Reorganize directory structure

---
 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/at91/Makefile        |    0
 {cpu => arch/arm/cpu}/arm920t/at91/lowlevel_init.S |    0
 {cpu => arch/arm/cpu}/arm920t/at91/reset.c         |    0
 {cpu => arch/arm/cpu}/arm920t/at91/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/ep93xx/Makefile      |    0
 {cpu => arch/arm/cpu}/arm920t/ep93xx/cpu.c         |    0
 {cpu => arch/arm/cpu}/arm920t/ep93xx/led.c         |    0
 .../arm/cpu}/arm920t/ep93xx/lowlevel_init.S        |    0
 {cpu => arch/arm/cpu}/arm920t/ep93xx/speed.c       |    0
 {cpu => arch/arm/cpu}/arm920t/ep93xx/timer.c       |    0
 {cpu => arch/arm/cpu}/arm920t/ep93xx/u-boot.lds    |    2 +-
 {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/mx25/Makefile      |    2 +-
 {cpu => arch/arm/cpu}/arm926ejs/mx25/generic.c     |    0
 {cpu => arch/arm/cpu}/arm926ejs/mx25/reset.c       |    0
 {cpu => arch/arm/cpu}/arm926ejs/mx25/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/spear/Makefile     |    0
 {cpu => arch/arm/cpu}/arm926ejs/spear/reset.c      |    0
 {cpu => arch/arm/cpu}/arm926ejs/spear/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/mx51/Makefile   |    0
 {cpu => arch/arm/cpu}/arm_cortexa8/mx51/clock.c    |    0
 {cpu => arch/arm/cpu}/arm_cortexa8/mx51/iomux.c    |    0
 .../arm/cpu}/arm_cortexa8/mx51/lowlevel_init.S     |    0
 {cpu => arch/arm/cpu}/arm_cortexa8/mx51/soc.c      |    0
 {cpu => arch/arm/cpu}/arm_cortexa8/mx51/speed.c    |    0
 {cpu => arch/arm/cpu}/arm_cortexa8/mx51/timer.c    |    0
 {cpu => arch/arm/cpu}/arm_cortexa8/mx51/u-boot.lds |    2 +-
 {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.S |    2 +-
 {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/gpio.c  |    0
 {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/reset.S |    0
 {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/sromc.c |    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/include/asm/arch-mx51/asm-offsets.h       |    2 +-
 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                   |    2 +-
 board/davinci/schmoogie/board_init.S               |    2 +-
 board/davinci/sffsdr/board_init.S                  |    2 +-
 board/davinci/sonata/board_init.S                  |    2 +-
 board/edb93xx/config.mk                            |    2 +-
 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/karo/tx25/Makefile                  |    4 ++--
 nand_spl/board/samsung/smdk6400/Makefile           |    4 ++--
 407 files changed, 56 insertions(+), 56 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/at91/Makefile (100%)
 rename {cpu => arch/arm/cpu}/arm920t/at91/lowlevel_init.S (100%)
 rename {cpu => arch/arm/cpu}/arm920t/at91/reset.c (100%)
 rename {cpu => arch/arm/cpu}/arm920t/at91/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/ep93xx/Makefile (100%)
 rename {cpu => arch/arm/cpu}/arm920t/ep93xx/cpu.c (100%)
 rename {cpu => arch/arm/cpu}/arm920t/ep93xx/led.c (100%)
 rename {cpu => arch/arm/cpu}/arm920t/ep93xx/lowlevel_init.S (100%)
 rename {cpu => arch/arm/cpu}/arm920t/ep93xx/speed.c (100%)
 rename {cpu => arch/arm/cpu}/arm920t/ep93xx/timer.c (100%)
 rename {cpu => arch/arm/cpu}/arm920t/ep93xx/u-boot.lds (97%)
 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/mx25/Makefile (94%)
 rename {cpu => arch/arm/cpu}/arm926ejs/mx25/generic.c (100%)
 rename {cpu => arch/arm/cpu}/arm926ejs/mx25/reset.c (100%)
 rename {cpu => arch/arm/cpu}/arm926ejs/mx25/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/spear/Makefile (100%)
 rename {cpu => arch/arm/cpu}/arm926ejs/spear/reset.c (100%)
 rename {cpu => arch/arm/cpu}/arm926ejs/spear/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/mx51/Makefile (100%)
 rename {cpu => arch/arm/cpu}/arm_cortexa8/mx51/clock.c (100%)
 rename {cpu => arch/arm/cpu}/arm_cortexa8/mx51/iomux.c (100%)
 rename {cpu => arch/arm/cpu}/arm_cortexa8/mx51/lowlevel_init.S (100%)
 rename {cpu => arch/arm/cpu}/arm_cortexa8/mx51/soc.c (100%)
 rename {cpu => arch/arm/cpu}/arm_cortexa8/mx51/speed.c (100%)
 rename {cpu => arch/arm/cpu}/arm_cortexa8/mx51/timer.c (100%)
 rename {cpu => arch/arm/cpu}/arm_cortexa8/mx51/u-boot.lds (97%)
 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.S (98%)
 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/gpio.c (100%)
 rename {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/reset.S (100%)
 rename {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/sromc.c (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%)

index ddfe73c..e922ec3 100644
@@ -193,7 +193,7 @@ ifdef SOC
 LIBS += $(CPUDIR)/$(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 \

similarity index 100%
rename from cpu/arm1136/Makefile
rename to arch/arm/cpu/arm1136/Makefile

similarity index 100%
rename from cpu/arm1136/config.mk
rename to arch/arm/cpu/arm1136/config.mk

similarity index 100%
rename from cpu/arm1136/cpu.c
rename to arch/arm/cpu/arm1136/cpu.c

similarity index 100%
rename from cpu/arm1136/mx31/Makefile
rename to arch/arm/cpu/arm1136/mx31/Makefile

similarity index 100%
rename from cpu/arm1136/mx31/devices.c
rename to arch/arm/cpu/arm1136/mx31/devices.c

similarity index 100%
rename from cpu/arm1136/mx31/generic.c
rename to arch/arm/cpu/arm1136/mx31/generic.c

similarity index 100%
rename from cpu/arm1136/mx31/timer.c
rename to arch/arm/cpu/arm1136/mx31/timer.c

similarity index 100%
rename from cpu/arm1136/omap24xx/Makefile
rename to arch/arm/cpu/arm1136/omap24xx/Makefile

similarity index 100%
rename from cpu/arm1136/omap24xx/reset.S
rename to arch/arm/cpu/arm1136/omap24xx/reset.S

similarity index 100%
rename from cpu/arm1136/omap24xx/timer.c
rename to arch/arm/cpu/arm1136/omap24xx/timer.c

similarity index 100%
rename from cpu/arm1136/start.S
rename to arch/arm/cpu/arm1136/start.S

similarity index 97%
rename from cpu/arm1136/u-boot.lds
rename to arch/arm/cpu/arm1136/u-boot.lds
index 7181a56..e7eefc9 100644
@@ -39,7 +39,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text :
 	{
-		cpu/arm1136/start.o	(.text)
+		arch/arm/cpu/arm1136/start.o	(.text)
 		*(.text)
 	}
 

similarity index 100%
rename from cpu/arm1176/Makefile
rename to arch/arm/cpu/arm1176/Makefile

similarity index 100%
rename from cpu/arm1176/config.mk
rename to arch/arm/cpu/arm1176/config.mk

similarity index 100%
rename from cpu/arm1176/cpu.c
rename to arch/arm/cpu/arm1176/cpu.c

similarity index 100%
rename from cpu/arm1176/s3c64xx/Makefile
rename to arch/arm/cpu/arm1176/s3c64xx/Makefile

similarity index 100%
rename from cpu/arm1176/s3c64xx/config.mk
rename to arch/arm/cpu/arm1176/s3c64xx/config.mk

similarity index 100%
rename from cpu/arm1176/s3c64xx/cpu_init.S
rename to arch/arm/cpu/arm1176/s3c64xx/cpu_init.S

similarity index 100%
rename from cpu/arm1176/s3c64xx/reset.S
rename to arch/arm/cpu/arm1176/s3c64xx/reset.S

similarity index 100%
rename from cpu/arm1176/s3c64xx/speed.c
rename to arch/arm/cpu/arm1176/s3c64xx/speed.c

similarity index 100%
rename from cpu/arm1176/s3c64xx/timer.c
rename to arch/arm/cpu/arm1176/s3c64xx/timer.c

similarity index 100%
rename from cpu/arm1176/start.S
rename to arch/arm/cpu/arm1176/start.S

similarity index 97%
rename from cpu/arm1176/u-boot.lds
rename to arch/arm/cpu/arm1176/u-boot.lds
index cc682f5..8969587 100644
@@ -31,7 +31,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text :
 	{
-		cpu/arm1176/start.o	(.text)
+		arch/arm/cpu/arm1176/start.o	(.text)
 		*(.text)
 	}
 

similarity index 100%
rename from cpu/arm720t/Makefile
rename to arch/arm/cpu/arm720t/Makefile

similarity index 100%
rename from cpu/arm720t/config.mk
rename to arch/arm/cpu/arm720t/config.mk

similarity index 100%
rename from cpu/arm720t/cpu.c
rename to arch/arm/cpu/arm720t/cpu.c

similarity index 100%
rename from cpu/arm720t/interrupts.c
rename to arch/arm/cpu/arm720t/interrupts.c

similarity index 100%
rename from cpu/arm720t/lpc2292/Makefile
rename to arch/arm/cpu/arm720t/lpc2292/Makefile

similarity index 100%
rename from cpu/arm720t/lpc2292/flash.c
rename to arch/arm/cpu/arm720t/lpc2292/flash.c

similarity index 100%
rename from cpu/arm720t/lpc2292/iap_entry.S
rename to arch/arm/cpu/arm720t/lpc2292/iap_entry.S

similarity index 100%
rename from cpu/arm720t/lpc2292/mmc.c
rename to arch/arm/cpu/arm720t/lpc2292/mmc.c

similarity index 100%
rename from cpu/arm720t/lpc2292/mmc_hw.c
rename to arch/arm/cpu/arm720t/lpc2292/mmc_hw.c

similarity index 100%
rename from cpu/arm720t/lpc2292/mmc_hw.h
rename to arch/arm/cpu/arm720t/lpc2292/mmc_hw.h

similarity index 100%
rename from cpu/arm720t/lpc2292/spi.c
rename to arch/arm/cpu/arm720t/lpc2292/spi.c

similarity index 100%
rename from cpu/arm720t/s3c4510b/Makefile
rename to arch/arm/cpu/arm720t/s3c4510b/Makefile

similarity index 100%
rename from cpu/arm720t/s3c4510b/cache.c
rename to arch/arm/cpu/arm720t/s3c4510b/cache.c

similarity index 100%
rename from cpu/arm720t/start.S
rename to arch/arm/cpu/arm720t/start.S

similarity index 97%
rename from cpu/arm720t/u-boot.lds
rename to arch/arm/cpu/arm720t/u-boot.lds
index 111c3f5..c975fc3 100644
@@ -31,7 +31,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text :
 	{
-		cpu/arm720t/start.o	(.text)
+		arch/arm/cpu/arm720t/start.o	(.text)
 		*(.text)
 	}
 

similarity index 100%
rename from cpu/arm920t/Makefile
rename to arch/arm/cpu/arm920t/Makefile

similarity index 100%
rename from cpu/arm920t/a320/Makefile
rename to arch/arm/cpu/arm920t/a320/Makefile

similarity index 100%
rename from cpu/arm920t/a320/ftsmc020.c
rename to arch/arm/cpu/arm920t/a320/ftsmc020.c

similarity index 100%
rename from cpu/arm920t/a320/reset.S
rename to arch/arm/cpu/arm920t/a320/reset.S

similarity index 100%
rename from cpu/arm920t/a320/timer.c
rename to arch/arm/cpu/arm920t/a320/timer.c

similarity index 100%
rename from cpu/arm920t/at91/Makefile
rename to arch/arm/cpu/arm920t/at91/Makefile

similarity index 100%
rename from cpu/arm920t/at91/lowlevel_init.S
rename to arch/arm/cpu/arm920t/at91/lowlevel_init.S

similarity index 100%
rename from cpu/arm920t/at91/reset.c
rename to arch/arm/cpu/arm920t/at91/reset.c

similarity index 100%
rename from cpu/arm920t/at91/timer.c
rename to arch/arm/cpu/arm920t/at91/timer.c

similarity index 100%
rename from cpu/arm920t/at91rm9200/Makefile
rename to arch/arm/cpu/arm920t/at91rm9200/Makefile

similarity index 100%
rename from cpu/arm920t/at91rm9200/bcm5221.c
rename to arch/arm/cpu/arm920t/at91rm9200/bcm5221.c

similarity index 100%
rename from cpu/arm920t/at91rm9200/dm9161.c
rename to arch/arm/cpu/arm920t/at91rm9200/dm9161.c

similarity index 100%
rename from cpu/arm920t/at91rm9200/ether.c
rename to arch/arm/cpu/arm920t/at91rm9200/ether.c

similarity index 100%
rename from cpu/arm920t/at91rm9200/i2c.c
rename to arch/arm/cpu/arm920t/at91rm9200/i2c.c

similarity index 100%
rename from cpu/arm920t/at91rm9200/ks8721.c
rename to arch/arm/cpu/arm920t/at91rm9200/ks8721.c

similarity index 100%
rename from cpu/arm920t/at91rm9200/lowlevel_init.S
rename to arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S

similarity index 100%
rename from cpu/arm920t/at91rm9200/lxt972.c
rename to arch/arm/cpu/arm920t/at91rm9200/lxt972.c

similarity index 100%
rename from cpu/arm920t/at91rm9200/reset.c
rename to arch/arm/cpu/arm920t/at91rm9200/reset.c

similarity index 100%
rename from cpu/arm920t/at91rm9200/spi.c
rename to arch/arm/cpu/arm920t/at91rm9200/spi.c

similarity index 100%
rename from cpu/arm920t/at91rm9200/timer.c
rename to arch/arm/cpu/arm920t/at91rm9200/timer.c

similarity index 100%
rename from cpu/arm920t/at91rm9200/usb.c
rename to arch/arm/cpu/arm920t/at91rm9200/usb.c

similarity index 100%
rename from cpu/arm920t/config.mk
rename to arch/arm/cpu/arm920t/config.mk

similarity index 100%
rename from cpu/arm920t/cpu.c
rename to arch/arm/cpu/arm920t/cpu.c

similarity index 100%
rename from cpu/arm920t/ep93xx/Makefile
rename to arch/arm/cpu/arm920t/ep93xx/Makefile

similarity index 100%
rename from cpu/arm920t/ep93xx/cpu.c
rename to arch/arm/cpu/arm920t/ep93xx/cpu.c

similarity index 100%
rename from cpu/arm920t/ep93xx/led.c
rename to arch/arm/cpu/arm920t/ep93xx/led.c

similarity index 100%
rename from cpu/arm920t/ep93xx/lowlevel_init.S
rename to arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S

similarity index 100%
rename from cpu/arm920t/ep93xx/speed.c
rename to arch/arm/cpu/arm920t/ep93xx/speed.c

similarity index 100%
rename from cpu/arm920t/ep93xx/timer.c
rename to arch/arm/cpu/arm920t/ep93xx/timer.c

similarity index 97%
rename from cpu/arm920t/ep93xx/u-boot.lds
rename to arch/arm/cpu/arm920t/ep93xx/u-boot.lds
index 737c9d8..5bfcb02 100644
@@ -31,7 +31,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text      :
 	{
-	  cpu/arm920t/start.o	(.text)
+	  arch/arm/cpu/arm920t/start.o	(.text)
 		/* the EP93xx expects to find the pattern 'CRUS' at 0x1000 */
 	  . = 0x1000;
 	  LONG(0x53555243)

similarity index 100%
rename from cpu/arm920t/imx/Makefile
rename to arch/arm/cpu/arm920t/imx/Makefile

similarity index 100%
rename from cpu/arm920t/imx/generic.c
rename to arch/arm/cpu/arm920t/imx/generic.c

similarity index 100%
rename from cpu/arm920t/imx/speed.c
rename to arch/arm/cpu/arm920t/imx/speed.c

similarity index 100%
rename from cpu/arm920t/imx/timer.c
rename to arch/arm/cpu/arm920t/imx/timer.c

similarity index 100%
rename from cpu/arm920t/interrupts.c
rename to arch/arm/cpu/arm920t/interrupts.c

similarity index 100%
rename from cpu/arm920t/ks8695/Makefile
rename to arch/arm/cpu/arm920t/ks8695/Makefile

similarity index 100%
rename from cpu/arm920t/ks8695/lowlevel_init.S
rename to arch/arm/cpu/arm920t/ks8695/lowlevel_init.S

similarity index 100%
rename from cpu/arm920t/ks8695/timer.c
rename to arch/arm/cpu/arm920t/ks8695/timer.c

similarity index 100%
rename from cpu/arm920t/s3c24x0/Makefile
rename to arch/arm/cpu/arm920t/s3c24x0/Makefile

similarity index 100%
rename from cpu/arm920t/s3c24x0/interrupts.c
rename to arch/arm/cpu/arm920t/s3c24x0/interrupts.c

similarity index 100%
rename from cpu/arm920t/s3c24x0/speed.c
rename to arch/arm/cpu/arm920t/s3c24x0/speed.c

similarity index 100%
rename from cpu/arm920t/s3c24x0/timer.c
rename to arch/arm/cpu/arm920t/s3c24x0/timer.c

similarity index 100%
rename from cpu/arm920t/s3c24x0/usb.c
rename to arch/arm/cpu/arm920t/s3c24x0/usb.c

similarity index 100%
rename from cpu/arm920t/s3c24x0/usb_ohci.c
rename to arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c

similarity index 100%
rename from cpu/arm920t/s3c24x0/usb_ohci.h
rename to arch/arm/cpu/arm920t/s3c24x0/usb_ohci.h

similarity index 100%
rename from cpu/arm920t/start.S
rename to arch/arm/cpu/arm920t/start.S

similarity index 97%
rename from cpu/arm920t/u-boot.lds
rename to arch/arm/cpu/arm920t/u-boot.lds
index d9bfbee..a7decfc 100644
@@ -39,7 +39,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text :
 	{
-		cpu/arm920t/start.o	(.text)
+		arch/arm/cpu/arm920t/start.o	(.text)
 		*(.text)
 	}
 

similarity index 100%
rename from cpu/arm925t/Makefile
rename to arch/arm/cpu/arm925t/Makefile

similarity index 100%
rename from cpu/arm925t/config.mk
rename to arch/arm/cpu/arm925t/config.mk

similarity index 100%
rename from cpu/arm925t/cpu.c
rename to arch/arm/cpu/arm925t/cpu.c

similarity index 100%
rename from cpu/arm925t/omap925.c
rename to arch/arm/cpu/arm925t/omap925.c

similarity index 100%
rename from cpu/arm925t/start.S
rename to arch/arm/cpu/arm925t/start.S

similarity index 100%
rename from cpu/arm925t/timer.c
rename to arch/arm/cpu/arm925t/timer.c

similarity index 97%
rename from cpu/arm925t/u-boot.lds
rename to arch/arm/cpu/arm925t/u-boot.lds
index 694780e..e21d6dc 100644
@@ -34,7 +34,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text :
 	{
-		cpu/arm925t/start.o	(.text)
+		arch/arm/cpu/arm925t/start.o	(.text)
 		*(.text)
 	}
 

similarity index 100%
rename from cpu/arm926ejs/Makefile
rename to arch/arm/cpu/arm926ejs/Makefile

similarity index 100%
rename from cpu/arm926ejs/at91/Makefile
rename to arch/arm/cpu/arm926ejs/at91/Makefile

similarity index 100%
rename from cpu/arm926ejs/at91/at91cap9_devices.c
rename to arch/arm/cpu/arm926ejs/at91/at91cap9_devices.c

similarity index 100%
rename from cpu/arm926ejs/at91/at91sam9260_devices.c
rename to arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c

similarity index 100%
rename from cpu/arm926ejs/at91/at91sam9261_devices.c
rename to arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c

similarity index 100%
rename from cpu/arm926ejs/at91/at91sam9263_devices.c
rename to arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c

similarity index 100%
rename from cpu/arm926ejs/at91/at91sam9m10g45_devices.c
rename to arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c

similarity index 100%
rename from cpu/arm926ejs/at91/at91sam9rl_devices.c
rename to arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c

similarity index 100%
rename from cpu/arm926ejs/at91/clock.c
rename to arch/arm/cpu/arm926ejs/at91/clock.c

similarity index 100%
rename from cpu/arm926ejs/at91/config.mk
rename to arch/arm/cpu/arm926ejs/at91/config.mk

similarity index 100%
rename from cpu/arm926ejs/at91/cpu.c
rename to arch/arm/cpu/arm926ejs/at91/cpu.c

similarity index 100%
rename from cpu/arm926ejs/at91/led.c
rename to arch/arm/cpu/arm926ejs/at91/led.c

similarity index 100%
rename from cpu/arm926ejs/at91/lowlevel_init.S
rename to arch/arm/cpu/arm926ejs/at91/lowlevel_init.S

similarity index 100%
rename from cpu/arm926ejs/at91/reset.c
rename to arch/arm/cpu/arm926ejs/at91/reset.c

similarity index 100%
rename from cpu/arm926ejs/at91/timer.c
rename to arch/arm/cpu/arm926ejs/at91/timer.c

similarity index 100%
rename from cpu/arm926ejs/config.mk
rename to arch/arm/cpu/arm926ejs/config.mk

similarity index 100%
rename from cpu/arm926ejs/cpu.c
rename to arch/arm/cpu/arm926ejs/cpu.c

similarity index 100%
rename from cpu/arm926ejs/davinci/Makefile
rename to arch/arm/cpu/arm926ejs/davinci/Makefile

similarity index 100%
rename from cpu/arm926ejs/davinci/config.mk
rename to arch/arm/cpu/arm926ejs/davinci/config.mk

similarity index 100%
rename from cpu/arm926ejs/davinci/cpu.c
rename to arch/arm/cpu/arm926ejs/davinci/cpu.c

similarity index 100%
rename from cpu/arm926ejs/davinci/dm355.c
rename to arch/arm/cpu/arm926ejs/davinci/dm355.c

similarity index 100%
rename from cpu/arm926ejs/davinci/dm365.c
rename to arch/arm/cpu/arm926ejs/davinci/dm365.c

similarity index 100%
rename from cpu/arm926ejs/davinci/dm644x.c
rename to arch/arm/cpu/arm926ejs/davinci/dm644x.c

similarity index 100%
rename from cpu/arm926ejs/davinci/dm646x.c
rename to arch/arm/cpu/arm926ejs/davinci/dm646x.c

similarity index 100%
rename from cpu/arm926ejs/davinci/dp83848.c
rename to arch/arm/cpu/arm926ejs/davinci/dp83848.c

similarity index 100%
rename from cpu/arm926ejs/davinci/lowlevel_init.S
rename to arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S

similarity index 100%
rename from cpu/arm926ejs/davinci/lxt972.c
rename to arch/arm/cpu/arm926ejs/davinci/lxt972.c

similarity index 100%
rename from cpu/arm926ejs/davinci/psc.c
rename to arch/arm/cpu/arm926ejs/davinci/psc.c

similarity index 100%
rename from cpu/arm926ejs/davinci/reset.S
rename to arch/arm/cpu/arm926ejs/davinci/reset.S

similarity index 100%
rename from cpu/arm926ejs/davinci/timer.c
rename to arch/arm/cpu/arm926ejs/davinci/timer.c

similarity index 100%
rename from cpu/arm926ejs/kirkwood/Makefile
rename to arch/arm/cpu/arm926ejs/kirkwood/Makefile

similarity index 100%
rename from cpu/arm926ejs/kirkwood/cpu.c
rename to arch/arm/cpu/arm926ejs/kirkwood/cpu.c

similarity index 100%
rename from cpu/arm926ejs/kirkwood/dram.c
rename to arch/arm/cpu/arm926ejs/kirkwood/dram.c

similarity index 100%
rename from cpu/arm926ejs/kirkwood/mpp.c
rename to arch/arm/cpu/arm926ejs/kirkwood/mpp.c

similarity index 100%
rename from cpu/arm926ejs/kirkwood/timer.c
rename to arch/arm/cpu/arm926ejs/kirkwood/timer.c

similarity index 94%
rename from cpu/arm926ejs/mx25/Makefile
rename to arch/arm/cpu/arm926ejs/mx25/Makefile
index 55c1e89..76f0179 100644
@@ -28,7 +28,7 @@ COBJS	= generic.o timer.o
 MX27OBJS = reset.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
-SRCS	+= $(addprefix $(SRCTREE)/cpu/arm926ejs/mx27/,$(MX27OBJS:.o=.c))
+SRCS	+= $(addprefix $(SRCTREE)/arch/arm/cpu/arm926ejs/mx27/,$(MX27OBJS:.o=.c))
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS) $(MX27OBJS))
 
 all:	$(obj).depend $(LIB)

similarity index 100%
rename from cpu/arm926ejs/mx25/generic.c
rename to arch/arm/cpu/arm926ejs/mx25/generic.c

similarity index 100%
rename from cpu/arm926ejs/mx25/reset.c
rename to arch/arm/cpu/arm926ejs/mx25/reset.c

similarity index 100%
rename from cpu/arm926ejs/mx25/timer.c
rename to arch/arm/cpu/arm926ejs/mx25/timer.c

similarity index 100%
rename from cpu/arm926ejs/mx27/Makefile
rename to arch/arm/cpu/arm926ejs/mx27/Makefile

similarity index 100%
rename from cpu/arm926ejs/mx27/generic.c
rename to arch/arm/cpu/arm926ejs/mx27/generic.c

similarity index 100%
rename from cpu/arm926ejs/mx27/reset.c
rename to arch/arm/cpu/arm926ejs/mx27/reset.c

similarity index 100%
rename from cpu/arm926ejs/mx27/timer.c
rename to arch/arm/cpu/arm926ejs/mx27/timer.c

similarity index 100%
rename from cpu/arm926ejs/nomadik/Makefile
rename to arch/arm/cpu/arm926ejs/nomadik/Makefile

similarity index 100%
rename from cpu/arm926ejs/nomadik/gpio.c
rename to arch/arm/cpu/arm926ejs/nomadik/gpio.c

similarity index 100%
rename from cpu/arm926ejs/nomadik/reset.S
rename to arch/arm/cpu/arm926ejs/nomadik/reset.S

similarity index 100%
rename from cpu/arm926ejs/nomadik/timer.c
rename to arch/arm/cpu/arm926ejs/nomadik/timer.c

similarity index 100%
rename from cpu/arm926ejs/omap/Makefile
rename to arch/arm/cpu/arm926ejs/omap/Makefile

similarity index 100%
rename from cpu/arm926ejs/omap/cpuinfo.c
rename to arch/arm/cpu/arm926ejs/omap/cpuinfo.c

similarity index 100%
rename from cpu/arm926ejs/omap/reset.S
rename to arch/arm/cpu/arm926ejs/omap/reset.S

similarity index 100%
rename from cpu/arm926ejs/omap/timer.c
rename to arch/arm/cpu/arm926ejs/omap/timer.c

similarity index 100%
rename from cpu/arm926ejs/spear/Makefile
rename to arch/arm/cpu/arm926ejs/spear/Makefile

similarity index 100%
rename from cpu/arm926ejs/spear/reset.c
rename to arch/arm/cpu/arm926ejs/spear/reset.c

similarity index 100%
rename from cpu/arm926ejs/spear/timer.c
rename to arch/arm/cpu/arm926ejs/spear/timer.c

similarity index 100%
rename from cpu/arm926ejs/start.S
rename to arch/arm/cpu/arm926ejs/start.S

similarity index 97%
rename from cpu/arm926ejs/u-boot.lds
rename to arch/arm/cpu/arm926ejs/u-boot.lds
index ee5eeb5..ecbc58c 100644
@@ -31,7 +31,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text :
 	{
-		cpu/arm926ejs/start.o	(.text)
+		arch/arm/cpu/arm926ejs/start.o	(.text)
 		*(.text)
 	}
 

similarity index 100%
rename from cpu/arm926ejs/versatile/Makefile
rename to arch/arm/cpu/arm926ejs/versatile/Makefile

similarity index 100%
rename from cpu/arm926ejs/versatile/reset.S
rename to arch/arm/cpu/arm926ejs/versatile/reset.S

similarity index 100%
rename from cpu/arm926ejs/versatile/timer.c
rename to arch/arm/cpu/arm926ejs/versatile/timer.c

similarity index 100%
rename from cpu/arm946es/Makefile
rename to arch/arm/cpu/arm946es/Makefile

similarity index 100%
rename from cpu/arm946es/config.mk
rename to arch/arm/cpu/arm946es/config.mk

similarity index 100%
rename from cpu/arm946es/cpu.c
rename to arch/arm/cpu/arm946es/cpu.c

similarity index 100%
rename from cpu/arm946es/start.S
rename to arch/arm/cpu/arm946es/start.S

similarity index 97%
rename from cpu/arm_intcm/u-boot.lds
rename to arch/arm/cpu/arm946es/u-boot.lds
index 5eb87fb..fef21c7 100644
@@ -31,7 +31,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text :
 	{
-		cpu/arm_intcm/start.o	(.text)
+		arch/arm/cpu/arm946es/start.o	(.text)
 		*(.text)
 	}
 

similarity index 100%
rename from cpu/arm_cortexa8/Makefile
rename to arch/arm/cpu/arm_cortexa8/Makefile

similarity index 100%
rename from cpu/arm_cortexa8/config.mk
rename to arch/arm/cpu/arm_cortexa8/config.mk

similarity index 100%
rename from cpu/arm_cortexa8/cpu.c
rename to arch/arm/cpu/arm_cortexa8/cpu.c

similarity index 100%
rename from cpu/arm_cortexa8/mx51/Makefile
rename to arch/arm/cpu/arm_cortexa8/mx51/Makefile

similarity index 100%
rename from cpu/arm_cortexa8/mx51/clock.c
rename to arch/arm/cpu/arm_cortexa8/mx51/clock.c

similarity index 100%
rename from cpu/arm_cortexa8/mx51/iomux.c
rename to arch/arm/cpu/arm_cortexa8/mx51/iomux.c

similarity index 100%
rename from cpu/arm_cortexa8/mx51/lowlevel_init.S
rename to arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S

similarity index 100%
rename from cpu/arm_cortexa8/mx51/soc.c
rename to arch/arm/cpu/arm_cortexa8/mx51/soc.c

similarity index 100%
rename from cpu/arm_cortexa8/mx51/speed.c
rename to arch/arm/cpu/arm_cortexa8/mx51/speed.c

similarity index 100%
rename from cpu/arm_cortexa8/mx51/timer.c
rename to arch/arm/cpu/arm_cortexa8/mx51/timer.c

similarity index 97%
rename from cpu/arm_cortexa8/mx51/u-boot.lds
rename to arch/arm/cpu/arm_cortexa8/mx51/u-boot.lds
index 84c173a..2953b93 100644
@@ -36,7 +36,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text	   :
 	{
-	  cpu/arm_cortexa8/start.o
+	  arch/arm/cpu/arm_cortexa8/start.o
 	  *(.text)
 	}
 

similarity index 100%
rename from cpu/arm_cortexa8/omap3/Makefile
rename to arch/arm/cpu/arm_cortexa8/omap3/Makefile

similarity index 100%
rename from cpu/arm_cortexa8/omap3/board.c
rename to arch/arm/cpu/arm_cortexa8/omap3/board.c

similarity index 100%
rename from cpu/arm_cortexa8/omap3/cache.S
rename to arch/arm/cpu/arm_cortexa8/omap3/cache.S

similarity index 100%
rename from cpu/arm_cortexa8/omap3/clock.c
rename to arch/arm/cpu/arm_cortexa8/omap3/clock.c

similarity index 100%
rename from cpu/arm_cortexa8/omap3/gpio.c
rename to arch/arm/cpu/arm_cortexa8/omap3/gpio.c

similarity index 100%
rename from cpu/arm_cortexa8/omap3/lowlevel_init.S
rename to arch/arm/cpu/arm_cortexa8/omap3/lowlevel_init.S

similarity index 100%
rename from cpu/arm_cortexa8/omap3/mem.c
rename to arch/arm/cpu/arm_cortexa8/omap3/mem.c

similarity index 100%
rename from cpu/arm_cortexa8/omap3/reset.S
rename to arch/arm/cpu/arm_cortexa8/omap3/reset.S

similarity index 100%
rename from cpu/arm_cortexa8/omap3/sys_info.c
rename to arch/arm/cpu/arm_cortexa8/omap3/sys_info.c

similarity index 100%
rename from cpu/arm_cortexa8/omap3/syslib.c
rename to arch/arm/cpu/arm_cortexa8/omap3/syslib.c

similarity index 100%
rename from cpu/arm_cortexa8/omap3/timer.c
rename to arch/arm/cpu/arm_cortexa8/omap3/timer.c

similarity index 100%
rename from cpu/arm_cortexa8/s5pc1xx/Makefile
rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile

similarity index 98%
rename from cpu/arm_cortexa8/s5pc1xx/cache.S
rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/cache.S
index 23f527a..906118d 100644
@@ -2,7 +2,7 @@
  * Copyright (C) 2009 Samsung Electronics
  * Minkyu Kang <[email protected]>
  *
- * based on cpu/arm_cortexa8/omap3/cache.S
+ * based on arch/arm/cpu/arm_cortexa8/omap3/cache.S
  *
  * See file CREDITS for list of people who contributed to this
  * project.

similarity index 100%
rename from cpu/arm_cortexa8/s5pc1xx/clock.c
rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/clock.c

similarity index 100%
rename from cpu/arm_cortexa8/s5pc1xx/cpu_info.c
rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/cpu_info.c

similarity index 100%
rename from cpu/arm_cortexa8/s5pc1xx/gpio.c
rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/gpio.c

similarity index 100%
rename from cpu/arm_cortexa8/s5pc1xx/reset.S
rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/reset.S

similarity index 100%
rename from cpu/arm_cortexa8/s5pc1xx/sromc.c
rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/sromc.c

similarity index 100%
rename from cpu/arm_cortexa8/s5pc1xx/timer.c
rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/timer.c

similarity index 100%
rename from cpu/arm_cortexa8/start.S
rename to arch/arm/cpu/arm_cortexa8/start.S

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
@@ -34,7 +34,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text	:
 	{
-		cpu/arm_cortexa8/start.o	(.text)
+		arch/arm/cpu/arm_cortexa8/start.o	(.text)
 		*(.text)
 	}
 

similarity index 100%
rename from cpu/arm_intcm/Makefile
rename to arch/arm/cpu/arm_intcm/Makefile

similarity index 100%
rename from cpu/arm_intcm/config.mk
rename to arch/arm/cpu/arm_intcm/config.mk

similarity index 100%
rename from cpu/arm_intcm/cpu.c
rename to arch/arm/cpu/arm_intcm/cpu.c

similarity index 100%
rename from cpu/arm_intcm/start.S
rename to arch/arm/cpu/arm_intcm/start.S

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

similarity index 100%
rename from cpu/ixp/Makefile
rename to arch/arm/cpu/ixp/Makefile

similarity index 100%
rename from cpu/ixp/config.mk
rename to arch/arm/cpu/ixp/config.mk

similarity index 100%
rename from cpu/ixp/cpu.c
rename to arch/arm/cpu/ixp/cpu.c

similarity index 100%
rename from cpu/ixp/interrupts.c
rename to arch/arm/cpu/ixp/interrupts.c

similarity index 100%
rename from cpu/ixp/npe/IxEthAcc.c
rename to arch/arm/cpu/ixp/npe/IxEthAcc.c

similarity index 100%
rename from cpu/ixp/npe/IxEthAccCommon.c
rename to arch/arm/cpu/ixp/npe/IxEthAccCommon.c

similarity index 100%
rename from cpu/ixp/npe/IxEthAccControlInterface.c
rename to arch/arm/cpu/ixp/npe/IxEthAccControlInterface.c

similarity index 100%
rename from cpu/ixp/npe/IxEthAccDataPlane.c
rename to arch/arm/cpu/ixp/npe/IxEthAccDataPlane.c

similarity index 100%
rename from cpu/ixp/npe/IxEthAccMac.c
rename to arch/arm/cpu/ixp/npe/IxEthAccMac.c

similarity index 100%
rename from cpu/ixp/npe/IxEthAccMii.c
rename to arch/arm/cpu/ixp/npe/IxEthAccMii.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBAPI.c
rename to arch/arm/cpu/ixp/npe/IxEthDBAPI.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBAPISupport.c
rename to arch/arm/cpu/ixp/npe/IxEthDBAPISupport.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBCore.c
rename to arch/arm/cpu/ixp/npe/IxEthDBCore.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBEvents.c
rename to arch/arm/cpu/ixp/npe/IxEthDBEvents.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBFeatures.c
rename to arch/arm/cpu/ixp/npe/IxEthDBFeatures.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBFirewall.c
rename to arch/arm/cpu/ixp/npe/IxEthDBFirewall.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBHashtable.c
rename to arch/arm/cpu/ixp/npe/IxEthDBHashtable.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBLearning.c
rename to arch/arm/cpu/ixp/npe/IxEthDBLearning.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBMem.c
rename to arch/arm/cpu/ixp/npe/IxEthDBMem.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBNPEAdaptor.c
rename to arch/arm/cpu/ixp/npe/IxEthDBNPEAdaptor.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBPortUpdate.c
rename to arch/arm/cpu/ixp/npe/IxEthDBPortUpdate.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBReports.c
rename to arch/arm/cpu/ixp/npe/IxEthDBReports.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBSearch.c
rename to arch/arm/cpu/ixp/npe/IxEthDBSearch.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBSpanningTree.c
rename to arch/arm/cpu/ixp/npe/IxEthDBSpanningTree.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBUtil.c
rename to arch/arm/cpu/ixp/npe/IxEthDBUtil.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBVlan.c
rename to arch/arm/cpu/ixp/npe/IxEthDBVlan.c

similarity index 100%
rename from cpu/ixp/npe/IxEthDBWiFi.c
rename to arch/arm/cpu/ixp/npe/IxEthDBWiFi.c

similarity index 100%
rename from cpu/ixp/npe/IxEthMii.c
rename to arch/arm/cpu/ixp/npe/IxEthMii.c

similarity index 100%
rename from cpu/ixp/npe/IxFeatureCtrl.c
rename to arch/arm/cpu/ixp/npe/IxFeatureCtrl.c

similarity index 100%
rename from cpu/ixp/npe/IxNpeDl.c
rename to arch/arm/cpu/ixp/npe/IxNpeDl.c

similarity index 100%
rename from cpu/ixp/npe/IxNpeDlImageMgr.c
rename to arch/arm/cpu/ixp/npe/IxNpeDlImageMgr.c

similarity index 100%
rename from cpu/ixp/npe/IxNpeDlNpeMgr.c
rename to arch/arm/cpu/ixp/npe/IxNpeDlNpeMgr.c

similarity index 100%
rename from cpu/ixp/npe/IxNpeDlNpeMgrUtils.c
rename to arch/arm/cpu/ixp/npe/IxNpeDlNpeMgrUtils.c

similarity index 100%
rename from cpu/ixp/npe/IxNpeMh.c
rename to arch/arm/cpu/ixp/npe/IxNpeMh.c

similarity index 100%
rename from cpu/ixp/npe/IxNpeMhConfig.c
rename to arch/arm/cpu/ixp/npe/IxNpeMhConfig.c

similarity index 100%
rename from cpu/ixp/npe/IxNpeMhReceive.c
rename to arch/arm/cpu/ixp/npe/IxNpeMhReceive.c

similarity index 100%
rename from cpu/ixp/npe/IxNpeMhSend.c
rename to arch/arm/cpu/ixp/npe/IxNpeMhSend.c

similarity index 100%
rename from cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c
rename to arch/arm/cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c

similarity index 100%
rename from cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c
rename to arch/arm/cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c

similarity index 100%
rename from cpu/ixp/npe/IxOsalBufferMgt.c
rename to arch/arm/cpu/ixp/npe/IxOsalBufferMgt.c

similarity index 100%
rename from cpu/ixp/npe/IxOsalIoMem.c
rename to arch/arm/cpu/ixp/npe/IxOsalIoMem.c

similarity index 100%
rename from cpu/ixp/npe/IxOsalOsCacheMMU.c
rename to arch/arm/cpu/ixp/npe/IxOsalOsCacheMMU.c

similarity index 100%
rename from cpu/ixp/npe/IxOsalOsMsgQ.c
rename to arch/arm/cpu/ixp/npe/IxOsalOsMsgQ.c

similarity index 100%
rename from cpu/ixp/npe/IxOsalOsSemaphore.c
rename to arch/arm/cpu/ixp/npe/IxOsalOsSemaphore.c

similarity index 100%
rename from cpu/ixp/npe/IxOsalOsServices.c
rename to arch/arm/cpu/ixp/npe/IxOsalOsServices.c

similarity index 100%
rename from cpu/ixp/npe/IxOsalOsThread.c
rename to arch/arm/cpu/ixp/npe/IxOsalOsThread.c

similarity index 100%
rename from cpu/ixp/npe/IxQMgrAqmIf.c
rename to arch/arm/cpu/ixp/npe/IxQMgrAqmIf.c

similarity index 100%
rename from cpu/ixp/npe/IxQMgrDispatcher.c
rename to arch/arm/cpu/ixp/npe/IxQMgrDispatcher.c

similarity index 100%
rename from cpu/ixp/npe/IxQMgrInit.c
rename to arch/arm/cpu/ixp/npe/IxQMgrInit.c

similarity index 100%
rename from cpu/ixp/npe/IxQMgrQAccess.c
rename to arch/arm/cpu/ixp/npe/IxQMgrQAccess.c

similarity index 100%
rename from cpu/ixp/npe/IxQMgrQCfg.c
rename to arch/arm/cpu/ixp/npe/IxQMgrQCfg.c

similarity index 95%
rename from cpu/ixp/npe/Makefile
rename to arch/arm/cpu/ixp/npe/Makefile
index 8fefd29..e1f9700 100644
@@ -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)
 

similarity index 100%
rename from cpu/ixp/npe/include/IxAssert.h
rename to arch/arm/cpu/ixp/npe/include/IxAssert.h

similarity index 100%
rename from cpu/ixp/npe/include/IxAtmSch.h
rename to arch/arm/cpu/ixp/npe/include/IxAtmSch.h

similarity index 100%
rename from cpu/ixp/npe/include/IxAtmTypes.h
rename to arch/arm/cpu/ixp/npe/include/IxAtmTypes.h

similarity index 100%
rename from cpu/ixp/npe/include/IxAtmdAcc.h
rename to arch/arm/cpu/ixp/npe/include/IxAtmdAcc.h

similarity index 100%
rename from cpu/ixp/npe/include/IxAtmdAccCtrl.h
rename to arch/arm/cpu/ixp/npe/include/IxAtmdAccCtrl.h

similarity index 100%
rename from cpu/ixp/npe/include/IxAtmm.h
rename to arch/arm/cpu/ixp/npe/include/IxAtmm.h

similarity index 100%
rename from cpu/ixp/npe/include/IxDmaAcc.h
rename to arch/arm/cpu/ixp/npe/include/IxDmaAcc.h

similarity index 100%
rename from cpu/ixp/npe/include/IxEthAcc.h
rename to arch/arm/cpu/ixp/npe/include/IxEthAcc.h

similarity index 100%
rename from cpu/ixp/npe/include/IxEthAccDataPlane_p.h
rename to arch/arm/cpu/ixp/npe/include/IxEthAccDataPlane_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

similarity index 100%
rename from cpu/ixp/npe/include/IxEthAccMii_p.h
rename to arch/arm/cpu/ixp/npe/include/IxEthAccMii_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

similarity index 100%
rename from cpu/ixp/npe/include/IxEthAcc_p.h
rename to arch/arm/cpu/ixp/npe/include/IxEthAcc_p.h

similarity index 100%
rename from cpu/ixp/npe/include/IxEthDB.h
rename to arch/arm/cpu/ixp/npe/include/IxEthDB.h

similarity index 100%
rename from cpu/ixp/npe/include/IxEthDBLocks_p.h
rename to arch/arm/cpu/ixp/npe/include/IxEthDBLocks_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

similarity index 100%
rename from cpu/ixp/npe/include/IxEthDBMessages_p.h
rename to arch/arm/cpu/ixp/npe/include/IxEthDBMessages_p.h

similarity index 100%
rename from cpu/ixp/npe/include/IxEthDBPortDefs.h
rename to arch/arm/cpu/ixp/npe/include/IxEthDBPortDefs.h

similarity index 100%
rename from cpu/ixp/npe/include/IxEthDBQoS.h
rename to arch/arm/cpu/ixp/npe/include/IxEthDBQoS.h

similarity index 100%
rename from cpu/ixp/npe/include/IxEthDB_p.h
rename to arch/arm/cpu/ixp/npe/include/IxEthDB_p.h

similarity index 100%
rename from cpu/ixp/npe/include/IxEthMii.h
rename to arch/arm/cpu/ixp/npe/include/IxEthMii.h

similarity index 100%
rename from cpu/ixp/npe/include/IxEthMii_p.h
rename to arch/arm/cpu/ixp/npe/include/IxEthMii_p.h

similarity index 100%
rename from cpu/ixp/npe/include/IxEthNpe.h
rename to arch/arm/cpu/ixp/npe/include/IxEthNpe.h

similarity index 100%
rename from cpu/ixp/npe/include/IxFeatureCtrl.h
rename to arch/arm/cpu/ixp/npe/include/IxFeatureCtrl.h

similarity index 100%
rename from cpu/ixp/npe/include/IxHssAcc.h
rename to arch/arm/cpu/ixp/npe/include/IxHssAcc.h

similarity index 100%
rename from cpu/ixp/npe/include/IxI2cDrv.h
rename to arch/arm/cpu/ixp/npe/include/IxI2cDrv.h

similarity index 100%
rename from cpu/ixp/npe/include/IxNpeA.h
rename to arch/arm/cpu/ixp/npe/include/IxNpeA.h

similarity index 100%
rename from cpu/ixp/npe/include/IxNpeDl.h
rename to arch/arm/cpu/ixp/npe/include/IxNpeDl.h

similarity index 100%
rename from cpu/ixp/npe/include/IxNpeDlImageMgr_p.h
rename to arch/arm/cpu/ixp/npe/include/IxNpeDlImageMgr_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

similarity index 100%
rename from cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h
rename to arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_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

similarity index 100%
rename from cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h
rename to arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h

similarity index 100%
rename from cpu/ixp/npe/include/IxNpeMh.h
rename to arch/arm/cpu/ixp/npe/include/IxNpeMh.h

similarity index 100%
rename from cpu/ixp/npe/include/IxNpeMhConfig_p.h
rename to arch/arm/cpu/ixp/npe/include/IxNpeMhConfig_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

similarity index 100%
rename from cpu/ixp/npe/include/IxNpeMhReceive_p.h
rename to arch/arm/cpu/ixp/npe/include/IxNpeMhReceive_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

similarity index 100%
rename from cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h
rename to arch/arm/cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_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

similarity index 100%
rename from cpu/ixp/npe/include/IxNpeMicrocode.h
rename to arch/arm/cpu/ixp/npe/include/IxNpeMicrocode.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsBufLib.h
rename to arch/arm/cpu/ixp/npe/include/IxOsBufLib.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsBuffMgt.h
rename to arch/arm/cpu/ixp/npe/include/IxOsBuffMgt.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsBuffPoolMgt.h
rename to arch/arm/cpu/ixp/npe/include/IxOsBuffPoolMgt.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsCacheMMU.h
rename to arch/arm/cpu/ixp/npe/include/IxOsCacheMMU.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsPrintf.h
rename to arch/arm/cpu/ixp/npe/include/IxOsPrintf.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsServices.h
rename to arch/arm/cpu/ixp/npe/include/IxOsServices.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsServicesComponents.h
rename to arch/arm/cpu/ixp/npe/include/IxOsServicesComponents.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsServicesEndianess.h
rename to arch/arm/cpu/ixp/npe/include/IxOsServicesEndianess.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsServicesMemAccess.h
rename to arch/arm/cpu/ixp/npe/include/IxOsServicesMemAccess.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsServicesMemMap.h
rename to arch/arm/cpu/ixp/npe/include/IxOsServicesMemMap.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsal.h
rename to arch/arm/cpu/ixp/npe/include/IxOsal.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalAssert.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalAssert.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalBackward.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalBackward.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalBackwardAssert.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardAssert.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalBackwardMemMap.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardMemMap.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalBackwardOsServices.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardOsServices.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalBackwardOssl.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardOssl.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalBufferMgt.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalBufferMgt.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalBufferMgtDefault.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalBufferMgtDefault.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalConfig.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalConfig.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalEndianess.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalEndianess.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalIoMem.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalIoMem.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalMemAccess.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalMemAccess.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalOem.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalOem.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalOs.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalOs.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalOsAssert.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalOsAssert.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalOsBufferMgt.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalOsBufferMgt.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalOsIxp400.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalOsTypes.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalOsTypes.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalTypes.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalTypes.h

similarity index 100%
rename from cpu/ixp/npe/include/IxOsalUtilitySymbols.h
rename to arch/arm/cpu/ixp/npe/include/IxOsalUtilitySymbols.h

similarity index 100%
rename from cpu/ixp/npe/include/IxParityENAcc.h
rename to arch/arm/cpu/ixp/npe/include/IxParityENAcc.h

similarity index 100%
rename from cpu/ixp/npe/include/IxPerfProfAcc.h
rename to arch/arm/cpu/ixp/npe/include/IxPerfProfAcc.h

similarity index 100%
rename from cpu/ixp/npe/include/IxQMgr.h
rename to arch/arm/cpu/ixp/npe/include/IxQMgr.h

similarity index 100%
rename from cpu/ixp/npe/include/IxQMgrAqmIf_p.h
rename to arch/arm/cpu/ixp/npe/include/IxQMgrAqmIf_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

similarity index 100%
rename from cpu/ixp/npe/include/IxQMgrDispatcher_p.h
rename to arch/arm/cpu/ixp/npe/include/IxQMgrDispatcher_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

similarity index 100%
rename from cpu/ixp/npe/include/IxQMgrQAccess_p.h
rename to arch/arm/cpu/ixp/npe/include/IxQMgrQAccess_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

similarity index 100%
rename from cpu/ixp/npe/include/IxQueueAssignments.h
rename to arch/arm/cpu/ixp/npe/include/IxQueueAssignments.h

similarity index 100%
rename from cpu/ixp/npe/include/IxSspAcc.h
rename to arch/arm/cpu/ixp/npe/include/IxSspAcc.h

similarity index 100%
rename from cpu/ixp/npe/include/IxTimeSyncAcc.h
rename to arch/arm/cpu/ixp/npe/include/IxTimeSyncAcc.h

similarity index 100%
rename from cpu/ixp/npe/include/IxTimerCtrl.h
rename to arch/arm/cpu/ixp/npe/include/IxTimerCtrl.h

similarity index 100%
rename from cpu/ixp/npe/include/IxTypes.h
rename to arch/arm/cpu/ixp/npe/include/IxTypes.h

similarity index 100%
rename from cpu/ixp/npe/include/IxUART.h
rename to arch/arm/cpu/ixp/npe/include/IxUART.h

similarity index 100%
rename from cpu/ixp/npe/include/IxVersionId.h
rename to arch/arm/cpu/ixp/npe/include/IxVersionId.h

similarity index 100%
rename from cpu/ixp/npe/include/ix_error.h
rename to arch/arm/cpu/ixp/npe/include/ix_error.h

similarity index 100%
rename from cpu/ixp/npe/include/ix_macros.h
rename to arch/arm/cpu/ixp/npe/include/ix_macros.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

similarity index 100%
rename from cpu/ixp/npe/include/ix_ossl.h
rename to arch/arm/cpu/ixp/npe/include/ix_ossl.h

similarity index 100%
rename from cpu/ixp/npe/include/ix_symbols.h
rename to arch/arm/cpu/ixp/npe/include/ix_symbols.h

similarity index 100%
rename from cpu/ixp/npe/include/ix_types.h
rename to arch/arm/cpu/ixp/npe/include/ix_types.h

similarity index 100%
rename from cpu/ixp/npe/include/npe.h
rename to arch/arm/cpu/ixp/npe/include/npe.h

similarity index 100%
rename from cpu/ixp/npe/include/os_datatypes.h
rename to arch/arm/cpu/ixp/npe/include/os_datatypes.h

similarity index 100%
rename from cpu/ixp/npe/miiphy.c
rename to arch/arm/cpu/ixp/npe/miiphy.c

similarity index 100%
rename from cpu/ixp/npe/npe.c
rename to arch/arm/cpu/ixp/npe/npe.c

similarity index 100%
rename from cpu/ixp/start.S
rename to arch/arm/cpu/ixp/start.S

similarity index 100%
rename from cpu/ixp/timer.c
rename to arch/arm/cpu/ixp/timer.c

similarity index 97%
rename from cpu/ixp/u-boot.lds
rename to arch/arm/cpu/ixp/u-boot.lds
index 85209ca..b8ff2ee 100644
@@ -31,7 +31,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text :
 	{
-		cpu/ixp/start.o(.text)
+		arch/arm/cpu/ixp/start.o(.text)
 		*(.text)
 	}
 

similarity index 100%
rename from cpu/lh7a40x/Makefile
rename to arch/arm/cpu/lh7a40x/Makefile

similarity index 100%
rename from cpu/lh7a40x/config.mk
rename to arch/arm/cpu/lh7a40x/config.mk

similarity index 100%
rename from cpu/lh7a40x/cpu.c
rename to arch/arm/cpu/lh7a40x/cpu.c

similarity index 100%
rename from cpu/lh7a40x/speed.c
rename to arch/arm/cpu/lh7a40x/speed.c

similarity index 100%
rename from cpu/lh7a40x/start.S
rename to arch/arm/cpu/lh7a40x/start.S

similarity index 100%
rename from cpu/lh7a40x/timer.c
rename to arch/arm/cpu/lh7a40x/timer.c

similarity index 97%
rename from cpu/arm946es/u-boot.lds
rename to arch/arm/cpu/lh7a40x/u-boot.lds
index 5bd4390..5a8ccf5 100644
@@ -31,7 +31,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text :
 	{
-		cpu/arm946es/start.o	(.text)
+		arch/arm/cpu/lh7a40x/start.o	(.text)
 		*(.text)
 	}
 

similarity index 100%
rename from cpu/pxa/Makefile
rename to arch/arm/cpu/pxa/Makefile

similarity index 100%
rename from cpu/pxa/config.mk
rename to arch/arm/cpu/pxa/config.mk

similarity index 100%
rename from cpu/pxa/cpu.c
rename to arch/arm/cpu/pxa/cpu.c

similarity index 100%
rename from cpu/pxa/i2c.c
rename to arch/arm/cpu/pxa/i2c.c

similarity index 100%
rename from cpu/pxa/pxafb.c
rename to arch/arm/cpu/pxa/pxafb.c

similarity index 100%
rename from cpu/pxa/start.S
rename to arch/arm/cpu/pxa/start.S

similarity index 100%
rename from cpu/pxa/timer.c
rename to arch/arm/cpu/pxa/timer.c

similarity index 97%
rename from cpu/pxa/u-boot.lds
rename to arch/arm/cpu/pxa/u-boot.lds
index 77ab3c9..d4e85ef 100644
@@ -31,7 +31,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text :
 	{
-		cpu/pxa/start.o	(.text)
+		arch/arm/cpu/pxa/start.o	(.text)
 		*(.text)
 	}
 

similarity index 100%
rename from cpu/pxa/usb.c
rename to arch/arm/cpu/pxa/usb.c

similarity index 100%
rename from cpu/s3c44b0/Makefile
rename to arch/arm/cpu/s3c44b0/Makefile

similarity index 100%
rename from cpu/s3c44b0/cache.c
rename to arch/arm/cpu/s3c44b0/cache.c

similarity index 100%
rename from cpu/s3c44b0/config.mk
rename to arch/arm/cpu/s3c44b0/config.mk

similarity index 100%
rename from cpu/s3c44b0/cpu.c
rename to arch/arm/cpu/s3c44b0/cpu.c

similarity index 100%
rename from cpu/s3c44b0/start.S
rename to arch/arm/cpu/s3c44b0/start.S

similarity index 100%
rename from cpu/s3c44b0/timer.c
rename to arch/arm/cpu/s3c44b0/timer.c

similarity index 97%
rename from cpu/s3c44b0/u-boot.lds
rename to arch/arm/cpu/s3c44b0/u-boot.lds
index 41ca3b4..267d94c 100644
@@ -31,7 +31,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text :
 	{
-		cpu/s3c44b0/start.o	(.text)
+		arch/arm/cpu/s3c44b0/start.o	(.text)
 		*(.text)
 	}
 

similarity index 100%
rename from cpu/sa1100/Makefile
rename to arch/arm/cpu/sa1100/Makefile

similarity index 100%
rename from cpu/sa1100/config.mk
rename to arch/arm/cpu/sa1100/config.mk

similarity index 100%
rename from cpu/sa1100/cpu.c
rename to arch/arm/cpu/sa1100/cpu.c

similarity index 100%
rename from cpu/sa1100/start.S
rename to arch/arm/cpu/sa1100/start.S

similarity index 100%
rename from cpu/sa1100/timer.c
rename to arch/arm/cpu/sa1100/timer.c

similarity index 97%
rename from cpu/sa1100/u-boot.lds
rename to arch/arm/cpu/sa1100/u-boot.lds
index 0c02e76..f6197ac 100644
@@ -34,7 +34,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text :
 	{
-		cpu/sa1100/start.o	(.text)
+		arch/arm/cpu/sa1100/start.o	(.text)
 		*(.text)
 	}
 

index 3a83fa0..fbba412 100644
@@ -1,5 +1,5 @@
 /*
- * needed for cpu/arm_cortexa8/mx51/lowlevel_init.S
+ * needed for arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S
  *
  * These should be auto-generated
  */

index 119140d..a0dbe0b 100644
@@ -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

index 40b5ef3..5c1ece7 100644
@@ -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)

index 119140d..a0dbe0b 100644
@@ -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

index f9ab281..707c027 100644
@@ -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)

index 119140d..a0dbe0b 100644
@@ -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

index 2fc3796..497ab97 100644
@@ -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)

index 9a634cd..f2b5fc9 100644
@@ -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

index 22d8adc..81b23d0 100644
@@ -2,7 +2,7 @@
  * Copyright (C) 2007 Sergey Kubushyn <[email protected]>
  *
  * Board-specific low level initialization code. Called at the very end
- * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no
+ * 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

index 22d8adc..81b23d0 100644
@@ -2,7 +2,7 @@
  * Copyright (C) 2007 Sergey Kubushyn <[email protected]>
  *
  * Board-specific low level initialization code. Called at the very end
- * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no
+ * 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

index 22d8adc..81b23d0 100644
@@ -2,7 +2,7 @@
  * Copyright (C) 2007 Sergey Kubushyn <[email protected]>
  *
  * Board-specific low level initialization code. Called at the very end
- * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no
+ * 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

index fbb9ea7..3e4c7a2 100644
@@ -2,7 +2,7 @@
  * Copyright (C) 2007 Sergey Kubushyn <[email protected]>
  *
  * Board-specific low level initialization code. Called at the very end
- * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no
+ * 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

index b2fc6fa..b627869 100644
@@ -1,4 +1,4 @@
-LDSCRIPT := $(SRCTREE)/cpu/arm920t/ep93xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/arm/cpu/arm920t/ep93xx/u-boot.lds
 
 ifdef CONFIG_EDB9301
 TEXT_BASE = 0x05700000

index 6f5bda4..2731294 100644
@@ -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)

index 387ed2d..6455d1d 100644
@@ -46,7 +46,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.

index a7e175d..fd5389f 100644
@@ -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

index a074420..29a4f61 100644
@@ -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)
 	}
 

