Patchwork [U-Boot,v2,1/2] Vexpress build errors

login
register
mail settings
Submitter matt.waddel@linaro.org
Date Dec. 2, 2010, 7:43 p.m.
Message ID <1291318994-31573-1-git-send-email-matt.waddel@linaro.org>
Download mbox | patch
Permalink /patch/74016/
State Accepted
Commit 7d38f8747466abb427b8cac8e7a2f9687cd97294
Headers show

Comments

matt.waddel@linaro.org - Dec. 2, 2010, 7:43 p.m.
From: Matt Waddel <matt.waddel@linaro.org>

This patch fixes build errors in the vexpress system:
  - Removed sys_proto.h requirement from syslib.c.
  - Switched vexpress to the default armv7 linker script.
  - Renamed TEXT_BASE to CONFIG_SYS_TEXT_BASE.


Signed-off-by: Matt Waddel <matt.waddel@linaro.org>
---
Change log v2:
Removed the new arch/arm/include/asm/arch-armv7/sys_proto.h file.

 arch/arm/cpu/armv7/syslib.c      |    1 -
 board/armltd/vexpress/config.mk  |    3 +-
 board/armltd/vexpress/u-boot.lds |   65 --------------------------------------
 3 files changed, 1 insertions(+), 68 deletions(-)
 delete mode 100644 board/armltd/vexpress/u-boot.lds
Wolfgang Denk - Dec. 8, 2010, 10:43 p.m.
Dear matt.waddel@linaro.org,

In message <1291318994-31573-1-git-send-email-matt.waddel@linaro.org> you wrote:
> From: Matt Waddel <matt.waddel@linaro.org>
> 
> This patch fixes build errors in the vexpress system:
>   - Removed sys_proto.h requirement from syslib.c.
>   - Switched vexpress to the default armv7 linker script.
>   - Renamed TEXT_BASE to CONFIG_SYS_TEXT_BASE.
> 
> 
> Signed-off-by: Matt Waddel <matt.waddel@linaro.org>
> ---
> Change log v2:
> Removed the new arch/arm/include/asm/arch-armv7/sys_proto.h file.
> 
>  arch/arm/cpu/armv7/syslib.c      |    1 -
>  board/armltd/vexpress/config.mk  |    3 +-
>  board/armltd/vexpress/u-boot.lds |   65 --------------------------------------
>  3 files changed, 1 insertions(+), 68 deletions(-)
>  delete mode 100644 board/armltd/vexpress/u-boot.lds

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/arch/arm/cpu/armv7/syslib.c b/arch/arm/cpu/armv7/syslib.c
index f9ed9a3..84d17f0 100644
--- a/arch/arm/cpu/armv7/syslib.c
+++ b/arch/arm/cpu/armv7/syslib.c
@@ -23,7 +23,6 @@ 
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/sys_proto.h>
 
 /************************************************************
  * sdelay() - simple spin loop.  Will be constant time as
diff --git a/board/armltd/vexpress/config.mk b/board/armltd/vexpress/config.mk
index 2d797d7..36395f2 100644
--- a/board/armltd/vexpress/config.mk
+++ b/board/armltd/vexpress/config.mk
@@ -19,5 +19,4 @@ 
 #
 # Linux-Kernel is expected to be at 0x60008000
 #
-TEXT_BASE = 0x60800000
-LDSCRIPT := $(SRCTREE)/board/armltd/vexpress/u-boot.lds
+CONFIG_SYS_TEXT_BASE = 0x60800000
diff --git a/board/armltd/vexpress/u-boot.lds b/board/armltd/vexpress/u-boot.lds
deleted file mode 100644
index 5ac62f2..0000000
--- a/board/armltd/vexpress/u-boot.lds
+++ /dev/null
@@ -1,65 +0,0 @@ 
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(_start)
-SECTIONS
-{
-	. = 0x00000000;
-	. = ALIGN(4);
-	.text	:
-	{
-		arch/arm/cpu/armv7/start.o	(.text)
-		*(.text)
-	}
-
-	. = ALIGN(4);
-	.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata))) }
-
-	. = ALIGN(4);
-	.data : { *(.data)
-	__datarel_start = .;
-		*(.data.rel)
-	__datarelrolocal_start = .;
-		*(.data.rel.ro.local)
-	__datarellocal_start = .;
-		*(.data.rel.local)
-	__datarelro_start = .;
-		*(.data.rel.ro)
-	}
-
-	__got_start = .;
-	. = ALIGN(4);
-	.got : { *(.got) }
-	__got_end = .;
-
-	. = .;
-	__u_boot_cmd_start = .;
-	.u_boot_cmd : { *(.u_boot_cmd) }
-	__u_boot_cmd_end = .;
-
-	. = ALIGN(4);
-	__bss_start = .;
-	.bss : { *(.bss) }
-	_end = .;
-}