From patchwork Wed Jul 24 12:54:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrej.rosano@f-secure.com X-Patchwork-Id: 1136506 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=f-secure.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=f-secure.com header.i=@f-secure.com header.b="j5Cb+kzU"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45v2wj0ryQz9s3l for ; Thu, 25 Jul 2019 03:52:03 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id F1D30C21D4A; Wed, 24 Jul 2019 17:51:52 +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=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 94E38C21C27; Wed, 24 Jul 2019 17:51:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 94DBEC21C27; Wed, 24 Jul 2019 12:54:48 +0000 (UTC) Received: from helmsgagent01.f-secure.com (helmsgagent01.f-secure.com [193.110.108.21]) by lists.denx.de (Postfix) with ESMTPS id 41298C21BE5 for ; Wed, 24 Jul 2019 12:54:48 +0000 (UTC) Received: from pps.filterd (helmsgagent01.f-secure.com [127.0.0.1]) by helmsgagent01.f-secure.com (8.16.0.27/8.16.0.27) with SMTP id x6OCsRIj012513; Wed, 24 Jul 2019 15:54:46 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=f-secure.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=msg2048; bh=ka9oBweYF4kdSx/pW2+iKi3rxzxT2npfT9h3a5IffXA=; b=j5Cb+kzUuhoTczwTyxE51SmGyqJSYxYHSXVBF5a0r6Wq3kg3tobEKJiIjwjifZDV11fH 3JHVF4IhWYsRCiigaJCVoNrQY14JUefpI+eHtbBypG2lclanxwLn3F6N73ZlJVs4nBiJ 2MofYjvhyFMe/x+/l3KhXZ3QevIUnuBmFsetQmnnmABJ4U7xUt4RJmuDwpS0B1DqWiLI z9AaB11itzljortnwv0Ex3Csmy1FbFzlELhqkALagn/sn0b0g0BbY2QClpJQv4y9z+K7 pvdlrha3Bu2BFgPk3ws3TDBP4ymAs5hayF4HaJj/rP6u5lV5EkkA4ttUgVRk16fVcRM1 Jw== Received: from helex01.fi.f-secure.com ([10.190.48.70]) by helmsgagent01.f-secure.com with ESMTP id 2tx62bh7r3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 24 Jul 2019 15:54:46 +0300 Received: from localhost (10.191.8.25) by helex01.FI.F-Secure.com (10.190.48.70) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 24 Jul 2019 15:54:45 +0300 From: To: Date: Wed, 24 Jul 2019 14:54:42 +0200 Message-ID: <20190724125442.18961-1-andrej.rosano@f-secure.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-Originating-IP: [10.191.8.25] X-ClientProxiedBy: helex01.FI.F-Secure.com (10.190.48.70) To helex01.FI.F-Secure.com (10.190.48.70) X-Mailman-Approved-At: Wed, 24 Jul 2019 17:51:49 +0000 Subject: [U-Boot] [PATCH] Drop linker-generated array creation when CONFIG_CMDLINE is disabled 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" From: Andrej Rosano Linker generated array entry is not needed when the command line is disabled. Remove this code in that case. This is required as the commit 80a48dd47e3bf3ede676fae5a630cb6c80de3e69 breaks the linking stage when CONFIG_CMDLINE=n: .. LDS u-boot.lds LD u-boot u-boot contains unexpected relocations: R_ARM_NONE R_ARM_RELATIVE make: *** [Makefile:1775: checkarmreloc] Error 1 Signed-off-by: Andrej Rosano --- cmd/help.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/help.c b/cmd/help.c index fa2010c67e..a1a0b99b6f 100644 --- a/cmd/help.c +++ b/cmd/help.c @@ -27,6 +27,7 @@ U_BOOT_CMD( " - print detailed usage of 'command'" ); +#ifdef CONFIG_CMDLINE /* This does not use the U_BOOT_CMD macro as ? can't be used in symbol names */ ll_entry_declare(cmd_tbl_t, question_mark, cmd) = { "?", CONFIG_SYS_MAXARGS, cmd_always_repeatable, do_help, @@ -35,3 +36,4 @@ ll_entry_declare(cmd_tbl_t, question_mark, cmd) = { "" #endif /* CONFIG_SYS_LONGHELP */ }; +#endif