From d0f46a64916579ddb09f31e3a73393018cda561a Mon Sep 17 00:00:00 2001 From: Weiwen Chen Date: Tue, 6 Apr 2021 10:26:38 +0800 Subject: [PATCH] rv1126_rv1109: fix uboot build AB system bootup fix this: $ rm .config $ make rv1126-ab.config rk-sfc.config The base file '.config' does not exist. Exit. scripts/kconfig/Makefile:130: recipe for target 'rv1126-ab.config' failed make[2]: *** [rv1126-ab.config] Error 1 Makefile:479: recipe for target 'rv1126-ab.config' failed make[1]: *** [rv1126-ab.config] Error 2 Makefile:461: recipe for target '__build_one_by_one' failed make: *** [__build_one_by_one] Error 2 Signed-off-by: Weiwen Chen Change-Id: If4885195f604e452d5b656d6988b4c7d23ae4432 --- rv1126_rv1109/BoardConfig-38x38-spi-nand-ab.mk | 6 +++--- rv1126_rv1109/BoardConfig-uvcc-spi-nand.mk | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/rv1126_rv1109/BoardConfig-38x38-spi-nand-ab.mk b/rv1126_rv1109/BoardConfig-38x38-spi-nand-ab.mk index 43f2c72..f1cdeb9 100644 --- a/rv1126_rv1109/BoardConfig-38x38-spi-nand-ab.mk +++ b/rv1126_rv1109/BoardConfig-38x38-spi-nand-ab.mk @@ -5,9 +5,9 @@ export RK_CHIP=RV1126 # Target arch export RK_ARCH=arm # Uboot defconfig -export RK_UBOOT_DEFCONFIG=rv1126-ab -# Uboot defconfig fragment, config rk-sfc.config if sdcard upgrade -export RK_UBOOT_DEFCONFIG_FRAGMENT=rk-sfc.config +export RK_UBOOT_DEFCONFIG=rv1126 +# Uboot defconfig fragment, config rk-sfc.config if sdcard upgrade, rv1126-ab.config for AB system bootup +export RK_UBOOT_DEFCONFIG_FRAGMENT="rv1126-ab.config rk-sfc.config" # Uboot update loader (spl) export RK_LOADER_UPDATE_SPL=true # Uboot image format type: fit(flattened image tree) diff --git a/rv1126_rv1109/BoardConfig-uvcc-spi-nand.mk b/rv1126_rv1109/BoardConfig-uvcc-spi-nand.mk index ce1d6d9..5e5773c 100644 --- a/rv1126_rv1109/BoardConfig-uvcc-spi-nand.mk +++ b/rv1126_rv1109/BoardConfig-uvcc-spi-nand.mk @@ -5,10 +5,9 @@ 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 +export RK_UBOOT_DEFCONFIG=rv1126 +# Uboot defconfig fragment, config rk-sfc.config if sdcard upgrade, rv1126-ab.config for AB system bootup +export RK_UBOOT_DEFCONFIG_FRAGMENT="rv1126-ab.config rk-sfc.config" # Uboot image format type: fit(flattened image tree) export RK_UBOOT_FORMAT_TYPE=fit #export RK_SPL_DEFCONFIG=rv1126