From patchwork Fri Jan 18 07:46:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1027150 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ERgdpo8f"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43gtLy3F20z9sBn for ; Fri, 18 Jan 2019 18:47:06 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 15F21C220AF; Fri, 18 Jan 2019 07:47:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, KHOP_BIG_TO_CC, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 508AFC21F9C; Fri, 18 Jan 2019 07:47:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1CDC0C21F9C; Fri, 18 Jan 2019 07:46:59 +0000 (UTC) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by lists.denx.de (Postfix) with ESMTPS id E66ACC21DA6 for ; Fri, 18 Jan 2019 07:46:57 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id z9so6196157pfi.2 for ; Thu, 17 Jan 2019 23:46:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=El2HIJrahwWhIIvMXxeLT/hqr7NOHYyAMkfOvgxGB9Y=; b=ERgdpo8fT8nGNROSK+0ZAUAOhqVG2c6ne56i0U5lAHgUdGcOGZ+FvV/JddfqSxSrf0 NkUc+VPGSe+7lWJOgfMqdFUmoQ46vsu8Wc/OcHY6OFWk/t0hs+Urd4Gd6ObbO8wvoJO5 wLuqslOrs6A3VloRX54kvtANHmWm8PSKxsHmm0lM5KuzAAckSRJFhTGUTNDuexqOWl+k rkic2Fkmv5b2zOJZ7Jim8BD7H+MnMp6CUv0P0leCn1xoMyKCYFOdLBsLfcdHvpxqTK8F K1fOYrJ8pYKbZJUjs64HLZVm7qQgYH9X+1aFGIY/h9XSpsdwhFo9CF0voJcVZjrjvhew HrUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=El2HIJrahwWhIIvMXxeLT/hqr7NOHYyAMkfOvgxGB9Y=; b=NjKugjsrPlesxKOAeW2UXuz3GqSnLtjnbfZ6rt8Zjw8ggsAWBUcgL/M6qgEeYPCprA EwC8wR0X1GqsvHJcVUl7WUsP7zegLofSpYWHVRBtU8RwXXeO/hMOR7M+Bx0jbGpNcWtk pX8v33gG6TtDy8gPabVgdeBtah9Zre4Le4Dy4xdTqUrs90NiHWgt+ckqQbbF+IUyVCil 5GV3nAWa7vfOyCansuMC5q5TWbnA8HblgAWTAcR9d9d15IvV6jkKIkvkZDxrpvCwUnVH z/MLVJhwzHjnc6rdHiq2URw4keJAFjoPGciLLIrHZfj4LJTEe4O8nHatAya6NHu2xSxR UKHA== X-Gm-Message-State: AJcUukfo2EIuMafjOmZ2q9c4A6ygBm1QmW6V7U1mB1Fu1YRlNoFhPfQM leqng5uVQkdKdUOKcCuALgnEiSCF/SPYmw== X-Google-Smtp-Source: ALg8bN5z80ZpKQ3kyYwalMf/uJaJI/XucB6V/pxddCJqNR5pgdahKA/tBAP/2d4Dq1uWdbCNrwSwEw== X-Received: by 2002:a62:5d0c:: with SMTP id r12mr19042944pfb.0.1547797616168; Thu, 17 Jan 2019 23:46:56 -0800 (PST) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id 24sm13882361pfl.32.2019.01.17.23.46.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Jan 2019 23:46:55 -0800 (PST) From: Chris Packham To: u-boot@lists.denx.de Date: Fri, 18 Jan 2019 20:46:43 +1300 Message-Id: <20190118074643.21148-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Cc: Gerald Kerma , Marek Vasut , Prafulla Wadaskar , Walter Schweizer , Joe Hershberger , Chris Packham , Michal Simek , Luka Perkov , Duncan Hare , Tony Dinh , Siddarth Gore , Jason Cooper , Chris Packham Subject: [U-Boot] [PATCH] Kconfig: set default BUILD_TARGET for kirkwood X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Now that BUILD_TARGET is in Kconfig we can define a default for boards using the Kirkwood SoC. Signed-off-by: Chris Packham Cc: Jagan Teki --- This is based on http://patchwork.ozlabs.org/patch/1026858/ Kconfig | 1 + configs/SBx81LIFKW_defconfig | 1 - configs/SBx81LIFXCAT_defconfig | 1 - configs/dreamplug_defconfig | 1 - configs/ds109_defconfig | 1 - configs/guruplug_defconfig | 1 - configs/ib62x0_defconfig | 1 - configs/nsa310s_defconfig | 1 - configs/sheevaplug_defconfig | 1 - 9 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Kconfig b/Kconfig index 3a3a8d4d5bd6..e8fc5e7e727e 100644 --- a/Kconfig +++ b/Kconfig @@ -230,6 +230,7 @@ config BUILD_TARGET default "u-boot-spl.kwb" if ARCH_MVEBU && SPL_BUILD default "u-boot-elf.srec" if RCAR_GEN3 default "u-boot.itb" if ARCH_SUNXI && ARM64 + default "u-boot.kwb" if KIRKWOOD help Some SoCs need special image types (e.g. U-Boot binary with a special header) as build targets. By defining diff --git a/configs/SBx81LIFKW_defconfig b/configs/SBx81LIFKW_defconfig index 52bb70ae8c09..e0ce1595c5ee 100644 --- a/configs/SBx81LIFKW_defconfig +++ b/configs/SBx81LIFKW_defconfig @@ -5,7 +5,6 @@ CONFIG_TARGET_SBx81LIFKW=y CONFIG_IDENT_STRING="\nSBx81LIFKW" # CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 -CONFIG_BUILD_TARGET="u-boot.kwb" CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_U_BOOT_ONLY=y CONFIG_MISC_INIT_R=y diff --git a/configs/SBx81LIFXCAT_defconfig b/configs/SBx81LIFXCAT_defconfig index b322ab0959db..4a6e05844fec 100644 --- a/configs/SBx81LIFXCAT_defconfig +++ b/configs/SBx81LIFXCAT_defconfig @@ -5,7 +5,6 @@ CONFIG_TARGET_SBx81LIFXCAT=y CONFIG_IDENT_STRING="\nSBx81LIFXCAT" # CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 -CONFIG_BUILD_TARGET="u-boot.kwb" CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_U_BOOT_ONLY=y CONFIG_MISC_INIT_R=y diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig index 762521f97d7c..d3263cf9cd3f 100644 --- a/configs/dreamplug_defconfig +++ b/configs/dreamplug_defconfig @@ -6,7 +6,6 @@ CONFIG_IDENT_STRING="\nMarvell-DreamPlug" CONFIG_NR_DRAM_BANKS=2 # CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 -CONFIG_BUILD_TARGET="u-boot.kwb" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y # CONFIG_CMD_FLASH is not set diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig index b72174eada3c..352403e57385 100644 --- a/configs/ds109_defconfig +++ b/configs/ds109_defconfig @@ -5,7 +5,6 @@ CONFIG_TARGET_DS109=y CONFIG_NR_DRAM_BANKS=2 # CONFIG_SYS_MALLOC_F is not set CONFIG_HUSH_PARSER=y -CONFIG_BUILD_TARGET="u-boot.kwb" # CONFIG_CMD_FLASH is not set CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index 7726f9a76990..9998e48ab9c2 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -6,7 +6,6 @@ CONFIG_IDENT_STRING="\nMarvell-GuruPlug" CONFIG_NR_DRAM_BANKS=2 # CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 -CONFIG_BUILD_TARGET="u-boot.kwb" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig index 03987a4ff192..985d85e02746 100644 --- a/configs/ib62x0_defconfig +++ b/configs/ib62x0_defconfig @@ -5,7 +5,6 @@ CONFIG_TARGET_IB62X0=y CONFIG_IDENT_STRING=" RaidSonic ICY BOX IB-NAS62x0" CONFIG_NR_DRAM_BANKS=2 CONFIG_BOOTDELAY=3 -CONFIG_BUILD_TARGET="u-boot.kwb" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ib62x0 => " diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index 971d33b33dd2..eb29a70157c9 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_NSA310S=y CONFIG_NR_DRAM_BANKS=2 CONFIG_BOOTDELAY=3 -CONFIG_BUILD_TARGET="u-boot.kwb" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="nsa310s => " diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 33cced9c48db..04b00cdea9d4 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -7,7 +7,6 @@ CONFIG_IDENT_STRING="\nMarvell-Sheevaplug" CONFIG_NR_DRAM_BANKS=2 # CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 -CONFIG_BUILD_TARGET="u-boot.kwb" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y