From a85f9f21aab7ee586cabe1773a02e9d04caa65fa Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Wed, 6 Apr 2005 13:52:31 +0000
Subject: Patch by Steven Scholz, 06 Apr 2005: - creating SoC subdir for Atmel
 AT91RM9200 cpu/arm920t/at91rm9200 - moving code out of cpu/at91rm9200 into
 cpu/arm920t/at91rm9200

---
 include/configs/adsvix.h       |  9 ++-------
 include/configs/at91rm9200dk.h |  8 ++++++--
 include/configs/cmc_pu2.h      | 10 +++++++---
 3 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'include')

diff --git a/include/configs/adsvix.h b/include/configs/adsvix.h
index b8797d1..c410891 100644
--- a/include/configs/adsvix.h
+++ b/include/configs/adsvix.h
@@ -34,13 +34,6 @@
 #define __CONFIG_H
 
 /*
- * If we are developing, we might want to start armboot from ram
- * so we MUST NOT initialize critical regs like mem-timing ...
- */
-#define CONFIG_INIT_CRITICAL		/* undef for developing */
-#define RTC
-
-/*
  * High Level Configuration Options
  * (easy to change)
  */
@@ -51,6 +44,8 @@
 
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff */
 
+#define RTC
+
 /*
  * Size of malloc() pool
  */
diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h
index 6a246b6..195de60 100644
--- a/include/configs/at91rm9200dk.h
+++ b/include/configs/at91rm9200dk.h
@@ -32,8 +32,12 @@
 
 #define AT91_SLOW_CLOCK		32768	/* slow clock */
 
-#define CONFIG_AT91RM9200DK	1	/* on an AT91RM9200DK Board	 */
-#undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff */
+#define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
+#define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
+#define CONFIG_AT91RM9200DK	1	/* on an AT91RM9200DK Board	*/
+#undef  CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
+#define USE_920T_MMU		1
+
 #define CONFIG_CMDLINE_TAG	1	/* enable passing of ATAGs	*/
 #define CONFIG_SETUP_MEMORY_TAGS 1
 #define CONFIG_INITRD_TAG	1
diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h
index 9ed9adb..752aeb2 100644
--- a/include/configs/cmc_pu2.h
+++ b/include/configs/cmc_pu2.h
@@ -31,9 +31,13 @@
 
 #define AT91_SLOW_CLOCK		32768	/* slow clock */
 
-#define CONFIG_AT91RM9200DK	1	/* on an AT91RM9200DK Board	 */
-#define CONFIG_CMC_PU2		1	/* on an CMC_PU2 Board	 */
-#undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff */
+#define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
+#define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
+#define CONFIG_AT91RM9200DK	1	/* on an AT91RM9200DK Board	*/
+#define CONFIG_CMC_PU2		1	/* on an CMC_PU2 Board		*/
+#undef  CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
+#define USE_920T_MMU		1
+
 #define CONFIG_CMDLINE_TAG	1	/* enable passing of ATAGs	*/
 #define CONFIG_SETUP_MEMORY_TAGS 1
 #define CONFIG_INITRD_TAG	1
-- 
cgit v1.1