diff --git a/include/configs/am335x_nmhw21.h b/include/configs/am335x_nmhw21.h
index 0d83adb136..ba2924810d 100644
--- a/include/configs/am335x_nmhw21.h
+++ b/include/configs/am335x_nmhw21.h
@@ -48,16 +48,37 @@
 #define CONFIG_BOOTP_MAY_FAIL
 
 #ifndef CONFIG_SPL_BUILD
-#define KERNEL_ADDR			"0x80000000"
-#define LOAD_ADDR			"0x83000000"
-#define FDT_ADDR			"0x82000000"
-#define PXE_ADDR			"0x82800000"
-#define FDT_HIGH_ADDR			"0x87000000"
-#define INIT_RD_ADDR			"0x88000000"
 
-#define OT_KERNEL_ADDR			"0x90000000"
-#define OT_LOAD_ADDR			"0x87000000"
-#define OT_RD_ADDR			"0x83000000"
+
+/*
+Memory map:
+
+0x80000000 KERNEL_ADDR
++63MB
+0x83F00000 FDT_ADDR
++512kB
+0x83F80000 FDT_HIGH_ADDR
++512kB
+0x84000000 OT_RD_ADDR
++126MB
+0x8BE00000 PXE_ADDR
++2MB
+0x8C000000 LOAD_ADDR
++1MB
+0x8C100000 OT_KERNEL_ADDR
++63MB
+0x90000000 256 MB
+
+*/
+
+#define KERNEL_ADDR     "0x80000000"
+#define FDT_ADDR        "0x83F00000"
+#define FDT_HIGH_ADDR   "0x83F80000"
+#define OT_RD_ADDR      "0x84000000"
+#define PXE_ADDR        "0x8BE00000"
+#define LOAD_ADDR       "0x8C000000"
+#define OT_KERNEL_ADDR  "0x8C100000"
+
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"kernel_image=zImage\0"	\
@@ -66,7 +87,7 @@
 	"fdt_high=" FDT_HIGH_ADDR "\0" \
 	"kernel_addr=" KERNEL_ADDR "\0" \
 	"kernel_addr_r=" OT_KERNEL_ADDR "\0" \
-	"load_addr=" OT_LOAD_ADDR "\0" \
+	"load_addr=" LOAD_ADDR "\0" \
 	"pxefile_addr_r=" PXE_ADDR "\0" \
 	"ramdisk_addr_r=" OT_RD_ADDR "\0" \
 	"defaultconsole=ttyS2\0" /* Default output console */ \