diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2018-08-28 14:20:50 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-11-29 11:14:48 +0100 |
| commit | 6efbcb8cd6740e60fc53f9033d60cc27f62b3c74 (patch) | |
| tree | fc1f6871d2402ba1162d06263c69789e883e6264 | |
| parent | 2963361493e0f3df76f3a25202a56a76e69fd63f (diff) | |
colibri-imx8qxp: synchronize with imx8qxp-mek from beta2
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit 6557f1c6c8f5c5e6a5585459ab77e3d994ffff81)
| -rw-r--r-- | board/toradex/colibri-imx8qxp/colibri-imx8qxp.c | 8 | ||||
| -rw-r--r-- | include/configs/colibri-imx8qxp.h | 17 |
2 files changed, 18 insertions, 7 deletions
diff --git a/board/toradex/colibri-imx8qxp/colibri-imx8qxp.c b/board/toradex/colibri-imx8qxp/colibri-imx8qxp.c index 6bd7ca19db..c3a56481dc 100644 --- a/board/toradex/colibri-imx8qxp/colibri-imx8qxp.c +++ b/board/toradex/colibri-imx8qxp/colibri-imx8qxp.c @@ -255,8 +255,6 @@ int board_eth_init(bd_t *bis) int ret; struct power_domain pd; - printf("[%s] %d\n", __func__, __LINE__); - if (CONFIG_FEC_ENET_DEV) { if (!power_domain_lookup_name("conn_enet1", &pd)) power_domain_on(&pd); @@ -428,6 +426,12 @@ int board_late_init(void) board_late_mmc_env_init(); #endif +#ifdef CONFIG_AHAB_BOOT + setenv("sec_boot", "yes"); +#else + setenv("sec_boot", "no"); +#endif + return 0; } diff --git a/include/configs/colibri-imx8qxp.h b/include/configs/colibri-imx8qxp.h index 4148c698fd..947994198a 100644 --- a/include/configs/colibri-imx8qxp.h +++ b/include/configs/colibri-imx8qxp.h @@ -69,6 +69,12 @@ "kernel_addr_r=0x82000000\0" \ "ramdisk_addr_r=0x84100000\0" +#ifdef CONFIG_AHAB_BOOT +#define AHAB_ENV "sec_boot=yes\0" +#else +#define AHAB_ENV "sec_boot=no\0" +#endif + /* Boot M4 */ #define M4_BOOT_ENV \ "m4_0_image=m4_0.bin\0" \ @@ -99,6 +105,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ + AHAB_ENV \ MEM_LAYOUT_ENV_SETTINGS \ "script=boot.scr\0" \ "image=Image\0" \ @@ -179,7 +186,7 @@ #define CONFIG_SYS_MEMTEST_END 0x89000000 /* Default environment is in SD */ -#define CONFIG_ENV_SIZE 0x1000 +#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (64 * SZ_64K) #define CONFIG_ENV_IS_IN_MMC @@ -207,11 +214,11 @@ /* Monitor Command Prompt */ #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SYS_MAXARGS 64 -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE +#define CONFIG_SYS_CBSIZE 2048 +#define CONFIG_SYS_MAXARGS 64 +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_CMDLINE_EDITING |