Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 98e214dde38c9656fa75c2284328f0a28453026e

Authored by Ian Campbell
1 parent f01b6cdd60
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

sunxi: Correct typo CONFIG_FTDFILE => CONFIG_FDTFILE 

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" ]

Showing 23 changed files with 24 additions and 24 deletions Side-by-side Diff

... ... @@ -36,8 +36,8 @@
36 36 string
37 37 default "sunxi"
38 38  
39   -config FTDFILE
40   - string "Default ftdfile env setting for this board"
  39 +config FDTFILE
  40 + string "Default fdtfile env setting for this board"
41 41  
42 42 endif
configs/A10-OLinuXino-Lime_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="A10_OLINUXINO_L,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
3   -CONFIG_FTDFILE="sun4i-a10-olinuxino-lime.dtb"
  3 +CONFIG_FDTFILE="sun4i-a10-olinuxino-lime.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN4I=y
configs/A10s-OLinuXino-M_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="A10S_OLINUXINO_M,AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10)"
3   -CONFIG_FTDFILE="sun5i-a10s-olinuxino-micro.dtb"
  3 +CONFIG_FDTFILE="sun5i-a10s-olinuxino-micro.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN5I=y
configs/A13-OLinuXinoM_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINOM,CONS_INDEX=2,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
3   -CONFIG_FTDFILE="sun5i-a13-olinuxino-micro.dtb"
  3 +CONFIG_FDTFILE="sun5i-a13-olinuxino-micro.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN5I=y
configs/A13-OLinuXino_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINO,CONS_INDEX=2,AXP209_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
3   -CONFIG_FTDFILE="sun5i-a13-olinuxino.dtb"
  3 +CONFIG_FDTFILE="sun5i-a13-olinuxino.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN5I=y
configs/A20-OLinuXino_MICRO_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_M,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-olinuxino-micro.dtb"
  3 +CONFIG_FDTFILE="sun7i-a20-olinuxino-micro.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/Auxtek-T004_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="AUXTEK_T004,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
3   -CONFIG_FTDFILE="sun5i-a10s-auxtek-t004.dtb"
  3 +CONFIG_FDTFILE="sun5i-a10s-auxtek-t004.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN5I=y
configs/Bananapi_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="BANANAPI,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-bananapi.dtb"
  3 +CONFIG_FDTFILE="sun7i-a20-bananapi.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/Cubieboard2_FEL_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-cubieboard2.dtb"
  3 +CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/Cubieboard2_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-cubieboard2.dtb"
  3 +CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/Cubieboard_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
3   -CONFIG_FTDFILE="sun4i-a10-cubieboard.dtb"
  3 +CONFIG_FDTFILE="sun4i-a10-cubieboard.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN4I=y
configs/Cubietruck_FEL_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-cubietruck.dtb"
  3 +CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/Cubietruck_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-cubietruck.dtb"
  3 +CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/Linksprite_pcDuino3_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="PCDUINO3,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-pcduino3.dtb"
  3 +CONFIG_FDTFILE="sun7i-a20-pcduino3.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/Mele_A1000G_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000G,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
3   -CONFIG_FTDFILE="sun4i-a10-a1000.dtb"
  3 +CONFIG_FDTFILE="sun4i-a10-a1000.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN4I=y
configs/Mele_A1000_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
3   -CONFIG_FTDFILE="sun4i-a10-a1000.dtb"
  3 +CONFIG_FDTFILE="sun4i-a10-a1000.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN4I=y
configs/Mini-X-1Gb_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="MINI_X_1GB,AXP209_POWER,USB_EHCI"
3   -CONFIG_FTDFILE="sun4i-a10-mini-xplus.dtb"
  3 +CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN4I=y
configs/Mini-X_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="MINI_X,AXP209_POWER,USB_EHCI"
3   -CONFIG_FTDFILE="sun4i-a10-mini-xplus.dtb"
  3 +CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN4I=y
configs/ba10_tv_box_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12)"
3   -CONFIG_FTDFILE="sun4i-a10-ba10-tvbox.dtb"
  3 +CONFIG_FDTFILE="sun4i-a10-ba10-tvbox.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN4I=y
configs/i12-tvbox_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="I12_TVBOX,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-i12-tvbox.dtb"
  3 +CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/qt840a_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="QT840A,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-i12-tvbox.dtb"
  3 +CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/r7-tv-dongle_defconfig
Diff comments   View file @ 98e214d
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="R7DONGLE,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
3   -CONFIG_FTDFILE="sun5i-a10s-r7-tv-dongle.dtb"
  3 +CONFIG_FDTFILE="sun5i-a10s-r7-tv-dongle.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN5I=y
include/configs/sunxi-common.h
Diff comments   View file @ 98e214d
... ... @@ -244,7 +244,7 @@
244 244  
245 245 #define CONFIG_EXTRA_ENV_SETTINGS \
246 246 MEM_LAYOUT_ENV_SETTINGS \
247   - "fdtfile=" CONFIG_FTDFILE "FILE "\0" \" \
  247 + "fdtfile=" CONFIG_FDTFILE "FILE "\0" \" \
248 248 "console=ttyS0,115200\0" \
249 249 BOOTENV
250 250