Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev

5 files changed, 25 insertions, 15 deletions

diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index 0f6123a359..af9dc0ff9c 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,16 +1,15 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r6"
+MACHINE_KERNEL_PR = "r8"
 
 TARGET_ARCH = "arm"
 
 KERNEL_IMAGETYPE = "uImage"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
-PREFERRED_VERSION_u-boot = "git"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 UBOOT_MACHINE = "davinci_dvevm_config"
 
 UBOOT_ENTRYPOINT = "0x80008000"
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index 9e6f130c35..c185deb555 100644
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -11,7 +11,7 @@ USE_DEVFS = "0"
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
 
-MACHINE_KERNEL_PR = "r5"
+MACHINE_KERNEL_PR = "r8"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 SERIAL_CONSOLE = "ttyS0 115200"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 1249837ddb..8e90453d4c 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,13 +1,30 @@
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r36" 
+MACHINE_KERNEL_PR = "r37" 
 
 KERNEL_IMAGETYPE = "uImage"
 
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-EXTRA_IMAGEDEPENDS += "u-boot x-load"
+# Only build u-boot, xload is optional
+EXTRA_IMAGEDEPENDS += "u-boot"
 
 MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
+
+# TI DVSDK stuff:
+CODEC_INSTALL_DIR ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-omap3530"
+CODEC ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-omap3530"
+DSPCFG ?= "OMAP3530SHMEM"
+DSPLINKDSPCFG ?= "OMAP3530SHMEM"
+DSPLINKGPPOS ?= "OMAPLSP"
+GPPOS ?= "OMAPLSP"
+DSPLINKPLATFORM ?= "OMAP3530"
+DSPLINKSOC ?= "3530"
+DSPPOWERSOC ?= "omap3530"
+LPMDSPPOWERSOC ?= "omap3530"
+PLATFORM ?= "omap3530"
+TARGET ?= "o3530_al"
+XDC_PLATFORM ?= ti.platforms.evm3530
+
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 69589a0d60..ba923f9515 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -40,9 +40,10 @@ MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz kernel-module-px
 MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
 
-# For tosa only: wlan-ng Modules and OHCI suspend/resume fixup
+# For tosa: OHCI suspend/resume fixup
+# wlan-ng is now in kernel (2.6.29)
 # Fixme ? module-snd for tosa
-MACHINE_EXTRA_RRECOMMENDS_tosa = "wlan-ng-modules-usb apm-tosa-suspendfix"
+MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix"
 
 # Fixme ? module-snd for collie
 MACHINE_EXTRA_RRECOMMENDS_collie = ""
diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc
index 2ca00da9c7..d9f1c1ba85 100644
--- a/conf/machine/include/zaurus-kernel.inc
+++ b/conf/machine/include/zaurus-kernel.inc
@@ -6,13 +6,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 PREFERRED_PROVIDER_virtual/kernel_collie = "linux"
 PREFERRED_PROVIDER_virtual/kernel_tosa = "linux"
 
-# Increase PR everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r11"
-MACHINE_KERNEL_PR_collie = "r8"
-MACHINE_KERNEL_PR_tosa = "r4"
-
-MACHINE_KERNEL_PR_pn-linux-kexecboot = "r13"
-
 KERNEL_IMAGE_MAXSIZE = "1294336"
 KERNEL_IMAGE_MAXSIZE_collie = "1048576"