On 05/08/2019 02:36 AM, Jagan Teki wrote: > Few SPL and U-Boot proper configs are common to all rk3399 target > defconfigs, move them and select it from platform kconfig. > > Moved configs: > - SPL_ATF > - SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF > - SPL_LOAD_FIT > - SPL_CLK if SPL > - SPL_PINCTRL if SPL > - SPL_RAM if SPL > - SPL_REGMAP if SPL > - SPL_SYSCON if SPL > - CLK > - FIT > - PINCTRL > - RAM > - REGMAP > - SYSCON > - DM_PMIC > - DM_REGULATOR_FIXED > > Signed-off-by: Jagan Teki <jagan@xxxxxxxxxxxxxxxxxxxx> Reviewed-by: Kever Yang <kever.yang@xxxxxxxxxxxxxx> Thanks, - Kever > --- > arch/arm/mach-rockchip/Kconfig | 16 ++++++++++++++++ > configs/chromebook_bob_defconfig | 16 ---------------- > configs/evb-rk3399_defconfig | 16 ---------------- > configs/ficus-rk3399_defconfig | 16 ---------------- > configs/firefly-rk3399_defconfig | 16 ---------------- > configs/orangepi-rk3399_defconfig | 16 ---------------- > configs/puma-rk3399_defconfig | 16 ---------------- > configs/rock960-rk3399_defconfig | 16 ---------------- > 8 files changed, 16 insertions(+), 112 deletions(-) > > diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig > index f5c3329750..c05e3c3f48 100644 > --- a/arch/arm/mach-rockchip/Kconfig > +++ b/arch/arm/mach-rockchip/Kconfig > @@ -156,11 +156,27 @@ config ROCKCHIP_RK3399 > select SUPPORT_SPL > select SUPPORT_TPL > select SPL > + select SPL_ATF > + select SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF > + select SPL_LOAD_FIT > + select SPL_CLK if SPL > + select SPL_PINCTRL if SPL > + select SPL_RAM if SPL > + select SPL_REGMAP if SPL > + select SPL_SYSCON if SPL > select TPL_NEEDS_SEPARATE_TEXT_BASE if TPL > select TPL_NEEDS_SEPARATE_STACK if TPL > select SPL_SEPARATE_BSS > select SPL_SERIAL_SUPPORT > select SPL_DRIVERS_MISC_SUPPORT > + select CLK > + select FIT > + select PINCTRL > + select RAM > + select REGMAP > + select SYSCON > + select DM_PMIC > + select DM_REGULATOR_FIXED > select BOARD_LATE_INIT > select ROCKCHIP_BROM_HELPER > imply TPL_SERIAL_SUPPORT > diff --git a/configs/chromebook_bob_defconfig b/configs/chromebook_bob_defconfig > index bd836acad5..e61e27c992 100644 > --- a/configs/chromebook_bob_defconfig > +++ b/configs/chromebook_bob_defconfig > @@ -17,8 +17,6 @@ CONFIG_DEBUG_UART_CLOCK=24000000 > CONFIG_SPL_SPI_FLASH_SUPPORT=y > CONFIG_SPL_SPI_SUPPORT=y > CONFIG_DEBUG_UART=y > -CONFIG_FIT=y > -CONFIG_SPL_LOAD_FIT=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-gru-bob.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > @@ -26,8 +24,6 @@ CONFIG_SPL_TEXT_BASE=0xff8c2000 > CONFIG_SPL_STACK_R=y > CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000 > CONFIG_SPL_SPI_LOAD=y > -CONFIG_SPL_ATF=y > -CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_GPIO=y > CONFIG_CMD_GPT=y > @@ -46,12 +42,6 @@ CONFIG_SPL_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="rk3399-gru-bob" > CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > -CONFIG_REGMAP=y > -CONFIG_SPL_REGMAP=y > -CONFIG_SYSCON=y > -CONFIG_SPL_SYSCON=y > -CONFIG_CLK=y > -CONFIG_SPL_CLK=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_I2C_CROS_EC_TUNNEL=y > CONFIG_SYS_I2C_ROCKCHIP=y > @@ -71,16 +61,10 @@ CONFIG_SPI_FLASH_GIGADEVICE=y > CONFIG_DM_ETH=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > -CONFIG_PINCTRL=y > -CONFIG_SPL_PINCTRL=y > -CONFIG_DM_PMIC=y > CONFIG_PMIC_RK8XX=y > CONFIG_REGULATOR_PWM=y > -CONFIG_DM_REGULATOR_FIXED=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > -CONFIG_RAM=y > -CONFIG_SPL_RAM=y > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_ROCKCHIP_SPI=y > CONFIG_SYSRESET=y > diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig > index 94963e4280..f10502cb0e 100644 > --- a/configs/evb-rk3399_defconfig > +++ b/configs/evb-rk3399_defconfig > @@ -11,15 +11,11 @@ CONFIG_SPL_STACK_R_ADDR=0x80000 > CONFIG_DEBUG_UART_BASE=0xFF1A0000 > CONFIG_DEBUG_UART_CLOCK=24000000 > CONFIG_DEBUG_UART=y > -CONFIG_FIT=y > -CONFIG_SPL_LOAD_FIT=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-evb.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > CONFIG_SPL_STACK_R=y > CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 > -CONFIG_SPL_ATF=y > -CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y > CONFIG_TPL=y > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_GPT=y > @@ -33,12 +29,6 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb" > CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > CONFIG_NET_RANDOM_ETHADDR=y > -CONFIG_REGMAP=y > -CONFIG_SPL_REGMAP=y > -CONFIG_SYSCON=y > -CONFIG_SPL_SYSCON=y > -CONFIG_CLK=y > -CONFIG_SPL_CLK=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > CONFIG_MMC_DW=y > @@ -48,16 +38,10 @@ CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_DM_ETH=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > -CONFIG_PINCTRL=y > -CONFIG_SPL_PINCTRL=y > -CONFIG_DM_PMIC=y > CONFIG_PMIC_RK8XX=y > CONFIG_REGULATOR_PWM=y > -CONFIG_DM_REGULATOR_FIXED=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > -CONFIG_RAM=y > -CONFIG_SPL_RAM=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYSRESET=y > diff --git a/configs/ficus-rk3399_defconfig b/configs/ficus-rk3399_defconfig > index 926d244fbe..6a1b279cc9 100644 > --- a/configs/ficus-rk3399_defconfig > +++ b/configs/ficus-rk3399_defconfig > @@ -11,15 +11,11 @@ CONFIG_SPL_STACK_R_ADDR=0x80000 > CONFIG_DEBUG_UART_BASE=0xFF1A0000 > CONFIG_DEBUG_UART_CLOCK=24000000 > CONFIG_DEBUG_UART=y > -CONFIG_FIT=y > -CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > CONFIG_SPL_TEXT_BASE=0xff8c2000 > CONFIG_SPL_STACK_R=y > CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000 > -CONFIG_SPL_ATF=y > -CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_GPT=y > CONFIG_CMD_MMC=y > @@ -32,12 +28,6 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-ficus" > CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > CONFIG_NET_RANDOM_ETHADDR=y > -CONFIG_REGMAP=y > -CONFIG_SPL_REGMAP=y > -CONFIG_SYSCON=y > -CONFIG_SPL_SYSCON=y > -CONFIG_CLK=y > -CONFIG_SPL_CLK=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > CONFIG_MMC_DW=y > @@ -49,17 +39,11 @@ CONFIG_DM_ETH=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_RGMII=y > CONFIG_GMAC_ROCKCHIP=y > -CONFIG_PINCTRL=y > -CONFIG_SPL_PINCTRL=y > -CONFIG_DM_PMIC=y > CONFIG_PMIC_RK8XX=y > CONFIG_REGULATOR_PWM=y > -CONFIG_DM_REGULATOR_FIXED=y > CONFIG_DM_REGULATOR_GPIO=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > -CONFIG_RAM=y > -CONFIG_SPL_RAM=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYSRESET=y > diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig > index 5016fb8993..61f05b784f 100644 > --- a/configs/firefly-rk3399_defconfig > +++ b/configs/firefly-rk3399_defconfig > @@ -11,15 +11,11 @@ CONFIG_SPL_STACK_R_ADDR=0x80000 > CONFIG_DEBUG_UART_BASE=0xFF1A0000 > CONFIG_DEBUG_UART_CLOCK=24000000 > CONFIG_DEBUG_UART=y > -CONFIG_FIT=y > -CONFIG_SPL_LOAD_FIT=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-firefly.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > CONFIG_SPL_STACK_R=y > CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 > -CONFIG_SPL_ATF=y > -CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y > CONFIG_TPL=y > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_GPT=y > @@ -32,12 +28,6 @@ CONFIG_SPL_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="rk3399-firefly" > CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > -CONFIG_REGMAP=y > -CONFIG_SPL_REGMAP=y > -CONFIG_SYSCON=y > -CONFIG_SPL_SYSCON=y > -CONFIG_CLK=y > -CONFIG_SPL_CLK=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > CONFIG_MMC_DW=y > @@ -48,16 +38,10 @@ CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_DM_ETH=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > -CONFIG_PINCTRL=y > -CONFIG_SPL_PINCTRL=y > -CONFIG_DM_PMIC=y > CONFIG_PMIC_RK8XX=y > CONFIG_REGULATOR_PWM=y > -CONFIG_DM_REGULATOR_FIXED=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > -CONFIG_RAM=y > -CONFIG_SPL_RAM=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYSRESET=y > diff --git a/configs/orangepi-rk3399_defconfig b/configs/orangepi-rk3399_defconfig > index 22ddd8dce3..3f02c89983 100644 > --- a/configs/orangepi-rk3399_defconfig > +++ b/configs/orangepi-rk3399_defconfig > @@ -11,16 +11,12 @@ CONFIG_DEBUG_UART_CLOCK=24000000 > CONFIG_SPL_STACK_R_ADDR=0x80000 > CONFIG_DEBUG_UART=y > CONFIG_NR_DRAM_BANKS=1 > -CONFIG_FIT=y > -CONFIG_SPL_LOAD_FIT=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-orangepi.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > CONFIG_SPL_TEXT_BASE=0xff8c2000 > CONFIG_SPL_STACK_R=y > CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000 > -CONFIG_SPL_ATF=y > -CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_GPT=y > CONFIG_CMD_MMC=y > @@ -32,12 +28,6 @@ CONFIG_SPL_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="rk3399-orangepi" > CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > -CONFIG_REGMAP=y > -CONFIG_SPL_REGMAP=y > -CONFIG_SYSCON=y > -CONFIG_SPL_SYSCON=y > -CONFIG_CLK=y > -CONFIG_SPL_CLK=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > CONFIG_MMC_DW=y > @@ -47,16 +37,10 @@ CONFIG_MMC_SDHCI_ROCKCHIP=y > CONFIG_DM_ETH=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > -CONFIG_PINCTRL=y > -CONFIG_SPL_PINCTRL=y > -CONFIG_DM_PMIC=y > CONFIG_PMIC_RK8XX=y > CONFIG_REGULATOR_PWM=y > -CONFIG_DM_REGULATOR_FIXED=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > -CONFIG_RAM=y > -CONFIG_SPL_RAM=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYSRESET=y > diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig > index 964464ac0f..03f0bfdb59 100644 > --- a/configs/puma-rk3399_defconfig > +++ b/configs/puma-rk3399_defconfig > @@ -15,8 +15,6 @@ CONFIG_DEBUG_UART_CLOCK=24000000 > CONFIG_SPL_SPI_FLASH_SUPPORT=y > CONFIG_SPL_SPI_SUPPORT=y > CONFIG_DEBUG_UART=y > -CONFIG_FIT=y > -CONFIG_SPL_LOAD_FIT=y > CONFIG_SPL_FIT_SOURCE="board/theobroma-systems/puma_rk3399/fit_spl_atf.its" > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-puma-haikou.dtb" > CONFIG_MISC_INIT_R=y > @@ -32,8 +30,6 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 > CONFIG_SPL_I2C_SUPPORT=y > CONFIG_SPL_POWER_SUPPORT=y > CONFIG_SPL_SPI_LOAD=y > -CONFIG_SPL_ATF=y > -CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_GPT=y > CONFIG_CMD_I2C=y > @@ -52,12 +48,6 @@ CONFIG_OF_LIVE=y > CONFIG_DEFAULT_DEVICE_TREE="rk3399-puma-ddr1600" > CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > -CONFIG_REGMAP=y > -CONFIG_SPL_REGMAP=y > -CONFIG_SYSCON=y > -CONFIG_SPL_SYSCON=y > -CONFIG_CLK=y > -CONFIG_SPL_CLK=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > CONFIG_MISC=y > @@ -76,20 +66,14 @@ CONFIG_PHY_MICREL_KSZ90X1=y > CONFIG_DM_ETH=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > -CONFIG_PINCTRL=y > -CONFIG_SPL_PINCTRL=y > -CONFIG_DM_PMIC=y > CONFIG_DM_PMIC_FAN53555=y > CONFIG_PMIC_RK8XX=y > CONFIG_SPL_DM_REGULATOR=y > CONFIG_REGULATOR_PWM=y > -CONFIG_DM_REGULATOR_FIXED=y > CONFIG_SPL_DM_REGULATOR_FIXED=y > CONFIG_DM_REGULATOR_GPIO=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > -CONFIG_RAM=y > -CONFIG_SPL_RAM=y > CONFIG_DM_RTC=y > CONFIG_RTC_ISL1208=y > CONFIG_DEBUG_UART_SHIFT=2 > diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig > index 48d14ef7d8..1958b7e190 100644 > --- a/configs/rock960-rk3399_defconfig > +++ b/configs/rock960-rk3399_defconfig > @@ -11,16 +11,12 @@ CONFIG_SPL_STACK_R_ADDR=0x80000 > CONFIG_DEBUG_UART_BASE=0xFF1A0000 > CONFIG_DEBUG_UART_CLOCK=24000000 > CONFIG_DEBUG_UART=y > -CONFIG_FIT=y > -CONFIG_SPL_LOAD_FIT=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock960.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > CONFIG_SPL_TEXT_BASE=0xff8c2000 > CONFIG_SPL_STACK_R=y > CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000 > -CONFIG_SPL_ATF=y > -CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y > CONFIG_SYS_PROMPT="rock960 => " > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_GPT=y > @@ -33,12 +29,6 @@ CONFIG_SPL_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock960" > CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > -CONFIG_REGMAP=y > -CONFIG_SPL_REGMAP=y > -CONFIG_SYSCON=y > -CONFIG_SPL_SYSCON=y > -CONFIG_CLK=y > -CONFIG_SPL_CLK=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > CONFIG_MMC_DW=y > @@ -46,16 +36,10 @@ CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_MMC_SDHCI=y > CONFIG_MMC_SDHCI_ROCKCHIP=y > CONFIG_SF_DEFAULT_SPEED=20000000 > -CONFIG_PINCTRL=y > -CONFIG_SPL_PINCTRL=y > -CONFIG_DM_PMIC=y > CONFIG_PMIC_RK8XX=y > CONFIG_REGULATOR_PWM=y > -CONFIG_DM_REGULATOR_FIXED=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > -CONFIG_RAM=y > -CONFIG_SPL_RAM=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYSRESET=y _______________________________________________ Linux-rockchip mailing list Linux-rockchip@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/linux-rockchip
