Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-26 04:17:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

armv8: ls2080ardb, ls2080aqds: Adjust memory map for NOR-boot

Browse source 
This patch adjusts memory map for images on LS2080ARDB and
LS2080AQDS NOR flash as below

Image				Flash Offset
RCW+PBI				0x00000000
Boot firmware (U-Boot)		0x00100000
Boot firmware Environment	0x00300000
PPA firmware			0x00400000
PHY firmware			0x00980000
DPAA2 MC			0x00A00000
DPAA2 DPL			0x00D00000
DPAA2 DPC			0x00E00000
Kernel.itb			0x01000000

Signed-off-by: Santan Kumar <santan.kumar@nxp.com>
Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Santan Kumar 2017-04-28 12:47:24 +05:30 • committed by York Sun
parent 8104deb2d6
commit f5bf23d827
6 changed files with 40 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/cpu/armv8/fsl-layerscape/Kconfig
View file

@ -165,7 +165,7 @@ config SYS_LS_PPA_FW_ADDR
depends on FSL_LS_PPA depends on FSL_LS_PPA
default 0x20400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT && ARCH_LS2080A default 0x20400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT && ARCH_LS2080A
default 0x40400000 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 0x580400000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS2080A
default 0x60400000 if SYS_LS_PPA_FW_IN_XIP 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_MMC
default 0x400000 if SYS_LS_PPA_FW_IN_NAND default 0x400000 if SYS_LS_PPA_FW_IN_NAND

12
board/freescale/ls2080aqds/README
View file

@ -89,6 +89,18 @@ c) NAND boot
d) SD boot d) SD boot
e) QSPI boot e) QSPI boot
Memory map for NOR boot
-------------------------
Image Flash Offset
RCW+PBI 0x00000000
Boot firmware (U-Boot) 0x00100000
Boot firmware Environment 0x00300000
PPA firmware 0x00400000
DPAA2 MC 0x00A00000
DPAA2 DPL 0x00D00000
DPAA2 DPC 0x00E00000
Kernel.itb 0x01000000
Environment Variables Environment Variables
--------------------- ---------------------
- mcboottimeout: MC boot timeout in milliseconds. If this variable is not defined - mcboottimeout: MC boot timeout in milliseconds. If this variable is not defined

13
board/freescale/ls2080ardb/README
View file

@ -85,6 +85,19 @@ a) NOR boot
b) NAND boot b) NAND boot
c) QSPI boot c) QSPI boot
Memory map for NOR boot
-------------------------
Image Flash Offset
RCW+PBI 0x00000000
Boot firmware (U-Boot) 0x00100000
Boot firmware Environment 0x00300000
PPA firmware 0x00400000
Cortina PHY firmware 0x00980000
DPAA2 MC 0x00A00000
DPAA2 DPL 0x00D00000
DPAA2 DPC 0x00E00000
Kernel.itb 0x01000000
cfg_rcw_src switches needs to be changed for booting from different option. cfg_rcw_src switches needs to be changed for booting from different option.
Refer to board documentation for correct switch setting. Refer to board documentation for correct switch setting.

8
include/configs/ls2080a_common.h
View file

@ -193,18 +193,18 @@ unsigned long long get_qixis_addr(void);
"ramdisk_size=0x2000000\0" \ "ramdisk_size=0x2000000\0" \
"fdt_high=0xa0000000\0" \ "fdt_high=0xa0000000\0" \
"initrd_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \
"kernel_start=0x581200000\0" \ "kernel_start=0x581000000\0" \
"kernel_load=0xa0000000\0" \ "kernel_load=0xa0000000\0" \
"kernel_size=0x2800000\0" \ "kernel_size=0x2800000\0" \
"console=ttyAMA0,38400n8\0" \ "console=ttyAMA0,38400n8\0" \
"mcinitcmd=fsl_mc start mc 0x580300000" \ "mcinitcmd=fsl_mc start mc 0x580a00000" \
" 0x580800000 \0" " 0x580e00000 \0"
#define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \
"earlycon=uart8250,mmio,0x21c0500 " \ "earlycon=uart8250,mmio,0x21c0500 " \
"ramdisk_size=0x2000000 default_hugepagesz=2m" \ "ramdisk_size=0x2000000 default_hugepagesz=2m" \
" hugepagesz=2m hugepages=256" " hugepagesz=2m hugepages=256"
#define CONFIG_BOOTCOMMAND "fsl_mc apply dpl 0x580700000 &&" \ #define CONFIG_BOOTCOMMAND "fsl_mc apply dpl 0x580d00000 &&" \
" cp.b $kernel_start $kernel_load" \ " cp.b $kernel_start $kernel_load" \
" $kernel_size && bootm $kernel_load" " $kernel_size && bootm $kernel_load"

