Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6: xtensa: Update platform files to reflect new location of the header files. xtensa: switch to packed struct unaligned access implementation xtensa: Add xt2000 support files. xtensa: move headers files to arch/xtensa/include xtensa: use the new byteorder headers
git-mirror · Jan 7, 2009 · 52fefce · 52fefce
2 parents a0e280e + 5fee325
commit 52fefce
Show file tree

Hide file tree

Showing 124 changed files with 324 additions and 69 deletions.
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
@@ -33,6 +33,15 @@ KBUILD_CFLAGS += -ffreestanding
 
 KBUILD_CFLAGS += -pipe -mlongcalls
 
+vardirs := $(patsubst %,arch/xtensa/variants/%/,$(variant-y))
+plfdirs := $(patsubst %,arch/xtensa/platforms/%/,$(platform-y))
+
+ifeq ($(KBUILD_SRC),)
+KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(vardirs) $(plfdirs))
+else
+KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(vardirs) $(plfdirs))
+endif
+
 KBUILD_DEFCONFIG := iss_defconfig
 
 # ramdisk/initrd support
@@ -66,21 +75,6 @@ libs-y		+= arch/xtensa/lib/ $(LIBGCC)
 
 boot		:= arch/xtensa/boot
 
-archinc		:= include/asm-xtensa
-
-archprepare: $(archinc)/.platform
-
-# Update processor variant and platform symlinks if something which affects
-# them changed.
-
-$(archinc)/.platform: $(wildcard include/config/arch/*.h) include/config/auto.conf
-	@echo '  SYMLINK $(archinc)/variant -> $(archinc)/variant-$(VARIANT)'
-	$(Q)mkdir -p $(archinc)
-	$(Q)ln -fsn $(srctree)/$(archinc)/variant-$(VARIANT) $(archinc)/variant
-	@echo '  SYMLINK $(archinc)/platform -> $(archinc)/platform-$(PLATFORM)'
-	$(Q)ln -fsn $(srctree)/$(archinc)/platform-$(PLATFORM) $(archinc)/platform
-	@touch $@
-
 
 all: zImage
 
@@ -89,10 +83,6 @@ bzImage : zImage
 zImage zImage.initrd: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) $@
 
-CLEAN_FILES	+= arch/xtensa/vmlinux.lds                      \
-		   $(archinc)/platform $(archinc)/variant	\
-		   $(archinc)/.platform
-
 define archhelp
   @echo '* zImage      - Compressed kernel image (arch/xtensa/boot/images/zImage.*)'
 endef

diff --git a/arch/xtensa/boot/boot-elf/boot.lds.S b/arch/xtensa/boot/boot-elf/boot.lds.S
@@ -1,4 +1,4 @@
-#include <asm/variant/core.h>
+#include <variant/core.h>
 OUTPUT_ARCH(xtensa)
 ENTRY(_ResetVector)
 

diff --git a/arch/xtensa/boot/boot-redboot/bootstrap.S b/arch/xtensa/boot/boot-redboot/bootstrap.S
@@ -1,4 +1,4 @@
-#include <asm/variant/core.h>
+#include <variant/core.h>
 #include <asm/regs.h>
 #include <asm/asmmacro.h>
 #include <asm/cacheasm.h>

diff --git a/include/asm-xtensa/Kbuild → arch/xtensa/include/asm/Kbuild b/include/asm-xtensa/Kbuild → arch/xtensa/include/asm/Kbuild
diff --git a/include/asm-xtensa/asmmacro.h → arch/xtensa/include/asm/asmmacro.h b/include/asm-xtensa/asmmacro.h → arch/xtensa/include/asm/asmmacro.h
@@ -11,7 +11,7 @@
 #ifndef _XTENSA_ASMMACRO_H
 #define _XTENSA_ASMMACRO_H
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 /*
  * Some little helpers for loops. Use zero-overhead-loops

diff --git a/include/asm-xtensa/atomic.h → arch/xtensa/include/asm/atomic.h b/include/asm-xtensa/atomic.h → arch/xtensa/include/asm/atomic.h
diff --git a/include/asm-xtensa/auxvec.h → arch/xtensa/include/asm/auxvec.h b/include/asm-xtensa/auxvec.h → arch/xtensa/include/asm/auxvec.h
diff --git a/include/asm-xtensa/bitops.h → arch/xtensa/include/asm/bitops.h b/include/asm-xtensa/bitops.h → arch/xtensa/include/asm/bitops.h
diff --git a/include/asm-xtensa/bootparam.h → arch/xtensa/include/asm/bootparam.h b/include/asm-xtensa/bootparam.h → arch/xtensa/include/asm/bootparam.h
diff --git a/include/asm-xtensa/bug.h → arch/xtensa/include/asm/bug.h b/include/asm-xtensa/bug.h → arch/xtensa/include/asm/bug.h
diff --git a/include/asm-xtensa/bugs.h → arch/xtensa/include/asm/bugs.h b/include/asm-xtensa/bugs.h → arch/xtensa/include/asm/bugs.h
diff --git a/include/asm-xtensa/byteorder.h → arch/xtensa/include/asm/byteorder.h b/include/asm-xtensa/byteorder.h → arch/xtensa/include/asm/byteorder.h
@@ -14,7 +14,17 @@
 #include <asm/types.h>
 #include <linux/compiler.h>
 
-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
+#ifdef __XTENSA_EL__
+# define __LITTLE_ENDIAN
+#elif defined(__XTENSA_EB__)
+# define __BIG_ENDIAN
+#else
+# error processor byte order undefined!
+#endif
+
+#define __SWAB_64_THRU_32__
+
+static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
 {
     __u32 res;
     /* instruction sequence from Xtensa ISA release 2/2000 */
@@ -28,8 +38,9 @@ static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
 	    );
     return res;
 }
