From 86c9888207b0d5b9632c4ed7a61fd09b81bb618c Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Sun, 3 Apr 2005 14:26:46 +0000
Subject: [PATCH] Patch by Steven Scholz, 03 Apr 2005: - create SoC specific
 directories include/asm-arm/arch-imx and   include/asm-arm/arch-s3c24x0

---
 CHANGELOG                                               | 3 +++
 board/mx1ads/mx1ads.c                                   | 2 +-
 include/asm-arm/{arch-arm920t => arch-imx}/imx-regs.h   | 0
 include/asm-arm/{arch-arm920t => arch-s3c24x0}/memory.h | 0
 mkconfig                                                | 7 ++++++-
 5 files changed, 10 insertions(+), 2 deletions(-)
 rename include/asm-arm/{arch-arm920t => arch-imx}/imx-regs.h (100%)
 rename include/asm-arm/{arch-arm920t => arch-s3c24x0}/memory.h (100%)

diff --git a/CHANGELOG b/CHANGELOG
index 1136f11f7a..71eae5e7ef 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,9 @@ Changes for U-Boot 1.1.3:
 * Prepare for SoC rework of ARM code:
   - rename CONFIG_BOOTBINFUNC into  CONFIG_INIT_CRITICAL
   - rename memsetup into lowlevel_init (function name and source files)
+  Patch by Steven Scholz, 03 Apr 2005:
+  - create SoC specific directories include/asm-arm/arch-imx and
+    include/asm-arm/arch-s3c24x0
 
 * Fix problems with SNTP support;
   enable SNTP support in some boards.
diff --git a/board/mx1ads/mx1ads.c b/board/mx1ads/mx1ads.c
index 332f0a2beb..5c33ba3c0e 100644
--- a/board/mx1ads/mx1ads.c
+++ b/board/mx1ads/mx1ads.c
@@ -25,7 +25,7 @@
 
 #include <common.h>
 /*#include <mc9328.h>*/
-#include <asm/arch-arm920t/imx-regs.h>
+#include <asm/arch/imx-regs.h>
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/include/asm-arm/arch-arm920t/imx-regs.h b/include/asm-arm/arch-imx/imx-regs.h
similarity index 100%
rename from include/asm-arm/arch-arm920t/imx-regs.h
rename to include/asm-arm/arch-imx/imx-regs.h
diff --git a/include/asm-arm/arch-arm920t/memory.h b/include/asm-arm/arch-s3c24x0/memory.h
similarity index 100%
rename from include/asm-arm/arch-arm920t/memory.h
rename to include/asm-arm/arch-s3c24x0/memory.h
diff --git a/mkconfig b/mkconfig
index 266addd705..e366267181 100644
--- a/mkconfig
+++ b/mkconfig
@@ -31,7 +31,12 @@ cd ./include
 rm -f asm
 ln -s asm-$2 asm
 rm -f asm-$2/arch
-ln -s arch-$3 asm-$2/arch
+
+if [ -z "$6" -o "$6" == "NULL" ] ; then
+	ln -s arch-$3 asm-$2/arch
+else
+	ln -s arch-$6 asm-$2/arch
+fi
 
 if [ "$2" = "arm" ] ; then
 	rm -f asm-$2/proc