diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index e7443f8be570baff5782c1a97cb12f476088423a..2d8024759944f573bfc72e088737aaa2242d014e 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 7085469bb65eedb4d8494b35bba010e961d4f5a2..44c7a8ef269f850c21b62266b7f7594c13a4ecfe 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 79b74a7ba324bb7de7a2d3af7a59770e3c89417d..ccf656b2896cdd08daf475088ee4ee65f779ae87 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 8494bb5b6efd331e073a56ce5507a4f72f1d7048..5fd2a54eb18e5ca67797239b731f96cac24372a2 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 9ccd73997725b61f6c5fd9dccb3275535a53787a..a4735f63922f880d98428eeb80fc549eb4939952 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 504332d3bc66c2f9a76f60c49a29b8e3f94c3422..30aecca220cffcd08ebb3bc7a2f8df4c51929d47 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -50,8 +50,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 477a37ba0aef644db0507a20cdb444582282808f..55ef5f8cc6ca4bec5b66a973df0a5cf76c499df9 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -40,8 +40,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 38b4a87bffb5f67ea012b8d96a0d49122a24fa88..eac24d39ea8da1d855d6133b20f0a938328d8097 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -52,8 +52,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 d39fa2a39efb79fbdce09d74ff40364951df94d0..5df7d2f387dfbbf8882302a1bdd3c3d1d529383c 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 ffb2e8c3d131a80ef137c207c3ae6633f6d5cbd0..2c43f3ebede593564fb95bc6a2b341b008a28b78 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -37,8 +37,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