diff --git a/board/freescale/m54418twr/u-boot.lds b/board/freescale/m54418twr/u-boot.lds
index f3414493469bb7b378c359a966d73e050b727a72..36a4c264b9255f54793b36a2e11b95141aa58f15 100644
--- a/board/freescale/m54418twr/u-boot.lds
+++ b/board/freescale/m54418twr/u-boot.lds
@@ -66,9 +66,11 @@ SECTIONS
   PROVIDE (edata = .);
 
   . = .;
-  __u_boot_cmd_start = .;
-  .u_boot_cmd : { *(.u_boot_cmd) }
-  __u_boot_cmd_end = .;
+
+  . = ALIGN(4);
+  .u_boot_list : {
+	#include <u-boot.lst>
+  }
 
   . = .;
   __start___ex_table = .;
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 6c96111a7ec26d4ef44e69a9ae08fed84bde5c01..3be2f8ef33c77edf735297112559d9ca0d9091ff 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -350,7 +350,7 @@
 #endif
 #if defined(CONFIG_SYS_NAND_BOOT)
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_IN_NAND	1
+#define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_ENV_OFFSET	0x80000
 #define CONFIG_ENV_SIZE	0x20000
 #define CONFIG_ENV_SECT_SIZE	0x20000