Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: utils/serial: Generate FDT serial driver list at compile-time

Browse Source 
Instead of having FDT serial driver list hard-coded in the C source,
we generate it using carray.sh at compile-time.

Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
This commit is contained in:
Anup Patel
2022-05-13 09:26:13 +05:30
committed by Anup Patel
parent 73cf511914
commit 1e62705adc
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/utils/serial/fdt_serial.c
View File

@@ -13,23 +13,9 @@
#include <sbi_utils/fdt/fdt_helper.h>
#include <sbi_utils/serial/fdt_serial.h>
extern struct fdt_serial fdt_serial_uart8250;
extern struct fdt_serial fdt_serial_sifive;
extern struct fdt_serial fdt_serial_litex;
extern struct fdt_serial fdt_serial_htif;
extern struct fdt_serial fdt_serial_shakti;
extern struct fdt_serial fdt_serial_gaisler;
extern struct fdt_serial fdt_serial_xlnx_uartlite;
static struct fdt_serial *serial_drivers[] = {
&fdt_serial_uart8250,
&fdt_serial_sifive,
&fdt_serial_litex,
&fdt_serial_htif,
&fdt_serial_shakti,
&fdt_serial_gaisler,
&fdt_serial_xlnx_uartlite,
};
/* List of FDT serial drivers generated at compile time */
extern struct fdt_serial *fdt_serial_drivers[];
extern unsigned long fdt_serial_drivers_size;
static struct fdt_serial dummy = {
.match_table = NULL,
@@ -64,8 +50,8 @@ int fdt_serial_init(void)
}
/* First check DT node pointed by stdout-path */
for (pos = 0; pos < array_size(serial_drivers) && -1 < noff; pos++) {
drv = serial_drivers[pos];
for (pos = 0; pos < fdt_serial_drivers_size && -1 < noff; pos++) {
drv = fdt_serial_drivers[pos];
match = fdt_match_node(fdt, noff, drv->match_table);
if (!match)
@@ -87,8 +73,8 @@ int fdt_serial_init(void)
goto done;
/* Lastly check all DT nodes */
for (pos = 0; pos < array_size(serial_drivers); pos++) {
drv = serial_drivers[pos];
for (pos = 0; pos < fdt_serial_drivers_size; pos++) {
drv = fdt_serial_drivers[pos];
noff = fdt_find_match(fdt, -1, drv->match_table, &match);
if (noff < 0)

3
lib/utils/serial/fdt_serial_drivers.carray Normal file
View File

@@ -0,0 +1,3 @@
HEADER: sbi_utils/serial/fdt_serial.h
TYPE: struct fdt_serial
NAME: fdt_serial_drivers

16
lib/utils/serial/objects.mk
View File

@@ -8,13 +8,29 @@
#
libsbiutils-objs-y += serial/fdt_serial.o
libsbiutils-objs-y += serial/fdt_serial_drivers.o
carray-fdt_serial_drivers-y += fdt_serial_gaisler
libsbiutils-objs-y += serial/fdt_serial_gaisler.o
carray-fdt_serial_drivers-y += fdt_serial_htif
libsbiutils-objs-y += serial/fdt_serial_htif.o
carray-fdt_serial_drivers-y += fdt_serial_shakti
libsbiutils-objs-y += serial/fdt_serial_shakti.o
carray-fdt_serial_drivers-y += fdt_serial_sifive
libsbiutils-objs-y += serial/fdt_serial_sifive.o
carray-fdt_serial_drivers-y += fdt_serial_litex
libsbiutils-objs-y += serial/fdt_serial_litex.o
carray-fdt_serial_drivers-y += fdt_serial_uart8250
libsbiutils-objs-y += serial/fdt_serial_uart8250.o
carray-fdt_serial_drivers-y += fdt_serial_xlnx_uartlite
libsbiutils-objs-y += serial/fdt_serial_xlnx_uartlite.o
libsbiutils-objs-y += serial/gaisler-uart.o
libsbiutils-objs-y += serial/shakti-uart.o
libsbiutils-objs-y += serial/sifive-uart.o