diff options
Diffstat (limited to 'c/src/lib/libbsp/i386/pc386/startup')
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/startup/bspreset.c | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/startup/bspstart.c | 11 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/startup/ldsegs.S | 2 |
4 files changed, 1 insertions, 23 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c b/c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c index 5207bac6c1..21cb472607 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c +++ b/c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c @@ -56,7 +56,6 @@ static void bsp_size_memory(void) { uintptr_t topAddr; -#if (BSP_IS_EDISON == 0) /* Set the value of start of free memory. */ rtemsWorkAreaStart = (uint32_t)WorkAreaBase + _stack_size; @@ -117,10 +116,6 @@ static void bsp_size_memory(void) #endif } -#else - topAddr = (1 * 1024 * 1024 * 1024); -#endif - bsp_mem_size = topAddr; } diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspreset.c b/c/src/lib/libbsp/i386/pc386/startup/bspreset.c index b11a123399..ebb283b6f6 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/bspreset.c +++ b/c/src/lib/libbsp/i386/pc386/startup/bspreset.c @@ -14,9 +14,5 @@ void bsp_reset(void) { /* shutdown and reboot */ - #if (BSP_IS_EDISON == 0) - outport_byte(0x64, 0xFE); /* use keyboard controller */ - #else - *((uint32_t*)0xff009000) = 0xf3; /* use watchdog */ - #endif + *((uint32_t*)0xff009000) = 0xf3; /* use watchdog */ } diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c index 0559fbe065..db1ca90cf4 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c +++ b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c @@ -49,7 +49,6 @@ rtems_pci_config_t BSP_pci_configuration = { */ static void bsp_pci_initialize_helper(void) { -#if (BSP_IS_EDISON == 0) const pci_config_access_functions *pci_accessors; pci_accessors = pci_bios_initialize(); @@ -67,7 +66,6 @@ static void bsp_pci_initialize_helper(void) } printk("PCI bus: could not initialize PCI BIOS interface\n"); -#endif } /*-------------------------------------------------------------------------+ @@ -82,17 +80,10 @@ static void bsp_start_default( void ) /* * Turn off watchdog */ -#if (BSP_IS_EDISON == 1) - volatile uint32_t *edison_wd = (volatile uint32_t *)0xff009000; - *edison_wd = 0x11f8; -#endif - /* * Calibrate variable for 1ms-loop (see timer.c) */ -#if (BSP_IS_EDISON == 0) Calibrate_loop_1ms(); -#endif /* * Init rtems interrupt management @@ -136,9 +127,7 @@ static void bsp_start_default( void ) */ pc386_parse_console_arguments(); -#if (BSP_IS_EDISON == 0) Clock_driver_install_handler(); -#endif #if BSP_ENABLE_IDE bsp_ide_cmdline_init(); diff --git a/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S b/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S index 626d5a02d4..b56bf836f0 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S +++ b/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S @@ -120,7 +120,6 @@ next_step: | it isn't fun. +---------------------------------------------------------------------*/ -#if (BSP_IS_EDISON == 0) movb $0x11, al /* initialization sequence */ outb al, $0x20 /* send it to 8259A-1 */ call SYM(pc386_delay) @@ -156,7 +155,6 @@ next_step: movb $0xFB, al /* mask all irq's but irq2 which */ outb al, $0x21 /* is cascaded */ call SYM(pc386_delay) -#endif jmp SYM (_establish_stack) # return to the bsp entry code /*-------------------------------------------------------------------------+ |