sunxi: Move all boards to the driver-model
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 <hdegoede@redhat.com> Reviewed-by: Simon Glass <sjg@chromium.org> Acked-by: Ian Campbell <ijc@hellion.org.uk>
This commit is contained in:
parent
25acd33f85
commit
b6006baf9c
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -20,3 +20,4 @@ CONFIG_MACH_SUN5I=y
|
||||
CONFIG_DRAM_CLK=432
|
||||
CONFIG_DRAM_ZQ=123
|
||||
CONFIG_DRAM_EMR1=0
|
||||
CONFIG_DM_SERIAL=n
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user