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>
9 years ago · 99556d7deb
parent 3e4522279d
commit 99556d7deb
13 changed files with 19 additions and 7 deletions
--- a/2
+++ b/2
@ -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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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