Patchwork [U-Boot,2/5] ARM: Exynos5250: remove redundant defines in exynos5250-dt.h

login
register
mail settings
Submitter Andre Przywara
Date Sept. 25, 2013, 10:42 a.m.
Message ID <1380105759-9687-3-git-send-email-andre.przywara@linaro.org>
Download mbox | patch
Permalink /patch/277790/
State Changes Requested
Delegated to: Minkyu Kang
Headers show

Comments

Andre Przywara - Sept. 25, 2013, 10:42 a.m.
For some reasons the very same defines appear twice in
exynos5250-dt.h. Remove the second version.

Signed-off-by: Andre Przywara <andre.przywara@linaro.org>
---
 include/configs/exynos5250-dt.h | 21 ---------------------
 1 file changed, 21 deletions(-)
Minkyu Kang - Dec. 5, 2013, 8:07 a.m.
On 25/09/13 19:42, Andre Przywara wrote:
> For some reasons the very same defines appear twice in
> exynos5250-dt.h. Remove the second version.
> 
> Signed-off-by: Andre Przywara <andre.przywara@linaro.org>
> ---
>  include/configs/exynos5250-dt.h | 21 ---------------------
>  1 file changed, 21 deletions(-)
> 
> diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h
> index 14d62e4..c8c4b35 100644
> --- a/include/configs/exynos5250-dt.h
> +++ b/include/configs/exynos5250-dt.h
> @@ -284,27 +284,6 @@
>  #define CONFIG_POWER_I2C
>  #define CONFIG_POWER_MAX77686
>  
> -/* SPI */
> -#define CONFIG_ENV_IS_IN_SPI_FLASH
> -#define CONFIG_SPI_FLASH
> -
> -#ifdef CONFIG_SPI_FLASH
> -#define CONFIG_EXYNOS_SPI
> -#define CONFIG_CMD_SF
> -#define CONFIG_CMD_SPI
> -#define CONFIG_SPI_FLASH_WINBOND
> -#define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
> -#define CONFIG_SF_DEFAULT_SPEED		50000000
> -#define EXYNOS5_SPI_NUM_CONTROLLERS	5
> -#endif
> -
> -#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
> -#define CONFIG_ENV_SPI_MODE	SPI_MODE_0
> -#define CONFIG_ENV_SECT_SIZE	CONFIG_ENV_SIZE
> -#define CONFIG_ENV_SPI_BUS	1
> -#define CONFIG_ENV_SPI_MAX_HZ	50000000
> -#endif
> -
>  /* Ethernet Controllor Driver */
>  #ifdef CONFIG_CMD_NET
>  #define CONFIG_SMC911X
> 

Same patch is applied to u-boot-samsung.

commit 31e0bd6974cbaca15e15f400acf1d7499e86fe17
Author: Luka Perkov <luka@openwrt.org>
Date:   Mon Nov 4 02:12:00 2013 +0100

    config: arm: exynos5250: remove duplicate defines
    
    The SPI section is already defined in this file (lines 268-288) so we can
    remove the duplicate definitions. While at it, also fix one tiny whitespace
    typo.
    
    Signed-off-by: Luka Perkov <luka@openwrt.org>
    Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

Thanks,
Minkyu Kang.

Patch

diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h
index 14d62e4..c8c4b35 100644
--- a/include/configs/exynos5250-dt.h
+++ b/include/configs/exynos5250-dt.h
@@ -284,27 +284,6 @@ 
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_MAX77686
 
-/* SPI */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SPI_FLASH
-
-#ifdef CONFIG_SPI_FLASH
-#define CONFIG_EXYNOS_SPI
-#define CONFIG_CMD_SF
-#define CONFIG_CMD_SPI
-#define CONFIG_SPI_FLASH_WINBOND
-#define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
-#define CONFIG_SF_DEFAULT_SPEED		50000000
-#define EXYNOS5_SPI_NUM_CONTROLLERS	5
-#endif
-
-#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_ENV_SPI_MODE	SPI_MODE_0
-#define CONFIG_ENV_SECT_SIZE	CONFIG_ENV_SIZE
-#define CONFIG_ENV_SPI_BUS	1
-#define CONFIG_ENV_SPI_MAX_HZ	50000000
-#endif
-
 /* Ethernet Controllor Driver */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_SMC911X