summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/preferred-shr-versions.inc7
-rw-r--r--conf/distro/include/sane-srcrevs-fso.inc40
-rw-r--r--conf/distro/shr.conf8
-rw-r--r--conf/machine/om-gta01.conf16
-rw-r--r--conf/machine/om-gta02.conf40
5 files changed, 84 insertions, 27 deletions
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 769ec7c4c7..a2d1992706 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -1,5 +1,6 @@
# Upgraded
# use newer version then preferred by default
+PREFERRED_VERSION_boost ?= "1.40.0"
PREFERRED_VERSION_dbus ?= "1.3.0"
PREFERRED_VERSION_autoconf = "2.63"
PREFERRED_VERSION_autoconf-native = "2.63"
@@ -11,6 +12,7 @@ PREFERRED_VERSION_strace ?= "4.5.15"
PREFERRED_VERSION_linux-libc-headers = "2.6.29"
# upgrades used in Angstrom
+PREFERRED_VERSION_pixman = "0.17.1"
PREFERRED_VERSION_gtk+ = "2.18.3"
PREFERRED_VERSION_hal = "0.5.13"
PREFERRED_VERSION_libtool = "2.2.6a"
@@ -25,8 +27,3 @@ UDEV_GE_141 = "1"
# Downgraded
# python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py
PREFERRED_VERSION_python-pygtk ?= "2.10.4"
-PREFERRED_VERSION_gpe-gallery ?= "0.97"
-PREFERRED_VERSION_boost ?= "1.33.1"
-PREFERRED_VERSION_man-pages ?= "2.41"
-PREFERRED_VERSION_xchat ?= "2.8.4"
-PREFERRED_VERSION_x11vnc ?= "0.9.3"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index 88c9f9a883..bb11525998 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -1,44 +1,44 @@
# To be included from sane-srcrevs.inc
# FSO Projects -- Cornucopia
-FSO_CORNUCOPIA_SRCREV ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
+FSO_CORNUCOPIA_SRCREV ?= "1dcf546fb0423930f938129a51f538874c172226"
SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsodeviced ?= "a6273b0008359c91eb35b7f2c6f633086467c84e"
SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsousaged ?= "11dbb63abb48094fab63c64de189fe99189b9f73"
SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
# FSO Projects -- Misc
-SRCREV_pn-dbus-hlid ?= "39e804f28808247df2573788cb99897d4d765e69"
-SRCREV_pn-frameworkd ?= "a2dfde0fb46a745f5c07e6a1ab44e4b95b7dde80"
+SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb"
+SRCREV_pn-frameworkd ?= "d48bd43c430322b26744e31829f9c76e9b725819"
SRCREV_pn-frameworkd-config-shr_FSO_REV = ${SRCREV_pn-frameworkd}
-SRCREV_pn-fso-abyss ?= "8ce3c6e40c4852de7dcca502f65784f6b18ca6bf"
-SRCREV_pn-fso-term ?= "e0d92222e3e5a62025089c60a625f1836c510915"
-SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
+SRCREV_pn-fso-abyss ?= "7f271311e2e0b63235139859169bd248920ade30"
+SRCREV_pn-fso-term ?= "aa0b9c26dee3918a5e9d2809bb36335bda276a0d"
+SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6"
SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
-SRCREV_pn-fso-monitord ?= "eb8fb32d52d19c5aa9284c6cc540dd40bb924c9d"
-SRCREV_pn-fso-sounds ?= "cc46b55131fc07a415bf1bd62ce98f73344489cb"
-SRCREV_pn-fso-specs ?= "66c992afd6c551ffd8fc63d7201c5cce269a4d77"
+SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44"
+SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
+SRCREV_pn-fso-specs ?= "1f12f6fab0df9bae2ae25bbd91a22d4cb7792927"
SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
-SRCREV_pn-libeflvala ?= "c566847e000fad132225aefd854b81ae713eaa82"
-SRCREV_pn-libfso-glib ?= "b855b0297ff68bb505a02d9b4b13914ca558cd59"
-SRCREV_pn-libframeworkd-glib ?= "680276e4cddabeb1edd088ddd421f363dd106a50"
-SRCREV_pn-libgsm0710 ?= "3bb80ba6cc9f86ed3996f88bfa2986cc572489d6"
-SRCREV_pn-libgsm0710mux ?= "b74d4615374abb856441e4a416726fb3e8d7835b"
+SRCREV_pn-libeflvala ?= "d07db4fbd24c9d5dfc9b1fd5024fd651b02f123e"
+SRCREV_pn-libfso-glib ?= "3630315a498f91106b4187e41608613520d63090"
+SRCREV_pn-libframeworkd-glib ?= "f7ea17bc2a33d6f0989a71f86ccc6ed3e8051e77"
+SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166"
+SRCREV_pn-libgsm0710mux ?= "e81ed512ec86e31d0d0119826afa9d1302651693"
SRCREV_pn-libpersistence ?= "26180fd3c0fe4eb6abb7440f10e51d997719b97a"
-FSO_PYTHONHELPERS_SRCREV ?= "6d7f51b5189a00a07d9b88100a565f46fcb62644"
+FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317"
SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}"
SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}"
SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}"
SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}"
SRCREV_pn-pycd ?= "${FSO_PYTHONHELPERS_SRCREV}"
-SRCREV_pn-vala-dbus-binding-tool-native ?= "0d221b688bfb51e0607b7f4e6e03bf96d13d5d44"
-SRCREV_pn-vala-terminal ?= "2f849c5690d834a69f6c0693cc159573b3aa78d"
-SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
+SRCREV_pn-vala-dbus-binding-tool-native ?= "324a78c0cab484535ce5a7a33436e9c62311297d"
+SRCREV_pn-vala-terminal ?= "932285d72e26b965c488f8aa99fe51f7a34231ad"
+SRCREV_pn-vala-native ?= "2f14aed36765c842fe7b4035ba564d2c023ef0b0"
SRCREV_pn-zhone ?= "d654b3d15500a56c8e987e4d2cc2f8eef70b78c0"
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index e45fc07334..1da9b36bb2 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -39,8 +39,15 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1"
# We only want to build UTF8 locales
LOCALE_UTF8_ONLY = "1"
+#save statistical info on images
INHERIT += "testlab"
+#activate the angstrom blacklister
+INHERIT += "angstrom"
+
+ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4"
+ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4"
+
CVS_TARBALL_STASH += "http://build.shr-project.org/sources/"
PREMIRRORS = "(ftp|https?)$://.*/.* http://build.shr-project.org/sources/"
@@ -84,6 +91,7 @@ PREFERRED_PROVIDER_virtual/gail = "gtk+"
PREFERRED_PROVIDER_opkg = "opkg"
PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
PREFERRED_PROVIDER_atd = "atd-over-fso"
+PREFERRED_PROVIDER_qt4x11 = "qt4-x11-free"
# Helper to say what image we built
SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version"
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-02 09:02:56 +0000