From patchwork Tue Dec 6 13:48:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabien Parent X-Patchwork-Id: 86837 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp2022747qgi; Tue, 6 Dec 2016 05:49:18 -0800 (PST) X-Received: by 10.28.105.81 with SMTP id e78mr2974918wmc.140.1481032158213; Tue, 06 Dec 2016 05:49:18 -0800 (PST) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id qo1si11472316wjc.294.2016.12.06.05.49.17; Tue, 06 Dec 2016 05:49:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 64625A75F9; Tue, 6 Dec 2016 14:49:06 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I2AWpnw7dbaj; Tue, 6 Dec 2016 14:49:06 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5BF9FA75FD; Tue, 6 Dec 2016 14:48:57 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5B048A7599 for ; Tue, 6 Dec 2016 14:48:52 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7y0kxLQ2eQi4 for ; Tue, 6 Dec 2016 14:48:52 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-wj0-f175.google.com (mail-wj0-f175.google.com [209.85.210.175]) by theia.denx.de (Postfix) with ESMTPS id 250BCA7573 for ; Tue, 6 Dec 2016 14:48:49 +0100 (CET) Received: by mail-wj0-f175.google.com with SMTP id xy5so321676642wjc.0 for ; Tue, 06 Dec 2016 05:48:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z+iuKI5FrL2VcRluzaeGLRTl6w0PRsmhhJPtZ6+L92M=; b=Z51ph2G8syyMZR4jpQvEJf637eiHO4bn0Mc8kuLUOL3OQBncw1XbYmeLemIXs8jyK5 RWViRReoNiKNoqDBxjGnYRs2sQp1+naYLSwOHrut69+cpYrgT7P8MSyc9l6xP7Btj0N5 2ipYLLv9Xk5aqNQrgUPg+oSbiB+xYckx87NCrKTA6lQb3xe3a5oggTl1HSJTAjuBjGDR eWUlSR1iHeyf/mDH2o7UA+A2avPLWWe7Nb7hiUhMklbDhrd0tHVzJ2HbMO9MQ36uLOjg youpw15yH1o6C3tZ5Mkmrrt58XGEZnYk/rc4XNvbP46zZCTnfsT6IbRkLbjsFA93rXC4 n0XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=z+iuKI5FrL2VcRluzaeGLRTl6w0PRsmhhJPtZ6+L92M=; b=CJk2k8x3bMjJ3RQUuhSsB9PwWISvyCjo4dGQ5AOSqfBH3ZllwPD8xSpu+802LMleM6 l1WxuqDatUHG0tE8pv1bkmF55tM9zH+arRV8u1pNM8mcJp7u5++gXxHfLYtwTlrUFa1X TX3pjg1esuvB2/CcfEBx0eGlo3wICKImstELlQAgOgzJZg44rcz5K8pw0tkXKUuBn12L iG2wCmECUT2GFUyuqc5ZVxiqeglQRaMKdySyRYI7PrwCI5dplITQBipDrOlkhYdyz9fb Of/6Hb4kr3XAd8vxLm82r4q7gQBLzm9QsbG3OpXw5F38JqWdu41JoHRhprO4hMacyygi FTMA== X-Gm-Message-State: AKaTC01oW9K3Eoko9KcAIRyOx7/4F+H3ZC5Xcp8RKpCfAqFN5OxfYHajrUx6POA0/pkRFat+ X-Received: by 10.194.203.135 with SMTP id kq7mr65135077wjc.26.1481032128433; Tue, 06 Dec 2016 05:48:48 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id c81sm4084080wmf.22.2016.12.06.05.48.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Dec 2016 05:48:47 -0800 (PST) From: Fabien Parent To: u-boot@lists.denx.de Date: Tue, 6 Dec 2016 14:48:29 +0100 Message-Id: <20161206134830.22130-3-fparent@baylibre.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161206134830.22130-1-fparent@baylibre.com> References: <20161206134830.22130-1-fparent@baylibre.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 2/3] SPL: create Kconfig options for CONFIG_SPL_*_LOAD X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" In order to clean up the config headers and also to allow to easily switch the boot device for some boards without having to modify the config headers, it is better to move the options to Kconfig. This commit move the CONFIG_SPL_*_LOAD options to Kconfig files. Signed-off-by: Fabien Parent --- common/spl/Kconfig | 25 +++++++++++++++++++++++++ scripts/config_whitelist.txt | 3 --- 2 files changed, 25 insertions(+), 3 deletions(-) -- 2.11.0 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/common/spl/Kconfig b/common/spl/Kconfig index cba51f5df6..9313870566 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -97,6 +97,31 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR Address on the MMC to load U-Boot from, when the MMC is being used in raw mode. Units: MMC sectors (1 sector = 512 bytes). +config SPL_SELECT_BOOT_MEDIA + bool "Select the media to boot from" + depends on SPL + help + Enable selection of the media that will be used to load u-boot or + the OS. This is not a must, some SoCs need this, some not. + +choice + prompt "Boot media" + depends on SPL_SELECT_BOOT_MEDIA + +config SPL_NAND_LOAD + bool "Load u-boot or OS from NAND" + depends on SPL_NAND_SUPPORT + +config SPL_SPI_LOAD + bool "Load u-boot or OS from SPI" + depends on SPL_SPI_FLASH_SUPPORT + +config SPL_MMC_LOAD + bool "Load u-boot or OS from MMC" + depends on SPL_MMC_SUPPORT + +endchoice + config TPL bool depends on SPL && SUPPORT_TPL diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8814841e1f..f9fb4b59f8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4163,7 +4163,6 @@ CONFIG_SPL_MAX_FOOTPRINT CONFIG_SPL_MAX_PEB_SIZE CONFIG_SPL_MAX_SIZE CONFIG_SPL_MMC_BOOT -CONFIG_SPL_MMC_LOAD CONFIG_SPL_MMC_MINIMAL CONFIG_SPL_MPC83XX_WAIT_FOR_NAND CONFIG_SPL_MXS_PSWITCH_WAIT @@ -4173,7 +4172,6 @@ CONFIG_SPL_NAND_BOOT CONFIG_SPL_NAND_DRIVERS CONFIG_SPL_NAND_ECC CONFIG_SPL_NAND_INIT -CONFIG_SPL_NAND_LOAD CONFIG_SPL_NAND_MINIMAL CONFIG_SPL_NAND_MXS CONFIG_SPL_NAND_RAW_ONLY @@ -4199,7 +4197,6 @@ CONFIG_SPL_SKIP_RELOCATE CONFIG_SPL_SPAACT_ADDR CONFIG_SPL_SPI_BOOT CONFIG_SPL_SPI_FLASH_MINIMAL -CONFIG_SPL_SPI_LOAD CONFIG_SPL_STACK CONFIG_SPL_STACK_ADDR CONFIG_SPL_STACK_SIZE