From f01b6cdd6009cf4973c72936775d37ada0decb62 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sun, 31 Aug 2014 22:32:19 +0900 Subject: 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 Acked-by: Ian Campbell --- configs/A13-OLinuXino_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs/A13-OLinuXino_defconfig') diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index c3a12cc17d..d181cc069a 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINO,SPL,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" +S:CONFIG_ARM=y +S:CONFIG_TARGET_SUN5I=y -- cgit From 98e214dde38c9656fa75c2284328f0a28453026e Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Sun, 31 Aug 2014 13:13:43 +0100 Subject: 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 Signed-off-by: Ian Campbell Acked-by: Hans de Goede [ ijc -- s/Spotted-by/Reported-by/ and resolve conflict vs "remove redundant "SPL" from CONFIG_SYS_EXTRA_OPTIONS" ] --- configs/A13-OLinuXino_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs/A13-OLinuXino_defconfig') diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index d181cc069a..2c726f308a 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y 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_TARGET_SUN5I=y -- cgit