From: Chris Packham <judge.packham@gmail.com>
To: u-boot@lists.denx.de
Cc: "Chris Packham" <judge.packham@gmail.com>,
"Chris Packham" <chris.packham@alliedtelesis.co.nz>,
"Marek Behún" <marek.behun@nic.cz>,
"Mario Six" <mario.six@gdsys.cc>,
"Patrick Delaunay" <patrick.delaunay@foss.st.com>,
"Simon Glass" <sjg@chromium.org>, "Stefan Roese" <sr@denx.de>,
"Tom Rini" <trini@konsulko.com>
Subject: [PATCH 3/3] arm: mvebu: Remove CONFIG_SPL_BOOT_DEVICE
Date: Sun, 29 May 2022 11:13:18 +1200 [thread overview]
Message-ID: <20220528231318.359510-3-judge.packham@gmail.com> (raw)
In-Reply-To: <20220528231318.359510-1-judge.packham@gmail.com>
CONFIG_SPL_BOOT_DEVICE was made obsolete by
CONFIG_MVEBU_SPL_BOOT_DEVICE_{SPI,MMC,SATA,UART}.
CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI is the default so existing users of
CONFIG_SPL_BOOT_DEVICE can simply have the option removed.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
include/configs/controlcenterdc.h | 11 -----------
include/configs/db-88f6820-amc.h | 12 ------------
include/configs/db-88f6820-gp.h | 11 -----------
scripts/config_whitelist.txt | 1 -
4 files changed, 35 deletions(-)
diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index a8534e59d9b1..3d7da4b2a33e 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -23,17 +23,6 @@
#endif
/* SPL */
-/*
- * Select the boot device here
- *
- * Currently supported are:
- * SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash
- * SPL_BOOT_SDIO_MMC_CARD - Booting via SDIO/MMC card (partition 1)
- */
-#define SPL_BOOT_SPI_NOR_FLASH 1
-#define SPL_BOOT_SDIO_MMC_CARD 2
-#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH
-
/* Defines for SPL */
#define CONFIG_SPL_SIZE (160 << 10)
diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
index 6538e66052aa..d044292d6b5a 100644
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -27,18 +27,6 @@
"initrd_high=0x10000000\0"
/* SPL */
-/*
- * Select the boot device here
- *
- * Currently supported are:
- * SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash
- *
- * MMC is not populated on this board.
- * NAND support may be added in the future.
- */
-#define SPL_BOOT_SPI_NOR_FLASH 1
-#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH
-
/* Defines for SPL */
#define CONFIG_SPL_SIZE (140 << 10)
#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000))
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index b4b58e0bcb8a..35ff6a876fde 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -28,17 +28,6 @@
"initrd_high=0x10000000\0"
/* SPL */
-/*
- * Select the boot device here
- *
- * Currently supported are:
- * SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash
- * SPL_BOOT_SDIO_MMC_CARD - Booting via SDIO/MMC card (partition 1)
- */
-#define SPL_BOOT_SPI_NOR_FLASH 1
-#define SPL_BOOT_SDIO_MMC_CARD 2
-#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH
-
/* Defines for SPL */
#define CONFIG_SPL_SIZE (140 << 10)
#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000))
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 25962b735f27..a8766c9755ab 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -565,7 +565,6 @@ CONFIG_SPI_HALF_DUPLEX
CONFIG_SPI_N25Q256A_RESET
CONFIG_SPL_BOARD_LOAD_IMAGE
CONFIG_SPL_BOOTROM_SAVE
-CONFIG_SPL_BOOT_DEVICE
CONFIG_SPL_BSS_MAX_SIZE
CONFIG_SPL_BSS_START_ADDR
CONFIG_SPL_CMT
--
2.36.1
next prev parent reply other threads:[~2022-05-28 23:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-28 23:13 [PATCH 1/3] arm: mvebu: Use MVEBU_SPL_BOOT_DEVICE instead of SPL_BOOT_DEVICE Chris Packham
2022-05-28 23:13 ` [PATCH 2/3] Convert CONFIG_FIXED_SDHCI_ALIGNED_BUFFER to Kconfig Chris Packham
2022-05-29 10:47 ` Marek Behún
2022-05-30 6:52 ` Stefan Roese
2022-06-06 21:36 ` Tom Rini
2022-05-28 23:13 ` Chris Packham [this message]
2022-05-29 10:47 ` [PATCH 3/3] arm: mvebu: Remove CONFIG_SPL_BOOT_DEVICE Marek Behún
2022-05-30 6:53 ` Stefan Roese
2022-06-06 21:36 ` Tom Rini
2022-05-30 6:52 ` [PATCH 1/3] arm: mvebu: Use MVEBU_SPL_BOOT_DEVICE instead of SPL_BOOT_DEVICE Stefan Roese
2022-06-06 21:36 ` Tom Rini
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=20220528231318.359510-3-judge.packham@gmail.com \
--to=judge.packham@gmail.com \
--cc=chris.packham@alliedtelesis.co.nz \
--cc=marek.behun@nic.cz \
--cc=mario.six@gdsys.cc \
--cc=patrick.delaunay@foss.st.com \
--cc=sjg@chromium.org \
--cc=sr@denx.de \
--cc=trini@konsulko.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox