From 96ae6ea0be1b902c28b3b463c27da42b41e2b63a Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:16:45 +0200 Subject: [PATCH] i386: move boot Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/i386/Makefile | 9 ++++++--- arch/{i386 => x86}/boot/.gitignore | 0 arch/{i386 => x86}/boot/Makefile | 2 +- arch/{i386 => x86}/boot/a20.c | 0 arch/{i386 => x86}/boot/apm.c | 0 arch/{i386 => x86}/boot/bitops.h | 0 arch/{i386 => x86}/boot/boot.h | 0 arch/{i386 => x86}/boot/cmdline.c | 0 arch/{i386 => x86}/boot/code16gcc.h | 0 arch/{i386 => x86}/boot/copy.S | 0 arch/{i386 => x86}/boot/cpu.c | 0 arch/{i386 => x86}/boot/cpucheck.c | 0 arch/{i386 => x86}/boot/edd.c | 0 arch/{i386 => x86}/boot/header.S | 0 arch/{i386 => x86}/boot/install.sh | 0 arch/{i386 => x86}/boot/main.c | 0 arch/{i386 => x86}/boot/mca.c | 0 arch/{i386 => x86}/boot/memory.c | 0 arch/{i386 => x86}/boot/mtools.conf.in | 0 arch/{i386 => x86}/boot/pm.c | 0 arch/{i386 => x86}/boot/pmjump.S | 0 arch/{i386 => x86}/boot/printf.c | 0 arch/{i386 => x86}/boot/setup.ld | 0 arch/{i386 => x86}/boot/string.c | 0 arch/{i386 => x86}/boot/tty.c | 0 arch/{i386 => x86}/boot/version.c | 0 arch/{i386 => x86}/boot/vesa.h | 0 arch/{i386 => x86}/boot/video-bios.c | 0 arch/{i386 => x86}/boot/video-vesa.c | 0 arch/{i386 => x86}/boot/video-vga.c | 0 arch/{i386 => x86}/boot/video.c | 0 arch/{i386 => x86}/boot/video.h | 0 arch/{i386 => x86}/boot/voyager.c | 0 arch/x86_64/boot/Makefile | 2 +- 34 files changed, 8 insertions(+), 5 deletions(-) rename arch/{i386 => x86}/boot/.gitignore (100%) rename arch/{i386 => x86}/boot/Makefile (99%) rename arch/{i386 => x86}/boot/a20.c (100%) rename arch/{i386 => x86}/boot/apm.c (100%) rename arch/{i386 => x86}/boot/bitops.h (100%) rename arch/{i386 => x86}/boot/boot.h (100%) rename arch/{i386 => x86}/boot/cmdline.c (100%) rename arch/{i386 => x86}/boot/code16gcc.h (100%) rename arch/{i386 => x86}/boot/copy.S (100%) rename arch/{i386 => x86}/boot/cpu.c (100%) rename arch/{i386 => x86}/boot/cpucheck.c (100%) rename arch/{i386 => x86}/boot/edd.c (100%) rename arch/{i386 => x86}/boot/header.S (100%) rename arch/{i386 => x86}/boot/install.sh (100%) rename arch/{i386 => x86}/boot/main.c (100%) rename arch/{i386 => x86}/boot/mca.c (100%) rename arch/{i386 => x86}/boot/memory.c (100%) rename arch/{i386 => x86}/boot/mtools.conf.in (100%) rename arch/{i386 => x86}/boot/pm.c (100%) rename arch/{i386 => x86}/boot/pmjump.S (100%) rename arch/{i386 => x86}/boot/printf.c (100%) rename arch/{i386 => x86}/boot/setup.ld (100%) rename arch/{i386 => x86}/boot/string.c (100%) rename arch/{i386 => x86}/boot/tty.c (100%) rename arch/{i386 => x86}/boot/version.c (100%) rename arch/{i386 => x86}/boot/vesa.h (100%) rename arch/{i386 => x86}/boot/video-bios.c (100%) rename arch/{i386 => x86}/boot/video-vesa.c (100%) rename arch/{i386 => x86}/boot/video-vga.c (100%) rename arch/{i386 => x86}/boot/video.c (100%) rename arch/{i386 => x86}/boot/video.h (100%) rename arch/{i386 => x86}/boot/voyager.c (100%) diff --git a/arch/i386/Makefile b/arch/i386/Makefile index 510df782f940..776d8dcf2340 100644 --- a/arch/i386/Makefile +++ b/arch/i386/Makefile @@ -116,7 +116,7 @@ drivers-$(CONFIG_FB) += arch/i386/video/ CFLAGS += $(mflags-y) AFLAGS += $(mflags-y) -boot := arch/i386/boot +boot := arch/x86/boot PHONY += zImage bzImage compressed zlilo bzlilo \ zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install @@ -125,9 +125,11 @@ all: bzImage # KBUILD_IMAGE specify target image being built 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 + $(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) compressed: zImage @@ -145,7 +147,8 @@ install: $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install archclean: - $(Q)$(MAKE) $(clean)=arch/i386/boot + $(Q)rm -rf $(objtree)/arch/i386/boot + $(Q)$(MAKE) $(clean)=arch/x86/boot define archhelp echo '* bzImage - Compressed kernel image (arch/$(ARCH)/boot/bzImage)' diff --git a/arch/i386/boot/.gitignore b/arch/x86/boot/.gitignore similarity index 100% rename from arch/i386/boot/.gitignore rename to arch/x86/boot/.gitignore diff --git a/arch/i386/boot/Makefile b/arch/x86/boot/Makefile similarity index 99% rename from arch/i386/boot/Makefile rename to arch/x86/boot/Makefile index 93386a4e40b4..cb1035f2b7e9 100644 --- a/arch/i386/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -1,5 +1,5 @@ # -# arch/i386/boot/Makefile +# arch/x86/boot/Makefile # # 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 diff --git a/arch/i386/boot/a20.c b/arch/x86/boot/a20.c similarity index 100% rename from arch/i386/boot/a20.c rename to arch/x86/boot/a20.c diff --git a/arch/i386/boot/apm.c b/arch/x86/boot/apm.c similarity index 100% rename from arch/i386/boot/apm.c rename to arch/x86/boot/apm.c diff --git a/arch/i386/boot/bitops.h b/arch/x86/boot/bitops.h similarity index 100% rename from arch/i386/boot/bitops.h rename to arch/x86/boot/bitops.h diff --git a/arch/i386/boot/boot.h b/arch/x86/boot/boot.h similarity index 100% rename from arch/i386/boot/boot.h rename to arch/x86/boot/boot.h diff --git a/arch/i386/boot/cmdline.c b/arch/x86/boot/cmdline.c similarity index 100% rename from arch/i386/boot/cmdline.c rename to arch/x86/boot/cmdline.c diff --git a/arch/i386/boot/code16gcc.h b/arch/x86/boot/code16gcc.h similarity index 100% rename from arch/i386/boot/code16gcc.h rename to arch/x86/boot/code16gcc.h diff --git a/arch/i386/boot/copy.S b/arch/x86/boot/copy.S similarity index 100% rename from arch/i386/boot/copy.S rename to arch/x86/boot/copy.S diff --git a/arch/i386/boot/cpu.c b/arch/x86/boot/cpu.c similarity index 100% rename from arch/i386/boot/cpu.c rename to arch/x86/boot/cpu.c diff --git a/arch/i386/boot/cpucheck.c b/arch/x86/boot/cpucheck.c similarity index 100% rename from arch/i386/boot/cpucheck.c rename to arch/x86/boot/cpucheck.c diff --git a/arch/i386/boot/edd.c b/arch/x86/boot/edd.c similarity index 100% rename from arch/i386/boot/edd.c rename to arch/x86/boot/edd.c diff --git a/arch/i386/boot/header.S b/arch/x86/boot/header.S similarity index 100% rename from arch/i386/boot/header.S rename to arch/x86/boot/header.S diff --git a/arch/i386/boot/install.sh b/arch/x86/boot/install.sh similarity index 100% rename from arch/i386/boot/install.sh rename to arch/x86/boot/install.sh diff --git a/arch/i386/boot/main.c b/arch/x86/boot/main.c similarity index 100% rename from arch/i386/boot/main.c rename to arch/x86/boot/main.c diff --git a/arch/i386/boot/mca.c b/arch/x86/boot/mca.c similarity index 100% rename from arch/i386/boot/mca.c rename to arch/x86/boot/mca.c diff --git a/arch/i386/boot/memory.c b/arch/x86/boot/memory.c similarity index 100% rename from arch/i386/boot/memory.c rename to arch/x86/boot/memory.c diff --git a/arch/i386/boot/mtools.conf.in b/arch/x86/boot/mtools.conf.in similarity index 100% rename from arch/i386/boot/mtools.conf.in rename to arch/x86/boot/mtools.conf.in diff --git a/arch/i386/boot/pm.c b/arch/x86/boot/pm.c similarity index 100% rename from arch/i386/boot/pm.c rename to arch/x86/boot/pm.c diff --git a/arch/i386/boot/pmjump.S b/arch/x86/boot/pmjump.S similarity index 100% rename from arch/i386/boot/pmjump.S rename to arch/x86/boot/pmjump.S diff --git a/arch/i386/boot/printf.c b/arch/x86/boot/printf.c similarity index 100% rename from arch/i386/boot/printf.c rename to arch/x86/boot/printf.c diff --git a/arch/i386/boot/setup.ld b/arch/x86/boot/setup.ld similarity index 100% rename from arch/i386/boot/setup.ld rename to arch/x86/boot/setup.ld diff --git a/arch/i386/boot/string.c b/arch/x86/boot/string.c similarity index 100% rename from arch/i386/boot/string.c rename to arch/x86/boot/string.c diff --git a/arch/i386/boot/tty.c b/arch/x86/boot/tty.c similarity index 100% rename from arch/i386/boot/tty.c rename to arch/x86/boot/tty.c diff --git a/arch/i386/boot/version.c b/arch/x86/boot/version.c similarity index 100% rename from arch/i386/boot/version.c rename to arch/x86/boot/version.c diff --git a/arch/i386/boot/vesa.h b/arch/x86/boot/vesa.h similarity index 100% rename from arch/i386/boot/vesa.h rename to arch/x86/boot/vesa.h diff --git a/arch/i386/boot/video-bios.c b/arch/x86/boot/video-bios.c similarity index 100% rename from arch/i386/boot/video-bios.c rename to arch/x86/boot/video-bios.c diff --git a/arch/i386/boot/video-vesa.c b/arch/x86/boot/video-vesa.c similarity index 100% rename from arch/i386/boot/video-vesa.c rename to arch/x86/boot/video-vesa.c diff --git a/arch/i386/boot/video-vga.c b/arch/x86/boot/video-vga.c similarity index 100% rename from arch/i386/boot/video-vga.c rename to arch/x86/boot/video-vga.c diff --git a/arch/i386/boot/video.c b/arch/x86/boot/video.c similarity index 100% rename from arch/i386/boot/video.c rename to arch/x86/boot/video.c diff --git a/arch/i386/boot/video.h b/arch/x86/boot/video.h similarity index 100% rename from arch/i386/boot/video.h rename to arch/x86/boot/video.h diff --git a/arch/i386/boot/voyager.c b/arch/x86/boot/voyager.c similarity index 100% rename from arch/i386/boot/voyager.c rename to arch/x86/boot/voyager.c diff --git a/arch/x86_64/boot/Makefile b/arch/x86_64/boot/Makefile index 67096389de1f..0f7b6c2cfa58 100644 --- a/arch/x86_64/boot/Makefile +++ b/arch/x86_64/boot/Makefile @@ -5,5 +5,5 @@ # So tell kbuild that we fetch the code from i386 and include the # Makefile from i386 too. -src := arch/i386/boot +src := arch/x86/boot include $(src)/Makefile