ti-c6accel: fix patch

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
author: Koen Kooi <koen@dominion.thruhere.net> 2011-08-08 09:29:45 +0200
committer: Koen Kooi <koen@dominion.thruhere.net> 2011-08-16 09:46:07 +0200
commit: a44c93e0238483edb5587f268fabfe7dd2dea960 (patch)
tree: 8d8a607e95ffea859ea19d21d22713495bf95334
parent: ec6a6c9427289311eb3de167e79687a219931771 (diff)
download: meta-ti-a44c93e0238483edb5587f268fabfe7dd2dea960.tar.gz
2 files changed, 57 insertions, 57 deletions
diff --git a/recipes-ti/c6accel/ti-c6accel.inc b/recipes-ti/c6accel/ti-c6accel.inc
index f76df938..2710696c 100644
--- a/recipes-ti/c6accel/ti-c6accel.inc
+++ b/recipes-ti/c6accel/ti-c6accel.inc
@@ -10,7 +10,7 @@ require recipes-ti/includes/ti-eula-unpack.inc
 PLATFORM_omapl138 = "omapl138"
 PLATFORM_omap3 = "omap3530"
-PLATFORM ?= "<UNDEFINED_PLATFORM>"
+PLATFORM ?= "UNDEFINED_PLATFORM"
 COMPATIBLE_MACHINE = "(omapl138|omap3)"
diff --git a/recipes-ti/c6accel/ti-c6accel/0001-soc-honour-buildsystem-CFLAGS-and-LDFLAGS-when-set.patch b/recipes-ti/c6accel/ti-c6accel/0001-soc-honour-buildsystem-CFLAGS-and-LDFLAGS-when-set.patch
index 0480f74a..a108c6e0 100644
--- a/recipes-ti/c6accel/ti-c6accel/0001-soc-honour-buildsystem-CFLAGS-and-LDFLAGS-when-set.patch
+++ b/recipes-ti/c6accel/ti-c6accel/0001-soc-honour-buildsystem-CFLAGS-and-LDFLAGS-when-set.patch
@@ -14,69 +14,69 @@ index 2647746..bed937e 100755
 --- a/soc/app/Makefile
 +++ b/soc/app/Makefile
 @@ -53,15 +53,10 @@ CONFIGURO = $(XDC_INSTALL_DIR)/xs xdc.tools.configuro
- CONFIG_BLD = ../../config.bld
+ CONFIG_BLD = ../../config.bld
- 
+ 
- ifeq ($(BUILD_TYPE), release)
+ ifeq ($(BUILD_TYPE), release)
-ifeq ($(ARM_ISA),armv7-a)
+-ifeq ($(ARM_ISA),armv7-a)
-    C_FLAGS    += -O3 -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp
+-    C_FLAGS    += -O3 -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp
-endif
+-endif
-ifeq ($(ARM_ISA),armv5t)
+-ifeq ($(ARM_ISA),armv5t)
-    C_FLAGS    += -mlittle-endian -march=armv5t -mtune=arm9tdmi -mabi=aapcs-linux -O
+-    C_FLAGS    += -mlittle-endian -march=armv5t -mtune=arm9tdmi -mabi=aapcs-linux -O
-endif
+-endif
-+C_FLAGS += $(CFLAGS)
+C_FLAGS += $(CFLAGS)
- else
+ else
-     CPP_FLAGS  += -DNDEBUG
+     CPP_FLAGS  += -DNDEBUG
-    C_FLAGS    += -Wall -g
+-    C_FLAGS    += -Wall -g
-+    C_FLAGS    += $(CFLAGS) -Wall -g
+    C_FLAGS    += $(CFLAGS) -Wall -g
- endif
+ endif
- 
+ 
- 
+ 
 @@ -72,7 +67,7 @@ ifeq ($(PLATFORM),omapl138)
