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

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

diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h
index 317a3d7dd78c552ff2d9577f89ddec98d77fcdfd..8ca04ea4809e81d6dfe6170c636a6e6c668b7e48 100644 (file)
--- a/include/configs/hammerhead.h
+++ b/include/configs/hammerhead.h
@@ -47,6 +47,9 @@
 #define CONFIG_SYS_CLKDIV_PBA                  2
 #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>
@@ -117,7 +120,7 @@
 
 #define CONFIG_ATMEL_USART             1
 #define CONFIG_MACB                    1
-#define CONFIG_PIO2                    1
+#define CONFIG_PORTMUX_PIO             1
 #define CONFIG_SYS_NR_PIOS                     5
 #define CONFIG_SYS_HSDRAMC                     1
 #define CONFIG_MMC                     1