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

sunxi: Correct typo CONFIG_FTDFILE => CONFIG_FDTFILE

Browse Source 
Patch is the result of:
  sed -i -e 's/FTDFILE/FDTFILE/g' board/sunxi/Kconfig configs/* include/configs/sunxi-common.h
  sed -i -e 's/ftdfile/fdtfile/g' board/sunxi/Kconfig

Reported-by: Vagrant Cascadian <vagrant@debian.org>
Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Acked-by: Hans de Goede <hdegoede@redhat.com>
[ ijc -- s/Spotted-by/Reported-by/ and resolve conflict vs "remove
         redundant "SPL" from CONFIG_SYS_EXTRA_OPTIONS" ]
master
Ian Campbell 11 years ago
parent f01b6cdd60
commit 98e214dde3
23 changed files with 24 additions and 24 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. 4
      board/sunxi/Kconfig
  2. 2
      configs/A10-OLinuXino-Lime_defconfig
  3. 2
      configs/A10s-OLinuXino-M_defconfig
  4. 2
      configs/A13-OLinuXinoM_defconfig
  5. 2
      configs/A13-OLinuXino_defconfig
  6. 2
      configs/A20-OLinuXino_MICRO_defconfig
  7. 2
      configs/Auxtek-T004_defconfig
  8. 2
      configs/Bananapi_defconfig
  9. 2
      configs/Cubieboard2_FEL_defconfig
  10. 2
      configs/Cubieboard2_defconfig
  11. 2
      configs/Cubieboard_defconfig
  12. 2
      configs/Cubietruck_FEL_defconfig
  13. 2
      configs/Cubietruck_defconfig
  14. 2
      configs/Linksprite_pcDuino3_defconfig
  15. 2
      configs/Mele_A1000G_defconfig
  16. 2
      configs/Mele_A1000_defconfig
  17. 2
      configs/Mini-X-1Gb_defconfig
  18. 2
      configs/Mini-X_defconfig
  19. 2
      configs/ba10_tv_box_defconfig
  20. 2
      configs/i12-tvbox_defconfig
  21. 2
      configs/qt840a_defconfig
  22. 2
      configs/r7-tv-dongle_defconfig
  23. 2
      include/configs/sunxi-common.h

4
board/sunxi/Kconfig
Unescape View File

@ -36,7 +36,7 @@ config SYS_SOC
string string
default "sunxi" default "sunxi"
config FTDFILE config FDTFILE
string "Default ftdfile env setting for this board" string "Default fdtfile env setting for this board"
endif endif

2
configs/A10-OLinuXino-Lime_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="A10_OLINUXINO_L,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="A10_OLINUXINO_L,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
CONFIG_FTDFILE="sun4i-a10-olinuxino-lime.dtb" CONFIG_FDTFILE="sun4i-a10-olinuxino-lime.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN4I=y +S:CONFIG_TARGET_SUN4I=y

2
configs/A10s-OLinuXino-M_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="A10S_OLINUXINO_M,AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10)" CONFIG_SYS_EXTRA_OPTIONS="A10S_OLINUXINO_M,AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10)"
CONFIG_FTDFILE="sun5i-a10s-olinuxino-micro.dtb" CONFIG_FDTFILE="sun5i-a10s-olinuxino-micro.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN5I=y +S:CONFIG_TARGET_SUN5I=y

2
configs/A13-OLinuXinoM_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINOM,CONS_INDEX=2,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)" CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINOM,CONS_INDEX=2,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
CONFIG_FTDFILE="sun5i-a13-olinuxino-micro.dtb" CONFIG_FDTFILE="sun5i-a13-olinuxino-micro.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN5I=y +S:CONFIG_TARGET_SUN5I=y

2
configs/A13-OLinuXino_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINO,CONS_INDEX=2,AXP209_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)" CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINO,CONS_INDEX=2,AXP209_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
CONFIG_FTDFILE="sun5i-a13-olinuxino.dtb" CONFIG_FDTFILE="sun5i-a13-olinuxino.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN5I=y +S:CONFIG_TARGET_SUN5I=y

2
configs/A20-OLinuXino_MICRO_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_M,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_M,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-olinuxino-micro.dtb" CONFIG_FDTFILE="sun7i-a20-olinuxino-micro.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

2
configs/Auxtek-T004_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AUXTEK_T004,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)" CONFIG_SYS_EXTRA_OPTIONS="AUXTEK_T004,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
CONFIG_FTDFILE="sun5i-a10s-auxtek-t004.dtb" CONFIG_FDTFILE="sun5i-a10s-auxtek-t004.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN5I=y +S:CONFIG_TARGET_SUN5I=y

2
configs/Bananapi_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BANANAPI,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="BANANAPI,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-bananapi.dtb" CONFIG_FDTFILE="sun7i-a20-bananapi.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

2
configs/Cubieboard2_FEL_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-cubieboard2.dtb" CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

2
configs/Cubieboard2_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-cubieboard2.dtb" CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

2
configs/Cubieboard_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
CONFIG_FTDFILE="sun4i-a10-cubieboard.dtb" CONFIG_FDTFILE="sun4i-a10-cubieboard.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN4I=y +S:CONFIG_TARGET_SUN4I=y

2
configs/Cubietruck_FEL_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-cubietruck.dtb" CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

2
configs/Cubietruck_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-cubietruck.dtb" CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

2
configs/Linksprite_pcDuino3_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PCDUINO3,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="PCDUINO3,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-pcduino3.dtb" CONFIG_FDTFILE="sun7i-a20-pcduino3.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

2
configs/Mele_A1000G_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000G,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000G,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
CONFIG_FTDFILE="sun4i-a10-a1000.dtb" CONFIG_FDTFILE="sun4i-a10-a1000.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN4I=y +S:CONFIG_TARGET_SUN4I=y

2
configs/Mele_A1000_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
CONFIG_FTDFILE="sun4i-a10-a1000.dtb" CONFIG_FDTFILE="sun4i-a10-a1000.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN4I=y +S:CONFIG_TARGET_SUN4I=y

2
configs/Mini-X-1Gb_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MINI_X_1GB,AXP209_POWER,USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="MINI_X_1GB,AXP209_POWER,USB_EHCI"
CONFIG_FTDFILE="sun4i-a10-mini-xplus.dtb" CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN4I=y +S:CONFIG_TARGET_SUN4I=y

2
configs/Mini-X_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MINI_X,AXP209_POWER,USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="MINI_X,AXP209_POWER,USB_EHCI"
CONFIG_FTDFILE="sun4i-a10-mini-xplus.dtb" CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN4I=y +S:CONFIG_TARGET_SUN4I=y

2
configs/ba10_tv_box_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12)" CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12)"
CONFIG_FTDFILE="sun4i-a10-ba10-tvbox.dtb" CONFIG_FDTFILE="sun4i-a10-ba10-tvbox.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN4I=y +S:CONFIG_TARGET_SUN4I=y

2
configs/i12-tvbox_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="I12_TVBOX,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="I12_TVBOX,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-i12-tvbox.dtb" CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

2
configs/qt840a_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="QT840A,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI" CONFIG_SYS_EXTRA_OPTIONS="QT840A,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
CONFIG_FTDFILE="sun7i-a20-i12-tvbox.dtb" CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN7I=y +S:CONFIG_TARGET_SUN7I=y

2
configs/r7-tv-dongle_defconfig
Unescape View File

@ -1,5 +1,5 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="R7DONGLE,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)" CONFIG_SYS_EXTRA_OPTIONS="R7DONGLE,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
CONFIG_FTDFILE="sun5i-a10s-r7-tv-dongle.dtb" CONFIG_FDTFILE="sun5i-a10s-r7-tv-dongle.dtb"
+S:CONFIG_ARM=y +S:CONFIG_ARM=y
+S:CONFIG_TARGET_SUN5I=y +S:CONFIG_TARGET_SUN5I=y

2
include/configs/sunxi-common.h
Unescape View File

@ -244,7 +244,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
MEM_LAYOUT_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \
"fdtfile=" CONFIG_FTDFILE "\0" \ "fdtfile=" CONFIG_FDTFILE "\0" \
"console=ttyS0,115200\0" \ "console=ttyS0,115200\0" \
BOOTENV BOOTENV

Write Preview
Loading…
Cancel
Save