[PATCH] arm: kirkwood: Enable bootstd and other modernization for ib62x0 board

[Stefan Roese]

On 23.06.25 22:59, Tony Dinh wrote:
> Enable bootstd.
> Update defconfigs to the latest u-boot requirements.
> Enable SYS_THUMB_BUILD and LTO and to reduce binary size.
> Enable NET_RANDOM_ETHADDR.
> Disable JFFS2 support.
> 
> Signed-off-by: Tony Dinh <mibodhi at gmail.com>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
> 
>   configs/ib62x0_defconfig | 16 ++++------------
>   include/configs/ib62x0.h | 28 ++++++++++++++++++++++------
>   2 files changed, 26 insertions(+), 18 deletions(-)
> 
> diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
> index 1beb5837bb4..0c14ac06e92 100644
> --- a/configs/ib62x0_defconfig
> +++ b/configs/ib62x0_defconfig
> @@ -2,48 +2,41 @@ CONFIG_ARM=y
>   CONFIG_SKIP_LOWLEVEL_INIT=y
>   CONFIG_SYS_DCACHE_OFF=y
>   CONFIG_ARCH_CPU_INIT=y
> +CONFIG_SYS_THUMB_BUILD=y
>   CONFIG_ARCH_KIRKWOOD=y
>   CONFIG_SYS_KWD_CONFIG="board/raidsonic/ib62x0/kwbimage.cfg"
>   CONFIG_TEXT_BASE=0x600000
>   CONFIG_NR_DRAM_BANKS=2
> -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000
>   CONFIG_TARGET_IB62X0=y
>   CONFIG_ENV_SIZE=0x20000
>   CONFIG_ENV_OFFSET=0xE0000
>   CONFIG_DEFAULT_DEVICE_TREE="marvell/kirkwood-ib62x0"
>   CONFIG_SYS_LOAD_ADDR=0x800000
>   CONFIG_IDENT_STRING=" RaidSonic ICY BOX IB-NAS62x0"
> +CONFIG_LTO=y
> +CONFIG_BOOTSTD_FULL=y
>   CONFIG_BOOTDELAY=3
> -CONFIG_USE_BOOTCOMMAND=y
>   CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part root; ubifsmount ubi:rootfs; ubifsload 0x800000 ${kernel}; ubifsload 0x700000 ${fdt}; ubifsumount; fdt addr 0x700000; fdt resize; fdt chosen; bootz 0x800000 - 0x700000"
>   CONFIG_USE_PREBOOT=y
>   CONFIG_SYS_PBSIZE=1051
>   # CONFIG_DISPLAY_BOARDINFO is not set
> -CONFIG_HUSH_PARSER=y
>   CONFIG_SYS_PROMPT="ib62x0 => "
>   CONFIG_SYS_MAXARGS=32
> -CONFIG_CMD_BOOTZ=y
>   CONFIG_CMD_IDE=y
>   CONFIG_CMD_NAND=y
>   CONFIG_CMD_USB=y
>   # CONFIG_CMD_SETEXPR is not set
> -CONFIG_CMD_DHCP=y
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_JFFS2=y
>   CONFIG_CMD_MTDPARTS=y
>   CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
>   CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000 at 0x0(uboot),0x20000 at 0xe0000(uboot_env),- at 0x100000(root)"
>   CONFIG_CMD_UBI=y
> -CONFIG_ISO_PARTITION=y
>   CONFIG_OF_CONTROL=y
>   CONFIG_ENV_OVERWRITE=y
>   CONFIG_ENV_IS_IN_NAND=y
>   CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>   CONFIG_NETCONSOLE=y
>   CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
> +CONFIG_NET_RANDOM_ETHADDR=y
>   CONFIG_SYS_ATA_STRIDE=4
>   CONFIG_SYS_ATA_DATA_OFFSET=0x100
>   CONFIG_SYS_ATA_REG_OFFSET=0x100
> @@ -58,6 +51,5 @@ CONFIG_MVGBE=y
>   CONFIG_MII=y
>   CONFIG_USB=y
>   CONFIG_USB_EHCI_HCD=y
> -CONFIG_USB_STORAGE=y
>   CONFIG_LZMA=y
>   CONFIG_BZIP2=y
> diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
> index e1b62f78b21..01ab6edb05f 100644
> --- a/include/configs/ib62x0.h
> +++ b/include/configs/ib62x0.h
> @@ -1,5 +1,6 @@
>   /* SPDX-License-Identifier: GPL-2.0+ */
>   /*
> + * Copyright (C) 2025 Tony Dinh <mibodhi at gmail.com>
>    * Copyright (C) 2011-2012
>    * Gerald Kerma <dreagle at doukki.net>
>    * Luka Perkov <luka at openwrt.org>
> @@ -11,19 +12,34 @@
>   #include "mv-common.h"
>   
>   /*
> - * Environment variables configuration
> - */
> -
> -/*
> - * Default environment variables
> + * mv-common.h should be defined after CMD configs since it used them
> + * to enable certain macros
>    */
> +#include "mv-common.h"
>   
> -#define CFG_EXTRA_ENV_SETTINGS \
> +#define EXTRA_ENV_SETTINGS_LEGACY \
>   	"console=console=ttyS0,115200\0"				\
>   	"kernel=/boot/zImage\0"						\
>   	"fdt=/boot/ib62x0.dtb\0"					\
>   	"bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
>   
> +#define KERNEL_ADDR_R	__stringify(0x800000)
> +#define FDT_ADDR_R	__stringify(0x2c00000)
> +#define RAMDISK_ADDR_R	__stringify(0x01100000)
> +#define SCRIPT_ADDR_R	__stringify(0x200000)
> +
> +#define LOAD_ADDRESS_ENV_SETTINGS \
> +	"kernel_addr_r=" KERNEL_ADDR_R "\0" \
> +	"fdt_addr_r=" FDT_ADDR_R "\0" \
> +	"ramdisk_addr_r=" RAMDISK_ADDR_R "\0" \
> +	"scriptaddr=" SCRIPT_ADDR_R "\0"
> +
> +#define CFG_EXTRA_ENV_SETTINGS \
> +	EXTRA_ENV_SETTINGS_LEGACY \
> +	LOAD_ADDRESS_ENV_SETTINGS \
> +	"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
> +	"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
> +
>   /*
>    * SATA driver configuration
>    */