Changeset 53cb823 in rtems


Ignore:
Timestamp:
Sep 16, 2008, 10:15:59 PM (11 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, master
Children:
939439d3
Parents:
e1ee0b59
Message:

2008-09-16 Joel Sherrill <joel.sherrill@…>

  • Makefile.am, include/bsp.h, startup/init68360.c, startup/linkcmds, startup/linkcmds.bootp, startup/linkcmds.prom: Use top level shared bsp_get_work_area() implementation.
Location:
c/src/lib/libbsp/m68k/gen68360
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/m68k/gen68360/ChangeLog

    re1ee0b59 r53cb823  
     12008-09-16      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * Makefile.am, include/bsp.h, startup/init68360.c, startup/linkcmds,
     4        startup/linkcmds.bootp, startup/linkcmds.prom: Use top level shared
     5        bsp_get_work_area() implementation.
     6
    172008-09-16      Joel Sherrill <joel.sherrill@oarcorp.com>
    28
  • c/src/lib/libbsp/m68k/gen68360/Makefile.am

    re1ee0b59 r53cb823  
    2929    ../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \
    3030    ../../shared/bsplibc.c ../../shared/bsppost.c \
    31     ../../m68k/shared/m68kbspgetworkarea.c ../../shared/bspstart.c \
     31    ../../shared/bspgetworkarea.c ../../shared/bspstart.c \
    3232    startup/init68360.c ../../shared/bootcard.c \
    3333    ../../shared/sbrk.c ../../m68k/shared/setvec.c \
  • c/src/lib/libbsp/m68k/gen68360/include/bsp.h

    re1ee0b59 r53cb823  
    9898
    9999/*
    100  * Values assigned by link editor
    101  */
    102 extern char _RamBase[];
    103 extern char _HeapSize[];
    104 
    105 
    106 /*
    107100 * Definitions for Atlas Computer Equipment Inc. High Speed Bridge (HSB)
    108101 */
     
    114107
    115108
    116   /*
    117    * definitions for PGH360 board
    118    */
     109/*
     110 * definitions for PGH360 board
     111 */
    119112#if defined(PGH360)
    120113/*
  • c/src/lib/libbsp/m68k/gen68360/startup/init68360.c

    re1ee0b59 r53cb823  
    4646        unsigned long ramSize;
    4747        extern void _CopyDataClearBSSAndStart (unsigned long ramSize);
    48         extern char _RamBase[];
     48        extern void *RamBase;
    4949        extern void *_RomBase;  /* From linkcmds */
    5050
     
    147147                                        M360_MEMC_OR_1MB |
    148148                                        M360_MEMC_OR_DRAM;
    149         m360.memc[1].br = (unsigned long)&_RamBase |
     149        m360.memc[1].br = (unsigned long)&RamBase |
    150150                                        M360_MEMC_BR_BACK40 |
    151151                                        M360_MEMC_BR_V;
     
    153153                continue;
    154154        for (i = 0; i < 8; ++i)
    155                 *((volatile unsigned long *)(unsigned long)&_RamBase);
     155                *((volatile unsigned long *)(unsigned long)&RamBase);
    156156
    157157        /*
     
    285285        m360.memc[1].or = M360_MEMC_OR_TCYC(2) | M360_MEMC_OR_1MB |
    286286                                        M360_MEMC_OR_PGME | M360_MEMC_OR_DRAM;
    287         m360.memc[1].br = (unsigned long)&_RamBase | M360_MEMC_BR_V;
     287        m360.memc[1].br = (unsigned long)&RamBase | M360_MEMC_BR_V;
    288288
    289289        /* second bank 1MByte DRAM */
    290290        m360.memc[2].or = M360_MEMC_OR_TCYC(2) | M360_MEMC_OR_1MB |
    291291                                        M360_MEMC_OR_PGME | M360_MEMC_OR_DRAM;
    292         m360.memc[2].br = ((unsigned long)&_RamBase + 0x100000) |
     292        m360.memc[2].br = ((unsigned long)&RamBase + 0x100000) |
    293293                                        M360_MEMC_BR_V;
    294294
     
    306306                continue;
    307307        for (i = 0; i < 8; ++i)
    308                 *((volatile unsigned long *)(unsigned long)&_RamBase);
     308                *((volatile unsigned long *)(unsigned long)&RamBase);
    309309
    310310        /*
     
    446446                          M360_MEMC_OR_FCMC(0)  | /* M360_MEMC_OR_PGME | */
    447447                          M360_MEMC_OR_32BIT    | M360_MEMC_OR_DRAM;
    448         m360.memc[7].br = (unsigned long)&_RamBase | M360_MEMC_BR_V;
     448        m360.memc[7].br = (unsigned long)&RamBase | M360_MEMC_BR_V;
    449449
    450450        /*
     
    595595    */
    596596   ramSize = 4 * 1024 * 1024;
    597    m360.memc[1].br = (unsigned long)&_RamBase | M360_MEMC_BR_V;
     597   m360.memc[1].br = (unsigned long)&RamBase | M360_MEMC_BR_V;
    598598   m360.memc[1].or = M360_MEMC_OR_WAITS(0) | M360_MEMC_OR_2MB |
    599599                                                   M360_MEMC_OR_32BIT;
    600    m360.memc[2].br = ((unsigned long)&_RamBase + 0x200000) | M360_MEMC_BR_V;
     600   m360.memc[2].br = ((unsigned long)&RamBase + 0x200000) | M360_MEMC_BR_V;
    601601   m360.memc[2].or = M360_MEMC_OR_WAITS(0) | M360_MEMC_OR_2MB |
    602602                                                   M360_MEMC_OR_32BIT;
     
    745745                                                M360_MEMC_OR_16MB |
    746746                                                M360_MEMC_OR_DRAM;
    747                 m360.memc[1].br = (unsigned long)&_RamBase | M360_MEMC_BR_V;
     747                m360.memc[1].br = (unsigned long)&RamBase | M360_MEMC_BR_V;
    748748
    749749                /*
     
    754754                        continue;
    755755                for (i = 0; i < 8; ++i)
    756                         *((volatile unsigned long *)(unsigned long)&_RamBase);
     756                        *((volatile unsigned long *)(unsigned long)&RamBase);
    757757
    758758                /*
     
    764764                 * the memory map, but will work with the same bootstrap PROM.
    765765                 */
    766                 *(volatile char *)&_RamBase = 0;
    767                 *((volatile char *)&_RamBase+0x00C01800) = 1;
    768                 if (*(volatile char *)&_RamBase) {
     766                *(volatile char *)&RamBase = 0;
     767                *((volatile char *)&RamBase+0x00C01800) = 1;
     768                if (*(volatile char *)&RamBase) {
    769769                        m360.gmr = (m360.gmr & ~0x001C0000) | M360_GMR_PGS(1);
    770770                }
    771771                else {
    772                         *((volatile char *)&_RamBase+0x00801000) = 1;
    773                         if (*(volatile char *)&_RamBase) {
     772                        *((volatile char *)&RamBase+0x00801000) = 1;
     773                        if (*(volatile char *)&RamBase) {
    774774                                m360.gmr = (m360.gmr & ~0x001C0000) | M360_GMR_PGS(3);
    775775                        }
  • c/src/lib/libbsp/m68k/gen68360/startup/linkcmds

    re1ee0b59 r53cb823  
    1616 * A heap size of 0 means `use all available memory for the heap'.
    1717 */
    18 _RamBase = DEFINED(_RamBase) ? _RamBase : 0x0;
    19 _RamSize = DEFINED(_RamSize) ? _RamSize : 64M;
    20 _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
     18RamBase = DEFINED(RamBase) ? RamBase : 0x0;
     19RamSize = DEFINED(RamSize) ? RamSize : 64M;
     20HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
    2121_StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
    2222
     
    4545         */
    4646        ram : {
    47                 _RamBase = .;
     47                RamBase = .;
    4848        } >ram
    4949
     
    134134                _clear_end = .;
    135135
    136                 _WorkspaceBase = .;
     136                WorkAreaBase = .;
    137137        } >ram
    138138
  • c/src/lib/libbsp/m68k/gen68360/startup/linkcmds.bootp

    re1ee0b59 r53cb823  
    2020 * A heap size of 0 means `use all available memory for the heap'.
    2121 */
    22 _RamBase = DEFINED(_RamBase) ? _RamBase : 0x0;
    23 _RamSize = DEFINED(_RamSize) ? _RamSize : 64M;
    24 _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
     22RamBase = DEFINED(RamBase) ? RamBase : 0x0;
     23RamSize = DEFINED(RamSize) ? RamSize : 64M;
     24HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
    2525_StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
    2626
     
    5050         */
    5151        ram : {
    52                 _RamBase = .;
     52                RamBase = .;
    5353        } >ram
    5454
     
    139139                _clear_end = .;
    140140
    141                 _WorkspaceBase = .;
     141                WorkAreaBase = .;
    142142        } >myram
    143143
  • c/src/lib/libbsp/m68k/gen68360/startup/linkcmds.prom

    re1ee0b59 r53cb823  
    2020 * A heap size of 0 means `use all available memory for the heap'.
    2121 */
    22 _RamBase = DEFINED(_RamBase) ? _RamBase : 0x0;
    23 _RamSize = DEFINED(_RamSize) ? _RamSize : 64M;
    24 _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
     22RamBase = DEFINED(RamBase) ? RamBase : 0x0;
     23RamSize = DEFINED(RamSize) ? RamSize : 64M;
     24HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
    2525_StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
    2626
     
    4949         */
    5050        ram : {
    51                 _RamBase = .;
     51                RamBase = .;
    5252        } >ram
    5353
     
    137137                _clear_end = .;
    138138
    139                 _WorkspaceBase = .;
     139                WorkAreaBase = .;
    140140        } >ram
    141141
Note: See TracChangeset for help on using the changeset viewer.