Skip to content

Commit

Permalink
sunxi: Move all boards to the driver-model
Browse files Browse the repository at this point in the history
Now that we've everything prepared for it remove the DM settings from the
defconfig(s) and simply always set them for sunxi.

This makes all sunxi boards allways use the driver model for gpios and
ethernet, and allows us to move over more bits to the driver-model without
the need to introduce #ifdef-ery for boards which are not yet using DM.

Signed-off-by: Hans de Goede <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Acked-by: Ian Campbell <[email protected]>
  • Loading branch information
jwrdegoede committed May 4, 2015
1 parent 25acd33 commit b6006ba
Show file tree
Hide file tree
Showing 25 changed files with 19 additions and 50 deletions.
5 changes: 5 additions & 0 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,11 @@ config TARGET_SOCFPGA_CYCLONE5

config ARCH_SUNXI
bool "Support sunxi (Allwinner) SoCs"
select DM
select DM_GPIO
select OF_CONTROL
select OF_SEPARATE
select SPL_DISABLE_OF_CONTROL

config TARGET_SNOWBALL
bool "Support snowball"
Expand Down
12 changes: 12 additions & 0 deletions board/sunxi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -543,4 +543,16 @@ config GMAC_TX_DELAY
---help---
Set the GMAC Transmit Clock Delay Chain value.

config NET
default y

config NETDEVICES
default y

config DM_ETH
default y

config DM_SERIAL
default y

endif
2 changes: 0 additions & 2 deletions configs/A20-OLinuXino-Lime2_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,3 @@ CONFIG_DRAM_CLK=480
CONFIG_DRAM_ZQ=127
CONFIG_DRAM_EMR1=4
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/A20-OLinuXino-Lime_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,3 @@ CONFIG_DRAM_CLK=480
CONFIG_DRAM_ZQ=127
CONFIG_DRAM_EMR1=4
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/A20-OLinuXino_MICRO_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,3 @@ CONFIG_DRAM_CLK=384
CONFIG_DRAM_ZQ=127
CONFIG_DRAM_EMR1=4
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/Bananapi_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,3 @@ CONFIG_DRAM_CLK=432
CONFIG_DRAM_ZQ=127
CONFIG_DRAM_EMR1=4
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/Bananapro_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,3 @@ CONFIG_DRAM_CLK=432
CONFIG_DRAM_ZQ=127
CONFIG_DRAM_EMR1=4
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/CSQ_CS908_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,3 @@ CONFIG_AXP221_ALDO1_VOLT=3300
CONFIG_USB1_VBUS_PIN=""
CONFIG_USB2_VBUS_PIN=""
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/Colombus_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,3 @@ CONFIG_AXP221_ALDO1_VOLT=3300
# No Vbus gpio for usb1
CONFIG_USB1_VBUS_PIN=""
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/Cubieboard2_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,3 @@ CONFIG_DRAM_CLK=480
CONFIG_DRAM_ZQ=127
CONFIG_DRAM_EMR1=4
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/Cubietruck_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,3 @@ CONFIG_DRAM_CLK=432
CONFIG_DRAM_ZQ=127
CONFIG_DRAM_EMR1=4
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/Hummingbird_A31_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,3 @@ CONFIG_USB1_VBUS_PIN="PH24"
# No Vbus gpio for usb2
CONFIG_USB2_VBUS_PIN=""
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/Linksprite_pcDuino3_Nano_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,3 @@ CONFIG_DRAM_CLK=408
CONFIG_DRAM_ZQ=122
CONFIG_DRAM_EMR1=4
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
9 changes: 0 additions & 9 deletions configs/Linksprite_pcDuino3_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,4 @@ CONFIG_MACH_SUN7I=y
CONFIG_DRAM_CLK=480
CONFIG_DRAM_ZQ=122
CONFIG_DRAM_EMR1=4
CONFIG_DM=y
CONFIG_DM_GPIO=y
CONFIG_DM_SERIAL=y
CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_OF_SEPARATE=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
CONFIG_DM_ETH=y
2 changes: 0 additions & 2 deletions configs/Mele_I7_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,3 @@ CONFIG_USB1_VBUS_PIN="PC27"
# No Vbus gpio for usb2
CONFIG_USB2_VBUS_PIN=""
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/Mele_M3_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,3 @@ CONFIG_DRAM_CLK=384
CONFIG_DRAM_ZQ=127
CONFIG_DRAM_EMR1=4
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/Mele_M5_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,3 @@ CONFIG_DRAM_CLK=432
CONFIG_DRAM_ZQ=122
CONFIG_DRAM_EMR1=4
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/Mele_M9_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,3 @@ CONFIG_USB1_VBUS_PIN="PC27"
# No Vbus gpio for usb2
CONFIG_USB2_VBUS_PIN=""
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/Orangepi_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,3 @@ CONFIG_DRAM_CLK=432
CONFIG_DRAM_ZQ=127
CONFIG_DRAM_EMR1=4
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/Orangepi_mini_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,3 @@ CONFIG_DRAM_CLK=432
CONFIG_DRAM_ZQ=127
CONFIG_DRAM_EMR1=4
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
1 change: 1 addition & 0 deletions configs/UTOO_P66_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ CONFIG_MACH_SUN5I=y
CONFIG_DRAM_CLK=432
CONFIG_DRAM_ZQ=123
CONFIG_DRAM_EMR1=0
CONFIG_DM_SERIAL=n
2 changes: 0 additions & 2 deletions configs/Wits_Pro_A20_DKT_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,3 @@ CONFIG_DRAM_CLK=384
CONFIG_DRAM_ZQ=127
CONFIG_DRAM_EMR1=4
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/i12-tvbox_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,3 @@ CONFIG_DRAM_CLK=384
CONFIG_DRAM_ZQ=127
CONFIG_DRAM_EMR1=4
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 0 additions & 2 deletions configs/mixtile_loftq_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,3 @@ CONFIG_USB1_VBUS_PIN="PH24"
# No Vbus gpio for usb2
CONFIG_USB2_VBUS_PIN=""
CONFIG_ETH_DESIGNWARE=y
CONFIG_NETDEVICES=y
CONFIG_NET=y
2 changes: 1 addition & 1 deletion include/configs/sunxi-common.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

#define CONFIG_SYS_TEXT_BASE 0x4a000000

#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_DM)
#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_DM_SERIAL)
# define CONFIG_DW_SERIAL
#endif

Expand Down

0 comments on commit b6006ba

Please sign in to comment.