From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtprelay03.ispgateway.de ([80.67.29.7]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1RweHd-00088O-Ps for ptxdist@pengutronix.de; Sun, 12 Feb 2012 19:36:22 +0100 Received: from [88.217.121.13] (helo=galilei.fritz.box) by smtprelay03.ispgateway.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1RweHc-0006S7-RO for ptxdist@pengutronix.de; Sun, 12 Feb 2012 19:36:20 +0100 From: Bernhard Walle Date: Sun, 12 Feb 2012 19:36:17 +0100 Message-Id: <1329071777-24239-1-git-send-email-bernhard@bwalle.de> Subject: [ptxdist] [PATCH] u-boot: Allow copying of u-boot SPL to images Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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 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. Signed-off-by: Bernhard Walle --- 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