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

Commit 96ae6ea0 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

i386: move boot 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 0530bf37

arch/i386/Makefile

+6 −3
Original line number Original line Diff line number Diff line
@@ -116,7 +116,7 @@ drivers-$(CONFIG_FB) += arch/i386/video/ 
CFLAGS += $(mflags-y)

CFLAGS += $(mflags-y)

AFLAGS += $(mflags-y)

AFLAGS += $(mflags-y)





boot := arch/i386/boot

boot := arch/x86/boot





PHONY += zImage bzImage compressed zlilo bzlilo \

PHONY += zImage bzImage compressed zlilo bzlilo \

         zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install

         zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install
@@ -125,9 +125,11 @@ all: bzImage 




# KBUILD_IMAGE specify target image being built

# KBUILD_IMAGE specify target image being built

                    KBUILD_IMAGE := $(boot)/bzImage

                    KBUILD_IMAGE := $(boot)/bzImage

zImage zlilo zdisk: KBUILD_IMAGE := arch/i386/boot/zImage

zImage zlilo zdisk: KBUILD_IMAGE := arch/x86/boot/zImage





zImage bzImage: vmlinux

zImage bzImage: vmlinux

	$(Q)mkdir -p $(objtree)/arch/i386/boot

	$(Q)ln -fsn $(objtree)/arch/x86/boot/bzImage $(objtree)/arch/i386/boot/bzImage

	$(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE)

	$(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE)





compressed: zImage

compressed: zImage
@@ -145,7 +147,8 @@ install: 
	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install

	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install





archclean:

archclean:

	$(Q)$(MAKE) $(clean)=arch/i386/boot

	$(Q)rm -rf $(objtree)/arch/i386/boot

	$(Q)$(MAKE) $(clean)=arch/x86/boot





define archhelp

define archhelp

  echo  '* bzImage	- Compressed kernel image (arch/$(ARCH)/boot/bzImage)'

  echo  '* bzImage	- Compressed kernel image (arch/$(ARCH)/boot/bzImage)'

arch/i386/boot/.gitignore→arch/x86/boot/.gitignore

+0 −0

File moved.

View file

arch/i386/boot/Makefile→arch/x86/boot/Makefile

+1 −1
Original line number Original line Diff line number Diff line 
#

#

# arch/i386/boot/Makefile

# arch/x86/boot/Makefile

#

#

# This file is subject to the terms and conditions of the GNU General Public

# This file is subject to the terms and conditions of the GNU General Public

# License.  See the file "COPYING" in the main directory of this archive

# License.  See the file "COPYING" in the main directory of this archive

arch/i386/boot/a20.c→arch/x86/boot/a20.c

+0 −0

File moved.

View file

arch/i386/boot/apm.c→arch/x86/boot/apm.c

+0 −0

File moved.

View file