From 804ce1b655d99f9fe4a4a1c3258129917220c7e0 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Mon, 8 Aug 2011 12:19:59 +0200
Subject: [PATCH] c6accel: update to 1.0.1.00.06

Patches from .03 will be rebased and applied later

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 recipes-ti/c6accel/ti-c6accel.inc             |  7 +----
 ...file-to-pass-Wl-T-before-the-linkers.patch | 26 -------------------
 recipes-ti/c6accel/ti-c6accel_1.01.00.03.bb   | 16 ------------
 recipes-ti/c6accel/ti-c6accel_1.01.00.06.bb   | 16 ++++++++++++
 4 files changed, 17 insertions(+), 48 deletions(-)
 delete mode 100644 recipes-ti/c6accel/ti-c6accel/0001-soc-app-fix-makefile-to-pass-Wl-T-before-the-linkers.patch
 delete mode 100644 recipes-ti/c6accel/ti-c6accel_1.01.00.03.bb
 create mode 100644 recipes-ti/c6accel/ti-c6accel_1.01.00.06.bb

diff --git a/recipes-ti/c6accel/ti-c6accel.inc b/recipes-ti/c6accel/ti-c6accel.inc
index 72454faa..138072cc 100644
--- a/recipes-ti/c6accel/ti-c6accel.inc
+++ b/recipes-ti/c6accel/ti-c6accel.inc
@@ -18,7 +18,7 @@ PROVIDES += "ti-c6accel-apps"
 
 # This recipe links statically against kernel dependant stuff, use kernel PR as base and append a local version
 PR = "${MACHINE_KERNEL_PR}"
-PR_append = "c"
+PR_append = "a"
 
 S = "${WORKDIR}/c6accel_${PV}"
 
@@ -57,11 +57,6 @@ do_configure() {
 	unset VERBOSE
 	make ${TIARGS} clean
 	sed -i -e 's:-L$(LINUXLIBS_INSTALL_DIR)/lib:-L$(LINUXLIBS_INSTALL_DIR)/lib -L$(LINUXLIBS_INSTALL_DIR)/usr/lib ${LDFLAGS}:' ${S}/soc/app/Makefile
-
-	# Angstrom 2008 breaks with -Wl,-T, while angstrom 2010 needs it
-	if [ $(${TARGET_PREFIX}gcc -dumpversion | awk -F. '{print $2}') -gt 3 ] ; then
-		sed -i -e 's: $(XDC_CFG)/linker.cmd: -Wl,-T,$(XDC_CFG)/linker.cmd:g' ${S}/soc/app/Makefile
-	fi
 }
 
 do_compile() {
diff --git a/recipes-ti/c6accel/ti-c6accel/0001-soc-app-fix-makefile-to-pass-Wl-T-before-the-linkers.patch b/recipes-ti/c6accel/ti-c6accel/0001-soc-app-fix-makefile-to-pass-Wl-T-before-the-linkers.patch
deleted file mode 100644
index 8e47ae21..00000000
--- a/recipes-ti/c6accel/ti-c6accel/0001-soc-app-fix-makefile-to-pass-Wl-T-before-the-linkers.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 58c50064afdc2fd7093613e0ae3a9192ea189460 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 5 Jan 2011 10:10:33 +0100
-Subject: [PATCH] soc/app: fix makefile to pass -Wl,-T, before the linkerscript
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- soc/app/Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/soc/app/Makefile b/soc/app/Makefile
-index 0bb7bdc..342e43a 100755
---- a/soc/app/Makefile
-+++ b/soc/app/Makefile
-@@ -33,7 +33,7 @@ XDC_CFG		= $(TARGET)_config
- XDC_CFLAGS	= $(XDC_CFG)/compiler.opt
- 
- # Output linker file
--XDC_LFILE	= $(XDC_CFG)/linker.cmd
-+XDC_LFILE	= -Wl,-T,$(XDC_CFG)/linker.cmd
- 
- # Input configuration file
- XDC_CFGFILE	= $(PLATFORM)/$(TARGET).cfg
--- 
-1.6.6.1
-
diff --git a/recipes-ti/c6accel/ti-c6accel_1.01.00.03.bb b/recipes-ti/c6accel/ti-c6accel_1.01.00.03.bb
deleted file mode 100644
index dab68f00..00000000
--- a/recipes-ti/c6accel/ti-c6accel_1.01.00.03.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require ti-c6accel.inc
-
-LIC_FILES_CHKSUM = "file://docs/ReleaseNotes_C6Accel.txt;md5=880049ffbd3d0207e90ef5a03d6cc0c3"
-
-SRC_URI[c6accelbin.md5sum] = "0ddf37fd9dad91fa3a914e549da933b9"
-SRC_URI[c6accelbin.sha256sum] = "453399a84bf117bd7a91393242c7c005e2829692db5ede18e4be166c61e4354c"
-
-SRC_URI_append = "file://fix-loadmodule.patch \
-                  file://0001-soc-honour-buildsystem-CFLAGS-and-LDFLAGS-when-set.patch \
-                 "
-
-PV = "1_01_00_03"
-
-
-CFLAGS += "-fPIC"
-
diff --git a/recipes-ti/c6accel/ti-c6accel_1.01.00.06.bb b/recipes-ti/c6accel/ti-c6accel_1.01.00.06.bb
new file mode 100644
index 00000000..61263c53
--- /dev/null
+++ b/recipes-ti/c6accel/ti-c6accel_1.01.00.06.bb
@@ -0,0 +1,16 @@
+require ti-c6accel.inc
+
+SRC_URI[c6accelbin.md5sum] = "4cfb9ae9d1b69954a22b454726d4d6cb"
+SRC_URI[c6accelbin.sha256sum] = "9fac3295c5c8533535e18f96c9a31c446f5a275798ace8c145f9ed51fa3e3ece"
+
+LIC_FILES_CHKSUM = "file://docs/ReleaseNotes_C6Accel.txt;md5=28fbd64e0ba4a1af1a2f1179024f38a9"
+
+SSRC_URI_append = " \
+                  file://0001-soc-honour-buildsystem-CFLAGS-and-LDFLAGS-when-set.patch \
+                 "
+
+PV = "1_01_00_06"
+
+
+CFLAGS += "-fPIC"
+