index 8cf17b8..fc91574 100644
@@ -2,7 +2,7 @@
  * (C) Copyright 2006 Embedded Artists AB <www.embeddedartists.com>
  *
  * (C) Copyright 2007 Gary Jennejohn garyj at 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

index ad0c136..6a3a4cd 100644
@@ -2,7 +2,7 @@
  * (C) Copyright 2003
  * Martin Krause, TQ-Systems GmbH, <[email protected]>
  *
- * 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, <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify

index 16d69bb..19e3244 100644
@@ -2,7 +2,7 @@
  * (C) Copyright 2003
  * Martin Krause, TQ-Systems GmbH, <[email protected]>
  *
- * 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, <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify

index 05b929f..cd50e85 100644
@@ -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)

index 4daf341..5a0e934 100644
@@ -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......

index 15f065d..d6bd624 100644
@@ -1,7 +1,7 @@
 [By Steven Scholz <[email protected]>, 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 "$(CPUDIR)/$(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

index f7bb254..2ac3c8f 100644
@@ -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

index 0e13d5d..c1dcf05 100644
@@ -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

index ae71f66..62aa583 100644
@@ -33,7 +33,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/arm926ejs/start.S
+SRCS	+= $(SRCTREE)/arch/arm/cpu/arm926ejs/start.S
 SRCS	+= $(SRCTREE)/board/karo/tx25/lowlevel_init.S
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
 __OBJS	:= $(SOBJS) $(COBJS)

@@ -61,7 +61,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
 
 #########################################################################
 
-$(obj)%.o:	$(SRCTREE)/cpu/arm926ejs/%.S
+$(obj)%.o:	$(SRCTREE)/arch/arm/cpu/arm926ejs/%.S
 	$(CC) $(AFLAGS) -c -o $@ $<
 
 $(obj)%.o:	$(SRCTREE)/board/karo/tx25/%.S

index 0fdda25..9cb4853 100644
@@ -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:

1.6.2.1

---
 {cpu => arch/m68k/cpu}/mcf5227x/Makefile       |    0
 {cpu => arch/m68k/cpu}/mcf5227x/config.mk      |    0
 {cpu => arch/m68k/cpu}/mcf5227x/cpu.c          |    0
 {cpu => arch/m68k/cpu}/mcf5227x/cpu_init.c     |    0
 {cpu => arch/m68k/cpu}/mcf5227x/interrupts.c   |    0
 {cpu => arch/m68k/cpu}/mcf5227x/speed.c        |    0
 {cpu => arch/m68k/cpu}/mcf5227x/start.S        |    0
 {cpu => arch/m68k/cpu}/mcf523x/Makefile        |    0
 {cpu => arch/m68k/cpu}/mcf523x/config.mk       |    0
 {cpu => arch/m68k/cpu}/mcf523x/cpu.c           |    0
 {cpu => arch/m68k/cpu}/mcf523x/cpu_init.c      |    0
 {cpu => arch/m68k/cpu}/mcf523x/interrupts.c    |    0
 {cpu => arch/m68k/cpu}/mcf523x/speed.c         |    0
 {cpu => arch/m68k/cpu}/mcf523x/start.S         |    0
 {cpu => arch/m68k/cpu}/mcf52x2/Makefile        |    0
 {cpu => arch/m68k/cpu}/mcf52x2/config.mk       |    0
 {cpu => arch/m68k/cpu}/mcf52x2/cpu.c           |    0
 {cpu => arch/m68k/cpu}/mcf52x2/cpu.h           |    0
 {cpu => arch/m68k/cpu}/mcf52x2/cpu_init.c      |    0
 {cpu => arch/m68k/cpu}/mcf52x2/interrupts.c    |    0
 {cpu => arch/m68k/cpu}/mcf52x2/speed.c         |    0
 {cpu => arch/m68k/cpu}/mcf52x2/start.S         |    0
 {cpu => arch/m68k/cpu}/mcf532x/Makefile        |    0
 {cpu => arch/m68k/cpu}/mcf532x/config.mk       |    0
 {cpu => arch/m68k/cpu}/mcf532x/cpu.c           |    0
 {cpu => arch/m68k/cpu}/mcf532x/cpu_init.c      |    0
 {cpu => arch/m68k/cpu}/mcf532x/interrupts.c    |    0
 {cpu => arch/m68k/cpu}/mcf532x/speed.c         |    0
 {cpu => arch/m68k/cpu}/mcf532x/start.S         |    0
 {cpu => arch/m68k/cpu}/mcf5445x/Makefile       |    0
 {cpu => arch/m68k/cpu}/mcf5445x/config.mk      |    0
 {cpu => arch/m68k/cpu}/mcf5445x/cpu.c          |    0
 {cpu => arch/m68k/cpu}/mcf5445x/cpu_init.c     |    0
 {cpu => arch/m68k/cpu}/mcf5445x/interrupts.c   |    0
 {cpu => arch/m68k/cpu}/mcf5445x/pci.c          |    0
 {cpu => arch/m68k/cpu}/mcf5445x/speed.c        |    0
 {cpu => arch/m68k/cpu}/mcf5445x/start.S        |    0
 {cpu => arch/m68k/cpu}/mcf547x_8x/Makefile     |    0
 {cpu => arch/m68k/cpu}/mcf547x_8x/config.mk    |    0
 {cpu => arch/m68k/cpu}/mcf547x_8x/cpu.c        |    0
 {cpu => arch/m68k/cpu}/mcf547x_8x/cpu_init.c   |    0
 {cpu => arch/m68k/cpu}/mcf547x_8x/interrupts.c |    0
 {cpu => arch/m68k/cpu}/mcf547x_8x/pci.c        |    0
 {cpu => arch/m68k/cpu}/mcf547x_8x/slicetimer.c |    0
 {cpu => arch/m68k/cpu}/mcf547x_8x/speed.c      |    0
 {cpu => arch/m68k/cpu}/mcf547x_8x/start.S      |    0
 board/BuS/EB+MCF-EV123/u-boot.lds              |    2 +-
 board/astro/mcf5373l/u-boot.lds                |    2 +-
 board/cobra5272/u-boot.lds                     |    6 +++---
 board/esd/tasreg/u-boot.lds                    |    4 ++--
 board/freescale/m5208evbe/u-boot.lds           |    4 ++--
 board/freescale/m52277evb/u-boot.spa           |    4 ++--
 board/freescale/m52277evb/u-boot.stm           |    2 +-
 board/freescale/m5235evb/u-boot.16             |    4 ++--
 board/freescale/m5235evb/u-boot.32             |   10 +++++-----
 board/freescale/m5249evb/u-boot.lds            |    4 ++--
 board/freescale/m5253demo/u-boot.lds           |    4 ++--
 board/freescale/m5253evbe/u-boot.lds           |    4 ++--
 board/freescale/m5271evb/u-boot.lds            |    4 ++--
 board/freescale/m5272c3/u-boot.lds             |    4 ++--
 board/freescale/m5275evb/u-boot.lds            |    2 +-
 board/freescale/m5282evb/u-boot.lds            |    2 +-
 board/freescale/m53017evb/u-boot.lds           |    4 ++--
 board/freescale/m5329evb/u-boot.lds            |    2 +-
 board/freescale/m5373evb/u-boot.lds            |    2 +-
 board/freescale/m54451evb/u-boot.spa           |    4 ++--
 board/freescale/m54451evb/u-boot.stm           |   12 ++++++------
 board/freescale/m54455evb/u-boot.atm           |    2 +-
 board/freescale/m54455evb/u-boot.int           |    2 +-
 board/freescale/m54455evb/u-boot.stm           |    2 +-
 board/freescale/m547xevb/u-boot.lds            |    2 +-
 board/freescale/m548xevb/u-boot.lds            |    2 +-
 board/idmr/u-boot.lds                          |    4 ++--
 doc/README.m52277evb                           |   14 +++++++-------
 doc/README.m53017evb                           |   14 +++++++-------
 doc/README.m5373evb                            |   14 +++++++-------
 doc/README.m54455evb                           |   14 +++++++-------
 doc/README.m5475evb                            |   16 ++++++++--------
 doc/README.m68k                                |    4 ++--
 79 files changed, 88 insertions(+), 88 deletions(-)
 rename {cpu => arch/m68k/cpu}/mcf5227x/Makefile (100%)
 rename {cpu => arch/m68k/cpu}/mcf5227x/config.mk (100%)
 rename {cpu => arch/m68k/cpu}/mcf5227x/cpu.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf5227x/cpu_init.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf5227x/interrupts.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf5227x/speed.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf5227x/start.S (100%)
 rename {cpu => arch/m68k/cpu}/mcf523x/Makefile (100%)
 rename {cpu => arch/m68k/cpu}/mcf523x/config.mk (100%)
 rename {cpu => arch/m68k/cpu}/mcf523x/cpu.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf523x/cpu_init.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf523x/interrupts.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf523x/speed.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf523x/start.S (100%)
 rename {cpu => arch/m68k/cpu}/mcf52x2/Makefile (100%)
 rename {cpu => arch/m68k/cpu}/mcf52x2/config.mk (100%)
 rename {cpu => arch/m68k/cpu}/mcf52x2/cpu.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf52x2/cpu.h (100%)
 rename {cpu => arch/m68k/cpu}/mcf52x2/cpu_init.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf52x2/interrupts.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf52x2/speed.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf52x2/start.S (100%)
 rename {cpu => arch/m68k/cpu}/mcf532x/Makefile (100%)
 rename {cpu => arch/m68k/cpu}/mcf532x/config.mk (100%)
 rename {cpu => arch/m68k/cpu}/mcf532x/cpu.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf532x/cpu_init.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf532x/interrupts.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf532x/speed.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf532x/start.S (100%)
 rename {cpu => arch/m68k/cpu}/mcf5445x/Makefile (100%)
 rename {cpu => arch/m68k/cpu}/mcf5445x/config.mk (100%)
 rename {cpu => arch/m68k/cpu}/mcf5445x/cpu.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf5445x/cpu_init.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf5445x/interrupts.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf5445x/pci.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf5445x/speed.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf5445x/start.S (100%)
 rename {cpu => arch/m68k/cpu}/mcf547x_8x/Makefile (100%)
 rename {cpu => arch/m68k/cpu}/mcf547x_8x/config.mk (100%)
 rename {cpu => arch/m68k/cpu}/mcf547x_8x/cpu.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf547x_8x/cpu_init.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf547x_8x/interrupts.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf547x_8x/pci.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf547x_8x/slicetimer.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf547x_8x/speed.c (100%)
 rename {cpu => arch/m68k/cpu}/mcf547x_8x/start.S (100%)

similarity index 100%
rename from cpu/mcf5227x/Makefile
rename to arch/m68k/cpu/mcf5227x/Makefile

similarity index 100%
rename from cpu/mcf5227x/config.mk
rename to arch/m68k/cpu/mcf5227x/config.mk

similarity index 100%
rename from cpu/mcf5227x/cpu.c
rename to arch/m68k/cpu/mcf5227x/cpu.c

similarity index 100%
rename from cpu/mcf5227x/cpu_init.c
rename to arch/m68k/cpu/mcf5227x/cpu_init.c

similarity index 100%
rename from cpu/mcf5227x/interrupts.c
rename to arch/m68k/cpu/mcf5227x/interrupts.c

similarity index 100%
rename from cpu/mcf5227x/speed.c
rename to arch/m68k/cpu/mcf5227x/speed.c

similarity index 100%
rename from cpu/mcf5227x/start.S
rename to arch/m68k/cpu/mcf5227x/start.S

similarity index 100%
rename from cpu/mcf523x/Makefile
rename to arch/m68k/cpu/mcf523x/Makefile

similarity index 100%
rename from cpu/mcf523x/config.mk
rename to arch/m68k/cpu/mcf523x/config.mk

similarity index 100%
rename from cpu/mcf523x/cpu.c
rename to arch/m68k/cpu/mcf523x/cpu.c

similarity index 100%
rename from cpu/mcf523x/cpu_init.c
rename to arch/m68k/cpu/mcf523x/cpu_init.c

similarity index 100%
rename from cpu/mcf523x/interrupts.c
rename to arch/m68k/cpu/mcf523x/interrupts.c

similarity index 100%
rename from cpu/mcf523x/speed.c
rename to arch/m68k/cpu/mcf523x/speed.c

similarity index 100%
rename from cpu/mcf523x/start.S
rename to arch/m68k/cpu/mcf523x/start.S

similarity index 100%
rename from cpu/mcf52x2/Makefile
rename to arch/m68k/cpu/mcf52x2/Makefile

similarity index 100%
rename from cpu/mcf52x2/config.mk
rename to arch/m68k/cpu/mcf52x2/config.mk

similarity index 100%
rename from cpu/mcf52x2/cpu.c
rename to arch/m68k/cpu/mcf52x2/cpu.c

similarity index 100%
rename from cpu/mcf52x2/cpu.h
rename to arch/m68k/cpu/mcf52x2/cpu.h

similarity index 100%
rename from cpu/mcf52x2/cpu_init.c
rename to arch/m68k/cpu/mcf52x2/cpu_init.c

similarity index 100%
rename from cpu/mcf52x2/interrupts.c
rename to arch/m68k/cpu/mcf52x2/interrupts.c

similarity index 100%
rename from cpu/mcf52x2/speed.c
rename to arch/m68k/cpu/mcf52x2/speed.c

similarity index 100%
rename from cpu/mcf52x2/start.S
rename to arch/m68k/cpu/mcf52x2/start.S

similarity index 100%
rename from cpu/mcf532x/Makefile
rename to arch/m68k/cpu/mcf532x/Makefile

similarity index 100%
rename from cpu/mcf532x/config.mk
rename to arch/m68k/cpu/mcf532x/config.mk

similarity index 100%
rename from cpu/mcf532x/cpu.c
rename to arch/m68k/cpu/mcf532x/cpu.c

similarity index 100%
rename from cpu/mcf532x/cpu_init.c
rename to arch/m68k/cpu/mcf532x/cpu_init.c

similarity index 100%
rename from cpu/mcf532x/interrupts.c
rename to arch/m68k/cpu/mcf532x/interrupts.c

similarity index 100%
rename from cpu/mcf532x/speed.c
rename to arch/m68k/cpu/mcf532x/speed.c

similarity index 100%
rename from cpu/mcf532x/start.S
rename to arch/m68k/cpu/mcf532x/start.S

similarity index 100%
rename from cpu/mcf5445x/Makefile
rename to arch/m68k/cpu/mcf5445x/Makefile

similarity index 100%
rename from cpu/mcf5445x/config.mk
rename to arch/m68k/cpu/mcf5445x/config.mk

similarity index 100%
rename from cpu/mcf5445x/cpu.c
rename to arch/m68k/cpu/mcf5445x/cpu.c

similarity index 100%
rename from cpu/mcf5445x/cpu_init.c
rename to arch/m68k/cpu/mcf5445x/cpu_init.c

similarity index 100%
rename from cpu/mcf5445x/interrupts.c
rename to arch/m68k/cpu/mcf5445x/interrupts.c

similarity index 100%
rename from cpu/mcf5445x/pci.c
rename to arch/m68k/cpu/mcf5445x/pci.c

similarity index 100%
rename from cpu/mcf5445x/speed.c
rename to arch/m68k/cpu/mcf5445x/speed.c

similarity index 100%
rename from cpu/mcf5445x/start.S
rename to arch/m68k/cpu/mcf5445x/start.S

similarity index 100%
rename from cpu/mcf547x_8x/Makefile
rename to arch/m68k/cpu/mcf547x_8x/Makefile

similarity index 100%
rename from cpu/mcf547x_8x/config.mk
rename to arch/m68k/cpu/mcf547x_8x/config.mk

similarity index 100%
rename from cpu/mcf547x_8x/cpu.c
rename to arch/m68k/cpu/mcf547x_8x/cpu.c

similarity index 100%
rename from cpu/mcf547x_8x/cpu_init.c
rename to arch/m68k/cpu/mcf547x_8x/cpu_init.c

similarity index 100%
rename from cpu/mcf547x_8x/interrupts.c
rename to arch/m68k/cpu/mcf547x_8x/interrupts.c

similarity index 100%
rename from cpu/mcf547x_8x/pci.c
rename to arch/m68k/cpu/mcf547x_8x/pci.c

similarity index 100%
rename from cpu/mcf547x_8x/slicetimer.c
rename to arch/m68k/cpu/mcf547x_8x/slicetimer.c

similarity index 100%
rename from cpu/mcf547x_8x/speed.c
rename to arch/m68k/cpu/mcf547x_8x/speed.c

similarity index 100%
rename from cpu/mcf547x_8x/start.S
rename to arch/m68k/cpu/mcf547x_8x/start.S

index b05eacf..0fa633a 100644
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf52x2/start.o	(.text)
+    arch/m68k/cpu/mcf52x2/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/string.o	(.text)
     lib/vsprintf.o	(.text)

index 73e0310..167a0a3 100644
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf532x/start.o		(.text)
+    arch/m68k/cpu/mcf532x/start.o		(.text)
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)

