diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-05-06 20:54:06 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-05-06 20:54:06 +0000 |
| commit | 0542a23b3fe475cf0249dc37fd739a8e8b8209d8 (patch) | |
| tree | 1c3ee5200eb748f44d2af5ca0e78c383df4eb2f6 /c/src/lib/libbsp/arm/gp32 | |
| parent | 2008-05-06 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-0542a23b3fe475cf0249dc37fd739a8e8b8209d8.tar.bz2 | |
2008-05-06 Ray Xu <rayx.cn@gmail.com>
* console/uart.c, include/bsp.h, smc/smc.c, startup/bspstart.c: Merge
smdk2410 with gp32.
Diffstat (limited to 'c/src/lib/libbsp/arm/gp32')
| -rw-r--r-- | c/src/lib/libbsp/arm/gp32/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/gp32/console/uart.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/gp32/include/bsp.h | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/gp32/smc/smc.c | 10 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/gp32/startup/bspstart.c | 7 |
5 files changed, 21 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/arm/gp32/ChangeLog b/c/src/lib/libbsp/arm/gp32/ChangeLog index 3f0cb548a7..9dde3cda72 100644 --- a/c/src/lib/libbsp/arm/gp32/ChangeLog +++ b/c/src/lib/libbsp/arm/gp32/ChangeLog @@ -1,3 +1,8 @@ +2008-05-06 Ray Xu <rayx.cn@gmail.com> + + * console/uart.c, include/bsp.h, smc/smc.c, startup/bspstart.c: Merge + smdk2410 with gp32. + 2008-03-03 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/linkcmds: Add wildcard to gcc_except_table section so diff --git a/c/src/lib/libbsp/arm/gp32/console/uart.c b/c/src/lib/libbsp/arm/gp32/console/uart.c index 88521463f9..02cb590d20 100644 --- a/c/src/lib/libbsp/arm/gp32/console/uart.c +++ b/c/src/lib/libbsp/arm/gp32/console/uart.c @@ -25,7 +25,7 @@ #include <rtems/bspIo.h> /* Put the CPU (or UART) specific header file #include here */ -#include <s3c2400.h> +#include <s3c24xx.h> #include <libchip/serial.h> #include <libchip/sersupp.h> diff --git a/c/src/lib/libbsp/arm/gp32/include/bsp.h b/c/src/lib/libbsp/arm/gp32/include/bsp.h index bbed42a0c4..d702591d5e 100644 --- a/c/src/lib/libbsp/arm/gp32/include/bsp.h +++ b/c/src/lib/libbsp/arm/gp32/include/bsp.h @@ -28,7 +28,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> -#include <s3c2400.h> +#include <s3c24xx.h> #define gp32_initButtons() {rPBCON=0x0;} #define gp32_getButtons() \ diff --git a/c/src/lib/libbsp/arm/gp32/smc/smc.c b/c/src/lib/libbsp/arm/gp32/smc/smc.c index cd0a9a5607..16aabb9d08 100644 --- a/c/src/lib/libbsp/arm/gp32/smc/smc.c +++ b/c/src/lib/libbsp/arm/gp32/smc/smc.c @@ -17,7 +17,7 @@ #include "rtems/diskdevs.h" #include "smc.h" #include <rtems/bspIo.h> -#include <s3c2400.h> +#include <s3c24xx.h> #define SMC_DEVICE_NAME "/dev/smc" #define SMC_SAMSUNG_ID 0xEC @@ -58,6 +58,14 @@ struct SMC_INFO uint32_t mb; }; +#ifdef CPU_S3C2410 //different regester map +#define rPBDAT rGPBDAT +#define rPBCON rGPBCON +#define rPDDAT rGPDDAT +#define rPEDAT rGPEDAT +#endif + + static struct SMC_INFO smc_info; uint32_t smc_l2p[0x2000]; diff --git a/c/src/lib/libbsp/arm/gp32/startup/bspstart.c b/c/src/lib/libbsp/arm/gp32/startup/bspstart.c index 739ebe77e3..0b34e58190 100644 --- a/c/src/lib/libbsp/arm/gp32/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/gp32/startup/bspstart.c @@ -18,7 +18,7 @@ #include <rtems/libcsupport.h> #include <rtems/libio.h> #include <rtems/bspIo.h> -#include <s3c2400.h> +#include <s3c24xx.h> /*-------------------------------------------------------------------------+ | Global Variables @@ -92,8 +92,11 @@ void bsp_start_default( void ) int i; /* stop RTC */ +#ifdef CPU_S3C2400 rTICINT=0x0; - +#else + rTICNT=0x0; +#endif /* stop watchdog,ADC and timers */ rWTCON=0x0; rTCON=0x0; |