aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2010-04-12 22:28:11 -0500
committerWolfgang Denk <wd@denx.de>2010-04-13 09:13:24 +0200
commit84ad688473bec2875e171b71040eb9e033c6c206 (patch)
treecf181129cbdf5d833d55262f759ea2cd9cafaff7
parent8f0fec74ac6d0f3a7134ccebafa1ed9bd8c712ba (diff)
arm: Move cpu/$CPU to arch/arm/cpu/$CPU
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
-rw-r--r--Makefile2
-rw-r--r--arch/arm/cpu/arm1136/Makefile (renamed from cpu/arm1136/Makefile)0
-rw-r--r--arch/arm/cpu/arm1136/config.mk (renamed from cpu/arm1136/config.mk)0
-rw-r--r--arch/arm/cpu/arm1136/cpu.c (renamed from cpu/arm1136/cpu.c)0
-rw-r--r--arch/arm/cpu/arm1136/mx31/Makefile (renamed from cpu/arm1136/mx31/Makefile)0
-rw-r--r--arch/arm/cpu/arm1136/mx31/devices.c (renamed from cpu/arm1136/mx31/devices.c)0
-rw-r--r--arch/arm/cpu/arm1136/mx31/generic.c (renamed from cpu/arm1136/mx31/generic.c)0
-rw-r--r--arch/arm/cpu/arm1136/mx31/timer.c (renamed from cpu/arm1136/mx31/timer.c)0
-rw-r--r--arch/arm/cpu/arm1136/omap24xx/Makefile (renamed from cpu/arm1136/omap24xx/Makefile)0
-rw-r--r--arch/arm/cpu/arm1136/omap24xx/reset.S (renamed from cpu/arm1136/omap24xx/reset.S)0
-rw-r--r--arch/arm/cpu/arm1136/omap24xx/timer.c (renamed from cpu/arm1136/omap24xx/timer.c)0
-rw-r--r--arch/arm/cpu/arm1136/start.S (renamed from cpu/arm1136/start.S)0
-rw-r--r--arch/arm/cpu/arm1136/u-boot.lds (renamed from cpu/arm1136/u-boot.lds)2
-rw-r--r--arch/arm/cpu/arm1176/Makefile (renamed from cpu/arm1176/Makefile)0
-rw-r--r--arch/arm/cpu/arm1176/config.mk (renamed from cpu/arm1176/config.mk)0
-rw-r--r--arch/arm/cpu/arm1176/cpu.c (renamed from cpu/arm1176/cpu.c)0
-rw-r--r--arch/arm/cpu/arm1176/s3c64xx/Makefile (renamed from cpu/arm1176/s3c64xx/Makefile)0
-rw-r--r--arch/arm/cpu/arm1176/s3c64xx/config.mk (renamed from cpu/arm1176/s3c64xx/config.mk)0
-rw-r--r--arch/arm/cpu/arm1176/s3c64xx/cpu_init.S (renamed from cpu/arm1176/s3c64xx/cpu_init.S)0
-rw-r--r--arch/arm/cpu/arm1176/s3c64xx/reset.S (renamed from cpu/arm1176/s3c64xx/reset.S)0
-rw-r--r--arch/arm/cpu/arm1176/s3c64xx/speed.c (renamed from cpu/arm1176/s3c64xx/speed.c)0
-rw-r--r--arch/arm/cpu/arm1176/s3c64xx/timer.c (renamed from cpu/arm1176/s3c64xx/timer.c)0
-rw-r--r--arch/arm/cpu/arm1176/start.S (renamed from cpu/arm1176/start.S)0
-rw-r--r--arch/arm/cpu/arm1176/u-boot.lds (renamed from cpu/arm1176/u-boot.lds)2
-rw-r--r--arch/arm/cpu/arm720t/Makefile (renamed from cpu/arm720t/Makefile)0
-rw-r--r--arch/arm/cpu/arm720t/config.mk (renamed from cpu/arm720t/config.mk)0
-rw-r--r--arch/arm/cpu/arm720t/cpu.c (renamed from cpu/arm720t/cpu.c)0
-rw-r--r--arch/arm/cpu/arm720t/interrupts.c (renamed from cpu/arm720t/interrupts.c)0
-rw-r--r--arch/arm/cpu/arm720t/lpc2292/Makefile (renamed from cpu/arm720t/lpc2292/Makefile)0
-rw-r--r--arch/arm/cpu/arm720t/lpc2292/flash.c (renamed from cpu/arm720t/lpc2292/flash.c)0
-rw-r--r--arch/arm/cpu/arm720t/lpc2292/iap_entry.S (renamed from cpu/arm720t/lpc2292/iap_entry.S)0
-rw-r--r--arch/arm/cpu/arm720t/lpc2292/mmc.c (renamed from cpu/arm720t/lpc2292/mmc.c)0
-rw-r--r--arch/arm/cpu/arm720t/lpc2292/mmc_hw.c (renamed from cpu/arm720t/lpc2292/mmc_hw.c)0
-rw-r--r--arch/arm/cpu/arm720t/lpc2292/mmc_hw.h (renamed from cpu/arm720t/lpc2292/mmc_hw.h)0
-rw-r--r--arch/arm/cpu/arm720t/lpc2292/spi.c (renamed from cpu/arm720t/lpc2292/spi.c)0
-rw-r--r--arch/arm/cpu/arm720t/s3c4510b/Makefile (renamed from cpu/arm720t/s3c4510b/Makefile)0
-rw-r--r--arch/arm/cpu/arm720t/s3c4510b/cache.c (renamed from cpu/arm720t/s3c4510b/cache.c)0
-rw-r--r--arch/arm/cpu/arm720t/start.S (renamed from cpu/arm720t/start.S)0
-rw-r--r--arch/arm/cpu/arm720t/u-boot.lds (renamed from cpu/arm720t/u-boot.lds)2
-rw-r--r--arch/arm/cpu/arm920t/Makefile (renamed from cpu/arm920t/Makefile)0
-rw-r--r--arch/arm/cpu/arm920t/a320/Makefile (renamed from cpu/arm920t/a320/Makefile)0
-rw-r--r--arch/arm/cpu/arm920t/a320/ftsmc020.c (renamed from cpu/arm920t/a320/ftsmc020.c)0
-rw-r--r--arch/arm/cpu/arm920t/a320/reset.S (renamed from cpu/arm920t/a320/reset.S)0
-rw-r--r--arch/arm/cpu/arm920t/a320/timer.c (renamed from cpu/arm920t/a320/timer.c)0
-rw-r--r--arch/arm/cpu/arm920t/at91/Makefile (renamed from cpu/arm920t/at91/Makefile)0
-rw-r--r--arch/arm/cpu/arm920t/at91/lowlevel_init.S (renamed from cpu/arm920t/at91/lowlevel_init.S)0
-rw-r--r--arch/arm/cpu/arm920t/at91/reset.c (renamed from cpu/arm920t/at91/reset.c)0
-rw-r--r--arch/arm/cpu/arm920t/at91/timer.c (renamed from cpu/arm920t/at91/timer.c)0
-rw-r--r--arch/arm/cpu/arm920t/at91rm9200/Makefile (renamed from cpu/arm920t/at91rm9200/Makefile)0
-rw-r--r--arch/arm/cpu/arm920t/at91rm9200/bcm5221.c (renamed from cpu/arm920t/at91rm9200/bcm5221.c)0
-rw-r--r--arch/arm/cpu/arm920t/at91rm9200/dm9161.c (renamed from cpu/arm920t/at91rm9200/dm9161.c)0
-rw-r--r--arch/arm/cpu/arm920t/at91rm9200/ether.c (renamed from cpu/arm920t/at91rm9200/ether.c)0
-rw-r--r--arch/arm/cpu/arm920t/at91rm9200/i2c.c (renamed from cpu/arm920t/at91rm9200/i2c.c)0
-rw-r--r--arch/arm/cpu/arm920t/at91rm9200/ks8721.c (renamed from cpu/arm920t/at91rm9200/ks8721.c)0
-rw-r--r--arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S (renamed from cpu/arm920t/at91rm9200/lowlevel_init.S)0
-rw-r--r--arch/arm/cpu/arm920t/at91rm9200/lxt972.c (renamed from cpu/arm920t/at91rm9200/lxt972.c)0
-rw-r--r--arch/arm/cpu/arm920t/at91rm9200/reset.c (renamed from cpu/arm920t/at91rm9200/reset.c)0
-rw-r--r--arch/arm/cpu/arm920t/at91rm9200/spi.c (renamed from cpu/arm920t/at91rm9200/spi.c)0
-rw-r--r--arch/arm/cpu/arm920t/at91rm9200/timer.c (renamed from cpu/arm920t/at91rm9200/timer.c)0
-rw-r--r--arch/arm/cpu/arm920t/at91rm9200/usb.c (renamed from cpu/arm920t/at91rm9200/usb.c)0
-rw-r--r--arch/arm/cpu/arm920t/config.mk (renamed from cpu/arm920t/config.mk)0
-rw-r--r--arch/arm/cpu/arm920t/cpu.c (renamed from cpu/arm920t/cpu.c)0
-rw-r--r--arch/arm/cpu/arm920t/ep93xx/Makefile (renamed from cpu/arm920t/ep93xx/Makefile)0
-rw-r--r--arch/arm/cpu/arm920t/ep93xx/cpu.c (renamed from cpu/arm920t/ep93xx/cpu.c)0
-rw-r--r--arch/arm/cpu/arm920t/ep93xx/led.c (renamed from cpu/arm920t/ep93xx/led.c)0
-rw-r--r--arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S (renamed from cpu/arm920t/ep93xx/lowlevel_init.S)0
-rw-r--r--arch/arm/cpu/arm920t/ep93xx/speed.c (renamed from cpu/arm920t/ep93xx/speed.c)0
-rw-r--r--arch/arm/cpu/arm920t/ep93xx/timer.c (renamed from cpu/arm920t/ep93xx/timer.c)0
-rw-r--r--arch/arm/cpu/arm920t/ep93xx/u-boot.lds (renamed from cpu/arm920t/ep93xx/u-boot.lds)2
-rw-r--r--arch/arm/cpu/arm920t/imx/Makefile (renamed from cpu/arm920t/imx/Makefile)0
-rw-r--r--arch/arm/cpu/arm920t/imx/generic.c (renamed from cpu/arm920t/imx/generic.c)0
-rw-r--r--arch/arm/cpu/arm920t/imx/speed.c (renamed from cpu/arm920t/imx/speed.c)0
-rw-r--r--arch/arm/cpu/arm920t/imx/timer.c (renamed from cpu/arm920t/imx/timer.c)0
-rw-r--r--arch/arm/cpu/arm920t/interrupts.c (renamed from cpu/arm920t/interrupts.c)0
-rw-r--r--arch/arm/cpu/arm920t/ks8695/Makefile (renamed from cpu/arm920t/ks8695/Makefile)0
-rw-r--r--arch/arm/cpu/arm920t/ks8695/lowlevel_init.S (renamed from cpu/arm920t/ks8695/lowlevel_init.S)0
-rw-r--r--arch/arm/cpu/arm920t/ks8695/timer.c (renamed from cpu/arm920t/ks8695/timer.c)0
-rw-r--r--arch/arm/cpu/arm920t/s3c24x0/Makefile (renamed from cpu/arm920t/s3c24x0/Makefile)0
-rw-r--r--arch/arm/cpu/arm920t/s3c24x0/interrupts.c (renamed from cpu/arm920t/s3c24x0/interrupts.c)0
-rw-r--r--arch/arm/cpu/arm920t/s3c24x0/speed.c (renamed from cpu/arm920t/s3c24x0/speed.c)0
-rw-r--r--arch/arm/cpu/arm920t/s3c24x0/timer.c (renamed from cpu/arm920t/s3c24x0/timer.c)0
-rw-r--r--arch/arm/cpu/arm920t/s3c24x0/usb.c (renamed from cpu/arm920t/s3c24x0/usb.c)0
-rw-r--r--arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c (renamed from cpu/arm920t/s3c24x0/usb_ohci.c)0
-rw-r--r--arch/arm/cpu/arm920t/s3c24x0/usb_ohci.h (renamed from cpu/arm920t/s3c24x0/usb_ohci.h)0
-rw-r--r--arch/arm/cpu/arm920t/start.S (renamed from cpu/arm920t/start.S)0
-rw-r--r--arch/arm/cpu/arm920t/u-boot.lds (renamed from cpu/arm920t/u-boot.lds)2
-rw-r--r--arch/arm/cpu/arm925t/Makefile (renamed from cpu/arm925t/Makefile)0
-rw-r--r--arch/arm/cpu/arm925t/config.mk (renamed from cpu/arm925t/config.mk)0
-rw-r--r--arch/arm/cpu/arm925t/cpu.c (renamed from cpu/arm925t/cpu.c)0
-rw-r--r--arch/arm/cpu/arm925t/omap925.c (renamed from cpu/arm925t/omap925.c)0
-rw-r--r--arch/arm/cpu/arm925t/start.S (renamed from cpu/arm925t/start.S)0
-rw-r--r--arch/arm/cpu/arm925t/timer.c (renamed from cpu/arm925t/timer.c)0
-rw-r--r--arch/arm/cpu/arm925t/u-boot.lds (renamed from cpu/arm925t/u-boot.lds)2
-rw-r--r--arch/arm/cpu/arm926ejs/Makefile (renamed from cpu/arm926ejs/Makefile)0
-rw-r--r--arch/arm/cpu/arm926ejs/at91/Makefile (renamed from cpu/arm926ejs/at91/Makefile)0
-rw-r--r--arch/arm/cpu/arm926ejs/at91/at91cap9_devices.c (renamed from cpu/arm926ejs/at91/at91cap9_devices.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c (renamed from cpu/arm926ejs/at91/at91sam9260_devices.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c (renamed from cpu/arm926ejs/at91/at91sam9261_devices.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c (renamed from cpu/arm926ejs/at91/at91sam9263_devices.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c (renamed from cpu/arm926ejs/at91/at91sam9m10g45_devices.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c (renamed from cpu/arm926ejs/at91/at91sam9rl_devices.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/at91/clock.c (renamed from cpu/arm926ejs/at91/clock.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/at91/config.mk (renamed from cpu/arm926ejs/at91/config.mk)0
-rw-r--r--arch/arm/cpu/arm926ejs/at91/cpu.c (renamed from cpu/arm926ejs/at91/cpu.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/at91/led.c (renamed from cpu/arm926ejs/at91/led.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/at91/lowlevel_init.S (renamed from cpu/arm926ejs/at91/lowlevel_init.S)0
-rw-r--r--arch/arm/cpu/arm926ejs/at91/reset.c (renamed from cpu/arm926ejs/at91/reset.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/at91/timer.c (renamed from cpu/arm926ejs/at91/timer.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/config.mk (renamed from cpu/arm926ejs/config.mk)0
-rw-r--r--arch/arm/cpu/arm926ejs/cpu.c (renamed from cpu/arm926ejs/cpu.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/Makefile (renamed from cpu/arm926ejs/davinci/Makefile)0
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/config.mk (renamed from cpu/arm926ejs/davinci/config.mk)0
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/cpu.c (renamed from cpu/arm926ejs/davinci/cpu.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/dm355.c (renamed from cpu/arm926ejs/davinci/dm355.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/dm365.c (renamed from cpu/arm926ejs/davinci/dm365.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/dm644x.c (renamed from cpu/arm926ejs/davinci/dm644x.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/dm646x.c (renamed from cpu/arm926ejs/davinci/dm646x.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/dp83848.c (renamed from cpu/arm926ejs/davinci/dp83848.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S (renamed from cpu/arm926ejs/davinci/lowlevel_init.S)0
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/lxt972.c (renamed from cpu/arm926ejs/davinci/lxt972.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/psc.c (renamed from cpu/arm926ejs/davinci/psc.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/reset.S (renamed from cpu/arm926ejs/davinci/reset.S)0
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/timer.c (renamed from cpu/arm926ejs/davinci/timer.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/kirkwood/Makefile (renamed from cpu/arm926ejs/kirkwood/Makefile)0
-rw-r--r--arch/arm/cpu/arm926ejs/kirkwood/cpu.c (renamed from cpu/arm926ejs/kirkwood/cpu.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/kirkwood/dram.c (renamed from cpu/arm926ejs/kirkwood/dram.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/kirkwood/mpp.c (renamed from cpu/arm926ejs/kirkwood/mpp.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/kirkwood/timer.c (renamed from cpu/arm926ejs/kirkwood/timer.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/mx25/Makefile (renamed from cpu/arm926ejs/mx25/Makefile)2
-rw-r--r--arch/arm/cpu/arm926ejs/mx25/generic.c (renamed from cpu/arm926ejs/mx25/generic.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/mx25/reset.c (renamed from cpu/arm926ejs/mx25/reset.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/mx25/timer.c (renamed from cpu/arm926ejs/mx25/timer.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/mx27/Makefile (renamed from cpu/arm926ejs/mx27/Makefile)0
-rw-r--r--arch/arm/cpu/arm926ejs/mx27/generic.c (renamed from cpu/arm926ejs/mx27/generic.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/mx27/reset.c (renamed from cpu/arm926ejs/mx27/reset.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/mx27/timer.c (renamed from cpu/arm926ejs/mx27/timer.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/nomadik/Makefile (renamed from cpu/arm926ejs/nomadik/Makefile)0
-rw-r--r--arch/arm/cpu/arm926ejs/nomadik/gpio.c (renamed from cpu/arm926ejs/nomadik/gpio.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/nomadik/reset.S (renamed from cpu/arm926ejs/nomadik/reset.S)0
-rw-r--r--arch/arm/cpu/arm926ejs/nomadik/timer.c (renamed from cpu/arm926ejs/nomadik/timer.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/omap/Makefile (renamed from cpu/arm926ejs/omap/Makefile)0
-rw-r--r--arch/arm/cpu/arm926ejs/omap/cpuinfo.c (renamed from cpu/arm926ejs/omap/cpuinfo.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/omap/reset.S (renamed from cpu/arm926ejs/omap/reset.S)0
-rw-r--r--arch/arm/cpu/arm926ejs/omap/timer.c (renamed from cpu/arm926ejs/omap/timer.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/spear/Makefile (renamed from cpu/arm926ejs/spear/Makefile)0
-rw-r--r--arch/arm/cpu/arm926ejs/spear/reset.c (renamed from cpu/arm926ejs/spear/reset.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/spear/timer.c (renamed from cpu/arm926ejs/spear/timer.c)0
-rw-r--r--arch/arm/cpu/arm926ejs/start.S (renamed from cpu/arm926ejs/start.S)0
-rw-r--r--arch/arm/cpu/arm926ejs/u-boot.lds (renamed from cpu/arm926ejs/u-boot.lds)2
-rw-r--r--arch/arm/cpu/arm926ejs/versatile/Makefile (renamed from cpu/arm926ejs/versatile/Makefile)0
-rw-r--r--arch/arm/cpu/arm926ejs/versatile/reset.S (renamed from cpu/arm926ejs/versatile/reset.S)0
-rw-r--r--arch/arm/cpu/arm926ejs/versatile/timer.c (renamed from cpu/arm926ejs/versatile/timer.c)0
-rw-r--r--arch/arm/cpu/arm946es/Makefile (renamed from cpu/arm946es/Makefile)0
-rw-r--r--arch/arm/cpu/arm946es/config.mk (renamed from cpu/arm946es/config.mk)0
-rw-r--r--arch/arm/cpu/arm946es/cpu.c (renamed from cpu/arm946es/cpu.c)0
-rw-r--r--arch/arm/cpu/arm946es/start.S (renamed from cpu/arm946es/start.S)0
-rw-r--r--arch/arm/cpu/arm946es/u-boot.lds (renamed from cpu/arm_intcm/u-boot.lds)2
-rw-r--r--arch/arm/cpu/arm_cortexa8/Makefile (renamed from cpu/arm_cortexa8/Makefile)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/config.mk (renamed from cpu/arm_cortexa8/config.mk)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/cpu.c (renamed from cpu/arm_cortexa8/cpu.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/mx51/Makefile (renamed from cpu/arm_cortexa8/mx51/Makefile)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/mx51/clock.c (renamed from cpu/arm_cortexa8/mx51/clock.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/mx51/iomux.c (renamed from cpu/arm_cortexa8/mx51/iomux.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S (renamed from cpu/arm_cortexa8/mx51/lowlevel_init.S)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/mx51/soc.c (renamed from cpu/arm_cortexa8/mx51/soc.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/mx51/speed.c (renamed from cpu/arm_cortexa8/mx51/speed.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/mx51/timer.c (renamed from cpu/arm_cortexa8/mx51/timer.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/mx51/u-boot.lds (renamed from cpu/arm_cortexa8/mx51/u-boot.lds)2
-rw-r--r--arch/arm/cpu/arm_cortexa8/omap3/Makefile (renamed from cpu/arm_cortexa8/omap3/Makefile)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/omap3/board.c (renamed from cpu/arm_cortexa8/omap3/board.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/omap3/cache.S (renamed from cpu/arm_cortexa8/omap3/cache.S)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/omap3/clock.c (renamed from cpu/arm_cortexa8/omap3/clock.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/omap3/gpio.c (renamed from cpu/arm_cortexa8/omap3/gpio.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/omap3/lowlevel_init.S (renamed from cpu/arm_cortexa8/omap3/lowlevel_init.S)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/omap3/mem.c (renamed from cpu/arm_cortexa8/omap3/mem.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/omap3/reset.S (renamed from cpu/arm_cortexa8/omap3/reset.S)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/omap3/sys_info.c (renamed from cpu/arm_cortexa8/omap3/sys_info.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/omap3/syslib.c (renamed from cpu/arm_cortexa8/omap3/syslib.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/omap3/timer.c (renamed from cpu/arm_cortexa8/omap3/timer.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile (renamed from cpu/arm_cortexa8/s5pc1xx/Makefile)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/s5pc1xx/cache.S (renamed from cpu/arm_cortexa8/s5pc1xx/cache.S)2
-rw-r--r--arch/arm/cpu/arm_cortexa8/s5pc1xx/clock.c (renamed from cpu/arm_cortexa8/s5pc1xx/clock.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/s5pc1xx/cpu_info.c (renamed from cpu/arm_cortexa8/s5pc1xx/cpu_info.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/s5pc1xx/gpio.c (renamed from cpu/arm_cortexa8/s5pc1xx/gpio.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/s5pc1xx/reset.S (renamed from cpu/arm_cortexa8/s5pc1xx/reset.S)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/s5pc1xx/sromc.c (renamed from cpu/arm_cortexa8/s5pc1xx/sromc.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/s5pc1xx/timer.c (renamed from cpu/arm_cortexa8/s5pc1xx/timer.c)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/start.S (renamed from cpu/arm_cortexa8/start.S)0
-rw-r--r--arch/arm/cpu/arm_cortexa8/u-boot.lds (renamed from cpu/arm_cortexa8/u-boot.lds)2
-rw-r--r--arch/arm/cpu/arm_intcm/Makefile (renamed from cpu/arm_intcm/Makefile)0
-rw-r--r--arch/arm/cpu/arm_intcm/config.mk (renamed from cpu/arm_intcm/config.mk)0
-rw-r--r--arch/arm/cpu/arm_intcm/cpu.c (renamed from cpu/arm_intcm/cpu.c)0
-rw-r--r--arch/arm/cpu/arm_intcm/start.S (renamed from cpu/arm_intcm/start.S)0
-rw-r--r--arch/arm/cpu/arm_intcm/u-boot.lds (renamed from cpu/arm946es/u-boot.lds)2
-rw-r--r--arch/arm/cpu/ixp/Makefile (renamed from cpu/ixp/Makefile)0
-rw-r--r--arch/arm/cpu/ixp/config.mk (renamed from cpu/ixp/config.mk)0
-rw-r--r--arch/arm/cpu/ixp/cpu.c (renamed from cpu/ixp/cpu.c)0
-rw-r--r--arch/arm/cpu/ixp/interrupts.c (renamed from cpu/ixp/interrupts.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthAcc.c (renamed from cpu/ixp/npe/IxEthAcc.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthAccCommon.c (renamed from cpu/ixp/npe/IxEthAccCommon.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthAccControlInterface.c (renamed from cpu/ixp/npe/IxEthAccControlInterface.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthAccDataPlane.c (renamed from cpu/ixp/npe/IxEthAccDataPlane.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthAccMac.c (renamed from cpu/ixp/npe/IxEthAccMac.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthAccMii.c (renamed from cpu/ixp/npe/IxEthAccMii.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBAPI.c (renamed from cpu/ixp/npe/IxEthDBAPI.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBAPISupport.c (renamed from cpu/ixp/npe/IxEthDBAPISupport.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBCore.c (renamed from cpu/ixp/npe/IxEthDBCore.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBEvents.c (renamed from cpu/ixp/npe/IxEthDBEvents.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBFeatures.c (renamed from cpu/ixp/npe/IxEthDBFeatures.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBFirewall.c (renamed from cpu/ixp/npe/IxEthDBFirewall.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBHashtable.c (renamed from cpu/ixp/npe/IxEthDBHashtable.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBLearning.c (renamed from cpu/ixp/npe/IxEthDBLearning.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBMem.c (renamed from cpu/ixp/npe/IxEthDBMem.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBNPEAdaptor.c (renamed from cpu/ixp/npe/IxEthDBNPEAdaptor.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBPortUpdate.c (renamed from cpu/ixp/npe/IxEthDBPortUpdate.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBReports.c (renamed from cpu/ixp/npe/IxEthDBReports.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBSearch.c (renamed from cpu/ixp/npe/IxEthDBSearch.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBSpanningTree.c (renamed from cpu/ixp/npe/IxEthDBSpanningTree.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBUtil.c (renamed from cpu/ixp/npe/IxEthDBUtil.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBVlan.c (renamed from cpu/ixp/npe/IxEthDBVlan.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthDBWiFi.c (renamed from cpu/ixp/npe/IxEthDBWiFi.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxEthMii.c (renamed from cpu/ixp/npe/IxEthMii.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxFeatureCtrl.c (renamed from cpu/ixp/npe/IxFeatureCtrl.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxNpeDl.c (renamed from cpu/ixp/npe/IxNpeDl.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxNpeDlImageMgr.c (renamed from cpu/ixp/npe/IxNpeDlImageMgr.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxNpeDlNpeMgr.c (renamed from cpu/ixp/npe/IxNpeDlNpeMgr.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxNpeDlNpeMgrUtils.c (renamed from cpu/ixp/npe/IxNpeDlNpeMgrUtils.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxNpeMh.c (renamed from cpu/ixp/npe/IxNpeMh.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxNpeMhConfig.c (renamed from cpu/ixp/npe/IxNpeMhConfig.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxNpeMhReceive.c (renamed from cpu/ixp/npe/IxNpeMhReceive.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxNpeMhSend.c (renamed from cpu/ixp/npe/IxNpeMhSend.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c (renamed from cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c (renamed from cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxOsalBufferMgt.c (renamed from cpu/ixp/npe/IxOsalBufferMgt.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxOsalIoMem.c (renamed from cpu/ixp/npe/IxOsalIoMem.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxOsalOsCacheMMU.c (renamed from cpu/ixp/npe/IxOsalOsCacheMMU.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxOsalOsMsgQ.c (renamed from cpu/ixp/npe/IxOsalOsMsgQ.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxOsalOsSemaphore.c (renamed from cpu/ixp/npe/IxOsalOsSemaphore.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxOsalOsServices.c (renamed from cpu/ixp/npe/IxOsalOsServices.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxOsalOsThread.c (renamed from cpu/ixp/npe/IxOsalOsThread.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxQMgrAqmIf.c (renamed from cpu/ixp/npe/IxQMgrAqmIf.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxQMgrDispatcher.c (renamed from cpu/ixp/npe/IxQMgrDispatcher.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxQMgrInit.c (renamed from cpu/ixp/npe/IxQMgrInit.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxQMgrQAccess.c (renamed from cpu/ixp/npe/IxQMgrQAccess.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/IxQMgrQCfg.c (renamed from cpu/ixp/npe/IxQMgrQCfg.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/Makefile (renamed from cpu/ixp/npe/Makefile)2
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxAssert.h (renamed from cpu/ixp/npe/include/IxAssert.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxAtmSch.h (renamed from cpu/ixp/npe/include/IxAtmSch.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxAtmTypes.h (renamed from cpu/ixp/npe/include/IxAtmTypes.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxAtmdAcc.h (renamed from cpu/ixp/npe/include/IxAtmdAcc.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxAtmdAccCtrl.h (renamed from cpu/ixp/npe/include/IxAtmdAccCtrl.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxAtmm.h (renamed from cpu/ixp/npe/include/IxAtmm.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxDmaAcc.h (renamed from cpu/ixp/npe/include/IxDmaAcc.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxEthAcc.h (renamed from cpu/ixp/npe/include/IxEthAcc.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxEthAccDataPlane_p.h (renamed from cpu/ixp/npe/include/IxEthAccDataPlane_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxEthAccMac_p.h (renamed from cpu/ixp/npe/include/IxEthAccMac_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxEthAccMii_p.h (renamed from cpu/ixp/npe/include/IxEthAccMii_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxEthAccQueueAssign_p.h (renamed from cpu/ixp/npe/include/IxEthAccQueueAssign_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxEthAcc_p.h (renamed from cpu/ixp/npe/include/IxEthAcc_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxEthDB.h (renamed from cpu/ixp/npe/include/IxEthDB.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxEthDBLocks_p.h (renamed from cpu/ixp/npe/include/IxEthDBLocks_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxEthDBLog_p.h (renamed from cpu/ixp/npe/include/IxEthDBLog_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxEthDBMessages_p.h (renamed from cpu/ixp/npe/include/IxEthDBMessages_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxEthDBPortDefs.h (renamed from cpu/ixp/npe/include/IxEthDBPortDefs.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxEthDBQoS.h (renamed from cpu/ixp/npe/include/IxEthDBQoS.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxEthDB_p.h (renamed from cpu/ixp/npe/include/IxEthDB_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxEthMii.h (renamed from cpu/ixp/npe/include/IxEthMii.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxEthMii_p.h (renamed from cpu/ixp/npe/include/IxEthMii_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxEthNpe.h (renamed from cpu/ixp/npe/include/IxEthNpe.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxFeatureCtrl.h (renamed from cpu/ixp/npe/include/IxFeatureCtrl.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxHssAcc.h (renamed from cpu/ixp/npe/include/IxHssAcc.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxI2cDrv.h (renamed from cpu/ixp/npe/include/IxI2cDrv.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxNpeA.h (renamed from cpu/ixp/npe/include/IxNpeA.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxNpeDl.h (renamed from cpu/ixp/npe/include/IxNpeDl.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxNpeDlImageMgr_p.h (renamed from cpu/ixp/npe/include/IxNpeDlImageMgr_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxNpeDlMacros_p.h (renamed from cpu/ixp/npe/include/IxNpeDlMacros_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h (renamed from cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h (renamed from cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h (renamed from cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxNpeMh.h (renamed from cpu/ixp/npe/include/IxNpeMh.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxNpeMhConfig_p.h (renamed from cpu/ixp/npe/include/IxNpeMhConfig_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxNpeMhMacros_p.h (renamed from cpu/ixp/npe/include/IxNpeMhMacros_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxNpeMhReceive_p.h (renamed from cpu/ixp/npe/include/IxNpeMhReceive_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxNpeMhSend_p.h (renamed from cpu/ixp/npe/include/IxNpeMhSend_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h (renamed from cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h (renamed from cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxNpeMicrocode.h (renamed from cpu/ixp/npe/include/IxNpeMicrocode.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsBufLib.h (renamed from cpu/ixp/npe/include/IxOsBufLib.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsBuffMgt.h (renamed from cpu/ixp/npe/include/IxOsBuffMgt.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsBuffPoolMgt.h (renamed from cpu/ixp/npe/include/IxOsBuffPoolMgt.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsCacheMMU.h (renamed from cpu/ixp/npe/include/IxOsCacheMMU.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsPrintf.h (renamed from cpu/ixp/npe/include/IxOsPrintf.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsServices.h (renamed from cpu/ixp/npe/include/IxOsServices.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsServicesComponents.h (renamed from cpu/ixp/npe/include/IxOsServicesComponents.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsServicesEndianess.h (renamed from cpu/ixp/npe/include/IxOsServicesEndianess.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsServicesMemAccess.h (renamed from cpu/ixp/npe/include/IxOsServicesMemAccess.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsServicesMemMap.h (renamed from cpu/ixp/npe/include/IxOsServicesMemMap.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsal.h (renamed from cpu/ixp/npe/include/IxOsal.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalAssert.h (renamed from cpu/ixp/npe/include/IxOsalAssert.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalBackward.h (renamed from cpu/ixp/npe/include/IxOsalBackward.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalBackwardAssert.h (renamed from cpu/ixp/npe/include/IxOsalBackwardAssert.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h (renamed from cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h (renamed from cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalBackwardMemMap.h (renamed from cpu/ixp/npe/include/IxOsalBackwardMemMap.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalBackwardOsServices.h (renamed from cpu/ixp/npe/include/IxOsalBackwardOsServices.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalBackwardOssl.h (renamed from cpu/ixp/npe/include/IxOsalBackwardOssl.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalBufferMgt.h (renamed from cpu/ixp/npe/include/IxOsalBufferMgt.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalBufferMgtDefault.h (renamed from cpu/ixp/npe/include/IxOsalBufferMgtDefault.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalConfig.h (renamed from cpu/ixp/npe/include/IxOsalConfig.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalEndianess.h (renamed from cpu/ixp/npe/include/IxOsalEndianess.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalIoMem.h (renamed from cpu/ixp/npe/include/IxOsalIoMem.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalMemAccess.h (renamed from cpu/ixp/npe/include/IxOsalMemAccess.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalOem.h (renamed from cpu/ixp/npe/include/IxOsalOem.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalOs.h (renamed from cpu/ixp/npe/include/IxOsalOs.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalOsAssert.h (renamed from cpu/ixp/npe/include/IxOsalOsAssert.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalOsBufferMgt.h (renamed from cpu/ixp/npe/include/IxOsalOsBufferMgt.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400.h (renamed from cpu/ixp/npe/include/IxOsalOsIxp400.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h (renamed from cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalOsTypes.h (renamed from cpu/ixp/npe/include/IxOsalOsTypes.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h (renamed from cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalTypes.h (renamed from cpu/ixp/npe/include/IxOsalTypes.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxOsalUtilitySymbols.h (renamed from cpu/ixp/npe/include/IxOsalUtilitySymbols.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxParityENAcc.h (renamed from cpu/ixp/npe/include/IxParityENAcc.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxPerfProfAcc.h (renamed from cpu/ixp/npe/include/IxPerfProfAcc.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxQMgr.h (renamed from cpu/ixp/npe/include/IxQMgr.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxQMgrAqmIf_p.h (renamed from cpu/ixp/npe/include/IxQMgrAqmIf_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxQMgrDefines_p.h (renamed from cpu/ixp/npe/include/IxQMgrDefines_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxQMgrDispatcher_p.h (renamed from cpu/ixp/npe/include/IxQMgrDispatcher_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxQMgrLog_p.h (renamed from cpu/ixp/npe/include/IxQMgrLog_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxQMgrQAccess_p.h (renamed from cpu/ixp/npe/include/IxQMgrQAccess_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxQMgrQCfg_p.h (renamed from cpu/ixp/npe/include/IxQMgrQCfg_p.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxQueueAssignments.h (renamed from cpu/ixp/npe/include/IxQueueAssignments.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxSspAcc.h (renamed from cpu/ixp/npe/include/IxSspAcc.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxTimeSyncAcc.h (renamed from cpu/ixp/npe/include/IxTimeSyncAcc.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxTimerCtrl.h (renamed from cpu/ixp/npe/include/IxTimerCtrl.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxTypes.h (renamed from cpu/ixp/npe/include/IxTypes.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxUART.h (renamed from cpu/ixp/npe/include/IxUART.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/IxVersionId.h (renamed from cpu/ixp/npe/include/IxVersionId.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/ix_error.h (renamed from cpu/ixp/npe/include/ix_error.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/ix_macros.h (renamed from cpu/ixp/npe/include/ix_macros.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/ix_os_type.h (renamed from cpu/ixp/npe/include/ix_os_type.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/ix_ossl.h (renamed from cpu/ixp/npe/include/ix_ossl.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/ix_symbols.h (renamed from cpu/ixp/npe/include/ix_symbols.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/ix_types.h (renamed from cpu/ixp/npe/include/ix_types.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/npe.h (renamed from cpu/ixp/npe/include/npe.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/include/os_datatypes.h (renamed from cpu/ixp/npe/include/os_datatypes.h)0
-rw-r--r--arch/arm/cpu/ixp/npe/miiphy.c (renamed from cpu/ixp/npe/miiphy.c)0
-rw-r--r--arch/arm/cpu/ixp/npe/npe.c (renamed from cpu/ixp/npe/npe.c)0
-rw-r--r--arch/arm/cpu/ixp/start.S (renamed from cpu/ixp/start.S)0
-rw-r--r--arch/arm/cpu/ixp/timer.c (renamed from cpu/ixp/timer.c)0
-rw-r--r--arch/arm/cpu/ixp/u-boot.lds (renamed from cpu/ixp/u-boot.lds)2
-rw-r--r--arch/arm/cpu/lh7a40x/Makefile (renamed from cpu/lh7a40x/Makefile)0
-rw-r--r--arch/arm/cpu/lh7a40x/config.mk (renamed from cpu/lh7a40x/config.mk)0
-rw-r--r--arch/arm/cpu/lh7a40x/cpu.c (renamed from cpu/lh7a40x/cpu.c)0
-rw-r--r--arch/arm/cpu/lh7a40x/speed.c (renamed from cpu/lh7a40x/speed.c)0
-rw-r--r--arch/arm/cpu/lh7a40x/start.S (renamed from cpu/lh7a40x/start.S)0
-rw-r--r--arch/arm/cpu/lh7a40x/timer.c (renamed from cpu/lh7a40x/timer.c)0
-rw-r--r--arch/arm/cpu/lh7a40x/u-boot.lds (renamed from cpu/lh7a40x/u-boot.lds)2
-rw-r--r--arch/arm/cpu/pxa/Makefile (renamed from cpu/pxa/Makefile)0
-rw-r--r--arch/arm/cpu/pxa/config.mk (renamed from cpu/pxa/config.mk)0
-rw-r--r--arch/arm/cpu/pxa/cpu.c (renamed from cpu/pxa/cpu.c)0
-rw-r--r--arch/arm/cpu/pxa/i2c.c (renamed from cpu/pxa/i2c.c)0
-rw-r--r--arch/arm/cpu/pxa/pxafb.c (renamed from cpu/pxa/pxafb.c)0
-rw-r--r--arch/arm/cpu/pxa/start.S (renamed from cpu/pxa/start.S)0
-rw-r--r--arch/arm/cpu/pxa/timer.c (renamed from cpu/pxa/timer.c)0
-rw-r--r--arch/arm/cpu/pxa/u-boot.lds (renamed from cpu/pxa/u-boot.lds)2
-rw-r--r--arch/arm/cpu/pxa/usb.c (renamed from cpu/pxa/usb.c)0
-rw-r--r--arch/arm/cpu/s3c44b0/Makefile (renamed from cpu/s3c44b0/Makefile)0
-rw-r--r--arch/arm/cpu/s3c44b0/cache.c (renamed from cpu/s3c44b0/cache.c)0
-rw-r--r--arch/arm/cpu/s3c44b0/config.mk (renamed from cpu/s3c44b0/config.mk)0
-rw-r--r--arch/arm/cpu/s3c44b0/cpu.c (renamed from cpu/s3c44b0/cpu.c)0
-rw-r--r--arch/arm/cpu/s3c44b0/start.S (renamed from cpu/s3c44b0/start.S)0
-rw-r--r--arch/arm/cpu/s3c44b0/timer.c (renamed from cpu/s3c44b0/timer.c)0
-rw-r--r--arch/arm/cpu/s3c44b0/u-boot.lds (renamed from cpu/s3c44b0/u-boot.lds)2
-rw-r--r--arch/arm/cpu/sa1100/Makefile (renamed from cpu/sa1100/Makefile)0
-rw-r--r--arch/arm/cpu/sa1100/config.mk (renamed from cpu/sa1100/config.mk)0
-rw-r--r--arch/arm/cpu/sa1100/cpu.c (renamed from cpu/sa1100/cpu.c)0
-rw-r--r--arch/arm/cpu/sa1100/start.S (renamed from cpu/sa1100/start.S)0
-rw-r--r--arch/arm/cpu/sa1100/timer.c (renamed from cpu/sa1100/timer.c)0
-rw-r--r--arch/arm/cpu/sa1100/u-boot.lds (renamed from cpu/sa1100/u-boot.lds)2
-rw-r--r--arch/arm/include/asm/arch-mx51/asm-offsets.h2
-rw-r--r--board/actux1/config.mk2
-rw-r--r--board/actux1/u-boot.lds4
-rw-r--r--board/actux2/config.mk2
-rw-r--r--board/actux2/u-boot.lds4
-rw-r--r--board/actux3/config.mk2
-rw-r--r--board/actux3/u-boot.lds4
-rw-r--r--board/actux4/config.mk2
-rw-r--r--board/davinci/dvevm/board_init.S2
-rw-r--r--board/davinci/schmoogie/board_init.S2
-rw-r--r--board/davinci/sffsdr/board_init.S2
-rw-r--r--board/davinci/sonata/board_init.S2
-rw-r--r--board/edb93xx/config.mk2
-rw-r--r--board/freescale/mx31ads/u-boot.lds2
-rw-r--r--board/logicpd/zoom2/zoom2.c2
-rw-r--r--board/lpc2292sodimm/flash.c2
-rw-r--r--board/samsung/smdk6400/u-boot-nand.lds4
-rw-r--r--board/siemens/SMN42/flash.c2
-rw-r--r--board/trab/rs485.c2
-rw-r--r--board/trab/rs485.h2
-rw-r--r--board/trab/u-boot.lds2
-rw-r--r--doc/README-integrator2
-rw-r--r--doc/README.ARM-SoC6
-rw-r--r--doc/README.modnet502
-rw-r--r--nand_spl/board/freescale/mx31pdk/Makefile4
-rw-r--r--nand_spl/board/karo/tx25/Makefile4
-rw-r--r--nand_spl/board/samsung/smdk6400/Makefile4
407 files changed, 56 insertions, 56 deletions
diff --git a/Makefile b/Makefile
index ddfe73c06..e922ec3a7 100644
--- a/Makefile
+++ b/Makefile
@@ -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 \
diff --git a/cpu/arm1136/Makefile b/arch/arm/cpu/arm1136/Makefile
index 7701b03bb..7701b03bb 100644
--- a/cpu/arm1136/Makefile
+++ b/arch/arm/cpu/arm1136/Makefile
diff --git a/cpu/arm1136/config.mk b/arch/arm/cpu/arm1136/config.mk
index 3e685354a..3e685354a 100644
--- a/cpu/arm1136/config.mk
+++ b/arch/arm/cpu/arm1136/config.mk
diff --git a/cpu/arm1136/cpu.c b/arch/arm/cpu/arm1136/cpu.c
index ade7f4680..ade7f4680 100644
--- a/cpu/arm1136/cpu.c
+++ b/arch/arm/cpu/arm1136/cpu.c
diff --git a/cpu/arm1136/mx31/Makefile b/arch/arm/cpu/arm1136/mx31/Makefile
index c8e18f7f0..c8e18f7f0 100644
--- a/cpu/arm1136/mx31/Makefile
+++ b/arch/arm/cpu/arm1136/mx31/Makefile
diff --git a/cpu/arm1136/mx31/devices.c b/arch/arm/cpu/arm1136/mx31/devices.c
index 1f4ca7eb4..1f4ca7eb4 100644
--- a/cpu/arm1136/mx31/devices.c
+++ b/arch/arm/cpu/arm1136/mx31/devices.c
diff --git a/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c
index 1415d6c2a..1415d6c2a 100644
--- a/cpu/arm1136/mx31/generic.c
+++ b/arch/arm/cpu/arm1136/mx31/generic.c
diff --git a/cpu/arm1136/mx31/timer.c b/arch/arm/cpu/arm1136/mx31/timer.c
index 7972ba0dd..7972ba0dd 100644
--- a/cpu/arm1136/mx31/timer.c
+++ b/arch/arm/cpu/arm1136/mx31/timer.c
diff --git a/cpu/arm1136/omap24xx/Makefile b/arch/arm/cpu/arm1136/omap24xx/Makefile
index 48dc7e328..48dc7e328 100644
--- a/cpu/arm1136/omap24xx/Makefile
+++ b/arch/arm/cpu/arm1136/omap24xx/Makefile
diff --git a/cpu/arm1136/omap24xx/reset.S b/arch/arm/cpu/arm1136/omap24xx/reset.S
index 5f8343fe6..5f8343fe6 100644
--- a/cpu/arm1136/omap24xx/reset.S
+++ b/arch/arm/cpu/arm1136/omap24xx/reset.S
diff --git a/cpu/arm1136/omap24xx/timer.c b/arch/arm/cpu/arm1136/omap24xx/timer.c
index 67547490f..67547490f 100644
--- a/cpu/arm1136/omap24xx/timer.c
+++ b/arch/arm/cpu/arm1136/omap24xx/timer.c
diff --git a/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
index 957f4389b..957f4389b 100644
--- a/cpu/arm1136/start.S
+++ b/arch/arm/cpu/arm1136/start.S
diff --git a/cpu/arm1136/u-boot.lds b/arch/arm/cpu/arm1136/u-boot.lds
index 7181a569e..e7eefc972 100644
--- a/cpu/arm1136/u-boot.lds
+++ b/arch/arm/cpu/arm1136/u-boot.lds
@@ -39,7 +39,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/arm1136/start.o (.text)
+ arch/arm/cpu/arm1136/start.o (.text)
*(.text)
}
diff --git a/cpu/arm1176/Makefile b/arch/arm/cpu/arm1176/Makefile
index 1ca9199a6..1ca9199a6 100644
--- a/cpu/arm1176/Makefile
+++ b/arch/arm/cpu/arm1176/Makefile
diff --git a/cpu/arm1176/config.mk b/arch/arm/cpu/arm1176/config.mk
index 14346cfff..14346cfff 100644
--- a/cpu/arm1176/config.mk
+++ b/arch/arm/cpu/arm1176/config.mk
diff --git a/cpu/arm1176/cpu.c b/arch/arm/cpu/arm1176/cpu.c
index befa0cdcc..befa0cdcc 100644
--- a/cpu/arm1176/cpu.c
+++ b/arch/arm/cpu/arm1176/cpu.c
diff --git a/cpu/arm1176/s3c64xx/Makefile b/arch/arm/cpu/arm1176/s3c64xx/Makefile
index b52793913..b52793913 100644
--- a/cpu/arm1176/s3c64xx/Makefile
+++ b/arch/arm/cpu/arm1176/s3c64xx/Makefile
diff --git a/cpu/arm1176/s3c64xx/config.mk b/arch/arm/cpu/arm1176/s3c64xx/config.mk
index 14346cfff..14346cfff 100644
--- a/cpu/arm1176/s3c64xx/config.mk
+++ b/arch/arm/cpu/arm1176/s3c64xx/config.mk
diff --git a/cpu/arm1176/s3c64xx/cpu_init.S b/arch/arm/cpu/arm1176/s3c64xx/cpu_init.S
index df88cba34..df88cba34 100644
--- a/cpu/arm1176/s3c64xx/cpu_init.S
+++ b/arch/arm/cpu/arm1176/s3c64xx/cpu_init.S
diff --git a/cpu/arm1176/s3c64xx/reset.S b/arch/arm/cpu/arm1176/s3c64xx/reset.S
index eae572e4f..eae572e4f 100644
--- a/cpu/arm1176/s3c64xx/reset.S
+++ b/arch/arm/cpu/arm1176/s3c64xx/reset.S
diff --git a/cpu/arm1176/s3c64xx/speed.c b/arch/arm/cpu/arm1176/s3c64xx/speed.c
index 11962acad..11962acad 100644
--- a/cpu/arm1176/s3c64xx/speed.c
+++ b/arch/arm/cpu/arm1176/s3c64xx/speed.c
diff --git a/cpu/arm1176/s3c64xx/timer.c b/arch/arm/cpu/arm1176/s3c64xx/timer.c
index 9768319ef..9768319ef 100644
--- a/cpu/arm1176/s3c64xx/timer.c
+++ b/arch/arm/cpu/arm1176/s3c64xx/timer.c
diff --git a/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S
index e2b6c9b08..e2b6c9b08 100644
--- a/cpu/arm1176/start.S
+++ b/arch/arm/cpu/arm1176/start.S
diff --git a/cpu/arm1176/u-boot.lds b/arch/arm/cpu/arm1176/u-boot.lds
index cc682f54d..8969587e8 100644
--- a/cpu/arm1176/u-boot.lds
+++ b/arch/arm/cpu/arm1176/u-boot.lds
@@ -31,7 +31,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/arm1176/start.o (.text)
+ arch/arm/cpu/arm1176/start.o (.text)
*(.text)
}
diff --git a/cpu/arm720t/Makefile b/arch/arm/cpu/arm720t/Makefile
index d5ac7d3fd..d5ac7d3fd 100644
--- a/cpu/arm720t/Makefile
+++ b/arch/arm/cpu/arm720t/Makefile
diff --git a/cpu/arm720t/config.mk b/arch/arm/cpu/arm720t/config.mk
index 3844c626a..3844c626a 100644
--- a/cpu/arm720t/config.mk
+++ b/arch/arm/cpu/arm720t/config.mk
diff --git a/cpu/arm720t/cpu.c b/arch/arm/cpu/arm720t/cpu.c
index 88c71bfe1..88c71bfe1 100644
--- a/cpu/arm720t/cpu.c
+++ b/arch/arm/cpu/arm720t/cpu.c
diff --git a/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c
index eb8d42531..eb8d42531 100644
--- a/cpu/arm720t/interrupts.c
+++ b/arch/arm/cpu/arm720t/interrupts.c
diff --git a/cpu/arm720t/lpc2292/Makefile b/arch/arm/cpu/arm720t/lpc2292/Makefile
index 240f1e3b3..240f1e3b3 100644
--- a/cpu/arm720t/lpc2292/Makefile
+++ b/arch/arm/cpu/arm720t/lpc2292/Makefile
diff --git a/cpu/arm720t/lpc2292/flash.c b/arch/arm/cpu/arm720t/lpc2292/flash.c
index 3d2dc3223..3d2dc3223 100644
--- a/cpu/arm720t/lpc2292/flash.c
+++ b/arch/arm/cpu/arm720t/lpc2292/flash.c
diff --git a/cpu/arm720t/lpc2292/iap_entry.S b/arch/arm/cpu/arm720t/lpc2292/iap_entry.S
index c31d5190b..c31d5190b 100644
--- a/cpu/arm720t/lpc2292/iap_entry.S
+++ b/arch/arm/cpu/arm720t/lpc2292/iap_entry.S
diff --git a/cpu/arm720t/lpc2292/mmc.c b/arch/arm/cpu/arm720t/lpc2292/mmc.c
index beaffe944..beaffe944 100644
--- a/cpu/arm720t/lpc2292/mmc.c
+++ b/arch/arm/cpu/arm720t/lpc2292/mmc.c
diff --git a/cpu/arm720t/lpc2292/mmc_hw.c b/arch/arm/cpu/arm720t/lpc2292/mmc_hw.c
index b4dc4a6e2..b4dc4a6e2 100644
--- a/cpu/arm720t/lpc2292/mmc_hw.c
+++ b/arch/arm/cpu/arm720t/lpc2292/mmc_hw.c
diff --git a/cpu/arm720t/lpc2292/mmc_hw.h b/arch/arm/cpu/arm720t/lpc2292/mmc_hw.h
index 3687dbf69..3687dbf69 100644
--- a/cpu/arm720t/lpc2292/mmc_hw.h
+++ b/arch/arm/cpu/arm720t/lpc2292/mmc_hw.h
diff --git a/cpu/arm720t/lpc2292/spi.c b/arch/arm/cpu/arm720t/lpc2292/spi.c
index d296bdac6..d296bdac6 100644
--- a/cpu/arm720t/lpc2292/spi.c
+++ b/arch/arm/cpu/arm720t/lpc2292/spi.c
diff --git a/cpu/arm720t/s3c4510b/Makefile b/arch/arm/cpu/arm720t/s3c4510b/Makefile
index c09903635..c09903635 100644
--- a/cpu/arm720t/s3c4510b/Makefile
+++ b/arch/arm/cpu/arm720t/s3c4510b/Makefile
diff --git a/cpu/arm720t/s3c4510b/cache.c b/arch/arm/cpu/arm720t/s3c4510b/cache.c
index 104d287b2..104d287b2 100644
--- a/cpu/arm720t/s3c4510b/cache.c
+++ b/arch/arm/cpu/arm720t/s3c4510b/cache.c
diff --git a/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S
index 022b873e3..022b873e3 100644
--- a/cpu/arm720t/start.S
+++ b/arch/arm/cpu/arm720t/start.S
diff --git a/cpu/arm720t/u-boot.lds b/arch/arm/cpu/arm720t/u-boot.lds
index 111c3f5a6..c975fc3d5 100644
--- a/cpu/arm720t/u-boot.lds
+++ b/arch/arm/cpu/arm720t/u-boot.lds
@@ -31,7 +31,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/arm720t/start.o (.text)
+ arch/arm/cpu/arm720t/start.o (.text)
*(.text)
}
diff --git a/cpu/arm920t/Makefile b/arch/arm/cpu/arm920t/Makefile
index cbb13b2a4..cbb13b2a4 100644
--- a/cpu/arm920t/Makefile
+++ b/arch/arm/cpu/arm920t/Makefile
diff --git a/cpu/arm920t/a320/Makefile b/arch/arm/cpu/arm920t/a320/Makefile
index f030c5362..f030c5362 100644
--- a/cpu/arm920t/a320/Makefile
+++ b/arch/arm/cpu/arm920t/a320/Makefile
diff --git a/cpu/arm920t/a320/ftsmc020.c b/arch/arm/cpu/arm920t/a320/ftsmc020.c
index 76465373e..76465373e 100644
--- a/cpu/arm920t/a320/ftsmc020.c
+++ b/arch/arm/cpu/arm920t/a320/ftsmc020.c
diff --git a/cpu/arm920t/a320/reset.S b/arch/arm/cpu/arm920t/a320/reset.S
index 12ca527c5..12ca527c5 100644
--- a/cpu/arm920t/a320/reset.S
+++ b/arch/arm/cpu/arm920t/a320/reset.S
diff --git a/cpu/arm920t/a320/timer.c b/arch/arm/cpu/arm920t/a320/timer.c
index bb655930d..bb655930d 100644
--- a/cpu/arm920t/a320/timer.c
+++ b/arch/arm/cpu/arm920t/a320/timer.c
diff --git a/cpu/arm920t/at91/Makefile b/arch/arm/cpu/arm920t/at91/Makefile
index d8a438365..d8a438365 100644
--- a/cpu/arm920t/at91/Makefile
+++ b/arch/arm/cpu/arm920t/at91/Makefile
diff --git a/cpu/arm920t/at91/lowlevel_init.S b/arch/arm/cpu/arm920t/at91/lowlevel_init.S
index 22fc86cd5..22fc86cd5 100644
--- a/cpu/arm920t/at91/lowlevel_init.S
+++ b/arch/arm/cpu/arm920t/at91/lowlevel_init.S
diff --git a/cpu/arm920t/at91/reset.c b/arch/arm/cpu/arm920t/at91/reset.c
index ce9c15615..ce9c15615 100644
--- a/cpu/arm920t/at91/reset.c
+++ b/arch/arm/cpu/arm920t/at91/reset.c
diff --git a/cpu/arm920t/at91/timer.c b/arch/arm/cpu/arm920t/at91/timer.c
index 91377d47a..91377d47a 100644
--- a/cpu/arm920t/at91/timer.c
+++ b/arch/arm/cpu/arm920t/at91/timer.c
diff --git a/cpu/arm920t/at91rm9200/Makefile b/arch/arm/cpu/arm920t/at91rm9200/Makefile
index 114d8adeb..114d8adeb 100644
--- a/cpu/arm920t/at91rm9200/Makefile
+++ b/arch/arm/cpu/arm920t/at91rm9200/Makefile
diff --git a/cpu/arm920t/at91rm9200/bcm5221.c b/arch/arm/cpu/arm920t/at91rm9200/bcm5221.c
index 8de3cba73..8de3cba73 100644
--- a/cpu/arm920t/at91rm9200/bcm5221.c
+++ b/arch/arm/cpu/arm920t/at91rm9200/bcm5221.c
diff --git a/cpu/arm920t/at91rm9200/dm9161.c b/arch/arm/cpu/arm920t/at91rm9200/dm9161.c
index 6d4384f41..6d4384f41 100644
--- a/cpu/arm920t/at91rm9200/dm9161.c
+++ b/arch/arm/cpu/arm920t/at91rm9200/dm9161.c
diff --git a/cpu/arm920t/at91rm9200/ether.c b/arch/arm/cpu/arm920t/at91rm9200/ether.c
index 91eab95ee..91eab95ee 100644
--- a/cpu/arm920t/at91rm9200/ether.c
+++ b/arch/arm/cpu/arm920t/at91rm9200/ether.c
diff --git a/cpu/arm920t/at91rm9200/i2c.c b/arch/arm/cpu/arm920t/at91rm9200/i2c.c
index 1711088ad..1711088ad 100644
--- a/cpu/arm920t/at91rm9200/i2c.c
+++ b/arch/arm/cpu/arm920t/at91rm9200/i2c.c
diff --git a/cpu/arm920t/at91rm9200/ks8721.c b/arch/arm/cpu/arm920t/at91rm9200/ks8721.c
index 9fe379369..9fe379369 100644
--- a/cpu/arm920t/at91rm9200/ks8721.c
+++ b/arch/arm/cpu/arm920t/at91rm9200/ks8721.c
diff --git a/cpu/arm920t/at91rm9200/lowlevel_init.S b/arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S
index d8bb96004..d8bb96004 100644
--- a/cpu/arm920t/at91rm9200/lowlevel_init.S
+++ b/arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S
diff --git a/cpu/arm920t/at91rm9200/lxt972.c b/arch/arm/cpu/arm920t/at91rm9200/lxt972.c
index 260d393cf..260d393cf 100644
--- a/cpu/arm920t/at91rm9200/lxt972.c
+++ b/arch/arm/cpu/arm920t/at91rm9200/lxt972.c
diff --git a/cpu/arm920t/at91rm9200/reset.c b/arch/arm/cpu/arm920t/at91rm9200/reset.c
index 945ea2c24..945ea2c24 100644
--- a/cpu/arm920t/at91rm9200/reset.c
+++ b/arch/arm/cpu/arm920t/at91rm9200/reset.c
diff --git a/cpu/arm920t/at91rm9200/spi.c b/arch/arm/cpu/arm920t/at91rm9200/spi.c
index f3cb5d8c2..f3cb5d8c2 100644
--- a/cpu/arm920t/at91rm9200/spi.c
+++ b/arch/arm/cpu/arm920t/at91rm9200/spi.c
diff --git a/cpu/arm920t/at91rm9200/timer.c b/arch/arm/cpu/arm920t/at91rm9200/timer.c
index 9c54bbedb..9c54bbedb 100644
--- a/cpu/arm920t/at91rm9200/timer.c
+++ b/arch/arm/cpu/arm920t/at91rm9200/timer.c
diff --git a/cpu/arm920t/at91rm9200/usb.c b/arch/arm/cpu/arm920t/at91rm9200/usb.c
index 72355dcf9..72355dcf9 100644
--- a/cpu/arm920t/at91rm9200/usb.c
+++ b/arch/arm/cpu/arm920t/at91rm9200/usb.c
diff --git a/cpu/arm920t/config.mk b/arch/arm/cpu/arm920t/config.mk
index 8f6c1a354..8f6c1a354 100644
--- a/cpu/arm920t/config.mk
+++ b/arch/arm/cpu/arm920t/config.mk
diff --git a/cpu/arm920t/cpu.c b/arch/arm/cpu/arm920t/cpu.c
index be82c87c7..be82c87c7 100644
--- a/cpu/arm920t/cpu.c
+++ b/arch/arm/cpu/arm920t/cpu.c
diff --git a/cpu/arm920t/ep93xx/Makefile b/arch/arm/cpu/arm920t/ep93xx/Makefile
index 01a2f5555..01a2f5555 100644
--- a/cpu/arm920t/ep93xx/Makefile
+++ b/arch/arm/cpu/arm920t/ep93xx/Makefile
diff --git a/cpu/arm920t/ep93xx/cpu.c b/arch/arm/cpu/arm920t/ep93xx/cpu.c
index 1abb9c6fa..1abb9c6fa 100644
--- a/cpu/arm920t/ep93xx/cpu.c
+++ b/arch/arm/cpu/arm920t/ep93xx/cpu.c
diff --git a/cpu/arm920t/ep93xx/led.c b/arch/arm/cpu/arm920t/ep93xx/led.c
index 7e2c89775..7e2c89775 100644
--- a/cpu/arm920t/ep93xx/led.c
+++ b/arch/arm/cpu/arm920t/ep93xx/led.c
diff --git a/cpu/arm920t/ep93xx/lowlevel_init.S b/arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S
index a20ec894b..a20ec894b 100644
--- a/cpu/arm920t/ep93xx/lowlevel_init.S
+++ b/arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S
diff --git a/cpu/arm920t/ep93xx/speed.c b/arch/arm/cpu/arm920t/ep93xx/speed.c
index c83a3bb91..c83a3bb91 100644
--- a/cpu/arm920t/ep93xx/speed.c
+++ b/arch/arm/cpu/arm920t/ep93xx/speed.c
diff --git a/cpu/arm920t/ep93xx/timer.c b/arch/arm/cpu/arm920t/ep93xx/timer.c
index 4a0ce4da6..4a0ce4da6 100644
--- a/cpu/arm920t/ep93xx/timer.c
+++ b/arch/arm/cpu/arm920t/ep93xx/timer.c
diff --git a/cpu/arm920t/ep93xx/u-boot.lds b/arch/arm/cpu/arm920t/ep93xx/u-boot.lds
index 737c9d8c1..5bfcb0231 100644
--- a/cpu/arm920t/ep93xx/u-boot.lds
+++ b/arch/arm/cpu/arm920t/ep93xx/u-boot.lds
@@ -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)
diff --git a/cpu/arm920t/imx/Makefile b/arch/arm/cpu/arm920t/imx/Makefile
index 28945e22c..28945e22c 100644
--- a/cpu/arm920t/imx/Makefile
+++ b/arch/arm/cpu/arm920t/imx/Makefile
diff --git a/cpu/arm920t/imx/generic.c b/arch/arm/cpu/arm920t/imx/generic.c
index aa7c8c159..aa7c8c159 100644
--- a/cpu/arm920t/imx/generic.c
+++ b/arch/arm/cpu/arm920t/imx/generic.c
diff --git a/cpu/arm920t/imx/speed.c b/arch/arm/cpu/arm920t/imx/speed.c
index 1e296987d..1e296987d 100644
--- a/cpu/arm920t/imx/speed.c
+++ b/arch/arm/cpu/arm920t/imx/speed.c
diff --git a/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c
index b06b518f0..b06b518f0 100644
--- a/cpu/arm920t/imx/timer.c
+++ b/arch/arm/cpu/arm920t/imx/timer.c
diff --git a/cpu/arm920t/interrupts.c b/arch/arm/cpu/arm920t/interrupts.c
index 561083ec7..561083ec7 100644
--- a/cpu/arm920t/interrupts.c
+++ b/arch/arm/cpu/arm920t/interrupts.c
diff --git a/cpu/arm920t/ks8695/Makefile b/arch/arm/cpu/arm920t/ks8695/Makefile
index f53fdc2b2..f53fdc2b2 100644
--- a/cpu/arm920t/ks8695/Makefile
+++ b/arch/arm/cpu/arm920t/ks8695/Makefile
diff --git a/cpu/arm920t/ks8695/lowlevel_init.S b/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S
index e9f1227dd..e9f1227dd 100644
--- a/cpu/arm920t/ks8695/lowlevel_init.S
+++ b/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S
diff --git a/cpu/arm920t/ks8695/timer.c b/arch/arm/cpu/arm920t/ks8695/timer.c
index 886e37059..886e37059 100644
--- a/cpu/arm920t/ks8695/timer.c
+++ b/arch/arm/cpu/arm920t/ks8695/timer.c
diff --git a/cpu/arm920t/s3c24x0/Makefile b/arch/arm/cpu/arm920t/s3c24x0/Makefile
index 7e8d6ed5f..7e8d6ed5f 100644
--- a/cpu/arm920t/s3c24x0/Makefile
+++ b/arch/arm/cpu/arm920t/s3c24x0/Makefile
diff --git a/cpu/arm920t/s3c24x0/interrupts.c b/arch/arm/cpu/arm920t/s3c24x0/interrupts.c
index 879fda66a..879fda66a 100644
--- a/cpu/arm920t/s3c24x0/interrupts.c
+++ b/arch/arm/cpu/arm920t/s3c24x0/interrupts.c
diff --git a/cpu/arm920t/s3c24x0/speed.c b/arch/arm/cpu/arm920t/s3c24x0/speed.c
index b13283a79..b13283a79 100644
--- a/cpu/arm920t/s3c24x0/speed.c
+++ b/arch/arm/cpu/arm920t/s3c24x0/speed.c
diff --git a/cpu/arm920t/s3c24x0/timer.c b/arch/arm/cpu/arm920t/s3c24x0/timer.c
index 7d4735438..7d4735438 100644
--- a/cpu/arm920t/s3c24x0/timer.c
+++ b/arch/arm/cpu/arm920t/s3c24x0/timer.c
diff --git a/cpu/arm920t/s3c24x0/usb.c b/arch/arm/cpu/arm920t/s3c24x0/usb.c
index e468ed08f..e468ed08f 100644
--- a/cpu/arm920t/s3c24x0/usb.c
+++ b/arch/arm/cpu/arm920t/s3c24x0/usb.c
diff --git a/cpu/arm920t/s3c24x0/usb_ohci.c b/arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c
index 5aa8d64a5..5aa8d64a5 100644
--- a/cpu/arm920t/s3c24x0/usb_ohci.c
+++ b/arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c
diff --git a/cpu/arm920t/s3c24x0/usb_ohci.h b/arch/arm/cpu/arm920t/s3c24x0/usb_ohci.h
index f272d7885..f272d7885 100644
--- a/cpu/arm920t/s3c24x0/usb_ohci.h
+++ b/arch/arm/cpu/arm920t/s3c24x0/usb_ohci.h
diff --git a/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S
index 779f192e5..779f192e5 100644
--- a/cpu/arm920t/start.S
+++ b/arch/arm/cpu/arm920t/start.S
diff --git a/cpu/arm920t/u-boot.lds b/arch/arm/cpu/arm920t/u-boot.lds
index d9bfbee73..a7decfcd7 100644
--- a/cpu/arm920t/u-boot.lds
+++ b/arch/arm/cpu/arm920t/u-boot.lds
@@ -39,7 +39,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/arm920t/start.o (.text)
+ arch/arm/cpu/arm920t/start.o (.text)
*(.text)
}
diff --git a/cpu/arm925t/Makefile b/arch/arm/cpu/arm925t/Makefile
index 8d0e88f90..8d0e88f90 100644
--- a/cpu/arm925t/Makefile
+++ b/arch/arm/cpu/arm925t/Makefile
diff --git a/cpu/arm925t/config.mk b/arch/arm/cpu/arm925t/config.mk
index 8f6c1a354..8f6c1a354 100644
--- a/cpu/arm925t/config.mk
+++ b/arch/arm/cpu/arm925t/config.mk
diff --git a/cpu/arm925t/cpu.c b/arch/arm/cpu/arm925t/cpu.c
index 71700bb17..71700bb17 100644
--- a/cpu/arm925t/cpu.c
+++ b/arch/arm/cpu/arm925t/cpu.c
diff --git a/cpu/arm925t/omap925.c b/arch/arm/cpu/arm925t/omap925.c
index 65dab9f88..65dab9f88 100644
--- a/cpu/arm925t/omap925.c
+++ b/arch/arm/cpu/arm925t/omap925.c
diff --git a/cpu/arm925t/start.S b/arch/arm/cpu/arm925t/start.S
index 567e80479..567e80479 100644
--- a/cpu/arm925t/start.S
+++ b/arch/arm/cpu/arm925t/start.S
diff --git a/cpu/arm925t/timer.c b/arch/arm/cpu/arm925t/timer.c
index 7dfe2b564..7dfe2b564 100644
--- a/cpu/arm925t/timer.c
+++ b/arch/arm/cpu/arm925t/timer.c
diff --git a/cpu/arm925t/u-boot.lds b/arch/arm/cpu/arm925t/u-boot.lds
index 694780eba..e21d6dc5a 100644
--- a/cpu/arm925t/u-boot.lds
+++ b/arch/arm/cpu/arm925t/u-boot.lds
@@ -34,7 +34,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/arm925t/start.o (.text)
+ arch/arm/cpu/arm925t/start.o (.text)
*(.text)
}
diff --git a/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile
index 7701b03bb..7701b03bb 100644
--- a/cpu/arm926ejs/Makefile
+++ b/arch/arm/cpu/arm926ejs/Makefile
diff --git a/cpu/arm926ejs/at91/Makefile b/arch/arm/cpu/arm926ejs/at91/Makefile
index 4f467be91..4f467be91 100644
--- a/cpu/arm926ejs/at91/Makefile
+++ b/arch/arm/cpu/arm926ejs/at91/Makefile
diff --git a/cpu/arm926ejs/at91/at91cap9_devices.c b/arch/arm/cpu/arm926ejs/at91/at91cap9_devices.c
index 2d878fdde..2d878fdde 100644
--- a/cpu/arm926ejs/at91/at91cap9_devices.c
+++ b/arch/arm/cpu/arm926ejs/at91/at91cap9_devices.c
diff --git a/cpu/arm926ejs/at91/at91sam9260_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c
index 77d49ab1c..77d49ab1c 100644
--- a/cpu/arm926ejs/at91/at91sam9260_devices.c
+++ b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c
diff --git a/cpu/arm926ejs/at91/at91sam9261_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c
index b4353ef5c..b4353ef5c 100644
--- a/cpu/arm926ejs/at91/at91sam9261_devices.c
+++ b/arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c
diff --git a/cpu/arm926ejs/at91/at91sam9263_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c
index deda3e54d..deda3e54d 100644
--- a/cpu/arm926ejs/at91/at91sam9263_devices.c
+++ b/arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c
diff --git a/cpu/arm926ejs/at91/at91sam9m10g45_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c
index 4ad9b1fcc..4ad9b1fcc 100644
--- a/cpu/arm926ejs/at91/at91sam9m10g45_devices.c
+++ b/arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c
diff --git a/cpu/arm926ejs/at91/at91sam9rl_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c
index 4f570f4fb..4f570f4fb 100644
--- a/cpu/arm926ejs/at91/at91sam9rl_devices.c
+++ b/arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c
diff --git a/cpu/arm926ejs/at91/clock.c b/arch/arm/cpu/arm926ejs/at91/clock.c
index ecf91f518..ecf91f518 100644
--- a/cpu/arm926ejs/at91/clock.c
+++ b/arch/arm/cpu/arm926ejs/at91/clock.c
diff --git a/cpu/arm926ejs/at91/config.mk b/arch/arm/cpu/arm926ejs/at91/config.mk
index 19296fdba..19296fdba 100644
--- a/cpu/arm926ejs/at91/config.mk
+++ b/arch/arm/cpu/arm926ejs/at91/config.mk
diff --git a/cpu/arm926ejs/at91/cpu.c b/arch/arm/cpu/arm926ejs/at91/cpu.c
index 141a7d1ec..141a7d1ec 100644
--- a/cpu/arm926ejs/at91/cpu.c
+++ b/arch/arm/cpu/arm926ejs/at91/cpu.c
diff --git a/cpu/arm926ejs/at91/led.c b/arch/arm/cpu/arm926ejs/at91/led.c
index 0a315c497..0a315c497 100644
--- a/cpu/arm926ejs/at91/led.c
+++ b/arch/arm/cpu/arm926ejs/at91/led.c
diff --git a/cpu/arm926ejs/at91/lowlevel_init.S b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S
index 559c35c9e..559c35c9e 100644
--- a/cpu/arm926ejs/at91/lowlevel_init.S
+++ b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S
diff --git a/cpu/arm926ejs/at91/reset.c b/arch/arm/cpu/arm926ejs/at91/reset.c
index 1b67e7788..1b67e7788 100644
--- a/cpu/arm926ejs/at91/reset.c
+++ b/arch/arm/cpu/arm926ejs/at91/reset.c
diff --git a/cpu/arm926ejs/at91/timer.c b/arch/arm/cpu/arm926ejs/at91/timer.c
index d21eebfb4..d21eebfb4 100644
--- a/cpu/arm926ejs/at91/timer.c
+++ b/arch/arm/cpu/arm926ejs/at91/timer.c
diff --git a/cpu/arm926ejs/config.mk b/arch/arm/cpu/arm926ejs/config.mk
index f8ef90f2d..f8ef90f2d 100644
--- a/cpu/arm926ejs/config.mk
+++ b/arch/arm/cpu/arm926ejs/config.mk
diff --git a/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c
index 5c902dfc1..5c902dfc1 100644
--- a/cpu/arm926ejs/cpu.c
+++ b/arch/arm/cpu/arm926ejs/cpu.c
diff --git a/cpu/arm926ejs/davinci/Makefile b/arch/arm/cpu/arm926ejs/davinci/Makefile
index d7e9e2ca0..d7e9e2ca0 100644
--- a/cpu/arm926ejs/davinci/Makefile
+++ b/arch/arm/cpu/arm926ejs/davinci/Makefile
diff --git a/cpu/arm926ejs/davinci/config.mk b/arch/arm/cpu/arm926ejs/davinci/config.mk
index 565adda11..565adda11 100644
--- a/cpu/arm926ejs/davinci/config.mk
+++ b/arch/arm/cpu/arm926ejs/davinci/config.mk
diff --git a/cpu/arm926ejs/davinci/cpu.c b/arch/arm/cpu/arm926ejs/davinci/cpu.c
index fc3551c30..fc3551c30 100644
--- a/cpu/arm926ejs/davinci/cpu.c
+++ b/arch/arm/cpu/arm926ejs/davinci/cpu.c
diff --git a/cpu/arm926ejs/davinci/dm355.c b/arch/arm/cpu/arm926ejs/davinci/dm355.c
index bc45b67fb..bc45b67fb 100644
--- a/cpu/arm926ejs/davinci/dm355.c
+++ b/arch/arm/cpu/arm926ejs/davinci/dm355.c
diff --git a/cpu/arm926ejs/davinci/dm365.c b/arch/arm/cpu/arm926ejs/davinci/dm365.c
index 56c1bc032..56c1bc032 100644
--- a/cpu/arm926ejs/davinci/dm365.c
+++ b/arch/arm/cpu/arm926ejs/davinci/dm365.c
diff --git a/cpu/arm926ejs/davinci/dm644x.c b/arch/arm/cpu/arm926ejs/davinci/dm644x.c
index bb105b56e..bb105b56e 100644
--- a/cpu/arm926ejs/davinci/dm644x.c
+++ b/arch/arm/cpu/arm926ejs/davinci/dm644x.c
diff --git a/cpu/arm926ejs/davinci/dm646x.c b/arch/arm/cpu/arm926ejs/davinci/dm646x.c
index 329825f45..329825f45 100644
--- a/cpu/arm926ejs/davinci/dm646x.c
+++ b/arch/arm/cpu/arm926ejs/davinci/dm646x.c
diff --git a/cpu/arm926ejs/davinci/dp83848.c b/arch/arm/cpu/arm926ejs/davinci/dp83848.c
index c71c685f7..c71c685f7 100644
--- a/cpu/arm926ejs/davinci/dp83848.c
+++ b/arch/arm/cpu/arm926ejs/davinci/dp83848.c
diff --git a/cpu/arm926ejs/davinci/lowlevel_init.S b/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S
index 0a4b2cf67..0a4b2cf67 100644
--- a/cpu/arm926ejs/davinci/lowlevel_init.S
+++ b/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S
diff --git a/cpu/arm926ejs/davinci/lxt972.c b/arch/arm/cpu/arm926ejs/davinci/lxt972.c
index ce3e41c55..ce3e41c55 100644
--- a/cpu/arm926ejs/davinci/lxt972.c
+++ b/arch/arm/cpu/arm926ejs/davinci/lxt972.c
diff --git a/cpu/arm926ejs/davinci/psc.c b/arch/arm/cpu/arm926ejs/davinci/psc.c
index 8273a7fae..8273a7fae 100644
--- a/cpu/arm926ejs/davinci/psc.c
+++ b/arch/arm/cpu/arm926ejs/davinci/psc.c
diff --git a/cpu/arm926ejs/davinci/reset.S b/arch/arm/cpu/arm926ejs/davinci/reset.S
index ba0a7c3b4..ba0a7c3b4 100644
--- a/cpu/arm926ejs/davinci/reset.S
+++ b/arch/arm/cpu/arm926ejs/davinci/reset.S
diff --git a/cpu/arm926ejs/davinci/timer.c b/arch/arm/cpu/arm926ejs/davinci/timer.c
index 9da7443f3..9da7443f3 100644
--- a/cpu/arm926ejs/davinci/timer.c
+++ b/arch/arm/cpu/arm926ejs/davinci/timer.c
diff --git a/cpu/arm926ejs/kirkwood/Makefile b/arch/arm/cpu/arm926ejs/kirkwood/Makefile
index fc2cc0300..fc2cc0300 100644
--- a/cpu/arm926ejs/kirkwood/Makefile
+++ b/arch/arm/cpu/arm926ejs/kirkwood/Makefile
diff --git a/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
index 6fc390258..6fc390258 100644
--- a/cpu/arm926ejs/kirkwood/cpu.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
diff --git a/cpu/arm926ejs/kirkwood/dram.c b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
index 8f2a18af6..8f2a18af6 100644
--- a/cpu/arm926ejs/kirkwood/dram.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
diff --git a/cpu/arm926ejs/kirkwood/mpp.c b/arch/arm/cpu/arm926ejs/kirkwood/mpp.c
index b2f0ad55e..b2f0ad55e 100644
--- a/cpu/arm926ejs/kirkwood/mpp.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/mpp.c
diff --git a/cpu/arm926ejs/kirkwood/timer.c b/arch/arm/cpu/arm926ejs/kirkwood/timer.c
index 2ec6a9380..2ec6a9380 100644
--- a/cpu/arm926ejs/kirkwood/timer.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/timer.c
diff --git a/cpu/arm926ejs/mx25/Makefile b/arch/arm/cpu/arm926ejs/mx25/Makefile
index 55c1e899b..76f01791a 100644
--- a/cpu/arm926ejs/mx25/Makefile
+++ b/arch/arm/cpu/arm926ejs/mx25/Makefile
@@ -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)
diff --git a/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index 694841dd1..694841dd1 100644
--- a/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
diff --git a/cpu/arm926ejs/mx25/reset.c b/arch/arm/cpu/arm926ejs/mx25/reset.c
index 1e33150eb..1e33150eb 100644
--- a/cpu/arm926ejs/mx25/reset.c
+++ b/arch/arm/cpu/arm926ejs/mx25/reset.c
diff --git a/cpu/arm926ejs/mx25/timer.c b/arch/arm/cpu/arm926ejs/mx25/timer.c
index 11d41a8bf..11d41a8bf 100644
--- a/cpu/arm926ejs/mx25/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx25/timer.c
diff --git a/cpu/arm926ejs/mx27/Makefile b/arch/arm/cpu/arm926ejs/mx27/Makefile
index 67d1b0e30..67d1b0e30 100644
--- a/cpu/arm926ejs/mx27/Makefile
+++ b/arch/arm/cpu/arm926ejs/mx27/Makefile
diff --git a/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c
index 30cf54471..30cf54471 100644
--- a/cpu/arm926ejs/mx27/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx27/generic.c
diff --git a/cpu/arm926ejs/mx27/reset.c b/arch/arm/cpu/arm926ejs/mx27/reset.c
index 6c54eafd3..6c54eafd3 100644
--- a/cpu/arm926ejs/mx27/reset.c
+++ b/arch/arm/cpu/arm926ejs/mx27/reset.c
diff --git a/cpu/arm926ejs/mx27/timer.c b/arch/arm/cpu/arm926ejs/mx27/timer.c
index 8f1d47bba..8f1d47bba 100644
--- a/cpu/arm926ejs/mx27/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx27/timer.c
diff --git a/cpu/arm926ejs/nomadik/Makefile b/arch/arm/cpu/arm926ejs/nomadik/Makefile
index 0fc9f2a4c..0fc9f2a4c 100644
--- a/cpu/arm926ejs/nomadik/Makefile
+++ b/arch/arm/cpu/arm926ejs/nomadik/Makefile
diff --git a/cpu/arm926ejs/nomadik/gpio.c b/arch/arm/cpu/arm926ejs/nomadik/gpio.c
index 62a375b5b..62a375b5b 100644
--- a/cpu/arm926ejs/nomadik/gpio.c
+++ b/arch/arm/cpu/arm926ejs/nomadik/gpio.c
diff --git a/cpu/arm926ejs/nomadik/reset.S b/arch/arm/cpu/arm926ejs/nomadik/reset.S
index ec954726a..ec954726a 100644
--- a/cpu/arm926ejs/nomadik/reset.S
+++ b/arch/arm/cpu/arm926ejs/nomadik/reset.S
diff --git a/cpu/arm926ejs/nomadik/timer.c b/arch/arm/cpu/arm926ejs/nomadik/timer.c
index 1d98ef3eb..1d98ef3eb 100644
--- a/cpu/arm926ejs/nomadik/timer.c
+++ b/arch/arm/cpu/arm926ejs/nomadik/timer.c
diff --git a/cpu/arm926ejs/omap/Makefile b/arch/arm/cpu/arm926ejs/omap/Makefile
index 74aea7418..74aea7418 100644
--- a/cpu/arm926ejs/omap/Makefile
+++ b/arch/arm/cpu/arm926ejs/omap/Makefile
diff --git a/cpu/arm926ejs/omap/cpuinfo.c b/arch/arm/cpu/arm926ejs/omap/cpuinfo.c
index 0052daba8..0052daba8 100644
--- a/cpu/arm926ejs/omap/cpuinfo.c
+++ b/arch/arm/cpu/arm926ejs/omap/cpuinfo.c
diff --git a/cpu/arm926ejs/omap/reset.S b/arch/arm/cpu/arm926ejs/omap/reset.S
index 4b20756d1..4b20756d1 100644
--- a/cpu/arm926ejs/omap/reset.S
+++ b/arch/arm/cpu/arm926ejs/omap/reset.S
diff --git a/cpu/arm926ejs/omap/timer.c b/arch/arm/cpu/arm926ejs/omap/timer.c
index 2ac38c40b..2ac38c40b 100644
--- a/cpu/arm926ejs/omap/timer.c
+++ b/arch/arm/cpu/arm926ejs/omap/timer.c
diff --git a/cpu/arm926ejs/spear/Makefile b/arch/arm/cpu/arm926ejs/spear/Makefile
index bf8dfa8c3..bf8dfa8c3 100644
--- a/cpu/arm926ejs/spear/Makefile
+++ b/arch/arm/cpu/arm926ejs/spear/Makefile
diff --git a/cpu/arm926ejs/spear/reset.c b/arch/arm/cpu/arm926ejs/spear/reset.c
index 73ad86da3..73ad86da3 100644
--- a/cpu/arm926ejs/spear/reset.c
+++ b/arch/arm/cpu/arm926ejs/spear/reset.c
diff --git a/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c
index 06858b4a1..06858b4a1 100644
--- a/cpu/arm926ejs/spear/timer.c
+++ b/arch/arm/cpu/arm926ejs/spear/timer.c
diff --git a/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S
index 3b81151f4..3b81151f4 100644
--- a/cpu/arm926ejs/start.S
+++ b/arch/arm/cpu/arm926ejs/start.S
diff --git a/cpu/arm926ejs/u-boot.lds b/arch/arm/cpu/arm926ejs/u-boot.lds
index ee5eeb590..ecbc58c7c 100644
--- a/cpu/arm926ejs/u-boot.lds
+++ b/arch/arm/cpu/arm926ejs/u-boot.lds
@@ -31,7 +31,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/arm926ejs/start.o (.text)
+ arch/arm/cpu/arm926ejs/start.o (.text)
*(.text)
}
diff --git a/cpu/arm926ejs/versatile/Makefile b/arch/arm/cpu/arm926ejs/versatile/Makefile
index c335d5c86..c335d5c86 100644
--- a/cpu/arm926ejs/versatile/Makefile
+++ b/arch/arm/cpu/arm926ejs/versatile/Makefile
diff --git a/cpu/arm926ejs/versatile/reset.S b/arch/arm/cpu/arm926ejs/versatile/reset.S
index 4b20756d1..4b20756d1 100644
--- a/cpu/arm926ejs/versatile/reset.S
+++ b/arch/arm/cpu/arm926ejs/versatile/reset.S
diff --git a/cpu/arm926ejs/versatile/timer.c b/arch/arm/cpu/arm926ejs/versatile/timer.c
index 563db3654..563db3654 100644
--- a/cpu/arm926ejs/versatile/timer.c
+++ b/arch/arm/cpu/arm926ejs/versatile/timer.c
diff --git a/cpu/arm946es/Makefile b/arch/arm/cpu/arm946es/Makefile
index e81f2da29..e81f2da29 100644
--- a/cpu/arm946es/Makefile
+++ b/arch/arm/cpu/arm946es/Makefile
diff --git a/cpu/arm946es/config.mk b/arch/arm/cpu/arm946es/config.mk
index e783f697a..e783f697a 100644
--- a/cpu/arm946es/config.mk
+++ b/arch/arm/cpu/arm946es/config.mk
diff --git a/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c
index c63c98be8..c63c98be8 100644
--- a/cpu/arm946es/cpu.c
+++ b/arch/arm/cpu/arm946es/cpu.c
diff --git a/cpu/arm946es/start.S b/arch/arm/cpu/arm946es/start.S
index 627e3cb94..627e3cb94 100644
--- a/cpu/arm946es/start.S
+++ b/arch/arm/cpu/arm946es/start.S
diff --git a/cpu/arm_intcm/u-boot.lds b/arch/arm/cpu/arm946es/u-boot.lds
index 5eb87fbee..fef21c758 100644
--- a/cpu/arm_intcm/u-boot.lds
+++ b/arch/arm/cpu/arm946es/u-boot.lds
@@ -31,7 +31,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/arm_intcm/start.o (.text)
+ arch/arm/cpu/arm946es/start.o (.text)
*(.text)
}
diff --git a/cpu/arm_cortexa8/Makefile b/arch/arm/cpu/arm_cortexa8/Makefile
index ae20299db..ae20299db 100644
--- a/cpu/arm_cortexa8/Makefile
+++ b/arch/arm/cpu/arm_cortexa8/Makefile
diff --git a/cpu/arm_cortexa8/config.mk b/arch/arm/cpu/arm_cortexa8/config.mk
index 49ac9c74a..49ac9c74a 100644
--- a/cpu/arm_cortexa8/config.mk
+++ b/arch/arm/cpu/arm_cortexa8/config.mk
diff --git a/cpu/arm_cortexa8/cpu.c b/arch/arm/cpu/arm_cortexa8/cpu.c
index a01e0d605..a01e0d605 100644
--- a/cpu/arm_cortexa8/cpu.c
+++ b/arch/arm/cpu/arm_cortexa8/cpu.c
diff --git a/cpu/arm_cortexa8/mx51/Makefile b/arch/arm/cpu/arm_cortexa8/mx51/Makefile
index 7cfaa2c13..7cfaa2c13 100644
--- a/cpu/arm_cortexa8/mx51/Makefile
+++ b/arch/arm/cpu/arm_cortexa8/mx51/Makefile
diff --git a/cpu/arm_cortexa8/mx51/clock.c b/arch/arm/cpu/arm_cortexa8/mx51/clock.c
index 38480ac5a..38480ac5a 100644
--- a/cpu/arm_cortexa8/mx51/clock.c
+++ b/arch/arm/cpu/arm_cortexa8/mx51/clock.c
diff --git a/cpu/arm_cortexa8/mx51/iomux.c b/arch/arm/cpu/arm_cortexa8/mx51/iomux.c
index 62b2954be..62b2954be 100644
--- a/cpu/arm_cortexa8/mx51/iomux.c
+++ b/arch/arm/cpu/arm_cortexa8/mx51/iomux.c
diff --git a/cpu/arm_cortexa8/mx51/lowlevel_init.S b/arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S
index 31af9e2b5..31af9e2b5 100644
--- a/cpu/arm_cortexa8/mx51/lowlevel_init.S
+++ b/arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S
diff --git a/cpu/arm_cortexa8/mx51/soc.c b/arch/arm/cpu/arm_cortexa8/mx51/soc.c
index 2a139b21d..2a139b21d 100644
--- a/cpu/arm_cortexa8/mx51/soc.c
+++ b/arch/arm/cpu/arm_cortexa8/mx51/soc.c
diff --git a/cpu/arm_cortexa8/mx51/speed.c b/arch/arm/cpu/arm_cortexa8/mx51/speed.c
index a444def7e..a444def7e 100644
--- a/cpu/arm_cortexa8/mx51/speed.c
+++ b/arch/arm/cpu/arm_cortexa8/mx51/speed.c
diff --git a/cpu/arm_cortexa8/mx51/timer.c b/arch/arm/cpu/arm_cortexa8/mx51/timer.c
index 8ecfec66d..8ecfec66d 100644
--- a/cpu/arm_cortexa8/mx51/timer.c
+++ b/arch/arm/cpu/arm_cortexa8/mx51/timer.c
diff --git a/cpu/arm_cortexa8/mx51/u-boot.lds b/arch/arm/cpu/arm_cortexa8/mx51/u-boot.lds
index 84c173ac7..2953b9363 100644
--- a/cpu/arm_cortexa8/mx51/u-boot.lds
+++ b/arch/arm/cpu/arm_cortexa8/mx51/u-boot.lds
@@ -36,7 +36,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/arm_cortexa8/start.o
+ arch/arm/cpu/arm_cortexa8/start.o
*(.text)
}
diff --git a/cpu/arm_cortexa8/omap3/Makefile b/arch/arm/cpu/arm_cortexa8/omap3/Makefile
index 136b163ad..136b163ad 100644
--- a/cpu/arm_cortexa8/omap3/Makefile
+++ b/arch/arm/cpu/arm_cortexa8/omap3/Makefile
diff --git a/cpu/arm_cortexa8/omap3/board.c b/arch/arm/cpu/arm_cortexa8/omap3/board.c
index 7b78fa448..7b78fa448 100644
--- a/cpu/arm_cortexa8/omap3/board.c
+++ b/arch/arm/cpu/arm_cortexa8/omap3/board.c
diff --git a/cpu/arm_cortexa8/omap3/cache.S b/arch/arm/cpu/arm_cortexa8/omap3/cache.S
index 0f6381535..0f6381535 100644
--- a/cpu/arm_cortexa8/omap3/cache.S
+++ b/arch/arm/cpu/arm_cortexa8/omap3/cache.S
diff --git a/cpu/arm_cortexa8/omap3/clock.c b/arch/arm/cpu/arm_cortexa8/omap3/clock.c
index 6330c9e5d..6330c9e5d 100644
--- a/cpu/arm_cortexa8/omap3/clock.c
+++ b/arch/arm/cpu/arm_cortexa8/omap3/clock.c
diff --git a/cpu/arm_cortexa8/omap3/gpio.c b/arch/arm/cpu/arm_cortexa8/omap3/gpio.c
index aeb6066d8..aeb6066d8 100644
--- a/cpu/arm_cortexa8/omap3/gpio.c
+++ b/arch/arm/cpu/arm_cortexa8/omap3/gpio.c
diff --git a/cpu/arm_cortexa8/omap3/lowlevel_init.S b/arch/arm/cpu/arm_cortexa8/omap3/lowlevel_init.S
index 73063ec8e..73063ec8e 100644
--- a/cpu/arm_cortexa8/omap3/lowlevel_init.S
+++ b/arch/arm/cpu/arm_cortexa8/omap3/lowlevel_init.S
diff --git a/cpu/arm_cortexa8/omap3/mem.c b/arch/arm/cpu/arm_cortexa8/omap3/mem.c
index dfb7e4c2a..dfb7e4c2a 100644
--- a/cpu/arm_cortexa8/omap3/mem.c
+++ b/arch/arm/cpu/arm_cortexa8/omap3/mem.c
diff --git a/cpu/arm_cortexa8/omap3/reset.S b/arch/arm/cpu/arm_cortexa8/omap3/reset.S
index a53c40819..a53c40819 100644
--- a/cpu/arm_cortexa8/omap3/reset.S
+++ b/arch/arm/cpu/arm_cortexa8/omap3/reset.S
diff --git a/cpu/arm_cortexa8/omap3/sys_info.c b/arch/arm/cpu/arm_cortexa8/omap3/sys_info.c
index 08fb32eaa..08fb32eaa 100644
--- a/cpu/arm_cortexa8/omap3/sys_info.c
+++ b/arch/arm/cpu/arm_cortexa8/omap3/sys_info.c
diff --git a/cpu/arm_cortexa8/omap3/syslib.c b/arch/arm/cpu/arm_cortexa8/omap3/syslib.c
index 9ced495c8..9ced495c8 100644
--- a/cpu/arm_cortexa8/omap3/syslib.c
+++ b/arch/arm/cpu/arm_cortexa8/omap3/syslib.c
diff --git a/cpu/arm_cortexa8/omap3/timer.c b/arch/arm/cpu/arm_cortexa8/omap3/timer.c
index 401bfe6d0..401bfe6d0 100644
--- a/cpu/arm_cortexa8/omap3/timer.c
+++ b/arch/arm/cpu/arm_cortexa8/omap3/timer.c
diff --git a/cpu/arm_cortexa8/s5pc1xx/Makefile b/arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile
index 01c93feda..01c93feda 100644
--- a/cpu/arm_cortexa8/s5pc1xx/Makefile
+++ b/arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile
diff --git a/cpu/arm_cortexa8/s5pc1xx/cache.S b/arch/arm/cpu/arm_cortexa8/s5pc1xx/cache.S
index 23f527a48..906118d82 100644
--- a/cpu/arm_cortexa8/s5pc1xx/cache.S
+++ b/arch/arm/cpu/arm_cortexa8/s5pc1xx/cache.S
@@ -2,7 +2,7 @@
* Copyright (C) 2009 Samsung Electronics
* Minkyu Kang <mk7.kang@samsung.com>
*
- * 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.
diff --git a/cpu/arm_cortexa8/s5pc1xx/clock.c b/arch/arm/cpu/arm_cortexa8/s5pc1xx/clock.c
index 19619f92c..19619f92c 100644
--- a/cpu/arm_cortexa8/s5pc1xx/clock.c
+++ b/arch/arm/cpu/arm_cortexa8/s5pc1xx/clock.c
diff --git a/cpu/arm_cortexa8/s5pc1xx/cpu_info.c b/arch/arm/cpu/arm_cortexa8/s5pc1xx/cpu_info.c
index f16c0ff13..f16c0ff13 100644
--- a/cpu/arm_cortexa8/s5pc1xx/cpu_info.c
+++ b/arch/arm/cpu/arm_cortexa8/s5pc1xx/cpu_info.c
diff --git a/cpu/arm_cortexa8/s5pc1xx/gpio.c b/arch/arm/cpu/arm_cortexa8/s5pc1xx/gpio.c
index a97244bf3..a97244bf3 100644
--- a/cpu/arm_cortexa8/s5pc1xx/gpio.c
+++ b/arch/arm/cpu/arm_cortexa8/s5pc1xx/gpio.c
diff --git a/cpu/arm_cortexa8/s5pc1xx/reset.S b/arch/arm/cpu/arm_cortexa8/s5pc1xx/reset.S
index 7f6ff9c35..7f6ff9c35 100644
--- a/cpu/arm_cortexa8/s5pc1xx/reset.S
+++ b/arch/arm/cpu/arm_cortexa8/s5pc1xx/reset.S
diff --git a/cpu/arm_cortexa8/s5pc1xx/sromc.c b/arch/arm/cpu/arm_cortexa8/s5pc1xx/sromc.c
index 380be81be..380be81be 100644
--- a/cpu/arm_cortexa8/s5pc1xx/sromc.c
+++ b/arch/arm/cpu/arm_cortexa8/s5pc1xx/sromc.c
diff --git a/cpu/arm_cortexa8/s5pc1xx/timer.c b/arch/arm/cpu/arm_cortexa8/s5pc1xx/timer.c
index c5df5c5ab..c5df5c5ab 100644
--- a/cpu/arm_cortexa8/s5pc1xx/timer.c
+++ b/arch/arm/cpu/arm_cortexa8/s5pc1xx/timer.c
diff --git a/cpu/arm_cortexa8/start.S b/arch/arm/cpu/arm_cortexa8/start.S
index 29dae2f28..29dae2f28 100644
--- a/cpu/arm_cortexa8/start.S
+++ b/arch/arm/cpu/arm_cortexa8/start.S
diff --git a/cpu/arm_cortexa8/u-boot.lds b/arch/arm/cpu/arm_cortexa8/u-boot.lds
index 4f1711cca..820e3a104 100644
--- a/cpu/arm_cortexa8/u-boot.lds
+++ b/arch/arm/cpu/arm_cortexa8/u-boot.lds
@@ -34,7 +34,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/arm_cortexa8/start.o (.text)
+ arch/arm/cpu/arm_cortexa8/start.o (.text)
*(.text)
}
diff --git a/cpu/arm_intcm/Makefile b/arch/arm/cpu/arm_intcm/Makefile
index 7701b03bb..7701b03bb 100644
--- a/cpu/arm_intcm/Makefile
+++ b/arch/arm/cpu/arm_intcm/Makefile
diff --git a/cpu/arm_intcm/config.mk b/arch/arm/cpu/arm_intcm/config.mk
index e783f697a..e783f697a 100644
--- a/cpu/arm_intcm/config.mk
+++ b/arch/arm/cpu/arm_intcm/config.mk
diff --git a/cpu/arm_intcm/cpu.c b/arch/arm/cpu/arm_intcm/cpu.c
index c0748e872..c0748e872 100644
--- a/cpu/arm_intcm/cpu.c
+++ b/arch/arm/cpu/arm_intcm/cpu.c
diff --git a/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S
index bb1f00359..bb1f00359 100644
--- a/cpu/arm_intcm/start.S
+++ b/arch/arm/cpu/arm_intcm/start.S
diff --git a/cpu/arm946es/u-boot.lds b/arch/arm/cpu/arm_intcm/u-boot.lds
index 5bd4390fb..4ed7d8906 100644
--- a/cpu/arm946es/u-boot.lds
+++ b/arch/arm/cpu/arm_intcm/u-boot.lds
@@ -31,7 +31,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/arm946es/start.o (.text)
+ arch/arm/cpu/arm_intcm/start.o (.text)
*(.text)
}
diff --git a/cpu/ixp/Makefile b/arch/arm/cpu/ixp/Makefile
index 1403c4f39..1403c4f39 100644
--- a/cpu/ixp/Makefile
+++ b/arch/arm/cpu/ixp/Makefile
diff --git a/cpu/ixp/config.mk b/arch/arm/cpu/ixp/config.mk
index deca3f4d5..deca3f4d5 100644
--- a/cpu/ixp/config.mk
+++ b/arch/arm/cpu/ixp/config.mk
diff --git a/cpu/ixp/cpu.c b/arch/arm/cpu/ixp/cpu.c
index ce275e5f3..ce275e5f3 100644
--- a/cpu/ixp/cpu.c
+++ b/arch/arm/cpu/ixp/cpu.c
diff --git a/cpu/ixp/interrupts.c b/arch/arm/cpu/ixp/interrupts.c
index 06a826af6..06a826af6 100644
--- a/cpu/ixp/interrupts.c
+++ b/arch/arm/cpu/ixp/interrupts.c
diff --git a/cpu/ixp/npe/IxEthAcc.c b/arch/arm/cpu/ixp/npe/IxEthAcc.c
index 061b24bb5..061b24bb5 100644
--- a/cpu/ixp/npe/IxEthAcc.c
+++ b/arch/arm/cpu/ixp/npe/IxEthAcc.c
diff --git a/cpu/ixp/npe/IxEthAccCommon.c b/arch/arm/cpu/ixp/npe/IxEthAccCommon.c
index 211203dff..211203dff 100644
--- a/cpu/ixp/npe/IxEthAccCommon.c
+++ b/arch/arm/cpu/ixp/npe/IxEthAccCommon.c
diff --git a/cpu/ixp/npe/IxEthAccControlInterface.c b/arch/arm/cpu/ixp/npe/IxEthAccControlInterface.c
index 44328473e..44328473e 100644
--- a/cpu/ixp/npe/IxEthAccControlInterface.c
+++ b/arch/arm/cpu/ixp/npe/IxEthAccControlInterface.c
diff --git a/cpu/ixp/npe/IxEthAccDataPlane.c b/arch/arm/cpu/ixp/npe/IxEthAccDataPlane.c
index b62f0d016..b62f0d016 100644
--- a/cpu/ixp/npe/IxEthAccDataPlane.c
+++ b/arch/arm/cpu/ixp/npe/IxEthAccDataPlane.c
diff --git a/cpu/ixp/npe/IxEthAccMac.c b/arch/arm/cpu/ixp/npe/IxEthAccMac.c
index 369ee91d9..369ee91d9 100644
--- a/cpu/ixp/npe/IxEthAccMac.c
+++ b/arch/arm/cpu/ixp/npe/IxEthAccMac.c
diff --git a/cpu/ixp/npe/IxEthAccMii.c b/arch/arm/cpu/ixp/npe/IxEthAccMii.c
index d282aa672..d282aa672 100644
--- a/cpu/ixp/npe/IxEthAccMii.c
+++ b/arch/arm/cpu/ixp/npe/IxEthAccMii.c
diff --git a/cpu/ixp/npe/IxEthDBAPI.c b/arch/arm/cpu/ixp/npe/IxEthDBAPI.c
index b2bfb7260..b2bfb7260 100644
--- a/cpu/ixp/npe/IxEthDBAPI.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBAPI.c
diff --git a/cpu/ixp/npe/IxEthDBAPISupport.c b/arch/arm/cpu/ixp/npe/IxEthDBAPISupport.c
index 25633a3d5..25633a3d5 100644
--- a/cpu/ixp/npe/IxEthDBAPISupport.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBAPISupport.c
diff --git a/cpu/ixp/npe/IxEthDBCore.c b/arch/arm/cpu/ixp/npe/IxEthDBCore.c
index 25b7cbb8b..25b7cbb8b 100644
--- a/cpu/ixp/npe/IxEthDBCore.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBCore.c
diff --git a/cpu/ixp/npe/IxEthDBEvents.c b/arch/arm/cpu/ixp/npe/IxEthDBEvents.c
index 4d44e0333..4d44e0333 100644
--- a/cpu/ixp/npe/IxEthDBEvents.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBEvents.c
diff --git a/cpu/ixp/npe/IxEthDBFeatures.c b/arch/arm/cpu/ixp/npe/IxEthDBFeatures.c
index 7a58d268c..7a58d268c 100644
--- a/cpu/ixp/npe/IxEthDBFeatures.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBFeatures.c
diff --git a/cpu/ixp/npe/IxEthDBFirewall.c b/arch/arm/cpu/ixp/npe/IxEthDBFirewall.c
index eb46174b6..eb46174b6 100644
--- a/cpu/ixp/npe/IxEthDBFirewall.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBFirewall.c
diff --git a/cpu/ixp/npe/IxEthDBHashtable.c b/arch/arm/cpu/ixp/npe/IxEthDBHashtable.c
index f1b18e6b4..f1b18e6b4 100644
--- a/cpu/ixp/npe/IxEthDBHashtable.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBHashtable.c
diff --git a/cpu/ixp/npe/IxEthDBLearning.c b/arch/arm/cpu/ixp/npe/IxEthDBLearning.c
index 2287dbe96..2287dbe96 100644
--- a/cpu/ixp/npe/IxEthDBLearning.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBLearning.c
diff --git a/cpu/ixp/npe/IxEthDBMem.c b/arch/arm/cpu/ixp/npe/IxEthDBMem.c
index 133cbef8d..133cbef8d 100644
--- a/cpu/ixp/npe/IxEthDBMem.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBMem.c
diff --git a/cpu/ixp/npe/IxEthDBNPEAdaptor.c b/arch/arm/cpu/ixp/npe/IxEthDBNPEAdaptor.c
index 112a46c99..112a46c99 100644
--- a/cpu/ixp/npe/IxEthDBNPEAdaptor.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBNPEAdaptor.c
diff --git a/cpu/ixp/npe/IxEthDBPortUpdate.c b/arch/arm/cpu/ixp/npe/IxEthDBPortUpdate.c
index cdf114bfc..cdf114bfc 100644
--- a/cpu/ixp/npe/IxEthDBPortUpdate.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBPortUpdate.c
diff --git a/cpu/ixp/npe/IxEthDBReports.c b/arch/arm/cpu/ixp/npe/IxEthDBReports.c
index 9c7ae1cc6..9c7ae1cc6 100644
--- a/cpu/ixp/npe/IxEthDBReports.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBReports.c
diff --git a/cpu/ixp/npe/IxEthDBSearch.c b/arch/arm/cpu/ixp/npe/IxEthDBSearch.c
index 4a10878b6..4a10878b6 100644
--- a/cpu/ixp/npe/IxEthDBSearch.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBSearch.c
diff --git a/cpu/ixp/npe/IxEthDBSpanningTree.c b/arch/arm/cpu/ixp/npe/IxEthDBSpanningTree.c
index 6d9fd6ec1..6d9fd6ec1 100644
--- a/cpu/ixp/npe/IxEthDBSpanningTree.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBSpanningTree.c
diff --git a/cpu/ixp/npe/IxEthDBUtil.c b/arch/arm/cpu/ixp/npe/IxEthDBUtil.c
index e708bf1bc..e708bf1bc 100644
--- a/cpu/ixp/npe/IxEthDBUtil.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBUtil.c
diff --git a/cpu/ixp/npe/IxEthDBVlan.c b/arch/arm/cpu/ixp/npe/IxEthDBVlan.c
index e2efb9b33..e2efb9b33 100644
--- a/cpu/ixp/npe/IxEthDBVlan.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBVlan.c
diff --git a/cpu/ixp/npe/IxEthDBWiFi.c b/arch/arm/cpu/ixp/npe/IxEthDBWiFi.c
index 0a6043f36..0a6043f36 100644
--- a/cpu/ixp/npe/IxEthDBWiFi.c
+++ b/arch/arm/cpu/ixp/npe/IxEthDBWiFi.c
diff --git a/cpu/ixp/npe/IxEthMii.c b/arch/arm/cpu/ixp/npe/IxEthMii.c
index 4d92f17ee..4d92f17ee 100644
--- a/cpu/ixp/npe/IxEthMii.c
+++ b/arch/arm/cpu/ixp/npe/IxEthMii.c
diff --git a/cpu/ixp/npe/IxFeatureCtrl.c b/arch/arm/cpu/ixp/npe/IxFeatureCtrl.c
index 2e196a19a..2e196a19a 100644
--- a/cpu/ixp/npe/IxFeatureCtrl.c
+++ b/arch/arm/cpu/ixp/npe/IxFeatureCtrl.c
diff --git a/cpu/ixp/npe/IxNpeDl.c b/arch/arm/cpu/ixp/npe/IxNpeDl.c
index 373833753..373833753 100644
--- a/cpu/ixp/npe/IxNpeDl.c
+++ b/arch/arm/cpu/ixp/npe/IxNpeDl.c
diff --git a/cpu/ixp/npe/IxNpeDlImageMgr.c b/arch/arm/cpu/ixp/npe/IxNpeDlImageMgr.c
index 9bcdc9c0d..9bcdc9c0d 100644
--- a/cpu/ixp/npe/IxNpeDlImageMgr.c
+++ b/arch/arm/cpu/ixp/npe/IxNpeDlImageMgr.c
diff --git a/cpu/ixp/npe/IxNpeDlNpeMgr.c b/arch/arm/cpu/ixp/npe/IxNpeDlNpeMgr.c
index f5a4c5f50..f5a4c5f50 100644
--- a/cpu/ixp/npe/IxNpeDlNpeMgr.c
+++ b/arch/arm/cpu/ixp/npe/IxNpeDlNpeMgr.c
diff --git a/cpu/ixp/npe/IxNpeDlNpeMgrUtils.c b/arch/arm/cpu/ixp/npe/IxNpeDlNpeMgrUtils.c
index 18cac5020..18cac5020 100644
--- a/cpu/ixp/npe/IxNpeDlNpeMgrUtils.c
+++ b/arch/arm/cpu/ixp/npe/IxNpeDlNpeMgrUtils.c
diff --git a/cpu/ixp/npe/IxNpeMh.c b/arch/arm/cpu/ixp/npe/IxNpeMh.c
index 8703def8b..8703def8b 100644
--- a/cpu/ixp/npe/IxNpeMh.c
+++ b/arch/arm/cpu/ixp/npe/IxNpeMh.c
diff --git a/cpu/ixp/npe/IxNpeMhConfig.c b/arch/arm/cpu/ixp/npe/IxNpeMhConfig.c
index 50c8f2113..50c8f2113 100644
--- a/cpu/ixp/npe/IxNpeMhConfig.c
+++ b/arch/arm/cpu/ixp/npe/IxNpeMhConfig.c
diff --git a/cpu/ixp/npe/IxNpeMhReceive.c b/arch/arm/cpu/ixp/npe/IxNpeMhReceive.c
index 57c8be30e..57c8be30e 100644
--- a/cpu/ixp/npe/IxNpeMhReceive.c
+++ b/arch/arm/cpu/ixp/npe/IxNpeMhReceive.c
diff --git a/cpu/ixp/npe/IxNpeMhSend.c b/arch/arm/cpu/ixp/npe/IxNpeMhSend.c
index 318913ac8..318913ac8 100644
--- a/cpu/ixp/npe/IxNpeMhSend.c
+++ b/arch/arm/cpu/ixp/npe/IxNpeMhSend.c
diff --git a/cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c b/arch/arm/cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c
index 8e083a63b..8e083a63b 100644
--- a/cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c
+++ b/arch/arm/cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c
diff --git a/cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c b/arch/arm/cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c
index d37f9f930..d37f9f930 100644
--- a/cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c
+++ b/arch/arm/cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c
diff --git a/cpu/ixp/npe/IxOsalBufferMgt.c b/arch/arm/cpu/ixp/npe/IxOsalBufferMgt.c
index fa8db477a..fa8db477a 100644
--- a/cpu/ixp/npe/IxOsalBufferMgt.c
+++ b/arch/arm/cpu/ixp/npe/IxOsalBufferMgt.c
diff --git a/cpu/ixp/npe/IxOsalIoMem.c b/arch/arm/cpu/ixp/npe/IxOsalIoMem.c
index 34df92bf7..34df92bf7 100644
--- a/cpu/ixp/npe/IxOsalIoMem.c
+++ b/arch/arm/cpu/ixp/npe/IxOsalIoMem.c
diff --git a/cpu/ixp/npe/IxOsalOsCacheMMU.c b/arch/arm/cpu/ixp/npe/IxOsalOsCacheMMU.c
index 3db1a70da..3db1a70da 100644
--- a/cpu/ixp/npe/IxOsalOsCacheMMU.c
+++ b/arch/arm/cpu/ixp/npe/IxOsalOsCacheMMU.c
diff --git a/cpu/ixp/npe/IxOsalOsMsgQ.c b/arch/arm/cpu/ixp/npe/IxOsalOsMsgQ.c
index 45a5c68b1..45a5c68b1 100644
--- a/cpu/ixp/npe/IxOsalOsMsgQ.c
+++ b/arch/arm/cpu/ixp/npe/IxOsalOsMsgQ.c
diff --git a/cpu/ixp/npe/IxOsalOsSemaphore.c b/arch/arm/cpu/ixp/npe/IxOsalOsSemaphore.c
index 443aefd4f..443aefd4f 100644
--- a/cpu/ixp/npe/IxOsalOsSemaphore.c
+++ b/arch/arm/cpu/ixp/npe/IxOsalOsSemaphore.c
diff --git a/cpu/ixp/npe/IxOsalOsServices.c b/arch/arm/cpu/ixp/npe/IxOsalOsServices.c
index e18c6c4c1..e18c6c4c1 100644
--- a/cpu/ixp/npe/IxOsalOsServices.c
+++ b/arch/arm/cpu/ixp/npe/IxOsalOsServices.c
diff --git a/cpu/ixp/npe/IxOsalOsThread.c b/arch/arm/cpu/ixp/npe/IxOsalOsThread.c
index e6a4967fc..e6a4967fc 100644
--- a/cpu/ixp/npe/IxOsalOsThread.c
+++ b/arch/arm/cpu/ixp/npe/IxOsalOsThread.c
diff --git a/cpu/ixp/npe/IxQMgrAqmIf.c b/arch/arm/cpu/ixp/npe/IxQMgrAqmIf.c
index 738651322..738651322 100644
--- a/cpu/ixp/npe/IxQMgrAqmIf.c
+++ b/arch/arm/cpu/ixp/npe/IxQMgrAqmIf.c
diff --git a/cpu/ixp/npe/IxQMgrDispatcher.c b/arch/arm/cpu/ixp/npe/IxQMgrDispatcher.c
index 09f69ce32..09f69ce32 100644
--- a/cpu/ixp/npe/IxQMgrDispatcher.c
+++ b/arch/arm/cpu/ixp/npe/IxQMgrDispatcher.c
diff --git a/cpu/ixp/npe/IxQMgrInit.c b/arch/arm/cpu/ixp/npe/IxQMgrInit.c
index b00c22d08..b00c22d08 100644
--- a/cpu/ixp/npe/IxQMgrInit.c
+++ b/arch/arm/cpu/ixp/npe/IxQMgrInit.c
diff --git a/cpu/ixp/npe/IxQMgrQAccess.c b/arch/arm/cpu/ixp/npe/IxQMgrQAccess.c
index 888573624..888573624 100644
--- a/cpu/ixp/npe/IxQMgrQAccess.c
+++ b/arch/arm/cpu/ixp/npe/IxQMgrQAccess.c
diff --git a/cpu/ixp/npe/IxQMgrQCfg.c b/arch/arm/cpu/ixp/npe/IxQMgrQCfg.c
index ec7d837c3..ec7d837c3 100644
--- a/cpu/ixp/npe/IxQMgrQCfg.c
+++ b/arch/arm/cpu/ixp/npe/IxQMgrQCfg.c
diff --git a/cpu/ixp/npe/Makefile b/arch/arm/cpu/ixp/npe/Makefile
index 8fefd29eb..e1f970062 100644
--- a/cpu/ixp/npe/Makefile
+++ b/arch/arm/cpu/ixp/npe/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libnpe.a
-LOCAL_CFLAGS += -I$(TOPDIR)/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux
+LOCAL_CFLAGS += -I$(TOPDIR)/arch/arm/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux
CFLAGS += $(LOCAL_CFLAGS)
HOSTCFLAGS += $(LOCAL_CFLAGS)
diff --git a/cpu/ixp/npe/include/IxAssert.h b/arch/arm/cpu/ixp/npe/include/IxAssert.h
index eae8b3f27..eae8b3f27 100644
--- a/cpu/ixp/npe/include/IxAssert.h
+++ b/arch/arm/cpu/ixp/npe/include/IxAssert.h
diff --git a/cpu/ixp/npe/include/IxAtmSch.h b/arch/arm/cpu/ixp/npe/include/IxAtmSch.h
index 73c3be29a..73c3be29a 100644
--- a/cpu/ixp/npe/include/IxAtmSch.h
+++ b/arch/arm/cpu/ixp/npe/include/IxAtmSch.h
diff --git a/cpu/ixp/npe/include/IxAtmTypes.h b/arch/arm/cpu/ixp/npe/include/IxAtmTypes.h
index 8624c3328..8624c3328 100644
--- a/cpu/ixp/npe/include/IxAtmTypes.h
+++ b/arch/arm/cpu/ixp/npe/include/IxAtmTypes.h
diff --git a/cpu/ixp/npe/include/IxAtmdAcc.h b/arch/arm/cpu/ixp/npe/include/IxAtmdAcc.h
index ae7b2434c..ae7b2434c 100644
--- a/cpu/ixp/npe/include/IxAtmdAcc.h
+++ b/arch/arm/cpu/ixp/npe/include/IxAtmdAcc.h
diff --git a/cpu/ixp/npe/include/IxAtmdAccCtrl.h b/arch/arm/cpu/ixp/npe/include/IxAtmdAccCtrl.h
index e2230493f..e2230493f 100644
--- a/cpu/ixp/npe/include/IxAtmdAccCtrl.h
+++ b/arch/arm/cpu/ixp/npe/include/IxAtmdAccCtrl.h
diff --git a/cpu/ixp/npe/include/IxAtmm.h b/arch/arm/cpu/ixp/npe/include/IxAtmm.h
index fcf523fca..fcf523fca 100644
--- a/cpu/ixp/npe/include/IxAtmm.h
+++ b/arch/arm/cpu/ixp/npe/include/IxAtmm.h
diff --git a/cpu/ixp/npe/include/IxDmaAcc.h b/arch/arm/cpu/ixp/npe/include/IxDmaAcc.h
index 45c7527de..45c7527de 100644
--- a/cpu/ixp/npe/include/IxDmaAcc.h
+++ b/arch/arm/cpu/ixp/npe/include/IxDmaAcc.h
diff --git a/cpu/ixp/npe/include/IxEthAcc.h b/arch/arm/cpu/ixp/npe/include/IxEthAcc.h
index ff706c451..ff706c451 100644
--- a/cpu/ixp/npe/include/IxEthAcc.h
+++ b/arch/arm/cpu/ixp/npe/include/IxEthAcc.h
diff --git a/cpu/ixp/npe/include/IxEthAccDataPlane_p.h b/arch/arm/cpu/ixp/npe/include/IxEthAccDataPlane_p.h
index 8b8e6b256..8b8e6b256 100644
--- a/cpu/ixp/npe/include/IxEthAccDataPlane_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxEthAccDataPlane_p.h
diff --git a/cpu/ixp/npe/include/IxEthAccMac_p.h b/arch/arm/cpu/ixp/npe/include/IxEthAccMac_p.h
index 93e9d98e7..93e9d98e7 100644
--- a/cpu/ixp/npe/include/IxEthAccMac_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxEthAccMac_p.h
diff --git a/cpu/ixp/npe/include/IxEthAccMii_p.h b/arch/arm/cpu/ixp/npe/include/IxEthAccMii_p.h
index 568d4a0fa..568d4a0fa 100644
--- a/cpu/ixp/npe/include/IxEthAccMii_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxEthAccMii_p.h
diff --git a/cpu/ixp/npe/include/IxEthAccQueueAssign_p.h b/arch/arm/cpu/ixp/npe/include/IxEthAccQueueAssign_p.h
index e5fd16e2f..e5fd16e2f 100644
--- a/cpu/ixp/npe/include/IxEthAccQueueAssign_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxEthAccQueueAssign_p.h
diff --git a/cpu/ixp/npe/include/IxEthAcc_p.h b/arch/arm/cpu/ixp/npe/include/IxEthAcc_p.h
index 0ee412355..0ee412355 100644
--- a/cpu/ixp/npe/include/IxEthAcc_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxEthAcc_p.h
diff --git a/cpu/ixp/npe/include/IxEthDB.h b/arch/arm/cpu/ixp/npe/include/IxEthDB.h
index 1189c9a14..1189c9a14 100644
--- a/cpu/ixp/npe/include/IxEthDB.h
+++ b/arch/arm/cpu/ixp/npe/include/IxEthDB.h
diff --git a/cpu/ixp/npe/include/IxEthDBLocks_p.h b/arch/arm/cpu/ixp/npe/include/IxEthDBLocks_p.h
index 1d8b24fdf..1d8b24fdf 100644
--- a/cpu/ixp/npe/include/IxEthDBLocks_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxEthDBLocks_p.h
diff --git a/cpu/ixp/npe/include/IxEthDBLog_p.h b/arch/arm/cpu/ixp/npe/include/IxEthDBLog_p.h
index 1d6b0bb20..1d6b0bb20 100644
--- a/cpu/ixp/npe/include/IxEthDBLog_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxEthDBLog_p.h
diff --git a/cpu/ixp/npe/include/IxEthDBMessages_p.h b/arch/arm/cpu/ixp/npe/include/IxEthDBMessages_p.h
index ff18160c1..ff18160c1 100644
--- a/cpu/ixp/npe/include/IxEthDBMessages_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxEthDBMessages_p.h
diff --git a/cpu/ixp/npe/include/IxEthDBPortDefs.h b/arch/arm/cpu/ixp/npe/include/IxEthDBPortDefs.h
index c3acbddde..c3acbddde 100644
--- a/cpu/ixp/npe/include/IxEthDBPortDefs.h
+++ b/arch/arm/cpu/ixp/npe/include/IxEthDBPortDefs.h
diff --git a/cpu/ixp/npe/include/IxEthDBQoS.h b/arch/arm/cpu/ixp/npe/include/IxEthDBQoS.h
index 6d3488945..6d3488945 100644
--- a/cpu/ixp/npe/include/IxEthDBQoS.h
+++ b/arch/arm/cpu/ixp/npe/include/IxEthDBQoS.h
diff --git a/cpu/ixp/npe/include/IxEthDB_p.h b/arch/arm/cpu/ixp/npe/include/IxEthDB_p.h
index ccec7ea7b..ccec7ea7b 100644
--- a/cpu/ixp/npe/include/IxEthDB_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxEthDB_p.h
diff --git a/cpu/ixp/npe/include/IxEthMii.h b/arch/arm/cpu/ixp/npe/include/IxEthMii.h
index 397253a94..397253a94 100644
--- a/cpu/ixp/npe/include/IxEthMii.h
+++ b/arch/arm/cpu/ixp/npe/include/IxEthMii.h
diff --git a/cpu/ixp/npe/include/IxEthMii_p.h b/arch/arm/cpu/ixp/npe/include/IxEthMii_p.h
index 104b65c1f..104b65c1f 100644
--- a/cpu/ixp/npe/include/IxEthMii_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxEthMii_p.h
diff --git a/cpu/ixp/npe/include/IxEthNpe.h b/arch/arm/cpu/ixp/npe/include/IxEthNpe.h
index 21bdedc5a..21bdedc5a 100644
--- a/cpu/ixp/npe/include/IxEthNpe.h
+++ b/arch/arm/cpu/ixp/npe/include/IxEthNpe.h
diff --git a/cpu/ixp/npe/include/IxFeatureCtrl.h b/arch/arm/cpu/ixp/npe/include/IxFeatureCtrl.h
index dabc38e25..dabc38e25 100644
--- a/cpu/ixp/npe/include/IxFeatureCtrl.h
+++ b/arch/arm/cpu/ixp/npe/include/IxFeatureCtrl.h
diff --git a/cpu/ixp/npe/include/IxHssAcc.h b/arch/arm/cpu/ixp/npe/include/IxHssAcc.h
index 07bb119b0..07bb119b0 100644
--- a/cpu/ixp/npe/include/IxHssAcc.h
+++ b/arch/arm/cpu/ixp/npe/include/IxHssAcc.h
diff --git a/cpu/ixp/npe/include/IxI2cDrv.h b/arch/arm/cpu/ixp/npe/include/IxI2cDrv.h
index 92c6b24b4..92c6b24b4 100644
--- a/cpu/ixp/npe/include/IxI2cDrv.h
+++ b/arch/arm/cpu/ixp/npe/include/IxI2cDrv.h
diff --git a/cpu/ixp/npe/include/IxNpeA.h b/arch/arm/cpu/ixp/npe/include/IxNpeA.h
index 7427cc41c..7427cc41c 100644
--- a/cpu/ixp/npe/include/IxNpeA.h
+++ b/arch/arm/cpu/ixp/npe/include/IxNpeA.h
diff --git a/cpu/ixp/npe/include/IxNpeDl.h b/arch/arm/cpu/ixp/npe/include/IxNpeDl.h
index 86f69f414..86f69f414 100644
--- a/cpu/ixp/npe/include/IxNpeDl.h
+++ b/arch/arm/cpu/ixp/npe/include/IxNpeDl.h
diff --git a/cpu/ixp/npe/include/IxNpeDlImageMgr_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeDlImageMgr_p.h
index 622f879a4..622f879a4 100644
--- a/cpu/ixp/npe/include/IxNpeDlImageMgr_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxNpeDlImageMgr_p.h
diff --git a/cpu/ixp/npe/include/IxNpeDlMacros_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeDlMacros_p.h
index e32906a63..e32906a63 100644
--- a/cpu/ixp/npe/include/IxNpeDlMacros_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxNpeDlMacros_p.h
diff --git a/cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h
index f68212667..f68212667 100644
--- a/cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h
diff --git a/cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h
index a752f26e8..a752f26e8 100644
--- a/cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h
diff --git a/cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h
index b7fb0f021..b7fb0f021 100644
--- a/cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h
diff --git a/cpu/ixp/npe/include/IxNpeMh.h b/arch/arm/cpu/ixp/npe/include/IxNpeMh.h
index 20ee38b06..20ee38b06 100644
--- a/cpu/ixp/npe/include/IxNpeMh.h
+++ b/arch/arm/cpu/ixp/npe/include/IxNpeMh.h
diff --git a/cpu/ixp/npe/include/IxNpeMhConfig_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhConfig_p.h
index 375b3468e..375b3468e 100644
--- a/cpu/ixp/npe/include/IxNpeMhConfig_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxNpeMhConfig_p.h
diff --git a/cpu/ixp/npe/include/IxNpeMhMacros_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhMacros_p.h
index 68f34ef35..68f34ef35 100644
--- a/cpu/ixp/npe/include/IxNpeMhMacros_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxNpeMhMacros_p.h
diff --git a/cpu/ixp/npe/include/IxNpeMhReceive_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhReceive_p.h
index 6416bedcb..6416bedcb 100644
--- a/cpu/ixp/npe/include/IxNpeMhReceive_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxNpeMhReceive_p.h
diff --git a/cpu/ixp/npe/include/IxNpeMhSend_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhSend_p.h
index 977cc94a7..977cc94a7 100644
--- a/cpu/ixp/npe/include/IxNpeMhSend_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxNpeMhSend_p.h
diff --git a/cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h
index 40cd496c9..40cd496c9 100644
--- a/cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h
diff --git a/cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h
index dea8cafa2..dea8cafa2 100644
--- a/cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h
diff --git a/cpu/ixp/npe/include/IxNpeMicrocode.h b/arch/arm/cpu/ixp/npe/include/IxNpeMicrocode.h
index 893d8030a..893d8030a 100644
--- a/cpu/ixp/npe/include/IxNpeMicrocode.h
+++ b/arch/arm/cpu/ixp/npe/include/IxNpeMicrocode.h
diff --git a/cpu/ixp/npe/include/IxOsBufLib.h b/arch/arm/cpu/ixp/npe/include/IxOsBufLib.h
index a297a97d8..a297a97d8 100644
--- a/cpu/ixp/npe/include/IxOsBufLib.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsBufLib.h
diff --git a/cpu/ixp/npe/include/IxOsBuffMgt.h b/arch/arm/cpu/ixp/npe/include/IxOsBuffMgt.h
index b7de712bc..b7de712bc 100644
--- a/cpu/ixp/npe/include/IxOsBuffMgt.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsBuffMgt.h
diff --git a/cpu/ixp/npe/include/IxOsBuffPoolMgt.h b/arch/arm/cpu/ixp/npe/include/IxOsBuffPoolMgt.h
index 4a983c791..4a983c791 100644
--- a/cpu/ixp/npe/include/IxOsBuffPoolMgt.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsBuffPoolMgt.h
diff --git a/cpu/ixp/npe/include/IxOsCacheMMU.h b/arch/arm/cpu/ixp/npe/include/IxOsCacheMMU.h
index 2c8592fe8..2c8592fe8 100644
--- a/cpu/ixp/npe/include/IxOsCacheMMU.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsCacheMMU.h
diff --git a/cpu/ixp/npe/include/IxOsPrintf.h b/arch/arm/cpu/ixp/npe/include/IxOsPrintf.h
index 218e14093..218e14093 100644
--- a/cpu/ixp/npe/include/IxOsPrintf.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsPrintf.h
diff --git a/cpu/ixp/npe/include/IxOsServices.h b/arch/arm/cpu/ixp/npe/include/IxOsServices.h
index 62e8a790b..62e8a790b 100644
--- a/cpu/ixp/npe/include/IxOsServices.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsServices.h
diff --git a/cpu/ixp/npe/include/IxOsServicesComponents.h b/arch/arm/cpu/ixp/npe/include/IxOsServicesComponents.h
index d662cd3ee..d662cd3ee 100644
--- a/cpu/ixp/npe/include/IxOsServicesComponents.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsServicesComponents.h
diff --git a/cpu/ixp/npe/include/IxOsServicesEndianess.h b/arch/arm/cpu/ixp/npe/include/IxOsServicesEndianess.h
index 0d6cd8cce..0d6cd8cce 100644
--- a/cpu/ixp/npe/include/IxOsServicesEndianess.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsServicesEndianess.h
diff --git a/cpu/ixp/npe/include/IxOsServicesMemAccess.h b/arch/arm/cpu/ixp/npe/include/IxOsServicesMemAccess.h
index 58e994106..58e994106 100644
--- a/cpu/ixp/npe/include/IxOsServicesMemAccess.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsServicesMemAccess.h
diff --git a/cpu/ixp/npe/include/IxOsServicesMemMap.h b/arch/arm/cpu/ixp/npe/include/IxOsServicesMemMap.h
index 4ce37c3f6..4ce37c3f6 100644
--- a/cpu/ixp/npe/include/IxOsServicesMemMap.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsServicesMemMap.h
diff --git a/cpu/ixp/npe/include/IxOsal.h b/arch/arm/cpu/ixp/npe/include/IxOsal.h
index b2a93a5db..b2a93a5db 100644
--- a/cpu/ixp/npe/include/IxOsal.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsal.h
diff --git a/cpu/ixp/npe/include/IxOsalAssert.h b/arch/arm/cpu/ixp/npe/include/IxOsalAssert.h
index 04a4f515a..04a4f515a 100644
--- a/cpu/ixp/npe/include/IxOsalAssert.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalAssert.h
diff --git a/cpu/ixp/npe/include/IxOsalBackward.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackward.h
index ea9f30731..ea9f30731 100644
--- a/cpu/ixp/npe/include/IxOsalBackward.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalBackward.h
diff --git a/cpu/ixp/npe/include/IxOsalBackwardAssert.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardAssert.h
index be1e27255..be1e27255 100644
--- a/cpu/ixp/npe/include/IxOsalBackwardAssert.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardAssert.h
diff --git a/cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h
index 4cf80d31e..4cf80d31e 100644
--- a/cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h
diff --git a/cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h
index fe570e641..fe570e641 100644
--- a/cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h
diff --git a/cpu/ixp/npe/include/IxOsalBackwardMemMap.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardMemMap.h
index 3881a3b6d..3881a3b6d 100644
--- a/cpu/ixp/npe/include/IxOsalBackwardMemMap.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardMemMap.h
diff --git a/cpu/ixp/npe/include/IxOsalBackwardOsServices.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardOsServices.h
index 0ccff84ae..0ccff84ae 100644
--- a/cpu/ixp/npe/include/IxOsalBackwardOsServices.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardOsServices.h
diff --git a/cpu/ixp/npe/include/IxOsalBackwardOssl.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardOssl.h
index 634b494ae..634b494ae 100644
--- a/cpu/ixp/npe/include/IxOsalBackwardOssl.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardOssl.h
diff --git a/cpu/ixp/npe/include/IxOsalBufferMgt.h b/arch/arm/cpu/ixp/npe/include/IxOsalBufferMgt.h
index 497ed0471..497ed0471 100644
--- a/cpu/ixp/npe/include/IxOsalBufferMgt.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalBufferMgt.h
diff --git a/cpu/ixp/npe/include/IxOsalBufferMgtDefault.h b/arch/arm/cpu/ixp/npe/include/IxOsalBufferMgtDefault.h
index 684b52edb..684b52edb 100644
--- a/cpu/ixp/npe/include/IxOsalBufferMgtDefault.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalBufferMgtDefault.h
diff --git a/cpu/ixp/npe/include/IxOsalConfig.h b/arch/arm/cpu/ixp/npe/include/IxOsalConfig.h
index d56e79639..d56e79639 100644
--- a/cpu/ixp/npe/include/IxOsalConfig.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalConfig.h
diff --git a/cpu/ixp/npe/include/IxOsalEndianess.h b/arch/arm/cpu/ixp/npe/include/IxOsalEndianess.h
index 3b1c73947..3b1c73947 100644
--- a/cpu/ixp/npe/include/IxOsalEndianess.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalEndianess.h
diff --git a/cpu/ixp/npe/include/IxOsalIoMem.h b/arch/arm/cpu/ixp/npe/include/IxOsalIoMem.h
index ea6d64d00..ea6d64d00 100644
--- a/cpu/ixp/npe/include/IxOsalIoMem.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalIoMem.h
diff --git a/cpu/ixp/npe/include/IxOsalMemAccess.h b/arch/arm/cpu/ixp/npe/include/IxOsalMemAccess.h
index 9e7fb87be..9e7fb87be 100644
--- a/cpu/ixp/npe/include/IxOsalMemAccess.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalMemAccess.h
diff --git a/cpu/ixp/npe/include/IxOsalOem.h b/arch/arm/cpu/ixp/npe/include/IxOsalOem.h
index f89402620..f89402620 100644
--- a/cpu/ixp/npe/include/IxOsalOem.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalOem.h
diff --git a/cpu/ixp/npe/include/IxOsalOs.h b/arch/arm/cpu/ixp/npe/include/IxOsalOs.h
index 6c6661341..6c6661341 100644
--- a/cpu/ixp/npe/include/IxOsalOs.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalOs.h
diff --git a/cpu/ixp/npe/include/IxOsalOsAssert.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsAssert.h
index e4c3e1f61..e4c3e1f61 100644
--- a/cpu/ixp/npe/include/IxOsalOsAssert.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalOsAssert.h
diff --git a/cpu/ixp/npe/include/IxOsalOsBufferMgt.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsBufferMgt.h
index 8e46586ea..8e46586ea 100644
--- a/cpu/ixp/npe/include/IxOsalOsBufferMgt.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalOsBufferMgt.h
diff --git a/cpu/ixp/npe/include/IxOsalOsIxp400.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400.h
index 44a94fb30..44a94fb30 100644
--- a/cpu/ixp/npe/include/IxOsalOsIxp400.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400.h
diff --git a/cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h
index 47ce3a2d8..47ce3a2d8 100644
--- a/cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h
diff --git a/cpu/ixp/npe/include/IxOsalOsTypes.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsTypes.h
index 272eef185..272eef185 100644
--- a/cpu/ixp/npe/include/IxOsalOsTypes.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalOsTypes.h
diff --git a/cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h
index beb45a079..beb45a079 100644
--- a/cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h
diff --git a/cpu/ixp/npe/include/IxOsalTypes.h b/arch/arm/cpu/ixp/npe/include/IxOsalTypes.h
index a190a707e..a190a707e 100644
--- a/cpu/ixp/npe/include/IxOsalTypes.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalTypes.h
diff --git a/cpu/ixp/npe/include/IxOsalUtilitySymbols.h b/arch/arm/cpu/ixp/npe/include/IxOsalUtilitySymbols.h
index f2a73db8b..f2a73db8b 100644
--- a/cpu/ixp/npe/include/IxOsalUtilitySymbols.h
+++ b/arch/arm/cpu/ixp/npe/include/IxOsalUtilitySymbols.h
diff --git a/cpu/ixp/npe/include/IxParityENAcc.h b/arch/arm/cpu/ixp/npe/include/IxParityENAcc.h
index 62fe1714f..62fe1714f 100644
--- a/cpu/ixp/npe/include/IxParityENAcc.h
+++ b/arch/arm/cpu/ixp/npe/include/IxParityENAcc.h
diff --git a/cpu/ixp/npe/include/IxPerfProfAcc.h b/arch/arm/cpu/ixp/npe/include/IxPerfProfAcc.h
index 65c0ba96a..65c0ba96a 100644
--- a/cpu/ixp/npe/include/IxPerfProfAcc.h
+++ b/arch/arm/cpu/ixp/npe/include/IxPerfProfAcc.h
diff --git a/cpu/ixp/npe/include/IxQMgr.h b/arch/arm/cpu/ixp/npe/include/IxQMgr.h
index 165ed96e5..165ed96e5 100644
--- a/cpu/ixp/npe/include/IxQMgr.h
+++ b/arch/arm/cpu/ixp/npe/include/IxQMgr.h
diff --git a/cpu/ixp/npe/include/IxQMgrAqmIf_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrAqmIf_p.h
index 4f0f64d27..4f0f64d27 100644
--- a/cpu/ixp/npe/include/IxQMgrAqmIf_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxQMgrAqmIf_p.h
diff --git a/cpu/ixp/npe/include/IxQMgrDefines_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrDefines_p.h
index 0183596af..0183596af 100644
--- a/cpu/ixp/npe/include/IxQMgrDefines_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxQMgrDefines_p.h
diff --git a/cpu/ixp/npe/include/IxQMgrDispatcher_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrDispatcher_p.h
index 71a3f8588..71a3f8588 100644
--- a/cpu/ixp/npe/include/IxQMgrDispatcher_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxQMgrDispatcher_p.h
diff --git a/cpu/ixp/npe/include/IxQMgrLog_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrLog_p.h
index 6b685b8a2..6b685b8a2 100644
--- a/cpu/ixp/npe/include/IxQMgrLog_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxQMgrLog_p.h
diff --git a/cpu/ixp/npe/include/IxQMgrQAccess_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrQAccess_p.h
index 8612670a1..8612670a1 100644
--- a/cpu/ixp/npe/include/IxQMgrQAccess_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxQMgrQAccess_p.h
diff --git a/cpu/ixp/npe/include/IxQMgrQCfg_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrQCfg_p.h
index c9dae1ef0..c9dae1ef0 100644
--- a/cpu/ixp/npe/include/IxQMgrQCfg_p.h
+++ b/arch/arm/cpu/ixp/npe/include/IxQMgrQCfg_p.h
diff --git a/cpu/ixp/npe/include/IxQueueAssignments.h b/arch/arm/cpu/ixp/npe/include/IxQueueAssignments.h
index f7194e72e..f7194e72e 100644
--- a/cpu/ixp/npe/include/IxQueueAssignments.h
+++ b/arch/arm/cpu/ixp/npe/include/IxQueueAssignments.h
diff --git a/cpu/ixp/npe/include/IxSspAcc.h b/arch/arm/cpu/ixp/npe/include/IxSspAcc.h
index 35e7abf06..35e7abf06 100644
--- a/cpu/ixp/npe/include/IxSspAcc.h
+++ b/arch/arm/cpu/ixp/npe/include/IxSspAcc.h
diff --git a/cpu/ixp/npe/include/IxTimeSyncAcc.h b/arch/arm/cpu/ixp/npe/include/IxTimeSyncAcc.h
index 25effed90..25effed90 100644
--- a/cpu/ixp/npe/include/IxTimeSyncAcc.h
+++ b/arch/arm/cpu/ixp/npe/include/IxTimeSyncAcc.h
diff --git a/cpu/ixp/npe/include/IxTimerCtrl.h b/arch/arm/cpu/ixp/npe/include/IxTimerCtrl.h
index 669dd3ef2..669dd3ef2 100644
--- a/cpu/ixp/npe/include/IxTimerCtrl.h
+++ b/arch/arm/cpu/ixp/npe/include/IxTimerCtrl.h
diff --git a/cpu/ixp/npe/include/IxTypes.h b/arch/arm/cpu/ixp/npe/include/IxTypes.h
index c4c5a2d26..c4c5a2d26 100644
--- a/cpu/ixp/npe/include/IxTypes.h
+++ b/arch/arm/cpu/ixp/npe/include/IxTypes.h
diff --git a/cpu/ixp/npe/include/IxUART.h b/arch/arm/cpu/ixp/npe/include/IxUART.h
index 03a44441c..03a44441c 100644
--- a/cpu/ixp/npe/include/IxUART.h
+++ b/arch/arm/cpu/ixp/npe/include/IxUART.h
diff --git a/cpu/ixp/npe/include/IxVersionId.h b/arch/arm/cpu/ixp/npe/include/IxVersionId.h
index 27796ede8..27796ede8 100644
--- a/cpu/ixp/npe/include/IxVersionId.h
+++ b/arch/arm/cpu/ixp/npe/include/IxVersionId.h
diff --git a/cpu/ixp/npe/include/ix_error.h b/arch/arm/cpu/ixp/npe/include/ix_error.h
index d32ace20b..d32ace20b 100644
--- a/cpu/ixp/npe/include/ix_error.h
+++ b/arch/arm/cpu/ixp/npe/include/ix_error.h
diff --git a/cpu/ixp/npe/include/ix_macros.h b/arch/arm/cpu/ixp/npe/include/ix_macros.h
index 53f5942f9..53f5942f9 100644
--- a/cpu/ixp/npe/include/ix_macros.h
+++ b/arch/arm/cpu/ixp/npe/include/ix_macros.h
diff --git a/cpu/ixp/npe/include/ix_os_type.h b/arch/arm/cpu/ixp/npe/include/ix_os_type.h
index 857509672..857509672 100644
--- a/cpu/ixp/npe/include/ix_os_type.h
+++ b/arch/arm/cpu/ixp/npe/include/ix_os_type.h
diff --git a/cpu/ixp/npe/include/ix_ossl.h b/arch/arm/cpu/ixp/npe/include/ix_ossl.h
index b59f7d087..b59f7d087 100644
--- a/cpu/ixp/npe/include/ix_ossl.h
+++ b/arch/arm/cpu/ixp/npe/include/ix_ossl.h
diff --git a/cpu/ixp/npe/include/ix_symbols.h b/arch/arm/cpu/ixp/npe/include/ix_symbols.h
index f7bb029d6..f7bb029d6 100644
--- a/cpu/ixp/npe/include/ix_symbols.h
+++ b/arch/arm/cpu/ixp/npe/include/ix_symbols.h
diff --git a/cpu/ixp/npe/include/ix_types.h b/arch/arm/cpu/ixp/npe/include/ix_types.h
index fc7b1e993..fc7b1e993 100644
--- a/cpu/ixp/npe/include/ix_types.h
+++ b/arch/arm/cpu/ixp/npe/include/ix_types.h
diff --git a/cpu/ixp/npe/include/npe.h b/arch/arm/cpu/ixp/npe/include/npe.h
index 3d6f72747..3d6f72747 100644
--- a/cpu/ixp/npe/include/npe.h
+++ b/arch/arm/cpu/ixp/npe/include/npe.h
diff --git a/cpu/ixp/npe/include/os_datatypes.h b/arch/arm/cpu/ixp/npe/include/os_datatypes.h
index 4387b2a05..4387b2a05 100644
--- a/cpu/ixp/npe/include/os_datatypes.h
+++ b/arch/arm/cpu/ixp/npe/include/os_datatypes.h
diff --git a/cpu/ixp/npe/miiphy.c b/arch/arm/cpu/ixp/npe/miiphy.c
index b208c51ea..b208c51ea 100644
--- a/cpu/ixp/npe/miiphy.c
+++ b/arch/arm/cpu/ixp/npe/miiphy.c
diff --git a/cpu/ixp/npe/npe.c b/arch/arm/cpu/ixp/npe/npe.c
index 2e6868960..2e6868960 100644
--- a/cpu/ixp/npe/npe.c
+++ b/arch/arm/cpu/ixp/npe/npe.c
diff --git a/cpu/ixp/start.S b/arch/arm/cpu/ixp/start.S
index 5ebce5338..5ebce5338 100644
--- a/cpu/ixp/start.S
+++ b/arch/arm/cpu/ixp/start.S
diff --git a/cpu/ixp/timer.c b/arch/arm/cpu/ixp/timer.c
index edf341ff9..edf341ff9 100644
--- a/cpu/ixp/timer.c
+++ b/arch/arm/cpu/ixp/timer.c
diff --git a/cpu/ixp/u-boot.lds b/arch/arm/cpu/ixp/u-boot.lds
index 85209caf7..b8ff2eed5 100644
--- a/cpu/ixp/u-boot.lds
+++ b/arch/arm/cpu/ixp/u-boot.lds
@@ -31,7 +31,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/ixp/start.o(.text)
+ arch/arm/cpu/ixp/start.o(.text)
*(.text)
}
diff --git a/cpu/lh7a40x/Makefile b/arch/arm/cpu/lh7a40x/Makefile
index 1b3f58abb..1b3f58abb 100644
--- a/cpu/lh7a40x/Makefile
+++ b/arch/arm/cpu/lh7a40x/Makefile
diff --git a/cpu/lh7a40x/config.mk b/arch/arm/cpu/lh7a40x/config.mk
index 47b2b7b72..47b2b7b72 100644
--- a/cpu/lh7a40x/config.mk
+++ b/arch/arm/cpu/lh7a40x/config.mk
diff --git a/cpu/lh7a40x/cpu.c b/arch/arm/cpu/lh7a40x/cpu.c
index b19318912..b19318912 100644
--- a/cpu/lh7a40x/cpu.c
+++ b/arch/arm/cpu/lh7a40x/cpu.c
diff --git a/cpu/lh7a40x/speed.c b/arch/arm/cpu/lh7a40x/speed.c
index 333ebb504..333ebb504 100644
--- a/cpu/lh7a40x/speed.c
+++ b/arch/arm/cpu/lh7a40x/speed.c
diff --git a/cpu/lh7a40x/start.S b/arch/arm/cpu/lh7a40x/start.S
index a1321b1d7..a1321b1d7 100644
--- a/cpu/lh7a40x/start.S
+++ b/arch/arm/cpu/lh7a40x/start.S
diff --git a/cpu/lh7a40x/timer.c b/arch/arm/cpu/lh7a40x/timer.c
index 2691315d8..2691315d8 100644
--- a/cpu/lh7a40x/timer.c
+++ b/arch/arm/cpu/lh7a40x/timer.c
diff --git a/cpu/lh7a40x/u-boot.lds b/arch/arm/cpu/lh7a40x/u-boot.lds
index e7543c97c..5a8ccf588 100644
--- a/cpu/lh7a40x/u-boot.lds
+++ b/arch/arm/cpu/lh7a40x/u-boot.lds
@@ -31,7 +31,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/lh7a40x/start.o (.text)
+ arch/arm/cpu/lh7a40x/start.o (.text)
*(.text)
}
diff --git a/cpu/pxa/Makefile b/arch/arm/cpu/pxa/Makefile
index 07a151a17..07a151a17 100644
--- a/cpu/pxa/Makefile
+++ b/arch/arm/cpu/pxa/Makefile
diff --git a/cpu/pxa/config.mk b/arch/arm/cpu/pxa/config.mk
index a05d69ca2..a05d69ca2 100644
--- a/cpu/pxa/config.mk
+++ b/arch/arm/cpu/pxa/config.mk
diff --git a/cpu/pxa/cpu.c b/arch/arm/cpu/pxa/cpu.c
index 800d120e7..800d120e7 100644
--- a/cpu/pxa/cpu.c
+++ b/arch/arm/cpu/pxa/cpu.c
diff --git a/cpu/pxa/i2c.c b/arch/arm/cpu/pxa/i2c.c
index 6b72ba13a..6b72ba13a 100644
--- a/cpu/pxa/i2c.c
+++ b/arch/arm/cpu/pxa/i2c.c
diff --git a/cpu/pxa/pxafb.c b/arch/arm/cpu/pxa/pxafb.c
index d56c5f099..d56c5f099 100644
--- a/cpu/pxa/pxafb.c
+++ b/arch/arm/cpu/pxa/pxafb.c
diff --git a/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S
index 63ab0c591..63ab0c591 100644
--- a/cpu/pxa/start.S
+++ b/arch/arm/cpu/pxa/start.S
diff --git a/cpu/pxa/timer.c b/arch/arm/cpu/pxa/timer.c
index 8d0f82679..8d0f82679 100644
--- a/cpu/pxa/timer.c
+++ b/arch/arm/cpu/pxa/timer.c
diff --git a/cpu/pxa/u-boot.lds b/arch/arm/cpu/pxa/u-boot.lds
index 77ab3c902..d4e85ef55 100644
--- a/cpu/pxa/u-boot.lds
+++ b/arch/arm/cpu/pxa/u-boot.lds
@@ -31,7 +31,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/pxa/start.o (.text)
+ arch/arm/cpu/pxa/start.o (.text)
*(.text)
}
diff --git a/cpu/pxa/usb.c b/arch/arm/cpu/pxa/usb.c
index bd718a6ff..bd718a6ff 100644
--- a/cpu/pxa/usb.c
+++ b/arch/arm/cpu/pxa/usb.c
diff --git a/cpu/s3c44b0/Makefile b/arch/arm/cpu/s3c44b0/Makefile
index 6da2016f6..6da2016f6 100644
--- a/cpu/s3c44b0/Makefile
+++ b/arch/arm/cpu/s3c44b0/Makefile
diff --git a/cpu/s3c44b0/cache.c b/arch/arm/cpu/s3c44b0/cache.c
index 66974f61a..66974f61a 100644
--- a/cpu/s3c44b0/cache.c
+++ b/arch/arm/cpu/s3c44b0/cache.c
diff --git a/cpu/s3c44b0/config.mk b/arch/arm/cpu/s3c44b0/config.mk
index 7454d728a..7454d728a 100644
--- a/cpu/s3c44b0/config.mk
+++ b/arch/arm/cpu/s3c44b0/config.mk
diff --git a/cpu/s3c44b0/cpu.c b/arch/arm/cpu/s3c44b0/cpu.c
index bca38f81d..bca38f81d 100644
--- a/cpu/s3c44b0/cpu.c
+++ b/arch/arm/cpu/s3c44b0/cpu.c
diff --git a/cpu/s3c44b0/start.S b/arch/arm/cpu/s3c44b0/start.S
index f5a3d3ac3..f5a3d3ac3 100644
--- a/cpu/s3c44b0/start.S
+++ b/arch/arm/cpu/s3c44b0/start.S
diff --git a/cpu/s3c44b0/timer.c b/arch/arm/cpu/s3c44b0/timer.c
index 6f1d8f677..6f1d8f677 100644
--- a/cpu/s3c44b0/timer.c
+++ b/arch/arm/cpu/s3c44b0/timer.c
diff --git a/cpu/s3c44b0/u-boot.lds b/arch/arm/cpu/s3c44b0/u-boot.lds
index 41ca3b4e8..267d94c08 100644
--- a/cpu/s3c44b0/u-boot.lds
+++ b/arch/arm/cpu/s3c44b0/u-boot.lds
@@ -31,7 +31,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/s3c44b0/start.o (.text)
+ arch/arm/cpu/s3c44b0/start.o (.text)
*(.text)
}
diff --git a/cpu/sa1100/Makefile b/arch/arm/cpu/sa1100/Makefile
index 28b668267..28b668267 100644
--- a/cpu/sa1100/Makefile
+++ b/arch/arm/cpu/sa1100/Makefile
diff --git a/cpu/sa1100/config.mk b/arch/arm/cpu/sa1100/config.mk
index 6f21f410b..6f21f410b 100644
--- a/cpu/sa1100/config.mk
+++ b/arch/arm/cpu/sa1100/config.mk
diff --git a/cpu/sa1100/cpu.c b/arch/arm/cpu/sa1100/cpu.c
index 58e90dc9f..58e90dc9f 100644
--- a/cpu/sa1100/cpu.c
+++ b/arch/arm/cpu/sa1100/cpu.c
diff --git a/cpu/sa1100/start.S b/arch/arm/cpu/sa1100/start.S
index 278c5008f..278c5008f 100644
--- a/cpu/sa1100/start.S
+++ b/arch/arm/cpu/sa1100/start.S
diff --git a/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c
index 020750125..020750125 100644
--- a/cpu/sa1100/timer.c
+++ b/arch/arm/cpu/sa1100/timer.c
diff --git a/cpu/sa1100/u-boot.lds b/arch/arm/cpu/sa1100/u-boot.lds
index 0c02e76e7..f6197acd8 100644
--- a/cpu/sa1100/u-boot.lds
+++ b/arch/arm/cpu/sa1100/u-boot.lds
@@ -34,7 +34,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/sa1100/start.o (.text)
+ arch/arm/cpu/sa1100/start.o (.text)
*(.text)
}
diff --git a/arch/arm/include/asm/arch-mx51/asm-offsets.h b/arch/arm/include/asm/arch-mx51/asm-offsets.h
index 3a83fa07a..fbba412aa 100644
--- a/arch/arm/include/asm/arch-mx51/asm-offsets.h
+++ b/arch/arm/include/asm/arch-mx51/asm-offsets.h
@@ -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
*/
diff --git a/board/actux1/config.mk b/board/actux1/config.mk
index 119140d8c..a0dbe0bc4 100644
--- a/board/actux1/config.mk
+++ b/board/actux1/config.mk
@@ -1,6 +1,6 @@
TEXT_BASE = 0x00e00000
# include NPE ethernet driver
-BOARDLIBS = cpu/ixp/npe/libnpe.a
+BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a
LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds
index 40b5ef3bd..5c1ece79c 100644
--- a/board/actux1/u-boot.lds
+++ b/board/actux1/u-boot.lds
@@ -30,12 +30,12 @@ SECTIONS
. = ALIGN (4);
.text : {
- cpu/ixp/start.o(.text)
+ arch/arm/cpu/ixp/start.o(.text)
lib/string.o(.text)
lib/vsprintf.o(.text)
arch/arm/lib/board.o(.text)
common/dlmalloc.o(.text)
- cpu/ixp/cpu.o(.text)
+ arch/arm/cpu/ixp/cpu.o(.text)
. = env_offset;
common/env_embedded.o(.ppcenv)
* (.text)
diff --git a/board/actux2/config.mk b/board/actux2/config.mk
index 119140d8c..a0dbe0bc4 100644
--- a/board/actux2/config.mk
+++ b/board/actux2/config.mk
@@ -1,6 +1,6 @@
TEXT_BASE = 0x00e00000
# include NPE ethernet driver
-BOARDLIBS = cpu/ixp/npe/libnpe.a
+BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a
LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds
index f9ab281bc..707c027ab 100644
--- a/board/actux2/u-boot.lds
+++ b/board/actux2/u-boot.lds
@@ -30,12 +30,12 @@ SECTIONS
. = ALIGN (4);
.text : {
- cpu/ixp/start.o(.text)
+ arch/arm/cpu/ixp/start.o(.text)
lib/string.o(.text)
lib/vsprintf.o(.text)
arch/arm/lib/board.o(.text)
common/dlmalloc.o(.text)
- cpu/ixp/cpu.o(.text)
+ arch/arm/cpu/ixp/cpu.o(.text)
. = env_offset;
common/env_embedded.o (.ppcenv)
diff --git a/board/actux3/config.mk b/board/actux3/config.mk
index 119140d8c..a0dbe0bc4 100644
--- a/board/actux3/config.mk
+++ b/board/actux3/config.mk
@@ -1,6 +1,6 @@
TEXT_BASE = 0x00e00000
# include NPE ethernet driver
-BOARDLIBS = cpu/ixp/npe/libnpe.a
+BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a
LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds
index 2fc379615..497ab9769 100644
--- a/board/actux3/u-boot.lds
+++ b/board/actux3/u-boot.lds
@@ -30,12 +30,12 @@ SECTIONS
. = ALIGN (4);
.text : {
- cpu/ixp/start.o (.text)
+ arch/arm/cpu/ixp/start.o (.text)
lib/string.o (.text)
lib/vsprintf.o (.text)
arch/arm/lib/board.o (.text)
common/dlmalloc.o (.text)
- cpu/ixp/cpu.o (.text)
+ arch/arm/cpu/ixp/cpu.o (.text)
. = env_offset;
common/env_embedded.o (.ppcenv)
diff --git a/board/actux4/config.mk b/board/actux4/config.mk
index 9a634cdff..f2b5fc911 100644
--- a/board/actux4/config.mk
+++ b/board/actux4/config.mk
@@ -1,4 +1,4 @@
TEXT_BASE = 0x00e00000
# include NPE ethernet driver
-BOARDLIBS = cpu/ixp/npe/libnpe.a
+BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a
diff --git a/board/davinci/dvevm/board_init.S b/board/davinci/dvevm/board_init.S
index 22d8adc18..81b23d043 100644
--- a/board/davinci/dvevm/board_init.S
+++ b/board/davinci/dvevm/board_init.S
@@ -2,7 +2,7 @@
* Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
*
* Board-specific low level initialization code. Called at the very end
- * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no
+ * 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
diff --git a/board/davinci/schmoogie/board_init.S b/board/davinci/schmoogie/board_init.S
index 22d8adc18..81b23d043 100644
--- a/board/davinci/schmoogie/board_init.S
+++ b/board/davinci/schmoogie/board_init.S
@@ -2,7 +2,7 @@
* Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
*
* Board-specific low level initialization code. Called at the very end
- * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no
+ * 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
diff --git a/board/davinci/sffsdr/board_init.S b/board/davinci/sffsdr/board_init.S
index 22d8adc18..81b23d043 100644
--- a/board/davinci/sffsdr/board_init.S
+++ b/board/davinci/sffsdr/board_init.S
@@ -2,7 +2,7 @@
* Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
*
* Board-specific low level initialization code. Called at the very end
- * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no
+ * 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
diff --git a/board/davinci/sonata/board_init.S b/board/davinci/sonata/board_init.S
index fbb9ea73e..3e4c7a2c5 100644
--- a/board/davinci/sonata/board_init.S
+++ b/board/davinci/sonata/board_init.S
@@ -2,7 +2,7 @@
* Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
*
* Board-specific low level initialization code. Called at the very end
- * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no
+ * 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
diff --git a/board/edb93xx/config.mk b/board/edb93xx/config.mk
index b2fc6fac3..b627869c2 100644
--- a/board/edb93xx/config.mk
+++ b/board/edb93xx/config.mk
@@ -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
diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds
index 6f5bda457..273129457 100644
--- a/board/freescale/mx31ads/u-boot.lds
+++ b/board/freescale/mx31ads/u-boot.lds
@@ -37,7 +37,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/arm1136/start.o (.text)
+ arch/arm/cpu/arm1136/start.o (.text)
board/freescale/mx31ads/libmx31ads.a (.text)
arch/arm/lib/libarm.a (.text)
net/libnet.a (.text)
diff --git a/board/logicpd/zoom2/zoom2.c b/board/logicpd/zoom2/zoom2.c
index 387ed2d39..6455d1dc3 100644
--- a/board/logicpd/zoom2/zoom2.c
+++ b/board/logicpd/zoom2/zoom2.c
@@ -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.
diff --git a/board/lpc2292sodimm/flash.c b/board/lpc2292sodimm/flash.c
index a7e175d8e..fd5389fb9 100644
--- a/board/lpc2292sodimm/flash.c
+++ b/board/lpc2292sodimm/flash.c
@@ -1,7 +1,7 @@
/*
* (C) Copyright 2006 Embedded Artists AB <www.embeddedartists.com>
*
- * Modified to use the routines in cpu/arm720t/lpc2292/flash.c by
+ * Modified to use the routines in arch/arm/cpu/arm720t/lpc2292/flash.c by
* Gary Jennejohn <garyj@denx,de>
*
* This program is free software; you can redistribute it and/or
diff --git a/board/samsung/smdk6400/u-boot-nand.lds b/board/samsung/smdk6400/u-boot-nand.lds
index a074420c1..29a4f61e3 100644
--- a/board/samsung/smdk6400/u-boot-nand.lds
+++ b/board/samsung/smdk6400/u-boot-nand.lds
@@ -34,8 +34,8 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/arm1176/start.o (.text)
- cpu/arm1176/s3c64xx/cpu_init.o (.text)
+ arch/arm/cpu/arm1176/start.o (.text)
+ arch/arm/cpu/arm1176/s3c64xx/cpu_init.o (.text)
*(.text)
}
diff --git a/board/siemens/SMN42/flash.c b/board/siemens/SMN42/flash.c
index 8cf17b857..fc91574f8 100644
--- a/board/siemens/SMN42/flash.c
+++ b/board/siemens/SMN42/flash.c
@@ -2,7 +2,7 @@
* (C) Copyright 2006 Embedded Artists AB <www.embeddedartists.com>
*
* (C) Copyright 2007 Gary Jennejohn garyj@denx.de
- * Modified to use the routines in cpu/arm720t/lpc2292/flash.c.
+ * Modified to use the routines in arch/arm/cpu/arm720t/lpc2292/flash.c.
* Heavily modified to support the SMN42 board from Siemens
*
* This program is free software; you can redistribute it and/or
diff --git a/board/trab/rs485.c b/board/trab/rs485.c
index ad0c13665..6a3a4cda9 100644
--- a/board/trab/rs485.c
+++ b/board/trab/rs485.c
@@ -2,7 +2,7 @@
* (C) Copyright 2003
* Martin Krause, TQ-Systems GmbH, <martin.krause@tqs.de>
*
- * Based on cpu/arm920t/serial.c, by Gary Jennejohn
+ * Based on arch/arm/cpu/arm920t/serial.c, by Gary Jennejohn
* (C) Copyright 2002 Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/board/trab/rs485.h b/board/trab/rs485.h
index 16d69bbd5..19e32446c 100644
--- a/board/trab/rs485.h
+++ b/board/trab/rs485.h
@@ -2,7 +2,7 @@
* (C) Copyright 2003
* Martin Krause, TQ-Systems GmbH, <martin.krause@tqs.de>
*
- * Based on cpu/arm920t/serial.c, by Gary Jennejohn
+ * Based on arch/arm/cpu/arm920t/serial.c, by Gary Jennejohn
* (C) Copyright 2002 Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds
index 05b929f56..cd50e8524 100644
--- a/board/trab/u-boot.lds
+++ b/board/trab/u-boot.lds
@@ -32,7 +32,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
- cpu/arm920t/start.o (.text)
+ arch/arm/cpu/arm920t/start.o (.text)
lib/zlib.o (.text)
lib/crc32.o (.text)
lib/string.o (.text)
diff --git a/doc/README-integrator b/doc/README-integrator
index 4daf3413a..5a0e93492 100644
--- a/doc/README-integrator
+++ b/doc/README-integrator
@@ -52,7 +52,7 @@ cpu/arm<>/start.S so that it may be used by other boards.
However, to avoid duplicating code through all processor files, a generic core
for ARM Integrator CMs has been added
- cpu/arm_intcm
+ arch/arm/cpu/arm_intcm
Otherwise. for example, the standard CM reset via the CM control register would
need placing in each CM processor file......
diff --git a/doc/README.ARM-SoC b/doc/README.ARM-SoC
index 15f065dfb..d6bd62488 100644
--- a/doc/README.ARM-SoC
+++ b/doc/README.ARM-SoC
@@ -1,7 +1,7 @@
[By Steven Scholz <steven.scholz@imc-berlin.de>, 16 Aug 2004]
Since the cpu/ directory gets clobbered with peripheral driver code I
-started cleaning up cpu/arm920t.
+started cleaning up arch/arm/cpu/arm920t.
I introduced the concept of Soc (system on a chip) into the ./cpu
directory. That means that code that is cpu (i.e. core) specific
@@ -17,8 +17,8 @@ peripherals around the core) is moved into
Thus a library/archive "$(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
diff --git a/doc/README.modnet50 b/doc/README.modnet50
index f7bb254e1..2ac3c8fbe 100644
--- a/doc/README.modnet50
+++ b/doc/README.modnet50
@@ -45,7 +45,7 @@ flash.
Files:
-cpu/arm720t/serial_netarm.c .. serial I/O for the cpu
+arch/arm/cpu/arm720t/serial_netarm.c .. serial I/O for the cpu
board/modnet50/lowlevel_init.S .. memory setup for ModNET50
board/modnet50/flash.c .. flash routines
diff --git a/nand_spl/board/freescale/mx31pdk/Makefile b/nand_spl/board/freescale/mx31pdk/Makefile
index 0e13d5de2..c1dcf05f3 100644
--- a/nand_spl/board/freescale/mx31pdk/Makefile
+++ b/nand_spl/board/freescale/mx31pdk/Makefile
@@ -12,7 +12,7 @@ SOBJS = start.o lowlevel_init.o
COBJS = nand_boot_fsl_nfc.o
SRCS := $(SRCTREE)/nand_spl/nand_boot_fsl_nfc.c
-SRCS += $(SRCTREE)/cpu/arm1136/start.S
+SRCS += $(SRCTREE)/arch/arm/cpu/arm1136/start.S
SRCS += $(SRCTREE)/board/freescale/mx31pdk/lowlevel_init.S
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
__OBJS := $(SOBJS) $(COBJS)
@@ -40,7 +40,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
#########################################################################
-$(obj)%.o: $(SRCTREE)/cpu/arm1136/%.S
+$(obj)%.o: $(SRCTREE)/arch/arm/cpu/arm1136/%.S
$(CC) $(AFLAGS) -c -o $@ $<
$(obj)%.o: $(SRCTREE)/board/freescale/mx31pdk/%.S
diff --git a/nand_spl/board/karo/tx25/Makefile b/nand_spl/board/karo/tx25/Makefile
index ae71f6695..62aa58351 100644
--- a/nand_spl/board/karo/tx25/Makefile
+++ b/nand_spl/board/karo/tx25/Makefile
@@ -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
diff --git a/nand_spl/board/samsung/smdk6400/Makefile b/nand_spl/board/samsung/smdk6400/Makefile
index 0fdda25ac..9cb485331 100644
--- a/nand_spl/board/samsung/smdk6400/Makefile
+++ b/nand_spl/board/samsung/smdk6400/Makefile
@@ -67,12 +67,12 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
# from cpu directory
$(obj)start.S:
@rm -f $@
- @ln -s $(TOPDIR)/cpu/arm1176/start.S $@
+ @ln -s $(TOPDIR)/arch/arm/cpu/arm1176/start.S $@
# from SoC directory
$(obj)cpu_init.S:
@rm -f $@
- @ln -s $(TOPDIR)/cpu/arm1176/s3c64xx/cpu_init.S $@
+ @ln -s $(TOPDIR)/arch/arm/cpu/arm1176/s3c64xx/cpu_init.S $@
# from board directory
$(obj)lowlevel_init.S: