diff --git a/board/hisilicon/hi3518ev200/board.c b/board/hisilicon/hi3518ev200/board.c index a6a0faf096f0..a50590354fde 100644 --- a/board/hisilicon/hi3518ev200/board.c +++ b/board/hisilicon/hi3518ev200/board.c @@ -92,8 +92,9 @@ int board_init(void) int misc_init_r(void) { - openipc_helper(); + /* before the scan: a split image clears it, so bootm checks its CRC */ env_set("verify", "n"); + openipc_helper(); return 0; } diff --git a/board/xmedia/xm72010200/board.c b/board/xmedia/xm72010200/board.c index 181a48ac07fd..ddac529b7e26 100755 --- a/board/xmedia/xm72010200/board.c +++ b/board/xmedia/xm72010200/board.c @@ -279,11 +279,12 @@ void clear_update_flag(int update_flag) int misc_init_r(void) { + /* before the scan: a split image clears it, so bootm checks its CRC */ + 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/hi3516cv200_config b/openipc/hi3516cv200_config index 35152d920513..a78c0e11fb15 100644 --- a/openipc/hi3516cv200_config +++ b/openipc/hi3516cv200_config @@ -38,3 +38,7 @@ CONFIG_XMEDIA_DISABLE_DOWNLOAD=y # CONFIG_CMD_UGZIP is not set CONFIG_MMC=y CONFIG_CMD_MMC=y + +# The split NOR layout: the kernel (OpenIPC/linux hisilicon-hi3516cv200) +# divides one firmware partition from its own device tree. +CONFIG_OPENIPC_NOR_SPLIT=y diff --git a/openipc/hi3518ev200_config b/openipc/hi3518ev200_config index 751e3b4c6e01..e5032f4a3d7c 100644 --- a/openipc/hi3518ev200_config +++ b/openipc/hi3518ev200_config @@ -38,3 +38,7 @@ CONFIG_XMEDIA_DISABLE_DOWNLOAD=y # CONFIG_CMD_UGZIP is not set CONFIG_MMC=y CONFIG_CMD_MMC=y + +# The split NOR layout: the kernel (OpenIPC/linux hisilicon-hi3516cv200) +# divides one firmware partition from its own device tree. +CONFIG_OPENIPC_NOR_SPLIT=y diff --git a/openipc/xm72010200_config b/openipc/xm72010200_config index 03c9b3841614..54b85bdffde3 100644 --- a/openipc/xm72010200_config +++ b/openipc/xm72010200_config @@ -8,3 +8,7 @@ CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_MMC=y CONFIG_CMD_MMC=y CONFIG_MMC_SDHCI=y + +# The split NOR layout: the kernel (OpenIPC/linux goke-gk7205v500) +# divides one firmware partition from its own device tree. +CONFIG_OPENIPC_NOR_SPLIT=y