From fd4519b5ef086fbec60041570c6c9d73d6a80a79 Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Wed, 12 Aug 2009 15:56:17 +0000 Subject: This now builds. Signed-off-by: Ronald G. Minnich Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4537 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/Makefile.inc | 2 +- src/cpu/amd/Makefile.inc | 1 + src/cpu/amd/dualcore/Makefile.inc | 3 +++ src/cpu/amd/model_fxx/Makefile.inc | 6 ++++++ src/cpu/amd/mtrr/Makefile.inc | 1 + src/cpu/amd/socket_F/Makefile.inc | 14 ++++++++++++++ src/cpu/x86/pae/Makefile.inc | 1 + src/northbridge/Kconfig | 2 +- src/northbridge/Makefile.inc | 2 +- src/northbridge/amd/Makefile.inc | 14 +++++++------- src/northbridge/amd/amdk8/Kconfig | 11 +++++++++++ src/northbridge/amd/amdk8/Makefile.inc | 30 ++++++++++++++++++++++++++++++ src/pc80/Makefile.inc | 2 +- src/pc80/vga/Makefile.inc | 2 ++ src/southbridge/Kconfig | 2 +- src/southbridge/Makefile.inc | 2 +- src/southbridge/amd/Kconfig | 16 ++++++++-------- src/southbridge/amd/Makefile.inc | 18 +++++++++--------- src/southbridge/amd/amd8131/Kconfig | 23 +++++++++++++++++++++++ 19 files changed, 122 insertions(+), 30 deletions(-) create mode 100644 src/cpu/amd/Makefile.inc create mode 100644 src/cpu/amd/dualcore/Makefile.inc create mode 100644 src/cpu/amd/model_fxx/Makefile.inc create mode 100644 src/cpu/amd/mtrr/Makefile.inc create mode 100644 src/cpu/amd/socket_F/Makefile.inc create mode 100644 src/cpu/x86/pae/Makefile.inc create mode 100644 src/northbridge/amd/amdk8/Makefile.inc create mode 100644 src/pc80/vga/Makefile.inc create mode 100644 src/southbridge/amd/amd8131/Kconfig diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc index aa4435f029..e650525b61 100644 --- a/src/cpu/Makefile.inc +++ b/src/cpu/Makefile.inc @@ -1,4 +1,4 @@ -#input amd +subdirs-y += amd subdirs-y += intel subdirs-y += via subdirs-y += emulation diff --git a/src/cpu/amd/Makefile.inc b/src/cpu/amd/Makefile.inc new file mode 100644 index 0000000000..c63bc2bb86 --- /dev/null +++ b/src/cpu/amd/Makefile.inc @@ -0,0 +1 @@ +subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += socket_F diff --git a/src/cpu/amd/dualcore/Makefile.inc b/src/cpu/amd/dualcore/Makefile.inc new file mode 100644 index 0000000000..90a7ee55ef --- /dev/null +++ b/src/cpu/amd/dualcore/Makefile.inc @@ -0,0 +1,3 @@ +# This is a leaf makefile, no conditionals. If it is included it will +# be used. +obj-y += amd_sibling.o diff --git a/src/cpu/amd/model_fxx/Makefile.inc b/src/cpu/amd/model_fxx/Makefile.inc new file mode 100644 index 0000000000..ea3088b46a --- /dev/null +++ b/src/cpu/amd/model_fxx/Makefile.inc @@ -0,0 +1,6 @@ +# no conditionals here. If you include this file from a socket, then you get all the binaries. +driver-y += model_fxx_init.o +obj-y += apic_timer.o +obj-y += model_fxx_update_microcode.o +obj-y += processor_name.o +obj-y += powernow_acpi.o diff --git a/src/cpu/amd/mtrr/Makefile.inc b/src/cpu/amd/mtrr/Makefile.inc new file mode 100644 index 0000000000..2978a397ac --- /dev/null +++ b/src/cpu/amd/mtrr/Makefile.inc @@ -0,0 +1 @@ +obj-y += amd_mtrr.o diff --git a/src/cpu/amd/socket_F/Makefile.inc b/src/cpu/amd/socket_F/Makefile.inc new file mode 100644 index 0000000000..bd9885c414 --- /dev/null +++ b/src/cpu/amd/socket_F/Makefile.inc @@ -0,0 +1,14 @@ +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 diff --git a/src/cpu/x86/pae/Makefile.inc b/src/cpu/x86/pae/Makefile.inc new file mode 100644 index 0000000000..e20ee2fc51 --- /dev/null +++ b/src/cpu/x86/pae/Makefile.inc @@ -0,0 +1 @@ +obj-y += pgtbl.o diff --git a/src/northbridge/Kconfig b/src/northbridge/Kconfig index 666ff4d112..0c13d45113 100644 --- a/src/northbridge/Kconfig +++ b/src/northbridge/Kconfig @@ -1,4 +1,4 @@ -#source src/northbridge/amd/Kconfig +source src/northbridge/amd/Kconfig #source src/northbridge/ibm/Kconfig source src/northbridge/intel/Kconfig #source src/northbridge/motorola/Kconfig diff --git a/src/northbridge/Makefile.inc b/src/northbridge/Makefile.inc index 8aac9b9401..3d876b38d5 100644 --- a/src/northbridge/Makefile.inc +++ b/src/northbridge/Makefile.inc @@ -1,4 +1,4 @@ -#subdirs-y += amd +subdirs-y += amd #subdirs-y += ibm subdirs-y += intel #subdirs-y += motorola diff --git a/src/northbridge/amd/Makefile.inc b/src/northbridge/amd/Makefile.inc index 06e931482a..88ee1e6568 100644 --- a/src/northbridge/amd/Makefile.inc +++ b/src/northbridge/amd/Makefile.inc @@ -1,8 +1,8 @@ -subdirs-$(CPU_AMD_K10) += amdfam10 -subdirs-$(CPU_AMD_HT) += amdht -subdirs-$(CPU_AMD_K8) += amdk8 -subdirs-$(CPU_AMD_MCT) += amdmct -subdirs-$(CPU_AMD_GX1) += gx1 -subdirs-$(CPU_AMD_GX2) += gx2 -subdirs-$(CPU_AMD_LX) += lx +subdirs-$(CONFIG_NORTHBRIDGE_AMD_AMDFAM10) += amdfam10 +subdirs-$(CONFIG_NORTHBRIDGE_AMD_AMDHT) += amdht +subdirs-$(CONFIG_NORTHBRIDGE_AMD_AMDK8) += amdk8 +subdirs-$(CONFIG_NORTHBRIDGE_AMD_AMDMCT) += amdmct +subdirs-$(CONFIG_NORTHBRIDGE_AMD_GX1) += gx1 +subdirs-$(CONFIG_NORTHBRIDGE_AMD_GX2) += gx2 +subdirs-$(CONFIG_NORTHBRIDGE_AMD_LX) += lx diff --git a/src/northbridge/amd/amdk8/Kconfig b/src/northbridge/amd/amdk8/Kconfig index 171f1f50ee..181f1c219a 100644 --- a/src/northbridge/amd/amdk8/Kconfig +++ b/src/northbridge/amd/amdk8/Kconfig @@ -20,3 +20,14 @@ config NORTHBRIDGE_AMD_AMDK8 bool default n + +config AGP_APERTURE_SIZE + hex + default 0x4000000 + +config HAVE_HIGH_TABLES + int + default 1 + + +source src/northbridge/amd/amdk8/root_complex/Kconfig \ No newline at end of file diff --git a/src/northbridge/amd/amdk8/Makefile.inc b/src/northbridge/amd/amdk8/Makefile.inc new file mode 100644 index 0000000000..462db4815d --- /dev/null +++ b/src/northbridge/amd/amdk8/Makefile.inc @@ -0,0 +1,30 @@ + +#default CONFIG_AGP_APERTURE_SIZE=0x4000000 +#default CONFIG_HAVE_HIGH_TABLES=1 + + +driver-y += northbridge.o +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 +#if CONFIG_K8_REV_F_SUPPORT +# +#makerule raminit_test +# depends "$(TOP)/src/northbridge/amd/amdk8/raminit_test.c" +# depends "$(TOP)/src/northbridge/amd/amdk8/raminit_f.c" +# action "$(HOSTCC) $(HOSTCFLAGS) $(CPUFLAGS) -Wno-unused-function -I$(TOP)/src/include -g $< -o $@" +#end +# +#else +# +#makerule raminit_test +# depends "$(TOP)/src/northbridge/amd/amdk8/raminit_test.c" +# depends "$(TOP)/src/northbridge/amd/amdk8/raminit.c" +# action "$(HOSTCC) $(HOSTCFLAGS) $(CPUFLAGS) -Wno-unused-function -I$(TOP)/src/include -g $< -o $@" +#end +# +#end +# +# diff --git a/src/pc80/Makefile.inc b/src/pc80/Makefile.inc index a54c5ee41a..bb105241f1 100644 --- a/src/pc80/Makefile.inc +++ b/src/pc80/Makefile.inc @@ -6,4 +6,4 @@ obj-$(CONFIG_UDELAY_IO) += udelay_io.o obj-y += keyboard.o #initobj-y += serial.o - +subdirs-y += vga diff --git a/src/pc80/vga/Makefile.inc b/src/pc80/vga/Makefile.inc new file mode 100644 index 0000000000..f5b75c0c3f --- /dev/null +++ b/src/pc80/vga/Makefile.inc @@ -0,0 +1,2 @@ +obj-y += vga_io.o +obj-$(CONFIG_VGA) += vga.o diff --git a/src/southbridge/Kconfig b/src/southbridge/Kconfig index 51a4fb5e9c..b3303a5c36 100644 --- a/src/southbridge/Kconfig +++ b/src/southbridge/Kconfig @@ -1,4 +1,4 @@ -#source src/southbridge/amd/Kconfig +source src/southbridge/amd/Kconfig #source src/southbridge/broadcom/Kconfig source src/southbridge/intel/Kconfig #source src/southbridge/nvidia/Kconfig diff --git a/src/southbridge/Makefile.inc b/src/southbridge/Makefile.inc index 8f795a2f67..8986f14e55 100644 --- a/src/southbridge/Makefile.inc +++ b/src/southbridge/Makefile.inc @@ -1,4 +1,4 @@ -#subdirs-y += amd +subdirs-y += amd #subdirs-y += broadcom subdirs-y += intel #subdirs-y += nvidia diff --git a/src/southbridge/amd/Kconfig b/src/southbridge/amd/Kconfig index d451debfa5..e8edbf455c 100644 --- a/src/southbridge/amd/Kconfig +++ b/src/southbridge/amd/Kconfig @@ -1,10 +1,10 @@ source src/southbridge/amd/amd8111/Kconfig source src/southbridge/amd/amd8131/Kconfig -source src/southbridge/amd/amd8131-disable/Kconfig -source src/southbridge/amd/amd8132/Kconfig -source src/southbridge/amd/amd8151/Kconfig -source src/southbridge/amd/cs5530/Kconfig -source src/southbridge/amd/cs5535/Kconfig -source src/southbridge/amd/cs5536/Kconfig -source src/southbridge/amd/rs690/Kconfig -source src/southbridge/amd/sb600/Kconfig +#source src/southbridge/amd/amd8131-disable/Kconfig +#source src/southbridge/amd/amd8132/Kconfig +#source src/southbridge/amd/amd8151/Kconfig +#source src/southbridge/amd/cs5530/Kconfig +#source src/southbridge/amd/cs5535/Kconfig +#source src/southbridge/amd/cs5536/Kconfig +#source src/southbridge/amd/rs690/Kconfig +#source src/southbridge/amd/sb600/Kconfig diff --git a/src/southbridge/amd/Makefile.inc b/src/southbridge/amd/Makefile.inc index caf5e42690..a172c5d72d 100644 --- a/src/southbridge/amd/Makefile.inc +++ b/src/southbridge/amd/Makefile.inc @@ -1,11 +1,11 @@ -subdirs-$(SOUTHBRIDGE_AMD_AMD8111) += amd8111 -subdirs-$(SOUTHBRIDGE_AMD_AMD8131) += amd8131 -subdirs-$(SOUTHBRIDGE_AMD_AMD8112) += amd8132 -subdirs-$(SOUTHBRIDGE_AMD_AMD8151) += amd8151 -subdirs-$(SOUTHBRIDGE_AMD_RS690) += rs690 -subdirs-$(SOUTHBRIDGE_AMD_SB600) += sb600 +subdirs-$(CONFIG_SOUTHBRIDGE_AMD_AMD8111) += amd8111 +subdirs-$(CONFIG_SOUTHBRIDGE_AMD_AMD8131) += amd8131 +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-$(SOUTHBRIDGE_AMD_CS5530) += cs5530 -subdirs-$(SOUTHBRIDGE_AMD_CS5535) += cs5535 -subdirs-$(SOUTHBRIDGE_AMD_CS5536) += cs5536 +subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CS5530) += cs5530 +subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CS5535) += cs5535 +subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CS5536) += cs5536 diff --git a/src/southbridge/amd/amd8131/Kconfig b/src/southbridge/amd/amd8131/Kconfig new file mode 100644 index 0000000000..dd8bf4b955 --- /dev/null +++ b/src/southbridge/amd/amd8131/Kconfig @@ -0,0 +1,23 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2008-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. +## +## 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 +## + +config SOUTHBRIDGE_AMD_AMD8131 + bool + default n + -- cgit v1.2.3