[PATCH] arm: kirkwood: Enable bootstd for Zyxel NSA310S board

[Stefan Roese]

On 10/26/23 09:09, Stefan Roese wrote:
> On 10/26/23 00:38, Tony Dinh wrote:
>> Enable bootstd for Zyxel NSA310S board, and remove distroboot.
>>
>> Signed-off-by: Tony Dinh <mibodhi at gmail.com>
> 
> Reviewed-by: Stefan Roese <sr at denx.de>

Applied to u-boot-marvell/master

Thanks,
Stefan

> Thanks,
> Stefan
> 
>> ---
>>
>>   configs/nsa310s_defconfig |  3 ++-
>>   include/configs/nsa310s.h | 17 ++---------------
>>   2 files changed, 4 insertions(+), 16 deletions(-)
>>
>> diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
>> index ff4895622c..038ef42e9d 100644
>> --- 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 fa029a176b..8c4d03553d 100644
>> --- 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 at gmail.com>
>> + * Copyright (C) 2015, 2021-2023 Tony Dinh <mibodhi at gmail.com>
>>    * Copyright (C) 2015
>>    * Gerald Kerma <dreagle at doukki.net>
>>    * Luka Perkov <luka.perkov at 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 */
> 
> Viele Grüße,
> Stefan Roese
> 

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de