diff options
| author | Atish Patra <atish.patra@wdc.com> | 2019-06-18 14:54:02 -0700 |
|---|---|---|
| committer | Anup Patel <anup.patel@wdc.com> | 2019-06-19 09:48:54 +0530 |
| commit | 98aaf8317b74414afa78078bc056670f46c45f41 (patch) | |
| tree | e26aa71b9e3ea232f246fd10a7cfd3fd94578f7a | |
| parent | 749b0b093242a4c27f7c4f66121afd7852b2de48 (diff) | |
lib: Include helper libc functions directly in libsbi.
libsbi needs some of the custom libc functions. It should be directly
included in libsbi instead of platform specific libraries.
Signed-off-by: Atish Patra <atish.patra@wdc.com>
Acked-by: Anup Patel <anup.patel@wdc.com>
| -rw-r--r-- | include/sbi/string.h (renamed from platform/common/include/plat/string.h) | 0 | ||||
| -rw-r--r-- | lib/sbi/libc/objects.mk (renamed from platform/common/libc/objects.mk) | 4 | ||||
| -rw-r--r-- | lib/sbi/libc/string.c (renamed from platform/common/libc/string.c) | 2 | ||||
| -rw-r--r-- | lib/sbi/objects.mk | 3 | ||||
| -rw-r--r-- | lib/sbi/sbi_fifo.c | 2 | ||||
| -rw-r--r-- | lib/sbi/sbi_ipi.c | 2 | ||||
| -rw-r--r-- | lib/sbi/sbi_tlb.c | 2 | ||||
| -rw-r--r-- | platform/common/irqchip/plic.c | 2 | ||||
| -rw-r--r-- | platform/common/libfdt/libfdt_env.h | 2 | ||||
| -rw-r--r-- | platform/common/tinyfdt.c | 2 |
10 files changed, 9 insertions, 12 deletions
diff --git a/platform/common/include/plat/string.h b/include/sbi/string.h index 8259ef5..8259ef5 100644 --- a/platform/common/include/plat/string.h +++ b/include/sbi/string.h diff --git a/platform/common/libc/objects.mk b/lib/sbi/libc/objects.mk index 1dcfe8e..7a6ebbe 100644 --- a/platform/common/libc/objects.mk +++ b/lib/sbi/libc/objects.mk @@ -10,6 +10,6 @@ libc_files = string.o $(foreach file, $(libc_files), \ - $(eval CFLAGS_$(file) = -I$(src)/../../common/libc)) + $(eval CFLAGS_$(file) = -I$(src)/../../sbi/libc)) -platform-common-objs-$(PLATFORM_INCLUDE_LIBC) += $(addprefix libc/,$(libc_files)) +libsbi-objs-y += $(addprefix libc/,$(libc_files)) diff --git a/platform/common/libc/string.c b/lib/sbi/libc/string.c index 6e273d0..b5743fe 100644 --- a/platform/common/libc/string.c +++ b/lib/sbi/libc/string.c @@ -12,7 +12,7 @@ * bugs as well. Use any optimized routines from newlib or glibc if required. */ -#include <plat/string.h> +#include <sbi/string.h> int strcmp(const char *a, const char *b) { diff --git a/lib/sbi/objects.mk b/lib/sbi/objects.mk index 817e805..d0fd856 100644 --- a/lib/sbi/objects.mk +++ b/lib/sbi/objects.mk @@ -27,6 +27,3 @@ libsbi-objs-y += sbi_system.o libsbi-objs-y += sbi_timer.o libsbi-objs-y += sbi_tlb.o libsbi-objs-y += sbi_trap.o - -# External Libraries to include -PLATFORM_INCLUDE_LIBC=y diff --git a/lib/sbi/sbi_fifo.c b/lib/sbi/sbi_fifo.c index a92b46c..e823d2a 100644 --- a/lib/sbi/sbi_fifo.c +++ b/lib/sbi/sbi_fifo.c @@ -10,7 +10,7 @@ #include <sbi/riscv_locks.h> #include <sbi/sbi_error.h> #include <sbi/sbi_fifo.h> -#include <plat/string.h> +#include <sbi/string.h> void sbi_fifo_init(struct sbi_fifo *fifo, void *queue_mem, u16 entries, u16 entry_size) diff --git a/lib/sbi/sbi_ipi.c b/lib/sbi/sbi_ipi.c index 48d5b22..19da029 100644 --- a/lib/sbi/sbi_ipi.c +++ b/lib/sbi/sbi_ipi.c @@ -19,7 +19,7 @@ #include <sbi/sbi_platform.h> #include <sbi/sbi_timer.h> #include <sbi/sbi_tlb.h> -#include <plat/string.h> +#include <sbi/string.h> static unsigned long ipi_data_off; diff --git a/lib/sbi/sbi_tlb.c b/lib/sbi/sbi_tlb.c index 814d402..1031df3 100644 --- a/lib/sbi/sbi_tlb.c +++ b/lib/sbi/sbi_tlb.c @@ -16,7 +16,7 @@ #include <sbi/sbi_bitops.h> #include <sbi/sbi_scratch.h> #include <sbi/sbi_tlb.h> -#include <plat/string.h> +#include <sbi/string.h> static unsigned long ipi_tlb_fifo_off; static unsigned long ipi_tlb_fifo_mem_off; diff --git a/platform/common/irqchip/plic.c b/platform/common/irqchip/plic.c index 90a7820..e3cdb17 100644 --- a/platform/common/irqchip/plic.c +++ b/platform/common/irqchip/plic.c @@ -10,7 +10,7 @@ #include <sbi/riscv_io.h> #include <sbi/riscv_encoding.h> #include <sbi/sbi_console.h> -#include <plat/string.h> +#include <sbi/string.h> #include <plat/tinyfdt.h> #include <plat/irqchip/plic.h> diff --git a/platform/common/libfdt/libfdt_env.h b/platform/common/libfdt/libfdt_env.h index 2428fd5..adcd315 100644 --- a/platform/common/libfdt/libfdt_env.h +++ b/platform/common/libfdt/libfdt_env.h @@ -52,7 +52,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <plat/string.h> +#include <sbi/string.h> #include <sbi/sbi_types.h> #define INT_MAX ((int)(~0U >> 1)) diff --git a/platform/common/tinyfdt.c b/platform/common/tinyfdt.c index e62a809..73dd131 100644 --- a/platform/common/tinyfdt.c +++ b/platform/common/tinyfdt.c @@ -7,7 +7,7 @@ * Anup Patel <anup.patel@wdc.com> */ -#include <plat/string.h> +#include <sbi/string.h> #include <plat/tinyfdt.h> #define FDT_MAGIC 0xd00dfeed |