aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-08-05 00:36:16 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-08-14 00:36:29 +0200
commit74890c3f8e6333109e95071d59c0438da6b6d63b (patch)
treeeba188f6157651c93f4013a657d5c15f2f776175
parentcf8564c86bba511425d3cdb430aa41df5158cd13 (diff)
downloadu-boot-linaro-stable-74890c3f8e6333109e95071d59c0438da6b6d63b.tar.gz
MX28: Move the u-boot.bd info CPUDIR/SOCDIR
This gets us rid of duplication of the same file. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Stefano Babic <sbabic@denx.de>
-rw-r--r--Makefile2
-rw-r--r--arch/arm/cpu/arm926ejs/mxs/u-boot.bd (renamed from board/bluegiga/apx4devkit/u-boot.bd)0
-rw-r--r--board/denx/m28evk/u-boot.bd14
-rw-r--r--board/freescale/mx28evk/u-boot.bd14
4 files changed, 1 insertions, 29 deletions
diff --git a/Makefile b/Makefile
index 8b555fb54..f6471e212 100644
--- a/Makefile
+++ b/Makefile
@@ -453,7 +453,7 @@ $(obj)u-boot.ais: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
$(obj)u-boot.ais
$(obj)u-boot.sb: $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
- elftosb -zdf imx28 -c $(TOPDIR)/board/$(BOARDDIR)/u-boot.bd \
+ elftosb -zdf imx28 -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot.bd \
-o $(obj)u-boot.sb
# On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.
diff --git a/board/bluegiga/apx4devkit/u-boot.bd b/arch/arm/cpu/arm926ejs/mxs/u-boot.bd
index c60615a45..c60615a45 100644
--- a/board/bluegiga/apx4devkit/u-boot.bd
+++ b/arch/arm/cpu/arm926ejs/mxs/u-boot.bd
diff --git a/board/denx/m28evk/u-boot.bd b/board/denx/m28evk/u-boot.bd
deleted file mode 100644
index c60615a45..000000000
--- a/board/denx/m28evk/u-boot.bd
+++ /dev/null
@@ -1,14 +0,0 @@
-sources {
- u_boot_spl="spl/u-boot-spl.bin";
- u_boot="u-boot.bin";
-}
-
-section (0) {
- load u_boot_spl > 0x0000;
- load ivt (entry = 0x0014) > 0x8000;
- hab call 0x8000;
-
- load u_boot > 0x40000100;
- load ivt (entry = 0x40000100) > 0x8000;
- hab call 0x8000;
-}
diff --git a/board/freescale/mx28evk/u-boot.bd b/board/freescale/mx28evk/u-boot.bd
deleted file mode 100644
index c60615a45..000000000
--- a/board/freescale/mx28evk/u-boot.bd
+++ /dev/null
@@ -1,14 +0,0 @@
-sources {
- u_boot_spl="spl/u-boot-spl.bin";
- u_boot="u-boot.bin";
-}
-
-section (0) {
- load u_boot_spl > 0x0000;
- load ivt (entry = 0x0014) > 0x8000;
- hab call 0x8000;
-
- load u_boot > 0x40000100;
- load ivt (entry = 0x40000100) > 0x8000;
- hab call 0x8000;
-}