From 1232cd46905cc5a59dae2195c39eb5dd5742a754 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 25 Jun 2018 08:44:16 +0200 Subject: bsp/riscv: Add device tree support for console Update #3433. --- c/src/lib/libbsp/riscv/riscv/Makefile.am | 9 ++++----- c/src/lib/libbsp/riscv/riscv/configure.ac | 3 +++ 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/riscv/riscv/Makefile.am b/c/src/lib/libbsp/riscv/riscv/Makefile.am index bc5355f585..c8299f3e72 100644 --- a/c/src/lib/libbsp/riscv/riscv/Makefile.am +++ b/c/src/lib/libbsp/riscv/riscv/Makefile.am @@ -49,9 +49,6 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/riscv/riscv/clock/clockdrv.c # Timer librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv/btimer/btimer.c -# console -librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c - # IRQ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv/irq/irq.c @@ -59,8 +56,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv/irq/irq.c # Cache librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c -# debugio -librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv/console/console-io.c +# Console +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv/console/console-config.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv/console/htif.c if HAS_SMP librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspsmp-dummy.c diff --git a/c/src/lib/libbsp/riscv/riscv/configure.ac b/c/src/lib/libbsp/riscv/riscv/configure.ac index 9d13210cd7..68a7b50871 100644 --- a/c/src/lib/libbsp/riscv/riscv/configure.ac +++ b/c/src/lib/libbsp/riscv/riscv/configure.ac @@ -27,6 +27,9 @@ RTEMS_BSPOPTS_HELP([BSP_FDT_BLOB_READ_ONLY],[place the FDT blob into the read-on RTEMS_BSPOPTS_SET([BSP_FDT_BLOB_COPY_TO_READ_ONLY_LOAD_AREA],[*],[1]) RTEMS_BSPOPTS_HELP([BSP_FDT_BLOB_COPY_TO_READ_ONLY_LOAD_AREA],[copy the FDT blob into the read-only load area via bsp_fdt_copy()]) +RTEMS_BSPOPTS_SET([RISCV_ENABLE_HTIF_SUPPORT],[*],[1]) +RTEMS_BSPOPTS_HELP([RISCV_ENABLE_HTIF_SUPPORT],[enables the HTIF support if defined to a non-zero value, otherwise it is disabled (enabled by default)]) + RTEMS_BSP_CLEANUP_OPTIONS case "${RTEMS_BSP}" in -- cgit v1.2.3