index aacc089..ec0f5e9 100644
@@ -54,10 +54,10 @@ SECTIONS
   {
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
-    cpu/mcf52x2/start.o		(.text)
-    cpu/mcf52x2/cpu_init.o	(.text)
+    arch/m68k/cpu/mcf52x2/start.o		(.text)
+    arch/m68k/cpu/mcf52x2/cpu_init.o	(.text)
     arch/m68k/lib/traps.o		(.text)
-    cpu/mcf52x2/interrupts.o	(.text)
+    arch/m68k/cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
     lib/zlib.o		(.text)
 

index f87d3cb..d4fd705 100644
@@ -55,9 +55,9 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf52x2/start.o		(.text)
+    arch/m68k/cpu/mcf52x2/start.o		(.text)
     arch/m68k/lib/traps.o		(.text)
-    cpu/mcf52x2/interrupts.o	(.text)
+    arch/m68k/cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
     lib/zlib.o		(.text)
 

index 3877527..507e21a 100644
@@ -55,8 +55,8 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf52x2/start.o		(.text)
-    cpu/mcf52x2/libmcf52x2.a	(.text)
+    arch/m68k/cpu/mcf52x2/start.o		(.text)
+    arch/m68k/cpu/mcf52x2/libmcf52x2.a	(.text)
     arch/m68k/lib/libm68k.a		(.text)
     common/dlmalloc.o		(.text)
 

index 6d916d8..4591196 100644
@@ -55,8 +55,8 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf5227x/start.o	(.text)
-    cpu/mcf5227x/libmcf5227x.a	(.text)
+    arch/m68k/cpu/mcf5227x/start.o	(.text)
+    arch/m68k/cpu/mcf5227x/libmcf5227x.a	(.text)
     arch/m68k/lib/libm68k.a		(.text)
     lib/libgeneric.a	(.text)
     common/cmd_mem.o		(.text)

index 03ff532..1ec83e9 100644
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf5227x/start.o		(.text)
+    arch/m68k/cpu/mcf5227x/start.o		(.text)
 
     *(.text)
     *(.fixup)

index 4e70efb..d7bd10f 100644
@@ -55,8 +55,8 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf523x/start.o		(.text)
-    cpu/mcf523x/cpu_init.o	(.text)
+    arch/m68k/cpu/mcf523x/start.o		(.text)
+    arch/m68k/cpu/mcf523x/cpu_init.o	(.text)
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)

