Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit f5bf23d8278b2fdfb9ce41fa36369cebc882ab02

Authored by Santan Kumar
Committed by York Sun
1 parent 8104deb2d6
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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

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>

Showing 6 changed files with 40 additions and 15 deletions Side-by-side Diff

arch/arm/cpu/armv8/fsl-layerscape/Kconfig
Diff comments   View file @ f5bf23d
... ... @@ -165,7 +165,7 @@
165 165 depends on FSL_LS_PPA
166 166 default 0x20400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT && ARCH_LS2080A
167 167 default 0x40400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT
168   - default 0x580a00000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS2080A
  168 + default 0x580400000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS2080A
169 169 default 0x60400000 if SYS_LS_PPA_FW_IN_XIP
170 170 default 0x400000 if SYS_LS_PPA_FW_IN_MMC
171 171 default 0x400000 if SYS_LS_PPA_FW_IN_NAND
board/freescale/ls2080aqds/README
Diff comments   View file @ f5bf23d
... ... @@ -89,6 +89,18 @@
89 89 d) SD boot
90 90 e) QSPI boot
91 91  
  92 +Memory map for NOR boot
  93 +-------------------------
  94 +Image Flash Offset
  95 +RCW+PBI 0x00000000
  96 +Boot firmware (U-Boot) 0x00100000
  97 +Boot firmware Environment 0x00300000
  98 +PPA firmware 0x00400000
  99 +DPAA2 MC 0x00A00000
  100 +DPAA2 DPL 0x00D00000
  101 +DPAA2 DPC 0x00E00000
  102 +Kernel.itb 0x01000000
  103 +
92 104 Environment Variables
93 105 ---------------------
94 106 - mcboottimeout: MC boot timeout in milliseconds. If this variable is not defined
board/freescale/ls2080ardb/README
Diff comments   View file @ f5bf23d
... ... @@ -85,6 +85,19 @@
85 85 b) NAND boot
86 86 c) QSPI boot
87 87  
  88 +Memory map for NOR boot
  89 +-------------------------
  90 +Image Flash Offset
  91 +RCW+PBI 0x00000000
  92 +Boot firmware (U-Boot) 0x00100000
  93 +Boot firmware Environment 0x00300000
  94 +PPA firmware 0x00400000
  95 +Cortina PHY firmware 0x00980000
  96 +DPAA2 MC 0x00A00000
  97 +DPAA2 DPL 0x00D00000
  98 +DPAA2 DPC 0x00E00000
  99 +Kernel.itb 0x01000000
  100 +
88 101 cfg_rcw_src switches needs to be changed for booting from different option.
89 102 Refer to board documentation for correct switch setting.
90 103  
include/configs/ls2080a_common.h
Diff comments   View file @ f5bf23d
... ... @@ -193,18 +193,18 @@
193 193 "ramdisk_size=0x2000000\0" \
194 194 "fdt_high=0xa0000000\0" \
195 195 "initrd_high=0xffffffffffffffff\0" \
196   - "kernel_start=0x58120000000000\0" \" \
  196 + "kernel_start=0x58100000000000\0" \" \
197 197 "kernel_load=0xa0000000\0" \
198 198 "kernel_size=0x2800000\0" \
199 199 "console=ttyAMA0,38400n8\0" \
200   - "mcinitcmd=fsl_mc start mc 0x580300000" \
201   - " 0x580800000 \0"
  200 + "mcinitcmd=fsl_mc start mc 0x580a00000" \
  201 + " 0x580e00000 \0"
202 202  
203 203 #define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \
204 204 "earlycon=uart8250,mmio,0x21c0500 " \
205 205 "ramdisk_size=0x2000000 default_hugepagesz=2m" \
206 206 " hugepagesz=2m hugepages=256"
207   -#define CONFIG_BOOTCOMMAND "fsl_mc apply dpl 0x580700000 &&" \
  207 +#define CONFIG_BOOTCOMMAND "fsl_mc apply dpl 0x580d00000 &&" \
