diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index cae3691012..74ad425077 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -23,7 +23,9 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifdef CONFIG_DRIVER_TI_CPSW
 static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
+#endif
 
 /*
  * Read header information from EEPROM into global structure.
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 48d621ec3a..5b16669a13 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -99,6 +99,53 @@
 #define CONFIG_SF_DEFAULT_SPEED                48000000
 #define CONFIG_DEFAULT_SPI_MODE                SPI_MODE_3
 
+/*
+ * Default to using SPI for environment, etc.
+ * 0x000000 - 0x010000 : QSPI.SPL (64KiB)
+ * 0x010000 - 0x020000 : QSPI.SPL.backup1 (64KiB)
+ * 0x020000 - 0x030000 : QSPI.SPL.backup2 (64KiB)
+ * 0x030000 - 0x040000 : QSPI.SPL.backup3 (64KiB)
+ * 0x040000 - 0x1c0000 : QSPI.u-boot (1.5MiB)
+ * 0x1c0000 - 0x1d0000 : QSPI.u-boot-spl-os (64KiB)
+ * 0x1d0000 - 0x1e0000 : QSPI.u-boot-env (64KiB)
+ * 0x1e0000 - 0x1f0000 : QSPI.u-boot-env.backup1 (64KiB)
+ * 0x1f0000 - 0x6f0000 : QSPI.kernel (5MiB)
+ * 0x6f0000 - 0x4000000 : USERLAND
+ */
+#if defined(CONFIG_QSPI_BOOT)
+#ifdef CONFIG_SPL_BUILD
+#undef CONFIG_SPL_MMC_SUPPORT
+#endif
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#define CONFIG_ENV_SPI_MAX_HZ           CONFIG_SF_DEFAULT_SPEED
+#undef	CONFIG_SPL_MAX_SIZE
+#define	CONFIG_SPL_MAX_SIZE		(64 << 10)  /* 64 KiB */
+#undef CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_SECT_SIZE		(64 << 10) /* 64 KB sectors */
+#define CONFIG_ENV_OFFSET		0x1d0000
+#define CONFIG_ENV_OFFSET_REDUND	0x1e0000
+
+#ifdef MTDIDS_DEFAULT
+#undef MTDIDS_DEFAULT
+#endif
+#define MTDIDS_DEFAULT			"nor0=m25p80-flash.0"
+
+#ifdef MTDPARTS_DEFAULT
+#undef MTDPARTS_DEFAULT
+#endif
+#define MTDPARTS_DEFAULT			"mtdparts=qspi.0:64k(SPL)," \
+						"64k(QSPI.SPL.backup1)," \
+						"64k(QSPI.SPL.backup2)," \
+						"64k(QSPI.SPL.backup3)," \
+						"1.5m(QSPI.u-boot)," \
+						"64k(QSPI.u-boot-spl-os)," \
+						"64k(QSPI.u-boot-env)," \
+						"64k(QSPI.u-boot-env.backup1)," \
+						"5m(QSPI.kernel)," \
+						"-(QSPI.rootfs)"
+#endif
+
 /* SPI SPL */
 #define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
@@ -221,9 +268,10 @@
 		BOOTCMD_USB \
 		BOOTCMD_MMC \
 		BOOTCMD_NAND
-
 #endif
 
+#ifdef CONFIG_QSPI_BOOT
+#if !defined(CONFIG_SPL_BUILD)
 /* Enhance our eMMC support / experience. */
 #define CONFIG_CMD_GPT
 #define CONFIG_EFI_PARTITION
@@ -254,6 +302,8 @@
 #define CONFIG_SPL_ETH_SUPPORT
 #define CONFIG_SPL_NET_SUPPORT
 #define CONFIG_SYS_RX_ETH_BUFFER	64
+#endif
+#endif
 
 /* NAND support */
 #ifdef CONFIG_NAND