BoardConfig: support build sdcard update firmware

Signed-off-by: Weiwen Chen <cww@rock-chips.com> Change-Id: Ife9024e0af5600abedaa3c6e75cbccba5054bd73
2021-02-05 16:59:33 +08:00
parent 62fa9cc7e3
commit b82ad91c22
7 changed files with 106 additions and 24 deletions
--- a/rk3308/BoardConfig.mk
+++ b/rk3308/BoardConfig.mk
@ -43,5 +43,25 @@ MIC_NUM=6
 export RK_MISC=wipe_all-misc.img
 #choose enable distro module
 export RK_DISTRO_MODULE=
-#choose enable Linux A/B
-export RK_LINUX_AB_ENABLE=
+# Define package-file for update_ab.img
+export RK_PACKAGE_FILE_AB=
+# Define package-file for ota update_ota.img
+export RK_PACKAGE_FILE_OTA=
+
+##########################################################
+# To support sdcard update firmware for A/B system
+# 1. Use recovery to boot into sdcard
+# 2. Update update_ab.img into storage media (eMMC or Nand)
+# Detail to see docs/Linux/Recovery/Rockchip_Developer_Guide_Linux_Upgrade_CN.pdf
+#
+# Define package-file for sdcard update update_sdcard.img
+# export RK_PACKAGE_FILE_SDCARD_UPDATE=sdcard-update-package-file
+# Recovery config
+# export RK_CFG_RECOVERY=
+# Recovery image format type: fit(flattened image tree)
+# export RK_RECOVERY_FIT_ITS=
+# To boot into sdcard reccovery for update_sdcard.img
+# export RK_SDUPDATE_AB_MISC=sdupdate-ab-misc.img
+# parameter for sdcard update update_sdcard.img
+# export RK_PARAMETER_SDUPDATE=parameter-sdupdate.txt
+##########################################################
--- a/rv1126_rv1109/BoardConfig-38x38-spi-nand-ab.mk
+++ b/rv1126_rv1109/BoardConfig-38x38-spi-nand-ab.mk
@ -5,12 +5,13 @@ export RK_CHIP=RV1126
 # Target arch
 export RK_ARCH=arm
 # Uboot defconfig
-#export RK_UBOOT_DEFCONFIG=rv1126
 export RK_UBOOT_DEFCONFIG=rv1126-ab
+# Uboot defconfig fragment, config rk-sfc.config if sdcard upgrade
+export RK_UBOOT_DEFCONFIG_FRAGMENT=rk-sfc.config
+# Uboot update loader (spl)
+export RK_LOADER_UPDATE_SPL=true
 # Uboot image format type: fit(flattened image tree)
 export RK_UBOOT_FORMAT_TYPE=fit
-#export RK_SPL_DEFCONFIG=rv1126
-export RK_LOADER_UPDATE_SPL=true
 # Kernel defconfig
 export RK_KERNEL_DEFCONFIG=rv1126_defconfig
 # Kernel defconfig fragment
@ -51,7 +52,7 @@ export RK_OEM_DIR=oem_ipc
 # OEM build on buildroot
 export RK_OEM_BUILDIN_BUILDROOT=YES
 #userdata config, if not define this, system will format by RK_USERDATA_FS_TYPE
-export RK_USERDATA_DIR=userdata_empty
+export RK_USERDATA_DIR=
 #
 # Set ubifs page size, 2048(2KB) or 4096(4KB)
 # Option.
@ -63,7 +64,7 @@ export RK_UBI_BLOCK_SIZE=0x20000
 #
 # Set userdata partition size (byte) if define RK_USERDATA_DIR
 # MUST, if userdata partition is grow partition.
-export RK_USERDATA_PARTITION_SIZE=0x680000
+# export RK_USERDATA_PARTITION_SIZE=0x680000
 #
 # Set oem partition size (byte)
 # Option. if not set, it will get from parameter auto.
@ -75,7 +76,25 @@ export RK_MISC=blank-misc.img
 export RK_DISTRO_MODULE=
 # Define pre-build script for this board
 export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
