diff options
| -rw-r--r-- | arch/xtensa/Makefile | 28 | ||||
| -rw-r--r-- | arch/xtensa/boot/boot-elf/boot.lds.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/boot/boot-redboot/bootstrap.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/Kbuild (renamed from include/asm-xtensa/Kbuild) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/asmmacro.h (renamed from include/asm-xtensa/asmmacro.h) | 2 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/atomic.h (renamed from include/asm-xtensa/atomic.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/auxvec.h (renamed from include/asm-xtensa/auxvec.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/bitops.h (renamed from include/asm-xtensa/bitops.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/bootparam.h (renamed from include/asm-xtensa/bootparam.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/bug.h (renamed from include/asm-xtensa/bug.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/bugs.h (renamed from include/asm-xtensa/bugs.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/byteorder.h (renamed from include/asm-xtensa/byteorder.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/cache.h (renamed from include/asm-xtensa/cache.h) | 2 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/cacheasm.h (renamed from include/asm-xtensa/cacheasm.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/cacheflush.h (renamed from include/asm-xtensa/cacheflush.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/checksum.h (renamed from include/asm-xtensa/checksum.h) | 2 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/coprocessor.h (renamed from include/asm-xtensa/coprocessor.h) | 4 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/cpumask.h (renamed from include/asm-xtensa/cpumask.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/cputime.h (renamed from include/asm-xtensa/cputime.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/current.h (renamed from include/asm-xtensa/current.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/delay.h (renamed from include/asm-xtensa/delay.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/device.h (renamed from include/asm-xtensa/device.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/div64.h (renamed from include/asm-xtensa/div64.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/dma-mapping.h (renamed from include/asm-xtensa/dma-mapping.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/dma.h (renamed from include/asm-xtensa/dma.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/elf.h (renamed from include/asm-xtensa/elf.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/emergency-restart.h (renamed from include/asm-xtensa/emergency-restart.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/errno.h (renamed from include/asm-xtensa/errno.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/fb.h (renamed from include/asm-xtensa/fb.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/fcntl.h (renamed from include/asm-xtensa/fcntl.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/futex.h (renamed from include/asm-xtensa/futex.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/hardirq.h (renamed from include/asm-xtensa/hardirq.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/highmem.h (renamed from include/asm-xtensa/highmem.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/hw_irq.h (renamed from include/asm-xtensa/hw_irq.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/io.h (renamed from include/asm-xtensa/io.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/ioctl.h (renamed from include/asm-xtensa/ioctl.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/ioctls.h (renamed from include/asm-xtensa/ioctls.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/ipcbuf.h (renamed from include/asm-xtensa/ipcbuf.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/irq.h (renamed from include/asm-xtensa/irq.h) | 4 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/irq_regs.h (renamed from include/asm-xtensa/irq_regs.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/kdebug.h (renamed from include/asm-xtensa/kdebug.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/kmap_types.h (renamed from include/asm-xtensa/kmap_types.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/linkage.h (renamed from include/asm-xtensa/linkage.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/local.h (renamed from include/asm-xtensa/local.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/mman.h (renamed from include/asm-xtensa/mman.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/mmu.h (renamed from include/asm-xtensa/mmu.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/mmu_context.h (renamed from include/asm-xtensa/mmu_context.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/module.h (renamed from include/asm-xtensa/module.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/msgbuf.h (renamed from include/asm-xtensa/msgbuf.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/mutex.h (renamed from include/asm-xtensa/mutex.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/page.h (renamed from include/asm-xtensa/page.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/param.h (renamed from include/asm-xtensa/param.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/pci-bridge.h (renamed from include/asm-xtensa/pci-bridge.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/pci.h (renamed from include/asm-xtensa/pci.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/percpu.h (renamed from include/asm-xtensa/percpu.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/pgalloc.h (renamed from include/asm-xtensa/pgalloc.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/pgtable.h (renamed from include/asm-xtensa/pgtable.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/platform.h (renamed from include/asm-xtensa/platform.h) | 2 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/poll.h (renamed from include/asm-xtensa/poll.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/posix_types.h (renamed from include/asm-xtensa/posix_types.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/processor.h (renamed from include/asm-xtensa/processor.h) | 2 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/ptrace.h (renamed from include/asm-xtensa/ptrace.h) | 2 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/regs.h (renamed from include/asm-xtensa/regs.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/resource.h (renamed from include/asm-xtensa/resource.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/rmap.h (renamed from include/asm-xtensa/rmap.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/rwsem.h (renamed from include/asm-xtensa/rwsem.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/scatterlist.h (renamed from include/asm-xtensa/scatterlist.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/sections.h (renamed from include/asm-xtensa/sections.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/segment.h (renamed from include/asm-xtensa/segment.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/sembuf.h (renamed from include/asm-xtensa/sembuf.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/serial.h (renamed from include/asm-xtensa/serial.h) | 2 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/setup.h (renamed from include/asm-xtensa/setup.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/shmbuf.h (renamed from include/asm-xtensa/shmbuf.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/shmparam.h (renamed from include/asm-xtensa/shmparam.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/sigcontext.h (renamed from include/asm-xtensa/sigcontext.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/siginfo.h (renamed from include/asm-xtensa/siginfo.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/signal.h (renamed from include/asm-xtensa/signal.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/smp.h (renamed from include/asm-xtensa/smp.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/socket.h (renamed from include/asm-xtensa/socket.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/sockios.h (renamed from include/asm-xtensa/sockios.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/spinlock.h (renamed from include/asm-xtensa/spinlock.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/stat.h (renamed from include/asm-xtensa/stat.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/statfs.h (renamed from include/asm-xtensa/statfs.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/string.h (renamed from include/asm-xtensa/string.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/syscall.h (renamed from include/asm-xtensa/syscall.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/system.h (renamed from include/asm-xtensa/system.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/termbits.h (renamed from include/asm-xtensa/termbits.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/termios.h (renamed from include/asm-xtensa/termios.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/thread_info.h (renamed from include/asm-xtensa/thread_info.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/timex.h (renamed from include/asm-xtensa/timex.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/tlb.h (renamed from include/asm-xtensa/tlb.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/tlbflush.h (renamed from include/asm-xtensa/tlbflush.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/topology.h (renamed from include/asm-xtensa/topology.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/types.h (renamed from include/asm-xtensa/types.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/uaccess.h (renamed from include/asm-xtensa/uaccess.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/ucontext.h (renamed from include/asm-xtensa/ucontext.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/unaligned.h (renamed from include/asm-xtensa/unaligned.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/unistd.h (renamed from include/asm-xtensa/unistd.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/user.h (renamed from include/asm-xtensa/user.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/vga.h (renamed from include/asm-xtensa/vga.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/xor.h (renamed from include/asm-xtensa/xor.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/kernel/vmlinux.lds.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/lib/checksum.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/lib/memcopy.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/lib/memset.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/lib/strncpy_user.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/lib/strnlen_user.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/lib/usercopy.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/platforms/iss/console.c | 2 | ||||
| -rw-r--r-- | arch/xtensa/platforms/iss/include/platform/hardware.h (renamed from include/asm-xtensa/platform-iss/hardware.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/platforms/iss/include/platform/simcall.h (renamed from include/asm-xtensa/platform-iss/simcall.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/platforms/iss/io.c | 2 | ||||
| -rw-r--r-- | arch/xtensa/platforms/iss/network.c | 2 | ||||
| -rw-r--r-- | arch/xtensa/variants/dc232b/include/variant/core.h (renamed from include/asm-xtensa/variant-dc232b/core.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/variants/dc232b/include/variant/tie-asm.h (renamed from include/asm-xtensa/variant-dc232b/tie-asm.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/variants/dc232b/include/variant/tie.h (renamed from include/asm-xtensa/variant-dc232b/tie.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/variants/fsf/include/variant/core.h (renamed from include/asm-xtensa/variant-fsf/core.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/variants/fsf/include/variant/tie-asm.h (renamed from include/asm-xtensa/variant-fsf/tie-asm.h) | 0 | ||||
| -rw-r--r-- | arch/xtensa/variants/fsf/include/variant/tie.h (renamed from include/asm-xtensa/variant-fsf/tie.h) | 0 |
120 files changed, 32 insertions, 44 deletions
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index 015b6b2a26b9..1da55fe4beff 100644 --- 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 index 849dfcafd518..4e53b74dc44b 100644 --- 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 index 84848123e2a8..5582e8cfac8f 100644 --- 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 b/arch/xtensa/include/asm/Kbuild index c68e1680da01..c68e1680da01 100644 --- a/include/asm-xtensa/Kbuild +++ b/arch/xtensa/include/asm/Kbuild diff --git a/include/asm-xtensa/asmmacro.h b/arch/xtensa/include/asm/asmmacro.h index 76915cabad17..755320f6e0bc 100644 --- a/include/asm-xtensa/asmmacro.h +++ b/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 |