diff options
author | roy zang <tie-fei.zang@freescale.com> | 2007-01-22 13:15:35 +0800 |
---|---|---|
committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2007-01-22 13:15:35 +0800 |
commit | ee460917afb74767aedc3da095d4fec4a50ba6f8 (patch) | |
tree | fdead38c4681fc9adbedd6836792660f933614d3 /include/asm-ppc/processor.h | |
parent | a41969e09b9d886091a804c2ba5f1ab84b084dd3 (diff) | |
parent | a4012396645533aef218354eeba754dff0deace8 (diff) | |
download | u-boot-imx-ee460917afb74767aedc3da095d4fec4a50ba6f8.zip u-boot-imx-ee460917afb74767aedc3da095d4fec4a50ba6f8.tar.gz u-boot-imx-ee460917afb74767aedc3da095d4fec4a50ba6f8.tar.bz2 |
Merge branch 'master' into hpc2
Conflicts:
drivers/cfi_flash.c
The patch by Heiko Schocher <hs@pollux.denx.de> on Jan, 19, 2007
fixes cfi_driver bug for mpc7448hpc2 board. The default cfi_driver can support
mpc7448hpc2 board.
Diffstat (limited to 'include/asm-ppc/processor.h')
-rw-r--r-- | include/asm-ppc/processor.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 6619686..f102600 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -747,11 +747,14 @@ #define PVR_440GX_RC 0x51B21892 #define PVR_440GX_RF 0x51B21894 #define PVR_405EP_RB 0x51210950 -#define PVR_440SP_RA 0x53221850 -#define PVR_440SP_RB 0x53221891 -#define PVR_440SP_RC 0x53221892 -#define PVR_440SPe_RA 0x53421890 -#define PVR_440SPe_RB 0x53421891 +#define PVR_440SP_6_RAB 0x53221850 /* 440SP rev A&B with RAID 6 support enabled */ +#define PVR_440SP_RAB 0x53321850 /* 440SP rev A&B without RAID 6 support */ +#define PVR_440SP_6_RC 0x53221891 /* 440SP rev C with RAID 6 support enabled */ +#define PVR_440SP_RC 0x53321891 /* 440SP rev C without RAID 6 support */ +#define PVR_440SPe_6_RA 0x53421890 /* 440SPe rev A with RAID 6 support enabled */ +#define PVR_440SPe_RA 0x53521890 /* 440SPe rev A without RAID 6 support */ +#define PVR_440SPe_6_RB 0x53421891 /* 440SPe rev B with RAID 6 support enabled */ +#define PVR_440SPe_RB 0x53521891 /* 440SPe rev B without RAID 6 support */ #define PVR_601 0x00010000 #define PVR_602 0x00050000 #define PVR_603 0x00030000 |