From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Fri, 13 Mar 2015 09:08:54 +0000 (+0900)
Subject: kbuild: remove "*_felconfig" target
X-Git-Tag: v2015.04-rc5~50
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=97ec89e5012510ca0d86e994740eab2e697dd047;p=u-boot

kbuild: remove "*_felconfig" target

This target was added by commit cbdd9a9737cc (sunxi: kconfig: Add
%_felconfig rule to enable FEL build of sunxi platforms.).

At that time, U-Boot used separate .config files for U-Boot proper
and SPL.  I understood the pain to modify both .config and
spl/.config.

Now, we have switched to single .config configuration.
It seems acceptable to run "make menuconfig" or friends to enable
CONFIG_SPL_FEL, as we do for other CONFIGs.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Ian Campbell <ijc@hellion.org.uk>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/scripts/multiconfig.sh b/scripts/multiconfig.sh
index cc8a787f88..9c6b256349 100755
--- a/scripts/multiconfig.sh
+++ b/scripts/multiconfig.sh
@@ -70,16 +70,6 @@ do_board_defconfig () {
 	cleanup_after_defconfig
 }
 
-do_board_felconfig () {
-    do_board_defconfig ${1%%_felconfig}_defconfig
-    if ! grep -q CONFIG_ARCH_SUNXI=y .config || ! grep -q CONFIG_SPL=y .config ; then
-	echo "$progname: Cannot felconfig a non-sunxi or non-SPL platform" >&2
-	exit 1
-    fi
-    sed -i -e 's/\# CONFIG_SPL_FEL is not set/CONFIG_SPL_FEL=y\nCONFIG_UART0_PORT_F=n/g' \
-	.config
-}
-
 do_others () {
 	run_make_config $1
 }
@@ -90,8 +80,6 @@ target=$1
 case $target in
 *_defconfig)
 	do_board_defconfig $target;;
-*_felconfig)
-	do_board_felconfig $target;;
 *_config)
 	# backward compatibility
 	do_board_defconfig ${target%_config}_defconfig;;