Merge branch 'next' of ../custodians into next

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

diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h
index 8cfa31269ba7787b71ac6def3d814b8ffaf006c1..d3cbee6b634cd3205a101cb121b0b4675fb9eb89 100644 (file)
--- a/include/configs/atstk1006.h
+++ b/include/configs/atstk1006.h
@@ -73,6 +73,9 @@
  */
 #define CONFIG_SYS_CLKDIV_PBB                  1
 
+/* Reserve VM regions for SDRAM and NOR flash */
+#define CONFIG_SYS_NR_VM_REGIONS               2
+
 /*
  * The PLLOPT register controls the PLL like this:
  *   icp = PLLOPT<2>
@@ -142,9 +145,9 @@
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MMC
 
-#undef CONFIG_CMD_AUTOSCRIPT
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_SETGETDCR
+#undef CONFIG_CMD_SOURCE
 #undef CONFIG_CMD_XIMG
 
 #define CONFIG_ATMEL_USART             1