summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMing Liu <ming.liu@toradex.com>2020-03-14 19:54:27 +0100
committerMing Liu <ming.liu@toradex.com>2020-03-14 20:09:27 +0100
commitaf3c4735e6f2bfd3c1166a434832286a281a7d65 (patch)
tree58995697c0420123e86b6ea8829593bdd57c812a
parent4f5057328843300d9ce1d86e9cb285655112ce42 (diff)
imx-atf: fix a uninitialized variable issue
This fixes a following compiling error on verdin-imx8mm machine: +| plat/imx/common/imx8m/imx_rdc.c: In function 'imx_rdc_set_masters': +| plat/imx/common/imx8m/imx_rdc.c:146:9: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized] Signed-off-by: Ming Liu <ming.liu@toradex.com>
-rw-r--r--recipes-bsp/imx-atf/imx-atf/0001-imx8m-imx_rdc.c-fix-a-uninitialized-variable.patch32
-rw-r--r--recipes-bsp/imx-atf/imx-atf_%.bbappend4
2 files changed, 36 insertions, 0 deletions
diff --git a/recipes-bsp/imx-atf/imx-atf/0001-imx8m-imx_rdc.c-fix-a-uninitialized-variable.patch b/recipes-bsp/imx-atf/imx-atf/0001-imx8m-imx_rdc.c-fix-a-uninitialized-variable.patch
new file mode 100644
index 0000000..f976c04
--- /dev/null
+++ b/recipes-bsp/imx-atf/imx-atf/0001-imx8m-imx_rdc.c-fix-a-uninitialized-variable.patch
@@ -0,0 +1,32 @@
+From ef0745861de6fc60ca7c5aec385419d12494f17d Mon Sep 17 00:00:00 2001
+From: Ming Liu <ming.liu@toradex.com>
+Date: Sat, 14 Mar 2020 19:50:08 +0100
+Subject: [PATCH] imx8m: imx_rdc.c: fix a uninitialized variable
+
+This fixes a following error:
+| plat/imx/common/imx8m/imx_rdc.c: In function 'imx_rdc_set_masters':
+| plat/imx/common/imx8m/imx_rdc.c:146:9: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized]
+
+Upstream-Status: Pending
+
+Signed-off-by: Ming Liu <ming.liu@toradex.com>
+---
+ plat/imx/common/imx8m/imx_rdc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plat/imx/common/imx8m/imx_rdc.c b/plat/imx/common/imx8m/imx_rdc.c
+index 1a21cd318..b539e0553 100644
+--- a/plat/imx/common/imx8m/imx_rdc.c
++++ b/plat/imx/common/imx8m/imx_rdc.c
+@@ -135,7 +135,7 @@ int imx_rdc_set_mda(struct rdc_mda_conf *p)
+ */
+ int imx_rdc_set_masters(struct rdc_mda_conf *masters_list, uint32_t count)
+ {
+- int i, ret;
++ int i, ret = 0;
+
+ for (i = 0; i < count; i++) {
+ ret = imx_rdc_set_mda(&masters_list[i]);
+--
+2.25.1
+
diff --git a/recipes-bsp/imx-atf/imx-atf_%.bbappend b/recipes-bsp/imx-atf/imx-atf_%.bbappend
index f7e3bd9..5d0247e 100644
--- a/recipes-bsp/imx-atf/imx-atf_%.bbappend
+++ b/recipes-bsp/imx-atf/imx-atf_%.bbappend
@@ -3,6 +3,10 @@
#SRCREV = "d6451cc1e162eff89b03dd63e86d55b9baa8885b"
#PLATFORM_mx8qxp = "imx8qxp"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+
+SRC_URI_append = " file://0001-imx8m-imx_rdc.c-fix-a-uninitialized-variable.patch"
+
PV = "2.0+git${SRCPV}"
SRCBRANCH = "imx_4.14.98_2.3.0"
SRCREV = "bb209a0b4ccca2aa4a3a887f9606dc4a3d294adf"