diff options
author | Milton Miller <miltonm@bga.com> | 2007-10-20 03:58:03 -0500 |
---|---|---|
committer | Sam Ravnborg <sam@neptun.(none)> | 2007-10-20 20:35:23 +0200 |
commit | 437374e9a95062fe310b901e48585691edaf5dd0 (patch) | |
tree | a3cc09f88beb6114d920a20c938640fac9a99796 | |
parent | a54bb701c248d65f761d366f94f2809abdc39f04 (diff) | |
download | op-kernel-dev-437374e9a95062fe310b901e48585691edaf5dd0.zip op-kernel-dev-437374e9a95062fe310b901e48585691edaf5dd0.tar.gz |
kbuild: restore arch/{ppc/xtensa}/boot cflags
Commit 9a39e273d4df0560c724c5fe71f6314a0583ca2b removed the boot directory
addition to CFLAGS that was being used by the subdirectory builds. For the
other files, that patch set EXTRA_CFLAGS, but Makefile.build explicitly
sets that to empty as it is explicitly for a single directory only.
Append to KBUILD_CFLAGS instead.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r-- | arch/ppc/boot/Makefile | 2 | ||||
-rw-r--r-- | arch/xtensa/boot/Makefile | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/ppc/boot/Makefile b/arch/ppc/boot/Makefile index 487dc66..500497e 100644 --- a/arch/ppc/boot/Makefile +++ b/arch/ppc/boot/Makefile @@ -13,6 +13,8 @@ # modified by Cort (cort@cs.nmt.edu) # +# KBUILD_CFLAGS used when building rest of boot (takes effect recursively) +KBUILD_CFLAGS += -fno-builtin -D__BOOTER__ -Iarch/$(ARCH)/boot/include HOSTCFLAGS += -Iarch/$(ARCH)/boot/include BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile index 9c5185f..40aa55b 100644 --- a/arch/xtensa/boot/Makefile +++ b/arch/xtensa/boot/Makefile @@ -8,7 +8,8 @@ # -EXTRA_CFLAGS += -fno-builtin -Iarch/$(ARCH)/boot/include +# KBUILD_CFLAGS used when building rest of boot (takes effect recursively) +KBUILD_CFLAGS += -fno-builtin -Iarch/$(ARCH)/boot/include HOSTFLAGS += -Iarch/$(ARCH)/boot/include BIG_ENDIAN := $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#") |