diff options
Diffstat (limited to 'src/mainboard')
-rw-r--r-- | src/mainboard/Kconfig | 27 | ||||
-rw-r--r-- | src/mainboard/amd/serengeti_cheetah/Kconfig | 12 | ||||
-rw-r--r-- | src/mainboard/amd/serengeti_cheetah/Makefile.inc | 30 | ||||
-rw-r--r-- | src/mainboard/kontron/986lcd-m/Makefile.inc | 16 | ||||
-rw-r--r-- | src/mainboard/kontron/Kconfig | 28 | ||||
-rw-r--r-- | src/mainboard/msi/Kconfig | 1 | ||||
-rw-r--r-- | src/mainboard/via/Kconfig | 9 | ||||
-rw-r--r-- | src/mainboard/via/epia-n/Kconfig | 16 | ||||
-rw-r--r-- | src/mainboard/via/epia-n/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/via/vt8454c/Kconfig | 18 | ||||
-rw-r--r-- | src/mainboard/via/vt8454c/Makefile.inc | 20 |
11 files changed, 86 insertions, 95 deletions
diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig index d005230ef4..423068a1a9 100644 --- a/src/mainboard/Kconfig +++ b/src/mainboard/Kconfig @@ -1,4 +1,3 @@ - menu "Mainboard" choice @@ -228,29 +227,29 @@ config VENDOR_VIA endchoice config MAINBOARD_VENDOR - string - default "EMULATION" - depends on VENDOR_EMULATION + string + default "Emulation" + depends on VENDOR_EMULATION config MAINBOARD_VENDOR - string - default "KONTRON" - depends on VENDOR_KONTRON + string + default "Kontron" + depends on VENDOR_KONTRON config MAINBOARD_VENDOR - string - default "VIA" - depends on VENDOR_VIA + string + default "VIA" + depends on VENDOR_VIA config MAINBOARD_VENDOR - string - default "AMD" - depends on VENDOR_AMD + string + default "AMD" + depends on VENDOR_AMD config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1019 - depends on VENDOR_VIA + depends on VENDOR_VIA source "src/mainboard/a-trend/Kconfig" source "src/mainboard/abit/Kconfig" diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig index b148558e46..8bbc4c50d7 100644 --- a/src/mainboard/amd/serengeti_cheetah/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah/Kconfig @@ -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 @@ -27,12 +27,12 @@ config USE_DCACHE_RAM int default 1 depends on BOARD_AMD_SERENGETI_CHEETAH - + config DCACHE_RAM_BASE hex default 0xc8000 depends on BOARD_AMD_SERENGETI_CHEETAH - + config DCACHE_RAM_SIZE hex default 0x08000 @@ -70,7 +70,7 @@ config LB_CKS_RANGE_END config LB_CKS_LOC int - default 123 + default 123 depends on BOARD_AMD_SERENGETI_CHEETAH config MAINBOARD_PART_NUMBER @@ -80,7 +80,7 @@ config MAINBOARD_PART_NUMBER config PCI_64BIT_PREF_MEM int - default 0 + default 0 depends on BOARD_AMD_SERENGETI_CHEETAH config USE_DCACHE_RAM diff --git a/src/mainboard/amd/serengeti_cheetah/Makefile.inc b/src/mainboard/amd/serengeti_cheetah/Makefile.inc index d5ff7d1efb..320bb7be1e 100644 --- a/src/mainboard/amd/serengeti_cheetah/Makefile.inc +++ b/src/mainboard/amd/serengeti_cheetah/Makefile.inc @@ -1,6 +1,6 @@ ## ## This file is part of the coreboot project. -## +## ## Copyright (C) 2007-2008 coresystems GmbH ## ## This program is free software; you can redistribute it and/or @@ -19,27 +19,23 @@ ## MA 02110-1301 USA ## -## -## This mainboard requires DCACHE_AS_RAM enabled. It won't work without. -## - -driver-y += mainboard.o +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 -obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o - -#./ssdt.o is in northbridge/amd/amdk8/Config.lb -obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt2.o -obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt3.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += ssdt4.o +obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o +obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o +obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o + +# ./ssdt.o is in northbridge/amd/amdk8/Config.lb +obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt2.o +obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt3.o +obj-$(CONFIG_HAVE_ACPI_TABLES) += ssdt4.o driver-y += ../../../drivers/i2c/i2cmux/i2cmux.o -# This is part of the conversion to init-obj and away from included code. +# This is part of the conversion to init-obj and away from included code. initobj-y += crt0.o # FIXME in $(top)/Makefile @@ -79,7 +75,7 @@ $(obj)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl" iasl -p $(CURDIR)/pci3 -tc $(CONFIG_MAINBOARD)/ perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' pci3.hex mv pci3.hex ssdt3.c - + $(obj)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl" iasl -p $(CURDIR)/pci4 -tc $(CONFIG_MAINBOARD)/dx/pci4.asl perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' pci4.hex diff --git a/src/mainboard/kontron/986lcd-m/Makefile.inc b/src/mainboard/kontron/986lcd-m/Makefile.inc index 6a021bfca9..3dc5e29fd3 100644 --- a/src/mainboard/kontron/986lcd-m/Makefile.inc +++ b/src/mainboard/kontron/986lcd-m/Makefile.inc @@ -1,6 +1,6 @@ ## ## This file is part of the coreboot project. -## +## ## Copyright (C) 2007-2008 coresystems GmbH ## ## This program is free software; you can redistribute it and/or @@ -21,21 +21,21 @@ ## ## This mainboard requires DCACHE_AS_RAM enabled. It won't work without. -## +## -driver-y += mainboard.o -driver-y += rtl8168.o +driver-y += mainboard.o +driver-y += rtl8168.o #obj-y += ../../../southbridge/intel/i82801gx/i82801gx_reset.c obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o +obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o +obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o +obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o -# This is part of the conversion to init-obj and away from included code. +# This is part of the conversion to init-obj and away from included code. initobj-y += crt0.o # FIXME in $(top)/Makefile diff --git a/src/mainboard/kontron/Kconfig b/src/mainboard/kontron/Kconfig index 4a6a64fddb..dd5be6704d 100644 --- a/src/mainboard/kontron/Kconfig +++ b/src/mainboard/kontron/Kconfig @@ -1,20 +1,21 @@ choice - prompt "Mainboard model" - depends on VENDOR_KONTRON + prompt "Mainboard model" + depends on VENDOR_KONTRON config BOARD_KONTRON_986LCD_M - bool "986LCD-M" - select ARCH_X86 - select CPU_INTEL_CORE + bool "986LCD-M" + select ARCH_X86 + select CPU_INTEL_CORE select CPU_INTEL_SOCKET_MFCPGA478 - select NORTHBRIDGE_INTEL_I945 - select SOUTHBRIDGE_INTEL_I82801GX - select SUPERIO_WINBOND_W83627THG - select PIRQ_TABLE + select NORTHBRIDGE_INTEL_I945 + select SOUTHBRIDGE_INTEL_I82801GX + select SUPERIO_WINBOND_W83627THG + select PIRQ_TABLE select MMCONF_SUPPORT select USE_PRINTK_IN_CAR - help - Kontron 986LCD-M Series mainboards + help + Kontron 986LCD-M/mITX mainboard. + endchoice config MAINBOARD_DIR @@ -26,7 +27,7 @@ config DCACHE_RAM_BASE hex default 0xffdf8000 depends on BOARD_KONTRON_986LCD_M - + config DCACHE_RAM_SIZE hex default 0x8000 @@ -39,10 +40,11 @@ config LB_CKS_RANGE_END config LB_CKS_LOC int - default 123 + default 123 depends on BOARD_KONTRON_986LCD_M config MAINBOARD_PART_NUMBER string default "986LCD-M" depends on BOARD_KONTRON_986LCD_M + diff --git a/src/mainboard/msi/Kconfig b/src/mainboard/msi/Kconfig index 3a3a38a563..ee636338b9 100644 --- a/src/mainboard/msi/Kconfig +++ b/src/mainboard/msi/Kconfig @@ -32,6 +32,7 @@ config BOARD_MSI_MS6178 select PIRQ_TABLE help MSI MS-6178 mainboard. + endchoice config MAINBOARD_DIR diff --git a/src/mainboard/via/Kconfig b/src/mainboard/via/Kconfig index 4d0a55b6bf..787b32bc56 100644 --- a/src/mainboard/via/Kconfig +++ b/src/mainboard/via/Kconfig @@ -1,10 +1,9 @@ choice - prompt "Mainboard model" - depends on VENDOR_VIA + prompt "Mainboard model" + depends on VENDOR_VIA - source "src/mainboard/via/vt8454c/Kconfig" - source "src/mainboard/via/epia-n/Kconfig" +source "src/mainboard/via/vt8454c/Kconfig" +source "src/mainboard/via/epia-n/Kconfig" endchoice - diff --git a/src/mainboard/via/epia-n/Kconfig b/src/mainboard/via/epia-n/Kconfig index 93f9e236ce..e7818a9b51 100644 --- a/src/mainboard/via/epia-n/Kconfig +++ b/src/mainboard/via/epia-n/Kconfig @@ -1,14 +1,14 @@ config BOARD_VIA_EPIA_N - bool "via epia-n" - select ARCH_X86 - select CPU_VIA_C3 - select NORTHBRIDGE_VIA_CN400 + bool "EPIA-N" + select ARCH_X86 + select CPU_VIA_C3 + select NORTHBRIDGE_VIA_CN400 select SOUTHBRIDGE_VIA_VT8237R - select SUPERIO_WINBOND_W83697HF - select PIRQ_TABLE + select SUPERIO_WINBOND_W83697HF + select PIRQ_TABLE select USE_PRINTK_IN_CAR - help - VIA Epia-n mainboards + help + VIA EPIA-N mainboard. config MAINBOARD_DIR string diff --git a/src/mainboard/via/epia-n/Makefile.inc b/src/mainboard/via/epia-n/Makefile.inc index 9cc015ff97..a100d9ac31 100644 --- a/src/mainboard/via/epia-n/Makefile.inc +++ b/src/mainboard/via/epia-n/Makefile.inc @@ -21,8 +21,8 @@ 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_PIRQ_TABLE) += irq_tables.o +obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o diff --git a/src/mainboard/via/vt8454c/Kconfig b/src/mainboard/via/vt8454c/Kconfig index bdd582759c..7433e0f934 100644 --- a/src/mainboard/via/vt8454c/Kconfig +++ b/src/mainboard/via/vt8454c/Kconfig @@ -1,15 +1,15 @@ config BOARD_VIA_VT8454C - bool "vt8454c" - select ARCH_X86 - select CPU_VIA_C7 - select NORTHBRIDGE_VIA_CX700 -# select SOUTHBRIDGE_INTEL_I82801GX - select SUPERIO_VIA_VT1211 - select PIRQ_TABLE + bool "VT8454c" + select ARCH_X86 + select CPU_VIA_C7 + select NORTHBRIDGE_VIA_CX700 +# select SOUTHBRIDGE_INTEL_I82801GX + select SUPERIO_VIA_VT1211 + select PIRQ_TABLE # select MMCONF_SUPPORT select USE_PRINTK_IN_CAR - help - Kontron 986LCD-M Series mainboards + help + VIA VT8454C mainboard. config MAINBOARD_DIR string diff --git a/src/mainboard/via/vt8454c/Makefile.inc b/src/mainboard/via/vt8454c/Makefile.inc index d74c632497..f33336bd6c 100644 --- a/src/mainboard/via/vt8454c/Makefile.inc +++ b/src/mainboard/via/vt8454c/Makefile.inc @@ -1,12 +1,11 @@ ## ## This file is part of the coreboot project. -## +## ## Copyright (C) 2007-2009 coresystems GmbH ## ## 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,21 +14,16 @@ ## ## 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 -## - +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -## This mainboard requires DCACHE_AS_RAM enabled. It won't work without. -## -driver-y += mainboard.o +driver-y += mainboard.o obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o +obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o +obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o +obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o initobj-y += crt0.o # FIXME in $(top)/Makefile |