8
include/configs/ls2080aqds.h
View file

@ -265,7 +265,7 @@ unsigned long get_board_ddr_clk(void);
#ifndef CONFIG_QSPI_BOOT #ifndef CONFIG_QSPI_BOOT
#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x200000) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000)
#define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SIZE 0x2000
#endif #endif
@ -376,12 +376,12 @@ unsigned long get_board_ddr_clk(void);
"ramdisk_size=0x2000000\0" \ "ramdisk_size=0x2000000\0" \
"fdt_high=0xa0000000\0" \ "fdt_high=0xa0000000\0" \
"initrd_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \
"kernel_start=0x581100000\0" \ "kernel_start=0x581000000\0" \
"kernel_load=0xa0000000\0" \ "kernel_load=0xa0000000\0" \
"kernel_size=0x2800000\0" \ "kernel_size=0x2800000\0" \
"mcmemsize=0x40000000\0" \ "mcmemsize=0x40000000\0" \
"mcinitcmd=fsl_mc start mc 0x580300000" \ "mcinitcmd=fsl_mc start mc 0x580a00000" \
" 0x580800000 \0" " 0x580e00000 \0"
#endif /* CONFIG_SECURE_BOOT */ #endif /* CONFIG_SECURE_BOOT */

12
include/configs/ls2080ardb.h
View file

@ -251,7 +251,7 @@ unsigned long get_board_sys_clk(void);
#define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3 #define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3
#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x200000) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000)
#define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SIZE 0x2000
#endif #endif
@ -421,13 +421,13 @@ unsigned long get_board_sys_clk(void);
"ramdisk_size=0x2000000\0" \ "ramdisk_size=0x2000000\0" \
"fdt_high=0xa0000000\0" \ "fdt_high=0xa0000000\0" \
"initrd_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \
"kernel_start=0x581100000\0" \ "kernel_start=0x581000000\0" \
"kernel_load=0xa0000000\0" \ "kernel_load=0xa0000000\0" \
"kernel_size=0x2800000\0" \ "kernel_size=0x2800000\0" \
"mcmemsize=0x40000000\0" \ "mcmemsize=0x40000000\0" \
"fdtfile=fsl-ls2080a-rdb.dtb\0" \ "fdtfile=fsl-ls2080a-rdb.dtb\0" \
"mcinitcmd=fsl_mc start mc 0x580300000" \ "mcinitcmd=fsl_mc start mc 0x580a00000" \
" 0x580800000 \0" \ " 0x580e00000 \0" \
BOOTENV BOOTENV
#endif #endif
#endif #endif
@ -447,7 +447,7 @@ unsigned long get_board_sys_clk(void);
" || run distro_bootcmd" " || run distro_bootcmd"
#else #else
/* Try to boot an on-NOR kernel first, then do normal distro boot */ /* Try to boot an on-NOR kernel first, then do normal distro boot */
#define CONFIG_BOOTCOMMAND "run mcinitcmd && fsl_mc lazyapply dpl 0x580700000" \ #define CONFIG_BOOTCOMMAND "run mcinitcmd && fsl_mc lazyapply dpl 0x580d00000" \
" && cp.b $kernel_start $kernel_load $kernel_size" \ " && cp.b $kernel_start $kernel_load $kernel_size" \
" && bootm $kernel_load" \ " && bootm $kernel_load" \
" || run distro_bootcmd" " || run distro_bootcmd"
@ -463,7 +463,7 @@ unsigned long get_board_sys_clk(void);
#ifdef CONFIG_QSPI_BOOT #ifdef CONFIG_QSPI_BOOT
#define CONFIG_CORTINA_FW_ADDR 0x20980000 #define CONFIG_CORTINA_FW_ADDR 0x20980000
#else #else
#define CONFIG_CORTINA_FW_ADDR 0x581000000 #define CONFIG_CORTINA_FW_ADDR 0x580980000
#endif #endif
#define CONFIG_CORTINA_FW_LENGTH 0x40000 #define CONFIG_CORTINA_FW_LENGTH 0x40000