On 11/12/2015 04:22, Masahiro Yamada wrote:
Currently, CONFIG_SYS_TEXT_BASE is defined in various ways:
[1] by board/${VENDOR}/${BOARD}/config.mk
[2] by CONFIG_SYS_EXTRA_OPTIONS (This was "options" field of boards.cfg before Kconfig conversion)
[3] by include/configs/${BOARD}.h
[4] by configs/${BOARD}_defconfig
Kbuild is still keeping some tricky code for [1]. We have some boards using [1] for M68K, MIPS, PowerPC.
Convert them and drop the workaround code from Kbuild.
I built all the boards and compared the checksum of the binary images for all of them. I confirmed no impact on these moves. This series should be OK.
Masahiro Yamada (8): m68k: move CONFIG_SYS_TEXT_BASE to defconfig files m68k: M54418TWR: drop board/freescale/m54418twr/config.mk microblaze: move CONFIG_SYS_TEXT_BASE to defconfig mips: vct: move CONFIG_SYS_TEXT_BASE away from config.mk mips: dbau1x00: move CONFIG_SYS_TEXT_BASE away from config.mk mips: pb1x00: move CONFIG_SYS_TEXT_BASE away from config.mk powerpc: yucca: drop redundant CONFIG_SYS_TEXT_BASE from config.mk kbuild: drop workaround for old style CONFIG_SYS_TEXT_BASE defines
Kconfig | 3 ++- Makefile | 6 ------ arch/m68k/cpu/mcf5445x/start.S | 8 ++++---- board/amcc/yucca/config.mk | 6 ------ board/cobra5272/config.mk | 9 --------- board/dbau1x00/config.mk | 16 ---------------- board/freescale/m5208evbe/config.mk | 9 --------- board/freescale/m5249evb/config.mk | 9 --------- board/freescale/m5253demo/config.mk | 9 --------- board/freescale/m5253evbe/config.mk | 9 --------- board/freescale/m5272c3/config.mk | 9 --------- board/freescale/m5275evb/config.mk | 9 --------- board/freescale/m5282evb/config.mk | 9 --------- board/freescale/m53017evb/config.mk | 9 --------- board/freescale/m5329evb/config.mk | 9 --------- board/freescale/m5373evb/config.mk | 9 --------- board/freescale/m54418twr/config.mk | 7 ------- board/freescale/m547xevb/config.mk | 9 --------- board/freescale/m548xevb/config.mk | 9 --------- board/micronas/vct/config.mk | 13 ------------- board/pb1x00/config.mk | 16 ---------------- board/sysam/amcore/config.mk | 7 ------- board/xilinx/microblaze-generic/config.mk | 2 -- configs/M5208EVBE_defconfig | 1 + configs/M52277EVB_defconfig | 3 ++- configs/M52277EVB_stmicro_defconfig | 3 ++- configs/M5235EVB_Flash32_defconfig | 3 ++- configs/M5235EVB_defconfig | 2 +- configs/M5249EVB_defconfig | 1 + configs/M5253DEMO_defconfig | 1 + configs/M5253EVBE_defconfig | 1 + configs/M5272C3_defconfig | 1 + configs/M5275EVB_defconfig | 1 + configs/M5282EVB_defconfig | 1 + configs/M53017EVB_defconfig | 1 + configs/M5329AFEE_defconfig | 1 + configs/M5329BFEE_defconfig | 1 + configs/M5373EVB_defconfig | 1 + configs/M54418TWR_defconfig | 3 ++- configs/M54418TWR_nand_mii_defconfig | 3 ++- configs/M54418TWR_nand_rmii_defconfig | 3 ++- configs/M54418TWR_nand_rmii_lowfreq_defconfig | 3 ++- configs/M54418TWR_serial_mii_defconfig | 3 ++- configs/M54418TWR_serial_rmii_defconfig | 3 ++- configs/M54451EVB_defconfig | 3 ++- configs/M54451EVB_stmicro_defconfig | 3 ++- configs/M54455EVB_a66_defconfig | 3 ++- configs/M54455EVB_defconfig | 3 ++- configs/M54455EVB_i66_defconfig | 3 ++- configs/M54455EVB_intel_defconfig | 3 ++- configs/M54455EVB_stm33_defconfig | 3 ++- configs/M5475AFE_defconfig | 1 + configs/M5475BFE_defconfig | 1 + configs/M5475CFE_defconfig | 1 + configs/M5475DFE_defconfig | 1 + configs/M5475EFE_defconfig | 1 + configs/M5475FFE_defconfig | 1 + configs/M5475GFE_defconfig | 1 + configs/M5485AFE_defconfig | 1 + configs/M5485BFE_defconfig | 1 + configs/M5485CFE_defconfig | 1 + configs/M5485DFE_defconfig | 1 + configs/M5485EFE_defconfig | 1 + configs/M5485FFE_defconfig | 1 + configs/M5485GFE_defconfig | 1 + configs/M5485HFE_defconfig | 1 + configs/amcore_defconfig | 1 + configs/cobra5272_defconfig | 1 + configs/eb_cpu5282_defconfig | 3 ++- configs/eb_cpu5282_internal_defconfig | 3 ++- configs/microblaze-generic_defconfig | 1 + include/configs/M54418TWR.h | 2 +- include/configs/dbau1x00.h | 5 +++++ include/configs/pb1x00.h | 5 +++++ include/configs/vct.h | 1 + 75 files changed, 84 insertions(+), 215 deletions(-) delete mode 100644 board/cobra5272/config.mk delete mode 100644 board/dbau1x00/config.mk delete mode 100644 board/freescale/m5208evbe/config.mk delete mode 100644 board/freescale/m5249evb/config.mk delete mode 100644 board/freescale/m5253demo/config.mk delete mode 100644 board/freescale/m5253evbe/config.mk delete mode 100644 board/freescale/m5272c3/config.mk delete mode 100644 board/freescale/m5275evb/config.mk delete mode 100644 board/freescale/m5282evb/config.mk delete mode 100644 board/freescale/m53017evb/config.mk delete mode 100644 board/freescale/m5329evb/config.mk delete mode 100644 board/freescale/m5373evb/config.mk delete mode 100644 board/freescale/m54418twr/config.mk delete mode 100644 board/freescale/m547xevb/config.mk delete mode 100644 board/freescale/m548xevb/config.mk delete mode 100644 board/micronas/vct/config.mk delete mode 100644 board/pb1x00/config.mk delete mode 100644 board/sysam/amcore/config.mk
Acked-by: Angelo Dureghello <angelo at sysam.it>