[U-Boot] [PATCH] arm: exynos: adds ifdef for spi boot

[U-Boot] [PATCH] arm: exynos: adds ifdef for spi boot

[Minkyu Kang]

This patch fix following errors and warnings

spl_boot.c: In function 'exynos_spi_copy':
spl_boot.c:111:49: error: 'CONFIG_ENV_SPI_BASE' undeclared (first use in this function)
spl_boot.c:111:49: note: each undeclared identifier is reported only once for each function it appears in
spl_boot.c:142:2: error: 'SPI_FLASH_UBOOT_POS' undeclared (first use in this function)
spl_boot.c: In function 'copy_uboot_to_ram':
spl_boot.c:189:28: warning: unused variable 'param' [-Wunused-variable]
spl_boot.c: At top level:
spl_boot.c:107:13: warning: 'exynos_spi_copy' defined but not used [-Wunused-function]

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
---
 arch/arm/cpu/armv7/exynos/spl_boot.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/cpu/armv7/exynos/spl_boot.c b/arch/arm/cpu/armv7/exynos/spl_boot.c
index 6faf13f..ade45fd 100644
--- a/arch/arm/cpu/armv7/exynos/spl_boot.c
+++ b/arch/arm/cpu/armv7/exynos/spl_boot.c
@@ -62,6 +62,7 @@ static int config_branch_prediction(int set_cr_z)
 }
 #endif
 
+#ifdef CONFIG_SPI_BOOTING
 static void spi_rx_tx(struct exynos_spi *regs, int todo,
 			void *dinp, void const *doutp, int i)
 {
@@ -174,6 +175,7 @@ static void exynos_spi_copy(unsigned int uboot_size, unsigned int uboot_addr)
 	clrbits_le32(&regs->ch_cfg, SPI_CH_RST);
 	clrbits_le32(&regs->ch_cfg, SPI_TX_CH_ON | SPI_RX_CH_ON);
 }
+#endif
 
 /*
 * Copy U-boot from mmc to RAM:
@@ -186,7 +188,9 @@ void copy_uboot_to_ram(void)
 
 	u32 (*copy_bl2)(u32 offset, u32 nblock, u32 dst) = NULL;
 	u32 offset = 0, size = 0;
+#ifdef CONFIG_SPI_BOOTING
 	struct spl_machine_param *param = spl_get_machine_params();
+#endif
 #ifdef CONFIG_SUPPORT_EMMC_BOOT
 	u32 (*copy_bl2_from_emmc)(u32 nblock, u32 dst);
 	void (*end_bootop_from_emmc)(void);
-- 
1.7.9.5
-- 
Thanks,
Minkyu Kang.

[U-Boot] [PATCH] arm: exynos: adds ifdef for spi boot

[Minkyu Kang]

On 06/12/13 19:25, Minkyu Kang wrote:
> This patch fix following errors and warnings
> 
> spl_boot.c: In function 'exynos_spi_copy':
> spl_boot.c:111:49: error: 'CONFIG_ENV_SPI_BASE' undeclared (first use in this function)
> spl_boot.c:111:49: note: each undeclared identifier is reported only once for each function it appears in
> spl_boot.c:142:2: error: 'SPI_FLASH_UBOOT_POS' undeclared (first use in this function)
> spl_boot.c: In function 'copy_uboot_to_ram':
> spl_boot.c:189:28: warning: unused variable 'param' [-Wunused-variable]
> spl_boot.c: At top level:
> spl_boot.c:107:13: warning: 'exynos_spi_copy' defined but not used [-Wunused-function]
> 
> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> ---
>  arch/arm/cpu/armv7/exynos/spl_boot.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/arch/arm/cpu/armv7/exynos/spl_boot.c b/arch/arm/cpu/armv7/exynos/spl_boot.c
> index 6faf13f..ade45fd 100644
> --- a/arch/arm/cpu/armv7/exynos/spl_boot.c
> +++ b/arch/arm/cpu/armv7/exynos/spl_boot.c
> @@ -62,6 +62,7 @@ static int config_branch_prediction(int set_cr_z)
>  }
>  #endif
>  
> +#ifdef CONFIG_SPI_BOOTING
>  static void spi_rx_tx(struct exynos_spi *regs, int todo,
>  			void *dinp, void const *doutp, int i)
>  {
> @@ -174,6 +175,7 @@ static void exynos_spi_copy(unsigned int uboot_size, unsigned int uboot_addr)
>  	clrbits_le32(&regs->ch_cfg, SPI_CH_RST);
>  	clrbits_le32(&regs->ch_cfg, SPI_TX_CH_ON | SPI_RX_CH_ON);
>  }
> +#endif
>  
>  /*
>  * Copy U-boot from mmc to RAM:
> @@ -186,7 +188,9 @@ void copy_uboot_to_ram(void)
>  
>  	u32 (*copy_bl2)(u32 offset, u32 nblock, u32 dst) = NULL;
>  	u32 offset = 0, size = 0;
> +#ifdef CONFIG_SPI_BOOTING
>  	struct spl_machine_param *param = spl_get_machine_params();
> +#endif
>  #ifdef CONFIG_SUPPORT_EMMC_BOOT
>  	u32 (*copy_bl2_from_emmc)(u32 nblock, u32 dst);
>  	void (*end_bootop_from_emmc)(void);
> 

applied to u-boot-samsung.

Thanks,
Minkyu Kang.