From 1abd05764f96cf2732640933c502f60c4642e4e4 Mon Sep 17 00:00:00 2001
From: Russel Winder <russel@russel.org.uk>
Date: Sat, 29 Aug 2009 18:18:25 +0100
Subject: [PATCH] Move the linker scripts out of the header file directory.

---
 containers/SConscript                           | 4 ++--
 containers/posix/fs0/{include => }/linker.lds   | 2 +-
 containers/posix/mm0/{include => }/linker.lds   | 2 +-
 containers/posix/test0/SConscript               | 2 +-
 containers/posix/test0/{include => }/linker.lds | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename containers/posix/fs0/{include => }/linker.lds (97%)
 rename containers/posix/mm0/{include => }/linker.lds (97%)
 rename containers/posix/test0/{include => }/linker.lds (97%)

diff --git a/containers/SConscript b/containers/SConscript
index f8e0351..9be4d67 100644
--- a/containers/SConscript
+++ b/containers/SConscript
@@ -43,13 +43,13 @@ environment['targetHelpEntries']['tasklibs'] = 'build the support libraries for
 
 def buildTask(programName, sources, environment, previousImage, extraCppPath=None):
     e = environment.Clone()
-    e.Append(LINKFLAGS=['-T' + e['posixServicesDirectory'] + '/' + programName + '/include/linker.lds'])
+    e.Append(LINKFLAGS=['-T' + e['posixServicesDirectory'] + '/' + programName + '/linker.lds'])
     e.Append(LIBPATH=['#' + e['buildDirectory'] + '/' + e['posixServicesDirectory'] + '/' + programName])
     if extraCppPath: e.Append(CPPPATH=extraCppPath)
     objects = e.StaticObject(sources)
     Depends(objects, e['configFiles'])
     program = e.Program(programName, objects)
-    environment['physicalBaseLinkerScript'] = Command('include/physical_base.lds', previousImage, 'tools/pyelf/readelf.py --first-free-page ' + previousImage[0].path + ' >> $TARGET')
+    environment['physicalBaseLinkerScript'] = Command('physical_base.lds', previousImage, 'tools/pyelf/readelf.py --first-free-page ' + previousImage[0].path + ' >> $TARGET')
     Depends(program, [environment['physicalBaseLinkerScript']])
     return program
 
diff --git a/containers/posix/fs0/include/linker.lds b/containers/posix/fs0/linker.lds
similarity index 97%
rename from containers/posix/fs0/include/linker.lds
rename to containers/posix/fs0/linker.lds
index fed94eb..94a2512 100644
--- a/containers/posix/fs0/include/linker.lds
+++ b/containers/posix/fs0/linker.lds
@@ -15,7 +15,7 @@
 /* USER_AREA_START, see memlayout.h */
 virtual_base = 0x10000000;
 __stack = (0x20000000 - 0x1000 - 8); /* First page before env/args page */
-INCLUDE "include/physical_base.lds"
+INCLUDE "physical_base.lds"
 
 /* physical_base = 0x228000; */
 offset = virtual_base - physical_base;
diff --git a/containers/posix/mm0/include/linker.lds b/containers/posix/mm0/linker.lds
similarity index 97%
rename from containers/posix/mm0/include/linker.lds
rename to containers/posix/mm0/linker.lds
index ae99198..797d947 100644
--- a/containers/posix/mm0/include/linker.lds
+++ b/containers/posix/mm0/linker.lds
@@ -14,7 +14,7 @@
  */
 /* INITTASK_AREA_START, see memlayout.h */
 virtual_base = 0xE0000000;
-INCLUDE "include/physical_base.lds"
+INCLUDE "physical_base.lds"
 
 /* physical_base = 0x228000; */
 pager_offset = virtual_base - physical_base;
diff --git a/containers/posix/test0/SConscript b/containers/posix/test0/SConscript
index 8982fde..f24981a 100644
--- a/containers/posix/test0/SConscript
+++ b/containers/posix/test0/SConscript
@@ -75,7 +75,7 @@ def createTestExecS(target, source, env):
 
 testTaskEnvironment = environment.Clone()
 testTaskEnvironment.Append(CPPPATH=['#' + testTaskEnvironment['posixServicesDirectory'] +'/libposix/include/posix'])
-testExecLinkerScript = Command('#build/' + testTaskEnvironment['posixServicesDirectory'] +'/' + taskName + '/include/test_exec_linker.lds', testTaskEnvironment['physicalBaseLinkerScript'], createTestExecLinkerScript)
+testExecLinkerScript = Command('#build/' + testTaskEnvironment['posixServicesDirectory'] +'/' + taskName + '/test_exec_linker.lds', testTaskEnvironment['physicalBaseLinkerScript'], createTestExecLinkerScript)
 testExecEnvironment = testTaskEnvironment.Clone()
 testExecEnvironment.Append(LINKFLAGS=['-T' + testExecLinkerScript[0].path])
 testExec = testExecEnvironment.Program('test_exec', Glob('src/test_exec/*.[cS]'))
diff --git a/containers/posix/test0/include/linker.lds b/containers/posix/test0/linker.lds
similarity index 97%
rename from containers/posix/test0/include/linker.lds
rename to containers/posix/test0/linker.lds
index 5da024e..bfa0f1a 100644
--- a/containers/posix/test0/include/linker.lds
+++ b/containers/posix/test0/linker.lds
@@ -15,7 +15,7 @@
 /* USER_AREA_START, see memlayout.h */
 virtual_base = 0x10000000;
 __stack = (0x20000000 - 0x1000 - 8); /* First page before the env/args */
-INCLUDE "include/physical_base.lds"
+INCLUDE "physical_base.lds"
 
 /* physical_base = 0x228000; */
 offset = virtual_base - physical_base;