summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSam Ravnborg <sam@neptun.(none)>2007-10-16 23:50:33 +0200
committerSam Ravnborg <sam@neptun.(none)>2007-10-16 23:50:33 +0200
commit7eebb9348655b55553d65fc7cb6cfad292d28dbb (patch)
tree1990473960655295b9d368bce0c1e976a6984bbf /arch
parentf77bf01425b11947eeb3b5b54685212c302741b8 (diff)
downloadkernel-crypto-7eebb9348655b55553d65fc7cb6cfad292d28dbb.tar.gz
kernel-crypto-7eebb9348655b55553d65fc7cb6cfad292d28dbb.tar.xz
kernel-crypto-7eebb9348655b55553d65fc7cb6cfad292d28dbb.zip
x86: fix boot error introduced by kbuild
x86 uses target specific assignment of EXTRA_AFLAGS, EXTRA_CFLAGS - this caused troubles with introducing asflags-y, ccflags-y. Fixed the target specific assignments in arch/x86/boot/Makefile and auditted the rest of the kernel for similar usage. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/boot/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index d6ed8e5e1cc..e8756e5f6b2 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -64,10 +64,10 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
$(obj)/zImage: IMAGE_OFFSET := 0x1000
-$(obj)/zImage: EXTRA_AFLAGS := $(SVGA_MODE) $(RAMDISK)
+$(obj)/zImage: asflags-y := $(SVGA_MODE) $(RAMDISK)
$(obj)/bzImage: IMAGE_OFFSET := 0x100000
-$(obj)/bzImage: EXTRA_CFLAGS := -D__BIG_KERNEL__
-$(obj)/bzImage: EXTRA_AFLAGS := $(SVGA_MODE) $(RAMDISK) -D__BIG_KERNEL__
+$(obj)/bzImage: ccflags-y := -D__BIG_KERNEL__
+$(obj)/bzImage: asflags-y := $(SVGA_MODE) $(RAMDISK) -D__BIG_KERNEL__
$(obj)/bzImage: BUILDFLAGS := -b
quiet_cmd_image = BUILD $@