From 99222b9498d791d912aa047d9cb774ce6a0d4405 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Fri, 29 Jun 2007 13:28:33 +0000 Subject: [PATCH] Various Kconfig file fixes (trivial). Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@411 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- arch/x86/Kconfig | 1 - device/Kconfig | 13 ++++++------- lib/Kconfig | 6 +++--- mainboard/Kconfig | 10 ++++------ mainboard/adl/Kconfig | 5 +++-- mainboard/adl/msm800sev/Kconfig | 13 ++++++------- mainboard/amd/Kconfig | 3 ++- mainboard/amd/norwich/Kconfig | 5 ++--- mainboard/artecgroup/Kconfig | 5 +++-- mainboard/artecgroup/dbe61/Kconfig | 5 ++--- northbridge/intel/i440bxemulation/Kconfig | 12 ++++++------ 11 files changed, 37 insertions(+), 41 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index da3814f53c..e791ee91aa 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -55,4 +55,3 @@ config OPTION_TABLE a battery backed up real time clock with CMOS NVRAM. It is usually set in mainboard/*/Kconfig. - diff --git a/device/Kconfig b/device/Kconfig index c8da7a5b70..79a0b9f3dc 100644 --- a/device/Kconfig +++ b/device/Kconfig @@ -33,7 +33,7 @@ choice default PCI_OPTION_ROM_RUN_VM86 help Execute PCI/AGP option ROMs if available. You can choose to - execute PCI option ROMs natively (32bit x86 system required), + execute PCI option ROMs natively (32bit x86 system required), in an emulator (x86emu), or ignore option ROM execution. @@ -41,9 +41,9 @@ config PCI_OPTION_ROM_RUN_X86EMU bool "x86emu" select PCI_OPTION_ROM_RUN help - If you choose this option, the x86 instruction set emulator + If you choose this option, the x86 instruction set emulator x86emu is used to execute 16bit legacy BIOS option ROMs. - + x86emu is slow, big and safe. All 16bit x86 code is executed in an encapsulated environment where it can not break out. @@ -56,7 +56,7 @@ config PCI_OPTION_ROM_RUN_VM86 If you choose this option, the virtual x86 mode "vm86" is used to execute 16bit legacy BIOS option ROMs. - vm86 is very small, fast, and probably a little less safe than + vm86 is very small, fast, and probably a little less safe than x86emu, since it runs option ROMs on the real hardware instead of an emulator. @@ -65,12 +65,11 @@ config PCI_OPTION_ROM_RUN_NONE help Do not execute PCI option ROMs at all. - If you choose this option, VGA plugin cards will not be - initialized. + If you choose this option, VGA plugin cards will not be initialized. endchoice -# This should probably become a CMOS option +# TODO: This should probably become a CMOS option. config MULTIPLE_VGA_INIT bool "Initialize all VGA cards" depends PCI_OPTION_ROM_RUN diff --git a/lib/Kconfig b/lib/Kconfig index 36fbb901ce..798f57e144 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -3,7 +3,7 @@ ## ## Copyright (C) 2007 coresystems GmbH ## (Written by Stefan Reinauer for coresystems GmbH) -## Copyright (C) 2007 Uwe Hermann +## Copyright (C) 2007 Uwe Hermann ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -208,7 +208,7 @@ config CONSOLE_USB * 8086:268c Intel 631xESB/632xESB/3100 * 8086:27cc Intel ICH7 * 8086:2836 Intel ICH8 - * 8086:283a Intel ICH8 + * 8086:283a Intel ICH8 See http://linuxbios.org/EHCI_Debug_Port for an up-to-date list. @@ -220,7 +220,7 @@ config CONSOLE_PREFIX depends EXPERT && (CONSOLE_SERIAL || CONSOLE_USB) default n help - When you enable this option, LinuxBIOS will prefix each line of + When you enable this option, LinuxBIOS will prefix each line of console output with '(LB)'. endmenu diff --git a/mainboard/Kconfig b/mainboard/Kconfig index 58b725ac7d..b2c4429ec3 100644 --- a/mainboard/Kconfig +++ b/mainboard/Kconfig @@ -29,20 +29,18 @@ choice config VENDOR_ADL bool "Advanced Digital Logic" help - Select this option for various systems from - Advanced Digital Logic + Select this option for various systems from Advanced Digital Logic. config VENDOR_AMD bool "AMD" help Select this option for various systems from - Advanced Micro Devices, Inc + Advanced Micro Devices, Inc. config VENDOR_ARTECGROUP bool "Artec Group" help - Select this option for various systems from - the Artec Group + Select this option for various systems from the Artec Group. config VENDOR_EMULATION bool "Emulated systems" @@ -51,10 +49,10 @@ config VENDOR_EMULATION endchoice -source "mainboard/emulation/Kconfig" source "mainboard/adl/Kconfig" source "mainboard/amd/Kconfig" source "mainboard/artecgroup/Kconfig" +source "mainboard/emulation/Kconfig" choice prompt "ROM chip size" diff --git a/mainboard/adl/Kconfig b/mainboard/adl/Kconfig index c34187079a..19ebcf6c46 100644 --- a/mainboard/adl/Kconfig +++ b/mainboard/adl/Kconfig @@ -24,7 +24,7 @@ choice depends on VENDOR_ADL config BOARD_ADL_MSM800SEV - bool "msm800sev" + bool "MSM800SEV" select ARCH_X86 select CPU_AMD_GEODELX select OPTION_TABLE @@ -32,7 +32,8 @@ config BOARD_ADL_MSM800SEV select SOUTHBRIDGE_AMD_CS5536 select SUPERIO_WINBOND_W83627HF help - ADL MSM800SEV board + Advanced Digital Logic MSM800SEV mainboard. + endchoice source "mainboard/adl/msm800sev/Kconfig" diff --git a/mainboard/adl/msm800sev/Kconfig b/mainboard/adl/msm800sev/Kconfig index 330298d0c2..7695ac3e38 100644 --- a/mainboard/adl/msm800sev/Kconfig +++ b/mainboard/adl/msm800sev/Kconfig @@ -24,22 +24,21 @@ config MAINBOARD_NAME default adl/msm800sev depends BOARD_ADL_MSM800SEV help - This is the name for the ADL MSM800SEV + This is the name for the Advanced Digital Logic MSM800SEV mainboard. config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex + # TODO: Fix the PCI ID. default 0x1022 depends BOARD_ADL_MSM800SEV help - Mainboard specific PCI subsystem vendor ID -- it's wrong. + Mainboard specific PCI subsystem vendor ID. config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex + # TODO: Fix the PCI ID. default 0x2323 - depends ADL_MSM800SEV + depends BOARD_ADL_MSM800SEV help - Mainboard specific PCI subsystem vendor ID -- it's wrong. - - - + Mainboard specific PCI subsystem vendor ID. diff --git a/mainboard/amd/Kconfig b/mainboard/amd/Kconfig index a151cdd6b0..53d9a285a4 100644 --- a/mainboard/amd/Kconfig +++ b/mainboard/amd/Kconfig @@ -31,7 +31,8 @@ config BOARD_AMD_NORWICH select NORTHBRIDGE_AMD_GEODELX select SOUTHBRIDGE_AMD_CS5536 help - AMD Norwich Geode LX Development board + AMD Norwich Geode LX development board. + endchoice source "mainboard/amd/norwich/Kconfig" diff --git a/mainboard/amd/norwich/Kconfig b/mainboard/amd/norwich/Kconfig index 9d3f2f7a5b..1920a50074 100644 --- a/mainboard/amd/norwich/Kconfig +++ b/mainboard/amd/norwich/Kconfig @@ -28,6 +28,7 @@ config MAINBOARD_NAME config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex + # TODO: Fix PCI ID. default 0x1022 depends BOARD_AMD_NORWICH help @@ -35,11 +36,9 @@ config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex + # TODO: Fix PCI ID. default 0x2323 depends BOARD_AMD_NORWICH help Mainboard specific PCI subsystem device ID. - - - diff --git a/mainboard/artecgroup/Kconfig b/mainboard/artecgroup/Kconfig index fb81b40b11..d8f0e380f7 100644 --- a/mainboard/artecgroup/Kconfig +++ b/mainboard/artecgroup/Kconfig @@ -24,14 +24,15 @@ choice depends on VENDOR_ARTECGROUP config BOARD_ARTECGROUP_DBE61 - bool "dbe61" + bool "DBE61" select ARCH_X86 select CPU_AMD_GEODELX select OPTION_TABLE select NORTHBRIDGE_AMD_GEODELX select SOUTHBRIDGE_AMD_CS5536 help - Artec Group DBE61, also known as Linutop + Artec Group DBE61, also known as ThinCan and Linutop. + endchoice source "mainboard/artecgroup/dbe61/Kconfig" diff --git a/mainboard/artecgroup/dbe61/Kconfig b/mainboard/artecgroup/dbe61/Kconfig index 431ef7b810..54f89a34d0 100644 --- a/mainboard/artecgroup/dbe61/Kconfig +++ b/mainboard/artecgroup/dbe61/Kconfig @@ -28,6 +28,7 @@ config MAINBOARD_NAME config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex + # TODO: Fix PCI ID. default 0x1022 depends BOARD_ARTECGROUP_DBE61 help @@ -35,11 +36,9 @@ config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex + # TODO: Fix PCI ID. default 0x2323 depends BOARD_ARTECGROUP_DBE61 help Mainboard specific PCI subsystem device ID. - - - diff --git a/northbridge/intel/i440bxemulation/Kconfig b/northbridge/intel/i440bxemulation/Kconfig index 22b993e799..18f7a011e3 100644 --- a/northbridge/intel/i440bxemulation/Kconfig +++ b/northbridge/intel/i440bxemulation/Kconfig @@ -1,23 +1,23 @@ -## +## ## This file is part of the LinuxBIOS project. -## +## ## Copyright (C) 2007 Ronald G. Minnich ## Copyright (C) 2007 Uwe Hermann -## +## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. -## +## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -## +## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## +## config NORTHBRIDGE_INTEL_I440BXEMULATION_RAMSIZE int