[U-Boot] [PATCH v2] Convert ARCH_OMAP2PLUS boards' CONFIG_SYS_TEXT_BASE to Kconfig
Adam Ford
aford173 at gmail.com
Mon Aug 7 21:58:05 UTC 2017
On Aug 7, 2017 4:48 PM, "Peter Robinson" <pbrobinson at gmail.com> wrote:
On Fri, Jul 28, 2017 at 2:32 PM, Adam Ford <aford173 at gmail.com> wrote:
> 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.
Was it intended to leave omap4 and most of the am33xx devices out of
this conversion?
All omap 2 plus devices are included. By default they do not need to appear
in the defconfig because the Kconfig will set the default value. The only
defconfig files that will appear are exceptions to the default.
Peter
> Signed-off-by: Adam Ford <aford173 at gmail.com>
> ---
> Changes since V1
> - Move default 0x80800000 if ARCH_OMAP2PLUS under config SYS_TEXT_BASE
> - Revert default 0x80800000 under ARCH_OMAP2PLUS
>
> Kconfig | 4 +++-
> configs/am335x_evm_norboot_defconfig | 1 +
> configs/am3517_crane_defconfig | 1 +
> configs/am3517_evm_defconfig | 1 +
> configs/cairo_defconfig | 1 +
> configs/cm_t3517_defconfig | 1 +
> configs/cm_t35_defconfig | 1 +
> configs/devkit8000_defconfig | 1 +
> configs/draco_defconfig | 1 +
> configs/eco5pk_defconfig | 1 +
> configs/etamin_defconfig | 1 +
> configs/kc1_defconfig | 1 +
> configs/mcx_defconfig | 1 +
> configs/mt_ventoux_defconfig | 1 +
> configs/nokia_rx51_defconfig | 1 +
> configs/omap3_beagle_defconfig | 1 +
> configs/omap3_evm_defconfig | 1 +
> configs/omap3_ha_defconfig | 1 +
> configs/omap3_pandora_defconfig | 1 +
> configs/pxm2_defconfig | 1 +
> configs/rastaban_defconfig | 1 +
> configs/rut_defconfig | 1 +
> configs/sniper_defconfig | 1 +
> configs/tao3530_defconfig | 1 +
> configs/thuban_defconfig | 1 +
> configs/tricorder_defconfig | 1 +
> configs/tricorder_flash_defconfig | 1 +
> configs/twister_defconfig | 1 +
> 28 files changed, 30 insertions(+), 1 deletion(-)
>
> diff --git a/Kconfig b/Kconfig
> index bb80ada..e7b8052 100644
> --- a/Kconfig
> +++ b/Kconfig
> @@ -325,12 +325,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 f121e2f..7f1fbab 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 2102956..f16decc 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 eddeb5e..863e8e7 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 5d26532..6118495 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 d37b693..1b5282a 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 ba76463..05190bd 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 f5e5317..c9bf519 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 763e96b..fc87a5a 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 0bcc75b..d794c57 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 ab3ef75..577c07e 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 5a9d7cc..b9761d7 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 ef7d153..bc3e3cf 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 72a4ef1..be02f43 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 d7bbf2d..4029391 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 c51309c..f78b864 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 466564b..d81b633 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 ac2d4bb..6e45088 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 cc40f91..ea54a7e 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 9220458..d7c54b3 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 a572db2..85e2ce8 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 e4e99be..22d009a 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 dc3a572..80da61a 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 6e45252..0b368f0 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 7d80a41..76039a3 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
> --
> 2.7.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
More information about the U-Boot
mailing list