x86: Kconfig: Remove deprecated CONFIG_SYS_EXTRA_OPTIONS

Currently all x86 boards still use CONFIG_SYS_EXTRA_OPTIONS to define
the text base address. Since it is deprecated, just remove it and use
CONFIG_SYS_TEXT_BASE directly.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/Kconfig b/Kconfig
index 41d4784f890c2477a00fb453d91255311a1b963e..85faff78c8dd3df1da2860906ca0d663d5aa521a 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -178,7 +178,7 @@ config SYS_EXTRA_OPTIONS
          new boards should not use this option.
 
 config SYS_TEXT_BASE
-       depends on SPARC || ARC
+       depends on SPARC || ARC || X86
        hex "Text Base"
        help
          TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture

diff --git a/board/coreboot/coreboot/Kconfig b/board/coreboot/coreboot/Kconfig
index 981de1f0711aeda25ab1669181e7ac2ad38762d9..6a04158f16ac1ff93ecdfab42bde4c3492e5ca98 100644 (file)
--- a/board/coreboot/coreboot/Kconfig
+++ b/board/coreboot/coreboot/Kconfig
@@ -9,6 +9,9 @@ config SYS_VENDOR
 config SYS_SOC
        default "coreboot"
 
+config SYS_TEXT_BASE
+       default 0x01110000
+
 comment "coreboot-specific options"
 
 config SYS_CONFIG_NAME

diff --git a/board/google/chromebook_link/Kconfig b/board/google/chromebook_link/Kconfig
index ea454721c52f44cd771b5c5b32b4e8c9cd91fac8..9c8d0205a13549e0ae08e7d58ef138d4f043f164 100644 (file)
--- a/board/google/chromebook_link/Kconfig
+++ b/board/google/chromebook_link/Kconfig
@@ -12,6 +12,9 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "chromebook_link"
 
+config SYS_TEXT_BASE
+       default 0xfff00000
+
 config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
        select X86_RESET_VECTOR

diff --git a/board/google/chromebox_panther/Kconfig b/board/google/chromebox_panther/Kconfig
index 11df55a13cdf7c74b31cd45b3d53ff0676085156..e3604ebe311e50867c55d37f6b57bfcae7837755 100644 (file)
--- a/board/google/chromebox_panther/Kconfig
+++ b/board/google/chromebox_panther/Kconfig
@@ -12,6 +12,9 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "chromebox_panther"
 
+config SYS_TEXT_BASE
+       default 0xfff00000
+
 # Panther actually uses haswell, not ivybridge, so this is just a placeholder
 config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y

diff --git a/board/intel/crownbay/Kconfig b/board/intel/crownbay/Kconfig
index 762663a001aaae75a3975e9b36ef81233f5c5482..b30701afc8048eb5a808ab48e74376a126b449f0 100644 (file)
--- a/board/intel/crownbay/Kconfig
+++ b/board/intel/crownbay/Kconfig
@@ -12,6 +12,9 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "crownbay"
 
+config SYS_TEXT_BASE
+       default 0xfff00000
+
 config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
        select X86_RESET_VECTOR

diff --git a/board/intel/galileo/Kconfig b/board/intel/galileo/Kconfig
index 85afbbc8c5a5c01cb71ab0dd9dcf483435d806f5..6515bacd760e2b1188c03b8045009c1258af7d9e 100644 (file)
--- a/board/intel/galileo/Kconfig
+++ b/board/intel/galileo/Kconfig
@@ -12,6 +12,9 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "galileo"
 
+config SYS_TEXT_BASE
+       default 0xfff10000
+
 config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
        select X86_RESET_VECTOR

diff --git a/board/intel/minnowmax/Kconfig b/board/intel/minnowmax/Kconfig
index 43c50a519bdd76dde36ae51e3fabc41f60c67fdd..f2a0b71c442c8d482fe24fc9f144fb8af23edae5 100644 (file)
--- a/board/intel/minnowmax/Kconfig
+++ b/board/intel/minnowmax/Kconfig
@@ -12,6 +12,9 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "minnowmax"
 
+config SYS_TEXT_BASE
+       default 0xfff00000
+
 config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
        select X86_RESET_VECTOR

diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 9cfc65b5b7d87014ad3797935addbc3a35f6bbf4..81222d23fee5b6b05534960fa3b2ebd7ab859878 100644 (file)
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -1,4 +1,3 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xfff00000"
 CONFIG_X86=y
 CONFIG_VENDOR_GOOGLE=y
 CONFIG_TARGET_CHROMEBOOK_LINK=y

diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index c4db232d2d908cc8b178df0d0bef1318cb729558..91189c9c105c73b9b8f5648e41c00f50d092a62f 100644 (file)
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -1,4 +1,3 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xfff00000"
 CONFIG_X86=y
 CONFIG_VENDOR_GOOGLE=y
 CONFIG_TARGET_CHROMEBOX_PANTHER=y

diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index eb192ae42c4051e2533fe708d09b6186ccc1655a..799853f33cd0eca4d1801d6c54d18558d935d36b 100644 (file)
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -1,4 +1,3 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x01110000"
 CONFIG_X86=y
 CONFIG_VENDOR_COREBOOT=y
 CONFIG_TARGET_COREBOOT=y

diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index de84650609942b12037ccc37cbda331e8931e58b..61d1fcc6e58b825d889cedea51f6427acc665642 100644 (file)
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -1,4 +1,3 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xfff00000"
 CONFIG_X86=y
 CONFIG_VENDOR_INTEL=y
 CONFIG_TARGET_CROWNBAY=y

diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index 787e15f568084a05926e55f8ec28c2f0386a283a..1a54ba59526ad1ce2c725b889f169526b32dfa80 100644 (file)
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -1,4 +1,3 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xfff10000"
 CONFIG_X86=y
 CONFIG_VENDOR_INTEL=y
 CONFIG_TARGET_GALILEO=y

diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index c4dbfcacc591967a76bfcfe41538aaef8d6986f0..c59f4ace1efed60cf8853b412f98418a0afffb76 100644 (file)
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -1,4 +1,3 @@
-CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xfff00000"
 CONFIG_X86=y
 CONFIG_VENDOR_INTEL=y
 CONFIG_TARGET_MINNOWMAX=y