-# Define package-file for update.img
-export RK_PACKAGE_FILE=rv1126_rv1109-package-file-2
-#choose enable Linux A/B
-export RK_LINUX_AB_ENABLE=true
+# Define package-file for update_ab.img
+export RK_PACKAGE_FILE_AB=rv1126-package-file-spi-nand-256MB-ab
+# Define package-file for ota update_ota.img
+export RK_PACKAGE_FILE_OTA=rv1126-package-file-spi-nand-256MB-ota
+
+##########################################################
+# To support sdcard update firmware for A/B system
+# 1. Use recovery to boot into sdcard
+# 2. Update update_ab.img into storage media (eMMC or Nand)
+# Detail to see docs/Linux/Recovery/Rockchip_Developer_Guide_Linux_Upgrade_CN.pdf
+#
+# Define package-file for sdcard update update_sdcard.img
+export RK_PACKAGE_FILE_SDCARD_UPDATE=sdcard-update-package-file
+# Recovery config
+export RK_CFG_RECOVERY=rockchip_rv1126_rv1109_spi_nand_recovery
+# Recovery image format type: fit(flattened image tree)
+export RK_RECOVERY_FIT_ITS=boot4recovery.its
+# To boot into sdcard reccovery for update_sdcard.img
+export RK_SDUPDATE_AB_MISC=sdupdate-ab-misc.img
+# parameter for sdcard update update_sdcard.img
+export RK_PARAMETER_SDUPDATE=parameter-sdupdate.txt
+##########################################################
--- a/rv1126_rv1109/BoardConfig-38x38-spi-nand.mk
+++ b/rv1126_rv1109/BoardConfig-38x38-spi-nand.mk
@ -6,6 +6,8 @@ export RK_CHIP=RV1126
 export RK_ARCH=arm
 # Uboot defconfig
 export RK_UBOOT_DEFCONFIG=rv1126
+# Uboot defconfig fragment, config rk-sfc.config if sdcard upgrade
+export RK_UBOOT_DEFCONFIG_FRAGMENT=rk-sfc.config
 # Uboot update loader (spl)
 export RK_LOADER_UPDATE_SPL=true
 # Uboot image format type: fit(flattened image tree)
@ -26,6 +28,8 @@ export RK_PARAMETER=parameter-fit-nand-256M.txt
 export RK_CFG_BUILDROOT=rockchip_rv1126_rv1109_spi_nand
 # Recovery config
 export RK_CFG_RECOVERY=rockchip_rv1126_rv1109_spi_nand_recovery
+# Recovery image format type: fit(flattened image tree)
+export RK_RECOVERY_FIT_ITS=boot4recovery.its
 # ramboot config
 export RK_CFG_RAMBOOT=
 # Pcba config
--- a/rv1126_rv1109/BoardConfig-ab-v13.mk
+++ b/rv1126_rv1109/BoardConfig-ab-v13.mk
@ -24,10 +24,6 @@ export RK_KERNEL_FIT_ITS=boot.its
 export RK_PARAMETER=parameter-ab-fit.txt
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rv1126_rv1109_ab
-# Recovery config
-export RK_CFG_RECOVERY=
-# Recovery image format type: fit(flattened image tree)
-export RK_RECOVERY_FIT_ITS=
 # ramboot config
 export RK_CFG_RAMBOOT=
 # Pcba config
@ -53,10 +49,29 @@ export RK_OEM_BUILDIN_BUILDROOT=YES
 #userdata config, if not define this, system will format by RK_USERDATA_FS_TYPE
 export RK_USERDATA_DIR=userdata_normal
 #misc image
-export RK_MISC=wipe_all-misc.img
-# Define package-file for update.img
-export RK_PACKAGE_FILE=rv1126_rv1109-package-file-2-ab
-#choose enable distro module
-export RK_DISTRO_MODULE=
+export RK_MISC=blank-misc.img
+# Define package-file for AB system update_ab.img
+export RK_PACKAGE_FILE_AB=rv1126_rv1109-package-file-2-ab
+# Define package-file for ota update_ota.img
+export RK_PACKAGE_FILE_OTA=rv1126_rv1109-package-file-2-ota
+
+##########################################################
+# To support sdcard update firmware for A/B system
+# 1. Use recovery to boot into sdcard
+# 2. Update update_ab.img into storage media (eMMC or Nand)
+# Detail to see docs/Linux/Recovery/Rockchip_Developer_Guide_Linux_Upgrade_CN.pdf
+#
+# Define package-file for sdcard update update_sdcard.img
+export RK_PACKAGE_FILE_SDCARD_UPDATE=sdcard-update-package-file
+# Recovery config
+export RK_CFG_RECOVERY=rockchip_rv1126_rv1109_recovery
+# Recovery image format type: fit(flattened image tree)
+export RK_RECOVERY_FIT_ITS=boot4recovery.its
+# To boot into sdcard reccovery for update_sdcard.img
+export RK_SDUPDATE_AB_MISC=sdupdate-ab-misc.img
+# parameter for sdcard update update_sdcard.img
+export RK_PARAMETER_SDUPDATE=parameter-sdupdate.txt
+##########################################################
+
 # Define pre-build script for this board
 export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
