dsplink: create an 'openembedded' distro for dsplink, update kernel flags

4 files changed, 29 insertions, 16 deletions

diff --git a/packages/dsplink/dsplink.inc b/packages/dsplink/dsplink.inc
index 95f2552eb6..f528271c2f 100644
--- a/packages/dsplink/dsplink.inc
+++ b/packages/dsplink/dsplink.inc
@@ -25,23 +25,41 @@ 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"
-
+KERNELARMFLAGS = "-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                  \
+                   -Wdeclaration-after-statement -Os -marm  -mabi=aapcs-linux"
+KERNELARMFLAGS_armv6 = "-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__=6 -march=armv6j -mtune=arm1136jf-s \
+                   -msoft-float -Uarm -mapcs                  \                   
+                   -Wdeclaration-after-statement -Os -marm  -mabi=aapcs-linux"
+KERNELARMFLAGS_armv7a = "-c -nostdinc -include $(BASE_OSINC)/linux/autoconf.h -isystem $(OSINC_PLATFORM)  -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__=7 -march=armv7-a -mtune=cortex-a8 \
+                   -msoft-float -Uarm -mapcs                  \ 
+                   -Wdeclaration-after-statement -Os -marm  -mabi=aapcs-linux \
+                   -D__KERNEL__ -mno-thumb-interwork   -msoft-float -fno-optimize-sibling-calls -g  -fno-stack-protector -Wno-pointer-sign -g -DUSE_UDEV=1 -DOS_LINUX -DLINUX_KERNEL"
 
 export DSPLINKPLATFORM 
 export DSPLINKDSP
 
 do_configure () {
 	cp ${WORKDIR}/CURRENTCFG.MK ${S}/config
-	cp ${WORKDIR}/davinci_mvlpro5.0.mk ${S}/make/Linux
+	cp ${WORKDIR}/openembedded.mk ${S}/make/Linux
 	cp ${WORKDIR}/c64xx_5.xx_linux.mk ${S}/make/DspBios
 
 	sed -i 	-e s:SED_ME_SOURCEDIR:${S}:g \
-		-e s:SED_ME_GPPDISTRO:davinci_mvlpro5\.0:g \
+		-e s:SED_ME_GPPDISTRO:openembedded:g \
 		-e s:SED_ME_KERNELVERSION:${KERNEL_VERSION}:g \
-		-e s:SED_ME_DSPDISTRO:davinci_mvlpro5\.0:g \
+		-e s:SED_ME_DSPDISTRO:openembedded:g \
 		-e s:SED_ME_PLATFORM:${DSPLINKPLATFORM}:g \
 		-e s:SED_ME_DSP:${DSPLINKDSP}:g \
 		-e s:SED_ME_SOC:${DSPLINKSOC}:g \	
@@ -53,7 +71,7 @@ do_configure () {
 		-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 
+		${S}/make/Linux/openembedded.mk 
 
 }
 
diff --git a/packages/dsplink/dsplink_1.50.bb b/packages/dsplink/dsplink_1.50.bb
index f222fd2861..9ded5ef43d 100644
--- a/packages/dsplink/dsplink_1.50.bb
+++ b/packages/dsplink/dsplink_1.50.bb
@@ -11,7 +11,7 @@ PV = "1.50"
 SRC_URI = "http://install.tarball.in.source.dir/dsplink_1_50.tar.gz \
            file://CURRENTCFG.MK \
            file://c64xx_5.xx_linux.mk \
-           file://davinci_mvlpro5.0.mk \
+           file://openmebdded.mk \
 	   file://prcs-fix-include.patch;patch=1;pnum=2 \
 "
 
diff --git a/packages/dsplink/dsplink_1.51.00.08.bb b/packages/dsplink/dsplink_1.51.00.08.bb
index 3be772d801..928f03204f 100644
--- a/packages/dsplink/dsplink_1.51.00.08.bb
+++ b/packages/dsplink/dsplink_1.51.00.08.bb
@@ -11,7 +11,7 @@ PV = "1.51"
 SRC_URI = "http://install.tarball.in.source.dir/dsplink_1_51_00_08.tar.gz \
            file://CURRENTCFG.MK \
            file://c64xx_5.xx_linux.mk \
-           file://davinci_mvlpro5.0.mk \
+           file://openembedded.mk \
 	   file://prcs-fix-include.patch;patch=1;pnum=2 \
 "
 
diff --git a/packages/dsplink/files/davinci_mvlpro5.0.mk b/packages/dsplink/files/openembedded.mk
index 00bae888e6..aaf241ad14 100644
--- a/packages/dsplink/files/davinci_mvlpro5.0.mk
+++ b/packages/dsplink/files/openembedded.mk
@@ -99,12 +99,7 @@ CC_SW_DEB       := -g
 #   ----------------------------------------------------------------------------
 #   Standard flags for the compiler
 #   ----------------------------------------------------------------------------
-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 SEDME_KERNEL_ARMFLAGS \
-                   -msoft-float -Uarm -mapcs                  \
-                   -Wdeclaration-after-statement -Os -marm  -mabi=aapcs-linux
+STD_KRNL_FLAGS  := SEDME_KERNEL_ARMFLAGS 
 STD_USER_FLAGS  := -mlittle-endian SEDME_USER_ARMFLAGS -msoft-float \
                   -Uarm -Wdeclaration-after-statement -marm -Wall              \
                   -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing      \