Commit 25f840d7ef440442f290e760459714a068487727
Committed by
Tom Rini
1 parent
183f5fd3ca
Exists in
smarc_8mq_lf_v2020.04
and in
20 other branches
ARM: rmobile: Disable CONFIG_ARCH_FIXUP_FDT_MEMORY
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>
Showing 4 changed files with 4 additions and 0 deletions Side-by-side Diff
configs/r8a7795_salvator-x_defconfig
| ... | ... | @@ -5,6 +5,7 @@ |
| 5 | 5 | CONFIG_TARGET_SALVATOR_X=y |
| 6 | 6 | CONFIG_DEFAULT_DEVICE_TREE="r8a7795-salvator-x" |
| 7 | 7 | CONFIG_SMBIOS_PRODUCT_NAME="" |
| 8 | +# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set | |
| 8 | 9 | CONFIG_USE_BOOTARGS=y |
| 9 | 10 | CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" |
| 10 | 11 | CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb" |
configs/r8a7795_ulcb_defconfig
| ... | ... | @@ -5,6 +5,7 @@ |
| 5 | 5 | CONFIG_TARGET_ULCB=y |
| 6 | 6 | CONFIG_DEFAULT_DEVICE_TREE="r8a7795-h3ulcb" |
| 7 | 7 | CONFIG_SMBIOS_PRODUCT_NAME="" |
| 8 | +# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set | |
| 8 | 9 | CONFIG_USE_BOOTARGS=y |
| 9 | 10 | CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" |
| 10 | 11 | CONFIG_DEFAULT_FDT_FILE="r8a7795-h3ulcb.dtb" |
configs/r8a7796_salvator-x_defconfig
| ... | ... | @@ -6,6 +6,7 @@ |
| 6 | 6 | CONFIG_TARGET_SALVATOR_X=y |
| 7 | 7 | CONFIG_DEFAULT_DEVICE_TREE="r8a7796-salvator-x" |
| 8 | 8 | CONFIG_SMBIOS_PRODUCT_NAME="" |
| 9 | +# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set | |
| 9 | 10 | CONFIG_USE_BOOTARGS=y |
| 10 | 11 | CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" |
| 11 | 12 | CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb" |
configs/r8a7796_ulcb_defconfig
| ... | ... | @@ -6,6 +6,7 @@ |
| 6 | 6 | CONFIG_TARGET_ULCB=y |
| 7 | 7 | CONFIG_DEFAULT_DEVICE_TREE="r8a7796-m3ulcb" |
| 8 | 8 | CONFIG_SMBIOS_PRODUCT_NAME="" |
| 9 | +# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set | |
| 9 | 10 | CONFIG_USE_BOOTARGS=y |
| 10 | 11 | CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" |
| 11 | 12 | CONFIG_DEFAULT_FDT_FILE="r8a7796-m3ulcb.dtb" |