mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 08:30:50 +09:00
sunxi: Remove CONFIG_TARGET_FOO for sun5i and sun7i boards
CONFIG_TARGET_FOO was only used in board/sunxi/Makefile to select the dram config for sun5i and sun7i boards and in board/sunxi/gmac.c for some special handling of the bananapi/bananapro (both sun7i), all sun5i and sun7i boards have been moved over to using a single dram_sun5i_autoconfig file, and the tx clk delay handling for the Banana boards now has its own Kconfig. IOW nothing is using CONFIG_TARGET_FOO anymore, so remove it. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
This commit is contained in:
parent
c13f60d92a
commit
40d0cdda3e
@ -64,88 +64,6 @@ config SYS_CONFIG_NAME
|
|||||||
default "sun7i" if MACH_SUN7I
|
default "sun7i" if MACH_SUN7I
|
||||||
default "sun8i" if MACH_SUN8I
|
default "sun8i" if MACH_SUN8I
|
||||||
|
|
||||||
choice
|
|
||||||
prompt "Board"
|
|
||||||
|
|
||||||
config TARGET_A10S_OLINUXINO_M
|
|
||||||
bool "A10S_OLINUXINO_M"
|
|
||||||
depends on MACH_SUN5I
|
|
||||||
|
|
||||||
config TARGET_A13_OLINUXINOM
|
|
||||||
bool "A13_OLINUXINOM"
|
|
||||||
depends on MACH_SUN5I
|
|
||||||
|
|
||||||
config TARGET_A13_OLINUXINO
|
|
||||||
bool "A13_OLINUXINO"
|
|
||||||
depends on MACH_SUN5I
|
|
||||||
|
|
||||||
config TARGET_A20_OLINUXINO_L2
|
|
||||||
bool "A20_OLINUXINO_L2"
|
|
||||||
depends on MACH_SUN7I
|
|
||||||
|
|
||||||
config TARGET_A20_OLINUXINO_L
|
|
||||||
bool "A20_OLINUXINO_L"
|
|
||||||
depends on MACH_SUN7I
|
|
||||||
|
|
||||||
config TARGET_A20_OLINUXINO_M
|
|
||||||
bool "A20_OLINUXINO_M"
|
|
||||||
depends on MACH_SUN7I
|
|
||||||
|
|
||||||
config TARGET_AUXTEK_T004
|
|
||||||
bool "AUXTEK_T004"
|
|
||||||
depends on MACH_SUN5I
|
|
||||||
|
|
||||||
config TARGET_BANANAPI
|
|
||||||
bool "BANANAPI"
|
|
||||||
depends on MACH_SUN7I
|
|
||||||
|
|
||||||
config TARGET_BANANAPRO
|
|
||||||
bool "BANANAPRO"
|
|
||||||
depends on MACH_SUN7I
|
|
||||||
|
|
||||||
config TARGET_CUBIEBOARD2
|
|
||||||
bool "CUBIEBOARD2"
|
|
||||||
depends on MACH_SUN7I
|
|
||||||
|
|
||||||
config TARGET_CUBIETRUCK
|
|
||||||
bool "CUBIETRUCK"
|
|
||||||
depends on MACH_SUN7I
|
|
||||||
|
|
||||||
config TARGET_PCDUINO3
|
|
||||||
bool "PCDUINO3"
|
|
||||||
depends on MACH_SUN7I
|
|
||||||
|
|
||||||
config TARGET_MELE_M3
|
|
||||||
bool "MELE_M3"
|
|
||||||
depends on MACH_SUN7I
|
|
||||||
|
|
||||||
config TARGET_MK802_A10S
|
|
||||||
bool "MK802_A10S"
|
|
||||||
depends on MACH_SUN5I
|
|
||||||
|
|
||||||
config TARGET_MSI_PRIMO73
|
|
||||||
bool "MSI Primo73 (7\" tablet)"
|
|
||||||
depends on MACH_SUN7I
|
|
||||||
---help---
|
|
||||||
The MSI Primo73 is an A20 based tablet, with 1G RAM, 16G NAND,
|
|
||||||
1024x600 TN LCD display, mono speaker, 0.3 MP front camera, 2.0 MP
|
|
||||||
rear camera, 3000 mAh battery, gt911 touchscreen, mma8452 accelerometer
|
|
||||||
and rtl8188etv usb wifi. Has "power", "volume+" and "volume-" buttons
|
|
||||||
(both volume buttons are also connected to the UBOOT_SEL pin). The
|
|
||||||
external connectors are represented by MicroSD slot, MiniHDMI, MicroUSB
|
|
||||||
OTG and 3.5mm headphone jack. More details are available at
|
|
||||||
http://linux-sunxi.org/MSI_Primo73
|
|
||||||
|
|
||||||
config TARGET_I12_TVBOX
|
|
||||||
bool "I12_TVBOX"
|
|
||||||
depends on MACH_SUN7I
|
|
||||||
|
|
||||||
config TARGET_R7DONGLE
|
|
||||||
bool "R7DONGLE"
|
|
||||||
depends on MACH_SUN5I
|
|
||||||
|
|
||||||
endchoice
|
|
||||||
|
|
||||||
config SYS_BOARD
|
config SYS_BOARD
|
||||||
default "sunxi"
|
default "sunxi"
|
||||||
|
|
||||||
|
@ -8,7 +8,6 @@ CONFIG_USB1_VBUS_PIN="PB10"
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN5I=y
|
+S:CONFIG_MACH_SUN5I=y
|
||||||
+S:CONFIG_TARGET_A10S_OLINUXINO_M=y
|
|
||||||
+S:CONFIG_DRAM_CLK=432
|
+S:CONFIG_DRAM_CLK=432
|
||||||
+S:CONFIG_DRAM_ZQ=123
|
+S:CONFIG_DRAM_ZQ=123
|
||||||
+S:CONFIG_DRAM_EMR1=4
|
+S:CONFIG_DRAM_EMR1=4
|
||||||
|
@ -12,7 +12,6 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN5I=y
|
+S:CONFIG_MACH_SUN5I=y
|
||||||
+S:CONFIG_TARGET_A13_OLINUXINOM=y
|
|
||||||
+S:CONFIG_DRAM_CLK=408
|
+S:CONFIG_DRAM_CLK=408
|
||||||
+S:CONFIG_DRAM_ZQ=123
|
+S:CONFIG_DRAM_ZQ=123
|
||||||
+S:CONFIG_DRAM_EMR1=0
|
+S:CONFIG_DRAM_EMR1=0
|
||||||
|
@ -12,7 +12,6 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN5I=y
|
+S:CONFIG_MACH_SUN5I=y
|
||||||
+S:CONFIG_TARGET_A13_OLINUXINO=y
|
|
||||||
+S:CONFIG_DRAM_CLK=408
|
+S:CONFIG_DRAM_CLK=408
|
||||||
+S:CONFIG_DRAM_ZQ=123
|
+S:CONFIG_DRAM_ZQ=123
|
||||||
+S:CONFIG_DRAM_EMR1=0
|
+S:CONFIG_DRAM_EMR1=0
|
||||||
|
@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun7i-a20-olinuxino-lime2.dtb"
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN7I=y
|
+S:CONFIG_MACH_SUN7I=y
|
||||||
+S:CONFIG_TARGET_A20_OLINUXINO_L2=y
|
|
||||||
+S:CONFIG_DRAM_CLK=480
|
+S:CONFIG_DRAM_CLK=480
|
||||||
+S:CONFIG_DRAM_ZQ=127
|
+S:CONFIG_DRAM_ZQ=127
|
||||||
+S:CONFIG_DRAM_EMR1=4
|
+S:CONFIG_DRAM_EMR1=4
|
||||||
|
@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun7i-a20-olinuxino-lime.dtb"
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN7I=y
|
+S:CONFIG_MACH_SUN7I=y
|
||||||
+S:CONFIG_TARGET_A20_OLINUXINO_L=y
|
|
||||||
+S:CONFIG_DRAM_CLK=480
|
+S:CONFIG_DRAM_CLK=480
|
||||||
+S:CONFIG_DRAM_ZQ=127
|
+S:CONFIG_DRAM_ZQ=127
|
||||||
+S:CONFIG_DRAM_EMR1=4
|
+S:CONFIG_DRAM_EMR1=4
|
||||||
|
@ -8,7 +8,6 @@ CONFIG_VIDEO_VGA=y
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN7I=y
|
+S:CONFIG_MACH_SUN7I=y
|
||||||
+S:CONFIG_TARGET_A20_OLINUXINO_M=y
|
|
||||||
+S:CONFIG_DRAM_CLK=384
|
+S:CONFIG_DRAM_CLK=384
|
||||||
+S:CONFIG_DRAM_ZQ=127
|
+S:CONFIG_DRAM_ZQ=127
|
||||||
+S:CONFIG_DRAM_EMR1=4
|
+S:CONFIG_DRAM_EMR1=4
|
||||||
|
@ -5,7 +5,6 @@ CONFIG_USB1_VBUS_PIN="PG13"
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN5I=y
|
+S:CONFIG_MACH_SUN5I=y
|
||||||
+S:CONFIG_TARGET_AUXTEK_T004=y
|
|
||||||
+S:CONFIG_DRAM_CLK=432
|
+S:CONFIG_DRAM_CLK=432
|
||||||
+S:CONFIG_DRAM_ZQ=123
|
+S:CONFIG_DRAM_ZQ=123
|
||||||
+S:CONFIG_DRAM_EMR1=4
|
+S:CONFIG_DRAM_EMR1=4
|
||||||
|
@ -5,7 +5,6 @@ CONFIG_GMAC_TX_DELAY=3
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN7I=y
|
+S:CONFIG_MACH_SUN7I=y
|
||||||
+S:CONFIG_TARGET_BANANAPI=y
|
|
||||||
+S:CONFIG_DRAM_CLK=432
|
+S:CONFIG_DRAM_CLK=432
|
||||||
+S:CONFIG_DRAM_ZQ=127
|
+S:CONFIG_DRAM_ZQ=127
|
||||||
+S:CONFIG_DRAM_EMR1=4
|
+S:CONFIG_DRAM_EMR1=4
|
||||||
|
@ -7,7 +7,6 @@ CONFIG_GMAC_TX_DELAY=3
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN7I=y
|
+S:CONFIG_MACH_SUN7I=y
|
||||||
+S:CONFIG_TARGET_BANANAPRO=y
|
|
||||||
+S:CONFIG_DRAM_CLK=432
|
+S:CONFIG_DRAM_CLK=432
|
||||||
+S:CONFIG_DRAM_ZQ=127
|
+S:CONFIG_DRAM_ZQ=127
|
||||||
+S:CONFIG_DRAM_EMR1=4
|
+S:CONFIG_DRAM_EMR1=4
|
||||||
|
@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN7I=y
|
+S:CONFIG_MACH_SUN7I=y
|
||||||
+S:CONFIG_TARGET_CUBIEBOARD2=y
|
|
||||||
+S:CONFIG_DRAM_CLK=480
|
+S:CONFIG_DRAM_CLK=480
|
||||||
+S:CONFIG_DRAM_ZQ=127
|
+S:CONFIG_DRAM_ZQ=127
|
||||||
+S:CONFIG_DRAM_EMR1=4
|
+S:CONFIG_DRAM_EMR1=4
|
||||||
|
@ -5,7 +5,6 @@ CONFIG_VIDEO_VGA=y
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN7I=y
|
+S:CONFIG_MACH_SUN7I=y
|
||||||
+S:CONFIG_TARGET_CUBIETRUCK=y
|
|
||||||
+S:CONFIG_DRAM_CLK=432
|
+S:CONFIG_DRAM_CLK=432
|
||||||
+S:CONFIG_DRAM_ZQ=127
|
+S:CONFIG_DRAM_ZQ=127
|
||||||
+S:CONFIG_DRAM_EMR1=4
|
+S:CONFIG_DRAM_EMR1=4
|
||||||
|
@ -11,7 +11,6 @@ CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN8I=y
|
+S:CONFIG_MACH_SUN8I=y
|
||||||
+S:CONFIG_TARGET_IPPO_Q8H_V5=y
|
|
||||||
+S:CONFIG_DRAM_CLK=480
|
+S:CONFIG_DRAM_CLK=480
|
||||||
# zq = 0xf777
|
# zq = 0xf777
|
||||||
+S:CONFIG_DRAM_ZQ=63351
|
+S:CONFIG_DRAM_ZQ=63351
|
||||||
|
@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun7i-a20-pcduino3.dtb"
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN7I=y
|
+S:CONFIG_MACH_SUN7I=y
|
||||||
+S:CONFIG_TARGET_PCDUINO3=y
|
|
||||||
+S:CONFIG_DRAM_CLK=480
|
+S:CONFIG_DRAM_CLK=480
|
||||||
+S:CONFIG_DRAM_ZQ=122
|
+S:CONFIG_DRAM_ZQ=122
|
||||||
+S:CONFIG_DRAM_EMR1=4
|
+S:CONFIG_DRAM_EMR1=4
|
||||||
|
@ -8,7 +8,6 @@ CONFIG_OF_SEPARATE=y
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN7I=y
|
+S:CONFIG_MACH_SUN7I=y
|
||||||
+S:CONFIG_TARGET_PCDUINO3=y
|
|
||||||
+S:CONFIG_DRAM_CLK=480
|
+S:CONFIG_DRAM_CLK=480
|
||||||
+S:CONFIG_DRAM_ZQ=122
|
+S:CONFIG_DRAM_ZQ=122
|
||||||
+S:CONFIG_DRAM_EMR1=4
|
+S:CONFIG_DRAM_EMR1=4
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
# The MSI Primo73 is an A20 based tablet, with 1G RAM, 16G NAND,
|
||||||
|
# 1024x600 TN LCD display, mono speaker, 0.3 MP front camera, 2.0 MP
|
||||||
|
# rear camera, 3000 mAh battery, gt911 touchscreen, mma8452 accelerometer
|
||||||
|
# and rtl8188etv usb wifi. Has "power", "volume+" and "volume-" buttons
|
||||||
|
# (both volume buttons are also connected to the UBOOT_SEL pin). The
|
||||||
|
# external connectors are represented by MicroSD slot, MiniHDMI, MicroUSB
|
||||||
|
# OTG and 3.5mm headphone jack. More details are available at
|
||||||
|
# http://linux-sunxi.org/MSI_Primo73
|
||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
|
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
|
||||||
CONFIG_FDTFILE="sun7i-a20-primo73.dtb"
|
CONFIG_FDTFILE="sun7i-a20-primo73.dtb"
|
||||||
@ -10,7 +18,6 @@ CONFIG_USB_KEYBOARD=n
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN7I=y
|
+S:CONFIG_MACH_SUN7I=y
|
||||||
+S:CONFIG_TARGET_MSI_PRIMO73=y
|
|
||||||
+S:CONFIG_DRAM_CLK=384
|
+S:CONFIG_DRAM_CLK=384
|
||||||
+S:CONFIG_DRAM_ZQ=127
|
+S:CONFIG_DRAM_ZQ=127
|
||||||
+S:CONFIG_DRAM_EMR1=4
|
+S:CONFIG_DRAM_EMR1=4
|
||||||
|
@ -7,7 +7,6 @@ CONFIG_VIDEO_VGA=y
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN7I=y
|
+S:CONFIG_MACH_SUN7I=y
|
||||||
+S:CONFIG_TARGET_MELE_M3=y
|
|
||||||
+S:CONFIG_DRAM_CLK=384
|
+S:CONFIG_DRAM_CLK=384
|
||||||
+S:CONFIG_DRAM_ZQ=127
|
+S:CONFIG_DRAM_ZQ=127
|
||||||
+S:CONFIG_DRAM_EMR1=4
|
+S:CONFIG_DRAM_EMR1=4
|
||||||
|
@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN7I=y
|
+S:CONFIG_MACH_SUN7I=y
|
||||||
+S:CONFIG_TARGET_I12_TVBOX=y
|
|
||||||
+S:CONFIG_DRAM_CLK=384
|
+S:CONFIG_DRAM_CLK=384
|
||||||
+S:CONFIG_DRAM_ZQ=127
|
+S:CONFIG_DRAM_ZQ=127
|
||||||
+S:CONFIG_DRAM_EMR1=4
|
+S:CONFIG_DRAM_EMR1=4
|
||||||
|
@ -5,7 +5,6 @@ CONFIG_USB1_VBUS_PIN="PB10"
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN5I=y
|
+S:CONFIG_MACH_SUN5I=y
|
||||||
+S:CONFIG_TARGET_MK802_A10S=y
|
|
||||||
+S:CONFIG_DRAM_CLK=432
|
+S:CONFIG_DRAM_CLK=432
|
||||||
+S:CONFIG_DRAM_ZQ=123
|
+S:CONFIG_DRAM_ZQ=123
|
||||||
+S:CONFIG_DRAM_EMR1=0
|
+S:CONFIG_DRAM_EMR1=0
|
||||||
|
@ -5,7 +5,6 @@ CONFIG_USB1_VBUS_PIN="PG13"
|
|||||||
+S:CONFIG_ARM=y
|
+S:CONFIG_ARM=y
|
||||||
+S:CONFIG_ARCH_SUNXI=y
|
+S:CONFIG_ARCH_SUNXI=y
|
||||||
+S:CONFIG_MACH_SUN5I=y
|
+S:CONFIG_MACH_SUN5I=y
|
||||||
+S:CONFIG_TARGET_R7DONGLE=y
|
|
||||||
+S:CONFIG_DRAM_CLK=384
|
+S:CONFIG_DRAM_CLK=384
|
||||||
+S:CONFIG_DRAM_ZQ=123
|
+S:CONFIG_DRAM_ZQ=123
|
||||||
+S:CONFIG_DRAM_EMR1=4
|
+S:CONFIG_DRAM_EMR1=4
|
||||||
|
Loading…
Reference in New Issue
Block a user