From 4b7fd32e65c3e503de5f41f8599009726bff59fa Mon Sep 17 00:00:00 2001
From: Travis Geiselbrecht <geist@foobox.com>
Date: Tue, 24 Jan 2012 15:42:44 -0800
Subject: [PATCH] [make] remove the BOOTOBJS variable, ordering is handled via
 a special linker section

---
 arch/arm/rules.mk | 4 +---
 arch/x86/crt0.S   | 2 +-
 arch/x86/rules.mk | 4 +---
 makefile          | 4 +---
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/arch/arm/rules.mk b/arch/arm/rules.mk
index 7dff81e6..2f98181e 100644
--- a/arch/arm/rules.mk
+++ b/arch/arm/rules.mk
@@ -92,10 +92,8 @@ endif
 INCLUDES += \
 	-I$(LOCAL_DIR)/include
 
-BOOTOBJS += \
-	$(LOCAL_DIR)/start.o
-
 OBJS += \
+	$(LOCAL_DIR)/start.o \
 	$(LOCAL_DIR)/arch.Ao \
 	$(LOCAL_DIR)/asm.o \
 	$(LOCAL_DIR)/cache.o \
diff --git a/arch/x86/crt0.S b/arch/x86/crt0.S
index 9cc9ab0f..44b03044 100644
--- a/arch/x86/crt0.S
+++ b/arch/x86/crt0.S
@@ -37,7 +37,7 @@
 #define NUM_INT 0x31
 #define NUM_EXC 0x14
 
-.text
+.text.boot
 .global _start
 _start:
 	jmp real_start
diff --git a/arch/x86/rules.mk b/arch/x86/rules.mk
index d929cb6d..e3d62e38 100644
--- a/arch/x86/rules.mk
+++ b/arch/x86/rules.mk
@@ -3,10 +3,8 @@ LOCAL_DIR := $(GET_LOCAL_DIR)
 INCLUDES += \
 	-I$(LOCAL_DIR)/include
 
-BOOTOBJS += \
-	$(LOCAL_DIR)/crt0.o
-
 OBJS += \
+	$(LOCAL_DIR)/crt0.o \
 	$(LOCAL_DIR)/arch.o \
 	$(LOCAL_DIR)/asm.o \
 	$(LOCAL_DIR)/cache.o \
diff --git a/makefile b/makefile
index d2cd5793..ed7c53b8 100644
--- a/makefile
+++ b/makefile
@@ -48,9 +48,7 @@ LDFLAGS += -gc-sections
 # top level rule
 all:: $(OUTBIN) $(OUTELF).lst $(OUTELF).debug.lst $(OUTELF).sym $(OUTELF).size
 
-# the following three object lists are identical except for the ordering
-# which is bootobjs, kobjs, objs
-BOOTOBJS :=	
+# master object list
 OBJS :=
 
 # a linker script needs to be declared in one of the project/target/platform files