| commit | 8641ff266ae6638da201747c239fd39ba34c4958 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Tue Aug 12 22:02:27 2008 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Tue Aug 12 22:02:27 2008 +0200 |
| tree | 0470bdb1e588449a9133ed62ac6b49d0213948e4 | |
| parent | 195ccfc5991d48764b2519941e3507f693851d5d [diff] | |
| parent | 8ed2f5f950e2581214d20b011a8f27a6396d65d2 [diff] |
Merge branch 'master' of git://www.denx.de/git/u-boot-at91
diff --git a/Makefile b/Makefile index ffdd726..6624370 100644 --- a/Makefile +++ b/Makefile
@@ -2363,13 +2363,13 @@ @$(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 @@ -2391,10 +2391,10 @@ ######################################################################### 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 similarity index 100% rename from cpu/arm926ejs/at91sam9/Makefile rename to cpu/arm926ejs/at91/Makefile
diff --git a/cpu/arm926ejs/at91sam9/config.mk b/cpu/arm926ejs/at91/config.mk similarity index 62% rename from cpu/arm926ejs/at91sam9/config.mk rename to 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 similarity index 100% rename from cpu/arm926ejs/at91sam9/ether.c rename to cpu/arm926ejs/at91/ether.c
diff --git a/cpu/arm926ejs/at91sam9/lowlevel_init.S b/cpu/arm926ejs/at91/lowlevel_init.S similarity index 100% rename from cpu/arm926ejs/at91sam9/lowlevel_init.S rename to cpu/arm926ejs/at91/lowlevel_init.S
diff --git a/cpu/arm926ejs/at91sam9/spi.c b/cpu/arm926ejs/at91/spi.c similarity index 100% rename from cpu/arm926ejs/at91sam9/spi.c rename to cpu/arm926ejs/at91/spi.c
diff --git a/cpu/arm926ejs/at91sam9/timer.c b/cpu/arm926ejs/at91/timer.c similarity index 100% rename from cpu/arm926ejs/at91sam9/timer.c rename to cpu/arm926ejs/at91/timer.c
diff --git a/cpu/arm926ejs/at91sam9/u-boot.lds b/cpu/arm926ejs/at91/u-boot.lds similarity index 100% rename from cpu/arm926ejs/at91sam9/u-boot.lds rename to cpu/arm926ejs/at91/u-boot.lds
diff --git a/cpu/arm926ejs/at91sam9/usb.c b/cpu/arm926ejs/at91/usb.c similarity index 100% rename from cpu/arm926ejs/at91sam9/usb.c rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/at91_pio.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/at91_pit.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/at91_pmc.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/at91_rstc.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/at91_spi.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/at91cap9.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/at91cap9_matrix.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/at91sam9260.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/at91sam9260_matrix.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/at91sam9261.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/at91sam9261_matrix.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/at91sam9263.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/at91sam9263_matrix.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/at91sam9_smc.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/at91sam9rl.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/at91sam9rl_matrix.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/clk.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/gpio.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/hardware.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/io.h rename to 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 similarity index 100% rename from include/asm-arm/arch-at91sam9/memory-map.h rename to include/asm-arm/arch-at91/memory-map.h