From 8ade10b54bf971c5ec0f74ad28a130ca68f0dc26 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 11 Jul 2008 10:45:12 +0000
Subject: dsplink: attempt to fix kernel architecture flags. before: vermagic: 
      2.6.26-rc9-omap1 mod_unload modversions ARMv5 after:  vermagic:      
 2.6.26-rc9-omap1 mod_unload modversions ARMv7 Still not loading on omap3,
 though

---
 packages/dsplink/dsplink.inc                | 11 ++++++++++-
 packages/dsplink/dsplink_1.51.00.08.bb      |  2 +-
 packages/dsplink/files/davinci_mvlpro5.0.mk |  6 +++---
 3 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'packages')

diff --git a/packages/dsplink/dsplink.inc b/packages/dsplink/dsplink.inc
index 4ea750ea98..95f2552eb6 100644
--- a/packages/dsplink/dsplink.inc
+++ b/packages/dsplink/dsplink.inc
@@ -23,6 +23,13 @@ DSPLINKSOC ?= "DM6446"
 
 DSPLINKSOC_beagleboard = "3530"
 
+
+USERARMFLAGS = "${TARGET_CC_ARCH}"
+KERNELARMFLAGS = "-D__LINUX_ARM_ARCH__=5 -march=armv5t -mtune=arm9tdmi"
+KERNELARMFLAGS_armv6 = "-D__LINUX_ARM_ARCH__=6 -march=armv6j -mtune=arm1136jf-s"
+KERNELARMFLAGS_armv7a = "-D__LINUX_ARM_ARCH__=7 -march=armv7-a -mtune=cortex-a8"
+
+
 export DSPLINKPLATFORM 
 export DSPLINKDSP
 
@@ -43,7 +50,9 @@ do_configure () {
 	sed -i	-e s:SED_ME_CROSS:${STAGING_INCDIR}:g \
 		-e s:SED_ME_STAGINGDIR:${STAGING_DIR_TARGET}:g \
 		-e s:SED_ME_TARGET_PREFIX:${TARGET_PREFIX}:g \
-		-e s:SED_ME_KERNELDIR:${STAGING_KERNEL_DIR}:g \	
+		-e s:SED_ME_KERNELDIR:${STAGING_KERNEL_DIR}:g \
+		-e 's:SEDME_KERNEL_ARMFLAGS:${KERNELARMFLAGS}:g' \
+		-e 's:SEDME_USER_ARMFLAGS:${USERARMFLAGS}:g' \
 		${S}/make/Linux/davinci_mvlpro5.0.mk 
 
 }
diff --git a/packages/dsplink/dsplink_1.51.00.08.bb b/packages/dsplink/dsplink_1.51.00.08.bb
index 8220e6c395..3be772d801 100644
--- a/packages/dsplink/dsplink_1.51.00.08.bb
+++ b/packages/dsplink/dsplink_1.51.00.08.bb
@@ -1,6 +1,6 @@
 require dsplink.inc
 
-PR = "r5"
+PR = "r6"
 PE = "1"
 PV = "1.51"
 
diff --git a/packages/dsplink/files/davinci_mvlpro5.0.mk b/packages/dsplink/files/davinci_mvlpro5.0.mk
index 2379bc359e..00bae888e6 100644
--- a/packages/dsplink/files/davinci_mvlpro5.0.mk
+++ b/packages/dsplink/files/davinci_mvlpro5.0.mk
@@ -102,10 +102,10 @@ CC_SW_DEB       := -g
 STD_KRNL_FLAGS  := -include linux/autoconf.h -c -iwithprefix include -Iinclude -Wall  -Wstrict-prototypes\
                    -Wno-trigraphs -fno-strict-aliasing -fno-common             \
                    -fno-omit-frame-pointer -mapcs -mno-sched-prolog            \
-                   -mlittle-endian -D__LINUX_ARM_ARCH__=5 -march=armv5t        \
-                   -mtune=arm9tdmi  -msoft-float -Uarm -mapcs                  \
+                   -mlittle-endian SEDME_KERNEL_ARMFLAGS \
+                   -msoft-float -Uarm -mapcs                  \
                    -Wdeclaration-after-statement -Os -marm  -mabi=aapcs-linux
-STD_USER_FLAGS  := -mlittle-endian -march=armv5t -mtune=arm9tdmi  -msoft-float \
+STD_USER_FLAGS  := -mlittle-endian SEDME_USER_ARMFLAGS -msoft-float \
                   -Uarm -Wdeclaration-after-statement -marm -Wall              \
                   -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing      \
                   -fno-common -fno-omit-frame-pointer -mapcs -c                \
-- 
cgit v1.2.3