From 7fb1ed0eabd6aeb36dd107ea1ed1f7432064031e Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 5 Aug 2012 00:36:16 +0000 Subject: [PATCH] MX28: Move the u-boot.bd info CPUDIR/SOCDIR This gets us rid of duplication of the same file. Signed-off-by: Marek Vasut Cc: Stefano Babic Acked-by: Stefano Babic --- Makefile | 2 +- .../arm/cpu/arm926ejs/mxs}/u-boot.bd | 0 board/denx/m28evk/u-boot.bd | 14 -------------- board/freescale/mx28evk/u-boot.bd | 14 -------------- 4 files changed, 1 insertion(+), 29 deletions(-) rename {board/bluegiga/apx4devkit => arch/arm/cpu/arm926ejs/mxs}/u-boot.bd (100%) delete mode 100644 board/denx/m28evk/u-boot.bd delete mode 100644 board/freescale/mx28evk/u-boot.bd diff --git a/Makefile b/Makefile index 42fc5ee63c..913360cacd 100644 --- 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/board/bluegiga/apx4devkit/u-boot.bd b/arch/arm/cpu/arm926ejs/mxs/u-boot.bd similarity index 100% rename from board/bluegiga/apx4devkit/u-boot.bd rename to 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 c60615a456..0000000000 --- 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 c60615a456..0000000000 --- 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; -} -- 2.39.5