From: Adam Ford Date: Fri, 28 Jul 2017 13:32:52 +0000 (-0500) Subject: Convert ARCH_OMAP2PLUS boards' CONFIG_SYS_TEXT_BASE to Kconfig X-Git-Tag: v2017.09-rc2~108 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e0ed13f47b6fcd91e1d536340a7f2d6780ffe48;p=platform%2Fkernel%2Fu-boot.git Convert ARCH_OMAP2PLUS boards' CONFIG_SYS_TEXT_BASE to Kconfig This converts the following to Kconfig: CONFIG_SYS_TEXT_BASE The includes, whitelist, etc. were left for now but I don't get any build errors or warnings on the omap3_logic_defconfig or am3517_evm_defconfig builds I tried. Signed-off-by: Adam Ford --- diff --git a/Kconfig b/Kconfig index c1451bc..286d1c7 100644 --- a/Kconfig +++ b/Kconfig @@ -335,12 +335,14 @@ config SYS_EXTRA_OPTIONS config SYS_TEXT_BASE depends on ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \ (M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE || MIPS || \ - ARCH_ZYNQ || ARCH_KEYSTONE + ARCH_ZYNQ || ARCH_KEYSTONE || ARCH_OMAP2PLUS depends on !EFI_APP hex "Text Base" help TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture + default 0x80800000 if ARCH_OMAP2PLUS + config SYS_CLK_FREQ depends on ARC || ARCH_SUNXI diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index 9e61728..73354f4 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x08000000 CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_AM33XX=y CONFIG_NOR=y diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig index da87453..396aadd 100644 --- a/configs/am3517_crane_defconfig +++ b/configs/am3517_crane_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80100000 # CONFIG_SPL_GPIO_SUPPORT is not set CONFIG_TARGET_AM3517_CRANE=y CONFIG_ENV_IS_IN_NAND=y diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 803dd38..1d07f1b 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80100000 # CONFIG_SPL_GPIO_SUPPORT is not set CONFIG_TARGET_AM3517_EVM=y CONFIG_SYS_EXTRA_OPTIONS="NAND" diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index 4c881d2..6996440 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_TARGET_OMAP3_CAIRO=y CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=-2 diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig index 546bf7e..d5550fe 100644 --- a/configs/cm_t3517_defconfig +++ b/configs/cm_t3517_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80008000 CONFIG_TARGET_CM_T3517=y CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index d145333..16f1eab 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80008000 CONFIG_TARGET_CM_T35=y CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index cd790fc..9afc2ce 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_TARGET_DEVKIT8000=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_CONSOLE_INFO_QUIET=y diff --git a/configs/draco_defconfig b/configs/draco_defconfig index be7aea0..fc275da 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index 05bc9ce..00261dd 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80008000 CONFIG_TARGET_ECO5PK=y CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=10 diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index 836dd98..2c7286f 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig index c680bb1..125876e 100644 --- a/configs/kc1_defconfig +++ b/configs/kc1_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_OMAP44XX=y CONFIG_TARGET_KC1=y # CONFIG_SPL_NAND_SUPPORT is not set diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig index b782718..0b65b73 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80008000 # CONFIG_SPL_GPIO_SUPPORT is not set CONFIG_TARGET_MCX=y CONFIG_VIDEO=y diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index 65e3937..2a46c19 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80008000 CONFIG_TARGET_MT_VENTOUX=y CONFIG_VIDEO=y CONFIG_ENV_IS_IN_NAND=y diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index eb47bc1..3802bc5 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80008000 CONFIG_TARGET_NOKIA_RX51=y CONFIG_VIDEO=y CONFIG_ENV_IS_NOWHERE=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index b876be5..1a134df 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_TARGET_OMAP3_BEAGLE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="NAND" diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index d29e437..620148c 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_TARGET_OMAP3_EVM=y CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig index 589fb55..f88c2e1 100644 --- a/configs/omap3_ha_defconfig +++ b/configs/omap3_ha_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80008000 CONFIG_TARGET_TAO3530=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BOARD_OMAP3_HA" CONFIG_ENV_IS_IN_NAND=y diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index 2987d3d..8a2e0ae 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80008000 CONFIG_TARGET_OMAP3_PANDORA=y CONFIG_DISTRO_DEFAULTS=y CONFIG_ENV_IS_IN_NAND=y diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 8f2dece..f999561 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index c89c043..600417d 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 87a7d74..27c14e1 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index f56274e..f365efc 100644 --- a/configs/sniper_defconfig +++ b/configs/sniper_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_TARGET_SNIPER=y # CONFIG_SPL_NAND_SUPPORT is not set CONFIG_ENV_IS_NOWHERE=y diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig index bebcd85..e6c7e60 100644 --- a/configs/tao3530_defconfig +++ b/configs/tao3530_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80008000 CONFIG_TARGET_TAO3530=y CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index be466fb..c523b04 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig index 09cb488..de42b4d 100644 --- a/configs/tricorder_defconfig +++ b/configs/tricorder_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_TARGET_TRICORDER=y CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=0 diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig index 3e770e3..c7cb0f7 100644 --- a/configs/tricorder_flash_defconfig +++ b/configs/tricorder_flash_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_TARGET_TRICORDER=y CONFIG_SYS_EXTRA_OPTIONS="FLASHCARD" CONFIG_ENV_IS_NOWHERE=y diff --git a/configs/twister_defconfig b/configs/twister_defconfig index b9e8cf9..61132ee 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SYS_TEXT_BASE=0x80008000 CONFIG_TARGET_TWISTER=y CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=10