arm: mvebu: Enable bootstd for Synology DS116 board

Enable bootstd for Synology DS116 board, and remove distroboot.

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

diff --git a/configs/ds116_defconfig b/configs/ds116_defconfig
index 0cd546c223011a85f02ed990cd28cf2848c00ea4..2437be73cdbf3ab966f797e5beb536c5e3268263 100644 (file)
--- a/configs/ds116_defconfig
+++ b/configs/ds116_defconfig
@@ -28,7 +28,8 @@ CONFIG_SYS_LOAD_ADDR=0x800000
 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/ds116.h b/include/configs/ds116.h
index 031f4f6afc1c67a81715997911aa63673d6af591..0883ec4d53b30ccaea6474968ef70187906936a6 100644 (file)
--- a/include/configs/ds116.h
+++ b/include/configs/ds116.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(USB, usb, 0) \
-       func(SCSI, scsi, 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 */