summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2012-11-13 15:04:12 -0800
committerStefan Reinauer <stefan.reinauer@coreboot.org>2012-11-16 01:13:40 +0100
commit84833448026bfd5c5ef634d937d30017138f22b4 (patch)
tree95af8a600be4af8502dab96290ca280997a61256
parentfccf4166ddbe1a41ee4f6e327c31dc3e21144a5c (diff)
downloadcoreboot-84833448026bfd5c5ef634d937d30017138f22b4.tar.xz
Drop Kconfig.deprecated_options
Both remaining options, DRIVERS_PS2_KEYBOARD and ID_SECTION_OFFSET are not likely to go away any time soon, so let's not keep them in Kconfig.deprecated_options but move them close to the code they control. Change-Id: I310b877c5b3d5a3444056641c4aee07a48c4c4be Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/1839 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
-rw-r--r--src/Kconfig1
-rw-r--r--src/arch/x86/Kconfig4
-rw-r--r--src/drivers/Kconfig9
-rw-r--r--src/drivers/pc80/Kconfig (renamed from src/Kconfig.deprecated_options)14
4 files changed, 10 insertions, 18 deletions
diff --git a/src/Kconfig b/src/Kconfig
index 062366f50f..a8f52213d8 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -1179,5 +1179,4 @@ config POWER_BUTTON_IS_OPTIONAL
help
Internal option that controls ENABLE_POWER_BUTTON visibility.
-source src/Kconfig.deprecated_options
source src/vendorcode/Kconfig
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index ec52d0e9ca..9bfd368c2e 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -115,4 +115,8 @@ config HPET_ADDRESS
hex
default 0xfed00000 if !HPET_ADDRESS_OVERRIDE
+config ID_SECTION_OFFSET
+ hex
+ default 0x80
+
endmenu
diff --git a/src/drivers/Kconfig b/src/drivers/Kconfig
index 56a1592013..b6eec3da75 100644
--- a/src/drivers/Kconfig
+++ b/src/drivers/Kconfig
@@ -19,14 +19,15 @@
source src/drivers/ati/Kconfig
source src/drivers/dec/Kconfig
+source src/drivers/elog/Kconfig
source src/drivers/emulation/Kconfig
source src/drivers/generic/Kconfig
source src/drivers/i2c/Kconfig
+source src/drivers/ics/Kconfig
+source src/drivers/ipmi/Kconfig
source src/drivers/oxford/Kconfig
+source src/drivers/pc80/Kconfig
source src/drivers/realtek/Kconfig
source src/drivers/sil/Kconfig
-source src/drivers/trident/Kconfig
-source src/drivers/ics/Kconfig
source src/drivers/spi/Kconfig
-source src/drivers/ipmi/Kconfig
-source src/drivers/elog/Kconfig
+source src/drivers/trident/Kconfig
diff --git a/src/Kconfig.deprecated_options b/src/drivers/pc80/Kconfig
index fc61c222c2..e82045523f 100644
--- a/src/Kconfig.deprecated_options
+++ b/src/drivers/pc80/Kconfig
@@ -1,10 +1,4 @@
-# Options in this file are meant to be deprecated. Avoid their use
-# if possible, and if you find the time, or touch the general area
-# for other purposes, please consider removing their uses.
-
-menu "Deprecated"
-
-# Will be removed (alongside with the PS/2 init code) once payloads
+# Might be removed (alongside with the PS/2 init code) once payloads
# reliably support PS/2 init themselves.
config DRIVERS_PS2_KEYBOARD
bool "PS/2 keyboard init"
@@ -20,9 +14,3 @@ config DRIVERS_PS2_KEYBOARD
If you know you will only use a payload which does not require
this option, then you can say N here to speed up boot time.
Otherwise say Y.
-
-config ID_SECTION_OFFSET
- hex
- default 0x80
-
-endmenu