| Message ID | 20200224180541.3654-2-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | 23830e98f5ad74343fc6c6182cd8d99507ab4e36 |
| Headers | show |
| Series | [1/7] misc: Add more -I$(objtree)/$(obj) lines | expand |
On Mon, 24 Feb 2020 at 19:05, Tom Rini <trini at konsulko.com> wrote: > As there is only one mx31pdk config file and with upcoming updates to > the Kconfig parsing logic, rather than have an entry in > board/freescale/mx31pdk/Kconfig, move this single setting to the > defconfig file. > > Cc: Magnus Lilja <lilja.magnus at gmail.com> > Signed-off-by: Tom Rini <trini at konsulko.com> > --- > Reviewed-by: Magnus Lilja <lilja.magnus at gmail.com> /Magnus > board/freescale/mx31pdk/Kconfig | 3 --- > configs/mx31pdk_defconfig | 1 + > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/board/freescale/mx31pdk/Kconfig > b/board/freescale/mx31pdk/Kconfig > index b9fc2d517786..055545c93063 100644 > --- a/board/freescale/mx31pdk/Kconfig > +++ b/board/freescale/mx31pdk/Kconfig > @@ -1,8 +1,5 @@ > if TARGET_MX31PDK > > -config SPL_LDSCRIPT > - default "arch/$(ARCH)/cpu/u-boot-spl.lds" > - > config SYS_BOARD > default "mx31pdk" > > diff --git a/configs/mx31pdk_defconfig b/configs/mx31pdk_defconfig > index 9ab4a09ea9cb..163f756b4afc 100644 > --- a/configs/mx31pdk_defconfig > +++ b/configs/mx31pdk_defconfig > @@ -2,6 +2,7 @@ CONFIG_ARM=y > # CONFIG_SPL_USE_ARCH_MEMCPY is not set > # CONFIG_SPL_USE_ARCH_MEMSET is not set > CONFIG_ARCH_MX31=y > +CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds" > CONFIG_SYS_TEXT_BASE=0x87e00000 > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_TARGET_MX31PDK=y > -- > 2.17.1 > >
On Mon, Feb 24, 2020 at 01:05:36PM -0500, Tom Rini wrote: > As there is only one mx31pdk config file and with upcoming updates to > the Kconfig parsing logic, rather than have an entry in > board/freescale/mx31pdk/Kconfig, move this single setting to the > defconfig file. > > Cc: Magnus Lilja <lilja.magnus at gmail.com> > Signed-off-by: Tom Rini <trini at konsulko.com> > Reviewed-by: Magnus Lilja <lilja.magnus at gmail.com> Applied to u-boot/next, thanks!
diff --git a/board/freescale/mx31pdk/Kconfig b/board/freescale/mx31pdk/Kconfig index b9fc2d517786..055545c93063 100644 --- a/board/freescale/mx31pdk/Kconfig +++ b/board/freescale/mx31pdk/Kconfig @@ -1,8 +1,5 @@ if TARGET_MX31PDK -config SPL_LDSCRIPT - default "arch/$(ARCH)/cpu/u-boot-spl.lds" - config SYS_BOARD default "mx31pdk" diff --git a/configs/mx31pdk_defconfig b/configs/mx31pdk_defconfig index 9ab4a09ea9cb..163f756b4afc 100644 --- a/configs/mx31pdk_defconfig +++ b/configs/mx31pdk_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_MX31=y +CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds" CONFIG_SYS_TEXT_BASE=0x87e00000 CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_MX31PDK=y
As there is only one mx31pdk config file and with upcoming updates to the Kconfig parsing logic, rather than have an entry in board/freescale/mx31pdk/Kconfig, move this single setting to the defconfig file. Cc: Magnus Lilja <lilja.magnus at gmail.com> Signed-off-by: Tom Rini <trini at konsulko.com> --- board/freescale/mx31pdk/Kconfig | 3 --- configs/mx31pdk_defconfig | 1 + 2 files changed, 1 insertion(+), 3 deletions(-)