Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 905949190d4df7fc5b7c4f3e96adf219e65cad78

Authored by Simon Glass
Committed by Tom Rini
1 parent db910353a1
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

Make export interface support CONFIG_SYS_MALLOC_SIMPLE 

When CONFIG_SYS_MALLOC_SIMPLE is defined, free() is a static inline. Make
sure that the export interface still builds in this case.

Signed-off-by: Simon Glass <sjg@chromium.org>

Showing 2 changed files with 4 additions and 0 deletions Side-by-side Diff

... ... @@ -23,7 +23,9 @@
23 23 EXPORT_FUNC(dummy, void, free_hdlr, void)
24 24 #endif
25 25 EXPORT_FUNC(malloc, void *, malloc, size_t)
  26 +#ifndef CONFIG_SYS_MALLOC_SIMPLE
26 27 EXPORT_FUNC(free, void, free, void *)
  28 +#endif
27 29 EXPORT_FUNC(udelay, void, udelay, unsigned long)
28 30 EXPORT_FUNC(get_timer, unsigned long, get_timer, unsigned long)
29 31 EXPORT_FUNC(vprintf, int, vprintf, const char *, va_list)
... ... @@ -15,7 +15,9 @@
15 15 void install_hdlr(int, interrupt_handler_t, void*);
16 16 void free_hdlr(int);
17 17 void *malloc(size_t);
  18 +#ifndef CONFIG_SYS_MALLOC_SIMPLE
18 19 void free(void*);
  20 +#endif
19 21 void __udelay(unsigned long);
20 22 unsigned long get_timer(unsigned long);
21 23 int vprintf(const char *, va_list);