diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | cpu/arm926ejs/at91/Makefile (renamed from cpu/arm926ejs/at91sam9/Makefile) | 0 | ||||
| -rw-r--r-- | cpu/arm926ejs/at91/config.mk (renamed from cpu/arm926ejs/at91sam9/config.mk) | 2 | ||||
| -rw-r--r-- | cpu/arm926ejs/at91/ether.c (renamed from cpu/arm926ejs/at91sam9/ether.c) | 0 | ||||
| -rw-r--r-- | cpu/arm926ejs/at91/lowlevel_init.S (renamed from cpu/arm926ejs/at91sam9/lowlevel_init.S) | 0 | ||||
| -rw-r--r-- | cpu/arm926ejs/at91/spi.c (renamed from cpu/arm926ejs/at91sam9/spi.c) | 0 | ||||
| -rw-r--r-- | cpu/arm926ejs/at91/timer.c (renamed from cpu/arm926ejs/at91sam9/timer.c) | 0 | ||||
| -rw-r--r-- | cpu/arm926ejs/at91/u-boot.lds (renamed from cpu/arm926ejs/at91sam9/u-boot.lds) | 0 | ||||
| -rw-r--r-- | cpu/arm926ejs/at91/usb.c (renamed from cpu/arm926ejs/at91sam9/usb.c) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91_pio.h (renamed from include/asm-arm/arch-at91sam9/at91_pio.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91_pit.h (renamed from include/asm-arm/arch-at91sam9/at91_pit.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91_pmc.h (renamed from include/asm-arm/arch-at91sam9/at91_pmc.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91_rstc.h (renamed from include/asm-arm/arch-at91sam9/at91_rstc.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91_spi.h (renamed from include/asm-arm/arch-at91sam9/at91_spi.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91cap9.h (renamed from include/asm-arm/arch-at91sam9/at91cap9.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91cap9_matrix.h (renamed from include/asm-arm/arch-at91sam9/at91cap9_matrix.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91sam9260.h (renamed from include/asm-arm/arch-at91sam9/at91sam9260.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91sam9260_matrix.h (renamed from include/asm-arm/arch-at91sam9/at91sam9260_matrix.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91sam9261.h (renamed from include/asm-arm/arch-at91sam9/at91sam9261.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91sam9261_matrix.h (renamed from include/asm-arm/arch-at91sam9/at91sam9261_matrix.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91sam9263.h (renamed from include/asm-arm/arch-at91sam9/at91sam9263.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91sam9263_matrix.h (renamed from include/asm-arm/arch-at91sam9/at91sam9263_matrix.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91sam9_smc.h (renamed from include/asm-arm/arch-at91sam9/at91sam9_smc.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91sam9rl.h (renamed from include/asm-arm/arch-at91sam9/at91sam9rl.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/at91sam9rl_matrix.h (renamed from include/asm-arm/arch-at91sam9/at91sam9rl_matrix.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/clk.h (renamed from include/asm-arm/arch-at91sam9/clk.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/gpio.h (renamed from include/asm-arm/arch-at91sam9/gpio.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/hardware.h (renamed from include/asm-arm/arch-at91sam9/hardware.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/io.h (renamed from include/asm-arm/arch-at91sam9/io.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/memory-map.h (renamed from include/asm-arm/arch-at91sam9/memory-map.h) | 0 |
30 files changed, 6 insertions, 6 deletions
@@ -2354,13 +2354,13 @@ at91rm9200dk_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200 at91sam9261ek_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9261ek atmel at91sam9 + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9261ek atmel at91 at91sam9263ek_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9263ek atmel at91sam9 + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9263ek atmel at91 at91sam9rlek_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9rlek atmel at91sam9 + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9rlek atmel at91 cmc_pu2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200 @@ -2382,10 +2382,10 @@ mp2usb_config : unconfig ######################################################################### at91cap9adk_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91sam9 + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91 at91sam9260ek_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ek atmel at91sam9 + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ek atmel at91 ######################################################################## ## ARM Integrator boards - see doc/README-integrator for more info. diff --git a/cpu/arm926ejs/at91sam9/Makefile b/cpu/arm926ejs/at91/Makefile index 44cde1a..44cde1a 100644 --- a/cpu/arm926ejs/at91sam9/Makefile +++ b/cpu/arm926ejs/at91/Makefile diff --git a/cpu/arm926ejs/at91sam9/config.mk b/cpu/arm926ejs/at91/config.mk index 83040eb..31491a8 100644 --- a/cpu/arm926ejs/at91sam9/config.mk +++ b/cpu/arm926ejs/at91/config.mk @@ -1,3 +1,3 @@ PLATFORM_CPPFLAGS += -march=armv5te PLATFORM_CPPFLAGS += $(call cc-option,-mtune=arm926ejs,) -LDSCRIPT := $(SRCTREE)/cpu/arm926ejs/at91sam9/u-boot.lds +LDSCRIPT := $(SRCTREE)/cpu/arm926ejs/at91/u-boot.lds diff --git a/cpu/arm926ejs/at91sam9/ether.c b/cpu/arm926ejs/at91/ether.c index 7e11fe4..7e11fe4 100644 --- a/cpu/arm926ejs/at91sam9/ether.c +++ b/cpu/arm926ejs/at91/ether.c diff --git a/cpu/arm926ejs/at91sam9/lowlevel_init.S b/cpu/arm926ejs/at91/lowlevel_init.S index ec6ad5d..ec6ad5d 100644 --- a/cpu/arm926ejs/at91sam9/lowlevel_init.S +++ b/cpu/arm926ejs/at91/lowlevel_init.S diff --git a/cpu/arm926ejs/at91sam9/spi.c b/cpu/arm926ejs/at91/spi.c index c9fe6d8..c9fe6d8 100644 --- a/cpu/arm926ejs/at91sam9/spi.c +++ b/cpu/arm926ejs/at91/spi.c diff --git a/cpu/arm926ejs/at91sam9/timer.c b/cpu/arm926ejs/at91/timer.c index c79ec7e..c79ec7e 100644 --- a/cpu/arm926ejs/at91sam9/timer.c +++ b/cpu/arm926ejs/at91/timer.c diff --git a/cpu/arm926ejs/at91sam9/u-boot.lds b/cpu/arm926ejs/at91/u-boot.lds index 996f401..996f401 100644 --- a/cpu/arm926ejs/at91sam9/u-boot.lds +++ b/cpu/arm926ejs/at91/u-boot.lds diff --git a/cpu/arm926ejs/at91sam9/usb.c b/cpu/arm926ejs/at91/usb.c index 2a92f73..2a92f73 100644 --- a/cpu/arm926ejs/at91sam9/usb.c +++ b/cpu/arm926ejs/at91/usb.c diff --git a/include/asm-arm/arch-at91sam9/at91_pio.h b/include/asm-arm/arch-at91/at91_pio.h index f6ce1f9..f6ce1f9 100644 --- a/include/asm-arm/arch-at91sam9/at91_pio.h +++ b/include/asm-arm/arch-at91/at91_pio.h diff --git a/include/asm-arm/arch-at91sam9/at91_pit.h b/include/asm-arm/arch-at91/at91_pit.h index 94dd242..94dd242 100644 --- a/include/asm-arm/arch-at91sam9/at91_pit.h +++ b/include/asm-arm/arch-at91/at91_pit.h diff --git a/include/asm-arm/arch-at91sam9/at91_pmc.h b/include/asm-arm/arch-at91/at91_pmc.h index b57875d..b57875d 100644 --- a/include/asm-arm/arch-at91sam9/at91_pmc.h +++ b/include/asm-arm/arch-at91/at91_pmc.h diff --git a/include/asm-arm/arch-at91sam9/at91_rstc.h b/include/asm-arm/arch-at91/at91_rstc.h index e49caef..e49caef 100644 --- a/include/asm-arm/arch-at91sam9/at91_rstc.h +++ b/include/asm-arm/arch-at91/at91_rstc.h diff --git a/include/asm-arm/arch-at91sam9/at91_spi.h b/include/asm-arm/arch-at91/at91_spi.h index 30643c6..30643c6 100644 --- a/include/asm-arm/arch-at91sam9/at91_spi.h +++ b/include/asm-arm/arch-at91/at91_spi.h diff --git a/include/asm-arm/arch-at91sam9/at91cap9.h b/include/asm-arm/arch-at91/at91cap9.h index 0b52228..0b52228 100644 --- a/include/asm-arm/arch-at91sam9/at91cap9.h +++ b/include/asm-arm/arch-at91/at91cap9.h diff --git a/include/asm-arm/arch-at91sam9/at91cap9_matrix.h b/include/asm-arm/arch-at91/at91cap9_matrix.h index 22b7e9b..22b7e9b 100644 --- a/include/asm-arm/arch-at91sam9/at91cap9_matrix.h +++ b/include/asm-arm/arch-at91/at91cap9_matrix.h diff --git a/include/asm-arm/arch-at91sam9/at91sam9260.h b/include/asm-arm/arch-at91/at91sam9260.h index 920a7f3..920a7f3 100644 --- a/include/asm-arm/arch-at91sam9/at91sam9260.h +++ b/include/asm-arm/arch-at91/at91sam9260.h diff --git a/include/asm-arm/arch-at91sam9/at91sam9260_matrix.h b/include/asm-arm/arch-at91/at91sam9260_matrix.h index f8b023d..f8b023d 100644 --- a/include/asm-arm/arch-at91sam9/at91sam9260_matrix.h +++ b/include/asm-arm/arch-at91/at91sam9260_matrix.h diff --git a/include/asm-arm/arch-at91sam9/at91sam9261.h b/include/asm-arm/arch-at91/at91sam9261.h index 752d81d..752d81d 100644 --- a/include/asm-arm/arch-at91sam9/at91sam9261.h +++ b/include/asm-arm/arch-at91/at91sam9261.h diff --git a/include/asm-arm/arch-at91sam9/at91sam9261_matrix.h b/include/asm-arm/arch-at91/at91sam9261_matrix.h index e2bfc4b..e2bfc4b 100644 --- a/include/asm-arm/arch-at91sam9/at91sam9261_matrix.h +++ b/include/asm-arm/arch-at91/at91sam9261_matrix.h diff --git a/include/asm-arm/arch-at91sam9/at91sam9263.h b/include/asm-arm/arch-at91/at91sam9263.h index 98251cb..98251cb 100644 --- a/include/asm-arm/arch-at91sam9/at91sam9263.h +++ b/include/asm-arm/arch-at91/at91sam9263.h diff --git a/include/asm-arm/arch-at91sam9/at91sam9263_matrix.h b/include/asm-arm/arch-at91/at91sam9263_matrix.h index 83aaaab..83aaaab 100644 --- a/include/asm-arm/arch-at91sam9/at91sam9263_matrix.h +++ b/include/asm-arm/arch-at91/at91sam9263_matrix.h diff --git a/include/asm-arm/arch-at91sam9/at91sam9_smc.h b/include/asm-arm/arch-at91/at91sam9_smc.h index d64511b..d64511b 100644 --- a/include/asm-arm/arch-at91sam9/at91sam9_smc.h +++ b/include/asm-arm/arch-at91/at91sam9_smc.h diff --git a/include/asm-arm/arch-at91sam9/at91sam9rl.h b/include/asm-arm/arch-at91/at91sam9rl.h index 215bbc8..215bbc8 100644 --- a/include/asm-arm/arch-at91sam9/at91sam9rl.h +++ b/include/asm-arm/arch-at91/at91sam9rl.h diff --git a/include/asm-arm/arch-at91sam9/at91sam9rl_matrix.h b/include/asm-arm/arch-at91/at91sam9rl_matrix.h index af8d914..af8d914 100644 --- a/include/asm-arm/arch-at91sam9/at91sam9rl_matrix.h +++ b/include/asm-arm/arch-at91/at91sam9rl_matrix.h diff --git a/include/asm-arm/arch-at91sam9/clk.h b/include/asm-arm/arch-at91/clk.h index 1b502c8..1b502c8 100644 --- a/include/asm-arm/arch-at91sam9/clk.h +++ b/include/asm-arm/arch-at91/clk.h diff --git a/include/asm-arm/arch-at91sam9/gpio.h b/include/asm-arm/arch-at91/gpio.h index c4d7b97..c4d7b97 100644 --- a/include/asm-arm/arch-at91sam9/gpio.h +++ b/include/asm-arm/arch-at91/gpio.h diff --git a/include/asm-arm/arch-at91sam9/hardware.h b/include/asm-arm/arch-at91/hardware.h index f312419..f312419 100644 --- a/include/asm-arm/arch-at91sam9/hardware.h +++ b/include/asm-arm/arch-at91/hardware.h diff --git a/include/asm-arm/arch-at91sam9/io.h b/include/asm-arm/arch-at91/io.h index f09b2df..f09b2df 100644 --- a/include/asm-arm/arch-at91sam9/io.h +++ b/include/asm-arm/arch-at91/io.h diff --git a/include/asm-arm/arch-at91sam9/memory-map.h b/include/asm-arm/arch-at91/memory-map.h index 8015dad..8015dad 100644 --- a/include/asm-arm/arch-at91sam9/memory-map.h +++ b/include/asm-arm/arch-at91/memory-map.h |