diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-07-20 16:39:45 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-07-20 16:39:45 +0000 |
| commit | 3d2f5a0e79da3083a09e8585098e608cc09342c2 (patch) | |
| tree | 8c24e634065c6e7c74f360142018e52371891ad1 | |
| parent | 3460d8b5a8b0d0f3aa00ac46b3b7330fa77d980c (diff) | |
2011-07-20 Till Straumann <strauman@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.
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/motorola/motorola.c | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/motorola/motorola.h | 43 |
3 files changed, 33 insertions, 22 deletions
diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog index 2c57c9bb7d..c22653af74 100644 --- a/c/src/lib/libbsp/powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ChangeLog @@ -1,3 +1,9 @@ +2011-07-20 Till Straumann <strauman@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@slac.stanford.edu> PR1797/bsps diff --git a/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c b/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c index 03c5e03527..f91b846e8e 100644 --- a/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c +++ b/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c @@ -296,8 +296,12 @@ typedef struct { 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 --git a/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h b/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h index 5243df0d84..394a4f6b06 100644 --- a/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h +++ b/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h @@ -26,27 +26,28 @@ typedef enum { 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; |