[oe-commits] org.oe.dev merge of '3a89dabf7f758f7d9957d9dfebb5e383d9096d6e'
oe commit
openembedded-commits at lists.openembedded.org
Mon Feb 4 16:51:00 UTC 2008
merge of '3a89dabf7f758f7d9957d9dfebb5e383d9096d6e'
and 'fe3ce31a0e6060324326d5a27cdba01788c95b7b'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 29817a260e6a9fe06810b70340557576d2be9f57
ViewMTN: http://monotone.openembedded.org/revision/info/29817a260e6a9fe06810b70340557576d2be9f57
Files:
1
packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb
packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb
packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb
packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb
packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb
packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb
packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb
packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb
packages/binutils/binutils-2.17/500-avr32-atmel.1.3.0.patch
packages/binutils/binutils-2.17/501-avr32-fix-pool-alignment.patch
packages/inetutils/inetutils_1.5.bb
packages/linux/linux-openmoko_2.6.24.bb
packages/qemu/qemu-0.9.1/writev_fix.patch
packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/atngw100.conf
conf/machine/h5000.conf
conf/machine/mpc8313e-rdb.conf
conf/machine/mpc8323e-rdb.conf
packages/altboot/altboot.inc
packages/altboot/altboot_1.0.8+1.0.9_pre1.bb
packages/altboot/altboot_1.0.8.bb
packages/altboot/altboot_1.1.1+wip-SVNR78.bb
packages/altboot/altboot_svn.bb
packages/binutils/binutils_2.17.bb
packages/gsm/files/default
packages/gsm/gsmd.inc
packages/libmad/files/libmad-0.15.1b-avr32-optimization.patch
packages/libmad/libmad_0.15.1b.bb
packages/linux/linux.inc
packages/opie-ttf-support/opie-ttf-support_1.1.bb
packages/python/python-edbus_cvs.bb
packages/qemu/qemu_0.9.1.bb
packages/tasks/task-base.bb
packages/xorg-app/bdftopcf-native_1.0.0.bb
packages/xorg-font/font-util-native_1.0.1.bb
packages/xorg-xserver/xserver-kdrive_1.4.bb
mtn:manual_merge
true
packages/xserver-common/files/ti-osk.patch
packages/xserver-common/xserver-common_1.18.bb
Diffs:
#
# mt diff -r3a89dabf7f758f7d9957d9dfebb5e383d9096d6e -r29817a260e6a9fe06810b70340557576d2be9f57
#
#
#
# rename "packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb"
# to "packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb"
#
# rename "packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb"
# to "packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb"
#
# rename "packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb"
# to "packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb"
#
# rename "packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb"
# to "packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb"
#
# rename "packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb"
# to "packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb"
#
# rename "packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb"
# to "packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb"
#
# rename "packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb"
# to "packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb"
#
# rename "packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb"
# to "packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb"
#
# add_file "packages/binutils/binutils-2.17/500-avr32-atmel.1.3.0.patch"
# content [5f7f471aaf1689d853655f32ce35a826dc860c07]
#
# add_file "packages/binutils/binutils-2.17/501-avr32-fix-pool-alignment.patch"
# content [d74bbdb835334aa6edcbd34f0971c63bf1fd151e]
#
# add_file "packages/inetutils/inetutils_1.5.bb"
# content [dfddc68af03f52a9106590446cca1d62313b47dc]
#
# add_file "packages/linux/linux-openmoko_2.6.24.bb"
# content [0f56c43fad11545eef657d0595fe6049fec5a575]
#
# add_file "packages/qemu/qemu-0.9.1/writev_fix.patch"
# content [3f2bd27101b7c9040d2fb4744e2ebe2231460cff]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch"
# content [2dd41bf751f18da06f0d638ee68db2ba1a670f11]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [aa578df0dc91a178786a5d3c808aa37f370e60f9]
# to [7ea86daa05508d4bd45a3e6eeba28b45153de9fe]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [c768b9d1c19df1d7e887abfa05c239ccf9218529]
# to [679a152fab923d34ccb9cd6b19ed77f4b7dac487]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [a5473bb5c86337913d9f630632a7ed94f804d24f]
# to [e323b12b054e9ead019c22ace5ac95039bf1d7e6]
#
# patch "conf/machine/atngw100.conf"
# from [3be4e9a4b5ba7595209dd7a081329f095488a40d]
# to [f8e16fd82334ed6e47de584e2bcbfbec63360ec3]
#
# patch "conf/machine/h5000.conf"
# from [b6fb552c41aeff2850cd35e5d3dfb99733e1e56d]
# to [e03a562f647e39de325cf64e33abb934e96da504]
#
# patch "conf/machine/mpc8313e-rdb.conf"
# from [f24e1a2aa898afd23e87bf623adfe947da548a3d]
# to [8d91dbc6066254429f7bb58a89ddd63064e893b6]
#
# patch "conf/machine/mpc8323e-rdb.conf"
# from [250e826f5d31182ea85bbc328c82de9c3973796b]
# to [54b0a85f3b2b21b088ba2cc07834fa16318a72d8]
#
# patch "packages/altboot/altboot.inc"
# from [7d0087ae6e6996973f11ae225cc750b9dd76f18f]
# to [336e728d9129e883c155439bd6e2298237b4ef44]
#
# patch "packages/altboot/altboot_1.0.8+1.0.9_pre1.bb"
# from [e6e9ee087092e6c26fe5b41f6aaff0b8dc672bc1]
# to [afdeba748d44ac6c81823deabecdba5be4f4caf3]
#
# patch "packages/altboot/altboot_1.0.8.bb"
# from [e7cdd46a53bb7b9dfa3f4d7520ec9e6dce521581]
# to [a63e82e147eb3d71871ae1f06a484f9d14a39db6]
#
# patch "packages/altboot/altboot_1.1.1+wip-SVNR78.bb"
# from [e7448ea24abd4e393507febae23ebd7c18501aca]
# to [2ba799e0906a42e4430aa1f44ffae3a2066c1d43]
#
# patch "packages/altboot/altboot_svn.bb"
# from [6ae5256c1654c364f27500c99be5940eacaff077]
# to [ff3c96a2e2b55419fb0d7d72dd3d6df341f015e7]
#
# patch "packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb"
# from [2cf4bac2b83ff6352cb4315ebe9bcea76fa47ce7]
# to [bc806f771dfb211bb02961e2f052b4c8a4cbcbbc]
#
# patch "packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb"
# from [84fc3a38f5414cbd71aabdebd2df8cb422c94290]
# to [4c11d3df09f6a7340c8d0de10119b55c14bfc64f]
#
# patch "packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb"
# from [49e28cdbdf947670361e9bf063c2e5cb74702417]
# to [6ec7811fb60d0489394ab075d552e12a70685633]
#
# patch "packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb"
# from [43abb0834bd9e900f53ffd78c329cdc8ba920e57]
# to [f4c0ee79455559e83ac70389ffae91dabb34538a]
#
# patch "packages/binutils/binutils_2.17.bb"
# from [b221c1f76176e30933b227951e0ebee85e3033b1]
# to [214d0d98246a44ff78cdafec723b4114aee39837]
#
# patch "packages/gsm/files/default"
# from [2c9ff75946e58892430cb9cee5cb6e6a16739d7c]
# to [d981c451d500ec2d0079c4622536ebe440f68480]
#
# patch "packages/gsm/gsmd.inc"
# from [9ddb79e73fa5344cdebd3d8fd96e8acc67ea81f0]
# to [69249920053eb5816872a237e49b8a365ceac6e5]
#
# patch "packages/libmad/files/libmad-0.15.1b-avr32-optimization.patch"
# from [e0949dad838b63c646d58ab74e97aa86a3247427]
# to [43f597b37b259d2959fb55a43dc74f7ef4192561]
#
# patch "packages/libmad/libmad_0.15.1b.bb"
# from [681e5446340f9939d27a70b7381f2b6e61aadd4e]
# to [5adf575856900e241c7311e25081db325e13344d]
#
# patch "packages/linux/linux.inc"
# from [a0d496b811bed73fa1cc6883dc248a306f18edef]
# to [842044ba3ce2c6e2833cece5e5b577864f966d55]
#
# patch "packages/opie-ttf-support/opie-ttf-support_1.1.bb"
# from [09c30f685e453e48a2f95e26642436c3429b832d]
# to [31bd2beed5a8228f8da31953542c42edf4b43385]
#
# patch "packages/python/python-edbus_cvs.bb"
# from [8d1d00ca5115e7226c39fbda403b7c1f6246e0a2]
# to [b9e9b38cb16c01ec8101aa260e4284de97c19c1e]
#
# patch "packages/qemu/qemu_0.9.1.bb"
# from [f8d662dfd4e4b410c48acb09eac959d69412e332]
# to [bf513f5e837d2341359ac2ed28d1e0c8b9d8ef93]
#
# patch "packages/tasks/task-base.bb"
# from [c13ff0dc014dd2c93926e1f1aef880d9dda3571c]
# to [1a4f000020453dc9598a87cbb8a1df9e88bc5c96]
#
# patch "packages/xorg-app/bdftopcf-native_1.0.0.bb"
# from [60d6c9131e6edb0c83a67fd03de07e9b8331719c]
# to [7f4e40b838d6811415a1d0a5752d2cc807af3d67]
#
# patch "packages/xorg-font/font-util-native_1.0.1.bb"
# from [e15331aa720a2c0392a072ac4bedee6d2406739c]
# to [38bd9ec3ecff18a104db97c5ea359a0ec7b06c93]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.4.bb"
# from [b08682b1e497d6999914f7b52000ff0293b6b2ef]
# to [e924574025f2310b2e6051f3aeef14fd3082d730]
#
# set "packages/binutils/binutils-2.17/500-avr32-atmel.1.3.0.patch"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
# packages/binutils/binutils-2.17/500-avr32-atmel.1.3.0.patch is binary
============================================================
--- packages/binutils/binutils-2.17/501-avr32-fix-pool-alignment.patch d74bbdb835334aa6edcbd34f0971c63bf1fd151e
+++ packages/binutils/binutils-2.17/501-avr32-fix-pool-alignment.patch d74bbdb835334aa6edcbd34f0971c63bf1fd151e
@@ -0,0 +1,26 @@
+Index: a/gas/config/tc-avr32.c
+===================================================================
+--- a/gas/config/tc-avr32.c (revision 31496)
++++ b/gas/config/tc-avr32.c (revision 32014)
+@@ -3092,6 +3092,8 @@
+
+ /* Make sure the constant pool is properly aligned */
+ frag_align_code(2, 0);
++ if (bfd_get_section_alignment(stdoutput, pool->section) < 2)
++ bfd_set_section_alignment(stdoutput, pool->section, 2);
+
+ /* Assume none of the entries are discarded, and that we need the
+ maximum amount of alignment. But we're not going to allocate
+Index: a/bfd/configure.in
+===================================================================
+--- a/bfd/configure.in (revision 31496)
++++ b/bfd/configure.in (revision 32014)
+@@ -8,7 +8,7 @@
+ AC_CANONICAL_TARGET
+ AC_ISC_POSIX
+
+-AM_INIT_AUTOMAKE(bfd, 2.17.atmel.1.2.0)
++AM_INIT_AUTOMAKE(bfd, 2.17.atmel.1.2.1)
+
+ dnl These must be called before AM_PROG_LIBTOOL, because it may want
+ dnl to call AC_CHECK_PROG.
============================================================
--- packages/inetutils/inetutils_1.5.bb dfddc68af03f52a9106590446cca1d62313b47dc
+++ packages/inetutils/inetutils_1.5.bb dfddc68af03f52a9106590446cca1d62313b47dc
@@ -0,0 +1,17 @@
+SECTION = "libs"
+DEPENDS = "ncurses"
+LICENSE = "GPL"
+DESCRIPTION = "The GNU inetutils are a collection of common \
+networking utilities and servers including ftp, ftpd, rcp, \
+rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \
+talkd, telnet, telnetd, tftp, tftpd, and uucpd."
+
+SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR}"
+
+do_configure_prepend () {
+ rm -f ${S}/glob/configure*
+}
============================================================
--- packages/linux/linux-openmoko_2.6.24.bb 0f56c43fad11545eef657d0595fe6049fec5a575
+++ packages/linux/linux-openmoko_2.6.24.bb 0f56c43fad11545eef657d0595fe6049fec5a575
@@ -0,0 +1,61 @@
+require linux.inc
+require linux-openmoko.inc
+
+DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko"
+VANILLA_VERSION = "2.6.24"
+KERNEL_RELEASE = "2.6.24"
+
+# need to synchronize with LOCALVERSION, if set
+KERNEL_VERSION = "${KERNEL_RELEASE}"
+
+PV = "${VANILLA_VERSION}+svnr${SRCREV}"
+PR = "r3"
+
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "30008000"
+
+##############################################################
+# source and patches
+#
+SRCREV_FORMAT = "patches-rconfig"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
+ svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=patches;proto=http;name=patches \
+ svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=config;proto=http;name=config "
+
+S = "${WORKDIR}/linux-${VANILLA_VERSION}"
+
+##############################################################
+# kernel image resides on a seperate flash partition (for now)
+#
+ALLOW_EMPTY = "1"
+
+COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02'
+
+CMDLINE = "unused -- bootloader passes ATAG list"
+
+###############################################################
+# module configs specific to this kernel
+#
+
+# usb
+module_autoload_ohci-hcd = "ohci-hcd"
+module_autoload_hci_usb = "hci_usb"
+module_autoload_g_ether = "g_ether"
+# audio
+module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
+module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+# sd/mmc
+module_autoload_s3cmci = "s3cmci"
+
+do_prepatch() {
+ mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
+ mv patches patches.openmoko
+ mv .pc .pc.old
+ mv ${WORKDIR}/config/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig
+}
+
+addtask prepatch after do_unpack before do_patch
============================================================
--- packages/qemu/qemu-0.9.1/writev_fix.patch 3f2bd27101b7c9040d2fb4744e2ebe2231460cff
+++ packages/qemu/qemu-0.9.1/writev_fix.patch 3f2bd27101b7c9040d2fb4744e2ebe2231460cff
@@ -0,0 +1,17 @@
+---
+ linux-user/syscall.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qemu-0.9.1/linux-user/syscall.c
+===================================================================
+--- qemu-0.9.1.orig/linux-user/syscall.c 2008-02-03 00:00:00.000000000 +0000
++++ qemu-0.9.1/linux-user/syscall.c 2008-02-03 00:00:38.000000000 +0000
+@@ -1048,7 +1048,7 @@ static abi_long lock_iovec(int type, str
+ base = tswapl(target_vec[i].iov_base);
+ vec[i].iov_len = tswapl(target_vec[i].iov_len);
+ vec[i].iov_base = lock_user(type, base, vec[i].iov_len, copy);
+- if (!vec[i].iov_base)
++ if (!vec[i].iov_base && vec[i].iov_len)
+ goto fail;
+ }
+ unlock_user (target_vec, target_addr, 0);
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch 2dd41bf751f18da06f0d638ee68db2ba1a670f11
+++ packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch 2dd41bf751f18da06f0d638ee68db2ba1a670f11
@@ -0,0 +1,16 @@
+Index: xorg-server-1.4/hw/kdrive/linux/keyboard.c
+===================================================================
+--- xorg-server-1.4.orig/hw/kdrive/linux/keyboard.c 2007-09-29 18:31:15.000000000 +0200
++++ xorg-server-1.4/hw/kdrive/linux/keyboard.c 2007-09-29 18:33:02.000000000 +0200
+@@ -743,11 +743,6 @@
+ cfsetispeed(&nTty, 9600);
+ cfsetospeed(&nTty, 9600);
+ tcsetattr(fd, TCSANOW, &nTty);
+- /*
+- * Flush any pending keystrokes
+- */
+- while ((n = read (fd, buf, sizeof (buf))) > 0)
+- ;
+ KdRegisterFd (fd, LinuxKeyboardRead, ki);
+ return Success;
+ }
============================================================
--- conf/distro/angstrom-2008.1.conf aa578df0dc91a178786a5d3c808aa37f370e60f9
+++ conf/distro/angstrom-2008.1.conf 7ea86daa05508d4bd45a3e6eeba28b45153de9fe
@@ -71,8 +71,8 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9
#Prefer a newer GTK+ and friends
-PREFERRED_VERSION_gtk+ = "2.12.0"
-PREFERRED_VERSION_glib-2.0 = "2.14.0"
+PREFERRED_VERSION_gtk+ = "2.12.3"
+PREFERRED_VERSION_glib-2.0 = "2.14.4"
PREFERRED_VERSION_pango = "1.18.1"
# prefer newest for speed and fun
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc c768b9d1c19df1d7e887abfa05c239ccf9218529
+++ conf/distro/include/angstrom-2007-preferred-versions.inc 679a152fab923d34ccb9cd6b19ed77f4b7dac487
@@ -886,7 +886,7 @@ PREFERRED_VERSION_libgeda ?= "20050820"
PREFERRED_VERSION_libgc ?= "6.7"
PREFERRED_VERSION_libgcrypt ?= "1.2.3"
PREFERRED_VERSION_libgeda ?= "20050820"
-PREFERRED_VERSION_libgemwidget ?= "0.1"
+PREFERRED_VERSION_libgemwidget ?= "1.0"
PREFERRED_VERSION_libglade ?= "2.6.2"
PREFERRED_VERSION_libglademm ?= "2.4.1"
PREFERRED_VERSION_libgmime ?= "2.1.7"
@@ -918,7 +918,7 @@ PREFERRED_VERSION_libhtml-mason-perl ?=
PREFERRED_VERSION_libhildonhelp ?= "1.9.1"
PREFERRED_VERSION_libhildonmime ?= "1.9.5"
PREFERRED_VERSION_libhtml-mason-perl ?= "1.35"
-PREFERRED_VERSION_libiac ?= "0.1"
+PREFERRED_VERSION_libiac ?= "1.0"
PREFERRED_VERSION_libice ?= "1.0.4"
PREFERRED_VERSION_libiconv ?= "1.11"
PREFERRED_VERSION_libid3 ?= "1.1"
@@ -946,7 +946,7 @@ PREFERRED_VERSION_libmikmod ?= "3.2.0-be
PREFERRED_VERSION_libmatchbox ?= "1.9"
PREFERRED_VERSION_libmath-bigint-gmp-perl ?= "1.18"
PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2"
-PREFERRED_VERSION_libmimedir ?= "0.3.1"
+PREFERRED_VERSION_libmimedir ?= "0.4.2"
PREFERRED_VERSION_libmng ?= "1.0.8"
PREFERRED_VERSION_libmodplug ?= "0.7"
PREFERRED_VERSION_libmodule-build-perl ?= "0.2805"
============================================================
--- conf/distro/include/sane-srcrevs.inc a5473bb5c86337913d9f630632a7ed94f804d24f
+++ conf/distro/include/sane-srcrevs.inc e323b12b054e9ead019c22ace5ac95039bf1d7e6
@@ -45,7 +45,7 @@ SRCREV_pn-linux-ixp4xx ?= "1021"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1021"
-SRCREV_pn-linux-openmoko ?= "3801"
+SRCREV_pn-linux-openmoko ?= "4014"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
SRCREV_pn-maemo-mapper ?= "118"
============================================================
--- conf/machine/atngw100.conf 3be4e9a4b5ba7595209dd7a081329f095488a40d
+++ conf/machine/atngw100.conf f8e16fd82334ed6e47de584e2bcbfbec63360ec3
@@ -22,3 +22,7 @@ KERNEL_IMAGETYPE = "uImage"
PREFERRED_VERSION_u-boot = "1.1.4"
KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "0x90000000"
+UBOOT_LOADADRESS = "0x10000000"
+
+
============================================================
--- conf/machine/h5000.conf b6fb552c41aeff2850cd35e5d3dfb99733e1e56d
+++ conf/machine/h5000.conf e03a562f647e39de325cf64e33abb934e96da504
@@ -27,7 +27,8 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
kernel-module-h5400-battery \
- kernel-module-snd-soc-h5000"
+ kernel-module-snd-soc-h5000 \
+ kernel-module-i2c-pxa"
#
# Modules autoload and other boot properties
============================================================
--- conf/machine/mpc8313e-rdb.conf f2%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rfe3ce31a0e6060324326d5a27cdba01788c95b7b -r29817a260e6a9fe06810b70340557576d2be9f57
#
#
#
# add_file "packages/xserver-common/files/ti-osk.patch"
# content [df20cd58aa35b3bd5976b322aab2eaf895cc8a1a]
#
# patch "packages/xserver-common/xserver-common_1.18.bb"
# from [3409a8ba366a252767d2dd923e81b9c7ea5c824d]
# to [e69696d1e49e2098413cfc6501b2281a99662042]
#
============================================================
--- packages/xserver-common/files/ti-osk.patch df20cd58aa35b3bd5976b322aab2eaf895cc8a1a
+++ packages/xserver-common/files/ti-osk.patch df20cd58aa35b3bd5976b322aab2eaf895cc8a1a
@@ -0,0 +1,12 @@
+diff -Naur xserver-common-1.18-orig/X11/Xserver xserver-common-1.18/X11/Xserver
+--- xserver-common-1.18-orig/X11/Xserver 2007-08-24 06:15:25.000000000 -0500
++++ xserver-common-1.18/X11/Xserver 2008-01-12 19:59:59.000000000 -0600
+@@ -76,6 +76,8 @@
+ ARGS="$ARGS -dpi 100 -rgba rgb" ;;
+ "Generic OMAP1510/1610/1710")
+ ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;;
++ "TI-OSK")
++ ARGS="$ARGS -dpi 100 -mouse tslib" ;;
+ "Cellon C8000 Board")
+ ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;;
+ "HTC Universal")
============================================================
--- packages/xserver-common/xserver-common_1.18.bb 3409a8ba366a252767d2dd923e81b9c7ea5c824d
+++ packages/xserver-common/xserver-common_1.18.bb e69696d1e49e2098413cfc6501b2281a99662042
@@ -9,7 +9,7 @@ inherit gpe
# we are using a gpe-style Makefile
inherit gpe
-SRC_URI_append = " file://unbreak-simpad.patch;patch=1 file://setDPI.sh "
+SRC_URI_append = " file://ti-osk.patch;patch=1 file://unbreak-simpad.patch;patch=1 file://setDPI.sh "
do_install_append() {
install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
More information about the Openembedded-commits
mailing list