diff options
| -rw-r--r-- | .gitlab-ci.yml | 30 | ||||
| -rw-r--r-- | plat/imx/common/imx8_psci.c | 2 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mm/include/platform_def.h | 1 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mm/platform.mk | 3 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mp/include/platform_def.h | 1 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mp/platform.mk | 3 |
6 files changed, 37 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..ece7e76e --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,30 @@ +variables: +# uncomment for the pipeline debug purpose +# CI_DEBUG_TRACE: "true" + CI_IMAGE: gitlab.int.toradex.com:4567/philippe.schenker/linux-toradex/ci-kernel-builder:gcc9 + DOCKER_HOST: tcp://docker:2375 + DOCKER_DRIVER: overlay2 + DOCKER_TLS_CERTDIR: "" + +stages: + - build-imx-atf + +build_imx-atf: + stage: build-imx-atf + image: $CI_IMAGE + variables: + GIT_STRATEGY: fetch + GIT_DEPTH: "1" + script: | + source /select_64bit_toolchain.sh + echo "GCC used to build binaries is" + which ${CROSS_COMPILE}gcc + ${CROSS_COMPILE}gcc --version + echo -e "Arch is \e[36m$ARCH\e[39m" + echo "Current directory: ${PWD}" + echo "building with $THREADS parallel threads" + for PLATFORM in imx8mm imx8qm imx8qx; do + echo "make -j8 PLAT=$PLATFORM bl31" + make -j8 PLAT=$PLATFORM bl31 + ls -l build/$PLATFORM/release/bl31.bin + done diff --git a/plat/imx/common/imx8_psci.c b/plat/imx/common/imx8_psci.c index 5b53e62f..d4f6723e 100644 --- a/plat/imx/common/imx8_psci.c +++ b/plat/imx/common/imx8_psci.c @@ -23,7 +23,7 @@ void __dead2 imx_system_off(void) void __dead2 imx_system_reset(void) { - sc_pm_reboot(ipc_handle, SC_PM_RESET_TYPE_COLD); + sc_pm_reset(ipc_handle, SC_PM_RESET_TYPE_BOARD); wfi(); ERROR("system reset failed.\n"); panic(); diff --git a/plat/imx/imx8m/imx8mm/include/platform_def.h b/plat/imx/imx8m/imx8mm/include/platform_def.h index 42b03613..09481808 100644 --- a/plat/imx/imx8m/imx8mm/include/platform_def.h +++ b/plat/imx/imx8m/imx8mm/include/platform_def.h @@ -51,7 +51,6 @@ #define HAB_RVT_BASE U(0x00000900) /* HAB_RVT for i.MX8MM */ -#define IMX_BOOT_UART_BASE U(0x30890000) #define IMX_BOOT_UART_CLK_IN_HZ 24000000 /* Select 24MHz oscillator */ #define PLAT_CRASH_UART_BASE IMX_BOOT_UART_BASE diff --git a/plat/imx/imx8m/imx8mm/platform.mk b/plat/imx/imx8m/imx8mm/platform.mk index 600a3c44..51da5c0e 100644 --- a/plat/imx/imx8m/imx8mm/platform.mk +++ b/plat/imx/imx8m/imx8mm/platform.mk @@ -66,3 +66,6 @@ $(eval $(call add_define,BL32_SIZE)) ifeq (${SPD},trusty) BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 endif + +IMX_BOOT_UART_BASE ?= 0x30890000 +$(eval $(call add_define,IMX_BOOT_UART_BASE)) diff --git a/plat/imx/imx8m/imx8mp/include/platform_def.h b/plat/imx/imx8m/imx8mp/include/platform_def.h index d32789c5..dc5e6627 100644 --- a/plat/imx/imx8m/imx8mp/include/platform_def.h +++ b/plat/imx/imx8m/imx8mp/include/platform_def.h @@ -51,7 +51,6 @@ #define HAB_RVT_BASE U(0x00000900) /* HAB_RVT for i.MX8MM */ -#define IMX_BOOT_UART_BASE U(0x30890000) #define IMX_BOOT_UART_CLK_IN_HZ 24000000 /* Select 24MHz oscillator */ #define PLAT_CRASH_UART_BASE IMX_BOOT_UART_BASE diff --git a/plat/imx/imx8m/imx8mp/platform.mk b/plat/imx/imx8m/imx8mp/platform.mk index c668ca70..f5a55948 100644 --- a/plat/imx/imx8m/imx8mp/platform.mk +++ b/plat/imx/imx8m/imx8mp/platform.mk @@ -66,3 +66,6 @@ $(eval $(call add_define,BL32_SIZE)) ifeq (${SPD},trusty) BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 endif + +IMX_BOOT_UART_BASE ?= 0x30890000 +$(eval $(call add_define,IMX_BOOT_UART_BASE)) |