[PATCH 1/6] ti-tisdk-makefile: Prepare for Linaro transition

[PATCH 1/6] ti-tisdk-makefile: Prepare for Linaro transition

[Franklin S. Cooper Jr]

* Currently some of our example applications hard code certain values such as
  target architecture and softfp should be used.
* This is problematic since incorrect architecture results in optimizations
  being missed and changes in toolchains can break applications.
* Pull in some of these variables into Rules.make which insures the correct
  settings are used for each machine.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../ti-tisdk-makefile/ti-tisdk-makefile/Rules.make |    2 ++
 .../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb     |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Rules.make b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Rules.make
index 2741769..a20c684 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Rules.make
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Rules.make
@@ -29,3 +29,5 @@ export ENV_SETUP=$(LINUX_DEVKIT_PATH)/environment-setup
 
 #The directory that points to the SDK kernel source tree
 LINUXKERNEL_INSTALL_DIR=$(TI_SDK_PATH)/board-support/__KERNEL_NAME__
+
+CFLAGS=__CFLAGS__
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index 74a4f14..0f14341 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -32,7 +32,7 @@ SRC_URI = "\
     file://Makefile_omapconf \
 "
 
-PR = "r11"
+PR = "r12"
 
 MAKEFILES_COMMON = "linux \
                     matrix-gui \
@@ -124,6 +124,7 @@ do_install () {
     sed -i -e "s/__ARCH__/${PLATFORM_ARCH}/" ${D}/Rules.make
     sed -i -e "s/__TOOLCHAIN_PREFIX__/${TOOLCHAIN_SYS}-/" ${D}/Rules.make
     sed -i -e "s/__UBOOT_MACHINE__/${UBOOT_MACHINE}/" ${D}/Rules.make
+    sed -i -e "s/__CFLAGS__/${TARGET_CC_ARCH}/" ${D}/Rules.make
 
 }
 
-- 
1.7.0.4

[PATCH 2/6] arm-benchmarks: Grab CFLAGS from OE or Rules.make

[Franklin S. Cooper Jr]

* When building from OE CFLAGS will be passed in.
* When building from within the sdk CFLAGS from Rules.make will be used.
* This insures the optimal CFLAGS are used which corrects optimization and also
  the correct toolchain settings (ie softfp/hardfp) are used.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../arm-benchmarks/arm-benchmarks_1.3.bb           |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-arago-extras/recipes-benchmark/arm-benchmarks/arm-benchmarks_1.3.bb b/meta-arago-extras/recipes-benchmark/arm-benchmarks/arm-benchmarks_1.3.bb
index 23acd42..ce18860 100644
--- a/meta-arago-extras/recipes-benchmark/arm-benchmarks/arm-benchmarks_1.3.bb
+++ b/meta-arago-extras/recipes-benchmark/arm-benchmarks/arm-benchmarks_1.3.bb
@@ -4,10 +4,10 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7aefb5e1cffc7b6a3ef18b803f957922"
 SECTION = "system"
 
-PR = "r4"
+PR = "r5"
 
 BRANCH ?= "master"
-SRCREV = "9b7b4fbde8fcf796a23da2a464dbf934e550f6c9"
+SRCREV = "176c8869817913967ae1a0d561535eb40ba8a527"
 
 SRC_URI = "git://gitorious.org/arm_benchmarks/arm_benchmarks.git;protocol=git;branch=${BRANCH}"
 
@@ -18,6 +18,7 @@ PLATFORM_ARCH_omapl138 = "armv5te"
 
 do_compile() {
 	export CROSS_COMPILE=${TARGET_PREFIX}
+	export CFLAGS='${TARGET_CC_ARCH}'
 	# build the release version
 	oe_runmake -C ${PLATFORM_ARCH} release
 }
-- 
1.7.0.4

[PATCH 3/6] am-sysinfo: Grab CFLAGS from OE or Rules.make

[Franklin S. Cooper Jr]

* When building from OE CFLAGS will be passed in.
* When building from within the sdk CFLAGS from Rules.make will be used.
* This insures the optimal CFLAGS are used which corrects optimization and also
  the correct toolchain settings (ie softfp/hardfp) are used.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../recipes-core/am-sysinfo/am-sysinfo_git.bb      |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb b/meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb
