diff --git a/board/xmedia/xm72020300/board.c b/board/xmedia/xm72020300/board.c index a942b75627aa..756e9416d215 100755 --- a/board/xmedia/xm72020300/board.c +++ b/board/xmedia/xm72020300/board.c @@ -330,11 +330,13 @@ void clear_update_flag(int update_flag) int misc_init_r(void) { + /* Before openipc_helper(): a FIT on the split NOR layout carries + * hashes, and firmware_scan() drops this for it. */ + env_set("verify", "n"); openipc_helper(); #ifdef CONFIG_RANDOM_ETHADDR random_init_r(); #endif - env_set("verify", "n"); #ifdef CFG_MMU_HANDLEOK dcache_stop(); diff --git a/board/xmedia/xm76050100/board.c b/board/xmedia/xm76050100/board.c index 101c4ddc74d6..7f654fdb2d18 100755 --- a/board/xmedia/xm76050100/board.c +++ b/board/xmedia/xm76050100/board.c @@ -277,11 +277,13 @@ int check_update_button(void) int misc_init_r(void) { + /* Before openipc_helper(): a FIT on the split NOR layout carries + * hashes, and firmware_scan() drops this for it. */ + env_set("verify", "n"); openipc_helper(); #ifdef CONFIG_RANDOM_ETHADDR random_init_r(); #endif - env_set("verify", "n"); #ifdef CFG_MMU_HANDLEOK dcache_stop(); diff --git a/openipc/xm72020300_config b/openipc/xm72020300_config index 8c1a5e454794..9e34729fe213 100644 --- a/openipc/xm72020300_config +++ b/openipc/xm72020300_config @@ -8,3 +8,7 @@ CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_MMC=y CONFIG_CMD_MMC=y CONFIG_MMC_SDHCI=y +# Split NOR layout: a hashed FIT kernel (board nor-fit.its in OpenIPC/firmware) +CONFIG_FIT=y +CONFIG_SHA1=y +CONFIG_OPENIPC_NOR_FIT_SPLIT=y diff --git a/openipc/xm76050100_config b/openipc/xm76050100_config index d19e04445f4a..6117d549fc57 100644 --- a/openipc/xm76050100_config +++ b/openipc/xm76050100_config @@ -8,3 +8,7 @@ CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_MMC=y CONFIG_CMD_MMC=y CONFIG_MMC_SDHCI=y +# Split NOR layout: a hashed FIT kernel (board nor-fit.its in OpenIPC/firmware) +CONFIG_FIT=y +CONFIG_SHA1=y +CONFIG_OPENIPC_NOR_FIT_SPLIT=y