diff mbox

[U-Boot] arm: mx6: Remove SPI support from WRU-IV baseboard

Message ID 1438764650-10354-1-git-send-email-sr@denx.de
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Commit Message

Stefan Roese Aug. 5, 2015, 8:50 a.m. UTC
This patch removes the SPI support from the WRU-IV baseboard as its
not used at all.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
Cc: Markus Niebel <Markus.Niebel@tq-group.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 board/tqc/tqma6/tqma6.c           | 1 +
 configs/tqma6s_wru4_mmc_defconfig | 3 ---
 include/configs/tqma6_wru4.h      | 8 ++++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

Comments

Stefano Babic Aug. 5, 2015, 9 a.m. UTC | #1
Hi Stefan, Clemens,

On 05/08/2015 10:50, Stefan Roese wrote:
> This patch removes the SPI support from the WRU-IV baseboard as its
> not used at all.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
> Cc: Markus Niebel <Markus.Niebel@tq-group.com>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
>  board/tqc/tqma6/tqma6.c           | 1 +
>  configs/tqma6s_wru4_mmc_defconfig | 3 ---
>  include/configs/tqma6_wru4.h      | 8 ++++++++
>  3 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
> index 29db838..8656782 100644
> --- a/board/tqc/tqma6/tqma6.c
> +++ b/board/tqc/tqma6/tqma6.c
> @@ -25,6 +25,7 @@
>  #include <mmc.h>
>  #include <power/pfuze100_pmic.h>
>  #include <power/pmic.h>
> +#include <spi_flash.h>
>  
>  #include "tqma6_bb.h"
>  
> diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig
> index 66ac0b1..e30b130 100644
> --- a/configs/tqma6s_wru4_mmc_defconfig
> +++ b/configs/tqma6s_wru4_mmc_defconfig
> @@ -3,11 +3,8 @@ CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_TQMA6=y
>  CONFIG_TQMA6S=y
>  CONFIG_WRU4=y
> -CONFIG_CMD_SETEXPR=y
> -CONFIG_CMD_NET=y
>  CONFIG_AUTOBOOT_KEYED=y
>  CONFIG_AUTOBOOT_PROMPT="Enter password in %d seconds to stop autoboot\n"
>  CONFIG_AUTOBOOT_ENCRYPTION=y
>  CONFIG_AUTOBOOT_STOP_STR_SHA256="36a9e7f1c95b82ffb99743e0c5c4ce95d83c9a430aac59f84ef3cbfab6145068"
>  CONFIG_PCA9551_LED=y
> -CONFIG_SPI_FLASH=y
> diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
> index 1c86bc0..1330a0a 100644
> --- a/include/configs/tqma6_wru4.h
> +++ b/include/configs/tqma6_wru4.h
> @@ -68,4 +68,12 @@
>  #define CONFIG_SYS_BOOTCOUNT_ADDR	IRAM_BASE_ADDR
>  #define CONFIG_SYS_BOOTCOUNT_BE
>  
> +/*
> + * Remove all unused interfaces / commands that are defined in
> + * the common header tqms6.h
> + */
> +#undef CONFIG_CMD_SF
> +#undef CONFIG_CMD_SPI
> +#undef CONFIG_MXC_SPI
> +
>  #endif /* __CONFIG_TQMA6_WRU4_H */
> 

I read the thread - Clemens, can you send your Tested-by after you
tested with success the patch ? I will apply it, then..

Best regards,
Stefano Babic
Clemens Gruber Aug. 5, 2015, 9:28 a.m. UTC | #2
Hi Stefano, Hi Stefan,

On Wed, Aug 05, 2015 at 11:00:56AM +0200, Stefano Babic wrote:
> Hi Stefan, Clemens,
> 
> I read the thread - Clemens, can you send your Tested-by after you
> tested with success the patch ? I will apply it, then..
> 
> Best regards,
> Stefano Babic

Although I am not convinced that ifdefs are as bad as Stefan thinks they are,
the new patch works fine too. Thank you!

Tested-by: Clemens Gruber <clemens.gruber@pqgruber.com>

Regards,
Clemens
Stefano Babic Aug. 5, 2015, 9:36 a.m. UTC | #3
Hi Clemens,