index cbf2249..45ff158 100644
@@ -55,11 +55,11 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf523x/start.o		(.text)
-    cpu/mcf523x/cpu.o		(.text)
-    cpu/mcf523x/cpu_init.o	(.text)
-    cpu/mcf523x/interrupts.o	(.text)
-    cpu/mcf523x/speed.o		(.text)
+    arch/m68k/cpu/mcf523x/start.o		(.text)
+    arch/m68k/cpu/mcf523x/cpu.o		(.text)
+    arch/m68k/cpu/mcf523x/cpu_init.o	(.text)
+    arch/m68k/cpu/mcf523x/interrupts.o	(.text)
+    arch/m68k/cpu/mcf523x/speed.o		(.text)
     arch/m68k/lib/libm68k.a		(.text)
     common/dlmalloc.o		(.text)
     common/cmd_bootm.o		(.text)

index f87d3cb..d4fd705 100644
@@ -55,9 +55,9 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf52x2/start.o		(.text)
+    arch/m68k/cpu/mcf52x2/start.o		(.text)
     arch/m68k/lib/traps.o		(.text)
-    cpu/mcf52x2/interrupts.o	(.text)
+    arch/m68k/cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
     lib/zlib.o		(.text)
 

index 455e9b8..4f8bb20 100644
@@ -55,9 +55,9 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf52x2/start.o		(.text)
+    arch/m68k/cpu/mcf52x2/start.o		(.text)
     arch/m68k/lib/traps.o		(.text)
