 +CONFIG_AUTOBOOT_KEYED=y
 +CONFIG_AUTOBOOT_PROMPT="Automatic boot in %ds...\nEnter 'noautoboot' to enter prompt without timeout\n"
 +CONFIG_AUTOBOOT_STOP_STR="noautoboot"
++CONFIG_CMD_THOR_DOWNLOAD=y
 +CONFIG_CMD_DFU=y
 +# CONFIG_CMD_FLASH is not set
 +CONFIG_CMD_GPIO=y
 +CONFIG_CMD_I2C=y
 +CONFIG_CMD_MMC=y
-+CONFIG_CMD_USB=y
-+# CONFIG_CMD_SETEXPR is not set
-+# CONFIG_CMD_NET is not set
-+# CONFIG_CMD_NFS is not set
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_EXT4=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_SPL_DM_SEQ_ALIAS=y
-+CONFIG_DM_GPIO=y
-+CONFIG_DFU_RAM=y
-+CONFIG_DM_I2C=y
-+CONFIG_I2C_CROS_EC_TUNNEL=y
-+CONFIG_SYS_I2C_CADENCE=y
-+CONFIG_I2C_MUX=y
-+CONFIG_I2C_MUX_PCA954x=y
-+CONFIG_MISC=y
-+CONFIG_CROS_EC=y
-+CONFIG_CROS_EC_I2C=y
-+CONFIG_I2C_EEPROM=y
-+CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_ZYNQ=y
-+CONFIG_ZYNQ_GEM=y
-+CONFIG_DEBUG_UART_ZYNQ=y
-+CONFIG_DEBUG_UART_BASE=0xe0000000
-+CONFIG_DEBUG_UART_CLOCK=100000000
-+CONFIG_ZYNQ_SERIAL=y
-+CONFIG_USB=y
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_ULPI_VIEWPORT=y
-+CONFIG_USB_ULPI=y
-+CONFIG_USB_STORAGE=y
-+CONFIG_USB_GADGET=y
-+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
-+CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
-+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
-+CONFIG_CI_UDC=y
-+CONFIG_USB_GADGET_DOWNLOAD=y
-+CONFIG_ENV_IS_IN_MMC=y
-diff --git a/configs/ni_e31x_sg3_defconfig b/configs/ni_e31x_sg3_defconfig
-new file mode 100644
-index 0000000000..e85e3c80fc
---- /dev/null
-+++ b/configs/ni_e31x_sg3_defconfig
-@@ -0,0 +1,59 @@
-+CONFIG_ARM=y
-+CONFIG_SYS_VENDOR="ni"
-+CONFIG_SYS_CONFIG_NAME="ni_e31x_sg3"
-+CONFIG_ARCH_ZYNQ=y
-+CONFIG_SYS_TEXT_BASE=0x4000000
-+CONFIG_SPL_STACK_R_ADDR=0x200000
-+CONFIG_DEFAULT_DEVICE_TREE="zynq-ni-e31x-sg3"
-+CONFIG_DEBUG_UART=y
-+CONFIG_FIT=y
-+CONFIG_FIT_SIGNATURE=y
-+CONFIG_BOOTDELAY=0
-+# CONFIG_DISPLAY_CPUINFO is not set
-+CONFIG_SPL=y
-+CONFIG_SPL_STACK_R=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_PROMPT="ni-e31x-uboot> "
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_AUTOBOOT_PROMPT="Automatic boot in %ds...\nEnter 'noautoboot' to enter prompt without timeout\n"
-+CONFIG_AUTOBOOT_STOP_STR="noautoboot"
-+CONFIG_CMD_DFU=y
-+# CONFIG_CMD_FLASH is not set
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_I2C=y
-+CONFIG_CMD_MMC=y
++CONFIG_CMD_MII=y
 +CONFIG_CMD_USB=y
 +# CONFIG_CMD_SETEXPR is not set
 +# CONFIG_CMD_NET is not set

+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
+CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/include/configs/ni_e31x.h b/include/configs/ni_e31x.h
new file mode 100644

 board/ni/zynq/ps7_init_gpl.h                  |  35 +++
 board/ni/zynq/zynq-ni-e31x-sg1/ps7_init_gpl.c | 299 +++++++++++++++++++++++++
 board/ni/zynq/zynq-ni-e31x-sg3/ps7_init_gpl.c | 306 ++++++++++++++++++++++++++
 configs/ni_e31x_sg1_defconfig                 |  65 ++++++
 configs/ni_e31x_sg3_defconfig                 |  65 ++++++
 include/configs/ni_e31x.h                     |  41 ++++
 include/configs/ni_e31x_sg1.h                 |  15 ++
 include/configs/ni_e31x_sg3.h                 |  16 ++
 17 files changed, 1465 insertions(+)
 create mode 100644 arch/arm/dts/zynq-ni-e31x-sg1.dts
 create mode 100644 arch/arm/dts/zynq-ni-e31x-sg3.dts
 create mode 100644 arch/arm/dts/zynq-ni-e31x-uboot.dtsi
