diff mbox

[1/2] boot/uboot: add support for i.MX28 SD format

Message ID 1426701961-2619-1-git-send-email-vincent.stehle@freescale.com
State Superseded
Headers show

Commit Message

Vincent Stehlé March 18, 2015, 6:06 p.m. UTC
Allow to generate u-boot.sd, Freescale i.MX28 SB format with a header for
booting from an SD card.

U-boot includes an mxsboot tool to generate this format, starting from
v2011.12.

See u-boot doc/README.mxs.

Signed-off-by: Vincent Stehlé <vincent.stehle@freescale.com>
---
 boot/uboot/Config.in | 12 ++++++++++++
 boot/uboot/uboot.mk  |  5 +++++
 2 files changed, 17 insertions(+)

Comments

Jörg Krause March 18, 2015, 7:53 p.m. UTC | #1
On Mi, 2015-03-18 at 19:06 +0100, Vincent Stehlé wrote:
> Allow to generate u-boot.sd, Freescale i.MX28 SB format with a header for
> booting from an SD card.
> 
> U-boot includes an mxsboot tool to generate this format, starting from
> v2011.12.
> 
> See u-boot doc/README.mxs.
> 
> Signed-off-by: Vincent Stehlé <vincent.stehle@freescale.com>
> ---
>  boot/uboot/Config.in | 12 ++++++++++++
>  boot/uboot/uboot.mk  |  5 +++++
>  2 files changed, 17 insertions(+)
> 
> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
> index 03e6acc..cea993a 100644
> --- a/boot/uboot/Config.in
> +++ b/boot/uboot/Config.in
> @@ -117,6 +117,18 @@ config BR2_TARGET_UBOOT_FORMAT_SB
>  	depends on BR2_arm
>  	bool "u-boot.sb"
>  
> +config BR2_TARGET_UBOOT_FORMAT_SD
> +	depends on BR2_arm
> +	bool "u-boot.sd"
> +	help
> +	  This is Freescale i.MX28 SB format, with a header for booting from an
> +	  SD card.
> +
> +	  U-boot includes an mxsboot tool to generate this format, starting
> +	  from v2011.12.
> +
> +	  See doc/README.mxs.
> +
>  config BR2_TARGET_UBOOT_FORMAT_CUSTOM
>  	bool "Custom (specify below)"
>  	help
> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> index a9ba054..8fad5b4 100644
> --- a/boot/uboot/uboot.mk
> +++ b/boot/uboot/uboot.mk
> @@ -49,6 +49,9 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
>  UBOOT_BIN = u-boot.sb
>  UBOOT_MAKE_TARGET = $(UBOOT_BIN)
>  UBOOT_DEPENDENCIES += host-elftosb
> +else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SD),y)
> +UBOOT_BIN = u-boot.sd
> +UBOOT_MAKE_TARGET = u-boot.sb
>  else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
>  UBOOT_BIN = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
>  else
> @@ -116,6 +119,8 @@ define UBOOT_BUILD_CMDS
>  	$(TARGET_CONFIGURE_OPTS) 	\
>  		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) 		\
>  		$(UBOOT_MAKE_TARGET)
> +	$(if $(BR2_TARGET_UBOOT_FORMAT_SD),
> +		$(@D)/tools/mxsboot sd $(@D)/u-boot.sb $(@D)/u-boot.sd)
>  endef
>  
>  define UBOOT_BUILD_OMAP_IFT

Happy to see Freescale patches here. Tested for a custom i.MX28 board.

Tested-by: Jörg Krause <joerg.krause@embedded.rocks>
Arnout Vandecappelle March 22, 2015, 1:02 p.m. UTC | #2
On 18/03/15 19:06, Vincent Stehlé wrote:
> Allow to generate u-boot.sd, Freescale i.MX28 SB format with a header for
> booting from an SD card.
> 
> U-boot includes an mxsboot tool to generate this format, starting from
> v2011.12.
> 
> See u-boot doc/README.mxs.
> 
> Signed-off-by: Vincent Stehlé <vincent.stehle@freescale.com>
> ---
>  boot/uboot/Config.in | 12 ++++++++++++
>  boot/uboot/uboot.mk  |  5 +++++
>  2 files changed, 17 insertions(+)
> 
> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
> index 03e6acc..cea993a 100644
> --- a/boot/uboot/Config.in
> +++ b/boot/uboot/Config.in
> @@ -117,6 +117,18 @@ config BR2_TARGET_UBOOT_FORMAT_SB
>  	depends on BR2_arm
>  	bool "u-boot.sb"
>  
> +config BR2_TARGET_UBOOT_FORMAT_SD
> +	depends on BR2_arm
> +	bool "u-boot.sd"
> +	help
> +	  This is Freescale i.MX28 SB format, with a header for booting from an

 Lines should wrap at 72 columns.