-    cpu/mcf52x2/interrupts.o	(.text)
+    arch/m68k/cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
     lib/zlib.o		(.text)
 

index 99c125c..797c837 100644
@@ -55,9 +55,9 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf52x2/start.o		(.text)
+    arch/m68k/cpu/mcf52x2/start.o		(.text)
     arch/m68k/lib/traps.o		(.text)
-    cpu/mcf52x2/interrupts.o	(.text)
+    arch/m68k/cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
     lib/zlib.o		(.text)
 

index 588a128..ca41232 100644
@@ -56,9 +56,9 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf52x2/start.o		(.text)
+    arch/m68k/cpu/mcf52x2/start.o		(.text)
     arch/m68k/lib/traps.o		(.text)
-    cpu/mcf52x2/interrupts.o	(.text)
+    arch/m68k/cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
     lib/zlib.o		(.text)
 

index aaba5a3..8b011df 100644
@@ -55,9 +55,9 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf52x2/start.o		(.text)
+    arch/m68k/cpu/mcf52x2/start.o		(.text)
     arch/m68k/lib/traps.o		(.text)
-    cpu/mcf52x2/interrupts.o	(.text)
+    arch/m68k/cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
     lib/zlib.o		(.text)
 

index 700b9f5..cd17b0a 100644
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf52x2/start.o		(.text)
+    arch/m68k/cpu/mcf52x2/start.o		(.text)
     common/dlmalloc.o		(.text)
     lib/string.o	(.text)
     lib/zlib.o		(.text)