--- a/rv1126_rv1109/BoardConfig-slc-nand-v12.mk
+++ b/rv1126_rv1109/BoardConfig-slc-nand-v12.mk
@ -6,6 +6,8 @@ export RK_CHIP=RV1126
 export RK_ARCH=arm
 # Uboot defconfig
 export RK_UBOOT_DEFCONFIG=rv1126
+# Uboot defconfig fragment, config rk-nand.config if sdcard upgrade
+export RK_UBOOT_DEFCONFIG_FRAGMENT=rk-nand.config
 # Loader update spl from Uboot
 export RK_LOADER_UPDATE_SPL=true
 # Uboot image format type: fit(flattened image tree)
--- a/rv1126_rv1109/BoardConfig-spi-nand.mk
+++ b/rv1126_rv1109/BoardConfig-spi-nand.mk
@ -6,6 +6,8 @@ export RK_CHIP=RV1126
 export RK_ARCH=arm
 # Uboot defconfig
 export RK_UBOOT_DEFCONFIG=rv1126
+# Uboot defconfig fragment, config rk-sfc.config if sdcard upgrade
+export RK_UBOOT_DEFCONFIG_FRAGMENT=rk-sfc.config
 # Uboot update loader (spl)
 export RK_LOADER_UPDATE_SPL=true
 # Uboot image format type: fit(flattened image tree)
--- a/rv1126_rv1109/BoardConfig-uvcc-spi-nand.mk
+++ b/rv1126_rv1109/BoardConfig-uvcc-spi-nand.mk
@ -7,6 +7,8 @@ export RK_ARCH=arm
 # Uboot defconfig
 #export RK_UBOOT_DEFCONFIG=rv1126
 export RK_UBOOT_DEFCONFIG=rv1126-ab
+# Uboot defconfig fragment, config rk-sfc.config if sdcard upgrade
+export RK_UBOOT_DEFCONFIG_FRAGMENT=rk-sfc.config
 # Uboot image format type: fit(flattened image tree)
 export RK_UBOOT_FORMAT_TYPE=fit
 #export RK_SPL_DEFCONFIG=rv1126
@ -73,7 +75,25 @@ export RK_MISC=
 export RK_DISTRO_MODULE=
 # Define pre-build script for this board
 export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
-# Define package-file for update.img
-export RK_PACKAGE_FILE=rv1126-package-file-spi-nand-uvc
-#choose enable Linux A/B
-export RK_LINUX_AB_ENABLE=true
+# Define package-file for update_ab.img
+export RK_PACKAGE_FILE_AB=rv1126-package-file-spi-nand-uvc-ab
+# Define package-file for update_ota.img
+export RK_PACKAGE_FILE_OTA=rv1126-package-file-spi-nand-uvc-ota
+
+##########################################################
+# To support sdcard update firmware for A/B system
+# 1. Use recovery to boot into sdcard
+# 2. Update update_ab.img into storage media (eMMC or Nand)
+# Detail to see docs/Linux/Recovery/Rockchip_Developer_Guide_Linux_Upgrade_CN.pdf
+#
+# Define package-file for sdcard update update_sdcard.img
+# export RK_PACKAGE_FILE_SDCARD_UPDATE=sdcard-update-package-file
+# Recovery config
+# export RK_CFG_RECOVERY=
+# Recovery image format type: fit(flattened image tree)
+# export RK_RECOVERY_FIT_ITS=boot4recovery.its
+# To boot into sdcard reccovery for update_sdcard.img
+# export RK_SDUPDATE_AB_MISC=sdupdate-ab-misc.img
+# parameter for sdcard update update_sdcard.img
+# export RK_PARAMETER_SDUPDATE=parameter-sdupdate.txt
+##########################################################