+#define __arch_swab32 __arch_swab32
 
-static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
+static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
 {
     /* Given that 'short' values are signed (i.e., can be negative),
      * we cannot assume that the upper 16-bits of the register are
@@ -62,21 +73,8 @@ static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
 
     return res;
 }
+#define __arch_swab16 __arch_swab16
 
-#define __arch__swab32(x) ___arch__swab32(x)
-#define __arch__swab16(x) ___arch__swab16(x)
-
-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
-
-#ifdef __XTENSA_EL__
-# include <linux/byteorder/little_endian.h>
-#elif defined(__XTENSA_EB__)
-# include <linux/byteorder/big_endian.h>
-#else
-# error processor byte order undefined!
-#endif
+#include <linux/byteorder.h>
 
 #endif /* _XTENSA_BYTEORDER_H */
diff --git a/include/asm-xtensa/cache.h → arch/xtensa/include/asm/cache.h b/include/asm-xtensa/cache.h → arch/xtensa/include/asm/cache.h
@@ -11,7 +11,7 @@
 #ifndef _XTENSA_CACHE_H
 #define _XTENSA_CACHE_H
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 #define L1_CACHE_SHIFT	XCHAL_DCACHE_LINEWIDTH
 #define L1_CACHE_BYTES	XCHAL_DCACHE_LINESIZE

diff --git a/include/asm-xtensa/cacheasm.h → arch/xtensa/include/asm/cacheasm.h b/include/asm-xtensa/cacheasm.h → arch/xtensa/include/asm/cacheasm.h
diff --git a/include/asm-xtensa/cacheflush.h → arch/xtensa/include/asm/cacheflush.h b/include/asm-xtensa/cacheflush.h → arch/xtensa/include/asm/cacheflush.h
diff --git a/include/asm-xtensa/checksum.h → arch/xtensa/include/asm/checksum.h b/include/asm-xtensa/checksum.h → arch/xtensa/include/asm/checksum.h
@@ -12,7 +12,7 @@
 #define _XTENSA_CHECKSUM_H
 
 #include <linux/in6.h>
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 /*
  * computes the checksum of a memory block at buff, length len,

diff --git a/include/asm-xtensa/coprocessor.h → arch/xtensa/include/asm/coprocessor.h b/include/asm-xtensa/coprocessor.h → arch/xtensa/include/asm/coprocessor.h
@@ -13,11 +13,11 @@
 #define _XTENSA_COPROCESSOR_H
 
 #include <linux/stringify.h>
-#include <asm/variant/tie.h>
+#include <variant/tie.h>
 #include <asm/types.h>
 
 #ifdef __ASSEMBLY__
-# include <asm/variant/tie-asm.h>
+# include <variant/tie-asm.h>
 
 .macro	xchal_sa_start  a b
 	.set .Lxchal_pofs_, 0

diff --git a/include/asm-xtensa/cpumask.h → arch/xtensa/include/asm/cpumask.h b/include/asm-xtensa/cpumask.h → arch/xtensa/include/asm/cpumask.h
diff --git a/include/asm-xtensa/cputime.h → arch/xtensa/include/asm/cputime.h b/include/asm-xtensa/cputime.h → arch/xtensa/include/asm/cputime.h
diff --git a/include/asm-xtensa/current.h → arch/xtensa/include/asm/current.h b/include/asm-xtensa/current.h → arch/xtensa/include/asm/current.h
diff --git a/include/asm-xtensa/delay.h → arch/xtensa/include/asm/delay.h b/include/asm-xtensa/delay.h → arch/xtensa/include/asm/delay.h
diff --git a/include/asm-xtensa/device.h → arch/xtensa/include/asm/device.h b/include/asm-xtensa/device.h → arch/xtensa/include/asm/device.h
diff --git a/include/asm-xtensa/div64.h → arch/xtensa/include/asm/div64.h b/include/asm-xtensa/div64.h → arch/xtensa/include/asm/div64.h
diff --git a/include/asm-xtensa/dma-mapping.h → arch/xtensa/include/asm/dma-mapping.h b/include/asm-xtensa/dma-mapping.h → arch/xtensa/include/asm/dma-mapping.h
diff --git a/include/asm-xtensa/dma.h → arch/xtensa/include/asm/dma.h b/include/asm-xtensa/dma.h → arch/xtensa/include/asm/dma.h
diff --git a/include/asm-xtensa/elf.h → arch/xtensa/include/asm/elf.h b/include/asm-xtensa/elf.h → arch/xtensa/include/asm/elf.h
diff --git a/include/asm-xtensa/emergency-restart.h → arch/xtensa/include/asm/emergency-restart.h b/include/asm-xtensa/emergency-restart.h → arch/xtensa/include/asm/emergency-restart.h
diff --git a/include/asm-xtensa/errno.h → arch/xtensa/include/asm/errno.h b/include/asm-xtensa/errno.h → arch/xtensa/include/asm/errno.h
diff --git a/include/asm-xtensa/fb.h → arch/xtensa/include/asm/fb.h b/include/asm-xtensa/fb.h → arch/xtensa/include/asm/fb.h
diff --git a/include/asm-xtensa/fcntl.h → arch/xtensa/include/asm/fcntl.h b/include/asm-xtensa/fcntl.h → arch/xtensa/include/asm/fcntl.h
diff --git a/include/asm-xtensa/futex.h → arch/xtensa/include/asm/futex.h b/include/asm-xtensa/futex.h → arch/xtensa/include/asm/futex.h
diff --git a/include/asm-xtensa/hardirq.h → arch/xtensa/include/asm/hardirq.h b/include/asm-xtensa/hardirq.h → arch/xtensa/include/asm/hardirq.h
diff --git a/include/asm-xtensa/highmem.h → arch/xtensa/include/asm/highmem.h b/include/asm-xtensa/highmem.h → arch/xtensa/include/asm/highmem.h
diff --git a/include/asm-xtensa/hw_irq.h → arch/xtensa/include/asm/hw_irq.h b/include/asm-xtensa/hw_irq.h → arch/xtensa/include/asm/hw_irq.h
diff --git a/include/asm-xtensa/io.h → arch/xtensa/include/asm/io.h b/include/asm-xtensa/io.h → arch/xtensa/include/asm/io.h
diff --git a/include/asm-xtensa/ioctl.h → arch/xtensa/include/asm/ioctl.h b/include/asm-xtensa/ioctl.h → arch/xtensa/include/asm/ioctl.h
diff --git a/include/asm-xtensa/ioctls.h → arch/xtensa/include/asm/ioctls.h b/include/asm-xtensa/ioctls.h → arch/xtensa/include/asm/ioctls.h
diff --git a/include/asm-xtensa/ipcbuf.h → arch/xtensa/include/asm/ipcbuf.h b/include/asm-xtensa/ipcbuf.h → arch/xtensa/include/asm/ipcbuf.h
diff --git a/include/asm-xtensa/irq.h → arch/xtensa/include/asm/irq.h b/include/asm-xtensa/irq.h → arch/xtensa/include/asm/irq.h
@@ -11,8 +11,8 @@
 #ifndef _XTENSA_IRQ_H
 #define _XTENSA_IRQ_H
 
-#include <asm/platform/hardware.h>
-#include <asm/variant/core.h>
+#include <platform/hardware.h>
+#include <variant/core.h>
 
 #ifndef PLATFORM_NR_IRQS
 # define PLATFORM_NR_IRQS 0

diff --git a/include/asm-xtensa/irq_regs.h → arch/xtensa/include/asm/irq_regs.h b/include/asm-xtensa/irq_regs.h → arch/xtensa/include/asm/irq_regs.h
diff --git a/include/asm-xtensa/kdebug.h → arch/xtensa/include/asm/kdebug.h b/include/asm-xtensa/kdebug.h → arch/xtensa/include/asm/kdebug.h
diff --git a/include/asm-xtensa/kmap_types.h → arch/xtensa/include/asm/kmap_types.h b/include/asm-xtensa/kmap_types.h → arch/xtensa/include/asm/kmap_types.h
diff --git a/include/asm-xtensa/linkage.h → arch/xtensa/include/asm/linkage.h b/include/asm-xtensa/linkage.h → arch/xtensa/include/asm/linkage.h
diff --git a/include/asm-xtensa/local.h → arch/xtensa/include/asm/local.h b/include/asm-xtensa/local.h → arch/xtensa/include/asm/local.h
diff --git a/include/asm-xtensa/mman.h → arch/xtensa/include/asm/mman.h b/include/asm-xtensa/mman.h → arch/xtensa/include/asm/mman.h
diff --git a/include/asm-xtensa/mmu.h → arch/xtensa/include/asm/mmu.h b/include/asm-xtensa/mmu.h → arch/xtensa/include/asm/mmu.h
diff --git a/include/asm-xtensa/mmu_context.h → arch/xtensa/include/asm/mmu_context.h b/include/asm-xtensa/mmu_context.h → arch/xtensa/include/asm/mmu_context.h
diff --git a/include/asm-xtensa/module.h → arch/xtensa/include/asm/module.h b/include/asm-xtensa/module.h → arch/xtensa/include/asm/module.h
diff --git a/include/asm-xtensa/msgbuf.h → arch/xtensa/include/asm/msgbuf.h b/include/asm-xtensa/msgbuf.h → arch/xtensa/include/asm/msgbuf.h
diff --git a/include/asm-xtensa/mutex.h → arch/xtensa/include/asm/mutex.h b/include/asm-xtensa/mutex.h → arch/xtensa/include/asm/mutex.h
diff --git a/include/asm-xtensa/page.h → arch/xtensa/include/asm/page.h b/include/asm-xtensa/page.h → arch/xtensa/include/asm/page.h
diff --git a/include/asm-xtensa/param.h → arch/xtensa/include/asm/param.h b/include/asm-xtensa/param.h → arch/xtensa/include/asm/param.h
diff --git a/include/asm-xtensa/pci-bridge.h → arch/xtensa/include/asm/pci-bridge.h b/include/asm-xtensa/pci-bridge.h → arch/xtensa/include/asm/pci-bridge.h
diff --git a/include/asm-xtensa/pci.h → arch/xtensa/include/asm/pci.h b/include/asm-xtensa/pci.h → arch/xtensa/include/asm/pci.h
diff --git a/include/asm-xtensa/percpu.h → arch/xtensa/include/asm/percpu.h b/include/asm-xtensa/percpu.h → arch/xtensa/include/asm/percpu.h
diff --git a/include/asm-xtensa/pgalloc.h → arch/xtensa/include/asm/pgalloc.h b/include/asm-xtensa/pgalloc.h → arch/xtensa/include/asm/pgalloc.h
diff --git a/include/asm-xtensa/pgtable.h → arch/xtensa/include/asm/pgtable.h b/include/asm-xtensa/pgtable.h → arch/xtensa/include/asm/pgtable.h
diff --git a/include/asm-xtensa/platform.h → arch/xtensa/include/asm/platform.h b/include/asm-xtensa/platform.h → arch/xtensa/include/asm/platform.h
@@ -1,6 +1,4 @@
 /*
- * include/asm-xtensa/platform.h
- *
  * Platform specific functions
  *
  * This file is subject to the terms and conditions of the GNU General

diff --git a/include/asm-xtensa/poll.h → arch/xtensa/include/asm/poll.h b/include/asm-xtensa/poll.h → arch/xtensa/include/asm/poll.h
diff --git a/include/asm-xtensa/posix_types.h → arch/xtensa/include/asm/posix_types.h b/include/asm-xtensa/posix_types.h → arch/xtensa/include/asm/posix_types.h
diff --git a/include/asm-xtensa/processor.h → arch/xtensa/include/asm/processor.h b/include/asm-xtensa/processor.h → arch/xtensa/include/asm/processor.h
@@ -11,7 +11,7 @@
 #ifndef _XTENSA_PROCESSOR_H
 #define _XTENSA_PROCESSOR_H
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 #include <asm/coprocessor.h>
 
 #include <linux/compiler.h>

diff --git a/include/asm-xtensa/ptrace.h → arch/xtensa/include/asm/ptrace.h b/include/asm-xtensa/ptrace.h → arch/xtensa/include/asm/ptrace.h
@@ -111,7 +111,7 @@ struct pt_regs {
 	unsigned long areg[16];		/* 128 (64) */
 };
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 # define task_pt_regs(tsk) ((struct pt_regs*) \
   (task_stack_page(tsk) + KERNEL_STACK_SIZE - (XCHAL_NUM_AREGS-16)*4) - 1)

