mirror of
https://github.com/u-boot/u-boot.git
synced 2025-01-18 16:53:24 +08:00
ARMV7: Vexpress: fix build errors
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>
This commit is contained in:
parent
b097b9282c
commit
7d38f87474
@ -23,7 +23,6 @@
|
|||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/sys_proto.h>
|
|
||||||
|
|
||||||
/************************************************************
|
/************************************************************
|
||||||
* sdelay() - simple spin loop. Will be constant time as
|
* sdelay() - simple spin loop. Will be constant time as
|
||||||
|
@ -19,5 +19,4 @@
|
|||||||
#
|
#
|
||||||
# Linux-Kernel is expected to be at 0x60008000
|
# Linux-Kernel is expected to be at 0x60008000
|
||||||
#
|
#
|
||||||
TEXT_BASE = 0x60800000
|
CONFIG_SYS_TEXT_BASE = 0x60800000
|
||||||
LDSCRIPT := $(SRCTREE)/board/armltd/vexpress/u-boot.lds
|
|
||||||
|
@ -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 = .;
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user