-     C_FLAGS    += -DPLATFORM=138
+     C_FLAGS    += -DPLATFORM=138
- endif
+ endif
- 
+ 
-LD_FLAGS += -L$(LINUXLIBS_INSTALL_DIR)/lib -lm -lpthread
+-LD_FLAGS += -L$(LINUXLIBS_INSTALL_DIR)/lib -lm -lpthread
-+LD_FLAGS += $(LDFLAGS) -L$(LINUXLIBS_INSTALL_DIR)/lib -lm -lpthread
+LD_FLAGS += $(LDFLAGS) -L$(LINUXLIBS_INSTALL_DIR)/lib -lm -lpthread
- C6ACCEL_LIB += ../c6accelw/lib/c6accelw_$(PLATFORM).a470MV
+ C6ACCEL_LIB += ../c6accelw/lib/c6accelw_$(PLATFORM).a470MV
- 
+ 
- COMPILE.c = $(VERBOSE) $(CSTOOL_PREFIX)gcc $(CPP_FLAGS) $(C_FLAGS) $(CPP_FLAGS) -c
+ COMPILE.c = $(VERBOSE) $(CSTOOL_PREFIX)gcc $(CPP_FLAGS) $(C_FLAGS) $(CPP_FLAGS) -c
 @@ -102,7 +97,7 @@ $(TARGET):   $(OBJFILES) $(C6ACCEL_LIB) $(XDC_LFILE)
- 
+ 
- $(OBJFILES):   %.o: %.c $(HEADERS) $(XDC_CFLAGS)
+ $(OBJFILES):   %.o: %.c $(HEADERS) $(XDC_CFLAGS)
-        @echo Compiling $@ from $<..
+        @echo Compiling $@ from $<..
-       $(COMPILE.c) $(shell cat $(XDC_CFLAGS)) -o $@ $<
+-       $(COMPILE.c) $(shell cat $(XDC_CFLAGS)) -o $@ $<
-+       $(COMPILE.c) $(shell cat $(XDC_CFLAGS) | sed 's:-march=armv5t::g') -o $@ $<
+       $(COMPILE.c) $(shell cat $(XDC_CFLAGS) | sed 's:-march=armv5t::g') -o $@ $<
- 
+ 
- $(XDC_LFILE) $(XDC_CFLAGS):    $(XDC_CFGFILE)
+ $(XDC_LFILE) $(XDC_CFLAGS):    $(XDC_CFGFILE)
-        @echo
+        @echo
 diff --git a/soc/c6accelw/Makefile b/soc/c6accelw/Makefile
 index cc58acf..298ab3b 100755
 --- a/soc/c6accelw/Makefile
 +++ b/soc/c6accelw/Makefile
 @@ -21,19 +21,13 @@ BUILD_TYPE=release
