[PATCH 02/10] ARM: socfpga: add Mercury+ AA1 SoM support

[Marek Vasut]

On 10/13/24 4:32 PM, Lothar Rubusch wrote:

[...]

> +++ b/board/enclustra/mercury_aa1/MAINTAINERS
> @@ -0,0 +1,10 @@
> +Enclustra Mercury+ AA1
> +M:	Lothar Rubusch <l.rubusch at gmail.com>
> +S:	Maintained
> +F:	board/enclustra/mercury_aa1/
> +F:	board/enclustra/common/
> +F:	configs/socfpga_enclustra_mercury_aa1_defconfig
> +F:	doc/board/enclustra/mercury-aa1.rst
> +F:	include/configs/socfpga_mercury_aa1.h
> +N:	enclustra
> +N:	mercury_aa1

I think the N: will match on all the files listed in F: above too, so 
you can remove the F:

> diff --git a/board/enclustra/mercury_aa1/fpga.its b/board/enclustra/mercury_aa1/fpga.its
> new file mode 100644
> index 0000000000..cb42d61fbd
> --- /dev/null
> +++ b/board/enclustra/mercury_aa1/fpga.its
> @@ -0,0 +1,32 @@
> +/dts-v1/;
> +
> +/ {
> +	description = "FIT image with FPGA bistream";
> +	#address-cells = <1>;
> +
> +	images {
> +		fpga-periph-1 {
> +			description = "FPGA peripheral bitstream";
> +			data = /incbin/("../../../bitstream.periph.rbf");
> +			type = "fpga";
> +			arch = "arm";
> +			compression = "none";
> +		};
> +
> +		fpga-core-1 {
> +			description = "FPGA core bitstream";
> +			data = /incbin/("../../../bitstream.core.rbf");
> +			type = "fpga";
> +			arch = "arm";
> +			compression = "none";
> +		};
> +	};
> +
> +	configurations {
> +		default = "config-1";
> +		config-1 {
> +			description = "Boot with FPGA early IO release config";
> +			fpga = "fpga-periph-1", "fpga-core-1";
> +		};
> +	};
> +};

Can this be generated using binman instead ?

[...]

> diff --git a/doc/board/enclustra/mercury-aa1.rst b/doc/board/enclustra/mercury-aa1.rst
> index c4b3359220..6a96bf70e3 100644
> --- a/doc/board/enclustra/mercury-aa1.rst
> +++ b/doc/board/enclustra/mercury-aa1.rst
> @@ -165,7 +165,7 @@ The demo shows booting a AA1 + ST1 setup and stopping at the u-boot shell.
>   
>   Here is the console output::
>   
> -  U-Boot SPL 2024.10-rc4-00416-gf0b9c383e6c3 (Sep 08 2024 - 14:03:59 +0000)
> +  U-Boot SPL 2024.10-rc4-00416-gf0b9c383e6c3 (Sep 27 2024 - 14:03:59 +0000)

Remove the commit hash and timestamp from the examples, so they wouldn't 
get updated randomly. Also, this change(s) should be in patch 1/10 I think.

[...]

> diff --git a/include/configs/socfpga_mercury_aa1.h b/include/configs/socfpga_mercury_aa1.h
> new file mode 100644
> index 0000000000..a5b63336e8
> --- /dev/null
> +++ b/include/configs/socfpga_mercury_aa1.h
> @@ -0,0 +1,33 @@
> +/* SPDX-License-Identifier: GPL-2.0+ */
> +/*
> + * Copyright (C) 2024 Enclustra GmbH
> + * <info at enclustra.com>
> + */
> +
> +#ifndef __CONFIG_SOCFGPA_MERCURY_AA1_H__
> +#define __CONFIG_SOCFGPA_MERCURY_AA1_H__
> +
> +#include <asm/arch/base_addr_a10.h>
> +
> +/*
> + * U-Boot general configurations
> + */
> +
> +/* Memory configurations  */
> +#define PHYS_SDRAM_1_SIZE		0x80000000
> +
> +/*
> + * Serial / UART configurations
> + */
> +#define CFG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200}
Maybe the default baudrate table is OK too ?