From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from mediacenter.hi.pengutronix.de ([2001:6f8:1178:2::65])
	by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1RxQ11-0001Ar-CH
	for ptxdist@pengutronix.de; Tue, 14 Feb 2012 22:34:23 +0100
Received: from mol by mediacenter.hi.pengutronix.de with local (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1RxQ11-0001x9-BD
	for ptxdist@pengutronix.de; Tue, 14 Feb 2012 22:34:23 +0100
Date: Tue, 14 Feb 2012 22:34:23 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
Message-ID: <20120214213423.GP25569@pengutronix.de>
References: <1329071777-24239-1-git-send-email-bernhard@bwalle.de>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <1329071777-24239-1-git-send-email-bernhard@bwalle.de>
Subject: Re: [ptxdist] [PATCH] u-boot: Allow copying of u-boot SPL to images
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de

On Sun, Feb 12, 2012 at 07:36:17PM +0100, Bernhard Walle wrote:
> This patch adds two options:
> 
>  1) U_BOOT_INSTALL_MLO copies the "MLO" (u-boot SPL which replaces
>     x-loader for OMAP CPUs) to the images directory.
>  2) U_BOOT_INSTALL_U_BOOT_IMG copies "u-boot.img" in addition to the
>     u-boot binary because u-boot SPL expects the u-boot.img (which
>     contains an additional u-boot header) on a SD card.
> 
> Because of the file name conflict, U_BOOT_INSTALL_MLO is only selectable
> when x-loader is not built.

Applied. Next time please make sure to indent properly.

Michael

> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> ---
>  platforms/u-boot.in |   19 +++++++++++++++++++
>  rules/u-boot.make   |    6 ++++++
>  2 files changed, 25 insertions(+), 0 deletions(-)
> 
> diff --git a/platforms/u-boot.in b/platforms/u-boot.in
> index 86f0703..1cac07b 100644
> --- a/platforms/u-boot.in
> +++ b/platforms/u-boot.in
> @@ -60,5 +60,24 @@ config U_BOOT_INSTALL_ELF
>  	help
>  	  Installing the U-Boot ELF binary into platform image directory.
>  
> +config U_BOOT_INSTALL_MLO
> +	prompt "install MLO"
> +        bool
> +	depends on !X_LOAD
> +	help
> +	  Installing the U-Boot SPL ("MLO") binary needed for OMAP CPUs into platform
> +	  image directory.
> +
> +if U_BOOT_INSTALL_MLO
> +
> +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.
> +
> +endif
> +
>  endif
>  
> diff --git a/rules/u-boot.make b/rules/u-boot.make
> index bee7faf..36760ee 100644
> --- a/rules/u-boot.make
> +++ b/rules/u-boot.make
> @@ -70,6 +70,12 @@ 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_MLO
> +	@install -D -m644 $(U_BOOT_DIR)/MLO $(IMAGEDIR)/MLO
> +endif
> +ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_IMG
> +	@install -D -m644 $(U_BOOT_DIR)/u-boot.img $(IMAGEDIR)/u-boot.img
> +endif
>  	@$(call touch)
>  
>  # ----------------------------------------------------------------------------
> -- 
> 1.7.9
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de