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>
master
Tom Warren 9 years ago
parent 722e000ccd
commit 9e8f4be345
  1. 1
      configs/dalmore_defconfig
  2. 1
      configs/jetson-tk1_defconfig
  3. 1
      configs/nyan-big_defconfig
  4. 1
      configs/p2571_defconfig
  5. 1
      configs/venice2_defconfig
  6. 2
      include/configs/dalmore.h
  7. 2
      include/configs/jetson-tk1.h
  8. 2
      include/configs/nyan-big.h
  9. 2
      include/configs/p2571.h
  10. 2
      include/configs/venice2.h

@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore"
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NFS is not set # CONFIG_CMD_NFS is not set
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_TEGRA114_SPI=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y CONFIG_DM_USB=y

@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1"
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NFS is not set # CONFIG_CMD_NFS is not set
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_TEGRA114_SPI=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y CONFIG_DM_USB=y

@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big"
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NFS is not set # CONFIG_CMD_NFS is not set
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_TEGRA114_SPI=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_CMD_CROS_EC=y CONFIG_CMD_CROS_EC=y
CONFIG_CROS_EC=y CONFIG_CROS_EC=y

@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571"
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NFS is not set # CONFIG_CMD_NFS is not set
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_TEGRA114_SPI=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y CONFIG_DM_USB=y

@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2"
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NFS is not set # CONFIG_CMD_NFS is not set
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_TEGRA114_SPI=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y CONFIG_DM_USB=y

@ -50,8 +50,6 @@
#define MACH_TYPE_DALMORE 4304 /* not yet in mach-types.h */ #define MACH_TYPE_DALMORE 4304 /* not yet in mach-types.h */
/* SPI */ /* SPI */
#define CONFIG_TEGRA114_SPI
#define CONFIG_TEGRA114_SPI_CTRLS 6
#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SPI_FLASH_WINBOND
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SF_DEFAULT_SPEED 24000000

@ -40,8 +40,6 @@
#define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_SYS_MMC_ENV_PART 2
/* SPI */ /* SPI */
#define CONFIG_TEGRA114_SPI /* Compatible w/ Tegra114 SPI */
#define CONFIG_TEGRA114_SPI_CTRLS 6
#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SPI_FLASH_WINBOND
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SF_DEFAULT_SPEED 24000000

@ -52,8 +52,6 @@
#define CONFIG_LCD_ALIGNMENT MMU_SECTION_SIZE #define CONFIG_LCD_ALIGNMENT MMU_SECTION_SIZE
/* SPI */ /* SPI */
#define CONFIG_TEGRA114_SPI /* Compatible w/ Tegra114 SPI */
#define CONFIG_TEGRA114_SPI_CTRLS 6
#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SPI_FLASH_WINBOND
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SF_DEFAULT_SPEED 24000000

@ -41,8 +41,6 @@
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
/* SPI */ /* SPI */
#define CONFIG_TEGRA114_SPI /* Compatible w/ Tegra114 SPI */
#define CONFIG_TEGRA114_SPI_CTRLS 6
#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SPI_FLASH_WINBOND
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SF_DEFAULT_SPEED 24000000

@ -37,8 +37,6 @@
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
/* SPI */ /* SPI */
#define CONFIG_TEGRA114_SPI /* Compatible w/ Tegra114 SPI */
#define CONFIG_TEGRA114_SPI_CTRLS 6
#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SPI_FLASH_WINBOND
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
#define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SF_DEFAULT_SPEED 24000000

Loading…
Cancel
Save