From patchwork Mon Jul 29 07:24:53 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: 1138207 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="d/4G5n71"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45xrmz5FXJz9sBt for ; Mon, 29 Jul 2019 17:25:07 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 6611BC21DB5; Mon, 29 Jul 2019 07:25:01 +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 0B89DC21CB6; Mon, 29 Jul 2019 07:24:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 66831C21CB6; Mon, 29 Jul 2019 07:24:57 +0000 (UTC) Received: from helmsgagent01.f-secure.com (helmsgagent01.f-secure.com [193.110.108.21]) by lists.denx.de (Postfix) with ESMTPS id 11D6BC21C6A for ; Mon, 29 Jul 2019 07:24:57 +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 x6T7L84E027143 for ; Mon, 29 Jul 2019 10:24:56 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=f-secure.com; h=from : to : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=msg2048; bh=ka9oBweYF4kdSx/pW2+iKi3rxzxT2npfT9h3a5IffXA=; b=d/4G5n71etOLr5nfGEnfCT2bkvI8jGyLz0qSEBilKk5F7IvoHdcnmrVe0fot8BTwDo2g xyLsgarQb8WpjZm7s2N6V5mq/Aq1MaQ/DOD9RQXLIw8zMrGc69heU3e11Amn0Y6uRbBv fyAZsLG4X9Nj0rbIFVjFiNVCS5SJrZfuPjCFtjXBQjxhajURgBLaAQR9bne4aG0QSJPt HYKCKonAVa/2diPx662iFZIW6ItFF/dMtwzxMXW2ta3ycJuUsMF2794UceDpB1muT53k b6zd8ulNg+gyqZ7HDB9NLNLIEqNxzK6k+rLRCw6PQsBQlpU9tV/ZSOQObJBwtBmiDf2O QQ== Received: from helex01.fi.f-secure.com ([10.190.48.70]) by helmsgagent01.f-secure.com with ESMTP id 2u096tsyu1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Mon, 29 Jul 2019 10:24:56 +0300 Received: from localhost (10.191.8.48) by helex01.FI.F-Secure.com (10.190.48.70) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Mon, 29 Jul 2019 10:24:53 +0300 From: To: Date: Mon, 29 Jul 2019 09:24:53 +0200 Message-ID: <20190729072453.6711-1-andrej.rosano@f-secure.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-Originating-IP: [10.191.8.48] X-ClientProxiedBy: helex01.FI.F-Secure.com (10.190.48.70) To helex01.FI.F-Secure.com (10.190.48.70) 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