From c749f83060d06ec2e29d78c241b3bb2ffebac707 Mon Sep 17 00:00:00 2001
From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Fri, 24 May 2013 00:30:24 +0200
Subject: [PATCH] felboot: Reduce to only a linkerscript + stubs to compensate
 for general SPL config

The stubs is only needed because we are using objects from a full
SPL build. Even these will go away when felboot is integrated in
u-boot, reducing it to only a link script and config changes.
---
 felboot/fel-boot.ld | 4 ++--
 felboot/main.c      | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/felboot/fel-boot.ld b/felboot/fel-boot.ld
index cf1419ff77..cf0230004e 100644
--- a/felboot/fel-boot.ld
+++ b/felboot/fel-boot.ld
@@ -1,13 +1,13 @@
 OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
-ENTRY(_start)
+ENTRY(s_init)
 SECTIONS
 {
  . = 0x00002000;
  . = ALIGN(4);
  .text :
  {
-  main.o (.text.start)
+  *(.text.s_init)
   *(.text*)
  }
  . = ALIGN(4);
diff --git a/felboot/main.c b/felboot/main.c
index 43d2d4e10f..fb3256aedf 100644
--- a/felboot/main.c
+++ b/felboot/main.c
@@ -18,12 +18,6 @@
  */
 
 #include <common.h>
-#include <version.h>
-
-__attribute__ ((section (".text.start"))) void _start(void)
-{
-	s_init();
-}
 
 int sunxi_mmc_init(void)
 {