From 84c4fa16b0567a36d60fce61449c9668079fbfb7 Mon Sep 17 00:00:00 2001 From: Igor Opaniuk Date: Thu, 6 Aug 2020 17:16:34 +0300 Subject: apalis-imx8: fix addresses to align with MEK platform This fixes distroboot script invocation and finally gets Linux kernel booting: ERROR: Did not find a cmdline Flattened Device Tree FDT and ATAGS support not compiled in - hanging ERROR ### Please RESET the board With this fix kernel boots: => boot MMC: no card present MMC: no card present switch to partitions #0, OK mmc0(part 0) is current device Scanning mmc 0:1... Found U-Boot script /boot.scr 1243 bytes read in 14 ms (85.9 KiB/s) 106496 bytes read in 13 ms (7.8 MiB/s) Loading hdp firmware from 0x000000009c000000 offset 0x0000000000002000 Loading hdp firmware Complete 105758 bytes read in 15 ms (6.7 MiB/s) 21563904 bytes read in 650 ms (31.6 MiB/s) Booting using the fdt blob at 0x83800000 Loading Device Tree to 00000000fd634000, end 00000000fd650d1d ... OK Starting kernel ... [ 0.000000] Booting Linux on physical CPU 0x0 [ 0.000000] Linux version 4.14.170-3.0.4+gbaa6c24240a4 (oe-user@oe-host) (gcc version 8.2.0 (GCC)) #1 SMP PREEMPT Tue Apr 21 04:11:13 UTC 2020 [ 0.000000] Boot CPU: AArch64 Processor [410fd034] [ 0.000000] Machine model: Toradex Apalis iMX8QM/QP on Apalis Evaluation Board [ 0.000000] efi: Getting EFI parameters from FDT: [ 0.000000] efi: UEFI not found. [ 0.000000] Reserved memory: created CMA memory pool at 0x0000000096000000, size 960 MiB [ 0.000000] OF: reserved mem: initialized node linux,cma, compatible id shared-dma-pool [ 0.000000] Reserved memory: created DMA memory pool at 0x0000000090400000, size 28 MiB [ 0.000000] OF: reserved mem: initialized node rpmsg_dma@0x90400000, compatible id shared-dma-pool [ 0.000000] NUMA: No NUMA configuration found [ 0.000000] NUMA: Faking a node at [mem 0x0000000080200000-0x00000008ffffffff] [ 0.000000] NUMA: NODE_DATA [mem 0x8fff5a780-0x8fff5c57f] [ 0.000000] Zone ranges: [ 0.000000] DMA [mem 0x0000000080200000-0x00000000ffffffff] [ 0.000000] Normal [mem 0x0000000100000000-0x00000008ffffffff] [ 0.000000] Movable zone start for each node [ 0.000000] Early memory node ranges [ 0.000000] node 0: [mem 0x0000000080200000-0x0000000083ffffff] [ 0.000000] node 0: [mem 0x0000000086400000-0x000000008fffffff] [ 0.000000] node 0: [mem 0x0000000094c00000-0x00000000ffffffff] [ 0.000000] node 0: [mem 0x0000000880000000-0x00000008ffffffff] [ 0.000000] Initmem setup node 0 [mem 0x0000000080200000-0x00000008ffffffff] [ 0.000000] psci: probing for conduit method from DT. [ 0.000000] psci: PSCIv1.1 detected in firmware. [ 0.000000] psci: Using standard PSCI v0.2 function IDs [ 0.000000] psci: MIGRATE_INFO_TYPE not supported. [ 0.000000] psci: SMC Calling Convention v1.1 [ 0.000000] percpu: Embedded 23 pages/cpu s53656 r8192 d32360 u94208 Relates-to: ELB-2927 Signed-off-by: Igor Opaniuk --- include/configs/apalis-imx8.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 21e8850c70..62e35807fa 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -39,7 +39,7 @@ #define FEC_ENET_ENABLE_TXC_DELAY #define MEM_LAYOUT_ENV_SETTINGS \ - "fdt_addr_r=0x84000000\0" \ + "fdt_addr_r=0x83800000\0" \ "kernel_addr_r=0x82000000\0" \ "ramdisk_addr_r=0x86400000\0" \ "scriptaddr=0x87000000\0" @@ -78,15 +78,14 @@ MEM_LAYOUT_ENV_SETTINGS \ "bootcmd_mfg=select_dt_from_module_version && fastboot 0\0" \ "script=boot.scr\0" \ - "image=Image\0" \ + "kernel_image=Image\0" \ "console=ttyLP1 earlycon\0" \ - "fdt_addr=0x83000000\0" \ "fdt_high=\0" \ + "fdt_addr=0x83800000\0" \ "boot_fdt=try\0" \ "fdtfile=" FDT_FILE "\0" \ "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \ - "initrd_addr=0x83800000\0" \ - "hdp_addr=0x84000000\0" \ + "hdp_addr=0x9c000000\0" \ "hdp_file=hdmitxfw.bin\0" \ "loadhdp=fatload mmc ${mmcdev}:${mmcpart} ${hdp_addr} ${hdp_file}\0" \ "mmcautodetect=yes\0" \ @@ -98,7 +97,7 @@ "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \ "\0" \ "nfsboot=run netargs; dhcp ${loadaddr} ${image}; tftp ${fdt_addr} " \ - "apalis-imx8/${fdt_file}; booti ${loadaddr} - ${fdt_addr}\0" \ + "apalis-imx8/${fdtfile}; booti ${loadaddr} - ${fdt_addr}\0" \ "panel=NULL\0" \ "update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \ "if test \"$confirm\" = \"y\"; then " \ -- cgit v1.2.3