Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sunxi: Remove CONFIG_TARGET_FOO for sun4i, sun6i and sun8i boards

Browse Source 
CONFIG_TARGET_FOO is 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), iow it is not used
at all on any sun4i, sun6i and sun8i boards so lets get rid of it there.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
master
Hans de Goede 10 years ago
parent 2ddd8012f5
commit 6915270871
12 changed files with 9 additions and 64 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 53
      board/sunxi/Kconfig
  2. 1
      configs/A10-OLinuXino-Lime_defconfig
  3. 1
      configs/CSQ_CS908_defconfig
  4. 1
      configs/Colombus_defconfig
  5. 1
      configs/Cubieboard_defconfig
  6. 1
      configs/Hummingbird_A31_defconfig
  7. 1
      configs/Linksprite_pcDuino_defconfig
  8. 10
      configs/MSI_Primo81_defconfig
  9. 1
      configs/Mele_A1000_defconfig
  10. 1
      configs/Mele_M9_defconfig
  11. 1
      configs/Mini-X_defconfig
  12. 1
      configs/ba10_tv_box_defconfig

53
board/sunxi/Kconfig
Unescape View File

@ -70,10 +70,6 @@ config SYS_CONFIG_NAME
choice
prompt "Board"
config TARGET_A10_OLINUXINO_L
bool "A10_OLINUXINO_L"
depends on MACH_SUN4I
config TARGET_A10S_OLINUXINO_M
bool "A10S_OLINUXINO_M"
depends on MACH_SUN5I
@ -110,54 +106,22 @@ config TARGET_BANANAPRO
bool "BANANAPRO"
depends on MACH_SUN7I
config TARGET_COLOMBUS
bool "COLOMBUS"
depends on MACH_SUN6I
config TARGET_CUBIEBOARD2
bool "CUBIEBOARD2"
depends on MACH_SUN7I
config TARGET_CUBIEBOARD
bool "CUBIEBOARD"
depends on MACH_SUN4I
config TARGET_CUBIETRUCK
bool "CUBIETRUCK"
depends on MACH_SUN7I
config TARGET_HUMMINGBIRD_A31
bool "HUMMINGBIRD_A31"
depends on MACH_SUN6I
config TARGET_IPPO_Q8H_V5
bool "IPPO_Q8H_V5"
depends on MACH_SUN8I
config TARGET_PCDUINO
bool "PCDUINO"
depends on MACH_SUN4I
config TARGET_PCDUINO3
bool "PCDUINO3"
depends on MACH_SUN7I
config TARGET_MELE_A1000
bool "MELE_A1000"
depends on MACH_SUN4I
config TARGET_MELE_M3
bool "MELE_M3"
depends on MACH_SUN7I
config TARGET_MELE_M9
bool "MELE_M9"
depends on MACH_SUN6I
config TARGET_MINI_X
bool "MINI_X"
depends on MACH_SUN4I
config TARGET_MSI_PRIMO73
bool "MSI Primo73 (7\" tablet)"
depends on MACH_SUN7I
@ -171,23 +135,6 @@ config TARGET_MSI_PRIMO73
OTG and 3.5mm headphone jack. More details are available at
http://linux-sunxi.org/MSI_Primo73
config TARGET_MSI_PRIMO81
bool "MSI Primo81 (7.85\" tablet)"
depends on MACH_SUN6I
---help---
The MSI Primo81 is an A31s based tablet, with 1G RAM, 16G NAND,
1024x768 IPS LCD display, mono speaker, 0.3 MP front camera, 2.0 MP
rear camera, 3500 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_Primo81
config TARGET_BA10_TV_BOX
bool "BA10_TV_BOX"
depends on MACH_SUN4I
config TARGET_I12_TVBOX
bool "I12_TVBOX"
depends on MACH_SUN7I

1
configs/A10-OLinuXino-Lime_defconfig
Unescape View File

@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun4i-a10-olinuxino-lime.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_MACH_SUN4I=y
+S:CONFIG_TARGET_A10_OLINUXINO_L=y
+S:CONFIG_DRAM_CLK=480
+S:CONFIG_DRAM_ZQ=123
+S:CONFIG_DRAM_EMR1=4

