change log for rtems (2011-07-20)
rtems-vc at rtems.org
rtems-vc at rtems.org
Wed Jul 20 17:11:32 UTC 2011
*jennifer*:
2011-07-20 Jennifer Averett <Jennifer.Averett at OARcorp.com>
* start/start16.S: Removed tabs and added OAR standard copyright header
in preperation for merging SMP support.
M 1.277 c/src/lib/libbsp/i386/pc386/ChangeLog
M 1.14 c/src/lib/libbsp/i386/pc386/start/start16.S
diff -u rtems/c/src/lib/libbsp/i386/pc386/ChangeLog:1.276 rtems/c/src/lib/libbsp/i386/pc386/ChangeLog:1.277
--- rtems/c/src/lib/libbsp/i386/pc386/ChangeLog:1.276 Thu Jul 14 10:07:21 2011
+++ rtems/c/src/lib/libbsp/i386/pc386/ChangeLog Wed Jul 20 11:50:19 2011
@@ -1,3 +1,8 @@
+2011-07-20 Jennifer Averett <Jennifer.Averett at OARcorp.com>
+
+ * start/start16.S: Removed tabs and added OAR standard copyright header
+ in preperation for merging SMP support.
+
2011-07-14 Jennifer Averett <Jennifer.Averett at OARcorp.com>
* start/start.S: Moved enable_sse into a subroutine that may be called
diff -u rtems/c/src/lib/libbsp/i386/pc386/start/start16.S:1.13 rtems/c/src/lib/libbsp/i386/pc386/start/start16.S:1.14
--- rtems/c/src/lib/libbsp/i386/pc386/start/start16.S:1.13 Wed Feb 11 13:48:25 2009
+++ rtems/c/src/lib/libbsp/i386/pc386/start/start16.S Wed Jul 20 11:50:19 2011
@@ -1,34 +1,47 @@
-/*-------------------------------------------------------------------------+
-| start16.s v1.0 - PC386 BSP - 1998/04/13
-+--------------------------------------------------------------------------+
-| This file contains the entry point for the application.
-| The name of this entry point is compiler dependent.
-| It jumps to the BSP which is responsible for performing all initialization.
-+--------------------------------------------------------------------------+
-| (C) Copyright 1997 -
-| - NavIST Group - Real-Time Distributed Systems and Industrial Automation
-|
-| http://pandora.ist.utl.pt
-|
-| Instituto Superior Tecnico * Lisboa * PORTUGAL
-+--------------------------------------------------------------------------+
-| Disclaimer:
-|
-| This file is provided "AS IS" without warranty of any kind, either
-| expressed or implied.
-+--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------+
+ * start16.s v1.0 - PC386 BSP - 1998/04/13
+ *--------------------------------------------------------------------------+
+ * This file contains the entry point for the application.
+ * The name of this entry point is compiler dependent.
+ * It jumps to the BSP which is responsible for performing all initialization.
+ *--------------------------------------------------------------------------+
+ * (C) Copyright 1997 -
+ * - NavIST Group - Real-Time Distributed Systems and Industrial Automation
+ *
+ * http://pandora.ist.utl.pt
+ *
+ * Instituto Superior Tecnico * Lisboa * PORTUGAL
+ *--------------------------------------------------------------------------+
+ * Disclaimer:
+ *
+ * This file is provided "AS IS" without warranty of any kind, either
+ * expressed or implied.
+ *--------------------------------------------------------------------------+
+ */
+
+/*
+ * COPYRIGHT (c) 2011.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
#include <bspopts.h>
-/*----------------------------------------------------------------------------+
+/*---------------------------------------------------------------------------+
| Constants
+----------------------------------------------------------------------------*/
-.set PROT_CODE_SEG, 0x08 # offset of code segment descriptor into GDT
-.set PROT_DATA_SEG, 0x10 # offset of code segment descriptor into GDT
-.set CR0_PE, 1 # protected mode flag on CR0 register
-.set HDRSTART, HEADERADDR # address of start of bin2boot header
-.set HDROFF, 0x24 # offset into bin2boot header of start32 addr
+.set PROT_CODE_SEG, 0x0 # offset of code segment descriptor into GDT
+.set PROT_DATA_SEG, 0x10 # offset of code segment descriptor into GDT
+.set CR0_PE, 1 # protected mode flag on CR0 register
+.set HDRSTART, HEADERADDR # address of start of bin2boot header
+.set HDROFF, 0x24 # offset into bin2boot header of start32 addr
.set STACKOFF, 0x200-0x10 # offset to load into %esp, from start of image
/* #define NEW_GAS */
@@ -38,91 +51,90 @@
.text
- .globl _start16 # entry point
- .globl start16
+ .globl _start16 # entry point
+ .globl start16
start16:
_start16:
.code16
+ cli # DISABLE INTERRUPTS!!!
- cli # DISABLE INTERRUPTS!!!
-
- movw %cs, %ax #
- movw %ax, %ds # set the rest of real mode registers
- movw %ax, %es #
- movw %ax, %ss #
+ movw %cs, %ax #
+ movw %ax, %ds # set the rest of real mode registers
+ movw %ax, %es #
+ movw %ax, %ss #
#if (RTEMS_VIDEO_80x50 == 1)
- movl $0x0040,%eax # use 32 bit constant to ensure 16 MSB=0
- mov %ax,%es
- movw %es:0x4a, %ax # get 16 bit number of columns
- cmpw $0, %ax # or 0 if no video adapter
- je 1f # if no video, skip touching it
- /*---------------------------------------------------------------------+
- | Switch VGA video to 80 lines x 50 columns mode. Has to be done before
- | turning protected mode on since it uses BIOS int 10h (video) services.
- +---------------------------------------------------------------------*/
-
- movw $0x0003, %ax # forced set
- int $0x10
- movw $0x1112, %ax # use 8x8 font
- xorb %bl, %bl
- int $0x10
- movw $0x1201, %ax # turn off cursor emulation
- movb $0x34, %bl
- int $0x10
- movb $0x01, %ah # define cursor (scan lines 0 to 7)
- movw $0x0007, %cx
- int $0x10
+ movl $0x0040,%eax # use 32 bit constant to ensure 16 MSB=0
+ mov %ax,%es
+ movw %es:0x4a, %ax # get 16 bit number of columns
+ cmpw $0, %ax # or 0 if no video adapter
+ je 1f # if no video, skip touching it
+ /*---------------------------------------------------------------------+
+ | Switch VGA video to 80 lines x 50 columns mode. Has to be done before
+ | turning protected mode on since it uses BIOS int 10h (video) services.
+ +---------------------------------------------------------------------*/
+
+ movw $0x0003, %ax # forced set
+ int $0x10
+ movw $0x1112, %ax # use 8x8 font
+ xorb %bl, %bl
+ int $0x10
+ movw $0x1201, %ax # turn off cursor emulation
+ movb $0x34, %bl
+ int $0x10
+ movb $0x01, %ah # define cursor (scan lines 0 to 7)
+ movw $0x0007, %cx
+ int $0x10
1:
#endif /* RTEMS_VIDEO_80x50 */
- /*---------------------------------------------------------------------+
- | Bare PC machines boot in real mode! We have to turn protected mode on.
- +---------------------------------------------------------------------*/
-
- lgdt gdtptr - start16 # load Global Descriptor Table
- movl %cr0, %eax
- orl $CR0_PE, %eax
- movl %eax, %cr0 # turn on protected mode
+ /*---------------------------------------------------------------------+
+ | Bare PC machines boot in real mode! We have to turn protected mode on.
+ +---------------------------------------------------------------------*/
+
+ lgdt gdtptr - start16 # load Global Descriptor Table
+ movl %cr0, %eax
+ orl $CR0_PE, %eax
+ movl %eax, %cr0 # turn on protected mode
#ifdef NEW_GAS
- ljmpl $PROT_CODE_SEG, $1f # flush prefetch queue, and reload %cs
+ ljmpl $PROT_CODE_SEG, $1f # flush prefetch queue, and reload %cs
#else
- ljmp $PROT_CODE_SEG, $1f # flush prefetch queue, and reload %cs
+ ljmp $PROT_CODE_SEG, $1f # flush prefetch queue, and reload %cs
#endif
.code32
1:
/*---------------------------------------------------------------------+
| load the other segment registers
+---------------------------------------------------------------------*/
- movl $PROT_DATA_SEG, %eax
- movw %ax, %ds
- movw %ax, %es
- movw %ax, %ss
- movl $start16 + STACKOFF, %esp # set up stack pointer
- addl $start16 + STACKOFF, %ebp # set up stack pointer
+ movl $PROT_DATA_SEG, %eax
+ movw %ax, %ds
+ movw %ax, %es
+ movw %ax, %ss
+ movl $start16 + STACKOFF, %esp # set up stack pointer
+ addl $start16 + STACKOFF, %ebp # set up stack pointer
/*---------------------------------------------------------------------+
| we have to enable A20 in order to access memory above 1MByte
+---------------------------------------------------------------------*/
- call empty_8042
- movb $0xD1, %al # command write
- outb %al, $0x64
- call empty_8042
- movb $0xDF, %al # A20 on
- outb %al, $0x60
- call empty_8042
-
- call pc386_delay
- call pc386_delay
- call pc386_delay
-
- movl %cs:HDRSTART + HDROFF, %eax #
- pushl %eax # jump to start of 32 bit code
- ret #
+ call empty_8042
+ movb $0xD1, %al # command write
+ outb %al, $0x64
+ call empty_8042
+ movb $0xDF, %al # A20 on
+ outb %al, $0x60
+ call empty_8042
+
+ call pc386_delay
+ call pc386_delay
+ call pc386_delay
+
+ movl %cs:HDRSTART + HDROFF, %eax #
+ pushl %eax # jump to start of 32 bit code
+ ret #
/*----------------------------------------------------------------------------+
| pc386_delay
@@ -137,24 +149,24 @@
!
| NOTE: Saving the content of the EAX register just in case. - Rosimildo.
+----------------------------------------------------------------------------*/
- .p2align 4
- .globl _pc386_delay
- .globl pc386_delay
+ .p2align 4
+ .globl _pc386_delay
+ .globl pc386_delay
pc386_delay:
_pc386_delay:
- pushl %eax
+ pushl %eax
#if defined(USE_OUTB_FOR_DELAY)
- outb %al, $0x80 # about 1uS delay on most machines
+ outb %al, $0x80 # about 1uS delay on most machines
#else
- movl $0x200, %eax
+ movl $0x200, %eax
pc386_delay1:
- dec %eax
- jnz pc386_delay1
+ dec %eax
+ jnz pc386_delay1
#endif
- popl %eax
- ret
+ popl %eax
+ ret
/*----------------------------------------------------------------------------+
| empty_8042
@@ -164,22 +176,22 @@
| No timeout is used - if this hangs there is something wrong with the machine,
| and we probably couldn't proceed anyway.
+----------------------------------------------------------------------------*/
- .p2align 4
- .globl _empty_8042
- .globl empty_8042
+ .p2align 4
+ .globl _empty_8042
+ .globl empty_8042
empty_8042:
_empty_8042:
- call pc386_delay
- inb $0x64, %al # 8042 status port
- testb $0x01, %al # output buffer?
- jz no_output
- call pc386_delay
- in $0x60, %al # read it
- jmp empty_8042
+ call pc386_delay
+ inb $0x64, %al # 8042 status port
+ testb $0x01, %al # output buffer?
+ jz no_output
+ call pc386_delay
+ in $0x60, %al # read it
+ jmp empty_8042
no_output:
- test $0x02, %al # is input buffer full?
- jnz empty_8042 # yes - loop
- ret
+ test $0x02, %al # is input buffer full?
+ jnz empty_8042 # yes - loop
+ ret
/*----------------------------------------------------------------------------+
| DATA section
@@ -189,20 +201,20 @@
* GLOBAL DESCRIPTOR TABLE *
**************************/
- .p2align 4
+ .p2align 4
gdtptr:
- /* we use the NULL descriptor to store the GDT pointer - a trick quite
- nifty due to: Robert Collins (rcollins at x86.org) */
- .word gdtlen - 1
- .long gdtptr
- .word 0x0000
-
- /* code segment */
- .word 0xffff, 0
- .byte 0, 0x9f, 0xcf, 0
+ /* we use the NULL descriptor to store the GDT pointer - a trick quite
+ nifty due to: Robert Collins (rcollins at x86.org) */
+ .word gdtlen - 1
+ .long gdtptr
+ .word 0x0000
+
+ /* code segment */
+ .word 0xffff, 0
+ .byte 0, 0x9f, 0xcf, 0
/* data segment */
- .word 0xffff, 0
- .byte 0, 0x93, 0xcf, 0
+ .word 0xffff, 0
+ .byte 0, 0x93, 0xcf, 0
- .set gdtlen, . - gdtptr # length of GDT
+ .set gdtlen, . - gdtptr # length of GDT
*joel* (on branch rtems-4-9-branch):
2011-07-20 Till Straumann <strauman at slac.stanford.edu>
PR 1837/bsps
* shared/motorola/motorola.c, shared/motorola/motorola.h: Add MVME2400
board with 750 CPU to list of supported Motorola boards.
M 1.261 c/src/lib/libbsp/powerpc/ChangeLog
M 1.178.2.10 c/src/lib/libbsp/powerpc/ChangeLog
M 1.233.2.7 c/src/lib/libbsp/powerpc/ChangeLog
M 1.9 c/src/lib/libbsp/powerpc/shared/motorola/motorola.h
M 1.7.8.1 c/src/lib/libbsp/powerpc/shared/motorola/motorola.h
M 1.7.6.1 c/src/lib/libbsp/powerpc/shared/motorola/motorola.h
M 1.19 c/src/lib/libbsp/powerpc/shared/motorola/motorola.c
M 1.13.2.2 c/src/lib/libbsp/powerpc/shared/motorola/motorola.c
M 1.16.2.1 c/src/lib/libbsp/powerpc/shared/motorola/motorola.c
diff -u rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.260 rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.261
--- rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.260 Mon Jul 18 11:38:54 2011
+++ rtems/c/src/lib/libbsp/powerpc/ChangeLog Wed Jul 20 11:39:30 2011
@@ -1,3 +1,9 @@
+2011-07-20 Till Straumann <strauman at slac.stanford.edu>
+
+ PR 1837/bsps
+ * shared/motorola/motorola.c, shared/motorola/motorola.h: Add MVME2400
+ board with 750 CPU to list of supported Motorola boards.
+
2011-07-18 Till Straumann <strauman at slac.stanford.edu>
* shared/bootloader/qemu_fakerom.S: Added work-around for
diff -u rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.178.2.9 rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.178.2.10
--- rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.178.2.9 Wed Aug 25 17:29:55 2010
+++ rtems/c/src/lib/libbsp/powerpc/ChangeLog Wed Jul 20 11:39:57 2011
@@ -1,3 +1,9 @@
+2011-07-20 Till Straumann <strauman at slac.stanford.edu>
+
+ PR 1837/bsps
+ * shared/motorola/motorola.c, shared/motorola/motorola.h: Add MVME2400
+ board with 750 CPU to list of supported Motorola boards.
+
2010-08-25 Till Straumann <strauman at slac.stanford.edu>
PR 1689/bsps
diff -u rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.233.2.6 rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.233.2.7
--- rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.233.2.6 Wed May 18 00:08:35 2011
+++ rtems/c/src/lib/libbsp/powerpc/ChangeLog Wed Jul 20 11:39:44 2011
@@ -1,3 +1,9 @@
+2011-07-20 Till Straumann <strauman at slac.stanford.edu>
+
+ PR 1837/bsps
+ * shared/motorola/motorola.c, shared/motorola/motorola.h: Add MVME2400
+ board with 750 CPU to list of supported Motorola boards.
+
2011-05-17 Till Straumann <strauman at slac.stanford.edu>
PR1797/bsps
diff -u rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h:1.8 rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h:1.9
--- rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h:1.8 Fri Jan 28 14:29:52 2011
+++ rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h Wed Jul 20 11:39:31 2011
@@ -26,27 +26,28 @@
typedef enum {
MVME_2400 = 0,
- GENESIS = 1,
- POWERSTACK_E = 2,
- BLACKAWK = 3,
- OMAHA = 4,
- UTAH = 5,
- POWERSTACK_EX = 6,
- MESQUITE = 7,
- SITKA = 8,
- MESQUITE_W_HAC = 9,
- MTX_PLUS = 10,
- MTX_WO_PP = 11,
- MTX_W_PP = 12,
- MVME_2300 = 13,
- MVME_2300SC_2600 = 14,
- MVME_2600_W_MVME712M = 15,
- MVME_2600_2700_W_MVME761 = 16,
- MVME_3600_W_MVME712M = 17,
- MVME_3600_W_MVME761 = 18,
- MVME_1600 = 19,
- /* In the table, slot 20 is the marker for end of automatic probe and scan */
- MVME_2100 = 21,
+ MVME_2400_750 = 1,
+ GENESIS = 2,
+ POWERSTACK_E = 3,
+ BLACKAWK = 4,
+ OMAHA = 5,
+ UTAH = 6,
+ POWERSTACK_EX = 7,
+ MESQUITE = 8,
+ SITKA = 9,
+ MESQUITE_W_HAC = 10,
+ MTX_PLUS = 11,
+ MTX_WO_PP = 12,
+ MTX_W_PP = 13,
+ MVME_2300 = 14,
+ MVME_2300SC_2600 = 15,
+ MVME_2600_W_MVME712M = 16,
+ MVME_2600_2700_W_MVME761 = 17,
+ MVME_3600_W_MVME712M = 18,
+ MVME_3600_W_MVME761 = 19,
+ MVME_1600 = 20,
+ /* In the table, slot 21 is the marker for end of automatic probe and scan */
+ MVME_2100 = 22,
MOTOROLA_UNKNOWN = 255
} motorolaBoard;
diff -u rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h:1.7 rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h:1.7.8.1
--- rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h:1.7 Wed Nov 10 17:51:17 2004
+++ rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h Wed Jul 20 11:39:45 2011
@@ -26,27 +26,28 @@
typedef enum {
MVME_2400 = 0,
- GENESIS = 1,
- POWERSTACK_E = 2,
- BLACKAWK = 3,
- OMAHA = 4,
- UTAH = 5,
- POWERSTACK_EX = 6,
- MESQUITE = 7,
- SITKA = 8,
- MESQUITE_W_HAC = 9,
- MTX_PLUS = 10,
- MTX_WO_PP = 11,
- MTX_W_PP = 12,
- MVME_2300 = 13,
- MVME_2300SC_2600 = 14,
- MVME_2600_W_MVME712M = 15,
- MVME_2600_2700_W_MVME761 = 16,
- MVME_3600_W_MVME712M = 17,
- MVME_3600_W_MVME761 = 18,
- MVME_1600 = 19,
- /* In the table, slot 20 is the marker for end of automatic probe and scan */
- MVME_2100 = 21,
+ MVME_2400_750 = 1,
+ GENESIS = 2,
+ POWERSTACK_E = 3,
+ BLACKAWK = 4,
+ OMAHA = 5,
+ UTAH = 6,
+ POWERSTACK_EX = 7,
+ MESQUITE = 8,
+ SITKA = 9,
+ MESQUITE_W_HAC = 10,
+ MTX_PLUS = 11,
+ MTX_WO_PP = 12,
+ MTX_W_PP = 13,
+ MVME_2300 = 14,
+ MVME_2300SC_2600 = 15,
+ MVME_2600_W_MVME712M = 16,
+ MVME_2600_2700_W_MVME761 = 17,
+ MVME_3600_W_MVME712M = 18,
+ MVME_3600_W_MVME761 = 19,
+ MVME_1600 = 20,
+ /* In the table, slot 21 is the marker for end of automatic probe and scan */
+ MVME_2100 = 22,
MOTOROLA_UNKNOWN = 255
} motorolaBoard;
diff -u rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h:1.7 rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h:1.7.6.1
--- rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h:1.7 Wed Nov 10 17:51:17 2004
+++ rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h Wed Jul 20 11:39:57 2011
@@ -26,27 +26,28 @@
typedef enum {
MVME_2400 = 0,
- GENESIS = 1,
- POWERSTACK_E = 2,
- BLACKAWK = 3,
- OMAHA = 4,
- UTAH = 5,
- POWERSTACK_EX = 6,
- MESQUITE = 7,
- SITKA = 8,
- MESQUITE_W_HAC = 9,
- MTX_PLUS = 10,
- MTX_WO_PP = 11,
- MTX_W_PP = 12,
- MVME_2300 = 13,
- MVME_2300SC_2600 = 14,
- MVME_2600_W_MVME712M = 15,
- MVME_2600_2700_W_MVME761 = 16,
- MVME_3600_W_MVME712M = 17,
- MVME_3600_W_MVME761 = 18,
- MVME_1600 = 19,
- /* In the table, slot 20 is the marker for end of automatic probe and scan */
- MVME_2100 = 21,
+ MVME_2400_750 = 1,
+ GENESIS = 2,
+ POWERSTACK_E = 3,
+ BLACKAWK = 4,
+ OMAHA = 5,
+ UTAH = 6,
+ POWERSTACK_EX = 7,
+ MESQUITE = 8,
+ SITKA = 9,
+ MESQUITE_W_HAC = 10,
+ MTX_PLUS = 11,
+ MTX_WO_PP = 12,
+ MTX_W_PP = 13,
+ MVME_2300 = 14,
+ MVME_2300SC_2600 = 15,
+ MVME_2600_W_MVME712M = 16,
+ MVME_2600_2700_W_MVME761 = 17,
+ MVME_3600_W_MVME712M = 18,
+ MVME_3600_W_MVME761 = 19,
+ MVME_1600 = 20,
+ /* In the table, slot 21 is the marker for end of automatic probe and scan */
+ MVME_2100 = 22,
MOTOROLA_UNKNOWN = 255
} motorolaBoard;
diff -u rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c:1.18 rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c:1.19
--- rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c:1.18 Fri Jul 15 20:29:05 2011
+++ rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c Wed Jul 20 11:39:31 2011
@@ -306,8 +306,12 @@
int (*swizzler)(int, int);
} mot_info_t;
+/* NOTE: When adding boards here the 'motorolaBoard' enums MUST be
+ * updated accordingly!
+ */
static const mot_info_t mot_boards[] = {
- {0x3E0, 0x00, PPC_750, "MVME 2400", mvme24xx_intmap,prep_pci_swizzle},
+ {0x0E0, 0xF9, PPC_604, "MVME 2400", mvme24xx_intmap,prep_pci_swizzle},
+ {0x3E0, 0x00, PPC_750, "MVME 2400 (PPC 750)", mvme24xx_intmap,prep_pci_swizzle},
{0x010, 0x00, PPC_UNKNOWN, "Genesis", NULL, NULL},
{0x020, 0x00, PPC_UNKNOWN, "Powerstack (Series E)", NULL, NULL},
{0x040, 0x00, PPC_UNKNOWN, "Blackhawk (Powerstack)", NULL, NULL},
diff -u rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c:1.13.2.1 rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c:1.13.2.2
--- rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c:1.13.2.1 Wed Feb 11 10:37:14 2009
+++ rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c Wed Jul 20 11:39:57 2011
@@ -296,8 +296,12 @@
int (*swizzler)(int, int);
} mot_info_t;
+/* NOTE: When adding boards here the 'motorolaBoard' enums MUST be
+ * updated accordingly!
+ */
static const mot_info_t mot_boards[] = {
- {0x3E0, 0x00, PPC_750, "MVME 2400", mvme24xx_intmap,prep_pci_swizzle},
+ {0x0E0, 0xF9, PPC_604, "MVME 2400", mvme24xx_intmap,prep_pci_swizzle},
+ {0x3E0, 0x00, PPC_750, "MVME 2400 (PPC 750)", mvme24xx_intmap,prep_pci_swizzle},
{0x010, 0x00, PPC_UNKNOWN, "Genesis", NULL, NULL},
{0x020, 0x00, PPC_UNKNOWN, "Powerstack (Series E)", NULL, NULL},
{0x040, 0x00, PPC_UNKNOWN, "Blackhawk (Powerstack)", NULL, NULL},
diff -u rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c:1.16 rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c:1.16.2.1
--- rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c:1.16 Sun Nov 29 22:29:20 2009
+++ rtems/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c Wed Jul 20 11:39:44 2011
@@ -296,8 +296,12 @@
int (*swizzler)(int, int);
} mot_info_t;
+/* NOTE: When adding boards here the 'motorolaBoard' enums MUST be
+ * updated accordingly!
+ */
static const mot_info_t mot_boards[] = {
- {0x3E0, 0x00, PPC_750, "MVME 2400", mvme24xx_intmap,prep_pci_swizzle},
+ {0x0E0, 0xF9, PPC_604, "MVME 2400", mvme24xx_intmap,prep_pci_swizzle},
+ {0x3E0, 0x00, PPC_750, "MVME 2400 (PPC 750)", mvme24xx_intmap,prep_pci_swizzle},
{0x010, 0x00, PPC_UNKNOWN, "Genesis", NULL, NULL},
{0x020, 0x00, PPC_UNKNOWN, "Powerstack (Series E)", NULL, NULL},
{0x040, 0x00, PPC_UNKNOWN, "Blackhawk (Powerstack)", NULL, NULL},
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110720/5a66a4b5/attachment.html>
More information about the vc
mailing list