From 27b24887352bfcc360ccd14c44e4e9a767a9505a Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Fri, 22 Nov 2024 13:30:16 +1300 Subject: arm: mvebu: x240: Switch to standard boot 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 Reviewed-by: Stefan Roese --- include/configs/x240.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/configs/x240.h b/include/configs/x240.h index bc66e4e3c8e..05241f33d74 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 +#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" /* -- cgit v1.2.3