diff --git a/include/asm-xtensa/regs.h → arch/xtensa/include/asm/regs.h b/include/asm-xtensa/regs.h → arch/xtensa/include/asm/regs.h
diff --git a/include/asm-xtensa/resource.h → arch/xtensa/include/asm/resource.h b/include/asm-xtensa/resource.h → arch/xtensa/include/asm/resource.h
diff --git a/include/asm-xtensa/rmap.h → arch/xtensa/include/asm/rmap.h b/include/asm-xtensa/rmap.h → arch/xtensa/include/asm/rmap.h
diff --git a/include/asm-xtensa/rwsem.h → arch/xtensa/include/asm/rwsem.h b/include/asm-xtensa/rwsem.h → arch/xtensa/include/asm/rwsem.h
diff --git a/include/asm-xtensa/scatterlist.h → arch/xtensa/include/asm/scatterlist.h b/include/asm-xtensa/scatterlist.h → arch/xtensa/include/asm/scatterlist.h
diff --git a/include/asm-xtensa/sections.h → arch/xtensa/include/asm/sections.h b/include/asm-xtensa/sections.h → arch/xtensa/include/asm/sections.h
diff --git a/include/asm-xtensa/segment.h → arch/xtensa/include/asm/segment.h b/include/asm-xtensa/segment.h → arch/xtensa/include/asm/segment.h
diff --git a/include/asm-xtensa/sembuf.h → arch/xtensa/include/asm/sembuf.h b/include/asm-xtensa/sembuf.h → arch/xtensa/include/asm/sembuf.h
diff --git a/include/asm-xtensa/serial.h → arch/xtensa/include/asm/serial.h b/include/asm-xtensa/serial.h → arch/xtensa/include/asm/serial.h
@@ -13,6 +13,6 @@
 #ifndef _XTENSA_SERIAL_H
 #define _XTENSA_SERIAL_H
 
