diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-01-18 12:56:22 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-01-18 12:56:22 +0000 |
| commit | 9dbd684b5a39ffd0fcc0d24938600c104beb4f47 (patch) | |
| tree | 779bdbca7bb49ae31abe1ae7b9e2f37cb1e28766 | |
| parent | 3811d80493e0ccd7870aba1dbf4e9f357b526326 (diff) | |
| download | openembedded-core-9dbd684b5a39ffd0fcc0d24938600c104beb4f47.tar.gz openembedded-core-9dbd684b5a39ffd0fcc0d24938600c104beb4f47.tar.bz2 openembedded-core-9dbd684b5a39ffd0fcc0d24938600c104beb4f47.tar.xz openembedded-core-9dbd684b5a39ffd0fcc0d24938600c104beb4f47.zip | |
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.conf | 7 | ||||
| -rw-r--r-- | meta/conf/machine/fic-gta02.conf | 15 |
2 files changed, 10 insertions, 12 deletions
diff --git a/meta/conf/machine/fic-gta01.conf b/meta/conf/machine/fic-gta01.conf index bd14df581..5317c3035 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 diff --git a/meta/conf/machine/fic-gta02.conf b/meta/conf/machine/fic-gta02.conf index 1760424fc..85399cf4c 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}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "285" +XSERVER = "xserver-kdrive-glamo 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-neo1973-gta02-wm8753 \ kernel-module-snd-soc-smdk2440 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-cp437 \ " SERIAL_CONSOLE = "115200 ttySAC2" @@ -38,7 +35,11 @@ SERIAL_CONSOLE = "115200 ttySAC2" ROOT_FLASH_SIZE = "256" # extra jffs2 tweaks -EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \ + --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \ + --littleendian --pad \ + -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary" # build / upload tools EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" |