On 05/08/2015 11:28, Clemens Gruber wrote:
> Hi Stefano, Hi Stefan,
> 
> On Wed, Aug 05, 2015 at 11:00:56AM +0200, Stefano Babic wrote:
>> Hi Stefan, Clemens,
>>
>> I read the thread - Clemens, can you send your Tested-by after you
>> tested with success the patch ? I will apply it, then..
>>
>> Best regards,
>> Stefano Babic
> 
> Although I am not convinced that ifdefs are as bad as Stefan thinks they are,
> the new patch works fine too. Thank you!
> 

We are trying to get rid of #ifdef as much as possible.

> Tested-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> 


Ok, thanks !

Best regards,
Stefano Babic
Jagan Teki Aug. 5, 2015, 9:41 a.m. UTC | #4
On 5 August 2015 at 14:20, Stefan Roese <sr@denx.de> wrote:
> This patch removes the SPI support from the WRU-IV baseboard as its
> not used at all.
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
> Cc: Markus Niebel <Markus.Niebel@tq-group.com>
> Cc: Stefano Babic <sbabic@denx.de>

Reviewed-by: Jagan Teki <jteki@openedev.com>

> ---
>  board/tqc/tqma6/tqma6.c           | 1 +
>  configs/tqma6s_wru4_mmc_defconfig | 3 ---
>  include/configs/tqma6_wru4.h      | 8 ++++++++
>  3 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
> index 29db838..8656782 100644
> --- a/board/tqc/tqma6/tqma6.c
> +++ b/board/tqc/tqma6/tqma6.c
> @@ -25,6 +25,7 @@
>  #include <mmc.h>
>  #include <power/pfuze100_pmic.h>
>  #include <power/pmic.h>
> +#include <spi_flash.h>
>
>  #include "tqma6_bb.h"
>
> diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig
> index 66ac0b1..e30b130 100644
> --- a/configs/tqma6s_wru4_mmc_defconfig
> +++ b/configs/tqma6s_wru4_mmc_defconfig
> @@ -3,11 +3,8 @@ CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_TQMA6=y
>  CONFIG_TQMA6S=y
>  CONFIG_WRU4=y
> -CONFIG_CMD_SETEXPR=y
> -CONFIG_CMD_NET=y
>  CONFIG_AUTOBOOT_KEYED=y
>  CONFIG_AUTOBOOT_PROMPT="Enter password in %d seconds to stop autoboot\n"
>  CONFIG_AUTOBOOT_ENCRYPTION=y
>  CONFIG_AUTOBOOT_STOP_STR_SHA256="36a9e7f1c95b82ffb99743e0c5c4ce95d83c9a430aac59f84ef3cbfab6145068"
>  CONFIG_PCA9551_LED=y
> -CONFIG_SPI_FLASH=y
> diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
> index 1c86bc0..1330a0a 100644
> --- a/include/configs/tqma6_wru4.h
> +++ b/include/configs/tqma6_wru4.h
> @@ -68,4 +68,12 @@
>  #define CONFIG_SYS_BOOTCOUNT_ADDR      IRAM_BASE_ADDR
>  #define CONFIG_SYS_BOOTCOUNT_BE
>
> +/*
> + * Remove all unused interfaces / commands that are defined in
> + * the common header tqms6.h
> + */
> +#undef CONFIG_CMD_SF
> +#undef CONFIG_CMD_SPI
> +#undef CONFIG_MXC_SPI
> +
>  #endif /* __CONFIG_TQMA6_WRU4_H */
> --
> 2.4.8
>

thanks!
Jagan Teki Aug. 5, 2015, 9:41 a.m. UTC | #5
On 5 August 2015 at 15:06, Stefano Babic <sbabic@denx.de> wrote:
> Hi Clemens,
>
> On 05/08/2015 11:28, Clemens Gruber wrote:
>> Hi Stefano, Hi Stefan,
>>
>> On Wed, Aug 05, 2015 at 11:00:56AM +0200, Stefano Babic wrote:
>>> Hi Stefan, Clemens,
>>>
>>> I read the thread - Clemens, can you send your Tested-by after you
>>> tested with success the patch ? I will apply it, then..
>>>
>>> Best regards,
>>> Stefano Babic
>>
>> Although I am not convinced that ifdefs are as bad as Stefan thinks they are,
>> the new patch works fine too. Thank you!
>>
>
> We are trying to get rid of #ifdef as much as possible.

Agreed Stefano, this is u-boot on-going development goal.

