arm: mvebu: Enable bootstd for Thecus N2350 board

Enable bootstd for Thecus N2350 board, and remove distroboot.

Signed-off-by: Tony Dinh <mibodhi@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/configs/n2350_defconfig b/configs/n2350_defconfig
index 109f0e10e9a33c70f049c36a04105d0753606963..07135742d3f6dfe2ec18495c087d5699b17d3f1e 100644 (file)
--- 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 92b2270236f1226041e0e9c9ba3e80f31ea46f9c..d8a9814d3e87549fd775e782bf3491e06029adb6 100644 (file)
--- 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 <config_distro_bootcmd.h>
-
 #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 */