> +	  SD card.
> +
> +	  U-boot includes an mxsboot tool to generate this format, starting
> +	  from v2011.12.

 U-Boot doesn't use v in its version specifiers.

> +
> +	  See doc/README.mxs.

 Before 2013.07, it was called README.mx28_common

 Before 2014.01, you needed elftosb to generate the BootStream image.
Unfortunately we can't automatically add that dependency because we can't detect
the U-Boot version. So, add this dependency unconditionally like is done for the
SB format.

> +
>  config BR2_TARGET_UBOOT_FORMAT_CUSTOM
>  	bool "Custom (specify below)"
>  	help
> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> index a9ba054..8fad5b4 100644
> --- a/boot/uboot/uboot.mk
> +++ b/boot/uboot/uboot.mk
> @@ -49,6 +49,9 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
>  UBOOT_BIN = u-boot.sb
>  UBOOT_MAKE_TARGET = $(UBOOT_BIN)
>  UBOOT_DEPENDENCIES += host-elftosb
> +else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SD),y)
> +UBOOT_BIN = u-boot.sd
> +UBOOT_MAKE_TARGET = u-boot.sb

 Since sb and sd are visually so similar, I think it's worthwhile to add a small
comment here to say which is which. E.g.

# BootStream (.sb) file is built by U-Boot, we convert it to SD file

 I'll send an updated series with these changes.

 Regards,
 Arnout

>  else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
>  UBOOT_BIN = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
>  else
> @@ -116,6 +119,8 @@ define UBOOT_BUILD_CMDS
>  	$(TARGET_CONFIGURE_OPTS) 	\
>  		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) 		\
>  		$(UBOOT_MAKE_TARGET)
> +	$(if $(BR2_TARGET_UBOOT_FORMAT_SD),
> +		$(@D)/tools/mxsboot sd $(@D)/u-boot.sb $(@D)/u-boot.sd)
>  endef
>  
>  define UBOOT_BUILD_OMAP_IFT
>
diff mbox

Patch

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 03e6acc..cea993a 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -117,6 +117,18 @@  config BR2_TARGET_UBOOT_FORMAT_SB
 	depends on BR2_arm
 	bool "u-boot.sb"
 
+config BR2_TARGET_UBOOT_FORMAT_SD
+	depends on BR2_arm
+	bool "u-boot.sd"
+	help
+	  This is Freescale i.MX28 SB format, with a header for booting from an
+	  SD card.
+
+	  U-boot includes an mxsboot tool to generate this format, starting
+	  from v2011.12.
+
+	  See doc/README.mxs.
+
 config BR2_TARGET_UBOOT_FORMAT_CUSTOM
 	bool "Custom (specify below)"
 	help
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index a9ba054..8fad5b4 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -49,6 +49,9 @@  else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
 UBOOT_BIN = u-boot.sb
 UBOOT_MAKE_TARGET = $(UBOOT_BIN)
 UBOOT_DEPENDENCIES += host-elftosb
+else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SD),y)
+UBOOT_BIN = u-boot.sd
+UBOOT_MAKE_TARGET = u-boot.sb
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
 UBOOT_BIN = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
 else
@@ -116,6 +119,8 @@  define UBOOT_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) 	\
 		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) 		\
 		$(UBOOT_MAKE_TARGET)
+	$(if $(BR2_TARGET_UBOOT_FORMAT_SD),
+		$(@D)/tools/mxsboot sd $(@D)/u-boot.sb $(@D)/u-boot.sd)
 endef
 
 define UBOOT_BUILD_OMAP_IFT