From c6e18144b69231192a2722dbf5a0be9d18d60fcd Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 11 Dec 2015 12:22:24 +0900 Subject: m68k: move CONFIG_SYS_TEXT_BASE to defconfig files For historical reason, CONFIG_SYS_TEXT_BASE has been specified 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 Most of M68K boards use either [1] or [2], both of which we want to deprecate. Switch them into [4], which is the newest way (Kconfig). We still allow [3] too, because it is still used by many boards and we expect much time for conversion. Signed-off-by: Masahiro Yamada Acked-by: Angelo Dureghello Reviewed-by: Simon Glass --- configs/M54418TWR_nand_mii_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configs/M54418TWR_nand_mii_defconfig') diff --git a/configs/M54418TWR_nand_mii_defconfig b/configs/M54418TWR_nand_mii_defconfig index 373845b4a0..de73e305ed 100644 --- a/configs/M54418TWR_nand_mii_defconfig +++ b/configs/M54418TWR_nand_mii_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M54418TWR=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000" +CONFIG_SYS_TEXT_BASE=0x47E00000 +CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_INPUT_CLKSRC=25000000" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_LOADB is not set -- cgit