| Message ID | 20190514182633.30925-1-peron.clem@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
| Series | [U-Boot] sun50i: h6: Fix Beelink GS1 board config | expand |
On Tue, May 14, 2019 at 11:56 PM <peron.clem@gmail.com> wrote: > > From: Clément Péron <peron.clem@gmail.com> > > SPL_TEXT_BASE has been moved to Kconfig with commit: > f89d6133ee configs: move CONFIG_SPL_TEXT_BASE to Kconfig > > But Beelink GS1 config file has been introduced in the > same time without this modification. > > Fix this by settings the CONFIG_SPL_TEXT_BASE > > Suggested-by: Jonas Smedegaard <dr@jones.dk> > Signed-off-by: Clément Péron <peron.clem@gmail.com> > --- > configs/beelink_gs1_defconfig | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > index ef4dd29549..f16d0fee22 100644 > --- a/configs/beelink_gs1_defconfig > +++ b/configs/beelink_gs1_defconfig > @@ -1,12 +1,13 @@ > CONFIG_ARM=y > CONFIG_ARCH_SUNXI=y > +CONFIG_NR_DRAM_BANKS=1 > CONFIG_SPL=y > CONFIG_MACH_SUN50I_H6=y > CONFIG_MMC0_CD_PIN="PF6" > CONFIG_MMC_SUNXI_SLOT_EXTRA=2 > # CONFIG_PSCI_RESET is not set > -CONFIG_NR_DRAM_BANKS=1 Change changes seems different
Hi Jagan, On Mon, 20 May 2019 at 18:34, Jagan Teki <jagan@amarulasolutions.com> wrote: > > On Tue, May 14, 2019 at 11:56 PM <peron.clem@gmail.com> wrote: > > > > From: Clément Péron <peron.clem@gmail.com> > > > > SPL_TEXT_BASE has been moved to Kconfig with commit: > > f89d6133ee configs: move CONFIG_SPL_TEXT_BASE to Kconfig > > > > But Beelink GS1 config file has been introduced in the > > same time without this modification. > > > > Fix this by settings the CONFIG_SPL_TEXT_BASE > > > > Suggested-by: Jonas Smedegaard <dr@jones.dk> > > Signed-off-by: Clément Péron <peron.clem@gmail.com> > > --- > > configs/beelink_gs1_defconfig | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > > index ef4dd29549..f16d0fee22 100644 > > --- a/configs/beelink_gs1_defconfig > > +++ b/configs/beelink_gs1_defconfig > > @@ -1,12 +1,13 @@ > > CONFIG_ARM=y > > CONFIG_ARCH_SUNXI=y > > +CONFIG_NR_DRAM_BANKS=1 > > CONFIG_SPL=y > > CONFIG_MACH_SUN50I_H6=y > > CONFIG_MMC0_CD_PIN="PF6" > > CONFIG_MMC_SUNXI_SLOT_EXTRA=2 > > # CONFIG_PSCI_RESET is not set > > -CONFIG_NR_DRAM_BANKS=1 > > Change changes seems different This happens when I made the "make save_defconfig" Do you want to split this in two commits ? Regards, Clément
On Mon, May 20, 2019 at 10:07 PM Clément Péron <peron.clem@gmail.com> wrote: > > Hi Jagan, > > On Mon, 20 May 2019 at 18:34, Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > On Tue, May 14, 2019 at 11:56 PM <peron.clem@gmail.com> wrote: > > > > > > From: Clément Péron <peron.clem@gmail.com> > > > > > > SPL_TEXT_BASE has been moved to Kconfig with commit: > > > f89d6133ee configs: move CONFIG_SPL_TEXT_BASE to Kconfig > > > > > > But Beelink GS1 config file has been introduced in the > > > same time without this modification. > > > > > > Fix this by settings the CONFIG_SPL_TEXT_BASE > > > > > > Suggested-by: Jonas Smedegaard <dr@jones.dk> > > > Signed-off-by: Clément Péron <peron.clem@gmail.com> > > > --- > > > configs/beelink_gs1_defconfig | 3 ++- > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > > > index ef4dd29549..f16d0fee22 100644 > > > --- a/configs/beelink_gs1_defconfig > > > +++ b/configs/beelink_gs1_defconfig > > > @@ -1,12 +1,13 @@ > > > CONFIG_ARM=y > > > CONFIG_ARCH_SUNXI=y > > > +CONFIG_NR_DRAM_BANKS=1 > > > CONFIG_SPL=y > > > CONFIG_MACH_SUN50I_H6=y > > > CONFIG_MMC0_CD_PIN="PF6" > > > CONFIG_MMC_SUNXI_SLOT_EXTRA=2 > > > # CONFIG_PSCI_RESET is not set > > > -CONFIG_NR_DRAM_BANKS=1 > > > > Change changes seems different > > This happens when I made the "make save_defconfig" > > Do you want to split this in two commits ? I can drop that while applying, if you agree?
Hi Jagan, On Mon, 20 May 2019 at 18:38, Jagan Teki <jagan@amarulasolutions.com> wrote: > > On Mon, May 20, 2019 at 10:07 PM Clément Péron <peron.clem@gmail.com> wrote: > > > > Hi Jagan, > > > > On Mon, 20 May 2019 at 18:34, Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > On Tue, May 14, 2019 at 11:56 PM <peron.clem@gmail.com> wrote: > > > > > > > > From: Clément Péron <peron.clem@gmail.com> > > > > > > > > SPL_TEXT_BASE has been moved to Kconfig with commit: > > > > f89d6133ee configs: move CONFIG_SPL_TEXT_BASE to Kconfig > > > > > > > > But Beelink GS1 config file has been introduced in the > > > > same time without this modification. > > > > > > > > Fix this by settings the CONFIG_SPL_TEXT_BASE > > > > > > > > Suggested-by: Jonas Smedegaard <dr@jones.dk> > > > > Signed-off-by: Clément Péron <peron.clem@gmail.com> > > > > --- > > > > configs/beelink_gs1_defconfig | 3 ++- > > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > > > > index ef4dd29549..f16d0fee22 100644 > > > > --- a/configs/beelink_gs1_defconfig > > > > +++ b/configs/beelink_gs1_defconfig > > > > @@ -1,12 +1,13 @@ > > > > CONFIG_ARM=y > > > > CONFIG_ARCH_SUNXI=y > > > > +CONFIG_NR_DRAM_BANKS=1 > > > > CONFIG_SPL=y > > > > CONFIG_MACH_SUN50I_H6=y > > > > CONFIG_MMC0_CD_PIN="PF6" > > > > CONFIG_MMC_SUNXI_SLOT_EXTRA=2 > > > > # CONFIG_PSCI_RESET is not set > > > > -CONFIG_NR_DRAM_BANKS=1 > > > > > > Change changes seems different > > > > This happens when I made the "make save_defconfig" > > > > Do you want to split this in two commits ? > > I can drop that while applying, if you agree? Please do so, Thanks, Clément
On Mon, May 20, 2019 at 10:14 PM Clément Péron <peron.clem@gmail.com> wrote: > > Hi Jagan, > > > On Mon, 20 May 2019 at 18:38, Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > On Mon, May 20, 2019 at 10:07 PM Clément Péron <peron.clem@gmail.com> wrote: > > > > > > Hi Jagan, > > > > > > On Mon, 20 May 2019 at 18:34, Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > On Tue, May 14, 2019 at 11:56 PM <peron.clem@gmail.com> wrote: > > > > > > > > > > From: Clément Péron <peron.clem@gmail.com> > > > > > > > > > > SPL_TEXT_BASE has been moved to Kconfig with commit: > > > > > f89d6133ee configs: move CONFIG_SPL_TEXT_BASE to Kconfig > > > > > > > > > > But Beelink GS1 config file has been introduced in the > > > > > same time without this modification. > > > > > > > > > > Fix this by settings the CONFIG_SPL_TEXT_BASE > > > > > > > > > > Suggested-by: Jonas Smedegaard <dr@jones.dk> > > > > > Signed-off-by: Clément Péron <peron.clem@gmail.com> > > > > > --- > > > > > configs/beelink_gs1_defconfig | 3 ++- > > > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > > > > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > > > > > index ef4dd29549..f16d0fee22 100644 > > > > > --- a/configs/beelink_gs1_defconfig > > > > > +++ b/configs/beelink_gs1_defconfig > > > > > @@ -1,12 +1,13 @@ > > > > > CONFIG_ARM=y > > > > > CONFIG_ARCH_SUNXI=y > > > > > +CONFIG_NR_DRAM_BANKS=1 > > > > > CONFIG_SPL=y > > > > > CONFIG_MACH_SUN50I_H6=y > > > > > CONFIG_MMC0_CD_PIN="PF6" > > > > > CONFIG_MMC_SUNXI_SLOT_EXTRA=2 > > > > > # CONFIG_PSCI_RESET is not set > > > > > -CONFIG_NR_DRAM_BANKS=1 > > > > > > > > Change changes seems different > > > > > > This happens when I made the "make save_defconfig" > > > > > > Do you want to split this in two commits ? > > > > I can drop that while applying, if you agree? Applied to u-boot-sunxi/master
diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig index ef4dd29549..f16d0fee22 100644 --- a/configs/beelink_gs1_defconfig +++ b/configs/beelink_gs1_defconfig @@ -1,12 +1,13 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y +CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL=y CONFIG_MACH_SUN50I_H6=y CONFIG_MMC0_CD_PIN="PF6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_PSCI_RESET is not set -CONFIG_NR_DRAM_BANKS=1 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL_TEXT_BASE=0x20060 # CONFIG_CMD_FLASH is not set # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set