From patchwork Wed Jul 24 09:50:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 261398 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id C1D422C00A6 for ; Wed, 24 Jul 2013 19:50:26 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 38A3C322FE; Wed, 24 Jul 2013 09:50:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rdA-jt2-bhKk; Wed, 24 Jul 2013 09:50:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 566F83122E; Wed, 24 Jul 2013 09:50:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 46D9E1BF854 for ; Wed, 24 Jul 2013 09:50:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C327E8DA1B for ; Wed, 24 Jul 2013 09:50:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Kx34Q9VeMqAy for ; Wed, 24 Jul 2013 09:50:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ea0-f169.google.com (mail-ea0-f169.google.com [209.85.215.169]) by whitealder.osuosl.org (Postfix) with ESMTPS id F42208D96F for ; Wed, 24 Jul 2013 09:50:21 +0000 (UTC) Received: by mail-ea0-f169.google.com with SMTP id h15so121504eak.0 for ; Wed, 24 Jul 2013 02:50:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:content-type:mime-version:content-transfer-encoding:subject :x-mercurial-node:message-id:user-agent:date:from:to; bh=kswHaHwW/W5eiOWvgbKCW1RQyUkbeA2m9IDtrW1bc20=; b=BJiQYnNNPoQHx1cU0lK1wN8b/xsY6cafo31gHJr9Pzwvn4wRThRmsibUXaBXueMH/5 M6OtQlJgI6lxQmU4y643nRmCKCzmrpslteKWyFtrlL8rUPtAHWD1KJFHD7nu7lATLGU0 lkszRgfKyYh3GWO65/qnpQ8CGqYvTHDEvs5YoXr25UbvGIb0UO50FcKx7apU6hslcWhg oOUtUVJASAvoWcpoKgdQTF9AocdhstWNjoMKj2BnTnBFTIqDrNaehpBYBHe7NQCKOyk3 iqHOrX9lmU8ez53F3gila/vDyGkHDH/Wh8LZdbypPbe0em45v3GBOKxswkwF5SoE5+8j Xgag== X-Received: by 10.14.201.68 with SMTP id a44mr10905917eeo.46.1374659420366; Wed, 24 Jul 2013 02:50:20 -0700 (PDT) Received: from [127.0.1.1] (d54C62EEB.access.telenet.be. [84.198.46.235]) by mx.google.com with ESMTPSA id bj46sm64763333eeb.13.2013.07.24.02.50.18 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 24 Jul 2013 02:50:19 -0700 (PDT) MIME-Version: 1.0 X-Mercurial-Node: b03d9402321cbcb3ae1e9d24d40fe0c3cc00176d Message-Id: User-Agent: Mercurial-patchbomb/2.2.2 Date: Wed, 24 Jul 2013 11:50:14 +0200 From: Thomas De Schampheleire To: buildroot@busybox.net Subject: [Buildroot] [PATCH] u-boot: support custom u-boot.bin name X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net On some platforms, the standard U-Boot binary is not called u-boot.bin, but u-boot.bin. This is for example the case on the Cavium-provided u-boot, where the output file is called u-boot_.bin. This patch adds a 'custom format' choice in the existing u-boot binary format selection, where this name can be put. In the Cavium example, this option could be set to: BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-$(BR2_TARGET_UBOOT_BOARDNAME).bin" Signed-off-by: Thomas De Schampheleire --- boot/uboot/Config.in | 16 ++++++++++++++++ boot/uboot/uboot.mk | 2 ++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -101,8 +101,24 @@ config BR2_TARGET_UBOOT_FORMAT_LDR config BR2_TARGET_UBOOT_FORMAT_ELF bool "u-boot.elf" +config BR2_TARGET_UBOOT_FORMAT_CUSTOM + bool "Custom (specify below)" + help + On some platforms, the standard U-Boot binary is not called + u-boot.bin, but u-boot.bin. If this is your case, + you should select this option and specify the correct name + in BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME. + endchoice +config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME + string "U-Boot binary format: custom name" + depends on BR2_TARGET_UBOOT_FORMAT_CUSTOM + help + Specify the correct name of the output binary created by + U-Boot, if it is not one of the default names. For example: + u-boot_magic.bin + config BR2_TARGET_UBOOT_OMAP_IFT depends on BR2_TARGET_UBOOT_FORMAT_BIN depends on BR2_arm || BR2_armeb diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -40,6 +40,8 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAN UBOOT_BIN = u-boot-nand.bin else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y) UBOOT_BIN = u-boot.img +else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y) +UBOOT_BIN = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME)) else UBOOT_BIN = u-boot.bin UBOOT_BIN_IFT = $(UBOOT_BIN).ift