---

yaml --- r: 65560 b: refs/heads/master c: 96ae6ea h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · 3b3c875 · 3b3c875
1 parent accdc32
commit 3b3c875
Show file tree

Hide file tree

Showing 35 changed files with 9 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0530bf37cebcf22a73652937c2340bc1ebd92000
+refs/heads/master: 96ae6ea0be1b902c28b3b463c27da42b41e2b63a
diff --git a/trunk/arch/i386/Makefile b/trunk/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/trunk/arch/i386/boot/.gitignore → trunk/arch/x86/boot/.gitignore b/trunk/arch/i386/boot/.gitignore → trunk/arch/x86/boot/.gitignore
diff --git a/trunk/arch/i386/boot/Makefile → trunk/arch/x86/boot/Makefile b/trunk/arch/i386/boot/Makefile → trunk/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/trunk/arch/i386/boot/a20.c → trunk/arch/x86/boot/a20.c b/trunk/arch/i386/boot/a20.c → trunk/arch/x86/boot/a20.c
diff --git a/trunk/arch/i386/boot/apm.c → trunk/arch/x86/boot/apm.c b/trunk/arch/i386/boot/apm.c → trunk/arch/x86/boot/apm.c
diff --git a/trunk/arch/i386/boot/bitops.h → trunk/arch/x86/boot/bitops.h b/trunk/arch/i386/boot/bitops.h → trunk/arch/x86/boot/bitops.h
diff --git a/trunk/arch/i386/boot/boot.h → trunk/arch/x86/boot/boot.h b/trunk/arch/i386/boot/boot.h → trunk/arch/x86/boot/boot.h
diff --git a/trunk/arch/i386/boot/cmdline.c → trunk/arch/x86/boot/cmdline.c b/trunk/arch/i386/boot/cmdline.c → trunk/arch/x86/boot/cmdline.c
diff --git a/trunk/arch/i386/boot/code16gcc.h → trunk/arch/x86/boot/code16gcc.h b/trunk/arch/i386/boot/code16gcc.h → trunk/arch/x86/boot/code16gcc.h
diff --git a/trunk/arch/i386/boot/copy.S → trunk/arch/x86/boot/copy.S b/trunk/arch/i386/boot/copy.S → trunk/arch/x86/boot/copy.S
diff --git a/trunk/arch/i386/boot/cpu.c → trunk/arch/x86/boot/cpu.c b/trunk/arch/i386/boot/cpu.c → trunk/arch/x86/boot/cpu.c
diff --git a/trunk/arch/i386/boot/cpucheck.c → trunk/arch/x86/boot/cpucheck.c b/trunk/arch/i386/boot/cpucheck.c → trunk/arch/x86/boot/cpucheck.c
diff --git a/trunk/arch/i386/boot/edd.c → trunk/arch/x86/boot/edd.c b/trunk/arch/i386/boot/edd.c → trunk/arch/x86/boot/edd.c
diff --git a/trunk/arch/i386/boot/header.S → trunk/arch/x86/boot/header.S b/trunk/arch/i386/boot/header.S → trunk/arch/x86/boot/header.S
diff --git a/trunk/arch/i386/boot/install.sh → trunk/arch/x86/boot/install.sh b/trunk/arch/i386/boot/install.sh → trunk/arch/x86/boot/install.sh
diff --git a/trunk/arch/i386/boot/main.c → trunk/arch/x86/boot/main.c b/trunk/arch/i386/boot/main.c → trunk/arch/x86/boot/main.c
diff --git a/trunk/arch/i386/boot/mca.c → trunk/arch/x86/boot/mca.c b/trunk/arch/i386/boot/mca.c → trunk/arch/x86/boot/mca.c
diff --git a/trunk/arch/i386/boot/memory.c → trunk/arch/x86/boot/memory.c b/trunk/arch/i386/boot/memory.c → trunk/arch/x86/boot/memory.c
diff --git a/trunk/arch/i386/boot/mtools.conf.in → trunk/arch/x86/boot/mtools.conf.in b/trunk/arch/i386/boot/mtools.conf.in → trunk/arch/x86/boot/mtools.conf.in
diff --git a/trunk/arch/i386/boot/pm.c → trunk/arch/x86/boot/pm.c b/trunk/arch/i386/boot/pm.c → trunk/arch/x86/boot/pm.c
diff --git a/trunk/arch/i386/boot/pmjump.S → trunk/arch/x86/boot/pmjump.S b/trunk/arch/i386/boot/pmjump.S → trunk/arch/x86/boot/pmjump.S
diff --git a/trunk/arch/i386/boot/printf.c → trunk/arch/x86/boot/printf.c b/trunk/arch/i386/boot/printf.c → trunk/arch/x86/boot/printf.c
diff --git a/trunk/arch/i386/boot/setup.ld → trunk/arch/x86/boot/setup.ld b/trunk/arch/i386/boot/setup.ld → trunk/arch/x86/boot/setup.ld
diff --git a/trunk/arch/i386/boot/string.c → trunk/arch/x86/boot/string.c b/trunk/arch/i386/boot/string.c → trunk/arch/x86/boot/string.c
diff --git a/trunk/arch/i386/boot/tty.c → trunk/arch/x86/boot/tty.c b/trunk/arch/i386/boot/tty.c → trunk/arch/x86/boot/tty.c
diff --git a/trunk/arch/i386/boot/version.c → trunk/arch/x86/boot/version.c b/trunk/arch/i386/boot/version.c → trunk/arch/x86/boot/version.c
diff --git a/trunk/arch/i386/boot/vesa.h → trunk/arch/x86/boot/vesa.h b/trunk/arch/i386/boot/vesa.h → trunk/arch/x86/boot/vesa.h
diff --git a/trunk/arch/i386/boot/video-bios.c → trunk/arch/x86/boot/video-bios.c b/trunk/arch/i386/boot/video-bios.c → trunk/arch/x86/boot/video-bios.c
diff --git a/trunk/arch/i386/boot/video-vesa.c → trunk/arch/x86/boot/video-vesa.c b/trunk/arch/i386/boot/video-vesa.c → trunk/arch/x86/boot/video-vesa.c
diff --git a/trunk/arch/i386/boot/video-vga.c → trunk/arch/x86/boot/video-vga.c b/trunk/arch/i386/boot/video-vga.c → trunk/arch/x86/boot/video-vga.c
diff --git a/trunk/arch/i386/boot/video.c → trunk/arch/x86/boot/video.c b/trunk/arch/i386/boot/video.c → trunk/arch/x86/boot/video.c
diff --git a/trunk/arch/i386/boot/video.h → trunk/arch/x86/boot/video.h b/trunk/arch/i386/boot/video.h → trunk/arch/x86/boot/video.h
diff --git a/trunk/arch/i386/boot/voyager.c → trunk/arch/x86/boot/voyager.c b/trunk/arch/i386/boot/voyager.c → trunk/arch/x86/boot/voyager.c
diff --git a/trunk/arch/x86_64/boot/Makefile b/trunk/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