diff --git a/arch/avr32/cpu/at32ap700x/clk.c b/arch/avr32/cpu/at32ap700x/clk.c
index 742bc6b5a21c42b010c83b9a68516036ff665acc..b63b9df143deb94a1d607eb00cfdde1eb563a655 100644
--- a/arch/avr32/cpu/at32ap700x/clk.c
+++ b/arch/avr32/cpu/at32ap700x/clk.c
@@ -24,7 +24,7 @@
 #include <asm/io.h>
 
 #include <asm/arch/clk.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/portmux.h>
 
 #include "sm.h"
diff --git a/arch/avr32/cpu/at32ap700x/portmux.c b/arch/avr32/cpu/at32ap700x/portmux.c
index b1f2c6f1ffba5f6fd9533172e1b2de9d0991fa98..e3e38a2a75726a348a3d9f9861e43803319873c8 100644
--- a/arch/avr32/cpu/at32ap700x/portmux.c
+++ b/arch/avr32/cpu/at32ap700x/portmux.c
@@ -24,7 +24,7 @@
 #include <asm/io.h>
 
 #include <asm/arch/chip-features.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/portmux.h>
 
 /*
diff --git a/arch/avr32/cpu/cpu.c b/arch/avr32/cpu/cpu.c
index e4489bb2e28ecbecb23f07a3f36b795924dc176b..790783767f12a4430c1a1707e17620095ad4850a 100644
--- a/arch/avr32/cpu/cpu.c
+++ b/arch/avr32/cpu/cpu.c
@@ -27,7 +27,7 @@
 #include <asm/sysreg.h>
 
 #include <asm/arch/clk.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 
 #include "hsmc3.h"
 
diff --git a/arch/avr32/cpu/hsdramc.c b/arch/avr32/cpu/hsdramc.c
index b6eae667c242ab0b22fe8cdcd54d7a01a9cdda61..1485494f49b225bf42f9aaa75e7dacefcb41543a 100644
--- a/arch/avr32/cpu/hsdramc.c
+++ b/arch/avr32/cpu/hsdramc.c
@@ -25,7 +25,7 @@
 #include <asm/sdram.h>
 
 #include <asm/arch/clk.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 
 #include "hsdramc1.h"
 
diff --git a/arch/avr32/cpu/interrupts.c b/arch/avr32/cpu/interrupts.c
index c6d8d16e39e8aecd95abbd2cf866b88b6438ca53..c751981b34ebbbf7cab98b46fd597e3dfa7aae4e 100644
--- a/arch/avr32/cpu/interrupts.c
+++ b/arch/avr32/cpu/interrupts.c
@@ -27,7 +27,7 @@
 #include <asm/processor.h>
 #include <asm/sysreg.h>
 
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 
 #define HANDLER_MASK	0x00ffffff
 #define INTLEV_SHIFT	30
diff --git a/arch/avr32/cpu/portmux-gpio.c b/arch/avr32/cpu/portmux-gpio.c
index 9acd040d1be2153c48cfd07dcbee740e71ba6b55..7b64c89a9872a365aa79341e6ec45b8d3a25a60b 100644
--- a/arch/avr32/cpu/portmux-gpio.c
+++ b/arch/avr32/cpu/portmux-gpio.c
@@ -22,7 +22,7 @@
 #include <common.h>
 
 #include <asm/io.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/gpio.h>
 
 void portmux_select_peripheral(void *port, unsigned long pin_mask,
diff --git a/arch/avr32/cpu/portmux-pio.c b/arch/avr32/cpu/portmux-pio.c
index a29f94e3ba4648b02b19515023a2660d2c69822b..cb5e96205ae2b4ad87b52146b4c5e54c811b5cb1 100644
--- a/arch/avr32/cpu/portmux-pio.c
+++ b/arch/avr32/cpu/portmux-pio.c
@@ -22,7 +22,7 @@
 #include <common.h>
 
 #include <asm/io.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/gpio.h>
 
 void portmux_select_peripheral(void *port, unsigned long pin_mask,
diff --git a/arch/avr32/include/asm/arch-at32ap700x/gpio.h b/arch/avr32/include/asm/arch-at32ap700x/gpio.h
index 303e35313abbf55f1cba8e64d294865abf1f9ac8..b0254f2d7f7c4181ed6e8f6e4d3c1416c3697890 100644
--- a/arch/avr32/include/asm/arch-at32ap700x/gpio.h
+++ b/arch/avr32/include/asm/arch-at32ap700x/gpio.h
@@ -23,7 +23,7 @@
 #define __ASM_AVR32_ARCH_GPIO_H__
 
 #include <asm/arch/chip-features.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 
 #define NR_GPIO_CONTROLLERS	5
 
diff --git a/arch/avr32/include/asm/arch-at32ap700x/memory-map.h b/arch/avr32/include/asm/arch-at32ap700x/hardware.h
similarity index 100%
rename from arch/avr32/include/asm/arch-at32ap700x/memory-map.h
rename to arch/avr32/include/asm/arch-at32ap700x/hardware.h
diff --git a/board/miromico/hammerhead/hammerhead.c b/board/miromico/hammerhead/hammerhead.c
index 78f4fd405ea0872293b0fdc7df71294bb206701d..a0794ba966a10baddac871846aea7b4959c5f7f8 100644
--- a/board/miromico/hammerhead/hammerhead.c
+++ b/board/miromico/hammerhead/hammerhead.c
@@ -29,7 +29,7 @@
 #include <asm/sdram.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/hmatrix.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/mmu.h>
 #include <asm/arch/portmux.h>
 
diff --git a/drivers/mmc/atmel_mci.c b/drivers/mmc/atmel_mci.c
index 3946ffeebea2343f8cc6c2d5fc8f1fcbb21d6ce7..0af8d42611cfa5af2dd379f4135c8043e257152a 100644
--- a/drivers/mmc/atmel_mci.c
+++ b/drivers/mmc/atmel_mci.c
@@ -28,7 +28,7 @@
 #include <asm/errno.h>
 #include <asm/byteorder.h>
 #include <asm/arch/clk.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 
 #include "atmel_mci.h"
 
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index 92491ca09d15f376d4305b7bb4c8978a28f2be22..a3e92e8162cd3c0a743c28a60379329aaa002b7a 100644
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -24,7 +24,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 
 #define CONFIG_AVR32			1
 #define CONFIG_AT32AP			1
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 6416d170919675b13cd0fa16a9289b40c255eba6..252c5ae6991c85c88b023a903f0d51fbc065f421 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -24,7 +24,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 
 #define CONFIG_AVR32			1
 #define CONFIG_AT32AP			1
diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h
index a4d9b0b9083af451149015e3720116e090866943..8f060817fd5d79601be087cb5aabfdbd58aaab51 100644
--- a/include/configs/atstk1003.h
+++ b/include/configs/atstk1003.h
@@ -24,7 +24,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 
 #define CONFIG_AVR32			1
 #define CONFIG_AT32AP			1
diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h
index 06bb5da8a3f36d6b5e551138cd05bf2a3a99bdb0..12c9414a677c7ef64bc210feba94455cc8b80fa4 100644
--- a/include/configs/atstk1004.h
+++ b/include/configs/atstk1004.h
@@ -24,7 +24,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 
 #define CONFIG_AVR32			1
 #define CONFIG_AT32AP			1
diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h
index d3cbee6b634cd3205a101cb121b0b4675fb9eb89..8cbaf75a642ebbe2307452fc18be43ab6d606219 100644
--- a/include/configs/atstk1006.h
+++ b/include/configs/atstk1006.h
@@ -24,7 +24,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 
 #define CONFIG_AVR32			1
 #define CONFIG_AT32AP			1
diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h
index 1c381c76b85aacbf394eb99798ede6bf3ad85d2a..a65fbd409fb8fc8ab5f6e3b85e5419f54b803620 100644
--- a/include/configs/favr-32-ezkit.h
+++ b/include/configs/favr-32-ezkit.h
@@ -22,7 +22,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 
 #define CONFIG_AVR32			1
 #define CONFIG_AT32AP			1
diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h
index 16e2ec62ee24789904df9a7be7479e1b32640847..a5c52e5cfe5b816a95bca6fb61f7ba060e05310f 100644
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@ -24,7 +24,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 
 #define CONFIG_AVR32			1
 #define CONFIG_AT32AP			1