V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

powerpc/8xxx: Distinguish between incompatible SEC h/w types 

CONFIG_SYS_FSL_SEC_COMPAT is set to 2 for the SEC 2.x and SEC 3.x.
Parts with newer SEC h/w versions will increment the number to
accomodate incompatible code changes.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Kim Phillips 2010-06-01 12:24:27 -05:00 committed by Kumar Gala
parent 5d0c3b57b2
commit 929a213830
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/cpu/mpc8xxx/fdt.c
View File

@ -97,11 +97,11 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd)
} }
#endif /* CONFIG_HAS_FSL_DR_USB */ #endif /* CONFIG_HAS_FSL_DR_USB */
#if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx)
/* /*
* update crypto node properties to a specified revision of the SEC * update crypto node properties to a specified revision of the SEC
* called with sec_rev == 0 if not on an mpc8xxxE processor * called with sec_rev == 0 if not on an E processor
*/ */
#if CONFIG_SYS_FSL_SEC_COMPAT == 2 /* SEC 2.x/3.x */
void fdt_fixup_crypto_node(void *blob, int sec_rev) void fdt_fixup_crypto_node(void *blob, int sec_rev)
{ {
const struct sec_rev_prop { const struct sec_rev_prop {
@ -183,4 +183,4 @@ void fdt_fixup_crypto_node(void *blob, int sec_rev)
printf("WARNING: could not set crypto property: %s\n", printf("WARNING: could not set crypto property: %s\n",
fdt_strerror(err)); fdt_strerror(err));
} }
#endif /* defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) */ #endif

7
arch/powerpc/include/asm/config.h
View File

@ -66,6 +66,13 @@
#define CONFIG_TSECV2 #define CONFIG_TSECV2
#endif #endif
/*
* SEC (crypto unit) major compatible version determination
*/
#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC83xx)
#define CONFIG_SYS_FSL_SEC_COMPAT 2
#endif
/* Number of TLB CAM entries we have on FSL Book-E chips */ /* Number of TLB CAM entries we have on FSL Book-E chips */
#if defined(CONFIG_E500MC) #if defined(CONFIG_E500MC)
#define CONFIG_SYS_NUM_TLBCAMS 64 #define CONFIG_SYS_NUM_TLBCAMS 64

2
include/fdt_support.h
View File

@ -59,7 +59,7 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd);
static inline void fdt_fixup_dr_usb(void *blob, bd_t *bd) {} static inline void fdt_fixup_dr_usb(void *blob, bd_t *bd) {}
#endif /* CONFIG_HAS_FSL_DR_USB */ #endif /* CONFIG_HAS_FSL_DR_USB */
#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC83xx) #if defined(CONFIG_SYS_FSL_SEC_COMPAT)
void fdt_fixup_crypto_node(void *blob, int sec_rev); void fdt_fixup_crypto_node(void *blob, int sec_rev);
#else #else
static inline void fdt_fixup_crypto_node(void *blob, int sec_rev) {} static inline void fdt_fixup_crypto_node(void *blob, int sec_rev) {}