From 815c9c464a268e2754bf0a93ac88c2af98d17d2d Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Fri, 8 Mar 2024 10:59:26 +0800 Subject: [PATCH] openamp: Refine elf_load to remoteproc_elf_loader to avoid the name conflict with binfmt elf loader Signed-off-by: Xiang Xiao --- openamp/open-amp.cmake | 2 ++ openamp/open-amp.defs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/openamp/open-amp.cmake b/openamp/open-amp.cmake index 419bce9c745..3fea5fde9b5 100644 --- a/openamp/open-amp.cmake +++ b/openamp/open-amp.cmake @@ -97,6 +97,8 @@ if(CONFIG_OPENAMP_DEBUG) add_compile_definitions(VQUEUE_DEBUG) endif() +add_compile_definitions(elf_load=remoteproc_elf_load) + set(WITH_LIBMETAL_FIND OFF) if(NOT CMAKE_SYSTEM_PROCESSOR) diff --git a/openamp/open-amp.defs b/openamp/open-amp.defs index 508e26ea071..6985eedb86b 100644 --- a/openamp/open-amp.defs +++ b/openamp/open-amp.defs @@ -30,6 +30,8 @@ ifeq ($(CONFIG_OPENAMP_DEBUG),y) CFLAGS += -DRPMSG_DEBUG -DVQUEUE_DEBUG endif +CFLAGS += -Delf_load=remoteproc_elf_load + CSRCS += open-amp/lib/remoteproc/elf_loader.c CSRCS += open-amp/lib/remoteproc/remoteproc.c CSRCS += open-amp/lib/remoteproc/remoteproc_virtio.c