arm: kirkwood: Enable bootstd for Zyxel NSA310S board

Enable bootstd for Zyxel NSA310S board, and remove distroboot.

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

diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
index ff4895622cb376f89609cffe4245557db5fcef40..038ef42e9d8060c109ff5d92091fd39bc656be34 100644 (file)
--- a/configs/nsa310s_defconfig
+++ b/configs/nsa310s_defconfig
@@ -19,7 +19,8 @@ CONFIG_DEBUG_UART_CLOCK=166666667
 CONFIG_IDENT_STRING="\nZyXEL NSA310S/320S 1/2-Bay Power Media Server"
 CONFIG_SYS_LOAD_ADDR=0x800000
 CONFIG_DEBUG_UART=y
-CONFIG_DISTRO_DEFAULTS=y
+CONFIG_BOOTSTD_FULL=y
+CONFIG_BOOTSTD_DEFAULTS=y
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index fa029a176bd74ced7d1024177c07bae02b0dbca6..8c4d03553d3da2153b8f0ab2be83871a9d26c970 100644 (file)
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2015, 2021-2022 Tony Dinh <mibodhi@gmail.com>
+ * Copyright (C) 2015, 2021-2023 Tony Dinh <mibodhi@gmail.com>
  * Copyright (C) 2015
  * Gerald Kerma <dreagle@doukki.net>
  * Luka Perkov <luka.perkov@sartura.hr>
@@ -15,14 +15,6 @@
  */
 #include "mv-common.h"
 
-/* Include the common distro boot environment */
-#ifndef CONFIG_SPL_BUILD
-
-#define BOOT_TARGET_DEVICES(func) \
-       func(USB, usb, 0) \
-       func(SATA, sata, 0) \
-       func(DHCP, dhcp, na)
-
 #define KERNEL_ADDR_R  __stringify(0x800000)
 #define FDT_ADDR_R     __stringify(0x2c00000)
 #define RAMDISK_ADDR_R __stringify(0x01100000)
@@ -34,16 +26,11 @@
        "ramdisk_addr_r=" RAMDISK_ADDR_R "\0" \
        "scriptaddr=" SCRIPT_ADDR_R "\0"
 
-#include <config_distro_bootcmd.h>
-
 #define CFG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0" \
        "kernel=/boot/zImage\0" \
        "fdt=/boot/nsa310s.dtb\0" \
        "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0" \
-       LOAD_ADDRESS_ENV_SETTINGS \
-       BOOTENV
-
-#endif /* CONFIG_SPL_BUILD */
+       LOAD_ADDRESS_ENV_SETTINGS
 
 #endif /* _CONFIG_NSA310S_H */