configs: rockchip: add image and build configure

JosephChen2017 · JosephChen2017 · commit 25f7c6d4dfa4 · 2021-04-27T15:02:05.000+08:00
They are coming from make.sh

Signed-off-by: Joseph Chen &lt;chenjh@rock-chips.com&gt;
Change-Id: I45ddc82241a9b0cad2633dc888566cbb407bd0b8
diff --git a/configs/evb-aarch32-rk3308_defconfig b/configs/evb-aarch32-rk3308_defconfig
@@ -6,6 +6,11 @@ CONFIG_ARM64_BOOT_AARCH32=y
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
 # CONFIG_USING_KERNEL_DTB is not set
+CONFIG_TRUST_INI="RK3308AARCH32TRUST.ini"
+CONFIG_UBOOT_SIZE_KB=512
+CONFIG_UBOOT_NUM=2
+CONFIG_TRUST_SIZE_KB=512
+CONFIG_TRUST_RSA_MODE=3
 CONFIG_TARGET_EVB_RK3308=y
 CONFIG_DEFAULT_DEVICE_TREE="rk3308-evb"
 CONFIG_DEBUG_UART=y
diff --git a/configs/evb-px30_defconfig b/configs/evb-px30_defconfig
@@ -7,6 +7,7 @@ CONFIG_ROCKCHIP_PX30=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_TRUST_RSA_MODE=3
 CONFIG_TARGET_EVB_PX30=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x600000
diff --git a/configs/evb-px3se_defconfig b/configs/evb-px3se_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_MALLOC_F_LEN=0x1000
 CONFIG_ROCKCHIP_RK3128=y
 CONFIG_ROCKCHIP_PX3SE=y
+CONFIG_CHIP_NAME="PX3SE"
 CONFIG_DEFAULT_DEVICE_TREE="px3se-evb"
 CONFIG_DEBUG_UART=y
 CONFIG_ANDROID_BOOT_IMAGE=y
diff --git a/configs/evb-px5_defconfig b/configs/evb-px5_defconfig
@@ -7,6 +7,8 @@ CONFIG_TPL_MAX_SIZE=32768
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
 CONFIG_ROCKCHIP_RK3368=y
 CONFIG_ROCKCHIP_PX5=y
+CONFIG_TRUST_SHA_MODE=2
+CONFIG_CHIP_NAME="PX5"
 CONFIG_TPL_LIBCOMMON_SUPPORT=y
 CONFIG_TPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig
@@ -9,6 +9,10 @@ CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_optee.sh"
 CONFIG_TPL_STACK=0x10081fff
 # CONFIG_SPL_ROCKCHIP_BACK_TO_BROM is not set
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
+CONFIG_UBOOT_SIZE_KB=512
+CONFIG_UBOOT_NUM=1
+CONFIG_TRUST_SIZE_KB=512
+CONFIG_TRUST_NUM=1
 CONFIG_TARGET_EVB_RK3036=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x60600000
diff --git a/configs/evb-rk3308_defconfig b/configs/evb-rk3308_defconfig
@@ -9,6 +9,9 @@ CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
 # CONFIG_USING_KERNEL_DTB is not set
 CONFIG_ROCKCHIP_UART_MUX_SEL_M=1
+CONFIG_UBOOT_NUM=2
+CONFIG_TRUST_SIZE_KB=1024
+CONFIG_TRUST_RSA_MODE=3
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_TARGET_EVB_RK3308=y
 CONFIG_SPL_STACK_R_ADDR=0xc00000
diff --git a/configs/evb-rk3326_defconfig b/configs/evb-rk3326_defconfig
@@ -8,6 +8,8 @@ CONFIG_ROCKCHIP_RK3326=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_TRUST_RSA_MODE=3
+CONFIG_CHIP_NAME="RK3326"
 CONFIG_TARGET_EVB_PX30=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x600000
diff --git a/configs/evb-rv1108_defconfig b/configs/evb-rv1108_defconfig
@@ -8,6 +8,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ROCKCHIP_RV1108=y
 CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
 # CONFIG_USING_KERNEL_DTB is not set