-#include <asm/platform/serial.h>
+#include <platform/serial.h>
 
 #endif	/* _XTENSA_SERIAL_H */
diff --git a/include/asm-xtensa/setup.h → arch/xtensa/include/asm/setup.h b/include/asm-xtensa/setup.h → arch/xtensa/include/asm/setup.h
diff --git a/include/asm-xtensa/shmbuf.h → arch/xtensa/include/asm/shmbuf.h b/include/asm-xtensa/shmbuf.h → arch/xtensa/include/asm/shmbuf.h
diff --git a/include/asm-xtensa/shmparam.h → arch/xtensa/include/asm/shmparam.h b/include/asm-xtensa/shmparam.h → arch/xtensa/include/asm/shmparam.h
diff --git a/include/asm-xtensa/sigcontext.h → arch/xtensa/include/asm/sigcontext.h b/include/asm-xtensa/sigcontext.h → arch/xtensa/include/asm/sigcontext.h
diff --git a/include/asm-xtensa/siginfo.h → arch/xtensa/include/asm/siginfo.h b/include/asm-xtensa/siginfo.h → arch/xtensa/include/asm/siginfo.h
diff --git a/include/asm-xtensa/signal.h → arch/xtensa/include/asm/signal.h b/include/asm-xtensa/signal.h → arch/xtensa/include/asm/signal.h
diff --git a/include/asm-xtensa/smp.h → arch/xtensa/include/asm/smp.h b/include/asm-xtensa/smp.h → arch/xtensa/include/asm/smp.h
diff --git a/include/asm-xtensa/socket.h → arch/xtensa/include/asm/socket.h b/include/asm-xtensa/socket.h → arch/xtensa/include/asm/socket.h
diff --git a/include/asm-xtensa/sockios.h → arch/xtensa/include/asm/sockios.h b/include/asm-xtensa/sockios.h → arch/xtensa/include/asm/sockios.h
diff --git a/include/asm-xtensa/spinlock.h → arch/xtensa/include/asm/spinlock.h b/include/asm-xtensa/spinlock.h → arch/xtensa/include/asm/spinlock.h
diff --git a/include/asm-xtensa/stat.h → arch/xtensa/include/asm/stat.h b/include/asm-xtensa/stat.h → arch/xtensa/include/asm/stat.h
diff --git a/include/asm-xtensa/statfs.h → arch/xtensa/include/asm/statfs.h b/include/asm-xtensa/statfs.h → arch/xtensa/include/asm/statfs.h
diff --git a/include/asm-xtensa/string.h → arch/xtensa/include/asm/string.h b/include/asm-xtensa/string.h → arch/xtensa/include/asm/string.h
diff --git a/include/asm-xtensa/syscall.h → arch/xtensa/include/asm/syscall.h b/include/asm-xtensa/syscall.h → arch/xtensa/include/asm/syscall.h
diff --git a/include/asm-xtensa/system.h → arch/xtensa/include/asm/system.h b/include/asm-xtensa/system.h → arch/xtensa/include/asm/system.h
diff --git a/include/asm-xtensa/termbits.h → arch/xtensa/include/asm/termbits.h b/include/asm-xtensa/termbits.h → arch/xtensa/include/asm/termbits.h
diff --git a/include/asm-xtensa/termios.h → arch/xtensa/include/asm/termios.h b/include/asm-xtensa/termios.h → arch/xtensa/include/asm/termios.h
diff --git a/include/asm-xtensa/thread_info.h → arch/xtensa/include/asm/thread_info.h b/include/asm-xtensa/thread_info.h → arch/xtensa/include/asm/thread_info.h
diff --git a/include/asm-xtensa/timex.h → arch/xtensa/include/asm/timex.h b/include/asm-xtensa/timex.h → arch/xtensa/include/asm/timex.h
diff --git a/include/asm-xtensa/tlb.h → arch/xtensa/include/asm/tlb.h b/include/asm-xtensa/tlb.h → arch/xtensa/include/asm/tlb.h
diff --git a/include/asm-xtensa/tlbflush.h → arch/xtensa/include/asm/tlbflush.h b/include/asm-xtensa/tlbflush.h → arch/xtensa/include/asm/tlbflush.h
diff --git a/include/asm-xtensa/topology.h → arch/xtensa/include/asm/topology.h b/include/asm-xtensa/topology.h → arch/xtensa/include/asm/topology.h
diff --git a/include/asm-xtensa/types.h → arch/xtensa/include/asm/types.h b/include/asm-xtensa/types.h → arch/xtensa/include/asm/types.h
diff --git a/include/asm-xtensa/uaccess.h → arch/xtensa/include/asm/uaccess.h b/include/asm-xtensa/uaccess.h → arch/xtensa/include/asm/uaccess.h
diff --git a/include/asm-xtensa/ucontext.h → arch/xtensa/include/asm/ucontext.h b/include/asm-xtensa/ucontext.h → arch/xtensa/include/asm/ucontext.h
diff --git a/include/asm-xtensa/unaligned.h → arch/xtensa/include/asm/unaligned.h b/include/asm-xtensa/unaligned.h → arch/xtensa/include/asm/unaligned.h
@@ -10,20 +10,20 @@
 #ifndef _ASM_XTENSA_UNALIGNED_H
 #define _ASM_XTENSA_UNALIGNED_H
 
