From patchwork Thu Dec 28 07:25:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derald Woods X-Patchwork-Id: 853361 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DGS+s+AU"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3z6h8d0W9sz9s1h for ; Thu, 28 Dec 2017 18:25:51 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 14003C21DA3; Thu, 28 Dec 2017 07:25:35 +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, RCVD_IN_DNSWL_BLOCKED, 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 7E325C21C34; Thu, 28 Dec 2017 07:25:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6A2C7C21C34; Thu, 28 Dec 2017 07:25:31 +0000 (UTC) Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by lists.denx.de (Postfix) with ESMTPS id DB25FC21C2B for ; Thu, 28 Dec 2017 07:25:30 +0000 (UTC) Received: by mail-it0-f66.google.com with SMTP id 68so27815500ite.4 for ; Wed, 27 Dec 2017 23:25:30 -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; bh=p5dGDbjWRQycHzNXn5FUJ99IVNjQ5ust4r0erOrKnLY=; b=DGS+s+AUDePMbNKRaXf6KM6wXAoBVjlq3ocMLs+pxr7dU5lx/ff+GFc5zupDvb1SjL W6EN1nSiYtkchML78IotX+sYRyZO6XREInTMnCuzziLTXAR3ANm3/ZyM3olA325CkuD1 bNgfe/7u2XpKD7lt+K8yDzx1Lb+zOi4sS8ZiPOuNlVL8zR83efMxVWbWMnYUogpyk3b7 sviOWuRrhpR4ogxtK7bfmGzuvDmottUy2JMcWXaw7YR5zgK89G1XdkVsyXBcstHCvEOt wgsP1sHRRCHF4xH5wbgWIE7SgFo0WNUkwNhFxcrfehS+MfqAXxXo/cYn1ivDx6Q1nWIa FGDg== 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; bh=p5dGDbjWRQycHzNXn5FUJ99IVNjQ5ust4r0erOrKnLY=; b=i+6QWbTq0yTgdyc/NPJUP0pEsbGglrlZKHUOQVKH1+gHStXCRERegG9brKuO5O2joS 5WGYnDw5tXCqXpAgCqQftCzPTRrPTHHOr1Q6UyrKh9oCgnaupyPhMjB2PBfIBc/R+ido GTdlgxLFlqd84GSrh9/ifZ98miDnyEFpaWNgBINt3eReDoLpF83lm06+TUP3KVeAx6DD U3KpR3h6cTojygdYoxVl5fbkfTP7DIEJG+l8kNue8f004y2nNGUL9VXR+B9C2Bv3kcYr xK5Hmt7iUQ9HV5EcOF32pPDRP5lLIEBKxiR9iHHke/EWtVQNGQKBgppIfhVb4tx7LzPp 0ETQ== X-Gm-Message-State: AKGB3mLEaP752i2AVtIIcOi2XB2bmjXJIkNDiJTRC5CIeN2zWhjtvA4Y YrttngmIkh7Tksi6N+rM7wICOQ== X-Google-Smtp-Source: ACJfBovBpHjAfUW+bkQzThetFNTLc6MOvzdDpFHLbtDzMqVHqidN4qfO6hYHYFnQ6Kpqy5CJ1CFZ2A== X-Received: by 10.36.65.232 with SMTP id b101mr40778067itd.38.1514445929304; Wed, 27 Dec 2017 23:25:29 -0800 (PST) Received: from ethiopia.woodsts.org (c-73-74-196-48.hsd1.il.comcast.net. [73.74.196.48]) by smtp.gmail.com with ESMTPSA id 202sm11897737ioz.51.2017.12.27.23.25.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Dec 2017 23:25:28 -0800 (PST) From: "Derald D. Woods" To: u-boot@lists.denx.de Date: Thu, 28 Dec 2017 01:25:13 -0600 Message-Id: <20171228072513.1068-1-woods.technical@gmail.com> X-Mailer: git-send-email 2.15.1 Cc: trini@konsulko.com Subject: [U-Boot] [PATCH] Convert CONFIG_SYS_BOOT_GET_{CMDLINE, KBD} to Kconfig 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This converts the following to Kconfig: CONFIG_SYS_BOOT_GET_CMDLINE CONFIG_SYS_BOOT_GET_KBD Additionally, ARM now selects CONFIG_SYS_BOOT_GET_CMDLINE. This enables the 'boot_get_cmdline' call to be reached from 'image_setup_linux' in "common/image.c". Signed-off-by: Derald D. Woods --- Kconfig | 12 ++++++++++++ arch/Kconfig | 5 +++++ arch/m68k/include/asm/config.h | 2 -- arch/powerpc/include/asm/config.h | 2 -- scripts/config_whitelist.txt | 2 -- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Kconfig b/Kconfig index 9b8a807799..f713c6a9b1 100644 --- a/Kconfig +++ b/Kconfig @@ -83,6 +83,18 @@ config DISTRO_DEFAULTS Select this to enable various options and commands which are suitable for building u-boot for booting general purpose Linux distributions. +config SYS_BOOT_GET_CMDLINE + bool "Enable kernel command line setup" + help + Enables allocating and saving kernel cmdline in space between + "bootm_low" and "bootm_low" + BOOTMAPSZ. + +config SYS_BOOT_GET_KBD + bool "Enable kernel board information setup" + help + Enables allocating and saving a kernel copy of the bd_info in + space between "bootm_low" and "bootm_low" + BOOTMAPSZ. + config SYS_MALLOC_F bool "Enable malloc() pool before relocation" default y if DM diff --git a/arch/Kconfig b/arch/Kconfig index 0b12ed986c..41f61a46dc 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -22,10 +22,13 @@ config ARM select CREATE_ARCH_SYMLINK select HAVE_PRIVATE_LIBGCC if !ARM64 select SUPPORT_OF_CONTROL + select SYS_BOOT_GET_CMDLINE config M68K bool "M68000 architecture" select HAVE_PRIVATE_LIBGCC + select SYS_BOOT_GET_CMDLINE + select SYS_BOOT_GET_KBD config MICROBLAZE bool "MicroBlaze architecture" @@ -53,6 +56,8 @@ config PPC bool "PowerPC architecture" select HAVE_PRIVATE_LIBGCC select SUPPORT_OF_CONTROL + select SYS_BOOT_GET_CMDLINE + select SYS_BOOT_GET_KBD config SANDBOX bool "Sandbox" diff --git a/arch/m68k/include/asm/config.h b/arch/m68k/include/asm/config.h index 9c4d3fb8fd..fd0b5513ee 100644 --- a/arch/m68k/include/asm/config.h +++ b/arch/m68k/include/asm/config.h @@ -11,7 +11,5 @@ #define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH -#define CONFIG_SYS_BOOT_GET_CMDLINE -#define CONFIG_SYS_BOOT_GET_KBD #endif diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index 6aec815c71..67e4b48a96 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -31,8 +31,6 @@ #define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH -#define CONFIG_SYS_BOOT_GET_CMDLINE -#define CONFIG_SYS_BOOT_GET_KBD #ifndef CONFIG_MAX_MEM_MAPPED #if defined(CONFIG_E500) || \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 43a4ff0892..8117d485ec 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2322,8 +2322,6 @@ CONFIG_SYS_BOOTM_LEN CONFIG_SYS_BOOTPARAMS_LEN CONFIG_SYS_BOOTSZ CONFIG_SYS_BOOT_BLOCK -CONFIG_SYS_BOOT_GET_CMDLINE -CONFIG_SYS_BOOT_GET_KBD CONFIG_SYS_BOOT_RAMDISK_HIGH CONFIG_SYS_BR0_64M CONFIG_SYS_BR0_8M