powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations
PATCH 2/3 powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations
Warnings are treated as errors for arch/powerpc code, so build fails with CONFIG_I2C_SPI_UCODE_PATCH=y:
CC arch/powerpc/sysdev/micropatch.o
cc1: warnings being treated as errors arch/powerpc/sysdev/micropatch.c: In function 'cpm_load_patch':
arch/powerpc/sysdev/micropatch.c:630: warning: unused variable 'smp' make[1]: *** [arch/powerpc/sysdev/micropatch.o] Error 1
And with CONFIG_USB_SOF_UCODE_PATCH=y:
CC arch/powerpc/sysdev/micropatch.o
cc1: warnings being treated as errors arch/powerpc/sysdev/micropatch.c: In function 'cpm_load_patch':
arch/powerpc/sysdev/micropatch.c:629: warning: unused variable 'spp' arch/powerpc/sysdev/micropatch.c:628: warning: unused variable 'iip' make[1]: *** [arch/powerpc/sysdev/micropatch.o] Error 1
This patch fixes these issues by introducing proper #ifdefs.
--- arch/powerpc/sysdev/micropatch.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
arch/powerpc/sysdev/micropatch.c +5 -0
@@ -626,9 +626,14 @@ cpm_load_patch(cpm8xx_t *cp) {volatile uint *dp;/* Dual-ported RAM. */ volatile cpm8xx_t *commproc; +#if defined(CONFIG_I2C_SPI_UCODE_PATCH ) || \ + defined(CONFIG_I2C_SPI_SMC1_UCODE_PATCH )volatile iic_t *iip;volatile struct spi_pram *spp; +#ifdef CONFIG_I2C_SPI_SMC1_UCODE_PATCH volatile smc_uart_t *smp; +#endif +#endif int i; commproc = cp;
Signature · 1 line
1.7.0.5
Kumar Gala
AppliedQuoted 18 lines · Anton Vorontsov
Warnings are treated as errors for
arch/powerpccode, so build fails withCONFIG_I2C_SPI_UCODE_PATCH=y:CC
arch/powerpc/sysdev/micropatch.o
cc1: warnings being treated as errorsarch/powerpc/sysdev/micropatch.c: In function 'cpm_load_patch':
arch/powerpc/sysdev/micropatch.c:630: warning: unused variable 'smp' make[1]: *** [arch/powerpc/sysdev/micropatch.o] Error 1And with
CONFIG_USB_SOF_UCODE_PATCH=y:CC
arch/powerpc/sysdev/micropatch.o
cc1: warnings being treated as errorsarch/powerpc/sysdev/micropatch.c: In function 'cpm_load_patch':
arch/powerpc/sysdev/micropatch.c:629: warning: unused variable 'spp'arch/powerpc/sysdev/micropatch.c:628: warning: unused variable 'iip' make[1]: *** [arch/powerpc/sysdev/micropatch.o] Error 1
Quoted 7 lines
This patch fixes these issues by introducing proper #ifdefs.
Cc <[email protected]> [ .33, .34 ]Signed-off-by Anton Vorontsov <[email protected]>---
arch/powerpc/sysdev/micropatch.c| 5 +++++1 files changed, 5 insertions(+), 0 deletions(-)
applied to merge
- k