omap5912osk.conf : prepare for task-base stuff

defconfig : Update defconfig to follow git and enable dsp gateway
linux-omap1_2.6.x+git.bb : Fix problems in build process

3 files changed, 19 insertions, 9 deletions

diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index fc17985233..3ae0064c46 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -7,6 +7,8 @@ IPKG_EXTRA_ARCHS = "armv5te"
 
 HOTPLUG = "udev"
 
+#MACHINE_TASK_PROVIDER = "task-bootstrap"
+
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
diff --git a/packages/linux/linux-omap1-2.6.x+git/defconfig b/packages/linux/linux-omap1-2.6.x+git/defconfig
index ca2ac4ebd5..5edb8f25b1 100644
--- a/packages/linux/linux-omap1-2.6.x+git/defconfig
+++ b/packages/linux/linux-omap1-2.6.x+git/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-rc4-omap1
-# Wed Aug 30 10:58:22 2006
+# Linux kernel version: 2.6.18-omap1
+# Wed Sep 27 11:56:19 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -31,14 +31,14 @@ CONFIG_SYSVIPC=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-CONFIG_SYSCTL=y
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
@@ -46,12 +46,12 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
-CONFIG_RT_MUTEXES=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
 CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
@@ -141,6 +141,10 @@ 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
+CONFIG_OMAP_DSP=y
+# CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set
+# CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set
+# CONFIG_OMAP_DSP_FBEXPORT is not set
 
 #
 # OMAP Core Type
@@ -170,7 +174,6 @@ CONFIG_OMAP_ARM_192MHZ=y
 # CONFIG_OMAP_ARM_120MHZ is not set
 # CONFIG_OMAP_ARM_60MHZ is not set
 # CONFIG_OMAP_ARM_30MHZ is not set
-# CONFIG_OMAP_DSP is not set
 
 #
 # Processor Type
@@ -339,7 +342,6 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 
@@ -889,6 +891,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 # CONFIG_USB is not set
 
 #
+# Enable Host or Gadget support to see Inventra options
+#
+
+#
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
 
diff --git a/packages/linux/linux-omap1_2.6.x+git.bb b/packages/linux/linux-omap1_2.6.x+git.bb
index 9bc1b7c0a9..42bfa341d2 100644
--- a/packages/linux/linux-omap1_2.6.x+git.bb
+++ b/packages/linux/linux-omap1_2.6.x+git.bb
@@ -9,12 +9,14 @@ SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
 S = "${WORKDIR}/git"
 
 KERNEL_IMAGETYPE = "vmlinux"
-KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}"
 
 DEPENDS = "u-boot"
 
 inherit kernel
 
+KERNEL_OUTPUT = "${KERNEL_IMAGETYPE}"
+KERNEL_RELEASE = "2.6.18-omap1"
+
 COMPATIBLE_HOST = 'arm.*-linux'
 
 do_configure_prepend() {
@@ -28,7 +30,7 @@ do_configure_prepend() {
 do_deploy() {
         if [ "${MACHINE}" == "omap5912osk" ]; then
                 install -d ${DEPLOY_DIR_IMAGE}
-                arm-linux-objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux ${DEPLOY_DIR_IMAGE}/linux.bin
+                arm-linux-objcopy -O binary -R .note -R .comment -S ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/linux.bin
                 gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin
                 mkimage -A arm -O linux -T kernel -C gzip -a 0x10c08000 -e 0x10c08000 -n "OE" -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
                 rm ${DEPLOY_DIR_IMAGE}/linux.bin.gz