Massive file rename and moving orgy:

- Everything in include/cpu/generic/x86/arch/* goes into
   include/arch/x86 now.

 - include/cpu/generic/x86/div64.h moves into include/arch/x86, too.

 - The former include/cpu/generic/x86/arch/elf.h moved to
   include/arch/x86/archelf.h, as elf.h already exists in include/
   and we must prevent a name clash.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@314 f3766cd6-281f-0410-b1cd-43a5c92072e9

HACKING

@@ -86,11 +86,11 @@ Third-party Code and License Overview
   Source: http://lxr.mozilla.org/mozilla1.8.0/source/js/src/jscpucfg.c
   Current version we use: CVS rev. 3.25
 
-* include/cpu/generic/x86/div64.h: GPLv2
+* include/arch/x86/div64.h: GPLv2
   Source: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
   Current version we use: e2afe67453e5b1499459ee3596b1e7924a5208f5
 
-* include/cpu/generic/x86/arch/swab.h: GPLv2
+* include/arch/x86/swab.h: GPLv2
   Source: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
   Current version we use: ?
 

Makefile

@@ -81,7 +81,7 @@ MAINBOARDDIR=$(shell echo $(CONFIG_MAINBOARD_NAME))
 
 LINUXBIOSINCLUDE    :=  -I$(src) -Iinclude \
 			-I$(src)/include \
-			-I$(src)/include/cpu/generic/$(ARCH)/ \
+			-I$(src)/include/arch/$(ARCH)/ \
 			-include $(obj)/config.h \
 			-include $(obj)/build.h
 

arch/x86/Makefile

@@ -21,7 +21,7 @@
 
 ifeq ($(CONFIG_ARCH_X86),y)
 
-INITCFLAGS := $(CFLAGS) -I$(src)/include/cpu/generic/x86 -I$(src)/include \
+INITCFLAGS := $(CFLAGS) -I$(src)/include/arch/x86 -I$(src)/include \
 		-fno-builtin
 
 SILENT := &> /dev/null

arch/x86/archtables.c

@@ -21,14 +21,14 @@
 
 /* 2006.1 yhlu add mptable cross 0x467 processing */
 
-#include <arch/types.h>
+#include <types.h>
 #include <console.h>
 #include <string.h>
 #include <tables.h>
 //#include <cpu/cpu.h>
-//#include <arch/pirq_routing.h>
-//#include <arch/smp/mpspec.h>
-//#include <arch/acpi.h>
+//#include <pirq_routing.h>
+//#include <smp/mpspec.h>
+//#include <acpi.h>
 
 // Global Descriptor Table, defined in c_start.S
 extern u8 gdt;

arch/x86/cachemain.c

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <arch/types.h>
-#include <arch/io.h>
+#include <types.h>
+#include <io.h>
 #include <console.h>
 #include <lar.h>
 #include <tables.h>

arch/x86/i8259.c

@@ -11,7 +11,7 @@
 ! March 1993/June 1994 (Christoph.Niemann@linux.org)
 */
 
-#include <arch/io.h>
+#include <io.h>
 
 /*
 ! well, that went ok, I hope. Now we have to reprogram the interrupts :-(

arch/x86/isa-dma.c

@@ -1,4 +1,4 @@
-#include <arch/io.h>
+#include <io.h>
 #include <isa-dma.h>
 
 /* DMA controller registers */

arch/x86/keyboard.c

@@ -1,7 +1,7 @@
 #include <console.h>
 #include <keyboard.h>
 #include <device/device.h>
