diff options
| author | Milton Miller <miltonm@bga.com> | 2007-10-20 04:58:03 -0400 |
|---|---|---|
| committer | Sam Ravnborg <sam@neptun.(none)> | 2007-10-20 14:35:23 -0400 |
| commit | 437374e9a95062fe310b901e48585691edaf5dd0 (patch) | |
| tree | a3cc09f88beb6114d920a20c938640fac9a99796 | |
| parent | a54bb701c248d65f761d366f94f2809abdc39f04 (diff) | |
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 487dc66dcc74..500497e3c72d 100644 --- a/arch/ppc/boot/Makefile +++ b/arch/ppc/boot/Makefile | |||
| @@ -13,6 +13,8 @@ | |||
| 13 | # modified by Cort (cort@cs.nmt.edu) | 13 | # modified by Cort (cort@cs.nmt.edu) |
| 14 | # | 14 | # |
| 15 | 15 | ||
| 16 | # KBUILD_CFLAGS used when building rest of boot (takes effect recursively) | ||
| 17 | KBUILD_CFLAGS += -fno-builtin -D__BOOTER__ -Iarch/$(ARCH)/boot/include | ||
| 16 | HOSTCFLAGS += -Iarch/$(ARCH)/boot/include | 18 | HOSTCFLAGS += -Iarch/$(ARCH)/boot/include |
| 17 | 19 | ||
| 18 | BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd | 20 | BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd |
diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile index 9c5185f605b6..40aa55b485be 100644 --- a/arch/xtensa/boot/Makefile +++ b/arch/xtensa/boot/Makefile | |||
| @@ -8,7 +8,8 @@ | |||
| 8 | # | 8 | # |
| 9 | 9 | ||
| 10 | 10 | ||
| 11 | EXTRA_CFLAGS += -fno-builtin -Iarch/$(ARCH)/boot/include | 11 | # KBUILD_CFLAGS used when building rest of boot (takes effect recursively) |
| 12 | KBUILD_CFLAGS += -fno-builtin -Iarch/$(ARCH)/boot/include | ||
| 12 | HOSTFLAGS += -Iarch/$(ARCH)/boot/include | 13 | HOSTFLAGS += -Iarch/$(ARCH)/boot/include |
| 13 | 14 | ||
| 14 | BIG_ENDIAN := $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#") | 15 | BIG_ENDIAN := $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#") |