sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various Kconfig and Makefile.inc fixes and cosmetics.

Browse Source 
- 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 <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4567 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Uwe Hermann
2009-08-25 00:53:22 +00:00
parent 50d0b8ce17
commit 5ec2c2b998
82 changed files with 290 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Kconfig
View File

@ -214,9 +214,10 @@ config IOAPIC
bool
default n
menu "Drivers"
endmenu
# TODO
# menu "Drivers"
#
# endmenu
menu "Payload"
@ -248,8 +249,6 @@ config VGA_BIOS
You will be able to specify the location and file name of the
image later.
config PAYLOAD_NONE
bool "No payload"
help
@ -257,7 +256,7 @@ config PAYLOAD_NONE
ROM image for a certain mainboard, i.e. a coreboot ROM image
which does not yet contain a payload.
For such an image to be useful, you have to use the 'lar' tool
For such an image to be useful, you have to use the 'cbfs' tool
to add a payload to the ROM image later.
endchoice
@ -267,7 +266,7 @@ config FALLBACK_PAYLOAD_FILE
depends on PAYLOAD_ELF
default "payload.elf"
help
The path and filename of the ELF executable file to use as fallback payload.
The path and filename of the ELF executable file to use as payload.
config FALLBACK_VGA_BIOS_FILE
string "VGA BIOS path and filename"
@ -286,9 +285,9 @@ config FALLBACK_VGA_BIOS_ID
endmenu
config GDB_STUB
bool "Enable GDB debugging support"
bool "GDB debugging support"
default y
help
If this is set, then you will be able to set breakpoints for gdb debugging.
See: src/arch/i386/lib/c_start.S
If enabled, you will be able to set breakpoints for gdb debugging.
See src/arch/i386/lib/c_start.S for details.

8
src/arch/i386/Kconfig
View File

@ -1,5 +1,5 @@
config ARCH_X86
boolean
bool
help
This option is used to set the architecture of a mainboard.
It is usually set in mainboard/*/Kconfig.
@ -50,13 +50,11 @@ config STACK_SIZE
hex
default 0x8000
menu "Misc Options"
menu "Misc options"
config MAX_REBOOT_CNT
int "Maximum Reboot Count"
int "Maximum reboot count"
default 3
endmenu

1
src/arch/i386/boot/Makefile.inc
View File

@ -1,4 +1,3 @@
obj-y += boot.o
obj-y += coreboot_table.o
obj-$(CONFIG_MULTIBOOT) += multiboot.o

1
src/arch/i386/smp/Makefile.inc
View File

@ -2,4 +2,3 @@ obj-$(CONFIG_HAVE_MP_TABLE) += mpspec.o
# what about this: how awkward.
#object ioapic.o CONFIG_IOAPIC

2
src/arch/ppc/Kconfig
View File

@ -1,5 +1,5 @@
config ARCH_POWERPC
boolean
bool
help
This option is used to set the architecture of a mainboard.
It is usually set in mainboard/*/Kconfig.

11
src/console/Kconfig
View File

@ -1,27 +1,28 @@
menu "Console Options"
menu "Console options"
config SERIAL_CONSOLE
bool "See output on the serial port console"
default y
config TTYS0_BASE
hex "I/O base for the serial port (default 0x3f8)"
hex "I/O base for the serial port"
depends on SERIAL_CONSOLE
default 0x3f8
config SERIAL_SET_SPEED
bool "Override the serial console baud rate"
bool "Override the serial console BAUD rate"
default y
depends on SERIAL_CONSOLE
config TTYS0_BAUD
int "Serial console baud rate (default 115200)"
int "Serial console BAUD rate"
depends on SERIAL_SET_SPEED
default 115200
config USBDEBUG_DIRECT
bool "Support a USB debug dongle. Not supported on all chipsets. FIX DEPENDENCY HERE"
bool "USB debug dongle support. Not supported on all chipsets."
default n
# TODO: FIX DEPENDENCY HERE
config CONSOLE_VGA
bool

2
src/console/Makefile.inc
View File

@ -2,8 +2,10 @@ obj-y += printk.o
obj-y += console.o
obj-y += vtxprintf.o
obj-y += vsprintf.o
initobj-y += vtxprintf.o
initobj-y += vsprintf.o
driver-$(CONFIG_SERIAL_CONSOLE) += uart8250_console.o
driver-$(CONFIG_USBDEBUG_DIRECT) += usbdebug_direct_console.o
driver-$(CONFIG_CONSOLE_VGA) += vga_console.o

1
src/cpu/Makefile.inc
View File

@ -4,5 +4,4 @@ subdirs-y += via
subdirs-y += emulation
#input ppc
#input simple_init
#input via
#input x86

3
src/cpu/amd/dualcore/Makefile.inc
View File

@ -1,3 +1,2 @@
# This is a leaf makefile, no conditionals. If it is included it will
# be used.
# This is a leaf Makefile, no conditionals. If it is included it will be used.
obj-y += amd_sibling.o

1
src/cpu/amd/model_fxx/Kconfig
View File

