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>
This commit is contained in:
parent
cf7a7b9979
commit
434c51a5e6
3
Makefile
3
Makefile
|
@ -374,8 +374,7 @@ $(U_BOOT_ONENAND): $(ONENAND_IPL) $(obj)u-boot.bin $(obj)include/autoconf.mk
|
||||||
|
|
||||||
$(VERSION_FILE):
|
$(VERSION_FILE):
|
||||||
@( printf '#define U_BOOT_VERSION "U-Boot %s%s"\n' "$(U_BOOT_VERSION)" \
|
@( printf '#define U_BOOT_VERSION "U-Boot %s%s"\n' "$(U_BOOT_VERSION)" \
|
||||||
'$(shell $(CONFIG_SHELL) $(TOPDIR)/tools/setlocalversion $(TOPDIR))' \
|
'$(shell $(TOPDIR)/tools/setlocalversion $(TOPDIR))' ) > $@.tmp
|
||||||
) > $@.tmp
|
|
||||||
@cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
|
@cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
|
||||||
|
|
||||||
$(TIMESTAMP_FILE):
|
$(TIMESTAMP_FILE):
|
||||||
|
|
|
@ -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)
|
ifeq ($(HOSTOS)-$(HOSTARCH),darwin-ppc)
|
||||||
HOSTCC = cc
|
HOSTCC = cc
|
||||||
else
|
else
|
||||||
|
@ -204,9 +200,8 @@ endif
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
|
|
||||||
export CONFIG_SHELL HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE \
|
export HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE \
|
||||||
AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP \
|
AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP MAKE
|
||||||
MAKE
|
|
||||||
export TEXT_BASE PLATFORM_CPPFLAGS PLATFORM_RELFLAGS CPPFLAGS CFLAGS AFLAGS
|
export TEXT_BASE PLATFORM_CPPFLAGS PLATFORM_RELFLAGS CPPFLAGS CFLAGS AFLAGS
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
|
|
Loading…
Reference in New Issue