From a934533f26bdf2f5a0d9afe41f0a3a0e21e1c3d5 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Wed, 18 Oct 2017 09:56:36 +0800 Subject: [PATCH] MLK-16599 imx8m: support SPL FIT Support SPL FIT. Uboot text base are also modified, because spl will load fit to address before text base of uboot. According to new ATF request, modified the SPL stack/bss to OCRAM_S space. Signed-off-by: Peng Fan Reviewed-by: Ye Li --- board/freescale/imx8mq_evk/spl.c | 10 ++++++++++ configs/imx8mq_evk_defconfig | 4 +++- include/configs/imx8mq_evk.h | 8 ++++---- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c index fd2c17d67c..580448a62f 100644 --- a/board/freescale/imx8mq_evk/spl.c +++ b/board/freescale/imx8mq_evk/spl.c @@ -198,6 +198,16 @@ void spl_board_init(void) puts("Normal Boot\n"); } +#ifdef CONFIG_SPL_LOAD_FIT +int board_fit_config_name_match(const char *name) +{ + /* Just empty function now - can't decide what to choose */ + debug("%s: %s\n", __func__, name); + + return 0; +} +#endif + void board_init_f(ulong dummy) { /* Clear global data */ diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index cdb266698a..ef1be74d88 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -28,6 +28,8 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_ETH=y CONFIG_CMD_PMIC=y - CONFIG_NXP_TMU=y CONFIG_DM_THERMAL=y +CONFIG_FIT=y +CONFIG_SPL_FIT=y +CONFIG_SPL_LOAD_FIT=y diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 47b6250f14..f76d4a9acf 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -24,15 +24,15 @@ #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" -#define CONFIG_SPL_STACK 0x91FFF0 +#define CONFIG_SPL_STACK 0x187FF0 #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_MMC_SUPPORT -#define CONFIG_SPL_BSS_START_ADDR 0x00912000 +#define CONFIG_SPL_BSS_START_ADDR 0x00180000 #define CONFIG_SPL_BSS_MAX_SIZE 0x2000 /* 8 KB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x00914000 +#define CONFIG_SYS_SPL_MALLOC_START 0x00182000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x2000 /* 8 KB */ #define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_DCACHE_OFF @@ -172,7 +172,7 @@ /* Link Definitions */ #define CONFIG_LOADADDR 0x40280000 -#define CONFIG_SYS_TEXT_BASE 0x40021000 +#define CONFIG_SYS_TEXT_BASE 0x40100000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -- 2.17.1