index a5e0afe..153d1f0 100644
--- a/meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb
+++ b/meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://mem_util/mem_util.c;beginline=1;endline=37;md5=8aa8e7
 SECTION = "system"
 
 PACKAGE_STRIP = "no"
-PR = "r6"
+PR = "r7"
 
 BRANCH ?= "master"
-SRCREV = "86e936b0a50e450089471b53ae8c68e933c15bbd"
+SRCREV = "30c1dd8da089da41cac5686a0bebacc8950a8805"
 
 SRC_URI = "git://gitorious.org/am_sysinfo/am_sysinfo.git;protocol=git;branch=${BRANCH}"
 
@@ -17,10 +17,13 @@ S = "${WORKDIR}/git"
 
 
 do_compile() {
-	${CC} ${CFLAGS} ${LDFLAGS} -o mem_util/mem_util mem_util/mem_util.c
+	export CROSS_COMPILE=${TARGET_PREFIX}
+	export CFLAGS='${TARGET_CC_ARCH}'
+	# build the release version
+	oe_runmake release
 }
 
 do_install() {
 	install -d ${D}/${bindir}
-	install -m 0755 ${S}/mem_util/mem_util ${D}/${bindir}
+	install -m 0755 ${S}/mem_util/Release/mem_util ${D}/${bindir}
 }
-- 
1.7.0.4

[PATCH 4/6] ti-crypto-examples: Grab CFLAGS from OE or Rules.make

[Franklin S. Cooper Jr]

* When building from OE CFLAGS will be passed in.
* When building from within the sdk CFLAGS from Rules.make will be used.
* This insures the optimal CFLAGS are used which corrects optimization and also
  the correct toolchain settings (ie softfp/hardfp) are used.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../ti-crypto-examples/ti-crypto-examples_git.bb   |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta-arago-extras/recipes-core/ti-crypto-examples/ti-crypto-examples_git.bb b/meta-arago-extras/recipes-core/ti-crypto-examples/ti-crypto-examples_git.bb
index 648d7dd..78f2d32 100644
--- a/meta-arago-extras/recipes-core/ti-crypto-examples/ti-crypto-examples_git.bb
+++ b/meta-arago-extras/recipes-core/ti-crypto-examples/ti-crypto-examples_git.bb
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://armv5te/AES/aes_256.c;beginline=9;endline=35;md5=8edb
 SECTION = "console"
 DEPENDS += "openssl"
 
-PR = "r3"
+PR = "r4"
 
 BRANCH ?= "master"
-SRCREV = "95007ae6a4284841e624680afff8e0859f28d429"
+SRCREV = "ade3446fda75f4e07262b6162343a1b8d85521cb"
 
 SRC_URI = "git://arago-project.org/git/projects/crypto-example-apps.git;protocol=git;branch=${BRANCH}"
 
@@ -23,7 +23,8 @@ SOURCE_DIR_omapl138 = "${S}/armv5te"
 
 do_compile() {
     cd ${SOURCE_DIR}
-
+    export CROSS_COMPILE=${TARGET_PREFIX}
+    export CFLAGS='${TARGET_CC_ARCH}'
     # build the release version
     oe_runmake release
 }
-- 
1.7.0.4

[PATCH 5/6] screenshot: Grab CFLAGS from OE or Rules.make

[Franklin S. Cooper Jr]

* When building from OE CFLAGS will be passed in.
* When building from within the sdk CFLAGS from Rules.make will be used.
* This insures the optimal CFLAGS are used which corrects optimization and also
  the correct toolchain settings (ie softfp/hardfp) are used.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../recipes-graphics/screenshot/screenshot_1.0.bb  |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-arago-extras/recipes-graphics/screenshot/screenshot_1.0.bb b/meta-arago-extras/recipes-graphics/screenshot/screenshot_1.0.bb
index ed819d0..096aa40 100644
--- a/meta-arago-extras/recipes-graphics/screenshot/screenshot_1.0.bb
+++ b/meta-arago-extras/recipes-graphics/screenshot/screenshot_1.0.bb
@@ -4,23 +4,23 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5cad16cc3f514a15adb1d710b82d5fc4"
 SECTION = "graphics"
 
-PR = "r0"
+PR = "r1"
 
 BRANCH ?= "master"
