On 22.11.24 01:30, Chris Packham wrote:
Use standard boot instead of the distro boot scripts. Regenerate the board defconfig now that some options are selected automatically.
Signed-off-by: Chris Packham judge.packham@gmail.com
Reviewed-by: Stefan Roese sr@denx.de
Thanks, Stefan
arch/arm/mach-mvebu/Kconfig | 1 + configs/x240_defconfig | 6 ------ include/configs/x240.h | 9 ++------- 3 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index b422bb09e023..adb816982f87 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -224,6 +224,7 @@ config TARGET_X250 config TARGET_X240 bool "Support Allied Telesis x240" select ALLEYCAT_5
imply BOOTSTD_DEFAULTS
config TARGET_DB_XC3_24G4XG bool "Support DB-XC3-24G4XG"
diff --git a/configs/x240_defconfig b/configs/x240_defconfig index f930d28de2dd..4fca1096e740 100644 --- a/configs/x240_defconfig +++ b/configs/x240_defconfig @@ -27,14 +27,9 @@ CONFIG_CMD_PCI=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_REGULATOR=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_CLK=y @@ -74,7 +69,6 @@ CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y -CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX88179=y diff --git a/include/configs/x240.h b/include/configs/x240.h index bc66e4e3c8e6..05241f33d74f 100644 --- a/include/configs/x240.h +++ b/include/configs/x240.h @@ -12,18 +12,13 @@ #define CFG_SYS_SDRAM_BASE 0x200000000
/* Default Env vars */
-#define BOOT_TARGET_DEVICES(func) \
- func(USB, usb, 0) \
- func(DHCP, dhcp, na)
-#include <config_distro_bootcmd.h> +#define BOOT_TARGETS "usb dhcp"
#define CFG_EXTRA_ENV_SETTINGS \
- BOOTENV \ "kernel_addr_r=0x202000000\0" \ "fdt_addr_r=0x201000000\0" \ "ramdisk_addr_r=0x206000000\0" \
"boot_targets=" BOOT_TARGETS "\0" \ "fdtfile=marvell/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0"
/*
Viele Grüße, Stefan Roese