summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-08-12 22:02:27 +0200
committerWolfgang Denk <wd@denx.de>2008-08-12 22:02:27 +0200
commit8641ff266ae6638da201747c239fd39ba34c4958 (patch)
tree0470bdb1e588449a9133ed62ac6b49d0213948e4 /cpu
parent195ccfc5991d48764b2519941e3507f693851d5d (diff)
parent8ed2f5f950e2581214d20b011a8f27a6396d65d2 (diff)
downloadu-boot-imx-8641ff266ae6638da201747c239fd39ba34c4958.zip
u-boot-imx-8641ff266ae6638da201747c239fd39ba34c4958.tar.gz
u-boot-imx-8641ff266ae6638da201747c239fd39ba34c4958.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-at91
Diffstat (limited to 'cpu')
-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
8 files changed, 1 insertions, 1 deletions
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