diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-08-30 21:06:33 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-08-30 21:06:33 +0200 |
| commit | 80f9963207ab876c7bcab0e729a1b074f0acc2b0 (patch) | |
| tree | c764386c8c67643c2c1d37945f274d2c5e82767e /Makefile | |
| parent | 3d5d2279c0c5d3a7e83f94d98434c1cf29e35311 (diff) | |
| parent | 0d35c3c8a0c2a1f1ff06eac20a12af0186753bc4 (diff) | |
| download | barebox-80f9963207ab876c7bcab0e729a1b074f0acc2b0.tar.gz barebox-80f9963207ab876c7bcab0e729a1b074f0acc2b0.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -290,7 +290,7 @@ LINUXINCLUDE := -Iinclude \ $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \ -I$(srctree)/arch/$(ARCH)/include \ -I$(objtree)/arch/$(ARCH)/include \ - -include include/linux/autoconf.h + -include include/generated/autoconf.h CPPFLAGS := -D__KERNEL__ -D__BAREBOX__ $(LINUXINCLUDE) -fno-builtin -ffreestanding @@ -305,7 +305,7 @@ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION -export ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC +export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS @@ -978,7 +978,7 @@ CLEAN_FILES += barebox System.map include/barebox_default_env.h \ # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config include2 usr/include MRPROPER_FILES += .config .config.old include/asm .version .old_version \ - include/linux/autoconf.h include/linux/version.h \ + include/generated/autoconf.h include/linux/version.h \ include/linux/utsrelease.h include/config.h \ Module.symvers tags TAGS cscope* |