From bccbe934302ee10296edd0aee04d02b539a04987 Mon Sep 17 00:00:00 2001 From: Zhihuan He Date: Tue, 17 Nov 2020 16:02:26 +0800 Subject: [PATCH] configs: rk3308: add tpl support Change-Id: Idd2b4f087d8d281edb750c6e65ac325b2729cd46 Signed-off-by: Zhihuan He --- configs/evb-rk3308_defconfig | 8 +++----- configs/rk3308_defconfig | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/configs/evb-rk3308_defconfig b/configs/evb-rk3308_defconfig index 947f1c06bc..ae25f7f4b9 100644 --- a/configs/evb-rk3308_defconfig +++ b/configs/evb-rk3308_defconfig @@ -9,8 +9,6 @@ CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0 CONFIG_RKIMG_BOOTLOADER=y CONFIG_ROCKCHIP_VENDOR_PARTITION=y # CONFIG_USING_KERNEL_DTB is not set -CONFIG_TPL_LIBCOMMON_SUPPORT=y -CONFIG_TPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_TARGET_EVB_RK3308=y CONFIG_SPL_STACK_R_ADDR=0xc00000 @@ -30,7 +28,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_RELOC_TEXT_BASE=0x3001000 CONFIG_SPL_ATF=y CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y -CONFIG_TPL_DRIVERS_MISC_SUPPORT=y +CONFIG_TPL_TINY_FRAMEWORK=y # CONFIG_FASTBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set @@ -55,10 +53,8 @@ CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_ISO_PARTITION is not set CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64 CONFIG_SPL_OF_CONTROL=y -CONFIG_TPL_OF_CONTROL=y CONFIG_OF_LIVE=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -CONFIG_TPL_DM=y CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CLK=y @@ -77,6 +73,7 @@ CONFIG_REGULATOR_PWM=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y +CONFIG_TPL_RAM=y CONFIG_DM_RESET=y CONFIG_RKFLASH=y CONFIG_RKNANDC_NAND=y @@ -86,6 +83,7 @@ CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_BASE=0xFF0C0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_ROCKCHIP_UART_MUX_SEL_M=1 CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_SYSRESET=y CONFIG_USB=y diff --git a/configs/rk3308_defconfig b/configs/rk3308_defconfig index 542a3d4d17..50abe01fd9 100644 --- a/configs/rk3308_defconfig +++ b/configs/rk3308_defconfig @@ -8,8 +8,6 @@ CONFIG_ROCKCHIP_RK3308=y CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0 CONFIG_RKIMG_BOOTLOADER=y CONFIG_ROCKCHIP_VENDOR_PARTITION=y -CONFIG_TPL_LIBCOMMON_SUPPORT=y -CONFIG_TPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_TARGET_EVB_RK3308=y CONFIG_SPL_STACK_R_ADDR=0xc00000 @@ -31,7 +29,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_RELOC_TEXT_BASE=0x3001000 CONFIG_SPL_ATF=y CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y -CONFIG_TPL_DRIVERS_MISC_SUPPORT=y +CONFIG_TPL_TINY_FRAMEWORK=y # CONFIG_FASTBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set @@ -55,10 +53,8 @@ CONFIG_CMD_PMIC=y # CONFIG_ISO_PARTITION is not set CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64 CONFIG_SPL_OF_CONTROL=y -CONFIG_TPL_OF_CONTROL=y CONFIG_OF_LIVE=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -CONFIG_TPL_DM=y CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CLK=y @@ -93,6 +89,7 @@ CONFIG_DM_CHARGE_DISPLAY=y CONFIG_CHARGE_ANIMATION=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y +CONFIG_TPL_RAM=y CONFIG_DM_RESET=y CONFIG_RKFLASH=y CONFIG_RKNANDC_NAND=y @@ -102,6 +99,7 @@ CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_BASE=0xFF0C0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_ROCKCHIP_UART_MUX_SEL_M=1 CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_SYSRESET=y CONFIG_DM_THERMAL=y