index e936adf..5ad0fad 100644
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf52x2/start.o	(.text)
+    arch/m68k/cpu/mcf52x2/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/string.o	(.text)
     lib/vsprintf.o	(.text)

index a725da1..6577299 100644
@@ -55,8 +55,8 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf532x/start.o		(.text)
-    cpu/mcf532x/libmcf532x.a	(.text)
+    arch/m68k/cpu/mcf532x/start.o		(.text)
+    arch/m68k/cpu/mcf532x/libmcf532x.a	(.text)
     arch/m68k/lib/libm68k.a		(.text)
     common/dlmalloc.o		(.text)
     lib/zlib.o		(.text)

index bf4f188..ba7ca27 100644
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf532x/start.o		(.text)
+    arch/m68k/cpu/mcf532x/start.o		(.text)
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)

index c129ac2..a2540bb 100644
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf532x/start.o		(.text)
+    arch/m68k/cpu/mcf532x/start.o		(.text)
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)

index e63b1f2..09ac481 100644
@@ -55,8 +55,8 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf5445x/start.o		(.text)
-    cpu/mcf5445x/libmcf5445x.a	(.text)
+    arch/m68k/cpu/mcf5445x/start.o		(.text)
+    arch/m68k/cpu/mcf5445x/libmcf5445x.a	(.text)
     arch/m68k/lib/libm68k.a		(.text)
     common/cmd_flash.o		(.text)
     common/dlmalloc.o		(.text)

index 7c3f068..e64a56c 100644
@@ -55,12 +55,12 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf5445x/start.o		(.text)
-/*    cpu/mcf5445x/cpu_init.o		(.text)
-    cpu/mcf5445x/cpu.o			(.text)
-    cpu/mcf5445x/dspi.o			(.text)
-    cpu/mcf5445x/interrupt.o		(.text)
-    cpu/mcf5445x/speed.o		(.text)
+    arch/m68k/cpu/mcf5445x/start.o		(.text)
+/*    arch/m68k/cpu/mcf5445x/cpu_init.o		(.text)
+    arch/m68k/cpu/mcf5445x/cpu.o			(.text)
+    arch/m68k/cpu/mcf5445x/dspi.o			(.text)
+    arch/m68k/cpu/mcf5445x/interrupt.o		(.text)
+    arch/m68k/cpu/mcf5445x/speed.o		(.text)
     arch/m68k/lib/board.o			(.text)
     common/serial.o			(.text)
     common/console.o			(.text)

index 2dd8a23..ebf801a 100644
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf5445x/start.o		(.text)
+    arch/m68k/cpu/mcf5445x/start.o		(.text)
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)

index 8e54d79..153556f 100644
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf5445x/start.o		(.text)
+    arch/m68k/cpu/mcf5445x/start.o		(.text)
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)

index 3dd9a6b..9cda102 100644
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf5445x/start.o		(.text)
+    arch/m68k/cpu/mcf5445x/start.o		(.text)
 
     *(.text)
     *(.fixup)

index 5f28a10..54bf278 100644
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf547x_8x/start.o		(.text)
+    arch/m68k/cpu/mcf547x_8x/start.o		(.text)
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)

index 5f28a10..54bf278 100644
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf547x_8x/start.o		(.text)
+    arch/m68k/cpu/mcf547x_8x/start.o		(.text)
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)

index 588a128..ca41232 100644
@@ -56,9 +56,9 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mcf52x2/start.o		(.text)
+    arch/m68k/cpu/mcf52x2/start.o		(.text)
     arch/m68k/lib/traps.o		(.text)
-    cpu/mcf52x2/interrupts.o	(.text)
+    arch/m68k/cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
     lib/zlib.o		(.text)
 

index f30b45e..b6e955b 100644
@@ -14,13 +14,13 @@ Changed files:
 - board/freescale/m52277evb/config.mk	config make
 - board/freescale/m52277evb/u-boot.lds	Linker description
 
-- cpu/mcf5227x/cpu.c		cpu specific code
-- cpu/mcf5227x/cpu_init.c	FBCS, Mux pins, icache and RTC extra regs
-- cpu/mcf5227x/interrupts.c	cpu specific interrupt support
-- cpu/mcf5227x/speed.c		system, flexbus, and cpu clock
-- cpu/mcf5227x/Makefile		Makefile
-- cpu/mcf5227x/config.mk	config make
-- cpu/mcf5227x/start.S		start up assembly code
+- arch/m68k/cpu/mcf5227x/cpu.c		cpu specific code
+- arch/m68k/cpu/mcf5227x/cpu_init.c	FBCS, Mux pins, icache and RTC extra regs
+- arch/m68k/cpu/mcf5227x/interrupts.c	cpu specific interrupt support
+- arch/m68k/cpu/mcf5227x/speed.c		system, flexbus, and cpu clock
+- arch/m68k/cpu/mcf5227x/Makefile		Makefile
+- arch/m68k/cpu/mcf5227x/config.mk	config make
+- arch/m68k/cpu/mcf5227x/start.S		start up assembly code
 
 - doc/README.m52277evb		This readme file
 

index 780a803..42798c2 100644
@@ -15,13 +15,13 @@ Changed files:
 - board/freescale/m53017evb/config.mk	config make
 - board/freescale/m53017evb/u-boot.lds	Linker description
 
-- cpu/mcf532x/cpu.c			cpu specific code
-- cpu/mcf532x/cpu_init.c		FBCS, Mux pins, icache and RTC extra regs
-- cpu/mcf532x/interrupts.c		cpu specific interrupt support
-- cpu/mcf532x/speed.c			system, flexbus, and cpu clock
-- cpu/mcf532x/Makefile			Makefile
-- cpu/mcf532x/config.mk			config make
-- cpu/mcf532x/start.S			start up assembly code
+- arch/m68k/cpu/mcf532x/cpu.c			cpu specific code
+- arch/m68k/cpu/mcf532x/cpu_init.c		FBCS, Mux pins, icache and RTC extra regs
+- arch/m68k/cpu/mcf532x/interrupts.c		cpu specific interrupt support
+- arch/m68k/cpu/mcf532x/speed.c			system, flexbus, and cpu clock
+- arch/m68k/cpu/mcf532x/Makefile			Makefile
+- arch/m68k/cpu/mcf532x/config.mk			config make
+- arch/m68k/cpu/mcf532x/start.S			start up assembly code
 
 - doc/README.m53017evb			This readme file
 

index 24a659b..e90a320 100644
@@ -15,13 +15,13 @@ Changed files:
 - board/freescale/m5373evb/config.mk	config make
 - board/freescale/m5373evb/u-boot.lds	Linker description
 
-- cpu/mcf532x/cpu.c		cpu specific code
-- cpu/mcf532x/cpu_init.c	FBCS, Mux pins, icache and RTC extra regs
-- cpu/mcf532x/interrupts.c	cpu specific interrupt support
-- cpu/mcf532x/speed.c		system, pci, flexbus, and cpu clock
-- cpu/mcf532x/Makefile		Makefile
-- cpu/mcf532x/config.mk		config make
-- cpu/mcf532x/start.S		start up assembly code
+- arch/m68k/cpu/mcf532x/cpu.c		cpu specific code
+- arch/m68k/cpu/mcf532x/cpu_init.c	FBCS, Mux pins, icache and RTC extra regs
+- arch/m68k/cpu/mcf532x/interrupts.c	cpu specific interrupt support
+- arch/m68k/cpu/mcf532x/speed.c		system, pci, flexbus, and cpu clock
+- arch/m68k/cpu/mcf532x/Makefile		Makefile
+- arch/m68k/cpu/mcf532x/config.mk		config make
+- arch/m68k/cpu/mcf532x/start.S		start up assembly code
 
 - doc/README.m5373evb		This readme file
 

index 257bcd5..918a746 100644
@@ -18,13 +18,13 @@ Changed files:
 - common/cmd_bdinfo.c		Clock frequencies output
 - common/cmd_mii.c		mii support
 
-- cpu/mcf5445x/cpu.c		cpu specific code
-- cpu/mcf5445x/cpu_init.c	Flexbus ChipSelect, Mux pins setup, icache and RTC extra regs
-- cpu/mcf5445x/interrupts.c	cpu specific interrupt support
-- cpu/mcf5445x/speed.c		system, pci, flexbus, and cpu clock
-- cpu/mcf5445x/Makefile		Makefile
-- cpu/mcf5445x/config.mk	config make
-- cpu/mcf5445x/start.S		start up assembly code
+- arch/m68k/cpu/mcf5445x/cpu.c		cpu specific code
+- arch/m68k/cpu/mcf5445x/cpu_init.c	Flexbus ChipSelect, Mux pins setup, icache and RTC extra regs
+- arch/m68k/cpu/mcf5445x/interrupts.c	cpu specific interrupt support
+- arch/m68k/cpu/mcf5445x/speed.c		system, pci, flexbus, and cpu clock
+- arch/m68k/cpu/mcf5445x/Makefile		Makefile
+- arch/m68k/cpu/mcf5445x/config.mk	config make
+- arch/m68k/cpu/mcf5445x/start.S		start up assembly code
 
 - doc/README.m54455evb	This readme file
 

index b61dfba..f5658ea 100644
@@ -15,14 +15,14 @@ Changed files:
 - board/freescale/m547xevb/config.mk	config make
 - board/freescale/m547xevb/u-boot.lds	Linker description
 
-- cpu/mcf547x_8x/cpu.c			cpu specific code
-- cpu/mcf547x_8x/cpu_init.c		Flexbus ChipSelect, Mux pins setup, icache and RTC extra regs
-- cpu/mcf547x_8x/interrupts.c		cpu specific interrupt support
-- cpu/mcf547x_8x/slicetimer.c		Timer support
-- cpu/mcf547x_8x/speed.c		system, pci, flexbus, and cpu clock
-- cpu/mcf547x_8x/Makefile		Makefile
-- cpu/mcf547x_8x/config.mk		config make
-- cpu/mcf547x_8x/start.S		start up assembly code
+- arch/m68k/cpu/mcf547x_8x/cpu.c			cpu specific code
+- arch/m68k/cpu/mcf547x_8x/cpu_init.c		Flexbus ChipSelect, Mux pins setup, icache and RTC extra regs
+- arch/m68k/cpu/mcf547x_8x/interrupts.c		cpu specific interrupt support
+- arch/m68k/cpu/mcf547x_8x/slicetimer.c		Timer support
+- arch/m68k/cpu/mcf547x_8x/speed.c		system, pci, flexbus, and cpu clock
+- arch/m68k/cpu/mcf547x_8x/Makefile		Makefile
+- arch/m68k/cpu/mcf547x_8x/config.mk		config make
+- arch/m68k/cpu/mcf547x_8x/start.S		start up assembly code
 
 - doc/README.m5475evb			This readme file
 

index e6c33a7..a00ab69 100644
@@ -31,12 +31,12 @@ hopefully added soon!
 
 2.1 Motorola Coldfire MCF5272
 -----------------------------
-CPU specific code is located in: cpu/mcf52x2
+CPU specific code is located in: arch/m68k/cpu/mcf52x2
 
 
 2.1 Motorola Coldfire MCF5282
 -----------------------------
-CPU specific code is located in: cpu/mcf52x2
+CPU specific code is located in: arch/m68k/cpu/mcf52x2
 
 The MCF5282 Port no longer needs a preloader and can place in external or
 internal FLASH.

1.6.2.1

---
 Makefile                                           |    2 +-
 {cpu/blackfin => arch/blackfin/cpu}/.gitignore     |    0
 {cpu/blackfin => arch/blackfin/cpu}/Makefile       |    0
 .../blackfin/cpu}/bootrom-asm-offsets.awk          |    0
 .../blackfin/cpu}/bootrom-asm-offsets.c.in         |    0
 {cpu/blackfin => arch/blackfin/cpu}/cache.S        |    0
 {cpu/blackfin => arch/blackfin/cpu}/cpu.c          |    0
 {cpu/blackfin => arch/blackfin/cpu}/cpu.h          |    0
 {cpu/blackfin => arch/blackfin/cpu}/initcode.c     |    0
 {cpu/blackfin => arch/blackfin/cpu}/interrupt.S    |    0
 {cpu/blackfin => arch/blackfin/cpu}/interrupts.c   |    0
 {cpu/blackfin => arch/blackfin/cpu}/jtag-console.c |    0
 {cpu/blackfin => arch/blackfin/cpu}/os_log.c       |    0
 {cpu/blackfin => arch/blackfin/cpu}/reset.c        |    0
 {cpu/blackfin => arch/blackfin/cpu}/serial.c       |    0
 {cpu/blackfin => arch/blackfin/cpu}/serial.h       |    0
 {cpu/blackfin => arch/blackfin/cpu}/start.S        |    0
 {cpu/blackfin => arch/blackfin/cpu}/traps.c        |    0
 {cpu/blackfin => arch/blackfin/cpu}/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/blackfin => arch/blackfin/cpu}/.gitignore (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/Makefile (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/bootrom-asm-offsets.awk (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/bootrom-asm-offsets.c.in (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/cache.S (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/cpu.c (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/cpu.h (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/initcode.c (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/interrupt.S (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/interrupts.c (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/jtag-console.c (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/os_log.c (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/reset.c (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/serial.c (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/serial.h (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/start.S (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/traps.c (100%)
 rename {cpu/blackfin => arch/blackfin/cpu}/watchdog.c (100%)

index e922ec3..0381c81 100644
@@ -3745,7 +3745,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/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}

similarity index 100%
rename from cpu/blackfin/.gitignore
rename to arch/blackfin/cpu/.gitignore

similarity index 100%
rename from cpu/blackfin/Makefile
rename to arch/blackfin/cpu/Makefile

similarity index 100%
rename from cpu/blackfin/bootrom-asm-offsets.awk
rename to arch/blackfin/cpu/bootrom-asm-offsets.awk

similarity index 100%
rename from cpu/blackfin/bootrom-asm-offsets.c.in
rename to arch/blackfin/cpu/bootrom-asm-offsets.c.in

similarity index 100%
rename from cpu/blackfin/cache.S
rename to arch/blackfin/cpu/cache.S

similarity index 100%
rename from cpu/blackfin/cpu.c
rename to arch/blackfin/cpu/cpu.c

similarity index 100%
rename from cpu/blackfin/cpu.h
rename to arch/blackfin/cpu/cpu.h

similarity index 100%
rename from cpu/blackfin/initcode.c
rename to arch/blackfin/cpu/initcode.c

similarity index 100%
rename from cpu/blackfin/interrupt.S
rename to arch/blackfin/cpu/interrupt.S

similarity index 100%
rename from cpu/blackfin/interrupts.c
rename to arch/blackfin/cpu/interrupts.c

similarity index 100%
rename from cpu/blackfin/jtag-console.c
rename to arch/blackfin/cpu/jtag-console.c

similarity index 100%
rename from cpu/blackfin/os_log.c
rename to arch/blackfin/cpu/os_log.c

similarity index 100%
rename from cpu/blackfin/reset.c
rename to arch/blackfin/cpu/reset.c

similarity index 100%
rename from cpu/blackfin/serial.c
rename to arch/blackfin/cpu/serial.c

similarity index 100%
rename from cpu/blackfin/serial.h
rename to arch/blackfin/cpu/serial.h

similarity index 100%
rename from cpu/blackfin/start.S
rename to arch/blackfin/cpu/start.S

similarity index 100%
rename from cpu/blackfin/traps.c
rename to arch/blackfin/cpu/traps.c

similarity index 100%
rename from cpu/blackfin/watchdog.c
rename to arch/blackfin/cpu/watchdog.c

index 2b23d8b..9163d20 100644
@@ -73,14 +73,14 @@ SECTIONS
 {
 	.text.pre :
 	{
-		cpu/blackfin/start.o (.text .text.*)
+		arch/blackfin/cpu/start.o (.text .text.*)
 
 		LDS_BOARD_TEXT
 	} >ram_code
 
 	.text.init :
 	{
-		cpu/blackfin/initcode.o (.text .text.*)
+		arch/blackfin/cpu/initcode.o (.text .text.*)
 	} >ram_code
 	__initcode_lma = LOADADDR(.text.init);
 	__initcode_len = SIZEOF(.text.init);

index 0b94f55..80c4884 100644
@@ -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/traps.o		(.text .text.*); \
+	arch/blackfin/cpu/interrupt.o	(.text .text.*); \
+	arch/blackfin/cpu/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
 	lib/crc32.o		(.text .text.*); \
 	. = DEFINED(env_offset) ? env_offset : .; \

index 8038c40..cf40d06 100644
@@ -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/traps.o		(.text .text.*); \
+	arch/blackfin/cpu/interrupt.o	(.text .text.*); \
+	arch/blackfin/cpu/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
 	lib/crc32.o		(.text .text.*); \
 	. = DEFINED(env_offset) ? env_offset : .; \

index 0f8679b..92ceb38 100644
@@ -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/traps.o		(.text .text.*); \
+	arch/blackfin/cpu/interrupt.o	(.text .text.*); \
+	arch/blackfin/cpu/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
 	lib/crc32.o		(.text .text.*); \
 	. = DEFINED(env_offset) ? env_offset : .; \

index 696fe29..59e0565 100644
@@ -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/traps.o		(.text .text.*); \
+	arch/blackfin/cpu/interrupt.o	(.text .text.*); \
+	arch/blackfin/cpu/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
 	lib/crc32.o		(.text .text.*); \
 	. = DEFINED(env_offset) ? env_offset : .; \

index fca6e43..1e3fdef 100644
@@ -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/traps.o		(.text .text.*); \
+	arch/blackfin/cpu/interrupt.o	(.text .text.*); \
+	arch/blackfin/cpu/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
 	lib/crc32.o		(.text .text.*); \
 	lib/zlib.o		(.text .text.*); \

index d86409f..8d0bc12 100644
@@ -104,9 +104,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/traps.o		(.text .text.*); \
+	arch/blackfin/cpu/interrupt.o	(.text .text.*); \
+	arch/blackfin/cpu/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
 	lib/crc32.o		(.text .text.*); \
 	. = DEFINED(env_offset) ? env_offset : .; \

index 6be9dba..bbea3ab 100644
@@ -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/traps.o		(.text .text.*); \
+	arch/blackfin/cpu/interrupt.o	(.text .text.*); \
+	arch/blackfin/cpu/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
 	lib/crc32.o		(.text .text.*); \
 	. = DEFINED(env_offset) ? env_offset : .; \

index 6fa8cf7..2eef5ef 100644
@@ -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/traps.o		(.text .text.*); \
+	arch/blackfin/cpu/interrupt.o	(.text .text.*); \
+	arch/blackfin/cpu/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
 	lib/crc32.o		(.text .text.*); \
 	lib/zlib.o		(.text .text.*); \

index e9dfcc9..409a042 100644
@@ -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/traps.o		(.text .text.*); \
+	arch/blackfin/cpu/interrupt.o	(.text .text.*); \
+	arch/blackfin/cpu/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
 	lib/crc32.o		(.text .text.*); \
 	. = DEFINED(env_offset) ? env_offset : .; \

1.6.2.1

---
 {cpu/mips => arch/mips/cpu}/Makefile          |    0
 {cpu/mips => arch/mips/cpu}/asc_serial.c      |    0
 {cpu/mips => arch/mips/cpu}/asc_serial.h      |    0
 {cpu/mips => arch/mips/cpu}/au1x00_eth.c      |    0
 {cpu/mips => arch/mips/cpu}/au1x00_serial.c   |    0
 {cpu/mips => arch/mips/cpu}/au1x00_usb_ohci.c |    0
 {cpu/mips => arch/mips/cpu}/au1x00_usb_ohci.h |    0
 {cpu/mips => arch/mips/cpu}/cache.S           |    0
 {cpu/mips => arch/mips/cpu}/config.mk         |    0
 {cpu/mips => arch/mips/cpu}/cpu.c             |    0
 {cpu/mips => arch/mips/cpu}/incaip_clock.c    |    0
 {cpu/mips => arch/mips/cpu}/incaip_wdt.S      |    0
 {cpu/mips => arch/mips/cpu}/interrupts.c      |    0
 {cpu/mips => arch/mips/cpu}/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/mips => arch/mips/cpu}/Makefile (100%)
 rename {cpu/mips => arch/mips/cpu}/asc_serial.c (100%)
 rename {cpu/mips => arch/mips/cpu}/asc_serial.h (100%)
 rename {cpu/mips => arch/mips/cpu}/au1x00_eth.c (100%)
 rename {cpu/mips => arch/mips/cpu}/au1x00_serial.c (100%)
 rename {cpu/mips => arch/mips/cpu}/au1x00_usb_ohci.c (100%)
 rename {cpu/mips => arch/mips/cpu}/au1x00_usb_ohci.h (100%)
 rename {cpu/mips => arch/mips/cpu}/cache.S (100%)
 rename {cpu/mips => arch/mips/cpu}/config.mk (100%)
 rename {cpu/mips => arch/mips/cpu}/cpu.c (100%)
 rename {cpu/mips => arch/mips/cpu}/incaip_clock.c (100%)
 rename {cpu/mips => arch/mips/cpu}/incaip_wdt.S (100%)
 rename {cpu/mips => arch/mips/cpu}/interrupts.c (100%)
 rename {cpu/mips => arch/mips/cpu}/start.S (100%)

similarity index 100%
rename from cpu/mips/Makefile
rename to arch/mips/cpu/Makefile

similarity index 100%
rename from cpu/mips/asc_serial.c
rename to arch/mips/cpu/asc_serial.c

similarity index 100%
rename from cpu/mips/asc_serial.h
rename to arch/mips/cpu/asc_serial.h

similarity index 100%
rename from cpu/mips/au1x00_eth.c
rename to arch/mips/cpu/au1x00_eth.c

similarity index 100%
rename from cpu/mips/au1x00_serial.c
rename to arch/mips/cpu/au1x00_serial.c

similarity index 100%
rename from cpu/mips/au1x00_usb_ohci.c
rename to arch/mips/cpu/au1x00_usb_ohci.c

similarity index 100%
rename from cpu/mips/au1x00_usb_ohci.h
rename to arch/mips/cpu/au1x00_usb_ohci.h

similarity index 100%
rename from cpu/mips/cache.S
rename to arch/mips/cpu/cache.S

similarity index 100%
rename from cpu/mips/config.mk
rename to arch/mips/cpu/config.mk

similarity index 100%
rename from cpu/mips/cpu.c
rename to arch/mips/cpu/cpu.c

similarity index 100%
rename from cpu/mips/incaip_clock.c
rename to arch/mips/cpu/incaip_clock.c

similarity index 100%
rename from cpu/mips/incaip_wdt.S
rename to arch/mips/cpu/incaip_wdt.S

similarity index 100%
rename from cpu/mips/interrupts.c
rename to arch/mips/cpu/interrupts.c

similarity index 100%
rename from cpu/mips/start.S
rename to arch/mips/cpu/start.S

index 42756f5..b3c6d51 100644
@@ -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/cpu.c */
 void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );
 
 int checkboard (void)

