Skip to contentSkip to conversation

spl: spl_fit: add weak prototype for fpga_load

PATCH RESEND In review Eugen Hristev 2 participants 2 messages Jun 19, 2023

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 spl: spl_fit: add weak prototype for fpga_load

In case OPTIMIZE_DEBUG is set, unused code will not be optimized out, hence the reference to fpga_load will be compiled.
if DM_FPGA and SPL_FPGA are not set, the build will fail with :

aarch64-none-linux-gnu-ld.bfd: common/spl/spl_fit.o: in function `spl_fit_upload_fpga':
u-boot/common/spl/spl_fit.c:595: undefined reference to `fpga_load'

By adding a weak prototype, build is successful.

---
 common/spl/spl_fit.c | 6 ++++++
 1 file changed, 6 insertions(+)
common/spl/spl_fit.c +6 -0
index c51482b3b659..ca2e337b1ec4 100644
@@ -570,6 +570,12 @@ static void warn_deprecated(const char *msg)
 	printf("\tSee doc/uImage.FIT/source_file_format.txt\n");
 }
 
+__weak int fpga_load(int devnum, const void *buf, size_t bsize,
+		     bitstream_type bstype, int flags)
+{
+	return 0;
+}
+
 static int spl_fit_upload_fpga(struct spl_fit_info *ctx, int node,
 			       struct spl_image_info *fpga_image)
 {
Signature · 1 line
2.34.1
#1 lore raw

Hi Eugen,

Quoted 33 lines · Eugen Hristev

In case OPTIMIZE_DEBUG is set, unused code will not be optimized out, hence the reference to fpga_load will be compiled.
if DM_FPGA and SPL_FPGA are not set, the build will fail with :

aarch64-none-linux-gnu-ld.bfd: common/spl/spl_fit.o: in function `spl_fit_upload_fpga':
u-boot/common/spl/spl_fit.c:595: undefined reference to `fpga_load'

By adding a weak prototype, build is successful.

---
 common/spl/spl_fit.c | 6 ++++++
 1 file changed, 6 insertions(+)
common/spl/spl_fit.c +6 -1
index c51482b3b659..ca2e337b1ec4 100644
@@ -570,6 +570,12 @@ static void warn_deprecated(const char *msg)
        printf("\tSee doc/uImage.FIT/source_file_format.txt\n");
 }
 
+__weak int fpga_load(int devnum, const void *buf, size_t bsize,
+                    bitstream_type bstype, int flags)
+{
+       return 0;
+}
+
 static int spl_fit_upload_fpga(struct spl_fit_info *ctx, int node,
                               struct spl_image_info *fpga_image)
 {
--
Quoted 2 lines

2.34.1

I'm not sure what to do with this. Perhaps the least worst is to put your weak function behind an '#ifdef OPTIMIZE_DEBUG'? Or would it work to create a static inline in the header for this case? Putting #ifdefs in the header files is more acceptable.

Regards,
Simon