diff --git a/board/nm/common/nbhw_env.c b/board/nm/common/nbhw_env.c
index 7a02183135..2eb8f70ec3 100644
--- a/board/nm/common/nbhw_env.c
+++ b/board/nm/common/nbhw_env.c
@@ -30,7 +30,6 @@ void set_console(void)
 		buf[0] = 0;
 	}
 
-use_default_console:
 	if (buf[0] == 0) {
 		strncpy(buf, defaultconsole, sizeof(buf));
 	}
diff --git a/configs/armada-385-nbhw18-v1_defconfig b/configs/armada-385-nbhw18-v1_defconfig
index 51a8e636a7..0c130eb9d9 100644
--- a/configs/armada-385-nbhw18-v1_defconfig
+++ b/configs/armada-385-nbhw18-v1_defconfig
@@ -7,11 +7,16 @@ CONFIG_TARGET_NM_NBHW18_V1=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
-CONFIG_DEFAULT_DEVICE_TREE="armada-385-nbhw18-v1"
-CONFIG_DEFAULT_FDT_FILE="armada-385-nbhw18-v1"
+CONFIG_DEFAULT_DEVICE_TREE="armada-385-nbhw18-spl"
+CONFIG_SMBIOS_PRODUCT_NAME="nbhw18_v1"
 CONFIG_BOOTDELAY=3
 CONFIG_BOOTSTAGE_STASH_SIZE=4096
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
+CONFIG_PRE_CONSOLE_BUFFER=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_PRE_CON_BUF_SZ=4096
+CONFIG_PRE_CON_BUF_ADDR=0x04000000
+# CONFIG_CONSOLE_MUX is not set
+CONFIG_DEFAULT_FDT_FILE="armada-385-nbhw18-spl"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SPL=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x190
@@ -40,17 +45,18 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
+CONFIG_OF_BOARD_FIXUP=y
 CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_OF_LIST="armada-385-nbhw18-spl armada-385-nbhw18-v1"
+CONFIG_MULTI_DTB_FIT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_MV=y
 CONFIG_SPI_FLASH=y
 CONFIG_MVNETA=y
 CONFIG_PCI=y
-CONFIG_DEBUG_UART=y
-CONFIG_DEBUG_UART_BASE=0xd0012000
-CONFIG_DEBUG_UART_CLOCK=250000000
-CONFIG_DEBUG_UART_SHIFT=2
+# CONFIG_DEBUG_UART is not set
+# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
@@ -59,4 +65,5 @@ CONFIG_USB_EHCI_MARVELL=y
 CONFIG_USB_STORAGE=y
 CONFIG_MVEBU_GPIO=y
 CONFIG_DM_GPIO=y
+CONFIG_CMD_EEPROM=y
 CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/include/configs/armada-385-nbhw18-v1.h b/include/configs/armada-385-nbhw18-v1.h
index 2a2f9706dc..f04988432d 100644
--- a/include/configs/armada-385-nbhw18-v1.h
+++ b/include/configs/armada-385-nbhw18-v1.h
@@ -52,13 +52,20 @@
  * 0x0400		0x200		The NetModule License Descriptor
  * 0x0600		0x400		The NetModule Parition table
  * 0x0A00		0x600		reserved
- * 0x1000		0x800		The U-Boot environment
- * 0x1800		0x800		reserved
+ * 0x1000		0xA00		The U-Boot environment
+ * 0x1A00		0x600		reserved
  */
 #define CONFIG_ENV_OFFSET				(0x1000)  /* The Environment is located at 4k */
-#define CONFIG_ENV_SIZE					(0x800) /* 64KiB */
+#define CONFIG_ENV_SIZE					(0xA00) /* 64KiB */
 #define CONFIG_ENV_SECT_SIZE			(256 << 10) /* 256KiB sectors */
 
+#define CONFIG_ENV_EEPROM_IS_ON_I2C
+#define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* Main EEPROM */
+#define CONFIG_SYS_DEF_EEPROM_ADDR	0x50
+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	(2)
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	5
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	70
+
 #define CONFIG_PHY_MARVELL		/* there is a marvell phy */
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs a longer aneg time */