Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f563d53c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild 

* ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  x86: fix boot error introduced by kbuild
parents ce4b61f5 7eebb934

arch/x86/boot/Makefile

+3 −3
Original line number Original line Diff line number Diff line
@@ -64,10 +64,10 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ 
KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__

KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__





$(obj)/zImage:  IMAGE_OFFSET := 0x1000

$(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: IMAGE_OFFSET := 0x100000

$(obj)/bzImage: EXTRA_CFLAGS := -D__BIG_KERNEL__

$(obj)/bzImage: ccflags-y := -D__BIG_KERNEL__

$(obj)/bzImage: EXTRA_AFLAGS := $(SVGA_MODE) $(RAMDISK) -D__BIG_KERNEL__

$(obj)/bzImage: asflags-y := $(SVGA_MODE) $(RAMDISK) -D__BIG_KERNEL__

$(obj)/bzImage: BUILDFLAGS   := -b

$(obj)/bzImage: BUILDFLAGS   := -b





quiet_cmd_image = BUILD   $@

quiet_cmd_image = BUILD   $@