- CPP_FLAGS += -I../packages -I$(XDC_INSTALL_DIR)/packages -I$(CE_INSTALL_DIR)/packages -I$(XDAIS_INSTALL_DIR)/packages -Dxdc_target_name__=arm/GCArmv5T -Dxdc_target_types__=gnu/targets/std.h
+ CPP_FLAGS += -I../packages -I$(XDC_INSTALL_DIR)/packages -I$(CE_INSTALL_DIR)/packages -I$(XDAIS_INSTALL_DIR)/packages -Dxdc_target_name__=arm/GCArmv5T -Dxdc_target_types__=gnu/targets/std.h
- 
+ 
- ifeq ($(BUILD_TYPE), release)
+ ifeq ($(BUILD_TYPE), release)
-ifeq ($(ARM_ISA),armv7-a)
+-ifeq ($(ARM_ISA),armv7-a)
-    C_FLAGS    += -O3 -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp
+-    C_FLAGS    += -O3 -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp
- endif
+- endif
-ifeq ($(ARM_ISA),armv5t)
+-ifeq ($(ARM_ISA),armv5t)
-    C_FLAGS    += -mlittle-endian -march=armv5t -mtune=arm9tdmi -mabi=aapcs-linux -O
+-    C_FLAGS    += -mlittle-endian -march=armv5t -mtune=arm9tdmi -mabi=aapcs-linux -O
- endif
+- endif
-
+-
-+C_FLAGS += $(CFLAGS)
+C_FLAGS += $(CFLAGS)
- else
+ else
-    CPP_FLAGS  += -DNDEBUG
+-    CPP_FLAGS  += -DNDEBUG
-    C_FLAGS    += -Wall -g
+-    C_FLAGS    += -Wall -g
-+    CPP_FLAGS   += -DNDEBUG
+    CPP_FLAGS   += -DNDEBUG
-+    C_FLAGS += $(CFLAGS) -Wall -g
+    C_FLAGS += $(CFLAGS) -Wall -g
- endif
+ endif
- 
+ 
-LD_FLAGS += -L$(LINUXLIBS_INSTALL_DIR)/lib
+-LD_FLAGS += -L$(LINUXLIBS_INSTALL_DIR)/lib
-+LD_FLAGS += $(LDFLAGS) -L$(LINUXLIBS_INSTALL_DIR)/lib
+LD_FLAGS += $(LDFLAGS) -L$(LINUXLIBS_INSTALL_DIR)/lib
- AR_FLAGS += 
+ AR_FLAGS += 
- 
+ 
- COMPILE.c = $(VERBOSE) $(CSTOOL_PREFIX)gcc $(CPP_FLAGS) $(C_FLAGS) -c
+ COMPILE.c = $(VERBOSE) $(CSTOOL_PREFIX)gcc $(CPP_FLAGS) $(C_FLAGS) -c
 -- 
 1.6.6.1
author	Koen Kooi <koen@dominion.thruhere.net>	2011-08-08 09:29:45 +0200
committer	Koen Kooi <koen@dominion.thruhere.net>	2011-08-16 09:46:07 +0200
commit	a44c93e0238483edb5587f268fabfe7dd2dea960 (patch)
tree	8d8a607e95ffea859ea19d21d22713495bf95334
parent	ec6a6c9427289311eb3de167e79687a219931771 (diff)
download	meta-ti-a44c93e0238483edb5587f268fabfe7dd2dea960.tar.gz

diff --git a/recipes-ti/c6accel/ti-c6accel.inc b/recipes-ti/c6accel/ti-c6accel.inc index f76df938..2710696c 100644 --- a/recipes-ti/c6accel/ti-c6accel.inc +++ b/recipes-ti/c6accel/ti-c6accel.inc
@@ -10,7 +10,7 @@ require recipes-ti/includes/ti-eula-unpack.inc
10		10
11	PLATFORM_omapl138 = "omapl138"	11	PLATFORM_omapl138 = "omapl138"
12	PLATFORM_omap3 = "omap3530"	12	PLATFORM_omap3 = "omap3530"
13	PLATFORM ?= "<UNDEFINED_PLATFORM>"	13	PLATFORM ?= "UNDEFINED_PLATFORM"
14		14
15	COMPATIBLE_MACHINE = "(omapl138\|omap3)"	15	COMPATIBLE_MACHINE = "(omapl138\|omap3)"
16		16


