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>

diff --git a/Makefile b/Makefile
index 42fc5ee63c535f262ac60ce472b98c426c65fe88..913360cacd7e17ea4cda1d1c567e2cd9cfc4160e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -450,7 +450,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/arch/arm/cpu/arm926ejs/mxs/u-boot.bd b/arch/arm/cpu/arm926ejs/mxs/u-boot.bd
new file mode 100644 (file)
index 0000000..c60615a
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/mxs/u-boot.bd
@@ -0,0 +1,14 @@
+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/bluegiga/apx4devkit/u-boot.bd b/board/bluegiga/apx4devkit/u-boot.bd
deleted file mode 100644 (file)
index c60615a..0000000
--- a/board/bluegiga/apx4devkit/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/denx/m28evk/u-boot.bd b/board/denx/m28evk/u-boot.bd
deleted file mode 100644 (file)
index c60615a..0000000
--- 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 (file)
index c60615a..0000000
--- 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;
-}