[U-Boot] [PATCH 0/12] dm: use "select DM"
01/12 fixes SOCFPGA boards. (Because of a wrong dependency, SOCFPGA boards cannot enable CONFIG_DM_SPI_FLASH.
The other patches move CONFIG options from defcofig to Kconfig and use "select".
02 thru 12 do not change the output binaries at all. I compared MD5SUM of all the boards and confirmed this.
Masahiro Yamada (12): dm: spi_flash: fix wrong dependency dm: select CONFIG_DM* options ARM: UniPhier: use "select" instead of default value in defconfig ARM: zynq: use "select" instead of default value in defconfig ARM: rmobile: use "select" instead of default value in defconfig ARM: snapper9260: use "select" instead of default value in defconfig ARM: mx6: use "select" instead of default value in defconfig ARM: socfpga: use "select" instead of default value in defconfig ARM: bav335x: use "select" instead of default value in defconfig ARM: stv0991: use "select" instead of default value in defconfig ARM: cm_fx6: use "select" instead of default value in defconfig powerpc: ids8313: use "select" instead of default value in defconfig
arch/Kconfig | 9 +++++ arch/arm/Kconfig | 58 ++++++++++++++++++++++++++++++++ arch/arm/cpu/armv7/exynos/Kconfig | 15 --------- arch/arm/cpu/armv7/omap3/Kconfig | 27 ++++++++++----- arch/arm/cpu/armv7/rmobile/Kconfig | 12 +++++++ arch/arm/mach-at91/Kconfig | 3 ++ arch/arm/mach-bcm283x/Kconfig | 9 ----- arch/arm/mach-tegra/Kconfig | 18 ---------- arch/powerpc/cpu/mpc83xx/Kconfig | 1 + arch/powerpc/cpu/ppc4xx/Kconfig | 2 ++ arch/sandbox/Kconfig | 18 ---------- arch/x86/Kconfig | 9 ----- board/amcc/canyonlands/Kconfig | 6 ---- board/compulab/cm_t335/Kconfig | 9 ----- board/gumstix/pepper/Kconfig | 9 ----- board/isee/igep0033/Kconfig | 9 ----- board/phytec/pcm051/Kconfig | 9 ----- board/samsung/goni/Kconfig | 9 ----- board/samsung/smdkc100/Kconfig | 9 ----- board/silica/pengwyn/Kconfig | 9 ----- board/ti/am335x/Kconfig | 9 ----- configs/alt_defconfig | 2 -- configs/am335x_boneblack_vboot_defconfig | 1 - configs/am3517_crane_defconfig | 3 -- configs/am3517_evm_defconfig | 3 -- configs/birdland_bav335a_defconfig | 3 -- configs/birdland_bav335b_defconfig | 3 -- configs/cm_fx6_defconfig | 3 -- configs/cm_t3517_defconfig | 3 -- configs/cm_t35_defconfig | 3 -- configs/devkit8000_defconfig | 3 -- configs/dig297_defconfig | 3 -- configs/eco5pk_defconfig | 3 -- configs/gose_defconfig | 2 -- configs/ids8313_defconfig | 1 - configs/koelsch_defconfig | 2 -- configs/lager_defconfig | 2 -- configs/mcx_defconfig | 3 -- configs/mt_ventoux_defconfig | 3 -- configs/mx6dlsabreauto_defconfig | 2 -- configs/mx6dlsabresd_defconfig | 2 -- configs/mx6qsabreauto_defconfig | 2 -- configs/mx6qsabresd_defconfig | 2 -- configs/mx6sabresd_spl_defconfig | 2 -- configs/mx6sxsabresd_defconfig | 2 -- configs/mx6sxsabresd_spl_defconfig | 2 -- configs/nokia_rx51_defconfig | 3 -- configs/omap3_beagle_defconfig | 3 -- configs/omap3_evm_defconfig | 3 -- configs/omap3_evm_quick_mmc_defconfig | 3 -- configs/omap3_evm_quick_nand_defconfig | 3 -- configs/omap3_ha_defconfig | 3 -- configs/omap3_logic_defconfig | 3 -- configs/omap3_mvblx_defconfig | 3 -- configs/omap3_pandora_defconfig | 3 -- configs/omap3_sdp3430_defconfig | 3 -- configs/ph1_ld4_defconfig | 3 -- configs/ph1_pro4_defconfig | 3 -- configs/ph1_sld8_defconfig | 3 -- configs/porter_defconfig | 2 -- configs/sandbox_defconfig | 1 - configs/silk_defconfig | 2 -- configs/snapper9260_defconfig | 3 -- configs/snapper9g20_defconfig | 3 -- configs/socfpga_arria5_defconfig | 3 -- configs/socfpga_cyclone5_defconfig | 3 -- configs/socfpga_socrates_defconfig | 3 -- configs/stv0991_defconfig | 2 -- configs/tao3530_defconfig | 3 -- configs/tricorder_defconfig | 3 -- configs/tricorder_flash_defconfig | 3 -- configs/twister_defconfig | 3 -- configs/zynq_microzed_defconfig | 1 - configs/zynq_zc70x_defconfig | 1 - configs/zynq_zc770_xm010_defconfig | 1 - configs/zynq_zc770_xm012_defconfig | 1 - configs/zynq_zc770_xm013_defconfig | 1 - configs/zynq_zed_defconfig | 1 - configs/zynq_zybo_defconfig | 1 - drivers/mtd/spi/Kconfig | 2 +- 80 files changed, 104 insertions(+), 297 deletions(-)
CONFIG_SPI does not exist in Kconfig in the first place, so the dependency "depends on DM && SPI" is never met, i.e., DM_SPI_FLASH can never be enabled (unless you ignore the dependency in an illegal way. See below.)
Actually, some defconfigs such as socfpga_*_defconfig define CONFIG_DM_SPI_FLASH=y, but it never appears in the .config file because of this wrong dependency.
On the other hand, all the Tegra boards enable DM_SPI_FLASH because
config DM_SPI_FLASH default y
silently ignores the dependency. Unfortunately, this style of CONFIG definition is abused everywhere in U-Boot, so we easily miss such a wrong dependency.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
drivers/mtd/spi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig index 2dc46b4..fd2d7ac 100644 --- a/drivers/mtd/spi/Kconfig +++ b/drivers/mtd/spi/Kconfig @@ -1,6 +1,6 @@ config DM_SPI_FLASH bool "Enable Driver Model for SPI flash" - depends on DM && SPI + depends on DM && DM_SPI help Enable driver model for SPI flash. This SPI flash interface (spi_flash_probe(), spi_flash_write(), etc.) is then
On 30 March 2015 at 21:47, Masahiro Yamada yamada.masahiro@socionext.com wrote:
CONFIG_SPI does not exist in Kconfig in the first place, so the dependency "depends on DM && SPI" is never met, i.e., DM_SPI_FLASH can never be enabled (unless you ignore the dependency in an illegal way. See below.)
Actually, some defconfigs such as socfpga_*_defconfig define CONFIG_DM_SPI_FLASH=y, but it never appears in the .config file because of this wrong dependency.
On the other hand, all the Tegra boards enable DM_SPI_FLASH because
config DM_SPI_FLASH default y
silently ignores the dependency. Unfortunately, this style of CONFIG definition is abused everywhere in U-Boot, so we easily miss such a wrong dependency.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
drivers/mtd/spi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig index 2dc46b4..fd2d7ac 100644 --- a/drivers/mtd/spi/Kconfig +++ b/drivers/mtd/spi/Kconfig @@ -1,6 +1,6 @@ config DM_SPI_FLASH bool "Enable Driver Model for SPI flash"
depends on DM && SPI
depends on DM && DM_SPI help Enable driver model for SPI flash. This SPI flash interface (spi_flash_probe(), spi_flash_write(), etc.) is then-- 1.9.1
Acked-by: Simon Glass sjg@chromium.org
On 7 April 2015 at 20:50, Simon Glass sjg@chromium.org wrote:
On 30 March 2015 at 21:47, Masahiro Yamada yamada.masahiro@socionext.com wrote:
CONFIG_SPI does not exist in Kconfig in the first place, so the dependency "depends on DM && SPI" is never met, i.e., DM_SPI_FLASH can never be enabled (unless you ignore the dependency in an illegal way. See below.)
Actually, some defconfigs such as socfpga_*_defconfig define CONFIG_DM_SPI_FLASH=y, but it never appears in the .config file because of this wrong dependency.
On the other hand, all the Tegra boards enable DM_SPI_FLASH because
config DM_SPI_FLASH default y
silently ignores the dependency. Unfortunately, this style of CONFIG definition is abused everywhere in U-Boot, so we easily miss such a wrong dependency.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
drivers/mtd/spi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig index 2dc46b4..fd2d7ac 100644 --- a/drivers/mtd/spi/Kconfig +++ b/drivers/mtd/spi/Kconfig @@ -1,6 +1,6 @@ config DM_SPI_FLASH bool "Enable Driver Model for SPI flash"
depends on DM && SPI
depends on DM && DM_SPI help Enable driver model for SPI flash. This SPI flash interface (spi_flash_probe(), spi_flash_write(), etc.) is then-- 1.9.1
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm/next, thanks!
Hi Tom,
On 08.04.2015 16:01, Simon Glass wrote:
On 7 April 2015 at 20:50, Simon Glass sjg@chromium.org wrote:
On 30 March 2015 at 21:47, Masahiro Yamada yamada.masahiro@socionext.com wrote:
CONFIG_SPI does not exist in Kconfig in the first place, so the dependency "depends on DM && SPI" is never met, i.e., DM_SPI_FLASH can never be enabled (unless you ignore the dependency in an illegal way. See below.)
Actually, some defconfigs such as socfpga_*_defconfig define CONFIG_DM_SPI_FLASH=y, but it never appears in the .config file because of this wrong dependency.
On the other hand, all the Tegra boards enable DM_SPI_FLASH because
config DM_SPI_FLASH default y
silently ignores the dependency. Unfortunately, this style of CONFIG definition is abused everywhere in U-Boot, so we easily miss such a wrong dependency.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
drivers/mtd/spi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig index 2dc46b4..fd2d7ac 100644 --- a/drivers/mtd/spi/Kconfig +++ b/drivers/mtd/spi/Kconfig @@ -1,6 +1,6 @@ config DM_SPI_FLASH bool "Enable Driver Model for SPI flash"
depends on DM && SPI
depends on DM && DM_SPI help Enable driver model for SPI flash. This SPI flash interface (spi_flash_probe(), spi_flash_write(), etc.) is then-- 1.9.1
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm/next, thanks!
Do you plan to release a v2015.04.1 stable release at some time? Then please add this patch to this version. As it fixes SPI NOR flash on SoCFPGA.
Thanks, Stefan
On Wednesday, April 22, 2015 at 11:19:53 AM, Stefan Roese wrote:
Hi Tom,
On 08.04.2015 16:01, Simon Glass wrote:
On 7 April 2015 at 20:50, Simon Glass sjg@chromium.org wrote:
On 30 March 2015 at 21:47, Masahiro Yamada
yamada.masahiro@socionext.com wrote:
CONFIG_SPI does not exist in Kconfig in the first place, so the dependency "depends on DM && SPI" is never met, i.e., DM_SPI_FLASH can never be enabled (unless you ignore the dependency in an illegal way. See below.)
Actually, some defconfigs such as socfpga_*_defconfig define CONFIG_DM_SPI_FLASH=y, but it never appears in the .config file because of this wrong dependency.
On the other hand, all the Tegra boards enable DM_SPI_FLASH because
config DM_SPI_FLASH
default ysilently ignores the dependency. Unfortunately, this style of CONFIG definition is abused everywhere in U-Boot, so we easily miss such a wrong dependency.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
drivers/mtd/spi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig index 2dc46b4..fd2d7ac 100644 --- a/drivers/mtd/spi/Kconfig +++ b/drivers/mtd/spi/Kconfig @@ -1,6 +1,6 @@
config DM_SPI_FLASH
bool "Enable Driver Model for SPI flash"
depends on DM && SPI
depends on DM && DM_SPI help Enable driver model for SPI flash. This SPI flash interface (spi_flash_probe(), spi_flash_write(), etc.) is then-- 1.9.1
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm/next, thanks!
Do you plan to release a v2015.04.1 stable release at some time? Then please add this patch to this version. As it fixes SPI NOR flash on SoCFPGA.
Maybe we should consider u-boot-stable ...
Best regards, Marek Vasut
Hi,
On 22 April 2015 at 04:07, Marek Vasut marex@denx.de wrote:
On Wednesday, April 22, 2015 at 11:19:53 AM, Stefan Roese wrote:
Hi Tom,
On 08.04.2015 16:01, Simon Glass wrote:
On 7 April 2015 at 20:50, Simon Glass sjg@chromium.org wrote:
On 30 March 2015 at 21:47, Masahiro Yamada
yamada.masahiro@socionext.com wrote:
CONFIG_SPI does not exist in Kconfig in the first place, so the dependency "depends on DM && SPI" is never met, i.e., DM_SPI_FLASH can never be enabled (unless you ignore the dependency in an illegal way. See below.)
Actually, some defconfigs such as socfpga_*_defconfig define CONFIG_DM_SPI_FLASH=y, but it never appears in the .config file because of this wrong dependency.
On the other hand, all the Tegra boards enable DM_SPI_FLASH because
config DM_SPI_FLASH
default ysilently ignores the dependency. Unfortunately, this style of CONFIG definition is abused everywhere in U-Boot, so we easily miss such a wrong dependency.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
drivers/mtd/spi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig index 2dc46b4..fd2d7ac 100644 --- a/drivers/mtd/spi/Kconfig +++ b/drivers/mtd/spi/Kconfig @@ -1,6 +1,6 @@
config DM_SPI_FLASH
bool "Enable Driver Model for SPI flash"
depends on DM && SPI
depends on DM && DM_SPI help Enable driver model for SPI flash. This SPI flash interface (spi_flash_probe(), spi_flash_write(), etc.) is then-- 1.9.1
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm/next, thanks!
Do you plan to release a v2015.04.1 stable release at some time? Then please add this patch to this version. As it fixes SPI NOR flash on SoCFPGA.
Maybe we should consider u-boot-stable ...
In this case, just mentioning that it was needed for the release would have helped. It's not always obvious whether patches are important fixes, particularly if they depend on other things.
Regards, Simon
Hi Simon,
On 22.04.2015 16:39, Simon Glass wrote:
Applied to u-boot-dm/next, thanks!
Do you plan to release a v2015.04.1 stable release at some time? Then please add this patch to this version. As it fixes SPI NOR flash on SoCFPGA.
Maybe we should consider u-boot-stable ...
In this case, just mentioning that it was needed for the release would have helped. It's not always obvious whether patches are important fixes, particularly if they depend on other things.
I really noticed it just now. Sorry for not testing earlier.
Thanks, Stefan
Hi Stefan,
On 22 April 2015 at 08:42, Stefan Roese sr@denx.de wrote:
Hi Simon,
On 22.04.2015 16:39, Simon Glass wrote:
Applied to u-boot-dm/next, thanks!
Do you plan to release a v2015.04.1 stable release at some time? Then please add this patch to this version. As it fixes SPI NOR flash on SoCFPGA.
Maybe we should consider u-boot-stable ...
In this case, just mentioning that it was needed for the release would have helped. It's not always obvious whether patches are important fixes, particularly if they depend on other things.
I really noticed it just now. Sorry for not testing earlier.
Sorry, that's wasn't a complaint, just some sort of explanation :-)
Regards, Simon
As mentioned in the previous commit, adding default values in each Kconfig causes problems because it does not co-exist with the "depends on" syntax. (Please note this is not a bug of Kconfig.) We should not do so unless we have a special reason. Actually, for CONFIG_DM*, we have no good reason to do so.
Generally, CONFIG_DM is not a user-configurable option. Once we convert a driver into Driver Model, the board only works with Driver Model, i.e. CONFIG_DM must be always enabled for that board. So, using "select DM" is more suitable rather than allowing users to modify it. Another good thing is, Kconfig warns unmet dependencies for "select" syntax, so we easily notice bugs.
Actually, CONFIG_DM and other related options have been added without consistency: some into arch/*/Kconfig, some into board/*/Kconfig, and some into configs/*_defconfig.
This commit prefers "select" and cleans up the following issues.
[1] Never use "CONFIG_DM=n" in defconfig files
It is really rare to add "CONFIG_FOO=n" to disable CONFIG options. It is more common to use "# CONFIG_FOO is not set". But here, we do not even have to do it. Less than half of OMAP3 boards have been converted to Driver Model. Adding the default values to arch/arm/cpu/armv7/omap3/Kconfig is weird. Instead, add "select DM" only to appropriate boards, which eventually eliminates "CONFIG_DM=n", etc.
[2] Delete redundant CONFIGs
Sandbox sets CONFIG_DM in arch/sandbox/Kconfig and defines it again in configs/sandbox_defconfig. Likewise, OMAP3 sets CONFIG_DM arch/arm/cpu/armv7/omap3/Kconfig and defines it also in omap3_beagle_defconfig and devkit8000_defconfig.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/Kconfig | 9 ++++++++ arch/arm/Kconfig | 35 ++++++++++++++++++++++++++++++++ arch/arm/cpu/armv7/exynos/Kconfig | 15 -------------- arch/arm/cpu/armv7/omap3/Kconfig | 27 ++++++++++++++++-------- arch/arm/mach-bcm283x/Kconfig | 9 -------- arch/arm/mach-tegra/Kconfig | 18 ---------------- arch/powerpc/cpu/ppc4xx/Kconfig | 2 ++ arch/sandbox/Kconfig | 18 ---------------- arch/x86/Kconfig | 9 -------- board/amcc/canyonlands/Kconfig | 6 ------ board/compulab/cm_t335/Kconfig | 9 -------- board/gumstix/pepper/Kconfig | 9 -------- board/isee/igep0033/Kconfig | 9 -------- board/phytec/pcm051/Kconfig | 9 -------- board/samsung/goni/Kconfig | 9 -------- board/samsung/smdkc100/Kconfig | 9 -------- board/silica/pengwyn/Kconfig | 9 -------- board/ti/am335x/Kconfig | 9 -------- configs/am335x_boneblack_vboot_defconfig | 1 - configs/am3517_crane_defconfig | 3 --- configs/am3517_evm_defconfig | 3 --- configs/cm_t3517_defconfig | 3 --- configs/cm_t35_defconfig | 3 --- configs/devkit8000_defconfig | 3 --- configs/dig297_defconfig | 3 --- configs/eco5pk_defconfig | 3 --- configs/mcx_defconfig | 3 --- configs/mt_ventoux_defconfig | 3 --- configs/nokia_rx51_defconfig | 3 --- configs/omap3_beagle_defconfig | 3 --- configs/omap3_evm_defconfig | 3 --- configs/omap3_evm_quick_mmc_defconfig | 3 --- configs/omap3_evm_quick_nand_defconfig | 3 --- configs/omap3_ha_defconfig | 3 --- configs/omap3_logic_defconfig | 3 --- configs/omap3_mvblx_defconfig | 3 --- configs/omap3_pandora_defconfig | 3 --- configs/omap3_sdp3430_defconfig | 3 --- configs/sandbox_defconfig | 1 - configs/tao3530_defconfig | 3 --- configs/tricorder_defconfig | 3 --- configs/tricorder_flash_defconfig | 3 --- configs/twister_defconfig | 3 --- 43 files changed, 64 insertions(+), 227 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig index ca617e7..6d897a2 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -69,6 +69,12 @@ config SANDBOX select HAVE_GENERIC_BOARD select SYS_GENERIC_BOARD select SUPPORT_OF_CONTROL + select DM + select DM_SPI_FLASH + select DM_SERIAL + select DM_I2C + select DM_SPI + select DM_GPIO
config SH bool "SuperH architecture" @@ -83,6 +89,9 @@ config X86 select HAVE_GENERIC_BOARD select SYS_GENERIC_BOARD select SUPPORT_OF_CONTROL + select DM + select DM_SERIAL + select DM_GPIO
endchoice
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9292e98..3a86df0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -288,6 +288,9 @@ config TARGET_MX35PDK
config ARCH_BCM283X bool "Broadcom BCM283X family" + select DM + select DM_SERIAL + select DM_GPIO
config TARGET_INTEGRATORAP_CM946ES bool "Support integratorap_cm946es" @@ -325,21 +328,33 @@ config TARGET_CM_T335 bool "Support cm_t335" select CPU_V7 select SUPPORT_SPL + select DM + select DM_SERIAL + select DM_GPIO
config TARGET_PEPPER bool "Support pepper" select CPU_V7 select SUPPORT_SPL + select DM + select DM_SERIAL + select DM_GPIO
config TARGET_AM335X_IGEP0033 bool "Support am335x_igep0033" select CPU_V7 select SUPPORT_SPL + select DM + select DM_SERIAL + select DM_GPIO
config TARGET_PCM051 bool "Support pcm051" select CPU_V7 select SUPPORT_SPL + select DM + select DM_SERIAL + select DM_GPIO
config TARGET_DRACO bool "Support draco" @@ -365,11 +380,17 @@ config TARGET_PENGWYN bool "Support pengwyn" select CPU_V7 select SUPPORT_SPL + select DM + select DM_SERIAL + select DM_GPIO
config TARGET_AM335X_EVM bool "Support am335x_evm" select CPU_V7 select SUPPORT_SPL + select DM + select DM_SERIAL + select DM_GPIO
config TARGET_AM43XX_EVM bool "Support am43xx_evm" @@ -414,10 +435,18 @@ config TARGET_BCMNSP config ARCH_EXYNOS bool "Samsung EXYNOS" select CPU_V7 + select DM + select DM_SPI_FLASH + select DM_SERIAL + select DM_SPI + select DM_GPIO
config ARCH_S5PC1XX bool "Samsung S5PC1XX" select CPU_V7 + select DM + select DM_SERIAL + select DM_GPIO
config ARCH_HIGHBANK bool "Calxeda Highbank" @@ -619,6 +648,12 @@ config TEGRA select SPL select OF_CONTROL select CPU_V7 + select DM + select DM_SPI_FLASH + select DM_SERIAL + select DM_I2C + select DM_SPI + select DM_GPIO
config TARGET_VEXPRESS64_AEMV8A bool "Support vexpress_aemv8a" diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig index bd7540a..053235a 100644 --- a/arch/arm/cpu/armv7/exynos/Kconfig +++ b/arch/arm/cpu/armv7/exynos/Kconfig @@ -65,21 +65,6 @@ endchoice config SYS_SOC default "exynos"
-config DM - default y - -config DM_SERIAL - default y - -config DM_SPI - default y - -config DM_SPI_FLASH - default y - -config DM_GPIO - default y - source "board/samsung/smdkv310/Kconfig" source "board/samsung/trats/Kconfig" source "board/samsung/universal_c210/Kconfig" diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig index 1f96498..cc82c50 100644 --- a/arch/arm/cpu/armv7/omap3/Kconfig +++ b/arch/arm/cpu/armv7/omap3/Kconfig @@ -17,6 +17,9 @@ config TARGET_OMAP3_SDP3430 config TARGET_OMAP3_BEAGLE bool "TI OMAP3 BeagleBoard" select SUPPORT_SPL + select DM + select DM_SERIAL + select DM_GPIO
config TARGET_CM_T35 bool "CompuLab CM-T3530 and CM-T3730 boards" @@ -28,6 +31,9 @@ config TARGET_CM_T3517 config TARGET_DEVKIT8000 bool "TimLL OMAP3 Devkit8000" select SUPPORT_SPL + select DM + select DM_SERIAL + select DM_GPIO
config TARGET_OMAP3_EVM bool "TI OMAP3 EVM" @@ -44,13 +50,22 @@ config TARGET_OMAP3_EVM_QUICK_NAND config TARGET_OMAP3_IGEP00X0 bool "IGEP" select SUPPORT_SPL + select DM + select DM_SERIAL + select DM_GPIO
config TARGET_OMAP3_OVERO bool "OMAP35xx Gumstix Overo" select SUPPORT_SPL + select DM + select DM_SERIAL + select DM_GPIO
config TARGET_OMAP3_ZOOM1 bool "TI Zoom1" + select DM + select DM_SERIAL + select DM_GPIO
config TARGET_AM3517_CRANE bool "am3517_crane" @@ -94,18 +109,12 @@ config TARGET_TWISTER config TARGET_OMAP3_CAIRO bool "QUIPOS CAIRO" select SUPPORT_SPL + select DM + select DM_SERIAL + select DM_GPIO
endchoice
-config DM - default y - -config DM_GPIO - default y if DM - -config DM_SERIAL - default y if DM - config SYS_SOC default "omap3"
diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig index b43f2d9..d40f505 100644 --- a/arch/arm/mach-bcm283x/Kconfig +++ b/arch/arm/mach-bcm283x/Kconfig @@ -14,15 +14,6 @@ config TARGET_RPI_2
endchoice
-config DM - default y - -config DM_SERIAL - default y - -config DM_GPIO - default y - config SYS_BOARD default "rpi" if TARGET_RPI default "rpi_2" if TARGET_RPI_2 diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index fce1c1d..8bab594 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -23,27 +23,9 @@ config SYS_MALLOC_F_LEN config USE_PRIVATE_LIBGCC default y
-config DM - 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 - source "arch/arm/mach-tegra/tegra20/Kconfig" source "arch/arm/mach-tegra/tegra30/Kconfig" source "arch/arm/mach-tegra/tegra114/Kconfig" diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index 9e52d3f..89cb3e9 100644 --- a/arch/powerpc/cpu/ppc4xx/Kconfig +++ b/arch/powerpc/cpu/ppc4xx/Kconfig @@ -43,6 +43,8 @@ config TARGET_BUBINGA
config TARGET_CANYONLANDS bool "Support canyonlands" + select DM + select DM_SERIAL
config TARGET_EBONY bool "Support ebony" diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig index 2098b9c..ffe553e 100644 --- a/arch/sandbox/Kconfig +++ b/arch/sandbox/Kconfig @@ -10,27 +10,9 @@ config SYS_BOARD config SYS_CONFIG_NAME default "sandbox"
-config DM - default y - -config DM_GPIO - default y - -config DM_SERIAL - default y - config DM_CROS_EC default y
-config DM_SPI - default y - -config DM_SPI_FLASH - default y - -config DM_I2C - default y - config DM_TEST default y
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index da27115..26c91dc 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -67,15 +67,6 @@ config TARGET_GALILEO
endchoice
-config DM - default y - -config DM_GPIO - default y - -config DM_SERIAL - default y - config SYS_MALLOC_F_LEN default 0x800
diff --git a/board/amcc/canyonlands/Kconfig b/board/amcc/canyonlands/Kconfig index 46efa7a..ef66ad4 100644 --- a/board/amcc/canyonlands/Kconfig +++ b/board/amcc/canyonlands/Kconfig @@ -33,10 +33,4 @@ config DISPLAY_BOARDINFO bool default y
-config DM - default y - -config DM_SERIAL - default y - endif diff --git a/board/compulab/cm_t335/Kconfig b/board/compulab/cm_t335/Kconfig index 3a8f304..683efde 100644 --- a/board/compulab/cm_t335/Kconfig +++ b/board/compulab/cm_t335/Kconfig @@ -12,13 +12,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "cm_t335"
-config DM - default y - -config DM_GPIO - default y - -config DM_SERIAL - default y - endif diff --git a/board/gumstix/pepper/Kconfig b/board/gumstix/pepper/Kconfig index 750db85..6f94612 100644 --- a/board/gumstix/pepper/Kconfig +++ b/board/gumstix/pepper/Kconfig @@ -12,13 +12,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "pepper"
-config DM - default y - -config DM_GPIO - default y - -config DM_SERIAL - default y - endif diff --git a/board/isee/igep0033/Kconfig b/board/isee/igep0033/Kconfig index 9a8421e..e989e4b 100644 --- a/board/isee/igep0033/Kconfig +++ b/board/isee/igep0033/Kconfig @@ -12,13 +12,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "am335x_igep0033"
-config DM - default y - -config DM_GPIO - default y - -config DM_SERIAL - default y - endif diff --git a/board/phytec/pcm051/Kconfig b/board/phytec/pcm051/Kconfig index bb98715..2cc0d88 100644 --- a/board/phytec/pcm051/Kconfig +++ b/board/phytec/pcm051/Kconfig @@ -12,13 +12,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "pcm051"
-config DM - default y - -config DM_GPIO - default y - -config DM_SERIAL - default y - endif diff --git a/board/samsung/goni/Kconfig b/board/samsung/goni/Kconfig index 006e864..cbbf5a9 100644 --- a/board/samsung/goni/Kconfig +++ b/board/samsung/goni/Kconfig @@ -12,13 +12,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "s5p_goni"
-config DM - default y - -config DM_GPIO - default y - -config DM_SERIAL - default y - endif diff --git a/board/samsung/smdkc100/Kconfig b/board/samsung/smdkc100/Kconfig index ea87166..d2157b4 100644 --- a/board/samsung/smdkc100/Kconfig +++ b/board/samsung/smdkc100/Kconfig @@ -12,13 +12,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "smdkc100"
-config DM - default y - -config DM_GPIO - default y - -config DM_SERIAL - default y - endif diff --git a/board/silica/pengwyn/Kconfig b/board/silica/pengwyn/Kconfig index 2e9a2b3..f2e1098 100644 --- a/board/silica/pengwyn/Kconfig +++ b/board/silica/pengwyn/Kconfig @@ -12,13 +12,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "pengwyn"
-config DM - default y - -config DM_GPIO - default y - -config DM_SERIAL - default y - endif diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig index 7cb006f..49b73ab 100644 --- a/board/ti/am335x/Kconfig +++ b/board/ti/am335x/Kconfig @@ -38,13 +38,4 @@ config NOR_BOOT as the ROM only partially sets up pinmux. We also default to using NOR for environment.
-config DM - default y - -config DM_GPIO - default y if DM - -config DM_SERIAL - default y if DM - endif diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 0e39c7d..e4ffe5f 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -9,4 +9,3 @@ CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y -CONFIG_DM=y diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig index 72cc2d7..cd16724 100644 --- a/configs/am3517_crane_defconfig +++ b/configs/am3517_crane_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_AM3517_CRANE=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 6d6b0d2..daf1ae4 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_AM3517_EVM=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig index 5c40b90..2d05ffb 100644 --- a/configs/cm_t3517_defconfig +++ b/configs/cm_t3517_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=n CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_CM_T3517=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 4a99263..63a85b4 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_CM_T35=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 9756461..84a1a25 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_DEVKIT8000=y -CONFIG_DM=y -CONFIG_DM_SERIAL=y -CONFIG_DM_GPIO=y diff --git a/configs/dig297_defconfig b/configs/dig297_defconfig index 0d18290..95bc353 100644 --- a/configs/dig297_defconfig +++ b/configs/dig297_defconfig @@ -1,6 +1,3 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_DIG297=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index fbe6335..8587c51 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_ECO5PK=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig index 2f61858..4abf34d 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_MCX=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index 5b1da8c..fd4f649 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_MT_VENTOUX=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 20a51e1..e03f586 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -1,6 +1,3 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_NOKIA_RX51=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 5106821..2a3cc66 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -3,6 +3,3 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_BEAGLE=y -CONFIG_DM=y -CONFIG_DM_GPIO=y -CONFIG_DM_SERIAL=y diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index fb4a800..91c290b 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_EVM=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/omap3_evm_quick_mmc_defconfig b/configs/omap3_evm_quick_mmc_defconfig index d4594cb..12005bf 100644 --- a/configs/omap3_evm_quick_mmc_defconfig +++ b/configs/omap3_evm_quick_mmc_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_EVM_QUICK_MMC=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/omap3_evm_quick_nand_defconfig b/configs/omap3_evm_quick_nand_defconfig index 1a78a6e..5cc9512 100644 --- a/configs/omap3_evm_quick_nand_defconfig +++ b/configs/omap3_evm_quick_nand_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_EVM_QUICK_NAND=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig index 344eca5..250890b 100644 --- a/configs/omap3_ha_defconfig +++ b/configs/omap3_ha_defconfig @@ -3,6 +3,3 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_BOARD_OMAP3_HA" CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_TAO3530=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 790ccba..5f2c063 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -1,6 +1,3 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_LOGIC=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/omap3_mvblx_defconfig b/configs/omap3_mvblx_defconfig index b75f513..fb6edc2 100644 --- a/configs/omap3_mvblx_defconfig +++ b/configs/omap3_mvblx_defconfig @@ -1,6 +1,3 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_MVBLX=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index dd0f17c..bf28537 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -1,6 +1,3 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_PANDORA=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/omap3_sdp3430_defconfig b/configs/omap3_sdp3430_defconfig index b3a8745..1172c2a 100644 --- a/configs/omap3_sdp3430_defconfig +++ b/configs/omap3_sdp3430_defconfig @@ -1,6 +1,3 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_SDP3430=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index a216039..66c7d8a 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -3,7 +3,6 @@ CONFIG_OF_HOSTFILE=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y -CONFIG_DM=y CONFIG_DEFAULT_DEVICE_TREE="sandbox" CONFIG_CROS_EC=y CONFIG_DM_CROS_EC=y diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig index 077dc89..86ba4cd 100644 --- a/configs/tao3530_defconfig +++ b/configs/tao3530_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_TAO3530=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig index 745ebc8..e307c65 100644 --- a/configs/tricorder_defconfig +++ b/configs/tricorder_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_TRICORDER=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig index cc93566..de6c16e 100644 --- a/configs/tricorder_flash_defconfig +++ b/configs/tricorder_flash_defconfig @@ -3,6 +3,3 @@ CONFIG_SYS_EXTRA_OPTIONS="FLASHCARD" CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_TRICORDER=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n diff --git a/configs/twister_defconfig b/configs/twister_defconfig index 5e7250a..344369d 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_TWISTER=y -CONFIG_DM=n -CONFIG_DM_SERIAL=n -CONFIG_DM_GPIO=n
On 30 March 2015 at 21:47, Masahiro Yamada yamada.masahiro@socionext.com wrote:
As mentioned in the previous commit, adding default values in each Kconfig causes problems because it does not co-exist with the "depends on" syntax. (Please note this is not a bug of Kconfig.) We should not do so unless we have a special reason. Actually, for CONFIG_DM*, we have no good reason to do so.
Generally, CONFIG_DM is not a user-configurable option. Once we convert a driver into Driver Model, the board only works with Driver Model, i.e. CONFIG_DM must be always enabled for that board. So, using "select DM" is more suitable rather than allowing users to modify it. Another good thing is, Kconfig warns unmet dependencies for "select" syntax, so we easily notice bugs.
Actually, CONFIG_DM and other related options have been added without consistency: some into arch/*/Kconfig, some into board/*/Kconfig, and some into configs/*_defconfig.
This commit prefers "select" and cleans up the following issues.
[1] Never use "CONFIG_DM=n" in defconfig files
It is really rare to add "CONFIG_FOO=n" to disable CONFIG options. It is more common to use "# CONFIG_FOO is not set". But here, we do not even have to do it. Less than half of OMAP3 boards have been converted to Driver Model. Adding the default values to arch/arm/cpu/armv7/omap3/Kconfig is weird. Instead, add "select DM" only to appropriate boards, which eventually eliminates "CONFIG_DM=n", etc.
[2] Delete redundant CONFIGs
Sandbox sets CONFIG_DM in arch/sandbox/Kconfig and defines it again in configs/sandbox_defconfig. Likewise, OMAP3 sets CONFIG_DM arch/arm/cpu/armv7/omap3/Kconfig and defines it also in omap3_beagle_defconfig and devkit8000_defconfig.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/Kconfig | 9 ++++++++ arch/arm/Kconfig | 35 ++++++++++++++++++++++++++++++++ arch/arm/cpu/armv7/exynos/Kconfig | 15 -------------- arch/arm/cpu/armv7/omap3/Kconfig | 27 ++++++++++++++++-------- arch/arm/mach-bcm283x/Kconfig | 9 -------- arch/arm/mach-tegra/Kconfig | 18 ---------------- arch/powerpc/cpu/ppc4xx/Kconfig | 2 ++ arch/sandbox/Kconfig | 18 ---------------- arch/x86/Kconfig | 9 -------- board/amcc/canyonlands/Kconfig | 6 ------ board/compulab/cm_t335/Kconfig | 9 -------- board/gumstix/pepper/Kconfig | 9 -------- board/isee/igep0033/Kconfig | 9 -------- board/phytec/pcm051/Kconfig | 9 -------- board/samsung/goni/Kconfig | 9 -------- board/samsung/smdkc100/Kconfig | 9 -------- board/silica/pengwyn/Kconfig | 9 -------- board/ti/am335x/Kconfig | 9 -------- configs/am335x_boneblack_vboot_defconfig | 1 - configs/am3517_crane_defconfig | 3 --- configs/am3517_evm_defconfig | 3 --- configs/cm_t3517_defconfig | 3 --- configs/cm_t35_defconfig | 3 --- configs/devkit8000_defconfig | 3 --- configs/dig297_defconfig | 3 --- configs/eco5pk_defconfig | 3 --- configs/mcx_defconfig | 3 --- configs/mt_ventoux_defconfig | 3 --- configs/nokia_rx51_defconfig | 3 --- configs/omap3_beagle_defconfig | 3 --- configs/omap3_evm_defconfig | 3 --- configs/omap3_evm_quick_mmc_defconfig | 3 --- configs/omap3_evm_quick_nand_defconfig | 3 --- configs/omap3_ha_defconfig | 3 --- configs/omap3_logic_defconfig | 3 --- configs/omap3_mvblx_defconfig | 3 --- configs/omap3_pandora_defconfig | 3 --- configs/omap3_sdp3430_defconfig | 3 --- configs/sandbox_defconfig | 1 - configs/tao3530_defconfig | 3 --- configs/tricorder_defconfig | 3 --- configs/tricorder_flash_defconfig | 3 --- configs/twister_defconfig | 3 --- 43 files changed, 64 insertions(+), 227 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
On 7 April 2015 at 20:50, Simon Glass sjg@chromium.org wrote:
On 30 March 2015 at 21:47, Masahiro Yamada yamada.masahiro@socionext.com wrote:
As mentioned in the previous commit, adding default values in each Kconfig causes problems because it does not co-exist with the "depends on" syntax. (Please note this is not a bug of Kconfig.) We should not do so unless we have a special reason. Actually, for CONFIG_DM*, we have no good reason to do so.
Generally, CONFIG_DM is not a user-configurable option. Once we convert a driver into Driver Model, the board only works with Driver Model, i.e. CONFIG_DM must be always enabled for that board. So, using "select DM" is more suitable rather than allowing users to modify it. Another good thing is, Kconfig warns unmet dependencies for "select" syntax, so we easily notice bugs.
Actually, CONFIG_DM and other related options have been added without consistency: some into arch/*/Kconfig, some into board/*/Kconfig, and some into configs/*_defconfig.
This commit prefers "select" and cleans up the following issues.
[1] Never use "CONFIG_DM=n" in defconfig files
It is really rare to add "CONFIG_FOO=n" to disable CONFIG options. It is more common to use "# CONFIG_FOO is not set". But here, we do not even have to do it. Less than half of OMAP3 boards have been converted to Driver Model. Adding the default values to arch/arm/cpu/armv7/omap3/Kconfig is weird. Instead, add "select DM" only to appropriate boards, which eventually eliminates "CONFIG_DM=n", etc.
[2] Delete redundant CONFIGs
Sandbox sets CONFIG_DM in arch/sandbox/Kconfig and defines it again in configs/sandbox_defconfig. Likewise, OMAP3 sets CONFIG_DM arch/arm/cpu/armv7/omap3/Kconfig and defines it also in omap3_beagle_defconfig and devkit8000_defconfig.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/Kconfig | 9 ++++++++ arch/arm/Kconfig | 35 ++++++++++++++++++++++++++++++++ arch/arm/cpu/armv7/exynos/Kconfig | 15 -------------- arch/arm/cpu/armv7/omap3/Kconfig | 27 ++++++++++++++++-------- arch/arm/mach-bcm283x/Kconfig | 9 -------- arch/arm/mach-tegra/Kconfig | 18 ---------------- arch/powerpc/cpu/ppc4xx/Kconfig | 2 ++ arch/sandbox/Kconfig | 18 ---------------- arch/x86/Kconfig | 9 -------- board/amcc/canyonlands/Kconfig | 6 ------ board/compulab/cm_t335/Kconfig | 9 -------- board/gumstix/pepper/Kconfig | 9 -------- board/isee/igep0033/Kconfig | 9 -------- board/phytec/pcm051/Kconfig | 9 -------- board/samsung/goni/Kconfig | 9 -------- board/samsung/smdkc100/Kconfig | 9 -------- board/silica/pengwyn/Kconfig | 9 -------- board/ti/am335x/Kconfig | 9 -------- configs/am335x_boneblack_vboot_defconfig | 1 - configs/am3517_crane_defconfig | 3 --- configs/am3517_evm_defconfig | 3 --- configs/cm_t3517_defconfig | 3 --- configs/cm_t35_defconfig | 3 --- configs/devkit8000_defconfig | 3 --- configs/dig297_defconfig | 3 --- configs/eco5pk_defconfig | 3 --- configs/mcx_defconfig | 3 --- configs/mt_ventoux_defconfig | 3 --- configs/nokia_rx51_defconfig | 3 --- configs/omap3_beagle_defconfig | 3 --- configs/omap3_evm_defconfig | 3 --- configs/omap3_evm_quick_mmc_defconfig | 3 --- configs/omap3_evm_quick_nand_defconfig | 3 --- configs/omap3_ha_defconfig | 3 --- configs/omap3_logic_defconfig | 3 --- configs/omap3_mvblx_defconfig | 3 --- configs/omap3_pandora_defconfig | 3 --- configs/omap3_sdp3430_defconfig | 3 --- configs/sandbox_defconfig | 1 - configs/tao3530_defconfig | 3 --- configs/tricorder_defconfig | 3 --- configs/tricorder_flash_defconfig | 3 --- configs/twister_defconfig | 3 --- 43 files changed, 64 insertions(+), 227 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm/next, thanks!
All the UniPhier boards have switch to Driver Model. "select DM" is better than default value in each defconfig.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/Kconfig | 3 +++ configs/ph1_ld4_defconfig | 3 --- configs/ph1_pro4_defconfig | 3 --- configs/ph1_sld8_defconfig | 3 --- 4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3a86df0..2d583c9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -748,6 +748,9 @@ config ARCH_UNIPHIER select SUPPORT_SPL select SPL select OF_CONTROL + select DM + select DM_SERIAL + select DM_I2C
endchoice
diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig index aa1805b..036e2d1 100644 --- a/configs/ph1_ld4_defconfig +++ b/configs/ph1_ld4_defconfig @@ -1,9 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y -CONFIG_DM=y -CONFIG_DM_SERIAL=y CONFIG_SPL_DM=y -CONFIG_DM_I2C=y CONFIG_MACH_PH1_LD4=y CONFIG_PFC_MICRO_SUPPORT_CARD=y CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld4-ref" diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig index 194f7a5..9a010ee 100644 --- a/configs/ph1_pro4_defconfig +++ b/configs/ph1_pro4_defconfig @@ -1,9 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y -CONFIG_DM=y -CONFIG_DM_SERIAL=y CONFIG_SPL_DM=y -CONFIG_DM_I2C=y CONFIG_MACH_PH1_PRO4=y CONFIG_PFC_MICRO_SUPPORT_CARD=y CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref" diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig index e7e7fff..29fe0e8 100644 --- a/configs/ph1_sld8_defconfig +++ b/configs/ph1_sld8_defconfig @@ -1,9 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y -CONFIG_DM=y -CONFIG_DM_SERIAL=y CONFIG_SPL_DM=y -CONFIG_DM_I2C=y CONFIG_MACH_PH1_SLD8=y CONFIG_PFC_MICRO_SUPPORT_CARD=y CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld8-ref"
On 30 March 2015 at 21:47, Masahiro Yamada yamada.masahiro@socionext.com wrote:
All the UniPhier boards have switch to Driver Model. "select DM" is better than default value in each defconfig.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 3 +++ configs/ph1_ld4_defconfig | 3 --- configs/ph1_pro4_defconfig | 3 --- configs/ph1_sld8_defconfig | 3 --- 4 files changed, 3 insertions(+), 9 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
On 7 April 2015 at 20:50, Simon Glass sjg@chromium.org wrote:
On 30 March 2015 at 21:47, Masahiro Yamada yamada.masahiro@socionext.com wrote:
All the UniPhier boards have switch to Driver Model. "select DM" is better than default value in each defconfig.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 3 +++ configs/ph1_ld4_defconfig | 3 --- configs/ph1_pro4_defconfig | 3 --- configs/ph1_sld8_defconfig | 3 --- 4 files changed, 3 insertions(+), 9 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm/next, thanks!
All the Zynq boards have switch to Driver Model. "select DM" is better than default value in each defconfig.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/Kconfig | 1 + configs/zynq_microzed_defconfig | 1 - configs/zynq_zc70x_defconfig | 1 - configs/zynq_zc770_xm010_defconfig | 1 - configs/zynq_zc770_xm012_defconfig | 1 - configs/zynq_zc770_xm013_defconfig | 1 - configs/zynq_zed_defconfig | 1 - configs/zynq_zybo_defconfig | 1 - 8 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2d583c9..ad8232c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -637,6 +637,7 @@ config ZYNQ bool "Xilinx Zynq Platform" select CPU_V7 select SUPPORT_SPL + select DM
config TARGET_XILINX_ZYNQMP bool "Support Xilinx ZynqMP Platform" diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index 39a7f6b..f5c1dff 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -6,5 +6,4 @@ CONFIG_OF_CONTROL=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y -CONFIG_DM=y CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed" diff --git a/configs/zynq_zc70x_defconfig b/configs/zynq_zc70x_defconfig index a8ef97f..a599bb1 100644 --- a/configs/zynq_zc70x_defconfig +++ b/configs/zynq_zc70x_defconfig @@ -7,4 +7,3 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y -CONFIG_DM=y diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig index ecd245a..92bc76e 100644 --- a/configs/zynq_zc770_xm010_defconfig +++ b/configs/zynq_zc770_xm010_defconfig @@ -8,4 +8,3 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y -CONFIG_DM=y diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig index 341a4d8..93d32a4 100644 --- a/configs/zynq_zc770_xm012_defconfig +++ b/configs/zynq_zc770_xm012_defconfig @@ -8,4 +8,3 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y -CONFIG_DM=y diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig index ee08a9f..9810cb4 100644 --- a/configs/zynq_zc770_xm013_defconfig +++ b/configs/zynq_zc770_xm013_defconfig @@ -8,4 +8,3 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y -CONFIG_DM=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 2500d84..3200253 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -7,4 +7,3 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-zed" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y -CONFIG_DM=y diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index c9d0121..aaa6cec 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -7,4 +7,3 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y -CONFIG_DM=y
On 30 March 2015 at 21:47, Masahiro Yamada yamada.masahiro@socionext.com wrote:
All the Zynq boards have switch to Driver Model. "select DM" is better than default value in each defconfig.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 1 + configs/zynq_microzed_defconfig | 1 - configs/zynq_zc70x_defconfig | 1 - configs/zynq_zc770_xm010_defconfig | 1 - configs/zynq_zc770_xm012_defconfig | 1 - configs/zynq_zc770_xm013_defconfig | 1 - configs/zynq_zed_defconfig | 1 - configs/zynq_zybo_defconfig | 1 - 8 files changed, 1 insertion(+), 7 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
On 7 April 2015 at 20:50, Simon Glass sjg@chromium.org wrote:
On 30 March 2015 at 21:47, Masahiro Yamada yamada.masahiro@socionext.com wrote:
All the Zynq boards have switch to Driver Model. "select DM" is better than default value in each defconfig.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 1 + configs/zynq_microzed_defconfig | 1 - configs/zynq_zc70x_defconfig | 1 - configs/zynq_zc770_xm010_defconfig | 1 - configs/zynq_zc770_xm012_defconfig | 1 - configs/zynq_zc770_xm013_defconfig | 1 - configs/zynq_zed_defconfig | 1 - configs/zynq_zybo_defconfig | 1 - 8 files changed, 1 insertion(+), 7 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm/next, thanks!
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/cpu/armv7/rmobile/Kconfig | 12 ++++++++++++ configs/alt_defconfig | 2 -- configs/gose_defconfig | 2 -- configs/koelsch_defconfig | 2 -- configs/lager_defconfig | 2 -- configs/porter_defconfig | 2 -- configs/silk_defconfig | 2 -- 7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm/cpu/armv7/rmobile/Kconfig b/arch/arm/cpu/armv7/rmobile/Kconfig index 2b333a3..57dccec 100644 --- a/arch/arm/cpu/armv7/rmobile/Kconfig +++ b/arch/arm/cpu/armv7/rmobile/Kconfig @@ -8,24 +8,36 @@ config TARGET_ARMADILLO_800EVA
config TARGET_GOSE bool "Gose board" + select DM + select DM_SERIAL
config TARGET_KOELSCH bool "Koelsch board" + select DM + select DM_SERIAL
config TARGET_LAGER bool "Lager board" + select DM + select DM_SERIAL
config TARGET_KZM9G bool "KZM9D board"
config TARGET_ALT bool "Alt board" + select DM + select DM_SERIAL
config TARGET_SILK bool "Silk board" + select DM + select DM_SERIAL
config TARGET_PORTER bool "Porter board" + select DM + select DM_SERIAL
endchoice
diff --git a/configs/alt_defconfig b/configs/alt_defconfig index ff87230..0a18409 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -1,6 +1,4 @@ CONFIG_ARM=y CONFIG_RMOBILE=y CONFIG_TARGET_ALT=y -CONFIG_DM=y -CONFIG_DM_SERIAL=y CONFIG_SH_SDHI=y diff --git a/configs/gose_defconfig b/configs/gose_defconfig index 353f854..b6054f7 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -1,6 +1,4 @@ CONFIG_ARM=y CONFIG_RMOBILE=y CONFIG_TARGET_GOSE=y -CONFIG_DM=y -CONFIG_DM_SERIAL=y CONFIG_SH_SDHI=y diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index b1e3529..7ab2bfd 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -1,6 +1,4 @@ CONFIG_ARM=y CONFIG_RMOBILE=y CONFIG_TARGET_KOELSCH=y -CONFIG_DM=y -CONFIG_DM_SERIAL=y CONFIG_SH_SDHI=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index 950b037..08adfe3 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -1,6 +1,4 @@ CONFIG_ARM=y CONFIG_RMOBILE=y CONFIG_TARGET_LAGER=y -CONFIG_DM=y -CONFIG_DM_SERIAL=y CONFIG_SH_SDHI=y diff --git a/configs/porter_defconfig b/configs/porter_defconfig index 8d594d9..a7b044e 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -1,6 +1,4 @@ CONFIG_ARM=y CONFIG_RMOBILE=y CONFIG_TARGET_PORTER=y -CONFIG_DM=y -CONFIG_DM_SERIAL=y CONFIG_SH_SDHI=y diff --git a/configs/silk_defconfig b/configs/silk_defconfig index 23d4f58..3c6f16e 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -1,6 +1,4 @@ CONFIG_ARM=y CONFIG_RMOBILE=y CONFIG_TARGET_SILK=y -CONFIG_DM=y -CONFIG_DM_SERIAL=y CONFIG_SH_SDHI=y
On 30 March 2015 at 21:47, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/cpu/armv7/rmobile/Kconfig | 12 ++++++++++++ configs/alt_defconfig | 2 -- configs/gose_defconfig | 2 -- configs/koelsch_defconfig | 2 -- configs/lager_defconfig | 2 -- configs/porter_defconfig | 2 -- configs/silk_defconfig | 2 -- 7 files changed, 12 insertions(+), 12 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
On 7 April 2015 at 20:50, Simon Glass sjg@chromium.org wrote:
On 30 March 2015 at 21:47, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/cpu/armv7/rmobile/Kconfig | 12 ++++++++++++ configs/alt_defconfig | 2 -- configs/gose_defconfig | 2 -- configs/koelsch_defconfig | 2 -- configs/lager_defconfig | 2 -- configs/porter_defconfig | 2 -- configs/silk_defconfig | 2 -- 7 files changed, 12 insertions(+), 12 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm/next, thanks!
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/mach-at91/Kconfig | 3 +++ configs/snapper9260_defconfig | 3 --- configs/snapper9g20_defconfig | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 30945c1..193f4d1 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -30,6 +30,9 @@ config TARGET_TNY_A9260 config TARGET_SNAPPER9260 bool "Support snapper9260" select CPU_ARM926EJS + select DM + select DM_SERIAL + select DM_GPIO
config TARGET_AFEB9260 bool "Support afeb9260" diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig index 576d9c5..5c8850a 100644 --- a/configs/snapper9260_defconfig +++ b/configs/snapper9260_defconfig @@ -2,6 +2,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260" CONFIG_ARM=y CONFIG_ARCH_AT91=y CONFIG_TARGET_SNAPPER9260=y -CONFIG_DM=y -CONFIG_DM_GPIO=y -CONFIG_DM_SERIAL=y diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig index 07a2643..9270b8d 100644 --- a/configs/snapper9g20_defconfig +++ b/configs/snapper9g20_defconfig @@ -2,6 +2,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20" CONFIG_ARM=y CONFIG_ARCH_AT91=y CONFIG_TARGET_SNAPPER9260=y -CONFIG_DM=y -CONFIG_DM_GPIO=y -CONFIG_DM_SERIAL=y
On 30 March 2015 at 21:47, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/mach-at91/Kconfig | 3 +++ configs/snapper9260_defconfig | 3 --- configs/snapper9g20_defconfig | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
On 7 April 2015 at 20:50, Simon Glass sjg@chromium.org wrote:
On 30 March 2015 at 21:47, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/mach-at91/Kconfig | 3 +++ configs/snapper9260_defconfig | 3 --- configs/snapper9g20_defconfig | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm/next, thanks!
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/Kconfig | 6 ++++++ configs/mx6dlsabreauto_defconfig | 2 -- configs/mx6dlsabresd_defconfig | 2 -- configs/mx6qsabreauto_defconfig | 2 -- configs/mx6qsabresd_defconfig | 2 -- configs/mx6sabresd_spl_defconfig | 2 -- configs/mx6sxsabresd_defconfig | 2 -- configs/mx6sxsabresd_spl_defconfig | 2 -- 8 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ad8232c..b25a4a9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -533,11 +533,15 @@ config TARGET_MX6QARM2 config TARGET_MX6QSABREAUTO bool "Support mx6qsabreauto" select CPU_V7 + select DM + select DM_THERMAL
config TARGET_MX6SABRESD bool "Support mx6sabresd" select CPU_V7 select SUPPORT_SPL + select DM + select DM_THERMAL
config TARGET_MX6SLEVK bool "Support mx6slevk" @@ -547,6 +551,8 @@ config TARGET_MX6SXSABRESD bool "Support mx6sxsabresd" select CPU_V7 select SUPPORT_SPL + select DM + select DM_THERMAL
config TARGET_GW_VENTANA bool "Support gw_ventana" diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig index 8bc5e8b..b649935 100644 --- a/configs/mx6dlsabreauto_defconfig +++ b/configs/mx6dlsabreauto_defconfig @@ -1,5 +1,3 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL" CONFIG_ARM=y CONFIG_TARGET_MX6QSABREAUTO=y -CONFIG_DM=y -CONFIG_DM_THERMAL=y diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig index 6adfd55..7f6cdff 100644 --- a/configs/mx6dlsabresd_defconfig +++ b/configs/mx6dlsabresd_defconfig @@ -1,5 +1,3 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg,MX6DL" CONFIG_ARM=y CONFIG_TARGET_MX6SABRESD=y -CONFIG_DM=y -CONFIG_DM_THERMAL=y diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig index ba9e512..7d86700 100644 --- a/configs/mx6qsabreauto_defconfig +++ b/configs/mx6qsabreauto_defconfig @@ -1,5 +1,3 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q" CONFIG_ARM=y CONFIG_TARGET_MX6QSABREAUTO=y -CONFIG_DM=y -CONFIG_DM_THERMAL=y diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig index 1764b39..67c1b77 100644 --- a/configs/mx6qsabresd_defconfig +++ b/configs/mx6qsabresd_defconfig @@ -1,5 +1,3 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q" CONFIG_ARM=y CONFIG_TARGET_MX6SABRESD=y -CONFIG_DM=y -CONFIG_DM_THERMAL=y diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig index 16a947e..7f563cd 100644 --- a/configs/mx6sabresd_spl_defconfig +++ b/configs/mx6sabresd_spl_defconfig @@ -2,5 +2,3 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q" CONFIG_ARM=y CONFIG_TARGET_MX6SABRESD=y -CONFIG_DM=y -CONFIG_DM_THERMAL=y diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig index 5c862cf..f23d48f 100644 --- a/configs/mx6sxsabresd_defconfig +++ b/configs/mx6sxsabresd_defconfig @@ -1,5 +1,3 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,MX6SX" CONFIG_ARM=y CONFIG_TARGET_MX6SXSABRESD=y -CONFIG_DM=y -CONFIG_DM_THERMAL=y diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig index de3d98f..b5e0635 100644 --- a/configs/mx6sxsabresd_spl_defconfig +++ b/configs/mx6sxsabresd_spl_defconfig @@ -2,5 +2,3 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX" CONFIG_ARM=y CONFIG_TARGET_MX6SXSABRESD=y -CONFIG_DM=y -CONFIG_DM_THERMAL=y
On 30 March 2015 at 21:47, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 6 ++++++ configs/mx6dlsabreauto_defconfig | 2 -- configs/mx6dlsabresd_defconfig | 2 -- configs/mx6qsabreauto_defconfig | 2 -- configs/mx6qsabresd_defconfig | 2 -- configs/mx6sabresd_spl_defconfig | 2 -- configs/mx6sxsabresd_defconfig | 2 -- configs/mx6sxsabresd_spl_defconfig | 2 -- 8 files changed, 6 insertions(+), 14 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
On 7 April 2015 at 20:50, Simon Glass sjg@chromium.org wrote:
On 30 March 2015 at 21:47, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 6 ++++++ configs/mx6dlsabreauto_defconfig | 2 -- configs/mx6dlsabresd_defconfig | 2 -- configs/mx6qsabreauto_defconfig | 2 -- configs/mx6qsabresd_defconfig | 2 -- configs/mx6sabresd_spl_defconfig | 2 -- configs/mx6sxsabresd_defconfig | 2 -- configs/mx6sxsabresd_spl_defconfig | 2 -- 8 files changed, 6 insertions(+), 14 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm/next, thanks!
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/Kconfig | 6 ++++++ configs/socfpga_arria5_defconfig | 3 --- configs/socfpga_cyclone5_defconfig | 3 --- configs/socfpga_socrates_defconfig | 3 --- 4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b25a4a9..6ae48c6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -618,11 +618,17 @@ config TARGET_SOCFPGA_ARRIA5 bool "Support socfpga_arria5" select CPU_V7 select SUPPORT_SPL + select DM + select DM_SPI_FLASH + select DM_SPI
config TARGET_SOCFPGA_CYCLONE5 bool "Support socfpga_cyclone5" select CPU_V7 select SUPPORT_SPL + select DM + select DM_SPI_FLASH + select DM_SPI
config ARCH_SUNXI bool "Support sunxi (Allwinner) SoCs" diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index 87d6007..52032e5 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -3,6 +3,3 @@ CONFIG_ARM=y CONFIG_TARGET_SOCFPGA_ARRIA5=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk" -CONFIG_DM=y -CONFIG_DM_SPI=y -CONFIG_DM_SPI_FLASH=y diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 0ebfbfc..56b6183 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -3,6 +3,3 @@ CONFIG_ARM=y CONFIG_TARGET_SOCFPGA_CYCLONE5=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk" -CONFIG_DM=y -CONFIG_DM_SPI=y -CONFIG_DM_SPI_FLASH=y diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 873b721..d68b9cc 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -3,6 +3,3 @@ CONFIG_ARM=y CONFIG_TARGET_SOCFPGA_CYCLONE5=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates" -CONFIG_DM=y -CONFIG_DM_SPI=y -CONFIG_DM_SPI_FLASH=y
Hi! On Tue 2015-03-31 12:47:59, Masahiro Yamada wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 6 ++++++ configs/socfpga_arria5_defconfig | 3 --- configs/socfpga_cyclone5_defconfig | 3 --- configs/socfpga_socrates_defconfig | 3 --- 4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b25a4a9..6ae48c6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -618,11 +618,17 @@ config TARGET_SOCFPGA_ARRIA5 bool "Support socfpga_arria5" select CPU_V7 select SUPPORT_SPL
- select DM
- select DM_SPI_FLASH
- select DM_SPI
Are you sure?
config DM_SPI_FLASH bool "Enable Driver Model for SPI flash" depends on DM && SPI help
DM_SPI_FLASH depends on SPI, you can't just select it...
Pavel
Hi Pavel,
2015-04-01 5:40 GMT+09:00 Pavel Machek pavel@denx.de:
Hi! On Tue 2015-03-31 12:47:59, Masahiro Yamada wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 6 ++++++ configs/socfpga_arria5_defconfig | 3 --- configs/socfpga_cyclone5_defconfig | 3 --- configs/socfpga_socrates_defconfig | 3 --- 4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b25a4a9..6ae48c6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -618,11 +618,17 @@ config TARGET_SOCFPGA_ARRIA5 bool "Support socfpga_arria5" select CPU_V7 select SUPPORT_SPL
select DMselect DM_SPI_FLASHselect DM_SPIAre you sure?
Yes, I'm sure.
config DM_SPI_FLASH bool "Enable Driver Model for SPI flash" depends on DM && SPI help
DM_SPI_FLASH depends on SPI, you can't just select it...
This dependency is wrong. Before this patch, it must be fixed.
Please see 01/12 of this series: http://patchwork.ozlabs.org/patch/456458/
Hi!
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 6 ++++++ configs/socfpga_arria5_defconfig | 3 --- configs/socfpga_cyclone5_defconfig | 3 --- configs/socfpga_socrates_defconfig | 3 --- 4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b25a4a9..6ae48c6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -618,11 +618,17 @@ config TARGET_SOCFPGA_ARRIA5 bool "Support socfpga_arria5" select CPU_V7 select SUPPORT_SPL
select DMselect DM_SPI_FLASHselect DM_SPI
Are you sure?
Yes, I'm sure.
config DM_SPI_FLASH bool "Enable Driver Model for SPI flash" depends on DM && SPI help
DM_SPI_FLASH depends on SPI, you can't just select it...
This dependency is wrong. Before this patch, it must be fixed.
Please see 01/12 of this series: http://patchwork.ozlabs.org/patch/456458/
But I'm not sure.
With this, you made CONFIG_DM_SPI_FLASH mandatory... even for users that have no SPI flash. There must be better solution...?
Pavel
Hi Pavel,
2015-04-02 21:47 GMT+09:00 Pavel Machek pavel@denx.de:
Hi!
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 6 ++++++ configs/socfpga_arria5_defconfig | 3 --- configs/socfpga_cyclone5_defconfig | 3 --- configs/socfpga_socrates_defconfig | 3 --- 4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b25a4a9..6ae48c6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -618,11 +618,17 @@ config TARGET_SOCFPGA_ARRIA5 bool "Support socfpga_arria5" select CPU_V7 select SUPPORT_SPL
select DMselect DM_SPI_FLASHselect DM_SPIAre you sure?
Yes, I'm sure.
config DM_SPI_FLASH bool "Enable Driver Model for SPI flash" depends on DM && SPI help
DM_SPI_FLASH depends on SPI, you can't just select it...
This dependency is wrong. Before this patch, it must be fixed.
Please see 01/12 of this series: http://patchwork.ozlabs.org/patch/456458/
But I'm not sure.
With this, you made CONFIG_DM_SPI_FLASH mandatory... even for users that have no SPI flash. There must be better solution...?
In my opinion,
CONFIG_DM_* should be user-unconfigurable.
CONFIG_DM_* should not enable/disable a feature, but should define how it is implemented.
For example,
!defined(CONFIG_SPI) --> SPI is disabled
defined(CONFIG_SPI) && defined(CONFIG_DM_SPI) --> Driver Model SPI is enabled
defined(CONFIG_SPI) && !defined(CONFIG_DM_SPI) --> ad-hoc SPI is enabled
Likewise, I think CONFIG_SPI_FLASH should decide if the system has SPI flash.
Hi Masahiro,
On 5 April 2015 at 21:22, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Hi Pavel,
2015-04-02 21:47 GMT+09:00 Pavel Machek pavel@denx.de:
Hi!
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 6 ++++++ configs/socfpga_arria5_defconfig | 3 --- configs/socfpga_cyclone5_defconfig | 3 --- configs/socfpga_socrates_defconfig | 3 --- 4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b25a4a9..6ae48c6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -618,11 +618,17 @@ config TARGET_SOCFPGA_ARRIA5 bool "Support socfpga_arria5" select CPU_V7 select SUPPORT_SPL
select DMselect DM_SPI_FLASHselect DM_SPIAre you sure?
Yes, I'm sure.
config DM_SPI_FLASH bool "Enable Driver Model for SPI flash" depends on DM && SPI help
DM_SPI_FLASH depends on SPI, you can't just select it...
This dependency is wrong. Before this patch, it must be fixed.
Please see 01/12 of this series: http://patchwork.ozlabs.org/patch/456458/
But I'm not sure.
With this, you made CONFIG_DM_SPI_FLASH mandatory... even for users that have no SPI flash. There must be better solution...?
In my opinion,
CONFIG_DM_* should be user-unconfigurable.
CONFIG_DM_* should not enable/disable a feature, but should define how it is implemented.
For example,
!defined(CONFIG_SPI) --> SPI is disabled
defined(CONFIG_SPI) && defined(CONFIG_DM_SPI) --> Driver Model SPI is enabled
defined(CONFIG_SPI) && !defined(CONFIG_DM_SPI) --> ad-hoc SPI is enabled
Likewise, I think CONFIG_SPI_FLASH should decide if the system has SPI flash.
This sounds right to me. In fact it is important, since we want to remove the CONFIG_DM options eventually. There are only there as a migration aid.
Regards, Simon
On 7 April 2015 at 20:46, Simon Glass sjg@chromium.org wrote:
Hi Masahiro,
On 5 April 2015 at 21:22, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Hi Pavel,
2015-04-02 21:47 GMT+09:00 Pavel Machek pavel@denx.de:
Hi!
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 6 ++++++ configs/socfpga_arria5_defconfig | 3 --- configs/socfpga_cyclone5_defconfig | 3 --- configs/socfpga_socrates_defconfig | 3 --- 4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b25a4a9..6ae48c6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -618,11 +618,17 @@ config TARGET_SOCFPGA_ARRIA5 bool "Support socfpga_arria5" select CPU_V7 select SUPPORT_SPL
select DMselect DM_SPI_FLASHselect DM_SPIAre you sure?
Yes, I'm sure.
config DM_SPI_FLASH bool "Enable Driver Model for SPI flash" depends on DM && SPI help
DM_SPI_FLASH depends on SPI, you can't just select it...
This dependency is wrong. Before this patch, it must be fixed.
Please see 01/12 of this series: http://patchwork.ozlabs.org/patch/456458/
But I'm not sure.
With this, you made CONFIG_DM_SPI_FLASH mandatory... even for users that have no SPI flash. There must be better solution...?
In my opinion,
CONFIG_DM_* should be user-unconfigurable.
CONFIG_DM_* should not enable/disable a feature, but should define how it is implemented.
For example,
!defined(CONFIG_SPI) --> SPI is disabled
defined(CONFIG_SPI) && defined(CONFIG_DM_SPI) --> Driver Model SPI is enabled
defined(CONFIG_SPI) && !defined(CONFIG_DM_SPI) --> ad-hoc SPI is enabled
Likewise, I think CONFIG_SPI_FLASH should decide if the system has SPI flash.
This sounds right to me. In fact it is important, since we want to remove the CONFIG_DM options eventually. There are only there as a migration aid.
Acked-by: Simon Glass sjg@chromium.org
On 7 April 2015 at 20:49, Simon Glass sjg@chromium.org wrote:
On 7 April 2015 at 20:46, Simon Glass sjg@chromium.org wrote:
Hi Masahiro,
On 5 April 2015 at 21:22, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Hi Pavel,
2015-04-02 21:47 GMT+09:00 Pavel Machek pavel@denx.de:
Hi!
> Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com > --- > > arch/arm/Kconfig | 6 ++++++ > configs/socfpga_arria5_defconfig | 3 --- > configs/socfpga_cyclone5_defconfig | 3 --- > configs/socfpga_socrates_defconfig | 3 --- > 4 files changed, 6 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index b25a4a9..6ae48c6 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -618,11 +618,17 @@ config TARGET_SOCFPGA_ARRIA5 > bool "Support socfpga_arria5" > select CPU_V7 > select SUPPORT_SPL > + select DM > + select DM_SPI_FLASH > + select DM_SPI
Are you sure?
Yes, I'm sure.
config DM_SPI_FLASH bool "Enable Driver Model for SPI flash" depends on DM && SPI help
DM_SPI_FLASH depends on SPI, you can't just select it...
This dependency is wrong. Before this patch, it must be fixed.
Please see 01/12 of this series: http://patchwork.ozlabs.org/patch/456458/
But I'm not sure.
With this, you made CONFIG_DM_SPI_FLASH mandatory... even for users that have no SPI flash. There must be better solution...?
In my opinion,
CONFIG_DM_* should be user-unconfigurable.
CONFIG_DM_* should not enable/disable a feature, but should define how it is implemented.
For example,
!defined(CONFIG_SPI) --> SPI is disabled
defined(CONFIG_SPI) && defined(CONFIG_DM_SPI) --> Driver Model SPI is enabled
defined(CONFIG_SPI) && !defined(CONFIG_DM_SPI) --> ad-hoc SPI is enabled
Likewise, I think CONFIG_SPI_FLASH should decide if the system has SPI flash.
This sounds right to me. In fact it is important, since we want to remove the CONFIG_DM options eventually. There are only there as a migration aid.
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm/next, thanks!
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/Kconfig | 2 ++ configs/birdland_bav335a_defconfig | 3 --- configs/birdland_bav335b_defconfig | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6ae48c6..3453ad0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -401,6 +401,8 @@ config TARGET_BAV335X bool "Support bav335x" select CPU_V7 select SUPPORT_SPL + select DM + select DM_SERIAL help The BAV335x OEM Network Processor integrates all the functions of an embedded network computer in a small, easy to use SODIMM module which diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 54ac4d1..43a4206 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -1,8 +1,5 @@ CONFIG_ARM=y CONFIG_TARGET_BAV335X=y -CONFIG_DM=y -CONFIG_DM_SERIAL=y -CONFIG_SYS_MALLOC_F=y CONFIG_BAV_VERSION=1 CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index 9046553..7206e8e 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -1,8 +1,5 @@ CONFIG_ARM=y CONFIG_TARGET_BAV335X=y -CONFIG_DM=y -CONFIG_DM_SERIAL=y -CONFIG_SYS_MALLOC_F=y CONFIG_BAV_VERSION=2 CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
On 30 March 2015 at 21:48, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 2 ++ configs/birdland_bav335a_defconfig | 3 --- configs/birdland_bav335b_defconfig | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
On 7 April 2015 at 20:50, Simon Glass sjg@chromium.org wrote:
On 30 March 2015 at 21:48, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 2 ++ configs/birdland_bav335a_defconfig | 3 --- configs/birdland_bav335b_defconfig | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm/next, thanks!
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/Kconfig | 2 ++ configs/stv0991_defconfig | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3453ad0..bade196 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -230,6 +230,8 @@ config TARGET_SPEAR600 config TARGET_STV0991 bool "Support stv0991" select CPU_V7 + select DM + select DM_SERIAL
config TARGET_X600 bool "Support x600" diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig index e8cf311..1884ac4 100644 --- a/configs/stv0991_defconfig +++ b/configs/stv0991_defconfig @@ -2,5 +2,3 @@ CONFIG_SYS_EXTRA_OPTIONS="stv0991" CONFIG_ARM=y CONFIG_TARGET_STV0991=y CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_DM=y -CONFIG_DM_SERIAL=y
On 30 March 2015 at 21:48, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 2 ++ configs/stv0991_defconfig | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
On 7 April 2015 at 20:50, Simon Glass sjg@chromium.org wrote:
On 30 March 2015 at 21:48, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 2 ++ configs/stv0991_defconfig | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm/next, thanks!
On 03/30/2015 08:48 PM, Masahiro Yamada wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 2 ++ configs/stv0991_defconfig | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
Acked-by : Vikas Manocha vikas.manocha@st.com
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/Kconfig | 3 +++ configs/cm_fx6_defconfig | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index bade196..735ee43 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -617,6 +617,9 @@ config TARGET_CM_FX6 bool "Support cm_fx6" select CPU_V7 select SUPPORT_SPL + select DM + select DM_SERIAL + select DM_GPIO
config TARGET_SOCFPGA_ARRIA5 bool "Support socfpga_arria5" diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index f10a5c2..c83a0e8 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -2,6 +2,3 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL" CONFIG_ARM=y CONFIG_TARGET_CM_FX6=y -CONFIG_DM=y -CONFIG_DM_GPIO=y -CONFIG_DM_SERIAL=y
On 30 March 2015 at 21:48, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 3 +++ configs/cm_fx6_defconfig | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
On 7 April 2015 at 20:50, Simon Glass sjg@chromium.org wrote:
On 30 March 2015 at 21:48, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/Kconfig | 3 +++ configs/cm_fx6_defconfig | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm/next, thanks!
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/powerpc/cpu/mpc83xx/Kconfig | 1 + configs/ids8313_defconfig | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index 4d6cb09..88a3bd6 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -49,6 +49,7 @@ config TARGET_MPC837XERDB
config TARGET_IDS8313 bool "Support ids8313" + select DM
config TARGET_KM8360 bool "Support km8360" diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig index 0950ec8..8479cd4 100644 --- a/configs/ids8313_defconfig +++ b/configs/ids8313_defconfig @@ -4,4 +4,3 @@ CONFIG_MPC83xx=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_TARGET_IDS8313=y -CONFIG_DM=y
On 30 March 2015 at 21:48, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/powerpc/cpu/mpc83xx/Kconfig | 1 + configs/ids8313_defconfig | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
Acked-by: Simon Glass sjg@chromium.org
On 7 April 2015 at 20:51, Simon Glass sjg@chromium.org wrote:
On 30 March 2015 at 21:48, Masahiro Yamada yamada.masahiro@socionext.com wrote:
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/powerpc/cpu/mpc83xx/Kconfig | 1 + configs/ids8313_defconfig | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm/next, thanks!
participants (6)
-
Marek Vasut -
Masahiro Yamada -
Pavel Machek -
Simon Glass -
Stefan Roese -
vikasm