From dd6992fd7c534bbb05e7cd85274f668632aa2de2 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 28 Jul 2017 14:15:36 -0500 Subject: Remove Edison BSP. Intel has obsoleted this hardware and the BSP was never completed. closes #3086. --- c/src/lib/libbsp/i386/pc386/Makefile.am | 7 -- c/src/lib/libbsp/i386/pc386/configure.ac | 10 --- c/src/lib/libbsp/i386/pc386/console/conscfg.c | 25 ------ .../lib/libbsp/i386/pc386/console/console_edison.c | 94 ---------------------- c/src/lib/libbsp/i386/pc386/include/bsp.h | 27 +------ c/src/lib/libbsp/i386/pc386/make/custom/edison.cfg | 5 -- .../lib/libbsp/i386/pc386/startup/bspgetworkarea.c | 5 -- c/src/lib/libbsp/i386/pc386/startup/bspreset.c | 6 +- c/src/lib/libbsp/i386/pc386/startup/bspstart.c | 11 --- c/src/lib/libbsp/i386/pc386/startup/ldsegs.S | 2 - 10 files changed, 3 insertions(+), 189 deletions(-) delete mode 100644 c/src/lib/libbsp/i386/pc386/console/console_edison.c delete mode 100644 c/src/lib/libbsp/i386/pc386/make/custom/edison.cfg diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am index 8408db0095..cc1a7f67cb 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/Makefile.am @@ -69,11 +69,7 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # clock -if RTEMS_EDISON -libbsp_a_SOURCES += ../../shared/clock_driver_simidle.c -else libbsp_a_SOURCES += clock/ckinit.c -endif libbsp_a_SOURCES += ../../shared/clockdrv_shell.h libbsp_a_SOURCES += clock/todcfg.c libbsp_a_SOURCES += ../../shared/tod.c @@ -113,9 +109,6 @@ endif endif # console (non-graphics support) -if RTEMS_EDISON -libbsp_a_SOURCES += console/console_edison.c -endif include_HEADERS += ../../i386/shared/comm/i386_io.h include_rtems_HEADERS += ../../shared/console_private.h libbsp_a_SOURCES += console/serial_mouse_config.c diff --git a/c/src/lib/libbsp/i386/pc386/configure.ac b/c/src/lib/libbsp/i386/pc386/configure.ac index d62a9b332e..13621153b3 100644 --- a/c/src/lib/libbsp/i386/pc386/configure.ac +++ b/c/src/lib/libbsp/i386/pc386/configure.ac @@ -17,15 +17,6 @@ RTEMS_PROG_CCAS RTEMS_CHECK_NETWORKING RTEMS_CHECK_SMP -# Is this an Intel Edison? -# NOTE: As we learn more, this could be trimmed if more issues -# turn out fo lack of legacy peripherals -RTEMS_BSPOPTS_SET([BSP_IS_EDISON],[edison],[1]) -RTEMS_BSPOPTS_SET([BSP_IS_EDISON],[*],[0]) -RTEMS_BSPOPTS_HELP([BSP_IS_EDISON],[Set if the BSP variant is Intel Edison.]) -AM_CONDITIONAL(RTEMS_EDISON,[test "$BSP_IS_EDISON" = "1"]) - -RTEMS_BSPOPTS_SET([BSP_ENABLE_VGA],[edison],[0]) RTEMS_BSPOPTS_SET([BSP_ENABLE_VGA],[*],[1]) RTEMS_BSPOPTS_HELP([BSP_ENABLE_VGA], [Set if the VGA and keyboard console support is enabled.]) @@ -35,7 +26,6 @@ RTEMS_BSPOPTS_SET([BSP_ENABLE_COM1_COM4],[*],[1]) RTEMS_BSPOPTS_HELP([BSP_ENABLE_COM1_COM4], [Set if COM1..COM4 support is enabled.]) -RTEMS_BSPOPTS_SET([BSP_ENABLE_IDE],[edison],[0]) RTEMS_BSPOPTS_SET([BSP_ENABLE_IDE],[*],[1]) RTEMS_BSPOPTS_HELP([BSP_ENABLE_IDE], [Set if IDE support is enabled.]) diff --git a/c/src/lib/libbsp/i386/pc386/console/conscfg.c b/c/src/lib/libbsp/i386/pc386/console/conscfg.c index 82d3cf9f98..97eb1b8cbb 100644 --- a/c/src/lib/libbsp/i386/pc386/console/conscfg.c +++ b/c/src/lib/libbsp/i386/pc386/console/conscfg.c @@ -60,10 +60,6 @@ } #endif -#if (BSP_IS_EDISON == 1 ) - extern const console_fns edison_fns; -#endif - /* * Default to the PC VGA console if present and configured. */ @@ -99,27 +95,6 @@ unsigned long Console_Configuration_Count = (sizeof(Console_Configuration_Ports)/sizeof(console_tbl)); static console_tbl Legacy_Ports[] = { -#if (BSP_IS_EDISON == 1) - { - "/dev/com1", /* sDeviceName */ - -1, /* deviceType */ - &edison_fns, /* pDeviceFns */ - NULL, /* deviceProbe */ - NULL, /* pDeviceFlow */ - 16, /* ulMargin */ - 8, /* ulHysteresis */ - (void *) NULL, /* NULL */ /* pDeviceParams */ - 0x00000000, /* ulCtrlPort1 */ - 0x00000000, /* ulCtrlPort2 */ - 0x00000000, /* ulDataPort */ - NULL, /* getRegister */ - NULL, /* setRegister */ - NULL,/* unused */ /* getData */ - NULL,/* unused */ /* setData */ - 0x0, /* ulClock */ - 0x0 /* ulIntVector -- base for port */ - }, -#endif #if BSP_ENABLE_COM1_COM4 { "/dev/com1", /* sDeviceName */ diff --git a/c/src/lib/libbsp/i386/pc386/console/console_edison.c b/c/src/lib/libbsp/i386/pc386/console/console_edison.c deleted file mode 100644 index d5e44aed86..0000000000 --- a/c/src/lib/libbsp/i386/pc386/console/console_edison.c +++ /dev/null @@ -1,94 +0,0 @@ - -#include -#include - -/* XXX hack until real support is available, code copied from libchip */ -#define NS16550_RECEIVE_BUFFER 0 -#define NS16550_TRANSMIT_BUFFER 0 -#define NS16550_INTERRUPT_ENABLE 1 -#define NS16550_INTERRUPT_ID 2 -#define NS16550_FIFO_CONTROL 2 -#define NS16550_LINE_CONTROL 3 -#define NS16550_MODEM_CONTROL 4 -#define NS16550_LINE_STATUS 5 -#define NS16550_MODEM_STATUS 6 -#define NS16550_SCRATCH_PAD 7 -#define NS16550_FRACTIONAL_DIVIDER 10 - -/* status bits we use in line status */ - -#define SP_LSR_TX 0x40 -#define SP_LSR_THOLD 0x20 -#define SP_LSR_RDY 0x01 -static volatile uint8_t *edison_com = (volatile uint8_t *)0xff010180; - -void edison_write_polled(int minor, char cChar); -int edison_inbyte_nonblocking_polled(int minor); - -static int edison_open(int major, int minor, void *arg) -{ - return 0; -} - -static int edison_close(int major, int minor, void *arg) -{ - return 0; -} - -int edison_inbyte_nonblocking_polled(int minor) -{ - if ( edison_com[NS16550_LINE_STATUS] & 0x01 ) - return (int) edison_com[NS16550_RECEIVE_BUFFER]; - return -1; -} - -static ssize_t edison_write_support_polled(int minor, const char *buf, size_t len) -{ - ssize_t i; - - for ( i=0 ; i