Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7eebb9348655b55553d65fc7cb6cfad292d28dbb
Commit:     7eebb9348655b55553d65fc7cb6cfad292d28dbb
Parent:     f77bf01425b11947eeb3b5b54685212c302741b8
Author:     Sam Ravnborg <[EMAIL PROTECTED](none)>
AuthorDate: Tue Oct 16 23:50:33 2007 +0200
Committer:  Sam Ravnborg <[EMAIL PROTECTED](none)>
CommitDate: Tue Oct 16 23:50:33 2007 +0200

    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 <[EMAIL PROTECTED]>
---
 arch/x86/boot/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index d6ed8e5..e8756e5 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   $@
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to