diff --git a/recipes-ti/c6accel/ti-c6accel/0001-soc-honour-buildsystem-CFLAGS-and-LDFLAGS-when-set.patch b/recipes-ti/c6accel/ti-c6accel/0001-soc-honour-buildsystem-CFLAGS-and-LDFLAGS-when-set.patch index 0480f74a..a108c6e0 100644 --- a/recipes-ti/c6accel/ti-c6accel/0001-soc-honour-buildsystem-CFLAGS-and-LDFLAGS-when-set.patch +++ b/recipes-ti/c6accel/ti-c6accel/0001-soc-honour-buildsystem-CFLAGS-and-LDFLAGS-when-set.patch
@@ -14,69 +14,69 @@ index 2647746..bed937e 100755
14	--- a/soc/app/Makefile	14	--- a/soc/app/Makefile
15	+++ b/soc/app/Makefile	15	+++ b/soc/app/Makefile
16	@@ -53,15 +53,10 @@ CONFIGURO = $(XDC_INSTALL_DIR)/xs xdc.tools.configuro	16	@@ -53,15 +53,10 @@ CONFIGURO = $(XDC_INSTALL_DIR)/xs xdc.tools.configuro
17	CONFIG_BLD = ../../config.bld	17	CONFIG_BLD = ../../config.bld
18		18
19	ifeq ($(BUILD_TYPE), release)	19	ifeq ($(BUILD_TYPE), release)
20	-ifeq ($(ARM_ISA),armv7-a)	20	-ifeq ($(ARM_ISA),armv7-a)
21	- C_FLAGS += -O3 -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp	21	- C_FLAGS += -O3 -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp
22	-endif	22	-endif
23	-ifeq ($(ARM_ISA),armv5t)	23	-ifeq ($(ARM_ISA),armv5t)
24	- C_FLAGS += -mlittle-endian -march=armv5t -mtune=arm9tdmi -mabi=aapcs-linux -O	24	- C_FLAGS += -mlittle-endian -march=armv5t -mtune=arm9tdmi -mabi=aapcs-linux -O
25	-endif	25	-endif
26	+C_FLAGS += $(CFLAGS)	26	+C_FLAGS += $(CFLAGS)
27	else	27	else
28	CPP_FLAGS += -DNDEBUG	28	CPP_FLAGS += -DNDEBUG
29	- C_FLAGS += -Wall -g	29	- C_FLAGS += -Wall -g
30	+ C_FLAGS += $(CFLAGS) -Wall -g	30	+ C_FLAGS += $(CFLAGS) -Wall -g
31	endif	31	endif
32		32
33		33
34	@@ -72,7 +67,7 @@ ifeq ($(PLATFORM),omapl138)	34	@@ -72,7 +67,7 @@ ifeq ($(PLATFORM),omapl138)
35	C_FLAGS += -DPLATFORM=138	35	C_FLAGS += -DPLATFORM=138
36	endif	36	endif
37		37
38	-LD_FLAGS += -L$(LINUXLIBS_INSTALL_DIR)/lib -lm -lpthread	38	-LD_FLAGS += -L$(LINUXLIBS_INSTALL_DIR)/lib -lm -lpthread
39	+LD_FLAGS += $(LDFLAGS) -L$(LINUXLIBS_INSTALL_DIR)/lib -lm -lpthread	39	+LD_FLAGS += $(LDFLAGS) -L$(LINUXLIBS_INSTALL_DIR)/lib -lm -lpthread
40	C6ACCEL_LIB += ../c6accelw/lib/c6accelw_$(PLATFORM).a470MV	40	C6ACCEL_LIB += ../c6accelw/lib/c6accelw_$(PLATFORM).a470MV
41		41
42	COMPILE.c = $(VERBOSE) $(CSTOOL_PREFIX)gcc $(CPP_FLAGS) $(C_FLAGS) $(CPP_FLAGS) -c	42	COMPILE.c = $(VERBOSE) $(CSTOOL_PREFIX)gcc $(CPP_FLAGS) $(C_FLAGS) $(CPP_FLAGS) -c
43	@@ -102,7 +97,7 @@ $(TARGET): $(OBJFILES) $(C6ACCEL_LIB) $(XDC_LFILE)	43	@@ -102,7 +97,7 @@ $(TARGET): $(OBJFILES) $(C6ACCEL_LIB) $(XDC_LFILE)
44		44
45	$(OBJFILES): %.o: %.c $(HEADERS) $(XDC_CFLAGS)	45	$(OBJFILES): %.o: %.c $(HEADERS) $(XDC_CFLAGS)
46	@echo Compiling $@ from $<..	46	@echo Compiling $@ from $<..
47	- $(COMPILE.c) $(shell cat $(XDC_CFLAGS)) -o $@ $<	47	- $(COMPILE.c) $(shell cat $(XDC_CFLAGS)) -o $@ $<
48	+ $(COMPILE.c) $(shell cat $(XDC_CFLAGS) \| sed 's:-march=armv5t::g') -o $@ $<	48	+ $(COMPILE.c) $(shell cat $(XDC_CFLAGS) \| sed 's:-march=armv5t::g') -o $@ $<
49		49
50	$(XDC_LFILE) $(XDC_CFLAGS): $(XDC_CFGFILE)	50	$(XDC_LFILE) $(XDC_CFLAGS): $(XDC_CFGFILE)
51	@echo	51	@echo
52	diff --git a/soc/c6accelw/Makefile b/soc/c6accelw/Makefile	52	diff --git a/soc/c6accelw/Makefile b/soc/c6accelw/Makefile
53	index cc58acf..298ab3b 100755	53	index cc58acf..298ab3b 100755
54	--- a/soc/c6accelw/Makefile	54	--- a/soc/c6accelw/Makefile
55	+++ b/soc/c6accelw/Makefile	55	+++ b/soc/c6accelw/Makefile
56	@@ -21,19 +21,13 @@ BUILD_TYPE=release	56	@@ -21,19 +21,13 @@ BUILD_TYPE=release
57	CPP_FLAGS += -I../packages -I$(XDC_INSTALL_DIR)/packages -I$(CE_INSTALL_DIR)/packages -I$(XDAIS_INSTALL_DIR)/packages -Dxdc_target_name__=arm/GCArmv5T -Dxdc_target_types__=gnu/targets/std.h	57	CPP_FLAGS += -I../packages -I$(XDC_INSTALL_DIR)/packages -I$(CE_INSTALL_DIR)/packages -I$(XDAIS_INSTALL_DIR)/packages -Dxdc_target_name__=arm/GCArmv5T -Dxdc_target_types__=gnu/targets/std.h
58		58
59	ifeq ($(BUILD_TYPE), release)	59	ifeq ($(BUILD_TYPE), release)
60	-ifeq ($(ARM_ISA),armv7-a)	60	-ifeq ($(ARM_ISA),armv7-a)
61	- C_FLAGS += -O3 -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp	61	- C_FLAGS += -O3 -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp
62	- endif	62	- endif
63	-ifeq ($(ARM_ISA),armv5t)	63	-ifeq ($(ARM_ISA),armv5t)
64	- C_FLAGS += -mlittle-endian -march=armv5t -mtune=arm9tdmi -mabi=aapcs-linux -O	64	- C_FLAGS += -mlittle-endian -march=armv5t -mtune=arm9tdmi -mabi=aapcs-linux -O
65	- endif	65	- endif
66	-	66	-
67	+C_FLAGS += $(CFLAGS)	67	+C_FLAGS += $(CFLAGS)
68	else	68	else
69	- CPP_FLAGS += -DNDEBUG	69	- CPP_FLAGS += -DNDEBUG
70	- C_FLAGS += -Wall -g	70	- C_FLAGS += -Wall -g
71	+ CPP_FLAGS += -DNDEBUG	71	+ CPP_FLAGS += -DNDEBUG
72	+ C_FLAGS += $(CFLAGS) -Wall -g	72	+ C_FLAGS += $(CFLAGS) -Wall -g
73	endif	73	endif
74		74
75	-LD_FLAGS += -L$(LINUXLIBS_INSTALL_DIR)/lib	75	-LD_FLAGS += -L$(LINUXLIBS_INSTALL_DIR)/lib
76	+LD_FLAGS += $(LDFLAGS) -L$(LINUXLIBS_INSTALL_DIR)/lib	76	+LD_FLAGS += $(LDFLAGS) -L$(LINUXLIBS_INSTALL_DIR)/lib
77	AR_FLAGS +=	77	AR_FLAGS +=
78		78
79	COMPILE.c = $(VERBOSE) $(CSTOOL_PREFIX)gcc $(CPP_FLAGS) $(C_FLAGS) -c	79	COMPILE.c = $(VERBOSE) $(CSTOOL_PREFIX)gcc $(CPP_FLAGS) $(C_FLAGS) -c
80	--	80	--
81	1.6.6.1	81	1.6.6.1
82		82