summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorRonald G. Minnich <rminnich@gmail.com>2009-08-20 18:05:31 +0000
committerRonald G. Minnich <rminnich@gmail.com>2009-08-20 18:05:31 +0000
commitd82e12858f34770a38dc93136f686ebab0e971ed (patch)
treecd36da4f912399710cba8be208b2bad7b031770e /src/cpu
parentb203c2f95e8174bff1170a47d06186a315de4997 (diff)
This goes a surprisingly long way to building the epia-n. It also has
important corrections to the Kconfig and Makefile.inc that were there. I would like to go ahead and get this in, because I don't want anyone to continue using what is in the upstream tree as it now exists. I also tested old-style build with this and it did not break anything. Signed-off-by: Ronald G. Minnich <rminnich@gmail.com> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4559 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/via/Makefile.inc5
-rw-r--r--src/cpu/via/model_c3/Kconfig3
-rw-r--r--src/cpu/via/model_c3/Makefile.inc11
-rw-r--r--src/cpu/via/model_c7/Makefile.inc20
4 files changed, 26 insertions, 13 deletions
diff --git a/src/cpu/via/Makefile.inc b/src/cpu/via/Makefile.inc
index 6d62f22619..512f82b02e 100644
--- a/src/cpu/via/Makefile.inc
+++ b/src/cpu/via/Makefile.inc
@@ -1,2 +1,3 @@
-#subdirs-y += model_c7
-subdirs-y += model_c7
+subdirs-$(CONFIG_CPU_VIA_C7) += model_c7
+subdirs-$(CONFIG_CPU_VIA_C3) += model_c3
+
diff --git a/src/cpu/via/model_c3/Kconfig b/src/cpu/via/model_c3/Kconfig
new file mode 100644
index 0000000000..570f710703
--- /dev/null
+++ b/src/cpu/via/model_c3/Kconfig
@@ -0,0 +1,3 @@
+config CPU_VIA_C3
+ bool
+ default n
diff --git a/src/cpu/via/model_c3/Makefile.inc b/src/cpu/via/model_c3/Makefile.inc
new file mode 100644
index 0000000000..4cd19a23c4
--- /dev/null
+++ b/src/cpu/via/model_c3/Makefile.inc
@@ -0,0 +1,11 @@
+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/smm
+subdirs-y += ../../intel/microcode
+
+obj-y += model_c3_init.o
diff --git a/src/cpu/via/model_c7/Makefile.inc b/src/cpu/via/model_c7/Makefile.inc
index 8e645eb0a2..e6634c384b 100644
--- a/src/cpu/via/model_c7/Makefile.inc
+++ b/src/cpu/via/model_c7/Makefile.inc
@@ -1,13 +1,11 @@
-ifeq ($(CONFIG_CPU_VIA_C7),y)
- 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/smm
- subdirs-y += ../../intel/microcode
-endif
+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/smm
+subdirs-y += ../../intel/microcode
obj-y += model_c7_init.o