diff options
Diffstat (limited to 'arch/arm/mach-imx/include/mach')
-rw-r--r-- | arch/arm/mach-imx/include/mach/habv4-imx6-gencsf.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/habv4-imx8-gencsf.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/iim.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/imx25-regs.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/imx31-regs.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/imx35-regs.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/imx6.h | 4 |
7 files changed, 6 insertions, 14 deletions
diff --git a/arch/arm/mach-imx/include/mach/habv4-imx6-gencsf.h b/arch/arm/mach-imx/include/mach/habv4-imx6-gencsf.h index 5818879609..2961b97b79 100644 --- a/arch/arm/mach-imx/include/mach/habv4-imx6-gencsf.h +++ b/arch/arm/mach-imx/include/mach/habv4-imx6-gencsf.h @@ -19,7 +19,7 @@ hab Engine = CAAM hab [Install SRK] hab File = CONFIG_HABV4_TABLE_BIN hab # SRK index within SRK-Table 0..3 -hab Source index = 0 +hab Source index = CONFIG_HABV4_SRK_INDEX hab [Install CSFK] /* target key index in keystore 1 */ diff --git a/arch/arm/mach-imx/include/mach/habv4-imx8-gencsf.h b/arch/arm/mach-imx/include/mach/habv4-imx8-gencsf.h index 34039ee590..9ed6893988 100644 --- a/arch/arm/mach-imx/include/mach/habv4-imx8-gencsf.h +++ b/arch/arm/mach-imx/include/mach/habv4-imx8-gencsf.h @@ -19,7 +19,7 @@ hab Engine = CAAM hab [Install SRK] hab File = CONFIG_HABV4_TABLE_BIN hab # SRK index within SRK-Table 0..3 -hab Source index = 0 +hab Source index = CONFIG_HABV4_SRK_INDEX hab [Install CSFK] /* target key index in keystore 1 */ diff --git a/arch/arm/mach-imx/include/mach/iim.h b/arch/arm/mach-imx/include/mach/iim.h index 2161809d4d..cc89b0d109 100644 --- a/arch/arm/mach-imx/include/mach/iim.h +++ b/arch/arm/mach-imx/include/mach/iim.h @@ -1,9 +1,6 @@ /* * (c) 2009 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de> * - * See file CREDITS for list of people who contributed to this - * project. - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of diff --git a/arch/arm/mach-imx/include/mach/imx25-regs.h b/arch/arm/mach-imx/include/mach/imx25-regs.h index 5974897a16..a5754c57db 100644 --- a/arch/arm/mach-imx/include/mach/imx25-regs.h +++ b/arch/arm/mach-imx/include/mach/imx25-regs.h @@ -1,9 +1,6 @@ /* * (c) 2009 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de> * - * See file CREDITS for list of people who contributed to this - * project. - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of diff --git a/arch/arm/mach-imx/include/mach/imx31-regs.h b/arch/arm/mach-imx/include/mach/imx31-regs.h index e491328694..3d6c91c503 100644 --- a/arch/arm/mach-imx/include/mach/imx31-regs.h +++ b/arch/arm/mach-imx/include/mach/imx31-regs.h @@ -1,9 +1,6 @@ /* * (c) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de> * - * See file CREDITS for list of people who contributed to this - * project. - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of diff --git a/arch/arm/mach-imx/include/mach/imx35-regs.h b/arch/arm/mach-imx/include/mach/imx35-regs.h index 48bf64386a..0a3f9273c7 100644 --- a/arch/arm/mach-imx/include/mach/imx35-regs.h +++ b/arch/arm/mach-imx/include/mach/imx35-regs.h @@ -1,9 +1,6 @@ /* * (c) 2009 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de> * - * See file CREDITS for list of people who contributed to this - * project. - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of diff --git a/arch/arm/mach-imx/include/mach/imx6.h b/arch/arm/mach-imx/include/mach/imx6.h index 5560774de9..b65cdaaf40 100644 --- a/arch/arm/mach-imx/include/mach/imx6.h +++ b/arch/arm/mach-imx/include/mach/imx6.h @@ -28,6 +28,7 @@ void __noreturn imx6_pm_stby_poweroff(struct poweroff_handler *handler); static inline int scu_get_core_count(void) { +#if __LINUX_ARM_ARCH__ <= 7 unsigned long base; unsigned int ncores; @@ -35,6 +36,9 @@ static inline int scu_get_core_count(void) ncores = readl(base + SCU_CONFIG); return (ncores & 0x03) + 1; +#else + return 0; +#endif } #define SI_REV_CPUTYPE(s) (((s) >> 16) & 0xff) |