From: Tom Rini tr...@konsulko.com
With certain features being convert to DM now we want sunxi to default
to having DM enabled for ETH/SERIAL and USB in some cases.
Cc: Hans de Goede hdego...@redhat.com
Cc: Ian Campbell i...@hellion.org.uk
Signed-off-by: Tom Rini tr...@konsulko.com
[hdego...@redhat.com: Also select CONFIG_USB for all sunxi builds]
Signed-off-by: Hans de Goede hdego...@redhat.com
---
arch/arm/Kconfig | 4
configs/A10-OLinuXino-Lime_defconfig | 7 ++-
configs/A10s-OLinuXino-M_defconfig | 7 ++-
configs/A13-OLinuXinoM_defconfig | 7 ++-
configs/A13-OLinuXino_defconfig | 7 ++-
configs/A20-OLinuXino-Lime2_defconfig| 7 ++-
configs/A20-OLinuXino-Lime_defconfig | 7 ++-
configs/A20-OLinuXino_MICRO_defconfig| 7 ++-
configs/Ainol_AW1_defconfig | 2 --
configs/Ampe_A76_defconfig | 2 --
configs/Auxtek-T004_defconfig| 7 ++-
configs/Bananapi_defconfig | 7 ++-
configs/Bananapro_defconfig | 7 ++-
configs/CSQ_CS908_defconfig | 7 ++-
configs/Chuwi_V7_CW0825_defconfig| 2 --
configs/Colombus_defconfig | 7 ++-
configs/Cubieboard2_defconfig| 7 ++-
configs/Cubieboard_defconfig | 7 ++-
configs/Cubietruck_defconfig | 7 ++-
configs/Et_q8_v1_6_defconfig | 2 --
configs/Hummingbird_A31_defconfig| 7 ++-
configs/Hyundai_A7HD_defconfig | 2 --
configs/Ippo_q8h_v1_2_a33_1024x600_defconfig | 2 --
configs/Ippo_q8h_v1_2_defconfig | 2 --
configs/Ippo_q8h_v5_defconfig| 2 --
configs/Linksprite_pcDuino3_Nano_defconfig | 7 ++-
configs/Linksprite_pcDuino3_defconfig| 7 ++-
configs/Linksprite_pcDuino_defconfig | 7 ++-
configs/MK808C_defconfig | 7 ++-
configs/MSI_Primo73_defconfig| 4
configs/MSI_Primo81_defconfig| 3 ---
configs/Marsboard_A10_defconfig | 7 ++-
configs/Mele_A1000G_quad_defconfig | 7 ++-
configs/Mele_A1000_defconfig | 7 ++-
configs/Mele_I7_defconfig| 7 ++-
configs/Mele_M3_defconfig| 7 ++-
configs/Mele_M5_defconfig| 7 ++-
configs/Mele_M9_defconfig| 7 ++-
configs/Merrii_A80_Optimus_defconfig | 4
configs/Mini-X_defconfig | 7 ++-
configs/Orangepi_defconfig | 7 ++-
configs/Orangepi_mini_defconfig | 7 ++-
configs/Sinlinx_SinA33_defconfig | 4
configs/TZX-Q8-713B7_defconfig | 2 --
configs/UTOO_P66_defconfig | 1 -
configs/Wexler_TAB7200_defconfig | 7 ++-
configs/Wits_Pro_A20_DKT_defconfig | 7 ++-
configs/Yones_Toptech_BD1078_defconfig | 2 --
configs/ba10_tv_box_defconfig| 7 ++-
configs/forfun_q88db_defconfig | 2 --
configs/ga10h_v1_1_defconfig | 2 --
configs/i12-tvbox_defconfig | 7 ++-
configs/iNet_3F_defconfig| 2 --
configs/iNet_3W_defconfig| 2 --
configs/iNet_86VS_defconfig | 2 --
configs/jesurun_q5_defconfig | 7 ++-
configs/mixtile_loftq_defconfig | 7 ++-
configs/mk802_a10s_defconfig | 7 ++-
configs/mk802_defconfig | 5 +
configs/mk802ii_defconfig| 7 ++-
configs/r7-tv-dongle_defconfig | 7 ++-
configs/sunxi_Gemei_G9_defconfig | 7 ++-
62 files changed, 85 insertions(+), 250 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 192d9cf..c6202ee 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -646,9 +646,13 @@ config ARCH_SUNXI
bool Support sunxi (Allwinner) SoCs
select DM
select DM_GPIO
+ select DM_ETH
+ select DM_SERIAL
+ 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
diff --git a/configs/A10-OLinuXino-Lime_defconfig
b/configs/A10-OLinuXino-Lime_defconfig
index 87ade90..0245bfc 100644
--- a/configs/A10-OLinuXino-Lime_defconfig
+++ b/configs/A10-OLinuXino-Lime_defconfig
@@ -7,11 +7,8 @@ CONFIG_SYS_CLK_FREQ=91200
CONFIG_DEFAULT_DEVICE_TREE=sun4i-a10-olinuxino-lime
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS=AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI
+CONFIG_SYS_EXTRA_OPTIONS=AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3)
#
