From c08bb737198dc1beac552af363646c307094d731 Mon Sep 17 00:00:00 2001
From: Pixel <pixel@nobis-crew.org>
Date: Wed, 26 Jan 2011 23:15:59 -0800
Subject: Simplification of the ldscript, and consolidation of the makefiles.

---
 arch/arm/lpc17xx/ldscript | 20 +++++---------------
 target-rules.mk           |  4 ++--
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/arch/arm/lpc17xx/ldscript b/arch/arm/lpc17xx/ldscript
index 2a1ce2b..677d063 100644
--- a/arch/arm/lpc17xx/ldscript
+++ b/arch/arm/lpc17xx/ldscript
@@ -54,6 +54,7 @@ SECTIONS
 {
   .text :
   {
+    . = ALIGN(32);
     CREATE_OBJECT_SYMBOLS
     __cs3_region_start_rom = .;
     __privileged_code_start__ = . ;
@@ -73,14 +74,8 @@ SECTIONS
     
     *( .privileged_code )
     *( privileged_functions )
-
-    __privileged_code_end___len = . - __privileged_code_start__ - 1 ;
-    __privileged_code_end___len |= __privileged_code_end___len >> 1 ;
-    __privileged_code_end___len |= __privileged_code_end___len >> 2 ;
-    __privileged_code_end___len |= __privileged_code_end___len >> 4 ;
-    __privileged_code_end___len |= __privileged_code_end___len >> 8 ;
-    __privileged_code_end___len |= __privileged_code_end___len >> 16 ;
-    . = ALIGN( MAX( __privileged_code_end___len + 1, 32 ) ) ;
+    
+    . = ALIGN(32);
 
     __privileged_code_end__ = .;
     __privileged_functions_end__ = .;
@@ -163,17 +158,12 @@ SECTIONS
 
   .data :
   {
+    . = ALIGN(32);
     __cs3_region_start_ram = .;
     __ram_data_begin = .;
     __privileged_data_start__ = .;
     *( privileged_data )
-    __privileged_data_end___len = . - __privileged_data_start__ - 1 ;
-    __privileged_data_end___len |= __privileged_data_end___len >> 1 ;
-    __privileged_data_end___len |= __privileged_data_end___len >> 2 ;
-    __privileged_data_end___len |= __privileged_data_end___len >> 4 ;
-    __privileged_data_end___len |= __privileged_data_end___len >> 8 ;
-    __privileged_data_end___len |= __privileged_data_end___len >> 16 ;
-    . = ALIGN( MAX( __privileged_data_end___len + 1, 32 ) ) ;
+    . = ALIGN(32);
 
     __privileged_data_end__ = .;
     *(.cs3.region-head.ram)
diff --git a/target-rules.mk b/target-rules.mk
index a2bd0fc..e7e3be6 100644
--- a/target-rules.mk
+++ b/target-rules.mk
@@ -15,9 +15,9 @@ TARGET_MAP = $(addsuffix .map, $(basename $(TARGET)))
 TARGET_OBJS += $(addsuffix .o, $(basename $(TARGET)))
 endif
 
-$(TARGET_ELF): $(TARGET_OBJS) $(LIBDEPS)
+$(TARGET_ELF): $(TARGET_OBJS) $(LIBDEPS) $(LDSCRIPT)
 	$(E) "[TL]     Linking $@"
-	$(Q)$(TARGET_LD) -Wl,--gc-sections -Wl,-O3 -Wl,-Map=$(TARGET_MAP) -o $@ $^ -T$(LDSCRIPT) $(LIBS)
+	$(Q)$(TARGET_LD) -Wl,--gc-sections -Wl,-O3 -Wl,-Map=$(TARGET_MAP) -o $@ $(TARGET_OBJS) -T$(LDSCRIPT) $(LIBS)
 
 $(TARGET_MAP): $(TARGET_ELF)
 
-- 
cgit v1.2.3