diff options
author | Martin.Jansa <Martin.Jansa@gmail.com> | 2009-11-18 11:32:09 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-18 11:32:38 +0100 |
commit | f205d8a02477ad9e9031db16f50ca79531886763 (patch) | |
tree | 79575ce43ee1a0cc7652a113d9ea92cc97f2ffbb /conf | |
parent | 2263b51333532bb8cdbbf24708aaecd4d5167c38 (diff) |
om-gta0(1|2): update config from SHR
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/om-gta01.conf | 16 | ||||
-rw-r--r-- | conf/machine/om-gta02.conf | 40 |
2 files changed, 54 insertions, 2 deletions
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf index cbc66d8748..5bdeba01f3 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -7,8 +7,18 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24" + +# SHR-specific overrides to the machine.conf file +PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel" +PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg" +PREFERRED_PROVIDER_xf86-video-fbdev_shr = "xf86-video-fbdev" +PREFERRED_PROVIDER_mesa_shr = "mesa" +XSERVER_shr = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard" + UBOOT_ENTRYPOINT = "30008000" +OLDEST_KERNEL_linux-gnueabi = "2.6.24" + MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" @@ -16,6 +26,10 @@ MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "285" XSERVER = "xserver-kdrive-fbdev" +# fbreader specific +READER_RESOLUTION = "480x640" +READER_ARCH = "openzaurus" + # package machine specific modules MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-gta01-pm-bt \ @@ -40,6 +54,8 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" # build / upload tools EXTRA_IMAGEDEPENDS += "dfu-util-native" +module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" + # tune for S3C24x0 include conf/machine/include/tune-arm920t.inc diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index 94ca2946e6..5882019e19 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -8,18 +8,36 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.28" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" + +# If you want to have KMS enabled in default kernel, uncomment linux-openmoko-shr-drm-devel +PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel" +#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-drm-devel" +#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31" + +PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg" +PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri" +MACHINE_DRI_MODULES_shr = "glamo" + +XSERVER_shr = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse" + UBOOT_ENTRYPOINT = "30008000" +OLDEST_KERNEL_linux-gnueabi = "2.6.24" + 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-xorg \ +XSERVER ?= "xserver-xorg \ xf86-input-tslib \ xf86-video-glamo \ xf86-input-keyboard" +# fbreader specific +READER_RESOLUTION = "480x640" +READER_ARCH = "openzaurus" + # package machine specific modules MACHINE_EXTRA_RRECOMMENDS = "\ kernel-modules \ @@ -32,8 +50,9 @@ USE_VT = "0" # used by some images ROOT_FLASH_SIZE = "256" +IMAGE_FSTYPES += "tar.gz jffs2 ubifs" + # extra jffs2 tweaks -IMAGE_FSTYPES += "jffs2" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \ --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \ --littleendian --pad \ @@ -44,8 +63,25 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \ mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary \ ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2" +# do ubiattach /dev/ubi_ctrl -m 4 +# From dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: logical eraseblock size: 129024 bytes +# from ubiattach stdout: +# UBI device number 0, total 1996 LEBs +MKUBIFS_ARGS = "-m 2048 -e 129024 -c 2047" + +# do ubiattach /dev/ubi_ctrl -m 4 +# from dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: physical eraseblock size: 131072 bytes (128 KiB) +# UBI: sub-page size: 512 +UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" + # build / upload tools EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" +module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753" + # tune for S3C24x0 include conf/machine/include/tune-arm920t.inc |