All of lore.kernel.org
 help / color / mirror / Atom feed
From: Joel Johnson <mrjoel@lixil.net>
To: u-boot@lists.denx.de
Subject: [PATCH 10/10] arm: mvebu: clearfog: don't assume MMC booting
Date: Sat, 11 Jan 2020 12:36:39 -0700	[thread overview]
Message-ID: <20200111193639.19022-10-mrjoel@lixil.net> (raw)
In-Reply-To: <20200111193639.19022-1-mrjoel@lixil.net>

Remove MMC booting assumptions from clearfog_defconfig. Their
presence in starting config files conflicts with default ENV_IS_IN
selection logic based on boot source, since the "select" option
can't distinguish between user-overridden and defconfig selected.

Signed-off-by: Joel Johnson <mrjoel@lixil.net>
---


The real objective is to remove CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC as
well but I couldn't identify an available mechanism to do so.
Requiring it as enabled in the defconfig results in additional items
being unneccessarily included if switching boot device after starting
with the defconfig, as well as ENV_IS_IN_MMC being undesirably
residually defined.

---
 arch/arm/mach-mvebu/Kconfig     | 1 +
 board/solidrun/clearfog/Kconfig | 5 +++++
 configs/clearfog_defconfig      | 3 ---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index b3239b2b01..3f9aa4b26e 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -248,6 +248,7 @@ config MVEBU_SPL_BOOT_DEVICE_MMC
 	select SPL_DM_GPIO
 	select SPL_DM_MMC
 	select SPL_LIBDISK_SUPPORT
+	select SPL_MMC_SUPPORT
 
 config MVEBU_SPL_BOOT_DEVICE_SATA
 	bool "SATA"
diff --git a/board/solidrun/clearfog/Kconfig b/board/solidrun/clearfog/Kconfig
index 253b925ba1..bd51df8750 100644
--- a/board/solidrun/clearfog/Kconfig
+++ b/board/solidrun/clearfog/Kconfig
@@ -52,6 +52,11 @@ config ENV_SECT_SIZE
 	# Use optimistic 64 KiB erase block, will vary between actual media
 	default 0x10000 if MVEBU_SPL_BOOT_DEVICE_MMC
 
+config SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR
+	hex "Address on the MMC to load U-Boot from"
+	default 0x141
+	depends on MVEBU_SPL_BOOT_DEVICE_MMC
+
 config SYS_SPI_U_BOOT_OFFS
 	hex "address of u-boot payload in SPI flash"
 	default 0x20000
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
index 0b55e63079..eab24c32f0 100644
--- a/configs/clearfog_defconfig
+++ b/configs/clearfog_defconfig
@@ -9,7 +9,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_CLEARFOG=y
 CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y
-CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_SPL=y
@@ -24,7 +23,6 @@ CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
-CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x141
 CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
@@ -39,7 +37,6 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog"
-CONFIG_ENV_IS_IN_MMC=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_AHCI_MVEBU=y
-- 
2.20.1

  parent reply	other threads:[~2020-01-11 19:36 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-11 19:36 [PATCH 01/10] arm: mvebu: fix SerDes table alignment Joel Johnson
2020-01-11 19:36 ` [PATCH 02/10] arm: mvebu: solidrun: remove hardcoded DTS MAC address Joel Johnson
2020-01-13  8:21   ` Stefan Roese
2020-01-11 19:36 ` [PATCH 03/10] arm: mvebu: clearfog: initial ClearFog Base variant Joel Johnson
2020-01-12 10:14   ` Baruch Siach
2020-01-12 15:16     ` Joel Johnson
2020-01-13  8:19       ` Stefan Roese
2020-01-11 19:36 ` [PATCH 04/10] arm: mvebu: clearfog: Add SATA mode flags Joel Johnson
2020-01-11 19:36 ` [PATCH 05/10] arm: mvebu: clearfog: Add option for 2.5 Gbps SFP Joel Johnson
2020-01-12 10:21   ` Baruch Siach
2020-01-12 15:07     ` Joel Johnson
2020-01-11 19:36 ` [PATCH 06/10] arm: mvebu: clearfog: Add config for 2GB SOM Joel Johnson
2020-01-12 10:33   ` Baruch Siach
2020-01-12 15:48     ` Joel Johnson
2020-01-12 16:44       ` Baruch Siach
2020-01-11 19:36 ` [PATCH 07/10] arm: mvebu: clearfog: add SPI offsets Joel Johnson
2020-01-12 10:42   ` Baruch Siach
2020-01-12 15:30     ` Joel Johnson
2020-01-12 16:28       ` Baruch Siach
2020-01-11 19:36 ` [PATCH 08/10] arm: mvebu: enable working default boot support Joel Johnson
2020-01-11 21:07   ` Joel Johnson
2020-01-13  8:26     ` Stefan Roese
2020-01-11 19:36 ` [PATCH 09/10] arm: mvebu: clearfog: move ENV params to Kconfig Joel Johnson
2020-01-13  8:29   ` Stefan Roese
2020-01-11 19:36 ` Joel Johnson [this message]
2020-01-12 10:49   ` [PATCH 10/10] arm: mvebu: clearfog: don't assume MMC booting Baruch Siach
2020-01-12 15:40     ` Joel Johnson
2020-01-12 16:34       ` Baruch Siach
2020-01-13  6:48         ` Stefan Roese
2020-01-13 11:40           ` Baruch Siach
2020-01-13 11:42             ` Stefan Roese
2020-01-14 12:55           ` Baruch Siach
2020-01-14 13:01             ` Stefan Roese
2020-01-14 14:53               ` Baruch Siach
2020-01-14 15:06                 ` Stefan Roese
2020-01-15  7:04                   ` Baruch Siach
2020-01-13  8:18 ` [PATCH 01/10] arm: mvebu: fix SerDes table alignment Stefan Roese

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200111193639.19022-10-mrjoel@lixil.net \
    --to=mrjoel@lixil.net \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.