From 335df894ad60f60632759a92ef62216bec62585e Mon Sep 17 00:00:00 2001 From: Tony Dinh Date: Sat, 7 Oct 2023 15:08:13 -0700 Subject: [PATCH] arm: mvebu: Enable bootstd for Thecus N2350 board Enable bootstd for Thecus N2350 board, and remove distroboot. Signed-off-by: Tony Dinh Reviewed-by: Stefan Roese --- configs/n2350_defconfig | 3 ++- include/configs/n2350.h | 12 +----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/configs/n2350_defconfig b/configs/n2350_defconfig index 109f0e10e9..07135742d3 100644 --- a/configs/n2350_defconfig +++ b/configs/n2350_defconfig @@ -29,7 +29,8 @@ CONFIG_ENV_ADDR=0x100000 CONFIG_PCI=y CONFIG_DEBUG_UART=y CONFIG_AHCI=y -CONFIG_DISTRO_DEFAULTS=y +CONFIG_BOOTSTD_FULL=y +CONFIG_BOOTSTD_DEFAULTS=y CONFIG_BOOTDELAY=10 CONFIG_USE_PREBOOT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y diff --git a/include/configs/n2350.h b/include/configs/n2350.h index 92b2270236..d8a9814d3e 100644 --- a/include/configs/n2350.h +++ b/include/configs/n2350.h @@ -20,15 +20,8 @@ */ #include "mv-common.h" -/* Include the common distro boot environment */ #ifndef CONFIG_SPL_BUILD -#define BOOT_TARGET_DEVICES(func) \ - func(SCSI, scsi, 0) \ - func(USB, usb, 0) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) - #define KERNEL_ADDR_R __stringify(0x1000000) #define FDT_ADDR_R __stringify(0x2000000) #define RAMDISK_ADDR_R __stringify(0x2200000) @@ -42,14 +35,11 @@ "scriptaddr=" SCRIPT_ADDR_R "\0" \ "pxefile_addr_r=" PXEFILE_ADDR_R "\0" -#include - #define CFG_EXTRA_ENV_SETTINGS \ RELOCATION_LIMITS_ENV_SETTINGS \ LOAD_ADDRESS_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ - "console=ttyS0,115200\0" \ - BOOTENV + "console=ttyS0,115200\0" #endif /* CONFIG_SPL_BUILD */ -- 2.39.5