Commit f01b6cdd6009cf4973c72936775d37ada0decb62
Committed by
Ian Campbell
1 parent
d6c1ffc7d2
Exists in
v2017.01-smarct4x
and in
37 other branches
kconfig: remove redundant "SPL" from CONFIG_SYS_EXTRA_OPTIONS
CONFIG_SPL is defined as a primary option in Kconfig. It should not be added to CONFIG_SYS_EXTRA_OPTIONS. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
Showing 20 changed files with 20 additions and 20 deletions Side-by-side Diff
- configs/A10-OLinuXino-Lime_defconfig
- configs/A10s-OLinuXino-M_defconfig
- configs/A13-OLinuXinoM_defconfig
- configs/A13-OLinuXino_defconfig
- configs/A20-OLinuXino_MICRO_defconfig
- configs/Auxtek-T004_defconfig
- configs/Bananapi_defconfig
- configs/Cubieboard2_defconfig
- configs/Cubieboard_defconfig
- configs/Cubietruck_defconfig
- configs/Linksprite_pcDuino3_defconfig
- configs/Mele_A1000G_defconfig
- configs/Mele_A1000_defconfig
- configs/Mini-X-1Gb_defconfig
- configs/Mini-X_defconfig
- configs/ba10_tv_box_defconfig
- configs/gwventana_defconfig
- configs/i12-tvbox_defconfig
- configs/qt840a_defconfig
- configs/r7-tv-dongle_defconfig
configs/A10-OLinuXino-Lime_defconfig
1 | 1 | CONFIG_SPL=y |
2 | -CONFIG_SYS_EXTRA_OPTIONS="A10_OLINUXINO_L,SPL,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI" | |
2 | +CONFIG_SYS_EXTRA_OPTIONS="A10_OLINUXINO_L,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI" | |
3 | 3 | CONFIG_FTDFILE="sun4i-a10-olinuxino-lime.dtb" |
4 | 4 | +S:CONFIG_ARM=y |
5 | 5 | +S:CONFIG_TARGET_SUN4I=y |
configs/A10s-OLinuXino-M_defconfig
1 | 1 | CONFIG_SPL=y |
2 | -CONFIG_SYS_EXTRA_OPTIONS="A10S_OLINUXINO_M,SPL,AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10)" | |
2 | +CONFIG_SYS_EXTRA_OPTIONS="A10S_OLINUXINO_M,AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10)" | |
3 | 3 | CONFIG_FTDFILE="sun5i-a10s-olinuxino-micro.dtb" |
4 | 4 | +S:CONFIG_ARM=y |
5 | 5 | +S:CONFIG_TARGET_SUN5I=y |
configs/A13-OLinuXinoM_defconfig
1 | 1 | CONFIG_SPL=y |
2 | -CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINOM,SPL,CONS_INDEX=2,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)" | |
2 | +CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINOM,CONS_INDEX=2,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)" | |
3 | 3 | CONFIG_FTDFILE="sun5i-a13-olinuxino-micro.dtb" |
4 | 4 | +S:CONFIG_ARM=y |
5 | 5 | +S:CONFIG_TARGET_SUN5I=y |
configs/A13-OLinuXino_defconfig
1 | 1 | CONFIG_SPL=y |
2 | -CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINO,SPL,CONS_INDEX=2,AXP209_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)" | |
2 | +CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINO,CONS_INDEX=2,AXP209_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)" | |
3 | 3 | CONFIG_FTDFILE="sun5i-a13-olinuxino.dtb" |
4 | 4 | +S:CONFIG_ARM=y |
5 | 5 | +S:CONFIG_TARGET_SUN5I=y |
configs/A20-OLinuXino_MICRO_defconfig
1 | 1 | CONFIG_SPL=y |
2 | -CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_M,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" | |
2 | +CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_M,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" | |
3 | 3 | CONFIG_FTDFILE="sun7i-a20-olinuxino-micro.dtb" |
4 | 4 | +S:CONFIG_ARM=y |
5 | 5 | +S:CONFIG_TARGET_SUN7I=y |
configs/Auxtek-T004_defconfig
1 | 1 | CONFIG_SPL=y |
2 | -CONFIG_SYS_EXTRA_OPTIONS="AUXTEK_T004,SPL,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)" | |
2 | +CONFIG_SYS_EXTRA_OPTIONS="AUXTEK_T004,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)" | |
3 | 3 | CONFIG_FTDFILE="sun5i-a10s-auxtek-t004.dtb" |
4 | 4 | +S:CONFIG_ARM=y |
5 | 5 | +S:CONFIG_TARGET_SUN5I=y |
configs/Bananapi_defconfig
1 | 1 | CONFIG_SPL=y |
2 | -CONFIG_SYS_EXTRA_OPTIONS="BANANAPI,SPL,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI" | |
2 | +CONFIG_SYS_EXTRA_OPTIONS="BANANAPI,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI" | |
3 | 3 | CONFIG_FTDFILE="sun7i-a20-bananapi.dtb" |
4 | 4 | +S:CONFIG_ARM=y |
5 | 5 | +S:CONFIG_TARGET_SUN7I=y |
configs/Cubieboard2_defconfig
1 | 1 | CONFIG_SPL=y |
2 | -CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" | |
2 | +CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" | |
3 | 3 | CONFIG_FTDFILE="sun7i-a20-cubieboard2.dtb" |
4 | 4 | +S:CONFIG_ARM=y |
5 | 5 | +S:CONFIG_TARGET_SUN7I=y |
configs/Cubieboard_defconfig
1 | 1 | CONFIG_SPL=y |
2 | -CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,SPL,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" | |
2 | +CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" | |
3 | 3 | CONFIG_FTDFILE="sun4i-a10-cubieboard.dtb" |
4 | 4 | +S:CONFIG_ARM=y |
5 | 5 | +S:CONFIG_TARGET_SUN4I=y |
configs/Cubietruck_defconfig
1 | 1 | CONFIG_SPL=y |
2 | -CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI" | |
2 | +CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI" | |
3 | 3 | CONFIG_FTDFILE="sun7i-a20-cubietruck.dtb" |
4 | 4 | +S:CONFIG_ARM=y |
5 | 5 | +S:CONFIG_TARGET_SUN7I=y |
configs/Linksprite_pcDuino3_defconfig
1 | 1 | CONFIG_SPL=y |
2 | -CONFIG_SYS_EXTRA_OPTIONS="PCDUINO3,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI" | |
2 | +CONFIG_SYS_EXTRA_OPTIONS="PCDUINO3,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI" | |
3 | 3 | CONFIG_FTDFILE="sun7i-a20-pcduino3.dtb" |
4 | 4 | +S:CONFIG_ARM=y |
5 | 5 | +S:CONFIG_TARGET_SUN7I=y |
configs/Mele_A1000G_defconfig
1 | 1 | CONFIG_SPL=y |
2 | -CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000G,SPL,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI" | |
2 | +CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000G,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI" | |
3 | 3 | CONFIG_FTDFILE="sun4i-a10-a1000.dtb" |
4 | 4 | +S:CONFIG_ARM=y |
5 | 5 | +S:CONFIG_TARGET_SUN4I=y |
configs/Mele_A1000_defconfig
1 | 1 | CONFIG_SPL=y |
2 | -CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000,SPL,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI" | |
2 | +CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI" | |
3 | 3 | CONFIG_FTDFILE="sun4i-a10-a1000.dtb" |
4 | 4 | +S:CONFIG_ARM=y |
5 | 5 | +S:CONFIG_TARGET_SUN4I=y |
configs/Mini-X-1Gb_defconfig
configs/Mini-X_defconfig
configs/ba10_tv_box_defconfig
1 | 1 | CONFIG_SPL=y |
2 | -CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,SPL,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12)" | |
2 | +CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12)" | |
3 | 3 | CONFIG_FTDFILE="sun4i-a10-ba10-tvbox.dtb" |
4 | 4 | +S:CONFIG_ARM=y |
5 | 5 | +S:CONFIG_TARGET_SUN4I=y |
configs/gwventana_defconfig
configs/i12-tvbox_defconfig
1 | 1 | CONFIG_SPL=y |
2 | -CONFIG_SYS_EXTRA_OPTIONS="I12_TVBOX,SPL,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI" | |
2 | +CONFIG_SYS_EXTRA_OPTIONS="I12_TVBOX,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI" | |
3 | 3 | CONFIG_FTDFILE="sun7i-a20-i12-tvbox.dtb" |
4 | 4 | +S:CONFIG_ARM=y |
5 | 5 | +S:CONFIG_TARGET_SUN7I=y |
configs/qt840a_defconfig
configs/r7-tv-dongle_defconfig
1 | 1 | CONFIG_SPL=y |
2 | -CONFIG_SYS_EXTRA_OPTIONS="R7DONGLE,SPL,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)" | |
2 | +CONFIG_SYS_EXTRA_OPTIONS="R7DONGLE,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)" | |
3 | 3 | CONFIG_FTDFILE="sun5i-a10s-r7-tv-dongle.dtb" |
4 | 4 | +S:CONFIG_ARM=y |
5 | 5 | +S:CONFIG_TARGET_SUN5I=y |