From dc9eb2aeb8bcb30962780e841516705d7409fdaa Mon Sep 17 00:00:00 2001 From: Lauren Post Date: Wed, 21 Jan 2015 08:44:33 -0600 Subject: [PATCH] imx-lib: Upgrade to 3.10.53-1.1.0_GA release Remove obey-variables patch - included in release. Signed-off-by: Lauren Post Signed-off-by: Otavio Salvador --- .../obey-variables.patch | 209 ------------------ .../imx-lib/imx-lib_3.10.31-1.1.0.bb | 16 -- .../imx-lib/imx-lib_3.10.53-1.1.0.bb | 10 + 3 files changed, 10 insertions(+), 225 deletions(-) delete mode 100644 meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-3.10.31-1.1.0/obey-variables.patch delete mode 100644 meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.31-1.1.0.bb create mode 100644 meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.53-1.1.0.bb diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-3.10.31-1.1.0/obey-variables.patch b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-3.10.31-1.1.0/obey-variables.patch deleted file mode 100644 index cc6319f7..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib-3.10.31-1.1.0/obey-variables.patch +++ /dev/null @@ -1,209 +0,0 @@ -Obey CFLAGS, LDFLAGS - -Signed-off-by: Christopher Larson -Upstream-status: Pending - ---- imx-lib-3.10.17-1.0.0_beta.orig/hdmi-cec/Makefile -+++ imx-lib-3.10.17-1.0.0_beta/hdmi-cec/Makefile -@@ -1,5 +1,6 @@ - CC ?=$(CROSS_COMPILE)gcc - AR ?=$(CROSS_COMPILE)ar -+CFLAGS ?=-O2 - - # list of platforms which want this test case - INCLUDE_LIST:= IMX6Q -@@ -32,10 +33,10 @@ all install : - endif - - %.o: %.c -- $(CC) -D$(PLATFORM) -Wall -O2 -fPIC -c $^ -o $@ -+ $(CC) -D$(PLATFORM) -Wall -fPIC $(CFLAGS) -c $^ -o $@ - - $(LIBNAME).so.$(SONAMEVERSION): $(OBJ) -- $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ -+ $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ $(LDFLAGS) - - $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) - ln -s $< $@ ---- imx-lib-3.10.17-1.0.0_beta.orig/ipu/Makefile -+++ imx-lib-3.10.17-1.0.0_beta/ipu/Makefile -@@ -1,5 +1,6 @@ - CC ?=$(CROSS_COMPILE)gcc - AR ?=$(CROSS_COMPILE)ar -+CFLAGS ?=-O2 - - ifeq ($(PLATFORM), IMX6Q) - OBJS = mxc_ipu_hl_lib_dummy.o -@@ -28,7 +29,7 @@ all install: - endif - - $(LIBNAME).so.$(SONAMEVERSION): $(OBJS) -- $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -+ $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ $(LDFLAGS) - - $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) - ln -s $< $@ -@@ -37,7 +38,7 @@ $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVER - ifeq "$(PLATFORM)" "" - $(error "Unspecified PLATFORM variable") - endif -- $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@ -+ $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -fPIC $(CFLAGS) -c $^ -o $@ - - .PHONY: clean - clean: ---- imx-lib-3.10.17-1.0.0_beta.orig/pxp/Makefile -+++ imx-lib-3.10.17-1.0.0_beta/pxp/Makefile -@@ -1,5 +1,6 @@ - CC ?=$(CROSS_COMPILE)gcc - AR ?=$(CROSS_COMPILE)ar -+CFLAGS ?=-O2 - - # list of platforms which want this test case - INCLUDE_LIST:=IMX50 IMX51 IMX5 IMX6Q IMX6S -@@ -26,10 +27,10 @@ all install : - endif - - %.o: %.c -- $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@ -+ $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -fPIC $(CFLAGS) -c $^ -o $@ - - $(LIBNAME).so.$(SONAMEVERSION): $(OBJ) -- $(CC) -shared -nostartfiles -Wl,-soname,$@ $(LFLAGS) $^ -o $@ -+ $(CC) -shared -nostartfiles -Wl,-soname,$@ $(LFLAGS) $^ -o $@ $(LDFLAGS) - - $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) - ln -s $< $@ ---- imx-lib-3.10.17-1.0.0_beta.orig/rng/Makefile -+++ imx-lib-3.10.17-1.0.0_beta/rng/Makefile -@@ -4,16 +4,17 @@ ifeq (,$(findstring $(PLATFORM), $(EXCLU - AR = ar -crv - RM = rm -f - CC ?=$(CROSS_COMPILE)gcc --LD=$(CROSS_COMPILE)ld -+LD ?=$(CROSS_COMPILE)ld -+CFLAGS ?=-g - - INC := $(INCLUDE) - - # Add compilation checks --CFLAGS += -g -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wdeclaration-after-statement -fPIC -+override CFLAGS += -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wdeclaration-after-statement -fPIC - - # In absence of kernel CONFIG flags, set API library to build on - # 'unknown' platform. --CFLAGS += -DFSL_PLATFORM_OTHER -DFSL_HAVE_RNGC $(INC) -+override CFLAGS += -DFSL_PLATFORM_OTHER -DFSL_HAVE_RNGC $(INC) - - OBJS= fsl_shw_rand.o fsl_shw_hash.o fsl_shw_sym.o fsl_shw_user.o \ - fsl_shw_keystore.o fsl_shw_auth.o fsl_shw_hmac.o fsl_shw_wrap.o -@@ -34,7 +35,7 @@ $(LIBNAME).a: $(OBJS) - $(AR) $@ $^ - - $(LIBNAME).so.$(SONAMEVERSION): $(OBJS) -- $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -+ $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ $(LDFLAGS) - - $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) - ln -s $< $@ ---- imx-lib-3.10.17-1.0.0_beta.orig/sahara2/Makefile -+++ imx-lib-3.10.17-1.0.0_beta/sahara2/Makefile -@@ -4,7 +4,8 @@ ifeq (,$(findstring $(PLATFORM), $(EXCLU - AR = ar -crv - RM = rm -f - CC ?=$(CROSS_COMPILE)gcc --LD=$(CROSS_COMPILE)ld -+LD ?=$(CROSS_COMPILE)ld -+CFLAGS ?=-g - - INC := $(INCLUDE) - -@@ -18,19 +19,19 @@ TARGET_ARCH=-DCONFIG_ARCH_MX5 - endif - - # Add compilation checks --CFLAGS += -g -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wdeclaration-after-statement -fPIC -+override CFLAGS += -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wdeclaration-after-statement -fPIC - - OBJS= fsl_shw_rand.o fsl_shw_hash.o fsl_shw_sym.o fsl_shw_user.o \ - fsl_shw_auth.o fsl_shw_hmac.o fsl_shw_wrap.o fsl_shw_keystore.o um_adaptor.o sf_util.o - - - #CFLAGS += -DSAHARA -DLINUX -I$(APIINCDIR) --CFLAGS += -DSAHARA -DLINUX $(INC) --CFLAGS += $(TARGET_ARCH) -+override CFLAGS += -DSAHARA -DLINUX $(INC) -+override CFLAGS += $(TARGET_ARCH) - # Uncomment to debug Library's creation of structures for driver --#CFLAGS += -DDIAG_SECURITY_FUNC -+#override CFLAGS += -DDIAG_SECURITY_FUNC - # Uncomment to simulate memory allocation errors --#CFLAGS += -DDIAG_MEM_ERRORS -DDIAG_MEM_CONST=5 -+#override CFLAGS += -DDIAG_MEM_ERRORS -DDIAG_MEM_CONST=5 - - LIBNAME=libsahara - SONAMEVERSION=0 -@@ -53,7 +54,7 @@ $(LIBNAME).a: $(OBJS) - $(AR) $@ $^ - - $(LIBNAME).so.$(SONAMEVERSION): $(OBJS) -- $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -+ $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ $(LDFLAGS) - - $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) - ln -s $< $@ ---- imx-lib-3.10.17-1.0.0_beta.orig/screenlayer/Makefile -+++ imx-lib-3.10.17-1.0.0_beta/screenlayer/Makefile -@@ -1,5 +1,6 @@ - CC ?=$(CROSS_COMPILE)gcc - AR ?=$(CROSS_COMPILE)ar -+CFLAGS ?=-O2 - INC = $(INCLUDE) -I../ipu - - OBJS = ScreenLayer.o -@@ -24,13 +25,13 @@ all install: - endif - - $(LIBNAME).so.$(SONAMEVERSION): $(OBJS) -- $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -L../ipu -lipu -+ $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -L../ipu -lipu $(LDFLAGS) - - $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) - ln -s $< $@ - - %.o: %.c -- $(CC) $(INC) -Wall -O2 -fPIC -c $^ -o $@ -+ $(CC) $(INC) -Wall -fPIC $(CFLAGS) -c $^ -o $@ - - .PHONY: clean - clean: ---- imx-lib-3.10.17-1.0.0_beta.orig/sim/Makefile -+++ imx-lib-3.10.17-1.0.0_beta/sim/Makefile -@@ -1,9 +1,10 @@ - CC ?=$(CROSS_COMPILE)gcc - AR ?=$(CROSS_COMPILE)ar -+CFLAGS ?=-O2 - - OBJS = iso7816-3.o - --CFLAGS += $(INCLUDE) -+override CFLAGS += $(INCLUDE) - - LIBNAME=libsim - SONAMEVERSION=0 -@@ -21,13 +22,13 @@ install: - cp iso7816-3.h $(DEST_DIR)/usr/include - - $(LIBNAME).so.$(SONAMEVERSION): $(OBJS) -- $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread -+ $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread $(LDFLAGS) - - $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) - ln -s $< $@ - - %.o: %.c -- $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@ -+ $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -fPIC $(CFLAGS) -c $^ -o $@ - - else - all install : diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.31-1.1.0.bb b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.31-1.1.0.bb deleted file mode 100644 index a8e44be6..00000000 --- a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.31-1.1.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2013, 2014 Freescale Semiconductor - -include imx-lib.inc - -# FIXME: Drop 'beta' suffix for GA release -SRC_URI = "${FSL_MIRROR}/${PN}-${PV}-beta.tar.gz" -S = "${WORKDIR}/${PN}-${PV}-beta" - -SRC_URI += "file://obey-variables.patch" - -PE = "1" - -SRC_URI[md5sum] = "0485e457eafe5a10274d171b3af79e2f" -SRC_URI[sha256sum] = "011eb34c6fd1b1ea9894bbe07a539c1aeee1500bc8fdd29d8ce1dc1d02f79e24" - -COMPATIBLE_MACHINE = "(mx6)" diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.53-1.1.0.bb b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.53-1.1.0.bb new file mode 100644 index 00000000..4768ce9d --- /dev/null +++ b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.53-1.1.0.bb @@ -0,0 +1,10 @@ +# Copyright (C) 2013-2015 Freescale Semiconductor + +include imx-lib.inc + +PE = "1" + +SRC_URI[md5sum] = "c510512ebd2bae5a7e57079b9788960e" +SRC_URI[sha256sum] = "4db2c1f286f2478b8236e62de4df9d2a2c26ff727c752dc4f21e2910f4a5e5d7" + +COMPATIBLE_MACHINE = "(mx6)" -- 2.40.1