1
configs/CSQ_CS908_defconfig
Unescape View File

@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun6i-a31s-cs908.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_MACH_SUN6I=y
+S:CONFIG_TARGET_CSQ_CS908=y
+S:CONFIG_DRAM_CLK=432
+S:CONFIG_DRAM_ZQ=123
# Ethernet phy power

1
configs/Colombus_defconfig
Unescape View File

@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun6i-a31-colombus.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_MACH_SUN6I=y
+S:CONFIG_TARGET_COLOMBUS=y
+S:CONFIG_DRAM_CLK=240
+S:CONFIG_DRAM_ZQ=251
# Wifi power

1
configs/Cubieboard_defconfig
Unescape View File

@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun4i-a10-cubieboard.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_MACH_SUN4I=y
+S:CONFIG_TARGET_CUBIEBOARD=y
+S:CONFIG_DRAM_CLK=480
+S:CONFIG_DRAM_ZQ=123
+S:CONFIG_DRAM_EMR1=0

1
configs/Hummingbird_A31_defconfig
Unescape View File

@ -6,7 +6,6 @@ CONFIG_VIDEO_VGA_EXTERNAL_DAC_EN="PH25"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_MACH_SUN6I=y
+S:CONFIG_TARGET_HUMMINGBIRD_A31=y
+S:CONFIG_DRAM_CLK=312
+S:CONFIG_DRAM_ZQ=251
# Wifi power

1
configs/Linksprite_pcDuino_defconfig
Unescape View File

@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun4i-a10-pcduino.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_MACH_SUN4I=y
+S:CONFIG_TARGET_PCDUINO=y
+S:CONFIG_DRAM_CLK=408
+S:CONFIG_DRAM_ZQ=123
+S:CONFIG_DRAM_EMR1=0

10
configs/MSI_Primo81_defconfig
Unescape View File

@ -1,3 +1,12 @@
# The MSI Primo81 is an A31s based tablet, with 1G RAM, 16G NAND,
# 1024x768 IPS LCD display, mono speaker, 0.3 MP front camera, 2.0 MP
# rear camera, 3500 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_Primo81
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS=""
CONFIG_FDTFILE="sun6i-a31s-primo81.dtb"
@ -5,7 +14,6 @@ CONFIG_USB_KEYBOARD=n
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_MACH_SUN6I=y
+S:CONFIG_TARGET_MSI_PRIMO81=y
+S:CONFIG_DRAM_CLK=360
+S:CONFIG_DRAM_ZQ=122
# Wifi power

1
configs/Mele_A1000_defconfig
Unescape View File

@ -5,7 +5,6 @@ CONFIG_VIDEO_VGA=y
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_MACH_SUN4I=y
+S:CONFIG_TARGET_MELE_A1000=y
+S:CONFIG_DRAM_CLK=360
+S:CONFIG_DRAM_ZQ=123
+S:CONFIG_DRAM_EMR1=0

1
configs/Mele_M9_defconfig
Unescape View File

@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun6i-a31-m9.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_MACH_SUN6I=y
+S:CONFIG_TARGET_MELE_M9=y
+S:CONFIG_DRAM_CLK=312
+S:CONFIG_DRAM_ZQ=120
# The Mele M9 uses 3.3V for general IO

1
configs/Mini-X_defconfig
Unescape View File

@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_MACH_SUN4I=y
+S:CONFIG_TARGET_MINI_X=y
+S:CONFIG_DRAM_CLK=360
+S:CONFIG_DRAM_ZQ=123
+S:CONFIG_DRAM_EMR1=0

1
configs/ba10_tv_box_defconfig
Unescape View File

@ -5,7 +5,6 @@ CONFIG_USB2_VBUS_PIN="PH12"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_MACH_SUN4I=y
+S:CONFIG_TARGET_BA10_TV_BOX=y
+S:CONFIG_DRAM_CLK=384
+S:CONFIG_DRAM_ZQ=123
+S:CONFIG_DRAM_EMR1=4

Write Preview
Loading…
Cancel
Save