[PATCH u-boot-marvell v2 06/20] tools: kwbimage: Add support for specifying CPU core

[Stefan Roese]

On 1/12/22 18:20, Pali Rohár wrote:
> For other changes it is required to know if CPU core is Sheeva or not.
> Therefore add a new command CPU for specifying CPU.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>

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

Thanks,
Stefan

> ---
>   tools/kwbimage.c | 26 ++++++++++++++++++++++++++
>   1 file changed, 26 insertions(+)
> 
> diff --git a/tools/kwbimage.c b/tools/kwbimage.c
> index 17d3c3cf223c..44843be2c13a 100644
> --- a/tools/kwbimage.c
> +++ b/tools/kwbimage.c
> @@ -99,6 +99,7 @@ enum image_cfg_type {
>   	IMAGE_CFG_NAND_BADBLK_LOCATION,
>   	IMAGE_CFG_NAND_ECC_MODE,
>   	IMAGE_CFG_NAND_PAGESZ,
> +	IMAGE_CFG_CPU,
>   	IMAGE_CFG_BINARY,
>   	IMAGE_CFG_DATA,
>   	IMAGE_CFG_DATA_DELAY,
> @@ -129,6 +130,7 @@ static const char * const id_strs[] = {
>   	[IMAGE_CFG_NAND_BADBLK_LOCATION] = "NAND_BADBLK_LOCATION",
>   	[IMAGE_CFG_NAND_ECC_MODE] = "NAND_ECC_MODE",
>   	[IMAGE_CFG_NAND_PAGESZ] = "NAND_PAGE_SIZE",
> +	[IMAGE_CFG_CPU] = "CPU",
>   	[IMAGE_CFG_BINARY] = "BINARY",
>   	[IMAGE_CFG_DATA] = "DATA",
>   	[IMAGE_CFG_DATA_DELAY] = "DATA_DELAY",
> @@ -152,6 +154,7 @@ struct image_cfg_element {
>   	enum image_cfg_type type;
>   	union {
>   		unsigned int version;
> +		unsigned int cpu_sheeva;
>   		unsigned int bootfrom;
>   		struct {
>   			const char *file;
> @@ -280,6 +283,17 @@ static int image_get_bootfrom(void)
>   	return e->bootfrom;
>   }
>   
> +static int image_is_cpu_sheeva(void)
> +{
> +	struct image_cfg_element *e;
> +
> +	e = image_find_option(IMAGE_CFG_CPU);
> +	if (!e)
> +		return 0;
> +
> +	return e->cpu_sheeva;
> +}
> +
>   /*
>    * Compute a 8-bit checksum of a memory area. This algorithm follows
>    * the requirements of the Marvell SoC BootROM specifications.
> @@ -1489,6 +1503,18 @@ static int image_create_config_parse_oneline(char *line,
>   	case IMAGE_CFG_VERSION:
>   		el->version = atoi(value1);
>   		break;
> +	case IMAGE_CFG_CPU:
> +		if (strcmp(value1, "FEROCEON") == 0)
> +			el->cpu_sheeva = 0;
> +		else if (strcmp(value1, "SHEEVA") == 0)
> +			el->cpu_sheeva = 1;
> +		else if (strcmp(value1, "A9") == 0)
> +			el->cpu_sheeva = 0;
> +		else {
> +			fprintf(stderr, "Invalid CPU %s\n", value1);
> +			return -1;
> +		}
> +		break;
>   	case IMAGE_CFG_BOOT_FROM:
>   		ret = image_boot_mode_id(value1);
>   
> 

Viele Grüße,
Stefan Roese

-- 
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