[U-Boot] [PATCH 2/3] armv8: layerscape: Adjust memory mapping for Flash/SD card on LS1043A

[york sun]

On 04/27/2017 01:08 AM, Alison Wang wrote:
> This patch is to adjust the memory mapping for FLash/SD card on
> LS1043AQDS and LS1043ARDB, such as PPA firmware load address, FMAN
> firmware load address, QE firmware load address, U-Boot start address on
> serial flash and environment address.
>
> Signed-off-by: Alison Wang <alison.wang at nxp.com>
> ---
>  arch/arm/cpu/armv8/fsl-layerscape/Kconfig |  8 ++++----
>  include/configs/ls1043a_common.h          | 10 +++++-----
>  include/configs/ls1043aqds.h              | 10 +++++-----
>  include/configs/ls1043ardb.h              |  8 ++++----
>  4 files changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
> index 4c16c4c..82c76e2 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
> @@ -163,11 +163,11 @@ endchoice
>  config SYS_LS_PPA_FW_ADDR
>  	hex "Address of PPA firmware loading from"
>  	depends on FSL_LS_PPA
> -	default 0x40500000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT
> +	default 0x40400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT
>  	default 0x580a00000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS2080A
> -	default 0x60500000 if SYS_LS_PPA_FW_IN_XIP
> -	default 0x500000 if SYS_LS_PPA_FW_IN_MMC
> -	default 0x500000 if SYS_LS_PPA_FW_IN_NAND
> +	default 0x60400000 if SYS_LS_PPA_FW_IN_XIP
> +	default 0x400000 if SYS_LS_PPA_FW_IN_MMC
> +	default 0x400000 if SYS_LS_PPA_FW_IN_NAND
>
>  	help
>  	  If the PPA firmware locate at XIP flash, such as NOR or
> diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
> index e269248..155da92 100644
> --- a/include/configs/ls1043a_common.h
> +++ b/include/configs/ls1043a_common.h
> @@ -208,9 +208,9 @@
>  #define CONFIG_SYS_FM_MURAM_SIZE	0x60000
>
>  #ifdef CONFIG_NAND_BOOT
> -/* Store Fman ucode at offeset 0x160000(11 blocks). */
> +/* Store Fman ucode at offeset 0x900000(72 blocks). */
>  #define CONFIG_SYS_QE_FMAN_FW_IN_NAND
> -#define CONFIG_SYS_FMAN_FW_ADDR		(11 * CONFIG_SYS_NAND_BLOCK_SIZE)
> +#define CONFIG_SYS_FMAN_FW_ADDR		(72 * CONFIG_SYS_NAND_BLOCK_SIZE)
>  #elif defined(CONFIG_SD_BOOT)
>  /*
>   * PBL SD boot image should stored at 0x1000(8 blocks), the size of the image is
> @@ -218,10 +218,10 @@
>   * 0x2000 (16 blocks), 8 + 2040 + 16 = 2064, enlarge it to 2080(0x820).
>   */
>  #define CONFIG_SYS_QE_FMAN_FW_IN_MMC
> -#define CONFIG_SYS_FMAN_FW_ADDR		(512 * 0x820)
> +#define CONFIG_SYS_FMAN_FW_ADDR		(512 * 0x4800)

Alison,

Please update the comments. It still says 0x820.

York