diff --git a/board/hisilicon/hi3516av200/board.c b/board/hisilicon/hi3516av200/board.c index e6de3b13d737..4054c27c9eb0 100644 --- a/board/hisilicon/hi3516av200/board.c +++ b/board/hisilicon/hi3516av200/board.c @@ -90,8 +90,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/hisilicon/hi3519v101/board.c b/board/hisilicon/hi3519v101/board.c index a621c4eaa929..c4e8e647a21b 100644 --- a/board/hisilicon/hi3519v101/board.c +++ b/board/hisilicon/hi3519v101/board.c @@ -90,8 +90,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/hisilicon/hi3536c/board.c b/board/hisilicon/hi3536c/board.c index c5be3c8a0248..224aaab873c8 100644 --- a/board/hisilicon/hi3536c/board.c +++ b/board/hisilicon/hi3536c/board.c @@ -85,8 +85,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/openipc/hi3516av200_config b/openipc/hi3516av200_config index e2b18d81d7cd..c1e85c401685 100644 --- a/openipc/hi3516av200_config +++ b/openipc/hi3516av200_config @@ -32,3 +32,7 @@ CONFIG_XMEDIA_DISABLE_DOWNLOAD=y # CONFIG_CMD_CREAD is not set # CONFIG_CMD_UGZIP is not set # CONFIG_DDR_TRAINING_V2 is not set + +# The split NOR layout: the kernel (OpenIPC/linux hisilicon-hi3519v101) +# divides one firmware partition from its own device tree. +CONFIG_OPENIPC_NOR_SPLIT=y diff --git a/openipc/hi3519v101_config b/openipc/hi3519v101_config index c49b591b01cf..a299c6cee724 100644 --- a/openipc/hi3519v101_config +++ b/openipc/hi3519v101_config @@ -32,3 +32,7 @@ CONFIG_XMEDIA_DISABLE_DOWNLOAD=y # CONFIG_CMD_CREAD is not set # CONFIG_CMD_UGZIP is not set # CONFIG_DDR_TRAINING_V2 is not set + +# The split NOR layout: the kernel (OpenIPC/linux hisilicon-hi3519v101) +# divides one firmware partition from its own device tree. +CONFIG_OPENIPC_NOR_SPLIT=y diff --git a/openipc/hi3536cv100_config b/openipc/hi3536cv100_config index 3dc5a38d4bdb..a6160a2ac8bb 100644 --- a/openipc/hi3536cv100_config +++ b/openipc/hi3536cv100_config @@ -37,3 +37,7 @@ CONFIG_XMEDIA_DISABLE_DOWNLOAD=y # CONFIG_CMD_CREAD is not set # CONFIG_CMD_UGZIP is not set # CONFIG_DDR_TRAINING_V2 is not set + +# The split NOR layout: the kernel (OpenIPC/linux hisilicon-hi3536cv100) +# divides one firmware partition from its own device tree. +CONFIG_OPENIPC_NOR_SPLIT=y