Remove unneeded CONFIG_SHELL references

Make should be using the bash shell by default which makes
CONFIG_SHELL unnecessary

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

diff --git a/Makefile b/Makefile
index 913fd16e1167995f0915d48cd5ebe591d45f9d75..4dafd2ba17b9a6fd05e03bcacfe4989e4b00a72b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -374,8 +374,7 @@ $(U_BOOT_ONENAND):  $(ONENAND_IPL) $(obj)u-boot.bin $(obj)include/autoconf.mk
 
 $(VERSION_FILE):
                @( printf '#define U_BOOT_VERSION "U-Boot %s%s"\n' "$(U_BOOT_VERSION)" \
-                '$(shell $(CONFIG_SHELL) $(TOPDIR)/tools/setlocalversion $(TOPDIR))' \
-                ) > $@.tmp
+                '$(shell $(TOPDIR)/tools/setlocalversion $(TOPDIR))' ) > $@.tmp
                @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
 
 $(TIMESTAMP_FILE):

diff --git a/config.mk b/config.mk
index 5a9334c6f6c8982beb195e67054e0a7272b495da..d770f09f93a9d002995cbee1c82822629e77778e 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -46,10 +46,6 @@ PLATFORM_LDFLAGS =
 
 #########################################################################
 
-CONFIG_SHELL   := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
-                   else if [ -x /bin/bash ]; then echo /bin/bash; \
-                   else echo sh; fi ; fi)
-
 ifeq ($(HOSTOS)-$(HOSTARCH),darwin-ppc)
 HOSTCC         = cc
 else
@@ -204,9 +200,8 @@ endif
 
 #########################################################################
 
-export CONFIG_SHELL HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE \
-       AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP \
-       MAKE
+export HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE \
+       AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP MAKE
 export TEXT_BASE PLATFORM_CPPFLAGS PLATFORM_RELFLAGS CPPFLAGS CFLAGS AFLAGS
 
 #########################################################################