| Message ID | 20200311221118.4579-3-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | 38fec8de5f4bf04f0824fda99ac482c0e64157c4 |
| Headers | show |
| Series | [PATCHv2,1/8] spl: Kconfig: Escape '$(ARCH)' in LDSCRIPT entries | expand |
On Thu, Mar 12, 2020 at 7:12 AM Tom Rini <trini at konsulko.com> wrote: > > As there is only one machine under mach-orion5x, having a Kconfig entry > for SPL_LDSCRIPT is not helpful, move this to the defconfig file. > > Suggested-by: Masahiro Yamada <masahiroy at kernel.org> > Signed-off-by: Tom Rini <trini at konsulko.com> > --- Reviewed-by: Masahiro Yamada <masahiroy at kernel.org> > arch/arm/mach-orion5x/Kconfig | 3 --- > configs/edminiv2_defconfig | 1 + > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig > index 2984a3edda21..7644b8dc854b 100644 > --- a/arch/arm/mach-orion5x/Kconfig > +++ b/arch/arm/mach-orion5x/Kconfig > @@ -15,7 +15,4 @@ config SYS_SOC > > source "board/LaCie/edminiv2/Kconfig" > > -config SPL_LDSCRIPT > - default "$(CPUDIR)/orion5x/u-boot-spl.lds" if ORION5X > - > endif > diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig > index 2bbd6a783b94..b9a68a9263aa 100644 > --- a/configs/edminiv2_defconfig > +++ b/configs/edminiv2_defconfig > @@ -1,6 +1,7 @@ > CONFIG_ARM=y > CONFIG_ARCH_CPU_INIT=y > CONFIG_ORION5X=y > +CONFIG_SPL_LDSCRIPT="arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds" > CONFIG_SYS_TEXT_BASE=0x00800000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > -- > 2.17.1 >
On Wed, Mar 11, 2020 at 06:11:13PM -0400, Tom Rini wrote: > As there is only one machine under mach-orion5x, having a Kconfig entry > for SPL_LDSCRIPT is not helpful, move this to the defconfig file. > > Suggested-by: Masahiro Yamada <masahiroy at kernel.org> > Signed-off-by: Tom Rini <trini at konsulko.com> > Reviewed-by: Masahiro Yamada <masahiroy at kernel.org> Applied to u-boot/next, thanks!
diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig index 2984a3edda21..7644b8dc854b 100644 --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig @@ -15,7 +15,4 @@ config SYS_SOC source "board/LaCie/edminiv2/Kconfig" -config SPL_LDSCRIPT - default "$(CPUDIR)/orion5x/u-boot-spl.lds" if ORION5X - endif diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig index 2bbd6a783b94..b9a68a9263aa 100644 --- a/configs/edminiv2_defconfig +++ b/configs/edminiv2_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ORION5X=y +CONFIG_SPL_LDSCRIPT="arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds" CONFIG_SYS_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
As there is only one machine under mach-orion5x, having a Kconfig entry for SPL_LDSCRIPT is not helpful, move this to the defconfig file. Suggested-by: Masahiro Yamada <masahiroy at kernel.org> Signed-off-by: Tom Rini <trini at konsulko.com> --- arch/arm/mach-orion5x/Kconfig | 3 --- configs/edminiv2_defconfig | 1 + 2 files changed, 1 insertion(+), 3 deletions(-)