Changeset dbdb0255 in rtems


Ignore:
Timestamp:
May 6, 2008, 8:58:05 PM (12 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.9, master
Children:
2226b8f8
Parents:
0542a23
Message:

2008-05-06 Ray Xu <rayx.cn@…>

  • Makefile.am, configure.ac, preinstall.am, s3c2400/include/s3c2400.h: Add CPU type s3c2410. Add a new s3c24xx common file shared between s3c2400 and s3c2410. Most content is moved from s3c2400 now. Some were changed to include <s3c24xx.h> instead of <s3c2400.h>.
  • s3c2410/include/s3c2410.h, s3c2410/irq/bsp_irq_asm.S, s3c2410/irq/irq.h, s3c24xx/clock/clockdrv.c, s3c24xx/clock/support.c, s3c24xx/include/s3c24xx.h, s3c24xx/irq/bsp_irq_init.c, s3c24xx/irq/irq.c, s3c24xx/irq/irq.h, s3c24xx/timer/timer.c: New files.
Location:
c/src/lib/libcpu/arm
Files:
10 added
5 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libcpu/arm/ChangeLog

    r0542a23 rdbdb0255  
     12008-05-06      Ray Xu <rayx.cn@gmail.com>
     2
     3        * Makefile.am, configure.ac, preinstall.am, s3c2400/include/s3c2400.h:
     4        Add CPU type s3c2410. Add a new s3c24xx common file shared between
     5        s3c2400 and s3c2410. Most content is moved from s3c2400 now. Some
     6        were changed to include <s3c24xx.h> instead of <s3c2400.h>.
     7        * s3c2410/include/s3c2410.h, s3c2410/irq/bsp_irq_asm.S,
     8        s3c2410/irq/irq.h, s3c24xx/clock/clockdrv.c, s3c24xx/clock/support.c,
     9        s3c24xx/include/s3c24xx.h, s3c24xx/irq/bsp_irq_init.c,
     10        s3c24xx/irq/irq.c, s3c24xx/irq/irq.h, s3c24xx/timer/timer.c: New files.
     11
    1122007-12-11      Joel Sherrill <joel.sherrill@OARcorp.com>
    213
  • c/src/lib/libcpu/arm/Makefile.am

    r0542a23 rdbdb0255  
    9191
    9292if s3c2400
    93 include_HEADERS = s3c2400/include/s3c2400.h
     93include_HEADERS = s3c24xx/include/s3c24xx.h s3c2400/include/s3c2400.h
    9494
    9595## s3c2400/clock
     
    109109
    110110noinst_PROGRAMS += s3c2400/irq.rel
    111 s3c2400_irq_rel_SOURCES = s3c2400/irq/irq.c s3c2400/irq/bsp_irq_init.c \
     111s3c2400_irq_rel_SOURCES = s3c24xx/irq/irq.c s3c24xx/irq/bsp_irq_init.c \
    112112    ../../libbsp/arm/shared/irq/irq_init.c s3c2400/irq/bsp_irq_asm.S \
    113113    ../../libbsp/arm/shared/irq/irq_asm.S s3c2400/irq/irq.h
    114114s3c2400_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
    115115s3c2400_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     116endif
     117
     118if s3c2410
     119include_HEADERS = s3c24xx/include/s3c24xx.h s3c2410/include/s3c2410.h
     120
     121## s3c2410/clock
     122noinst_PROGRAMS += s3c2410/clock.rel
     123s3c2410_clock_rel_SOURCES = s3c24xx/clock/clockdrv.c s3c24xx/clock/support.c
     124s3c2410_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
     125s3c2410_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     126
     127## s3c2410/timer
     128noinst_PROGRAMS += s3c2410/timer.rel
     129s3c2410_timer_rel_SOURCES = s3c24xx/timer/timer.c
     130s3c2410_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
     131s3c2410_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     132
     133## s3c2410/interrupt
     134include_HEADERS += s3c2410/irq/irq.h
     135
     136noinst_PROGRAMS += s3c2410/irq.rel
     137s3c2410_irq_rel_SOURCES = s3c24xx/irq/irq.c s3c24xx/irq/bsp_irq_init.c \
     138    ../../libbsp/arm/shared/irq/irq_init.c s3c2410/irq/bsp_irq_asm.S \
     139    ../../libbsp/arm/shared/irq/irq_asm.S s3c2410/irq/irq.h
     140s3c2410_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
     141s3c2410_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    116142endif
    117143
  • c/src/lib/libcpu/arm/configure.ac

    r0542a23 rdbdb0255  
    2424AM_CONDITIONAL(shared, test "$RTEMS_CPU_MODEL" = "at91rm9200" || \
    2525                       test "$RTEMS_CPU_MODEL" = "mc9328mxl" || \
     26                       test "$RTEMS_CPU_MODEL" = "s3c2410" || \
    2627                       test "$RTEMS_CPU_MODEL" = "s3c2400")
    2728AM_CONDITIONAL(at91rm9200, test "$RTEMS_CPU_MODEL" = "at91rm9200")
    2829AM_CONDITIONAL(mc9328mxl, test "$RTEMS_CPU_MODEL" = "mc9328mxl")
    2930AM_CONDITIONAL(s3c2400, test "$RTEMS_CPU_MODEL" = "s3c2400")
     31AM_CONDITIONAL(s3c2410, test "$RTEMS_CPU_MODEL" = "s3c2410")
    3032AM_CONDITIONAL(lpc22xx, test "$RTEMS_CPU_MODEL" = "lpc22xx")
    3133
  • c/src/lib/libcpu/arm/preinstall.am

    r0542a23 rdbdb0255  
    7272endif
    7373if s3c2400
     74$(PROJECT_INCLUDE)/s3c24xx.h: s3c24xx/include/s3c24xx.h $(PROJECT_INCLUDE)/$(dirstamp)
     75        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c24xx.h
     76PREINSTALL_FILES += $(PROJECT_INCLUDE)/s3c24xx.h
     77
    7478$(PROJECT_INCLUDE)/s3c2400.h: s3c2400/include/s3c2400.h $(PROJECT_INCLUDE)/$(dirstamp)
    7579        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c2400.h
     
    7781
    7882$(PROJECT_INCLUDE)/irq.h: s3c2400/irq/irq.h $(PROJECT_INCLUDE)/$(dirstamp)
     83        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/irq.h
     84PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq.h
     85endif
     86if s3c2410
     87$(PROJECT_INCLUDE)/s3c24xx.h: s3c24xx/include/s3c24xx.h $(PROJECT_INCLUDE)/$(dirstamp)
     88        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c24xx.h
     89PREINSTALL_FILES += $(PROJECT_INCLUDE)/s3c24xx.h
     90
     91$(PROJECT_INCLUDE)/s3c2410.h: s3c2410/include/s3c2410.h $(PROJECT_INCLUDE)/$(dirstamp)
     92        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c2410.h
     93PREINSTALL_FILES += $(PROJECT_INCLUDE)/s3c2410.h
     94
     95$(PROJECT_INCLUDE)/irq.h: s3c2410/irq/irq.h $(PROJECT_INCLUDE)/$(dirstamp)
    7996        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/irq.h
    8097PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq.h
  • c/src/lib/libcpu/arm/s3c2400/include/s3c2400.h

    r0542a23 rdbdb0255  
    428428/* Wait until rINTPND is changed for the case that the ISR is very short. */
    429429
     430#ifndef __asm__
    430431/* Typedefs */
    431432typedef union {
     
    654655  unsigned long all;
    655656} IISSFIF;
    656 
     657#endif //__asm__
    657658
    658659#define LCD_WIDTH 240
Note: See TracChangeset for help on using the changeset viewer.