[PATCH] arm: kirkwood: Enable bootstd for Pogo V4 board

[Stefan Roese]

On 10/26/23 09:08, Stefan Roese wrote:
> On 10/25/23 01:17, Tony Dinh wrote:
>> Enable bootstd for Pogo V4 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/pogo_v4_defconfig |  3 ++-
>>   include/configs/pogo_v4.h | 35 ++---------------------------------
>>   2 files changed, 4 insertions(+), 34 deletions(-)
>>
>> diff --git a/configs/pogo_v4_defconfig b/configs/pogo_v4_defconfig
>> index 2747c3c72d..ff6411d894 100644
>> --- a/configs/pogo_v4_defconfig
>> +++ b/configs/pogo_v4_defconfig
>> @@ -17,7 +17,8 @@ CONFIG_IDENT_STRING="\nPogoplug V4"
>>   CONFIG_SYS_LOAD_ADDR=0x800000
>>   CONFIG_PCI=y
>>   CONFIG_LTO=y
>> -CONFIG_DISTRO_DEFAULTS=y
>> +CONFIG_BOOTSTD_FULL=y
>> +CONFIG_BOOTSTD_DEFAULTS=y
>>   CONFIG_BOOTSTAGE=y
>>   CONFIG_SHOW_BOOT_PROGRESS=y
>>   CONFIG_BOOTDELAY=10
>> diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h
>> index 3371579023..d5003538da 100644
>> --- a/include/configs/pogo_v4.h
>> +++ b/include/configs/pogo_v4.h
>> @@ -1,6 +1,6 @@
>>   /* SPDX-License-Identifier: GPL-2.0+ */
>>   /*
>> - * Copyright (C) 2014-2022 Tony Dinh <mibodhi at gmail.com>
>> + * Copyright (C) 2014-2023 Tony Dinh <mibodhi at gmail.com>
>>    *
>>    * Based on
>>    * Copyright (C) 2012
>> @@ -21,33 +21,6 @@
>>    */
>>   #include "mv-common.h"
>> -/* Include the common distro boot environment */
>> -#ifndef CONFIG_SPL_BUILD
>> -
>> -#ifdef CONFIG_MMC
>> -#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
>> -#else
>> -#define BOOT_TARGET_DEVICES_MMC(func)
>> -#endif
>> -
>> -#ifdef CONFIG_SATA
>> -#define BOOT_TARGET_DEVICES_SATA(func) func(SATA, sata, 0)
>> -#else
>> -#define BOOT_TARGET_DEVICES_SATA(func)
>> -#endif
>> -
>> -#ifdef CONFIG_USB_STORAGE
>> -#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0)
>> -#else
>> -#define BOOT_TARGET_DEVICES_USB(func)
>> -#endif
>> -
>> -#define BOOT_TARGET_DEVICES(func) \
>> -    BOOT_TARGET_DEVICES_MMC(func) \
>> -    BOOT_TARGET_DEVICES_USB(func) \
>> -    BOOT_TARGET_DEVICES_SATA(func) \
>> -    func(DHCP, dhcp, na)
>> -
>>   #define KERNEL_ADDR_R    __stringify(0x800000)
>>   #define FDT_ADDR_R    __stringify(0x2c00000)
>>   #define RAMDISK_ADDR_R    __stringify(0x01100000)
>> @@ -59,14 +32,10 @@
>>       "ramdisk_addr_r=" RAMDISK_ADDR_R "\0" \
>>       "scriptaddr=" SCRIPT_ADDR_R "\0"
>> -#include <config_distro_bootcmd.h>
>> -
>>   #define CFG_EXTRA_ENV_SETTINGS \
>>       LOAD_ADDRESS_ENV_SETTINGS \
>>       "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
>>       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
>> -    "console=ttyS0,115200\0" \
>> -    BOOTENV
>> -#endif /* CONFIG_SPL_BUILD */
>> +    "console=ttyS0,115200\0"
>>   #endif /* _CONFIG_POGO_V4_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