+CONFIG_CHIP_NAME="RV110X"
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_TARGET_EVB_RV1108=y
diff --git a/configs/geekbox_defconfig b/configs/geekbox_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_MALLOC_F_LEN=0x1000
 CONFIG_ROCKCHIP_RK3368=y
+CONFIG_TRUST_SHA_MODE=2
 CONFIG_TARGET_GEEKBOX=y
 CONFIG_DEFAULT_DEVICE_TREE="rk3368-geekbox"
 CONFIG_DEBUG_UART=y
diff --git a/configs/gva-rk3229_defconfig b/configs/gva-rk3229_defconfig
@@ -10,6 +10,8 @@ CONFIG_ROCKCHIP_RK322X=y
 CONFIG_TPL_STACK=0x10088000
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_LOADER_INI="RK322XATMINIALL.ini"
+CONFIG_CHIP_NAME="RK322X"
 CONFIG_TARGET_GVA_RK3229=y
 CONFIG_SPL_STACK_R_ADDR=0x60600000
 CONFIG_DEFAULT_DEVICE_TREE="rk3229-gva"
diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig
@@ -9,6 +9,10 @@ CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_optee.sh"
 CONFIG_TPL_STACK=0x10081fff
 # CONFIG_SPL_ROCKCHIP_BACK_TO_BROM is not set
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
+CONFIG_UBOOT_SIZE_KB=512
+CONFIG_UBOOT_NUM=1
+CONFIG_TRUST_SIZE_KB=512
+CONFIG_TRUST_NUM=1
 CONFIG_TARGET_KYLIN_RK3036=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x60600000
diff --git a/configs/lion-rk3368_defconfig b/configs/lion-rk3368_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TPL_MAX_SIZE=32768
 CONFIG_ROCKCHIP_RK3368=y
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
+CONFIG_TRUST_SHA_MODE=2
 CONFIG_TPL_LIBCOMMON_SUPPORT=y
 CONFIG_TPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
diff --git a/configs/px30_defconfig b/configs/px30_defconfig
@@ -7,6 +7,7 @@ CONFIG_ROCKCHIP_PX30=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_TRUST_RSA_MODE=3
 CONFIG_TARGET_EVB_PX30=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x600000
diff --git a/configs/rk1806_defconfig b/configs/rk1806_defconfig
@@ -8,6 +8,10 @@ CONFIG_ROCKCHIP_RK1808=y
 CONFIG_ROCKCHIP_RK1806=y
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_UBOOT_NUM=2
+CONFIG_TRUST_SIZE_KB=1024
+CONFIG_TRUST_RSA_MODE=3
+CONFIG_CHIP_NAME="RK1806"
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x3fe0000
diff --git a/configs/rk1808_defconfig b/configs/rk1808_defconfig
@@ -7,6 +7,9 @@ CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
 CONFIG_ROCKCHIP_RK1808=y
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_UBOOT_NUM=2
+CONFIG_TRUST_SIZE_KB=1024
+CONFIG_TRUST_RSA_MODE=3
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x3fe0000
diff --git a/configs/rk3036_defconfig b/configs/rk3036_defconfig
@@ -10,6 +10,10 @@ CONFIG_TPL_STACK=0x10081fff
 # CONFIG_SPL_ROCKCHIP_BACK_TO_BROM is not set
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_UBOOT_SIZE_KB=512
+CONFIG_UBOOT_NUM=1
+CONFIG_TRUST_SIZE_KB=512
+CONFIG_TRUST_NUM=1
 CONFIG_TARGET_EVB_RK3036=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x60600000
diff --git a/configs/rk3126_defconfig b/configs/rk3126_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x38000
 CONFIG_ROCKCHIP_RK3128=y
 CONFIG_ROCKCHIP_RK3126=y
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_CHIP_NAME="RK3126"
 CONFIG_DEFAULT_DEVICE_TREE="rk3126-evb"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
diff --git a/configs/rk3128x_defconfig b/configs/rk3128x_defconfig
@@ -12,6 +12,7 @@ CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_optee.sh"
 CONFIG_TPL_STACK=0x10088000
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_CHIP_NAME="RK3128X"
 CONFIG_TARGET_EVB_RK3229=y
 CONFIG_SPL_STACK_R_ADDR=0x60600000
 CONFIG_DEFAULT_DEVICE_TREE="rk3229-evb"
