diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2020-08-12 12:35:39 +0200 |
|---|---|---|
| committer | Philippe Schenker <philippe.schenker@toradex.com> | 2020-08-20 14:04:47 +0200 |
| commit | fbdd85e70f0ff17cf9e742672c011173e16a782d (patch) | |
| tree | 1bbcf2bd0fb8761c83c966fa9e6697019700bb15 | |
| parent | f3641f508d8711c68557ecd1575c795fedf644d8 (diff) | |
include: apalis-imx8: different fixes for new u-boot
- Devicetree naming corrected
- Changed addresses as follows:
* SYS_SDRAM_BASE 0x80000000 0.125MiB
* SYS_TEXT_BASE 0x80020000 2.375MiB
* kernel_addr_r 0x80280000 45.5MiB
* fdt_addr_r 0x83000000 1MiB
* scriptaddr 0x83100000 15MiB
* __RESERVED__ 0x84000000 48MiB
* loadaddr 0x87000000 48MiB
* ramdisk_addr_r 0x8a000000 288MiB (to hdp_addr)
* SYS_MEMTEST_START 0x90000000
* hdp_addr 0x9c000000
* SYS_MEMTEST_END 0xC0000000
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
| -rw-r--r-- | configs/apalis-imx8qm_defconfig | 1 | ||||
| -rw-r--r-- | include/configs/apalis-imx8.h | 38 |
2 files changed, 26 insertions, 13 deletions
diff --git a/configs/apalis-imx8qm_defconfig b/configs/apalis-imx8qm_defconfig index 42c8fd2379..cbafb6dbeb 100644 --- a/configs/apalis-imx8qm_defconfig +++ b/configs/apalis-imx8qm_defconfig @@ -15,6 +15,7 @@ CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis-imx8/apalis-imx8qm-imximage.cfg" +CONFIG_BOOTDELAY=1 CONFIG_LOG=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 62e35807fa..0ab60592d5 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -38,11 +38,25 @@ #define FEC_ENET_ENABLE_TXC_DELAY +/** + * SYS_SDRAM_BASE 0x80000000 0.125MiB + * SYS_TEXT_BASE 0x80020000 2.375MiB + * kernel_addr_r 0x80280000 45.5MiB + * fdt_addr_r 0x83000000 1MiB + * scriptaddr 0x83100000 15MiB + * __RESERVED__ 0x84000000 48MiB + * loadaddr 0x87000000 48MiB + * ramdisk_addr_r 0x8a000000 288MiB (to hdp_addr) + * SYS_MEMTEST_START 0x90000000 + * hdp_addr 0x9c000000 + * SYS_MEMTEST_END 0xC0000000 + */ #define MEM_LAYOUT_ENV_SETTINGS \ - "fdt_addr_r=0x83800000\0" \ - "kernel_addr_r=0x82000000\0" \ - "ramdisk_addr_r=0x86400000\0" \ - "scriptaddr=0x87000000\0" + "fdt_addr_r=0x83000000\0" \ + "hdp_addr=0x9c000000\0" \ + "kernel_addr_r=0x80280000\0" \ + "ramdisk_addr_r=0x8a000000\0" \ + "scriptaddr=0x83100000\0" /* Boot M4 */ #define M4_BOOT_ENV \ @@ -67,8 +81,8 @@ #define AHAB_ENV "sec_boot=no\0" #endif -#define FDT_FILE "fsl-imx8qm-apalis-v1.1-eval.dtb" -#define FDT_FILE_V1_0 "fsl-imx8qm-apalis-eval.dtb" +#define FDT_FILE "imx8qm-apalis-v1.1-eval.dtb" +#define FDT_FILE_V1_0 "imx8qm-apalis-eval.dtb" /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -81,11 +95,9 @@ "kernel_image=Image\0" \ "console=ttyLP1 earlycon\0" \ "fdt_high=\0" \ - "fdt_addr=0x83800000\0" \ "boot_fdt=try\0" \ "fdtfile=" FDT_FILE "\0" \ "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \ - "hdp_addr=0x9c000000\0" \ "hdp_file=hdmitxfw.bin\0" \ "loadhdp=fatload mmc ${mmcdev}:${mmcpart} ${hdp_addr} ${hdp_file}\0" \ "mmcautodetect=yes\0" \ @@ -96,8 +108,8 @@ "netargs=setenv bootargs console=${console},${baudrate} " \ "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \ "\0" \ - "nfsboot=run netargs; dhcp ${loadaddr} ${image}; tftp ${fdt_addr} " \ - "apalis-imx8/${fdtfile}; booti ${loadaddr} - ${fdt_addr}\0" \ + "nfsboot=run netargs; dhcp ${loadaddr} ${image}; tftp ${fdt_addr_r} " \ + "apalis-imx8/${fdtfile}; booti ${loadaddr} - ${fdt_addr_r}\0" \ "panel=NULL\0" \ "update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \ "if test \"$confirm\" = \"y\"; then " \ @@ -109,14 +121,14 @@ "defargs=pci=nomsi" /* Link Definitions */ -#define CONFIG_LOADADDR 0x80280000 +#define CONFIG_LOADADDR 0x87000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 -#define CONFIG_SYS_MEMTEST_START 0x88000000 -#define CONFIG_SYS_MEMTEST_END 0x89000000 +#define CONFIG_SYS_MEMTEST_START 0x90000000 +#define CONFIG_SYS_MEMTEST_END 0xc0000000 /* Environment in eMMC, before config block at the end of 1st "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC1 eMMC */ |