-SRCREV = "1f11a23be4386c2ee0387cd12c1a9569c703a3bb" 
+SRCREV = "169242aa7a265d5c94755d74601ad4a3f1828c96"
 
 SRC_URI = "git://gitorious.org/screenshot/screenshot.git;protocol=git;branch=${BRANCH}"
 
+
 S = "${WORKDIR}/git"
 
 do_compile() {
     export CROSS_COMPILE=${TARGET_PREFIX}
-    export ARCH=${ARMPKGARCH}
+    export CFLAGS='${TARGET_CC_ARCH}'
     # build the release version
     make release
 }
 
 do_install() {
-    export ARCH=${ARMPKGARCH}
     make DESTDIR=${D} install
 }
-- 
1.7.0.4

[PATCH 6/6] av-examples: Grab CFLAGS from OE or Rules.make

[Franklin S. Cooper Jr]

* When building from OE CFLAGS will be passed in.
* When building from within the sdk CFLAGS from Rules.make will be used.
* This insures the optimal CFLAGS are used which corrects optimization and
* also the correct toolchain settings (ie softfp/hardfp) are used.
---
 .../av-examples/av-examples_1.0.bb                 |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta-arago-extras/recipes-multimedia/av-examples/av-examples_1.0.bb b/meta-arago-extras/recipes-multimedia/av-examples/av-examples_1.0.bb
index 3782cba..dec17a8 100644
--- a/meta-arago-extras/recipes-multimedia/av-examples/av-examples_1.0.bb
+++ b/meta-arago-extras/recipes-multimedia/av-examples/av-examples_1.0.bb
@@ -12,7 +12,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(omap3)"
 
 BRANCH ?= "master"
-SRCREV = "ac75d09d29a805d89c49dd2741b79f3069e97827"
+SRCREV = "87469a47bf91d681f15f0a2eb368fe695b21508c"
 
 SRC_URI = "git://gitorious.org/av_examples/av_examples.git;protocol=git;branch=${BRANCH}"
 
@@ -24,6 +24,7 @@ INSANE_SKIP_${PN} = "True"
 do_compile() {
 	touch debug
 	export CROSS_COMPILE=${TARGET_PREFIX}
+	export CFLAGS='${TARGET_CC_ARCH}'
 	make release LINUXKERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" PLATFORM="${MACHINE}"
 }
 
-- 
1.7.0.4

Re: [PATCH 6/6] av-examples: Grab CFLAGS from OE or Rules.make

[Denys Dmytriyenko]

BTW, thanks for fixing av-examples - I haven't seen the breakage until I 
started building for am37x and am3517...

-- 
Denys


On Mon, May 06, 2013 at 04:28:27PM -0500, Franklin S. Cooper Jr wrote:
> * When building from OE CFLAGS will be passed in.
> * When building from within the sdk CFLAGS from Rules.make will be used.
> * This insures the optimal CFLAGS are used which corrects optimization and
> * also the correct toolchain settings (ie softfp/hardfp) are used.
> ---
>  .../av-examples/av-examples_1.0.bb                 |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/meta-arago-extras/recipes-multimedia/av-examples/av-examples_1.0.bb b/meta-arago-extras/recipes-multimedia/av-examples/av-examples_1.0.bb
> index 3782cba..dec17a8 100644
> --- a/meta-arago-extras/recipes-multimedia/av-examples/av-examples_1.0.bb
> +++ b/meta-arago-extras/recipes-multimedia/av-examples/av-examples_1.0.bb
> @@ -12,7 +12,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
>  COMPATIBLE_MACHINE = "(omap3)"
>  
>  BRANCH ?= "master"
> -SRCREV = "ac75d09d29a805d89c49dd2741b79f3069e97827"
> +SRCREV = "87469a47bf91d681f15f0a2eb368fe695b21508c"
>  
>  SRC_URI = "git://gitorious.org/av_examples/av_examples.git;protocol=git;branch=${BRANCH}"
>  
> @@ -24,6 +24,7 @@ INSANE_SKIP_${PN} = "True"
>  do_compile() {
>  	touch debug
>  	export CROSS_COMPILE=${TARGET_PREFIX}
> +	export CFLAGS='${TARGET_CC_ARCH}'
>  	make release LINUXKERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" PLATFORM="${MACHINE}"
>  }
>  
> -- 
> 1.7.0.4
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago