[ptxdist] [PATCH] u-boot: Add support for SPL for non-OMAP CPUs

["Guillermo Rodríguez" <guille.rodriguez@gmail.com>]

Add support for installing the SPL binary for non-OMAP CPUs.

Also properly remove any files installed in the platform image
directory in the clean stage.

Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
---
 platforms/u-boot.in | 14 +++++++++++---
 rules/u-boot.make   |  4 ++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/platforms/u-boot.in b/platforms/u-boot.in
index 38684a0..602de46 100644
--- a/platforms/u-boot.in
+++ b/platforms/u-boot.in
@@ -49,6 +49,13 @@ config U_BOOT_INSTALL_ELF
 	help
 	  Installing the U-Boot ELF binary into platform image directory.
 
+config U_BOOT_INSTALL_SPL
+	prompt "install SPL"
+	bool
+	help
+	  Installing the U-Boot SPL (Secondary Program Loader) binary into
+	  platform image directory.
+
 config U_BOOT_INSTALL_MLO
 	prompt "install MLO"
 	bool
@@ -57,14 +64,14 @@ config U_BOOT_INSTALL_MLO
 	  Installing the U-Boot SPL ("MLO") binary needed for OMAP CPUs into platform
 	  image directory.
 
-if U_BOOT_INSTALL_MLO
+if U_BOOT_INSTALL_MLO || U_BOOT_INSTALL_SPL
 
 config U_BOOT_INSTALL_U_BOOT_IMG
 	prompt "install u-boot.img"
 	bool
 	help
 	  Installing the u-boot image with header ("u-boot.img") which is executed
-	  by u-boot SPL ("MLO") into platform image directory.
+	  by u-boot SPL into platform image directory.
 
 endif
 
@@ -73,7 +80,8 @@ config U_BOOT_INSTALL_U_BOOT_IMX
 	bool
 	help
 	  Installing the U-Boot image with imx header (u-boot.imx) into platform 
-	  image directory. Say yes if you are building for freescale i.MX SOC
+	  image directory. Say yes if you are building for freescale i.MX SOCs
+	  and are not using SPL.
 
 endif
 
diff --git a/rules/u-boot.make b/rules/u-boot.make
index 94aa774..9f69f9d 100644
--- a/rules/u-boot.make
+++ b/rules/u-boot.make
@@ -69,6 +69,9 @@ endif
 ifdef PTXCONF_U_BOOT_INSTALL_ELF
 	@install -D -m644 $(U_BOOT_DIR)/u-boot $(IMAGEDIR)/u-boot.elf
 endif
+ifdef PTXCONF_U_BOOT_INSTALL_SPL
+	@install -D -m644 $(U_BOOT_DIR)/SPL $(IMAGEDIR)/SPL
+endif
 ifdef PTXCONF_U_BOOT_INSTALL_MLO
 	@install -D -m644 $(U_BOOT_DIR)/MLO $(IMAGEDIR)/MLO
 endif
@@ -88,6 +91,7 @@ $(STATEDIR)/u-boot.clean:
 	@$(call targetinfo)
 	@$(call clean_pkg, U_BOOT)
 	@rm -f $(IMAGEDIR)/u-boot.bin $(IMAGEDIR)/u-boot.srec $(IMAGEDIR)/u-boot.elf
+	@rm -f $(IMAGEDIR)/u-boot.img $(IMAGEDIR)/SPL $(IMAGEDIR)/MLO
 	@rm -f $(IMAGEDIR)/u-boot.imx
 
 # vim: syntax=make
-- 
1.9.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de