Message ID | 1589357244-31582-1-git-send-email-clabbe@baylibre.com |
---|---|
State | Accepted |
Commit | 5c7f5c5b006c09157638b416ebe73d5cccec188c |
Headers | show |
Series | [v2] rpi_4_defconfig: add missing CONFIG_ARCH_FIXUP_FDT_MEMORY | expand |
On 13/05/2020 10:07, Corentin Labbe wrote: > As discussed at https://lore.kernel.org/linux-arm-kernel/b726290c-1038-3771-5187-6ac370bc92c9 at arm.com/T/ > the defconfig for rpi4 miss CONFIG_ARCH_FIXUP_FDT_MEMORY. > Without it, booting with an initrd fail. > > Signed-off-by: Corentin Labbe <clabbe at baylibre.com> > --- > Changes since v1: > - added fix for rpi_4_32b_defconfig > > configs/rpi_4_32b_defconfig | 2 +- > configs/rpi_4_defconfig | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > Any reason why you don't added rpi_arm64_defconfig? Regards, Matthias > diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig > index 8d262d89b4..f2a975891c 100644 > --- a/configs/rpi_4_32b_defconfig > +++ b/configs/rpi_4_32b_defconfig > @@ -7,7 +7,7 @@ CONFIG_ENV_SIZE=0x4000 > CONFIG_NR_DRAM_BANKS=2 > CONFIG_DISTRO_DEFAULTS=y > CONFIG_OF_BOARD_SETUP=y > -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set > +CONFIG_ARCH_FIXUP_FDT_MEMORY=y > CONFIG_MISC_INIT_R=y > # CONFIG_DISPLAY_CPUINFO is not set > # CONFIG_DISPLAY_BOARDINFO is not set > diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig > index 2a0cea4222..f1c8f5ef7d 100644 > --- a/configs/rpi_4_defconfig > +++ b/configs/rpi_4_defconfig > @@ -7,7 +7,7 @@ CONFIG_ENV_SIZE=0x4000 > CONFIG_NR_DRAM_BANKS=2 > CONFIG_DISTRO_DEFAULTS=y > CONFIG_OF_BOARD_SETUP=y > -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set > +CONFIG_ARCH_FIXUP_FDT_MEMORY=y > CONFIG_MISC_INIT_R=y > # CONFIG_DISPLAY_CPUINFO is not set > # CONFIG_DISPLAY_BOARDINFO is not set >
On Wed, May 13, 2020 at 12:38:58PM +0200, Matthias Brugger wrote: > > > On 13/05/2020 10:07, Corentin Labbe wrote: > > As discussed at https://lore.kernel.org/linux-arm-kernel/b726290c-1038-3771-5187-6ac370bc92c9 at arm.com/T/ > > the defconfig for rpi4 miss CONFIG_ARCH_FIXUP_FDT_MEMORY. > > Without it, booting with an initrd fail. > > > > Signed-off-by: Corentin Labbe <clabbe at baylibre.com> > > --- > > Changes since v1: > > - added fix for rpi_4_32b_defconfig > > > > configs/rpi_4_32b_defconfig | 2 +- > > configs/rpi_4_defconfig | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > Any reason why you don't added rpi_arm64_defconfig? > I didnt see rpi4 in its name so out of context of my changes. I believe it is a common defconfig for all rpis, in that case touching it need more testing. So I propose to apply the change for rpi4 which are tested now. And later I could try to test rpi_arm64_defconfig on rpi4 AND other rpis.. > > > diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig > > index 8d262d89b4..f2a975891c 100644 > > --- a/configs/rpi_4_32b_defconfig > > +++ b/configs/rpi_4_32b_defconfig > > @@ -7,7 +7,7 @@ CONFIG_ENV_SIZE=0x4000 > > CONFIG_NR_DRAM_BANKS=2 > > CONFIG_DISTRO_DEFAULTS=y > > CONFIG_OF_BOARD_SETUP=y > > -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set > > +CONFIG_ARCH_FIXUP_FDT_MEMORY=y > > CONFIG_MISC_INIT_R=y > > # CONFIG_DISPLAY_CPUINFO is not set > > # CONFIG_DISPLAY_BOARDINFO is not set > > diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig > > index 2a0cea4222..f1c8f5ef7d 100644 > > --- a/configs/rpi_4_defconfig > > +++ b/configs/rpi_4_defconfig > > @@ -7,7 +7,7 @@ CONFIG_ENV_SIZE=0x4000 > > CONFIG_NR_DRAM_BANKS=2 > > CONFIG_DISTRO_DEFAULTS=y > > CONFIG_OF_BOARD_SETUP=y > > -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set > > +CONFIG_ARCH_FIXUP_FDT_MEMORY=y > > CONFIG_MISC_INIT_R=y > > # CONFIG_DISPLAY_CPUINFO is not set > > # CONFIG_DISPLAY_BOARDINFO is not set > >
On 5/13/20 5:07 PM, Corentin Labbe wrote: > As discussed at https://lore.kernel.org/linux-arm-kernel/b726290c-1038-3771-5187-6ac370bc92c9 at arm.com/T/ > the defconfig for rpi4 miss CONFIG_ARCH_FIXUP_FDT_MEMORY. > Without it, booting with an initrd fail. > > Signed-off-by: Corentin Labbe <clabbe at baylibre.com> Reviewed-by: Jaehoon Chung <jh80.chung at samsung.com> Best Regards, Jaehoon Chung > --- > Changes since v1: > - added fix for rpi_4_32b_defconfig > > configs/rpi_4_32b_defconfig | 2 +- > configs/rpi_4_defconfig | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig > index 8d262d89b4..f2a975891c 100644 > --- a/configs/rpi_4_32b_defconfig > +++ b/configs/rpi_4_32b_defconfig > @@ -7,7 +7,7 @@ CONFIG_ENV_SIZE=0x4000 > CONFIG_NR_DRAM_BANKS=2 > CONFIG_DISTRO_DEFAULTS=y > CONFIG_OF_BOARD_SETUP=y > -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set > +CONFIG_ARCH_FIXUP_FDT_MEMORY=y > CONFIG_MISC_INIT_R=y > # CONFIG_DISPLAY_CPUINFO is not set > # CONFIG_DISPLAY_BOARDINFO is not set > diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig > index 2a0cea4222..f1c8f5ef7d 100644 > --- a/configs/rpi_4_defconfig > +++ b/configs/rpi_4_defconfig > @@ -7,7 +7,7 @@ CONFIG_ENV_SIZE=0x4000 > CONFIG_NR_DRAM_BANKS=2 > CONFIG_DISTRO_DEFAULTS=y > CONFIG_OF_BOARD_SETUP=y > -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set > +CONFIG_ARCH_FIXUP_FDT_MEMORY=y > CONFIG_MISC_INIT_R=y > # CONFIG_DISPLAY_CPUINFO is not set > # CONFIG_DISPLAY_BOARDINFO is not set >
diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig index 8d262d89b4..f2a975891c 100644 --- a/configs/rpi_4_32b_defconfig +++ b/configs/rpi_4_32b_defconfig @@ -7,7 +7,7 @@ CONFIG_ENV_SIZE=0x4000 CONFIG_NR_DRAM_BANKS=2 CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set +CONFIG_ARCH_FIXUP_FDT_MEMORY=y CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig index 2a0cea4222..f1c8f5ef7d 100644 --- a/configs/rpi_4_defconfig +++ b/configs/rpi_4_defconfig @@ -7,7 +7,7 @@ CONFIG_ENV_SIZE=0x4000 CONFIG_NR_DRAM_BANKS=2 CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y -# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set +CONFIG_ARCH_FIXUP_FDT_MEMORY=y CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
As discussed at https://lore.kernel.org/linux-arm-kernel/b726290c-1038-3771-5187-6ac370bc92c9 at arm.com/T/ the defconfig for rpi4 miss CONFIG_ARCH_FIXUP_FDT_MEMORY. Without it, booting with an initrd fail. Signed-off-by: Corentin Labbe <clabbe at baylibre.com> --- Changes since v1: - added fix for rpi_4_32b_defconfig configs/rpi_4_32b_defconfig | 2 +- configs/rpi_4_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)