-#ifdef __XTENSA_EL__
-# include <linux/unaligned/le_memmove.h>
+#include <asm/byteorder.h>
+
+#ifdef __LITTLE_ENDIAN
+# include <linux/unaligned/le_struct.h>
 # include <linux/unaligned/be_byteshift.h>
 # include <linux/unaligned/generic.h>
 # define get_unaligned	__get_unaligned_le
 # define put_unaligned	__put_unaligned_le
-#elif defined(__XTENSA_EB__)
-# include <linux/unaligned/be_memmove.h>
+#else
+# include <linux/unaligned/be_struct.h>
 # include <linux/unaligned/le_byteshift.h>
 # include <linux/unaligned/generic.h>
 # define get_unaligned	__get_unaligned_be
 # define put_unaligned	__put_unaligned_be
-#else
-# error processor byte order undefined!
 #endif
 
 #endif	/* _ASM_XTENSA_UNALIGNED_H */
diff --git a/include/asm-xtensa/unistd.h → arch/xtensa/include/asm/unistd.h b/include/asm-xtensa/unistd.h → arch/xtensa/include/asm/unistd.h
diff --git a/include/asm-xtensa/user.h → arch/xtensa/include/asm/user.h b/include/asm-xtensa/user.h → arch/xtensa/include/asm/user.h
diff --git a/include/asm-xtensa/vga.h → arch/xtensa/include/asm/vga.h b/include/asm-xtensa/vga.h → arch/xtensa/include/asm/vga.h
diff --git a/include/asm-xtensa/xor.h → arch/xtensa/include/asm/xor.h b/include/asm-xtensa/xor.h → arch/xtensa/include/asm/xor.h
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
@@ -25,7 +25,7 @@
 #include <asm/page.h>
 #include <asm/signal.h>
 #include <asm/tlbflush.h>
