Comments
Patch
===================================================================
@@ -1,195 +1,205 @@
choice
prompt "Mainboard model"
- depends on VENDOR_AMD
+ depends on VENDOR_TYAN
-config BOARD_AMD_SERENGETI_CHEETAH
- bool "SERENGETI_CHEETAH"
+config BOARD_TYAN_S2892
+ bool "Tyan Thunder K8S s2892"
select ARCH_X86
select CPU_AMD_K8
- select CPU_AMD_SOCKET_F
+ select CPU_AMD_SOCKET_940
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
- select SOUTHBRIDGE_AMD_AMD8111
+ select SOUTHBRIDGE_NVIDIA_CK804
select SOUTHBRIDGE_AMD_AMD8131
select SUPERIO_WINBOND_W83627HF
select PIRQ_TABLE
select USE_PRINTK_IN_CAR
help
- AMD Serengeti Series mainboards
+ Tyan Thunder K8S s2892 mainboard.
endchoice
config MAINBOARD_DIR
string
- default amd/serengeti_cheetah
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ default tyan/s2892
+ depends on BOARD_TYAN_S2892
config USE_DCACHE_RAM
int
default 1
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config DCACHE_RAM_BASE
hex
default 0xc8000
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config DCACHE_RAM_SIZE
hex
default 0x08000
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config DCACHE_RAM_GLOBAL_VAR_SIZE
hex
default 0x01000
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config APIC_ID_OFFSET
int
default 8
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config HAVE_HARD_RESET
bool
default y
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config IOAPIC
bool
default y
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config SB_HT_CHAIN_ON_BUS0
int
default 2
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config LB_CKS_RANGE_END
int
default 122
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config LB_CKS_LOC
int
default 123
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config MAINBOARD_PART_NUMBER
string
- default "Serengeti-Cheetah"
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ default "s2892"
+ depends on BOARD_TYAN_S2892
config PCI_64BIT_PREF_MEM
int
default 0
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config USE_DCACHE_RAM
int
default 1
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config DCACHE_RAM_BASE
hex
default 0xc8000
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config DCACHE_RAM_SIZE
hex
default 0x08000
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config DCACHE_RAM_GLOBAL_VAR_SIZE
hex
default 0x01000
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config USE_FAILOVER_IMAGE
int
default 0
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config HW_MEM_HOLE_SIZEK
hex
default 0x100000
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config MEM_TRAIN_SEQ
int
- default 1
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ default 0
+ depends on BOARD_TYAN_S2892
config HAVE_FAILOVER_BOOT
int
default 0
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config USE_FAILOVER_IMAGE
int
default 0
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config MAX_CPUS
int
default 8
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config MAX_PHYSICAL_CPUS
int
default 4
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config MEM_TRAIN_SEQ
int
default 1
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config AP_CODE_IN_CAR
int
default 1
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config HW_MEM_HOLE_SIZE_AUTO_INC
int
default 0
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
+
+config HT_CHAIN_UNITID_BASE
+ int
+ default 0
+ depends on BOARD_TYAN_S2892
config HT_CHAIN_END_UNITID_BASE
int
- default 0x6
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ default 0x20
+ depends on BOARD_TYAN_S2892
config USE_INIT
int
default 0
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config SERIAL_CPU_INIT
bool
- default n
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ default y
+ depends on BOARD_TYAN_S2892
config AP_CODE_IN_CAR
int
default 1
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config WAIT_BEFORE_CPUS_INIT
int
- default 1
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ default 0
+ depends on BOARD_TYAN_S2892
config SB_HT_CHAIN_ON_BUS0
int
default 2
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
+
+config SB_HT_CHAIN_UNITID_OFFSET_ONLY
+ int
+ default 0
+ depends on BOARD_TYAN_S2892
config CONSOLE_VGA
bool
default y
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
config PCI_ROM_RUN
int
default 1
- depends on BOARD_AMD_SERENGETI_CHEETAH
+ depends on BOARD_TYAN_S2892
===================================================================
@@ -1 +1,3 @@
-#
+#source "src/mainboard/tyan/s2891/Kconfig"
+source "src/mainboard/tyan/s2892/Kconfig"
+#source "src/mainboard/tyan/s2895/Kconfig"
===================================================================
@@ -38,6 +38,7 @@ 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
+driver-y += ../../../drivers/i2c/adm1027/adm1027.o
# This is part of the conversion to init-obj and away from included code.
@@ -46,14 +47,17 @@ initobj-y += crt0.o
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 += ../../../../src/southbridge/nvidia/ck804/romstrap.inc
+crt0-y += ../../../../src/southbridge/nvidia/ck804/id.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/cpu/x86/32bit/reset32.lds
+ldscript-y += ../../../../src/southbridge/nvidia/ck804/id.lds
+ldscript-y += ../../../../src/southbridge/nvidia/ck804/romstrap.lds
ldscript-y += ../../../../src/arch/i386/lib/failover.lds
ifdef POST_EVALUATION
@@ -63,30 +67,12 @@ MAINBOARD_OPTIONS=\
-DCONFIG_USE_PRINTK_IN_CAR=1 \
-DCONFIG_HAVE_HIGH_TABLES=1
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
+$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
+ iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
mv dsdt.hex $@
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
- $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
- iasl -p $(CURDIR)/pci2 -tc $(CONFIG_MAINBOARD)/dx/pci2.asl
- perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' pci2.hex
- mv pci2.hex ssdt2.c
-
-$(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
- mv pci4.hex ssdt4.c
-
$(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 $@
+ $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) -I$(src)/include -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 $@
===================================================================
@@ -1,6 +1,6 @@
#source src/cpu/amd/socket_754/Kconfig
#source src/cpu/amd/socket_939/Kconfig
-#source src/cpu/amd/socket_940/Kconfig
+source src/cpu/amd/socket_940/Kconfig
#source src/cpu/amd/socket_AM2/Kconfig
#source src/cpu/amd/socket_AM2r2/Kconfig
source src/cpu/amd/socket_F/Kconfig
===================================================================
@@ -1,32 +1,14 @@
-config CPU_AMD_SOCKET_F
+config CPU_AMD_SOCKET_940
bool
default false
-config CPU_SOCKET_TYPE
- hex
- default 0x10
- depends on CPU_AMD_SOCKET_F
-
config K8_REV_F_SUPPORT
hex
- default 1
- depends on CPU_AMD_SOCKET_F
+ default 0
+ depends on CPU_AMD_SOCKET_940
#Opteron K8 1G HT Support
config K8_HT_FREQ_1G_SUPPORT
hex
default 1
- depends on CPU_AMD_SOCKET_F
-
-#DDR2 and REG
-config DIMM_SUPPORT
- hex
- default 0x0104
- depends on CPU_AMD_SOCKET_F
-
-config CPU_SOCKET_TYPE
- hex
- default 0x10
- depends on CPU_AMD_SOCKET_F
-
-source src/cpu/amd/model_fxx/Kconfig
+ depends on CPU_AMD_SOCKET_940
===================================================================
@@ -1,14 +1,15 @@
-obj-$(CONFIG_CPU_AMD_SOCKET_F) += socket_F.o
-subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += ../model_fxx
-subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += ../dualcore
-subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += ../mtrr
-subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += ../../x86/tsc
-subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += ../../x86/mtrr
-subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += ../../x86/fpu
-subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += ../../x86/mmx
-subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += ../../x86/sse
-subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += ../../x86/lapic
-subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += ../../x86/cache
-subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += ../../x86/mtrr
-subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += ../../x86/pae
-subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += ../../x86/smm
+obj-y += socket_940.o
+obj-y += ../microcode/microcode.o
+subdirs-y += ../model_fxx
+subdirs-y += ../dualcore
+subdirs-y += ../mtrr
+subdirs-y += ../../x86/tsc
+subdirs-y += ../../x86/mtrr
+subdirs-y += ../../x86/fpu
+subdirs-y += ../../x86/mmx
+subdirs-y += ../../x86/sse
+subdirs-y += ../../x86/lapic
+subdirs-y += ../../x86/cache
+subdirs-y += ../../x86/mtrr
+subdirs-y += ../../x86/pae
+subdirs-y += ../../x86/smm
===================================================================
@@ -229,6 +229,11 @@ endchoice
config MAINBOARD_VENDOR
string
+ default "AMD"
+ depends on VENDOR_AMD
+
+config MAINBOARD_VENDOR
+ string
default "EMULATION"
depends on VENDOR_EMULATION
@@ -239,13 +244,13 @@ config MAINBOARD_VENDOR
config MAINBOARD_VENDOR
string
- default "VIA"
- depends on VENDOR_VIA
+ default "TYAN"
+ depends on VENDOR_TYAN
config MAINBOARD_VENDOR
string
- default "AMD"
- depends on VENDOR_AMD
+ default "VIA"
+ depends on VENDOR_VIA
config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
hex
===================================================================
@@ -1,20 +1,15 @@
-uses CONFIG_HAVE_ACPI_TABLES
+driver-y += ck804.o
+driver-y += ck804_usb.o
+driver-y += ck804_lpc.o
+driver-y += ck804_smbus.o
+driver-y += ck804_ide.o
+driver-y += ck804_sata.o
+driver-y += ck804_usb2.o
+driver-y += ck804_ac97.o
+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
-config chip.h
-driver ck804.o
-driver ck804_usb.o
-driver ck804_lpc.o
-driver ck804_smbus.o
-driver ck804_ide.o
-driver ck804_sata.o
-driver ck804_usb2.o
-driver ck804_ac97.o
-driver ck804_nic.o
-driver ck804_pci.o
-driver ck804_pcie.o
-driver ck804_ht.o
-object ck804_reset.o
-
-if CONFIG_HAVE_ACPI_TABLES
- object ck804_fadt.o
-end
+obj-$(CONFIG_HAVE_ACPI_TABLES) +=ck804_fadt.o
===================================================================
@@ -1,7 +1,7 @@
subdirs-y += amd
#subdirs-y += broadcom
subdirs-y += intel
-#subdirs-y += nvidia
+subdirs-y += nvidia
#subdirs-y += ricoh
#subdirs-y += sis
subdirs-y += via
===================================================================
@@ -1,3 +1,3 @@
subdirs-y += ck804
-subdirs-y += mcp55
+#subdirs-y += mcp55
===================================================================
@@ -1 +1,2 @@
subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += socket_F
+subdirs-$(CONFIG_CPU_AMD_SOCKET_940) += socket_940
===================================================================
@@ -1,7 +1,7 @@
source src/southbridge/amd/Kconfig
#source src/southbridge/broadcom/Kconfig
source src/southbridge/intel/Kconfig
-source src/southbridge/nvidia/Kconfig
+#source src/southbridge/nvidia/Kconfig
#source src/southbridge/ricoh/Kconfig
#source src/southbridge/sis/Kconfig
source src/southbridge/via/Kconfig
It compiles, but there are a lot of warnings about undefined CONFIG_ variables. To apply the patch, first : svn cp src/southbridge/nvidia/ck804/Config.lb src/southbridge/nvidia/ck804/Makefile.inc svn cp src/cpu/amd/socket_F/Kconfig src/cpu/amd/socket_940/Kconfig svn cp src/cpu/amd/socket_F/Makefile.inc src/cpu/amd/socket_940/Makefile.inc svn cp src/mainboard/amd/serengeti_cheetah/Kconfig src/mainboard/tyan/s2892/Kconfig svn cp src/mainboard/amd/serengeti_cheetah/Makefile.inc src/mainboard/tyan/s2892/Makefile.inc Here are the CONFIG variables that aren't defined: CONFIG_VGA CONFIG_CONSOLE_VGA_MULTI CONFIG_CONSOLE_VGA_MULTI CONFIG_USE_WATCHDOG_ON_BOOT CONFIG_SERIAL_POST CONFIG_CONSOLE_VGA_ONBOARD_AT_FIRST CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT CONFIG_PCIX_PLUGIN_SUPPORT CONFIG_PCIEXP_PLUGIN_SUPPORT CONFIG_AGP_PLUGIN_SUPPORT CONFIG_CARDBUS_PLUGIN_SUPPORT CONFIG_PCIX_PLUGIN_SUPPORT CONFIG_AGP_PLUGIN_SUPPORT CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT CONFIG_PCIEXP_PLUGIN_SUPPORT CONFIG_CARDBUS_PLUGIN_SUPPORT CONFIG_CONSOLE_VGA_MULTI CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 CONFIG_GFXUMA Signed-off-by: Myles Watson <mylesgw@gmail.com> Thanks, Myles