From 84833448026bfd5c5ef634d937d30017138f22b4 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 13 Nov 2012 15:04:12 -0800 Subject: 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 Reviewed-on: http://review.coreboot.org/1839 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/Kconfig | 1 - src/Kconfig.deprecated_options | 28 ---------------------------- src/arch/x86/Kconfig | 4 ++++ src/drivers/Kconfig | 9 +++++---- src/drivers/pc80/Kconfig | 16 ++++++++++++++++ 5 files changed, 25 insertions(+), 33 deletions(-) delete mode 100644 src/Kconfig.deprecated_options create mode 100644 src/drivers/pc80/Kconfig 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/Kconfig.deprecated_options b/src/Kconfig.deprecated_options deleted file mode 100644 index fc61c222c2..0000000000 --- a/src/Kconfig.deprecated_options +++ /dev/null @@ -1,28 +0,0 @@ -# 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 -# reliably support PS/2 init themselves. -config DRIVERS_PS2_KEYBOARD - bool "PS/2 keyboard init" - default y - help - Enable this option to initialize PS/2 keyboards found connected - to the PS/2 port. - - Some payloads (eg, filo) require this option. Other payloads - (eg, SeaBIOS, Linux) do not require it. - Initializing a PS/2 keyboard can take several hundred milliseconds. - - 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 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/drivers/pc80/Kconfig b/src/drivers/pc80/Kconfig new file mode 100644 index 0000000000..e82045523f --- /dev/null +++ b/src/drivers/pc80/Kconfig @@ -0,0 +1,16 @@ +# 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" + default y + help + Enable this option to initialize PS/2 keyboards found connected + to the PS/2 port. + + Some payloads (eg, filo) require this option. Other payloads + (eg, SeaBIOS, Linux) do not require it. + Initializing a PS/2 keyboard can take several hundred milliseconds. + + 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. -- cgit v1.2.3