| Message ID | 1465795839-16632-3-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | aa15038cdf4a00898bac05be8af63e6d1006aa1f |
| Delegated to: | Simon Glass |
| Headers | show |
On 12 June 2016 at 23:30, Simon Glass <sjg@chromium.org> wrote: > Rockchip uses driver model for all subsystems. Specify this in the arm > Kconfig rather than as defaults in the Rockchip Kconfig. This means that > boards cannot turn these options off, which seems correct. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > arch/arm/Kconfig | 10 ++++++++++ > arch/arm/mach-rockchip/Kconfig | 27 --------------------------- > 2 files changed, 10 insertions(+), 27 deletions(-) Applied to u-boot-dm/next.
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e75c4c0..85b4d31 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -823,7 +823,17 @@ config ARCH_ROCKCHIP select SPL select OF_CONTROL select CPU_V7 + select BLK select DM + select SPL_DM + select SYS_MALLOC_F + select SPL_SYS_MALLOC_SIMPLE + select DM_GPIO + select DM_I2C + select DM_MMC + select DM_SERIAL + select DM_SPI + select DM_SPI_FLASH config TARGET_THUNDERX_88XX bool "Support ThunderX 88xx" diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 2a8afac..c49cc19 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -17,33 +17,6 @@ config ROCKCHIP_RK3036 and video codec support. Peripherals include Gigabit Ethernet, USB2 host and OTG, SDIO, I2S, UART, SPI, I2C and PWMs. -config SYS_MALLOC_F - default y - -config SPL_SYS_MALLOC_SIMPLE - default y - -config SPL_DM - default y - -config DM_SERIAL - default y - -config DM_SPI - default y - -config DM_SPI_FLASH - default y - -config DM_I2C - default y - -config DM_GPIO - default y - -config BLK - default y - source "arch/arm/mach-rockchip/rk3288/Kconfig" source "arch/arm/mach-rockchip/rk3036/Kconfig" endif
Rockchip uses driver model for all subsystems. Specify this in the arm Kconfig rather than as defaults in the Rockchip Kconfig. This means that boards cannot turn these options off, which seems correct. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/arm/Kconfig | 10 ++++++++++ arch/arm/mach-rockchip/Kconfig | 27 --------------------------- 2 files changed, 10 insertions(+), 27 deletions(-)