[PATCH] UBUNTU: [Config] Enable VMSPLIT_2G to allow more memory in emulator

[Loïc Minier]

Signed-off-by: Loïc Minier <loic.minier at ubuntu.com>
Tested-by: Ricardo Salveti <ricardo.salveti at ubuntu.com>
Tested-by: Loïc Minier <loic.minier at ubuntu.com>
---
 debian.goldfish/config/armhf/config.common.armhf | 3 +++
 debian.goldfish/config/config.common.ubuntu      | 3 ---
 debian.goldfish/config/i386/config.common.i386   | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian.goldfish/config/armhf/config.common.armhf b/debian.goldfish/config/armhf/config.common.armhf
index e3544f2..6465e2f 100644
--- a/debian.goldfish/config/armhf/config.common.armhf
+++ b/debian.goldfish/config/armhf/config.common.armhf
@@ -163,6 +163,7 @@ CONFIG_NF_NAT_TFTP=y
 # CONFIG_NLS_ASCII is not set
 CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
+CONFIG_PAGE_OFFSET=0x80000000
 # CONFIG_PCCARD is not set
 CONFIG_PHYLIB=m
 # CONFIG_POSIX_MQUEUE is not set
@@ -262,6 +263,8 @@ CONFIG_USB_ZD1201=m
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_VITESSE_PHY=m
 CONFIG_VLAN_8021Q=y
+CONFIG_VMSPLIT_2G=y
+# CONFIG_VMSPLIT_3G is not set
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_WIRELESS_EXT_SYSFS is not set
diff --git a/debian.goldfish/config/config.common.ubuntu b/debian.goldfish/config/config.common.ubuntu
index b83443a..4afe40f 100644
--- a/debian.goldfish/config/config.common.ubuntu
+++ b/debian.goldfish/config/config.common.ubuntu
@@ -2150,7 +2150,6 @@ CONFIG_OUTPUT_FORMAT="elf32-i386"
 # CONFIG_P54_COMMON is not set
 CONFIG_PACKET=y
 CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PANASONIC_LAPTOP=m
 CONFIG_PANIC_TIMEOUT=0
 CONFIG_PANTHERLORD_FF=y
@@ -3128,9 +3127,7 @@ CONFIG_VME_TSI148=m
 CONFIG_VME_USER=m
 CONFIG_VMIVME_7805=m
 # CONFIG_VMSPLIT_1G is not set
-# CONFIG_VMSPLIT_2G is not set
 # CONFIG_VMSPLIT_2G_OPT is not set
-CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_3G_OPT is not set
 CONFIG_VMWARE_BALLOON=m
 CONFIG_VMXNET3=m
diff --git a/debian.goldfish/config/i386/config.common.i386 b/debian.goldfish/config/i386/config.common.i386
index 4c71de4..80a60d7 100644
--- a/debian.goldfish/config/i386/config.common.i386
+++ b/debian.goldfish/config/i386/config.common.i386
@@ -163,6 +163,7 @@ CONFIG_NFTL=y
 CONFIG_NLS_ASCII=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_UTF8=y
+CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PCCARD=y
 CONFIG_PHYLIB=y
 CONFIG_POSIX_MQUEUE=y
@@ -262,6 +263,8 @@ CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_VLAN_8021Q is not set
+# CONFIG_VMSPLIT_2G is not set
+CONFIG_VMSPLIT_3G=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_WATCHDOG=y
 CONFIG_WIRELESS_EXT_SYSFS=y
-- 
1.8.5.3