Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 25f840d7ef440442f290e760459714a068487727

Authored by Marek Vasut
Committed by Tom Rini
1 parent 183f5fd3ca
Exists in smarc_8mq_lf_v2020.04 and in 20 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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 Inline Diff

configs/r8a7795_salvator-x_defconfig
Diff comments   View file @ 25f840d
1 CONFIG_ARM=y 1 CONFIG_ARM=y
2 CONFIG_ARCH_RMOBILE=y 2 CONFIG_ARCH_RMOBILE=y
3 CONFIG_SYS_MALLOC_F_LEN=0x2000 3 CONFIG_SYS_MALLOC_F_LEN=0x2000
4 CONFIG_RCAR_GEN3=y 4 CONFIG_RCAR_GEN3=y
5 CONFIG_TARGET_SALVATOR_X=y 5 CONFIG_TARGET_SALVATOR_X=y
6 CONFIG_DEFAULT_DEVICE_TREE="r8a7795-salvator-x" 6 CONFIG_DEFAULT_DEVICE_TREE="r8a7795-salvator-x"
7 CONFIG_SMBIOS_PRODUCT_NAME="" 7 CONFIG_SMBIOS_PRODUCT_NAME=""
8 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
8 CONFIG_USE_BOOTARGS=y 9 CONFIG_USE_BOOTARGS=y
9 CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" 10 CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
10 CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb" 11 CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb"
11 CONFIG_VERSION_VARIABLE=y 12 CONFIG_VERSION_VARIABLE=y
12 CONFIG_HUSH_PARSER=y 13 CONFIG_HUSH_PARSER=y
13 CONFIG_CMD_BOOTZ=y 14 CONFIG_CMD_BOOTZ=y
14 # CONFIG_CMD_IMLS is not set 15 # CONFIG_CMD_IMLS is not set
15 CONFIG_CMD_MMC=y 16 CONFIG_CMD_MMC=y
16 CONFIG_CMD_SDRAM=y 17 CONFIG_CMD_SDRAM=y
17 CONFIG_CMD_USB=y 18 CONFIG_CMD_USB=y
18 CONFIG_CMD_DHCP=y 19 CONFIG_CMD_DHCP=y
19 CONFIG_CMD_MII=y 20 CONFIG_CMD_MII=y
20 CONFIG_CMD_PING=y 21 CONFIG_CMD_PING=y
21 CONFIG_CMD_FAT=y 22 CONFIG_CMD_FAT=y
22 CONFIG_OF_CONTROL=y 23 CONFIG_OF_CONTROL=y
23 CONFIG_ENV_IS_IN_MMC=y 24 CONFIG_ENV_IS_IN_MMC=y
24 CONFIG_CLK=y 25 CONFIG_CLK=y
25 CONFIG_CLK_RENESAS=y 26 CONFIG_CLK_RENESAS=y
26 CONFIG_DM_MMC=y 27 CONFIG_DM_MMC=y
27 CONFIG_SH_SDHI=y 28 CONFIG_SH_SDHI=y
28 CONFIG_PHY_MICREL=y 29 CONFIG_PHY_MICREL=y
29 CONFIG_PHY_MICREL_KSZ90X1=y 30 CONFIG_PHY_MICREL_KSZ90X1=y
30 CONFIG_DM_ETH=y 31 CONFIG_DM_ETH=y
31 CONFIG_RENESAS_RAVB=y 32 CONFIG_RENESAS_RAVB=y
32 CONFIG_SCIF_CONSOLE=y 33 CONFIG_SCIF_CONSOLE=y
33 CONFIG_USB=y 34 CONFIG_USB=y
34 CONFIG_DM_USB=y 35 CONFIG_DM_USB=y
35 CONFIG_USB_EHCI_HCD=y 36 CONFIG_USB_EHCI_HCD=y
36 CONFIG_USB_STORAGE=y 37 CONFIG_USB_STORAGE=y
37 CONFIG_SMBIOS_MANUFACTURER="" 38 CONFIG_SMBIOS_MANUFACTURER=""
38 39
configs/r8a7795_ulcb_defconfig
Diff comments   View file @ 25f840d
1 CONFIG_ARM=y 1 CONFIG_ARM=y
2 CONFIG_ARCH_RMOBILE=y 2 CONFIG_ARCH_RMOBILE=y
3 CONFIG_SYS_MALLOC_F_LEN=0x2000 3 CONFIG_SYS_MALLOC_F_LEN=0x2000
4 CONFIG_RCAR_GEN3=y 4 CONFIG_RCAR_GEN3=y
5 CONFIG_TARGET_ULCB=y 5 CONFIG_TARGET_ULCB=y
6 CONFIG_DEFAULT_DEVICE_TREE="r8a7795-h3ulcb" 6 CONFIG_DEFAULT_DEVICE_TREE="r8a7795-h3ulcb"
7 CONFIG_SMBIOS_PRODUCT_NAME="" 7 CONFIG_SMBIOS_PRODUCT_NAME=""
8 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
8 CONFIG_USE_BOOTARGS=y 9 CONFIG_USE_BOOTARGS=y
9 CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" 10 CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
10 CONFIG_DEFAULT_FDT_FILE="r8a7795-h3ulcb.dtb" 11 CONFIG_DEFAULT_FDT_FILE="r8a7795-h3ulcb.dtb"
11 CONFIG_VERSION_VARIABLE=y 12 CONFIG_VERSION_VARIABLE=y
12 CONFIG_HUSH_PARSER=y 13 CONFIG_HUSH_PARSER=y
13 CONFIG_CMD_BOOTZ=y 14 CONFIG_CMD_BOOTZ=y
14 # CONFIG_CMD_IMLS is not set 15 # CONFIG_CMD_IMLS is not set
15 CONFIG_CMD_MMC=y 16 CONFIG_CMD_MMC=y
16 CONFIG_CMD_USB=y 17 CONFIG_CMD_USB=y
17 CONFIG_CMD_DHCP=y 18 CONFIG_CMD_DHCP=y
18 CONFIG_CMD_MII=y 19 CONFIG_CMD_MII=y
19 CONFIG_CMD_PING=y 20 CONFIG_CMD_PING=y
20 CONFIG_OF_CONTROL=y 21 CONFIG_OF_CONTROL=y
21 CONFIG_ENV_IS_IN_MMC=y 22 CONFIG_ENV_IS_IN_MMC=y
22 CONFIG_CLK=y 23 CONFIG_CLK=y
23 CONFIG_CLK_RENESAS=y 24 CONFIG_CLK_RENESAS=y
24 CONFIG_DM_MMC=y 25 CONFIG_DM_MMC=y
25 CONFIG_SH_SDHI=y 26 CONFIG_SH_SDHI=y
26 CONFIG_DM_ETH=y 27 CONFIG_DM_ETH=y
27 CONFIG_RENESAS_RAVB=y 28 CONFIG_RENESAS_RAVB=y
28 CONFIG_SCIF_CONSOLE=y 29 CONFIG_SCIF_CONSOLE=y
29 CONFIG_USB=y 30 CONFIG_USB=y
30 CONFIG_DM_USB=y 31 CONFIG_DM_USB=y
31 CONFIG_USB_EHCI_HCD=y 32 CONFIG_USB_EHCI_HCD=y
32 CONFIG_USB_STORAGE=y 33 CONFIG_USB_STORAGE=y
33 CONFIG_SMBIOS_MANUFACTURER="" 34 CONFIG_SMBIOS_MANUFACTURER=""
34 35
configs/r8a7796_salvator-x_defconfig
Diff comments   View file @ 25f840d
1 CONFIG_ARM=y 1 CONFIG_ARM=y
2 CONFIG_ARCH_RMOBILE=y 2 CONFIG_ARCH_RMOBILE=y
3 CONFIG_SYS_MALLOC_F_LEN=0x2000 3 CONFIG_SYS_MALLOC_F_LEN=0x2000
4 CONFIG_RCAR_GEN3=y 4 CONFIG_RCAR_GEN3=y
5 CONFIG_R8A7796=y 5 CONFIG_R8A7796=y
6 CONFIG_TARGET_SALVATOR_X=y 6 CONFIG_TARGET_SALVATOR_X=y
7 CONFIG_DEFAULT_DEVICE_TREE="r8a7796-salvator-x" 7 CONFIG_DEFAULT_DEVICE_TREE="r8a7796-salvator-x"
8 CONFIG_SMBIOS_PRODUCT_NAME="" 8 CONFIG_SMBIOS_PRODUCT_NAME=""
9 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
9 CONFIG_USE_BOOTARGS=y 10 CONFIG_USE_BOOTARGS=y
10 CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" 11 CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
11 CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb" 12 CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb"
12 CONFIG_VERSION_VARIABLE=y 13 CONFIG_VERSION_VARIABLE=y
13 CONFIG_HUSH_PARSER=y 14 CONFIG_HUSH_PARSER=y
14 CONFIG_CMD_BOOTZ=y 15 CONFIG_CMD_BOOTZ=y
15 # CONFIG_CMD_IMLS is not set 16 # CONFIG_CMD_IMLS is not set
16 CONFIG_CMD_MMC=y 17 CONFIG_CMD_MMC=y
17 CONFIG_CMD_SDRAM=y 18 CONFIG_CMD_SDRAM=y
18 CONFIG_CMD_USB=y 19 CONFIG_CMD_USB=y
19 CONFIG_CMD_DHCP=y 20 CONFIG_CMD_DHCP=y
20 CONFIG_CMD_MII=y 21 CONFIG_CMD_MII=y
21 CONFIG_CMD_PING=y 22 CONFIG_CMD_PING=y
22 CONFIG_CMD_FAT=y 23 CONFIG_CMD_FAT=y
23 CONFIG_OF_CONTROL=y 24 CONFIG_OF_CONTROL=y
24 CONFIG_ENV_IS_IN_MMC=y 25 CONFIG_ENV_IS_IN_MMC=y
25 CONFIG_CLK=y 26 CONFIG_CLK=y
26 CONFIG_CLK_RENESAS=y 27 CONFIG_CLK_RENESAS=y
27 CONFIG_DM_MMC=y 28 CONFIG_DM_MMC=y
28 CONFIG_SH_SDHI=y 29 CONFIG_SH_SDHI=y
29 CONFIG_PHY_MICREL=y 30 CONFIG_PHY_MICREL=y
30 CONFIG_PHY_MICREL_KSZ90X1=y 31 CONFIG_PHY_MICREL_KSZ90X1=y
31 CONFIG_DM_ETH=y 32 CONFIG_DM_ETH=y
32 CONFIG_RENESAS_RAVB=y 33 CONFIG_RENESAS_RAVB=y
33 CONFIG_SCIF_CONSOLE=y 34 CONFIG_SCIF_CONSOLE=y
34 CONFIG_USB=y 35 CONFIG_USB=y
35 CONFIG_DM_USB=y 36 CONFIG_DM_USB=y
36 CONFIG_USB_EHCI_HCD=y 37 CONFIG_USB_EHCI_HCD=y
37 CONFIG_USB_STORAGE=y 38 CONFIG_USB_STORAGE=y
38 CONFIG_SMBIOS_MANUFACTURER="" 39 CONFIG_SMBIOS_MANUFACTURER=""
39 40
configs/r8a7796_ulcb_defconfig
Diff comments   View file @ 25f840d
1 CONFIG_ARM=y 1 CONFIG_ARM=y
2 CONFIG_ARCH_RMOBILE=y 2 CONFIG_ARCH_RMOBILE=y
3 CONFIG_SYS_MALLOC_F_LEN=0x2000 3 CONFIG_SYS_MALLOC_F_LEN=0x2000
4 CONFIG_RCAR_GEN3=y 4 CONFIG_RCAR_GEN3=y
5 CONFIG_R8A7796=y 5 CONFIG_R8A7796=y
6 CONFIG_TARGET_ULCB=y 6 CONFIG_TARGET_ULCB=y
7 CONFIG_DEFAULT_DEVICE_TREE="r8a7796-m3ulcb" 7 CONFIG_DEFAULT_DEVICE_TREE="r8a7796-m3ulcb"
8 CONFIG_SMBIOS_PRODUCT_NAME="" 8 CONFIG_SMBIOS_PRODUCT_NAME=""
9 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
9 CONFIG_USE_BOOTARGS=y 10 CONFIG_USE_BOOTARGS=y
10 CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" 11 CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
11 CONFIG_DEFAULT_FDT_FILE="r8a7796-m3ulcb.dtb" 12 CONFIG_DEFAULT_FDT_FILE="r8a7796-m3ulcb.dtb"
12 CONFIG_VERSION_VARIABLE=y 13 CONFIG_VERSION_VARIABLE=y
13 CONFIG_HUSH_PARSER=y 14 CONFIG_HUSH_PARSER=y
14 CONFIG_CMD_BOOTZ=y 15 CONFIG_CMD_BOOTZ=y
15 # CONFIG_CMD_IMLS is not set 16 # CONFIG_CMD_IMLS is not set
16 CONFIG_CMD_MMC=y 17 CONFIG_CMD_MMC=y
17 CONFIG_CMD_USB=y 18 CONFIG_CMD_USB=y
18 CONFIG_CMD_DHCP=y 19 CONFIG_CMD_DHCP=y
19 CONFIG_CMD_MII=y 20 CONFIG_CMD_MII=y
20 CONFIG_CMD_PING=y 21 CONFIG_CMD_PING=y
21 CONFIG_OF_CONTROL=y 22 CONFIG_OF_CONTROL=y
22 CONFIG_ENV_IS_IN_MMC=y 23 CONFIG_ENV_IS_IN_MMC=y
23 CONFIG_CLK=y 24 CONFIG_CLK=y
24 CONFIG_CLK_RENESAS=y 25 CONFIG_CLK_RENESAS=y
25 CONFIG_DM_MMC=y 26 CONFIG_DM_MMC=y
26 CONFIG_SH_SDHI=y 27 CONFIG_SH_SDHI=y
27 CONFIG_DM_ETH=y 28 CONFIG_DM_ETH=y
28 CONFIG_RENESAS_RAVB=y 29 CONFIG_RENESAS_RAVB=y
29 CONFIG_SCIF_CONSOLE=y 30 CONFIG_SCIF_CONSOLE=y
30 CONFIG_USB=y 31 CONFIG_USB=y
31 CONFIG_DM_USB=y 32 CONFIG_DM_USB=y
32 CONFIG_USB_EHCI_HCD=y 33 CONFIG_USB_EHCI_HCD=y
33 CONFIG_USB_STORAGE=y 34 CONFIG_USB_STORAGE=y
34 CONFIG_SMBIOS_MANUFACTURER="" 35 CONFIG_SMBIOS_MANUFACTURER=""
35 36