Merge tag 'u-boot-imx-20191105' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
authorTom Rini <trini@konsulko.com>
Tue, 12 Nov 2019 12:18:23 +0000 (07:18 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 12 Nov 2019 12:18:23 +0000 (07:18 -0500)
u-boot-imx-20191105
-------------------
i.MX8MN SoC support
ROM API image download support
i.MX8MM enet enabling

1  2 
arch/arm/dts/Makefile
configs/imx8qm_mek_defconfig

diff --combined arch/arm/dts/Makefile
index 5a64fcc5a79191896913436669469cf1467347f8,3e2677c4f19a7b65eae8f9dc911c94f4d7772a57..85ef00a2bd117a5e3c9aa2d0b2430681f823b2b2
@@@ -111,7 -111,6 +111,7 @@@ dtb-$(CONFIG_ROCKCHIP_RK3399) += 
        rk3399-khadas-edge.dtb \
        rk3399-khadas-edge-captain.dtb \
        rk3399-khadas-edge-v.dtb \
 +      rk3399-leez-p710.dtb \
        rk3399-nanopc-t4.dtb \
        rk3399-nanopi-m4.dtb \
        rk3399-nanopi-neo4.dtb \
@@@ -661,6 -660,7 +661,7 @@@ dtb-$(CONFIG_ARCH_IMX8) += 
  
  dtb-$(CONFIG_ARCH_IMX8M) += \
        imx8mm-evk.dtb \
+       imx8mn-ddr4-evk.dtb \
        imx8mq-evk.dtb
  
  dtb-$(CONFIG_RCAR_GEN2) += \
@@@ -835,8 -835,6 +836,8 @@@ dtb-$(CONFIG_TARGET_VEXPRESS_CA5X2) += 
  dtb-$(CONFIG_TARGET_VEXPRESS_CA9X4) += vexpress-v2p-ca9.dtb
  dtb-$(CONFIG_TARGET_VEXPRESS_CA15_TC2) += vexpress-v2p-ca15_a7.dtb
  
 +dtb-$(CONFIG_TARGET_DURIAN) += phytium-durian.dtb
 +
  targets += $(dtb-y)
  
  # Add any required device tree compiler flags here
index 8978a5c5b0c186b030fd582c688871131a47274d,9ec76764841ae975e73b928d2663ba1db202ce35..6e7d9e65601b6fcafa0b52abee565c4e53b6fdf6
@@@ -3,10 -3,11 +3,10 @@@ CONFIG_SPL_SYS_ICACHE_OFF=
  CONFIG_SPL_SYS_DCACHE_OFF=y
  CONFIG_ARCH_IMX8=y
  CONFIG_SYS_TEXT_BASE=0x80020000
 -CONFIG_SPL_TEXT_BASE=0x100000
  CONFIG_SPL_GPIO_SUPPORT=y
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
- CONFIG_SYS_MALLOC_F_LEN=0x4000
+ CONFIG_SYS_MALLOC_F_LEN=0x8000
  CONFIG_SPL_LOAD_IMX_CONTAINER=y
  CONFIG_IMX_CONTAINER_CFG="board/freescale/imx8qm_mek/uboot-container.cfg"
  CONFIG_TARGET_IMX8QM_MEK=y
@@@ -15,7 -16,6 +15,7 @@@ CONFIG_SPL_SERIAL_SUPPORT=
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=3
  CONFIG_SPL=y
 +CONFIG_SPL_TEXT_BASE=0x100000
  CONFIG_OF_SYSTEM_SETUP=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg"
  CONFIG_BOOTDELAY=3