From 36ba6fc7b4643f3ab37e9b90060190f2fa673a79 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 25 Apr 2012 18:14:07 +0300
Subject: [PATCH] virtual: more 'generic' project/kernel options

---
 projects/Virtual/linux/linux.i386.conf   | 18 ++++++++----------
 projects/Virtual/linux/linux.x86_64.conf |  7 ++-----
 projects/Virtual/options                 | 11 +++++++++--
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf
index 6c37a25e30..46ce46a56b 100644
--- a/projects/Virtual/linux/linux.i386.conf
+++ b/projects/Virtual/linux/linux.i386.conf
@@ -283,7 +283,7 @@ CONFIG_NO_BOOTMEM=y
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
+CONFIG_M586TSC=y
 # CONFIG_M586MMX is not set
 # CONFIG_M686 is not set
 # CONFIG_MPENTIUMII is not set
@@ -303,26 +303,24 @@ CONFIG_NO_BOOTMEM=y
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MVIAC3_2 is not set
 # CONFIG_MVIAC7 is not set
-CONFIG_MCORE2=y
+# CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
 # CONFIG_X86_GENERIC is not set
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_INTERNODE_CACHE_SHIFT=5
 CONFIG_X86_CMPXCHG=y
 CONFIG_CMPXCHG_LOCAL=y
 CONFIG_CMPXCHG_DOUBLE=y
-CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=5
 CONFIG_X86_XADD=y
+# CONFIG_X86_PPRO_FENCE is not set
+CONFIG_X86_F00F_BUG=y
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_BSWAP=y
 CONFIG_X86_POPAD_OK=y
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
-CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
 CONFIG_PROCESSOR_SELECT=y
 CONFIG_CPU_SUP_INTEL=y
 # CONFIG_CPU_SUP_CYRIX_32 is not set
diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf
index cc6a27a4a4..ce0f1d0142 100644
--- a/projects/Virtual/linux/linux.x86_64.conf
+++ b/projects/Virtual/linux/linux.x86_64.conf
@@ -280,9 +280,9 @@ CONFIG_NO_BOOTMEM=y
 # CONFIG_MEMTEST is not set
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
-CONFIG_MCORE2=y
+# CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
-# CONFIG_GENERIC_CPU is not set
+CONFIG_GENERIC_CPU=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
 CONFIG_CMPXCHG_LOCAL=y
@@ -290,9 +290,6 @@ CONFIG_CMPXCHG_DOUBLE=y
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
 CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_P6_NOP=y
 CONFIG_X86_TSC=y
 CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_CMOV=y
diff --git a/projects/Virtual/options b/projects/Virtual/options
index b2f8dc6773..00d004fb74 100755
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -39,7 +39,7 @@
       #               i686 i586 i486 i386
       # (VIA CPUs)    c3 c3-2
       #
-      TARGET_CPU="core2"
+      TARGET_CPU="i686"
       ;;
 
     x86_64)
@@ -299,5 +299,12 @@
   ADDON_SERVER_URL="http://addons.openelec.tv"
 
 # set the addon dirs
-  ADDON_PATH="$ADDON_VERSION/Intel/$TARGET_ARCH"
+  case $TARGET_ARCH in
+    i386)
+      ADDON_PATH="$ADDON_VERSION/Generic/$TARGET_ARCH"
+      ;;
+    x86_64)
+      ADDON_PATH="$ADDON_VERSION/Intel/$TARGET_ARCH"
+      ;;
+  esac
   ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"