summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-01-18 12:56:22 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-01-18 12:56:22 +0000
commit9dbd684b5a39ffd0fcc0d24938600c104beb4f47 (patch)
tree779bdbca7bb49ae31abe1ae7b9e2f37cb1e28766
parent3811d80493e0ccd7870aba1dbf4e9f357b526326 (diff)
downloadpoky-9dbd684b5a39ffd0fcc0d24938600c104beb4f47.tar.gz
Neo1973 (gta01/02): merge configs with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3531 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/machine/fic-gta01.conf7
-rw-r--r--meta/conf/machine/fic-gta02.conf15
2 files changed, 10 insertions, 12 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}"
11PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" 11PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
12UBOOT_ENTRYPOINT = "30008000" 12UBOOT_ENTRYPOINT = "30008000"
13 13
14MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone" 14MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2"
15MACHINE_DISPLAY_WIDTH_PIXELS = "480" 15MACHINE_DISPLAY_WIDTH_PIXELS = "480"
16MACHINE_DISPLAY_HEIGHT_PIXELS = "640" 16MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
17MACHINE_DISPLAY_ORIENTATION = "0" 17MACHINE_DISPLAY_ORIENTATION = "0"
18MACHINE_DISPLAY_PPI = "285" 18MACHINE_DISPLAY_PPI = "285"
19XSERVER = "xserver-kdrive-fbdev"
19 20
20# package machine specific modules 21# package machine specific modules
21MACHINE_EXTRA_RRECOMMENDS = "\ 22MACHINE_EXTRA_RRECOMMENDS = "\
@@ -24,12 +25,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\
24 kernel-module-gta01-pm-gsm \ 25 kernel-module-gta01-pm-gsm \
25 kernel-module-gta01kbd \ 26 kernel-module-gta01kbd \
26 kernel-module-s3cmci \ 27 kernel-module-s3cmci \
27 kernel-module-ext2 \
28 kernel-module-vfat \
29 kernel-module-snd-soc-neo1973-wm8753 \ 28 kernel-module-snd-soc-neo1973-wm8753 \
30 kernel-module-snd-soc-smdk2440 \ 29 kernel-module-snd-soc-smdk2440 \
31 kernel-module-nls-iso8859-1 \
32 kernel-module-nls-cp437 \
33" 30"
34 31
35# do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab 32# do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
diff --git a/meta/conf/machine/fic-gta02.conf b/meta/conf/machine/fic-gta02.conf
index 1760424fc8..85399cf4ca 100644
--- a/meta/conf/machine/fic-gta02.conf
+++ b/meta/conf/machine/fic-gta02.conf
@@ -11,11 +11,12 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}"
11PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" 11PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
12UBOOT_ENTRYPOINT = "30008000" 12UBOOT_ENTRYPOINT = "30008000"
13 13
14MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi" 14MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
15MACHINE_DISPLAY_WIDTH_PIXELS = "480" 15MACHINE_DISPLAY_WIDTH_PIXELS = "480"
16MACHINE_DISPLAY_HEIGHT_PIXELS = "640" 16MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
17MACHINE_DISPLAY_ORIENTATION = "0" 17MACHINE_DISPLAY_ORIENTATION = "0"
18MACHINE_DISPLAY_PPI = "285" 18MACHINE_DISPLAY_PPI = "285"
19XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev"
19 20
20# package machine specific modules 21# package machine specific modules
21MACHINE_EXTRA_RRECOMMENDS = "\ 22MACHINE_EXTRA_RRECOMMENDS = "\
@@ -24,12 +25,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\
24 kernel-module-gta01-pm-gsm \ 25 kernel-module-gta01-pm-gsm \
25 kernel-module-gta01kbd \ 26 kernel-module-gta01kbd \
26 kernel-module-s3cmci \ 27 kernel-module-s3cmci \
27 kernel-module-ext2 \ 28 kernel-module-snd-soc-neo1973-gta02-wm8753 \
28 kernel-module-vfat \
29 kernel-module-snd-soc-neo1973-wm8753 \
30 kernel-module-snd-soc-smdk2440 \ 29 kernel-module-snd-soc-smdk2440 \
31 kernel-module-nls-iso8859-1 \
32 kernel-module-nls-cp437 \
33" 30"
34 31
35SERIAL_CONSOLE = "115200 ttySAC2" 32SERIAL_CONSOLE = "115200 ttySAC2"
@@ -38,7 +35,11 @@ SERIAL_CONSOLE = "115200 ttySAC2"
38ROOT_FLASH_SIZE = "256" 35ROOT_FLASH_SIZE = "256"
39 36
40# extra jffs2 tweaks 37# extra jffs2 tweaks
41EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" 38EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
39 --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
40 --littleendian --pad \
41 -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
42 -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
42 43
43# build / upload tools 44# build / upload tools
44EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" 45EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"