Skip to contentSkip to conversation

sunxi: Select a bunch of CONFIG_foo options from ARCH_SUNXI

PATCH New Hans de Goede 2 participants 3 messages Jun 30, 2015 – Jul 1, 2015

Subsystems (2)
Arm (32-bit) Arm/Allwinner sunXi SoC support
lore
Share & tools
lore

Hans de Goede

author
#0 lore raw

PATCH 1/1 sunxi: Select a bunch of CONFIG_foo options from ARCH_SUNXI

Select a bunch of CONFIG_foo options from ARCH_SUNXI, instead of having them set to y in every single sunxi defconfig.

Signed-off-by Hans de Goede <[email protected]>
---
 arch/arm/Kconfig                             | 3 +++
 configs/A10-OLinuXino-Lime_defconfig         | 3 ---
 configs/A10s-OLinuXino-M_defconfig           | 3 ---
 configs/A13-OLinuXinoM_defconfig             | 3 ---
 configs/A13-OLinuXino_defconfig              | 3 ---
 configs/A20-OLinuXino-Lime2_defconfig        | 3 ---
 configs/A20-OLinuXino-Lime_defconfig         | 3 ---
 configs/A20-OLinuXino_MICRO_defconfig        | 3 ---
 configs/Ainol_AW1_defconfig                  | 1 -
 configs/Ampe_A76_defconfig                   | 1 -
 configs/Auxtek-T004_defconfig                | 3 ---
 configs/Bananapi_defconfig                   | 3 ---
 configs/Bananapro_defconfig                  | 3 ---
 configs/CSQ_CS908_defconfig                  | 3 ---
 configs/Chuwi_V7_CW0825_defconfig            | 1 -
 configs/Colombus_defconfig                   | 3 ---
 configs/Cubieboard2_defconfig                | 3 ---
 configs/Cubieboard_defconfig                 | 3 ---
 configs/Cubietruck_defconfig                 | 3 ---
 configs/Et_q8_v1_6_defconfig                 | 1 -
 configs/Hummingbird_A31_defconfig            | 3 ---
 configs/Hyundai_A7HD_defconfig               | 1 -
 configs/Ippo_q8h_v1_2_a33_1024x600_defconfig | 1 -
 configs/Ippo_q8h_v1_2_defconfig              | 1 -
 configs/Ippo_q8h_v5_defconfig                | 1 -
 configs/Linksprite_pcDuino3_Nano_defconfig   | 3 ---
 configs/Linksprite_pcDuino3_defconfig        | 3 ---
 configs/Linksprite_pcDuino_defconfig         | 3 ---
 configs/MK808C_defconfig                     | 3 ---
 configs/MSI_Primo73_defconfig                | 3 ---
 configs/MSI_Primo81_defconfig                | 2 --
 configs/Marsboard_A10_defconfig              | 3 ---
 configs/Mele_A1000G_quad_defconfig           | 3 ---
 configs/Mele_A1000_defconfig                 | 3 ---
 configs/Mele_I7_defconfig                    | 3 ---
 configs/Mele_M3_defconfig                    | 3 ---
 configs/Mele_M5_defconfig                    | 3 ---
 configs/Mele_M9_defconfig                    | 3 ---
 configs/Merrii_A80_Optimus_defconfig         | 3 ---
 configs/Mini-X_defconfig                     | 3 ---
 configs/Orangepi_defconfig                   | 3 ---
 configs/Orangepi_mini_defconfig              | 3 ---
 configs/Sinlinx_SinA33_defconfig             | 3 ---
 configs/TZX-Q8-713B7_defconfig               | 1 -
 configs/UTOO_P66_defconfig                   | 1 -
 configs/Wexler_TAB7200_defconfig             | 3 ---
 configs/Wits_Pro_A20_DKT_defconfig           | 3 ---
 configs/Yones_Toptech_BD1078_defconfig       | 1 -
 configs/ba10_tv_box_defconfig                | 3 ---
 configs/forfun_q88db_defconfig               | 1 -
 configs/ga10h_v1_1_defconfig                 | 1 -
 configs/i12-tvbox_defconfig                  | 3 ---
 configs/iNet_3F_defconfig                    | 1 -
 configs/iNet_3W_defconfig                    | 1 -
 configs/iNet_86VS_defconfig                  | 1 -
 configs/jesurun_q5_defconfig                 | 3 ---
 configs/mixtile_loftq_defconfig              | 3 ---
 configs/mk802_a10s_defconfig                 | 3 ---
 configs/mk802_defconfig                      | 3 ---
 configs/mk802ii_defconfig                    | 3 ---
 configs/r7-tv-dongle_defconfig               | 3 ---
 configs/sunxi_Gemei_G9_defconfig             | 3 ---
 62 files changed, 3 insertions(+), 150 deletions(-)
arch/arm/Kconfig +3 -0
index 0829235..6c4d138 100644
@@ -645,10 +645,13 @@ config ARCH_SOCFPGA
 config ARCH_SUNXI
 	bool "Support sunxi (Allwinner) SoCs"
 	select DM
+	select DM_ETH
 	select DM_GPIO
+	select DM_USB if !USB_MUSB_SUNXI
 	select OF_CONTROL
 	select OF_SEPARATE
 	select SPL_DISABLE_OF_CONTROL
+	select USB
 
 config TARGET_SNOWBALL
 	bool "Support snowball"
configs/A10-OLinuXino-Lime_defconfig +0 -3
index 87ade90..78e799f 100644
@@ -11,7 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/A10s-OLinuXino-M_defconfig +0 -3
index 5a450af..26fadcb 100644
@@ -13,7 +13,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC,USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/A13-OLinuXinoM_defconfig +0 -3
index 213ece6..2bce5c8 100644
@@ -17,7 +17,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/A13-OLinuXino_defconfig +0 -3
index d71c11c..9f9dc2d 100644
@@ -18,7 +18,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER,USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/A20-OLinuXino-Lime2_defconfig +0 -3
index 6445b25..c7cf48b 100644
@@ -12,8 +12,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/A20-OLinuXino-Lime_defconfig +0 -3
index 650670f..aac3ab9 100644
@@ -9,8 +9,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/A20-OLinuXino_MICRO_defconfig +0 -3
index 3f92504..726b59b 100644
@@ -13,8 +13,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Ainol_AW1_defconfig +0 -1
index f94cd5a..ec1fc8e 100644
@@ -19,5 +19,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
configs/Ampe_A76_defconfig +0 -1
index 99aa141..c7cddf8 100644
@@ -18,5 +18,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
configs/Auxtek-T004_defconfig +0 -3
index 016ccd9..7427bd7 100644
@@ -10,7 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Bananapi_defconfig +0 -3
index 3e186f6..4c2b4be 100644
@@ -10,8 +10,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHC
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Bananapro_defconfig +0 -3
index 5bd2fd6..27c95ea 100644
@@ -12,8 +12,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHC
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/CSQ_CS908_defconfig +0 -3
index 54f4846..d2e595d 100644
@@ -11,10 +11,7 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3300
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Chuwi_V7_CW0825_defconfig +0 -1
index 3a2a219..0c2ca9a 100644
@@ -18,7 +18,6 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
 CONFIG_VIDEO_LCD_SPI_CS="PA0"
 CONFIG_VIDEO_LCD_SPI_SCLK="PA1"