index 59873d5..8c3b55a 100644
@@ -93,7 +93,7 @@ phys_size_t initdram(int board_type)
 	return (SDRAM_SIZE);
 }
 
-/* In cpu/mips/cpu.c */
+/* In arch/mips/cpu/cpu.c */
 void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );
 
 void set_ledcard(u32 value){

index 773e446..2510ddf 100644
@@ -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/cpu.c */
 void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );
 
 int checkboard (void)

index 236ece4..1881e65 100644
@@ -34,9 +34,9 @@ SECTIONS
 	. = ALIGN(4);
 	.text       :
 	{
-	  cpu/mips/start.o		(.text)
+	  arch/mips/cpu/start.o		(.text)
 	  board/purple/lowlevel_init.o	(.text)
-	  cpu/mips/cache.o		(.text)
+	  arch/mips/cpu/cache.o		(.text)
 	  common/main.o			(.text)
 	  common/dlmalloc.o		(.text)
 	  common/cmd_boot.o		(.text)

index 7aff54b..abdcbb4 100644
@@ -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 "u-boot/arch/mips/cpu/au1x00_usb_ohci.c"
  * (original copyright message follows):
  *
  *    URB OHCI HCD (Host Controller Driver) for USB on the AU1x00.

1.6.2.1

---
 {cpu/at32ap => arch/avr32/cpu}/Makefile            |    0
 {cpu/at32ap => arch/avr32/cpu}/at32ap700x/Makefile |    0
 {cpu/at32ap => arch/avr32/cpu}/at32ap700x/clk.c    |    0
 .../at32ap => arch/avr32/cpu}/at32ap700x/portmux.c |    0
 {cpu/at32ap => arch/avr32/cpu}/at32ap700x/sm.h     |    0
 {cpu/at32ap => arch/avr32/cpu}/cache.c             |    0
 {cpu/at32ap => arch/avr32/cpu}/config.mk           |    0
 {cpu/at32ap => arch/avr32/cpu}/cpu.c               |    0
 {cpu/at32ap => arch/avr32/cpu}/exception.c         |    0
 {cpu/at32ap => arch/avr32/cpu}/hsdramc.c           |    0
 {cpu/at32ap => arch/avr32/cpu}/hsdramc1.h          |    0
 {cpu/at32ap => arch/avr32/cpu}/hsmc3.h             |    0
 {cpu/at32ap => arch/avr32/cpu}/interrupts.c        |    0
 {cpu/at32ap => arch/avr32/cpu}/pio2.h              |    0
 {cpu/at32ap => arch/avr32/cpu}/portmux-gpio.c      |    0
 {cpu/at32ap => arch/avr32/cpu}/portmux-pio.c       |    0
 {cpu/at32ap => arch/avr32/cpu}/start.S             |    0
 board/mimc/mimc200/mimc200.c                       |    2 +-
 18 files changed, 1 insertions(+), 1 deletions(-)
 rename {cpu/at32ap => arch/avr32/cpu}/Makefile (100%)
 rename {cpu/at32ap => arch/avr32/cpu}/at32ap700x/Makefile (100%)
 rename {cpu/at32ap => arch/avr32/cpu}/at32ap700x/clk.c (100%)
 rename {cpu/at32ap => arch/avr32/cpu}/at32ap700x/portmux.c (100%)
 rename {cpu/at32ap => arch/avr32/cpu}/at32ap700x/sm.h (100%)
 rename {cpu/at32ap => arch/avr32/cpu}/cache.c (100%)
 rename {cpu/at32ap => arch/avr32/cpu}/config.mk (100%)
 rename {cpu/at32ap => arch/avr32/cpu}/cpu.c (100%)
 rename {cpu/at32ap => arch/avr32/cpu}/exception.c (100%)
 rename {cpu/at32ap => arch/avr32/cpu}/hsdramc.c (100%)
 rename {cpu/at32ap => arch/avr32/cpu}/hsdramc1.h (100%)
 rename {cpu/at32ap => arch/avr32/cpu}/hsmc3.h (100%)
 rename {cpu/at32ap => arch/avr32/cpu}/interrupts.c (100%)
 rename {cpu/at32ap => arch/avr32/cpu}/pio2.h (100%)
 rename {cpu/at32ap => arch/avr32/cpu}/portmux-gpio.c (100%)
 rename {cpu/at32ap => arch/avr32/cpu}/portmux-pio.c (100%)
 rename {cpu/at32ap => arch/avr32/cpu}/start.S (100%)

similarity index 100%
rename from cpu/at32ap/Makefile
rename to arch/avr32/cpu/Makefile

similarity index 100%
rename from cpu/at32ap/at32ap700x/Makefile
rename to arch/avr32/cpu/at32ap700x/Makefile

similarity index 100%
rename from cpu/at32ap/at32ap700x/clk.c
rename to arch/avr32/cpu/at32ap700x/clk.c

similarity index 100%
rename from cpu/at32ap/at32ap700x/portmux.c
rename to arch/avr32/cpu/at32ap700x/portmux.c

similarity index 100%
rename from cpu/at32ap/at32ap700x/sm.h
rename to arch/avr32/cpu/at32ap700x/sm.h

similarity index 100%
rename from cpu/at32ap/cache.c
rename to arch/avr32/cpu/cache.c

similarity index 100%
rename from cpu/at32ap/config.mk
rename to arch/avr32/cpu/config.mk

similarity index 100%
rename from cpu/at32ap/cpu.c
rename to arch/avr32/cpu/cpu.c

similarity index 100%
rename from cpu/at32ap/exception.c
rename to arch/avr32/cpu/exception.c

