diff options
Diffstat (limited to 'dynamic-layers/openembedded-layer')
8 files changed, 5 insertions, 244 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend index 4cfa51ea9..dfedc062e 100644 --- a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend +++ b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend | |||
@@ -1,4 +1,5 @@ | |||
1 | # Only _mx8 machine do provide virtual/libgbm required for any drm* flavour | 1 | # 6 and 7 Vivante do not provide virtual/libgbm required for any drm* flavour |
2 | DRM-REMOVE:imxgpu = "drm-gl drm-gles2" | 2 | DRM-REMOVE = "" |
3 | DRM-REMOVE:imxgpu:mx8-nxp-bsp = "" | 3 | DRM-REMOVE:imxgpu:mx6-nxp-bsp = "drm-gl drm-gles2" |
4 | DRM-REMOVE:imxgpu:mx7-nxp-bsp = "drm-gl drm-gles2" | ||
4 | PACKAGECONFIG:remove = "${DRM-REMOVE}" | 5 | PACKAGECONFIG:remove = "${DRM-REMOVE}" |
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch b/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch deleted file mode 100644 index a3f5c8288..000000000 --- a/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | NXP uses weaken to solve conflict in linking. | ||
2 | On Ubuntu 22.04(LTS) this fails to link cst with libcrypto. | ||
3 | |||
4 | The patch fixes the conflict in the code itself. | ||
5 | It restricts the scope of err_msg to the module. | ||
6 | |||
7 | Upstream-Status: Inappropriate [i.MX specific] | ||
8 | Signed-off-by: Walter Schweizer <walter.schweizer@siemens.com> | ||
9 | ---- | ||
10 | diff --git a/code/cst/code/build/make/rules.mk b/code/cst/code/build/make/rules.mk | ||
11 | index 1c0842b..9c46cc4 100644 | ||
12 | --- a/code/cst/code/build/make/rules.mk | ||
13 | +++ b/code/cst/code/build/make/rules.mk | ||
14 | @@ -25,11 +25,11 @@ LFLAGS := -t | ||
15 | %.a: | ||
16 | @echo "Create archive $@" | ||
17 | $(AR) $(ARFLAGS) $@ $^ | ||
18 | -ifneq ($(OSTYPE),mingw32) | ||
19 | -ifneq ($(OSTYPE),osx) | ||
20 | - $(OBJCOPY) --weaken $@ | ||
21 | -endif | ||
22 | -endif | ||
23 | +#ifneq ($(OSTYPE),mingw32) | ||
24 | +#ifneq ($(OSTYPE),osx) | ||
25 | +# $(OBJCOPY) --weaken $@ | ||
26 | +#endif | ||
27 | +#endif | ||
28 | |||
29 | %.exe: | ||
30 | @echo "Link $@" | ||
31 | diff --git a/code/cst/code/front_end/src/acst.c b/code/cst/code/front_end/src/acst.c | ||
32 | index fb1e8aa..1e993ee 100644 | ||
33 | --- a/code/cst/code/front_end/src/acst.c | ||
34 | +++ b/code/cst/code/front_end/src/acst.c | ||
35 | @@ -65,7 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
36 | /*=========================================================================== | ||
37 | LOCAL VARIABLES | ||
38 | =============================================================================*/ | ||
39 | -char err_msg[MAX_ERR_MSG_BYTES]; | ||
40 | +static char err_msg[MAX_ERR_MSG_BYTES]; | ||
41 | |||
42 | /*=========================================================================== | ||
43 | LOCAL FUNCTION PROTOTYPES | ||
44 | diff --git a/code/cst/code/front_end/src/misc_helper.c b/code/cst/code/front_end/src/misc_helper.c | ||
45 | index 678dc17..9014b2a 100644 | ||
46 | --- a/code/cst/code/front_end/src/misc_helper.c | ||
47 | +++ b/code/cst/code/front_end/src/misc_helper.c | ||
48 | @@ -60,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
49 | /*=========================================================================== | ||
50 | LOCAL VARIABLES | ||
51 | =============================================================================*/ | ||
52 | -char err_msg[MAX_ERR_MSG_BYTES]; | ||
53 | +static char err_msg[MAX_ERR_MSG_BYTES]; | ||
54 | |||
55 | /*=========================================================================== | ||
56 | LOCAL FUNCTION PROTOTYPES | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb b/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb deleted file mode 100644 index 5f808a974..000000000 --- a/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | SUMMARY = "i.MX code signing tool" | ||
2 | DESCRIPTION = "Provides software code signing support designed that integrate the HABv4 and AHAB library" | ||
3 | SECTION = "cst" | ||
4 | LICENSE = "BSD-3-Clause" | ||
5 | |||
6 | LIC_FILES_CHKSUM = "file://LICENSE.bsd3;md5=1fbcd66ae51447aa94da10cbf6271530" | ||
7 | |||
8 | DEPENDS = "byacc-native flex-native openssl" | ||
9 | |||
10 | # tag=debian/3.3.1+dfsg-2 | ||
11 | SRCREV = "e2c687a856e6670e753147aacef42d0a3c07891a" | ||
12 | SRC_URI = " \ | ||
13 | file://0001-fix-err-msg-linking.patch \ | ||
14 | git://gitlab.apertis.org/pkg/imx-code-signing-tool.git;protocol=https;branch=apertis/v2022pre \ | ||
15 | " | ||
16 | |||
17 | S = "${WORKDIR}/git" | ||
18 | |||
19 | EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}" AR="${AR}" OBJCOPY="${OBJCOPY}"' | ||
20 | |||
21 | do_compile() { | ||
22 | cd ${S}/code/cst | ||
23 | oe_runmake build OSTYPE=linux64 ENCRYPTION=yes COPTIONS="${CFLAGS} ${CPPFLAGS}" LDOPTIONS="${LDFLAGS}" | ||
24 | cd - | ||
25 | oe_runmake -C code/hab_csf_parser COPTS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" | ||
26 | } | ||
27 | |||
28 | do_install () { | ||
29 | install -d ${D}${bindir} | ||
30 | install -m 755 ${S}/code/cst/code/obj.linux64/cst ${D}${bindir} | ||
31 | install -m 755 ${S}/code/cst/code/obj.linux64/srktool ${D}${bindir} | ||
32 | install -m 755 ${S}/code/hab_csf_parser/csf_parser ${D}${bindir} | ||
33 | } | ||
34 | |||
35 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit/ppc-fixplt.patch b/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit/ppc-fixplt.patch deleted file mode 100644 index b9f17f4e3..000000000 --- a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit/ppc-fixplt.patch +++ /dev/null | |||
@@ -1,105 +0,0 @@ | |||
1 | Upstream-Status: Unknown | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | |||
5 | libluajit is having symbols that can't be | ||
6 | resolved the reloc cannot accommodate an offset greater than 24 bits. | ||
7 | |||
8 | Looking at libluajit with readelf -r, you see a bunch of entries that look like: | ||
9 | 000082f0 00003c0a R_PPC_REL24 00000000 sqrt + 0 | ||
10 | |||
11 | These should not occur when the code is compiled and linked with -fPIC. | ||
12 | |||
13 | It turns out that libluajit *is* compiled and linked with -fPIC, however... | ||
14 | There is one assembler file called lj_vm.s which is generated during the build. | ||
15 | This file is missing the `@plt' qualifier from external references. | ||
16 | |||
17 | This file is generated by a program called buildvm. This in turn uses tables | ||
18 | in a file called buildvm_arch.h which is generated by dynasm.lua. | ||
19 | |||
20 | Index: LuaJIT-2.0.1/src/host/buildvm.c | ||
21 | =================================================================== | ||
22 | --- LuaJIT-2.0.1.orig/src/host/buildvm.c 2013-02-19 12:15:00.000000000 -0800 | ||
23 | +++ LuaJIT-2.0.1/src/host/buildvm.c 2013-05-14 20:26:05.933444512 -0700 | ||
24 | @@ -107,12 +107,14 @@ | ||
25 | #endif | ||
26 | sprintf(name, "%s%s%s", symprefix, prefix, suffix); | ||
27 | p = strchr(name, '@'); | ||
28 | +#if 0 | ||
29 | if (p) { | ||
30 | if (!LJ_64 && (ctx->mode == BUILD_coffasm || ctx->mode == BUILD_peobj)) | ||
31 | name[0] = '@'; | ||
32 | else | ||
33 | *p = '\0'; | ||
34 | } | ||
35 | +#endif | ||
36 | p = (char *)malloc(strlen(name)+1); /* MSVC doesn't like strdup. */ | ||
37 | strcpy(p, name); | ||
38 | return p; | ||
39 | Index: LuaJIT-2.0.1/src/vm_ppcspe.dasc | ||
40 | =================================================================== | ||
41 | --- LuaJIT-2.0.1.orig/src/vm_ppcspe.dasc 2013-02-19 12:15:00.000000000 -0800 | ||
42 | +++ LuaJIT-2.0.1/src/vm_ppcspe.dasc 2013-05-14 20:26:05.937444512 -0700 | ||
43 | @@ -1390,7 +1390,7 @@ | ||
44 | | checknum CARG2 | ||
45 | | evmergehi CARG1, CARG2, CARG2 | ||
46 | | checkfail ->fff_fallback | ||
47 | - | bl extern func | ||
48 | + | bl extern func@plt | ||
49 | | evmergelo CRET1, CRET1, CRET2 | ||
50 | | b ->fff_restv | ||
51 | |.endmacro | ||
52 | @@ -1405,7 +1405,7 @@ | ||
53 | | checknum CARG1 | ||
54 | | evmergehi CARG3, CARG4, CARG4 | ||
55 | | checkanyfail ->fff_fallback | ||
56 | - | bl extern func | ||
57 | + | bl extern func@plt | ||
58 | | evmergelo CRET1, CRET1, CRET2 | ||
59 | | b ->fff_restv | ||
60 | |.endmacro | ||
61 | @@ -1437,7 +1437,7 @@ | ||
62 | | checknum CARG2 | ||
63 | | evmergehi CARG1, CARG2, CARG2 | ||
64 | | checkfail ->fff_fallback | ||
65 | - | bl extern log | ||
66 | + | bl extern log@plt | ||
67 | | evmergelo CRET1, CRET1, CRET2 | ||
68 | | b ->fff_restv | ||
69 | | | ||
70 | @@ -1471,7 +1471,7 @@ | ||
71 | | checknum CARG1 | ||
72 | | checkanyfail ->fff_fallback | ||
73 | | efdctsi CARG3, CARG4 | ||
74 | - | bl extern ldexp | ||
75 | + | bl extern ldexp@plt | ||
76 | | evmergelo CRET1, CRET1, CRET2 | ||
77 | | b ->fff_restv | ||
78 | | | ||
79 | @@ -1484,7 +1484,7 @@ | ||
80 | | checkfail ->fff_fallback | ||
81 | | la CARG3, DISPATCH_GL(tmptv)(DISPATCH) | ||
82 | | lwz PC, FRAME_PC(BASE) | ||
83 | - | bl extern frexp | ||
84 | + | bl extern frexp@plt | ||
85 | | lwz TMP1, DISPATCH_GL(tmptv)(DISPATCH) | ||
86 | | evmergelo CRET1, CRET1, CRET2 | ||
87 | | efdcfsi CRET2, TMP1 | ||
88 | @@ -1503,7 +1503,7 @@ | ||
89 | | checkfail ->fff_fallback | ||
90 | | la CARG3, -8(BASE) | ||
91 | | lwz PC, FRAME_PC(BASE) | ||
92 | - | bl extern modf | ||
93 | + | bl extern modf@plt | ||
94 | | evmergelo CRET1, CRET1, CRET2 | ||
95 | | la RA, -8(BASE) | ||
96 | | evstdd CRET1, 0(BASE) | ||
97 | @@ -2399,7 +2399,7 @@ | ||
98 | | checknum CARG1 | ||
99 | | evmergehi CARG3, CARG4, CARG4 | ||
100 | | checkanyfail ->vmeta_arith_vv | ||
101 | - | bl extern pow | ||
102 | + | bl extern pow@plt | ||
103 | | evmergelo CRET2, CRET1, CRET2 | ||
104 | | evstddx CRET2, BASE, RA | ||
105 | | ins_next | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend b/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend deleted file mode 100644 index d07f8ae14..000000000 --- a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" | ||
2 | |||
3 | SRC_URI:append:qoriq-ppc = " file://ppc-fixplt.patch " | ||
4 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb index 62a717721..227b6291b 100644 --- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb +++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb | |||
@@ -7,9 +7,7 @@ PR = "r2" | |||
7 | DEPENDS = "libxml2 fmlib tclap" | 7 | DEPENDS = "libxml2 fmlib tclap" |
8 | 8 | ||
9 | SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1" | 9 | SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1" |
10 | SRCREV = "63c8ac99899a9bcd723801579b4d786594670455" | 10 | SRCREV = "5b9f4b16a864e9dfa58cdcc860be278a7f66ac18" |
11 | |||
12 | S = "${WORKDIR}/git" | ||
13 | 11 | ||
14 | EXTRA_OEMAKE = 'FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \ | 12 | EXTRA_OEMAKE = 'FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \ |
15 | FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \ | 13 | FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \ |
diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch deleted file mode 100644 index 283a081ba..000000000 --- a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 8ad045e5e664fe2d1bd9f88616d5bf83437aab4e Mon Sep 17 00:00:00 2001 | ||
2 | From: Yang Dong <b56112@freescale.com> | ||
3 | Date: Wed, 9 Sep 2015 13:08:57 +0800 | ||
4 | Subject: [PATCH] xserver-common: enable iglx module | ||
5 | |||
6 | Enable iglx module to pass indirect glx rendering test case. | ||
7 | |||
8 | Upstream-Status: Inappropriate [imx specific] | ||
9 | |||
10 | Date: Sep 9, 2015 | ||
11 | Signed-off-by Yang Dong <b56112@freescale.com> | ||
12 | --- | ||
13 | X11/xserver-common | 1 + | ||
14 | 1 file changed, 1 insertion(+) | ||
15 | |||
16 | diff --git a/X11/xserver-common b/X11/xserver-common | ||
17 | index 4dc48c4..d19b858 100644 | ||
18 | --- a/X11/xserver-common | ||
19 | +++ b/X11/xserver-common | ||
20 | @@ -44,6 +44,7 @@ SCREEN_SIZE=`fallback_screen_arg` | ||
21 | export USER=root | ||
22 | export XSERVER_DEFAULT_ORIENTATION=normal | ||
23 | |||
24 | +INPUT_EXTRA_ARGS="+iglx" | ||
25 | ARGS="-br -pn -nolisten tcp $INPUT_EXTRA_ARGS" | ||
26 | DPI="100" | ||
27 | MOUSE="" | ||
28 | -- | ||
29 | 1.9.1 | ||
30 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend deleted file mode 100644 index be6945744..000000000 --- a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | # i.MX extra configuration | ||
2 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" | ||
3 | |||
4 | SRC_URI:append:imxgpu3d = " \ | ||
5 | file://0016-xserver-common-enable-iglx-module.patch \ | ||
6 | " | ||
7 | |||
8 | PACKAGE_ARCH:imxgpu3d = "${MACHINE_SOCARCH}" | ||