-#include <asm/variant/tie-asm.h>
+#include <variant/tie-asm.h>
 
 /* Unimplemented features. */
 

diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S
@@ -16,7 +16,7 @@
 
 #include <asm-generic/vmlinux.lds.h>
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 OUTPUT_ARCH(xtensa)
 ENTRY(_start)
 

diff --git a/arch/xtensa/lib/checksum.S b/arch/xtensa/lib/checksum.S
@@ -16,7 +16,7 @@
 
 #include <asm/errno.h>
 #include <linux/linkage.h>
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 /*
  * computes a partial checksum, e.g. for TCP/UDP fragments

diff --git a/arch/xtensa/lib/memcopy.S b/arch/xtensa/lib/memcopy.S
@@ -9,7 +9,7 @@
  * Copyright (C) 2002 - 2005 Tensilica Inc.
  */
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 	.macro	src_b	r, w0, w1
 #ifdef __XTENSA_EB__

diff --git a/arch/xtensa/lib/memset.S b/arch/xtensa/lib/memset.S
@@ -11,7 +11,7 @@
  *  Copyright (C) 2002 Tensilica Inc.
  */
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 /*
  * void *memset(void *dst, int c, size_t length)

diff --git a/arch/xtensa/lib/strncpy_user.S b/arch/xtensa/lib/strncpy_user.S
@@ -11,7 +11,7 @@
  *  Copyright (C) 2002 Tensilica Inc.
  */
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 #include <linux/errno.h>
 
 /* Load or store instructions that may cause exceptions use the EX macro. */