@ -13,4 +13,3 @@ config CPU_ADDR_BITS
default 40
depends on CPU_AMD_SOCKET_F

2
src/cpu/amd/socket_AM2/Kconfig
View File

@ -12,7 +12,7 @@ config K8_REV_F_SUPPORT
default 1
depends on CPU_AMD_SOCKET_AM2
#Opteron K8 1G HT Support
# Opteron K8 1G HT support
config K8_HT_FREQ_1G_SUPPORT
hex
default 1

2
src/cpu/amd/socket_F/Kconfig
View File

@ -12,7 +12,7 @@ config K8_REV_F_SUPPORT
default 1
depends on CPU_AMD_SOCKET_F
#Opteron K8 1G HT Support
# Opteron K8 1G HT support
config K8_HT_FREQ_1G_SUPPORT
hex
default 1

7
src/cpu/intel/Makefile.inc
View File

@ -1,6 +1,7 @@
# Note: from here on down, we are socket-centric. Socket choice determines what other cpu files are included.
# Therefore:
# ONLY include Makefile.inc from socket directories!
# Note: From here on down, we are socket-centric. Socket choice determines
# what other cpu files are included.
#
# Therefore: ONLY include Makefile.inc from socket directories!
subdirs-$(CONFIG_CPU_INTEL_SOCKET_MFCPGA478) += socket_mFCPGA478
subdirs-$(CONFIG_CPU_INTEL_SOCKET_PGA370) += socket_PGA370

1
src/cpu/intel/socket_PGA370/Makefile.inc
View File

@ -30,4 +30,3 @@ subdirs-y += ../../x86/cache
subdirs-y += ../../x86/smm
subdirs-y += ../microcode

8
src/devices/Kconfig
View File

@ -27,7 +27,7 @@ config VGA_ROM_RUN
enable PCI/AGP VGA plugin cards.
choice
prompt "Execute PCI Option ROMs"
prompt "Execute PCI option ROMs"
default PCI_OPTION_ROM_RUN_REALMODE
help
Execute PCI/AGP option ROMs if available. You can choose to
@ -43,11 +43,11 @@ choice
enable PCI/AGP VGA plugin cards.
config NO_RUN
prompt "DO NOT Run VGA ROMs"
prompt "Do NOT run VGA ROMs"
bool
help
Execute PCI/AGP option ROMs if available. This is required to
enable PCI/AGP VGA plugin cards.
Do not execute PCI/AGP option ROMs.
endchoice
endmenu

5
src/mainboard/Kconfig
View File

@ -1,4 +1,3 @@
menu "Mainboard"
choice
@ -229,12 +228,12 @@ endchoice
config MAINBOARD_VENDOR
string
default "EMULATION"
default "Emulation"
depends on VENDOR_EMULATION
config MAINBOARD_VENDOR
string
default "KONTRON"
default "Kontron"
depends on VENDOR_KONTRON
config MAINBOARD_VENDOR

4
src/mainboard/amd/serengeti_cheetah/Kconfig
View File

@ -3,7 +3,7 @@ choice
depends on VENDOR_AMD
config BOARD_AMD_SERENGETI_CHEETAH
bool "SERENGETI_CHEETAH"
bool "Serengeti Cheetah"
select ARCH_X86
select CPU_AMD_K8
select CPU_AMD_SOCKET_F
@ -15,7 +15,7 @@ config BOARD_AMD_SERENGETI_CHEETAH
select PIRQ_TABLE
select USE_PRINTK_IN_CAR
help
AMD Serengeti Series mainboards
AMD Serengeti Cheetah mainboard.
endchoice
config MAINBOARD_DIR

6
src/mainboard/amd/serengeti_cheetah/Makefile.inc
View File

@ -19,13 +19,9 @@
## MA 02110-1301 USA
##
##
## This mainboard requires DCACHE_AS_RAM enabled. It won't work without.
##
driver-y += mainboard.o
#needed by irq_tables and mptable and acpi_tables
# Needed by irq_tables and mptable and acpi_tables.
obj-y += get_bus_conf.o
obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o

4
src/mainboard/kontron/Kconfig
View File

@ -14,7 +14,8 @@ config BOARD_KONTRON_986LCD_M
select MMCONF_SUPPORT
select USE_PRINTK_IN_CAR
help
Kontron 986LCD-M Series mainboards
Kontron 986LCD-M/mITX mainboard.
endchoice
config MAINBOARD_DIR
@ -46,3 +47,4 @@ config MAINBOARD_PART_NUMBER
string
default "986LCD-M"
depends on BOARD_KONTRON_986LCD_M

1
src/mainboard/msi/Kconfig
View File

@ -32,6 +32,7 @@ config BOARD_MSI_MS6178
select PIRQ_TABLE
help
MSI MS-6178 mainboard.
endchoice
config MAINBOARD_DIR

1
src/mainboard/via/Kconfig
View File

@ -7,4 +7,3 @@ choice
endchoice

4
src/mainboard/via/epia-n/Kconfig
View File

