Skip to contentSkip to conversation

MX28: Move the u-boot.bd info CPUDIR/SOCDIR

PATCH New Marek Vasut 2 participants 2 messages Aug 5, 2012

Subsystems (2)
Arm (32-bit) Kbuild
lore
Share & tools
lore

Marek Vasut

author
#0 lore raw

PATCH 1/1 MX28: Move the u-boot.bd info CPUDIR/SOCDIR

This gets us rid of duplication of the same file.

Signed-off-by Marek Vasut <[email protected]>
Cc Stefano Babic <[email protected]>
---
 Makefile                              |    2 +-
 arch/arm/cpu/arm926ejs/mx28/u-boot.bd |   14 ++++++++++++++
 board/bluegiga/apx4devkit/u-boot.bd   |   14 --------------
 board/denx/m28evk/u-boot.bd           |   14 --------------
 board/freescale/mx28evk/u-boot.bd     |   14 --------------
 5 files changed, 15 insertions(+), 43 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/mx28/u-boot.bd
 delete mode 100644 board/bluegiga/apx4devkit/u-boot.bd
 delete mode 100644 board/denx/m28evk/u-boot.bd
 delete mode 100644 board/freescale/mx28evk/u-boot.bd
Makefile +1 -1
index eb37ea1..81b8c87 100644
@@ -453,7 +453,7 @@ $(obj)u-boot.ais:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
 		rm $(obj)spl/u-boot-spl{,-pad}.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.
arch/arm/cpu/arm926ejs/mx28/u-boot.bd new file +14 -0
new file mode 100644
index 0000000..c60615a
@@ -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;
+}
board/bluegiga/apx4devkit/u-boot.bd deleted +0 -14
deleted file mode 100644
index c60615a..0000000
@@ -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;
-}
board/denx/m28evk/u-boot.bd deleted +0 -14
deleted file mode 100644
index c60615a..0000000
@@ -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;
-}
board/freescale/mx28evk/u-boot.bd deleted +0 -14
deleted file mode 100644
index c60615a..0000000
@@ -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;
-}
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 MX28: Move the u-boot.bd info CPUDIR/SOCDIR

Quoted 4 lines · Marek Vasut

This gets us rid of duplication of the same file.

Signed-off-by Marek Vasut <[email protected]>
Cc Stefano Babic <[email protected]>
Quoted 12 lines
---
 Makefile                              |    2 +-
 arch/arm/cpu/arm926ejs/mx28/u-boot.bd |   14 ++++++++++++++
 board/bluegiga/apx4devkit/u-boot.bd   |   14 --------------
 board/denx/m28evk/u-boot.bd           |   14 --------------
 board/freescale/mx28evk/u-boot.bd     |   14 --------------
 5 files changed, 15 insertions(+), 43 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/mx28/u-boot.bd
 delete mode 100644 board/bluegiga/apx4devkit/u-boot.bd
 delete mode 100644 board/denx/m28evk/u-boot.bd
 delete mode 100644 board/freescale/mx28evk/u-boot.bd
Acked-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================