diff --git a/arch/xtensa/lib/strnlen_user.S b/arch/xtensa/lib/strnlen_user.S
@@ -11,7 +11,7 @@
  *  Copyright (C) 2002 Tensilica Inc.
  */
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 /* Load or store instructions that may cause exceptions use the EX macro. */
 

diff --git a/arch/xtensa/lib/usercopy.S b/arch/xtensa/lib/usercopy.S
@@ -53,7 +53,7 @@
  *	a11/ original length
  */
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 #ifdef __XTENSA_EB__
 #define ALIGN(R, W0, W1) src	R, W0, W1

diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
@@ -1,5 +1,5 @@
 /*
- * arch/xtensa/platform-iss/console.c
+ * arch/xtensa/platforms/iss/console.c
  *
  * 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
@@ -24,7 +24,7 @@
 #include <asm/uaccess.h>
 #include <asm/irq.h>
 
-#include <asm/platform/simcall.h>
+#include <platform/simcall.h>
 
 #include <linux/tty.h>
 #include <linux/tty_flip.h>

diff --git a/include/asm-xtensa/platform-iss/hardware.h → ...platforms/iss/include/platform/hardware.h b/include/asm-xtensa/platform-iss/hardware.h → ...platforms/iss/include/platform/hardware.h
diff --git a/include/asm-xtensa/platform-iss/simcall.h → .../platforms/iss/include/platform/simcall.h b/include/asm-xtensa/platform-iss/simcall.h → .../platforms/iss/include/platform/simcall.h
diff --git a/arch/xtensa/platforms/iss/io.c b/arch/xtensa/platforms/iss/io.c
@@ -3,7 +3,7 @@
 #if 0
 
 #include <asm/io.h>
-#include <xtensa/simcall.h>
+#include <platform/platform-iss/simcall.h>
 
 extern int __simc ();
 

diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/iss/network.c
@@ -1,6 +1,6 @@
 /*
  *
- * arch/xtensa/platform-iss/network.c
+ * arch/xtensa/platforms/iss/network.c
  *
  * Platform specific initialization.
  *
@@ -33,7 +33,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/platform_device.h>
 
-#include <asm/platform/simcall.h>
+#include <platform/simcall.h>
 
 #define DRIVER_NAME "iss-netdev"
 #define ETH_MAX_PACKET 1500

diff --git a/arch/xtensa/platforms/xt2000/Makefile b/arch/xtensa/platforms/xt2000/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Tensilica XT2000 Emulation Board
+#
+
+obj-y 			= setup.o