@ -1,5 +1,5 @@
config BOARD_VIA_EPIA_N
bool "via epia-n"
bool "EPIA-N"
select ARCH_X86
select CPU_VIA_C3
select NORTHBRIDGE_VIA_CN400
@ -8,7 +8,7 @@ config BOARD_VIA_EPIA_N
select PIRQ_TABLE
select USE_PRINTK_IN_CAR
help
VIA Epia-n mainboards
VIA EPIA-N mainboard.
config MAINBOARD_DIR
string

2
src/mainboard/via/epia-n/Makefile.inc
View File

@ -22,7 +22,7 @@
initobj-y += crt0.o
obj-y += mainboard.o
obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_HAVE_MP_TABLE) += object mptable.o
obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o

4
src/mainboard/via/vt8454c/Kconfig
View File

@ -1,5 +1,5 @@
config BOARD_VIA_VT8454C
bool "vt8454c"
bool "VT8454c"
select ARCH_X86
select CPU_VIA_C7
select NORTHBRIDGE_VIA_CX700
@ -9,7 +9,7 @@ config BOARD_VIA_VT8454C
# select MMCONF_SUPPORT
select USE_PRINTK_IN_CAR
help
Kontron 986LCD-M Series mainboards
VIA VT8454C mainboard.
config MAINBOARD_DIR
string

10
src/mainboard/via/vt8454c/Makefile.inc
View File

@ -5,8 +5,7 @@
##
## 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; version 2 of
## the License.
## published by the Free Software Foundation; version 2 of the License.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -15,12 +14,7 @@
##
## 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
##
##
## This mainboard requires DCACHE_AS_RAM enabled. It won't work without.
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
driver-y += mainboard.o

1
src/northbridge/amd/amdk8/Kconfig
View File

@ -29,5 +29,4 @@ config HAVE_HIGH_TABLES
bool
default y
source src/northbridge/amd/amdk8/root_complex/Kconfig

4
src/northbridge/amd/amdk8/Makefile.inc
View File

@ -8,7 +8,8 @@ driver-y += misc_control.o
obj-y += get_sblk_pci1234.o
obj-$(CONFIG_HAVE_ACPI_TABLES) += amdk8_acpi.o
# Not sure what to do with these yet. How did raminit_test even work? Should be a target in -y form
# Not sure what to do with these yet. How did raminit_test even work?
# Should be a target in -y form.
#if CONFIG_K8_REV_F_SUPPORT
#
#makerule raminit_test
@ -27,4 +28,3 @@ obj-$(CONFIG_HAVE_ACPI_TABLES) += amdk8_acpi.o
#
#end
#
#

2
src/northbridge/via/cx700/Makefile.inc
View File

@ -1,3 +1,4 @@
##
## This file is part of the coreboot project.
##
## Copyright (C) 2007-2009 coresystems GmbH
@ -14,6 +15,7 @@
## 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
##
obj-y += cx700_reset.o
obj-y += northbridge.o

1
src/southbridge/amd/Makefile.inc
View File

@ -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

2
src/southbridge/intel/i82371eb/Kconfig
View File

@ -1,3 +1,3 @@
config SOUTHBRIDGE_INTEL_I82371EB
boolean
bool

1
src/southbridge/intel/i82371eb/Makefile.inc
View File

@ -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

1
src/southbridge/nvidia/ck804/Makefile.inc
View File

@ -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

1
src/southbridge/nvidia/mcp55/Makefile.inc
View File

@ -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

3
src/superio/Makefile.inc
View File

@ -1,9 +1,8 @@
subdirs-y += fintek
subdirs-y += intel
subdirs-y += ite
subdirs-y += nsc
#subdirs-y += serverengine
# subdirs-y += serverengines
subdirs-y += smsc
subdirs-y += via
subdirs-y += winbond

2
src/superio/intel/Kconfig
View File

@ -1,2 +1,2 @@
config SUPERIO_FINTEK_I3100
config SUPERIO_INTEL_I3100
bool

2
src/superio/serverengines/Kconfig
View File

@ -1,2 +1,2 @@
config SERVERENGINES_ITE_PILOT
config SUPERIO_SERVERENGINES_PILOT
bool

18
src/superio/winbond/Kconfig
View File

@ -1,18 +1,18 @@
config SUPERIO_WINBOND_W83627DHG
boolean
bool
config SUPERIO_WINBOND_W83627EHG
boolean
bool
config SUPERIO_WINBOND_W83627HF
boolean
bool
config SUPERIO_WINBOND_W83627THF
boolean
bool
config SUPERIO_WINBOND_W83627THG
boolean
bool
config SUPERIO_WINBOND_W83627UHG
boolean
bool
config SUPERIO_WINBOND_W83697HF
boolean
bool
config SUPERIO_WINBOND_W83977F
boolean
bool
config SUPERIO_WINBOND_W83977TF
boolean
bool

4
util/cbfstool/Makefile.inc
View File

@ -1,6 +1,3 @@
#
#
#
ifdef POST_EVALUATION
@ -36,4 +33,3 @@ endif
include $(top)/util/cbfstool/tools/Makefile.inc