similarity index 100%
rename from cpu/at32ap/hsdramc.c
rename to arch/avr32/cpu/hsdramc.c

similarity index 100%
rename from cpu/at32ap/hsdramc1.h
rename to arch/avr32/cpu/hsdramc1.h

similarity index 100%
rename from cpu/at32ap/hsmc3.h
rename to arch/avr32/cpu/hsmc3.h

similarity index 100%
rename from cpu/at32ap/interrupts.c
rename to arch/avr32/cpu/interrupts.c

similarity index 100%
rename from cpu/at32ap/pio2.h
rename to arch/avr32/cpu/pio2.h

similarity index 100%
rename from cpu/at32ap/portmux-gpio.c
rename to arch/avr32/cpu/portmux-gpio.c

similarity index 100%
rename from cpu/at32ap/portmux-pio.c
rename to arch/avr32/cpu/portmux-pio.c

similarity index 100%
rename from cpu/at32ap/start.S
rename to arch/avr32/cpu/start.S

index 0dcacb9..cc0f137 100644
@@ -31,7 +31,7 @@
 #include <atmel_lcdc.h>
 #include <lcd.h>
 
-#include "../../../cpu/at32ap/hsmc3.h"
+#include "../../../arch/avr32/cpu/hsmc3.h"
 
 #if defined(CONFIG_LCD)
 /* 480x272x16 @ 72 Hz */

1.6.2.1

---
 {cpu/microblaze => arch/microblaze/cpu}/Makefile   |    0
 {cpu/microblaze => arch/microblaze/cpu}/cache.c    |    0
 {cpu/microblaze => arch/microblaze/cpu}/cpu.c      |    0
 .../microblaze => arch/microblaze/cpu}/exception.c |    0
 .../microblaze/cpu}/interrupts.c                   |    0
 {cpu/microblaze => arch/microblaze/cpu}/irq.S      |    0
 {cpu/microblaze => arch/microblaze/cpu}/start.S    |    0
 {cpu/microblaze => arch/microblaze/cpu}/timer.c    |    0
 board/xilinx/microblaze-generic/u-boot.lds         |    2 +-
 9 files changed, 1 insertions(+), 1 deletions(-)
 rename {cpu/microblaze => arch/microblaze/cpu}/Makefile (100%)
 rename {cpu/microblaze => arch/microblaze/cpu}/cache.c (100%)
 rename {cpu/microblaze => arch/microblaze/cpu}/cpu.c (100%)
 rename {cpu/microblaze => arch/microblaze/cpu}/exception.c (100%)
 rename {cpu/microblaze => arch/microblaze/cpu}/interrupts.c (100%)
 rename {cpu/microblaze => arch/microblaze/cpu}/irq.S (100%)
 rename {cpu/microblaze => arch/microblaze/cpu}/start.S (100%)
 rename {cpu/microblaze => arch/microblaze/cpu}/timer.c (100%)

similarity index 100%
rename from cpu/microblaze/Makefile
rename to arch/microblaze/cpu/Makefile

similarity index 100%
rename from cpu/microblaze/cache.c
rename to arch/microblaze/cpu/cache.c

similarity index 100%
rename from cpu/microblaze/cpu.c
rename to arch/microblaze/cpu/cpu.c

similarity index 100%
rename from cpu/microblaze/exception.c
rename to arch/microblaze/cpu/exception.c

similarity index 100%
rename from cpu/microblaze/interrupts.c
rename to arch/microblaze/cpu/interrupts.c

similarity index 100%
rename from cpu/microblaze/irq.S
rename to arch/microblaze/cpu/irq.S

similarity index 100%
rename from cpu/microblaze/start.S
rename to arch/microblaze/cpu/start.S

similarity index 100%
rename from cpu/microblaze/timer.c
rename to arch/microblaze/cpu/timer.c

index c20c6dd..ee41145 100644
@@ -30,7 +30,7 @@ SECTIONS
 	.text ALIGN(0x4):
 	{
 		__text_start = .;
-		cpu/microblaze/start.o (.text)
+		arch/microblaze/cpu/start.o (.text)
 		*(.text)
 		__text_end = .;
 	}

1.6.2.1

---
 {cpu/i386 => arch/i386/cpu}/Makefile            |    0
 {cpu/i386 => arch/i386/cpu}/config.mk           |    0
 {cpu/i386 => arch/i386/cpu}/cpu.c               |    0
 {cpu/i386 => arch/i386/cpu}/interrupts.c        |    0
 {cpu/i386 => arch/i386/cpu}/resetvec.S          |    0
 {cpu/i386 => arch/i386/cpu}/sc520/Makefile      |    0
 {cpu/i386 => arch/i386/cpu}/sc520/sc520.c       |    0
 {cpu/i386 => arch/i386/cpu}/sc520/sc520_asm.S   |    0
 {cpu/i386 => arch/i386/cpu}/sc520/sc520_pci.c   |    0
 {cpu/i386 => arch/i386/cpu}/sc520/sc520_ssi.c   |    0
 {cpu/i386 => arch/i386/cpu}/sc520/sc520_timer.c |    0
 {cpu/i386 => arch/i386/cpu}/serial.c            |    0
 {cpu/i386 => arch/i386/cpu}/start.S             |    0
 {cpu/i386 => arch/i386/cpu}/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/i386 => arch/i386/cpu}/Makefile (100%)
 rename {cpu/i386 => arch/i386/cpu}/config.mk (100%)
 rename {cpu/i386 => arch/i386/cpu}/cpu.c (100%)
 rename {cpu/i386 => arch/i386/cpu}/interrupts.c (100%)
 rename {cpu/i386 => arch/i386/cpu}/resetvec.S (100%)
 rename {cpu/i386 => arch/i386/cpu}/sc520/Makefile (100%)
 rename {cpu/i386 => arch/i386/cpu}/sc520/sc520.c (100%)
 rename {cpu/i386 => arch/i386/cpu}/sc520/sc520_asm.S (100%)
 rename {cpu/i386 => arch/i386/cpu}/sc520/sc520_pci.c (100%)
 rename {cpu/i386 => arch/i386/cpu}/sc520/sc520_ssi.c (100%)
 rename {cpu/i386 => arch/i386/cpu}/sc520/sc520_timer.c (100%)
 rename {cpu/i386 => arch/i386/cpu}/serial.c (100%)
 rename {cpu/i386 => arch/i386/cpu}/start.S (100%)
 rename {cpu/i386 => arch/i386/cpu}/start16.S (100%)

similarity index 100%
rename from cpu/i386/Makefile
rename to arch/i386/cpu/Makefile

similarity index 100%
rename from cpu/i386/config.mk
rename to arch/i386/cpu/config.mk

similarity index 100%
rename from cpu/i386/cpu.c
rename to arch/i386/cpu/cpu.c

similarity index 100%
rename from cpu/i386/interrupts.c
rename to arch/i386/cpu/interrupts.c

similarity index 100%
rename from cpu/i386/resetvec.S
rename to arch/i386/cpu/resetvec.S

similarity index 100%
rename from cpu/i386/sc520/Makefile
rename to arch/i386/cpu/sc520/Makefile

similarity index 100%
rename from cpu/i386/sc520/sc520.c
rename to arch/i386/cpu/sc520/sc520.c

similarity index 100%
rename from cpu/i386/sc520/sc520_asm.S
rename to arch/i386/cpu/sc520/sc520_asm.S

similarity index 100%
rename from cpu/i386/sc520/sc520_pci.c
rename to arch/i386/cpu/sc520/sc520_pci.c

similarity index 100%
rename from cpu/i386/sc520/sc520_ssi.c
rename to arch/i386/cpu/sc520/sc520_ssi.c

similarity index 100%
rename from cpu/i386/sc520/sc520_timer.c
rename to arch/i386/cpu/sc520/sc520_timer.c

similarity index 100%
rename from cpu/i386/serial.c
rename to arch/i386/cpu/serial.c

similarity index 100%
rename from cpu/i386/start.S
rename to arch/i386/cpu/start.S

similarity index 100%
rename from cpu/i386/start16.S
rename to arch/i386/cpu/start16.S

index 8d324d9..07426fe 100644
@@ -27,7 +27,7 @@
 #ifndef __ASM_INTERRUPT_H_
 #define __ASM_INTERRUPT_H_ 1
 
-/* cpu/i386/interrupts.c */
+/* arch/i386/cpu/interrupts.c */
 void set_vector(u8 intnum, void *routine);
 
 /* arch/i386/lib/interupts.c */

index a08632d..521fd35 100644
@@ -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)/ */
+/* Architecture specific - can be in arch/i386/cpu/, arch/i386/lib/, or $(BOARD)/ */
 int timer_init(void);
 
 /* cpu/.../interrupts.c */

index 2261f4a..9b6c5d4 100644
@@ -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/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
 * speaker beep interface
 
 

1.6.2.1

---
 {cpu => arch/sparc/cpu}/leon2/Makefile     |    0
 {cpu => arch/sparc/cpu}/leon2/config.mk    |    0
 {cpu => arch/sparc/cpu}/leon2/cpu.c        |    0
 {cpu => arch/sparc/cpu}/leon2/cpu_init.c   |    0
 {cpu => arch/sparc/cpu}/leon2/interrupts.c |    0
 {cpu => arch/sparc/cpu}/leon2/prom.c       |    0
 {cpu => arch/sparc/cpu}/leon2/serial.c     |    0
 {cpu => arch/sparc/cpu}/leon2/start.S      |    0
 {cpu => arch/sparc/cpu}/leon3/Makefile     |    0
 {cpu => arch/sparc/cpu}/leon3/ambapp.c     |    0
 {cpu => arch/sparc/cpu}/leon3/config.mk    |    0
 {cpu => arch/sparc/cpu}/leon3/cpu.c        |    0
 {cpu => arch/sparc/cpu}/leon3/cpu_init.c   |    0
 {cpu => arch/sparc/cpu}/leon3/interrupts.c |    0
 {cpu => arch/sparc/cpu}/leon3/prom.c       |    0
 {cpu => arch/sparc/cpu}/leon3/serial.c     |    0
 {cpu => arch/sparc/cpu}/leon3/start.S      |    0
 {cpu => arch/sparc/cpu}/leon3/usb_uhci.c   |    0
 {cpu => arch/sparc/cpu}/leon3/usb_uhci.h   |    0
 board/gaisler/gr_cpci_ax2000/u-boot.lds    |    2 +-
 board/gaisler/gr_ep2s60/u-boot.lds         |    2 +-
 board/gaisler/gr_xc3s_1500/u-boot.lds      |    2 +-
 board/gaisler/grsim/u-boot.lds             |    2 +-
 board/gaisler/grsim_leon2/u-boot.lds       |    2 +-
 24 files changed, 5 insertions(+), 5 deletions(-)
 rename {cpu => arch/sparc/cpu}/leon2/Makefile (100%)
 rename {cpu => arch/sparc/cpu}/leon2/config.mk (100%)
 rename {cpu => arch/sparc/cpu}/leon2/cpu.c (100%)
 rename {cpu => arch/sparc/cpu}/leon2/cpu_init.c (100%)
 rename {cpu => arch/sparc/cpu}/leon2/interrupts.c (100%)
 rename {cpu => arch/sparc/cpu}/leon2/prom.c (100%)
 rename {cpu => arch/sparc/cpu}/leon2/serial.c (100%)
 rename {cpu => arch/sparc/cpu}/leon2/start.S (100%)
 rename {cpu => arch/sparc/cpu}/leon3/Makefile (100%)
 rename {cpu => arch/sparc/cpu}/leon3/ambapp.c (100%)
 rename {cpu => arch/sparc/cpu}/leon3/config.mk (100%)
 rename {cpu => arch/sparc/cpu}/leon3/cpu.c (100%)
 rename {cpu => arch/sparc/cpu}/leon3/cpu_init.c (100%)
 rename {cpu => arch/sparc/cpu}/leon3/interrupts.c (100%)
 rename {cpu => arch/sparc/cpu}/leon3/prom.c (100%)
 rename {cpu => arch/sparc/cpu}/leon3/serial.c (100%)
 rename {cpu => arch/sparc/cpu}/leon3/start.S (100%)
 rename {cpu => arch/sparc/cpu}/leon3/usb_uhci.c (100%)
 rename {cpu => arch/sparc/cpu}/leon3/usb_uhci.h (100%)

similarity index 100%
rename from cpu/leon2/Makefile
rename to arch/sparc/cpu/leon2/Makefile

similarity index 100%
rename from cpu/leon2/config.mk
rename to arch/sparc/cpu/leon2/config.mk

similarity index 100%
rename from cpu/leon2/cpu.c
rename to arch/sparc/cpu/leon2/cpu.c

similarity index 100%
rename from cpu/leon2/cpu_init.c
rename to arch/sparc/cpu/leon2/cpu_init.c

similarity index 100%
rename from cpu/leon2/interrupts.c
rename to arch/sparc/cpu/leon2/interrupts.c

similarity index 100%
rename from cpu/leon2/prom.c
rename to arch/sparc/cpu/leon2/prom.c

similarity index 100%
rename from cpu/leon2/serial.c
rename to arch/sparc/cpu/leon2/serial.c

similarity index 100%
rename from cpu/leon2/start.S
rename to arch/sparc/cpu/leon2/start.S

similarity index 100%
rename from cpu/leon3/Makefile
rename to arch/sparc/cpu/leon3/Makefile

similarity index 100%
rename from cpu/leon3/ambapp.c
rename to arch/sparc/cpu/leon3/ambapp.c

similarity index 100%
rename from cpu/leon3/config.mk
rename to arch/sparc/cpu/leon3/config.mk

similarity index 100%
rename from cpu/leon3/cpu.c
rename to arch/sparc/cpu/leon3/cpu.c

similarity index 100%
rename from cpu/leon3/cpu_init.c
rename to arch/sparc/cpu/leon3/cpu_init.c

similarity index 100%
rename from cpu/leon3/interrupts.c
rename to arch/sparc/cpu/leon3/interrupts.c

similarity index 100%
rename from cpu/leon3/prom.c
rename to arch/sparc/cpu/leon3/prom.c

similarity index 100%
rename from cpu/leon3/serial.c
rename to arch/sparc/cpu/leon3/serial.c

similarity index 100%
rename from cpu/leon3/start.S
rename to arch/sparc/cpu/leon3/start.S

similarity index 100%
rename from cpu/leon3/usb_uhci.c
rename to arch/sparc/cpu/leon3/usb_uhci.c

similarity index 100%
rename from cpu/leon3/usb_uhci.h
rename to arch/sparc/cpu/leon3/usb_uhci.h

index d5d7842..2282682 100644
@@ -60,7 +60,7 @@ SECTIONS
 		_text = .;
 
 		*(.start)
-		cpu/leon3/start.o (.text)
+		arch/sparc/cpu/leon3/start.o (.text)
 /* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */
 		. = ALIGN(8192);
 /* PROM CODE, Will be relocated to the end of memory,

index 99aa0ad..0ca2651 100644
@@ -60,7 +60,7 @@ SECTIONS
 		_text = .;
 
 		*(.start)
-		cpu/leon3/start.o (.text)
+		arch/sparc/cpu/leon3/start.o (.text)
 /* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */
 		. = ALIGN(8192);
 /* PROM CODE, Will be relocated to the end of memory,

index 3b13190..67222ac 100644
@@ -60,7 +60,7 @@ SECTIONS
 		_text = .;
 
 		*(.start)
-		cpu/leon3/start.o (.text)
+		arch/sparc/cpu/leon3/start.o (.text)
 /* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */
 		. = ALIGN(8192);
 /* PROM CODE, Will be relocated to the end of memory,

index 0fa6627..681fd8d 100644
@@ -59,7 +59,7 @@ SECTIONS
 		_text = .;
 
 		*(.start)
-		cpu/leon3/start.o (.text)
+		arch/sparc/cpu/leon3/start.o (.text)
 /* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */
 		. = ALIGN(8192);
 /* PROM CODE, Will be relocated to the end of memory,