[PATCH 2/6] arm: octeontx: support generic distro config

[Stefan Roese]

On 26.03.21 01:07, Tim Harvey wrote:
> Support Generic Distro Default config
> 
> Signed-off-by: Tim Harvey <tharvey at gateworks.com>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
>   include/configs/octeontx_common.h | 31 ++++++++++++++++++++++++++-----
>   1 file changed, 26 insertions(+), 5 deletions(-)
> 
> diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h
> index 55d329f55e..434e54442f 100644
> --- a/include/configs/octeontx_common.h
> +++ b/include/configs/octeontx_common.h
> @@ -8,6 +8,32 @@
>   #ifndef __OCTEONTX_COMMON_H__
>   #define __OCTEONTX_COMMON_H__
>   
> +#ifdef CONFIG_DISTRO_DEFAULTS
> +#define BOOT_TARGET_DEVICES(func) \
> +	func(MMC, mmc, 0) \
> +	func(MMC, mmc, 1) \
> +	func(USB, usb, 0) \
> +	func(SCSI, scsi, 0)
> +
> +#include <config_distro_bootcmd.h>
> +/* Extra environment variables */
> +#define CONFIG_EXTRA_ENV_SETTINGS	\
> +	"autoload=0\0"			\
> +	"loadaddr=0x20080000\0"		\
> +	"kernel_addr_r=0x02000000\0"	\
> +	"ramdisk_addr_r=0x03000000\0"	\
> +	"scriptaddr=0x04000000\0"	\
> +	BOOTENV
> +
> +#else
> +
> +/** Extra environment settings */
> +#define CONFIG_EXTRA_ENV_SETTINGS	\
> +	"loadaddr=20080000\0"		\
> +	"autoload=0\0"
> +
> +#endif /* ifdef CONFIG_DISTRO_DEFAULTS*/
> +
>   /** Maximum size of image supported for bootm (and bootable FIT images) */
>   #define CONFIG_SYS_BOOTM_LEN		(256 << 20)
>   
> @@ -50,11 +76,6 @@
>   # define CONFIG_SF_DEFAULT_CS	0
>   #endif
>   
> -/** Extra environment settings */
> -#define CONFIG_EXTRA_ENV_SETTINGS	\
> -					"loadaddr=20080000\0"	\
> -					"autoload=0\0"
> -
>   /** Environment defines */
>   #if defined(CONFIG_ENV_IS_IN_MMC)
>   #define CONFIG_SYS_MMC_ENV_DEV		0
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
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