configs/Colombus_defconfig +0 -3
index 9d84901..4c3312e 100644
@@ -11,9 +11,6 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_ALDO1_VOLT=3300
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Cubieboard2_defconfig +0 -3
index 0fbaa23..667b742 100644
@@ -10,8 +10,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Cubieboard_defconfig +0 -3
index 0d0051e..243e8b7 100644
@@ -9,7 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Cubietruck_defconfig +0 -3
index 57a3847..1857c34 100644
@@ -11,8 +11,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(1
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Et_q8_v1_6_defconfig +0 -1
index e36895c..50b4da8 100644
@@ -19,7 +19,6 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
configs/Hummingbird_A31_defconfig +0 -3
index 02c657a..ee80c0d 100644
@@ -13,9 +13,6 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_ALDO1_VOLT=3300
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Hyundai_A7HD_defconfig +0 -1
index 7800fa2..c4a566b 100644
@@ -20,5 +20,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
configs/Ippo_q8h_v1_2_a33_1024x600_defconfig +0 -1
index 63910c2..6af061e 100644
@@ -19,7 +19,6 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
configs/Ippo_q8h_v1_2_defconfig +0 -1
index ab62210..2d89512 100644
@@ -19,7 +19,6 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
configs/Ippo_q8h_v5_defconfig +0 -1
index 312a38c..e23fd6a 100644
@@ -19,7 +19,6 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
configs/Linksprite_pcDuino3_Nano_defconfig +0 -3
index 04ec7ab..8b86fbb 100644
@@ -12,8 +12,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Linksprite_pcDuino3_defconfig +0 -3
index 6d7690d..4e0ed67 100644
@@ -10,8 +10,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Linksprite_pcDuino_defconfig +0 -3
index ddd162f..836bb31 100644
@@ -9,7 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/MK808C_defconfig +0 -3
index a6db139..22fd604 100644
@@ -9,7 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/MSI_Primo73_defconfig +0 -3
index 6e0d246..9d6ca79 100644
@@ -15,7 +15,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/MSI_Primo81_defconfig +0 -2
index 9787e34..c53256a 100644
@@ -18,7 +18,6 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_VIDEO_LCD_SSD2828_TX_CLK=27

@@ -27,4 +26,3 @@ CONFIG_VIDEO_LCD_SPI_CS="PH9"
 CONFIG_VIDEO_LCD_SPI_SCLK="PH10"
 CONFIG_VIDEO_LCD_SPI_MOSI="PH11"
 CONFIG_VIDEO_LCD_SPI_MISO="PH12"
-CONFIG_USB=y
configs/Marsboard_A10_defconfig +0 -3
index ed41af6..7f4f12a 100644
@@ -8,7 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,AHCI,USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Mele_A1000G_quad_defconfig +0 -3
index 6e0a493..9c7bb48 100644
@@ -11,12 +11,9 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DCDC1_VOLT=3300
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_DLDO4_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3300
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Mele_A1000_defconfig +0 -3
index 983ffdc..df356d6 100644
@@ -9,7 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Mele_I7_defconfig +0 -3
index 7f083a7..65398d8 100644
@@ -11,12 +11,9 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DCDC1_VOLT=3300
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_DLDO4_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3300
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Mele_M3_defconfig +0 -3
index 73d87c3..8bfd32f 100644
@@ -12,8 +12,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Mele_M5_defconfig +0 -3
index 79c5901..300679a 100644
@@ -11,8 +11,5 @@ CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,USB_EHCI,STATUSLED=234"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Mele_M9_defconfig +0 -3
index e017ad7..8bfd9b1 100644
@@ -11,12 +11,9 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DCDC1_VOLT=3300
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_DLDO4_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3300
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Merrii_A80_Optimus_defconfig +0 -3
index b02b1a3..23ab5dc 100644
@@ -12,7 +12,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Mini-X_defconfig +0 -3
index da57711..aa3f5c4 100644
@@ -8,7 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Orangepi_defconfig +0 -3
index ba89a25..325d9f8 100644
@@ -13,8 +13,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHC
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Orangepi_mini_defconfig +0 -3
index 8f03815..c602533 100644
@@ -15,8 +15,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHC
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Sinlinx_SinA33_defconfig +0 -3
index e9e62da..0ba53c0 100644
@@ -9,8 +9,5 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_ALDO1_VOLT=3000
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/TZX-Q8-713B7_defconfig +0 -1
index 68961fc..e398bc0 100644
@@ -18,5 +18,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
configs/UTOO_P66_defconfig +0 -1
index c3b13b7..59d5e4e 100644
@@ -23,4 +23,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
configs/Wexler_TAB7200_defconfig +0 -3
index d9180c7..321226d 100644
@@ -13,7 +13,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Wits_Pro_A20_DKT_defconfig +0 -3
index bb8dd29..0a30ef8 100644
@@ -15,8 +15,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/Yones_Toptech_BD1078_defconfig +0 -1
index aab580e..40583d3 100644
@@ -24,5 +24,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
configs/ba10_tv_box_defconfig +0 -3
index c84e82e..07e3540 100644
@@ -11,7 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/forfun_q88db_defconfig +0 -1
index 85c807a..cc9391a 100644
@@ -17,5 +17,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
configs/ga10h_v1_1_defconfig +0 -1
index 315627d..3bc1a52 100644
@@ -21,7 +21,6 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
configs/i12-tvbox_defconfig +0 -3
index 3a69422..7477953 100644
@@ -9,8 +9,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/iNet_3F_defconfig +0 -1
index 54de300..7b5948b 100644
@@ -19,5 +19,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
configs/iNet_3W_defconfig +0 -1
index e1beac8..92a384c 100644
@@ -19,5 +19,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
configs/iNet_86VS_defconfig +0 -1
index 627e211..1f91e8f 100644
@@ -17,5 +17,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
configs/jesurun_q5_defconfig +0 -3
index 4b09a33..a4c7d1e 100644
@@ -9,7 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI,MACPWR=SUNXI_GPH(19)"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/mixtile_loftq_defconfig +0 -3
index a8c497c..48fe570 100644
@@ -12,9 +12,6 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_ALDO1_VOLT=3300
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/mk802_a10s_defconfig +0 -3
index dc78fa4..ce308d9 100644
@@ -11,7 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/mk802_defconfig +0 -3
index 31bde00..1098bd4 100644
@@ -9,7 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/mk802ii_defconfig +0 -3
index ffa7891..635273c 100644
@@ -8,7 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/r7-tv-dongle_defconfig +0 -3
index ac7928d..edf7b8a 100644
@@ -10,7 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
configs/sunxi_Gemei_G9_defconfig +0 -3
index e95cbe4..5ee6fd9 100644
@@ -15,7 +15,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
Signature · 1 line
2.4.3
#1 lore raw

PATCH 1/1 sunxi: Select a bunch of CONFIG_foo options from ARCH_SUNXI

Quoted 4 lines · Hans de Goede

Select a bunch of CONFIG_foo options from ARCH_SUNXI, instead of having them set to y in every single sunxi defconfig.

Signed-off-by Hans de Goede <[email protected]>

Ug, sorry, I was waiting for some build results to come out before posting my version of this.

To update the USB side:

$ for F in `git grep -l SYS_EXTRA.*USB_EHCI`;do sed -i -e 's/,USB_EHCI//'
-e 's/USB_EHCI,//' $F && echo CONFIG_USB_EHCI_HCD=y >> $F;done

And was there a reason you didn't include a 'select DM_SERIAL' in yours?

[snip]

Quoted 5 lines
arch/arm/Kconfig +0 -0
index 0829235..6c4d138 100644

arch/arm/Kconfig config ARCH_SOCFPGA · line 654

Quoted 10 lines
arch/arm/Kconfig +3 -0
@@ -645,10 +645,13 @@ config ARCH_SOCFPGA
 config ARCH_SUNXI
 	bool "Support sunxi (Allwinner) SoCs"
 	select DM
+	select DM_ETH
 	select DM_GPIO
+	select DM_USB if !USB_MUSB_SUNXI
 	select OF_CONTROL
 	select OF_SEPARATE
 	select SPL_DISABLE_OF_CONTROL
+	select USB

We really don't want to leave USB as a board choice?

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150630/057dd9eb/attachment.sig>
author
#2 lore raw

PATCH 1/1 sunxi: Select a bunch of CONFIG_foo options from ARCH_SUNXI

Hi,

Quoted 9 lines · Tom Rini
Quoted 4 lines · Hans de Goede

Select a bunch of CONFIG_foo options from ARCH_SUNXI, instead of having them set to y in every single sunxi defconfig.

Signed-off-by Hans de Goede <[email protected]>

Ug, sorry, I was waiting for some build results to come out before posting my version of this.

No problem.

Quoted 5 lines

To update the USB side:

$ for F in `git grep -l SYS_EXTRA.*USB_EHCI`;do sed -i -e 's/,USB_EHCI//'
-e 's/USB_EHCI,//' $F && echo CONFIG_USB_EHCI_HCD=y >> $F;done

And was there a reason you didn't include a 'select DM_SERIAL' in yours?

Yes setting that for all boards breaks booting of boards which do not have a serial port as drivers/serial/serial-uclass.c:
serial_find_console_or_panic() will then panic (runtime error, yeah).

And we've one such board. I've a fix for this, next step is to merge your and mine patches as both have some good things the other one does not have (I like your work on setting CONFIG_USB_EHCI_HCD, but you're not selecting CONFIG_USB).

I've run out of steam for today, so I will try to get this done tomorrow.

Quoted 10 lines

[snip]

Quoted 9 lines
arch/arm/Kconfig +1 -0
index 0829235..6c4d138 100644
@@ -645,10 +645,13 @@ config ARCH_SOCFPGA
  config ARCH_SUNXI
  	bool "Support sunxi (Allwinner) SoCs"
  	select DM
+	select DM_ETH
Quoted 8 lines

arch/arm/Kconfig config ARCH_SOCFPGA · line 654

Quoted 6 lines
arch/arm/Kconfig +2 -0
  	select DM_GPIO
+	select DM_USB if !USB_MUSB_SUNXI
  	select OF_CONTROL
  	select OF_SEPARATE
  	select SPL_DISABLE_OF_CONTROL
+	select USB

We really don't want to leave USB as a board choice?

All sunxi SoCs have 2 - 4 (*) usb controllers, and there does not exist a single board which does not at least uses one usb controller, and I like to keep things consistent where ever possible to reduce the combinatorial explosion problem all these Kconfig options give us.

Regards,

Hans

*) 3 - 6 if you count ehci/ohci seperately.