[U-Boot] [PATCH 1/1] board/ls2081ardb: Update qspi flash type and checkboard

York Sun york.sun at nxp.com
Tue Jun 13 20:52:53 UTC 2017


On 06/08/2017 11:16 PM, Santan Kumar wrote:
> Patch makes below changes:
>   -As per updated board design, different QSPI flash is connected on boards,
> 	hence change QSPI flash type from n25q512a to s25fs512ss
>   -Remove deprecated config : CONFIG_DISPLAY_BOARDINFO_LATE
>   -Increase env size from 64kb to 256kb for qspi boot
>   -Update checkboard() to detect boot source and display message

Please separate common change from board specific change.

> 
> Signed-off-by: Santan Kumar <santan.kumar at nxp.com>
> Signed-off-by: Yogesh Gaur <yogeshnarayan.gaur at nxp.com>
> Signed-off-by: Priyanka Jain <priyanka.jain at nxp.com>
> ---
>   arch/arm/dts/fsl-ls2081a-rdb.dts        |  4 ++--
>   board/freescale/ls2080ardb/ls2080ardb.c | 15 +++------------
>   include/configs/ls2080a_common.h        |  2 +-
>   include/configs/ls2080ardb.h            |  7 +------
>   4 files changed, 7 insertions(+), 21 deletions(-)
> 
> diff --git a/arch/arm/dts/fsl-ls2081a-rdb.dts b/arch/arm/dts/fsl-ls2081a-rdb.dts
> index 6489362..aa4aa68 100644
> --- a/arch/arm/dts/fsl-ls2081a-rdb.dts
> +++ b/arch/arm/dts/fsl-ls2081a-rdb.dts
> @@ -41,7 +41,7 @@
>   	bus-num = <0>;
>   	status = "okay";
>   
> -	qflash0: n25q512a at 0 {
> +	qflash0: s25fs512s at 0 {

Is there any version of LS2081ARDB with n25q512a?

>   		#address-cells = <1>;
>   		#size-cells = <1>;
>   		compatible = "spi-flash";
> @@ -49,7 +49,7 @@
>   		reg = <0>;
>   	};
>   
> -	qflash1: n25q512a at 1 {
> +	qflash1: s25fs512s at 1 {
>   		#address-cells = <1>;
>   		#size-cells = <1>;
>   		compatible = "spi-flash";
> diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
> index 210142c..9d21d1e 100644
> --- a/board/freescale/ls2080ardb/ls2080ardb.c
> +++ b/board/freescale/ls2080ardb/ls2080ardb.c
> @@ -71,36 +71,27 @@ int checkboard(void)
>   #ifdef CONFIG_TARGET_LS2081ARDB
>   #ifdef CONFIG_FSL_QIXIS
>   	sw = QIXIS_READ(arch);
> -	printf("Board Arch: V%d, ", sw >> 4);
>   	printf("Board version: %c, ", (sw & 0xf) + 'A');
>   

What's the reason to drop "Board Arch"?

>   	sw = QIXIS_READ(brdcfg[0]);
> -	sw = (sw & QIXIS_QMAP_MASK) >> QIXIS_QMAP_SHIFT;
> +	sw = sw  >> QIXIS_QMAP_SHIFT;
>   	switch (sw) {
>   	case 0:
> +	case 4:
>   		puts("boot from QSPI DEV#0\n");
> -		puts("QSPI_CSA_1 mapped to QSPI DEV#1\n");
>   		break;
>   	case 1:
>   		puts("boot from QSPI DEV#1\n");
> -		puts("QSPI_CSA_1 mapped to QSPI DEV#0\n");
>   		break;
>   	case 2:
> -		puts("boot from QSPI EMU\n");
> -		puts("QSPI_CSA_1 mapped to QSPI DEV#0\n");
> -		break;
>   	case 3:
>   		puts("boot from QSPI EMU\n");
> -		puts("QSPI_CSA_1 mapped to QSPI DEV#1\n");
> -		break;
> -	case 4:
> -		puts("boot from QSPI DEV#0\n");
> -		puts("QSPI_CSA_1 mapped to QSPI EMU\n");
>   		break;
>   	default:
>   		printf("invalid setting of SW%u\n", sw);
>   		break;
>   	}
> +	printf("FPGA: v%d.%d\n", QIXIS_READ(scver), QIXIS_READ(tagdata));

What are you changing in this function?

York


More information about the U-Boot mailing list