diff --git a/configs/rk3308-aarch32_defconfig b/configs/rk3308-aarch32_defconfig
@@ -5,6 +5,11 @@ CONFIG_ROCKCHIP_RK3308=y
 CONFIG_ARM64_BOOT_AARCH32=y
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_TRUST_INI="RK3308AARCH32TRUST.ini"
+CONFIG_UBOOT_SIZE_KB=512
+CONFIG_UBOOT_NUM=2
+CONFIG_TRUST_SIZE_KB=512
+CONFIG_TRUST_RSA_MODE=3
 CONFIG_TARGET_EVB_RK3308=y
 CONFIG_DEFAULT_DEVICE_TREE="rk3308-evb"
 CONFIG_DEBUG_UART=y
diff --git a/configs/rk3308_defconfig b/configs/rk3308_defconfig
@@ -8,6 +8,9 @@ CONFIG_ROCKCHIP_RK3308=y
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
 CONFIG_ROCKCHIP_UART_MUX_SEL_M=1
+CONFIG_UBOOT_NUM=2
+CONFIG_TRUST_SIZE_KB=1024
+CONFIG_TRUST_RSA_MODE=3
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_TARGET_EVB_RK3308=y
 CONFIG_SPL_STACK_R_ADDR=0xc00000
diff --git a/configs/rk3326-aarch32_defconfig b/configs/rk3326-aarch32_defconfig
@@ -6,6 +6,9 @@ CONFIG_ROCKCHIP_RK3326=y
 CONFIG_ARM64_BOOT_AARCH32=y
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_LOADER_INI="RK3326AARCH32MINIALL.ini"
+CONFIG_TRUST_RSA_MODE=3
+CONFIG_CHIP_NAME="RK3326"
 CONFIG_TARGET_EVB_PX30=y
 CONFIG_DEFAULT_DEVICE_TREE="rk3326-evb"
 CONFIG_DEBUG_UART=y
diff --git a/configs/rk3326_defconfig b/configs/rk3326_defconfig
@@ -8,6 +8,8 @@ CONFIG_ROCKCHIP_RK3326=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_TRUST_RSA_MODE=3
+CONFIG_CHIP_NAME="RK3326"
 CONFIG_TARGET_EVB_PX30=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x600000
diff --git a/configs/rk3368_defconfig b/configs/rk3368_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_ROCKCHIP_RK3368=y
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_TRUST_SHA_MODE=2
 CONFIG_TARGET_EVB_RK3368=y
 CONFIG_DEFAULT_DEVICE_TREE="rk3368-evb"
 CONFIG_DEBUG_UART=y
diff --git a/configs/rk3399pro_defconfig b/configs/rk3399pro_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
 CONFIG_ROCKCHIP_RK3399=y
 CONFIG_ROCKCHIP_RK3399PRO=y
 CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_CHIP_NAME="RK3399PRO"
 CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
diff --git a/configs/rknpu-lion_defconfig b/configs/rknpu-lion_defconfig
@@ -4,6 +4,11 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ROCKCHIP_RK1808=y
 CONFIG_COPROCESSOR_RK1808=y
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
+CONFIG_LOADER_INI="RKNPULIONMINIALL.ini"
+CONFIG_TRUST_INI="RKNPULIONTRUST.ini"
+CONFIG_UBOOT_NUM=2
+CONFIG_TRUST_SIZE_KB=1024
+CONFIG_TRUST_RSA_MODE=3
 CONFIG_TARGET_EVB_RK1808=y
 CONFIG_DEFAULT_DEVICE_TREE="rk3399pro-npu-evb"
 CONFIG_DEBUG_UART=y
diff --git a/configs/sheep-rk3368_defconfig b/configs/sheep-rk3368_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_MALLOC_F_LEN=0x1000
 CONFIG_ROCKCHIP_RK3368=y
+CONFIG_TRUST_SHA_MODE=2
 CONFIG_TARGET_SHEEP=y
 CONFIG_DEFAULT_DEVICE_TREE="rk3368-sheep"
 CONFIG_DEBUG_UART=y
