[PATCH] boards: Disable NET on platforms without NETDEVICES
None of these platforms enabled a networking devices, and disabled CMD_NET. Given that we used to gate network support on CMD_NET rather than NET, we disable CONFIG_NET on these platforms now.
Signed-off-by: Tom Rini trini@konsulko.com --- Cc: Simon Glass sjg@chromium.org Cc: Heinrich Schuchardt xypron.glpk@gmx.de Cc: Matthias Winker matthias.winker@de.bosch.com Cc: Philip Oberfichtner pro@denx.de Cc: Minkyu Kang mk7.kang@samsung.com Cc: Jaehoon Chung jh80.chung@samsung.com Cc: Patrice Chotard patrice.chotard@foss.st.com Cc: Patrick Delaunay patrick.delaunay@foss.st.com Cc: Sergey Temerkhanov s.temerkhanov@gmail.com --- configs/efi-x86_app32_defconfig | 3 +-- configs/efi-x86_app64_defconfig | 3 +-- configs/imx6q_bosch_acc_defconfig | 3 +-- configs/origen_defconfig | 2 +- configs/s5pc210_universal_defconfig | 2 +- configs/stm32mp25_defconfig | 2 +- configs/thunderx_88xx_defconfig | 2 +- configs/trats2_defconfig | 2 +- configs/trats_defconfig | 2 +- 9 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/configs/efi-x86_app32_defconfig b/configs/efi-x86_app32_defconfig index 682ba5b89576..e2e6f42c9a9d 100644 --- a/configs/efi-x86_app32_defconfig +++ b/configs/efi-x86_app32_defconfig @@ -21,7 +21,6 @@ CONFIG_SYS_PBSIZE=532 CONFIG_CMD_BOOTZ=y CONFIG_CMD_PART=y # CONFIG_CMD_SCSI is not set -# CONFIG_CMD_NET is not set CONFIG_CMD_TIME=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y @@ -36,7 +35,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_USE_BOOTFILE=y CONFIG_BOOTFILE="bzImage" -CONFIG_USE_ROOTPATH=y +# CONFIG_NET is not set CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_REGEX is not set diff --git a/configs/efi-x86_app64_defconfig b/configs/efi-x86_app64_defconfig index d6b6c3d82995..14b5cd0fa0ee 100644 --- a/configs/efi-x86_app64_defconfig +++ b/configs/efi-x86_app64_defconfig @@ -22,7 +22,6 @@ CONFIG_SYS_PBSIZE=532 CONFIG_CMD_BOOTZ=y CONFIG_CMD_PART=y # CONFIG_CMD_SCSI is not set -# CONFIG_CMD_NET is not set CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT2=y @@ -38,7 +37,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_USE_BOOTFILE=y CONFIG_BOOTFILE="bzImage" -CONFIG_USE_ROOTPATH=y +# CONFIG_NET is not set CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CONSOLE_SCROLL_LINES=5 diff --git a/configs/imx6q_bosch_acc_defconfig b/configs/imx6q_bosch_acc_defconfig index 05bab034e0f9..6abb7954ba2d 100644 --- a/configs/imx6q_bosch_acc_defconfig +++ b/configs/imx6q_bosch_acc_defconfig @@ -63,7 +63,6 @@ CONFIG_CMD_PART=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set # CONFIG_CMD_BLOCK_CACHE is not set # CONFIG_CMD_SLEEP is not set # CONFIG_CMD_MP is not set @@ -82,7 +81,7 @@ CONFIG_SYS_MMC_ENV_PART=1 CONFIG_ENV_WRITEABLE_LIST=y CONFIG_ENV_ACCESS_IGNORE_FORCE=y CONFIG_VERSION_VARIABLE=y -CONFIG_TFTP_BLOCKSIZE=512 +# CONFIG_NET is not set CONFIG_SPL_DM=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DM_BOOTCOUNT=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 3a71d6e582a7..5e55b712df9e 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -35,13 +35,13 @@ CONFIG_CMD_DFU=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_USB_MASS_STORAGE=y -# CONFIG_CMD_NET is not set CONFIG_CMD_CACHE=y # CONFIG_CMD_SLEEP is not set CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +# CONFIG_NET is not set CONFIG_DFU_MMC=y CONFIG_SYS_DFU_DATA_BUF_SIZE=0x2000000 CONFIG_MMC_DW=y diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index f585c510635a..ac236c82a1fc 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -33,7 +33,6 @@ CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB_MASS_STORAGE=y -# CONFIG_CMD_NET is not set CONFIG_CMD_CACHE=y # CONFIG_CMD_SLEEP is not set CONFIG_CMD_EXT4_WRITE=y @@ -42,6 +41,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +# CONFIG_NET is not set CONFIG_DFU_MMC=y CONFIG_SYS_DFU_DATA_BUF_SIZE=0x2000000 CONFIG_SYS_I2C_S3C24X0=y diff --git a/configs/stm32mp25_defconfig b/configs/stm32mp25_defconfig index 8423943f091c..75f27c98b441 100644 --- a/configs/stm32mp25_defconfig +++ b/configs/stm32mp25_defconfig @@ -23,7 +23,6 @@ CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y CONFIG_CMD_GPIO=y # CONFIG_CMD_LOADB is not set -# CONFIG_CMD_NET is not set CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_RNG=y @@ -31,6 +30,7 @@ CONFIG_CMD_TIMER=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_LOG=y CONFIG_OF_LIVE=y +# CONFIG_NET is not set CONFIG_GPIO_HOG=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_STM32F7=y diff --git a/configs/thunderx_88xx_defconfig b/configs/thunderx_88xx_defconfig index 5c24b38bb1fa..0c71b298ada5 100644 --- a/configs/thunderx_88xx_defconfig +++ b/configs/thunderx_88xx_defconfig @@ -32,8 +32,8 @@ CONFIG_SYS_BOOTM_LEN=0x800000 # CONFIG_CMD_EDITENV is not set # CONFIG_CMD_SAVEENV is not set # CONFIG_CMD_ENV_EXISTS is not set -# CONFIG_CMD_NET is not set CONFIG_SYS_RELOC_GD_ENV_ADDR=y +# CONFIG_NET is not set # CONFIG_MMC is not set CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART_SKIP_INIT=y diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index 6c4909f12be0..045c74f95efb 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -36,7 +36,6 @@ CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB_MASS_STORAGE=y -# CONFIG_CMD_NET is not set CONFIG_CMD_CACHE=y # CONFIG_CMD_SLEEP is not set CONFIG_CMD_EXT4_WRITE=y @@ -44,6 +43,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +# CONFIG_NET is not set CONFIG_DFU_MMC=y CONFIG_SYS_DFU_DATA_BUF_SIZE=0x2000000 CONFIG_DM_I2C_GPIO=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 78484c071945..b1adaef17a01 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -35,7 +35,6 @@ CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB_MASS_STORAGE=y -# CONFIG_CMD_NET is not set CONFIG_CMD_CACHE=y # CONFIG_CMD_SLEEP is not set CONFIG_CMD_EXT4_WRITE=y @@ -43,6 +42,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +# CONFIG_NET is not set CONFIG_DFU_MMC=y CONFIG_SYS_DFU_DATA_BUF_SIZE=0x2000000 CONFIG_DM_I2C_GPIO=y
On Fri, 17 Nov 2023 at 08:48, Tom Rini trini@konsulko.com wrote:
None of these platforms enabled a networking devices, and disabled CMD_NET. Given that we used to gate network support on CMD_NET rather than NET, we disable CONFIG_NET on these platforms now.
Signed-off-by: Tom Rini trini@konsulko.com
Cc: Simon Glass sjg@chromium.org Cc: Heinrich Schuchardt xypron.glpk@gmx.de Cc: Matthias Winker matthias.winker@de.bosch.com Cc: Philip Oberfichtner pro@denx.de Cc: Minkyu Kang mk7.kang@samsung.com Cc: Jaehoon Chung jh80.chung@samsung.com Cc: Patrice Chotard patrice.chotard@foss.st.com Cc: Patrick Delaunay patrick.delaunay@foss.st.com Cc: Sergey Temerkhanov s.temerkhanov@gmail.com
configs/efi-x86_app32_defconfig | 3 +-- configs/efi-x86_app64_defconfig | 3 +-- configs/imx6q_bosch_acc_defconfig | 3 +-- configs/origen_defconfig | 2 +- configs/s5pc210_universal_defconfig | 2 +- configs/stm32mp25_defconfig | 2 +- configs/thunderx_88xx_defconfig | 2 +- configs/trats2_defconfig | 2 +- configs/trats_defconfig | 2 +- 9 files changed, 9 insertions(+), 12 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Fri, Nov 17, 2023 at 10:47:57AM -0500, Tom Rini wrote:
None of these platforms enabled a networking devices, and disabled CMD_NET. Given that we used to gate network support on CMD_NET rather than NET, we disable CONFIG_NET on these platforms now.
Signed-off-by: Tom Rini trini@konsulko.com Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot/next, thanks!
On Mon, Nov 27, 2023 at 5:45 AM Winker Matthias (HC-CW/ENG-PJM) Matthias.Winker@de.bosch.com wrote:
Hello Tom,
Just to be sure. In the past we had NET enabled such that the fused MAC is taken over, although we don’t use NET CMD. With your changes, does I.mx6 evaluate the MAC fuses and forward it to Linux?
Our board: Bosch ACC.
I honestly don't know as I don't see how it's doing that today in current master (which does not have this change) so you might need to start by confirming behavior in the current tree and working from there, thanks.
On Mon, Nov 27, 2023 at 1:06 PM Tom Rini trini@konsulko.com wrote:
On Mon, Nov 27, 2023 at 5:45 AM Winker Matthias (HC-CW/ENG-PJM) Matthias.Winker@de.bosch.com wrote:
Hello Tom,
Just to be sure. In the past we had NET enabled such that the fused MAC is taken over, although we don’t use NET CMD. With your changes, does I.mx6 evaluate the MAC fuses and forward it to Linux?
Our board: Bosch ACC.
I honestly don't know as I don't see how it's doing that today in current master (which does not have this change) so you might need to start by confirming behavior in the current tree and working from there, thanks.
It's usually reading from eFUSES and populates details via DT using alias bits, whether or not that uses/depends on code in net I'm not sure.
On Mon, Nov 27, 2023 at 02:05:35PM +0000, Peter Robinson wrote:
On Mon, Nov 27, 2023 at 1:06 PM Tom Rini trini@konsulko.com wrote:
On Mon, Nov 27, 2023 at 5:45 AM Winker Matthias (HC-CW/ENG-PJM) Matthias.Winker@de.bosch.com wrote:
Hello Tom,
Just to be sure. In the past we had NET enabled such that the fused MAC is taken over, although we don’t use NET CMD. With your changes, does I.mx6 evaluate the MAC fuses and forward it to Linux?
Our board: Bosch ACC.
I honestly don't know as I don't see how it's doing that today in current master (which does not have this change) so you might need to start by confirming behavior in the current tree and working from there, thanks.
It's usually reading from eFUSES and populates details via DT using alias bits, whether or not that uses/depends on code in net I'm not sure.
Right. The regular (to me at least) hook is fdt_fixup_ethernet() which a few boards call, but not board/bosch/acc/ code. There's a couple of other calls in places, and then also a few places that modify "local-mac-address" or "mac-address" directly.
participants (4)
-
Peter Robinson -
Simon Glass -
Tom Rini -
Winker Matthias (HC-CW/ENG-PJM)