More boards in kconfig, and moved -O2 flag for romcc into

ROMCCFLAGS, so boards can override it where necessary.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Myles Watson <mylesgw@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4730 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

3 files changed, 183 insertions, 1 deletions

diff --git a/src/mainboard/newisys/Kconfig b/src/mainboard/newisys/Kconfig
index 792d600548..fd8f9176e1 100644
--- a/src/mainboard/newisys/Kconfig
+++ b/src/mainboard/newisys/Kconfig
@@ -1 +1,8 @@
-#
+choice
+	prompt "Mainboard model"
+	depends on VENDOR_NEWISYS
+        
+source "src/mainboard/newisys/khepri/Kconfig"
+
+endchoice
+
diff --git a/src/mainboard/newisys/khepri/Kconfig b/src/mainboard/newisys/khepri/Kconfig
new file mode 100644
index 0000000000..312a85764c
--- /dev/null
+++ b/src/mainboard/newisys/khepri/Kconfig
@@ -0,0 +1,123 @@
+config BOARD_NEWISYS_KHEPRI
+	bool "Khepri"
+	select ARCH_X86
+	select CPU_AMD_K8
+	select CPU_AMD_SOCKET_940
+	select NORTHBRIDGE_AMD_AMDK8
+	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
+	select SOUTHBRIDGE_AMD_AMD8111
+	select SOUTHBRIDGE_AMD_AMD8131
+	select SUPERIO_WINBOND_W83627HF
+	select HAVE_PIRQ_TABLE
+	select USE_PRINTK_IN_CAR
+	select USE_DCACHE_RAM
+
+config MAINBOARD_DIR
+	string
+	default newisys/khepri
+	depends on BOARD_NEWISYS_KHEPRI
+
+config DCACHE_RAM_BASE
+	hex
+	default 0xcf000
+	depends on BOARD_NEWISYS_KHEPRI
+
+config DCACHE_RAM_SIZE
+	hex
+	default 0x01000
+	depends on BOARD_NEWISYS_KHEPRI
+
+config APIC_ID_OFFSET
+	hex
+	default 0x10
+	depends on BOARD_NEWISYS_KHEPRI
+
+config HAVE_HARD_RESET
+	bool
+	default y
+	depends on BOARD_NEWISYS_KHEPRI
+
+config IOAPIC
+	bool
+	default y
+	depends on BOARD_NEWISYS_KHEPRI
+
+config K8_REV_F_SUPPORT
+	bool
+	default n
+	depends on BOARD_NEWISYS_KHEPRI
+
+config SB_HT_CHAIN_ON_BUS0
+	int
+	default 2
+	depends on BOARD_NEWISYS_KHEPRI
+
+config SB_HT_CHAIN_UNITID_OFFSET_ONLY
+	bool
+	default n
+	depends on BOARD_NEWISYS_KHEPRI
+
+config LB_CKS_RANGE_END
+	int
+	default 122
+	depends on BOARD_NEWISYS_KHEPRI
+
+config LB_CKS_LOC
+	int
+	default 123
+	depends on BOARD_NEWISYS_KHEPRI
+
+config MAINBOARD_PART_NUMBER
+	string
+	default "Khepri"
+	depends on BOARD_NEWISYS_KHEPRI
+
+config HW_MEM_HOLE_SIZEK
+	hex
+	default 0x100000
+	depends on BOARD_NEWISYS_KHEPRI
+
+config MAX_CPUS
+	int
+	default 4
+	depends on BOARD_NEWISYS_KHEPRI
+
+config MAX_PHYSICAL_CPUS
+	int
+	default 2
+	depends on BOARD_NEWISYS_KHEPRI
+
+config HT_CHAIN_END_UNITID_BASE
+	hex
+	default 0x0
+	depends on BOARD_NEWISYS_KHEPRI
+
+config HT_CHAIN_UNITID_BASE
+	hex
+	default 0x0
+	depends on BOARD_NEWISYS_KHEPRI
+
+config USE_INIT
+	bool
+	default n
+	depends on BOARD_NEWISYS_KHEPRI
+
+config SB_HT_CHAIN_ON_BUS0
+	int
+	default 2
+	depends on BOARD_NEWISYS_KHEPRI
+
+config CONSOLE_VGA
+	bool
+	default y
+	depends on BOARD_NEWISYS_KHEPRI
+
+config PCI_ROM_RUN
+	bool
+	default y
+	depends on BOARD_NEWISYS_KHEPRI
+
+config IRQ_SLOT_COUNT
+	int
+	default 11
+	depends on BOARD_NEWISYS_KHEPRI
diff --git a/src/mainboard/newisys/khepri/Makefile.inc b/src/mainboard/newisys/khepri/Makefile.inc
new file mode 100644
index 0000000000..86d71e152b
--- /dev/null
+++ b/src/mainboard/newisys/khepri/Makefile.inc
@@ -0,0 +1,52 @@
+##
+## 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
+## modify it under the terms of the GNU General Public License as
+## 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
+## 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
+##
+
+driver-y += mainboard.o
+
+obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
+obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+
+# This is part of the conversion to init-obj and away from included code.
+
+initobj-y += crt0.o
+# FIXME in $(top)/Makefile
+crt0-y += ../../../../src/cpu/x86/16bit/entry16.inc
+crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc
+crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc
+crt0-y += ../../../../src/arch/i386/lib/id.inc
+crt0-y += ../../../../src/cpu/amd/car/cache_as_ram.inc
+crt0-y += auto.inc
+
+ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
+ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds
+ldscript-y += ../../../../src/cpu/x86/16bit/reset16.lds
+ldscript-y += ../../../../src/arch/i386/lib/id.lds
+ldscript-y += ../../../../src/arch/i386/lib/failover.lds
+
+ifdef POST_EVALUATION
+
+$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c $(obj)/option_table.h
+	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c -o $@
+	perl -e 's/\.rodata/.rom.data/g' -pi $@
+	perl -e 's/\.text/.section .rom.text/g' -pi $@
+
+endif
+