diff --git a/Makefile b/Makefile
index 65f83d169..3ddb6b6df 100644
--- a/Makefile
+++ b/Makefile
@@ -199,6 +199,9 @@ else
 	@$(call PREPARE_REPACK,uImage,2048,rootfs.squashfs,8192,nor)
 endif
 endif
+endif
+# A NOR+NAND build (ultimate with BR2_TARGET_ROOTFS_UBI) packages its NAND
+# image whichever NOR layout it ships.
 ifeq ($(BR2_TARGET_ROOTFS_UBI),y)
 ifneq ($(filter $(BR2_OPENIPC_SOC_VENDOR),"rockchip" "sigmastar"),)
 	@$(call PREPARE_REPACK,,,rootfs.ubi,16384,nand)
@@ -232,7 +235,6 @@ ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
 	@$(call PREPARE_REPACK,uImage,16384,,,initramfs)
 endif
 endif
-endif
 
 size-report:
 	@TARGET_DIR=$(TARGET)/target \
diff --git a/br-ext-chip-hisilicon/board/hi3516ev200/hi3516dv200.generic.config b/br-ext-chip-hisilicon/board/hi3516ev200/hi3516dv200.generic.config
index 59a3dfc17..05622e149 100644
--- a/br-ext-chip-hisilicon/board/hi3516ev200/hi3516dv200.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516ev200/hi3516dv200.generic.config
@@ -777,6 +777,11 @@ CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_OF_PARTS=y
+CONFIG_MTD_ROOTFS_ROOT_DEV=y
+CONFIG_MTD_SPLIT_FIRMWARE=y
+CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
+CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y
+CONFIG_MTD_SPLIT_UIMAGE_FW=y
 # CONFIG_MTD_AR7_PARTS is not set
 
 #
diff --git a/br-ext-chip-hisilicon/board/hi3516ev200/hi3516ev200.generic.config b/br-ext-chip-hisilicon/board/hi3516ev200/hi3516ev200.generic.config
index a91f15019..74e2c560f 100644
--- a/br-ext-chip-hisilicon/board/hi3516ev200/hi3516ev200.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516ev200/hi3516ev200.generic.config
@@ -890,6 +890,11 @@ CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_OF_PARTS=y
+CONFIG_MTD_ROOTFS_ROOT_DEV=y
+CONFIG_MTD_SPLIT_FIRMWARE=y
+CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
+CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y
+CONFIG_MTD_SPLIT_UIMAGE_FW=y
 # CONFIG_MTD_AR7_PARTS is not set
 
 #
diff --git a/br-ext-chip-hisilicon/board/hi3516ev200/hi3518ev300.generic.config b/br-ext-chip-hisilicon/board/hi3516ev200/hi3518ev300.generic.config
index 8534433dc..1cb928886 100644
--- a/br-ext-chip-hisilicon/board/hi3516ev200/hi3518ev300.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516ev200/hi3518ev300.generic.config
@@ -901,6 +901,11 @@ CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_OF_PARTS=y
+CONFIG_MTD_ROOTFS_ROOT_DEV=y
+CONFIG_MTD_SPLIT_FIRMWARE=y
+CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
+CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y
+CONFIG_MTD_SPLIT_UIMAGE_FW=y
 # CONFIG_MTD_AR7_PARTS is not set
 
 #
diff --git a/br-ext-chip-hisilicon/configs/hi3516dv200_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516dv200_lite_defconfig
index 4f11d4283..ba6655413 100644
--- a/br-ext-chip-hisilicon/configs/hi3516dv200_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516dv200_lite_defconfig
@@ -62,3 +62,5 @@ BR2_PACKAGE_OPUS_OPENIPC=y
 BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
 BR2_PACKAGE_VTUND_OPENIPC=y
 BR2_PACKAGE_YAML_CLI=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_GENERAL_PATH)/scripts/post-image-split.sh"
+BR2_OPENIPC_NOR_FIXED_PACKAGE=y
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev200_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev200_lite_defconfig
index 833e40eda..72c9f8bc1 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev200_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev200_lite_defconfig
@@ -63,3 +63,5 @@ BR2_PACKAGE_OPUS_OPENIPC=y
 BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
 BR2_PACKAGE_VTUND_OPENIPC=y
 BR2_PACKAGE_YAML_CLI=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_GENERAL_PATH)/scripts/post-image-split.sh"
+BR2_OPENIPC_NOR_FIXED_PACKAGE=y
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig
index 7f73934de..3bff0937c 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig
@@ -81,3 +81,5 @@ BR2_PACKAGE_UACME_OPENIPC=y
 BR2_PACKAGE_VTUND_OPENIPC=y
 BR2_PACKAGE_YAML_CLI=y
 BR2_PACKAGE_ZEROTIER_ONE=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_GENERAL_PATH)/scripts/post-image-split.sh"
+BR2_OPENIPC_NOR_FIXED_PACKAGE=y
diff --git a/br-ext-chip-hisilicon/configs/hi3518ev300_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev300_lite_defconfig
index 4d2358bad..6e384e82c 100644
--- a/br-ext-chip-hisilicon/configs/hi3518ev300_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3518ev300_lite_defconfig
@@ -66,3 +66,5 @@ BR2_PACKAGE_MBEDTLS_OPENIPC=y
 BR2_PACKAGE_OPUS_OPENIPC=y
 BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
 BR2_PACKAGE_YAML_CLI=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_GENERAL_PATH)/scripts/post-image-split.sh"
+BR2_OPENIPC_NOR_FIXED_PACKAGE=y
diff --git a/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig
index 395b1e1fb..a26084d23 100644
--- a/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig
@@ -81,3 +81,5 @@ BR2_PACKAGE_UACME_OPENIPC=y
 BR2_PACKAGE_VTUND_OPENIPC=y
 BR2_PACKAGE_YAML_CLI=y
 BR2_PACKAGE_ZEROTIER_ONE=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_GENERAL_PATH)/scripts/post-image-split.sh"
+BR2_OPENIPC_NOR_FIXED_PACKAGE=y