208 208 " cp.b $kernel_start $kernel_load" \
209 209 " $kernel_size && bootm $kernel_load"
210 210  
include/configs/ls2080aqds.h
Diff comments   View file @ f5bf23d
... ... @@ -265,7 +265,7 @@
265 265  
266 266 #ifndef CONFIG_QSPI_BOOT
267 267 #define CONFIG_ENV_IS_IN_FLASH
268   -#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x200000)
  268 +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000)
269 269 #define CONFIG_ENV_SECT_SIZE 0x20000
270 270 #define CONFIG_ENV_SIZE 0x2000
271 271 #endif
272 272  
... ... @@ -376,12 +376,12 @@
376 376 "ramdisk_size=0x2000000\0" \
377 377 "fdt_high=0xa0000000\0" \
378 378 "initrd_high=0xffffffffffffffff\0" \
379   - "kernel_start=0x58110000000000\0" \" \
  379 + "kernel_start=0x58100000000000\0" \" \
380 380 "kernel_load=0xa0000000\0" \
381 381 "kernel_size=0x2800000\0" \
382 382 "mcmemsize=0x40000000\0" \
383   - "mcinitcmd=fsl_mc start mc 0x580300000" \
384   - " 0x580800000 \0"
  383 + "mcinitcmd=fsl_mc start mc 0x580a00000" \
  384 + " 0x580e00000 \0"
385 385 #endif /* CONFIG_SECURE_BOOT */
386 386  
387 387  
include/configs/ls2080ardb.h
Diff comments   View file @ f5bf23d
... ... @@ -251,7 +251,7 @@
251 251 #define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3
252 252  
253 253 #define CONFIG_ENV_IS_IN_FLASH
254   -#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x200000)
  254 +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000)
255 255 #define CONFIG_ENV_SECT_SIZE 0x20000
256 256 #define CONFIG_ENV_SIZE 0x2000
257 257 #endif
258 258  
... ... @@ -421,13 +421,13 @@
421 421 "ramdisk_size=0x2000000\0" \
422 422 "fdt_high=0xa0000000\0" \
423 423 "initrd_high=0xffffffffffffffff\0" \
424   - "kernel_start=0x58110000000000\0" \" \
  424 + "kernel_start=0x58100000000000\0" \" \
425 425 "kernel_load=0xa0000000\0" \
426 426 "kernel_size=0x2800000\0" \
427 427 "mcmemsize=0x40000000\0" \
428 428 "fdtfile=fsl-ls2080a-rdb.dtb\0" \
429   - "mcinitcmd=fsl_mc start mc 0x580300000" \
430   - " 0x580800000 \0" \
  429 + "mcinitcmd=fsl_mc start mc 0x580a00000" \
  430 + " 0x580e00000 \0" \
431 431 BOOTENV
432 432 #endif
433 433 #endif
... ... @@ -447,7 +447,7 @@
447 447 " || run distro_bootcmd"
448 448 #else
449 449 /* Try to boot an on-NOR kernel first, then do normal distro boot */
450   -#define CONFIG_BOOTCOMMAND "run mcinitcmd && fsl_mc lazyapply dpl 0x580700000" \
  450 +#define CONFIG_BOOTCOMMAND "run mcinitcmd && fsl_mc lazyapply dpl 0x580d00000" \
451 451 " && cp.b $kernel_start $kernel_load $kernel_size" \
452 452 " && bootm $kernel_load" \
453 453 " || run distro_bootcmd"
... ... @@ -463,7 +463,7 @@
463 463 #ifdef CONFIG_QSPI_BOOT
464 464 #define CONFIG_CORTINA_FW_ADDR 0x20980000
465 465 #else
466   -#define CONFIG_CORTINA_FW_ADDR 0x581000000
  466 +#define CONFIG_CORTINA_FW_ADDR 0x580980000
467 467 #endif
468 468 #define CONFIG_CORTINA_FW_LENGTH 0x40000
469 469