Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 929a213830612579e2413297ead6353615a64dc2

Authored by Kim Phillips
Committed by Kumar Gala
1 parent 5d0c3b57b2
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

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>

Showing 3 changed files with 11 additions and 4 deletions Side-by-side Diff

arch/powerpc/cpu/mpc8xxx/fdt.c
Diff comments   View file @ 929a213
... ... @@ -97,11 +97,11 @@
97 97 }
98 98 #endif /* CONFIG_HAS_FSL_DR_USB */
99 99  
100   -#if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx)
101 100 /*
102 101 * update crypto node properties to a specified revision of the SEC
103   - * called with sec_rev == 0 if not on an mpc8xxxE processor
  102 + * called with sec_rev == 0 if not on an E processor
104 103 */
  104 +#if CONFIG_SYS_FSL_SEC_COMPAT == 2 /* SEC 2.x/3.x */
105 105 void fdt_fixup_crypto_node(void *blob, int sec_rev)
106 106 {
107 107 const struct sec_rev_prop {
... ... @@ -183,5 +183,5 @@
183 183 printf("WARNING: could not set crypto property: %s\n",
184 184 fdt_strerror(err));
185 185 }
186   -#endif /* defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) */
  186 +#endif
arch/powerpc/include/asm/config.h
Diff comments   View file @ 929a213
... ... @@ -66,6 +66,13 @@
66 66 #define CONFIG_TSECV2
67 67 #endif
68 68  
  69 +/*
  70 + * SEC (crypto unit) major compatible version determination
  71 + */
  72 +#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC83xx)
  73 +#define CONFIG_SYS_FSL_SEC_COMPAT 2
  74 +#endif
  75 +
69 76 /* Number of TLB CAM entries we have on FSL Book-E chips */
70 77 #if defined(CONFIG_E500MC)
71 78 #define CONFIG_SYS_NUM_TLBCAMS 64
include/fdt_support.h
Diff comments   View file @ 929a213
... ... @@ -59,7 +59,7 @@
59 59 static inline void fdt_fixup_dr_usb(void *blob, bd_t *bd) {}
60 60 #endif /* CONFIG_HAS_FSL_DR_USB */
61 61  
62   -#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC83xx)
  62 +#if defined(CONFIG_SYS_FSL_SEC_COMPAT)
63 63 void fdt_fixup_crypto_node(void *blob, int sec_rev);
64 64 #else
65 65 static inline void fdt_fixup_crypto_node(void *blob, int sec_rev) {}