diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-08-31 15:27:58 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-08-31 15:27:58 +0000 |
| commit | b2aa729698971208f1700cb1566fd79d3eb2058d (patch) | |
| tree | c99171ee3bee7cbfa78f6d403d01c7e2f01a2695 /c | |
| parent | Regenerate. (diff) | |
| download | rtems-b2aa729698971208f1700cb1566fd79d3eb2058d.tar.bz2 | |
2011-08-31 Sebastian Huber <sebastian.huber@embedded-brains.de>
* new-exceptions/bspsupport/ppc_exc_categories.c,
shared/include/cpuIdent.c, shared/include/cpuIdent.h: Support e200z7.
Diffstat (limited to 'c')
4 files changed, 18 insertions, 7 deletions
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index 749a31ab04..b644b936d0 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,8 @@ +2011-08-31 Sebastian Huber <sebastian.huber@embedded-brains.de> + + * new-exceptions/bspsupport/ppc_exc_categories.c, + shared/include/cpuIdent.c, shared/include/cpuIdent.h: Support e200z7. + 2011-08-30 Peter Dufault <dufault@hda.com> * mpc55xx/misc/flash_support.c: New file. diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_categories.c b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_categories.c index 697c81f5c6..0de9aa76cf 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_categories.c +++ b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_categories.c @@ -275,6 +275,7 @@ const ppc_exc_categories *ppc_exc_categories_for_cpu(ppc_cpu_id_t cpu) case PPC_e200z0: case PPC_e200z1: case PPC_e200z6: + case PPC_e200z7: return &e200_category_table; case PPC_5XX: return &mpc_5xx_category_table; diff --git a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.c b/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.c index 96aefe37a4..08d3907b58 100644 --- a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.c +++ b/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.c @@ -54,6 +54,7 @@ char *get_ppc_cpu_type_name(ppc_cpu_id_t cpu) case PPC_e200z0: return "e200z0"; case PPC_e200z1: return "e200z1"; case PPC_e200z6: return "e200z6"; + case PPC_e200z7: return "e200z7"; case PPC_e500v2: return "e500v2"; default: printk("Unknown CPU value of 0x%x. Please add it to " @@ -66,12 +67,14 @@ ppc_cpu_id_t get_ppc_cpu_type(void) { /* * cpu types listed here have the lowermost nibble as a version identifier - * we will tweak them to the starndard version + * we will tweak them to the standard version */ const uint32_t ppc_cpu_id_version_nibble[] = { - PPC_e200z6, PPC_e200z0, - PPC_e200z1}; + PPC_e200z1, + PPC_e200z6, + PPC_e200z7 + }; unsigned int pvr; int i; @@ -120,6 +123,7 @@ ppc_cpu_id_t get_ppc_cpu_type(void) case PPC_e200z0: case PPC_e200z1: case PPC_e200z6: + case PPC_e200z7: case PPC_e300c1: case PPC_e300c2: case PPC_e300c3: @@ -179,6 +183,7 @@ ppc_cpu_id_t get_ppc_cpu_type(void) case PPC_e200z0: case PPC_e200z1: case PPC_e200z6: + case PPC_e200z7: case PPC_e500v2: current_ppc_features.is_bookE = PPC_BOOKE_E500; default: diff --git a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h b/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h index 6f8a666652..8088e295dd 100644 --- a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h +++ b/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h @@ -56,10 +56,10 @@ typedef enum PPC_e300c1 = 0x8083, /* e300c1 core, in MPC83xx*/ PPC_e300c2 = 0x8084, /* e300c2 core */ PPC_e300c3 = 0x8085, /* e300c3 core */ - PPC_e200z0 = 0x8171, - PPC_e200z1 = 0x8144, - PPC_e200z6 = 0x8112, - PPC_e200z6v5= 0x8115, + PPC_e200z0 = 0x8170, + PPC_e200z1 = 0x8140, + PPC_e200z6 = 0x8110, + PPC_e200z7 = 0x8160, PPC_PSIM = 0xfffe, /* GDB PowerPC simulator -- fake version */ PPC_UNKNOWN = 0xffff } ppc_cpu_id_t; |