[U-Boot] [PATCH] Tegra: spi: Move TEGRA114_SPI switch to defconfigs
All T114+ Tegra boards should be using the Kconfig TEGRA114_SPI switch. Remove it from include/config and put it into defconfig. Also removed unused TEGRA114_SPI_CTRLS from T114+ configs.
All Tegra SoCs build OK with this change.
Signed-off-by: Tom Warren twarren@nvidia.com --- configs/dalmore_defconfig | 1 + configs/jetson-tk1_defconfig | 1 + configs/nyan-big_defconfig | 1 + configs/p2571_defconfig | 1 + configs/venice2_defconfig | 1 + include/configs/dalmore.h | 2 -- include/configs/jetson-tk1.h | 2 -- include/configs/nyan-big.h | 2 -- include/configs/p2571.h | 2 -- include/configs/venice2.h | 2 -- 10 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig index e7443f8..2d80247 100644 --- a/configs/dalmore_defconfig +++ b/configs/dalmore_defconfig @@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore" # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPL_DM=y +CONFIG_TEGRA114_SPI=y CONFIG_SPI_FLASH=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index 7085469..44c7a8e 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1" # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPL_DM=y +CONFIG_TEGRA114_SPI=y CONFIG_SPI_FLASH=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index 79b74a7..ccf656b 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big" # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPL_DM=y +CONFIG_TEGRA114_SPI=y CONFIG_SPI_FLASH=y CONFIG_CMD_CROS_EC=y CONFIG_CROS_EC=y diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig index 8494bb5..5fd2a54 100644 --- a/configs/p2571_defconfig +++ b/configs/p2571_defconfig @@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571" # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPL_DM=y +CONFIG_TEGRA114_SPI=y CONFIG_SPI_FLASH=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig index 9ccd739..a4735f6 100644 --- a/configs/venice2_defconfig +++ b/configs/venice2_defconfig @@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2" # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPL_DM=y +CONFIG_TEGRA114_SPI=y CONFIG_SPI_FLASH=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 89b6f23..32fe9e8 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -51,8 +51,6 @@ #define MACH_TYPE_DALMORE 4304 /* not yet in mach-types.h */
/* SPI */ -#define CONFIG_TEGRA114_SPI -#define CONFIG_TEGRA114_SPI_CTRLS 6 #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index 3bbff28..5999504 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -41,8 +41,6 @@ #define CONFIG_SYS_MMC_ENV_PART 2
/* SPI */ -#define CONFIG_TEGRA114_SPI /* Compatible w/ Tegra114 SPI */ -#define CONFIG_TEGRA114_SPI_CTRLS 6 #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index dd549aa..4858dea 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -53,8 +53,6 @@ #define CONFIG_LCD_ALIGNMENT MMU_SECTION_SIZE
/* SPI */ -#define CONFIG_TEGRA114_SPI /* Compatible w/ Tegra114 SPI */ -#define CONFIG_TEGRA114_SPI_CTRLS 6 #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/p2571.h b/include/configs/p2571.h index d39fa2a..5df7d2f 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -41,8 +41,6 @@ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
/* SPI */ -#define CONFIG_TEGRA114_SPI /* Compatible w/ Tegra114 SPI */ -#define CONFIG_TEGRA114_SPI_CTRLS 6 #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 1d9d053..0535a6b 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -38,8 +38,6 @@ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
/* SPI */ -#define CONFIG_TEGRA114_SPI /* Compatible w/ Tegra114 SPI */ -#define CONFIG_TEGRA114_SPI_CTRLS 6 #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000
On 07/30/2015 02:57 PM, Tom Warren wrote:
All T114+ Tegra boards should be using the Kconfig TEGRA114_SPI switch. Remove it from include/config and put it into defconfig. Also removed unused TEGRA114_SPI_CTRLS from T114+ configs.
All Tegra SoCs build OK with this change.
Acked-by: Stephen Warren swarren@nvidia.com
This will make it fun to back-port my board support patches to the L4T U-Boot which doesn't have Kconfig support for TEGRA114_SPI, being just a little behind upstream, but that's my problem not yours.
On 30 July 2015 at 14:57, Tom Warren twarren@nvidia.com wrote:
All T114+ Tegra boards should be using the Kconfig TEGRA114_SPI switch. Remove it from include/config and put it into defconfig. Also removed unused TEGRA114_SPI_CTRLS from T114+ configs.
All Tegra SoCs build OK with this change.
Signed-off-by: Tom Warren twarren@nvidia.com
configs/dalmore_defconfig | 1 + configs/jetson-tk1_defconfig | 1 + configs/nyan-big_defconfig | 1 + configs/p2571_defconfig | 1 + configs/venice2_defconfig | 1 + include/configs/dalmore.h | 2 -- include/configs/jetson-tk1.h | 2 -- include/configs/nyan-big.h | 2 -- include/configs/p2571.h | 2 -- include/configs/venice2.h | 2 -- 10 files changed, 5 insertions(+), 10 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On 31 July 2015 at 03:03, Simon Glass sjg@chromium.org wrote:
On 30 July 2015 at 14:57, Tom Warren twarren@nvidia.com wrote:
All T114+ Tegra boards should be using the Kconfig TEGRA114_SPI switch. Remove it from include/config and put it into defconfig. Also removed unused TEGRA114_SPI_CTRLS from T114+ configs.
All Tegra SoCs build OK with this change.
Signed-off-by: Tom Warren twarren@nvidia.com
configs/dalmore_defconfig | 1 + configs/jetson-tk1_defconfig | 1 + configs/nyan-big_defconfig | 1 + configs/p2571_defconfig | 1 + configs/venice2_defconfig | 1 + include/configs/dalmore.h | 2 -- include/configs/jetson-tk1.h | 2 -- include/configs/nyan-big.h | 2 -- include/configs/p2571.h | 2 -- include/configs/venice2.h | 2 -- 10 files changed, 5 insertions(+), 10 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Reviewed-by: Jagan Teki jteki@openedev.com
I couldn't find this patch on patchwork, pls- provide the link?
thanks!
Jagan,
-----Original Message----- From: Jagan Teki [mailto:jteki@openedev.com] Sent: Wednesday, August 05, 2015 1:35 AM To: Simon Glass Cc: Tom Warren; U-Boot Mailing List; Stephen Warren; Tom Warren Subject: Re: [U-Boot] [PATCH] Tegra: spi: Move TEGRA114_SPI switch to defconfigs
On 31 July 2015 at 03:03, Simon Glass sjg@chromium.org wrote:
On 30 July 2015 at 14:57, Tom Warren twarren@nvidia.com wrote:
All T114+ Tegra boards should be using the Kconfig TEGRA114_SPI switch. Remove it from include/config and put it into defconfig. Also removed unused TEGRA114_SPI_CTRLS from T114+ configs.
All Tegra SoCs build OK with this change.
Signed-off-by: Tom Warren twarren@nvidia.com
configs/dalmore_defconfig | 1 + configs/jetson-tk1_defconfig | 1 + configs/nyan-big_defconfig | 1 + configs/p2571_defconfig | 1 + configs/venice2_defconfig | 1 + include/configs/dalmore.h | 2 -- include/configs/jetson-tk1.h | 2 -- include/configs/nyan-big.h | 2 -- include/configs/p2571.h | 2 -- include/configs/venice2.h | 2 -- 10 files changed, 5 insertions(+), 10 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Reviewed-by: Jagan Teki jteki@openedev.com
I couldn't find this patch on patchwork, pls- provide the link?
I don't see it in patchworks, either (nor do I see my P2571 cleanup patch that was sent the same day/time). Maybe patchwork was down/busy that day and dropped it?
Are you OK with my taking this in via u-boot-tegra, or do you want to take it in via u-boot-spi?
Tom -- nvpublic
thanks!
Jagan | openedev.
On 5 August 2015 at 20:50, Tom Warren TWarren@nvidia.com wrote:
Jagan,
-----Original Message----- From: Jagan Teki [mailto:jteki@openedev.com] Sent: Wednesday, August 05, 2015 1:35 AM To: Simon Glass Cc: Tom Warren; U-Boot Mailing List; Stephen Warren; Tom Warren Subject: Re: [U-Boot] [PATCH] Tegra: spi: Move TEGRA114_SPI switch to defconfigs
On 31 July 2015 at 03:03, Simon Glass sjg@chromium.org wrote:
On 30 July 2015 at 14:57, Tom Warren twarren@nvidia.com wrote:
All T114+ Tegra boards should be using the Kconfig TEGRA114_SPI switch. Remove it from include/config and put it into defconfig. Also removed unused TEGRA114_SPI_CTRLS from T114+ configs.
All Tegra SoCs build OK with this change.
Signed-off-by: Tom Warren twarren@nvidia.com
configs/dalmore_defconfig | 1 + configs/jetson-tk1_defconfig | 1 + configs/nyan-big_defconfig | 1 + configs/p2571_defconfig | 1 + configs/venice2_defconfig | 1 + include/configs/dalmore.h | 2 -- include/configs/jetson-tk1.h | 2 -- include/configs/nyan-big.h | 2 -- include/configs/p2571.h | 2 -- include/configs/venice2.h | 2 -- 10 files changed, 5 insertions(+), 10 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Reviewed-by: Jagan Teki jteki@openedev.com
I couldn't find this patch on patchwork, pls- provide the link?
I don't see it in patchworks, either (nor do I see my P2571 cleanup patch that was sent the same day/time). Maybe patchwork was down/busy that day and dropped it?
Are you OK with my taking this in via u-boot-tegra, or do you want to take it in via u-boot-spi?
You can take it, no issues.
thanks!
participants (5)
-
Jagan Teki -
Simon Glass -
Stephen Warren -
Tom Warren -
Tom Warren