aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorKoen Kooi <k-kooi@ti.com>2009-11-16 10:17:24 +0100
committerKoen Kooi <koen@openembedded.org>2009-12-04 19:46:02 +0100
commitb788499815bfc1974d4277c0a261b9a7c24aa816 (patch)
tree6c0546c0891d884f835355d851ec07147165ddd2 /conf
parent08dcecdc77ceb6a3673605216493905859f11982 (diff)
downloadopenembedded-b788499815bfc1974d4277c0a261b9a7c24aa816.tar.gz
recipes/ti: merge in updates
* New codec recipes from Arago team in Germantown * Updated dm6446 and dm355 from Brijesh Singh * cmem, gst-ti and dmai fixes from Brijesh Singh angstrom: introduce SOC_FAMILY and start using it TI recipes as a testing ground * SOC_FAMILY tells you which system on chip is used in the MACHINE, e.g. omap3, dm355, pxa25x, s3c24xx. This avoids having to duplicate lots of overrides in machine specific recipes. This is *NOT* intended to be used as a package arch.
Diffstat (limited to 'conf')
-rw-r--r--conf/checksums.ini16
-rw-r--r--conf/distro/include/angstrom.inc6
-rw-r--r--conf/machine/da830-omapl137-evm.conf1
-rw-r--r--conf/machine/da850-omapl138-evm.conf1
-rw-r--r--conf/machine/davinci-sffsdr.conf1
-rw-r--r--conf/machine/dm365-evm.conf1
-rw-r--r--conf/machine/dm6446-evm.conf1
-rw-r--r--conf/machine/include/davinci.inc2
-rw-r--r--conf/machine/include/dm355.inc9
-rw-r--r--conf/machine/include/dm365.inc12
-rw-r--r--conf/machine/include/dm6446.inc13
-rw-r--r--conf/machine/include/omap3.inc13
-rw-r--r--conf/machine/include/omapl137.conf2
-rw-r--r--conf/machine/include/omapl138.conf1
-rw-r--r--conf/machine/neuros-osd2.conf1
15 files changed, 60 insertions, 20 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index ca1c6b1aec..e195a71a40 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -7678,6 +7678,10 @@ sha256=44b7e18ba9ae5667dd64c89f7b04627bda5807a3a90255a125702d63c0c4ee17
md5=d5e8be59e307cef76bc479e1684df705
sha256=9f3b3ed7c9fffccefefa9af432eee7244a65592118851f75b5897814cb79b86f
+[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/fc/2_25_00_04/exports/framework_components_2_25_00_04.tar.gz]
+md5=11410b5cf4142ae415b683af0e9929b5
+sha256=161432f5cf184f96de290f807a4a6fddf11f2612d5b2efd91f8187c0ac612a40
+
[http://downloads.sourceforge.net/free42/free42.tgz]
md5=1fc21e04b3b77150846027dc7cb5210d
sha256=9d348a9d2d5bf8eabc7e7bb6f0907e611403e4abe6dc1e11b1b2ad1118b3088a
@@ -17406,6 +17410,10 @@ sha256=e4b6ab08eaff2766c3bf85ea8d63ab31ae774266b8351772117fcc94d1318ade
md5=de958cdb8d00e74792dd69f3c945b037
sha256=371f8133db705bde6c2f79cccb0b1a1f626a0d94bf41acceba5d76a69155f057
+[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/linuxutils/2_25_01_06/exports/linuxutils_2_25_01_06.tar.gz]
+md5=15486b27c9960f06b53f8a60e90f941d
+sha256=61b86cdb5c1b2f9eb766fece6ea5ae89f29cf84d0c3eecbcc9b5d0ffd42d2bcb
+
[http://gpephone.linuxtogo.org/download/gpephone/liblipsevent-0.1/lips_event-0.1.tar.gz]
md5=1fd0f41f9676ef0c882921bc37628d07
sha256=7182cf3f63e11e7ea6c6a994f9e70ef3bf6e430a5db643f5b29a0fd0996ddfd5
@@ -27938,6 +27946,10 @@ sha256=8290616302932e72d4224cbe27d872efa5f44b0b8553ded0bbfb3537abe76907
md5=59d8d79fb950a55722c0089496fd18b1
sha256=ae38043c9dbf99a516f4edc58ef6235ceba975d8b5f374244a2b3e96793d7d5a
+[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais/6_23/exports/xdais_6_23.tar.gz]
+md5=09b0a14b9f8fb98686a98857eedd10a1
+sha256=12e60870930d9392c37dabdd25988e6dd5fb66ce0fe1e3b0d72250c90c8c26b7
+
[http://xorg.freedesktop.org/releases/individual/app/xdbedizzy-1.0.2.tar.bz2]
md5=ecef9cfd197d00980e0d69ee4126d890
sha256=74e882e9fee7ebeb274caf43071afff92531b8a41f34650376146a131166012d
@@ -27958,6 +27970,10 @@ sha256=d398bfb7a5d9657b802db835c28db892ec8fe54cf332420edef0b3ba1c231fcb
md5=c7cd094cdc49459018b6f0e1eb95af30
sha256=0d5fbc8cfdaa968090ad11b0b84cfb122e2a1c54c4d261fd722b27c6d6972c23
+[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/xdctools_3_15/exports/xdctools_setuplinux_3_15_01_59.bin]
+md5=c7cd094cdc49459018b6f0e1eb95af30
+sha256=0d5fbc8cfdaa968090ad11b0b84cfb122e2a1c54c4d261fd722b27c6d6972c23
+
[http://gpe.linuxtogo.org/download/source/xdemineur-2.1.1.tar.bz2]
md5=b3884eaec59a63691f66bc29ce57a56d
sha256=75378ad3eacbe32c625de3b4af3e1f6fc9772ab45c1cd1393483d95ac4da3b22
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 6e65285e99..8647dd7ec4 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -11,8 +11,10 @@ BUILDNAME = "Angstrom ${DISTRO_VERSION}"
TARGET_VENDOR = "-angstrom"
-# Add FEED_ARCH to overrides
-OVERRIDES .= ":${FEED_ARCH}"
+SOC_FAMILY ?= "Unknown"
+
+# Add FEED_ARCH and SOC_FAMILY to overrides
+OVERRIDES .= ":${FEED_ARCH}:${SOC_FAMILY}"
# Put links to sources in deploy/sources to make it easier for people to be GPL compliant
INHERIT += "src_distribute_local"
diff --git a/conf/machine/da830-omapl137-evm.conf b/conf/machine/da830-omapl137-evm.conf
index 4df4d63cca..0164e1c27d 100644
--- a/conf/machine/da830-omapl137-evm.conf
+++ b/conf/machine/da830-omapl137-evm.conf
@@ -3,6 +3,7 @@
#@DESCRIPTION: Machine configuration for the TI DA830/OMAPL137 EVM board
require conf/machine/include/davinci.inc
+require conf/machine/include/omapl137.inc
UBOOT_MACHINE = "da830_omapl137_evm_config"
UBOOT_ENTRYPOINT = "0xc0008000"
diff --git a/conf/machine/da850-omapl138-evm.conf b/conf/machine/da850-omapl138-evm.conf
index bbcb45002e..746518b355 100644
--- a/conf/machine/da850-omapl138-evm.conf
+++ b/conf/machine/da850-omapl138-evm.conf
@@ -3,6 +3,7 @@
#@DESCRIPTION: Machine configuration for the TI DA850/OMAPL138 EVM board
require conf/machine/include/davinci.inc
+require conf/machine/include/omapl137.inc
UBOOT_MACHINE = "da850_omapl138_evm_config"
UBOOT_ENTRYPOINT = "0xc0008000"
diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf
index e3c0554f71..63fc2cacc4 100644
--- a/conf/machine/davinci-sffsdr.conf
+++ b/conf/machine/davinci-sffsdr.conf
@@ -28,4 +28,5 @@ MACHINE_FEATURES = "kernel26 serial"
#MACHINE_EXTRA_RRECOMMENDS = "dsplink-module"
require conf/machine/include/tune-arm926ejs.inc
+require conf/machine/include/dm6446.inc
diff --git a/conf/machine/dm365-evm.conf b/conf/machine/dm365-evm.conf
index 7cea5dc727..1fd51234e2 100644
--- a/conf/machine/dm365-evm.conf
+++ b/conf/machine/dm365-evm.conf
@@ -3,5 +3,6 @@
#@DESCRIPTION: Machine configuration for the TI Davinci DM365 EVM board
require conf/machine/include/davinci.inc
+require conf/machine/include/dm365.inc
UBOOT_MACHINE = "davinci_dm365evm_config"
diff --git a/conf/machine/dm6446-evm.conf b/conf/machine/dm6446-evm.conf
index 8b048a5474..aaa7492991 100644
--- a/conf/machine/dm6446-evm.conf
+++ b/conf/machine/dm6446-evm.conf
@@ -3,5 +3,6 @@
#@DESCRIPTION: Machine configuration for the TI Davinci DM6446 EVM board
require conf/machine/include/davinci.inc
+require conf/machine/include/dm6446.inc
UBOOT_MACHINE = "davinci_dvevm_config"
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index ceafa800b2..3f8254aff4 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
require conf/machine/include/tune-arm926ejs.inc
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r12"
+MACHINE_KERNEL_PR = "r28"
TARGET_ARCH = "arm"
diff --git a/conf/machine/include/dm355.inc b/conf/machine/include/dm355.inc
index dffafe4460..d666d5e030 100644
--- a/conf/machine/include/dm355.inc
+++ b/conf/machine/include/dm355.inc
@@ -1,9 +1,2 @@
-
-DEVICES = "DM355"
-GPPOS = "LINUX_GCC"
-PLATFORM = "dm355"
-PROGRAMS = "APP_LOCAL"
-TARGET = "dm355_al"
-XDC_PLATFORM = ti.platforms.evmDM355
-
+SOC_FAMILY = "dm355"
diff --git a/conf/machine/include/dm365.inc b/conf/machine/include/dm365.inc
new file mode 100644
index 0000000000..c53680ea63
--- /dev/null
+++ b/conf/machine/include/dm365.inc
@@ -0,0 +1,12 @@
+SOC_FAMILY = "dm365"
+
+
+# DMAI
+PLATFORM = "dm365"
+XDC_PLATFORM = ti.platforms.evmDM365
+
+# Obsoleted (CE examples rebuild)
+#GPPOS = "LINUX_GCC"
+
+# DMAI recipe
+#TARGET = "dm365_al"
diff --git a/conf/machine/include/dm6446.inc b/conf/machine/include/dm6446.inc
new file mode 100644
index 0000000000..c14e573c74
--- /dev/null
+++ b/conf/machine/include/dm6446.inc
@@ -0,0 +1,13 @@
+SOC_FAMILY = "dm6446"
+
+# TI DVSDK stuff:
+DSPCFG ?= "DM6446GEMSHMEM"
+DSPLINKDSPCFG ?= "DM6446GEMSHMEM"
+DSPLINKGPPOS ?= "MVL5G"
+DSPLINKPLATFORM ?= "DAVINCI"
+DSPLINKSOC ?= "DM6446"
+DSPPOWERSOC ?= "DM6446"
+GPPOS ?= "LINUX_GCC"
+PLATFORM ?= "dm6446"
+XDC_PLATFORM ?= "ti.platforms.evmDM6446"
+
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 2f242a4b38..9ff7b91ad9 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,3 +1,5 @@
+SOC_FAMILY = "omap3"
+
require conf/machine/include/tune-cortexa8.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
# Increase this everytime you change something in the kernel
@@ -12,17 +14,10 @@ UBOOT_LOADADDRESS = "0x80008000"
EXTRA_IMAGEDEPENDS += "u-boot"
# TI DVSDK stuff:
-CODEC_INSTALL_DIR ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo"
-CODEC ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo"
-DEVICES ?= "OMAP3530"
-DSPCFG ?= "OMAP3530SHMEM"
+# DSPLink rebuild
DSPLINKDSPCFG ?= "OMAP3530SHMEM"
DSPLINKGPPOS ?= "OMAPLSP"
DSPLINKPLATFORM ?= "OMAP3530"
DSPLINKSOC ?= "3530"
-DSPPOWERSOC ?= "omap3530"
-GPPOS ?= "LINUX_GCC"
-LPMDSPPOWERSOC ?= "omap3530"
-PLATFORM ?= "omap3530"
-XDC_PLATFORM ?= "ti.platforms.evm3530"
+
diff --git a/conf/machine/include/omapl137.conf b/conf/machine/include/omapl137.conf
new file mode 100644
index 0000000000..34d0e9a754
--- /dev/null
+++ b/conf/machine/include/omapl137.conf
@@ -0,0 +1,2 @@
+SOC_FAMILY = "omapl137"
+
diff --git a/conf/machine/include/omapl138.conf b/conf/machine/include/omapl138.conf
new file mode 100644
index 0000000000..4c222753df
--- /dev/null
+++ b/conf/machine/include/omapl138.conf
@@ -0,0 +1 @@
+SOC_FAMILY = "omapl138"
diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf
index b751cbcac2..9b552a462a 100644
--- a/conf/machine/neuros-osd2.conf
+++ b/conf/machine/neuros-osd2.conf
@@ -26,4 +26,5 @@ MACHINE_FEATURES = "kernel26 pcmcia usbhost screen"
require conf/machine/include/tune-arm926ejs.inc
require conf/machine/include/neuros.inc
+require conf/machine/include/dm6446.inc
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-26 19:52:37 +0000