Neo1973 (gta01/02): merge configs with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3531 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 2 insertions, 5 deletions

diff --git a/meta/conf/machine/fic-gta01.conf b/meta/conf/machine/fic-gta01.conf
index bd14df5814..5317c30357 100644
--- a/meta/conf/machine/fic-gta01.conf
+++ b/meta/conf/machine/fic-gta01.conf
@@ -11,11 +11,12 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}"
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
 UBOOT_ENTRYPOINT = "30008000"
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
+XSERVER = "xserver-kdrive-fbdev"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
@@ -24,12 +25,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-gsm \
   kernel-module-gta01kbd \
   kernel-module-s3cmci \
-  kernel-module-ext2 \
-  kernel-module-vfat \
   kernel-module-snd-soc-neo1973-wm8753 \
   kernel-module-snd-soc-smdk2440 \
-  kernel-module-nls-iso8859-1 \
-  kernel-module-nls-cp437 \
 "
 
 # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab