[oe-commits] org.oe.dev merge of '3b41e4e73158261f5bf7a4671ebe1acc90e80a9c'
oe commit
oe at amethyst.openembedded.net
Fri May 30 14:52:05 UTC 2008
merge of '3b41e4e73158261f5bf7a4671ebe1acc90e80a9c'
and '545cc6bcb45999e0577dbcf287bebfa887c83b9b'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 3d80d5e99ef4e42b4c77c24486de8fac537f1165
ViewMTN: http://monotone.openembedded.org/revision/info/3d80d5e99ef4e42b4c77c24486de8fac537f1165
Files:
1
packages/libmatthew/files
packages/linux/linux-omap1-2.6.25-omap1
packages/pkgconfig/pkgconfig-0.23
conf/machine/neuros-osd2.conf
packages/abiword/abiword_2.6.3.bb
packages/curl/curl-sdk_7.18.0.bb
packages/dbus-java/dbus-java_2.4.bb
packages/libmatthew/files/Makefile-0.7.patch
packages/libmatthew/libmatthew_0.7.bb
packages/linux/linux-omap1-2.6.25-omap1/defconfig
packages/linux/linux-omap1_2.6.25-omap1.bb
packages/linux/linux-omap2-git/beagleboard/0001-omap3beagle-add-a-platform-device-to-hook-up-the-GP.patch
packages/linux/linux-omap2-git/beagleboard/flash.patch
packages/pkgconfig/pkgconfig-0.23/autofoo.patch
packages/pkgconfig/pkgconfig-0.23/glibconfig-sysdefs.h
packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch
packages/pkgconfig/pkgconfig-sdk_0.23.bb
packages/zlib/zlib-sdk.inc
packages/zlib/zlib-sdk_1.2.3.bb
conf/distro/include/angstrom-2008-preferred-versions.inc
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/pkgconfig/pkgconfig.inc
packages/tasks/task-sdk-host.bb
packages/linux/linux-rt_2.6.25.bb
packages/linux/linux.inc
Diffs:
#
# mt diff -r3b41e4e73158261f5bf7a4671ebe1acc90e80a9c -r3d80d5e99ef4e42b4c77c24486de8fac537f1165
#
#
#
# add_dir "packages/libmatthew/files"
#
# add_dir "packages/linux/linux-omap1-2.6.25-omap1"
#
# add_dir "packages/pkgconfig/pkgconfig-0.23"
#
# add_file "conf/machine/neuros-osd2.conf"
# content [1c0968730bf1e80b5ed7fd3845c2ebbd407ec3a9]
#
# add_file "packages/abiword/abiword_2.6.3.bb"
# content [e1a10b5275d12dca63a83d0c19b8277c9cd110ea]
#
# add_file "packages/curl/curl-sdk_7.18.0.bb"
# content [ed2ecaaf51853c6ec6d8adf146a9c93fced16616]
#
# add_file "packages/dbus-java/dbus-java_2.4.bb"
# content [9e606b58fa7b7996d5de35d17f5c373e5ed79c01]
#
# add_file "packages/libmatthew/files/Makefile-0.7.patch"
# content [c415a2a3bccbc9d3b4781a8801557ee1d8d9560a]
#
# add_file "packages/libmatthew/libmatthew_0.7.bb"
# content [14a246a8f48391ed663d6bc440b6c11579d2bf16]
#
# add_file "packages/linux/linux-omap1-2.6.25-omap1/defconfig"
# content [0bb5bd9ca375be15ce92f225df5e10d3bbc43a37]
#
# add_file "packages/linux/linux-omap1_2.6.25-omap1.bb"
# content [3f880506329a1054b2ab693fa4e90e4dff2d5b70]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/0001-omap3beagle-add-a-platform-device-to-hook-up-the-GP.patch"
# content [b0b565d62f76114d9eb4ce37fc8e191699e6024c]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/flash.patch"
# content [178d61ff76fbe7fffe3974d659d677439e070225]
#
# add_file "packages/pkgconfig/pkgconfig-0.23/autofoo.patch"
# content [ac9271cf45243c678be6d3aa6f7daabfacc4e70f]
#
# add_file "packages/pkgconfig/pkgconfig-0.23/glibconfig-sysdefs.h"
# content [372a1bb7b434a2d33536de584a8e41604dd5fe1e]
#
# add_file "packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch"
# content [4fdfc33f2c6e1b7d10dc54ac1c710036a46baee4]
#
# add_file "packages/pkgconfig/pkgconfig-sdk_0.23.bb"
# content [056f414e305029ccb846930c8bdaf00f04c60300]
#
# add_file "packages/zlib/zlib-sdk.inc"
# content [ffed71a30566922bde7d5050dfdd74d867a554f2]
#
# add_file "packages/zlib/zlib-sdk_1.2.3.bb"
# content [36a9c14b653c1a461bf5365f4894eb10cdd4f928]
#
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
# from [14c6b4a552e2c80acee490345dee361941a819ac]
# to [0ce7f510a27ef0498c808c5d370ab46f5830f434]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [2aafda9a94285e1f028bf5b138b0b60355509e06]
# to [43099c2691de9dc1254203fe8f93ca85fbbcc1d3]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [f974b6ddb18fc07f4c03a0dde33905f2e4345ed1]
# to [d636d3d58625d7d6926d41fa08350a1787650cb7]
#
# patch "packages/pkgconfig/pkgconfig.inc"
# from [0ece4b8bbbb948f1b3372afcc62020beabcbd2fe]
# to [a8c84b8e716d79aae861977ee313a4e0922ebf85]
#
# patch "packages/tasks/task-sdk-host.bb"
# from [d8cf93c8023c6249cd6499a8ca3ffe51abcac72f]
# to [517b74709c44a4b287947fed2904aea3b1522254]
#
============================================================
--- conf/machine/neuros-osd2.conf 1c0968730bf1e80b5ed7fd3845c2ebbd407ec3a9
+++ conf/machine/neuros-osd2.conf 1c0968730bf1e80b5ed7fd3845c2ebbd407ec3a9
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: neuros OSD2
+#@DESCRIPTION: neuros OSD2
+
+TARGET_ARCH = "arm"
+
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
+
+PREFERRED_VERSION_u-boot = "git"
+#UBOOT_MACHINE = "davinci_dvevm_config"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+ROOT_FLASH_SIZE = "29"
+
+MACHINE_FEATURES = "kernel26 pcmcia usbhost screen"
+
+require conf/machine/include/tune-arm926ejs.inc
+
============================================================
--- packages/abiword/abiword_2.6.3.bb e1a10b5275d12dca63a83d0c19b8277c9cd110ea
+++ packages/abiword/abiword_2.6.3.bb e1a10b5275d12dca63a83d0c19b8277c9cd110ea
@@ -0,0 +1,3 @@
+require abiword-2.5.inc
+
+RCONFLICTS = "abiword-embedded"
============================================================
--- packages/curl/curl-sdk_7.18.0.bb ed2ecaaf51853c6ec6d8adf146a9c93fced16616
+++ packages/curl/curl-sdk_7.18.0.bb ed2ecaaf51853c6ec6d8adf146a9c93fced16616
@@ -0,0 +1,14 @@
+require curl_${PV}.bb
+inherit sdk
+DEPENDS = "zlib-sdk"
+
+do_stage () {
+ install -d ${STAGING_INCDIR}/curl
+ install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
+ oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
+}
+
+do_install() {
+ :
+}
+
============================================================
--- packages/dbus-java/dbus-java_2.4.bb 9e606b58fa7b7996d5de35d17f5c373e5ed79c01
+++ packages/dbus-java/dbus-java_2.4.bb 9e606b58fa7b7996d5de35d17f5c373e5ed79c01
@@ -0,0 +1,87 @@
+DESCRIPTION = "A pure Java D-Bus Implementation"
+DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)"
+DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)"
+AUTHOR = "Matthew Johnson <dbus at matthew.ath.cx>"
+HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
+SECTION = "libs"
+LICENSE = "GPLv2 AFL"
+DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
+RDEPENDS_dbus-java-viewer = "java2-runtime libmatthew-java ${JPN}"
+RDEPENDS_dbus-java-bin = "java2-runtime libmatthew-java ${JPN}"
+RSUGGESTS_libdbus-java = "libmatthew-java dbus"
+PR = "r0"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz"
+
+S = "${WORKDIR}/dbus-java-${PV}"
+
+inherit java-library
+
+do_compile () {
+ # run target .binclasses first to fix a brokenness in the Makefile
+ oe_runmake \
+ JCFLAGS="-source 1.5" \
+ JAVAC="javac" \
+ JARPREFIX="${STAGING_DATADIR_JAVA}" \
+ JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
+ CLASSPATH="${S}/classes" \
+ JAR="fastjar" \
+ .binclasses
+ oe_runmake \
+ JCFLAGS="-source 1.5" \
+ JAVAC="javac" \
+ JARPREFIX="${STAGING_DATADIR_JAVA}" \
+ JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
+ CLASSPATH="${S}/classes" \
+ JAR="fastjar" \
+ all
+ # Generated shell scripts will have staging paths inside them.
+ rm bin/*
+ # Generate them again with target paths.
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ JARPREFIX=${datadir_java} \
+ JAVAUNIXPATH=${datadir_java} \
+ all
+ # Trigger generation of all documentation files to prevent this
+ # being happen at the target 'install-man' in do_install.
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ JARPREFIX=${datadir_java} \
+ JAVAUNIXPATH=${datadir_java} \
+ CreateInterface.1 ListDBus.1 DBusDaemon.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL DBusCall.1
+}
+
+do_install () {
+ oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar
+ oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar
+ oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar
+ install -d ${D}${bindir}
+ install bin/DBusViewer ${D}${bindir}
+ install bin/DBusCall ${D}${bindir}
+ install bin/CreateInterface ${D}${bindir}
+ install bin/ListDBus ${D}${bindir}
+ install bin/DBusDaemon ${D}${bindir}
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ MANPREFIX=${D}${mandir} \
+ DOCPREFIX=${D}${docdir}/${JPN} \
+ install-man
+}
+
+do_stage () {
+ oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar
+}
+
+PACKAGE_ARCH = "all"
+# ${JPN} must be last otherwise it would pick up dbus-viewer*.jar
+# and dbus-bin*.jar
+PACKAGES = "dbus-java-viewer dbus-java-viewer-doc dbus-java-bin dbus-java-bin-doc ${JPN}"
+
+FILES_dbus-java-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer"
+FILES_dbus-java-viewer-doc = "${mandir}/DBusViewer*"
+FILES_dbus-java-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}"
+FILES_dbus-java-bin-doc = "${mandir} ${docdir}/${JPN}"
============================================================
--- packages/libmatthew/files/Makefile-0.7.patch c415a2a3bccbc9d3b4781a8801557ee1d8d9560a
+++ packages/libmatthew/files/Makefile-0.7.patch c415a2a3bccbc9d3b4781a8801557ee1d8d9560a
@@ -0,0 +1,15 @@
+Index: libmatthew-java-0.7/Makefile
+===================================================================
+--- libmatthew-java-0.7.orig/Makefile 2008-05-27 13:17:47.000000000 +0800
++++ libmatthew-java-0.7/Makefile 2008-05-27 13:18:04.000000000 +0800
+@@ -8,8 +8,8 @@
+ PPFLAGS+=-C -P
+ CFLAGS+=-fpic -Wall -Os -pedantic -std=c99 -Werror
+ GCJFLAGS+=-fjni
+-JCFLAGS+=-source 5.0
+-INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
++#JCFLAGS+=-source 5.0
++#INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+ JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/
+
+ LDVER?=$(shell ld -v | cut -d' ' -f1)
============================================================
--- packages/libmatthew/libmatthew_0.7.bb 14a246a8f48391ed663d6bc440b6c11579d2bf16
+++ packages/libmatthew/libmatthew_0.7.bb 14a246a8f48391ed663d6bc440b6c11579d2bf16
@@ -0,0 +1,50 @@
+DESCRIPTION = "Unix socket, debug and hexdump libraries"
+AUTHOR = "Matthew Johnson <web at matthew.ath.cx>"
+HOMEPAGE = "http://www.matthew.ath.cx/projects/java"
+SECTION = "libs"
+LICENSE = "LGPL"
+DEPENDS = "classpath-native classpath fastjar-native virtual/javac-native"
+RDEPENDS_${JPN} = "${PN}-jni"
+PR = "r0"
+
+SRC_URI = "http://www.matthew.ath.cx/projects/java/libmatthew-java-${PV}.tar.gz \
+ file://Makefile-0.7.patch;patch=1"
+
+S = "${WORKDIR}/libmatthew-java-${PV}"
+
+inherit java-library
+
+do_compile() {
+ oe_runmake \
+ JCFLAGS="-source 1.5" \
+ JAVAC="javac" \
+ JAR="fastjar" \
+ JAVAH="gjavah" \
+ INCLUDES="-I${STAGING_INCDIR}/classpath" \
+ LDFLAGS="-fpic -shared -lc ${LDFLAGS}" \
+ LD="${CC}" \
+ CFLAGS="-fpic -Wall -Os -pedantic -std=c99 -Werror"
+}
+do_install() {
+ oe_jarinstall cgi-0.5.jar cgi.jar
+ oe_jarinstall debug-disable-1.1.jar debug-disable.jar
+ oe_jarinstall debug-enable-1.1.jar debug-enable.jar
+ oe_jarinstall hexdump-0.2.jar hexdump.jar
+ oe_jarinstall io-0.1.jar io.jar
+ oe_jarinstall unix-0.4.jar unix.jar
+ oe_libinstall -so libcgi-java ${D}${libdir_jni}
+ oe_libinstall -so libunix-java ${D}${libdir_jni}
+}
+do_stage() {
+ oe_jarinstall -s cgi-0.5.jar cgi.jar
+ oe_jarinstall -s debug-disable-1.1.jar debug-disable.jar
+ oe_jarinstall -s debug-enable-1.1.jar debug-enable.jar
+ oe_jarinstall -s hexdump-0.2.jar hexdump.jar
+ oe_jarinstall -s io-0.1.jar io.jar
+ oe_jarinstall -s unix-0.4.jar unix.jar
+}
+
+PACKAGES += "${PN}-jni ${PN}-jni-dbg"
+
+FILES_${PN}-jni = "${libdir_jni}/lib*.so"
+FILES_${PN}-jni-dbg = "${libdir_jni}/.debug/lib*.so"
============================================================
--- packages/linux/linux-omap1-2.6.25-omap1/defconfig 0bb5bd9ca375be15ce92f225df5e10d3bbc43a37
+++ packages/linux/linux-omap1-2.6.25-omap1/defconfig 0bb5bd9ca375be15ce92f225df5e10d3bbc43a37
@@ -0,0 +1,1204 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.25-omap1
+# Thu May 29 14:43:54 2008
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_SUPPORTS_AOUT=y
+CONFIG_ZONE_DMA=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+CONFIG_NAMESPACES=y
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_CLASSIC_RCU=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_ORION is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_DAVINCI is not set
+CONFIG_ARCH_OMAP=y
+# CONFIG_ARCH_MSM7X00A is not set
+
+#
+# TI OMAP Implementations
+#
+CONFIG_ARCH_OMAP_OTG=y
+CONFIG_ARCH_OMAP1=y
+# CONFIG_ARCH_OMAP2 is not set
+# CONFIG_ARCH_OMAP3 is not set
+
+#
+# OMAP Feature Selections
+#
+CONFIG_OMAP_DEBUG_SRAM_PATCH=y
+CONFIG_OMAP_RESET_CLOCKS=y
+# CONFIG_OMAP_BOOT_TAG is not set
+# CONFIG_OMAP_GPIO_SWITCH is not set
+CONFIG_OMAP_MUX=y
+# CONFIG_OMAP_MUX_DEBUG is not set
+CONFIG_OMAP_MUX_WARNINGS=y
+CONFIG_OMAP_MCBSP=y
+# CONFIG_OMAP_MMU_FWK is not set
+# CONFIG_OMAP_MBOX_FWK is not set
+# CONFIG_OMAP_MPU_TIMER is not set
+CONFIG_OMAP_32K_TIMER=y
+CONFIG_OMAP_32K_TIMER_HZ=128
+# CONFIG_OMAP_DM_TIMER is not set
+CONFIG_OMAP_LL_DEBUG_UART1=y
+# CONFIG_OMAP_LL_DEBUG_UART2 is not set
+# CONFIG_OMAP_LL_DEBUG_UART3 is not set
+CONFIG_OMAP_SERIAL_WAKE=y
+
+#
+# OMAP Core Type
+#
+# CONFIG_ARCH_OMAP730 is not set
+# CONFIG_ARCH_OMAP15XX is not set
+CONFIG_ARCH_OMAP16XX=y
+
+#
+# OMAP Board Type
+#
+# CONFIG_MACH_OMAP_INNOVATOR is not set
+# CONFIG_MACH_OMAP_H2 is not set
+# CONFIG_MACH_OMAP_H3 is not set
+CONFIG_MACH_OMAP_OSK=y
+# CONFIG_OMAP_OSK_MISTRAL is not set
+# CONFIG_MACH_NOKIA770 is not set
+# CONFIG_MACH_OMAP_GENERIC is not set
+
+#
+# OMAP CPU Speed
+#
+# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set
+# CONFIG_OMAP_ARM_216%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r545cc6bcb45999e0577dbcf287bebfa887c83b9b -r3d80d5e99ef4e42b4c77c24486de8fac537f1165
#
#
#
# patch "packages/linux/linux-rt_2.6.25.bb"
# from [d71c0c64eb3d4d683d39fd523a6b6c11058fc74c]
# to [4751e7e5accade67eb352aa496eeb9d61b4c2c24]
#
# patch "packages/linux/linux.inc"
# from [f1aa05046da57692f765c8cf904367093ee01958]
# to [2d4e2851e31c00ffa8a1225499423c951b36971d]
#
============================================================
--- packages/linux/linux-rt_2.6.25.bb d71c0c64eb3d4d683d39fd523a6b6c11058fc74c
+++ packages/linux/linux-rt_2.6.25.bb 4751e7e5accade67eb352aa496eeb9d61b4c2c24
@@ -6,11 +6,11 @@ DEFAULT_PREFERENCE_mpc8315e-rdb = "1"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_mpc8315e-rdb = "1"
-PR = "r0"
+PR = "r1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.25.4.bz2;patch=1;p=1 \
- ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/patch-2.6.25.4-rt3.bz2;patch=1;p=1 \
+ ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/patch-2.6.25.4-rt4.bz2;patch=1;p=1 \
file://defconfig"
S = "${WORKDIR}/linux-2.6.25"
============================================================
--- packages/linux/linux.inc f1aa05046da57692f765c8cf904367093ee01958
+++ packages/linux/linux.inc 2d4e2851e31c00ffa8a1225499423c951b36971d
@@ -21,6 +21,7 @@ KERNEL_DEVICETREE_mpc8313e-rdb = "arch/$
# Support for binary device tree generation
KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
+KERNEL_DEVICETREE_mpc8315e-rdb = "arch/${ARCH}/boot/dts/mpc8315erdb.dts"
KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
KERNEL_DEVICETREE_kilauea = "arch/${ARCH}/boot/dts/kilauea.dts"
KERNEL_DEVICETREE_sequoia = "arch/${ARCH}/boot/dts/sequoia.dts"
More information about the Openembedded-commits
mailing list