| Message ID | 20170907074824.10872-1-marek.vasut+renesas@gmail.com |
|---|---|
| State | Accepted |
| Commit | 25f840d7ef440442f290e760459714a068487727 |
| Delegated to: | Nobuhiro Iwamatsu |
| Headers | show |
| Series | [U-Boot] ARM: rmobile: Disable CONFIG_ARCH_FIXUP_FDT_MEMORY | expand |
On Thu, Sep 07, 2017 at 09:48:24AM +0200, Marek Vasut wrote: > Disable CONFIG_ARCH_FIXUP_FDT_MEMORY to prevent U-Boot from modifying > the memory {} nodes in the DT passed to the Linux kernel. The R8A779x > DT contains multiple memory {} nodes, while U-Boot only modifies the > first one and stuffs all the memory entries into it, which is wrong. > Disabling CONFIG_ARCH_FIXUP_FDT_MEMORY is the least intrusive way to > fix the issue this close to the release, while the real fix is to > extend the fdt_fixup_memory_banks() to handle multiple memory nodes > in DT. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Applied to u-boot/master, thanks!
diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig index f037d20479..62b16b7a1c 100644 --- a/configs/r8a7795_salvator-x_defconfig +++ b/configs/r8a7795_salvator-x_defconfig @@ -5,6 +5,7 @@ CONFIG_RCAR_GEN3=y CONFIG_TARGET_SALVATOR_X=y CONFIG_DEFAULT_DEVICE_TREE="r8a7795-salvator-x" CONFIG_SMBIOS_PRODUCT_NAME="" +# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb" diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig index 42913dffaf..a3dba70305 100644 --- a/configs/r8a7795_ulcb_defconfig +++ b/configs/r8a7795_ulcb_defconfig @@ -5,6 +5,7 @@ CONFIG_RCAR_GEN3=y CONFIG_TARGET_ULCB=y CONFIG_DEFAULT_DEVICE_TREE="r8a7795-h3ulcb" CONFIG_SMBIOS_PRODUCT_NAME="" +# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" CONFIG_DEFAULT_FDT_FILE="r8a7795-h3ulcb.dtb" diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig index d9af5f36b7..aa231b65e0 100644 --- a/configs/r8a7796_salvator-x_defconfig +++ b/configs/r8a7796_salvator-x_defconfig @@ -6,6 +6,7 @@ CONFIG_R8A7796=y CONFIG_TARGET_SALVATOR_X=y CONFIG_DEFAULT_DEVICE_TREE="r8a7796-salvator-x" CONFIG_SMBIOS_PRODUCT_NAME="" +# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb" diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig index e5f560612b..f222a6833c 100644 --- a/configs/r8a7796_ulcb_defconfig +++ b/configs/r8a7796_ulcb_defconfig @@ -6,6 +6,7 @@ CONFIG_R8A7796=y CONFIG_TARGET_ULCB=y CONFIG_DEFAULT_DEVICE_TREE="r8a7796-m3ulcb" CONFIG_SMBIOS_PRODUCT_NAME="" +# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" CONFIG_DEFAULT_FDT_FILE="r8a7796-m3ulcb.dtb"
Disable CONFIG_ARCH_FIXUP_FDT_MEMORY to prevent U-Boot from modifying the memory {} nodes in the DT passed to the Linux kernel. The R8A779x DT contains multiple memory {} nodes, while U-Boot only modifies the first one and stuffs all the memory entries into it, which is wrong. Disabling CONFIG_ARCH_FIXUP_FDT_MEMORY is the least intrusive way to fix the issue this close to the release, while the real fix is to extend the fdt_fixup_memory_banks() to handle multiple memory nodes in DT. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> --- configs/r8a7795_salvator-x_defconfig | 1 + configs/r8a7795_ulcb_defconfig | 1 + configs/r8a7796_salvator-x_defconfig | 1 + configs/r8a7796_ulcb_defconfig | 1 + 4 files changed, 4 insertions(+)