diff mbox series

[meta-ti,master] u-boot: Fix implicit declaration compile error

Message ID 20250203232736.9017-1-reatmon@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [meta-ti,master] u-boot: Fix implicit declaration compile error | expand

Commit Message

Ryan Eatmon Feb. 3, 2025, 11:27 p.m. UTC
A recent patch to ti-u-boot 2025.01 introduces a compile error on
master for am64xx-evm.  A patch has been sent to the mailing list
that fixes this, but it will take time before we will see that patch
available to us on master.  So we need to carry the patch here.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../u-boot/u-boot-ti-staging_2025.01.bb       |  2 ++
 ...-Fix-implicit-definition-of-ti_secur.patch | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot/0001-remoteproc-k3-m4-Fix-implicit-definition-of-ti_secur.patch

Comments

Bajjuri, Praneeth Feb. 4, 2025, 8:01 a.m. UTC | #1
On 2/4/2025 4:57 AM, Ryan Eatmon wrote:
> A recent patch to ti-u-boot 2025.01 introduces a compile error on
> master for am64xx-evm.  A patch has been sent to the mailing list
> that fixes this, but it will take time before we will see that patch
> available to us on master.  So we need to carry the patch here.
> 
> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> ---
>   .../u-boot/u-boot-ti-staging_2025.01.bb       |  2 ++
>   ...-Fix-implicit-definition-of-ti_secur.patch | 32 +++++++++++++++++++

pulled this patch to ti-u-boot-2025.01-next

https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2025.01-next&id=5731ef2a5d3ca69c045b30c8ea31f9a6cd0cfbe7


>   2 files changed, 34 insertions(+)
>   create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot/0001-remoteproc-k3-m4-Fix-implicit-definition-of-ti_secur.patch
> 
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
> index 5e56d2db..c041ffe8 100644
> --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
> @@ -6,4 +6,6 @@ PR = "r0"
>   
>   BRANCH = "ti-u-boot-2025.01"
>   
> +SRC_URI += "file://0001-remoteproc-k3-m4-Fix-implicit-definition-of-ti_secur.patch"
> +
>   SRCREV = "4e9c90ad8b12cc5b4fdd1308bc3ac3e4fc869aab"
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot/0001-remoteproc-k3-m4-Fix-implicit-definition-of-ti_secur.patch b/meta-ti-bsp/recipes-bsp/u-boot/u-boot/0001-remoteproc-k3-m4-Fix-implicit-definition-of-ti_secur.patch
> new file mode 100644
> index 00000000..c6b15651
> --- /dev/null
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot/0001-remoteproc-k3-m4-Fix-implicit-definition-of-ti_secur.patch
> @@ -0,0 +1,32 @@
> +From f9c2ae13a80f3b0f309214c6b57bc3a705b71398 Mon Sep 17 00:00:00 2001
> +From: Ryan Eatmon <reatmon@ti.com>
> +Date: Mon, 3 Feb 2025 16:54:24 -0600
> +Subject: [tiU25.01]] remoteproc: k3-m4: Fix implicit definition of
> + ti_secure_image_post_process
> +
> +Add missing include to make sure that ti_secure_image_post_process() is
> +not implicitly declared.
> +
> +Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> +
> +Upstream-Status: Pending
> +
> +---
> + drivers/remoteproc/ti_k3_m4_rproc.c | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/drivers/remoteproc/ti_k3_m4_rproc.c b/drivers/remoteproc/ti_k3_m4_rproc.c
> +index 5a5ae2fa81d..516c817385e 100644
> +--- a/drivers/remoteproc/ti_k3_m4_rproc.c
> ++++ b/drivers/remoteproc/ti_k3_m4_rproc.c
> +@@ -20,6 +20,7 @@
> + #include <linux/sizes.h>
> + #include <linux/soc/ti/ti_sci_protocol.h>
> + #include "ti_sci_proc.h"
> ++#include <mach/security.h>
> +
> + /**
> +  * struct k3_m4_mem - internal memory structure
> +--
> +2.17.1
> +
diff mbox series

Patch

diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
index 5e56d2db..c041ffe8 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
@@ -6,4 +6,6 @@  PR = "r0"
 
 BRANCH = "ti-u-boot-2025.01"
 
+SRC_URI += "file://0001-remoteproc-k3-m4-Fix-implicit-definition-of-ti_secur.patch"
+
 SRCREV = "4e9c90ad8b12cc5b4fdd1308bc3ac3e4fc869aab"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot/0001-remoteproc-k3-m4-Fix-implicit-definition-of-ti_secur.patch b/meta-ti-bsp/recipes-bsp/u-boot/u-boot/0001-remoteproc-k3-m4-Fix-implicit-definition-of-ti_secur.patch
new file mode 100644
index 00000000..c6b15651
--- /dev/null
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot/0001-remoteproc-k3-m4-Fix-implicit-definition-of-ti_secur.patch
@@ -0,0 +1,32 @@ 
+From f9c2ae13a80f3b0f309214c6b57bc3a705b71398 Mon Sep 17 00:00:00 2001
+From: Ryan Eatmon <reatmon@ti.com>
+Date: Mon, 3 Feb 2025 16:54:24 -0600
+Subject: [tiU25.01]] remoteproc: k3-m4: Fix implicit definition of
+ ti_secure_image_post_process
+
+Add missing include to make sure that ti_secure_image_post_process() is
+not implicitly declared.
+
+Signed-off-by: Ryan Eatmon <reatmon@ti.com>
+
+Upstream-Status: Pending
+
+---
+ drivers/remoteproc/ti_k3_m4_rproc.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/remoteproc/ti_k3_m4_rproc.c b/drivers/remoteproc/ti_k3_m4_rproc.c
+index 5a5ae2fa81d..516c817385e 100644
+--- a/drivers/remoteproc/ti_k3_m4_rproc.c
++++ b/drivers/remoteproc/ti_k3_m4_rproc.c
+@@ -20,6 +20,7 @@
+ #include <linux/sizes.h>
+ #include <linux/soc/ti/ti_sci_protocol.h>
+ #include "ti_sci_proc.h"
++#include <mach/security.h>
+ 
+ /**
+  * struct k3_m4_mem - internal memory structure
+-- 
+2.17.1
+