Also move lib_<ARCH>/config.mk to arch/<ARCH>/config.mk

This change is intended to clean up the top-level directory structure and more closely mimic Linux's directory organization.

Signed-off-by: Peter Tyser ptyser@xes-inc.com --- Makefile | 8 +++--- README | 28 ++++++++++---------- {lib_arm => arch/arm}/config.mk | 4 +- {lib_arm => arch/arm/lib}/Makefile | 0 {lib_arm => arch/arm/lib}/_ashldi3.S | 0 {lib_arm => arch/arm/lib}/_ashrdi3.S | 0 {lib_arm => arch/arm/lib}/_divsi3.S | 0 {lib_arm => arch/arm/lib}/_lshrdi3.S | 0 {lib_arm => arch/arm/lib}/_modsi3.S | 0 {lib_arm => arch/arm/lib}/_udivsi3.S | 0 {lib_arm => arch/arm/lib}/_umodsi3.S | 0 {lib_arm => arch/arm/lib}/board.c | 0 {lib_arm => arch/arm/lib}/bootm.c | 0 {lib_arm => arch/arm/lib}/cache-cp15.c | 0 {lib_arm => arch/arm/lib}/cache.c | 0 {lib_arm => arch/arm/lib}/div0.c | 0 {lib_arm => arch/arm/lib}/eabi_compat.c | 0 {lib_arm => arch/arm/lib}/interrupts.c | 0 {lib_arm => arch/arm/lib}/reset.c | 0 {lib_avr32 => arch/avr32}/config.mk | 0 {lib_avr32 => arch/avr32/lib}/Makefile | 0 {lib_avr32 => arch/avr32/lib}/board.c | 0 {lib_avr32 => arch/avr32/lib}/bootm.c | 0 {lib_avr32 => arch/avr32/lib}/interrupts.c | 0 {lib_avr32 => arch/avr32/lib}/memset.S | 0 {lib_blackfin => arch/blackfin}/config.mk | 2 +- {lib_blackfin => arch/blackfin/lib}/.gitignore | 0 {lib_blackfin => arch/blackfin/lib}/Makefile | 0 {lib_blackfin => arch/blackfin/lib}/board.c | 0 {lib_blackfin => arch/blackfin/lib}/boot.c | 0 {lib_blackfin => arch/blackfin/lib}/cache.c | 0 {lib_blackfin => arch/blackfin/lib}/clocks.c | 0 .../blackfin/lib}/cmd_cache_dump.c | 0 {lib_blackfin => arch/blackfin/lib}/memcmp.S | 0 {lib_blackfin => arch/blackfin/lib}/memcpy.S | 0 {lib_blackfin => arch/blackfin/lib}/memmove.S | 0 {lib_blackfin => arch/blackfin/lib}/memset.S | 0 {lib_blackfin => arch/blackfin/lib}/muldi3.c | 0 {lib_blackfin => arch/blackfin/lib}/post.c | 0 {lib_blackfin => arch/blackfin/lib}/string.c | 0 {lib_blackfin => arch/blackfin/lib}/tests.c | 0 {lib_blackfin => arch/blackfin/lib}/u-boot.lds.S | 0 {lib_i386 => arch/i386}/config.mk | 0 {lib_i386 => arch/i386/lib}/Makefile | 0 {lib_i386 => arch/i386/lib}/bios.S | 0 {lib_i386 => arch/i386/lib}/bios.h | 0 {lib_i386 => arch/i386/lib}/bios_pci.S | 0 {lib_i386 => arch/i386/lib}/bios_setup.c | 0 {lib_i386 => arch/i386/lib}/board.c | 0 {lib_i386 => arch/i386/lib}/bootm.c | 0 {lib_i386 => arch/i386/lib}/interrupts.c | 0 {lib_i386 => arch/i386/lib}/pcat_interrupts.c | 0 {lib_i386 => arch/i386/lib}/pcat_timer.c | 0 {lib_i386 => arch/i386/lib}/pci.c | 0 {lib_i386 => arch/i386/lib}/pci_type1.c | 0 {lib_i386 => arch/i386/lib}/realmode.c | 0 {lib_i386 => arch/i386/lib}/realmode_switch.S | 0 {lib_i386 => arch/i386/lib}/timer.c | 0 {lib_i386 => arch/i386/lib}/video.c | 0 {lib_i386 => arch/i386/lib}/video_bios.c | 0 {lib_i386 => arch/i386/lib}/zimage.c | 0 {lib_m68k => arch/m68k}/config.mk | 0 {lib_m68k => arch/m68k/lib}/Makefile | 0 {lib_m68k => arch/m68k/lib}/board.c | 0 {lib_m68k => arch/m68k/lib}/bootm.c | 0 {lib_m68k => arch/m68k/lib}/cache.c | 0 {lib_m68k => arch/m68k/lib}/interrupts.c | 0 {lib_m68k => arch/m68k/lib}/time.c | 0 {lib_m68k => arch/m68k/lib}/traps.c | 0 {lib_microblaze => arch/microblaze}/config.mk | 0 {lib_microblaze => arch/microblaze/lib}/Makefile | 0 {lib_microblaze => arch/microblaze/lib}/board.c | 0 {lib_microblaze => arch/microblaze/lib}/bootm.c | 0 {lib_microblaze => arch/microblaze/lib}/cache.c | 0 {lib_microblaze => arch/microblaze/lib}/time.c | 0 {lib_mips => arch/mips}/config.mk | 0 {lib_mips => arch/mips/lib}/Makefile | 0 {lib_mips => arch/mips/lib}/board.c | 0 {lib_mips => arch/mips/lib}/bootm.c | 0 {lib_mips => arch/mips/lib}/bootm_qemu_mips.c | 0 {lib_mips => arch/mips/lib}/time.c | 0 {lib_nios => arch/nios}/config.mk | 0 {lib_nios => arch/nios/lib}/Makefile | 0 {lib_nios => arch/nios/lib}/board.c | 0 {lib_nios => arch/nios/lib}/bootm.c | 0 {lib_nios => arch/nios/lib}/cache.c | 0 {lib_nios => arch/nios/lib}/divmod.c | 0 {lib_nios => arch/nios/lib}/math.h | 0 {lib_nios => arch/nios/lib}/mult.c | 0 {lib_nios => arch/nios/lib}/time.c | 0 {lib_nios2 => arch/nios2}/config.mk | 0 {lib_nios2 => arch/nios2/lib}/Makefile | 0 {lib_nios2 => arch/nios2/lib}/board.c | 0 {lib_nios2 => arch/nios2/lib}/bootm.c | 0 {lib_nios2 => arch/nios2/lib}/cache.S | 0 {lib_nios2 => arch/nios2/lib}/divmod.c | 0 {lib_nios2 => arch/nios2/lib}/math.h | 0 {lib_nios2 => arch/nios2/lib}/mult.c | 0 {lib_nios2 => arch/nios2/lib}/time.c | 0 {lib_ppc => arch/ppc}/config.mk | 0 {lib_ppc => arch/ppc/lib}/Makefile | 0 {lib_ppc => arch/ppc/lib}/bat_rw.c | 0 {lib_ppc => arch/ppc/lib}/board.c | 0 {lib_ppc => arch/ppc/lib}/bootm.c | 0 {lib_ppc => arch/ppc/lib}/cache.c | 0 {lib_ppc => arch/ppc/lib}/extable.c | 0 {lib_ppc => arch/ppc/lib}/interrupts.c | 0 {lib_ppc => arch/ppc/lib}/kgdb.c | 0 {lib_ppc => arch/ppc/lib}/ppccache.S | 0 {lib_ppc => arch/ppc/lib}/ppcstring.S | 0 {lib_ppc => arch/ppc/lib}/ticks.S | 0 {lib_ppc => arch/ppc/lib}/time.c | 0 {lib_sh => arch/sh}/config.mk | 0 {lib_sh => arch/sh/lib}/Makefile | 0 {lib_sh => arch/sh/lib}/board.c | 0 {lib_sh => arch/sh/lib}/bootm.c | 0 {lib_sh => arch/sh/lib}/time.c | 0 {lib_sh => arch/sh/lib}/time_sh2.c | 0 {lib_sparc => arch/sparc}/config.mk | 0 {lib_sparc => arch/sparc/lib}/Makefile | 0 {lib_sparc => arch/sparc/lib}/board.c | 0 {lib_sparc => arch/sparc/lib}/bootm.c | 0 {lib_sparc => arch/sparc/lib}/cache.c | 0 {lib_sparc => arch/sparc/lib}/interrupts.c | 0 {lib_sparc => arch/sparc/lib}/time.c | 0 board/LEOX/elpt860/u-boot.lds | 10 +++--- board/RPXClassic/u-boot.lds | 2 +- board/RPXlite/u-boot.lds | 2 +- board/RPXlite_dw/u-boot.lds | 2 +- board/RRvision/u-boot.lds | 6 ++-- board/actux1/u-boot.lds | 2 +- board/actux2/u-boot.lds | 2 +- board/actux3/u-boot.lds | 2 +- board/amirix/ap1000/u-boot.lds | 2 +- board/c2mon/u-boot.lds | 2 +- board/cobra5272/u-boot.lds | 2 +- board/cray/L1/u-boot.lds.debug | 2 +- board/emk/top860/u-boot.lds.debug | 2 +- board/esd/tasreg/u-boot.lds | 2 +- board/esteem192e/u-boot.lds | 2 +- board/etx094/u-boot.lds.debug | 4 +- board/fads/u-boot.lds.debug | 2 +- board/freescale/m5208evbe/u-boot.lds | 2 +- board/freescale/m52277evb/u-boot.spa | 2 +- board/freescale/m5235evb/u-boot.16 | 4 +- board/freescale/m5235evb/u-boot.32 | 2 +- board/freescale/m5249evb/u-boot.lds | 2 +- board/freescale/m5253demo/u-boot.lds | 2 +- board/freescale/m5253evbe/u-boot.lds | 2 +- board/freescale/m5271evb/u-boot.lds | 2 +- board/freescale/m5272c3/u-boot.lds | 2 +- board/freescale/m53017evb/u-boot.lds | 2 +- board/freescale/m5329evb/u-boot.lds | 4 +- board/freescale/m5373evb/u-boot.lds | 4 +- board/freescale/m54451evb/u-boot.spa | 2 +- board/freescale/m54451evb/u-boot.stm | 2 +- board/freescale/m54455evb/u-boot.atm | 4 +- board/freescale/m54455evb/u-boot.int | 4 +- board/freescale/m547xevb/u-boot.lds | 4 +- board/freescale/m548xevb/u-boot.lds | 4 +- board/freescale/mpc7448hpc2/tsi108_init.c | 2 +- board/freescale/mpc8610hpcd/u-boot.lds | 2 +- board/freescale/mpc8641hpcn/u-boot.lds | 2 +- board/freescale/mx31ads/u-boot.lds | 2 +- board/genietv/u-boot.lds | 2 +- board/genietv/u-boot.lds.debug | 2 +- board/hermes/u-boot.lds | 6 ++-- board/hermes/u-boot.lds.debug | 6 ++-- board/hymod/u-boot.lds | 2 +- board/icu862/u-boot.lds | 2 +- board/icu862/u-boot.lds.debug | 2 +- board/idmr/u-boot.lds | 2 +- board/ip860/u-boot.lds | 6 ++-- board/ip860/u-boot.lds.debug | 6 ++-- board/ivm/u-boot.lds.debug | 2 +- board/jse/jse.c | 6 ++-- board/jse/sdram.c | 2 +- board/keymile/km8xx/u-boot.lds | 6 ++-- board/kup/kup4k/u-boot.lds | 2 +- board/kup/kup4x/u-boot.lds | 2 +- board/lantec/u-boot.lds | 2 +- board/lwmon/u-boot.lds.debug | 2 +- board/mbx8xx/u-boot.lds.debug | 2 +- board/ml2/u-boot.lds | 2 +- board/ml2/u-boot.lds.debug | 2 +- board/mousse/u-boot.lds | 4 +- board/mousse/u-boot.lds.rom | 2 +- board/mpl/pip405/u-boot.lds.debug | 2 +- board/netphone/u-boot.lds | 6 ++-- board/netstal/hcu4/hcu4.c | 2 +- board/netstal/hcu5/README.txt | 6 ++-- board/netstal/hcu5/hcu5.c | 2 +- board/netstal/mcu25/mcu25.c | 2 +- board/netta/u-boot.lds | 6 ++-- board/netta2/u-boot.lds | 6 ++-- board/netvia/u-boot.lds | 6 ++-- board/quantum/u-boot.lds | 2 +- board/rbc823/u-boot.lds | 2 +- board/rmu/u-boot.lds | 2 +- board/sandburst/karef/u-boot.lds.debug | 2 +- board/sandburst/metrobox/u-boot.lds.debug | 2 +- board/sbc8641d/u-boot.lds | 2 +- board/sc3/u-boot.lds | 2 +- board/siemens/CCM/u-boot.lds | 2 +- board/siemens/IAD210/u-boot.lds | 4 +- board/siemens/pcu_e/u-boot.lds.debug | 2 +- board/snmc/qs850/u-boot.lds | 6 ++-- board/snmc/qs860t/u-boot.lds | 6 ++-- board/spc1920/u-boot.lds | 6 ++-- board/spd8xx/u-boot.lds.debug | 2 +- board/stx/stxssa/stxssa.c | 2 +- board/stx/stxxtc/u-boot.lds | 6 ++-- board/svm_sc8xx/u-boot.lds | 6 ++-- board/tqc/tqm8xx/u-boot.lds | 4 +- board/uc100/u-boot.lds | 6 ++-- board/v37/u-boot.lds | 6 ++-- board/w7o/u-boot.lds.debug | 2 +- board/westel/amx860/u-boot.lds | 2 +- board/westel/amx860/u-boot.lds.debug | 2 +- board/xes/xpedite1000/u-boot.lds.debug | 2 +- board/xes/xpedite5170/u-boot.lds | 2 +- board/xilinx/ml300/u-boot.lds | 2 +- board/xilinx/ml300/u-boot.lds.debug | 2 +- config.mk | 2 +- cpu/mpc5xxx/u-boot-customlayout.lds | 4 +- doc/README.LED | 2 +- doc/README.alaska8220 | 2 +- doc/README.m52277evb | 12 ++++---- doc/README.m53017evb | 12 ++++---- doc/README.m5373evb | 12 ++++---- doc/README.m54455evb | 12 ++++---- doc/README.m5475evb | 10 +++--- doc/README.mpc5xx | 6 ++-- doc/README.nios | 2 +- doc/TODO-i386 | 2 +- examples/api/Makefile | 4 +- include/asm-i386/interrupt.h | 2 +- include/asm-i386/u-boot-i386.h | 4 +- include/common.h | 8 +++--- include/configs/B2.h | 2 +- nand_spl/board/freescale/mpc8313erdb/Makefile | 6 ++-- nand_spl/board/freescale/mpc8536ds/Makefile | 2 +- nand_spl/board/freescale/p1_p2_rdb/Makefile | 2 +- nand_spl/board/sheldon/simpc8313/Makefile | 6 ++-- 244 files changed, 229 insertions(+), 229 deletions(-) rename {lib_arm => arch/arm}/config.mk (94%) rename {lib_arm => arch/arm/lib}/Makefile (100%) rename {lib_arm => arch/arm/lib}/_ashldi3.S (100%) rename {lib_arm => arch/arm/lib}/_ashrdi3.S (100%) rename {lib_arm => arch/arm/lib}/_divsi3.S (100%) rename {lib_arm => arch/arm/lib}/_lshrdi3.S (100%) rename {lib_arm => arch/arm/lib}/_modsi3.S (100%) rename {lib_arm => arch/arm/lib}/_udivsi3.S (100%) rename {lib_arm => arch/arm/lib}/_umodsi3.S (100%) rename {lib_arm => arch/arm/lib}/board.c (100%) rename {lib_arm => arch/arm/lib}/bootm.c (100%) rename {lib_arm => arch/arm/lib}/cache-cp15.c (100%) rename {lib_arm => arch/arm/lib}/cache.c (100%) rename {lib_arm => arch/arm/lib}/div0.c (100%) rename {lib_arm => arch/arm/lib}/eabi_compat.c (100%) rename {lib_arm => arch/arm/lib}/interrupts.c (100%) rename {lib_arm => arch/arm/lib}/reset.c (100%) rename {lib_avr32 => arch/avr32}/config.mk (100%) rename {lib_avr32 => arch/avr32/lib}/Makefile (100%) rename {lib_avr32 => arch/avr32/lib}/board.c (100%) rename {lib_avr32 => arch/avr32/lib}/bootm.c (100%) rename {lib_avr32 => arch/avr32/lib}/interrupts.c (100%) rename {lib_avr32 => arch/avr32/lib}/memset.S (100%) rename {lib_blackfin => arch/blackfin}/config.mk (97%) rename {lib_blackfin => arch/blackfin/lib}/.gitignore (100%) rename {lib_blackfin => arch/blackfin/lib}/Makefile (100%) rename {lib_blackfin => arch/blackfin/lib}/board.c (100%) rename {lib_blackfin => arch/blackfin/lib}/boot.c (100%) rename {lib_blackfin => arch/blackfin/lib}/cache.c (100%) rename {lib_blackfin => arch/blackfin/lib}/clocks.c (100%) rename {lib_blackfin => arch/blackfin/lib}/cmd_cache_dump.c (100%) rename {lib_blackfin => arch/blackfin/lib}/memcmp.S (100%) rename {lib_blackfin => arch/blackfin/lib}/memcpy.S (100%) rename {lib_blackfin => arch/blackfin/lib}/memmove.S (100%) rename {lib_blackfin => arch/blackfin/lib}/memset.S (100%) rename {lib_blackfin => arch/blackfin/lib}/muldi3.c (100%) rename {lib_blackfin => arch/blackfin/lib}/post.c (100%) rename {lib_blackfin => arch/blackfin/lib}/string.c (100%) rename {lib_blackfin => arch/blackfin/lib}/tests.c (100%) rename {lib_blackfin => arch/blackfin/lib}/u-boot.lds.S (100%) rename {lib_i386 => arch/i386}/config.mk (100%) rename {lib_i386 => arch/i386/lib}/Makefile (100%) rename {lib_i386 => arch/i386/lib}/bios.S (100%) rename {lib_i386 => arch/i386/lib}/bios.h (100%) rename {lib_i386 => arch/i386/lib}/bios_pci.S (100%) rename {lib_i386 => arch/i386/lib}/bios_setup.c (100%) rename {lib_i386 => arch/i386/lib}/board.c (100%) rename {lib_i386 => arch/i386/lib}/bootm.c (100%) rename {lib_i386 => arch/i386/lib}/interrupts.c (100%) rename {lib_i386 => arch/i386/lib}/pcat_interrupts.c (100%) rename {lib_i386 => arch/i386/lib}/pcat_timer.c (100%) rename {lib_i386 => arch/i386/lib}/pci.c (100%) rename {lib_i386 => arch/i386/lib}/pci_type1.c (100%) rename {lib_i386 => arch/i386/lib}/realmode.c (100%) rename {lib_i386 => arch/i386/lib}/realmode_switch.S (100%) rename {lib_i386 => arch/i386/lib}/timer.c (100%) rename {lib_i386 => arch/i386/lib}/video.c (100%) rename {lib_i386 => arch/i386/lib}/video_bios.c (100%) rename {lib_i386 => arch/i386/lib}/zimage.c (100%) rename {lib_m68k => arch/m68k}/config.mk (100%) rename {lib_m68k => arch/m68k/lib}/Makefile (100%) rename {lib_m68k => arch/m68k/lib}/board.c (100%) rename {lib_m68k => arch/m68k/lib}/bootm.c (100%) rename {lib_m68k => arch/m68k/lib}/cache.c (100%) rename {lib_m68k => arch/m68k/lib}/interrupts.c (100%) rename {lib_m68k => arch/m68k/lib}/time.c (100%) rename {lib_m68k => arch/m68k/lib}/traps.c (100%) rename {lib_microblaze => arch/microblaze}/config.mk (100%) rename {lib_microblaze => arch/microblaze/lib}/Makefile (100%) rename {lib_microblaze => arch/microblaze/lib}/board.c (100%) rename {lib_microblaze => arch/microblaze/lib}/bootm.c (100%) rename {lib_microblaze => arch/microblaze/lib}/cache.c (100%) rename {lib_microblaze => arch/microblaze/lib}/time.c (100%) rename {lib_mips => arch/mips}/config.mk (100%) rename {lib_mips => arch/mips/lib}/Makefile (100%) rename {lib_mips => arch/mips/lib}/board.c (100%) rename {lib_mips => arch/mips/lib}/bootm.c (100%) rename {lib_mips => arch/mips/lib}/bootm_qemu_mips.c (100%) rename {lib_mips => arch/mips/lib}/time.c (100%) rename {lib_nios => arch/nios}/config.mk (100%) rename {lib_nios => arch/nios/lib}/Makefile (100%) rename {lib_nios => arch/nios/lib}/board.c (100%) rename {lib_nios => arch/nios/lib}/bootm.c (100%) rename {lib_nios => arch/nios/lib}/cache.c (100%) rename {lib_nios => arch/nios/lib}/divmod.c (100%) rename {lib_nios => arch/nios/lib}/math.h (100%) rename {lib_nios => arch/nios/lib}/mult.c (100%) rename {lib_nios => arch/nios/lib}/time.c (100%) rename {lib_nios2 => arch/nios2}/config.mk (100%) rename {lib_nios2 => arch/nios2/lib}/Makefile (100%) rename {lib_nios2 => arch/nios2/lib}/board.c (100%) rename {lib_nios2 => arch/nios2/lib}/bootm.c (100%) rename {lib_nios2 => arch/nios2/lib}/cache.S (100%) rename {lib_nios2 => arch/nios2/lib}/divmod.c (100%) rename {lib_nios2 => arch/nios2/lib}/math.h (100%) rename {lib_nios2 => arch/nios2/lib}/mult.c (100%) rename {lib_nios2 => arch/nios2/lib}/time.c (100%) rename {lib_ppc => arch/ppc}/config.mk (100%) rename {lib_ppc => arch/ppc/lib}/Makefile (100%) rename {lib_ppc => arch/ppc/lib}/bat_rw.c (100%) rename {lib_ppc => arch/ppc/lib}/board.c (100%) rename {lib_ppc => arch/ppc/lib}/bootm.c (100%) rename {lib_ppc => arch/ppc/lib}/cache.c (100%) rename {lib_ppc => arch/ppc/lib}/extable.c (100%) rename {lib_ppc => arch/ppc/lib}/interrupts.c (100%) rename {lib_ppc => arch/ppc/lib}/kgdb.c (100%) rename {lib_ppc => arch/ppc/lib}/ppccache.S (100%) rename {lib_ppc => arch/ppc/lib}/ppcstring.S (100%) rename {lib_ppc => arch/ppc/lib}/ticks.S (100%) rename {lib_ppc => arch/ppc/lib}/time.c (100%) rename {lib_sh => arch/sh}/config.mk (100%) rename {lib_sh => arch/sh/lib}/Makefile (100%) rename {lib_sh => arch/sh/lib}/board.c (100%) rename {lib_sh => arch/sh/lib}/bootm.c (100%) rename {lib_sh => arch/sh/lib}/time.c (100%) rename {lib_sh => arch/sh/lib}/time_sh2.c (100%) rename {lib_sparc => arch/sparc}/config.mk (100%) rename {lib_sparc => arch/sparc/lib}/Makefile (100%) rename {lib_sparc => arch/sparc/lib}/board.c (100%) rename {lib_sparc => arch/sparc/lib}/bootm.c (100%) rename {lib_sparc => arch/sparc/lib}/cache.c (100%) rename {lib_sparc => arch/sparc/lib}/interrupts.c (100%) rename {lib_sparc => arch/sparc/lib}/time.c (100%)

diff --git a/Makefile b/Makefile index 75b2c1e..4b4040b 100644 --- a/Makefile +++ b/Makefile @@ -195,7 +195,7 @@ endif ifeq ($(CPU),ixp) LIBS += cpu/ixp/npe/libnpe.a endif -LIBS += lib_$(ARCH)/lib$(ARCH).a +LIBS += arch/$(ARCH)/lib/lib$(ARCH).a LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \ fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a fs/yaffs2/libyaffs2.a \ fs/ubifs/libubifs.a @@ -259,7 +259,7 @@ LIBBOARD := $(addprefix $(obj),$(LIBBOARD)) # Add GCC lib ifdef USE_PRIVATE_LIBGCC ifeq ("$(USE_PRIVATE_LIBGCC)", "yes") -PLATFORM_LIBGCC = -L $(OBJTREE)/lib_$(ARCH) -lgcc +PLATFORM_LIBGCC = -L $(OBJTREE)/arch/$(ARCH)/lib -lgcc else PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc endif @@ -405,7 +405,7 @@ depend dep: $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk TAG_SUBDIRS += include TAG_SUBDIRS += lib_generic board/$(BOARDDIR) TAG_SUBDIRS += cpu/$(CPU) -TAG_SUBDIRS += lib_$(ARCH) +TAG_SUBDIRS += arch/$(ARCH)/lib TAG_SUBDIRS += fs/cramfs TAG_SUBDIRS += fs/fat TAG_SUBDIRS += fs/fdos @@ -3739,7 +3739,7 @@ clean: $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin} \ $(obj)board/trab/trab_fkt $(obj)board/voiceblue/eeprom \ $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds \ - $(obj)lib_blackfin/u-boot.lds \ + $(obj)arch/blackfin/lib/u-boot.lds \ $(obj)u-boot.lds \ $(obj)cpu/blackfin/bootrom-asm-offsets.[chs] @rm -f $(obj)include/bmp_logo.h diff --git a/README b/README index 22e35c3..4ddd6c7 100644 --- a/README +++ b/README @@ -182,19 +182,19 @@ Directory Hierarchy: - examples Example code for standalone applications, etc. - fs Filesystem code (cramfs, ext2, jffs2, etc.) - include Header Files -- lib_arm Files generic to ARM architecture -- lib_avr32 Files generic to AVR32 architecture -- lib_blackfin Files generic to Blackfin architecture +- arch/arm/lib Files generic to ARM architecture +- arch/avr32/lib Files generic to AVR32 architecture +- arch/blackfin/lib Files generic to Blackfin architecture - lib_generic Files generic to all architectures -- lib_i386 Files generic to i386 architecture -- lib_m68k Files generic to m68k architecture -- lib_microblaze Files generic to microblaze architecture -- lib_mips Files generic to MIPS architecture -- lib_nios Files generic to NIOS architecture -- lib_nios2 Files generic to NIOS2 architecture -- lib_ppc Files generic to PowerPC architecture -- lib_sh Files generic to SH architecture -- lib_sparc Files generic to SPARC architecture +- arch/i386/lib Files generic to i386 architecture +- arch/m68k/lib Files generic to m68k architecture +- arch/microblaze/lib Files generic to microblaze architecture +- arch/mips/lib Files generic to MIPS architecture +- arch/nios/lib Files generic to NIOS architecture +- arch/nios/lib2 Files generic to NIOS2 architecture +- arch/ppc/lib Files generic to PowerPC architecture +- arch/sh/lib Files generic to SH architecture +- arch/sparc/lib Files generic to SPARC architecture - libfdt Library files to support flattened device trees - net Networking code - post Power On Self Test @@ -1924,9 +1924,9 @@ Legacy uImage format: 13 common/image.c Start multifile image verification 14 common/image.c No initial ramdisk, no multifile, continue.

- 15 lib_<arch>/bootm.c All preparation done, transferring control to OS + 15 arch/<arch>/lib/bootm.c All preparation done, transferring control to OS

- -30 lib_ppc/board.c Fatal error, hang the system + -30 arch/ppc/lib/board.c Fatal error, hang the system -31 post/post.c POST test failed, detected by post_output_backlog() -32 post/post.c POST test failed, detected by post_run_single()

diff --git a/lib_arm/config.mk b/arch/arm/config.mk similarity index 94% rename from lib_arm/config.mk rename to arch/arm/config.mk index 3c078df..12057aa 100644 --- a/lib_arm/config.mk +++ b/arch/arm/config.mk @@ -59,8 +59,8 @@ PLATFORM_CPPFLAGS += $(call cc-option,\ # For EABI, make sure to provide raise() ifneq (,$(findstring -mabi=aapcs-linux,$(PLATFORM_CPPFLAGS))) # This file is parsed several times; make sure to add only once. -ifeq (,$(findstring lib_arm/eabi_compat.o,$(PLATFORM_LIBS))) -PLATFORM_LIBS += $(OBJTREE)/lib_arm/eabi_compat.o +ifeq (,$(findstring arch/arm/lib/eabi_compat.o,$(PLATFORM_LIBS))) +PLATFORM_LIBS += $(OBJTREE)/arch/arm/lib/eabi_compat.o endif endif LDSCRIPT := $(SRCTREE)/cpu/$(CPU)/u-boot.lds diff --git a/lib_arm/Makefile b/arch/arm/lib/Makefile similarity index 100% rename from lib_arm/Makefile rename to arch/arm/lib/Makefile diff --git a/lib_arm/_ashldi3.S b/arch/arm/lib/_ashldi3.S similarity index 100% rename from lib_arm/_ashldi3.S rename to arch/arm/lib/_ashldi3.S diff --git a/lib_arm/_ashrdi3.S b/arch/arm/lib/_ashrdi3.S similarity index 100% rename from lib_arm/_ashrdi3.S rename to arch/arm/lib/_ashrdi3.S diff --git a/lib_arm/_divsi3.S b/arch/arm/lib/_divsi3.S similarity index 100% rename from lib_arm/_divsi3.S rename to arch/arm/lib/_divsi3.S diff --git a/lib_arm/_lshrdi3.S b/arch/arm/lib/_lshrdi3.S similarity index 100% rename from lib_arm/_lshrdi3.S rename to arch/arm/lib/_lshrdi3.S diff --git a/lib_arm/_modsi3.S b/arch/arm/lib/_modsi3.S similarity index 100% rename from lib_arm/_modsi3.S rename to arch/arm/lib/_modsi3.S diff --git a/lib_arm/_udivsi3.S b/arch/arm/lib/_udivsi3.S similarity index 100% rename from lib_arm/_udivsi3.S rename to arch/arm/lib/_udivsi3.S diff --git a/lib_arm/_umodsi3.S b/arch/arm/lib/_umodsi3.S similarity index 100% rename from lib_arm/_umodsi3.S rename to arch/arm/lib/_umodsi3.S diff --git a/lib_arm/board.c b/arch/arm/lib/board.c similarity index 100% rename from lib_arm/board.c rename to arch/arm/lib/board.c diff --git a/lib_arm/bootm.c b/arch/arm/lib/bootm.c similarity index 100% rename from lib_arm/bootm.c rename to arch/arm/lib/bootm.c diff --git a/lib_arm/cache-cp15.c b/arch/arm/lib/cache-cp15.c similarity index 100% rename from lib_arm/cache-cp15.c rename to arch/arm/lib/cache-cp15.c diff --git a/lib_arm/cache.c b/arch/arm/lib/cache.c similarity index 100% rename from lib_arm/cache.c rename to arch/arm/lib/cache.c diff --git a/lib_arm/div0.c b/arch/arm/lib/div0.c similarity index 100% rename from lib_arm/div0.c rename to arch/arm/lib/div0.c diff --git a/lib_arm/eabi_compat.c b/arch/arm/lib/eabi_compat.c similarity index 100% rename from lib_arm/eabi_compat.c rename to arch/arm/lib/eabi_compat.c diff --git a/lib_arm/interrupts.c b/arch/arm/lib/interrupts.c similarity index 100% rename from lib_arm/interrupts.c rename to arch/arm/lib/interrupts.c diff --git a/lib_arm/reset.c b/arch/arm/lib/reset.c similarity index 100% rename from lib_arm/reset.c rename to arch/arm/lib/reset.c diff --git a/lib_avr32/config.mk b/arch/avr32/config.mk similarity index 100% rename from lib_avr32/config.mk rename to arch/avr32/config.mk diff --git a/lib_avr32/Makefile b/arch/avr32/lib/Makefile similarity index 100% rename from lib_avr32/Makefile rename to arch/avr32/lib/Makefile diff --git a/lib_avr32/board.c b/arch/avr32/lib/board.c similarity index 100% rename from lib_avr32/board.c rename to arch/avr32/lib/board.c diff --git a/lib_avr32/bootm.c b/arch/avr32/lib/bootm.c similarity index 100% rename from lib_avr32/bootm.c rename to arch/avr32/lib/bootm.c diff --git a/lib_avr32/interrupts.c b/arch/avr32/lib/interrupts.c similarity index 100% rename from lib_avr32/interrupts.c rename to arch/avr32/lib/interrupts.c diff --git a/lib_avr32/memset.S b/arch/avr32/lib/memset.S similarity index 100% rename from lib_avr32/memset.S rename to arch/avr32/lib/memset.S diff --git a/lib_blackfin/config.mk b/arch/blackfin/config.mk similarity index 97% rename from lib_blackfin/config.mk rename to arch/blackfin/config.mk index ce2fe67..74d326a 100644 --- a/lib_blackfin/config.mk +++ b/arch/blackfin/config.mk @@ -64,5 +64,5 @@ endif LDR_FLAGS += $(LDR_FLAGS-y)

ifeq ($(wildcard $(TOPDIR)/board/$(BOARD)/u-boot.lds*),) -LDSCRIPT = $(obj)lib_$(ARCH)/u-boot.lds.S +LDSCRIPT = $(obj)arch/$(ARCH)/lib/u-boot.lds.S endif diff --git a/lib_blackfin/.gitignore b/arch/blackfin/lib/.gitignore similarity index 100% rename from lib_blackfin/.gitignore rename to arch/blackfin/lib/.gitignore diff --git a/lib_blackfin/Makefile b/arch/blackfin/lib/Makefile similarity index 100% rename from lib_blackfin/Makefile rename to arch/blackfin/lib/Makefile diff --git a/lib_blackfin/board.c b/arch/blackfin/lib/board.c similarity index 100% rename from lib_blackfin/board.c rename to arch/blackfin/lib/board.c diff --git a/lib_blackfin/boot.c b/arch/blackfin/lib/boot.c similarity index 100% rename from lib_blackfin/boot.c rename to arch/blackfin/lib/boot.c diff --git a/lib_blackfin/cache.c b/arch/blackfin/lib/cache.c similarity index 100% rename from lib_blackfin/cache.c rename to arch/blackfin/lib/cache.c diff --git a/lib_blackfin/clocks.c b/arch/blackfin/lib/clocks.c similarity index 100% rename from lib_blackfin/clocks.c rename to arch/blackfin/lib/clocks.c diff --git a/lib_blackfin/cmd_cache_dump.c b/arch/blackfin/lib/cmd_cache_dump.c similarity index 100% rename from lib_blackfin/cmd_cache_dump.c rename to arch/blackfin/lib/cmd_cache_dump.c diff --git a/lib_blackfin/memcmp.S b/arch/blackfin/lib/memcmp.S similarity index 100% rename from lib_blackfin/memcmp.S rename to arch/blackfin/lib/memcmp.S diff --git a/lib_blackfin/memcpy.S b/arch/blackfin/lib/memcpy.S similarity index 100% rename from lib_blackfin/memcpy.S rename to arch/blackfin/lib/memcpy.S diff --git a/lib_blackfin/memmove.S b/arch/blackfin/lib/memmove.S similarity index 100% rename from lib_blackfin/memmove.S rename to arch/blackfin/lib/memmove.S diff --git a/lib_blackfin/memset.S b/arch/blackfin/lib/memset.S similarity index 100% rename from lib_blackfin/memset.S rename to arch/blackfin/lib/memset.S diff --git a/lib_blackfin/muldi3.c b/arch/blackfin/lib/muldi3.c similarity index 100% rename from lib_blackfin/muldi3.c rename to arch/blackfin/lib/muldi3.c diff --git a/lib_blackfin/post.c b/arch/blackfin/lib/post.c similarity index 100% rename from lib_blackfin/post.c rename to arch/blackfin/lib/post.c diff --git a/lib_blackfin/string.c b/arch/blackfin/lib/string.c similarity index 100% rename from lib_blackfin/string.c rename to arch/blackfin/lib/string.c diff --git a/lib_blackfin/tests.c b/arch/blackfin/lib/tests.c similarity index 100% rename from lib_blackfin/tests.c rename to arch/blackfin/lib/tests.c diff --git a/lib_blackfin/u-boot.lds.S b/arch/blackfin/lib/u-boot.lds.S similarity index 100% rename from lib_blackfin/u-boot.lds.S rename to arch/blackfin/lib/u-boot.lds.S diff --git a/lib_i386/config.mk b/arch/i386/config.mk similarity index 100% rename from lib_i386/config.mk rename to arch/i386/config.mk diff --git a/lib_i386/Makefile b/arch/i386/lib/Makefile similarity index 100% rename from lib_i386/Makefile rename to arch/i386/lib/Makefile diff --git a/lib_i386/bios.S b/arch/i386/lib/bios.S similarity index 100% rename from lib_i386/bios.S rename to arch/i386/lib/bios.S diff --git a/lib_i386/bios.h b/arch/i386/lib/bios.h similarity index 100% rename from lib_i386/bios.h rename to arch/i386/lib/bios.h diff --git a/lib_i386/bios_pci.S b/arch/i386/lib/bios_pci.S similarity index 100% rename from lib_i386/bios_pci.S rename to arch/i386/lib/bios_pci.S diff --git a/lib_i386/bios_setup.c b/arch/i386/lib/bios_setup.c similarity index 100% rename from lib_i386/bios_setup.c rename to arch/i386/lib/bios_setup.c diff --git a/lib_i386/board.c b/arch/i386/lib/board.c similarity index 100% rename from lib_i386/board.c rename to arch/i386/lib/board.c diff --git a/lib_i386/bootm.c b/arch/i386/lib/bootm.c similarity index 100% rename from lib_i386/bootm.c rename to arch/i386/lib/bootm.c diff --git a/lib_i386/interrupts.c b/arch/i386/lib/interrupts.c similarity index 100% rename from lib_i386/interrupts.c rename to arch/i386/lib/interrupts.c diff --git a/lib_i386/pcat_interrupts.c b/arch/i386/lib/pcat_interrupts.c similarity index 100% rename from lib_i386/pcat_interrupts.c rename to arch/i386/lib/pcat_interrupts.c diff --git a/lib_i386/pcat_timer.c b/arch/i386/lib/pcat_timer.c similarity index 100% rename from lib_i386/pcat_timer.c rename to arch/i386/lib/pcat_timer.c diff --git a/lib_i386/pci.c b/arch/i386/lib/pci.c similarity index 100% rename from lib_i386/pci.c rename to arch/i386/lib/pci.c diff --git a/lib_i386/pci_type1.c b/arch/i386/lib/pci_type1.c similarity index 100% rename from lib_i386/pci_type1.c rename to arch/i386/lib/pci_type1.c diff --git a/lib_i386/realmode.c b/arch/i386/lib/realmode.c similarity index 100% rename from lib_i386/realmode.c rename to arch/i386/lib/realmode.c diff --git a/lib_i386/realmode_switch.S b/arch/i386/lib/realmode_switch.S similarity index 100% rename from lib_i386/realmode_switch.S rename to arch/i386/lib/realmode_switch.S diff --git a/lib_i386/timer.c b/arch/i386/lib/timer.c similarity index 100% rename from lib_i386/timer.c rename to arch/i386/lib/timer.c diff --git a/lib_i386/video.c b/arch/i386/lib/video.c similarity index 100% rename from lib_i386/video.c rename to arch/i386/lib/video.c diff --git a/lib_i386/video_bios.c b/arch/i386/lib/video_bios.c similarity index 100% rename from lib_i386/video_bios.c rename to arch/i386/lib/video_bios.c diff --git a/lib_i386/zimage.c b/arch/i386/lib/zimage.c similarity index 100% rename from lib_i386/zimage.c rename to arch/i386/lib/zimage.c diff --git a/lib_m68k/config.mk b/arch/m68k/config.mk similarity index 100% rename from lib_m68k/config.mk rename to arch/m68k/config.mk diff --git a/lib_m68k/Makefile b/arch/m68k/lib/Makefile similarity index 100% rename from lib_m68k/Makefile rename to arch/m68k/lib/Makefile diff --git a/lib_m68k/board.c b/arch/m68k/lib/board.c similarity index 100% rename from lib_m68k/board.c rename to arch/m68k/lib/board.c diff --git a/lib_m68k/bootm.c b/arch/m68k/lib/bootm.c similarity index 100% rename from lib_m68k/bootm.c rename to arch/m68k/lib/bootm.c diff --git a/lib_m68k/cache.c b/arch/m68k/lib/cache.c similarity index 100% rename from lib_m68k/cache.c rename to arch/m68k/lib/cache.c diff --git a/lib_m68k/interrupts.c b/arch/m68k/lib/interrupts.c similarity index 100% rename from lib_m68k/interrupts.c rename to arch/m68k/lib/interrupts.c diff --git a/lib_m68k/time.c b/arch/m68k/lib/time.c similarity index 100% rename from lib_m68k/time.c rename to arch/m68k/lib/time.c diff --git a/lib_m68k/traps.c b/arch/m68k/lib/traps.c similarity index 100% rename from lib_m68k/traps.c rename to arch/m68k/lib/traps.c diff --git a/lib_microblaze/config.mk b/arch/microblaze/config.mk similarity index 100% rename from lib_microblaze/config.mk rename to arch/microblaze/config.mk diff --git a/lib_microblaze/Makefile b/arch/microblaze/lib/Makefile similarity index 100% rename from lib_microblaze/Makefile rename to arch/microblaze/lib/Makefile diff --git a/lib_microblaze/board.c b/arch/microblaze/lib/board.c similarity index 100% rename from lib_microblaze/board.c rename to arch/microblaze/lib/board.c diff --git a/lib_microblaze/bootm.c b/arch/microblaze/lib/bootm.c similarity index 100% rename from lib_microblaze/bootm.c rename to arch/microblaze/lib/bootm.c diff --git a/lib_microblaze/cache.c b/arch/microblaze/lib/cache.c similarity index 100% rename from lib_microblaze/cache.c rename to arch/microblaze/lib/cache.c diff --git a/lib_microblaze/time.c b/arch/microblaze/lib/time.c similarity index 100% rename from lib_microblaze/time.c rename to arch/microblaze/lib/time.c diff --git a/lib_mips/config.mk b/arch/mips/config.mk similarity index 100% rename from lib_mips/config.mk rename to arch/mips/config.mk diff --git a/lib_mips/Makefile b/arch/mips/lib/Makefile similarity index 100% rename from lib_mips/Makefile rename to arch/mips/lib/Makefile diff --git a/lib_mips/board.c b/arch/mips/lib/board.c similarity index 100% rename from lib_mips/board.c rename to arch/mips/lib/board.c diff --git a/lib_mips/bootm.c b/arch/mips/lib/bootm.c similarity index 100% rename from lib_mips/bootm.c rename to arch/mips/lib/bootm.c diff --git a/lib_mips/bootm_qemu_mips.c b/arch/mips/lib/bootm_qemu_mips.c similarity index 100% rename from lib_mips/bootm_qemu_mips.c rename to arch/mips/lib/bootm_qemu_mips.c diff --git a/lib_mips/time.c b/arch/mips/lib/time.c similarity index 100% rename from lib_mips/time.c rename to arch/mips/lib/time.c diff --git a/lib_nios/config.mk b/arch/nios/config.mk similarity index 100% rename from lib_nios/config.mk rename to arch/nios/config.mk diff --git a/lib_nios/Makefile b/arch/nios/lib/Makefile similarity index 100% rename from lib_nios/Makefile rename to arch/nios/lib/Makefile diff --git a/lib_nios/board.c b/arch/nios/lib/board.c similarity index 100% rename from lib_nios/board.c rename to arch/nios/lib/board.c diff --git a/lib_nios/bootm.c b/arch/nios/lib/bootm.c similarity index 100% rename from lib_nios/bootm.c rename to arch/nios/lib/bootm.c diff --git a/lib_nios/cache.c b/arch/nios/lib/cache.c similarity index 100% rename from lib_nios/cache.c rename to arch/nios/lib/cache.c diff --git a/lib_nios/divmod.c b/arch/nios/lib/divmod.c similarity index 100% rename from lib_nios/divmod.c rename to arch/nios/lib/divmod.c diff --git a/lib_nios/math.h b/arch/nios/lib/math.h similarity index 100% rename from lib_nios/math.h rename to arch/nios/lib/math.h diff --git a/lib_nios/mult.c b/arch/nios/lib/mult.c similarity index 100% rename from lib_nios/mult.c rename to arch/nios/lib/mult.c diff --git a/lib_nios/time.c b/arch/nios/lib/time.c similarity index 100% rename from lib_nios/time.c rename to arch/nios/lib/time.c diff --git a/lib_nios2/config.mk b/arch/nios2/config.mk similarity index 100% rename from lib_nios2/config.mk rename to arch/nios2/config.mk diff --git a/lib_nios2/Makefile b/arch/nios2/lib/Makefile similarity index 100% rename from lib_nios2/Makefile rename to arch/nios2/lib/Makefile diff --git a/lib_nios2/board.c b/arch/nios2/lib/board.c similarity index 100% rename from lib_nios2/board.c rename to arch/nios2/lib/board.c diff --git a/lib_nios2/bootm.c b/arch/nios2/lib/bootm.c similarity index 100% rename from lib_nios2/bootm.c rename to arch/nios2/lib/bootm.c diff --git a/lib_nios2/cache.S b/arch/nios2/lib/cache.S similarity index 100% rename from lib_nios2/cache.S rename to arch/nios2/lib/cache.S diff --git a/lib_nios2/divmod.c b/arch/nios2/lib/divmod.c similarity index 100% rename from lib_nios2/divmod.c rename to arch/nios2/lib/divmod.c diff --git a/lib_nios2/math.h b/arch/nios2/lib/math.h similarity index 100% rename from lib_nios2/math.h rename to arch/nios2/lib/math.h diff --git a/lib_nios2/mult.c b/arch/nios2/lib/mult.c similarity index 100% rename from lib_nios2/mult.c rename to arch/nios2/lib/mult.c diff --git a/lib_nios2/time.c b/arch/nios2/lib/time.c similarity index 100% rename from lib_nios2/time.c rename to arch/nios2/lib/time.c diff --git a/lib_ppc/config.mk b/arch/ppc/config.mk similarity index 100% rename from lib_ppc/config.mk rename to arch/ppc/config.mk diff --git a/lib_ppc/Makefile b/arch/ppc/lib/Makefile similarity index 100% rename from lib_ppc/Makefile rename to arch/ppc/lib/Makefile diff --git a/lib_ppc/bat_rw.c b/arch/ppc/lib/bat_rw.c similarity index 100% rename from lib_ppc/bat_rw.c rename to arch/ppc/lib/bat_rw.c diff --git a/lib_ppc/board.c b/arch/ppc/lib/board.c similarity index 100% rename from lib_ppc/board.c rename to arch/ppc/lib/board.c diff --git a/lib_ppc/bootm.c b/arch/ppc/lib/bootm.c similarity index 100% rename from lib_ppc/bootm.c rename to arch/ppc/lib/bootm.c diff --git a/lib_ppc/cache.c b/arch/ppc/lib/cache.c similarity index 100% rename from lib_ppc/cache.c rename to arch/ppc/lib/cache.c diff --git a/lib_ppc/extable.c b/arch/ppc/lib/extable.c similarity index 100% rename from lib_ppc/extable.c rename to arch/ppc/lib/extable.c diff --git a/lib_ppc/interrupts.c b/arch/ppc/lib/interrupts.c similarity index 100% rename from lib_ppc/interrupts.c rename to arch/ppc/lib/interrupts.c diff --git a/lib_ppc/kgdb.c b/arch/ppc/lib/kgdb.c similarity index 100% rename from lib_ppc/kgdb.c rename to arch/ppc/lib/kgdb.c diff --git a/lib_ppc/ppccache.S b/arch/ppc/lib/ppccache.S similarity index 100% rename from lib_ppc/ppccache.S rename to arch/ppc/lib/ppccache.S diff --git a/lib_ppc/ppcstring.S b/arch/ppc/lib/ppcstring.S similarity index 100% rename from lib_ppc/ppcstring.S rename to arch/ppc/lib/ppcstring.S diff --git a/lib_ppc/ticks.S b/arch/ppc/lib/ticks.S similarity index 100% rename from lib_ppc/ticks.S rename to arch/ppc/lib/ticks.S diff --git a/lib_ppc/time.c b/arch/ppc/lib/time.c similarity index 100% rename from lib_ppc/time.c rename to arch/ppc/lib/time.c diff --git a/lib_sh/config.mk b/arch/sh/config.mk similarity index 100% rename from lib_sh/config.mk rename to arch/sh/config.mk diff --git a/lib_sh/Makefile b/arch/sh/lib/Makefile similarity index 100% rename from lib_sh/Makefile rename to arch/sh/lib/Makefile diff --git a/lib_sh/board.c b/arch/sh/lib/board.c similarity index 100% rename from lib_sh/board.c rename to arch/sh/lib/board.c diff --git a/lib_sh/bootm.c b/arch/sh/lib/bootm.c similarity index 100% rename from lib_sh/bootm.c rename to arch/sh/lib/bootm.c diff --git a/lib_sh/time.c b/arch/sh/lib/time.c similarity index 100% rename from lib_sh/time.c rename to arch/sh/lib/time.c diff --git a/lib_sh/time_sh2.c b/arch/sh/lib/time_sh2.c similarity index 100% rename from lib_sh/time_sh2.c rename to arch/sh/lib/time_sh2.c diff --git a/lib_sparc/config.mk b/arch/sparc/config.mk similarity index 100% rename from lib_sparc/config.mk rename to arch/sparc/config.mk diff --git a/lib_sparc/Makefile b/arch/sparc/lib/Makefile similarity index 100% rename from lib_sparc/Makefile rename to arch/sparc/lib/Makefile diff --git a/lib_sparc/board.c b/arch/sparc/lib/board.c similarity index 100% rename from lib_sparc/board.c rename to arch/sparc/lib/board.c diff --git a/lib_sparc/bootm.c b/arch/sparc/lib/bootm.c similarity index 100% rename from lib_sparc/bootm.c rename to arch/sparc/lib/bootm.c diff --git a/lib_sparc/cache.c b/arch/sparc/lib/cache.c similarity index 100% rename from lib_sparc/cache.c rename to arch/sparc/lib/cache.c diff --git a/lib_sparc/interrupts.c b/arch/sparc/lib/interrupts.c similarity index 100% rename from lib_sparc/interrupts.c rename to arch/sparc/lib/interrupts.c diff --git a/lib_sparc/time.c b/arch/sparc/lib/time.c similarity index 100% rename from lib_sparc/time.c rename to arch/sparc/lib/time.c diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds index 3c44b3e..32778ca 100644 --- a/board/LEOX/elpt860/u-boot.lds +++ b/board/LEOX/elpt860/u-boot.lds @@ -66,15 +66,15 @@ SECTIONS

cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) lib_generic/string.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/extable.o (.text) - lib_ppc/time.o (.text) - lib_ppc/ticks.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/extable.o (.text) + arch/ppc/lib/time.o (.text) + arch/ppc/lib/ticks.o (.text)

. = env_offset; common/env_embedded.o (.text) diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds index 47247ec..c354ff8 100644 --- a/board/RPXClassic/u-boot.lds +++ b/board/RPXClassic/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS

cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds index 47247ec..c354ff8 100644 --- a/board/RPXlite/u-boot.lds +++ b/board/RPXlite/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS

cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds index 7ae7be0..89aafff 100644 --- a/board/RPXlite_dw/u-boot.lds +++ b/board/RPXlite_dw/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS

cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds index f22b25f..88644a4 100644 --- a/board/RRvision/u-boot.lds +++ b/board/RRvision/u-boot.lds @@ -58,12 +58,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text)

. = env_offset; common/env_embedded.o (.ppcenv) diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds index 836775f..1087167 100644 --- a/board/actux1/u-boot.lds +++ b/board/actux1/u-boot.lds @@ -33,7 +33,7 @@ SECTIONS cpu/ixp/start.o(.text) lib_generic/string.o(.text) lib_generic/vsprintf.o(.text) - lib_arm/board.o(.text) + arch/arm/lib/board.o(.text) common/dlmalloc.o(.text) cpu/ixp/cpu.o(.text) . = env_offset; diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds index 0752656..543af30 100644 --- a/board/actux2/u-boot.lds +++ b/board/actux2/u-boot.lds @@ -33,7 +33,7 @@ SECTIONS cpu/ixp/start.o(.text) lib_generic/string.o(.text) lib_generic/vsprintf.o(.text) - lib_arm/board.o(.text) + arch/arm/lib/board.o(.text) common/dlmalloc.o(.text) cpu/ixp/cpu.o(.text)

diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds index a69e7db..f63251d 100644 --- a/board/actux3/u-boot.lds +++ b/board/actux3/u-boot.lds @@ -33,7 +33,7 @@ SECTIONS cpu/ixp/start.o (.text) lib_generic/string.o (.text) lib_generic/vsprintf.o (.text) - lib_arm/board.o (.text) + arch/arm/lib/board.o (.text) common/dlmalloc.o (.text) cpu/ixp/cpu.o (.text)

diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds index 707203d..10308d5 100644 --- a/board/amirix/ap1000/u-boot.lds +++ b/board/amirix/ap1000/u-boot.lds @@ -65,7 +65,7 @@ SECTIONS cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text)

/* . = env_offset;*/ diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds index 2d0efb3..0571f02 100644 --- a/board/c2mon/u-boot.lds +++ b/board/c2mon/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS

cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds index 7e716bb..8989880 100644 --- a/board/cobra5272/u-boot.lds +++ b/board/cobra5272/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mcf52x2/start.o (.text) cpu/mcf52x2/cpu_init.o (.text) - lib_m68k/traps.o (.text) + arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/cray/L1/u-boot.lds.debug b/board/cray/L1/u-boot.lds.debug index 970628d..40d2f78 100644 --- a/board/cray/L1/u-boot.lds.debug +++ b/board/cray/L1/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text)

common/env_embedded.o(.text)

diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug index bfe8513..4e4943f 100644 --- a/board/emk/top860/u-boot.lds.debug +++ b/board/emk/top860/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text)

. = env_offset; common/env_embedded.o(.text) diff --git a/board/esd/tasreg/u-boot.lds b/board/esd/tasreg/u-boot.lds index e3230b9..54e0169 100644 --- a/board/esd/tasreg/u-boot.lds +++ b/board/esd/tasreg/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */

cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds index 3e4490e..215a2c4 100644 --- a/board/esteem192e/u-boot.lds +++ b/board/esteem192e/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS

cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug index 1af61fb..dd4dbfa 100644 --- a/board/etx094/u-boot.lds.debug +++ b/board/etx094/u-boot.lds.debug @@ -62,8 +62,8 @@ SECTIONS cpu/mpc8xx/cpu_init.o (.text) cpu/mpc8xx/speed.o (.text) cpu/mpc8xx/serial.o (.text) - lib_ppc/extable.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/extable.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/string.o (.text) lib_generic/crc32.o (.text) common/dlmalloc.o (.text) diff --git a/board/fads/u-boot.lds.debug b/board/fads/u-boot.lds.debug index 0a3b958..8d91aed 100644 --- a/board/fads/u-boot.lds.debug +++ b/board/fads/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text)

. = env_offset; common/env_embedded.o(.text) diff --git a/board/freescale/m5208evbe/u-boot.lds b/board/freescale/m5208evbe/u-boot.lds index bc9d5cd..3877527 100644 --- a/board/freescale/m5208evbe/u-boot.lds +++ b/board/freescale/m5208evbe/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS

cpu/mcf52x2/start.o (.text) cpu/mcf52x2/libmcf52x2.a (.text) - lib_m68k/libm68k.a (.text) + arch/m68k/lib/libm68k.a (.text) common/dlmalloc.o (.text)

. = DEFINED(env_offset) ? env_offset : .; diff --git a/board/freescale/m52277evb/u-boot.spa b/board/freescale/m52277evb/u-boot.spa index 7ae70d4..23d5710 100644 --- a/board/freescale/m52277evb/u-boot.spa +++ b/board/freescale/m52277evb/u-boot.spa @@ -57,7 +57,7 @@ SECTIONS

cpu/mcf5227x/start.o (.text) cpu/mcf5227x/libmcf5227x.a (.text) - lib_m68k/libm68k.a (.text) + arch/m68k/lib/libm68k.a (.text) lib_generic/libgeneric.a (.text) common/cmd_mem.o (.text) common/main.o (.text) diff --git a/board/freescale/m5235evb/u-boot.16 b/board/freescale/m5235evb/u-boot.16 index c134884..940da14 100644 --- a/board/freescale/m5235evb/u-boot.16 +++ b/board/freescale/m5235evb/u-boot.16 @@ -57,8 +57,8 @@ SECTIONS

cpu/mcf523x/start.o (.text) cpu/mcf523x/cpu_init.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + arch/m68k/lib/traps.o (.text) + arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text)

diff --git a/board/freescale/m5235evb/u-boot.32 b/board/freescale/m5235evb/u-boot.32 index 53c337d..50045e1 100644 --- a/board/freescale/m5235evb/u-boot.32 +++ b/board/freescale/m5235evb/u-boot.32 @@ -60,7 +60,7 @@ SECTIONS cpu/mcf523x/cpu_init.o (.text) cpu/mcf523x/interrupts.o (.text) cpu/mcf523x/speed.o (.text) - lib_m68k/libm68k.a (.text) + arch/m68k/lib/libm68k.a (.text) common/dlmalloc.o (.text) common/cmd_bootm.o (.text) common/cmd_flash.o (.text) diff --git a/board/freescale/m5249evb/u-boot.lds b/board/freescale/m5249evb/u-boot.lds index e3230b9..54e0169 100644 --- a/board/freescale/m5249evb/u-boot.lds +++ b/board/freescale/m5249evb/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */

cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/m5253demo/u-boot.lds b/board/freescale/m5253demo/u-boot.lds index 6cb5ee0..e53e67d 100644 --- a/board/freescale/m5253demo/u-boot.lds +++ b/board/freescale/m5253demo/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */

cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/m5253evbe/u-boot.lds b/board/freescale/m5253evbe/u-boot.lds index 132fccf..7f4dc27 100644 --- a/board/freescale/m5253evbe/u-boot.lds +++ b/board/freescale/m5253evbe/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */

cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/m5271evb/u-boot.lds b/board/freescale/m5271evb/u-boot.lds index 00c1f2a..713b18a 100644 --- a/board/freescale/m5271evb/u-boot.lds +++ b/board/freescale/m5271evb/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */

cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/m5272c3/u-boot.lds b/board/freescale/m5272c3/u-boot.lds index 9d20b22..446ec1b 100644 --- a/board/freescale/m5272c3/u-boot.lds +++ b/board/freescale/m5272c3/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */

cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/m53017evb/u-boot.lds b/board/freescale/m53017evb/u-boot.lds index c79d06c..fe0e314 100644 --- a/board/freescale/m53017evb/u-boot.lds +++ b/board/freescale/m53017evb/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS

cpu/mcf532x/start.o (.text) cpu/mcf532x/libmcf532x.a (.text) - lib_m68k/libm68k.a (.text) + arch/m68k/lib/libm68k.a (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text)

diff --git a/board/freescale/m5329evb/u-boot.lds b/board/freescale/m5329evb/u-boot.lds index af31098..0ed87ff 100644 --- a/board/freescale/m5329evb/u-boot.lds +++ b/board/freescale/m5329evb/u-boot.lds @@ -56,8 +56,8 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */

cpu/mcf532x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + arch/m68k/lib/traps.o (.text) + arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text)

diff --git a/board/freescale/m5373evb/u-boot.lds b/board/freescale/m5373evb/u-boot.lds index dff74b6..605452b 100644 --- a/board/freescale/m5373evb/u-boot.lds +++ b/board/freescale/m5373evb/u-boot.lds @@ -56,8 +56,8 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */

cpu/mcf532x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + arch/m68k/lib/traps.o (.text) + arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text)

diff --git a/board/freescale/m54451evb/u-boot.spa b/board/freescale/m54451evb/u-boot.spa index d8caefa..569518b 100644 --- a/board/freescale/m54451evb/u-boot.spa +++ b/board/freescale/m54451evb/u-boot.spa @@ -57,7 +57,7 @@ SECTIONS

cpu/mcf5445x/start.o (.text) cpu/mcf5445x/libmcf5445x.a (.text) - lib_m68k/libm68k.a (.text) + arch/m68k/lib/libm68k.a (.text) common/cmd_flash.o (.text) common/dlmalloc.o (.text) common/main.o (.text) diff --git a/board/freescale/m54451evb/u-boot.stm b/board/freescale/m54451evb/u-boot.stm index e9eac67..1b06b12 100644 --- a/board/freescale/m54451evb/u-boot.stm +++ b/board/freescale/m54451evb/u-boot.stm @@ -61,7 +61,7 @@ SECTIONS cpu/mcf5445x/dspi.o (.text) cpu/mcf5445x/interrupt.o (.text) cpu/mcf5445x/speed.o (.text) - lib_m68k/board.o (.text) + arch/m68k/lib/board.o (.text) common/serial.o (.text) common/console.o (.text) lib_generic/display_options.o (.text) diff --git a/board/freescale/m54455evb/u-boot.atm b/board/freescale/m54455evb/u-boot.atm index 08e184c..c48dd75 100644 --- a/board/freescale/m54455evb/u-boot.atm +++ b/board/freescale/m54455evb/u-boot.atm @@ -56,8 +56,8 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */

cpu/mcf5445x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + arch/m68k/lib/traps.o (.text) + arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text)

diff --git a/board/freescale/m54455evb/u-boot.int b/board/freescale/m54455evb/u-boot.int index 4d504a2..ef07174 100644 --- a/board/freescale/m54455evb/u-boot.int +++ b/board/freescale/m54455evb/u-boot.int @@ -56,8 +56,8 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */

cpu/mcf5445x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + arch/m68k/lib/traps.o (.text) + arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text)

diff --git a/board/freescale/m547xevb/u-boot.lds b/board/freescale/m547xevb/u-boot.lds index a3014bd..5f28a10 100644 --- a/board/freescale/m547xevb/u-boot.lds +++ b/board/freescale/m547xevb/u-boot.lds @@ -56,8 +56,8 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */

cpu/mcf547x_8x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + arch/m68k/lib/traps.o (.text) + arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text)

. = DEFINED(env_offset) ? env_offset : .; diff --git a/board/freescale/m548xevb/u-boot.lds b/board/freescale/m548xevb/u-boot.lds index a3014bd..5f28a10 100644 --- a/board/freescale/m548xevb/u-boot.lds +++ b/board/freescale/m548xevb/u-boot.lds @@ -56,8 +56,8 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */

cpu/mcf547x_8x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + arch/m68k/lib/traps.o (.text) + arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text)

. = DEFINED(env_offset) ? env_offset : .; diff --git a/board/freescale/mpc7448hpc2/tsi108_init.c b/board/freescale/mpc7448hpc2/tsi108_init.c index 74bb564..c6a3ade 100644 --- a/board/freescale/mpc7448hpc2/tsi108_init.c +++ b/board/freescale/mpc7448hpc2/tsi108_init.c @@ -323,7 +323,7 @@ int board_early_init_r (void) * We will over-ride the env_init called in board_init_f * This is really a work-around because, the HLP bank 1 * where NVRAM resides is not visible during board_init_f - * (lib_ppc/board.c) + * (arch/ppc/lib/board.c) * Alternatively, we could use the I2C EEPROM at start-up to configure * and enable all HLP banks and not just HLP 0 as is being done for * Taiga Rev. 2. diff --git a/board/freescale/mpc8610hpcd/u-boot.lds b/board/freescale/mpc8610hpcd/u-boot.lds index b573807..2ad0f0e 100644 --- a/board/freescale/mpc8610hpcd/u-boot.lds +++ b/board/freescale/mpc8610hpcd/u-boot.lds @@ -58,7 +58,7 @@ SECTIONS cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text) *(.text) *(.got1) diff --git a/board/freescale/mpc8641hpcn/u-boot.lds b/board/freescale/mpc8641hpcn/u-boot.lds index 2b98b5a..796828a 100644 --- a/board/freescale/mpc8641hpcn/u-boot.lds +++ b/board/freescale/mpc8641hpcn/u-boot.lds @@ -58,7 +58,7 @@ SECTIONS cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text) drivers/bios_emulator/atibios.o (.text) *(.text) diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds index 3182aa6..6f5bda4 100644 --- a/board/freescale/mx31ads/u-boot.lds +++ b/board/freescale/mx31ads/u-boot.lds @@ -39,7 +39,7 @@ SECTIONS

cpu/arm1136/start.o (.text) board/freescale/mx31ads/libmx31ads.a (.text) - lib_arm/libarm.a (.text) + arch/arm/lib/libarm.a (.text) net/libnet.a (.text) drivers/mtd/libmtd.a (.text)

diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds index 716efcd..9fc71a2 100644 --- a/board/genietv/u-boot.lds +++ b/board/genietv/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS

cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug index 3568e6d..9bb2c58 100644 --- a/board/genietv/u-boot.lds.debug +++ b/board/genietv/u-boot.lds.debug @@ -57,7 +57,7 @@ SECTIONS

cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds index 7b74cb7..1252baf 100644 --- a/board/hermes/u-boot.lds +++ b/board/hermes/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) cpu/mpc8xx/interrupts.o (.text) - lib_ppc/time.o (.text) - lib_ppc/ticks.o (.text) - lib_ppc/cache.o (.text) + arch/ppc/lib/time.o (.text) + arch/ppc/lib/ticks.o (.text) + arch/ppc/lib/cache.o (.text) lib_generic/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/hermes/u-boot.lds.debug b/board/hermes/u-boot.lds.debug index 3801206..dc810be 100644 --- a/board/hermes/u-boot.lds.debug +++ b/board/hermes/u-boot.lds.debug @@ -56,10 +56,10 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */

cpu/mpc8xx/start.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) cpu/mpc8xx/interrupts.o (.text) - lib_ppc/time.o (.text) - lib_ppc/ticks.o (.text) + arch/ppc/lib/time.o (.text) + arch/ppc/lib/ticks.o (.text) . = env_offset; common/env_embedded.o(.text)

diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds index 52d66a2..cc32b44 100644 --- a/board/hymod/u-boot.lds +++ b/board/hymod/u-boot.lds @@ -58,7 +58,7 @@ SECTIONS cpu/mpc8260/start.o (.text) /* common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds index b43be81..b614262 100644 --- a/board/icu862/u-boot.lds +++ b/board/icu862/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS /* cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug index 653e0be..919eb21 100644 --- a/board/icu862/u-boot.lds.debug +++ b/board/icu862/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text)

. = env_offset; common/env_embedded.o(.text) diff --git a/board/idmr/u-boot.lds b/board/idmr/u-boot.lds index 00c1f2a..713b18a 100644 --- a/board/idmr/u-boot.lds +++ b/board/idmr/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */

cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/ip860/u-boot.lds b/board/ip860/u-boot.lds index a786bf2..bbc7139 100644 --- a/board/ip860/u-boot.lds +++ b/board/ip860/u-boot.lds @@ -57,10 +57,10 @@ SECTIONS

cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) cpu/mpc8xx/interrupts.o (.text) - lib_ppc/time.o (.text) - lib_ppc/ticks.o (.text) + arch/ppc/lib/time.o (.text) + arch/ppc/lib/ticks.o (.text) /** . = env_offset; common/env_embedded.o(.text) diff --git a/board/ip860/u-boot.lds.debug b/board/ip860/u-boot.lds.debug index dc2f6e1..fc8fe6c 100644 --- a/board/ip860/u-boot.lds.debug +++ b/board/ip860/u-boot.lds.debug @@ -56,10 +56,10 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */

cpu/mpc8xx/start.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) cpu/mpc8xx/interrupts.o (.text) - lib_ppc/time.o (.text) - lib_ppc/ticks.o (.text) + arch/ppc/lib/time.o (.text) + arch/ppc/lib/ticks.o (.text) /** . = env_offset; common/env_embedded.o(.text) diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug index b5206c5..17965a0 100644 --- a/board/ivm/u-boot.lds.debug +++ b/board/ivm/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text)

. = env_offset; common/env_embedded.o(.text) diff --git a/board/jse/jse.c b/board/jse/jse.c index 1849ca4..e4c7b9d 100644 --- a/board/jse/jse.c +++ b/board/jse/jse.c @@ -26,7 +26,7 @@

/* * This function is run very early, out of flash, and before devices are - * initialized. It is called by lib_ppc/board.c:board_init_f by virtue + * initialized. It is called by arch/ppc/lib/board.c:board_init_f by virtue * of being in the init_sequence array. * * The SDRAM has been initialized already -- start.S:start called @@ -85,7 +85,7 @@ int board_pre_init (void) #endif

/* - * This function is also called by lib_ppc/board.c:board_init_f (it is + * This function is also called by arch/ppc/lib/board.c:board_init_f (it is * also in the init_sequence array) but later. Many more things are * configured, but we are still running from flash. */ @@ -149,7 +149,7 @@ int checkboard (void) /* **** No more functions called by board_init_f. **** */

/* - * This function is called by lib_ppc/board.c:board_init_r. At this + * This function is called by arch/ppc/lib/board.c:board_init_r. At this * point, basic setup is done, U-Boot has been moved into SDRAM and * PCI has been set up. From here we done late setup. */ diff --git a/board/jse/sdram.c b/board/jse/sdram.c index 88fdd84..a12ebde 100644 --- a/board/jse/sdram.c +++ b/board/jse/sdram.c @@ -27,7 +27,7 @@ /* * this is even after checkboard. It returns the size of the SDRAM * that we have installed. This function is called by board_init_f - * in lib_ppc/board.c to initialize the memory and return what I + * in arch/ppc/lib/board.c to initialize the memory and return what I * found. */ phys_size_t initdram (int board_type) diff --git a/board/keymile/km8xx/u-boot.lds b/board/keymile/km8xx/u-boot.lds index a8057f2..8b6305a 100644 --- a/board/keymile/km8xx/u-boot.lds +++ b/board/keymile/km8xx/u-boot.lds @@ -58,12 +58,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text)

. = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds index 79b886a..8e4faa1 100644 --- a/board/kup/kup4k/u-boot.lds +++ b/board/kup/kup4k/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS /* cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/kup/kup4x/u-boot.lds b/board/kup/kup4x/u-boot.lds index 79b886a..8e4faa1 100644 --- a/board/kup/kup4x/u-boot.lds +++ b/board/kup/kup4x/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS /* cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds index 854ed68..814a7a6 100644 --- a/board/lantec/u-boot.lds +++ b/board/lantec/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS

cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug index 987c4dd..49f8972 100644 --- a/board/lwmon/u-boot.lds.debug +++ b/board/lwmon/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text)

. = env_offset; common/env_embedded.o(.text) diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug index 0a3b958..8d91aed 100644 --- a/board/mbx8xx/u-boot.lds.debug +++ b/board/mbx8xx/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text)

. = env_offset; common/env_embedded.o(.text) diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds index 8fea3be..0083a21 100644 --- a/board/ml2/u-boot.lds +++ b/board/ml2/u-boot.lds @@ -65,7 +65,7 @@ SECTIONS cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text)

/* . = env_offset;*/ diff --git a/board/ml2/u-boot.lds.debug b/board/ml2/u-boot.lds.debug index 970628d..40d2f78 100644 --- a/board/ml2/u-boot.lds.debug +++ b/board/ml2/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text)

common/env_embedded.o(.text)

diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds index 5100542..c92a2ab 100644 --- a/board/mousse/u-boot.lds +++ b/board/mousse/u-boot.lds @@ -53,8 +53,8 @@ SECTIONS .text : { cpu/mpc824x/start.o (.text) - lib_ppc/board.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/board.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom index f79c39f..9750fc5 100644 --- a/board/mousse/u-boot.lds.rom +++ b/board/mousse/u-boot.lds.rom @@ -54,7 +54,7 @@ SECTIONS { cpu/mpc824x/start.o (.text) common/board.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/mpl/pip405/u-boot.lds.debug b/board/mpl/pip405/u-boot.lds.debug index 970628d..40d2f78 100644 --- a/board/mpl/pip405/u-boot.lds.debug +++ b/board/mpl/pip405/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text)

common/env_embedded.o(.text)

diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds index d64274b..4b17a1f 100644 --- a/board/netphone/u-boot.lds +++ b/board/netphone/u-boot.lds @@ -55,12 +55,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text)

. = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/netstal/hcu4/hcu4.c b/board/netstal/hcu4/hcu4.c index 8efbc23..3f07ff1 100644 --- a/board/netstal/hcu4/hcu4.c +++ b/board/netstal/hcu4/hcu4.c @@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR;

/* * This function is run very early, out of flash, and before devices are - * initialized. It is called by lib_ppc/board.c:board_init_f by virtue + * initialized. It is called by arch/ppc/lib/board.c:board_init_f by virtue * of being in the init_sequence array. * * The SDRAM has been initialized already -- start.S:start called diff --git a/board/netstal/hcu5/README.txt b/board/netstal/hcu5/README.txt index f649876..532c971 100644 --- a/board/netstal/hcu5/README.txt +++ b/board/netstal/hcu5/README.txt @@ -109,7 +109,7 @@ _start: call cpu_init_f /* run low-level CPU init code (from Flash) */

call cpu_init_f - board_init_f: (lib_ppc\board.c) + board_init_f: (arch/ppc/lib/board.c) init_sequence defines a list of function to be called board_early_init_f: (board/netstal/hcu5/hcu5.c) We are using Bootstrap-Option A @@ -141,7 +141,7 @@ _start: From now on our copy is in RAM and we will run from there, starting with board_init_r ------------------------------------------------------- - board_init_r: (lib_ppc\board.c) + board_init_r: (arch/ppc/lib/board.c) setup bd function pointers trap_init flash_init: (board/netstal/hcu5/flash.c) @@ -162,7 +162,7 @@ Most of the HW specific code for the HCU5 may be found in include/configs/hcu5.h board/netstal/hcu5/* cpu/ppc4xx/* -lib_ppc/* +arch/ppc/lib/* include/ppc440.h

Drivers for serial etc are found under drivers/ diff --git a/board/netstal/hcu5/hcu5.c b/board/netstal/hcu5/hcu5.c index c545cc0..90433fe 100644 --- a/board/netstal/hcu5/hcu5.c +++ b/board/netstal/hcu5/hcu5.c @@ -49,7 +49,7 @@ extern flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];

/* * This function is run very early, out of flash, and before devices are - * initialized. It is called by lib_ppc/board.c:board_init_f by virtue + * initialized. It is called by arch/ppc/lib/board.c:board_init_f by virtue * of being in the init_sequence array. * * The SDRAM has been initialized already -- start.S:start called diff --git a/board/netstal/mcu25/mcu25.c b/board/netstal/mcu25/mcu25.c index c66ab97..cc2f998 100644 --- a/board/netstal/mcu25/mcu25.c +++ b/board/netstal/mcu25/mcu25.c @@ -39,7 +39,7 @@ DECLARE_GLOBAL_DATA_PTR;

/* * This function is run very early, out of flash, and before devices are - * initialized. It is called by lib_ppc/board.c:board_init_f by virtue + * initialized. It is called by arch/ppc/lib/board.c:board_init_f by virtue * of being in the init_sequence array. * * The SDRAM has been initialized already -- start.S:start called diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds index 860c887..991d7a1 100644 --- a/board/netta/u-boot.lds +++ b/board/netta/u-boot.lds @@ -55,12 +55,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text)

. = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/netta2/u-boot.lds b/board/netta2/u-boot.lds index 860c887..991d7a1 100644 --- a/board/netta2/u-boot.lds +++ b/board/netta2/u-boot.lds @@ -55,12 +55,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text)

. = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds index a7d290a..7eb01ee 100644 --- a/board/netvia/u-boot.lds +++ b/board/netvia/u-boot.lds @@ -55,12 +55,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text)

. = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/quantum/u-boot.lds b/board/quantum/u-boot.lds index 47247ec..c354ff8 100644 --- a/board/quantum/u-boot.lds +++ b/board/quantum/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS

cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds index e0ea600..6074c14 100644 --- a/board/rbc823/u-boot.lds +++ b/board/rbc823/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS

cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds index 47247ec..c354ff8 100644 --- a/board/rmu/u-boot.lds +++ b/board/rmu/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS

cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug index 48fd579..1d8ce10 100644 --- a/board/sandburst/karef/u-boot.lds.debug +++ b/board/sandburst/karef/u-boot.lds.debug @@ -67,7 +67,7 @@ SECTIONS drivers/net/4xx_enet.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text)

/* common/env_embedded.o(.text) */ diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug index 4bc5cea..bbfea13 100644 --- a/board/sandburst/metrobox/u-boot.lds.debug +++ b/board/sandburst/metrobox/u-boot.lds.debug @@ -67,7 +67,7 @@ SECTIONS drivers/net/4xx_enet.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text)

/* common/env_embedded.o(.text) */ diff --git a/board/sbc8641d/u-boot.lds b/board/sbc8641d/u-boot.lds index b71a7d6..648efa2 100644 --- a/board/sbc8641d/u-boot.lds +++ b/board/sbc8641d/u-boot.lds @@ -58,7 +58,7 @@ SECTIONS cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text) *(.text) *(.got1) diff --git a/board/sc3/u-boot.lds b/board/sc3/u-boot.lds index 16dc384..04b350a 100644 --- a/board/sc3/u-boot.lds +++ b/board/sc3/u-boot.lds @@ -70,7 +70,7 @@ SECTIONS cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text)

/* . = env_offset;*/ diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds index 2d0efb3..0571f02 100644 --- a/board/siemens/CCM/u-boot.lds +++ b/board/siemens/CCM/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS

cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/siemens/IAD210/u-boot.lds b/board/siemens/IAD210/u-boot.lds index 104b44c..877cf9a 100644 --- a/board/siemens/IAD210/u-boot.lds +++ b/board/siemens/IAD210/u-boot.lds @@ -57,9 +57,9 @@ SECTIONS

cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) cpu/mpc8xx/interrupts.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/time.o (.text) . = env_offset; common/env_embedded.o(.text)

diff --git a/board/siemens/pcu_e/u-boot.lds.debug b/board/siemens/pcu_e/u-boot.lds.debug index 987c4dd..49f8972 100644 --- a/board/siemens/pcu_e/u-boot.lds.debug +++ b/board/siemens/pcu_e/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text)

. = env_offset; common/env_embedded.o(.text) diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds index 9ef2c20..ce115f5 100644 --- a/board/snmc/qs850/u-boot.lds +++ b/board/snmc/qs850/u-boot.lds @@ -58,12 +58,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text)

. = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds index 9ef2c20..ce115f5 100644 --- a/board/snmc/qs860t/u-boot.lds +++ b/board/snmc/qs860t/u-boot.lds @@ -58,12 +58,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text)

. = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds index d6711b5..172cfbb 100644 --- a/board/spc1920/u-boot.lds +++ b/board/spc1920/u-boot.lds @@ -58,12 +58,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text)

. = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug index 0a3b958..8d91aed 100644 --- a/board/spd8xx/u-boot.lds.debug +++ b/board/spd8xx/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text)

. = env_offset; common/env_embedded.o(.text) diff --git a/board/stx/stxssa/stxssa.c b/board/stx/stxssa/stxssa.c index 73dddf3..678ec58 100644 --- a/board/stx/stxssa/stxssa.c +++ b/board/stx/stxssa/stxssa.c @@ -259,7 +259,7 @@ board_early_init_f(void) #endif

/* Why is the phy reset done _after_ the ethernet - * initialization in lib_ppc/board.c? + * initialization in arch/ppc/lib/board.c? * Do it here so it's done before the TSECs are used. */ reset_phy(); diff --git a/board/stx/stxxtc/u-boot.lds b/board/stx/stxxtc/u-boot.lds index 860c887..991d7a1 100644 --- a/board/stx/stxxtc/u-boot.lds +++ b/board/stx/stxxtc/u-boot.lds @@ -55,12 +55,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text)

. = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds index 02aa9dd..cf78200 100644 --- a/board/svm_sc8xx/u-boot.lds +++ b/board/svm_sc8xx/u-boot.lds @@ -58,12 +58,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text)

. = env_offset; common/env_embedded.o (.ppcenv) diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds index 2df8d84..9f452c1 100644 --- a/board/tqc/tqm8xx/u-boot.lds +++ b/board/tqc/tqm8xx/u-boot.lds @@ -58,11 +58,11 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) + arch/ppc/lib/cache.o (.text)

. = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/uc100/u-boot.lds b/board/uc100/u-boot.lds index e3ea52a..967e432 100644 --- a/board/uc100/u-boot.lds +++ b/board/uc100/u-boot.lds @@ -58,12 +58,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text)

common/env_embedded.o (.text)

diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds index 6f2ea9a..c3dd8c7 100644 --- a/board/v37/u-boot.lds +++ b/board/v37/u-boot.lds @@ -58,12 +58,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text)

/* . = env_offset; diff --git a/board/w7o/u-boot.lds.debug b/board/w7o/u-boot.lds.debug index 8bb4929..85b1cd6 100644 --- a/board/w7o/u-boot.lds.debug +++ b/board/w7o/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text)

common/env_embedded.o(.text)

diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds index 2d0efb3..0571f02 100644 --- a/board/westel/amx860/u-boot.lds +++ b/board/westel/amx860/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS

cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug index 653e0be..919eb21 100644 --- a/board/westel/amx860/u-boot.lds.debug +++ b/board/westel/amx860/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text)

. = env_offset; common/env_embedded.o(.text) diff --git a/board/xes/xpedite1000/u-boot.lds.debug b/board/xes/xpedite1000/u-boot.lds.debug index d00834e..0830d0a 100644 --- a/board/xes/xpedite1000/u-boot.lds.debug +++ b/board/xes/xpedite1000/u-boot.lds.debug @@ -65,7 +65,7 @@ SECTIONS cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text)

/* common/env_embedded.o(.text) */ diff --git a/board/xes/xpedite5170/u-boot.lds b/board/xes/xpedite5170/u-boot.lds index b71a7d6..648efa2 100644 --- a/board/xes/xpedite5170/u-boot.lds +++ b/board/xes/xpedite5170/u-boot.lds @@ -58,7 +58,7 @@ SECTIONS cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text) *(.text) *(.got1) diff --git a/board/xilinx/ml300/u-boot.lds b/board/xilinx/ml300/u-boot.lds index b989940..da803a6 100644 --- a/board/xilinx/ml300/u-boot.lds +++ b/board/xilinx/ml300/u-boot.lds @@ -67,7 +67,7 @@ SECTIONS drivers/net/4xx_enet.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text) */ /* . = env_offset;*/ diff --git a/board/xilinx/ml300/u-boot.lds.debug b/board/xilinx/ml300/u-boot.lds.debug index 970628d..40d2f78 100644 --- a/board/xilinx/ml300/u-boot.lds.debug +++ b/board/xilinx/ml300/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text)

common/env_embedded.o(.text)

diff --git a/config.mk b/config.mk index cb1c4af..be6b91c 100644 --- a/config.mk +++ b/config.mk @@ -111,7 +111,7 @@ RANLIB = $(CROSS_COMPILE)RANLIB sinclude $(OBJTREE)/include/autoconf.mk

ifdef ARCH -sinclude $(TOPDIR)/lib_$(ARCH)/config.mk # include architecture dependend rules +sinclude $(TOPDIR)/arch/$(ARCH)/config.mk # include architecture dependend rules endif ifdef CPU sinclude $(TOPDIR)/cpu/$(CPU)/config.mk # include CPU specific rules diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/cpu/mpc5xxx/u-boot-customlayout.lds index c340086..c08c9c9 100644 --- a/cpu/mpc5xxx/u-boot-customlayout.lds +++ b/cpu/mpc5xxx/u-boot-customlayout.lds @@ -58,8 +58,8 @@ SECTIONS cpu/mpc5xxx/start.o (.text) cpu/mpc5xxx/traps.o (.text) lib_generic/crc32.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text)

. = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/doc/README.LED b/doc/README.LED index 94e552a..c3bcb3a 100644 --- a/doc/README.LED +++ b/doc/README.LED @@ -69,7 +69,7 @@ yellow_LED_off blue_LED_on blue_LED_off

-These are weakly defined in lib_arm/board.c to noops. Where applicable, define +These are weakly defined in arch/arm/lib/board.c to noops. Where applicable, define these functions in the board specific source.

TBD : Describe older board dependent macros similar to what is done for diff --git a/doc/README.alaska8220 b/doc/README.alaska8220 index 0bd68d9..279dac6 100644 --- a/doc/README.alaska8220 +++ b/doc/README.alaska8220 @@ -22,7 +22,7 @@ Changed files: - include/asm-ppc/global_data.h added global variables - inp_clk, pci_clk, vco_clk, pev_clk, flb_clk, and bExtUart

-- lib_ppc/board.c added CONFIG_MPC8220 support +- arch/ppc/lib/board.c added CONFIG_MPC8220 support

- net/eth.c added FEC support for MPC8220

diff --git a/doc/README.m52277evb b/doc/README.m52277evb index 40f9028..f30b45e 100644 --- a/doc/README.m52277evb +++ b/doc/README.m52277evb @@ -53,12 +53,12 @@ Changed files:

- include/configs/M52277EVB.h Board specific configuration file

-- lib_m68k/board.c board init function -- lib_m68k/cache.c -- lib_m68k/interrupts Coldfire common interrupt functions -- lib_m68k/m68k_linux.c -- lib_m68k/time.c Timer functions (Dma timer and PIT) -- lib_m68k/traps.c Exception init code +- arch/m68k/lib/board.c board init function +- arch/m68k/lib/cache.c +- arch/m68k/lib/interrupts Coldfire common interrupt functions +- arch/m68k/lib/m68k_linux.c +- arch/m68k/lib/time.c Timer functions (Dma timer and PIT) +- arch/m68k/lib/traps.c Exception init code

1 MCF52277 specific Options/Settings ==================================== diff --git a/doc/README.m53017evb b/doc/README.m53017evb index 60cfa95..780a803 100644 --- a/doc/README.m53017evb +++ b/doc/README.m53017evb @@ -51,12 +51,12 @@ Changed files:

- include/configs/M53017EVB.h Board specific configuration file

-- lib_m68k/board.c board init function -- lib_m68k/cache.c -- lib_m68k/interrupts Coldfire common interrupt functions -- lib_m68k/m68k_linux.c -- lib_m68k/time.c Timer functions (Dma timer and PIT) -- lib_m68k/traps.c Exception init code +- arch/m68k/lib/board.c board init function +- arch/m68k/lib/cache.c +- arch/m68k/lib/interrupts Coldfire common interrupt functions +- arch/m68k/lib/m68k_linux.c +- arch/m68k/lib/time.c Timer functions (Dma timer and PIT) +- arch/m68k/lib/traps.c Exception init code

1 MCF5301x specific Options/Settings ==================================== diff --git a/doc/README.m5373evb b/doc/README.m5373evb index 5591748..24a659b 100644 --- a/doc/README.m5373evb +++ b/doc/README.m5373evb @@ -50,12 +50,12 @@ Changed files:

- include/configs/M5373EVB.h Board specific configuration file

-- lib_m68k/board.c board init function -- lib_m68k/cache.c -- lib_m68k/interrupts Coldfire common interrupt functions -- lib_m68k/m68k_linux.c -- lib_m68k/time.c Timer functions (Dma timer and PIT) -- lib_m68k/traps.c Exception init code +- arch/m68k/lib/board.c board init function +- arch/m68k/lib/cache.c +- arch/m68k/lib/interrupts Coldfire common interrupt functions +- arch/m68k/lib/m68k_linux.c +- arch/m68k/lib/time.c Timer functions (Dma timer and PIT) +- arch/m68k/lib/traps.c Exception init code

1 MCF5373 specific Options/Settings ==================================== diff --git a/doc/README.m54455evb b/doc/README.m54455evb index 1888e16..257bcd5 100644 --- a/doc/README.m54455evb +++ b/doc/README.m54455evb @@ -52,12 +52,12 @@ Changed files:

- include/configs/M54455EVB.h Board specific configuration file

-- lib_m68k/board.c board init function -- lib_m68k/cache.c -- lib_m68k/interrupts Coldfire common interrupt functions -- lib_m68k/m68k_linux.c -- lib_m68k/time.c Timer functions (Dma timer and PIT) -- lib_m68k/traps.c Exception init code +- arch/m68k/lib/board.c board init function +- arch/m68k/lib/cache.c +- arch/m68k/lib/interrupts Coldfire common interrupt functions +- arch/m68k/lib/m68k_linux.c +- arch/m68k/lib/time.c Timer functions (Dma timer and PIT) +- arch/m68k/lib/traps.c Exception init code

- rtc/mcfrtc.c Realtime clock Driver

diff --git a/doc/README.m5475evb b/doc/README.m5475evb index f3a1d7b..b61dfba 100644 --- a/doc/README.m5475evb +++ b/doc/README.m5475evb @@ -58,11 +58,11 @@ Changed files:

- include/configs/M5475EVB.h Board specific configuration file

-- lib_m68k/board.c board init function -- lib_m68k/cache.c -- lib_m68k/interrupts Coldfire common interrupt functions -- lib_m68k/m68k_linux.c -- lib_m68k/traps.c Exception init code +- arch/m68k/lib/board.c board init function +- arch/m68k/lib/cache.c +- arch/m68k/lib/interrupts Coldfire common interrupt functions +- arch/m68k/lib/m68k_linux.c +- arch/m68k/lib/traps.c Exception init code

1 MCF547x specific Options/Settings ==================================== diff --git a/doc/README.mpc5xx b/doc/README.mpc5xx index 07be863..2e12174 100644 --- a/doc/README.mpc5xx +++ b/doc/README.mpc5xx @@ -34,9 +34,9 @@ u-boot-0.2.0/include/mpc5xx.h u-boot-0.2.0/include/status_led.h u-boot-0.2.0/include/asm-ppc/u-boot.h u-boot-0.2.0/include/asm-ppc/5xx_immap.h -u-boot-0.2.0/lib_ppc/board.c -u-boot-0.2.0/lib_ppc/cache.c -u-boot-0.2.0/lib_ppc/time.c +u-boot-0.2.0/arch/ppc/lib/board.c +u-boot-0.2.0/arch/ppc/lib/cache.c +u-boot-0.2.0/arch/ppc/lib/time.c u-boot-0.2.0/Makefile u-boot-0.2.0/CREDITS u-boot-0.2.0/doc/README.mpc5xx diff --git a/doc/README.nios b/doc/README.nios index 7f34938..da30ff5 100644 --- a/doc/README.nios +++ b/doc/README.nios @@ -244,7 +244,7 @@ cover most of the individual functions to get you started.

(gdb) directory common (gdb) directory cpu/nios - (gdb) directory lib_nios + (gdb) directory arch/nios/lib (gdb) directory board/altera/dk1c20

Note that the last command is for the DK1C20 board only. If you diff --git a/doc/TODO-i386 b/doc/TODO-i386 index 84113f8..2261f4a 100644 --- a/doc/TODO-i386 +++ b/doc/TODO-i386 @@ -8,7 +8,7 @@ i386 port missing features: * re-entry of protected mode from real mode, should be added to realmode_switch.S (and used by INT 10h and INT 16h handlers for console I/O during early linux boot...) -* missing functions in lib_i386 and cpu/i386 +* missing functions in arch/i386/lib and cpu/i386 * speaker beep interface

diff --git a/examples/api/Makefile b/examples/api/Makefile index d4c5ca2..62751ec 100644 --- a/examples/api/Makefile +++ b/examples/api/Makefile @@ -47,7 +47,7 @@ EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/string.o EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/time.o EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/vsprintf.o ifeq ($(ARCH),ppc) -EXT_SOBJ_FILES-$(CONFIG_API) += lib_ppc/ppcstring.o +EXT_SOBJ_FILES-$(CONFIG_API) += arch/ppc/lib/ppcstring.o endif

# Create a list of source files so their dependencies can be auto-generated @@ -79,7 +79,7 @@ $(obj)%.o: $(SRCTREE)/lib_generic/%.c $(CC) -g $(CFLAGS) -c -o $@ $<

# Rule to build architecture-specific library assembly files -$(obj)%.o: $(SRCTREE)/lib_$(ARCH)/%.S +$(obj)%.o: $(SRCTREE)/arch/$(ARCH)/lib/%.S $(CC) -g $(CFLAGS) -c -o $@ $<

######################################################################### diff --git a/include/asm-i386/interrupt.h b/include/asm-i386/interrupt.h index 3e2674a..8d324d9 100644 --- a/include/asm-i386/interrupt.h +++ b/include/asm-i386/interrupt.h @@ -30,7 +30,7 @@ /* cpu/i386/interrupts.c */ void set_vector(u8 intnum, void *routine);

-/* lib_i386/interupts.c */ +/* arch/i386/lib/interupts.c */ void disable_irq(int irq); void enable_irq(int irq);

diff --git a/include/asm-i386/u-boot-i386.h b/include/asm-i386/u-boot-i386.h index 7c99c8c..a08632d 100644 --- a/include/asm-i386/u-boot-i386.h +++ b/include/asm-i386/u-boot-i386.h @@ -33,7 +33,7 @@ void timer_isr(void *); typedef void (timer_fnc_t) (void); int register_timer_isr (timer_fnc_t *isr_func);

-/* Architecture specific - can be in cpu/i386/, lib_i386/, or $(BOARD)/ */ +/* Architecture specific - can be in cpu/i386/, arch/i386/lib/, or $(BOARD)/ */ int timer_init(void);

/* cpu/.../interrupts.c */ @@ -46,7 +46,7 @@ int dram_init(void); void isa_unmap_rom(u32 addr); u32 isa_map_rom(u32 bus_addr, int size);

-/* lib_i386/... */ +/* arch/i386/lib/... */ int video_bios_init(void); int video_init(void);

diff --git a/include/common.h b/include/common.h index 00b5434..d582eed 100644 --- a/include/common.h +++ b/include/common.h @@ -225,7 +225,7 @@ int parse_line (char *, char *[]); void init_cmd_timeout(void); void reset_cmd_timeout(void);

-/* lib_$(ARCH)/board.c */ +/* arch/$(ARCH)/lib/board.c */ void board_init_f (ulong) __attribute__ ((noreturn)); void board_init_r (gd_t *, ulong) __attribute__ ((noreturn)); int checkboard (void); @@ -596,17 +596,17 @@ ulong vfd_setmem (ulong); /* $(CPU)/.../video.c */ ulong video_setmem (ulong);

-/* lib_$(ARCH)/cache.c */ +/* arch/$(ARCH)/lib/cache.c */ void flush_cache (unsigned long, unsigned long); void flush_dcache_range(unsigned long start, unsigned long stop); void invalidate_dcache_range(unsigned long start, unsigned long stop);

-/* lib_$(ARCH)/ticks.S */ +/* arch/$(ARCH)/lib/ticks.S */ unsigned long long get_ticks(void); void wait_ticks (unsigned long);

-/* lib_$(ARCH)/time.c */ +/* arch/$(ARCH)/lib/time.c */ void __udelay (unsigned long); ulong usec2ticks (unsigned long usec); ulong ticks2usec (unsigned long ticks); diff --git a/include/configs/B2.h b/include/configs/B2.h index e5439f3..60498a7 100644 --- a/include/configs/B2.h +++ b/include/configs/B2.h @@ -207,7 +207,7 @@ */

/* - Linux TAGs (see lib_arm/armlinux.c) + Linux TAGs (see arch/arm/lib/armlinux.c) */ #define CONFIG_CMDLINE_TAG #undef CONFIG_SETUP_MEMORY_TAGS diff --git a/nand_spl/board/freescale/mpc8313erdb/Makefile b/nand_spl/board/freescale/mpc8313erdb/Makefile index a13e7e2..ee1dc4b 100644 --- a/nand_spl/board/freescale/mpc8313erdb/Makefile +++ b/nand_spl/board/freescale/mpc8313erdb/Makefile @@ -84,13 +84,13 @@ $(obj)nand_init.c: ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c

$(obj)cache.c: - ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c + ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c

$(obj)time.c: - ln -sf $(SRCTREE)/lib_ppc/time.c $(obj)time.c + ln -sf $(SRCTREE)/arch/ppc/lib/time.c $(obj)time.c

$(obj)ticks.S: - ln -sf $(SRCTREE)/lib_ppc/ticks.S $(obj)ticks.S + ln -sf $(SRCTREE)/arch/ppc/lib/ticks.S $(obj)ticks.S

#########################################################################

diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile index 7ed9d61..6948bab 100644 --- a/nand_spl/board/freescale/mpc8536ds/Makefile +++ b/nand_spl/board/freescale/mpc8536ds/Makefile @@ -64,7 +64,7 @@ $(nandobj)u-boot-spl: $(OBJS)

$(obj)cache.c: @rm -f $(obj)cache.c - ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c + ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c

$(obj)cpu_init_early.c: @rm -f $(obj)cpu_init_early.c diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile index 7ed9d61..6948bab 100644 --- a/nand_spl/board/freescale/p1_p2_rdb/Makefile +++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile @@ -64,7 +64,7 @@ $(nandobj)u-boot-spl: $(OBJS)

$(obj)cache.c: @rm -f $(obj)cache.c - ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c + ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c

$(obj)cpu_init_early.c: @rm -f $(obj)cpu_init_early.c diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile index 6920fe8..48c22f8 100644 --- a/nand_spl/board/sheldon/simpc8313/Makefile +++ b/nand_spl/board/sheldon/simpc8313/Makefile @@ -90,15 +90,15 @@ $(obj)nand_init.c:

$(obj)cache.c: @rm -f $@ - ln -s $(SRCTREE)/lib_ppc/cache.c $@ + ln -s $(SRCTREE)/arch/ppc/lib/cache.c $@

$(obj)time.c: @rm -f $@ - ln -s $(SRCTREE)/lib_ppc/time.c $@ + ln -s $(SRCTREE)/arch/ppc/lib/time.c $@

$(obj)ticks.S: @rm -f $@ - ln -s $(SRCTREE)/lib_ppc/ticks.S $@ + ln -s $(SRCTREE)/arch/ppc/lib/ticks.S $@

#########################################################################

Move the libfdt library into the common lib/ directory to clean up the top-level of U-Boot.

Signed-off-by: Peter Tyser ptyser@xes-inc.com --- Makefile | 2 +- {libfdt => lib/libfdt}/Makefile | 0 {libfdt => lib/libfdt}/README | 0 {libfdt => lib/libfdt}/fdt.c | 0 {libfdt => lib/libfdt}/fdt_ro.c | 0 {libfdt => lib/libfdt}/fdt_rw.c | 0 {libfdt => lib/libfdt}/fdt_strerror.c | 0 {libfdt => lib/libfdt}/fdt_sw.c | 0 {libfdt => lib/libfdt}/fdt_wip.c | 0 {libfdt => lib/libfdt}/libfdt_internal.h | 0 tools/Makefile | 4 ++-- tools/imls/Makefile | 6 +++--- 12 files changed, 6 insertions(+), 6 deletions(-) rename {libfdt => lib/libfdt}/Makefile (100%) rename {libfdt => lib/libfdt}/README (100%) rename {libfdt => lib/libfdt}/fdt.c (100%) rename {libfdt => lib/libfdt}/fdt_ro.c (100%) rename {libfdt => lib/libfdt}/fdt_rw.c (100%) rename {libfdt => lib/libfdt}/fdt_strerror.c (100%) rename {libfdt => lib/libfdt}/fdt_sw.c (100%) rename {libfdt => lib/libfdt}/fdt_wip.c (100%) rename {libfdt => lib/libfdt}/libfdt_internal.h (100%)

diff --git a/Makefile b/Makefile index c13aa0a..fb19e85 100644 --- a/Makefile +++ b/Makefile @@ -246,7 +246,7 @@ LIBS += drivers/usb/musb/libusb_musb.a LIBS += drivers/video/libvideo.a LIBS += drivers/watchdog/libwatchdog.a LIBS += common/libcommon.a -LIBS += libfdt/libfdt.a +LIBS += lib/libfdt/libfdt.a LIBS += api/libapi.a LIBS += post/libpost.a

diff --git a/libfdt/Makefile b/lib/libfdt/Makefile similarity index 100% rename from libfdt/Makefile rename to lib/libfdt/Makefile diff --git a/libfdt/README b/lib/libfdt/README similarity index 100% rename from libfdt/README rename to lib/libfdt/README diff --git a/libfdt/fdt.c b/lib/libfdt/fdt.c similarity index 100% rename from libfdt/fdt.c rename to lib/libfdt/fdt.c diff --git a/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c similarity index 100% rename from libfdt/fdt_ro.c rename to lib/libfdt/fdt_ro.c diff --git a/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c similarity index 100% rename from libfdt/fdt_rw.c rename to lib/libfdt/fdt_rw.c diff --git a/libfdt/fdt_strerror.c b/lib/libfdt/fdt_strerror.c similarity index 100% rename from libfdt/fdt_strerror.c rename to lib/libfdt/fdt_strerror.c diff --git a/libfdt/fdt_sw.c b/lib/libfdt/fdt_sw.c similarity index 100% rename from libfdt/fdt_sw.c rename to lib/libfdt/fdt_sw.c diff --git a/libfdt/fdt_wip.c b/lib/libfdt/fdt_wip.c similarity index 100% rename from libfdt/fdt_wip.c rename to lib/libfdt/fdt_wip.c diff --git a/libfdt/libfdt_internal.h b/lib/libfdt/libfdt_internal.h similarity index 100% rename from libfdt/libfdt_internal.h rename to lib/libfdt/libfdt_internal.h diff --git a/tools/Makefile b/tools/Makefile index 7a06cda..b1c2436 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -109,7 +109,7 @@ endif # now $(obj) is defined HOSTSRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c)) HOSTSRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c)) -HOSTSRCS += $(addprefix $(SRCTREE)/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c)) +HOSTSRCS += $(addprefix $(SRCTREE)/lib/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c)) BINS := $(addprefix $(obj),$(sort $(BIN_FILES-y))) LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))

@@ -123,7 +123,7 @@ NOPEDOBJS := $(addprefix $(obj),$(NOPED_OBJ_FILES-y)) HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ -idirafter $(OBJTREE)/include2 \ -idirafter $(OBJTREE)/include \ - -I $(SRCTREE)/libfdt \ + -I $(SRCTREE)/lib/libfdt \ -I $(SRCTREE)/tools \ -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \ -D__KERNEL_STRICT_NAMES diff --git a/tools/imls/Makefile b/tools/imls/Makefile index 82c2728..640e8ac 100644 --- a/tools/imls/Makefile +++ b/tools/imls/Makefile @@ -41,7 +41,7 @@ LIBFDT_OBJ_FILES-y += fdt_wip.o # now $(obj) is defined SRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c)) SRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c)) -SRCS += $(addprefix $(SRCTREE)/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c)) +SRCS += $(addprefix $(SRCTREE)/lib/lib/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c)) BINS := $(addprefix $(obj),$(sort $(BIN_FILES-y))) LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))

@@ -52,7 +52,7 @@ LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y)) HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ -idirafter $(OBJTREE)/include2 \ -idirafter $(OBJTREE)/include \ - -I $(SRCTREE)/libfdt \ + -I $(SRCTREE)/lib/lib/libfdt \ -I $(SRCTREE)/tools \ -DUSE_HOSTCC -D__KERNEL_STRICT_NAMES

@@ -81,7 +81,7 @@ $(obj)%.o: $(SRCTREE)/common/%.c $(obj)%.o: $(SRCTREE)/lib/%.c $(CC) -g $(HOSTCFLAGS) -c -o $@ $<

-$(obj)%.o: $(SRCTREE)/libfdt/%.c +$(obj)%.o: $(SRCTREE)/lib/lib/libfdt/%.c $(CC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $<

clean:

This cleans up the include/ directory, speeds up architecture-specific grepping, and brings U-Boot in line with Linux's directory structure.

Signed-off-by: Peter Tyser ptyser@xes-inc.com --- arch/.gitignore | 2 ++ .../arm/include/asm}/arch-a320/a320.h | 0 .../arm/include/asm}/arch-a320/ftpmu010.h | 0 .../arm/include/asm}/arch-a320/ftsdmc020.h | 0 .../arm/include/asm}/arch-a320/ftsmc020.h | 0 .../arm/include/asm}/arch-a320/fttmr010.h | 0 .../arm/include/asm}/arch-arm720t/hardware.h | 0 .../include/asm}/arch-arm720t/netarm_dma_module.h | 0 .../include/asm}/arch-arm720t/netarm_eni_module.h | 0 .../include/asm}/arch-arm720t/netarm_eth_module.h | 0 .../include/asm}/arch-arm720t/netarm_gen_module.h | 0 .../include/asm}/arch-arm720t/netarm_mem_module.h | 0 .../include/asm}/arch-arm720t/netarm_registers.h | 0 .../include/asm}/arch-arm720t/netarm_ser_module.h | 0 .../arm/include/asm}/arch-arm925t/sizes.h | 0 .../arm/include/asm}/arch-arm926ejs/sizes.h | 0 .../arm/include/asm}/arch-at91/at91_common.h | 0 .../arm/include/asm}/arch-at91/at91_pio.h | 0 .../arm/include/asm}/arch-at91/at91_pit.h | 0 .../arm/include/asm}/arch-at91/at91_pmc.h | 0 .../arm/include/asm}/arch-at91/at91_rstc.h | 0 .../arm/include/asm}/arch-at91/at91_spi.h | 0 .../arm/include/asm}/arch-at91/at91_wdt.h | 0 .../arm/include/asm}/arch-at91/at91cap9.h | 0 .../arm/include/asm}/arch-at91/at91cap9_matrix.h | 0 .../arm/include/asm}/arch-at91/at91sam9260.h | 0 .../include/asm}/arch-at91/at91sam9260_matrix.h | 0 .../arm/include/asm}/arch-at91/at91sam9261.h | 0 .../include/asm}/arch-at91/at91sam9261_matrix.h | 0 .../arm/include/asm}/arch-at91/at91sam9263.h | 0 .../include/asm}/arch-at91/at91sam9263_matrix.h | 0 .../arm/include/asm}/arch-at91/at91sam9_matrix.h | 0 .../arm/include/asm}/arch-at91/at91sam9_sdramc.h | 0 .../arm/include/asm}/arch-at91/at91sam9_smc.h | 0 .../arm/include/asm}/arch-at91/at91sam9g45.h | 0 .../include/asm}/arch-at91/at91sam9g45_matrix.h | 0 .../arm/include/asm}/arch-at91/at91sam9rl.h | 0 .../arm/include/asm}/arch-at91/at91sam9rl_matrix.h | 0 .../arm/include/asm}/arch-at91/clk.h | 0 .../arm/include/asm}/arch-at91/gpio.h | 0 .../arm/include/asm}/arch-at91/hardware.h | 0 .../arm/include/asm}/arch-at91/io.h | 0 .../arm/include/asm}/arch-at91/memory-map.h | 0 .../arm/include/asm}/arch-at91rm9200/AT91RM9200.h | 0 .../arm/include/asm}/arch-at91rm9200/hardware.h | 0 .../arm/include/asm}/arch-davinci/emac_defs.h | 0 .../arm/include/asm}/arch-davinci/emif_defs.h | 0 .../arm/include/asm}/arch-davinci/gpio_defs.h | 0 .../arm/include/asm}/arch-davinci/hardware.h | 0 .../arm/include/asm}/arch-davinci/i2c_defs.h | 0 .../arm/include/asm}/arch-davinci/nand_defs.h | 0 .../arm/include/asm}/arch-imx/imx-regs.h | 0 .../arm/include/asm}/arch-ixp/ixp425.h | 0 .../arm/include/asm}/arch-ixp/ixp425pci.h | 0 .../arm/include/asm}/arch-kirkwood/cpu.h | 0 .../arm/include/asm}/arch-kirkwood/gpio.h | 0 .../arm/include/asm}/arch-kirkwood/kirkwood.h | 0 .../arm/include/asm}/arch-kirkwood/kw88f6192.h | 0 .../arm/include/asm}/arch-kirkwood/kw88f6281.h | 0 .../arm/include/asm}/arch-kirkwood/mpp.h | 0 .../arm/include/asm}/arch-kirkwood/spi.h | 0 .../arm/include/asm}/arch-ks8695/platform.h | 0 .../arm/include/asm}/arch-lpc2292/hardware.h | 0 .../include/asm}/arch-lpc2292/lpc2292_registers.h | 0 .../arm/include/asm}/arch-lpc2292/spi.h | 0 .../arm/include/asm}/arch-mx27/asm-offsets.h | 0 .../arm/include/asm}/arch-mx27/clock.h | 0 .../arm/include/asm}/arch-mx27/imx-regs.h | 0 .../arm/include/asm}/arch-mx27/mxcmmc.h | 0 .../arm/include/asm}/arch-mx31/mx31-regs.h | 0 .../arm/include/asm}/arch-mx31/mx31.h | 0 .../arm/include/asm}/arch-nomadik/gpio.h | 0 .../arm/include/asm}/arch-nomadik/mtu.h | 0 .../arm/include/asm}/arch-omap/sizes.h | 0 .../arm/include/asm}/arch-omap24xx/bits.h | 0 .../arm/include/asm}/arch-omap24xx/clocks.h | 0 .../arm/include/asm}/arch-omap24xx/i2c.h | 0 .../arm/include/asm}/arch-omap24xx/mem.h | 0 .../arm/include/asm}/arch-omap24xx/mux.h | 0 .../arm/include/asm}/arch-omap24xx/omap2420.h | 0 .../arm/include/asm}/arch-omap24xx/sizes.h | 0 .../arm/include/asm}/arch-omap24xx/sys_info.h | 0 .../arm/include/asm}/arch-omap24xx/sys_proto.h | 0 .../arm/include/asm}/arch-omap3/clocks.h | 0 .../arm/include/asm}/arch-omap3/clocks_omap3.h | 0 .../arm/include/asm}/arch-omap3/cpu.h | 0 .../arm/include/asm}/arch-omap3/gpio.h | 0 .../arm/include/asm}/arch-omap3/i2c.h | 0 .../arm/include/asm}/arch-omap3/mem.h | 0 .../arm/include/asm}/arch-omap3/mmc.h | 0 .../arm/include/asm}/arch-omap3/mmc_host_def.h | 0 .../arm/include/asm}/arch-omap3/mux.h | 0 .../arm/include/asm}/arch-omap3/omap3.h | 0 .../arm/include/asm}/arch-omap3/omap_gpmc.h | 0 .../arm/include/asm}/arch-omap3/sys_proto.h | 0 .../arm/include/asm}/arch-pxa/bitfield.h | 0 .../arm/include/asm}/arch-pxa/hardware.h | 0 .../arm/include/asm}/arch-pxa/pxa-regs.h | 0 .../arm/include/asm}/arch-s3c24x0/memory.h | 0 .../arm/include/asm}/arch-s3c24x0/s3c2400.h | 0 .../arm/include/asm}/arch-s3c24x0/s3c2410.h | 0 .../arm/include/asm}/arch-s3c24x0/s3c24x0.h | 0 .../arm/include/asm}/arch-s3c24x0/s3c24x0_cpu.h | 0 .../arm/include/asm}/arch-s3c44b0/hardware.h | 0 .../arm/include/asm}/arch-s3c4510b/hardware.h | 0 .../arm/include/asm}/arch-s3c64xx/hardware.h | 0 .../arm/include/asm}/arch-s3c64xx/s3c6400.h | 0 .../arm/include/asm}/arch-s3c64xx/s3c64x0.h | 0 .../arm/include/asm}/arch-s5pc1xx/clk.h | 0 .../arm/include/asm}/arch-s5pc1xx/clock.h | 0 .../arm/include/asm}/arch-s5pc1xx/cpu.h | 0 .../arm/include/asm}/arch-s5pc1xx/gpio.h | 0 .../arm/include/asm}/arch-s5pc1xx/power.h | 0 .../arm/include/asm}/arch-s5pc1xx/pwm.h | 0 .../arm/include/asm}/arch-s5pc1xx/uart.h | 0 .../arm/include/asm}/arch-sa1100/bitfield.h | 0 {include/asm-arm => arch/arm/include/asm}/atomic.h | 0 {include/asm-arm => arch/arm/include/asm}/bitops.h | 0 .../asm-arm => arch/arm/include/asm}/byteorder.h | 0 {include/asm-arm => arch/arm/include/asm}/cache.h | 0 {include/asm-arm => arch/arm/include/asm}/config.h | 0 .../asm-arm => arch/arm/include/asm}/dma-mapping.h | 0 {include/asm-arm => arch/arm/include/asm}/errno.h | 0 .../asm-arm => arch/arm/include/asm}/global_data.h | 0 .../asm-arm => arch/arm/include/asm}/hardware.h | 0 {include/asm-arm => arch/arm/include/asm}/io.h | 0 .../asm-arm => arch/arm/include/asm}/mach-types.h | 0 {include/asm-arm => arch/arm/include/asm}/macro.h | 0 {include/asm-arm => arch/arm/include/asm}/memory.h | 0 .../asm-arm => arch/arm/include/asm}/posix_types.h | 0 .../arm/include/asm}/proc-armv/domain.h | 0 .../arm/include/asm}/proc-armv/processor.h | 0 .../arm/include/asm}/proc-armv/ptrace.h | 0 .../arm/include/asm}/proc-armv/system.h | 0 .../asm-arm => arch/arm/include/asm}/processor.h | 0 {include/asm-arm => arch/arm/include/asm}/ptrace.h | 0 {include/asm-arm => arch/arm/include/asm}/setup.h | 0 {include/asm-arm => arch/arm/include/asm}/sizes.h | 0 {include/asm-arm => arch/arm/include/asm}/string.h | 0 {include/asm-arm => arch/arm/include/asm}/system.h | 0 {include/asm-arm => arch/arm/include/asm}/types.h | 0 .../asm-arm => arch/arm/include/asm}/u-boot-arm.h | 0 {include/asm-arm => arch/arm/include/asm}/u-boot.h | 0 .../asm-arm => arch/arm/include/asm}/unaligned.h | 0 .../avr32/include/asm}/arch-at32ap700x/addrspace.h | 0 .../include/asm}/arch-at32ap700x/cacheflush.h | 0 .../include/asm}/arch-at32ap700x/chip-features.h | 0 .../avr32/include/asm}/arch-at32ap700x/clk.h | 0 .../avr32/include/asm}/arch-at32ap700x/gpio-impl.h | 0 .../avr32/include/asm}/arch-at32ap700x/gpio.h | 0 .../avr32/include/asm}/arch-at32ap700x/hmatrix.h | 0 .../include/asm}/arch-at32ap700x/memory-map.h | 0 .../avr32/include/asm}/arch-at32ap700x/portmux.h | 0 .../avr32/include/asm}/arch-common/portmux-gpio.h | 0 .../avr32/include/asm}/arch-common/portmux-pio.h | 0 .../asm-avr32 => arch/avr32/include/asm}/bitops.h | 0 .../avr32/include/asm}/byteorder.h | 0 .../asm-avr32 => arch/avr32/include/asm}/config.h | 0 .../avr32/include/asm}/dma-mapping.h | 0 .../asm-avr32 => arch/avr32/include/asm}/errno.h | 0 .../avr32/include/asm}/global_data.h | 0 .../avr32/include/asm}/hmatrix-common.h | 0 .../avr32/include/asm}/initcalls.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/io.h | 0 .../avr32/include/asm}/posix_types.h | 0 .../avr32/include/asm}/processor.h | 0 .../asm-avr32 => arch/avr32/include/asm}/ptrace.h | 0 .../asm-avr32 => arch/avr32/include/asm}/sdram.h | 0 .../avr32/include/asm}/sections.h | 0 .../asm-avr32 => arch/avr32/include/asm}/setup.h | 0 .../asm-avr32 => arch/avr32/include/asm}/string.h | 0 .../asm-avr32 => arch/avr32/include/asm}/sysreg.h | 0 .../asm-avr32 => arch/avr32/include/asm}/types.h | 0 .../asm-avr32 => arch/avr32/include/asm}/u-boot.h | 0 .../blackfin/include/asm}/bfin_logo_230x230.h | 0 .../blackfin/include/asm}/bitops.h | 0 .../blackfin/include/asm}/blackfin.h | 0 .../blackfin/include/asm}/blackfin_cdef.h | 0 .../blackfin/include/asm}/blackfin_def.h | 0 .../blackfin/include/asm}/blackfin_local.h | 0 .../blackfin/include/asm}/byteorder.h | 0 .../blackfin/include/asm}/config-pre.h | 0 .../blackfin/include/asm}/config.h | 0 .../blackfin/include/asm}/cplb.h | 0 .../blackfin/include/asm}/delay.h | 0 .../blackfin/include/asm}/entry.h | 0 .../blackfin/include/asm}/errno.h | 0 .../blackfin/include/asm}/global_data.h | 0 .../blackfin/include/asm}/io.h | 0 .../blackfin/include/asm}/linkage.h | 0 .../asm}/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h | 0 .../asm}/mach-bf527/ADSP-EDN-BF52x-extended_def.h | 0 .../blackfin/include/asm}/mach-bf527/BF522_cdef.h | 0 .../blackfin/include/asm}/mach-bf527/BF522_def.h | 0 .../blackfin/include/asm}/mach-bf527/BF523_cdef.h | 0 .../blackfin/include/asm}/mach-bf527/BF523_def.h | 0 .../blackfin/include/asm}/mach-bf527/BF524_cdef.h | 0 .../blackfin/include/asm}/mach-bf527/BF524_def.h | 0 .../blackfin/include/asm}/mach-bf527/BF525_cdef.h | 0 .../blackfin/include/asm}/mach-bf527/BF525_def.h | 0 .../blackfin/include/asm}/mach-bf527/BF526_cdef.h | 0 .../blackfin/include/asm}/mach-bf527/BF526_def.h | 0 .../blackfin/include/asm}/mach-bf527/BF527_cdef.h | 0 .../blackfin/include/asm}/mach-bf527/BF527_def.h | 0 .../blackfin/include/asm}/mach-bf527/anomaly.h | 0 .../blackfin/include/asm}/mach-bf527/def_local.h | 0 .../blackfin/include/asm}/mach-bf527/ports.h | 0 .../blackfin/include/asm}/mach-bf533/BF531_cdef.h | 0 .../blackfin/include/asm}/mach-bf533/BF531_def.h | 0 .../blackfin/include/asm}/mach-bf533/BF532_cdef.h | 0 .../blackfin/include/asm}/mach-bf533/BF532_def.h | 0 .../blackfin/include/asm}/mach-bf533/BF533_cdef.h | 0 .../blackfin/include/asm}/mach-bf533/BF533_def.h | 0 .../blackfin/include/asm}/mach-bf533/anomaly.h | 0 .../blackfin/include/asm}/mach-bf533/def_local.h | 0 .../blackfin/include/asm}/mach-bf533/ports.h | 0 .../asm}/mach-bf537/ADSP-EDN-BF534-extended_cdef.h | 0 .../asm}/mach-bf537/ADSP-EDN-BF534-extended_def.h | 0 .../blackfin/include/asm}/mach-bf537/BF534_cdef.h | 0 .../blackfin/include/asm}/mach-bf537/BF534_def.h | 0 .../blackfin/include/asm}/mach-bf537/BF536_cdef.h | 0 .../blackfin/include/asm}/mach-bf537/BF536_def.h | 0 .../blackfin/include/asm}/mach-bf537/BF537_cdef.h | 0 .../blackfin/include/asm}/mach-bf537/BF537_def.h | 0 .../blackfin/include/asm}/mach-bf537/anomaly.h | 0 .../blackfin/include/asm}/mach-bf537/def_local.h | 0 .../blackfin/include/asm}/mach-bf537/ports.h | 0 .../asm}/mach-bf548/ADSP-EDN-BF542-extended_cdef.h | 0 .../asm}/mach-bf548/ADSP-EDN-BF542-extended_def.h | 0 .../asm}/mach-bf548/ADSP-EDN-BF544-extended_cdef.h | 0 .../asm}/mach-bf548/ADSP-EDN-BF544-extended_def.h | 0 .../asm}/mach-bf548/ADSP-EDN-BF547-extended_cdef.h | 0 .../asm}/mach-bf548/ADSP-EDN-BF547-extended_def.h | 0 .../asm}/mach-bf548/ADSP-EDN-BF548-extended_cdef.h | 0 .../asm}/mach-bf548/ADSP-EDN-BF548-extended_def.h | 0 .../asm}/mach-bf548/ADSP-EDN-BF549-extended_cdef.h | 0 .../asm}/mach-bf548/ADSP-EDN-BF549-extended_def.h | 0 .../blackfin/include/asm}/mach-bf548/BF541_cdef.h | 0 .../blackfin/include/asm}/mach-bf548/BF541_def.h | 0 .../blackfin/include/asm}/mach-bf548/BF542_cdef.h | 0 .../blackfin/include/asm}/mach-bf548/BF542_def.h | 0 .../blackfin/include/asm}/mach-bf548/BF544_cdef.h | 0 .../blackfin/include/asm}/mach-bf548/BF544_def.h | 0 .../blackfin/include/asm}/mach-bf548/BF547_cdef.h | 0 .../blackfin/include/asm}/mach-bf548/BF547_def.h | 0 .../blackfin/include/asm}/mach-bf548/BF548_cdef.h | 0 .../blackfin/include/asm}/mach-bf548/BF548_def.h | 0 .../blackfin/include/asm}/mach-bf548/BF549_cdef.h | 0 .../blackfin/include/asm}/mach-bf548/BF549_def.h | 0 .../blackfin/include/asm}/mach-bf548/anomaly.h | 0 .../blackfin/include/asm}/mach-bf548/def_local.h | 0 .../blackfin/include/asm}/mach-bf548/ports.h | 0 .../blackfin/include/asm}/mach-bf561/BF561_cdef.h | 0 .../blackfin/include/asm}/mach-bf561/BF561_def.h | 0 .../blackfin/include/asm}/mach-bf561/anomaly.h | 0 .../blackfin/include/asm}/mach-bf561/def_local.h | 0 .../blackfin/include/asm}/mach-bf561/ports.h | 0 .../mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h | 0 .../mach-common/ADSP-EDN-DUAL-CORE-extended_def.h | 0 .../include/asm}/mach-common/ADSP-EDN-core_cdef.h | 0 .../include/asm}/mach-common/ADSP-EDN-core_def.h | 0 .../asm}/mach-common/ADSP-EDN-extended_cdef.h | 0 .../asm}/mach-common/ADSP-EDN-extended_def.h | 0 .../include/asm}/mach-common/bits/bootrom.h | 0 .../blackfin/include/asm}/mach-common/bits/core.h | 0 .../blackfin/include/asm}/mach-common/bits/dma.h | 0 .../blackfin/include/asm}/mach-common/bits/ebiu.h | 0 .../blackfin/include/asm}/mach-common/bits/emac.h | 0 .../blackfin/include/asm}/mach-common/bits/eppi.h | 0 .../include/asm}/mach-common/bits/lockbox.h | 0 .../blackfin/include/asm}/mach-common/bits/mpu.h | 0 .../blackfin/include/asm}/mach-common/bits/otp.h | 0 .../blackfin/include/asm}/mach-common/bits/pata.h | 0 .../blackfin/include/asm}/mach-common/bits/pll.h | 0 .../include/asm}/mach-common/bits/ports-a.h | 0 .../include/asm}/mach-common/bits/ports-b.h | 0 .../include/asm}/mach-common/bits/ports-c.h | 0 .../include/asm}/mach-common/bits/ports-d.h | 0 .../include/asm}/mach-common/bits/ports-e.h | 0 .../include/asm}/mach-common/bits/ports-f.h | 0 .../include/asm}/mach-common/bits/ports-g.h | 0 .../include/asm}/mach-common/bits/ports-h.h | 0 .../include/asm}/mach-common/bits/ports-i.h | 0 .../include/asm}/mach-common/bits/ports-j.h | 0 .../blackfin/include/asm}/mach-common/bits/ppi.h | 0 .../blackfin/include/asm}/mach-common/bits/rtc.h | 0 .../blackfin/include/asm}/mach-common/bits/sdh.h | 0 .../blackfin/include/asm}/mach-common/bits/spi.h | 0 .../blackfin/include/asm}/mach-common/bits/sport.h | 0 .../blackfin/include/asm}/mach-common/bits/timer.h | 0 .../blackfin/include/asm}/mach-common/bits/trace.h | 0 .../blackfin/include/asm}/mach-common/bits/twi.h | 0 .../blackfin/include/asm}/mach-common/bits/uart.h | 0 .../include/asm}/mach-common/bits/watchdog.h | 0 .../blackfin/include/asm}/mmc.h | 0 .../blackfin/include/asm}/net.h | 0 .../blackfin/include/asm}/posix_types.h | 0 .../blackfin/include/asm}/processor.h | 0 .../blackfin/include/asm}/ptrace.h | 0 .../blackfin/include/asm}/shared_resources.h | 0 .../blackfin/include/asm}/string.h | 0 .../blackfin/include/asm}/system.h | 0 .../blackfin/include/asm}/traps.h | 0 .../blackfin/include/asm}/types.h | 0 .../blackfin/include/asm}/u-boot.h | 0 .../asm-i386 => arch/i386/include/asm}/bitops.h | 0 .../asm-i386 => arch/i386/include/asm}/byteorder.h | 0 .../asm-i386 => arch/i386/include/asm}/config.h | 0 .../asm-i386 => arch/i386/include/asm}/errno.h | 0 .../i386/include/asm}/global_data.h | 0 .../asm-i386 => arch/i386/include/asm}/i8254.h | 0 .../asm-i386 => arch/i386/include/asm}/i8259.h | 0 .../asm-i386 => arch/i386/include/asm}/ibmpc.h | 0 .../asm-i386 => arch/i386/include/asm}/ic/pci.h | 0 .../asm-i386 => arch/i386/include/asm}/ic/sc520.h | 0 .../asm-i386 => arch/i386/include/asm}/ic/ssi.h | 0 .../asm-i386 => arch/i386/include/asm}/interrupt.h | 0 {include/asm-i386 => arch/i386/include/asm}/io.h | 0 {include/asm-i386 => arch/i386/include/asm}/pci.h | 0 .../i386/include/asm}/posix_types.h | 0 .../asm-i386 => arch/i386/include/asm}/processor.h | 0 .../asm-i386 => arch/i386/include/asm}/ptrace.h | 0 .../asm-i386 => arch/i386/include/asm}/realmode.h | 0 .../asm-i386 => arch/i386/include/asm}/string.h | 0 .../asm-i386 => arch/i386/include/asm}/types.h | 0 .../i386/include/asm}/u-boot-i386.h | 0 .../asm-i386 => arch/i386/include/asm}/u-boot.h | 0 .../asm-i386 => arch/i386/include/asm}/zimage.h | 0 .../asm-m68k => arch/m68k/include/asm}/bitops.h | 0 .../asm-m68k => arch/m68k/include/asm}/byteorder.h | 0 .../m68k/include/asm}/coldfire/ata.h | 0 .../m68k/include/asm}/coldfire/crossbar.h | 0 .../m68k/include/asm}/coldfire/dspi.h | 0 .../m68k/include/asm}/coldfire/edma.h | 0 .../m68k/include/asm}/coldfire/eport.h | 0 .../m68k/include/asm}/coldfire/flexbus.h | 0 .../m68k/include/asm}/coldfire/flexcan.h | 0 .../m68k/include/asm}/coldfire/intctrl.h | 0 .../m68k/include/asm}/coldfire/lcd.h | 0 .../m68k/include/asm}/coldfire/mdha.h | 0 .../m68k/include/asm}/coldfire/pwm.h | 0 .../m68k/include/asm}/coldfire/qspi.h | 0 .../m68k/include/asm}/coldfire/rng.h | 0 .../m68k/include/asm}/coldfire/skha.h | 0 .../m68k/include/asm}/coldfire/ssi.h | 0 .../asm-m68k => arch/m68k/include/asm}/config.h | 0 .../asm-m68k => arch/m68k/include/asm}/errno.h | 0 {include/asm-m68k => arch/m68k/include/asm}/fec.h | 0 .../asm-m68k => arch/m68k/include/asm}/fsl_i2c.h | 0 .../m68k/include/asm}/fsl_mcdmafec.h | 0 .../m68k/include/asm}/global_data.h | 0 .../asm-m68k => arch/m68k/include/asm}/immap.h | 0 .../m68k/include/asm}/immap_520x.h | 0 .../m68k/include/asm}/immap_5227x.h | 0 .../m68k/include/asm}/immap_5235.h | 0 .../m68k/include/asm}/immap_5249.h | 0 .../m68k/include/asm}/immap_5253.h | 0 .../m68k/include/asm}/immap_5271.h | 0 .../m68k/include/asm}/immap_5272.h | 0 .../m68k/include/asm}/immap_5275.h | 0 .../m68k/include/asm}/immap_5282.h | 0 .../m68k/include/asm}/immap_5301x.h | 0 .../m68k/include/asm}/immap_5329.h | 0 .../m68k/include/asm}/immap_5445x.h | 0 .../m68k/include/asm}/immap_547x_8x.h | 0 {include/asm-m68k => arch/m68k/include/asm}/io.h | 0 .../asm-m68k => arch/m68k/include/asm}/m520x.h | 0 .../asm-m68k => arch/m68k/include/asm}/m5227x.h | 0 .../asm-m68k => arch/m68k/include/asm}/m5235.h | 0 .../asm-m68k => arch/m68k/include/asm}/m5249.h | 0 .../asm-m68k => arch/m68k/include/asm}/m5253.h | 0 .../asm-m68k => arch/m68k/include/asm}/m5271.h | 0 .../asm-m68k => arch/m68k/include/asm}/m5272.h | 0 .../asm-m68k => arch/m68k/include/asm}/m5275.h | 0 .../asm-m68k => arch/m68k/include/asm}/m5282.h | 0 .../asm-m68k => arch/m68k/include/asm}/m5301x.h | 0 .../asm-m68k => arch/m68k/include/asm}/m5329.h | 0 .../asm-m68k => arch/m68k/include/asm}/m5445x.h | 0 .../asm-m68k => arch/m68k/include/asm}/m547x_8x.h | 0 .../m68k/include/asm}/posix_types.h | 0 .../asm-m68k => arch/m68k/include/asm}/processor.h | 0 .../asm-m68k => arch/m68k/include/asm}/ptrace.h | 0 {include/asm-m68k => arch/m68k/include/asm}/rtc.h | 0 .../asm-m68k => arch/m68k/include/asm}/string.h | 0 .../asm-m68k => arch/m68k/include/asm}/timer.h | 0 .../asm-m68k => arch/m68k/include/asm}/types.h | 0 .../asm-m68k => arch/m68k/include/asm}/u-boot.h | 0 {include/asm-m68k => arch/m68k/include/asm}/uart.h | 0 .../microblaze/include/asm}/asm.h | 0 .../microblaze/include/asm}/bitops.h | 0 .../microblaze/include/asm}/byteorder.h | 0 .../microblaze/include/asm}/config.h | 0 .../microblaze/include/asm}/errno.h | 0 .../microblaze/include/asm}/global_data.h | 0 .../microblaze/include/asm}/io.h | 0 .../microblaze/include/asm}/microblaze_intc.h | 0 .../microblaze/include/asm}/microblaze_timer.h | 0 .../microblaze/include/asm}/posix_types.h | 0 .../microblaze/include/asm}/processor.h | 0 .../microblaze/include/asm}/ptrace.h | 0 .../microblaze/include/asm}/string.h | 0 .../microblaze/include/asm}/system.h | 0 .../microblaze/include/asm}/types.h | 0 .../microblaze/include/asm}/u-boot.h | 0 .../asm-mips => arch/mips/include/asm}/addrspace.h | 0 {include/asm-mips => arch/mips/include/asm}/asm.h | 0 .../asm-mips => arch/mips/include/asm}/au1x00.h | 0 .../asm-mips => arch/mips/include/asm}/bitops.h | 0 .../asm-mips => arch/mips/include/asm}/byteorder.h | 0 .../asm-mips => arch/mips/include/asm}/cachectl.h | 0 .../asm-mips => arch/mips/include/asm}/cacheops.h | 0 .../asm-mips => arch/mips/include/asm}/config.h | 0 .../asm-mips => arch/mips/include/asm}/errno.h | 0 .../mips/include/asm}/global_data.h | 0 .../asm-mips => arch/mips/include/asm}/inca-ip.h | 0 {include/asm-mips => arch/mips/include/asm}/io.h | 0 .../asm-mips => arch/mips/include/asm}/isadep.h | 0 .../asm-mips => arch/mips/include/asm}/mipsregs.h | 0 .../mips/include/asm}/posix_types.h | 0 .../asm-mips => arch/mips/include/asm}/processor.h | 0 .../asm-mips => arch/mips/include/asm}/ptrace.h | 0 .../asm-mips => arch/mips/include/asm}/reboot.h | 0 {include/asm-mips => arch/mips/include/asm}/reg.h | 0 .../asm-mips => arch/mips/include/asm}/regdef.h | 0 .../asm-mips => arch/mips/include/asm}/sgidefs.h | 0 .../asm-mips => arch/mips/include/asm}/string.h | 0 .../asm-mips => arch/mips/include/asm}/system.h | 0 .../asm-mips => arch/mips/include/asm}/types.h | 0 .../asm-mips => arch/mips/include/asm}/u-boot.h | 0 .../asm-nios => arch/nios/include/asm}/bitops.h | 0 .../asm-nios => arch/nios/include/asm}/byteorder.h | 0 .../asm-nios => arch/nios/include/asm}/cache.h | 0 .../asm-nios => arch/nios/include/asm}/config.h | 0 .../nios/include/asm}/global_data.h | 0 {include/asm-nios => arch/nios/include/asm}/io.h | 0 .../nios/include/asm}/posix_types.h | 0 .../asm-nios => arch/nios/include/asm}/processor.h | 0 {include/asm-nios => arch/nios/include/asm}/psr.h | 0 .../asm-nios => arch/nios/include/asm}/ptrace.h | 0 .../nios/include/asm}/status_led.h | 0 .../asm-nios => arch/nios/include/asm}/string.h | 0 .../asm-nios => arch/nios/include/asm}/system.h | 0 .../asm-nios => arch/nios/include/asm}/types.h | 0 .../asm-nios => arch/nios/include/asm}/u-boot.h | 0 .../asm-nios2 => arch/nios2/include/asm}/bitops.h | 0 .../nios2/include/asm}/byteorder.h | 0 .../asm-nios2 => arch/nios2/include/asm}/cache.h | 0 .../asm-nios2 => arch/nios2/include/asm}/config.h | 0 .../nios2/include/asm}/global_data.h | 0 {include/asm-nios2 => arch/nios2/include/asm}/io.h | 0 .../asm-nios2 => arch/nios2/include/asm}/opcodes.h | 0 .../nios2/include/asm}/posix_types.h | 0 .../nios2/include/asm}/processor.h | 0 .../asm-nios2 => arch/nios2/include/asm}/psr.h | 0 .../asm-nios2 => arch/nios2/include/asm}/ptrace.h | 0 .../nios2/include/asm}/status_led.h | 0 .../asm-nios2 => arch/nios2/include/asm}/string.h | 0 .../asm-nios2 => arch/nios2/include/asm}/system.h | 0 .../asm-nios2 => arch/nios2/include/asm}/types.h | 0 .../asm-nios2 => arch/nios2/include/asm}/u-boot.h | 0 .../asm-ppc => arch/ppc/include/asm}/4xx_pci.h | 0 .../asm-ppc => arch/ppc/include/asm}/4xx_pcie.h | 0 .../asm-ppc => arch/ppc/include/asm}/5xx_immap.h | 0 .../asm-ppc => arch/ppc/include/asm}/8xx_immap.h | 0 {include/asm-ppc => arch/ppc/include/asm}/atomic.h | 0 {include/asm-ppc => arch/ppc/include/asm}/bitops.h | 0 .../asm-ppc => arch/ppc/include/asm}/byteorder.h | 0 {include/asm-ppc => arch/ppc/include/asm}/cache.h | 0 {include/asm-ppc => arch/ppc/include/asm}/config.h | 0 .../asm-ppc => arch/ppc/include/asm}/cpm_8260.h | 0 .../asm-ppc => arch/ppc/include/asm}/cpm_85xx.h | 0 {include/asm-ppc => arch/ppc/include/asm}/e300.h | 0 {include/asm-ppc => arch/ppc/include/asm}/errno.h | 0 .../ppc/include/asm}/fsl_ddr_dimm_params.h | 0 .../ppc/include/asm}/fsl_ddr_sdram.h | 0 .../asm-ppc => arch/ppc/include/asm}/fsl_dma.h | 0 .../asm-ppc => arch/ppc/include/asm}/fsl_i2c.h | 0 .../asm-ppc => arch/ppc/include/asm}/fsl_law.h | 0 .../asm-ppc => arch/ppc/include/asm}/fsl_lbc.h | 0 .../asm-ppc => arch/ppc/include/asm}/fsl_pci.h | 0 .../asm-ppc => arch/ppc/include/asm}/fsl_serdes.h | 0 .../asm-ppc => arch/ppc/include/asm}/global_data.h | 0 {include/asm-ppc => arch/ppc/include/asm}/gpio.h | 0 .../asm-ppc => arch/ppc/include/asm}/immap_512x.h | 0 .../asm-ppc => arch/ppc/include/asm}/immap_8220.h | 0 .../asm-ppc => arch/ppc/include/asm}/immap_8260.h | 0 .../asm-ppc => arch/ppc/include/asm}/immap_83xx.h | 0 .../asm-ppc => arch/ppc/include/asm}/immap_85xx.h | 0 .../asm-ppc => arch/ppc/include/asm}/immap_86xx.h | 0 .../asm-ppc => arch/ppc/include/asm}/immap_qe.h | 0 .../asm-ppc => arch/ppc/include/asm}/interrupt.h | 0 {include/asm-ppc => arch/ppc/include/asm}/io.h | 0 .../asm-ppc => arch/ppc/include/asm}/iopin_8260.h | 0 .../asm-ppc => arch/ppc/include/asm}/iopin_85xx.h | 0 .../asm-ppc => arch/ppc/include/asm}/iopin_8xx.h | 0 .../asm-ppc => arch/ppc/include/asm}/m8260_pci.h | 0 .../asm-ppc => arch/ppc/include/asm}/mc146818rtc.h | 0 {include/asm-ppc => arch/ppc/include/asm}/mmu.h | 0 {include/asm-ppc => arch/ppc/include/asm}/mp.h | 0 .../asm-ppc => arch/ppc/include/asm}/mpc512x.h | 0 .../asm-ppc => arch/ppc/include/asm}/mpc8349_pci.h | 0 .../asm-ppc => arch/ppc/include/asm}/mpc8xxx_spi.h | 0 {include/asm-ppc => arch/ppc/include/asm}/pci_io.h | 0 {include/asm-ppc => arch/ppc/include/asm}/pnp.h | 0 .../asm-ppc => arch/ppc/include/asm}/posix_types.h | 0 .../asm-ppc => arch/ppc/include/asm}/ppc4xx-ebc.h | 0 .../ppc/include/asm}/ppc4xx-isram.h | 0 .../ppc/include/asm}/ppc4xx-sdram.h | 0 .../asm-ppc => arch/ppc/include/asm}/ppc4xx-uic.h | 0 .../ppc/include/asm}/ppc4xx_config.h | 0 .../asm-ppc => arch/ppc/include/asm}/processor.h | 0 {include/asm-ppc => arch/ppc/include/asm}/ptrace.h | 0 .../asm-ppc => arch/ppc/include/asm}/residual.h | 0 .../asm-ppc => arch/ppc/include/asm}/sigcontext.h | 0 {include/asm-ppc => arch/ppc/include/asm}/signal.h | 0 .../asm-ppc => arch/ppc/include/asm}/status_led.h | 0 {include/asm-ppc => arch/ppc/include/asm}/string.h | 0 {include/asm-ppc => arch/ppc/include/asm}/types.h | 0 {include/asm-ppc => arch/ppc/include/asm}/u-boot.h | 0 .../asm-ppc => arch/ppc/include/asm}/unaligned.h | 0 .../asm-ppc => arch/ppc/include/asm}/xilinx_irq.h | 0 {include/asm-sh => arch/sh/include/asm}/bitops.h | 0 .../asm-sh => arch/sh/include/asm}/byteorder.h | 0 {include/asm-sh => arch/sh/include/asm}/cache.h | 0 {include/asm-sh => arch/sh/include/asm}/clk.h | 0 {include/asm-sh => arch/sh/include/asm}/config.h | 0 {include/asm-sh => arch/sh/include/asm}/cpu_sh2.h | 0 {include/asm-sh => arch/sh/include/asm}/cpu_sh3.h | 0 {include/asm-sh => arch/sh/include/asm}/cpu_sh4.h | 0 .../asm-sh => arch/sh/include/asm}/cpu_sh7203.h | 0 .../asm-sh => arch/sh/include/asm}/cpu_sh7710.h | 0 .../asm-sh => arch/sh/include/asm}/cpu_sh7720.h | 0 .../asm-sh => arch/sh/include/asm}/cpu_sh7722.h | 0 .../asm-sh => arch/sh/include/asm}/cpu_sh7723.h | 0 .../asm-sh => arch/sh/include/asm}/cpu_sh7750.h | 0 .../asm-sh => arch/sh/include/asm}/cpu_sh7763.h | 0 .../asm-sh => arch/sh/include/asm}/cpu_sh7780.h | 0 .../asm-sh => arch/sh/include/asm}/cpu_sh7785.h | 0 {include/asm-sh => arch/sh/include/asm}/errno.h | 0 .../asm-sh => arch/sh/include/asm}/global_data.h | 0 {include/asm-sh => arch/sh/include/asm}/io.h | 0 {include/asm-sh => arch/sh/include/asm}/irqflags.h | 0 {include/asm-sh => arch/sh/include/asm}/macro.h | 0 {include/asm-sh => arch/sh/include/asm}/pci.h | 0 .../asm-sh => arch/sh/include/asm}/posix_types.h | 0 .../asm-sh => arch/sh/include/asm}/processor.h | 0 {include/asm-sh => arch/sh/include/asm}/ptrace.h | 0 {include/asm-sh => arch/sh/include/asm}/string.h | 0 {include/asm-sh => arch/sh/include/asm}/system.h | 0 {include/asm-sh => arch/sh/include/asm}/types.h | 0 {include/asm-sh => arch/sh/include/asm}/u-boot.h | 0 .../sparc/include/asm}/arch-leon2/asi.h | 0 .../sparc/include/asm}/arch-leon3/asi.h | 0 .../asm-sparc => arch/sparc/include/asm}/asi.h | 0 .../sparc/include/asm}/asmmacro.h | 0 .../asm-sparc => arch/sparc/include/asm}/atomic.h | 0 .../asm-sparc => arch/sparc/include/asm}/bitops.h | 0 .../sparc/include/asm}/byteorder.h | 0 .../asm-sparc => arch/sparc/include/asm}/cache.h | 0 .../asm-sparc => arch/sparc/include/asm}/config.h | 0 .../asm-sparc => arch/sparc/include/asm}/errno.h | 0 .../sparc/include/asm}/global_data.h | 0 {include/asm-sparc => arch/sparc/include/asm}/io.h | 0 .../asm-sparc => arch/sparc/include/asm}/irq.h | 0 .../asm-sparc => arch/sparc/include/asm}/leon.h | 0 .../asm-sparc => arch/sparc/include/asm}/leon2.h | 0 .../asm-sparc => arch/sparc/include/asm}/leon3.h | 0 .../sparc/include/asm}/machines.h | 0 .../asm-sparc => arch/sparc/include/asm}/page.h | 0 .../sparc/include/asm}/posix_types.h | 0 .../sparc/include/asm}/processor.h | 0 .../asm-sparc => arch/sparc/include/asm}/prom.h | 0 .../asm-sparc => arch/sparc/include/asm}/psr.h | 0 .../asm-sparc => arch/sparc/include/asm}/ptrace.h | 0 .../asm-sparc => arch/sparc/include/asm}/srmmu.h | 0 .../asm-sparc => arch/sparc/include/asm}/stack.h | 0 .../asm-sparc => arch/sparc/include/asm}/string.h | 0 .../asm-sparc => arch/sparc/include/asm}/types.h | 0 .../asm-sparc => arch/sparc/include/asm}/u-boot.h | 0 .../sparc/include/asm}/winmacro.h | 0 include/.gitignore | 2 -- mkconfig | 19 ++++++++----------- 582 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 arch/.gitignore rename {include/asm-arm => arch/arm/include/asm}/arch-a320/a320.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-a320/ftpmu010.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-a320/ftsdmc020.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-a320/ftsmc020.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-a320/fttmr010.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_dma_module.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_eni_module.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_eth_module.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_gen_module.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_mem_module.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_registers.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_ser_module.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm925t/sizes.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm926ejs/sizes.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_common.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_pio.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_pit.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_pmc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_rstc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_spi.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_wdt.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91cap9.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91cap9_matrix.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9260.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9260_matrix.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9261.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9261_matrix.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9263.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9263_matrix.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9_matrix.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9_sdramc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9_smc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9g45.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9g45_matrix.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9rl.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9rl_matrix.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/clk.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/gpio.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/io.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/memory-map.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91rm9200/AT91RM9200.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91rm9200/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/emac_defs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/emif_defs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/gpio_defs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/i2c_defs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/nand_defs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-imx/imx-regs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-ixp/ixp425.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-ixp/ixp425pci.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/cpu.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/gpio.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/kirkwood.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/kw88f6192.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/kw88f6281.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/mpp.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/spi.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-ks8695/platform.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-lpc2292/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-lpc2292/lpc2292_registers.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-lpc2292/spi.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx27/asm-offsets.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx27/clock.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx27/imx-regs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx27/mxcmmc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx31/mx31-regs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx31/mx31.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-nomadik/gpio.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-nomadik/mtu.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap/sizes.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/bits.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/clocks.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/i2c.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/mem.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/mux.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/omap2420.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/sizes.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/sys_info.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/sys_proto.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/clocks.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/clocks_omap3.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/cpu.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/gpio.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/i2c.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/mem.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/mmc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/mmc_host_def.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/mux.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/omap3.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/omap_gpmc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/sys_proto.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-pxa/bitfield.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-pxa/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-pxa/pxa-regs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c24x0/memory.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c24x0/s3c2400.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c24x0/s3c2410.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c24x0/s3c24x0.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c24x0/s3c24x0_cpu.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c44b0/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c4510b/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c64xx/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c64xx/s3c6400.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c64xx/s3c64x0.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/clk.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/clock.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/cpu.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/gpio.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/power.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/pwm.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/uart.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-sa1100/bitfield.h (100%) rename {include/asm-arm => arch/arm/include/asm}/atomic.h (100%) rename {include/asm-arm => arch/arm/include/asm}/bitops.h (100%) rename {include/asm-arm => arch/arm/include/asm}/byteorder.h (100%) rename {include/asm-arm => arch/arm/include/asm}/cache.h (100%) rename {include/asm-arm => arch/arm/include/asm}/config.h (100%) rename {include/asm-arm => arch/arm/include/asm}/dma-mapping.h (100%) rename {include/asm-arm => arch/arm/include/asm}/errno.h (100%) rename {include/asm-arm => arch/arm/include/asm}/global_data.h (100%) rename {include/asm-arm => arch/arm/include/asm}/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/io.h (100%) rename {include/asm-arm => arch/arm/include/asm}/mach-types.h (100%) rename {include/asm-arm => arch/arm/include/asm}/macro.h (100%) rename {include/asm-arm => arch/arm/include/asm}/memory.h (100%) rename {include/asm-arm => arch/arm/include/asm}/posix_types.h (100%) rename {include/asm-arm => arch/arm/include/asm}/proc-armv/domain.h (100%) rename {include/asm-arm => arch/arm/include/asm}/proc-armv/processor.h (100%) rename {include/asm-arm => arch/arm/include/asm}/proc-armv/ptrace.h (100%) rename {include/asm-arm => arch/arm/include/asm}/proc-armv/system.h (100%) rename {include/asm-arm => arch/arm/include/asm}/processor.h (100%) rename {include/asm-arm => arch/arm/include/asm}/ptrace.h (100%) rename {include/asm-arm => arch/arm/include/asm}/setup.h (100%) rename {include/asm-arm => arch/arm/include/asm}/sizes.h (100%) rename {include/asm-arm => arch/arm/include/asm}/string.h (100%) rename {include/asm-arm => arch/arm/include/asm}/system.h (100%) rename {include/asm-arm => arch/arm/include/asm}/types.h (100%) rename {include/asm-arm => arch/arm/include/asm}/u-boot-arm.h (100%) rename {include/asm-arm => arch/arm/include/asm}/u-boot.h (100%) rename {include/asm-arm => arch/arm/include/asm}/unaligned.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/addrspace.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/cacheflush.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/chip-features.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/clk.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/gpio-impl.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/gpio.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/hmatrix.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/memory-map.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/portmux.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-common/portmux-gpio.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-common/portmux-pio.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/bitops.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/byteorder.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/config.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/dma-mapping.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/errno.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/global_data.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/hmatrix-common.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/initcalls.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/io.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/posix_types.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/processor.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/ptrace.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/sdram.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/sections.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/setup.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/string.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/sysreg.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/types.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/u-boot.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/bfin_logo_230x230.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/bitops.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/blackfin.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/blackfin_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/blackfin_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/blackfin_local.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/byteorder.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/config-pre.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/config.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/cplb.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/delay.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/entry.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/errno.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/global_data.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/io.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/linkage.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/ADSP-EDN-BF52x-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF522_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF522_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF523_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF523_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF524_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF524_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF525_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF525_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF526_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF526_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF527_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF527_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/anomaly.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/def_local.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/ports.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF531_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF531_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF532_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF532_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF533_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF533_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/anomaly.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/def_local.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/ports.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/ADSP-EDN-BF534-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/ADSP-EDN-BF534-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF534_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF534_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF536_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF536_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF537_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF537_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/anomaly.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/def_local.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/ports.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF542-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF542-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF544-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF544-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF547-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF547-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF548-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF548-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF549-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF549-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF541_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF541_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF542_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF542_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF544_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF544_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF547_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF547_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF548_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF548_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF549_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF549_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/anomaly.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/def_local.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ports.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf561/BF561_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf561/BF561_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf561/anomaly.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf561/def_local.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf561/ports.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-core_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-core_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/bootrom.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/core.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/dma.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ebiu.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/emac.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/eppi.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/lockbox.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/mpu.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/otp.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/pata.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/pll.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-a.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-b.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-c.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-d.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-e.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-f.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-g.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-h.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-i.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-j.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ppi.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/rtc.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/sdh.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/spi.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/sport.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/timer.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/trace.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/twi.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/uart.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/watchdog.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mmc.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/net.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/posix_types.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/processor.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/ptrace.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/shared_resources.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/string.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/system.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/traps.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/types.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/u-boot.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/bitops.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/byteorder.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/config.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/errno.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/global_data.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/i8254.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/i8259.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/ibmpc.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/ic/pci.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/ic/sc520.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/ic/ssi.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/interrupt.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/io.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/pci.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/posix_types.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/processor.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/ptrace.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/realmode.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/string.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/types.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/u-boot-i386.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/u-boot.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/zimage.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/bitops.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/byteorder.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/ata.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/crossbar.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/dspi.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/edma.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/eport.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/flexbus.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/flexcan.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/intctrl.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/lcd.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/mdha.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/pwm.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/qspi.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/rng.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/skha.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/ssi.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/config.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/errno.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/fec.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/fsl_i2c.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/fsl_mcdmafec.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/global_data.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_520x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5227x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5235.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5249.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5253.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5271.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5272.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5275.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5282.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5301x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5329.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5445x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_547x_8x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/io.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m520x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5227x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5235.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5249.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5253.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5271.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5272.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5275.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5282.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5301x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5329.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5445x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m547x_8x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/posix_types.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/processor.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/ptrace.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/rtc.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/string.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/timer.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/types.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/u-boot.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/uart.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/asm.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/bitops.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/byteorder.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/config.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/errno.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/global_data.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/io.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/microblaze_intc.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/microblaze_timer.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/posix_types.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/processor.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/ptrace.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/string.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/system.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/types.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/u-boot.h (100%) rename {include/asm-mips => arch/mips/include/asm}/addrspace.h (100%) rename {include/asm-mips => arch/mips/include/asm}/asm.h (100%) rename {include/asm-mips => arch/mips/include/asm}/au1x00.h (100%) rename {include/asm-mips => arch/mips/include/asm}/bitops.h (100%) rename {include/asm-mips => arch/mips/include/asm}/byteorder.h (100%) rename {include/asm-mips => arch/mips/include/asm}/cachectl.h (100%) rename {include/asm-mips => arch/mips/include/asm}/cacheops.h (100%) rename {include/asm-mips => arch/mips/include/asm}/config.h (100%) rename {include/asm-mips => arch/mips/include/asm}/errno.h (100%) rename {include/asm-mips => arch/mips/include/asm}/global_data.h (100%) rename {include/asm-mips => arch/mips/include/asm}/inca-ip.h (100%) rename {include/asm-mips => arch/mips/include/asm}/io.h (100%) rename {include/asm-mips => arch/mips/include/asm}/isadep.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mipsregs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/posix_types.h (100%) rename {include/asm-mips => arch/mips/include/asm}/processor.h (100%) rename {include/asm-mips => arch/mips/include/asm}/ptrace.h (100%) rename {include/asm-mips => arch/mips/include/asm}/reboot.h (100%) rename {include/asm-mips => arch/mips/include/asm}/reg.h (100%) rename {include/asm-mips => arch/mips/include/asm}/regdef.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sgidefs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/string.h (100%) rename {include/asm-mips => arch/mips/include/asm}/system.h (100%) rename {include/asm-mips => arch/mips/include/asm}/types.h (100%) rename {include/asm-mips => arch/mips/include/asm}/u-boot.h (100%) rename {include/asm-nios => arch/nios/include/asm}/bitops.h (100%) rename {include/asm-nios => arch/nios/include/asm}/byteorder.h (100%) rename {include/asm-nios => arch/nios/include/asm}/cache.h (100%) rename {include/asm-nios => arch/nios/include/asm}/config.h (100%) rename {include/asm-nios => arch/nios/include/asm}/global_data.h (100%) rename {include/asm-nios => arch/nios/include/asm}/io.h (100%) rename {include/asm-nios => arch/nios/include/asm}/posix_types.h (100%) rename {include/asm-nios => arch/nios/include/asm}/processor.h (100%) rename {include/asm-nios => arch/nios/include/asm}/psr.h (100%) rename {include/asm-nios => arch/nios/include/asm}/ptrace.h (100%) rename {include/asm-nios => arch/nios/include/asm}/status_led.h (100%) rename {include/asm-nios => arch/nios/include/asm}/string.h (100%) rename {include/asm-nios => arch/nios/include/asm}/system.h (100%) rename {include/asm-nios => arch/nios/include/asm}/types.h (100%) rename {include/asm-nios => arch/nios/include/asm}/u-boot.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/bitops.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/byteorder.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/cache.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/config.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/global_data.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/io.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/opcodes.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/posix_types.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/processor.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/psr.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/ptrace.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/status_led.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/string.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/system.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/types.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/u-boot.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/4xx_pci.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/4xx_pcie.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/5xx_immap.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/8xx_immap.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/atomic.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/bitops.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/byteorder.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/cache.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/config.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/cpm_8260.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/cpm_85xx.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/e300.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/errno.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/fsl_ddr_dimm_params.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/fsl_ddr_sdram.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/fsl_dma.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/fsl_i2c.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/fsl_law.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/fsl_lbc.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/fsl_pci.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/fsl_serdes.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/global_data.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/gpio.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/immap_512x.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/immap_8220.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/immap_8260.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/immap_83xx.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/immap_85xx.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/immap_86xx.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/immap_qe.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/interrupt.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/io.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/iopin_8260.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/iopin_85xx.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/iopin_8xx.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/m8260_pci.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/mc146818rtc.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/mmu.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/mp.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/mpc512x.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/mpc8349_pci.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/mpc8xxx_spi.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/pci_io.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/pnp.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/posix_types.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/ppc4xx-ebc.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/ppc4xx-isram.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/ppc4xx-sdram.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/ppc4xx-uic.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/ppc4xx_config.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/processor.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/ptrace.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/residual.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/sigcontext.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/signal.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/status_led.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/string.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/types.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/u-boot.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/unaligned.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/xilinx_irq.h (100%) rename {include/asm-sh => arch/sh/include/asm}/bitops.h (100%) rename {include/asm-sh => arch/sh/include/asm}/byteorder.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cache.h (100%) rename {include/asm-sh => arch/sh/include/asm}/clk.h (100%) rename {include/asm-sh => arch/sh/include/asm}/config.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh2.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh3.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh4.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7203.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7710.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7720.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7722.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7723.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7750.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7763.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7780.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7785.h (100%) rename {include/asm-sh => arch/sh/include/asm}/errno.h (100%) rename {include/asm-sh => arch/sh/include/asm}/global_data.h (100%) rename {include/asm-sh => arch/sh/include/asm}/io.h (100%) rename {include/asm-sh => arch/sh/include/asm}/irqflags.h (100%) rename {include/asm-sh => arch/sh/include/asm}/macro.h (100%) rename {include/asm-sh => arch/sh/include/asm}/pci.h (100%) rename {include/asm-sh => arch/sh/include/asm}/posix_types.h (100%) rename {include/asm-sh => arch/sh/include/asm}/processor.h (100%) rename {include/asm-sh => arch/sh/include/asm}/ptrace.h (100%) rename {include/asm-sh => arch/sh/include/asm}/string.h (100%) rename {include/asm-sh => arch/sh/include/asm}/system.h (100%) rename {include/asm-sh => arch/sh/include/asm}/types.h (100%) rename {include/asm-sh => arch/sh/include/asm}/u-boot.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/arch-leon2/asi.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/arch-leon3/asi.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/asi.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/asmmacro.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/atomic.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/bitops.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/byteorder.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/cache.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/config.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/errno.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/global_data.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/io.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/irq.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/leon.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/leon2.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/leon3.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/machines.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/page.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/posix_types.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/processor.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/prom.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/psr.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/ptrace.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/srmmu.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/stack.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/string.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/types.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/u-boot.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/winmacro.h (100%)

diff --git a/arch/.gitignore b/arch/.gitignore new file mode 100644 index 0000000..e05b593 --- /dev/null +++ b/arch/.gitignore @@ -0,0 +1,2 @@ +*/include/asm/arch +*/include/asm/proc diff --git a/include/asm-arm/arch-a320/a320.h b/arch/arm/include/asm/arch-a320/a320.h similarity index 100% rename from include/asm-arm/arch-a320/a320.h rename to arch/arm/include/asm/arch-a320/a320.h diff --git a/include/asm-arm/arch-a320/ftpmu010.h b/arch/arm/include/asm/arch-a320/ftpmu010.h similarity index 100% rename from include/asm-arm/arch-a320/ftpmu010.h rename to arch/arm/include/asm/arch-a320/ftpmu010.h diff --git a/include/asm-arm/arch-a320/ftsdmc020.h b/arch/arm/include/asm/arch-a320/ftsdmc020.h similarity index 100% rename from include/asm-arm/arch-a320/ftsdmc020.h rename to arch/arm/include/asm/arch-a320/ftsdmc020.h diff --git a/include/asm-arm/arch-a320/ftsmc020.h b/arch/arm/include/asm/arch-a320/ftsmc020.h similarity index 100% rename from include/asm-arm/arch-a320/ftsmc020.h rename to arch/arm/include/asm/arch-a320/ftsmc020.h diff --git a/include/asm-arm/arch-a320/fttmr010.h b/arch/arm/include/asm/arch-a320/fttmr010.h similarity index 100% rename from include/asm-arm/arch-a320/fttmr010.h rename to arch/arm/include/asm/arch-a320/fttmr010.h diff --git a/include/asm-arm/arch-arm720t/hardware.h b/arch/arm/include/asm/arch-arm720t/hardware.h similarity index 100% rename from include/asm-arm/arch-arm720t/hardware.h rename to arch/arm/include/asm/arch-arm720t/hardware.h diff --git a/include/asm-arm/arch-arm720t/netarm_dma_module.h b/arch/arm/include/asm/arch-arm720t/netarm_dma_module.h similarity index 100% rename from include/asm-arm/arch-arm720t/netarm_dma_module.h rename to arch/arm/include/asm/arch-arm720t/netarm_dma_module.h diff --git a/include/asm-arm/arch-arm720t/netarm_eni_module.h b/arch/arm/include/asm/arch-arm720t/netarm_eni_module.h similarity index 100% rename from include/asm-arm/arch-arm720t/netarm_eni_module.h rename to arch/arm/include/asm/arch-arm720t/netarm_eni_module.h diff --git a/include/asm-arm/arch-arm720t/netarm_eth_module.h b/arch/arm/include/asm/arch-arm720t/netarm_eth_module.h similarity index 100% rename from include/asm-arm/arch-arm720t/netarm_eth_module.h rename to arch/arm/include/asm/arch-arm720t/netarm_eth_module.h diff --git a/include/asm-arm/arch-arm720t/netarm_gen_module.h b/arch/arm/include/asm/arch-arm720t/netarm_gen_module.h similarity index 100% rename from include/asm-arm/arch-arm720t/netarm_gen_module.h rename to arch/arm/include/asm/arch-arm720t/netarm_gen_module.h diff --git a/include/asm-arm/arch-arm720t/netarm_mem_module.h b/arch/arm/include/asm/arch-arm720t/netarm_mem_module.h similarity index 100% rename from include/asm-arm/arch-arm720t/netarm_mem_module.h rename to arch/arm/include/asm/arch-arm720t/netarm_mem_module.h diff --git a/include/asm-arm/arch-arm720t/netarm_registers.h b/arch/arm/include/asm/arch-arm720t/netarm_registers.h similarity index 100% rename from include/asm-arm/arch-arm720t/netarm_registers.h rename to arch/arm/include/asm/arch-arm720t/netarm_registers.h diff --git a/include/asm-arm/arch-arm720t/netarm_ser_module.h b/arch/arm/include/asm/arch-arm720t/netarm_ser_module.h similarity index 100% rename from include/asm-arm/arch-arm720t/netarm_ser_module.h rename to arch/arm/include/asm/arch-arm720t/netarm_ser_module.h diff --git a/include/asm-arm/arch-arm925t/sizes.h b/arch/arm/include/asm/arch-arm925t/sizes.h similarity index 100% rename from include/asm-arm/arch-arm925t/sizes.h rename to arch/arm/include/asm/arch-arm925t/sizes.h diff --git a/include/asm-arm/arch-arm926ejs/sizes.h b/arch/arm/include/asm/arch-arm926ejs/sizes.h similarity index 100% rename from include/asm-arm/arch-arm926ejs/sizes.h rename to arch/arm/include/asm/arch-arm926ejs/sizes.h diff --git a/include/asm-arm/arch-at91/at91_common.h b/arch/arm/include/asm/arch-at91/at91_common.h similarity index 100% rename from include/asm-arm/arch-at91/at91_common.h rename to arch/arm/include/asm/arch-at91/at91_common.h diff --git a/include/asm-arm/arch-at91/at91_pio.h b/arch/arm/include/asm/arch-at91/at91_pio.h similarity index 100% rename from include/asm-arm/arch-at91/at91_pio.h rename to arch/arm/include/asm/arch-at91/at91_pio.h diff --git a/include/asm-arm/arch-at91/at91_pit.h b/arch/arm/include/asm/arch-at91/at91_pit.h similarity index 100% rename from include/asm-arm/arch-at91/at91_pit.h rename to arch/arm/include/asm/arch-at91/at91_pit.h diff --git a/include/asm-arm/arch-at91/at91_pmc.h b/arch/arm/include/asm/arch-at91/at91_pmc.h similarity index 100% rename from include/asm-arm/arch-at91/at91_pmc.h rename to arch/arm/include/asm/arch-at91/at91_pmc.h diff --git a/include/asm-arm/arch-at91/at91_rstc.h b/arch/arm/include/asm/arch-at91/at91_rstc.h similarity index 100% rename from include/asm-arm/arch-at91/at91_rstc.h rename to arch/arm/include/asm/arch-at91/at91_rstc.h diff --git a/include/asm-arm/arch-at91/at91_spi.h b/arch/arm/include/asm/arch-at91/at91_spi.h similarity index 100% rename from include/asm-arm/arch-at91/at91_spi.h rename to arch/arm/include/asm/arch-at91/at91_spi.h diff --git a/include/asm-arm/arch-at91/at91_wdt.h b/arch/arm/include/asm/arch-at91/at91_wdt.h similarity index 100% rename from include/asm-arm/arch-at91/at91_wdt.h rename to arch/arm/include/asm/arch-at91/at91_wdt.h diff --git a/include/asm-arm/arch-at91/at91cap9.h b/arch/arm/include/asm/arch-at91/at91cap9.h similarity index 100% rename from include/asm-arm/arch-at91/at91cap9.h rename to arch/arm/include/asm/arch-at91/at91cap9.h diff --git a/include/asm-arm/arch-at91/at91cap9_matrix.h b/arch/arm/include/asm/arch-at91/at91cap9_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91cap9_matrix.h rename to arch/arm/include/asm/arch-at91/at91cap9_matrix.h diff --git a/include/asm-arm/arch-at91/at91sam9260.h b/arch/arm/include/asm/arch-at91/at91sam9260.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9260.h rename to arch/arm/include/asm/arch-at91/at91sam9260.h diff --git a/include/asm-arm/arch-at91/at91sam9260_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9260_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9260_matrix.h rename to arch/arm/include/asm/arch-at91/at91sam9260_matrix.h diff --git a/include/asm-arm/arch-at91/at91sam9261.h b/arch/arm/include/asm/arch-at91/at91sam9261.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9261.h rename to arch/arm/include/asm/arch-at91/at91sam9261.h diff --git a/include/asm-arm/arch-at91/at91sam9261_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9261_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9261_matrix.h rename to arch/arm/include/asm/arch-at91/at91sam9261_matrix.h diff --git a/include/asm-arm/arch-at91/at91sam9263.h b/arch/arm/include/asm/arch-at91/at91sam9263.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9263.h rename to arch/arm/include/asm/arch-at91/at91sam9263.h diff --git a/include/asm-arm/arch-at91/at91sam9263_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9263_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9263_matrix.h rename to arch/arm/include/asm/arch-at91/at91sam9263_matrix.h diff --git a/include/asm-arm/arch-at91/at91sam9_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9_matrix.h rename to arch/arm/include/asm/arch-at91/at91sam9_matrix.h diff --git a/include/asm-arm/arch-at91/at91sam9_sdramc.h b/arch/arm/include/asm/arch-at91/at91sam9_sdramc.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9_sdramc.h rename to arch/arm/include/asm/arch-at91/at91sam9_sdramc.h diff --git a/include/asm-arm/arch-at91/at91sam9_smc.h b/arch/arm/include/asm/arch-at91/at91sam9_smc.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9_smc.h rename to arch/arm/include/asm/arch-at91/at91sam9_smc.h diff --git a/include/asm-arm/arch-at91/at91sam9g45.h b/arch/arm/include/asm/arch-at91/at91sam9g45.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9g45.h rename to arch/arm/include/asm/arch-at91/at91sam9g45.h diff --git a/include/asm-arm/arch-at91/at91sam9g45_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9g45_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9g45_matrix.h rename to arch/arm/include/asm/arch-at91/at91sam9g45_matrix.h diff --git a/include/asm-arm/arch-at91/at91sam9rl.h b/arch/arm/include/asm/arch-at91/at91sam9rl.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9rl.h rename to arch/arm/include/asm/arch-at91/at91sam9rl.h diff --git a/include/asm-arm/arch-at91/at91sam9rl_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9rl_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9rl_matrix.h rename to arch/arm/include/asm/arch-at91/at91sam9rl_matrix.h diff --git a/include/asm-arm/arch-at91/clk.h b/arch/arm/include/asm/arch-at91/clk.h similarity index 100% rename from include/asm-arm/arch-at91/clk.h rename to arch/arm/include/asm/arch-at91/clk.h diff --git a/include/asm-arm/arch-at91/gpio.h b/arch/arm/include/asm/arch-at91/gpio.h similarity index 100% rename from include/asm-arm/arch-at91/gpio.h rename to arch/arm/include/asm/arch-at91/gpio.h diff --git a/include/asm-arm/arch-at91/hardware.h b/arch/arm/include/asm/arch-at91/hardware.h similarity index 100% rename from include/asm-arm/arch-at91/hardware.h rename to arch/arm/include/asm/arch-at91/hardware.h diff --git a/include/asm-arm/arch-at91/io.h b/arch/arm/include/asm/arch-at91/io.h similarity index 100% rename from include/asm-arm/arch-at91/io.h rename to arch/arm/include/asm/arch-at91/io.h diff --git a/include/asm-arm/arch-at91/memory-map.h b/arch/arm/include/asm/arch-at91/memory-map.h similarity index 100% rename from include/asm-arm/arch-at91/memory-map.h rename to arch/arm/include/asm/arch-at91/memory-map.h diff --git a/include/asm-arm/arch-at91rm9200/AT91RM9200.h b/arch/arm/include/asm/arch-at91rm9200/AT91RM9200.h similarity index 100% rename from include/asm-arm/arch-at91rm9200/AT91RM9200.h rename to arch/arm/include/asm/arch-at91rm9200/AT91RM9200.h diff --git a/include/asm-arm/arch-at91rm9200/hardware.h b/arch/arm/include/asm/arch-at91rm9200/hardware.h similarity index 100% rename from include/asm-arm/arch-at91rm9200/hardware.h rename to arch/arm/include/asm/arch-at91rm9200/hardware.h diff --git a/include/asm-arm/arch-davinci/emac_defs.h b/arch/arm/include/asm/arch-davinci/emac_defs.h similarity index 100% rename from include/asm-arm/arch-davinci/emac_defs.h rename to arch/arm/include/asm/arch-davinci/emac_defs.h diff --git a/include/asm-arm/arch-davinci/emif_defs.h b/arch/arm/include/asm/arch-davinci/emif_defs.h similarity index 100% rename from include/asm-arm/arch-davinci/emif_defs.h rename to arch/arm/include/asm/arch-davinci/emif_defs.h diff --git a/include/asm-arm/arch-davinci/gpio_defs.h b/arch/arm/include/asm/arch-davinci/gpio_defs.h similarity index 100% rename from include/asm-arm/arch-davinci/gpio_defs.h rename to arch/arm/include/asm/arch-davinci/gpio_defs.h diff --git a/include/asm-arm/arch-davinci/hardware.h b/arch/arm/include/asm/arch-davinci/hardware.h similarity index 100% rename from include/asm-arm/arch-davinci/hardware.h rename to arch/arm/include/asm/arch-davinci/hardware.h diff --git a/include/asm-arm/arch-davinci/i2c_defs.h b/arch/arm/include/asm/arch-davinci/i2c_defs.h similarity index 100% rename from include/asm-arm/arch-davinci/i2c_defs.h rename to arch/arm/include/asm/arch-davinci/i2c_defs.h diff --git a/include/asm-arm/arch-davinci/nand_defs.h b/arch/arm/include/asm/arch-davinci/nand_defs.h similarity index 100% rename from include/asm-arm/arch-davinci/nand_defs.h rename to arch/arm/include/asm/arch-davinci/nand_defs.h diff --git a/include/asm-arm/arch-imx/imx-regs.h b/arch/arm/include/asm/arch-imx/imx-regs.h similarity index 100% rename from include/asm-arm/arch-imx/imx-regs.h rename to arch/arm/include/asm/arch-imx/imx-regs.h diff --git a/include/asm-arm/arch-ixp/ixp425.h b/arch/arm/include/asm/arch-ixp/ixp425.h similarity index 100% rename from include/asm-arm/arch-ixp/ixp425.h rename to arch/arm/include/asm/arch-ixp/ixp425.h diff --git a/include/asm-arm/arch-ixp/ixp425pci.h b/arch/arm/include/asm/arch-ixp/ixp425pci.h similarity index 100% rename from include/asm-arm/arch-ixp/ixp425pci.h rename to arch/arm/include/asm/arch-ixp/ixp425pci.h diff --git a/include/asm-arm/arch-kirkwood/cpu.h b/arch/arm/include/asm/arch-kirkwood/cpu.h similarity index 100% rename from include/asm-arm/arch-kirkwood/cpu.h rename to arch/arm/include/asm/arch-kirkwood/cpu.h diff --git a/include/asm-arm/arch-kirkwood/gpio.h b/arch/arm/include/asm/arch-kirkwood/gpio.h similarity index 100% rename from include/asm-arm/arch-kirkwood/gpio.h rename to arch/arm/include/asm/arch-kirkwood/gpio.h diff --git a/include/asm-arm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h similarity index 100% rename from include/asm-arm/arch-kirkwood/kirkwood.h rename to arch/arm/include/asm/arch-kirkwood/kirkwood.h diff --git a/include/asm-arm/arch-kirkwood/kw88f6192.h b/arch/arm/include/asm/arch-kirkwood/kw88f6192.h similarity index 100% rename from include/asm-arm/arch-kirkwood/kw88f6192.h rename to arch/arm/include/asm/arch-kirkwood/kw88f6192.h diff --git a/include/asm-arm/arch-kirkwood/kw88f6281.h b/arch/arm/include/asm/arch-kirkwood/kw88f6281.h similarity index 100% rename from include/asm-arm/arch-kirkwood/kw88f6281.h rename to arch/arm/include/asm/arch-kirkwood/kw88f6281.h diff --git a/include/asm-arm/arch-kirkwood/mpp.h b/arch/arm/include/asm/arch-kirkwood/mpp.h similarity index 100% rename from include/asm-arm/arch-kirkwood/mpp.h rename to arch/arm/include/asm/arch-kirkwood/mpp.h diff --git a/include/asm-arm/arch-kirkwood/spi.h b/arch/arm/include/asm/arch-kirkwood/spi.h similarity index 100% rename from include/asm-arm/arch-kirkwood/spi.h rename to arch/arm/include/asm/arch-kirkwood/spi.h diff --git a/include/asm-arm/arch-ks8695/platform.h b/arch/arm/include/asm/arch-ks8695/platform.h similarity index 100% rename from include/asm-arm/arch-ks8695/platform.h rename to arch/arm/include/asm/arch-ks8695/platform.h diff --git a/include/asm-arm/arch-lpc2292/hardware.h b/arch/arm/include/asm/arch-lpc2292/hardware.h similarity index 100% rename from include/asm-arm/arch-lpc2292/hardware.h rename to arch/arm/include/asm/arch-lpc2292/hardware.h diff --git a/include/asm-arm/arch-lpc2292/lpc2292_registers.h b/arch/arm/include/asm/arch-lpc2292/lpc2292_registers.h similarity index 100% rename from include/asm-arm/arch-lpc2292/lpc2292_registers.h rename to arch/arm/include/asm/arch-lpc2292/lpc2292_registers.h diff --git a/include/asm-arm/arch-lpc2292/spi.h b/arch/arm/include/asm/arch-lpc2292/spi.h similarity index 100% rename from include/asm-arm/arch-lpc2292/spi.h rename to arch/arm/include/asm/arch-lpc2292/spi.h diff --git a/include/asm-arm/arch-mx27/asm-offsets.h b/arch/arm/include/asm/arch-mx27/asm-offsets.h similarity index 100% rename from include/asm-arm/arch-mx27/asm-offsets.h rename to arch/arm/include/asm/arch-mx27/asm-offsets.h diff --git a/include/asm-arm/arch-mx27/clock.h b/arch/arm/include/asm/arch-mx27/clock.h similarity index 100% rename from include/asm-arm/arch-mx27/clock.h rename to arch/arm/include/asm/arch-mx27/clock.h diff --git a/include/asm-arm/arch-mx27/imx-regs.h b/arch/arm/include/asm/arch-mx27/imx-regs.h similarity index 100% rename from include/asm-arm/arch-mx27/imx-regs.h rename to arch/arm/include/asm/arch-mx27/imx-regs.h diff --git a/include/asm-arm/arch-mx27/mxcmmc.h b/arch/arm/include/asm/arch-mx27/mxcmmc.h similarity index 100% rename from include/asm-arm/arch-mx27/mxcmmc.h rename to arch/arm/include/asm/arch-mx27/mxcmmc.h diff --git a/include/asm-arm/arch-mx31/mx31-regs.h b/arch/arm/include/asm/arch-mx31/mx31-regs.h similarity index 100% rename from include/asm-arm/arch-mx31/mx31-regs.h rename to arch/arm/include/asm/arch-mx31/mx31-regs.h diff --git a/include/asm-arm/arch-mx31/mx31.h b/arch/arm/include/asm/arch-mx31/mx31.h similarity index 100% rename from include/asm-arm/arch-mx31/mx31.h rename to arch/arm/include/asm/arch-mx31/mx31.h diff --git a/include/asm-arm/arch-nomadik/gpio.h b/arch/arm/include/asm/arch-nomadik/gpio.h similarity index 100% rename from include/asm-arm/arch-nomadik/gpio.h rename to arch/arm/include/asm/arch-nomadik/gpio.h diff --git a/include/asm-arm/arch-nomadik/mtu.h b/arch/arm/include/asm/arch-nomadik/mtu.h similarity index 100% rename from include/asm-arm/arch-nomadik/mtu.h rename to arch/arm/include/asm/arch-nomadik/mtu.h diff --git a/include/asm-arm/arch-omap/sizes.h b/arch/arm/include/asm/arch-omap/sizes.h similarity index 100% rename from include/asm-arm/arch-omap/sizes.h rename to arch/arm/include/asm/arch-omap/sizes.h diff --git a/include/asm-arm/arch-omap24xx/bits.h b/arch/arm/include/asm/arch-omap24xx/bits.h similarity index 100% rename from include/asm-arm/arch-omap24xx/bits.h rename to arch/arm/include/asm/arch-omap24xx/bits.h diff --git a/include/asm-arm/arch-omap24xx/clocks.h b/arch/arm/include/asm/arch-omap24xx/clocks.h similarity index 100% rename from include/asm-arm/arch-omap24xx/clocks.h rename to arch/arm/include/asm/arch-omap24xx/clocks.h diff --git a/include/asm-arm/arch-omap24xx/i2c.h b/arch/arm/include/asm/arch-omap24xx/i2c.h similarity index 100% rename from include/asm-arm/arch-omap24xx/i2c.h rename to arch/arm/include/asm/arch-omap24xx/i2c.h diff --git a/include/asm-arm/arch-omap24xx/mem.h b/arch/arm/include/asm/arch-omap24xx/mem.h similarity index 100% rename from include/asm-arm/arch-omap24xx/mem.h rename to arch/arm/include/asm/arch-omap24xx/mem.h diff --git a/include/asm-arm/arch-omap24xx/mux.h b/arch/arm/include/asm/arch-omap24xx/mux.h similarity index 100% rename from include/asm-arm/arch-omap24xx/mux.h rename to arch/arm/include/asm/arch-omap24xx/mux.h diff --git a/include/asm-arm/arch-omap24xx/omap2420.h b/arch/arm/include/asm/arch-omap24xx/omap2420.h similarity index 100% rename from include/asm-arm/arch-omap24xx/omap2420.h rename to arch/arm/include/asm/arch-omap24xx/omap2420.h diff --git a/include/asm-arm/arch-omap24xx/sizes.h b/arch/arm/include/asm/arch-omap24xx/sizes.h similarity index 100% rename from include/asm-arm/arch-omap24xx/sizes.h rename to arch/arm/include/asm/arch-omap24xx/sizes.h diff --git a/include/asm-arm/arch-omap24xx/sys_info.h b/arch/arm/include/asm/arch-omap24xx/sys_info.h similarity index 100% rename from include/asm-arm/arch-omap24xx/sys_info.h rename to arch/arm/include/asm/arch-omap24xx/sys_info.h diff --git a/include/asm-arm/arch-omap24xx/sys_proto.h b/arch/arm/include/asm/arch-omap24xx/sys_proto.h similarity index 100% rename from include/asm-arm/arch-omap24xx/sys_proto.h rename to arch/arm/include/asm/arch-omap24xx/sys_proto.h diff --git a/include/asm-arm/arch-omap3/clocks.h b/arch/arm/include/asm/arch-omap3/clocks.h similarity index 100% rename from include/asm-arm/arch-omap3/clocks.h rename to arch/arm/include/asm/arch-omap3/clocks.h diff --git a/include/asm-arm/arch-omap3/clocks_omap3.h b/arch/arm/include/asm/arch-omap3/clocks_omap3.h similarity index 100% rename from include/asm-arm/arch-omap3/clocks_omap3.h rename to arch/arm/include/asm/arch-omap3/clocks_omap3.h diff --git a/include/asm-arm/arch-omap3/cpu.h b/arch/arm/include/asm/arch-omap3/cpu.h similarity index 100% rename from include/asm-arm/arch-omap3/cpu.h rename to arch/arm/include/asm/arch-omap3/cpu.h diff --git a/include/asm-arm/arch-omap3/gpio.h b/arch/arm/include/asm/arch-omap3/gpio.h similarity index 100% rename from include/asm-arm/arch-omap3/gpio.h rename to arch/arm/include/asm/arch-omap3/gpio.h diff --git a/include/asm-arm/arch-omap3/i2c.h b/arch/arm/include/asm/arch-omap3/i2c.h similarity index 100% rename from include/asm-arm/arch-omap3/i2c.h rename to arch/arm/include/asm/arch-omap3/i2c.h diff --git a/include/asm-arm/arch-omap3/mem.h b/arch/arm/include/asm/arch-omap3/mem.h similarity index 100% rename from include/asm-arm/arch-omap3/mem.h rename to arch/arm/include/asm/arch-omap3/mem.h diff --git a/include/asm-arm/arch-omap3/mmc.h b/arch/arm/include/asm/arch-omap3/mmc.h similarity index 100% rename from include/asm-arm/arch-omap3/mmc.h rename to arch/arm/include/asm/arch-omap3/mmc.h diff --git a/include/asm-arm/arch-omap3/mmc_host_def.h b/arch/arm/include/asm/arch-omap3/mmc_host_def.h similarity index 100% rename from include/asm-arm/arch-omap3/mmc_host_def.h rename to arch/arm/include/asm/arch-omap3/mmc_host_def.h diff --git a/include/asm-arm/arch-omap3/mux.h b/arch/arm/include/asm/arch-omap3/mux.h similarity index 100% rename from include/asm-arm/arch-omap3/mux.h rename to arch/arm/include/asm/arch-omap3/mux.h diff --git a/include/asm-arm/arch-omap3/omap3.h b/arch/arm/include/asm/arch-omap3/omap3.h similarity index 100% rename from include/asm-arm/arch-omap3/omap3.h rename to arch/arm/include/asm/arch-omap3/omap3.h diff --git a/include/asm-arm/arch-omap3/omap_gpmc.h b/arch/arm/include/asm/arch-omap3/omap_gpmc.h similarity index 100% rename from include/asm-arm/arch-omap3/omap_gpmc.h rename to arch/arm/include/asm/arch-omap3/omap_gpmc.h diff --git a/include/asm-arm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h similarity index 100% rename from include/asm-arm/arch-omap3/sys_proto.h rename to arch/arm/include/asm/arch-omap3/sys_proto.h diff --git a/include/asm-arm/arch-pxa/bitfield.h b/arch/arm/include/asm/arch-pxa/bitfield.h similarity index 100% rename from include/asm-arm/arch-pxa/bitfield.h rename to arch/arm/include/asm/arch-pxa/bitfield.h diff --git a/include/asm-arm/arch-pxa/hardware.h b/arch/arm/include/asm/arch-pxa/hardware.h similarity index 100% rename from include/asm-arm/arch-pxa/hardware.h rename to arch/arm/include/asm/arch-pxa/hardware.h diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/arch/arm/include/asm/arch-pxa/pxa-regs.h similarity index 100% rename from include/asm-arm/arch-pxa/pxa-regs.h rename to arch/arm/include/asm/arch-pxa/pxa-regs.h diff --git a/include/asm-arm/arch-s3c24x0/memory.h b/arch/arm/include/asm/arch-s3c24x0/memory.h similarity index 100% rename from include/asm-arm/arch-s3c24x0/memory.h rename to arch/arm/include/asm/arch-s3c24x0/memory.h diff --git a/include/asm-arm/arch-s3c24x0/s3c2400.h b/arch/arm/include/asm/arch-s3c24x0/s3c2400.h similarity index 100% rename from include/asm-arm/arch-s3c24x0/s3c2400.h rename to arch/arm/include/asm/arch-s3c24x0/s3c2400.h diff --git a/include/asm-arm/arch-s3c24x0/s3c2410.h b/arch/arm/include/asm/arch-s3c24x0/s3c2410.h similarity index 100% rename from include/asm-arm/arch-s3c24x0/s3c2410.h rename to arch/arm/include/asm/arch-s3c24x0/s3c2410.h diff --git a/include/asm-arm/arch-s3c24x0/s3c24x0.h b/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h similarity index 100% rename from include/asm-arm/arch-s3c24x0/s3c24x0.h rename to arch/arm/include/asm/arch-s3c24x0/s3c24x0.h diff --git a/include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h b/arch/arm/include/asm/arch-s3c24x0/s3c24x0_cpu.h similarity index 100% rename from include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h rename to arch/arm/include/asm/arch-s3c24x0/s3c24x0_cpu.h diff --git a/include/asm-arm/arch-s3c44b0/hardware.h b/arch/arm/include/asm/arch-s3c44b0/hardware.h similarity index 100% rename from include/asm-arm/arch-s3c44b0/hardware.h rename to arch/arm/include/asm/arch-s3c44b0/hardware.h diff --git a/include/asm-arm/arch-s3c4510b/hardware.h b/arch/arm/include/asm/arch-s3c4510b/hardware.h similarity index 100% rename from include/asm-arm/arch-s3c4510b/hardware.h rename to arch/arm/include/asm/arch-s3c4510b/hardware.h diff --git a/include/asm-arm/arch-s3c64xx/hardware.h b/arch/arm/include/asm/arch-s3c64xx/hardware.h similarity index 100% rename from include/asm-arm/arch-s3c64xx/hardware.h rename to arch/arm/include/asm/arch-s3c64xx/hardware.h diff --git a/include/asm-arm/arch-s3c64xx/s3c6400.h b/arch/arm/include/asm/arch-s3c64xx/s3c6400.h similarity index 100% rename from include/asm-arm/arch-s3c64xx/s3c6400.h rename to arch/arm/include/asm/arch-s3c64xx/s3c6400.h diff --git a/include/asm-arm/arch-s3c64xx/s3c64x0.h b/arch/arm/include/asm/arch-s3c64xx/s3c64x0.h similarity index 100% rename from include/asm-arm/arch-s3c64xx/s3c64x0.h rename to arch/arm/include/asm/arch-s3c64xx/s3c64x0.h diff --git a/include/asm-arm/arch-s5pc1xx/clk.h b/arch/arm/include/asm/arch-s5pc1xx/clk.h similarity index 100% rename from include/asm-arm/arch-s5pc1xx/clk.h rename to arch/arm/include/asm/arch-s5pc1xx/clk.h diff --git a/include/asm-arm/arch-s5pc1xx/clock.h b/arch/arm/include/asm/arch-s5pc1xx/clock.h similarity index 100% rename from include/asm-arm/arch-s5pc1xx/clock.h rename to arch/arm/include/asm/arch-s5pc1xx/clock.h diff --git a/include/asm-arm/arch-s5pc1xx/cpu.h b/arch/arm/include/asm/arch-s5pc1xx/cpu.h similarity index 100% rename from include/asm-arm/arch-s5pc1xx/cpu.h rename to arch/arm/include/asm/arch-s5pc1xx/cpu.h diff --git a/include/asm-arm/arch-s5pc1xx/gpio.h b/arch/arm/include/asm/arch-s5pc1xx/gpio.h similarity index 100% rename from include/asm-arm/arch-s5pc1xx/gpio.h rename to arch/arm/include/asm/arch-s5pc1xx/gpio.h diff --git a/include/asm-arm/arch-s5pc1xx/power.h b/arch/arm/include/asm/arch-s5pc1xx/power.h similarity index 100% rename from include/asm-arm/arch-s5pc1xx/power.h rename to arch/arm/include/asm/arch-s5pc1xx/power.h diff --git a/include/asm-arm/arch-s5pc1xx/pwm.h b/arch/arm/include/asm/arch-s5pc1xx/pwm.h similarity index 100% rename from include/asm-arm/arch-s5pc1xx/pwm.h rename to arch/arm/include/asm/arch-s5pc1xx/pwm.h diff --git a/include/asm-arm/arch-s5pc1xx/uart.h b/arch/arm/include/asm/arch-s5pc1xx/uart.h similarity index 100% rename from include/asm-arm/arch-s5pc1xx/uart.h rename to arch/arm/include/asm/arch-s5pc1xx/uart.h diff --git a/include/asm-arm/arch-sa1100/bitfield.h b/arch/arm/include/asm/arch-sa1100/bitfield.h similarity index 100% rename from include/asm-arm/arch-sa1100/bitfield.h rename to arch/arm/include/asm/arch-sa1100/bitfield.h diff --git a/include/asm-arm/atomic.h b/arch/arm/include/asm/atomic.h similarity index 100% rename from include/asm-arm/atomic.h rename to arch/arm/include/asm/atomic.h diff --git a/include/asm-arm/bitops.h b/arch/arm/include/asm/bitops.h similarity index 100% rename from include/asm-arm/bitops.h rename to arch/arm/include/asm/bitops.h diff --git a/include/asm-arm/byteorder.h b/arch/arm/include/asm/byteorder.h similarity index 100% rename from include/asm-arm/byteorder.h rename to arch/arm/include/asm/byteorder.h diff --git a/include/asm-arm/cache.h b/arch/arm/include/asm/cache.h similarity index 100% rename from include/asm-arm/cache.h rename to arch/arm/include/asm/cache.h diff --git a/include/asm-arm/config.h b/arch/arm/include/asm/config.h similarity index 100% rename from include/asm-arm/config.h rename to arch/arm/include/asm/config.h diff --git a/include/asm-arm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h similarity index 100% rename from include/asm-arm/dma-mapping.h rename to arch/arm/include/asm/dma-mapping.h diff --git a/include/asm-arm/errno.h b/arch/arm/include/asm/errno.h similarity index 100% rename from include/asm-arm/errno.h rename to arch/arm/include/asm/errno.h diff --git a/include/asm-arm/global_data.h b/arch/arm/include/asm/global_data.h similarity index 100% rename from include/asm-arm/global_data.h rename to arch/arm/include/asm/global_data.h diff --git a/include/asm-arm/hardware.h b/arch/arm/include/asm/hardware.h similarity index 100% rename from include/asm-arm/hardware.h rename to arch/arm/include/asm/hardware.h diff --git a/include/asm-arm/io.h b/arch/arm/include/asm/io.h similarity index 100% rename from include/asm-arm/io.h rename to arch/arm/include/asm/io.h diff --git a/include/asm-arm/mach-types.h b/arch/arm/include/asm/mach-types.h similarity index 100% rename from include/asm-arm/mach-types.h rename to arch/arm/include/asm/mach-types.h diff --git a/include/asm-arm/macro.h b/arch/arm/include/asm/macro.h similarity index 100% rename from include/asm-arm/macro.h rename to arch/arm/include/asm/macro.h diff --git a/include/asm-arm/memory.h b/arch/arm/include/asm/memory.h similarity index 100% rename from include/asm-arm/memory.h rename to arch/arm/include/asm/memory.h diff --git a/include/asm-arm/posix_types.h b/arch/arm/include/asm/posix_types.h similarity index 100% rename from include/asm-arm/posix_types.h rename to arch/arm/include/asm/posix_types.h diff --git a/include/asm-arm/proc-armv/domain.h b/arch/arm/include/asm/proc-armv/domain.h similarity index 100% rename from include/asm-arm/proc-armv/domain.h rename to arch/arm/include/asm/proc-armv/domain.h diff --git a/include/asm-arm/proc-armv/processor.h b/arch/arm/include/asm/proc-armv/processor.h similarity index 100% rename from include/asm-arm/proc-armv/processor.h rename to arch/arm/include/asm/proc-armv/processor.h diff --git a/include/asm-arm/proc-armv/ptrace.h b/arch/arm/include/asm/proc-armv/ptrace.h similarity index 100% rename from include/asm-arm/proc-armv/ptrace.h rename to arch/arm/include/asm/proc-armv/ptrace.h diff --git a/include/asm-arm/proc-armv/system.h b/arch/arm/include/asm/proc-armv/system.h similarity index 100% rename from include/asm-arm/proc-armv/system.h rename to arch/arm/include/asm/proc-armv/system.h diff --git a/include/asm-arm/processor.h b/arch/arm/include/asm/processor.h similarity index 100% rename from include/asm-arm/processor.h rename to arch/arm/include/asm/processor.h diff --git a/include/asm-arm/ptrace.h b/arch/arm/include/asm/ptrace.h similarity index 100% rename from include/asm-arm/ptrace.h rename to arch/arm/include/asm/ptrace.h diff --git a/include/asm-arm/setup.h b/arch/arm/include/asm/setup.h similarity index 100% rename from include/asm-arm/setup.h rename to arch/arm/include/asm/setup.h diff --git a/include/asm-arm/sizes.h b/arch/arm/include/asm/sizes.h similarity index 100% rename from include/asm-arm/sizes.h rename to arch/arm/include/asm/sizes.h diff --git a/include/asm-arm/string.h b/arch/arm/include/asm/string.h similarity index 100% rename from include/asm-arm/string.h rename to arch/arm/include/asm/string.h diff --git a/include/asm-arm/system.h b/arch/arm/include/asm/system.h similarity index 100% rename from include/asm-arm/system.h rename to arch/arm/include/asm/system.h diff --git a/include/asm-arm/types.h b/arch/arm/include/asm/types.h similarity index 100% rename from include/asm-arm/types.h rename to arch/arm/include/asm/types.h diff --git a/include/asm-arm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h similarity index 100% rename from include/asm-arm/u-boot-arm.h rename to arch/arm/include/asm/u-boot-arm.h diff --git a/include/asm-arm/u-boot.h b/arch/arm/include/asm/u-boot.h similarity index 100% rename from include/asm-arm/u-boot.h rename to arch/arm/include/asm/u-boot.h diff --git a/include/asm-arm/unaligned.h b/arch/arm/include/asm/unaligned.h similarity index 100% rename from include/asm-arm/unaligned.h rename to arch/arm/include/asm/unaligned.h diff --git a/include/asm-avr32/arch-at32ap700x/addrspace.h b/arch/avr32/include/asm/arch-at32ap700x/addrspace.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/addrspace.h rename to arch/avr32/include/asm/arch-at32ap700x/addrspace.h diff --git a/include/asm-avr32/arch-at32ap700x/cacheflush.h b/arch/avr32/include/asm/arch-at32ap700x/cacheflush.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/cacheflush.h rename to arch/avr32/include/asm/arch-at32ap700x/cacheflush.h diff --git a/include/asm-avr32/arch-at32ap700x/chip-features.h b/arch/avr32/include/asm/arch-at32ap700x/chip-features.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/chip-features.h rename to arch/avr32/include/asm/arch-at32ap700x/chip-features.h diff --git a/include/asm-avr32/arch-at32ap700x/clk.h b/arch/avr32/include/asm/arch-at32ap700x/clk.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/clk.h rename to arch/avr32/include/asm/arch-at32ap700x/clk.h diff --git a/include/asm-avr32/arch-at32ap700x/gpio-impl.h b/arch/avr32/include/asm/arch-at32ap700x/gpio-impl.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/gpio-impl.h rename to arch/avr32/include/asm/arch-at32ap700x/gpio-impl.h diff --git a/include/asm-avr32/arch-at32ap700x/gpio.h b/arch/avr32/include/asm/arch-at32ap700x/gpio.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/gpio.h rename to arch/avr32/include/asm/arch-at32ap700x/gpio.h diff --git a/include/asm-avr32/arch-at32ap700x/hmatrix.h b/arch/avr32/include/asm/arch-at32ap700x/hmatrix.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/hmatrix.h rename to arch/avr32/include/asm/arch-at32ap700x/hmatrix.h diff --git a/include/asm-avr32/arch-at32ap700x/memory-map.h b/arch/avr32/include/asm/arch-at32ap700x/memory-map.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/memory-map.h rename to arch/avr32/include/asm/arch-at32ap700x/memory-map.h diff --git a/include/asm-avr32/arch-at32ap700x/portmux.h b/arch/avr32/include/asm/arch-at32ap700x/portmux.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/portmux.h rename to arch/avr32/include/asm/arch-at32ap700x/portmux.h diff --git a/include/asm-avr32/arch-common/portmux-gpio.h b/arch/avr32/include/asm/arch-common/portmux-gpio.h similarity index 100% rename from include/asm-avr32/arch-common/portmux-gpio.h rename to arch/avr32/include/asm/arch-common/portmux-gpio.h diff --git a/include/asm-avr32/arch-common/portmux-pio.h b/arch/avr32/include/asm/arch-common/portmux-pio.h similarity index 100% rename from include/asm-avr32/arch-common/portmux-pio.h rename to arch/avr32/include/asm/arch-common/portmux-pio.h diff --git a/include/asm-avr32/bitops.h b/arch/avr32/include/asm/bitops.h similarity index 100% rename from include/asm-avr32/bitops.h rename to arch/avr32/include/asm/bitops.h diff --git a/include/asm-avr32/byteorder.h b/arch/avr32/include/asm/byteorder.h similarity index 100% rename from include/asm-avr32/byteorder.h rename to arch/avr32/include/asm/byteorder.h diff --git a/include/asm-avr32/config.h b/arch/avr32/include/asm/config.h similarity index 100% rename from include/asm-avr32/config.h rename to arch/avr32/include/asm/config.h diff --git a/include/asm-avr32/dma-mapping.h b/arch/avr32/include/asm/dma-mapping.h similarity index 100% rename from include/asm-avr32/dma-mapping.h rename to arch/avr32/include/asm/dma-mapping.h diff --git a/include/asm-avr32/errno.h b/arch/avr32/include/asm/errno.h similarity index 100% rename from include/asm-avr32/errno.h rename to arch/avr32/include/asm/errno.h diff --git a/include/asm-avr32/global_data.h b/arch/avr32/include/asm/global_data.h similarity index 100% rename from include/asm-avr32/global_data.h rename to arch/avr32/include/asm/global_data.h diff --git a/include/asm-avr32/hmatrix-common.h b/arch/avr32/include/asm/hmatrix-common.h similarity index 100% rename from include/asm-avr32/hmatrix-common.h rename to arch/avr32/include/asm/hmatrix-common.h diff --git a/include/asm-avr32/initcalls.h b/arch/avr32/include/asm/initcalls.h similarity index 100% rename from include/asm-avr32/initcalls.h rename to arch/avr32/include/asm/initcalls.h diff --git a/include/asm-avr32/io.h b/arch/avr32/include/asm/io.h similarity index 100% rename from include/asm-avr32/io.h rename to arch/avr32/include/asm/io.h diff --git a/include/asm-avr32/posix_types.h b/arch/avr32/include/asm/posix_types.h similarity index 100% rename from include/asm-avr32/posix_types.h rename to arch/avr32/include/asm/posix_types.h diff --git a/include/asm-avr32/processor.h b/arch/avr32/include/asm/processor.h similarity index 100% rename from include/asm-avr32/processor.h rename to arch/avr32/include/asm/processor.h diff --git a/include/asm-avr32/ptrace.h b/arch/avr32/include/asm/ptrace.h similarity index 100% rename from include/asm-avr32/ptrace.h rename to arch/avr32/include/asm/ptrace.h diff --git a/include/asm-avr32/sdram.h b/arch/avr32/include/asm/sdram.h similarity index 100% rename from include/asm-avr32/sdram.h rename to arch/avr32/include/asm/sdram.h diff --git a/include/asm-avr32/sections.h b/arch/avr32/include/asm/sections.h similarity index 100% rename from include/asm-avr32/sections.h rename to arch/avr32/include/asm/sections.h diff --git a/include/asm-avr32/setup.h b/arch/avr32/include/asm/setup.h similarity index 100% rename from include/asm-avr32/setup.h rename to arch/avr32/include/asm/setup.h diff --git a/include/asm-avr32/string.h b/arch/avr32/include/asm/string.h similarity index 100% rename from include/asm-avr32/string.h rename to arch/avr32/include/asm/string.h diff --git a/include/asm-avr32/sysreg.h b/arch/avr32/include/asm/sysreg.h similarity index 100% rename from include/asm-avr32/sysreg.h rename to arch/avr32/include/asm/sysreg.h diff --git a/include/asm-avr32/types.h b/arch/avr32/include/asm/types.h similarity index 100% rename from include/asm-avr32/types.h rename to arch/avr32/include/asm/types.h diff --git a/include/asm-avr32/u-boot.h b/arch/avr32/include/asm/u-boot.h similarity index 100% rename from include/asm-avr32/u-boot.h rename to arch/avr32/include/asm/u-boot.h diff --git a/include/asm-blackfin/bfin_logo_230x230.h b/arch/blackfin/include/asm/bfin_logo_230x230.h similarity index 100% rename from include/asm-blackfin/bfin_logo_230x230.h rename to arch/blackfin/include/asm/bfin_logo_230x230.h diff --git a/include/asm-blackfin/bitops.h b/arch/blackfin/include/asm/bitops.h similarity index 100% rename from include/asm-blackfin/bitops.h rename to arch/blackfin/include/asm/bitops.h diff --git a/include/asm-blackfin/blackfin.h b/arch/blackfin/include/asm/blackfin.h similarity index 100% rename from include/asm-blackfin/blackfin.h rename to arch/blackfin/include/asm/blackfin.h diff --git a/include/asm-blackfin/blackfin_cdef.h b/arch/blackfin/include/asm/blackfin_cdef.h similarity index 100% rename from include/asm-blackfin/blackfin_cdef.h rename to arch/blackfin/include/asm/blackfin_cdef.h diff --git a/include/asm-blackfin/blackfin_def.h b/arch/blackfin/include/asm/blackfin_def.h similarity index 100% rename from include/asm-blackfin/blackfin_def.h rename to arch/blackfin/include/asm/blackfin_def.h diff --git a/include/asm-blackfin/blackfin_local.h b/arch/blackfin/include/asm/blackfin_local.h similarity index 100% rename from include/asm-blackfin/blackfin_local.h rename to arch/blackfin/include/asm/blackfin_local.h diff --git a/include/asm-blackfin/byteorder.h b/arch/blackfin/include/asm/byteorder.h similarity index 100% rename from include/asm-blackfin/byteorder.h rename to arch/blackfin/include/asm/byteorder.h diff --git a/include/asm-blackfin/config-pre.h b/arch/blackfin/include/asm/config-pre.h similarity index 100% rename from include/asm-blackfin/config-pre.h rename to arch/blackfin/include/asm/config-pre.h diff --git a/include/asm-blackfin/config.h b/arch/blackfin/include/asm/config.h similarity index 100% rename from include/asm-blackfin/config.h rename to arch/blackfin/include/asm/config.h diff --git a/include/asm-blackfin/cplb.h b/arch/blackfin/include/asm/cplb.h similarity index 100% rename from include/asm-blackfin/cplb.h rename to arch/blackfin/include/asm/cplb.h diff --git a/include/asm-blackfin/delay.h b/arch/blackfin/include/asm/delay.h similarity index 100% rename from include/asm-blackfin/delay.h rename to arch/blackfin/include/asm/delay.h diff --git a/include/asm-blackfin/entry.h b/arch/blackfin/include/asm/entry.h similarity index 100% rename from include/asm-blackfin/entry.h rename to arch/blackfin/include/asm/entry.h diff --git a/include/asm-blackfin/errno.h b/arch/blackfin/include/asm/errno.h similarity index 100% rename from include/asm-blackfin/errno.h rename to arch/blackfin/include/asm/errno.h diff --git a/include/asm-blackfin/global_data.h b/arch/blackfin/include/asm/global_data.h similarity index 100% rename from include/asm-blackfin/global_data.h rename to arch/blackfin/include/asm/global_data.h diff --git a/include/asm-blackfin/io.h b/arch/blackfin/include/asm/io.h similarity index 100% rename from include/asm-blackfin/io.h rename to arch/blackfin/include/asm/io.h diff --git a/include/asm-blackfin/linkage.h b/arch/blackfin/include/asm/linkage.h similarity index 100% rename from include/asm-blackfin/linkage.h rename to arch/blackfin/include/asm/linkage.h diff --git a/include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h b/arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h rename to arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h diff --git a/include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_def.h b/arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_def.h rename to arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_def.h diff --git a/include/asm-blackfin/mach-bf527/BF522_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF522_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF522_cdef.h rename to arch/blackfin/include/asm/mach-bf527/BF522_cdef.h diff --git a/include/asm-blackfin/mach-bf527/BF522_def.h b/arch/blackfin/include/asm/mach-bf527/BF522_def.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF522_def.h rename to arch/blackfin/include/asm/mach-bf527/BF522_def.h diff --git a/include/asm-blackfin/mach-bf527/BF523_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF523_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF523_cdef.h rename to arch/blackfin/include/asm/mach-bf527/BF523_cdef.h diff --git a/include/asm-blackfin/mach-bf527/BF523_def.h b/arch/blackfin/include/asm/mach-bf527/BF523_def.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF523_def.h rename to arch/blackfin/include/asm/mach-bf527/BF523_def.h diff --git a/include/asm-blackfin/mach-bf527/BF524_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF524_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF524_cdef.h rename to arch/blackfin/include/asm/mach-bf527/BF524_cdef.h diff --git a/include/asm-blackfin/mach-bf527/BF524_def.h b/arch/blackfin/include/asm/mach-bf527/BF524_def.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF524_def.h rename to arch/blackfin/include/asm/mach-bf527/BF524_def.h diff --git a/include/asm-blackfin/mach-bf527/BF525_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF525_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF525_cdef.h rename to arch/blackfin/include/asm/mach-bf527/BF525_cdef.h diff --git a/include/asm-blackfin/mach-bf527/BF525_def.h b/arch/blackfin/include/asm/mach-bf527/BF525_def.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF525_def.h rename to arch/blackfin/include/asm/mach-bf527/BF525_def.h diff --git a/include/asm-blackfin/mach-bf527/BF526_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF526_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF526_cdef.h rename to arch/blackfin/include/asm/mach-bf527/BF526_cdef.h diff --git a/include/asm-blackfin/mach-bf527/BF526_def.h b/arch/blackfin/include/asm/mach-bf527/BF526_def.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF526_def.h rename to arch/blackfin/include/asm/mach-bf527/BF526_def.h diff --git a/include/asm-blackfin/mach-bf527/BF527_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF527_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF527_cdef.h rename to arch/blackfin/include/asm/mach-bf527/BF527_cdef.h diff --git a/include/asm-blackfin/mach-bf527/BF527_def.h b/arch/blackfin/include/asm/mach-bf527/BF527_def.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF527_def.h rename to arch/blackfin/include/asm/mach-bf527/BF527_def.h diff --git a/include/asm-blackfin/mach-bf527/anomaly.h b/arch/blackfin/include/asm/mach-bf527/anomaly.h similarity index 100% rename from include/asm-blackfin/mach-bf527/anomaly.h rename to arch/blackfin/include/asm/mach-bf527/anomaly.h diff --git a/include/asm-blackfin/mach-bf527/def_local.h b/arch/blackfin/include/asm/mach-bf527/def_local.h similarity index 100% rename from include/asm-blackfin/mach-bf527/def_local.h rename to arch/blackfin/include/asm/mach-bf527/def_local.h diff --git a/include/asm-blackfin/mach-bf527/ports.h b/arch/blackfin/include/asm/mach-bf527/ports.h similarity index 100% rename from include/asm-blackfin/mach-bf527/ports.h rename to arch/blackfin/include/asm/mach-bf527/ports.h diff --git a/include/asm-blackfin/mach-bf533/BF531_cdef.h b/arch/blackfin/include/asm/mach-bf533/BF531_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf533/BF531_cdef.h rename to arch/blackfin/include/asm/mach-bf533/BF531_cdef.h diff --git a/include/asm-blackfin/mach-bf533/BF531_def.h b/arch/blackfin/include/asm/mach-bf533/BF531_def.h similarity index 100% rename from include/asm-blackfin/mach-bf533/BF531_def.h rename to arch/blackfin/include/asm/mach-bf533/BF531_def.h diff --git a/include/asm-blackfin/mach-bf533/BF532_cdef.h b/arch/blackfin/include/asm/mach-bf533/BF532_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf533/BF532_cdef.h rename to arch/blackfin/include/asm/mach-bf533/BF532_cdef.h diff --git a/include/asm-blackfin/mach-bf533/BF532_def.h b/arch/blackfin/include/asm/mach-bf533/BF532_def.h similarity index 100% rename from include/asm-blackfin/mach-bf533/BF532_def.h rename to arch/blackfin/include/asm/mach-bf533/BF532_def.h diff --git a/include/asm-blackfin/mach-bf533/BF533_cdef.h b/arch/blackfin/include/asm/mach-bf533/BF533_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf533/BF533_cdef.h rename to arch/blackfin/include/asm/mach-bf533/BF533_cdef.h diff --git a/include/asm-blackfin/mach-bf533/BF533_def.h b/arch/blackfin/include/asm/mach-bf533/BF533_def.h similarity index 100% rename from include/asm-blackfin/mach-bf533/BF533_def.h rename to arch/blackfin/include/asm/mach-bf533/BF533_def.h diff --git a/include/asm-blackfin/mach-bf533/anomaly.h b/arch/blackfin/include/asm/mach-bf533/anomaly.h similarity index 100% rename from include/asm-blackfin/mach-bf533/anomaly.h rename to arch/blackfin/include/asm/mach-bf533/anomaly.h diff --git a/include/asm-blackfin/mach-bf533/def_local.h b/arch/blackfin/include/asm/mach-bf533/def_local.h similarity index 100% rename from include/asm-blackfin/mach-bf533/def_local.h rename to arch/blackfin/include/asm/mach-bf533/def_local.h diff --git a/include/asm-blackfin/mach-bf533/ports.h b/arch/blackfin/include/asm/mach-bf533/ports.h similarity index 100% rename from include/asm-blackfin/mach-bf533/ports.h rename to arch/blackfin/include/asm/mach-bf533/ports.h diff --git a/include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_cdef.h b/arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_cdef.h rename to arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_cdef.h diff --git a/include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_def.h b/arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_def.h rename to arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_def.h diff --git a/include/asm-blackfin/mach-bf537/BF534_cdef.h b/arch/blackfin/include/asm/mach-bf537/BF534_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf537/BF534_cdef.h rename to arch/blackfin/include/asm/mach-bf537/BF534_cdef.h diff --git a/include/asm-blackfin/mach-bf537/BF534_def.h b/arch/blackfin/include/asm/mach-bf537/BF534_def.h similarity index 100% rename from include/asm-blackfin/mach-bf537/BF534_def.h rename to arch/blackfin/include/asm/mach-bf537/BF534_def.h diff --git a/include/asm-blackfin/mach-bf537/BF536_cdef.h b/arch/blackfin/include/asm/mach-bf537/BF536_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf537/BF536_cdef.h rename to arch/blackfin/include/asm/mach-bf537/BF536_cdef.h diff --git a/include/asm-blackfin/mach-bf537/BF536_def.h b/arch/blackfin/include/asm/mach-bf537/BF536_def.h similarity index 100% rename from include/asm-blackfin/mach-bf537/BF536_def.h rename to arch/blackfin/include/asm/mach-bf537/BF536_def.h diff --git a/include/asm-blackfin/mach-bf537/BF537_cdef.h b/arch/blackfin/include/asm/mach-bf537/BF537_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf537/BF537_cdef.h rename to arch/blackfin/include/asm/mach-bf537/BF537_cdef.h diff --git a/include/asm-blackfin/mach-bf537/BF537_def.h b/arch/blackfin/include/asm/mach-bf537/BF537_def.h similarity index 100% rename from include/asm-blackfin/mach-bf537/BF537_def.h rename to arch/blackfin/include/asm/mach-bf537/BF537_def.h diff --git a/include/asm-blackfin/mach-bf537/anomaly.h b/arch/blackfin/include/asm/mach-bf537/anomaly.h similarity index 100% rename from include/asm-blackfin/mach-bf537/anomaly.h rename to arch/blackfin/include/asm/mach-bf537/anomaly.h diff --git a/include/asm-blackfin/mach-bf537/def_local.h b/arch/blackfin/include/asm/mach-bf537/def_local.h similarity index 100% rename from include/asm-blackfin/mach-bf537/def_local.h rename to arch/blackfin/include/asm/mach-bf537/def_local.h diff --git a/include/asm-blackfin/mach-bf537/ports.h b/arch/blackfin/include/asm/mach-bf537/ports.h similarity index 100% rename from include/asm-blackfin/mach-bf537/ports.h rename to arch/blackfin/include/asm/mach-bf537/ports.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_cdef.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF542-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_cdef.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF542-extended_cdef.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_def.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF542-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_def.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF542-extended_def.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_cdef.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF544-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_cdef.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF544-extended_cdef.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_def.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF544-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_def.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF544-extended_def.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_cdef.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF547-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_cdef.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF547-extended_cdef.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_def.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF547-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_def.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF547-extended_def.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_cdef.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF548-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_cdef.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF548-extended_cdef.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_def.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF548-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_def.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF548-extended_def.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_cdef.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF549-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_cdef.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF549-extended_cdef.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_def.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF549-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_def.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF549-extended_def.h diff --git a/include/asm-blackfin/mach-bf548/BF541_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF541_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF541_cdef.h rename to arch/blackfin/include/asm/mach-bf548/BF541_cdef.h diff --git a/include/asm-blackfin/mach-bf548/BF541_def.h b/arch/blackfin/include/asm/mach-bf548/BF541_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF541_def.h rename to arch/blackfin/include/asm/mach-bf548/BF541_def.h diff --git a/include/asm-blackfin/mach-bf548/BF542_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF542_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF542_cdef.h rename to arch/blackfin/include/asm/mach-bf548/BF542_cdef.h diff --git a/include/asm-blackfin/mach-bf548/BF542_def.h b/arch/blackfin/include/asm/mach-bf548/BF542_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF542_def.h rename to arch/blackfin/include/asm/mach-bf548/BF542_def.h diff --git a/include/asm-blackfin/mach-bf548/BF544_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF544_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF544_cdef.h rename to arch/blackfin/include/asm/mach-bf548/BF544_cdef.h diff --git a/include/asm-blackfin/mach-bf548/BF544_def.h b/arch/blackfin/include/asm/mach-bf548/BF544_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF544_def.h rename to arch/blackfin/include/asm/mach-bf548/BF544_def.h diff --git a/include/asm-blackfin/mach-bf548/BF547_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF547_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF547_cdef.h rename to arch/blackfin/include/asm/mach-bf548/BF547_cdef.h diff --git a/include/asm-blackfin/mach-bf548/BF547_def.h b/arch/blackfin/include/asm/mach-bf548/BF547_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF547_def.h rename to arch/blackfin/include/asm/mach-bf548/BF547_def.h diff --git a/include/asm-blackfin/mach-bf548/BF548_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF548_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF548_cdef.h rename to arch/blackfin/include/asm/mach-bf548/BF548_cdef.h diff --git a/include/asm-blackfin/mach-bf548/BF548_def.h b/arch/blackfin/include/asm/mach-bf548/BF548_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF548_def.h rename to arch/blackfin/include/asm/mach-bf548/BF548_def.h diff --git a/include/asm-blackfin/mach-bf548/BF549_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF549_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF549_cdef.h rename to arch/blackfin/include/asm/mach-bf548/BF549_cdef.h diff --git a/include/asm-blackfin/mach-bf548/BF549_def.h b/arch/blackfin/include/asm/mach-bf548/BF549_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF549_def.h rename to arch/blackfin/include/asm/mach-bf548/BF549_def.h diff --git a/include/asm-blackfin/mach-bf548/anomaly.h b/arch/blackfin/include/asm/mach-bf548/anomaly.h similarity index 100% rename from include/asm-blackfin/mach-bf548/anomaly.h rename to arch/blackfin/include/asm/mach-bf548/anomaly.h diff --git a/include/asm-blackfin/mach-bf548/def_local.h b/arch/blackfin/include/asm/mach-bf548/def_local.h similarity index 100% rename from include/asm-blackfin/mach-bf548/def_local.h rename to arch/blackfin/include/asm/mach-bf548/def_local.h diff --git a/include/asm-blackfin/mach-bf548/ports.h b/arch/blackfin/include/asm/mach-bf548/ports.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ports.h rename to arch/blackfin/include/asm/mach-bf548/ports.h diff --git a/include/asm-blackfin/mach-bf561/BF561_cdef.h b/arch/blackfin/include/asm/mach-bf561/BF561_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf561/BF561_cdef.h rename to arch/blackfin/include/asm/mach-bf561/BF561_cdef.h diff --git a/include/asm-blackfin/mach-bf561/BF561_def.h b/arch/blackfin/include/asm/mach-bf561/BF561_def.h similarity index 100% rename from include/asm-blackfin/mach-bf561/BF561_def.h rename to arch/blackfin/include/asm/mach-bf561/BF561_def.h diff --git a/include/asm-blackfin/mach-bf561/anomaly.h b/arch/blackfin/include/asm/mach-bf561/anomaly.h similarity index 100% rename from include/asm-blackfin/mach-bf561/anomaly.h rename to arch/blackfin/include/asm/mach-bf561/anomaly.h diff --git a/include/asm-blackfin/mach-bf561/def_local.h b/arch/blackfin/include/asm/mach-bf561/def_local.h similarity index 100% rename from include/asm-blackfin/mach-bf561/def_local.h rename to arch/blackfin/include/asm/mach-bf561/def_local.h diff --git a/include/asm-blackfin/mach-bf561/ports.h b/arch/blackfin/include/asm/mach-bf561/ports.h similarity index 100% rename from include/asm-blackfin/mach-bf561/ports.h rename to arch/blackfin/include/asm/mach-bf561/ports.h diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-core_cdef.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-core_cdef.h similarity index 100% rename from include/asm-blackfin/mach-common/ADSP-EDN-core_cdef.h rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-core_cdef.h diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-core_def.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-core_def.h similarity index 100% rename from include/asm-blackfin/mach-common/ADSP-EDN-core_def.h rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-core_def.h diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-extended_cdef.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-common/ADSP-EDN-extended_cdef.h rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_cdef.h diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-extended_def.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-common/ADSP-EDN-extended_def.h rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_def.h diff --git a/include/asm-blackfin/mach-common/bits/bootrom.h b/arch/blackfin/include/asm/mach-common/bits/bootrom.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/bootrom.h rename to arch/blackfin/include/asm/mach-common/bits/bootrom.h diff --git a/include/asm-blackfin/mach-common/bits/core.h b/arch/blackfin/include/asm/mach-common/bits/core.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/core.h rename to arch/blackfin/include/asm/mach-common/bits/core.h diff --git a/include/asm-blackfin/mach-common/bits/dma.h b/arch/blackfin/include/asm/mach-common/bits/dma.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/dma.h rename to arch/blackfin/include/asm/mach-common/bits/dma.h diff --git a/include/asm-blackfin/mach-common/bits/ebiu.h b/arch/blackfin/include/asm/mach-common/bits/ebiu.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ebiu.h rename to arch/blackfin/include/asm/mach-common/bits/ebiu.h diff --git a/include/asm-blackfin/mach-common/bits/emac.h b/arch/blackfin/include/asm/mach-common/bits/emac.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/emac.h rename to arch/blackfin/include/asm/mach-common/bits/emac.h diff --git a/include/asm-blackfin/mach-common/bits/eppi.h b/arch/blackfin/include/asm/mach-common/bits/eppi.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/eppi.h rename to arch/blackfin/include/asm/mach-common/bits/eppi.h diff --git a/include/asm-blackfin/mach-common/bits/lockbox.h b/arch/blackfin/include/asm/mach-common/bits/lockbox.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/lockbox.h rename to arch/blackfin/include/asm/mach-common/bits/lockbox.h diff --git a/include/asm-blackfin/mach-common/bits/mpu.h b/arch/blackfin/include/asm/mach-common/bits/mpu.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/mpu.h rename to arch/blackfin/include/asm/mach-common/bits/mpu.h diff --git a/include/asm-blackfin/mach-common/bits/otp.h b/arch/blackfin/include/asm/mach-common/bits/otp.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/otp.h rename to arch/blackfin/include/asm/mach-common/bits/otp.h diff --git a/include/asm-blackfin/mach-common/bits/pata.h b/arch/blackfin/include/asm/mach-common/bits/pata.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/pata.h rename to arch/blackfin/include/asm/mach-common/bits/pata.h diff --git a/include/asm-blackfin/mach-common/bits/pll.h b/arch/blackfin/include/asm/mach-common/bits/pll.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/pll.h rename to arch/blackfin/include/asm/mach-common/bits/pll.h diff --git a/include/asm-blackfin/mach-common/bits/ports-a.h b/arch/blackfin/include/asm/mach-common/bits/ports-a.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-a.h rename to arch/blackfin/include/asm/mach-common/bits/ports-a.h diff --git a/include/asm-blackfin/mach-common/bits/ports-b.h b/arch/blackfin/include/asm/mach-common/bits/ports-b.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-b.h rename to arch/blackfin/include/asm/mach-common/bits/ports-b.h diff --git a/include/asm-blackfin/mach-common/bits/ports-c.h b/arch/blackfin/include/asm/mach-common/bits/ports-c.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-c.h rename to arch/blackfin/include/asm/mach-common/bits/ports-c.h diff --git a/include/asm-blackfin/mach-common/bits/ports-d.h b/arch/blackfin/include/asm/mach-common/bits/ports-d.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-d.h rename to arch/blackfin/include/asm/mach-common/bits/ports-d.h diff --git a/include/asm-blackfin/mach-common/bits/ports-e.h b/arch/blackfin/include/asm/mach-common/bits/ports-e.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-e.h rename to arch/blackfin/include/asm/mach-common/bits/ports-e.h diff --git a/include/asm-blackfin/mach-common/bits/ports-f.h b/arch/blackfin/include/asm/mach-common/bits/ports-f.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-f.h rename to arch/blackfin/include/asm/mach-common/bits/ports-f.h diff --git a/include/asm-blackfin/mach-common/bits/ports-g.h b/arch/blackfin/include/asm/mach-common/bits/ports-g.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-g.h rename to arch/blackfin/include/asm/mach-common/bits/ports-g.h diff --git a/include/asm-blackfin/mach-common/bits/ports-h.h b/arch/blackfin/include/asm/mach-common/bits/ports-h.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-h.h rename to arch/blackfin/include/asm/mach-common/bits/ports-h.h diff --git a/include/asm-blackfin/mach-common/bits/ports-i.h b/arch/blackfin/include/asm/mach-common/bits/ports-i.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-i.h rename to arch/blackfin/include/asm/mach-common/bits/ports-i.h diff --git a/include/asm-blackfin/mach-common/bits/ports-j.h b/arch/blackfin/include/asm/mach-common/bits/ports-j.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-j.h rename to arch/blackfin/include/asm/mach-common/bits/ports-j.h diff --git a/include/asm-blackfin/mach-common/bits/ppi.h b/arch/blackfin/include/asm/mach-common/bits/ppi.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ppi.h rename to arch/blackfin/include/asm/mach-common/bits/ppi.h diff --git a/include/asm-blackfin/mach-common/bits/rtc.h b/arch/blackfin/include/asm/mach-common/bits/rtc.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/rtc.h rename to arch/blackfin/include/asm/mach-common/bits/rtc.h diff --git a/include/asm-blackfin/mach-common/bits/sdh.h b/arch/blackfin/include/asm/mach-common/bits/sdh.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/sdh.h rename to arch/blackfin/include/asm/mach-common/bits/sdh.h diff --git a/include/asm-blackfin/mach-common/bits/spi.h b/arch/blackfin/include/asm/mach-common/bits/spi.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/spi.h rename to arch/blackfin/include/asm/mach-common/bits/spi.h diff --git a/include/asm-blackfin/mach-common/bits/sport.h b/arch/blackfin/include/asm/mach-common/bits/sport.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/sport.h rename to arch/blackfin/include/asm/mach-common/bits/sport.h diff --git a/include/asm-blackfin/mach-common/bits/timer.h b/arch/blackfin/include/asm/mach-common/bits/timer.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/timer.h rename to arch/blackfin/include/asm/mach-common/bits/timer.h diff --git a/include/asm-blackfin/mach-common/bits/trace.h b/arch/blackfin/include/asm/mach-common/bits/trace.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/trace.h rename to arch/blackfin/include/asm/mach-common/bits/trace.h diff --git a/include/asm-blackfin/mach-common/bits/twi.h b/arch/blackfin/include/asm/mach-common/bits/twi.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/twi.h rename to arch/blackfin/include/asm/mach-common/bits/twi.h diff --git a/include/asm-blackfin/mach-common/bits/uart.h b/arch/blackfin/include/asm/mach-common/bits/uart.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/uart.h rename to arch/blackfin/include/asm/mach-common/bits/uart.h diff --git a/include/asm-blackfin/mach-common/bits/watchdog.h b/arch/blackfin/include/asm/mach-common/bits/watchdog.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/watchdog.h rename to arch/blackfin/include/asm/mach-common/bits/watchdog.h diff --git a/include/asm-blackfin/mmc.h b/arch/blackfin/include/asm/mmc.h similarity index 100% rename from include/asm-blackfin/mmc.h rename to arch/blackfin/include/asm/mmc.h diff --git a/include/asm-blackfin/net.h b/arch/blackfin/include/asm/net.h similarity index 100% rename from include/asm-blackfin/net.h rename to arch/blackfin/include/asm/net.h diff --git a/include/asm-blackfin/posix_types.h b/arch/blackfin/include/asm/posix_types.h similarity index 100% rename from include/asm-blackfin/posix_types.h rename to arch/blackfin/include/asm/posix_types.h diff --git a/include/asm-blackfin/processor.h b/arch/blackfin/include/asm/processor.h similarity index 100% rename from include/asm-blackfin/processor.h rename to arch/blackfin/include/asm/processor.h diff --git a/include/asm-blackfin/ptrace.h b/arch/blackfin/include/asm/ptrace.h similarity index 100% rename from include/asm-blackfin/ptrace.h rename to arch/blackfin/include/asm/ptrace.h diff --git a/include/asm-blackfin/shared_resources.h b/arch/blackfin/include/asm/shared_resources.h similarity index 100% rename from include/asm-blackfin/shared_resources.h rename to arch/blackfin/include/asm/shared_resources.h diff --git a/include/asm-blackfin/string.h b/arch/blackfin/include/asm/string.h similarity index 100% rename from include/asm-blackfin/string.h rename to arch/blackfin/include/asm/string.h diff --git a/include/asm-blackfin/system.h b/arch/blackfin/include/asm/system.h similarity index 100% rename from include/asm-blackfin/system.h rename to arch/blackfin/include/asm/system.h diff --git a/include/asm-blackfin/traps.h b/arch/blackfin/include/asm/traps.h similarity index 100% rename from include/asm-blackfin/traps.h rename to arch/blackfin/include/asm/traps.h diff --git a/include/asm-blackfin/types.h b/arch/blackfin/include/asm/types.h similarity index 100% rename from include/asm-blackfin/types.h rename to arch/blackfin/include/asm/types.h diff --git a/include/asm-blackfin/u-boot.h b/arch/blackfin/include/asm/u-boot.h similarity index 100% rename from include/asm-blackfin/u-boot.h rename to arch/blackfin/include/asm/u-boot.h diff --git a/include/asm-i386/bitops.h b/arch/i386/include/asm/bitops.h similarity index 100% rename from include/asm-i386/bitops.h rename to arch/i386/include/asm/bitops.h diff --git a/include/asm-i386/byteorder.h b/arch/i386/include/asm/byteorder.h similarity index 100% rename from include/asm-i386/byteorder.h rename to arch/i386/include/asm/byteorder.h diff --git a/include/asm-i386/config.h b/arch/i386/include/asm/config.h similarity index 100% rename from include/asm-i386/config.h rename to arch/i386/include/asm/config.h diff --git a/include/asm-i386/errno.h b/arch/i386/include/asm/errno.h similarity index 100% rename from include/asm-i386/errno.h rename to arch/i386/include/asm/errno.h diff --git a/include/asm-i386/global_data.h b/arch/i386/include/asm/global_data.h similarity index 100% rename from include/asm-i386/global_data.h rename to arch/i386/include/asm/global_data.h diff --git a/include/asm-i386/i8254.h b/arch/i386/include/asm/i8254.h similarity index 100% rename from include/asm-i386/i8254.h rename to arch/i386/include/asm/i8254.h diff --git a/include/asm-i386/i8259.h b/arch/i386/include/asm/i8259.h similarity index 100% rename from include/asm-i386/i8259.h rename to arch/i386/include/asm/i8259.h diff --git a/include/asm-i386/ibmpc.h b/arch/i386/include/asm/ibmpc.h similarity index 100% rename from include/asm-i386/ibmpc.h rename to arch/i386/include/asm/ibmpc.h diff --git a/include/asm-i386/ic/pci.h b/arch/i386/include/asm/ic/pci.h similarity index 100% rename from include/asm-i386/ic/pci.h rename to arch/i386/include/asm/ic/pci.h diff --git a/include/asm-i386/ic/sc520.h b/arch/i386/include/asm/ic/sc520.h similarity index 100% rename from include/asm-i386/ic/sc520.h rename to arch/i386/include/asm/ic/sc520.h diff --git a/include/asm-i386/ic/ssi.h b/arch/i386/include/asm/ic/ssi.h similarity index 100% rename from include/asm-i386/ic/ssi.h rename to arch/i386/include/asm/ic/ssi.h diff --git a/include/asm-i386/interrupt.h b/arch/i386/include/asm/interrupt.h similarity index 100% rename from include/asm-i386/interrupt.h rename to arch/i386/include/asm/interrupt.h diff --git a/include/asm-i386/io.h b/arch/i386/include/asm/io.h similarity index 100% rename from include/asm-i386/io.h rename to arch/i386/include/asm/io.h diff --git a/include/asm-i386/pci.h b/arch/i386/include/asm/pci.h similarity index 100% rename from include/asm-i386/pci.h rename to arch/i386/include/asm/pci.h diff --git a/include/asm-i386/posix_types.h b/arch/i386/include/asm/posix_types.h similarity index 100% rename from include/asm-i386/posix_types.h rename to arch/i386/include/asm/posix_types.h diff --git a/include/asm-i386/processor.h b/arch/i386/include/asm/processor.h similarity index 100% rename from include/asm-i386/processor.h rename to arch/i386/include/asm/processor.h diff --git a/include/asm-i386/ptrace.h b/arch/i386/include/asm/ptrace.h similarity index 100% rename from include/asm-i386/ptrace.h rename to arch/i386/include/asm/ptrace.h diff --git a/include/asm-i386/realmode.h b/arch/i386/include/asm/realmode.h similarity index 100% rename from include/asm-i386/realmode.h rename to arch/i386/include/asm/realmode.h diff --git a/include/asm-i386/string.h b/arch/i386/include/asm/string.h similarity index 100% rename from include/asm-i386/string.h rename to arch/i386/include/asm/string.h diff --git a/include/asm-i386/types.h b/arch/i386/include/asm/types.h similarity index 100% rename from include/asm-i386/types.h rename to arch/i386/include/asm/types.h diff --git a/include/asm-i386/u-boot-i386.h b/arch/i386/include/asm/u-boot-i386.h similarity index 100% rename from include/asm-i386/u-boot-i386.h rename to arch/i386/include/asm/u-boot-i386.h diff --git a/include/asm-i386/u-boot.h b/arch/i386/include/asm/u-boot.h similarity index 100% rename from include/asm-i386/u-boot.h rename to arch/i386/include/asm/u-boot.h diff --git a/include/asm-i386/zimage.h b/arch/i386/include/asm/zimage.h similarity index 100% rename from include/asm-i386/zimage.h rename to arch/i386/include/asm/zimage.h diff --git a/include/asm-m68k/bitops.h b/arch/m68k/include/asm/bitops.h similarity index 100% rename from include/asm-m68k/bitops.h rename to arch/m68k/include/asm/bitops.h diff --git a/include/asm-m68k/byteorder.h b/arch/m68k/include/asm/byteorder.h similarity index 100% rename from include/asm-m68k/byteorder.h rename to arch/m68k/include/asm/byteorder.h diff --git a/include/asm-m68k/coldfire/ata.h b/arch/m68k/include/asm/coldfire/ata.h similarity index 100% rename from include/asm-m68k/coldfire/ata.h rename to arch/m68k/include/asm/coldfire/ata.h diff --git a/include/asm-m68k/coldfire/crossbar.h b/arch/m68k/include/asm/coldfire/crossbar.h similarity index 100% rename from include/asm-m68k/coldfire/crossbar.h rename to arch/m68k/include/asm/coldfire/crossbar.h diff --git a/include/asm-m68k/coldfire/dspi.h b/arch/m68k/include/asm/coldfire/dspi.h similarity index 100% rename from include/asm-m68k/coldfire/dspi.h rename to arch/m68k/include/asm/coldfire/dspi.h diff --git a/include/asm-m68k/coldfire/edma.h b/arch/m68k/include/asm/coldfire/edma.h similarity index 100% rename from include/asm-m68k/coldfire/edma.h rename to arch/m68k/include/asm/coldfire/edma.h diff --git a/include/asm-m68k/coldfire/eport.h b/arch/m68k/include/asm/coldfire/eport.h similarity index 100% rename from include/asm-m68k/coldfire/eport.h rename to arch/m68k/include/asm/coldfire/eport.h diff --git a/include/asm-m68k/coldfire/flexbus.h b/arch/m68k/include/asm/coldfire/flexbus.h similarity index 100% rename from include/asm-m68k/coldfire/flexbus.h rename to arch/m68k/include/asm/coldfire/flexbus.h diff --git a/include/asm-m68k/coldfire/flexcan.h b/arch/m68k/include/asm/coldfire/flexcan.h similarity index 100% rename from include/asm-m68k/coldfire/flexcan.h rename to arch/m68k/include/asm/coldfire/flexcan.h diff --git a/include/asm-m68k/coldfire/intctrl.h b/arch/m68k/include/asm/coldfire/intctrl.h similarity index 100% rename from include/asm-m68k/coldfire/intctrl.h rename to arch/m68k/include/asm/coldfire/intctrl.h diff --git a/include/asm-m68k/coldfire/lcd.h b/arch/m68k/include/asm/coldfire/lcd.h similarity index 100% rename from include/asm-m68k/coldfire/lcd.h rename to arch/m68k/include/asm/coldfire/lcd.h diff --git a/include/asm-m68k/coldfire/mdha.h b/arch/m68k/include/asm/coldfire/mdha.h similarity index 100% rename from include/asm-m68k/coldfire/mdha.h rename to arch/m68k/include/asm/coldfire/mdha.h diff --git a/include/asm-m68k/coldfire/pwm.h b/arch/m68k/include/asm/coldfire/pwm.h similarity index 100% rename from include/asm-m68k/coldfire/pwm.h rename to arch/m68k/include/asm/coldfire/pwm.h diff --git a/include/asm-m68k/coldfire/qspi.h b/arch/m68k/include/asm/coldfire/qspi.h similarity index 100% rename from include/asm-m68k/coldfire/qspi.h rename to arch/m68k/include/asm/coldfire/qspi.h diff --git a/include/asm-m68k/coldfire/rng.h b/arch/m68k/include/asm/coldfire/rng.h similarity index 100% rename from include/asm-m68k/coldfire/rng.h rename to arch/m68k/include/asm/coldfire/rng.h diff --git a/include/asm-m68k/coldfire/skha.h b/arch/m68k/include/asm/coldfire/skha.h similarity index 100% rename from include/asm-m68k/coldfire/skha.h rename to arch/m68k/include/asm/coldfire/skha.h diff --git a/include/asm-m68k/coldfire/ssi.h b/arch/m68k/include/asm/coldfire/ssi.h similarity index 100% rename from include/asm-m68k/coldfire/ssi.h rename to arch/m68k/include/asm/coldfire/ssi.h diff --git a/include/asm-m68k/config.h b/arch/m68k/include/asm/config.h similarity index 100% rename from include/asm-m68k/config.h rename to arch/m68k/include/asm/config.h diff --git a/include/asm-m68k/errno.h b/arch/m68k/include/asm/errno.h similarity index 100% rename from include/asm-m68k/errno.h rename to arch/m68k/include/asm/errno.h diff --git a/include/asm-m68k/fec.h b/arch/m68k/include/asm/fec.h similarity index 100% rename from include/asm-m68k/fec.h rename to arch/m68k/include/asm/fec.h diff --git a/include/asm-m68k/fsl_i2c.h b/arch/m68k/include/asm/fsl_i2c.h similarity index 100% rename from include/asm-m68k/fsl_i2c.h rename to arch/m68k/include/asm/fsl_i2c.h diff --git a/include/asm-m68k/fsl_mcdmafec.h b/arch/m68k/include/asm/fsl_mcdmafec.h similarity index 100% rename from include/asm-m68k/fsl_mcdmafec.h rename to arch/m68k/include/asm/fsl_mcdmafec.h diff --git a/include/asm-m68k/global_data.h b/arch/m68k/include/asm/global_data.h similarity index 100% rename from include/asm-m68k/global_data.h rename to arch/m68k/include/asm/global_data.h diff --git a/include/asm-m68k/immap.h b/arch/m68k/include/asm/immap.h similarity index 100% rename from include/asm-m68k/immap.h rename to arch/m68k/include/asm/immap.h diff --git a/include/asm-m68k/immap_520x.h b/arch/m68k/include/asm/immap_520x.h similarity index 100% rename from include/asm-m68k/immap_520x.h rename to arch/m68k/include/asm/immap_520x.h diff --git a/include/asm-m68k/immap_5227x.h b/arch/m68k/include/asm/immap_5227x.h similarity index 100% rename from include/asm-m68k/immap_5227x.h rename to arch/m68k/include/asm/immap_5227x.h diff --git a/include/asm-m68k/immap_5235.h b/arch/m68k/include/asm/immap_5235.h similarity index 100% rename from include/asm-m68k/immap_5235.h rename to arch/m68k/include/asm/immap_5235.h diff --git a/include/asm-m68k/immap_5249.h b/arch/m68k/include/asm/immap_5249.h similarity index 100% rename from include/asm-m68k/immap_5249.h rename to arch/m68k/include/asm/immap_5249.h diff --git a/include/asm-m68k/immap_5253.h b/arch/m68k/include/asm/immap_5253.h similarity index 100% rename from include/asm-m68k/immap_5253.h rename to arch/m68k/include/asm/immap_5253.h diff --git a/include/asm-m68k/immap_5271.h b/arch/m68k/include/asm/immap_5271.h similarity index 100% rename from include/asm-m68k/immap_5271.h rename to arch/m68k/include/asm/immap_5271.h diff --git a/include/asm-m68k/immap_5272.h b/arch/m68k/include/asm/immap_5272.h similarity index 100% rename from include/asm-m68k/immap_5272.h rename to arch/m68k/include/asm/immap_5272.h diff --git a/include/asm-m68k/immap_5275.h b/arch/m68k/include/asm/immap_5275.h similarity index 100% rename from include/asm-m68k/immap_5275.h rename to arch/m68k/include/asm/immap_5275.h diff --git a/include/asm-m68k/immap_5282.h b/arch/m68k/include/asm/immap_5282.h similarity index 100% rename from include/asm-m68k/immap_5282.h rename to arch/m68k/include/asm/immap_5282.h diff --git a/include/asm-m68k/immap_5301x.h b/arch/m68k/include/asm/immap_5301x.h similarity index 100% rename from include/asm-m68k/immap_5301x.h rename to arch/m68k/include/asm/immap_5301x.h diff --git a/include/asm-m68k/immap_5329.h b/arch/m68k/include/asm/immap_5329.h similarity index 100% rename from include/asm-m68k/immap_5329.h rename to arch/m68k/include/asm/immap_5329.h diff --git a/include/asm-m68k/immap_5445x.h b/arch/m68k/include/asm/immap_5445x.h similarity index 100% rename from include/asm-m68k/immap_5445x.h rename to arch/m68k/include/asm/immap_5445x.h diff --git a/include/asm-m68k/immap_547x_8x.h b/arch/m68k/include/asm/immap_547x_8x.h similarity index 100% rename from include/asm-m68k/immap_547x_8x.h rename to arch/m68k/include/asm/immap_547x_8x.h diff --git a/include/asm-m68k/io.h b/arch/m68k/include/asm/io.h similarity index 100% rename from include/asm-m68k/io.h rename to arch/m68k/include/asm/io.h diff --git a/include/asm-m68k/m520x.h b/arch/m68k/include/asm/m520x.h similarity index 100% rename from include/asm-m68k/m520x.h rename to arch/m68k/include/asm/m520x.h diff --git a/include/asm-m68k/m5227x.h b/arch/m68k/include/asm/m5227x.h similarity index 100% rename from include/asm-m68k/m5227x.h rename to arch/m68k/include/asm/m5227x.h diff --git a/include/asm-m68k/m5235.h b/arch/m68k/include/asm/m5235.h similarity index 100% rename from include/asm-m68k/m5235.h rename to arch/m68k/include/asm/m5235.h diff --git a/include/asm-m68k/m5249.h b/arch/m68k/include/asm/m5249.h similarity index 100% rename from include/asm-m68k/m5249.h rename to arch/m68k/include/asm/m5249.h diff --git a/include/asm-m68k/m5253.h b/arch/m68k/include/asm/m5253.h similarity index 100% rename from include/asm-m68k/m5253.h rename to arch/m68k/include/asm/m5253.h diff --git a/include/asm-m68k/m5271.h b/arch/m68k/include/asm/m5271.h similarity index 100% rename from include/asm-m68k/m5271.h rename to arch/m68k/include/asm/m5271.h diff --git a/include/asm-m68k/m5272.h b/arch/m68k/include/asm/m5272.h similarity index 100% rename from include/asm-m68k/m5272.h rename to arch/m68k/include/asm/m5272.h diff --git a/include/asm-m68k/m5275.h b/arch/m68k/include/asm/m5275.h similarity index 100% rename from include/asm-m68k/m5275.h rename to arch/m68k/include/asm/m5275.h diff --git a/include/asm-m68k/m5282.h b/arch/m68k/include/asm/m5282.h similarity index 100% rename from include/asm-m68k/m5282.h rename to arch/m68k/include/asm/m5282.h diff --git a/include/asm-m68k/m5301x.h b/arch/m68k/include/asm/m5301x.h similarity index 100% rename from include/asm-m68k/m5301x.h rename to arch/m68k/include/asm/m5301x.h diff --git a/include/asm-m68k/m5329.h b/arch/m68k/include/asm/m5329.h similarity index 100% rename from include/asm-m68k/m5329.h rename to arch/m68k/include/asm/m5329.h diff --git a/include/asm-m68k/m5445x.h b/arch/m68k/include/asm/m5445x.h similarity index 100% rename from include/asm-m68k/m5445x.h rename to arch/m68k/include/asm/m5445x.h diff --git a/include/asm-m68k/m547x_8x.h b/arch/m68k/include/asm/m547x_8x.h similarity index 100% rename from include/asm-m68k/m547x_8x.h rename to arch/m68k/include/asm/m547x_8x.h diff --git a/include/asm-m68k/posix_types.h b/arch/m68k/include/asm/posix_types.h similarity index 100% rename from include/asm-m68k/posix_types.h rename to arch/m68k/include/asm/posix_types.h diff --git a/include/asm-m68k/processor.h b/arch/m68k/include/asm/processor.h similarity index 100% rename from include/asm-m68k/processor.h rename to arch/m68k/include/asm/processor.h diff --git a/include/asm-m68k/ptrace.h b/arch/m68k/include/asm/ptrace.h similarity index 100% rename from include/asm-m68k/ptrace.h rename to arch/m68k/include/asm/ptrace.h diff --git a/include/asm-m68k/rtc.h b/arch/m68k/include/asm/rtc.h similarity index 100% rename from include/asm-m68k/rtc.h rename to arch/m68k/include/asm/rtc.h diff --git a/include/asm-m68k/string.h b/arch/m68k/include/asm/string.h similarity index 100% rename from include/asm-m68k/string.h rename to arch/m68k/include/asm/string.h diff --git a/include/asm-m68k/timer.h b/arch/m68k/include/asm/timer.h similarity index 100% rename from include/asm-m68k/timer.h rename to arch/m68k/include/asm/timer.h diff --git a/include/asm-m68k/types.h b/arch/m68k/include/asm/types.h similarity index 100% rename from include/asm-m68k/types.h rename to arch/m68k/include/asm/types.h diff --git a/include/asm-m68k/u-boot.h b/arch/m68k/include/asm/u-boot.h similarity index 100% rename from include/asm-m68k/u-boot.h rename to arch/m68k/include/asm/u-boot.h diff --git a/include/asm-m68k/uart.h b/arch/m68k/include/asm/uart.h similarity index 100% rename from include/asm-m68k/uart.h rename to arch/m68k/include/asm/uart.h diff --git a/include/asm-microblaze/asm.h b/arch/microblaze/include/asm/asm.h similarity index 100% rename from include/asm-microblaze/asm.h rename to arch/microblaze/include/asm/asm.h diff --git a/include/asm-microblaze/bitops.h b/arch/microblaze/include/asm/bitops.h similarity index 100% rename from include/asm-microblaze/bitops.h rename to arch/microblaze/include/asm/bitops.h diff --git a/include/asm-microblaze/byteorder.h b/arch/microblaze/include/asm/byteorder.h similarity index 100% rename from include/asm-microblaze/byteorder.h rename to arch/microblaze/include/asm/byteorder.h diff --git a/include/asm-microblaze/config.h b/arch/microblaze/include/asm/config.h similarity index 100% rename from include/asm-microblaze/config.h rename to arch/microblaze/include/asm/config.h diff --git a/include/asm-microblaze/errno.h b/arch/microblaze/include/asm/errno.h similarity index 100% rename from include/asm-microblaze/errno.h rename to arch/microblaze/include/asm/errno.h diff --git a/include/asm-microblaze/global_data.h b/arch/microblaze/include/asm/global_data.h similarity index 100% rename from include/asm-microblaze/global_data.h rename to arch/microblaze/include/asm/global_data.h diff --git a/include/asm-microblaze/io.h b/arch/microblaze/include/asm/io.h similarity index 100% rename from include/asm-microblaze/io.h rename to arch/microblaze/include/asm/io.h diff --git a/include/asm-microblaze/microblaze_intc.h b/arch/microblaze/include/asm/microblaze_intc.h similarity index 100% rename from include/asm-microblaze/microblaze_intc.h rename to arch/microblaze/include/asm/microblaze_intc.h diff --git a/include/asm-microblaze/microblaze_timer.h b/arch/microblaze/include/asm/microblaze_timer.h similarity index 100% rename from include/asm-microblaze/microblaze_timer.h rename to arch/microblaze/include/asm/microblaze_timer.h diff --git a/include/asm-microblaze/posix_types.h b/arch/microblaze/include/asm/posix_types.h similarity index 100% rename from include/asm-microblaze/posix_types.h rename to arch/microblaze/include/asm/posix_types.h diff --git a/include/asm-microblaze/processor.h b/arch/microblaze/include/asm/processor.h similarity index 100% rename from include/asm-microblaze/processor.h rename to arch/microblaze/include/asm/processor.h diff --git a/include/asm-microblaze/ptrace.h b/arch/microblaze/include/asm/ptrace.h similarity index 100% rename from include/asm-microblaze/ptrace.h rename to arch/microblaze/include/asm/ptrace.h diff --git a/include/asm-microblaze/string.h b/arch/microblaze/include/asm/string.h similarity index 100% rename from include/asm-microblaze/string.h rename to arch/microblaze/include/asm/string.h diff --git a/include/asm-microblaze/system.h b/arch/microblaze/include/asm/system.h similarity index 100% rename from include/asm-microblaze/system.h rename to arch/microblaze/include/asm/system.h diff --git a/include/asm-microblaze/types.h b/arch/microblaze/include/asm/types.h similarity index 100% rename from include/asm-microblaze/types.h rename to arch/microblaze/include/asm/types.h diff --git a/include/asm-microblaze/u-boot.h b/arch/microblaze/include/asm/u-boot.h similarity index 100% rename from include/asm-microblaze/u-boot.h rename to arch/microblaze/include/asm/u-boot.h diff --git a/include/asm-mips/addrspace.h b/arch/mips/include/asm/addrspace.h similarity index 100% rename from include/asm-mips/addrspace.h rename to arch/mips/include/asm/addrspace.h diff --git a/include/asm-mips/asm.h b/arch/mips/include/asm/asm.h similarity index 100% rename from include/asm-mips/asm.h rename to arch/mips/include/asm/asm.h diff --git a/include/asm-mips/au1x00.h b/arch/mips/include/asm/au1x00.h similarity index 100% rename from include/asm-mips/au1x00.h rename to arch/mips/include/asm/au1x00.h diff --git a/include/asm-mips/bitops.h b/arch/mips/include/asm/bitops.h similarity index 100% rename from include/asm-mips/bitops.h rename to arch/mips/include/asm/bitops.h diff --git a/include/asm-mips/byteorder.h b/arch/mips/include/asm/byteorder.h similarity index 100% rename from include/asm-mips/byteorder.h rename to arch/mips/include/asm/byteorder.h diff --git a/include/asm-mips/cachectl.h b/arch/mips/include/asm/cachectl.h similarity index 100% rename from include/asm-mips/cachectl.h rename to arch/mips/include/asm/cachectl.h diff --git a/include/asm-mips/cacheops.h b/arch/mips/include/asm/cacheops.h similarity index 100% rename from include/asm-mips/cacheops.h rename to arch/mips/include/asm/cacheops.h diff --git a/include/asm-mips/config.h b/arch/mips/include/asm/config.h similarity index 100% rename from include/asm-mips/config.h rename to arch/mips/include/asm/config.h diff --git a/include/asm-mips/errno.h b/arch/mips/include/asm/errno.h similarity index 100% rename from include/asm-mips/errno.h rename to arch/mips/include/asm/errno.h diff --git a/include/asm-mips/global_data.h b/arch/mips/include/asm/global_data.h similarity index 100% rename from include/asm-mips/global_data.h rename to arch/mips/include/asm/global_data.h diff --git a/include/asm-mips/inca-ip.h b/arch/mips/include/asm/inca-ip.h similarity index 100% rename from include/asm-mips/inca-ip.h rename to arch/mips/include/asm/inca-ip.h diff --git a/include/asm-mips/io.h b/arch/mips/include/asm/io.h similarity index 100% rename from include/asm-mips/io.h rename to arch/mips/include/asm/io.h diff --git a/include/asm-mips/isadep.h b/arch/mips/include/asm/isadep.h similarity index 100% rename from include/asm-mips/isadep.h rename to arch/mips/include/asm/isadep.h diff --git a/include/asm-mips/mipsregs.h b/arch/mips/include/asm/mipsregs.h similarity index 100% rename from include/asm-mips/mipsregs.h rename to arch/mips/include/asm/mipsregs.h diff --git a/include/asm-mips/posix_types.h b/arch/mips/include/asm/posix_types.h similarity index 100% rename from include/asm-mips/posix_types.h rename to arch/mips/include/asm/posix_types.h diff --git a/include/asm-mips/processor.h b/arch/mips/include/asm/processor.h similarity index 100% rename from include/asm-mips/processor.h rename to arch/mips/include/asm/processor.h diff --git a/include/asm-mips/ptrace.h b/arch/mips/include/asm/ptrace.h similarity index 100% rename from include/asm-mips/ptrace.h rename to arch/mips/include/asm/ptrace.h diff --git a/include/asm-mips/reboot.h b/arch/mips/include/asm/reboot.h similarity index 100% rename from include/asm-mips/reboot.h rename to arch/mips/include/asm/reboot.h diff --git a/include/asm-mips/reg.h b/arch/mips/include/asm/reg.h similarity index 100% rename from include/asm-mips/reg.h rename to arch/mips/include/asm/reg.h diff --git a/include/asm-mips/regdef.h b/arch/mips/include/asm/regdef.h similarity index 100% rename from include/asm-mips/regdef.h rename to arch/mips/include/asm/regdef.h diff --git a/include/asm-mips/sgidefs.h b/arch/mips/include/asm/sgidefs.h similarity index 100% rename from include/asm-mips/sgidefs.h rename to arch/mips/include/asm/sgidefs.h diff --git a/include/asm-mips/string.h b/arch/mips/include/asm/string.h similarity index 100% rename from include/asm-mips/string.h rename to arch/mips/include/asm/string.h diff --git a/include/asm-mips/system.h b/arch/mips/include/asm/system.h similarity index 100% rename from include/asm-mips/system.h rename to arch/mips/include/asm/system.h diff --git a/include/asm-mips/types.h b/arch/mips/include/asm/types.h similarity index 100% rename from include/asm-mips/types.h rename to arch/mips/include/asm/types.h diff --git a/include/asm-mips/u-boot.h b/arch/mips/include/asm/u-boot.h similarity index 100% rename from include/asm-mips/u-boot.h rename to arch/mips/include/asm/u-boot.h diff --git a/include/asm-nios/bitops.h b/arch/nios/include/asm/bitops.h similarity index 100% rename from include/asm-nios/bitops.h rename to arch/nios/include/asm/bitops.h diff --git a/include/asm-nios/byteorder.h b/arch/nios/include/asm/byteorder.h similarity index 100% rename from include/asm-nios/byteorder.h rename to arch/nios/include/asm/byteorder.h diff --git a/include/asm-nios/cache.h b/arch/nios/include/asm/cache.h similarity index 100% rename from include/asm-nios/cache.h rename to arch/nios/include/asm/cache.h diff --git a/include/asm-nios/config.h b/arch/nios/include/asm/config.h similarity index 100% rename from include/asm-nios/config.h rename to arch/nios/include/asm/config.h diff --git a/include/asm-nios/global_data.h b/arch/nios/include/asm/global_data.h similarity index 100% rename from include/asm-nios/global_data.h rename to arch/nios/include/asm/global_data.h diff --git a/include/asm-nios/io.h b/arch/nios/include/asm/io.h similarity index 100% rename from include/asm-nios/io.h rename to arch/nios/include/asm/io.h diff --git a/include/asm-nios/posix_types.h b/arch/nios/include/asm/posix_types.h similarity index 100% rename from include/asm-nios/posix_types.h rename to arch/nios/include/asm/posix_types.h diff --git a/include/asm-nios/processor.h b/arch/nios/include/asm/processor.h similarity index 100% rename from include/asm-nios/processor.h rename to arch/nios/include/asm/processor.h diff --git a/include/asm-nios/psr.h b/arch/nios/include/asm/psr.h similarity index 100% rename from include/asm-nios/psr.h rename to arch/nios/include/asm/psr.h diff --git a/include/asm-nios/ptrace.h b/arch/nios/include/asm/ptrace.h similarity index 100% rename from include/asm-nios/ptrace.h rename to arch/nios/include/asm/ptrace.h diff --git a/include/asm-nios/status_led.h b/arch/nios/include/asm/status_led.h similarity index 100% rename from include/asm-nios/status_led.h rename to arch/nios/include/asm/status_led.h diff --git a/include/asm-nios/string.h b/arch/nios/include/asm/string.h similarity index 100% rename from include/asm-nios/string.h rename to arch/nios/include/asm/string.h diff --git a/include/asm-nios/system.h b/arch/nios/include/asm/system.h similarity index 100% rename from include/asm-nios/system.h rename to arch/nios/include/asm/system.h diff --git a/include/asm-nios/types.h b/arch/nios/include/asm/types.h similarity index 100% rename from include/asm-nios/types.h rename to arch/nios/include/asm/types.h diff --git a/include/asm-nios/u-boot.h b/arch/nios/include/asm/u-boot.h similarity index 100% rename from include/asm-nios/u-boot.h rename to arch/nios/include/asm/u-boot.h diff --git a/include/asm-nios2/bitops.h b/arch/nios2/include/asm/bitops.h similarity index 100% rename from include/asm-nios2/bitops.h rename to arch/nios2/include/asm/bitops.h diff --git a/include/asm-nios2/byteorder.h b/arch/nios2/include/asm/byteorder.h similarity index 100% rename from include/asm-nios2/byteorder.h rename to arch/nios2/include/asm/byteorder.h diff --git a/include/asm-nios2/cache.h b/arch/nios2/include/asm/cache.h similarity index 100% rename from include/asm-nios2/cache.h rename to arch/nios2/include/asm/cache.h diff --git a/include/asm-nios2/config.h b/arch/nios2/include/asm/config.h similarity index 100% rename from include/asm-nios2/config.h rename to arch/nios2/include/asm/config.h diff --git a/include/asm-nios2/global_data.h b/arch/nios2/include/asm/global_data.h similarity index 100% rename from include/asm-nios2/global_data.h rename to arch/nios2/include/asm/global_data.h diff --git a/include/asm-nios2/io.h b/arch/nios2/include/asm/io.h similarity index 100% rename from include/asm-nios2/io.h rename to arch/nios2/include/asm/io.h diff --git a/include/asm-nios2/opcodes.h b/arch/nios2/include/asm/opcodes.h similarity index 100% rename from include/asm-nios2/opcodes.h rename to arch/nios2/include/asm/opcodes.h diff --git a/include/asm-nios2/posix_types.h b/arch/nios2/include/asm/posix_types.h similarity index 100% rename from include/asm-nios2/posix_types.h rename to arch/nios2/include/asm/posix_types.h diff --git a/include/asm-nios2/processor.h b/arch/nios2/include/asm/processor.h similarity index 100% rename from include/asm-nios2/processor.h rename to arch/nios2/include/asm/processor.h diff --git a/include/asm-nios2/psr.h b/arch/nios2/include/asm/psr.h similarity index 100% rename from include/asm-nios2/psr.h rename to arch/nios2/include/asm/psr.h diff --git a/include/asm-nios2/ptrace.h b/arch/nios2/include/asm/ptrace.h similarity index 100% rename from include/asm-nios2/ptrace.h rename to arch/nios2/include/asm/ptrace.h diff --git a/include/asm-nios2/status_led.h b/arch/nios2/include/asm/status_led.h similarity index 100% rename from include/asm-nios2/status_led.h rename to arch/nios2/include/asm/status_led.h diff --git a/include/asm-nios2/string.h b/arch/nios2/include/asm/string.h similarity index 100% rename from include/asm-nios2/string.h rename to arch/nios2/include/asm/string.h diff --git a/include/asm-nios2/system.h b/arch/nios2/include/asm/system.h similarity index 100% rename from include/asm-nios2/system.h rename to arch/nios2/include/asm/system.h diff --git a/include/asm-nios2/types.h b/arch/nios2/include/asm/types.h similarity index 100% rename from include/asm-nios2/types.h rename to arch/nios2/include/asm/types.h diff --git a/include/asm-nios2/u-boot.h b/arch/nios2/include/asm/u-boot.h similarity index 100% rename from include/asm-nios2/u-boot.h rename to arch/nios2/include/asm/u-boot.h diff --git a/include/asm-ppc/4xx_pci.h b/arch/ppc/include/asm/4xx_pci.h similarity index 100% rename from include/asm-ppc/4xx_pci.h rename to arch/ppc/include/asm/4xx_pci.h diff --git a/include/asm-ppc/4xx_pcie.h b/arch/ppc/include/asm/4xx_pcie.h similarity index 100% rename from include/asm-ppc/4xx_pcie.h rename to arch/ppc/include/asm/4xx_pcie.h diff --git a/include/asm-ppc/5xx_immap.h b/arch/ppc/include/asm/5xx_immap.h similarity index 100% rename from include/asm-ppc/5xx_immap.h rename to arch/ppc/include/asm/5xx_immap.h diff --git a/include/asm-ppc/8xx_immap.h b/arch/ppc/include/asm/8xx_immap.h similarity index 100% rename from include/asm-ppc/8xx_immap.h rename to arch/ppc/include/asm/8xx_immap.h diff --git a/include/asm-ppc/atomic.h b/arch/ppc/include/asm/atomic.h similarity index 100% rename from include/asm-ppc/atomic.h rename to arch/ppc/include/asm/atomic.h diff --git a/include/asm-ppc/bitops.h b/arch/ppc/include/asm/bitops.h similarity index 100% rename from include/asm-ppc/bitops.h rename to arch/ppc/include/asm/bitops.h diff --git a/include/asm-ppc/byteorder.h b/arch/ppc/include/asm/byteorder.h similarity index 100% rename from include/asm-ppc/byteorder.h rename to arch/ppc/include/asm/byteorder.h diff --git a/include/asm-ppc/cache.h b/arch/ppc/include/asm/cache.h similarity index 100% rename from include/asm-ppc/cache.h rename to arch/ppc/include/asm/cache.h diff --git a/include/asm-ppc/config.h b/arch/ppc/include/asm/config.h similarity index 100% rename from include/asm-ppc/config.h rename to arch/ppc/include/asm/config.h diff --git a/include/asm-ppc/cpm_8260.h b/arch/ppc/include/asm/cpm_8260.h similarity index 100% rename from include/asm-ppc/cpm_8260.h rename to arch/ppc/include/asm/cpm_8260.h diff --git a/include/asm-ppc/cpm_85xx.h b/arch/ppc/include/asm/cpm_85xx.h similarity index 100% rename from include/asm-ppc/cpm_85xx.h rename to arch/ppc/include/asm/cpm_85xx.h diff --git a/include/asm-ppc/e300.h b/arch/ppc/include/asm/e300.h similarity index 100% rename from include/asm-ppc/e300.h rename to arch/ppc/include/asm/e300.h diff --git a/include/asm-ppc/errno.h b/arch/ppc/include/asm/errno.h similarity index 100% rename from include/asm-ppc/errno.h rename to arch/ppc/include/asm/errno.h diff --git a/include/asm-ppc/fsl_ddr_dimm_params.h b/arch/ppc/include/asm/fsl_ddr_dimm_params.h similarity index 100% rename from include/asm-ppc/fsl_ddr_dimm_params.h rename to arch/ppc/include/asm/fsl_ddr_dimm_params.h diff --git a/include/asm-ppc/fsl_ddr_sdram.h b/arch/ppc/include/asm/fsl_ddr_sdram.h similarity index 100% rename from include/asm-ppc/fsl_ddr_sdram.h rename to arch/ppc/include/asm/fsl_ddr_sdram.h diff --git a/include/asm-ppc/fsl_dma.h b/arch/ppc/include/asm/fsl_dma.h similarity index 100% rename from include/asm-ppc/fsl_dma.h rename to arch/ppc/include/asm/fsl_dma.h diff --git a/include/asm-ppc/fsl_i2c.h b/arch/ppc/include/asm/fsl_i2c.h similarity index 100% rename from include/asm-ppc/fsl_i2c.h rename to arch/ppc/include/asm/fsl_i2c.h diff --git a/include/asm-ppc/fsl_law.h b/arch/ppc/include/asm/fsl_law.h similarity index 100% rename from include/asm-ppc/fsl_law.h rename to arch/ppc/include/asm/fsl_law.h diff --git a/include/asm-ppc/fsl_lbc.h b/arch/ppc/include/asm/fsl_lbc.h similarity index 100% rename from include/asm-ppc/fsl_lbc.h rename to arch/ppc/include/asm/fsl_lbc.h diff --git a/include/asm-ppc/fsl_pci.h b/arch/ppc/include/asm/fsl_pci.h similarity index 100% rename from include/asm-ppc/fsl_pci.h rename to arch/ppc/include/asm/fsl_pci.h diff --git a/include/asm-ppc/fsl_serdes.h b/arch/ppc/include/asm/fsl_serdes.h similarity index 100% rename from include/asm-ppc/fsl_serdes.h rename to arch/ppc/include/asm/fsl_serdes.h diff --git a/include/asm-ppc/global_data.h b/arch/ppc/include/asm/global_data.h similarity index 100% rename from include/asm-ppc/global_data.h rename to arch/ppc/include/asm/global_data.h diff --git a/include/asm-ppc/gpio.h b/arch/ppc/include/asm/gpio.h similarity index 100% rename from include/asm-ppc/gpio.h rename to arch/ppc/include/asm/gpio.h diff --git a/include/asm-ppc/immap_512x.h b/arch/ppc/include/asm/immap_512x.h similarity index 100% rename from include/asm-ppc/immap_512x.h rename to arch/ppc/include/asm/immap_512x.h diff --git a/include/asm-ppc/immap_8220.h b/arch/ppc/include/asm/immap_8220.h similarity index 100% rename from include/asm-ppc/immap_8220.h rename to arch/ppc/include/asm/immap_8220.h diff --git a/include/asm-ppc/immap_8260.h b/arch/ppc/include/asm/immap_8260.h similarity index 100% rename from include/asm-ppc/immap_8260.h rename to arch/ppc/include/asm/immap_8260.h diff --git a/include/asm-ppc/immap_83xx.h b/arch/ppc/include/asm/immap_83xx.h similarity index 100% rename from include/asm-ppc/immap_83xx.h rename to arch/ppc/include/asm/immap_83xx.h diff --git a/include/asm-ppc/immap_85xx.h b/arch/ppc/include/asm/immap_85xx.h similarity index 100% rename from include/asm-ppc/immap_85xx.h rename to arch/ppc/include/asm/immap_85xx.h diff --git a/include/asm-ppc/immap_86xx.h b/arch/ppc/include/asm/immap_86xx.h similarity index 100% rename from include/asm-ppc/immap_86xx.h rename to arch/ppc/include/asm/immap_86xx.h diff --git a/include/asm-ppc/immap_qe.h b/arch/ppc/include/asm/immap_qe.h similarity index 100% rename from include/asm-ppc/immap_qe.h rename to arch/ppc/include/asm/immap_qe.h diff --git a/include/asm-ppc/interrupt.h b/arch/ppc/include/asm/interrupt.h similarity index 100% rename from include/asm-ppc/interrupt.h rename to arch/ppc/include/asm/interrupt.h diff --git a/include/asm-ppc/io.h b/arch/ppc/include/asm/io.h similarity index 100% rename from include/asm-ppc/io.h rename to arch/ppc/include/asm/io.h diff --git a/include/asm-ppc/iopin_8260.h b/arch/ppc/include/asm/iopin_8260.h similarity index 100% rename from include/asm-ppc/iopin_8260.h rename to arch/ppc/include/asm/iopin_8260.h diff --git a/include/asm-ppc/iopin_85xx.h b/arch/ppc/include/asm/iopin_85xx.h similarity index 100% rename from include/asm-ppc/iopin_85xx.h rename to arch/ppc/include/asm/iopin_85xx.h diff --git a/include/asm-ppc/iopin_8xx.h b/arch/ppc/include/asm/iopin_8xx.h similarity index 100% rename from include/asm-ppc/iopin_8xx.h rename to arch/ppc/include/asm/iopin_8xx.h diff --git a/include/asm-ppc/m8260_pci.h b/arch/ppc/include/asm/m8260_pci.h similarity index 100% rename from include/asm-ppc/m8260_pci.h rename to arch/ppc/include/asm/m8260_pci.h diff --git a/include/asm-ppc/mc146818rtc.h b/arch/ppc/include/asm/mc146818rtc.h similarity index 100% rename from include/asm-ppc/mc146818rtc.h rename to arch/ppc/include/asm/mc146818rtc.h diff --git a/include/asm-ppc/mmu.h b/arch/ppc/include/asm/mmu.h similarity index 100% rename from include/asm-ppc/mmu.h rename to arch/ppc/include/asm/mmu.h diff --git a/include/asm-ppc/mp.h b/arch/ppc/include/asm/mp.h similarity index 100% rename from include/asm-ppc/mp.h rename to arch/ppc/include/asm/mp.h diff --git a/include/asm-ppc/mpc512x.h b/arch/ppc/include/asm/mpc512x.h similarity index 100% rename from include/asm-ppc/mpc512x.h rename to arch/ppc/include/asm/mpc512x.h diff --git a/include/asm-ppc/mpc8349_pci.h b/arch/ppc/include/asm/mpc8349_pci.h similarity index 100% rename from include/asm-ppc/mpc8349_pci.h rename to arch/ppc/include/asm/mpc8349_pci.h diff --git a/include/asm-ppc/mpc8xxx_spi.h b/arch/ppc/include/asm/mpc8xxx_spi.h similarity index 100% rename from include/asm-ppc/mpc8xxx_spi.h rename to arch/ppc/include/asm/mpc8xxx_spi.h diff --git a/include/asm-ppc/pci_io.h b/arch/ppc/include/asm/pci_io.h similarity index 100% rename from include/asm-ppc/pci_io.h rename to arch/ppc/include/asm/pci_io.h diff --git a/include/asm-ppc/pnp.h b/arch/ppc/include/asm/pnp.h similarity index 100% rename from include/asm-ppc/pnp.h rename to arch/ppc/include/asm/pnp.h diff --git a/include/asm-ppc/posix_types.h b/arch/ppc/include/asm/posix_types.h similarity index 100% rename from include/asm-ppc/posix_types.h rename to arch/ppc/include/asm/posix_types.h diff --git a/include/asm-ppc/ppc4xx-ebc.h b/arch/ppc/include/asm/ppc4xx-ebc.h similarity index 100% rename from include/asm-ppc/ppc4xx-ebc.h rename to arch/ppc/include/asm/ppc4xx-ebc.h diff --git a/include/asm-ppc/ppc4xx-isram.h b/arch/ppc/include/asm/ppc4xx-isram.h similarity index 100% rename from include/asm-ppc/ppc4xx-isram.h rename to arch/ppc/include/asm/ppc4xx-isram.h diff --git a/include/asm-ppc/ppc4xx-sdram.h b/arch/ppc/include/asm/ppc4xx-sdram.h similarity index 100% rename from include/asm-ppc/ppc4xx-sdram.h rename to arch/ppc/include/asm/ppc4xx-sdram.h diff --git a/include/asm-ppc/ppc4xx-uic.h b/arch/ppc/include/asm/ppc4xx-uic.h similarity index 100% rename from include/asm-ppc/ppc4xx-uic.h rename to arch/ppc/include/asm/ppc4xx-uic.h diff --git a/include/asm-ppc/ppc4xx_config.h b/arch/ppc/include/asm/ppc4xx_config.h similarity index 100% rename from include/asm-ppc/ppc4xx_config.h rename to arch/ppc/include/asm/ppc4xx_config.h diff --git a/include/asm-ppc/processor.h b/arch/ppc/include/asm/processor.h similarity index 100% rename from include/asm-ppc/processor.h rename to arch/ppc/include/asm/processor.h diff --git a/include/asm-ppc/ptrace.h b/arch/ppc/include/asm/ptrace.h similarity index 100% rename from include/asm-ppc/ptrace.h rename to arch/ppc/include/asm/ptrace.h diff --git a/include/asm-ppc/residual.h b/arch/ppc/include/asm/residual.h similarity index 100% rename from include/asm-ppc/residual.h rename to arch/ppc/include/asm/residual.h diff --git a/include/asm-ppc/sigcontext.h b/arch/ppc/include/asm/sigcontext.h similarity index 100% rename from include/asm-ppc/sigcontext.h rename to arch/ppc/include/asm/sigcontext.h diff --git a/include/asm-ppc/signal.h b/arch/ppc/include/asm/signal.h similarity index 100% rename from include/asm-ppc/signal.h rename to arch/ppc/include/asm/signal.h diff --git a/include/asm-ppc/status_led.h b/arch/ppc/include/asm/status_led.h similarity index 100% rename from include/asm-ppc/status_led.h rename to arch/ppc/include/asm/status_led.h diff --git a/include/asm-ppc/string.h b/arch/ppc/include/asm/string.h similarity index 100% rename from include/asm-ppc/string.h rename to arch/ppc/include/asm/string.h diff --git a/include/asm-ppc/types.h b/arch/ppc/include/asm/types.h similarity index 100% rename from include/asm-ppc/types.h rename to arch/ppc/include/asm/types.h diff --git a/include/asm-ppc/u-boot.h b/arch/ppc/include/asm/u-boot.h similarity index 100% rename from include/asm-ppc/u-boot.h rename to arch/ppc/include/asm/u-boot.h diff --git a/include/asm-ppc/unaligned.h b/arch/ppc/include/asm/unaligned.h similarity index 100% rename from include/asm-ppc/unaligned.h rename to arch/ppc/include/asm/unaligned.h diff --git a/include/asm-ppc/xilinx_irq.h b/arch/ppc/include/asm/xilinx_irq.h similarity index 100% rename from include/asm-ppc/xilinx_irq.h rename to arch/ppc/include/asm/xilinx_irq.h diff --git a/include/asm-sh/bitops.h b/arch/sh/include/asm/bitops.h similarity index 100% rename from include/asm-sh/bitops.h rename to arch/sh/include/asm/bitops.h diff --git a/include/asm-sh/byteorder.h b/arch/sh/include/asm/byteorder.h similarity index 100% rename from include/asm-sh/byteorder.h rename to arch/sh/include/asm/byteorder.h diff --git a/include/asm-sh/cache.h b/arch/sh/include/asm/cache.h similarity index 100% rename from include/asm-sh/cache.h rename to arch/sh/include/asm/cache.h diff --git a/include/asm-sh/clk.h b/arch/sh/include/asm/clk.h similarity index 100% rename from include/asm-sh/clk.h rename to arch/sh/include/asm/clk.h diff --git a/include/asm-sh/config.h b/arch/sh/include/asm/config.h similarity index 100% rename from include/asm-sh/config.h rename to arch/sh/include/asm/config.h diff --git a/include/asm-sh/cpu_sh2.h b/arch/sh/include/asm/cpu_sh2.h similarity index 100% rename from include/asm-sh/cpu_sh2.h rename to arch/sh/include/asm/cpu_sh2.h diff --git a/include/asm-sh/cpu_sh3.h b/arch/sh/include/asm/cpu_sh3.h similarity index 100% rename from include/asm-sh/cpu_sh3.h rename to arch/sh/include/asm/cpu_sh3.h diff --git a/include/asm-sh/cpu_sh4.h b/arch/sh/include/asm/cpu_sh4.h similarity index 100% rename from include/asm-sh/cpu_sh4.h rename to arch/sh/include/asm/cpu_sh4.h diff --git a/include/asm-sh/cpu_sh7203.h b/arch/sh/include/asm/cpu_sh7203.h similarity index 100% rename from include/asm-sh/cpu_sh7203.h rename to arch/sh/include/asm/cpu_sh7203.h diff --git a/include/asm-sh/cpu_sh7710.h b/arch/sh/include/asm/cpu_sh7710.h similarity index 100% rename from include/asm-sh/cpu_sh7710.h rename to arch/sh/include/asm/cpu_sh7710.h diff --git a/include/asm-sh/cpu_sh7720.h b/arch/sh/include/asm/cpu_sh7720.h similarity index 100% rename from include/asm-sh/cpu_sh7720.h rename to arch/sh/include/asm/cpu_sh7720.h diff --git a/include/asm-sh/cpu_sh7722.h b/arch/sh/include/asm/cpu_sh7722.h similarity index 100% rename from include/asm-sh/cpu_sh7722.h rename to arch/sh/include/asm/cpu_sh7722.h diff --git a/include/asm-sh/cpu_sh7723.h b/arch/sh/include/asm/cpu_sh7723.h similarity index 100% rename from include/asm-sh/cpu_sh7723.h rename to arch/sh/include/asm/cpu_sh7723.h diff --git a/include/asm-sh/cpu_sh7750.h b/arch/sh/include/asm/cpu_sh7750.h similarity index 100% rename from include/asm-sh/cpu_sh7750.h rename to arch/sh/include/asm/cpu_sh7750.h diff --git a/include/asm-sh/cpu_sh7763.h b/arch/sh/include/asm/cpu_sh7763.h similarity index 100% rename from include/asm-sh/cpu_sh7763.h rename to arch/sh/include/asm/cpu_sh7763.h diff --git a/include/asm-sh/cpu_sh7780.h b/arch/sh/include/asm/cpu_sh7780.h similarity index 100% rename from include/asm-sh/cpu_sh7780.h rename to arch/sh/include/asm/cpu_sh7780.h diff --git a/include/asm-sh/cpu_sh7785.h b/arch/sh/include/asm/cpu_sh7785.h similarity index 100% rename from include/asm-sh/cpu_sh7785.h rename to arch/sh/include/asm/cpu_sh7785.h diff --git a/include/asm-sh/errno.h b/arch/sh/include/asm/errno.h similarity index 100% rename from include/asm-sh/errno.h rename to arch/sh/include/asm/errno.h diff --git a/include/asm-sh/global_data.h b/arch/sh/include/asm/global_data.h similarity index 100% rename from include/asm-sh/global_data.h rename to arch/sh/include/asm/global_data.h diff --git a/include/asm-sh/io.h b/arch/sh/include/asm/io.h similarity index 100% rename from include/asm-sh/io.h rename to arch/sh/include/asm/io.h diff --git a/include/asm-sh/irqflags.h b/arch/sh/include/asm/irqflags.h similarity index 100% rename from include/asm-sh/irqflags.h rename to arch/sh/include/asm/irqflags.h diff --git a/include/asm-sh/macro.h b/arch/sh/include/asm/macro.h similarity index 100% rename from include/asm-sh/macro.h rename to arch/sh/include/asm/macro.h diff --git a/include/asm-sh/pci.h b/arch/sh/include/asm/pci.h similarity index 100% rename from include/asm-sh/pci.h rename to arch/sh/include/asm/pci.h diff --git a/include/asm-sh/posix_types.h b/arch/sh/include/asm/posix_types.h similarity index 100% rename from include/asm-sh/posix_types.h rename to arch/sh/include/asm/posix_types.h diff --git a/include/asm-sh/processor.h b/arch/sh/include/asm/processor.h similarity index 100% rename from include/asm-sh/processor.h rename to arch/sh/include/asm/processor.h diff --git a/include/asm-sh/ptrace.h b/arch/sh/include/asm/ptrace.h similarity index 100% rename from include/asm-sh/ptrace.h rename to arch/sh/include/asm/ptrace.h diff --git a/include/asm-sh/string.h b/arch/sh/include/asm/string.h similarity index 100% rename from include/asm-sh/string.h rename to arch/sh/include/asm/string.h diff --git a/include/asm-sh/system.h b/arch/sh/include/asm/system.h similarity index 100% rename from include/asm-sh/system.h rename to arch/sh/include/asm/system.h diff --git a/include/asm-sh/types.h b/arch/sh/include/asm/types.h similarity index 100% rename from include/asm-sh/types.h rename to arch/sh/include/asm/types.h diff --git a/include/asm-sh/u-boot.h b/arch/sh/include/asm/u-boot.h similarity index 100% rename from include/asm-sh/u-boot.h rename to arch/sh/include/asm/u-boot.h diff --git a/include/asm-sparc/arch-leon2/asi.h b/arch/sparc/include/asm/arch-leon2/asi.h similarity index 100% rename from include/asm-sparc/arch-leon2/asi.h rename to arch/sparc/include/asm/arch-leon2/asi.h diff --git a/include/asm-sparc/arch-leon3/asi.h b/arch/sparc/include/asm/arch-leon3/asi.h similarity index 100% rename from include/asm-sparc/arch-leon3/asi.h rename to arch/sparc/include/asm/arch-leon3/asi.h diff --git a/include/asm-sparc/asi.h b/arch/sparc/include/asm/asi.h similarity index 100% rename from include/asm-sparc/asi.h rename to arch/sparc/include/asm/asi.h diff --git a/include/asm-sparc/asmmacro.h b/arch/sparc/include/asm/asmmacro.h similarity index 100% rename from include/asm-sparc/asmmacro.h rename to arch/sparc/include/asm/asmmacro.h diff --git a/include/asm-sparc/atomic.h b/arch/sparc/include/asm/atomic.h similarity index 100% rename from include/asm-sparc/atomic.h rename to arch/sparc/include/asm/atomic.h diff --git a/include/asm-sparc/bitops.h b/arch/sparc/include/asm/bitops.h similarity index 100% rename from include/asm-sparc/bitops.h rename to arch/sparc/include/asm/bitops.h diff --git a/include/asm-sparc/byteorder.h b/arch/sparc/include/asm/byteorder.h similarity index 100% rename from include/asm-sparc/byteorder.h rename to arch/sparc/include/asm/byteorder.h diff --git a/include/asm-sparc/cache.h b/arch/sparc/include/asm/cache.h similarity index 100% rename from include/asm-sparc/cache.h rename to arch/sparc/include/asm/cache.h diff --git a/include/asm-sparc/config.h b/arch/sparc/include/asm/config.h similarity index 100% rename from include/asm-sparc/config.h rename to arch/sparc/include/asm/config.h diff --git a/include/asm-sparc/errno.h b/arch/sparc/include/asm/errno.h similarity index 100% rename from include/asm-sparc/errno.h rename to arch/sparc/include/asm/errno.h diff --git a/include/asm-sparc/global_data.h b/arch/sparc/include/asm/global_data.h similarity index 100% rename from include/asm-sparc/global_data.h rename to arch/sparc/include/asm/global_data.h diff --git a/include/asm-sparc/io.h b/arch/sparc/include/asm/io.h similarity index 100% rename from include/asm-sparc/io.h rename to arch/sparc/include/asm/io.h diff --git a/include/asm-sparc/irq.h b/arch/sparc/include/asm/irq.h similarity index 100% rename from include/asm-sparc/irq.h rename to arch/sparc/include/asm/irq.h diff --git a/include/asm-sparc/leon.h b/arch/sparc/include/asm/leon.h similarity index 100% rename from include/asm-sparc/leon.h rename to arch/sparc/include/asm/leon.h diff --git a/include/asm-sparc/leon2.h b/arch/sparc/include/asm/leon2.h similarity index 100% rename from include/asm-sparc/leon2.h rename to arch/sparc/include/asm/leon2.h diff --git a/include/asm-sparc/leon3.h b/arch/sparc/include/asm/leon3.h similarity index 100% rename from include/asm-sparc/leon3.h rename to arch/sparc/include/asm/leon3.h diff --git a/include/asm-sparc/machines.h b/arch/sparc/include/asm/machines.h similarity index 100% rename from include/asm-sparc/machines.h rename to arch/sparc/include/asm/machines.h diff --git a/include/asm-sparc/page.h b/arch/sparc/include/asm/page.h similarity index 100% rename from include/asm-sparc/page.h rename to arch/sparc/include/asm/page.h diff --git a/include/asm-sparc/posix_types.h b/arch/sparc/include/asm/posix_types.h similarity index 100% rename from include/asm-sparc/posix_types.h rename to arch/sparc/include/asm/posix_types.h diff --git a/include/asm-sparc/processor.h b/arch/sparc/include/asm/processor.h similarity index 100% rename from include/asm-sparc/processor.h rename to arch/sparc/include/asm/processor.h diff --git a/include/asm-sparc/prom.h b/arch/sparc/include/asm/prom.h similarity index 100% rename from include/asm-sparc/prom.h rename to arch/sparc/include/asm/prom.h diff --git a/include/asm-sparc/psr.h b/arch/sparc/include/asm/psr.h similarity index 100% rename from include/asm-sparc/psr.h rename to arch/sparc/include/asm/psr.h diff --git a/include/asm-sparc/ptrace.h b/arch/sparc/include/asm/ptrace.h similarity index 100% rename from include/asm-sparc/ptrace.h rename to arch/sparc/include/asm/ptrace.h diff --git a/include/asm-sparc/srmmu.h b/arch/sparc/include/asm/srmmu.h similarity index 100% rename from include/asm-sparc/srmmu.h rename to arch/sparc/include/asm/srmmu.h diff --git a/include/asm-sparc/stack.h b/arch/sparc/include/asm/stack.h similarity index 100% rename from include/asm-sparc/stack.h rename to arch/sparc/include/asm/stack.h diff --git a/include/asm-sparc/string.h b/arch/sparc/include/asm/string.h similarity index 100% rename from include/asm-sparc/string.h rename to arch/sparc/include/asm/string.h diff --git a/include/asm-sparc/types.h b/arch/sparc/include/asm/types.h similarity index 100% rename from include/asm-sparc/types.h rename to arch/sparc/include/asm/types.h diff --git a/include/asm-sparc/u-boot.h b/arch/sparc/include/asm/u-boot.h similarity index 100% rename from include/asm-sparc/u-boot.h rename to arch/sparc/include/asm/u-boot.h diff --git a/include/asm-sparc/winmacro.h b/arch/sparc/include/asm/winmacro.h similarity index 100% rename from include/asm-sparc/winmacro.h rename to arch/sparc/include/asm/winmacro.h diff --git a/include/.gitignore b/include/.gitignore index 4481412..77594e5 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -1,7 +1,5 @@ /autoconf.mk* /asm -/asm-*/arch -/asm-*/proc /bmp_logo.h /config.h /config.mk diff --git a/mkconfig b/mkconfig index 27d9f2b..44366a6 100755 --- a/mkconfig +++ b/mkconfig @@ -42,30 +42,27 @@ if [ "$SRCTREE" != "$OBJTREE" ] ; then mkdir -p ${OBJTREE}/include2 cd ${OBJTREE}/include2 rm -f asm - ln -s ${SRCTREE}/include/asm-$2 asm + ln -s ${SRCTREE}/arch/$2/include/asm asm LNPREFIX="../../include2/asm/" cd ../include - rm -rf asm-$2 rm -f asm - mkdir asm-$2 - ln -s asm-$2 asm + ln -s ${SRCTREE}/arch/$2/include/asm asm else cd ./include - rm -f asm - ln -s asm-$2 asm + ln -s ../arch/$2/include/asm asm fi

-rm -f asm-$2/arch +rm -f asm/arch

if [ -z "$6" -o "$6" = "NULL" ] ; then - ln -s ${LNPREFIX}arch-$3 asm-$2/arch + ln -s ${LNPREFIX}arch-$3 asm/arch else - ln -s ${LNPREFIX}arch-$6 asm-$2/arch + ln -s ${LNPREFIX}arch-$6 asm/arch fi

if [ "$2" = "arm" ] ; then - rm -f asm-$2/proc - ln -s ${LNPREFIX}proc-armv asm-$2/proc + rm -f asm/proc + ln -s ${LNPREFIX}proc-armv asm/proc fi

#

Signed-off-by: Peter Tyser ptyser@xes-inc.com --- Makefile | 2 +- {cpu => arch/arm/cpu}/arm1136/Makefile | 0 {cpu => arch/arm/cpu}/arm1136/config.mk | 0 {cpu => arch/arm/cpu}/arm1136/cpu.c | 0 {cpu => arch/arm/cpu}/arm1136/mx31/Makefile | 0 {cpu => arch/arm/cpu}/arm1136/mx31/devices.c | 0 {cpu => arch/arm/cpu}/arm1136/mx31/generic.c | 0 {cpu => arch/arm/cpu}/arm1136/mx31/timer.c | 0 {cpu => arch/arm/cpu}/arm1136/omap24xx/Makefile | 0 {cpu => arch/arm/cpu}/arm1136/omap24xx/reset.S | 0 {cpu => arch/arm/cpu}/arm1136/omap24xx/timer.c | 0 {cpu => arch/arm/cpu}/arm1136/start.S | 0 {cpu => arch/arm/cpu}/arm1136/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm1176/Makefile | 0 {cpu => arch/arm/cpu}/arm1176/config.mk | 0 {cpu => arch/arm/cpu}/arm1176/cpu.c | 0 {cpu => arch/arm/cpu}/arm1176/s3c64xx/Makefile | 0 {cpu => arch/arm/cpu}/arm1176/s3c64xx/config.mk | 0 {cpu => arch/arm/cpu}/arm1176/s3c64xx/cpu_init.S | 0 {cpu => arch/arm/cpu}/arm1176/s3c64xx/reset.S | 0 {cpu => arch/arm/cpu}/arm1176/s3c64xx/speed.c | 0 {cpu => arch/arm/cpu}/arm1176/s3c64xx/timer.c | 0 {cpu => arch/arm/cpu}/arm1176/start.S | 0 {cpu => arch/arm/cpu}/arm1176/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm720t/Makefile | 0 {cpu => arch/arm/cpu}/arm720t/config.mk | 0 {cpu => arch/arm/cpu}/arm720t/cpu.c | 0 {cpu => arch/arm/cpu}/arm720t/interrupts.c | 0 {cpu => arch/arm/cpu}/arm720t/lpc2292/Makefile | 0 {cpu => arch/arm/cpu}/arm720t/lpc2292/flash.c | 0 {cpu => arch/arm/cpu}/arm720t/lpc2292/iap_entry.S | 0 {cpu => arch/arm/cpu}/arm720t/lpc2292/mmc.c | 0 {cpu => arch/arm/cpu}/arm720t/lpc2292/mmc_hw.c | 0 {cpu => arch/arm/cpu}/arm720t/lpc2292/mmc_hw.h | 0 {cpu => arch/arm/cpu}/arm720t/lpc2292/spi.c | 0 {cpu => arch/arm/cpu}/arm720t/s3c4510b/Makefile | 0 {cpu => arch/arm/cpu}/arm720t/s3c4510b/cache.c | 0 {cpu => arch/arm/cpu}/arm720t/start.S | 0 {cpu => arch/arm/cpu}/arm720t/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm920t/Makefile | 0 {cpu => arch/arm/cpu}/arm920t/a320/Makefile | 0 {cpu => arch/arm/cpu}/arm920t/a320/ftsmc020.c | 0 {cpu => arch/arm/cpu}/arm920t/a320/reset.S | 0 {cpu => arch/arm/cpu}/arm920t/a320/timer.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/Makefile | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/bcm5221.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/dm9161.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/ether.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/i2c.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/ks8721.c | 0 .../arm/cpu}/arm920t/at91rm9200/lowlevel_init.S | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/lxt972.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/reset.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/spi.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/timer.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/usb.c | 0 {cpu => arch/arm/cpu}/arm920t/config.mk | 0 {cpu => arch/arm/cpu}/arm920t/cpu.c | 0 {cpu => arch/arm/cpu}/arm920t/imx/Makefile | 0 {cpu => arch/arm/cpu}/arm920t/imx/generic.c | 0 {cpu => arch/arm/cpu}/arm920t/imx/speed.c | 0 {cpu => arch/arm/cpu}/arm920t/imx/timer.c | 0 {cpu => arch/arm/cpu}/arm920t/interrupts.c | 0 {cpu => arch/arm/cpu}/arm920t/ks8695/Makefile | 0 .../arm/cpu}/arm920t/ks8695/lowlevel_init.S | 0 {cpu => arch/arm/cpu}/arm920t/ks8695/timer.c | 0 {cpu => arch/arm/cpu}/arm920t/s3c24x0/Makefile | 0 {cpu => arch/arm/cpu}/arm920t/s3c24x0/interrupts.c | 0 {cpu => arch/arm/cpu}/arm920t/s3c24x0/speed.c | 0 {cpu => arch/arm/cpu}/arm920t/s3c24x0/timer.c | 0 {cpu => arch/arm/cpu}/arm920t/s3c24x0/usb.c | 0 {cpu => arch/arm/cpu}/arm920t/s3c24x0/usb_ohci.c | 0 {cpu => arch/arm/cpu}/arm920t/s3c24x0/usb_ohci.h | 0 {cpu => arch/arm/cpu}/arm920t/start.S | 0 {cpu => arch/arm/cpu}/arm920t/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm925t/Makefile | 0 {cpu => arch/arm/cpu}/arm925t/config.mk | 0 {cpu => arch/arm/cpu}/arm925t/cpu.c | 0 {cpu => arch/arm/cpu}/arm925t/omap925.c | 0 {cpu => arch/arm/cpu}/arm925t/start.S | 0 {cpu => arch/arm/cpu}/arm925t/timer.c | 0 {cpu => arch/arm/cpu}/arm925t/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm926ejs/Makefile | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/Makefile | 0 .../arm/cpu}/arm926ejs/at91/at91cap9_devices.c | 0 .../arm/cpu}/arm926ejs/at91/at91sam9260_devices.c | 0 .../arm/cpu}/arm926ejs/at91/at91sam9261_devices.c | 0 .../arm/cpu}/arm926ejs/at91/at91sam9263_devices.c | 0 .../cpu}/arm926ejs/at91/at91sam9m10g45_devices.c | 0 .../arm/cpu}/arm926ejs/at91/at91sam9rl_devices.c | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/clock.c | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/config.mk | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/cpu.c | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/led.c | 0 .../arm/cpu}/arm926ejs/at91/lowlevel_init.S | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/reset.c | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/timer.c | 0 {cpu => arch/arm/cpu}/arm926ejs/config.mk | 0 {cpu => arch/arm/cpu}/arm926ejs/cpu.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/Makefile | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/config.mk | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/cpu.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/dm355.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/dm365.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/dm644x.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/dm646x.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/dp83848.c | 0 .../arm/cpu}/arm926ejs/davinci/lowlevel_init.S | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/lxt972.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/psc.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/reset.S | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/timer.c | 0 {cpu => arch/arm/cpu}/arm926ejs/kirkwood/Makefile | 0 {cpu => arch/arm/cpu}/arm926ejs/kirkwood/cpu.c | 0 {cpu => arch/arm/cpu}/arm926ejs/kirkwood/dram.c | 0 {cpu => arch/arm/cpu}/arm926ejs/kirkwood/mpp.c | 0 {cpu => arch/arm/cpu}/arm926ejs/kirkwood/timer.c | 0 {cpu => arch/arm/cpu}/arm926ejs/mx27/Makefile | 0 {cpu => arch/arm/cpu}/arm926ejs/mx27/generic.c | 0 {cpu => arch/arm/cpu}/arm926ejs/mx27/reset.c | 0 {cpu => arch/arm/cpu}/arm926ejs/mx27/timer.c | 0 {cpu => arch/arm/cpu}/arm926ejs/nomadik/Makefile | 0 {cpu => arch/arm/cpu}/arm926ejs/nomadik/gpio.c | 0 {cpu => arch/arm/cpu}/arm926ejs/nomadik/reset.S | 0 {cpu => arch/arm/cpu}/arm926ejs/nomadik/timer.c | 0 {cpu => arch/arm/cpu}/arm926ejs/omap/Makefile | 0 {cpu => arch/arm/cpu}/arm926ejs/omap/cpuinfo.c | 0 {cpu => arch/arm/cpu}/arm926ejs/omap/reset.S | 0 {cpu => arch/arm/cpu}/arm926ejs/omap/timer.c | 0 {cpu => arch/arm/cpu}/arm926ejs/start.S | 0 {cpu => arch/arm/cpu}/arm926ejs/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm926ejs/versatile/Makefile | 0 {cpu => arch/arm/cpu}/arm926ejs/versatile/reset.S | 0 {cpu => arch/arm/cpu}/arm926ejs/versatile/timer.c | 0 {cpu => arch/arm/cpu}/arm946es/Makefile | 0 {cpu => arch/arm/cpu}/arm946es/config.mk | 0 {cpu => arch/arm/cpu}/arm946es/cpu.c | 0 {cpu => arch/arm/cpu}/arm946es/start.S | 0 .../arm_intcm => arch/arm/cpu/arm946es}/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm_cortexa8/Makefile | 0 {cpu => arch/arm/cpu}/arm_cortexa8/config.mk | 0 {cpu => arch/arm/cpu}/arm_cortexa8/cpu.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/Makefile | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/board.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/cache.S | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/clock.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/gpio.c | 0 .../arm/cpu}/arm_cortexa8/omap3/lowlevel_init.S | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/mem.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/reset.S | 0 .../arm/cpu}/arm_cortexa8/omap3/sys_info.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/syslib.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/timer.c | 0 .../arm/cpu}/arm_cortexa8/s5pc1xx/Makefile | 0 {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/cache.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/clock.c | 0 .../arm/cpu}/arm_cortexa8/s5pc1xx/cpu_info.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/reset.S | 0 {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/timer.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/start.S | 0 {cpu => arch/arm/cpu}/arm_cortexa8/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm_intcm/Makefile | 0 {cpu => arch/arm/cpu}/arm_intcm/config.mk | 0 {cpu => arch/arm/cpu}/arm_intcm/cpu.c | 0 {cpu => arch/arm/cpu}/arm_intcm/start.S | 0 {cpu/lh7a40x => arch/arm/cpu/arm_intcm}/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/ixp/Makefile | 0 {cpu => arch/arm/cpu}/ixp/config.mk | 0 {cpu => arch/arm/cpu}/ixp/cpu.c | 0 {cpu => arch/arm/cpu}/ixp/interrupts.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthAcc.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthAccCommon.c | 0 .../arm/cpu}/ixp/npe/IxEthAccControlInterface.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthAccDataPlane.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthAccMac.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthAccMii.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBAPI.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBAPISupport.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBCore.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBEvents.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBFeatures.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBFirewall.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBHashtable.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBLearning.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBMem.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBNPEAdaptor.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBPortUpdate.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBReports.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBSearch.c | 0 .../arm/cpu}/ixp/npe/IxEthDBSpanningTree.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBUtil.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBVlan.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBWiFi.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthMii.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxFeatureCtrl.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeDl.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeDlImageMgr.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeDlNpeMgr.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeDlNpeMgrUtils.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeMh.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhConfig.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhReceive.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhSend.c | 0 .../arm/cpu}/ixp/npe/IxNpeMhSolicitedCbMgr.c | 0 .../arm/cpu}/ixp/npe/IxNpeMhUnsolicitedCbMgr.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxOsalBufferMgt.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxOsalIoMem.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsCacheMMU.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsMsgQ.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsSemaphore.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsServices.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsThread.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxQMgrAqmIf.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxQMgrDispatcher.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxQMgrInit.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxQMgrQAccess.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxQMgrQCfg.c | 0 {cpu => arch/arm/cpu}/ixp/npe/Makefile | 2 +- {cpu => arch/arm/cpu}/ixp/npe/include/IxAssert.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmSch.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmTypes.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmdAcc.h | 0 .../arm/cpu}/ixp/npe/include/IxAtmdAccCtrl.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmm.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxDmaAcc.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAcc.h | 0 .../arm/cpu}/ixp/npe/include/IxEthAccDataPlane_p.h | 0 .../arm/cpu}/ixp/npe/include/IxEthAccMac_p.h | 0 .../arm/cpu}/ixp/npe/include/IxEthAccMii_p.h | 0 .../cpu}/ixp/npe/include/IxEthAccQueueAssign_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAcc_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDB.h | 0 .../arm/cpu}/ixp/npe/include/IxEthDBLocks_p.h | 0 .../arm/cpu}/ixp/npe/include/IxEthDBLog_p.h | 0 .../arm/cpu}/ixp/npe/include/IxEthDBMessages_p.h | 0 .../arm/cpu}/ixp/npe/include/IxEthDBPortDefs.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDBQoS.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDB_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthMii.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthMii_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthNpe.h | 0 .../arm/cpu}/ixp/npe/include/IxFeatureCtrl.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxHssAcc.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxI2cDrv.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeA.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDl.h | 0 .../arm/cpu}/ixp/npe/include/IxNpeDlImageMgr_p.h | 0 .../arm/cpu}/ixp/npe/include/IxNpeDlMacros_p.h | 0 .../ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h | 0 .../cpu}/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h | 0 .../arm/cpu}/ixp/npe/include/IxNpeDlNpeMgr_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMh.h | 0 .../arm/cpu}/ixp/npe/include/IxNpeMhConfig_p.h | 0 .../arm/cpu}/ixp/npe/include/IxNpeMhMacros_p.h | 0 .../arm/cpu}/ixp/npe/include/IxNpeMhReceive_p.h | 0 .../arm/cpu}/ixp/npe/include/IxNpeMhSend_p.h | 0 .../cpu}/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h | 0 .../ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h | 0 .../arm/cpu}/ixp/npe/include/IxNpeMicrocode.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsBufLib.h | 0 .../arm/cpu}/ixp/npe/include/IxOsBuffMgt.h | 0 .../arm/cpu}/ixp/npe/include/IxOsBuffPoolMgt.h | 0 .../arm/cpu}/ixp/npe/include/IxOsCacheMMU.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsPrintf.h | 0 .../arm/cpu}/ixp/npe/include/IxOsServices.h | 0 .../cpu}/ixp/npe/include/IxOsServicesComponents.h | 0 .../cpu}/ixp/npe/include/IxOsServicesEndianess.h | 0 .../cpu}/ixp/npe/include/IxOsServicesMemAccess.h | 0 .../arm/cpu}/ixp/npe/include/IxOsServicesMemMap.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsal.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalAssert.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalBackward.h | 0 .../cpu}/ixp/npe/include/IxOsalBackwardAssert.h | 0 .../cpu}/ixp/npe/include/IxOsalBackwardBufferMgt.h | 0 .../cpu}/ixp/npe/include/IxOsalBackwardCacheMMU.h | 0 .../cpu}/ixp/npe/include/IxOsalBackwardMemMap.h | 0 .../ixp/npe/include/IxOsalBackwardOsServices.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalBackwardOssl.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalBufferMgt.h | 0 .../cpu}/ixp/npe/include/IxOsalBufferMgtDefault.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalConfig.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalEndianess.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalIoMem.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalMemAccess.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOem.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOs.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalOsAssert.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalOsBufferMgt.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalOsIxp400.h | 0 .../npe/include/IxOsalOsIxp400CustomizedMapping.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalOsTypes.h | 0 .../cpu}/ixp/npe/include/IxOsalOsUtilitySymbols.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalTypes.h | 0 .../cpu}/ixp/npe/include/IxOsalUtilitySymbols.h | 0 .../arm/cpu}/ixp/npe/include/IxParityENAcc.h | 0 .../arm/cpu}/ixp/npe/include/IxPerfProfAcc.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgr.h | 0 .../arm/cpu}/ixp/npe/include/IxQMgrAqmIf_p.h | 0 .../arm/cpu}/ixp/npe/include/IxQMgrDefines_p.h | 0 .../arm/cpu}/ixp/npe/include/IxQMgrDispatcher_p.h | 0 .../arm/cpu}/ixp/npe/include/IxQMgrLog_p.h | 0 .../arm/cpu}/ixp/npe/include/IxQMgrQAccess_p.h | 0 .../arm/cpu}/ixp/npe/include/IxQMgrQCfg_p.h | 0 .../arm/cpu}/ixp/npe/include/IxQueueAssignments.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxSspAcc.h | 0 .../arm/cpu}/ixp/npe/include/IxTimeSyncAcc.h | 0 .../arm/cpu}/ixp/npe/include/IxTimerCtrl.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxTypes.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxUART.h | 0 .../arm/cpu}/ixp/npe/include/IxVersionId.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/ix_error.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/ix_macros.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/ix_os_type.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/ix_ossl.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/ix_symbols.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/ix_types.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/npe.h | 0 .../arm/cpu}/ixp/npe/include/os_datatypes.h | 0 {cpu => arch/arm/cpu}/ixp/npe/miiphy.c | 0 {cpu => arch/arm/cpu}/ixp/npe/npe.c | 0 {cpu => arch/arm/cpu}/ixp/start.S | 0 {cpu => arch/arm/cpu}/ixp/timer.c | 0 {cpu => arch/arm/cpu}/ixp/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/lh7a40x/Makefile | 0 {cpu => arch/arm/cpu}/lh7a40x/config.mk | 0 {cpu => arch/arm/cpu}/lh7a40x/cpu.c | 0 {cpu => arch/arm/cpu}/lh7a40x/speed.c | 0 {cpu => arch/arm/cpu}/lh7a40x/start.S | 0 {cpu => arch/arm/cpu}/lh7a40x/timer.c | 0 {cpu/arm946es => arch/arm/cpu/lh7a40x}/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/pxa/Makefile | 0 {cpu => arch/arm/cpu}/pxa/config.mk | 0 {cpu => arch/arm/cpu}/pxa/cpu.c | 0 {cpu => arch/arm/cpu}/pxa/i2c.c | 0 {cpu => arch/arm/cpu}/pxa/pxafb.c | 0 {cpu => arch/arm/cpu}/pxa/start.S | 0 {cpu => arch/arm/cpu}/pxa/timer.c | 0 {cpu => arch/arm/cpu}/pxa/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/pxa/usb.c | 0 {cpu => arch/arm/cpu}/s3c44b0/Makefile | 0 {cpu => arch/arm/cpu}/s3c44b0/cache.c | 0 {cpu => arch/arm/cpu}/s3c44b0/config.mk | 0 {cpu => arch/arm/cpu}/s3c44b0/cpu.c | 0 {cpu => arch/arm/cpu}/s3c44b0/start.S | 0 {cpu => arch/arm/cpu}/s3c44b0/timer.c | 0 {cpu => arch/arm/cpu}/s3c44b0/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/sa1100/Makefile | 0 {cpu => arch/arm/cpu}/sa1100/config.mk | 0 {cpu => arch/arm/cpu}/sa1100/cpu.c | 0 {cpu => arch/arm/cpu}/sa1100/start.S | 0 {cpu => arch/arm/cpu}/sa1100/timer.c | 0 {cpu => arch/arm/cpu}/sa1100/u-boot.lds | 2 +- arch/arm/lib/board.c | 4 ++-- board/actux1/config.mk | 2 +- board/actux1/u-boot.lds | 4 ++-- board/actux2/config.mk | 2 +- board/actux2/u-boot.lds | 4 ++-- board/actux3/config.mk | 2 +- board/actux3/u-boot.lds | 4 ++-- board/actux4/config.mk | 2 +- board/davinci/dvevm/board_init.S | 4 ++-- board/davinci/schmoogie/board_init.S | 4 ++-- board/davinci/sffsdr/board_init.S | 4 ++-- board/davinci/sonata/board_init.S | 4 ++-- board/freescale/mx31ads/u-boot.lds | 2 +- board/logicpd/zoom2/zoom2.c | 2 +- board/lpc2292sodimm/flash.c | 2 +- board/samsung/smdk6400/u-boot-nand.lds | 4 ++-- board/siemens/SMN42/flash.c | 2 +- board/trab/rs485.c | 2 +- board/trab/rs485.h | 2 +- board/trab/u-boot.lds | 2 +- doc/README-integrator | 2 +- doc/README.ARM-SoC | 6 +++--- doc/README.modnet50 | 2 +- nand_spl/board/freescale/mx31pdk/Makefile | 4 ++-- nand_spl/board/samsung/smdk6400/Makefile | 4 ++-- 377 files changed, 54 insertions(+), 54 deletions(-) rename {cpu => arch/arm/cpu}/arm1136/Makefile (100%) rename {cpu => arch/arm/cpu}/arm1136/config.mk (100%) rename {cpu => arch/arm/cpu}/arm1136/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm1136/mx31/Makefile (100%) rename {cpu => arch/arm/cpu}/arm1136/mx31/devices.c (100%) rename {cpu => arch/arm/cpu}/arm1136/mx31/generic.c (100%) rename {cpu => arch/arm/cpu}/arm1136/mx31/timer.c (100%) rename {cpu => arch/arm/cpu}/arm1136/omap24xx/Makefile (100%) rename {cpu => arch/arm/cpu}/arm1136/omap24xx/reset.S (100%) rename {cpu => arch/arm/cpu}/arm1136/omap24xx/timer.c (100%) rename {cpu => arch/arm/cpu}/arm1136/start.S (100%) rename {cpu => arch/arm/cpu}/arm1136/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm1176/Makefile (100%) rename {cpu => arch/arm/cpu}/arm1176/config.mk (100%) rename {cpu => arch/arm/cpu}/arm1176/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm1176/s3c64xx/Makefile (100%) rename {cpu => arch/arm/cpu}/arm1176/s3c64xx/config.mk (100%) rename {cpu => arch/arm/cpu}/arm1176/s3c64xx/cpu_init.S (100%) rename {cpu => arch/arm/cpu}/arm1176/s3c64xx/reset.S (100%) rename {cpu => arch/arm/cpu}/arm1176/s3c64xx/speed.c (100%) rename {cpu => arch/arm/cpu}/arm1176/s3c64xx/timer.c (100%) rename {cpu => arch/arm/cpu}/arm1176/start.S (100%) rename {cpu => arch/arm/cpu}/arm1176/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm720t/Makefile (100%) rename {cpu => arch/arm/cpu}/arm720t/config.mk (100%) rename {cpu => arch/arm/cpu}/arm720t/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm720t/interrupts.c (100%) rename {cpu => arch/arm/cpu}/arm720t/lpc2292/Makefile (100%) rename {cpu => arch/arm/cpu}/arm720t/lpc2292/flash.c (100%) rename {cpu => arch/arm/cpu}/arm720t/lpc2292/iap_entry.S (100%) rename {cpu => arch/arm/cpu}/arm720t/lpc2292/mmc.c (100%) rename {cpu => arch/arm/cpu}/arm720t/lpc2292/mmc_hw.c (100%) rename {cpu => arch/arm/cpu}/arm720t/lpc2292/mmc_hw.h (100%) rename {cpu => arch/arm/cpu}/arm720t/lpc2292/spi.c (100%) rename {cpu => arch/arm/cpu}/arm720t/s3c4510b/Makefile (100%) rename {cpu => arch/arm/cpu}/arm720t/s3c4510b/cache.c (100%) rename {cpu => arch/arm/cpu}/arm720t/start.S (100%) rename {cpu => arch/arm/cpu}/arm720t/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm920t/Makefile (100%) rename {cpu => arch/arm/cpu}/arm920t/a320/Makefile (100%) rename {cpu => arch/arm/cpu}/arm920t/a320/ftsmc020.c (100%) rename {cpu => arch/arm/cpu}/arm920t/a320/reset.S (100%) rename {cpu => arch/arm/cpu}/arm920t/a320/timer.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/Makefile (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/bcm5221.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/dm9161.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/ether.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/i2c.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/ks8721.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/lowlevel_init.S (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/lxt972.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/reset.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/spi.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/timer.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/usb.c (100%) rename {cpu => arch/arm/cpu}/arm920t/config.mk (100%) rename {cpu => arch/arm/cpu}/arm920t/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm920t/imx/Makefile (100%) rename {cpu => arch/arm/cpu}/arm920t/imx/generic.c (100%) rename {cpu => arch/arm/cpu}/arm920t/imx/speed.c (100%) rename {cpu => arch/arm/cpu}/arm920t/imx/timer.c (100%) rename {cpu => arch/arm/cpu}/arm920t/interrupts.c (100%) rename {cpu => arch/arm/cpu}/arm920t/ks8695/Makefile (100%) rename {cpu => arch/arm/cpu}/arm920t/ks8695/lowlevel_init.S (100%) rename {cpu => arch/arm/cpu}/arm920t/ks8695/timer.c (100%) rename {cpu => arch/arm/cpu}/arm920t/s3c24x0/Makefile (100%) rename {cpu => arch/arm/cpu}/arm920t/s3c24x0/interrupts.c (100%) rename {cpu => arch/arm/cpu}/arm920t/s3c24x0/speed.c (100%) rename {cpu => arch/arm/cpu}/arm920t/s3c24x0/timer.c (100%) rename {cpu => arch/arm/cpu}/arm920t/s3c24x0/usb.c (100%) rename {cpu => arch/arm/cpu}/arm920t/s3c24x0/usb_ohci.c (100%) rename {cpu => arch/arm/cpu}/arm920t/s3c24x0/usb_ohci.h (100%) rename {cpu => arch/arm/cpu}/arm920t/start.S (100%) rename {cpu => arch/arm/cpu}/arm920t/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm925t/Makefile (100%) rename {cpu => arch/arm/cpu}/arm925t/config.mk (100%) rename {cpu => arch/arm/cpu}/arm925t/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm925t/omap925.c (100%) rename {cpu => arch/arm/cpu}/arm925t/start.S (100%) rename {cpu => arch/arm/cpu}/arm925t/timer.c (100%) rename {cpu => arch/arm/cpu}/arm925t/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm926ejs/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/at91cap9_devices.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/at91sam9260_devices.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/at91sam9261_devices.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/at91sam9263_devices.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/at91sam9m10g45_devices.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/at91sam9rl_devices.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/clock.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/config.mk (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/led.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/lowlevel_init.S (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/reset.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/timer.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/config.mk (100%) rename {cpu => arch/arm/cpu}/arm926ejs/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/config.mk (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/dm355.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/dm365.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/dm644x.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/dm646x.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/dp83848.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/lowlevel_init.S (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/lxt972.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/psc.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/reset.S (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/timer.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/kirkwood/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/kirkwood/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/kirkwood/dram.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/kirkwood/mpp.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/kirkwood/timer.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/mx27/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/mx27/generic.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/mx27/reset.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/mx27/timer.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/nomadik/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/nomadik/gpio.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/nomadik/reset.S (100%) rename {cpu => arch/arm/cpu}/arm926ejs/nomadik/timer.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/omap/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/omap/cpuinfo.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/omap/reset.S (100%) rename {cpu => arch/arm/cpu}/arm926ejs/omap/timer.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/start.S (100%) rename {cpu => arch/arm/cpu}/arm926ejs/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm926ejs/versatile/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/versatile/reset.S (100%) rename {cpu => arch/arm/cpu}/arm926ejs/versatile/timer.c (100%) rename {cpu => arch/arm/cpu}/arm946es/Makefile (100%) rename {cpu => arch/arm/cpu}/arm946es/config.mk (100%) rename {cpu => arch/arm/cpu}/arm946es/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm946es/start.S (100%) rename {cpu/arm_intcm => arch/arm/cpu/arm946es}/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm_cortexa8/Makefile (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/config.mk (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/Makefile (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/board.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/cache.S (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/clock.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/gpio.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/lowlevel_init.S (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/mem.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/reset.S (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/sys_info.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/syslib.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/timer.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/Makefile (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/cache.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/clock.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/cpu_info.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/reset.S (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/timer.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/start.S (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm_intcm/Makefile (100%) rename {cpu => arch/arm/cpu}/arm_intcm/config.mk (100%) rename {cpu => arch/arm/cpu}/arm_intcm/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm_intcm/start.S (100%) rename {cpu/lh7a40x => arch/arm/cpu/arm_intcm}/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/ixp/Makefile (100%) rename {cpu => arch/arm/cpu}/ixp/config.mk (100%) rename {cpu => arch/arm/cpu}/ixp/cpu.c (100%) rename {cpu => arch/arm/cpu}/ixp/interrupts.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthAcc.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthAccCommon.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthAccControlInterface.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthAccDataPlane.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthAccMac.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthAccMii.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBAPI.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBAPISupport.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBCore.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBEvents.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBFeatures.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBFirewall.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBHashtable.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBLearning.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBMem.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBNPEAdaptor.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBPortUpdate.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBReports.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBSearch.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBSpanningTree.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBUtil.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBVlan.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBWiFi.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthMii.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxFeatureCtrl.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeDl.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeDlImageMgr.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeDlNpeMgr.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeDlNpeMgrUtils.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeMh.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhConfig.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhReceive.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhSend.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhSolicitedCbMgr.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhUnsolicitedCbMgr.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxOsalBufferMgt.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxOsalIoMem.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsCacheMMU.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsMsgQ.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsSemaphore.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsServices.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsThread.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxQMgrAqmIf.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxQMgrDispatcher.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxQMgrInit.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxQMgrQAccess.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxQMgrQCfg.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/Makefile (95%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxAssert.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmSch.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmTypes.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmdAcc.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmdAccCtrl.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmm.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxDmaAcc.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAcc.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAccDataPlane_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAccMac_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAccMii_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAccQueueAssign_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAcc_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDB.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDBLocks_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDBLog_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDBMessages_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDBPortDefs.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDBQoS.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDB_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthMii.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthMii_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthNpe.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxFeatureCtrl.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxHssAcc.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxI2cDrv.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeA.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDl.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDlImageMgr_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDlMacros_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDlNpeMgr_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMh.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMhConfig_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMhMacros_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMhReceive_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMhSend_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMicrocode.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsBufLib.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsBuffMgt.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsBuffPoolMgt.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsCacheMMU.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsPrintf.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsServices.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsServicesComponents.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsServicesEndianess.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsServicesMemAccess.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsServicesMemMap.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsal.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalAssert.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBackward.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBackwardAssert.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBackwardBufferMgt.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBackwardCacheMMU.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBackwardMemMap.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBackwardOsServices.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBackwardOssl.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBufferMgt.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBufferMgtDefault.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalConfig.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalEndianess.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalIoMem.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalMemAccess.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOem.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOs.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOsAssert.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOsBufferMgt.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOsIxp400.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOsTypes.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOsUtilitySymbols.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalTypes.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalUtilitySymbols.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxParityENAcc.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxPerfProfAcc.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgr.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrAqmIf_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrDefines_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrDispatcher_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrLog_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrQAccess_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrQCfg_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxQueueAssignments.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxSspAcc.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxTimeSyncAcc.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxTimerCtrl.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxTypes.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxUART.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxVersionId.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/ix_error.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/ix_macros.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/ix_os_type.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/ix_ossl.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/ix_symbols.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/ix_types.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/npe.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/os_datatypes.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/miiphy.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/npe.c (100%) rename {cpu => arch/arm/cpu}/ixp/start.S (100%) rename {cpu => arch/arm/cpu}/ixp/timer.c (100%) rename {cpu => arch/arm/cpu}/ixp/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/lh7a40x/Makefile (100%) rename {cpu => arch/arm/cpu}/lh7a40x/config.mk (100%) rename {cpu => arch/arm/cpu}/lh7a40x/cpu.c (100%) rename {cpu => arch/arm/cpu}/lh7a40x/speed.c (100%) rename {cpu => arch/arm/cpu}/lh7a40x/start.S (100%) rename {cpu => arch/arm/cpu}/lh7a40x/timer.c (100%) rename {cpu/arm946es => arch/arm/cpu/lh7a40x}/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/pxa/Makefile (100%) rename {cpu => arch/arm/cpu}/pxa/config.mk (100%) rename {cpu => arch/arm/cpu}/pxa/cpu.c (100%) rename {cpu => arch/arm/cpu}/pxa/i2c.c (100%) rename {cpu => arch/arm/cpu}/pxa/pxafb.c (100%) rename {cpu => arch/arm/cpu}/pxa/start.S (100%) rename {cpu => arch/arm/cpu}/pxa/timer.c (100%) rename {cpu => arch/arm/cpu}/pxa/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/pxa/usb.c (100%) rename {cpu => arch/arm/cpu}/s3c44b0/Makefile (100%) rename {cpu => arch/arm/cpu}/s3c44b0/cache.c (100%) rename {cpu => arch/arm/cpu}/s3c44b0/config.mk (100%) rename {cpu => arch/arm/cpu}/s3c44b0/cpu.c (100%) rename {cpu => arch/arm/cpu}/s3c44b0/start.S (100%) rename {cpu => arch/arm/cpu}/s3c44b0/timer.c (100%) rename {cpu => arch/arm/cpu}/s3c44b0/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/sa1100/Makefile (100%) rename {cpu => arch/arm/cpu}/sa1100/config.mk (100%) rename {cpu => arch/arm/cpu}/sa1100/cpu.c (100%) rename {cpu => arch/arm/cpu}/sa1100/start.S (100%) rename {cpu => arch/arm/cpu}/sa1100/timer.c (100%) rename {cpu => arch/arm/cpu}/sa1100/u-boot.lds (97%)

diff --git a/Makefile b/Makefile index 6b5e03c..c97ab1d 100644 --- a/Makefile +++ b/Makefile @@ -193,7 +193,7 @@ ifdef SOC LIBS += arch/$(ARCH)/cpu/$(CPU)/$(SOC)/lib$(SOC).a endif ifeq ($(CPU),ixp) -LIBS += cpu/ixp/npe/libnpe.a +LIBS += arch/arm/cpu/ixp/npe/libnpe.a endif LIBS += arch/$(ARCH)/lib/lib$(ARCH).a LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \ diff --git a/cpu/arm1136/Makefile b/arch/arm/cpu/arm1136/Makefile similarity index 100% rename from cpu/arm1136/Makefile rename to arch/arm/cpu/arm1136/Makefile diff --git a/cpu/arm1136/config.mk b/arch/arm/cpu/arm1136/config.mk similarity index 100% rename from cpu/arm1136/config.mk rename to arch/arm/cpu/arm1136/config.mk diff --git a/cpu/arm1136/cpu.c b/arch/arm/cpu/arm1136/cpu.c similarity index 100% rename from cpu/arm1136/cpu.c rename to arch/arm/cpu/arm1136/cpu.c diff --git a/cpu/arm1136/mx31/Makefile b/arch/arm/cpu/arm1136/mx31/Makefile similarity index 100% rename from cpu/arm1136/mx31/Makefile rename to arch/arm/cpu/arm1136/mx31/Makefile diff --git a/cpu/arm1136/mx31/devices.c b/arch/arm/cpu/arm1136/mx31/devices.c similarity index 100% rename from cpu/arm1136/mx31/devices.c rename to arch/arm/cpu/arm1136/mx31/devices.c diff --git a/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c similarity index 100% rename from cpu/arm1136/mx31/generic.c rename to arch/arm/cpu/arm1136/mx31/generic.c diff --git a/cpu/arm1136/mx31/timer.c b/arch/arm/cpu/arm1136/mx31/timer.c similarity index 100% rename from cpu/arm1136/mx31/timer.c rename to arch/arm/cpu/arm1136/mx31/timer.c diff --git a/cpu/arm1136/omap24xx/Makefile b/arch/arm/cpu/arm1136/omap24xx/Makefile similarity index 100% rename from cpu/arm1136/omap24xx/Makefile rename to arch/arm/cpu/arm1136/omap24xx/Makefile diff --git a/cpu/arm1136/omap24xx/reset.S b/arch/arm/cpu/arm1136/omap24xx/reset.S similarity index 100% rename from cpu/arm1136/omap24xx/reset.S rename to arch/arm/cpu/arm1136/omap24xx/reset.S diff --git a/cpu/arm1136/omap24xx/timer.c b/arch/arm/cpu/arm1136/omap24xx/timer.c similarity index 100% rename from cpu/arm1136/omap24xx/timer.c rename to arch/arm/cpu/arm1136/omap24xx/timer.c diff --git a/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S similarity index 100% rename from cpu/arm1136/start.S rename to arch/arm/cpu/arm1136/start.S diff --git a/cpu/arm1136/u-boot.lds b/arch/arm/cpu/arm1136/u-boot.lds similarity index 97% rename from cpu/arm1136/u-boot.lds rename to arch/arm/cpu/arm1136/u-boot.lds index 7181a56..e7eefc9 100644 --- a/cpu/arm1136/u-boot.lds +++ b/arch/arm/cpu/arm1136/u-boot.lds @@ -39,7 +39,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm1136/start.o (.text) + arch/arm/cpu/arm1136/start.o (.text) *(.text) }

diff --git a/cpu/arm1176/Makefile b/arch/arm/cpu/arm1176/Makefile similarity index 100% rename from cpu/arm1176/Makefile rename to arch/arm/cpu/arm1176/Makefile diff --git a/cpu/arm1176/config.mk b/arch/arm/cpu/arm1176/config.mk similarity index 100% rename from cpu/arm1176/config.mk rename to arch/arm/cpu/arm1176/config.mk diff --git a/cpu/arm1176/cpu.c b/arch/arm/cpu/arm1176/cpu.c similarity index 100% rename from cpu/arm1176/cpu.c rename to arch/arm/cpu/arm1176/cpu.c diff --git a/cpu/arm1176/s3c64xx/Makefile b/arch/arm/cpu/arm1176/s3c64xx/Makefile similarity index 100% rename from cpu/arm1176/s3c64xx/Makefile rename to arch/arm/cpu/arm1176/s3c64xx/Makefile diff --git a/cpu/arm1176/s3c64xx/config.mk b/arch/arm/cpu/arm1176/s3c64xx/config.mk similarity index 100% rename from cpu/arm1176/s3c64xx/config.mk rename to arch/arm/cpu/arm1176/s3c64xx/config.mk diff --git a/cpu/arm1176/s3c64xx/cpu_init.S b/arch/arm/cpu/arm1176/s3c64xx/cpu_init.S similarity index 100% rename from cpu/arm1176/s3c64xx/cpu_init.S rename to arch/arm/cpu/arm1176/s3c64xx/cpu_init.S diff --git a/cpu/arm1176/s3c64xx/reset.S b/arch/arm/cpu/arm1176/s3c64xx/reset.S similarity index 100% rename from cpu/arm1176/s3c64xx/reset.S rename to arch/arm/cpu/arm1176/s3c64xx/reset.S diff --git a/cpu/arm1176/s3c64xx/speed.c b/arch/arm/cpu/arm1176/s3c64xx/speed.c similarity index 100% rename from cpu/arm1176/s3c64xx/speed.c rename to arch/arm/cpu/arm1176/s3c64xx/speed.c diff --git a/cpu/arm1176/s3c64xx/timer.c b/arch/arm/cpu/arm1176/s3c64xx/timer.c similarity index 100% rename from cpu/arm1176/s3c64xx/timer.c rename to arch/arm/cpu/arm1176/s3c64xx/timer.c diff --git a/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S similarity index 100% rename from cpu/arm1176/start.S rename to arch/arm/cpu/arm1176/start.S diff --git a/cpu/arm1176/u-boot.lds b/arch/arm/cpu/arm1176/u-boot.lds similarity index 97% rename from cpu/arm1176/u-boot.lds rename to arch/arm/cpu/arm1176/u-boot.lds index cc682f5..8969587 100644 --- a/cpu/arm1176/u-boot.lds +++ b/arch/arm/cpu/arm1176/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm1176/start.o (.text) + arch/arm/cpu/arm1176/start.o (.text) *(.text) }

diff --git a/cpu/arm720t/Makefile b/arch/arm/cpu/arm720t/Makefile similarity index 100% rename from cpu/arm720t/Makefile rename to arch/arm/cpu/arm720t/Makefile diff --git a/cpu/arm720t/config.mk b/arch/arm/cpu/arm720t/config.mk similarity index 100% rename from cpu/arm720t/config.mk rename to arch/arm/cpu/arm720t/config.mk diff --git a/cpu/arm720t/cpu.c b/arch/arm/cpu/arm720t/cpu.c similarity index 100% rename from cpu/arm720t/cpu.c rename to arch/arm/cpu/arm720t/cpu.c diff --git a/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c similarity index 100% rename from cpu/arm720t/interrupts.c rename to arch/arm/cpu/arm720t/interrupts.c diff --git a/cpu/arm720t/lpc2292/Makefile b/arch/arm/cpu/arm720t/lpc2292/Makefile similarity index 100% rename from cpu/arm720t/lpc2292/Makefile rename to arch/arm/cpu/arm720t/lpc2292/Makefile diff --git a/cpu/arm720t/lpc2292/flash.c b/arch/arm/cpu/arm720t/lpc2292/flash.c similarity index 100% rename from cpu/arm720t/lpc2292/flash.c rename to arch/arm/cpu/arm720t/lpc2292/flash.c diff --git a/cpu/arm720t/lpc2292/iap_entry.S b/arch/arm/cpu/arm720t/lpc2292/iap_entry.S similarity index 100% rename from cpu/arm720t/lpc2292/iap_entry.S rename to arch/arm/cpu/arm720t/lpc2292/iap_entry.S diff --git a/cpu/arm720t/lpc2292/mmc.c b/arch/arm/cpu/arm720t/lpc2292/mmc.c similarity index 100% rename from cpu/arm720t/lpc2292/mmc.c rename to arch/arm/cpu/arm720t/lpc2292/mmc.c diff --git a/cpu/arm720t/lpc2292/mmc_hw.c b/arch/arm/cpu/arm720t/lpc2292/mmc_hw.c similarity index 100% rename from cpu/arm720t/lpc2292/mmc_hw.c rename to arch/arm/cpu/arm720t/lpc2292/mmc_hw.c diff --git a/cpu/arm720t/lpc2292/mmc_hw.h b/arch/arm/cpu/arm720t/lpc2292/mmc_hw.h similarity index 100% rename from cpu/arm720t/lpc2292/mmc_hw.h rename to arch/arm/cpu/arm720t/lpc2292/mmc_hw.h diff --git a/cpu/arm720t/lpc2292/spi.c b/arch/arm/cpu/arm720t/lpc2292/spi.c similarity index 100% rename from cpu/arm720t/lpc2292/spi.c rename to arch/arm/cpu/arm720t/lpc2292/spi.c diff --git a/cpu/arm720t/s3c4510b/Makefile b/arch/arm/cpu/arm720t/s3c4510b/Makefile similarity index 100% rename from cpu/arm720t/s3c4510b/Makefile rename to arch/arm/cpu/arm720t/s3c4510b/Makefile diff --git a/cpu/arm720t/s3c4510b/cache.c b/arch/arm/cpu/arm720t/s3c4510b/cache.c similarity index 100% rename from cpu/arm720t/s3c4510b/cache.c rename to arch/arm/cpu/arm720t/s3c4510b/cache.c diff --git a/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S similarity index 100% rename from cpu/arm720t/start.S rename to arch/arm/cpu/arm720t/start.S diff --git a/cpu/arm720t/u-boot.lds b/arch/arm/cpu/arm720t/u-boot.lds similarity index 97% rename from cpu/arm720t/u-boot.lds rename to arch/arm/cpu/arm720t/u-boot.lds index 111c3f5..c975fc3 100644 --- a/cpu/arm720t/u-boot.lds +++ b/arch/arm/cpu/arm720t/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm720t/start.o (.text) + arch/arm/cpu/arm720t/start.o (.text) *(.text) }

diff --git a/cpu/arm920t/Makefile b/arch/arm/cpu/arm920t/Makefile similarity index 100% rename from cpu/arm920t/Makefile rename to arch/arm/cpu/arm920t/Makefile diff --git a/cpu/arm920t/a320/Makefile b/arch/arm/cpu/arm920t/a320/Makefile similarity index 100% rename from cpu/arm920t/a320/Makefile rename to arch/arm/cpu/arm920t/a320/Makefile diff --git a/cpu/arm920t/a320/ftsmc020.c b/arch/arm/cpu/arm920t/a320/ftsmc020.c similarity index 100% rename from cpu/arm920t/a320/ftsmc020.c rename to arch/arm/cpu/arm920t/a320/ftsmc020.c diff --git a/cpu/arm920t/a320/reset.S b/arch/arm/cpu/arm920t/a320/reset.S similarity index 100% rename from cpu/arm920t/a320/reset.S rename to arch/arm/cpu/arm920t/a320/reset.S diff --git a/cpu/arm920t/a320/timer.c b/arch/arm/cpu/arm920t/a320/timer.c similarity index 100% rename from cpu/arm920t/a320/timer.c rename to arch/arm/cpu/arm920t/a320/timer.c diff --git a/cpu/arm920t/at91rm9200/Makefile b/arch/arm/cpu/arm920t/at91rm9200/Makefile similarity index 100% rename from cpu/arm920t/at91rm9200/Makefile rename to arch/arm/cpu/arm920t/at91rm9200/Makefile diff --git a/cpu/arm920t/at91rm9200/bcm5221.c b/arch/arm/cpu/arm920t/at91rm9200/bcm5221.c similarity index 100% rename from cpu/arm920t/at91rm9200/bcm5221.c rename to arch/arm/cpu/arm920t/at91rm9200/bcm5221.c diff --git a/cpu/arm920t/at91rm9200/dm9161.c b/arch/arm/cpu/arm920t/at91rm9200/dm9161.c similarity index 100% rename from cpu/arm920t/at91rm9200/dm9161.c rename to arch/arm/cpu/arm920t/at91rm9200/dm9161.c diff --git a/cpu/arm920t/at91rm9200/ether.c b/arch/arm/cpu/arm920t/at91rm9200/ether.c similarity index 100% rename from cpu/arm920t/at91rm9200/ether.c rename to arch/arm/cpu/arm920t/at91rm9200/ether.c diff --git a/cpu/arm920t/at91rm9200/i2c.c b/arch/arm/cpu/arm920t/at91rm9200/i2c.c similarity index 100% rename from cpu/arm920t/at91rm9200/i2c.c rename to arch/arm/cpu/arm920t/at91rm9200/i2c.c diff --git a/cpu/arm920t/at91rm9200/ks8721.c b/arch/arm/cpu/arm920t/at91rm9200/ks8721.c similarity index 100% rename from cpu/arm920t/at91rm9200/ks8721.c rename to arch/arm/cpu/arm920t/at91rm9200/ks8721.c diff --git a/cpu/arm920t/at91rm9200/lowlevel_init.S b/arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S similarity index 100% rename from cpu/arm920t/at91rm9200/lowlevel_init.S rename to arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S diff --git a/cpu/arm920t/at91rm9200/lxt972.c b/arch/arm/cpu/arm920t/at91rm9200/lxt972.c similarity index 100% rename from cpu/arm920t/at91rm9200/lxt972.c rename to arch/arm/cpu/arm920t/at91rm9200/lxt972.c diff --git a/cpu/arm920t/at91rm9200/reset.c b/arch/arm/cpu/arm920t/at91rm9200/reset.c similarity index 100% rename from cpu/arm920t/at91rm9200/reset.c rename to arch/arm/cpu/arm920t/at91rm9200/reset.c diff --git a/cpu/arm920t/at91rm9200/spi.c b/arch/arm/cpu/arm920t/at91rm9200/spi.c similarity index 100% rename from cpu/arm920t/at91rm9200/spi.c rename to arch/arm/cpu/arm920t/at91rm9200/spi.c diff --git a/cpu/arm920t/at91rm9200/timer.c b/arch/arm/cpu/arm920t/at91rm9200/timer.c similarity index 100% rename from cpu/arm920t/at91rm9200/timer.c rename to arch/arm/cpu/arm920t/at91rm9200/timer.c diff --git a/cpu/arm920t/at91rm9200/usb.c b/arch/arm/cpu/arm920t/at91rm9200/usb.c similarity index 100% rename from cpu/arm920t/at91rm9200/usb.c rename to arch/arm/cpu/arm920t/at91rm9200/usb.c diff --git a/cpu/arm920t/config.mk b/arch/arm/cpu/arm920t/config.mk similarity index 100% rename from cpu/arm920t/config.mk rename to arch/arm/cpu/arm920t/config.mk diff --git a/cpu/arm920t/cpu.c b/arch/arm/cpu/arm920t/cpu.c similarity index 100% rename from cpu/arm920t/cpu.c rename to arch/arm/cpu/arm920t/cpu.c diff --git a/cpu/arm920t/imx/Makefile b/arch/arm/cpu/arm920t/imx/Makefile similarity index 100% rename from cpu/arm920t/imx/Makefile rename to arch/arm/cpu/arm920t/imx/Makefile diff --git a/cpu/arm920t/imx/generic.c b/arch/arm/cpu/arm920t/imx/generic.c similarity index 100% rename from cpu/arm920t/imx/generic.c rename to arch/arm/cpu/arm920t/imx/generic.c diff --git a/cpu/arm920t/imx/speed.c b/arch/arm/cpu/arm920t/imx/speed.c similarity index 100% rename from cpu/arm920t/imx/speed.c rename to arch/arm/cpu/arm920t/imx/speed.c diff --git a/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c similarity index 100% rename from cpu/arm920t/imx/timer.c rename to arch/arm/cpu/arm920t/imx/timer.c diff --git a/cpu/arm920t/interrupts.c b/arch/arm/cpu/arm920t/interrupts.c similarity index 100% rename from cpu/arm920t/interrupts.c rename to arch/arm/cpu/arm920t/interrupts.c diff --git a/cpu/arm920t/ks8695/Makefile b/arch/arm/cpu/arm920t/ks8695/Makefile similarity index 100% rename from cpu/arm920t/ks8695/Makefile rename to arch/arm/cpu/arm920t/ks8695/Makefile diff --git a/cpu/arm920t/ks8695/lowlevel_init.S b/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S similarity index 100% rename from cpu/arm920t/ks8695/lowlevel_init.S rename to arch/arm/cpu/arm920t/ks8695/lowlevel_init.S diff --git a/cpu/arm920t/ks8695/timer.c b/arch/arm/cpu/arm920t/ks8695/timer.c similarity index 100% rename from cpu/arm920t/ks8695/timer.c rename to arch/arm/cpu/arm920t/ks8695/timer.c diff --git a/cpu/arm920t/s3c24x0/Makefile b/arch/arm/cpu/arm920t/s3c24x0/Makefile similarity index 100% rename from cpu/arm920t/s3c24x0/Makefile rename to arch/arm/cpu/arm920t/s3c24x0/Makefile diff --git a/cpu/arm920t/s3c24x0/interrupts.c b/arch/arm/cpu/arm920t/s3c24x0/interrupts.c similarity index 100% rename from cpu/arm920t/s3c24x0/interrupts.c rename to arch/arm/cpu/arm920t/s3c24x0/interrupts.c diff --git a/cpu/arm920t/s3c24x0/speed.c b/arch/arm/cpu/arm920t/s3c24x0/speed.c similarity index 100% rename from cpu/arm920t/s3c24x0/speed.c rename to arch/arm/cpu/arm920t/s3c24x0/speed.c diff --git a/cpu/arm920t/s3c24x0/timer.c b/arch/arm/cpu/arm920t/s3c24x0/timer.c similarity index 100% rename from cpu/arm920t/s3c24x0/timer.c rename to arch/arm/cpu/arm920t/s3c24x0/timer.c diff --git a/cpu/arm920t/s3c24x0/usb.c b/arch/arm/cpu/arm920t/s3c24x0/usb.c similarity index 100% rename from cpu/arm920t/s3c24x0/usb.c rename to arch/arm/cpu/arm920t/s3c24x0/usb.c diff --git a/cpu/arm920t/s3c24x0/usb_ohci.c b/arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c similarity index 100% rename from cpu/arm920t/s3c24x0/usb_ohci.c rename to arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c diff --git a/cpu/arm920t/s3c24x0/usb_ohci.h b/arch/arm/cpu/arm920t/s3c24x0/usb_ohci.h similarity index 100% rename from cpu/arm920t/s3c24x0/usb_ohci.h rename to arch/arm/cpu/arm920t/s3c24x0/usb_ohci.h diff --git a/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S similarity index 100% rename from cpu/arm920t/start.S rename to arch/arm/cpu/arm920t/start.S diff --git a/cpu/arm920t/u-boot.lds b/arch/arm/cpu/arm920t/u-boot.lds similarity index 97% rename from cpu/arm920t/u-boot.lds rename to arch/arm/cpu/arm920t/u-boot.lds index d9bfbee..a7decfc 100644 --- a/cpu/arm920t/u-boot.lds +++ b/arch/arm/cpu/arm920t/u-boot.lds @@ -39,7 +39,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm920t/start.o (.text) + arch/arm/cpu/arm920t/start.o (.text) *(.text) }

diff --git a/cpu/arm925t/Makefile b/arch/arm/cpu/arm925t/Makefile similarity index 100% rename from cpu/arm925t/Makefile rename to arch/arm/cpu/arm925t/Makefile diff --git a/cpu/arm925t/config.mk b/arch/arm/cpu/arm925t/config.mk similarity index 100% rename from cpu/arm925t/config.mk rename to arch/arm/cpu/arm925t/config.mk diff --git a/cpu/arm925t/cpu.c b/arch/arm/cpu/arm925t/cpu.c similarity index 100% rename from cpu/arm925t/cpu.c rename to arch/arm/cpu/arm925t/cpu.c diff --git a/cpu/arm925t/omap925.c b/arch/arm/cpu/arm925t/omap925.c similarity index 100% rename from cpu/arm925t/omap925.c rename to arch/arm/cpu/arm925t/omap925.c diff --git a/cpu/arm925t/start.S b/arch/arm/cpu/arm925t/start.S similarity index 100% rename from cpu/arm925t/start.S rename to arch/arm/cpu/arm925t/start.S diff --git a/cpu/arm925t/timer.c b/arch/arm/cpu/arm925t/timer.c similarity index 100% rename from cpu/arm925t/timer.c rename to arch/arm/cpu/arm925t/timer.c diff --git a/cpu/arm925t/u-boot.lds b/arch/arm/cpu/arm925t/u-boot.lds similarity index 97% rename from cpu/arm925t/u-boot.lds rename to arch/arm/cpu/arm925t/u-boot.lds index 694780e..e21d6dc 100644 --- a/cpu/arm925t/u-boot.lds +++ b/arch/arm/cpu/arm925t/u-boot.lds @@ -34,7 +34,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm925t/start.o (.text) + arch/arm/cpu/arm925t/start.o (.text) *(.text) }

diff --git a/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile similarity index 100% rename from cpu/arm926ejs/Makefile rename to arch/arm/cpu/arm926ejs/Makefile diff --git a/cpu/arm926ejs/at91/Makefile b/arch/arm/cpu/arm926ejs/at91/Makefile similarity index 100% rename from cpu/arm926ejs/at91/Makefile rename to arch/arm/cpu/arm926ejs/at91/Makefile diff --git a/cpu/arm926ejs/at91/at91cap9_devices.c b/arch/arm/cpu/arm926ejs/at91/at91cap9_devices.c similarity index 100% rename from cpu/arm926ejs/at91/at91cap9_devices.c rename to arch/arm/cpu/arm926ejs/at91/at91cap9_devices.c diff --git a/cpu/arm926ejs/at91/at91sam9260_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c similarity index 100% rename from cpu/arm926ejs/at91/at91sam9260_devices.c rename to arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c diff --git a/cpu/arm926ejs/at91/at91sam9261_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c similarity index 100% rename from cpu/arm926ejs/at91/at91sam9261_devices.c rename to arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c diff --git a/cpu/arm926ejs/at91/at91sam9263_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c similarity index 100% rename from cpu/arm926ejs/at91/at91sam9263_devices.c rename to arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c diff --git a/cpu/arm926ejs/at91/at91sam9m10g45_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c similarity index 100% rename from cpu/arm926ejs/at91/at91sam9m10g45_devices.c rename to arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c diff --git a/cpu/arm926ejs/at91/at91sam9rl_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c similarity index 100% rename from cpu/arm926ejs/at91/at91sam9rl_devices.c rename to arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c diff --git a/cpu/arm926ejs/at91/clock.c b/arch/arm/cpu/arm926ejs/at91/clock.c similarity index 100% rename from cpu/arm926ejs/at91/clock.c rename to arch/arm/cpu/arm926ejs/at91/clock.c diff --git a/cpu/arm926ejs/at91/config.mk b/arch/arm/cpu/arm926ejs/at91/config.mk similarity index 100% rename from cpu/arm926ejs/at91/config.mk rename to arch/arm/cpu/arm926ejs/at91/config.mk diff --git a/cpu/arm926ejs/at91/cpu.c b/arch/arm/cpu/arm926ejs/at91/cpu.c similarity index 100% rename from cpu/arm926ejs/at91/cpu.c rename to arch/arm/cpu/arm926ejs/at91/cpu.c diff --git a/cpu/arm926ejs/at91/led.c b/arch/arm/cpu/arm926ejs/at91/led.c similarity index 100% rename from cpu/arm926ejs/at91/led.c rename to arch/arm/cpu/arm926ejs/at91/led.c diff --git a/cpu/arm926ejs/at91/lowlevel_init.S b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S similarity index 100% rename from cpu/arm926ejs/at91/lowlevel_init.S rename to arch/arm/cpu/arm926ejs/at91/lowlevel_init.S diff --git a/cpu/arm926ejs/at91/reset.c b/arch/arm/cpu/arm926ejs/at91/reset.c similarity index 100% rename from cpu/arm926ejs/at91/reset.c rename to arch/arm/cpu/arm926ejs/at91/reset.c diff --git a/cpu/arm926ejs/at91/timer.c b/arch/arm/cpu/arm926ejs/at91/timer.c similarity index 100% rename from cpu/arm926ejs/at91/timer.c rename to arch/arm/cpu/arm926ejs/at91/timer.c diff --git a/cpu/arm926ejs/config.mk b/arch/arm/cpu/arm926ejs/config.mk similarity index 100% rename from cpu/arm926ejs/config.mk rename to arch/arm/cpu/arm926ejs/config.mk diff --git a/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c similarity index 100% rename from cpu/arm926ejs/cpu.c rename to arch/arm/cpu/arm926ejs/cpu.c diff --git a/cpu/arm926ejs/davinci/Makefile b/arch/arm/cpu/arm926ejs/davinci/Makefile similarity index 100% rename from cpu/arm926ejs/davinci/Makefile rename to arch/arm/cpu/arm926ejs/davinci/Makefile diff --git a/cpu/arm926ejs/davinci/config.mk b/arch/arm/cpu/arm926ejs/davinci/config.mk similarity index 100% rename from cpu/arm926ejs/davinci/config.mk rename to arch/arm/cpu/arm926ejs/davinci/config.mk diff --git a/cpu/arm926ejs/davinci/cpu.c b/arch/arm/cpu/arm926ejs/davinci/cpu.c similarity index 100% rename from cpu/arm926ejs/davinci/cpu.c rename to arch/arm/cpu/arm926ejs/davinci/cpu.c diff --git a/cpu/arm926ejs/davinci/dm355.c b/arch/arm/cpu/arm926ejs/davinci/dm355.c similarity index 100% rename from cpu/arm926ejs/davinci/dm355.c rename to arch/arm/cpu/arm926ejs/davinci/dm355.c diff --git a/cpu/arm926ejs/davinci/dm365.c b/arch/arm/cpu/arm926ejs/davinci/dm365.c similarity index 100% rename from cpu/arm926ejs/davinci/dm365.c rename to arch/arm/cpu/arm926ejs/davinci/dm365.c diff --git a/cpu/arm926ejs/davinci/dm644x.c b/arch/arm/cpu/arm926ejs/davinci/dm644x.c similarity index 100% rename from cpu/arm926ejs/davinci/dm644x.c rename to arch/arm/cpu/arm926ejs/davinci/dm644x.c diff --git a/cpu/arm926ejs/davinci/dm646x.c b/arch/arm/cpu/arm926ejs/davinci/dm646x.c similarity index 100% rename from cpu/arm926ejs/davinci/dm646x.c rename to arch/arm/cpu/arm926ejs/davinci/dm646x.c diff --git a/cpu/arm926ejs/davinci/dp83848.c b/arch/arm/cpu/arm926ejs/davinci/dp83848.c similarity index 100% rename from cpu/arm926ejs/davinci/dp83848.c rename to arch/arm/cpu/arm926ejs/davinci/dp83848.c diff --git a/cpu/arm926ejs/davinci/lowlevel_init.S b/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S similarity index 100% rename from cpu/arm926ejs/davinci/lowlevel_init.S rename to arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S diff --git a/cpu/arm926ejs/davinci/lxt972.c b/arch/arm/cpu/arm926ejs/davinci/lxt972.c similarity index 100% rename from cpu/arm926ejs/davinci/lxt972.c rename to arch/arm/cpu/arm926ejs/davinci/lxt972.c diff --git a/cpu/arm926ejs/davinci/psc.c b/arch/arm/cpu/arm926ejs/davinci/psc.c similarity index 100% rename from cpu/arm926ejs/davinci/psc.c rename to arch/arm/cpu/arm926ejs/davinci/psc.c diff --git a/cpu/arm926ejs/davinci/reset.S b/arch/arm/cpu/arm926ejs/davinci/reset.S similarity index 100% rename from cpu/arm926ejs/davinci/reset.S rename to arch/arm/cpu/arm926ejs/davinci/reset.S diff --git a/cpu/arm926ejs/davinci/timer.c b/arch/arm/cpu/arm926ejs/davinci/timer.c similarity index 100% rename from cpu/arm926ejs/davinci/timer.c rename to arch/arm/cpu/arm926ejs/davinci/timer.c diff --git a/cpu/arm926ejs/kirkwood/Makefile b/arch/arm/cpu/arm926ejs/kirkwood/Makefile similarity index 100% rename from cpu/arm926ejs/kirkwood/Makefile rename to arch/arm/cpu/arm926ejs/kirkwood/Makefile diff --git a/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c similarity index 100% rename from cpu/arm926ejs/kirkwood/cpu.c rename to arch/arm/cpu/arm926ejs/kirkwood/cpu.c diff --git a/cpu/arm926ejs/kirkwood/dram.c b/arch/arm/cpu/arm926ejs/kirkwood/dram.c similarity index 100% rename from cpu/arm926ejs/kirkwood/dram.c rename to arch/arm/cpu/arm926ejs/kirkwood/dram.c diff --git a/cpu/arm926ejs/kirkwood/mpp.c b/arch/arm/cpu/arm926ejs/kirkwood/mpp.c similarity index 100% rename from cpu/arm926ejs/kirkwood/mpp.c rename to arch/arm/cpu/arm926ejs/kirkwood/mpp.c diff --git a/cpu/arm926ejs/kirkwood/timer.c b/arch/arm/cpu/arm926ejs/kirkwood/timer.c similarity index 100% rename from cpu/arm926ejs/kirkwood/timer.c rename to arch/arm/cpu/arm926ejs/kirkwood/timer.c diff --git a/cpu/arm926ejs/mx27/Makefile b/arch/arm/cpu/arm926ejs/mx27/Makefile similarity index 100% rename from cpu/arm926ejs/mx27/Makefile rename to arch/arm/cpu/arm926ejs/mx27/Makefile diff --git a/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c similarity index 100% rename from cpu/arm926ejs/mx27/generic.c rename to arch/arm/cpu/arm926ejs/mx27/generic.c diff --git a/cpu/arm926ejs/mx27/reset.c b/arch/arm/cpu/arm926ejs/mx27/reset.c similarity index 100% rename from cpu/arm926ejs/mx27/reset.c rename to arch/arm/cpu/arm926ejs/mx27/reset.c diff --git a/cpu/arm926ejs/mx27/timer.c b/arch/arm/cpu/arm926ejs/mx27/timer.c similarity index 100% rename from cpu/arm926ejs/mx27/timer.c rename to arch/arm/cpu/arm926ejs/mx27/timer.c diff --git a/cpu/arm926ejs/nomadik/Makefile b/arch/arm/cpu/arm926ejs/nomadik/Makefile similarity index 100% rename from cpu/arm926ejs/nomadik/Makefile rename to arch/arm/cpu/arm926ejs/nomadik/Makefile diff --git a/cpu/arm926ejs/nomadik/gpio.c b/arch/arm/cpu/arm926ejs/nomadik/gpio.c similarity index 100% rename from cpu/arm926ejs/nomadik/gpio.c rename to arch/arm/cpu/arm926ejs/nomadik/gpio.c diff --git a/cpu/arm926ejs/nomadik/reset.S b/arch/arm/cpu/arm926ejs/nomadik/reset.S similarity index 100% rename from cpu/arm926ejs/nomadik/reset.S rename to arch/arm/cpu/arm926ejs/nomadik/reset.S diff --git a/cpu/arm926ejs/nomadik/timer.c b/arch/arm/cpu/arm926ejs/nomadik/timer.c similarity index 100% rename from cpu/arm926ejs/nomadik/timer.c rename to arch/arm/cpu/arm926ejs/nomadik/timer.c diff --git a/cpu/arm926ejs/omap/Makefile b/arch/arm/cpu/arm926ejs/omap/Makefile similarity index 100% rename from cpu/arm926ejs/omap/Makefile rename to arch/arm/cpu/arm926ejs/omap/Makefile diff --git a/cpu/arm926ejs/omap/cpuinfo.c b/arch/arm/cpu/arm926ejs/omap/cpuinfo.c similarity index 100% rename from cpu/arm926ejs/omap/cpuinfo.c rename to arch/arm/cpu/arm926ejs/omap/cpuinfo.c diff --git a/cpu/arm926ejs/omap/reset.S b/arch/arm/cpu/arm926ejs/omap/reset.S similarity index 100% rename from cpu/arm926ejs/omap/reset.S rename to arch/arm/cpu/arm926ejs/omap/reset.S diff --git a/cpu/arm926ejs/omap/timer.c b/arch/arm/cpu/arm926ejs/omap/timer.c similarity index 100% rename from cpu/arm926ejs/omap/timer.c rename to arch/arm/cpu/arm926ejs/omap/timer.c diff --git a/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S similarity index 100% rename from cpu/arm926ejs/start.S rename to arch/arm/cpu/arm926ejs/start.S diff --git a/cpu/arm926ejs/u-boot.lds b/arch/arm/cpu/arm926ejs/u-boot.lds similarity index 97% rename from cpu/arm926ejs/u-boot.lds rename to arch/arm/cpu/arm926ejs/u-boot.lds index ee5eeb5..ecbc58c 100644 --- a/cpu/arm926ejs/u-boot.lds +++ b/arch/arm/cpu/arm926ejs/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm926ejs/start.o (.text) + arch/arm/cpu/arm926ejs/start.o (.text) *(.text) }

diff --git a/cpu/arm926ejs/versatile/Makefile b/arch/arm/cpu/arm926ejs/versatile/Makefile similarity index 100% rename from cpu/arm926ejs/versatile/Makefile rename to arch/arm/cpu/arm926ejs/versatile/Makefile diff --git a/cpu/arm926ejs/versatile/reset.S b/arch/arm/cpu/arm926ejs/versatile/reset.S similarity index 100% rename from cpu/arm926ejs/versatile/reset.S rename to arch/arm/cpu/arm926ejs/versatile/reset.S diff --git a/cpu/arm926ejs/versatile/timer.c b/arch/arm/cpu/arm926ejs/versatile/timer.c similarity index 100% rename from cpu/arm926ejs/versatile/timer.c rename to arch/arm/cpu/arm926ejs/versatile/timer.c diff --git a/cpu/arm946es/Makefile b/arch/arm/cpu/arm946es/Makefile similarity index 100% rename from cpu/arm946es/Makefile rename to arch/arm/cpu/arm946es/Makefile diff --git a/cpu/arm946es/config.mk b/arch/arm/cpu/arm946es/config.mk similarity index 100% rename from cpu/arm946es/config.mk rename to arch/arm/cpu/arm946es/config.mk diff --git a/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c similarity index 100% rename from cpu/arm946es/cpu.c rename to arch/arm/cpu/arm946es/cpu.c diff --git a/cpu/arm946es/start.S b/arch/arm/cpu/arm946es/start.S similarity index 100% rename from cpu/arm946es/start.S rename to arch/arm/cpu/arm946es/start.S diff --git a/cpu/arm_intcm/u-boot.lds b/arch/arm/cpu/arm946es/u-boot.lds similarity index 97% rename from cpu/arm_intcm/u-boot.lds rename to arch/arm/cpu/arm946es/u-boot.lds index 5eb87fb..fef21c7 100644 --- a/cpu/arm_intcm/u-boot.lds +++ b/arch/arm/cpu/arm946es/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm_intcm/start.o (.text) + arch/arm/cpu/arm946es/start.o (.text) *(.text) }

diff --git a/cpu/arm_cortexa8/Makefile b/arch/arm/cpu/arm_cortexa8/Makefile similarity index 100% rename from cpu/arm_cortexa8/Makefile rename to arch/arm/cpu/arm_cortexa8/Makefile diff --git a/cpu/arm_cortexa8/config.mk b/arch/arm/cpu/arm_cortexa8/config.mk similarity index 100% rename from cpu/arm_cortexa8/config.mk rename to arch/arm/cpu/arm_cortexa8/config.mk diff --git a/cpu/arm_cortexa8/cpu.c b/arch/arm/cpu/arm_cortexa8/cpu.c similarity index 100% rename from cpu/arm_cortexa8/cpu.c rename to arch/arm/cpu/arm_cortexa8/cpu.c diff --git a/cpu/arm_cortexa8/omap3/Makefile b/arch/arm/cpu/arm_cortexa8/omap3/Makefile similarity index 100% rename from cpu/arm_cortexa8/omap3/Makefile rename to arch/arm/cpu/arm_cortexa8/omap3/Makefile diff --git a/cpu/arm_cortexa8/omap3/board.c b/arch/arm/cpu/arm_cortexa8/omap3/board.c similarity index 100% rename from cpu/arm_cortexa8/omap3/board.c rename to arch/arm/cpu/arm_cortexa8/omap3/board.c diff --git a/cpu/arm_cortexa8/omap3/cache.S b/arch/arm/cpu/arm_cortexa8/omap3/cache.S similarity index 100% rename from cpu/arm_cortexa8/omap3/cache.S rename to arch/arm/cpu/arm_cortexa8/omap3/cache.S diff --git a/cpu/arm_cortexa8/omap3/clock.c b/arch/arm/cpu/arm_cortexa8/omap3/clock.c similarity index 100% rename from cpu/arm_cortexa8/omap3/clock.c rename to arch/arm/cpu/arm_cortexa8/omap3/clock.c diff --git a/cpu/arm_cortexa8/omap3/gpio.c b/arch/arm/cpu/arm_cortexa8/omap3/gpio.c similarity index 100% rename from cpu/arm_cortexa8/omap3/gpio.c rename to arch/arm/cpu/arm_cortexa8/omap3/gpio.c diff --git a/cpu/arm_cortexa8/omap3/lowlevel_init.S b/arch/arm/cpu/arm_cortexa8/omap3/lowlevel_init.S similarity index 100% rename from cpu/arm_cortexa8/omap3/lowlevel_init.S rename to arch/arm/cpu/arm_cortexa8/omap3/lowlevel_init.S diff --git a/cpu/arm_cortexa8/omap3/mem.c b/arch/arm/cpu/arm_cortexa8/omap3/mem.c similarity index 100% rename from cpu/arm_cortexa8/omap3/mem.c rename to arch/arm/cpu/arm_cortexa8/omap3/mem.c diff --git a/cpu/arm_cortexa8/omap3/reset.S b/arch/arm/cpu/arm_cortexa8/omap3/reset.S similarity index 100% rename from cpu/arm_cortexa8/omap3/reset.S rename to arch/arm/cpu/arm_cortexa8/omap3/reset.S diff --git a/cpu/arm_cortexa8/omap3/sys_info.c b/arch/arm/cpu/arm_cortexa8/omap3/sys_info.c similarity index 100% rename from cpu/arm_cortexa8/omap3/sys_info.c rename to arch/arm/cpu/arm_cortexa8/omap3/sys_info.c diff --git a/cpu/arm_cortexa8/omap3/syslib.c b/arch/arm/cpu/arm_cortexa8/omap3/syslib.c similarity index 100% rename from cpu/arm_cortexa8/omap3/syslib.c rename to arch/arm/cpu/arm_cortexa8/omap3/syslib.c diff --git a/cpu/arm_cortexa8/omap3/timer.c b/arch/arm/cpu/arm_cortexa8/omap3/timer.c similarity index 100% rename from cpu/arm_cortexa8/omap3/timer.c rename to arch/arm/cpu/arm_cortexa8/omap3/timer.c diff --git a/cpu/arm_cortexa8/s5pc1xx/Makefile b/arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile similarity index 100% rename from cpu/arm_cortexa8/s5pc1xx/Makefile rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile diff --git a/cpu/arm_cortexa8/s5pc1xx/cache.c b/arch/arm/cpu/arm_cortexa8/s5pc1xx/cache.c similarity index 100% rename from cpu/arm_cortexa8/s5pc1xx/cache.c rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/cache.c diff --git a/cpu/arm_cortexa8/s5pc1xx/clock.c b/arch/arm/cpu/arm_cortexa8/s5pc1xx/clock.c similarity index 100% rename from cpu/arm_cortexa8/s5pc1xx/clock.c rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/clock.c diff --git a/cpu/arm_cortexa8/s5pc1xx/cpu_info.c b/arch/arm/cpu/arm_cortexa8/s5pc1xx/cpu_info.c similarity index 100% rename from cpu/arm_cortexa8/s5pc1xx/cpu_info.c rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/cpu_info.c diff --git a/cpu/arm_cortexa8/s5pc1xx/reset.S b/arch/arm/cpu/arm_cortexa8/s5pc1xx/reset.S similarity index 100% rename from cpu/arm_cortexa8/s5pc1xx/reset.S rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/reset.S diff --git a/cpu/arm_cortexa8/s5pc1xx/timer.c b/arch/arm/cpu/arm_cortexa8/s5pc1xx/timer.c similarity index 100% rename from cpu/arm_cortexa8/s5pc1xx/timer.c rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/timer.c diff --git a/cpu/arm_cortexa8/start.S b/arch/arm/cpu/arm_cortexa8/start.S similarity index 100% rename from cpu/arm_cortexa8/start.S rename to arch/arm/cpu/arm_cortexa8/start.S diff --git a/cpu/arm_cortexa8/u-boot.lds b/arch/arm/cpu/arm_cortexa8/u-boot.lds similarity index 97% rename from cpu/arm_cortexa8/u-boot.lds rename to arch/arm/cpu/arm_cortexa8/u-boot.lds index 4f1711c..820e3a1 100644 --- a/cpu/arm_cortexa8/u-boot.lds +++ b/arch/arm/cpu/arm_cortexa8/u-boot.lds @@ -34,7 +34,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm_cortexa8/start.o (.text) + arch/arm/cpu/arm_cortexa8/start.o (.text) *(.text) }

diff --git a/cpu/arm_intcm/Makefile b/arch/arm/cpu/arm_intcm/Makefile similarity index 100% rename from cpu/arm_intcm/Makefile rename to arch/arm/cpu/arm_intcm/Makefile diff --git a/cpu/arm_intcm/config.mk b/arch/arm/cpu/arm_intcm/config.mk similarity index 100% rename from cpu/arm_intcm/config.mk rename to arch/arm/cpu/arm_intcm/config.mk diff --git a/cpu/arm_intcm/cpu.c b/arch/arm/cpu/arm_intcm/cpu.c similarity index 100% rename from cpu/arm_intcm/cpu.c rename to arch/arm/cpu/arm_intcm/cpu.c diff --git a/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S similarity index 100% rename from cpu/arm_intcm/start.S rename to arch/arm/cpu/arm_intcm/start.S diff --git a/cpu/lh7a40x/u-boot.lds b/arch/arm/cpu/arm_intcm/u-boot.lds similarity index 97% rename from cpu/lh7a40x/u-boot.lds rename to arch/arm/cpu/arm_intcm/u-boot.lds index e7543c9..4ed7d89 100644 --- a/cpu/lh7a40x/u-boot.lds +++ b/arch/arm/cpu/arm_intcm/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/lh7a40x/start.o (.text) + arch/arm/cpu/arm_intcm/start.o (.text) *(.text) }

diff --git a/cpu/ixp/Makefile b/arch/arm/cpu/ixp/Makefile similarity index 100% rename from cpu/ixp/Makefile rename to arch/arm/cpu/ixp/Makefile diff --git a/cpu/ixp/config.mk b/arch/arm/cpu/ixp/config.mk similarity index 100% rename from cpu/ixp/config.mk rename to arch/arm/cpu/ixp/config.mk diff --git a/cpu/ixp/cpu.c b/arch/arm/cpu/ixp/cpu.c similarity index 100% rename from cpu/ixp/cpu.c rename to arch/arm/cpu/ixp/cpu.c diff --git a/cpu/ixp/interrupts.c b/arch/arm/cpu/ixp/interrupts.c similarity index 100% rename from cpu/ixp/interrupts.c rename to arch/arm/cpu/ixp/interrupts.c diff --git a/cpu/ixp/npe/IxEthAcc.c b/arch/arm/cpu/ixp/npe/IxEthAcc.c similarity index 100% rename from cpu/ixp/npe/IxEthAcc.c rename to arch/arm/cpu/ixp/npe/IxEthAcc.c diff --git a/cpu/ixp/npe/IxEthAccCommon.c b/arch/arm/cpu/ixp/npe/IxEthAccCommon.c similarity index 100% rename from cpu/ixp/npe/IxEthAccCommon.c rename to arch/arm/cpu/ixp/npe/IxEthAccCommon.c diff --git a/cpu/ixp/npe/IxEthAccControlInterface.c b/arch/arm/cpu/ixp/npe/IxEthAccControlInterface.c similarity index 100% rename from cpu/ixp/npe/IxEthAccControlInterface.c rename to arch/arm/cpu/ixp/npe/IxEthAccControlInterface.c diff --git a/cpu/ixp/npe/IxEthAccDataPlane.c b/arch/arm/cpu/ixp/npe/IxEthAccDataPlane.c similarity index 100% rename from cpu/ixp/npe/IxEthAccDataPlane.c rename to arch/arm/cpu/ixp/npe/IxEthAccDataPlane.c diff --git a/cpu/ixp/npe/IxEthAccMac.c b/arch/arm/cpu/ixp/npe/IxEthAccMac.c similarity index 100% rename from cpu/ixp/npe/IxEthAccMac.c rename to arch/arm/cpu/ixp/npe/IxEthAccMac.c diff --git a/cpu/ixp/npe/IxEthAccMii.c b/arch/arm/cpu/ixp/npe/IxEthAccMii.c similarity index 100% rename from cpu/ixp/npe/IxEthAccMii.c rename to arch/arm/cpu/ixp/npe/IxEthAccMii.c diff --git a/cpu/ixp/npe/IxEthDBAPI.c b/arch/arm/cpu/ixp/npe/IxEthDBAPI.c similarity index 100% rename from cpu/ixp/npe/IxEthDBAPI.c rename to arch/arm/cpu/ixp/npe/IxEthDBAPI.c diff --git a/cpu/ixp/npe/IxEthDBAPISupport.c b/arch/arm/cpu/ixp/npe/IxEthDBAPISupport.c similarity index 100% rename from cpu/ixp/npe/IxEthDBAPISupport.c rename to arch/arm/cpu/ixp/npe/IxEthDBAPISupport.c diff --git a/cpu/ixp/npe/IxEthDBCore.c b/arch/arm/cpu/ixp/npe/IxEthDBCore.c similarity index 100% rename from cpu/ixp/npe/IxEthDBCore.c rename to arch/arm/cpu/ixp/npe/IxEthDBCore.c diff --git a/cpu/ixp/npe/IxEthDBEvents.c b/arch/arm/cpu/ixp/npe/IxEthDBEvents.c similarity index 100% rename from cpu/ixp/npe/IxEthDBEvents.c rename to arch/arm/cpu/ixp/npe/IxEthDBEvents.c diff --git a/cpu/ixp/npe/IxEthDBFeatures.c b/arch/arm/cpu/ixp/npe/IxEthDBFeatures.c similarity index 100% rename from cpu/ixp/npe/IxEthDBFeatures.c rename to arch/arm/cpu/ixp/npe/IxEthDBFeatures.c diff --git a/cpu/ixp/npe/IxEthDBFirewall.c b/arch/arm/cpu/ixp/npe/IxEthDBFirewall.c similarity index 100% rename from cpu/ixp/npe/IxEthDBFirewall.c rename to arch/arm/cpu/ixp/npe/IxEthDBFirewall.c diff --git a/cpu/ixp/npe/IxEthDBHashtable.c b/arch/arm/cpu/ixp/npe/IxEthDBHashtable.c similarity index 100% rename from cpu/ixp/npe/IxEthDBHashtable.c rename to arch/arm/cpu/ixp/npe/IxEthDBHashtable.c diff --git a/cpu/ixp/npe/IxEthDBLearning.c b/arch/arm/cpu/ixp/npe/IxEthDBLearning.c similarity index 100% rename from cpu/ixp/npe/IxEthDBLearning.c rename to arch/arm/cpu/ixp/npe/IxEthDBLearning.c diff --git a/cpu/ixp/npe/IxEthDBMem.c b/arch/arm/cpu/ixp/npe/IxEthDBMem.c similarity index 100% rename from cpu/ixp/npe/IxEthDBMem.c rename to arch/arm/cpu/ixp/npe/IxEthDBMem.c diff --git a/cpu/ixp/npe/IxEthDBNPEAdaptor.c b/arch/arm/cpu/ixp/npe/IxEthDBNPEAdaptor.c similarity index 100% rename from cpu/ixp/npe/IxEthDBNPEAdaptor.c rename to arch/arm/cpu/ixp/npe/IxEthDBNPEAdaptor.c diff --git a/cpu/ixp/npe/IxEthDBPortUpdate.c b/arch/arm/cpu/ixp/npe/IxEthDBPortUpdate.c similarity index 100% rename from cpu/ixp/npe/IxEthDBPortUpdate.c rename to arch/arm/cpu/ixp/npe/IxEthDBPortUpdate.c diff --git a/cpu/ixp/npe/IxEthDBReports.c b/arch/arm/cpu/ixp/npe/IxEthDBReports.c similarity index 100% rename from cpu/ixp/npe/IxEthDBReports.c rename to arch/arm/cpu/ixp/npe/IxEthDBReports.c diff --git a/cpu/ixp/npe/IxEthDBSearch.c b/arch/arm/cpu/ixp/npe/IxEthDBSearch.c similarity index 100% rename from cpu/ixp/npe/IxEthDBSearch.c rename to arch/arm/cpu/ixp/npe/IxEthDBSearch.c diff --git a/cpu/ixp/npe/IxEthDBSpanningTree.c b/arch/arm/cpu/ixp/npe/IxEthDBSpanningTree.c similarity index 100% rename from cpu/ixp/npe/IxEthDBSpanningTree.c rename to arch/arm/cpu/ixp/npe/IxEthDBSpanningTree.c diff --git a/cpu/ixp/npe/IxEthDBUtil.c b/arch/arm/cpu/ixp/npe/IxEthDBUtil.c similarity index 100% rename from cpu/ixp/npe/IxEthDBUtil.c rename to arch/arm/cpu/ixp/npe/IxEthDBUtil.c diff --git a/cpu/ixp/npe/IxEthDBVlan.c b/arch/arm/cpu/ixp/npe/IxEthDBVlan.c similarity index 100% rename from cpu/ixp/npe/IxEthDBVlan.c rename to arch/arm/cpu/ixp/npe/IxEthDBVlan.c diff --git a/cpu/ixp/npe/IxEthDBWiFi.c b/arch/arm/cpu/ixp/npe/IxEthDBWiFi.c similarity index 100% rename from cpu/ixp/npe/IxEthDBWiFi.c rename to arch/arm/cpu/ixp/npe/IxEthDBWiFi.c diff --git a/cpu/ixp/npe/IxEthMii.c b/arch/arm/cpu/ixp/npe/IxEthMii.c similarity index 100% rename from cpu/ixp/npe/IxEthMii.c rename to arch/arm/cpu/ixp/npe/IxEthMii.c diff --git a/cpu/ixp/npe/IxFeatureCtrl.c b/arch/arm/cpu/ixp/npe/IxFeatureCtrl.c similarity index 100% rename from cpu/ixp/npe/IxFeatureCtrl.c rename to arch/arm/cpu/ixp/npe/IxFeatureCtrl.c diff --git a/cpu/ixp/npe/IxNpeDl.c b/arch/arm/cpu/ixp/npe/IxNpeDl.c similarity index 100% rename from cpu/ixp/npe/IxNpeDl.c rename to arch/arm/cpu/ixp/npe/IxNpeDl.c diff --git a/cpu/ixp/npe/IxNpeDlImageMgr.c b/arch/arm/cpu/ixp/npe/IxNpeDlImageMgr.c similarity index 100% rename from cpu/ixp/npe/IxNpeDlImageMgr.c rename to arch/arm/cpu/ixp/npe/IxNpeDlImageMgr.c diff --git a/cpu/ixp/npe/IxNpeDlNpeMgr.c b/arch/arm/cpu/ixp/npe/IxNpeDlNpeMgr.c similarity index 100% rename from cpu/ixp/npe/IxNpeDlNpeMgr.c rename to arch/arm/cpu/ixp/npe/IxNpeDlNpeMgr.c diff --git a/cpu/ixp/npe/IxNpeDlNpeMgrUtils.c b/arch/arm/cpu/ixp/npe/IxNpeDlNpeMgrUtils.c similarity index 100% rename from cpu/ixp/npe/IxNpeDlNpeMgrUtils.c rename to arch/arm/cpu/ixp/npe/IxNpeDlNpeMgrUtils.c diff --git a/cpu/ixp/npe/IxNpeMh.c b/arch/arm/cpu/ixp/npe/IxNpeMh.c similarity index 100% rename from cpu/ixp/npe/IxNpeMh.c rename to arch/arm/cpu/ixp/npe/IxNpeMh.c diff --git a/cpu/ixp/npe/IxNpeMhConfig.c b/arch/arm/cpu/ixp/npe/IxNpeMhConfig.c similarity index 100% rename from cpu/ixp/npe/IxNpeMhConfig.c rename to arch/arm/cpu/ixp/npe/IxNpeMhConfig.c diff --git a/cpu/ixp/npe/IxNpeMhReceive.c b/arch/arm/cpu/ixp/npe/IxNpeMhReceive.c similarity index 100% rename from cpu/ixp/npe/IxNpeMhReceive.c rename to arch/arm/cpu/ixp/npe/IxNpeMhReceive.c diff --git a/cpu/ixp/npe/IxNpeMhSend.c b/arch/arm/cpu/ixp/npe/IxNpeMhSend.c similarity index 100% rename from cpu/ixp/npe/IxNpeMhSend.c rename to arch/arm/cpu/ixp/npe/IxNpeMhSend.c diff --git a/cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c b/arch/arm/cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c similarity index 100% rename from cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c rename to arch/arm/cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c diff --git a/cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c b/arch/arm/cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c similarity index 100% rename from cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c rename to arch/arm/cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c diff --git a/cpu/ixp/npe/IxOsalBufferMgt.c b/arch/arm/cpu/ixp/npe/IxOsalBufferMgt.c similarity index 100% rename from cpu/ixp/npe/IxOsalBufferMgt.c rename to arch/arm/cpu/ixp/npe/IxOsalBufferMgt.c diff --git a/cpu/ixp/npe/IxOsalIoMem.c b/arch/arm/cpu/ixp/npe/IxOsalIoMem.c similarity index 100% rename from cpu/ixp/npe/IxOsalIoMem.c rename to arch/arm/cpu/ixp/npe/IxOsalIoMem.c diff --git a/cpu/ixp/npe/IxOsalOsCacheMMU.c b/arch/arm/cpu/ixp/npe/IxOsalOsCacheMMU.c similarity index 100% rename from cpu/ixp/npe/IxOsalOsCacheMMU.c rename to arch/arm/cpu/ixp/npe/IxOsalOsCacheMMU.c diff --git a/cpu/ixp/npe/IxOsalOsMsgQ.c b/arch/arm/cpu/ixp/npe/IxOsalOsMsgQ.c similarity index 100% rename from cpu/ixp/npe/IxOsalOsMsgQ.c rename to arch/arm/cpu/ixp/npe/IxOsalOsMsgQ.c diff --git a/cpu/ixp/npe/IxOsalOsSemaphore.c b/arch/arm/cpu/ixp/npe/IxOsalOsSemaphore.c similarity index 100% rename from cpu/ixp/npe/IxOsalOsSemaphore.c rename to arch/arm/cpu/ixp/npe/IxOsalOsSemaphore.c diff --git a/cpu/ixp/npe/IxOsalOsServices.c b/arch/arm/cpu/ixp/npe/IxOsalOsServices.c similarity index 100% rename from cpu/ixp/npe/IxOsalOsServices.c rename to arch/arm/cpu/ixp/npe/IxOsalOsServices.c diff --git a/cpu/ixp/npe/IxOsalOsThread.c b/arch/arm/cpu/ixp/npe/IxOsalOsThread.c similarity index 100% rename from cpu/ixp/npe/IxOsalOsThread.c rename to arch/arm/cpu/ixp/npe/IxOsalOsThread.c diff --git a/cpu/ixp/npe/IxQMgrAqmIf.c b/arch/arm/cpu/ixp/npe/IxQMgrAqmIf.c similarity index 100% rename from cpu/ixp/npe/IxQMgrAqmIf.c rename to arch/arm/cpu/ixp/npe/IxQMgrAqmIf.c diff --git a/cpu/ixp/npe/IxQMgrDispatcher.c b/arch/arm/cpu/ixp/npe/IxQMgrDispatcher.c similarity index 100% rename from cpu/ixp/npe/IxQMgrDispatcher.c rename to arch/arm/cpu/ixp/npe/IxQMgrDispatcher.c diff --git a/cpu/ixp/npe/IxQMgrInit.c b/arch/arm/cpu/ixp/npe/IxQMgrInit.c similarity index 100% rename from cpu/ixp/npe/IxQMgrInit.c rename to arch/arm/cpu/ixp/npe/IxQMgrInit.c diff --git a/cpu/ixp/npe/IxQMgrQAccess.c b/arch/arm/cpu/ixp/npe/IxQMgrQAccess.c similarity index 100% rename from cpu/ixp/npe/IxQMgrQAccess.c rename to arch/arm/cpu/ixp/npe/IxQMgrQAccess.c diff --git a/cpu/ixp/npe/IxQMgrQCfg.c b/arch/arm/cpu/ixp/npe/IxQMgrQCfg.c similarity index 100% rename from cpu/ixp/npe/IxQMgrQCfg.c rename to arch/arm/cpu/ixp/npe/IxQMgrQCfg.c diff --git a/cpu/ixp/npe/Makefile b/arch/arm/cpu/ixp/npe/Makefile similarity index 95% rename from cpu/ixp/npe/Makefile rename to arch/arm/cpu/ixp/npe/Makefile index 8fefd29..e1f9700 100644 --- a/cpu/ixp/npe/Makefile +++ b/arch/arm/cpu/ixp/npe/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk

LIB := $(obj)libnpe.a

-LOCAL_CFLAGS += -I$(TOPDIR)/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux +LOCAL_CFLAGS += -I$(TOPDIR)/arch/arm/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux CFLAGS += $(LOCAL_CFLAGS) HOSTCFLAGS += $(LOCAL_CFLAGS)

diff --git a/cpu/ixp/npe/include/IxAssert.h b/arch/arm/cpu/ixp/npe/include/IxAssert.h similarity index 100% rename from cpu/ixp/npe/include/IxAssert.h rename to arch/arm/cpu/ixp/npe/include/IxAssert.h diff --git a/cpu/ixp/npe/include/IxAtmSch.h b/arch/arm/cpu/ixp/npe/include/IxAtmSch.h similarity index 100% rename from cpu/ixp/npe/include/IxAtmSch.h rename to arch/arm/cpu/ixp/npe/include/IxAtmSch.h diff --git a/cpu/ixp/npe/include/IxAtmTypes.h b/arch/arm/cpu/ixp/npe/include/IxAtmTypes.h similarity index 100% rename from cpu/ixp/npe/include/IxAtmTypes.h rename to arch/arm/cpu/ixp/npe/include/IxAtmTypes.h diff --git a/cpu/ixp/npe/include/IxAtmdAcc.h b/arch/arm/cpu/ixp/npe/include/IxAtmdAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxAtmdAcc.h rename to arch/arm/cpu/ixp/npe/include/IxAtmdAcc.h diff --git a/cpu/ixp/npe/include/IxAtmdAccCtrl.h b/arch/arm/cpu/ixp/npe/include/IxAtmdAccCtrl.h similarity index 100% rename from cpu/ixp/npe/include/IxAtmdAccCtrl.h rename to arch/arm/cpu/ixp/npe/include/IxAtmdAccCtrl.h diff --git a/cpu/ixp/npe/include/IxAtmm.h b/arch/arm/cpu/ixp/npe/include/IxAtmm.h similarity index 100% rename from cpu/ixp/npe/include/IxAtmm.h rename to arch/arm/cpu/ixp/npe/include/IxAtmm.h diff --git a/cpu/ixp/npe/include/IxDmaAcc.h b/arch/arm/cpu/ixp/npe/include/IxDmaAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxDmaAcc.h rename to arch/arm/cpu/ixp/npe/include/IxDmaAcc.h diff --git a/cpu/ixp/npe/include/IxEthAcc.h b/arch/arm/cpu/ixp/npe/include/IxEthAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAcc.h rename to arch/arm/cpu/ixp/npe/include/IxEthAcc.h diff --git a/cpu/ixp/npe/include/IxEthAccDataPlane_p.h b/arch/arm/cpu/ixp/npe/include/IxEthAccDataPlane_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAccDataPlane_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthAccDataPlane_p.h diff --git a/cpu/ixp/npe/include/IxEthAccMac_p.h b/arch/arm/cpu/ixp/npe/include/IxEthAccMac_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAccMac_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthAccMac_p.h diff --git a/cpu/ixp/npe/include/IxEthAccMii_p.h b/arch/arm/cpu/ixp/npe/include/IxEthAccMii_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAccMii_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthAccMii_p.h diff --git a/cpu/ixp/npe/include/IxEthAccQueueAssign_p.h b/arch/arm/cpu/ixp/npe/include/IxEthAccQueueAssign_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAccQueueAssign_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthAccQueueAssign_p.h diff --git a/cpu/ixp/npe/include/IxEthAcc_p.h b/arch/arm/cpu/ixp/npe/include/IxEthAcc_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAcc_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthAcc_p.h diff --git a/cpu/ixp/npe/include/IxEthDB.h b/arch/arm/cpu/ixp/npe/include/IxEthDB.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDB.h rename to arch/arm/cpu/ixp/npe/include/IxEthDB.h diff --git a/cpu/ixp/npe/include/IxEthDBLocks_p.h b/arch/arm/cpu/ixp/npe/include/IxEthDBLocks_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDBLocks_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthDBLocks_p.h diff --git a/cpu/ixp/npe/include/IxEthDBLog_p.h b/arch/arm/cpu/ixp/npe/include/IxEthDBLog_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDBLog_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthDBLog_p.h diff --git a/cpu/ixp/npe/include/IxEthDBMessages_p.h b/arch/arm/cpu/ixp/npe/include/IxEthDBMessages_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDBMessages_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthDBMessages_p.h diff --git a/cpu/ixp/npe/include/IxEthDBPortDefs.h b/arch/arm/cpu/ixp/npe/include/IxEthDBPortDefs.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDBPortDefs.h rename to arch/arm/cpu/ixp/npe/include/IxEthDBPortDefs.h diff --git a/cpu/ixp/npe/include/IxEthDBQoS.h b/arch/arm/cpu/ixp/npe/include/IxEthDBQoS.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDBQoS.h rename to arch/arm/cpu/ixp/npe/include/IxEthDBQoS.h diff --git a/cpu/ixp/npe/include/IxEthDB_p.h b/arch/arm/cpu/ixp/npe/include/IxEthDB_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDB_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthDB_p.h diff --git a/cpu/ixp/npe/include/IxEthMii.h b/arch/arm/cpu/ixp/npe/include/IxEthMii.h similarity index 100% rename from cpu/ixp/npe/include/IxEthMii.h rename to arch/arm/cpu/ixp/npe/include/IxEthMii.h diff --git a/cpu/ixp/npe/include/IxEthMii_p.h b/arch/arm/cpu/ixp/npe/include/IxEthMii_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthMii_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthMii_p.h diff --git a/cpu/ixp/npe/include/IxEthNpe.h b/arch/arm/cpu/ixp/npe/include/IxEthNpe.h similarity index 100% rename from cpu/ixp/npe/include/IxEthNpe.h rename to arch/arm/cpu/ixp/npe/include/IxEthNpe.h diff --git a/cpu/ixp/npe/include/IxFeatureCtrl.h b/arch/arm/cpu/ixp/npe/include/IxFeatureCtrl.h similarity index 100% rename from cpu/ixp/npe/include/IxFeatureCtrl.h rename to arch/arm/cpu/ixp/npe/include/IxFeatureCtrl.h diff --git a/cpu/ixp/npe/include/IxHssAcc.h b/arch/arm/cpu/ixp/npe/include/IxHssAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxHssAcc.h rename to arch/arm/cpu/ixp/npe/include/IxHssAcc.h diff --git a/cpu/ixp/npe/include/IxI2cDrv.h b/arch/arm/cpu/ixp/npe/include/IxI2cDrv.h similarity index 100% rename from cpu/ixp/npe/include/IxI2cDrv.h rename to arch/arm/cpu/ixp/npe/include/IxI2cDrv.h diff --git a/cpu/ixp/npe/include/IxNpeA.h b/arch/arm/cpu/ixp/npe/include/IxNpeA.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeA.h rename to arch/arm/cpu/ixp/npe/include/IxNpeA.h diff --git a/cpu/ixp/npe/include/IxNpeDl.h b/arch/arm/cpu/ixp/npe/include/IxNpeDl.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDl.h rename to arch/arm/cpu/ixp/npe/include/IxNpeDl.h diff --git a/cpu/ixp/npe/include/IxNpeDlImageMgr_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeDlImageMgr_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDlImageMgr_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeDlImageMgr_p.h diff --git a/cpu/ixp/npe/include/IxNpeDlMacros_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeDlMacros_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDlMacros_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeDlMacros_p.h diff --git a/cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h diff --git a/cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h diff --git a/cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h diff --git a/cpu/ixp/npe/include/IxNpeMh.h b/arch/arm/cpu/ixp/npe/include/IxNpeMh.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMh.h rename to arch/arm/cpu/ixp/npe/include/IxNpeMh.h diff --git a/cpu/ixp/npe/include/IxNpeMhConfig_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhConfig_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhConfig_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeMhConfig_p.h diff --git a/cpu/ixp/npe/include/IxNpeMhMacros_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhMacros_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhMacros_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeMhMacros_p.h diff --git a/cpu/ixp/npe/include/IxNpeMhReceive_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhReceive_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhReceive_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeMhReceive_p.h diff --git a/cpu/ixp/npe/include/IxNpeMhSend_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhSend_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhSend_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeMhSend_p.h diff --git a/cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h diff --git a/cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h diff --git a/cpu/ixp/npe/include/IxNpeMicrocode.h b/arch/arm/cpu/ixp/npe/include/IxNpeMicrocode.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMicrocode.h rename to arch/arm/cpu/ixp/npe/include/IxNpeMicrocode.h diff --git a/cpu/ixp/npe/include/IxOsBufLib.h b/arch/arm/cpu/ixp/npe/include/IxOsBufLib.h similarity index 100% rename from cpu/ixp/npe/include/IxOsBufLib.h rename to arch/arm/cpu/ixp/npe/include/IxOsBufLib.h diff --git a/cpu/ixp/npe/include/IxOsBuffMgt.h b/arch/arm/cpu/ixp/npe/include/IxOsBuffMgt.h similarity index 100% rename from cpu/ixp/npe/include/IxOsBuffMgt.h rename to arch/arm/cpu/ixp/npe/include/IxOsBuffMgt.h diff --git a/cpu/ixp/npe/include/IxOsBuffPoolMgt.h b/arch/arm/cpu/ixp/npe/include/IxOsBuffPoolMgt.h similarity index 100% rename from cpu/ixp/npe/include/IxOsBuffPoolMgt.h rename to arch/arm/cpu/ixp/npe/include/IxOsBuffPoolMgt.h diff --git a/cpu/ixp/npe/include/IxOsCacheMMU.h b/arch/arm/cpu/ixp/npe/include/IxOsCacheMMU.h similarity index 100% rename from cpu/ixp/npe/include/IxOsCacheMMU.h rename to arch/arm/cpu/ixp/npe/include/IxOsCacheMMU.h diff --git a/cpu/ixp/npe/include/IxOsPrintf.h b/arch/arm/cpu/ixp/npe/include/IxOsPrintf.h similarity index 100% rename from cpu/ixp/npe/include/IxOsPrintf.h rename to arch/arm/cpu/ixp/npe/include/IxOsPrintf.h diff --git a/cpu/ixp/npe/include/IxOsServices.h b/arch/arm/cpu/ixp/npe/include/IxOsServices.h similarity index 100% rename from cpu/ixp/npe/include/IxOsServices.h rename to arch/arm/cpu/ixp/npe/include/IxOsServices.h diff --git a/cpu/ixp/npe/include/IxOsServicesComponents.h b/arch/arm/cpu/ixp/npe/include/IxOsServicesComponents.h similarity index 100% rename from cpu/ixp/npe/include/IxOsServicesComponents.h rename to arch/arm/cpu/ixp/npe/include/IxOsServicesComponents.h diff --git a/cpu/ixp/npe/include/IxOsServicesEndianess.h b/arch/arm/cpu/ixp/npe/include/IxOsServicesEndianess.h similarity index 100% rename from cpu/ixp/npe/include/IxOsServicesEndianess.h rename to arch/arm/cpu/ixp/npe/include/IxOsServicesEndianess.h diff --git a/cpu/ixp/npe/include/IxOsServicesMemAccess.h b/arch/arm/cpu/ixp/npe/include/IxOsServicesMemAccess.h similarity index 100% rename from cpu/ixp/npe/include/IxOsServicesMemAccess.h rename to arch/arm/cpu/ixp/npe/include/IxOsServicesMemAccess.h diff --git a/cpu/ixp/npe/include/IxOsServicesMemMap.h b/arch/arm/cpu/ixp/npe/include/IxOsServicesMemMap.h similarity index 100% rename from cpu/ixp/npe/include/IxOsServicesMemMap.h rename to arch/arm/cpu/ixp/npe/include/IxOsServicesMemMap.h diff --git a/cpu/ixp/npe/include/IxOsal.h b/arch/arm/cpu/ixp/npe/include/IxOsal.h similarity index 100% rename from cpu/ixp/npe/include/IxOsal.h rename to arch/arm/cpu/ixp/npe/include/IxOsal.h diff --git a/cpu/ixp/npe/include/IxOsalAssert.h b/arch/arm/cpu/ixp/npe/include/IxOsalAssert.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalAssert.h rename to arch/arm/cpu/ixp/npe/include/IxOsalAssert.h diff --git a/cpu/ixp/npe/include/IxOsalBackward.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackward.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackward.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBackward.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardAssert.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardAssert.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardAssert.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardAssert.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardMemMap.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardMemMap.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardMemMap.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardMemMap.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardOsServices.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardOsServices.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardOsServices.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardOsServices.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardOssl.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardOssl.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardOssl.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardOssl.h diff --git a/cpu/ixp/npe/include/IxOsalBufferMgt.h b/arch/arm/cpu/ixp/npe/include/IxOsalBufferMgt.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBufferMgt.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBufferMgt.h diff --git a/cpu/ixp/npe/include/IxOsalBufferMgtDefault.h b/arch/arm/cpu/ixp/npe/include/IxOsalBufferMgtDefault.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBufferMgtDefault.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBufferMgtDefault.h diff --git a/cpu/ixp/npe/include/IxOsalConfig.h b/arch/arm/cpu/ixp/npe/include/IxOsalConfig.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalConfig.h rename to arch/arm/cpu/ixp/npe/include/IxOsalConfig.h diff --git a/cpu/ixp/npe/include/IxOsalEndianess.h b/arch/arm/cpu/ixp/npe/include/IxOsalEndianess.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalEndianess.h rename to arch/arm/cpu/ixp/npe/include/IxOsalEndianess.h diff --git a/cpu/ixp/npe/include/IxOsalIoMem.h b/arch/arm/cpu/ixp/npe/include/IxOsalIoMem.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalIoMem.h rename to arch/arm/cpu/ixp/npe/include/IxOsalIoMem.h diff --git a/cpu/ixp/npe/include/IxOsalMemAccess.h b/arch/arm/cpu/ixp/npe/include/IxOsalMemAccess.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalMemAccess.h rename to arch/arm/cpu/ixp/npe/include/IxOsalMemAccess.h diff --git a/cpu/ixp/npe/include/IxOsalOem.h b/arch/arm/cpu/ixp/npe/include/IxOsalOem.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOem.h rename to arch/arm/cpu/ixp/npe/include/IxOsalOem.h diff --git a/cpu/ixp/npe/include/IxOsalOs.h b/arch/arm/cpu/ixp/npe/include/IxOsalOs.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOs.h rename to arch/arm/cpu/ixp/npe/include/IxOsalOs.h diff --git a/cpu/ixp/npe/include/IxOsalOsAssert.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsAssert.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsAssert.h rename to arch/arm/cpu/ixp/npe/include/IxOsalOsAssert.h diff --git a/cpu/ixp/npe/include/IxOsalOsBufferMgt.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsBufferMgt.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsBufferMgt.h rename to arch/arm/cpu/ixp/npe/include/IxOsalOsBufferMgt.h diff --git a/cpu/ixp/npe/include/IxOsalOsIxp400.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsIxp400.h rename to arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400.h diff --git a/cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h rename to arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h diff --git a/cpu/ixp/npe/include/IxOsalOsTypes.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsTypes.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsTypes.h rename to arch/arm/cpu/ixp/npe/include/IxOsalOsTypes.h diff --git a/cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h rename to arch/arm/cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h diff --git a/cpu/ixp/npe/include/IxOsalTypes.h b/arch/arm/cpu/ixp/npe/include/IxOsalTypes.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalTypes.h rename to arch/arm/cpu/ixp/npe/include/IxOsalTypes.h diff --git a/cpu/ixp/npe/include/IxOsalUtilitySymbols.h b/arch/arm/cpu/ixp/npe/include/IxOsalUtilitySymbols.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalUtilitySymbols.h rename to arch/arm/cpu/ixp/npe/include/IxOsalUtilitySymbols.h diff --git a/cpu/ixp/npe/include/IxParityENAcc.h b/arch/arm/cpu/ixp/npe/include/IxParityENAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxParityENAcc.h rename to arch/arm/cpu/ixp/npe/include/IxParityENAcc.h diff --git a/cpu/ixp/npe/include/IxPerfProfAcc.h b/arch/arm/cpu/ixp/npe/include/IxPerfProfAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxPerfProfAcc.h rename to arch/arm/cpu/ixp/npe/include/IxPerfProfAcc.h diff --git a/cpu/ixp/npe/include/IxQMgr.h b/arch/arm/cpu/ixp/npe/include/IxQMgr.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgr.h rename to arch/arm/cpu/ixp/npe/include/IxQMgr.h diff --git a/cpu/ixp/npe/include/IxQMgrAqmIf_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrAqmIf_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrAqmIf_p.h rename to arch/arm/cpu/ixp/npe/include/IxQMgrAqmIf_p.h diff --git a/cpu/ixp/npe/include/IxQMgrDefines_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrDefines_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrDefines_p.h rename to arch/arm/cpu/ixp/npe/include/IxQMgrDefines_p.h diff --git a/cpu/ixp/npe/include/IxQMgrDispatcher_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrDispatcher_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrDispatcher_p.h rename to arch/arm/cpu/ixp/npe/include/IxQMgrDispatcher_p.h diff --git a/cpu/ixp/npe/include/IxQMgrLog_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrLog_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrLog_p.h rename to arch/arm/cpu/ixp/npe/include/IxQMgrLog_p.h diff --git a/cpu/ixp/npe/include/IxQMgrQAccess_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrQAccess_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrQAccess_p.h rename to arch/arm/cpu/ixp/npe/include/IxQMgrQAccess_p.h diff --git a/cpu/ixp/npe/include/IxQMgrQCfg_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrQCfg_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrQCfg_p.h rename to arch/arm/cpu/ixp/npe/include/IxQMgrQCfg_p.h diff --git a/cpu/ixp/npe/include/IxQueueAssignments.h b/arch/arm/cpu/ixp/npe/include/IxQueueAssignments.h similarity index 100% rename from cpu/ixp/npe/include/IxQueueAssignments.h rename to arch/arm/cpu/ixp/npe/include/IxQueueAssignments.h diff --git a/cpu/ixp/npe/include/IxSspAcc.h b/arch/arm/cpu/ixp/npe/include/IxSspAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxSspAcc.h rename to arch/arm/cpu/ixp/npe/include/IxSspAcc.h diff --git a/cpu/ixp/npe/include/IxTimeSyncAcc.h b/arch/arm/cpu/ixp/npe/include/IxTimeSyncAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxTimeSyncAcc.h rename to arch/arm/cpu/ixp/npe/include/IxTimeSyncAcc.h diff --git a/cpu/ixp/npe/include/IxTimerCtrl.h b/arch/arm/cpu/ixp/npe/include/IxTimerCtrl.h similarity index 100% rename from cpu/ixp/npe/include/IxTimerCtrl.h rename to arch/arm/cpu/ixp/npe/include/IxTimerCtrl.h diff --git a/cpu/ixp/npe/include/IxTypes.h b/arch/arm/cpu/ixp/npe/include/IxTypes.h similarity index 100% rename from cpu/ixp/npe/include/IxTypes.h rename to arch/arm/cpu/ixp/npe/include/IxTypes.h diff --git a/cpu/ixp/npe/include/IxUART.h b/arch/arm/cpu/ixp/npe/include/IxUART.h similarity index 100% rename from cpu/ixp/npe/include/IxUART.h rename to arch/arm/cpu/ixp/npe/include/IxUART.h diff --git a/cpu/ixp/npe/include/IxVersionId.h b/arch/arm/cpu/ixp/npe/include/IxVersionId.h similarity index 100% rename from cpu/ixp/npe/include/IxVersionId.h rename to arch/arm/cpu/ixp/npe/include/IxVersionId.h diff --git a/cpu/ixp/npe/include/ix_error.h b/arch/arm/cpu/ixp/npe/include/ix_error.h similarity index 100% rename from cpu/ixp/npe/include/ix_error.h rename to arch/arm/cpu/ixp/npe/include/ix_error.h diff --git a/cpu/ixp/npe/include/ix_macros.h b/arch/arm/cpu/ixp/npe/include/ix_macros.h similarity index 100% rename from cpu/ixp/npe/include/ix_macros.h rename to arch/arm/cpu/ixp/npe/include/ix_macros.h diff --git a/cpu/ixp/npe/include/ix_os_type.h b/arch/arm/cpu/ixp/npe/include/ix_os_type.h similarity index 100% rename from cpu/ixp/npe/include/ix_os_type.h rename to arch/arm/cpu/ixp/npe/include/ix_os_type.h diff --git a/cpu/ixp/npe/include/ix_ossl.h b/arch/arm/cpu/ixp/npe/include/ix_ossl.h similarity index 100% rename from cpu/ixp/npe/include/ix_ossl.h rename to arch/arm/cpu/ixp/npe/include/ix_ossl.h diff --git a/cpu/ixp/npe/include/ix_symbols.h b/arch/arm/cpu/ixp/npe/include/ix_symbols.h similarity index 100% rename from cpu/ixp/npe/include/ix_symbols.h rename to arch/arm/cpu/ixp/npe/include/ix_symbols.h diff --git a/cpu/ixp/npe/include/ix_types.h b/arch/arm/cpu/ixp/npe/include/ix_types.h similarity index 100% rename from cpu/ixp/npe/include/ix_types.h rename to arch/arm/cpu/ixp/npe/include/ix_types.h diff --git a/cpu/ixp/npe/include/npe.h b/arch/arm/cpu/ixp/npe/include/npe.h similarity index 100% rename from cpu/ixp/npe/include/npe.h rename to arch/arm/cpu/ixp/npe/include/npe.h diff --git a/cpu/ixp/npe/include/os_datatypes.h b/arch/arm/cpu/ixp/npe/include/os_datatypes.h similarity index 100% rename from cpu/ixp/npe/include/os_datatypes.h rename to arch/arm/cpu/ixp/npe/include/os_datatypes.h diff --git a/cpu/ixp/npe/miiphy.c b/arch/arm/cpu/ixp/npe/miiphy.c similarity index 100% rename from cpu/ixp/npe/miiphy.c rename to arch/arm/cpu/ixp/npe/miiphy.c diff --git a/cpu/ixp/npe/npe.c b/arch/arm/cpu/ixp/npe/npe.c similarity index 100% rename from cpu/ixp/npe/npe.c rename to arch/arm/cpu/ixp/npe/npe.c diff --git a/cpu/ixp/start.S b/arch/arm/cpu/ixp/start.S similarity index 100% rename from cpu/ixp/start.S rename to arch/arm/cpu/ixp/start.S diff --git a/cpu/ixp/timer.c b/arch/arm/cpu/ixp/timer.c similarity index 100% rename from cpu/ixp/timer.c rename to arch/arm/cpu/ixp/timer.c diff --git a/cpu/ixp/u-boot.lds b/arch/arm/cpu/ixp/u-boot.lds similarity index 97% rename from cpu/ixp/u-boot.lds rename to arch/arm/cpu/ixp/u-boot.lds index 85209ca..b8ff2ee 100644 --- a/cpu/ixp/u-boot.lds +++ b/arch/arm/cpu/ixp/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/ixp/start.o(.text) + arch/arm/cpu/ixp/start.o(.text) *(.text) }

diff --git a/cpu/lh7a40x/Makefile b/arch/arm/cpu/lh7a40x/Makefile similarity index 100% rename from cpu/lh7a40x/Makefile rename to arch/arm/cpu/lh7a40x/Makefile diff --git a/cpu/lh7a40x/config.mk b/arch/arm/cpu/lh7a40x/config.mk similarity index 100% rename from cpu/lh7a40x/config.mk rename to arch/arm/cpu/lh7a40x/config.mk diff --git a/cpu/lh7a40x/cpu.c b/arch/arm/cpu/lh7a40x/cpu.c similarity index 100% rename from cpu/lh7a40x/cpu.c rename to arch/arm/cpu/lh7a40x/cpu.c diff --git a/cpu/lh7a40x/speed.c b/arch/arm/cpu/lh7a40x/speed.c similarity index 100% rename from cpu/lh7a40x/speed.c rename to arch/arm/cpu/lh7a40x/speed.c diff --git a/cpu/lh7a40x/start.S b/arch/arm/cpu/lh7a40x/start.S similarity index 100% rename from cpu/lh7a40x/start.S rename to arch/arm/cpu/lh7a40x/start.S diff --git a/cpu/lh7a40x/timer.c b/arch/arm/cpu/lh7a40x/timer.c similarity index 100% rename from cpu/lh7a40x/timer.c rename to arch/arm/cpu/lh7a40x/timer.c diff --git a/cpu/arm946es/u-boot.lds b/arch/arm/cpu/lh7a40x/u-boot.lds similarity index 97% rename from cpu/arm946es/u-boot.lds rename to arch/arm/cpu/lh7a40x/u-boot.lds index 5bd4390..5a8ccf5 100644 --- a/cpu/arm946es/u-boot.lds +++ b/arch/arm/cpu/lh7a40x/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm946es/start.o (.text) + arch/arm/cpu/lh7a40x/start.o (.text) *(.text) }

diff --git a/cpu/pxa/Makefile b/arch/arm/cpu/pxa/Makefile similarity index 100% rename from cpu/pxa/Makefile rename to arch/arm/cpu/pxa/Makefile diff --git a/cpu/pxa/config.mk b/arch/arm/cpu/pxa/config.mk similarity index 100% rename from cpu/pxa/config.mk rename to arch/arm/cpu/pxa/config.mk diff --git a/cpu/pxa/cpu.c b/arch/arm/cpu/pxa/cpu.c similarity index 100% rename from cpu/pxa/cpu.c rename to arch/arm/cpu/pxa/cpu.c diff --git a/cpu/pxa/i2c.c b/arch/arm/cpu/pxa/i2c.c similarity index 100% rename from cpu/pxa/i2c.c rename to arch/arm/cpu/pxa/i2c.c diff --git a/cpu/pxa/pxafb.c b/arch/arm/cpu/pxa/pxafb.c similarity index 100% rename from cpu/pxa/pxafb.c rename to arch/arm/cpu/pxa/pxafb.c diff --git a/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S similarity index 100% rename from cpu/pxa/start.S rename to arch/arm/cpu/pxa/start.S diff --git a/cpu/pxa/timer.c b/arch/arm/cpu/pxa/timer.c similarity index 100% rename from cpu/pxa/timer.c rename to arch/arm/cpu/pxa/timer.c diff --git a/cpu/pxa/u-boot.lds b/arch/arm/cpu/pxa/u-boot.lds similarity index 97% rename from cpu/pxa/u-boot.lds rename to arch/arm/cpu/pxa/u-boot.lds index 77ab3c9..d4e85ef 100644 --- a/cpu/pxa/u-boot.lds +++ b/arch/arm/cpu/pxa/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/pxa/start.o (.text) + arch/arm/cpu/pxa/start.o (.text) *(.text) }

diff --git a/cpu/pxa/usb.c b/arch/arm/cpu/pxa/usb.c similarity index 100% rename from cpu/pxa/usb.c rename to arch/arm/cpu/pxa/usb.c diff --git a/cpu/s3c44b0/Makefile b/arch/arm/cpu/s3c44b0/Makefile similarity index 100% rename from cpu/s3c44b0/Makefile rename to arch/arm/cpu/s3c44b0/Makefile diff --git a/cpu/s3c44b0/cache.c b/arch/arm/cpu/s3c44b0/cache.c similarity index 100% rename from cpu/s3c44b0/cache.c rename to arch/arm/cpu/s3c44b0/cache.c diff --git a/cpu/s3c44b0/config.mk b/arch/arm/cpu/s3c44b0/config.mk similarity index 100% rename from cpu/s3c44b0/config.mk rename to arch/arm/cpu/s3c44b0/config.mk diff --git a/cpu/s3c44b0/cpu.c b/arch/arm/cpu/s3c44b0/cpu.c similarity index 100% rename from cpu/s3c44b0/cpu.c rename to arch/arm/cpu/s3c44b0/cpu.c diff --git a/cpu/s3c44b0/start.S b/arch/arm/cpu/s3c44b0/start.S similarity index 100% rename from cpu/s3c44b0/start.S rename to arch/arm/cpu/s3c44b0/start.S diff --git a/cpu/s3c44b0/timer.c b/arch/arm/cpu/s3c44b0/timer.c similarity index 100% rename from cpu/s3c44b0/timer.c rename to arch/arm/cpu/s3c44b0/timer.c diff --git a/cpu/s3c44b0/u-boot.lds b/arch/arm/cpu/s3c44b0/u-boot.lds similarity index 97% rename from cpu/s3c44b0/u-boot.lds rename to arch/arm/cpu/s3c44b0/u-boot.lds index 41ca3b4..267d94c 100644 --- a/cpu/s3c44b0/u-boot.lds +++ b/arch/arm/cpu/s3c44b0/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/s3c44b0/start.o (.text) + arch/arm/cpu/s3c44b0/start.o (.text) *(.text) }

diff --git a/cpu/sa1100/Makefile b/arch/arm/cpu/sa1100/Makefile similarity index 100% rename from cpu/sa1100/Makefile rename to arch/arm/cpu/sa1100/Makefile diff --git a/cpu/sa1100/config.mk b/arch/arm/cpu/sa1100/config.mk similarity index 100% rename from cpu/sa1100/config.mk rename to arch/arm/cpu/sa1100/config.mk diff --git a/cpu/sa1100/cpu.c b/arch/arm/cpu/sa1100/cpu.c similarity index 100% rename from cpu/sa1100/cpu.c rename to arch/arm/cpu/sa1100/cpu.c diff --git a/cpu/sa1100/start.S b/arch/arm/cpu/sa1100/start.S similarity index 100% rename from cpu/sa1100/start.S rename to arch/arm/cpu/sa1100/start.S diff --git a/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c similarity index 100% rename from cpu/sa1100/timer.c rename to arch/arm/cpu/sa1100/timer.c diff --git a/cpu/sa1100/u-boot.lds b/arch/arm/cpu/sa1100/u-boot.lds similarity index 97% rename from cpu/sa1100/u-boot.lds rename to arch/arm/cpu/sa1100/u-boot.lds index 0c02e76..f6197ac 100644 --- a/cpu/sa1100/u-boot.lds +++ b/arch/arm/cpu/sa1100/u-boot.lds @@ -34,7 +34,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/sa1100/start.o (.text) + arch/arm/cpu/sa1100/start.o (.text) *(.text) }

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index e148739..4d00103 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -55,10 +55,10 @@ #endif

#ifdef CONFIG_DRIVER_SMC91111 -#include "../drivers/net/smc91111.h" +#include "../../../../drivers/net/smc91111.h" #endif #ifdef CONFIG_DRIVER_LAN91C96 -#include "../drivers/net/lan91c96.h" +#include "../../../../drivers/net/lan91c96.h" #endif

DECLARE_GLOBAL_DATA_PTR; diff --git a/board/actux1/config.mk b/board/actux1/config.mk index 119140d..a0dbe0b 100644 --- a/board/actux1/config.mk +++ b/board/actux1/config.mk @@ -1,6 +1,6 @@ TEXT_BASE = 0x00e00000

# include NPE ethernet driver -BOARDLIBS = cpu/ixp/npe/libnpe.a +BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a

LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds index 40b5ef3..5c1ece7 100644 --- a/board/actux1/u-boot.lds +++ b/board/actux1/u-boot.lds @@ -30,12 +30,12 @@ SECTIONS

. = ALIGN (4); .text : { - cpu/ixp/start.o(.text) + arch/arm/cpu/ixp/start.o(.text) lib/string.o(.text) lib/vsprintf.o(.text) arch/arm/lib/board.o(.text) common/dlmalloc.o(.text) - cpu/ixp/cpu.o(.text) + arch/arm/cpu/ixp/cpu.o(.text) . = env_offset; common/env_embedded.o(.ppcenv) * (.text) diff --git a/board/actux2/config.mk b/board/actux2/config.mk index 119140d..a0dbe0b 100644 --- a/board/actux2/config.mk +++ b/board/actux2/config.mk @@ -1,6 +1,6 @@ TEXT_BASE = 0x00e00000

# include NPE ethernet driver -BOARDLIBS = cpu/ixp/npe/libnpe.a +BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a

LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds index f9ab281..707c027 100644 --- a/board/actux2/u-boot.lds +++ b/board/actux2/u-boot.lds @@ -30,12 +30,12 @@ SECTIONS

. = ALIGN (4); .text : { - cpu/ixp/start.o(.text) + arch/arm/cpu/ixp/start.o(.text) lib/string.o(.text) lib/vsprintf.o(.text) arch/arm/lib/board.o(.text) common/dlmalloc.o(.text) - cpu/ixp/cpu.o(.text) + arch/arm/cpu/ixp/cpu.o(.text)

. = env_offset; common/env_embedded.o (.ppcenv) diff --git a/board/actux3/config.mk b/board/actux3/config.mk index 119140d..a0dbe0b 100644 --- a/board/actux3/config.mk +++ b/board/actux3/config.mk @@ -1,6 +1,6 @@ TEXT_BASE = 0x00e00000

# include NPE ethernet driver -BOARDLIBS = cpu/ixp/npe/libnpe.a +BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a

LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds index 2fc3796..497ab97 100644 --- a/board/actux3/u-boot.lds +++ b/board/actux3/u-boot.lds @@ -30,12 +30,12 @@ SECTIONS

. = ALIGN (4); .text : { - cpu/ixp/start.o (.text) + arch/arm/cpu/ixp/start.o (.text) lib/string.o (.text) lib/vsprintf.o (.text) arch/arm/lib/board.o (.text) common/dlmalloc.o (.text) - cpu/ixp/cpu.o (.text) + arch/arm/cpu/ixp/cpu.o (.text)

. = env_offset; common/env_embedded.o (.ppcenv) diff --git a/board/actux4/config.mk b/board/actux4/config.mk index 9a634cd..f2b5fc9 100644 --- a/board/actux4/config.mk +++ b/board/actux4/config.mk @@ -1,4 +1,4 @@ TEXT_BASE = 0x00e00000

# include NPE ethernet driver -BOARDLIBS = cpu/ixp/npe/libnpe.a +BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a diff --git a/board/davinci/dvevm/board_init.S b/board/davinci/dvevm/board_init.S index 22d8adc..6f8c91e 100644 --- a/board/davinci/dvevm/board_init.S +++ b/board/davinci/dvevm/board_init.S @@ -2,8 +2,8 @@ * Copyright (C) 2007 Sergey Kubushyn ksi@koi8.net * * Board-specific low level initialization code. Called at the very end - * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no - * initialization required. + * of arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there + * is no initialization required. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/board/davinci/schmoogie/board_init.S b/board/davinci/schmoogie/board_init.S index 22d8adc..6f8c91e 100644 --- a/board/davinci/schmoogie/board_init.S +++ b/board/davinci/schmoogie/board_init.S @@ -2,8 +2,8 @@ * Copyright (C) 2007 Sergey Kubushyn ksi@koi8.net * * Board-specific low level initialization code. Called at the very end - * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no - * initialization required. + * of arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there + * is no initialization required. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/board/davinci/sffsdr/board_init.S b/board/davinci/sffsdr/board_init.S index 22d8adc..6f8c91e 100644 --- a/board/davinci/sffsdr/board_init.S +++ b/board/davinci/sffsdr/board_init.S @@ -2,8 +2,8 @@ * Copyright (C) 2007 Sergey Kubushyn ksi@koi8.net * * Board-specific low level initialization code. Called at the very end - * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no - * initialization required. + * of arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there + * is no initialization required. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/board/davinci/sonata/board_init.S b/board/davinci/sonata/board_init.S index fbb9ea7..6eae684 100644 --- a/board/davinci/sonata/board_init.S +++ b/board/davinci/sonata/board_init.S @@ -2,8 +2,8 @@ * Copyright (C) 2007 Sergey Kubushyn ksi@koi8.net * * Board-specific low level initialization code. Called at the very end - * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no - * initialization required. + * of arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there + * is no initialization required. * * For _OLDER_ Sonata boards sets up GPIO4 to control NAND WP line. Newer * Sonata boards, AFAIK, don't use this so it's just return by default. Ask diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds index 6f5bda4..2731294 100644 --- a/board/freescale/mx31ads/u-boot.lds +++ b/board/freescale/mx31ads/u-boot.lds @@ -37,7 +37,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */

- cpu/arm1136/start.o (.text) + arch/arm/cpu/arm1136/start.o (.text) board/freescale/mx31ads/libmx31ads.a (.text) arch/arm/lib/libarm.a (.text) net/libnet.a (.text) diff --git a/board/logicpd/zoom2/zoom2.c b/board/logicpd/zoom2/zoom2.c index dadbeb6..f0f2ab8 100644 --- a/board/logicpd/zoom2/zoom2.c +++ b/board/logicpd/zoom2/zoom2.c @@ -45,7 +45,7 @@ /* * This the the zoom2, board specific, gpmc configuration for the * quad uart on the debug board. The more general gpmc configurations - * are setup at the cpu level in cpu/arm_cortexa8/omap3/mem.c + * are setup at the cpu level in arch/arm/cpu/arm_cortexa8/omap3/mem.c * * The details of the setting of the serial gpmc setup are not available. * The values were provided by another party. diff --git a/board/lpc2292sodimm/flash.c b/board/lpc2292sodimm/flash.c index a7e175d..fd5389f 100644 --- a/board/lpc2292sodimm/flash.c +++ b/board/lpc2292sodimm/flash.c @@ -1,7 +1,7 @@ /* * (C) Copyright 2006 Embedded Artists AB <www.embeddedartists.com> * - * Modified to use the routines in cpu/arm720t/lpc2292/flash.c by + * Modified to use the routines in arch/arm/cpu/arm720t/lpc2292/flash.c by * Gary Jennejohn <garyj@denx,de> * * This program is free software; you can redistribute it and/or diff --git a/board/samsung/smdk6400/u-boot-nand.lds b/board/samsung/smdk6400/u-boot-nand.lds index a074420..29a4f61 100644 --- a/board/samsung/smdk6400/u-boot-nand.lds +++ b/board/samsung/smdk6400/u-boot-nand.lds @@ -34,8 +34,8 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm1176/start.o (.text) - cpu/arm1176/s3c64xx/cpu_init.o (.text) + arch/arm/cpu/arm1176/start.o (.text) + arch/arm/cpu/arm1176/s3c64xx/cpu_init.o (.text) *(.text) }

diff --git a/board/siemens/SMN42/flash.c b/board/siemens/SMN42/flash.c index 8cf17b8..fc91574 100644 --- a/board/siemens/SMN42/flash.c +++ b/board/siemens/SMN42/flash.c @@ -2,7 +2,7 @@ * (C) Copyright 2006 Embedded Artists AB <www.embeddedartists.com> * * (C) Copyright 2007 Gary Jennejohn garyj@denx.de - * Modified to use the routines in cpu/arm720t/lpc2292/flash.c. + * Modified to use the routines in arch/arm/cpu/arm720t/lpc2292/flash.c. * Heavily modified to support the SMN42 board from Siemens * * This program is free software; you can redistribute it and/or diff --git a/board/trab/rs485.c b/board/trab/rs485.c index ad0c136..6a3a4cd 100644 --- a/board/trab/rs485.c +++ b/board/trab/rs485.c @@ -2,7 +2,7 @@ * (C) Copyright 2003 * Martin Krause, TQ-Systems GmbH, martin.krause@tqs.de * - * Based on cpu/arm920t/serial.c, by Gary Jennejohn + * Based on arch/arm/cpu/arm920t/serial.c, by Gary Jennejohn * (C) Copyright 2002 Gary Jennejohn, DENX Software Engineering, garyj@denx.de * * This program is free software; you can redistribute it and/or modify diff --git a/board/trab/rs485.h b/board/trab/rs485.h index 16d69bb..19e3244 100644 --- a/board/trab/rs485.h +++ b/board/trab/rs485.h @@ -2,7 +2,7 @@ * (C) Copyright 2003 * Martin Krause, TQ-Systems GmbH, martin.krause@tqs.de * - * Based on cpu/arm920t/serial.c, by Gary Jennejohn + * Based on arch/arm/cpu/arm920t/serial.c, by Gary Jennejohn * (C) Copyright 2002 Gary Jennejohn, DENX Software Engineering, garyj@denx.de * * This program is free software; you can redistribute it and/or modify diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds index 05b929f..cd50e85 100644 --- a/board/trab/u-boot.lds +++ b/board/trab/u-boot.lds @@ -32,7 +32,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm920t/start.o (.text) + arch/arm/cpu/arm920t/start.o (.text) lib/zlib.o (.text) lib/crc32.o (.text) lib/string.o (.text) diff --git a/doc/README-integrator b/doc/README-integrator index 4daf341..5a0e934 100644 --- a/doc/README-integrator +++ b/doc/README-integrator @@ -52,7 +52,7 @@ cpu/arm<>/start.S so that it may be used by other boards. However, to avoid duplicating code through all processor files, a generic core for ARM Integrator CMs has been added

- cpu/arm_intcm + arch/arm/cpu/arm_intcm

Otherwise. for example, the standard CM reset via the CM control register would need placing in each CM processor file...... diff --git a/doc/README.ARM-SoC b/doc/README.ARM-SoC index fb20cb1..a1f5eb1 100644 --- a/doc/README.ARM-SoC +++ b/doc/README.ARM-SoC @@ -1,7 +1,7 @@ [By Steven Scholz steven.scholz@imc-berlin.de, 16 Aug 2004]

Since the cpu/ directory gets clobbered with peripheral driver code I -started cleaning up cpu/arm920t. +started cleaning up arch/arm/cpu/arm920t.

I introduced the concept of Soc (system on a chip) into the ./cpu directory. That means that code that is cpu (i.e. core) specific @@ -17,8 +17,8 @@ peripherals around the core) is moved into Thus a library/archive "arch/$(ARCH)/cpu/$(CPU)/$(SOC)/lib$(SOC).a" will be build and linked. Examples will be

- cpu/arm920t/imx/ - cpu/arm920t/s3c24x0 + arch/arm/cpu/arm920t/imx/ + arch/arm/cpu/arm920t/s3c24x0

One can select an SoC by passing the name of it to ./mkconfig just like diff --git a/doc/README.modnet50 b/doc/README.modnet50 index f7bb254..2ac3c8f 100644 --- a/doc/README.modnet50 +++ b/doc/README.modnet50 @@ -45,7 +45,7 @@ flash.

Files:

-cpu/arm720t/serial_netarm.c .. serial I/O for the cpu +arch/arm/cpu/arm720t/serial_netarm.c .. serial I/O for the cpu

board/modnet50/lowlevel_init.S .. memory setup for ModNET50 board/modnet50/flash.c .. flash routines diff --git a/nand_spl/board/freescale/mx31pdk/Makefile b/nand_spl/board/freescale/mx31pdk/Makefile index 0e13d5d..c1dcf05 100644 --- a/nand_spl/board/freescale/mx31pdk/Makefile +++ b/nand_spl/board/freescale/mx31pdk/Makefile @@ -12,7 +12,7 @@ SOBJS = start.o lowlevel_init.o COBJS = nand_boot_fsl_nfc.o

SRCS := $(SRCTREE)/nand_spl/nand_boot_fsl_nfc.c -SRCS += $(SRCTREE)/cpu/arm1136/start.S +SRCS += $(SRCTREE)/arch/arm/cpu/arm1136/start.S SRCS += $(SRCTREE)/board/freescale/mx31pdk/lowlevel_init.S OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) __OBJS := $(SOBJS) $(COBJS) @@ -40,7 +40,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)

#########################################################################

-$(obj)%.o: $(SRCTREE)/cpu/arm1136/%.S +$(obj)%.o: $(SRCTREE)/arch/arm/cpu/arm1136/%.S $(CC) $(AFLAGS) -c -o $@ $<

$(obj)%.o: $(SRCTREE)/board/freescale/mx31pdk/%.S diff --git a/nand_spl/board/samsung/smdk6400/Makefile b/nand_spl/board/samsung/smdk6400/Makefile index 0fdda25..9cb4853 100644 --- a/nand_spl/board/samsung/smdk6400/Makefile +++ b/nand_spl/board/samsung/smdk6400/Makefile @@ -67,12 +67,12 @@ $(nandobj)u-boot.lds: $(LDSCRIPT) # from cpu directory $(obj)start.S: @rm -f $@ - @ln -s $(TOPDIR)/cpu/arm1176/start.S $@ + @ln -s $(TOPDIR)/arch/arm/cpu/arm1176/start.S $@

# from SoC directory $(obj)cpu_init.S: @rm -f $@ - @ln -s $(TOPDIR)/cpu/arm1176/s3c64xx/cpu_init.S $@ + @ln -s $(TOPDIR)/arch/arm/cpu/arm1176/s3c64xx/cpu_init.S $@

# from board directory $(obj)lowlevel_init.S:

Signed-off-by: Peter Tyser ptyser@xes-inc.com --- Makefile | 2 +- {cpu => arch/blackfin/cpu}/blackfin/.gitignore | 0 {cpu => arch/blackfin/cpu}/blackfin/Makefile | 0 .../blackfin/cpu}/blackfin/bootrom-asm-offsets.awk | 0 .../cpu}/blackfin/bootrom-asm-offsets.c.in | 0 {cpu => arch/blackfin/cpu}/blackfin/cache.S | 0 {cpu => arch/blackfin/cpu}/blackfin/cpu.c | 0 {cpu => arch/blackfin/cpu}/blackfin/cpu.h | 0 {cpu => arch/blackfin/cpu}/blackfin/initcode.c | 0 {cpu => arch/blackfin/cpu}/blackfin/interrupt.S | 0 {cpu => arch/blackfin/cpu}/blackfin/interrupts.c | 0 {cpu => arch/blackfin/cpu}/blackfin/jtag-console.c | 0 {cpu => arch/blackfin/cpu}/blackfin/os_log.c | 0 {cpu => arch/blackfin/cpu}/blackfin/reset.c | 0 {cpu => arch/blackfin/cpu}/blackfin/serial.c | 0 {cpu => arch/blackfin/cpu}/blackfin/serial.h | 0 {cpu => arch/blackfin/cpu}/blackfin/start.S | 0 {cpu => arch/blackfin/cpu}/blackfin/traps.c | 0 {cpu => arch/blackfin/cpu}/blackfin/watchdog.c | 0 arch/blackfin/lib/u-boot.lds.S | 4 ++-- include/configs/bf533-stamp.h | 6 +++--- include/configs/bf537-pnav.h | 6 +++--- include/configs/bf537-stamp.h | 6 +++--- include/configs/bf538f-ezkit.h | 6 +++--- include/configs/bf561-ezkit.h | 6 +++--- include/configs/cm-bf537e.h | 6 +++--- include/configs/cm-bf537u.h | 6 +++--- include/configs/ibf-dsp561.h | 6 +++--- include/configs/tcm-bf537.h | 6 +++--- 29 files changed, 30 insertions(+), 30 deletions(-) rename {cpu => arch/blackfin/cpu}/blackfin/.gitignore (100%) rename {cpu => arch/blackfin/cpu}/blackfin/Makefile (100%) rename {cpu => arch/blackfin/cpu}/blackfin/bootrom-asm-offsets.awk (100%) rename {cpu => arch/blackfin/cpu}/blackfin/bootrom-asm-offsets.c.in (100%) rename {cpu => arch/blackfin/cpu}/blackfin/cache.S (100%) rename {cpu => arch/blackfin/cpu}/blackfin/cpu.c (100%) rename {cpu => arch/blackfin/cpu}/blackfin/cpu.h (100%) rename {cpu => arch/blackfin/cpu}/blackfin/initcode.c (100%) rename {cpu => arch/blackfin/cpu}/blackfin/interrupt.S (100%) rename {cpu => arch/blackfin/cpu}/blackfin/interrupts.c (100%) rename {cpu => arch/blackfin/cpu}/blackfin/jtag-console.c (100%) rename {cpu => arch/blackfin/cpu}/blackfin/os_log.c (100%) rename {cpu => arch/blackfin/cpu}/blackfin/reset.c (100%) rename {cpu => arch/blackfin/cpu}/blackfin/serial.c (100%) rename {cpu => arch/blackfin/cpu}/blackfin/serial.h (100%) rename {cpu => arch/blackfin/cpu}/blackfin/start.S (100%) rename {cpu => arch/blackfin/cpu}/blackfin/traps.c (100%) rename {cpu => arch/blackfin/cpu}/blackfin/watchdog.c (100%)

diff --git a/Makefile b/Makefile index c97ab1d..1390c28 100644 --- a/Makefile +++ b/Makefile @@ -3741,7 +3741,7 @@ clean: $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds \ $(obj)arch/blackfin/lib/u-boot.lds \ $(obj)u-boot.lds \ - $(obj)cpu/blackfin/bootrom-asm-offsets.[chs] + $(obj)arch/blackfin/cpu/blackfin/bootrom-asm-offsets.[chs] @rm -f $(obj)include/bmp_logo.h @rm -f $(obj)nand_spl/{u-boot.lds,u-boot-spl,u-boot-spl.map,System.map} @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl.map} diff --git a/cpu/blackfin/.gitignore b/arch/blackfin/cpu/blackfin/.gitignore similarity index 100% rename from cpu/blackfin/.gitignore rename to arch/blackfin/cpu/blackfin/.gitignore diff --git a/cpu/blackfin/Makefile b/arch/blackfin/cpu/blackfin/Makefile similarity index 100% rename from cpu/blackfin/Makefile rename to arch/blackfin/cpu/blackfin/Makefile diff --git a/cpu/blackfin/bootrom-asm-offsets.awk b/arch/blackfin/cpu/blackfin/bootrom-asm-offsets.awk similarity index 100% rename from cpu/blackfin/bootrom-asm-offsets.awk rename to arch/blackfin/cpu/blackfin/bootrom-asm-offsets.awk diff --git a/cpu/blackfin/bootrom-asm-offsets.c.in b/arch/blackfin/cpu/blackfin/bootrom-asm-offsets.c.in similarity index 100% rename from cpu/blackfin/bootrom-asm-offsets.c.in rename to arch/blackfin/cpu/blackfin/bootrom-asm-offsets.c.in diff --git a/cpu/blackfin/cache.S b/arch/blackfin/cpu/blackfin/cache.S similarity index 100% rename from cpu/blackfin/cache.S rename to arch/blackfin/cpu/blackfin/cache.S diff --git a/cpu/blackfin/cpu.c b/arch/blackfin/cpu/blackfin/cpu.c similarity index 100% rename from cpu/blackfin/cpu.c rename to arch/blackfin/cpu/blackfin/cpu.c diff --git a/cpu/blackfin/cpu.h b/arch/blackfin/cpu/blackfin/cpu.h similarity index 100% rename from cpu/blackfin/cpu.h rename to arch/blackfin/cpu/blackfin/cpu.h diff --git a/cpu/blackfin/initcode.c b/arch/blackfin/cpu/blackfin/initcode.c similarity index 100% rename from cpu/blackfin/initcode.c rename to arch/blackfin/cpu/blackfin/initcode.c diff --git a/cpu/blackfin/interrupt.S b/arch/blackfin/cpu/blackfin/interrupt.S similarity index 100% rename from cpu/blackfin/interrupt.S rename to arch/blackfin/cpu/blackfin/interrupt.S diff --git a/cpu/blackfin/interrupts.c b/arch/blackfin/cpu/blackfin/interrupts.c similarity index 100% rename from cpu/blackfin/interrupts.c rename to arch/blackfin/cpu/blackfin/interrupts.c diff --git a/cpu/blackfin/jtag-console.c b/arch/blackfin/cpu/blackfin/jtag-console.c similarity index 100% rename from cpu/blackfin/jtag-console.c rename to arch/blackfin/cpu/blackfin/jtag-console.c diff --git a/cpu/blackfin/os_log.c b/arch/blackfin/cpu/blackfin/os_log.c similarity index 100% rename from cpu/blackfin/os_log.c rename to arch/blackfin/cpu/blackfin/os_log.c diff --git a/cpu/blackfin/reset.c b/arch/blackfin/cpu/blackfin/reset.c similarity index 100% rename from cpu/blackfin/reset.c rename to arch/blackfin/cpu/blackfin/reset.c diff --git a/cpu/blackfin/serial.c b/arch/blackfin/cpu/blackfin/serial.c similarity index 100% rename from cpu/blackfin/serial.c rename to arch/blackfin/cpu/blackfin/serial.c diff --git a/cpu/blackfin/serial.h b/arch/blackfin/cpu/blackfin/serial.h similarity index 100% rename from cpu/blackfin/serial.h rename to arch/blackfin/cpu/blackfin/serial.h diff --git a/cpu/blackfin/start.S b/arch/blackfin/cpu/blackfin/start.S similarity index 100% rename from cpu/blackfin/start.S rename to arch/blackfin/cpu/blackfin/start.S diff --git a/cpu/blackfin/traps.c b/arch/blackfin/cpu/blackfin/traps.c similarity index 100% rename from cpu/blackfin/traps.c rename to arch/blackfin/cpu/blackfin/traps.c diff --git a/cpu/blackfin/watchdog.c b/arch/blackfin/cpu/blackfin/watchdog.c similarity index 100% rename from cpu/blackfin/watchdog.c rename to arch/blackfin/cpu/blackfin/watchdog.c diff --git a/arch/blackfin/lib/u-boot.lds.S b/arch/blackfin/lib/u-boot.lds.S index 3604b78..ec1a1d7 100644 --- a/arch/blackfin/lib/u-boot.lds.S +++ b/arch/blackfin/lib/u-boot.lds.S @@ -67,12 +67,12 @@ SECTIONS { .text : { - cpu/blackfin/start.o (.text .text.*) + arch/blackfin/cpu/blackfin/start.o (.text .text.*)

LDS_BOARD_TEXT

__initcode_start = .; - cpu/blackfin/initcode.o (.text .text.*) + arch/blackfin/cpu/blackfin/initcode.o (.text .text.*) __initcode_end = .;

*(.text .text.*) diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index 06b4dee..a31cd31 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -126,9 +126,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h index f1872ec..0fee207 100644 --- a/include/configs/bf537-pnav.h +++ b/include/configs/bf537-pnav.h @@ -112,9 +112,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index fa46551..1f811f1 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -122,9 +122,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h index 0464943..efb26bb 100644 --- a/include/configs/bf538f-ezkit.h +++ b/include/configs/bf538f-ezkit.h @@ -119,9 +119,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h index 1cc6a6e..96b3f4e 100644 --- a/include/configs/bf561-ezkit.h +++ b/include/configs/bf561-ezkit.h @@ -96,9 +96,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ lib/zlib.o (.text .text.*); \ diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h index b2a08e3..9260e5a 100644 --- a/include/configs/cm-bf537e.h +++ b/include/configs/cm-bf537e.h @@ -101,9 +101,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h index cd729a8..a35c465 100644 --- a/include/configs/cm-bf537u.h +++ b/include/configs/cm-bf537u.h @@ -105,9 +105,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h index 0108120..bd36304 100644 --- a/include/configs/ibf-dsp561.h +++ b/include/configs/ibf-dsp561.h @@ -84,9 +84,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ lib/zlib.o (.text .text.*); \ diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h index 7c68bcf..fb4f8c4 100644 --- a/include/configs/tcm-bf537.h +++ b/include/configs/tcm-bf537.h @@ -102,9 +102,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \

Signed-off-by: Peter Tyser ptyser@xes-inc.com --- {cpu => arch/mips/cpu}/mips/Makefile | 0 {cpu => arch/mips/cpu}/mips/asc_serial.c | 0 {cpu => arch/mips/cpu}/mips/asc_serial.h | 0 {cpu => arch/mips/cpu}/mips/au1x00_eth.c | 0 {cpu => arch/mips/cpu}/mips/au1x00_serial.c | 0 {cpu => arch/mips/cpu}/mips/au1x00_usb_ohci.c | 0 {cpu => arch/mips/cpu}/mips/au1x00_usb_ohci.h | 0 {cpu => arch/mips/cpu}/mips/cache.S | 0 {cpu => arch/mips/cpu}/mips/config.mk | 0 {cpu => arch/mips/cpu}/mips/cpu.c | 0 {cpu => arch/mips/cpu}/mips/incaip_clock.c | 0 {cpu => arch/mips/cpu}/mips/incaip_wdt.S | 0 {cpu => arch/mips/cpu}/mips/interrupts.c | 0 {cpu => arch/mips/cpu}/mips/start.S | 0 board/dbau1x00/dbau1x00.c | 2 +- board/gth2/gth2.c | 2 +- board/pb1x00/pb1x00.c | 2 +- board/purple/u-boot.lds | 4 ++-- drivers/usb/host/isp116x-hcd.c | 2 +- 19 files changed, 6 insertions(+), 6 deletions(-) rename {cpu => arch/mips/cpu}/mips/Makefile (100%) rename {cpu => arch/mips/cpu}/mips/asc_serial.c (100%) rename {cpu => arch/mips/cpu}/mips/asc_serial.h (100%) rename {cpu => arch/mips/cpu}/mips/au1x00_eth.c (100%) rename {cpu => arch/mips/cpu}/mips/au1x00_serial.c (100%) rename {cpu => arch/mips/cpu}/mips/au1x00_usb_ohci.c (100%) rename {cpu => arch/mips/cpu}/mips/au1x00_usb_ohci.h (100%) rename {cpu => arch/mips/cpu}/mips/cache.S (100%) rename {cpu => arch/mips/cpu}/mips/config.mk (100%) rename {cpu => arch/mips/cpu}/mips/cpu.c (100%) rename {cpu => arch/mips/cpu}/mips/incaip_clock.c (100%) rename {cpu => arch/mips/cpu}/mips/incaip_wdt.S (100%) rename {cpu => arch/mips/cpu}/mips/interrupts.c (100%) rename {cpu => arch/mips/cpu}/mips/start.S (100%)

diff --git a/cpu/mips/Makefile b/arch/mips/cpu/mips/Makefile similarity index 100% rename from cpu/mips/Makefile rename to arch/mips/cpu/mips/Makefile diff --git a/cpu/mips/asc_serial.c b/arch/mips/cpu/mips/asc_serial.c similarity index 100% rename from cpu/mips/asc_serial.c rename to arch/mips/cpu/mips/asc_serial.c diff --git a/cpu/mips/asc_serial.h b/arch/mips/cpu/mips/asc_serial.h similarity index 100% rename from cpu/mips/asc_serial.h rename to arch/mips/cpu/mips/asc_serial.h diff --git a/cpu/mips/au1x00_eth.c b/arch/mips/cpu/mips/au1x00_eth.c similarity index 100% rename from cpu/mips/au1x00_eth.c rename to arch/mips/cpu/mips/au1x00_eth.c diff --git a/cpu/mips/au1x00_serial.c b/arch/mips/cpu/mips/au1x00_serial.c similarity index 100% rename from cpu/mips/au1x00_serial.c rename to arch/mips/cpu/mips/au1x00_serial.c diff --git a/cpu/mips/au1x00_usb_ohci.c b/arch/mips/cpu/mips/au1x00_usb_ohci.c similarity index 100% rename from cpu/mips/au1x00_usb_ohci.c rename to arch/mips/cpu/mips/au1x00_usb_ohci.c diff --git a/cpu/mips/au1x00_usb_ohci.h b/arch/mips/cpu/mips/au1x00_usb_ohci.h similarity index 100% rename from cpu/mips/au1x00_usb_ohci.h rename to arch/mips/cpu/mips/au1x00_usb_ohci.h diff --git a/cpu/mips/cache.S b/arch/mips/cpu/mips/cache.S similarity index 100% rename from cpu/mips/cache.S rename to arch/mips/cpu/mips/cache.S diff --git a/cpu/mips/config.mk b/arch/mips/cpu/mips/config.mk similarity index 100% rename from cpu/mips/config.mk rename to arch/mips/cpu/mips/config.mk diff --git a/cpu/mips/cpu.c b/arch/mips/cpu/mips/cpu.c similarity index 100% rename from cpu/mips/cpu.c rename to arch/mips/cpu/mips/cpu.c diff --git a/cpu/mips/incaip_clock.c b/arch/mips/cpu/mips/incaip_clock.c similarity index 100% rename from cpu/mips/incaip_clock.c rename to arch/mips/cpu/mips/incaip_clock.c diff --git a/cpu/mips/incaip_wdt.S b/arch/mips/cpu/mips/incaip_wdt.S similarity index 100% rename from cpu/mips/incaip_wdt.S rename to arch/mips/cpu/mips/incaip_wdt.S diff --git a/cpu/mips/interrupts.c b/arch/mips/cpu/mips/interrupts.c similarity index 100% rename from cpu/mips/interrupts.c rename to arch/mips/cpu/mips/interrupts.c diff --git a/cpu/mips/start.S b/arch/mips/cpu/mips/start.S similarity index 100% rename from cpu/mips/start.S rename to arch/mips/cpu/mips/start.S diff --git a/board/dbau1x00/dbau1x00.c b/board/dbau1x00/dbau1x00.c index 42756f5..332864d 100644 --- a/board/dbau1x00/dbau1x00.c +++ b/board/dbau1x00/dbau1x00.c @@ -37,7 +37,7 @@ phys_size_t initdram(int board_type) #define BCSR_PCMCIA_PC0DRVEN 0x0010 #define BCSR_PCMCIA_PC0RST 0x0080

-/* In cpu/mips/cpu.c */ +/* In arch/mips/cpu/mips/cpu.c */ void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );

int checkboard (void) diff --git a/board/gth2/gth2.c b/board/gth2/gth2.c index 59873d5..ffb009c 100644 --- a/board/gth2/gth2.c +++ b/board/gth2/gth2.c @@ -93,7 +93,7 @@ phys_size_t initdram(int board_type) return (SDRAM_SIZE); }

-/* In cpu/mips/cpu.c */ +/* In arch/mips/cpu/mips/cpu.c */ void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );

void set_ledcard(u32 value){ diff --git a/board/pb1x00/pb1x00.c b/board/pb1x00/pb1x00.c index 773e446..e7c878f 100644 --- a/board/pb1x00/pb1x00.c +++ b/board/pb1x00/pb1x00.c @@ -37,7 +37,7 @@ phys_size_t initdram(int board_type) #define BCSR_PCMCIA_PC0DRVEN 0x0010 #define BCSR_PCMCIA_PC0RST 0x0080

-/* In cpu/mips/cpu.c */ +/* In arch/mips/cpu/mips/cpu.c */ void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );

int checkboard (void) diff --git a/board/purple/u-boot.lds b/board/purple/u-boot.lds index 236ece4..11e6267 100644 --- a/board/purple/u-boot.lds +++ b/board/purple/u-boot.lds @@ -34,9 +34,9 @@ SECTIONS . = ALIGN(4); .text : { - cpu/mips/start.o (.text) + arch/mips/cpu/mips/start.o (.text) board/purple/lowlevel_init.o (.text) - cpu/mips/cache.o (.text) + arch/mips/cpu/mips/cache.o (.text) common/main.o (.text) common/dlmalloc.o (.text) common/cmd_boot.o (.text) diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index 7aff54b..1449783 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c @@ -42,7 +42,7 @@ * * [[GNU/GPL disclaimer]] * - * and in part from AU1x00 OHCI HCD driver "u-boot/cpu/mips/au1x00_usb_ohci.c" + * and in part from AU1x00 OHCI HCD driver arch/mips/cpu/mips/au1x00_usb_ohci.c * (original copyright message follows): * * URB OHCI HCD (Host Controller Driver) for USB on the AU1x00.

Signed-off-by: Peter Tyser ptyser@xes-inc.com --- {cpu => arch/microblaze/cpu}/microblaze/Makefile | 0 {cpu => arch/microblaze/cpu}/microblaze/cache.c | 0 {cpu => arch/microblaze/cpu}/microblaze/cpu.c | 0 .../microblaze/cpu}/microblaze/exception.c | 0 .../microblaze/cpu}/microblaze/interrupts.c | 0 {cpu => arch/microblaze/cpu}/microblaze/irq.S | 0 {cpu => arch/microblaze/cpu}/microblaze/start.S | 0 {cpu => arch/microblaze/cpu}/microblaze/timer.c | 0 board/xilinx/microblaze-generic/u-boot.lds | 2 +- 9 files changed, 1 insertions(+), 1 deletions(-) rename {cpu => arch/microblaze/cpu}/microblaze/Makefile (100%) rename {cpu => arch/microblaze/cpu}/microblaze/cache.c (100%) rename {cpu => arch/microblaze/cpu}/microblaze/cpu.c (100%) rename {cpu => arch/microblaze/cpu}/microblaze/exception.c (100%) rename {cpu => arch/microblaze/cpu}/microblaze/interrupts.c (100%) rename {cpu => arch/microblaze/cpu}/microblaze/irq.S (100%) rename {cpu => arch/microblaze/cpu}/microblaze/start.S (100%) rename {cpu => arch/microblaze/cpu}/microblaze/timer.c (100%)

diff --git a/cpu/microblaze/Makefile b/arch/microblaze/cpu/microblaze/Makefile similarity index 100% rename from cpu/microblaze/Makefile rename to arch/microblaze/cpu/microblaze/Makefile diff --git a/cpu/microblaze/cache.c b/arch/microblaze/cpu/microblaze/cache.c similarity index 100% rename from cpu/microblaze/cache.c rename to arch/microblaze/cpu/microblaze/cache.c diff --git a/cpu/microblaze/cpu.c b/arch/microblaze/cpu/microblaze/cpu.c similarity index 100% rename from cpu/microblaze/cpu.c rename to arch/microblaze/cpu/microblaze/cpu.c diff --git a/cpu/microblaze/exception.c b/arch/microblaze/cpu/microblaze/exception.c similarity index 100% rename from cpu/microblaze/exception.c rename to arch/microblaze/cpu/microblaze/exception.c diff --git a/cpu/microblaze/interrupts.c b/arch/microblaze/cpu/microblaze/interrupts.c similarity index 100% rename from cpu/microblaze/interrupts.c rename to arch/microblaze/cpu/microblaze/interrupts.c diff --git a/cpu/microblaze/irq.S b/arch/microblaze/cpu/microblaze/irq.S similarity index 100% rename from cpu/microblaze/irq.S rename to arch/microblaze/cpu/microblaze/irq.S diff --git a/cpu/microblaze/start.S b/arch/microblaze/cpu/microblaze/start.S similarity index 100% rename from cpu/microblaze/start.S rename to arch/microblaze/cpu/microblaze/start.S diff --git a/cpu/microblaze/timer.c b/arch/microblaze/cpu/microblaze/timer.c similarity index 100% rename from cpu/microblaze/timer.c rename to arch/microblaze/cpu/microblaze/timer.c diff --git a/board/xilinx/microblaze-generic/u-boot.lds b/board/xilinx/microblaze-generic/u-boot.lds index c20c6dd..06f3f1e 100644 --- a/board/xilinx/microblaze-generic/u-boot.lds +++ b/board/xilinx/microblaze-generic/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS .text ALIGN(0x4): { __text_start = .; - cpu/microblaze/start.o (.text) + arch/microblaze/cpu/microblaze/start.o (.text) *(.text) __text_end = .; }

Signed-off-by: Peter Tyser ptyser@xes-inc.com --- {cpu => arch/nios/cpu}/nios/Makefile | 0 {cpu => arch/nios/cpu}/nios/asmi.c | 0 {cpu => arch/nios/cpu}/nios/config.mk | 0 {cpu => arch/nios/cpu}/nios/cpu.c | 0 {cpu => arch/nios/cpu}/nios/interrupts.c | 0 {cpu => arch/nios/cpu}/nios/serial.c | 0 {cpu => arch/nios/cpu}/nios/spi.c | 0 {cpu => arch/nios/cpu}/nios/start.S | 0 {cpu => arch/nios/cpu}/nios/traps.S | 0 board/altera/dk1c20/u-boot.lds | 2 +- board/altera/dk1s10/u-boot.lds | 2 +- board/altera/ep1c20/u-boot.lds | 2 +- board/altera/ep1s10/u-boot.lds | 2 +- board/altera/ep1s40/u-boot.lds | 2 +- board/psyent/pci5441/u-boot.lds | 2 +- board/psyent/pk1c20/u-boot.lds | 2 +- board/ssv/adnpesc1/u-boot.lds | 2 +- doc/README.nios | 2 +- 18 files changed, 9 insertions(+), 9 deletions(-) rename {cpu => arch/nios/cpu}/nios/Makefile (100%) rename {cpu => arch/nios/cpu}/nios/asmi.c (100%) rename {cpu => arch/nios/cpu}/nios/config.mk (100%) rename {cpu => arch/nios/cpu}/nios/cpu.c (100%) rename {cpu => arch/nios/cpu}/nios/interrupts.c (100%) rename {cpu => arch/nios/cpu}/nios/serial.c (100%) rename {cpu => arch/nios/cpu}/nios/spi.c (100%) rename {cpu => arch/nios/cpu}/nios/start.S (100%) rename {cpu => arch/nios/cpu}/nios/traps.S (100%)

diff --git a/cpu/nios/Makefile b/arch/nios/cpu/nios/Makefile similarity index 100% rename from cpu/nios/Makefile rename to arch/nios/cpu/nios/Makefile diff --git a/cpu/nios/asmi.c b/arch/nios/cpu/nios/asmi.c similarity index 100% rename from cpu/nios/asmi.c rename to arch/nios/cpu/nios/asmi.c diff --git a/cpu/nios/config.mk b/arch/nios/cpu/nios/config.mk similarity index 100% rename from cpu/nios/config.mk rename to arch/nios/cpu/nios/config.mk diff --git a/cpu/nios/cpu.c b/arch/nios/cpu/nios/cpu.c similarity index 100% rename from cpu/nios/cpu.c rename to arch/nios/cpu/nios/cpu.c diff --git a/cpu/nios/interrupts.c b/arch/nios/cpu/nios/interrupts.c similarity index 100% rename from cpu/nios/interrupts.c rename to arch/nios/cpu/nios/interrupts.c diff --git a/cpu/nios/serial.c b/arch/nios/cpu/nios/serial.c similarity index 100% rename from cpu/nios/serial.c rename to arch/nios/cpu/nios/serial.c diff --git a/cpu/nios/spi.c b/arch/nios/cpu/nios/spi.c similarity index 100% rename from cpu/nios/spi.c rename to arch/nios/cpu/nios/spi.c diff --git a/cpu/nios/start.S b/arch/nios/cpu/nios/start.S similarity index 100% rename from cpu/nios/start.S rename to arch/nios/cpu/nios/start.S diff --git a/cpu/nios/traps.S b/arch/nios/cpu/nios/traps.S similarity index 100% rename from cpu/nios/traps.S rename to arch/nios/cpu/nios/traps.S diff --git a/board/altera/dk1c20/u-boot.lds b/board/altera/dk1c20/u-boot.lds index 98ee8f8..a734e39 100644 --- a/board/altera/dk1c20/u-boot.lds +++ b/board/altera/dk1c20/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS { .text : { - cpu/nios/start.o (.text) + arch/nios/cpu/nios/start.o (.text) *(.text) } __text_end = .; diff --git a/board/altera/dk1s10/u-boot.lds b/board/altera/dk1s10/u-boot.lds index 98ee8f8..a734e39 100644 --- a/board/altera/dk1s10/u-boot.lds +++ b/board/altera/dk1s10/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS { .text : { - cpu/nios/start.o (.text) + arch/nios/cpu/nios/start.o (.text) *(.text) } __text_end = .; diff --git a/board/altera/ep1c20/u-boot.lds b/board/altera/ep1c20/u-boot.lds index e2eb3aa..28e0f34 100644 --- a/board/altera/ep1c20/u-boot.lds +++ b/board/altera/ep1c20/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS { .text : { - cpu/nios2/start.o (.text) + arch/nios/cpu/nios2/start.o (.text) *(.text) *(.text.*) *(.gnu.linkonce.t*) diff --git a/board/altera/ep1s10/u-boot.lds b/board/altera/ep1s10/u-boot.lds index e2eb3aa..28e0f34 100644 --- a/board/altera/ep1s10/u-boot.lds +++ b/board/altera/ep1s10/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS { .text : { - cpu/nios2/start.o (.text) + arch/nios/cpu/nios2/start.o (.text) *(.text) *(.text.*) *(.gnu.linkonce.t*) diff --git a/board/altera/ep1s40/u-boot.lds b/board/altera/ep1s40/u-boot.lds index e2eb3aa..28e0f34 100644 --- a/board/altera/ep1s40/u-boot.lds +++ b/board/altera/ep1s40/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS { .text : { - cpu/nios2/start.o (.text) + arch/nios/cpu/nios2/start.o (.text) *(.text) *(.text.*) *(.gnu.linkonce.t*) diff --git a/board/psyent/pci5441/u-boot.lds b/board/psyent/pci5441/u-boot.lds index b2d88a5..fc0872a 100644 --- a/board/psyent/pci5441/u-boot.lds +++ b/board/psyent/pci5441/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS { .text : { - cpu/nios2/start.o (.text) + arch/nios/cpu/nios2/start.o (.text) *(.text) *(.text.*) *(.gnu.linkonce.t*) diff --git a/board/psyent/pk1c20/u-boot.lds b/board/psyent/pk1c20/u-boot.lds index b2d88a5..fc0872a 100644 --- a/board/psyent/pk1c20/u-boot.lds +++ b/board/psyent/pk1c20/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS { .text : { - cpu/nios2/start.o (.text) + arch/nios/cpu/nios2/start.o (.text) *(.text) *(.text.*) *(.gnu.linkonce.t*) diff --git a/board/ssv/adnpesc1/u-boot.lds b/board/ssv/adnpesc1/u-boot.lds index 98ee8f8..a734e39 100644 --- a/board/ssv/adnpesc1/u-boot.lds +++ b/board/ssv/adnpesc1/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS { .text : { - cpu/nios/start.o (.text) + arch/nios/cpu/nios/start.o (.text) *(.text) } __text_end = .; diff --git a/doc/README.nios b/doc/README.nios index da30ff5..43a3ab6 100644 --- a/doc/README.nios +++ b/doc/README.nios @@ -243,7 +243,7 @@ cover most of the individual functions to get you started. following commands, then close the console window:

(gdb) directory common - (gdb) directory cpu/nios + (gdb) directory arch/nios/cpu/nios (gdb) directory arch/nios/lib (gdb) directory board/altera/dk1c20

Signed-off-by: Peter Tyser ptyser@xes-inc.com --- {cpu => arch/i386/cpu}/i386/Makefile | 0 {cpu => arch/i386/cpu}/i386/config.mk | 0 {cpu => arch/i386/cpu}/i386/cpu.c | 0 {cpu => arch/i386/cpu}/i386/interrupts.c | 0 {cpu => arch/i386/cpu}/i386/resetvec.S | 0 {cpu => arch/i386/cpu}/i386/sc520/Makefile | 0 {cpu => arch/i386/cpu}/i386/sc520/sc520.c | 0 {cpu => arch/i386/cpu}/i386/sc520/sc520_asm.S | 0 {cpu => arch/i386/cpu}/i386/sc520/sc520_pci.c | 0 {cpu => arch/i386/cpu}/i386/sc520/sc520_ssi.c | 0 {cpu => arch/i386/cpu}/i386/sc520/sc520_timer.c | 0 {cpu => arch/i386/cpu}/i386/serial.c | 0 {cpu => arch/i386/cpu}/i386/start.S | 0 {cpu => arch/i386/cpu}/i386/start16.S | 0 arch/i386/include/asm/interrupt.h | 2 +- arch/i386/include/asm/u-boot-i386.h | 2 +- doc/TODO-i386 | 4 ++-- 17 files changed, 4 insertions(+), 4 deletions(-) rename {cpu => arch/i386/cpu}/i386/Makefile (100%) rename {cpu => arch/i386/cpu}/i386/config.mk (100%) rename {cpu => arch/i386/cpu}/i386/cpu.c (100%) rename {cpu => arch/i386/cpu}/i386/interrupts.c (100%) rename {cpu => arch/i386/cpu}/i386/resetvec.S (100%) rename {cpu => arch/i386/cpu}/i386/sc520/Makefile (100%) rename {cpu => arch/i386/cpu}/i386/sc520/sc520.c (100%) rename {cpu => arch/i386/cpu}/i386/sc520/sc520_asm.S (100%) rename {cpu => arch/i386/cpu}/i386/sc520/sc520_pci.c (100%) rename {cpu => arch/i386/cpu}/i386/sc520/sc520_ssi.c (100%) rename {cpu => arch/i386/cpu}/i386/sc520/sc520_timer.c (100%) rename {cpu => arch/i386/cpu}/i386/serial.c (100%) rename {cpu => arch/i386/cpu}/i386/start.S (100%) rename {cpu => arch/i386/cpu}/i386/start16.S (100%)

diff --git a/cpu/i386/Makefile b/arch/i386/cpu/i386/Makefile similarity index 100% rename from cpu/i386/Makefile rename to arch/i386/cpu/i386/Makefile diff --git a/cpu/i386/config.mk b/arch/i386/cpu/i386/config.mk similarity index 100% rename from cpu/i386/config.mk rename to arch/i386/cpu/i386/config.mk diff --git a/cpu/i386/cpu.c b/arch/i386/cpu/i386/cpu.c similarity index 100% rename from cpu/i386/cpu.c rename to arch/i386/cpu/i386/cpu.c diff --git a/cpu/i386/interrupts.c b/arch/i386/cpu/i386/interrupts.c similarity index 100% rename from cpu/i386/interrupts.c rename to arch/i386/cpu/i386/interrupts.c diff --git a/cpu/i386/resetvec.S b/arch/i386/cpu/i386/resetvec.S similarity index 100% rename from cpu/i386/resetvec.S rename to arch/i386/cpu/i386/resetvec.S diff --git a/cpu/i386/sc520/Makefile b/arch/i386/cpu/i386/sc520/Makefile similarity index 100% rename from cpu/i386/sc520/Makefile rename to arch/i386/cpu/i386/sc520/Makefile diff --git a/cpu/i386/sc520/sc520.c b/arch/i386/cpu/i386/sc520/sc520.c similarity index 100% rename from cpu/i386/sc520/sc520.c rename to arch/i386/cpu/i386/sc520/sc520.c diff --git a/cpu/i386/sc520/sc520_asm.S b/arch/i386/cpu/i386/sc520/sc520_asm.S similarity index 100% rename from cpu/i386/sc520/sc520_asm.S rename to arch/i386/cpu/i386/sc520/sc520_asm.S diff --git a/cpu/i386/sc520/sc520_pci.c b/arch/i386/cpu/i386/sc520/sc520_pci.c similarity index 100% rename from cpu/i386/sc520/sc520_pci.c rename to arch/i386/cpu/i386/sc520/sc520_pci.c diff --git a/cpu/i386/sc520/sc520_ssi.c b/arch/i386/cpu/i386/sc520/sc520_ssi.c similarity index 100% rename from cpu/i386/sc520/sc520_ssi.c rename to arch/i386/cpu/i386/sc520/sc520_ssi.c diff --git a/cpu/i386/sc520/sc520_timer.c b/arch/i386/cpu/i386/sc520/sc520_timer.c similarity index 100% rename from cpu/i386/sc520/sc520_timer.c rename to arch/i386/cpu/i386/sc520/sc520_timer.c diff --git a/cpu/i386/serial.c b/arch/i386/cpu/i386/serial.c similarity index 100% rename from cpu/i386/serial.c rename to arch/i386/cpu/i386/serial.c diff --git a/cpu/i386/start.S b/arch/i386/cpu/i386/start.S similarity index 100% rename from cpu/i386/start.S rename to arch/i386/cpu/i386/start.S diff --git a/cpu/i386/start16.S b/arch/i386/cpu/i386/start16.S similarity index 100% rename from cpu/i386/start16.S rename to arch/i386/cpu/i386/start16.S diff --git a/arch/i386/include/asm/interrupt.h b/arch/i386/include/asm/interrupt.h index 8d324d9..1c47203 100644 --- a/arch/i386/include/asm/interrupt.h +++ b/arch/i386/include/asm/interrupt.h @@ -27,7 +27,7 @@ #ifndef __ASM_INTERRUPT_H_ #define __ASM_INTERRUPT_H_ 1

-/* cpu/i386/interrupts.c */ +/* arch/i386/cpu/i386/interrupts.c */ void set_vector(u8 intnum, void *routine);

/* arch/i386/lib/interupts.c */ diff --git a/arch/i386/include/asm/u-boot-i386.h b/arch/i386/include/asm/u-boot-i386.h index a08632d..86f344e 100644 --- a/arch/i386/include/asm/u-boot-i386.h +++ b/arch/i386/include/asm/u-boot-i386.h @@ -33,7 +33,7 @@ void timer_isr(void *); typedef void (timer_fnc_t) (void); int register_timer_isr (timer_fnc_t *isr_func);

-/* Architecture specific - can be in cpu/i386/, arch/i386/lib/, or $(BOARD)/ */ +/* Arch-specific - can be in arch/i386/[cpu/i386/|i386/lib/], or $(BOARD) */ int timer_init(void);

/* cpu/.../interrupts.c */ diff --git a/doc/TODO-i386 b/doc/TODO-i386 index 2261f4a..d0d8052 100644 --- a/doc/TODO-i386 +++ b/doc/TODO-i386 @@ -4,11 +4,11 @@ i386 port missing features: * setup the BIOS data area and BIOS equipment word to reflect machine config. * Make reset work (from Linux and from the boot prompt) * DMA, FDC, RTC, KBC initialization -* split of part of cpu/i386/interrupt.c to cpu/i385/entry.c? +* split of part of arch/i386/cpu/i386/interrupt.c to cpu/i385/entry.c? * re-entry of protected mode from real mode, should be added to realmode_switch.S (and used by INT 10h and INT 16h handlers for console I/O during early linux boot...) -* missing functions in arch/i386/lib and cpu/i386 +* missing functions in arch/i386/lib and arch/i386/cpu/i386 * speaker beep interface