tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

i386: move boot

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Thomas Gleixner 96ae6ea0 0530bf37

+8 -5
+6 -3
arch/i386/Makefile
··· 116 116 CFLAGS += $(mflags-y) 117 117 AFLAGS += $(mflags-y) 118 118 119 - boot := arch/i386/boot 119 + boot := arch/x86/boot 120 120 121 121 PHONY += zImage bzImage compressed zlilo bzlilo \ 122 122 zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install ··· 125 125 126 126 # KBUILD_IMAGE specify target image being built 127 127 KBUILD_IMAGE := $(boot)/bzImage 128 - zImage zlilo zdisk: KBUILD_IMAGE := arch/i386/boot/zImage 128 + zImage zlilo zdisk: KBUILD_IMAGE := arch/x86/boot/zImage 129 129 130 130 zImage bzImage: vmlinux 131 + $(Q)mkdir -p $(objtree)/arch/i386/boot 132 + $(Q)ln -fsn $(objtree)/arch/x86/boot/bzImage $(objtree)/arch/i386/boot/bzImage 131 133 $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE) 132 134 133 135 compressed: zImage ··· 147 145 $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install 148 146 149 147 archclean: 150 - $(Q)$(MAKE) $(clean)=arch/i386/boot 148 + $(Q)rm -rf $(objtree)/arch/i386/boot 149 + $(Q)$(MAKE) $(clean)=arch/x86/boot 151 150 152 151 define archhelp 153 152 echo '* bzImage - Compressed kernel image (arch/$(ARCH)/boot/bzImage)'
arch/i386/boot/.gitignore arch/x86/boot/.gitignore
+1 -1
arch/i386/boot/Makefile arch/x86/boot/Makefile
··· 1 1 # 2 - # arch/i386/boot/Makefile 2 + # arch/x86/boot/Makefile 3 3 # 4 4 # This file is subject to the terms and conditions of the GNU General Public 5 5 # License. See the file "COPYING" in the main directory of this archive
arch/i386/boot/a20.c arch/x86/boot/a20.c
arch/i386/boot/apm.c arch/x86/boot/apm.c
arch/i386/boot/bitops.h arch/x86/boot/bitops.h
arch/i386/boot/boot.h arch/x86/boot/boot.h
arch/i386/boot/cmdline.c arch/x86/boot/cmdline.c
arch/i386/boot/code16gcc.h arch/x86/boot/code16gcc.h
arch/i386/boot/copy.S arch/x86/boot/copy.S
arch/i386/boot/cpu.c arch/x86/boot/cpu.c
arch/i386/boot/cpucheck.c arch/x86/boot/cpucheck.c
arch/i386/boot/edd.c arch/x86/boot/edd.c
arch/i386/boot/header.S arch/x86/boot/header.S
arch/i386/boot/install.sh arch/x86/boot/install.sh
arch/i386/boot/main.c arch/x86/boot/main.c
arch/i386/boot/mca.c arch/x86/boot/mca.c
arch/i386/boot/memory.c arch/x86/boot/memory.c
arch/i386/boot/mtools.conf.in arch/x86/boot/mtools.conf.in
arch/i386/boot/pm.c arch/x86/boot/pm.c
arch/i386/boot/pmjump.S arch/x86/boot/pmjump.S
arch/i386/boot/printf.c arch/x86/boot/printf.c
arch/i386/boot/setup.ld arch/x86/boot/setup.ld
arch/i386/boot/string.c arch/x86/boot/string.c
arch/i386/boot/tty.c arch/x86/boot/tty.c
arch/i386/boot/version.c arch/x86/boot/version.c
arch/i386/boot/vesa.h arch/x86/boot/vesa.h
arch/i386/boot/video-bios.c arch/x86/boot/video-bios.c
arch/i386/boot/video-vesa.c arch/x86/boot/video-vesa.c
arch/i386/boot/video-vga.c arch/x86/boot/video-vga.c
arch/i386/boot/video.c arch/x86/boot/video.c
arch/i386/boot/video.h arch/x86/boot/video.h
arch/i386/boot/voyager.c arch/x86/boot/voyager.c
+1 -1
arch/x86_64/boot/Makefile
··· 5 5 # So tell kbuild that we fetch the code from i386 and include the 6 6 # Makefile from i386 too. 7 7 8 - src := arch/i386/boot 8 + src := arch/x86/boot 9 9 include $(src)/Makefile