| Message ID | 20200224180541.3654-4-trini@konsulko.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/7] misc: Add more -I$(objtree)/$(obj) lines | expand |
On Tue, Feb 25, 2020 at 3:06 AM Tom Rini <trini at konsulko.com> wrote: > > In a few places we have Kconfig entries that set SPL_LDSCRIPT to what is > the default value anyways. Drop these. > > Cc: Michal Simek <monstr at monstr.eu> > Cc: Rick Chen <rick at andestech.com> > Cc: Philippe Reynes <tremyfr at yahoo.fr> > Cc: Eric Jarrige <eric.jarrige at armadeus.org> > Signed-off-by: Tom Rini <trini at konsulko.com> > --- I see more in defconfig files. $ cd configs $ git grep SPL_LDSCRIPT axm_defconfig:CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds" brppt2_defconfig:CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds" mx31pdk_defconfig:CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds" taurus_defconfig:CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds" They are the same as the default. Can you remove them too? > arch/microblaze/Kconfig | 3 --- > arch/riscv/Kconfig | 3 --- > board/armadeus/apf27/Kconfig | 3 --- > 3 files changed, 9 deletions(-) > > diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig > index 5ce8261451d3..2bd260e5d76e 100644 > --- a/arch/microblaze/Kconfig > +++ b/arch/microblaze/Kconfig > @@ -30,7 +30,4 @@ config STACK_SIZE > > source "board/xilinx/microblaze-generic/Kconfig" > > -config SPL_LDSCRIPT > - default "arch/microblaze/cpu/u-boot-spl.lds" > - > endmenu > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index 3338b788f84a..f49618d24d26 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -229,7 +229,4 @@ config STACK_SIZE_SHIFT > int > default 14 > > -config SPL_LDSCRIPT > - default "arch/riscv/cpu/u-boot-spl.lds" > - > endmenu > diff --git a/board/armadeus/apf27/Kconfig b/board/armadeus/apf27/Kconfig > index a342d2e05ec5..65544a844834 100644 > --- a/board/armadeus/apf27/Kconfig > +++ b/board/armadeus/apf27/Kconfig > @@ -1,8 +1,5 @@ > if TARGET_APF27 > > -config SPL_LDSCRIPT > - default "arch/$(ARCH)/cpu/u-boot-spl.lds" > - > config SYS_BOARD > default "apf27" > > -- > 2.17.1 >
On Wed, Feb 26, 2020 at 11:41:02AM +0900, Masahiro Yamada wrote: > On Tue, Feb 25, 2020 at 3:06 AM Tom Rini <trini at konsulko.com> wrote: > > > > In a few places we have Kconfig entries that set SPL_LDSCRIPT to what is > > the default value anyways. Drop these. > > > > Cc: Michal Simek <monstr at monstr.eu> > > Cc: Rick Chen <rick at andestech.com> > > Cc: Philippe Reynes <tremyfr at yahoo.fr> > > Cc: Eric Jarrige <eric.jarrige at armadeus.org> > > Signed-off-by: Tom Rini <trini at konsulko.com> > > --- > > I see more in defconfig files. > > $ cd configs > $ git grep SPL_LDSCRIPT > axm_defconfig:CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds" > brppt2_defconfig:CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds" > mx31pdk_defconfig:CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds" > taurus_defconfig:CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds" Re-checking, all 4 of these cases are overriding the default, but the cases of $(ARCH) aren't helpful and should just be 'arm' so I'll do that.
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 5ce8261451d3..2bd260e5d76e 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -30,7 +30,4 @@ config STACK_SIZE source "board/xilinx/microblaze-generic/Kconfig" -config SPL_LDSCRIPT - default "arch/microblaze/cpu/u-boot-spl.lds" - endmenu diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 3338b788f84a..f49618d24d26 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -229,7 +229,4 @@ config STACK_SIZE_SHIFT int default 14 -config SPL_LDSCRIPT - default "arch/riscv/cpu/u-boot-spl.lds" - endmenu diff --git a/board/armadeus/apf27/Kconfig b/board/armadeus/apf27/Kconfig index a342d2e05ec5..65544a844834 100644 --- a/board/armadeus/apf27/Kconfig +++ b/board/armadeus/apf27/Kconfig @@ -1,8 +1,5 @@ if TARGET_APF27 -config SPL_LDSCRIPT - default "arch/$(ARCH)/cpu/u-boot-spl.lds" - config SYS_BOARD default "apf27"
In a few places we have Kconfig entries that set SPL_LDSCRIPT to what is the default value anyways. Drop these. Cc: Michal Simek <monstr at monstr.eu> Cc: Rick Chen <rick at andestech.com> Cc: Philippe Reynes <tremyfr at yahoo.fr> Cc: Eric Jarrige <eric.jarrige at armadeus.org> Signed-off-by: Tom Rini <trini at konsulko.com> --- arch/microblaze/Kconfig | 3 --- arch/riscv/Kconfig | 3 --- board/armadeus/apf27/Kconfig | 3 --- 3 files changed, 9 deletions(-)