Merge branch 'next' of /home/wd/git/u-boot/next

[u-boot] / include / configs / acadia.h

diff --git a/include/configs/acadia.h b/include/configs/acadia.h
index b6f909c1107f2fd69be9064abe0d8fb4d9238ecf..39f85ae3b657a8af0cc68fde730e13f61b5221b9 100644 (file)
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -121,7 +121,13 @@
 #define CONFIG_SYS_FLASH_EMPTY_INFO            /* print 'E' for empty sector on flinfo */
 
 #else
-#define        CONFIG_SYS_NO_FLASH             1       /* No NOR on Acadia when NAND-booting   */
+/*
+ * No NOR-flash on Acadia when NAND-booting. We need to undef the
+ * NOR device-tree fixup code as well, since flash_info is not defined
+ * in this case.
+ */
+#define        CONFIG_SYS_NO_FLASH             1
+#undef CONFIG_FDT_FIXUP_NOR_FLASH_SIZE
 #endif
 
 #ifdef CONFIG_ENV_IS_IN_FLASH