diff --git a/cmake-tool/helpers/application_settings.cmake b/cmake-tool/helpers/application_settings.cmake index 591dec22..09513ec1 100644 --- a/cmake-tool/helpers/application_settings.cmake +++ b/cmake-tool/helpers/application_settings.cmake @@ -44,7 +44,7 @@ function(ApplyData61ElfLoaderSettings kernel_platform kernel_sel4_arch) # This applies to imx8mm, imx8mq (EVK and MaaXBoard), imx8mp when in aarch32 configuration # It should be possible to use a uimage format but when tried nothing # runs after uboot. - set(IMAGE_START_ADDR 0x41000000 CACHE INTERNAL "" FORCE) + set(IMAGE_START_ADDR 0x42000000 CACHE INTERNAL "" FORCE) endif() if(KernelPlatformHikey AND KernelSel4ArchAarch32) # This is preserving what the Hikey's bootloader requires. diff --git a/misc/style-c.sh b/misc/style-c.sh index 3cf74d67..9f78e896 100755 --- a/misc/style-c.sh +++ b/misc/style-c.sh @@ -4,6 +4,13 @@ # # SPDX-License-Identifier: BSD-2-Clause # +set -e + +if ! command -v astyle >/dev/null 2>&1 +then + echo "astyle could not be found, it must be available to run the script." + exit 1 +fi # Format (in place) a list of files as C code. astyle --options="${0%/*}/astylerc" "$@"