>
>> Tested-by: Clemens Gruber <clemens.gruber@pqgruber.com>
>>
>
>
> Ok, thanks !
>

thanks!
Stefano Babic Aug. 11, 2015, 10:42 a.m. UTC | #6
On 05/08/2015 10:50, Stefan Roese wrote:
> This patch removes the SPI support from the WRU-IV baseboard as its
> not used at all.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
> Cc: Markus Niebel <Markus.Niebel@tq-group.com>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
>  board/tqc/tqma6/tqma6.c           | 1 +
>  configs/tqma6s_wru4_mmc_defconfig | 3 ---
>  include/configs/tqma6_wru4.h      | 8 ++++++++
>  3 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
> index 29db838..8656782 100644
> --- a/board/tqc/tqma6/tqma6.c
> +++ b/board/tqc/tqma6/tqma6.c
> @@ -25,6 +25,7 @@
>  #include <mmc.h>
>  #include <power/pfuze100_pmic.h>
>  #include <power/pmic.h>
> +#include <spi_flash.h>
>  
>  #include "tqma6_bb.h"
>  
> diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig
> index 66ac0b1..e30b130 100644
> --- a/configs/tqma6s_wru4_mmc_defconfig
> +++ b/configs/tqma6s_wru4_mmc_defconfig
> @@ -3,11 +3,8 @@ CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_TQMA6=y
>  CONFIG_TQMA6S=y
>  CONFIG_WRU4=y
> -CONFIG_CMD_SETEXPR=y
> -CONFIG_CMD_NET=y
>  CONFIG_AUTOBOOT_KEYED=y
>  CONFIG_AUTOBOOT_PROMPT="Enter password in %d seconds to stop autoboot\n"
>  CONFIG_AUTOBOOT_ENCRYPTION=y
>  CONFIG_AUTOBOOT_STOP_STR_SHA256="36a9e7f1c95b82ffb99743e0c5c4ce95d83c9a430aac59f84ef3cbfab6145068"
>  CONFIG_PCA9551_LED=y
> -CONFIG_SPI_FLASH=y
> diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
> index 1c86bc0..1330a0a 100644
> --- a/include/configs/tqma6_wru4.h
> +++ b/include/configs/tqma6_wru4.h
> @@ -68,4 +68,12 @@
>  #define CONFIG_SYS_BOOTCOUNT_ADDR	IRAM_BASE_ADDR
>  #define CONFIG_SYS_BOOTCOUNT_BE
>  
> +/*
> + * Remove all unused interfaces / commands that are defined in
> + * the common header tqms6.h
> + */
> +#undef CONFIG_CMD_SF
> +#undef CONFIG_CMD_SPI
> +#undef CONFIG_MXC_SPI
> +
>  #endif /* __CONFIG_TQMA6_WRU4_H */
> 

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic
diff mbox

Patch

diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index 29db838..8656782 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -25,6 +25,7 @@ 
 #include <mmc.h>
 #include <power/pfuze100_pmic.h>
 #include <power/pmic.h>
+#include <spi_flash.h>
 
 #include "tqma6_bb.h"
 
diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig
index 66ac0b1..e30b130 100644
--- a/configs/tqma6s_wru4_mmc_defconfig
+++ b/configs/tqma6s_wru4_mmc_defconfig
@@ -3,11 +3,8 @@  CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TQMA6=y
 CONFIG_TQMA6S=y
 CONFIG_WRU4=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Enter password in %d seconds to stop autoboot\n"
 CONFIG_AUTOBOOT_ENCRYPTION=y
 CONFIG_AUTOBOOT_STOP_STR_SHA256="36a9e7f1c95b82ffb99743e0c5c4ce95d83c9a430aac59f84ef3cbfab6145068"
 CONFIG_PCA9551_LED=y
-CONFIG_SPI_FLASH=y
diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index 1c86bc0..1330a0a 100644
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -68,4 +68,12 @@ 
 #define CONFIG_SYS_BOOTCOUNT_ADDR	IRAM_BASE_ADDR
 #define CONFIG_SYS_BOOTCOUNT_BE
 
+/*
+ * Remove all unused interfaces / commands that are defined in
+ * the common header tqms6.h
+ */
+#undef CONFIG_CMD_SF
+#undef CONFIG_CMD_SPI
+#undef CONFIG_MXC_SPI
+
 #endif /* __CONFIG_TQMA6_WRU4_H */