From 5ec2c2b998086415047c05aca4ca7082de329e5a Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Tue, 25 Aug 2009 00:53:22 +0000 Subject: Various Kconfig and Makefile.inc fixes and cosmetics. - Whitespace fixes, remove trailing whitespace, use TABs for identation (except in Kconfig "help" lines, which start with one TAB and two spaces as per Linux kernel style) - Kconfig: Standardize on 'bool' (not 'boolean'). - s/lar/cbfs/ in one Kconfig help string. - Reword various Kconfig menu entries for a more usable and consistent menu. - Fix incorrect comment of NO_RUN in devices/Kconfig. - superio/serverengines/Kconfig: Incorrect config name. - superio/Makefile.inc: s/serverengine/serverengines/. - superio/intel/Kconfig: s/SUPERIO_FINTEK_I3100/SUPERIO_INTEL_I3100/. - mainboard/via/vt8454c/Kconfig: Fix copy-paste error in help string. - mainboard/via/epia-n/Kconfig: Fix "bool" menu text. - console/Kconfig: Don't mention defaults in the menu string, kconfig already displays them anyway. - Kill "Drivers" menu for now, it only confuses users as long as it's emtpy. Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4567 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/southbridge/amd/Makefile.inc | 1 - src/southbridge/intel/i82371eb/Kconfig | 2 +- src/southbridge/intel/i82371eb/Makefile.inc | 1 + src/southbridge/intel/i82801gx/Makefile.inc | 32 ++++++++++++++--------------- src/southbridge/intel/i82801xx/Makefile.inc | 24 +++++++++++----------- src/southbridge/nvidia/ck804/Makefile.inc | 3 ++- src/southbridge/nvidia/mcp55/Makefile.inc | 1 + src/southbridge/via/vt8237r/Makefile.inc | 14 ++++++------- 8 files changed, 40 insertions(+), 38 deletions(-) (limited to 'src/southbridge') diff --git a/src/southbridge/amd/Makefile.inc b/src/southbridge/amd/Makefile.inc index a172c5d..d0d196f 100644 --- a/src/southbridge/amd/Makefile.inc +++ b/src/southbridge/amd/Makefile.inc @@ -4,7 +4,6 @@ subdirs-$(CONFIG_SOUTHBRIDGE_AMD_AMD8112) += amd8132 subdirs-$(CONFIG_SOUTHBRIDGE_AMD_AMD8151) += amd8151 subdirs-$(CONFIG_SOUTHBRIDGE_AMD_RS690) += rs690 subdirs-$(CONFIG_SOUTHBRIDGE_AMD_SB600) += sb600 - subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CS5530) += cs5530 subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CS5535) += cs5535 subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CS5536) += cs5536 diff --git a/src/southbridge/intel/i82371eb/Kconfig b/src/southbridge/intel/i82371eb/Kconfig index e1c2044..03d4649 100644 --- a/src/southbridge/intel/i82371eb/Kconfig +++ b/src/southbridge/intel/i82371eb/Kconfig @@ -1,3 +1,3 @@ config SOUTHBRIDGE_INTEL_I82371EB - boolean + bool diff --git a/src/southbridge/intel/i82371eb/Makefile.inc b/src/southbridge/intel/i82371eb/Makefile.inc index 1ddd4c9..db55eae 100644 --- a/src/southbridge/intel/i82371eb/Makefile.inc +++ b/src/southbridge/intel/i82371eb/Makefile.inc @@ -17,6 +17,7 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## + driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82371EB) += i82371eb.o driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82371EB) += i82371eb_isa.o driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82371EB) += i82371eb_ide.o diff --git a/src/southbridge/intel/i82801gx/Makefile.inc b/src/southbridge/intel/i82801gx/Makefile.inc index 387ed10..1770654 100644 --- a/src/southbridge/intel/i82801gx/Makefile.inc +++ b/src/southbridge/intel/i82801gx/Makefile.inc @@ -17,24 +17,24 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_ac97.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_azalia.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_ide.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_lpc.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_nic.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_pci.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_pcie.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_sata.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_smbus.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_usb.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_usb_ehci.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_ac97.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_azalia.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_ide.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_lpc.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_nic.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_pci.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_pcie.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_sata.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_smbus.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_usb.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_usb_ehci.o -object-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_reset.o -object-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_watchdog.o +object-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_reset.o +object-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_watchdog.o # arg. How does the linux kconfig handle compound conditionals? ifeq ($(CONFIG_HAVE_SMI_HANDLER),y) - object-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_smi.o - smmobj-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_smihandler.o + object-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_smi.o + smmobj-$(CONFIG_SOUTHBRIDGE_INTEL_I82801GX) += i82801gx_smihandler.o endif diff --git a/src/southbridge/intel/i82801xx/Makefile.inc b/src/southbridge/intel/i82801xx/Makefile.inc index 337b4e8..25b76ce 100644 --- a/src/southbridge/intel/i82801xx/Makefile.inc +++ b/src/southbridge/intel/i82801xx/Makefile.inc @@ -18,19 +18,19 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_ac97.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_ide.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_lpc.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_nic.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_pci.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_sata.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_smbus.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_usb.o -driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_usb_ehci.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_ac97.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_ide.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_lpc.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_nic.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_pci.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_sata.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_smbus.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_usb.o +driver-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_usb_ehci.o -object-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_reset.o -object-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_watchdog.o +object-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_reset.o +object-$(CONFIG_SOUTHBRIDGE_INTEL_I82801XX) += i82801xx_watchdog.o # TODO: What about cmos_failover.c? diff --git a/src/southbridge/nvidia/ck804/Makefile.inc b/src/southbridge/nvidia/ck804/Makefile.inc index 13073cf..7c4ea9b 100644 --- a/src/southbridge/nvidia/ck804/Makefile.inc +++ b/src/southbridge/nvidia/ck804/Makefile.inc @@ -10,6 +10,7 @@ driver-y += ck804_nic.o driver-y += ck804_pci.o driver-y += ck804_pcie.o driver-y += ck804_ht.o + obj-y += ck804_reset.o -obj-$(CONFIG_HAVE_ACPI_TABLES) +=ck804_fadt.o +obj-$(CONFIG_HAVE_ACPI_TABLES) += ck804_fadt.o diff --git a/src/southbridge/nvidia/mcp55/Makefile.inc b/src/southbridge/nvidia/mcp55/Makefile.inc index e862ff8..c7f8396 100644 --- a/src/southbridge/nvidia/mcp55/Makefile.inc +++ b/src/southbridge/nvidia/mcp55/Makefile.inc @@ -10,6 +10,7 @@ driver-y += mcp55_sata.o driver-y += mcp55_smbus.o driver-y += mcp55_usb2.o driver-y += mcp55_usb.o + driver-$(CONFIG_HAVE_ACPI_TABLES) += mcp55_fadt.o obj-y += mcp55_reset.o diff --git a/src/southbridge/via/vt8237r/Makefile.inc b/src/southbridge/via/vt8237r/Makefile.inc index c1b743d..1eb7cba 100644 --- a/src/southbridge/via/vt8237r/Makefile.inc +++ b/src/southbridge/via/vt8237r/Makefile.inc @@ -17,11 +17,11 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += vt8237r.o -driver-y += vt8237_ctrl.o -driver-y += vt8237r_ide.o -driver-y += vt8237r_lpc.o -driver-y += vt8237r_sata.o -driver-y += vt8237r_usb.o -driver-y += vt8237r_nic.o +driver-y += vt8237r.o +driver-y += vt8237_ctrl.o +driver-y += vt8237r_ide.o +driver-y += vt8237r_lpc.o +driver-y += vt8237r_sata.o +driver-y += vt8237r_usb.o +driver-y += vt8237r_nic.o obj-$(CONFIG_HAVE_ACPI_TABLES) += vt8237_fadt.o -- cgit v1.1