[Mac-on-linux-devel] [PATCH 2/3] Make CPU virtualization mode selectable

[Alexander G. <ag...@su...>]

We want to give the user the choice between KVM and MOL kernel modules,
so let's make the config option selectable and fix all references to
it to actually reference to the config option.

Signed-off-by: Alexander Graf <ag...@su...>
---
 config/Kconfig-common |   11 ++++++++---
 src/Makefile          |    2 +-
 src/cpu/Makefile      |    4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/config/Kconfig-common b/config/Kconfig-common
index 8944dba..0993b1e 100644
--- a/config/Kconfig-common
+++ b/config/Kconfig-common
@@ -1,11 +1,16 @@
 mainmenu "Mac-on-Linux Configuration"
 
 menu "Machine Specific Build Targets"
-config PPC
-	bool
-	default y
+
+choice
+	prompt "Virtualization type"
+	default PPC
+
+config MOL
+	bool "MOL kernel module"
 	help
 	  No help yet.
+endchoice
 
 #config MPC107
 #	bool "MPC107 board (Crescendo)"
diff --git a/src/Makefile b/src/Makefile
index c5bad18..2733edb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
 
 include			../config/Makefile.top
 
-BUILD_MODS		:= y
+BUILD_MODS		:= $(if $(CONFIG_MOL),y)
 NETMODS			:= $(CONFIG_TUN)$(CONFIG_SHEEP)
 NETDRIVER		:= $(if $(LINUX),$(if $(NETMODS),$(BUILD_MODS)))
 
diff --git a/src/cpu/Makefile b/src/cpu/Makefile
index a4bc0dd..3251973 100644
--- a/src/cpu/Makefile
+++ b/src/cpu/Makefile
@@ -2,7 +2,7 @@
 include			../../config/Makefile.top
 
 SUBDIRS-$(MPC107)	= mpc107
-SUBDIRS-$(PPC)		= ppc
+SUBDIRS-$(CONFIG_MOL)	= ppc
 SUBDIRS-$(X86)		= i386
 
 XTARGETS		= cpu
@@ -10,7 +10,7 @@ XTARGETS		= cpu
 
 cpu-OBJS		= mainloop.o molcpu.o $(obj-y)
 obj-$(CONFIG_DEBUGGER)	+= breakpoints.o
-obj-$(PPC)		+= ppc/libppc.a
+obj-$(CONFIG_MOL)	+= ppc/libppc.a
 obj-$(X86)		+= i386/libi386.a
 obj-$(MPC107)		+= ppc/libmpc107.a
 
-- 
1.6.0.2