diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-11-12 14:16:57 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-11-12 14:16:57 +0000 |
| commit | 8a54204379574c12af94a9491a91cf59a5857e22 (patch) | |
| tree | 8000c0ad4c8734fc33326e0d37abd5c12f10d80f /c/src/lib/libbsp/powerpc/gen83xx/include | |
| parent | 2010-11-12 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
| download | rtems-8a54204379574c12af94a9491a91cf59a5857e22.tar.bz2 | |
2010-11-12 Sebastian Huber <sebastian.huber@embedded-brains.de>
* console/console.h, console/console.c, console/config.c,
console/ns16550cfg.c: Removed files.
* console/console-config.c: New file.
* Makefile.am: Reflect changes above.
* configure.ac: New BSP options.
* include/bsp.h: Use new BSP options.
* network/network.c: Avoid memory leak.
* startup/bspstart.c: Initialize console port table.
* spi/spi_init.c: Update for SD card API changes.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/gen83xx/include')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h | 67 |
1 files changed, 17 insertions, 50 deletions
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h b/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h index bb6dc4c7f3..971d7c71b6 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h @@ -20,21 +20,9 @@ #ifndef __GEN83xx_BSP_h #define __GEN83xx_BSP_h -#include <bspopts.h> - -/* - * MPC8313E Reference Design Board - */ - -#ifdef MPC8313ERDB - -#define HAS_UBOOT +#define BSP_FEATURE_IRQ_EXTENSION -/* For U-Boot */ -#define CONFIG_MPC83XX -#define CONFIG_HAS_ETH1 - -#endif /* MPC8313ERDB */ +#include <bspopts.h> #include <libcpu/powerpc-utility.h> @@ -78,25 +66,23 @@ LINKER_SYMBOL(IMMRBAR); extern "C" { #endif - #include <rtems.h> #include <rtems/console.h> #include <rtems/clockdrv.h> -#include <bsp/irq.h> #include <bsp/vectors.h> -#include <bsp/tictac.h> +#include <bsp/irq.h> #ifdef HAS_UBOOT + #ifdef MPC8313ERDB + #define CONFIG_MPC83XX + #define CONFIG_HAS_ETH1 + #endif -#include <bsp/u-boot.h> - -extern bd_t bsp_uboot_board_info; -extern const size_t bsp_uboot_board_info_size; - -#endif /* HAS_UBOOT */ + #include <bsp/u-boot.h> -#define BSP_UART1_MINOR 0 -#define BSP_UART2_MINOR 1 + extern bd_t bsp_uboot_board_info; + extern const size_t bsp_uboot_board_info_size; +#endif /* * indicate, that BSP has no IDE driver @@ -111,21 +97,6 @@ extern const size_t bsp_uboot_board_info_size; rtems_status_code bsp_register_i2c(void); rtems_status_code bsp_register_spi(void); -/* console modes (only termios) */ -#ifdef PRINTK_MINOR -#undef PRINTK_MINOR -#endif -#define PRINTK_MINOR BSP_UART1_MINOR - -#if defined(MPC8249EAMDS) || defined(HSC_CM01) -#define BSP_USE_UART2 TRUE -#else -#define BSP_USE_UART2 FALSE -#endif - -#define SINGLE_CHAR_MODE -#define UARTS_USE_TERMIOS_INT 1 - /* * Network driver configuration */ @@ -134,16 +105,12 @@ extern int BSP_tsec_attach(struct rtems_bsdnet_ifconfig *config,int attaching); #define RTEMS_BSP_NETWORK_DRIVER_ATTACH BSP_tsec_attach #ifdef MPC8313ERDB - -#define RTEMS_BSP_NETWORK_DRIVER_NAME "tsec2" -#define RTEMS_BSP_NETWORK_DRIVER_NAME2 "tsec1" - -#else /* MPC8313ERDB */ - -#define RTEMS_BSP_NETWORK_DRIVER_NAME "tsec1" -#define RTEMS_BSP_NETWORK_DRIVER_NAME2 "tsec2" - -#endif /* MPC8313ERDB */ + #define RTEMS_BSP_NETWORK_DRIVER_NAME "tsec2" + #define RTEMS_BSP_NETWORK_DRIVER_NAME2 "tsec1" +#else + #define RTEMS_BSP_NETWORK_DRIVER_NAME "tsec1" + #define RTEMS_BSP_NETWORK_DRIVER_NAME2 "tsec2" +#endif #if defined(MPC8349EAMDS) /* |