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

9 files changed, 85 insertions, 25 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 7d2ac2cb28..c38cfc02ff 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -9570,6 +9570,10 @@ sha256=79e3618edd959e29c877b9f8b0c9156d8249d725096582dffdd5308ba6a0e645
 md5=398729b82b911eebb14156c2fa02525b
 sha256=05d83a609aaea44ea8c979897f336cb8b5537a39b271af2831e6cca3851d3007
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.11.tar.bz2]
+md5=75a3359ece6a1c11a9e5463d79e274e8
+sha256=b50072ff6f36087b8ecebf509e6d44ab2e91292b1a3a5806a7f1437a382723e9
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.3.tar.bz2]
 md5=8545a02c408976c5e9f0c2cf3c6a362e
 sha256=648f1ef813c64c7eedd45d164eb41ba21366bba8ec5fcbff3100458721be489e
@@ -9618,6 +9622,10 @@ sha256=673f4a45a0f3aa99606a58097bde02d09ad51d7b2e702f0d68eeb6db21d47e93
 md5=5d0f1e07f8f6db564971b50f75261e8a
 sha256=184c5aed03ebfe38a276fc03cb7d8685d9a6da5a48bf6a0565c83e11a29cd5f9
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.23.tar.bz2]
+md5=641cc7def2d8667b9b4df15e69dba25f
+sha256=1c11d98eb9a1b1bc54becf465e74c2aa4019bb57a31dd70686269af6a9b9e93b
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.5.tar.bz2]
 md5=2b5958fb0baaf8d1b4eae18f7b13d49b
 sha256=fe2fb4fe446a1d3f8ccd4284ae7ffd25cb9f1b836b3d0e29d2494d10c1ae3eac
@@ -9642,6 +9650,10 @@ sha256=05323f065080e3df5f5c9cadceca977598ba106b3eebf2bbec46099becf796b1
 md5=27f27151ccefad1157c9eaa322e14ac4
 sha256=dfffb80ef01b8fee9af3576311e65b60c378d9985099dea532be090ede54ebaa
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.14.tar.bz2]
+md5=a861ccbb90a176d1242608502f45f0ac
+sha256=12205d01cb99900ed6f936a09ac31b5849f8a7ff3c9a93e5857a76dc3e30788a
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.2.tar.bz2]
 md5=03d3d0b5f19014fe0065234a3ea65ee6
 sha256=dd92993d08930cca071893b5d3f5cb40a4498f3ddaf12da98c0bbe8c27605e81
@@ -9670,6 +9682,10 @@ sha256=077bb0e095e5dd6dd16d697efd8d51761f3b5418efc808ed6ca7c60b34df51f8
 md5=031205d5599fce73fc36766f928b2515
 sha256=ced80afedd105cb9b1b72749f8bda29c71fa9eda06120d6b07e7362f705c9987
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.11.tar.bz2]
+md5=dfe2e201e066a3e86a9598b6769d9739
+sha256=681d3cf7ae124bff1949187db858e5439a41be162bdad59dd69b52b70fd62dfa
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.2.tar.bz2]
 md5=cf604b6acd80b57dc5173db7e93fc116
 sha256=c882c7485faec9803d2f61efbaedd02742e78d224a7d29d61a0a884cd962a09f
@@ -9742,6 +9758,10 @@ sha256=94c185a0452b5fcddb538f6b686ff959b7afca8340c48fdbe47c87a2a459c3d3
 md5=35dd8598837af4074753afe5b59e8ef2
 sha256=61489e0192b1362e6dc760154204c73c1edd9ad9d8c754535483ec00ad7e389e
 
+[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.23.tar.bz2]
+md5=f7b2e300d2d85756407ec529424ab237
+sha256=cf750821040102d2c9fbfed56472a86fd0d8c24ada37901c41867c88438a776d
+
 [http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.4.tar.bz2]
 md5=263a7800ecf44d0f38d0cbc80bce65ff
 sha256=7b8add7db1e0b0e3671f374469ef32b151fa96bc9eb2aa265eefd79548752ffc
@@ -24798,6 +24818,10 @@ sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4
 md5=6eba3b46ff77b99c44f93d2a08cc6935
 sha256=e1e2b2ffe37e1c70829eef55f700cf3cffd49b3b3e0e2d3bb47c2cdd5db5adf6
 
+[http://www.conan.de/touchscreen/xf86-input-evtouch-0.8.8.tar.bz2]
+md5=4d8e092356d8353002f60a4907046c13
+sha256=eafc4a09729a4b2b6120430c71e1954c5cac299ad6adf2f9a40aee8a7b51e476
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-1.1.0.tar.bz2]
 md5=a31066a2076d18619ceaea67f6d89698
 sha256=8ee3b2df90516182460fbda025153aa7fb2c6ba343e4239d225963a287f694f8
diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf
index 3c21c546b1..956e3f47b5 100644
--- a/conf/machine/cm-x270.conf
+++ b/conf/machine/cm-x270.conf
@@ -4,7 +4,6 @@
 TARGET_ARCH = "arm"
 GUI_MACHINE_CLASS ?= "bigscreen"
 
-
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 
 PACKAGE_EXTRA_ARCHS = " iwmmxt"
diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf
deleted file mode 100644
index f52efc2aab..0000000000
--- a/conf/machine/davinci-dvevm.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#@TYPE: Machine
-#@NAME: DM6446 cpu on a Davinci EVM board
-#@DESCRIPTION: Machine configuration for the TI Davinci EVM board
-
-TARGET_ARCH = "arm"
-
-HOTPLUG = "udev"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-
-#PREFERRED_VERSION_u-boot = "1.3.2"
-UBOOT_MACHINE = "davinci_dvevm_config"
-UBOOT_ENTRYPOINT="0x80008000"
-
-SERIAL_CONSOLE ?= "115200 ttyS0"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
-
-#ROOT_FLASH_SIZE = "29"
-
-MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa"
-
-require conf/machine/include/tune-arm926ejs.inc
-
diff --git a/conf/machine/dm355-evm.conf b/conf/machine/dm355-evm.conf
new file mode 100644
index 0000000000..d509152b22
--- /dev/null
+++ b/conf/machine/dm355-evm.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: DM355 CPUs on a Davinci DM355 EVM board
+#@DESCRIPTION: Machine configuration for the TI Davinci DM355 EVM board
+
+require conf/machine/include/davinci.inc
+
+UBOOT_MACHINE = "davinci_dvevm_config"
diff --git a/conf/machine/dm357-evm.conf b/conf/machine/dm357-evm.conf
new file mode 100644
index 0000000000..85e396ec1a
--- /dev/null
+++ b/conf/machine/dm357-evm.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: DM357 CPUs on a Davinci DM357 EVM board
+#@DESCRIPTION: Machine configuration for the TI Davinci DM357 EVM board
+
+require conf/machine/include/davinci.inc
+
+UBOOT_MACHINE = "davinci_dvevm_config"
diff --git a/conf/machine/dm365-evm.conf b/conf/machine/dm365-evm.conf
new file mode 100644
index 0000000000..09f4a353ca
--- /dev/null
+++ b/conf/machine/dm365-evm.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: DM365 CPUs on a Davinci DM365 EVM board
+#@DESCRIPTION: Machine configuration for the TI Davinci DM365 EVM board
+
+require conf/machine/include/davinci.inc
+
+UBOOT_MACHINE = "davinci_dvevm_config"
diff --git a/conf/machine/dm6446-evm.conf b/conf/machine/dm6446-evm.conf
new file mode 100644
index 0000000000..8b048a5474
--- /dev/null
+++ b/conf/machine/dm6446-evm.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: DM644x CPUs on a Davinci DM6446 EVM board
+#@DESCRIPTION: Machine configuration for the TI Davinci DM6446 EVM board
+
+require conf/machine/include/davinci.inc
+
+UBOOT_MACHINE = "davinci_dvevm_config"
diff --git a/conf/machine/dm6467-evm.conf b/conf/machine/dm6467-evm.conf
new file mode 100644
index 0000000000..66ed1fe1f2
--- /dev/null
+++ b/conf/machine/dm6467-evm.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: DM646x CPUs on a Davinci HD DM6467 EVM board
+#@DESCRIPTION: Machine configuration for the TI Davinci HD DM6467 EVM board
+
+require conf/machine/include/davinci.inc
+
+UBOOT_MACHINE = "davinci_dvevm_config"
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
new file mode 100644
index 0000000000..295a9c7007
--- /dev/null
+++ b/conf/machine/include/davinci.inc
@@ -0,0 +1,26 @@
+require conf/machine/include/tune-arm926ejs.inc
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r0"
+
+TARGET_ARCH = "arm"
+
+KERNEL_IMAGETYPE = "uImage"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+PREFERRED_VERSION_u-boot = "git"
+UBOOT_MACHINE = "davinci_dvevm_config"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+#EXTRA_IMAGEDEPENDS += "u-boot ubl"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+#ROOT_FLASH_SIZE = "29"
+
+MACHINE_FEATURES = "kernel26 serial ethernet usbhost usbgadget mmc alsa"