-#include <arch/io.h>
+#include <io.h>
 
 static int kbd_empty_input_buffer(void)
 {

arch/x86/linuxbios_table.c

@@ -26,9 +26,9 @@
 #include <tables.h>
 #include <mc146818rtc.h>
 //#include <cpu/cpu.h>
-//#include <arch/pirq_routing.h>
-//#include <arch/smp/mpspec.h>
-//#include <arch/acpi.h>
+//#include <pirq_routing.h>
+//#include <smp/mpspec.h>
+//#include <acpi.h>
 
 struct lb_header *lb_table_init(unsigned long addr)
 {

arch/x86/mc146818rtc.c

@@ -19,8 +19,8 @@
  */
 
 
-#include <arch/types.h>
-#include <arch/io.h>
+#include <types.h>
+#include <io.h>
 #include <console.h>
 #include <tables.h>
 #include <mc146818rtc.h>

arch/x86/pci_ops_auto.c

@@ -1,11 +1,11 @@
 #include <console.h>
 #include <device/device.h>
-#include <arch/pciconf.h>
+#include <pciconf.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <arch/types.h>
-#include <arch/io.h>
+#include <types.h>
+#include <io.h>
 
 /*
  * Before we decide to use direct hardware access mechanisms, we try to do some

arch/x86/pci_ops_conf1.c

@@ -1,11 +1,11 @@
 #include <console.h>
 #include <device/device.h>
-#include <arch/pciconf.h>
+#include <pciconf.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <arch/types.h>
-#include <arch/io.h>
+#include <types.h>
+#include <io.h>
 
 /*
  * Functions for accessing PCI configuration space with type 1 accesses

arch/x86/pci_ops_conf2.c

@@ -1,11 +1,11 @@
 #include <console.h>
 #include <device/device.h>
-#include <arch/pciconf.h>
+#include <pciconf.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <arch/types.h>
-#include <arch/io.h>
+#include <types.h>
+#include <io.h>
 
 /*
  * Functions for accessing PCI configuration space with type 2 accesses

arch/x86/pci_ops_mmconf.c

@@ -1,11 +1,10 @@
-
 #include <console.h>
 #include <device/device.h>
-#include <arch/pciconf.h>
+#include <pciconf.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <arch/types.h>
+#include <types.h>
 
 
 /*
@@ -17,7 +16,7 @@
         (((DEVFN) & 0xFF) << 12) | \
         ((WHERE) & 0xFFF))
 
-#include <arch/mmio_conf.h>
+#include <mmio_conf.h>
 
 static uint8_t pci_mmconf_read_config8(struct bus *pbus, int bus, int devfn, int where)
 {

arch/x86/serial.c

@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
  */
 
-#include <arch/io.h>
+#include <io.h>
 #include <uart8250.h>
 
 void uart_init(void)

arch/x86/speaker.c

@@ -25,7 +25,7 @@
  *  - Order number: 231244-006
  */
 
-#include <arch/io.h>
+#include <io.h>
 #include <lib.h>
 
 #define I82C54_CONTROL_WORD_REGISTER	0x43	/* Write-only. */

arch/x86/udelay_io.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
  */
 
-#include <arch/io.h>
+#include <io.h>
 
 void udelay(unsigned int usecs)
 {

console/console.c

@@ -1,5 +1,5 @@
-#include <arch/types.h>
-#include <arch/hlt.h>
+#include <types.h>
+#include <hlt.h>
 #include <console.h>
 #include <uart8250.h>
 // FIXME: we need this for varargs

device/device.c

@@ -29,7 +29,7 @@
  */
 
 #include <console.h>
-#include <arch/io.h>
+#include <io.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>

device/device_util.c

@@ -23,7 +23,7 @@
  */
 
 #include <console.h>
-#include <arch/io.h>
+#include <io.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>

device/pci_device.c

@@ -22,8 +22,8 @@
  * Copyright 1997 -- 1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
  */
 
-#include <arch/types.h>
-#include <arch/io.h>
+#include <types.h>
+#include <io.h>
 #include <string.h>
 #include <lib.h>
 #include <console.h>

device/pci_ops.c

@@ -20,11 +20,11 @@
 
 #include <console.h>
 #include <device/device.h>
-#include <arch/pciconf.h>
+#include <pciconf.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <arch/types.h>
+#include <types.h>
 
 /**
  * Walk up the tree from the current dev, in an attempt to find a

device/pnp_device.c

@@ -21,13 +21,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <console.h>
 #include <stdlib.h>
 // #include <stdint.h>
 // #include <bitops.h>
 #include <string.h>
-#include <arch/io.h>
+#include <io.h>
 #include <device/device.h>
 #include <device/pnp.h>
 

include/arch/x86/byteorder.h

@@ -19,7 +19,7 @@
 
 #define __LITTLE_ENDIAN 1234
 
-#include <arch/swab.h>
+#include <swab.h>
 
 #define cpu_to_le32(x) ((unsigned int)(x))
 #define le32_to_cpu(x) ((unsigned int)(x))

include/arch/x86/io.h

@@ -17,7 +17,7 @@
 #ifndef _ARCH_IO_H
 #define _ARCH_IO_H
 
-#include <arch/types.h>
+#include <types.h>
 
 /*
  * This file contains the definitions for the x86 IO instructions

include/console.h

@@ -17,7 +17,7 @@
 #ifndef CONSOLE_CONSOLE_H_
 #define CONSOLE_CONSOLE_H_
 
-#include <arch/types.h>
+#include <types.h>
 
 #define BIOS_EMERG      0   /* system is unusable                   */
 #define BIOS_ALERT      1   /* action must be taken immediately     */

include/device/device.h

@@ -20,7 +20,7 @@
 #ifndef DEVICE_H
 #define DEVICE_H
 
-#include <arch/types.h>
+#include <types.h>
 #include <device/resource.h>
 #include <device/path.h>
 

include/device/pci.h

@@ -33,7 +33,7 @@
 #ifndef PCI_H
 #define PCI_H
 
-#include <arch/types.h>
+#include <types.h>
 #include <device/pci_def.h>
 #include <device/resource.h>
 #include <device/device.h>

include/device/pci_ops.h

@@ -17,9 +17,9 @@
 #ifndef PCI_OPS_H
 #define PCI_OPS_H
 
-#include <arch/types.h>
+#include <types.h>
 #include <device/device.h>
-#include <arch/pci_ops.h>
+#include <pci_ops.h>
 
 u8 pci_read_config8(struct device * dev, unsigned where);
 u16 pci_read_config16(struct device * dev, unsigned where);

include/device/pci_rom.h

@@ -16,8 +16,8 @@
 
 #ifndef PCI_ROM_H
 #define PCI_ROM_H
-#include <arch/types.h>
-#include <arch/byteorder.h>
+#include <types.h>
+#include <byteorder.h>
 
 #define PCI_ROM_HDR 0xAA55
 #define PCI_DATA_HDR (u32) ( ('R' << 24) | ('I' << 16) | ('C' << 8) | 'P' )

include/device/pnp.h

@@ -20,7 +20,7 @@
 #ifndef DEVICE_PNP_H
 #define DEVICE_PNP_H
 
-#include <arch/types.h>
+#include <types.h>
 #include <device/device.h>
 #include <device/pnp_def.h>
 

include/device/resource.h

@@ -17,7 +17,7 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#include <arch/types.h>
+#include <types.h>
 
 #define IORESOURCE_BITS		0x000000ff	/* Bus-specific bits */
 

include/elf.h

@@ -30,8 +30,8 @@
 #ifndef _ELF_H
 #define	_ELF_H 1
 
-#include <arch/types.h>
-#include <arch/elf.h>
+#include <types.h>
+#include <archelf.h>
 
 /* Standard ELF types.  */
 

include/elf_boot.h

@@ -20,7 +20,7 @@
 #ifndef ELF_BOOT_H 
 #define ELF_BOOT_H 
 
-#include <arch/types.h>
+#include <types.h>
 
 /* This defines the structure of a table of parameters useful for ELF
  * bootable images.  These parameters are all passed and generated

include/lar.h

@@ -47,7 +47,7 @@
  * ---------------------------------------------------------------------------
  */
 
-#include <arch/types.h>
+#include <types.h>
 
 #define MAGIC "LARCHIVE"
 #define MAX_PATHLEN 1024

include/string.h

@@ -21,7 +21,7 @@
 #ifndef STRING_H
 #define STRING_H
 
-#include <arch/types.h>
+#include <types.h>
 
 /* Prototypes for functions from lib/mem.c. */
 void *memcpy(void *dest, const void *src, size_t len);

lib/compute_ip_checksum.c

@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <ip_checksum.h>
 #include <string.h>
 

lib/elfboot.c

@@ -26,9 +26,8 @@
  * no calls to malloc
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <string.h>
-
 #include <console.h>
 #include <tables.h>
 #include <elf.h>

lib/lar.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <string.h>
 #include <lar.h>
 #include <console.h>

lib/malloc.c

@@ -23,7 +23,7 @@
  * has had this at some time or other. 
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <stdlib.h>
 #include <console.h>
 

lib/mem.c

@@ -23,7 +23,7 @@
  * these. Inlines are not as wonderful as people think.
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <string.h>
 
 /**

lib/stage2.c

@@ -22,7 +22,7 @@
 
 /* stage2 - LinuxBIOS RAM-based setup. */
 
-#include <arch/types.h>
+#include <types.h>
 #include <string.h>
 #include <lar.h>
 #include <console.h>

lib/tables.c

@@ -22,7 +22,6 @@
 #include <console.h>
 //#include <cpu.h>
 #include <tables.h>
-#include <tables.h>
 
 struct lb_memory *
 write_tables(void)

lib/uart8250.c

@@ -1,5 +1,5 @@
 /* Should support 8250, 16450, 16550, 16550A type uarts */
-#include <arch/io.h>
+#include <io.h>
 #include <uart8250.h>
 
 /* Data */

mainboard/emulation/qemu-x86/vga.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <console.h>
 #include <device/device.h>
 #include <device/pci.h>

northbridge/intel/i440bxemulation/i440bx.c

@@ -34,7 +34,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <console.h>
 #include <device/device.h>
 #include <device/pci.h>

southbridge/intel/i82371eb/i82371eb.c

@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <console.h>
 #include <device/device.h>
 #include <device/pci.h>

superio/winbond/w83627hf/chip.h

@@ -1,5 +1,3 @@
-
-
 #include <keyboard.h>
 #include <uart8250.h>
 

superio/winbond/w83627hf/superio.c

@@ -6,7 +6,7 @@
  * This code is distributed without warranty under the GPL v2 (see COPYING) 
  */
 
-#include <arch/io.h>
+#include <io.h>
 #include <device/device.h>
 #include <device/pnp.h>
 #include <console.h>

superio/winbond/w83627hf/w83627hf_early_init.c

@@ -1,4 +1,3 @@
-#include <arch/romcc_io.h>
 #include "w83627hf.h"
 
 static void w83627hf_disable_dev(struct device *dev)

superio/winbond/w83627hf/w83627hf_early_serial.c

@@ -1,4 +1,3 @@
-#include <arch/romcc_io.h>
 #include "w83627hf.h"
 
 static inline void pnp_enter_ext_func_mode(struct device *dev) 

util/x86emu/biosemu.c

@@ -35,7 +35,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
-#include <arch/io.h>
+#include <io.h>
 #include <console.h>
 #include <device/device.h>
 #include <device/pci.h>

util/x86emu/vm86.c

@@ -27,7 +27,7 @@
 #include <device/pci_ops.h>
 #include <console.h>
 #include <string.h>
-#include <arch/io.h>
+#include <io.h>
 
 
 /* Declare a temporary global descriptor table - 

util/x86emu/x86emu/sys.c

@@ -46,7 +46,7 @@
 #include "debug.h"
 #include "prim_ops.h"
 #ifdef LINUXBIOS_VERSION
-#include "arch/io.h"
+#include "io.h"
 #else
 #include <sys/io.h>
 #endif