summaryrefslogtreecommitdiffstats
path: root/configs/r8a7796_salvator-x_defconfig
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2017-09-07 09:48:24 +0200
committerTom Rini <trini@konsulko.com>2017-09-07 20:04:41 -0400
commit25f840d7ef440442f290e760459714a068487727 (patch)
tree14c65acc90e95ce705e40a64f080be93de811d34 /configs/r8a7796_salvator-x_defconfig
parent183f5fd3caec9266432a7cbd50f59cec8bbddc6a (diff)
downloadu-boot-25f840d7ef440442f290e760459714a068487727.tar.gz
u-boot-25f840d7ef440442f290e760459714a068487727.tar.xz
u-boot-25f840d7ef440442f290e760459714a068487727.zip
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>
Diffstat (limited to 'configs/r8a7796_salvator-x_defconfig')
-rw-r--r--configs/r8a7796_salvator-x_defconfig1
1 files changed, 1 insertions, 0 deletions
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"