mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 13:41:31 +00:00
Merge branch 'master' of git://git.denx.de/u-boot-nios
This commit is contained in:
commit
21c76b56a4
6 changed files with 7 additions and 198 deletions
|
@ -1,61 +0,0 @@
|
||||||
/*
|
|
||||||
* (C) Copyright 2003, Psyent Corporation <www.psyent.com>
|
|
||||||
* Scott McNutt <smcnutt@psyent.com>
|
|
||||||
*
|
|
||||||
* 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-nios")
|
|
||||||
OUTPUT_ARCH(nios)
|
|
||||||
ENTRY(_start)
|
|
||||||
|
|
||||||
SECTIONS
|
|
||||||
{
|
|
||||||
.text :
|
|
||||||
{
|
|
||||||
*(.text)
|
|
||||||
}
|
|
||||||
__text_end = .;
|
|
||||||
|
|
||||||
. = ALIGN(4);
|
|
||||||
.rodata :
|
|
||||||
{
|
|
||||||
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
|
|
||||||
}
|
|
||||||
__rodata_end = .;
|
|
||||||
|
|
||||||
. = ALIGN(4);
|
|
||||||
.data :
|
|
||||||
{
|
|
||||||
*(.data)
|
|
||||||
}
|
|
||||||
. = ALIGN(4);
|
|
||||||
__data_end = .;
|
|
||||||
|
|
||||||
__bss_start = .;
|
|
||||||
. = ALIGN(4);
|
|
||||||
.bss (NOLOAD) :
|
|
||||||
{
|
|
||||||
*(.bss)
|
|
||||||
}
|
|
||||||
. = ALIGN(4);
|
|
||||||
__bss_end = .;
|
|
||||||
_end = .;
|
|
||||||
}
|
|
|
@ -1,133 +0,0 @@
|
||||||
/*
|
|
||||||
* (C) Copyright 2004, Psyent Corporation <www.psyent.com>
|
|
||||||
* Scott McNutt <smcnutt@psyent.com>
|
|
||||||
*
|
|
||||||
* 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-littlenios2")
|
|
||||||
OUTPUT_ARCH(nios2)
|
|
||||||
ENTRY(_start)
|
|
||||||
|
|
||||||
SECTIONS
|
|
||||||
{
|
|
||||||
.text :
|
|
||||||
{
|
|
||||||
*(.text)
|
|
||||||
*(.text.*)
|
|
||||||
*(.gnu.linkonce.t*)
|
|
||||||
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
|
|
||||||
*(.gnu.linkonce.r*)
|
|
||||||
}
|
|
||||||
. = ALIGN (4);
|
|
||||||
_etext = .;
|
|
||||||
PROVIDE (etext = .);
|
|
||||||
|
|
||||||
/* INIT DATA sections - "Small" data (see the gcc -G option)
|
|
||||||
* is always gp-relative. Here we make all init data sections
|
|
||||||
* adjacent to simplify the startup code -- and provide
|
|
||||||
* the global pointer for gp-relative access.
|
|
||||||
*/
|
|
||||||
_data = .;
|
|
||||||
.data :
|
|
||||||
{
|
|
||||||
*(.data)
|
|
||||||
*(.data.*)
|
|
||||||
*(.gnu.linkonce.d*)
|
|
||||||
}
|
|
||||||
|
|
||||||
. = ALIGN(16);
|
|
||||||
_gp = .; /* Global pointer addr */
|
|
||||||
PROVIDE (gp = .);
|
|
||||||
|
|
||||||
.sdata :
|
|
||||||
{
|
|
||||||
*(.sdata)
|
|
||||||
*(.sdata.*)
|
|
||||||
*(.gnu.linkonce.s.*)
|
|
||||||
}
|
|
||||||
. = ALIGN(4);
|
|
||||||
|
|
||||||
_edata = .;
|
|
||||||
PROVIDE (edata = .);
|
|
||||||
|
|
||||||
/* UNINIT DATA - Small uninitialized data is first so it's
|
|
||||||
* adjacent to sdata and can be referenced via gp. The normal
|
|
||||||
* bss follows. We keep it adjacent to simplify init code.
|
|
||||||
*/
|
|
||||||
__bss_start = .;
|
|
||||||
.sbss (NOLOAD) :
|
|
||||||
{
|
|
||||||
*(.sbss)
|
|
||||||
*(.sbss.*)
|
|
||||||
*(.gnu.linkonce.sb.*)
|
|
||||||
*(.scommon)
|
|
||||||
}
|
|
||||||
. = ALIGN(4);
|
|
||||||
.bss (NOLOAD) :
|
|
||||||
{
|
|
||||||
*(.bss)
|
|
||||||
*(.bss.*)
|
|
||||||
*(.dynbss)
|
|
||||||
*(COMMON)
|
|
||||||
*(.scommon)
|
|
||||||
}
|
|
||||||
. = ALIGN(4);
|
|
||||||
_end = .;
|
|
||||||
PROVIDE (end = .);
|
|
||||||
|
|
||||||
/* CMD TABLE - uboot command sections
|
|
||||||
*/
|
|
||||||
. = .;
|
|
||||||
__uboot_cmd_start = .;
|
|
||||||
.u_boot_cmd :
|
|
||||||
{
|
|
||||||
*(.u_boot_cmd)
|
|
||||||
}
|
|
||||||
. = ALIGN(4);
|
|
||||||
__u_boot_cmd_end = .;
|
|
||||||
|
|
||||||
/* DEBUG -- symbol table, string table, etc. etc.
|
|
||||||
*/
|
|
||||||
.stab 0 : { *(.stab) }
|
|
||||||
.stabstr 0 : { *(.stabstr) }
|
|
||||||
.stab.excl 0 : { *(.stab.excl) }
|
|
||||||
.stab.exclstr 0 : { *(.stab.exclstr) }
|
|
||||||
.stab.index 0 : { *(.stab.index) }
|
|
||||||
.stab.indexstr 0 : { *(.stab.indexstr) }
|
|
||||||
.comment 0 : { *(.comment) }
|
|
||||||
.debug 0 : { *(.debug) }
|
|
||||||
.line 0 : { *(.line) }
|
|
||||||
.debug_srcinfo 0 : { *(.debug_srcinfo) }
|
|
||||||
.debug_sfnames 0 : { *(.debug_sfnames) }
|
|
||||||
.debug_aranges 0 : { *(.debug_aranges) }
|
|
||||||
.debug_pubnames 0 : { *(.debug_pubnames) }
|
|
||||||
.debug_info 0 : { *(.debug_info) }
|
|
||||||
.debug_abbrev 0 : { *(.debug_abbrev) }
|
|
||||||
.debug_line 0 : { *(.debug_line) }
|
|
||||||
.debug_frame 0 : { *(.debug_frame) }
|
|
||||||
.debug_str 0 : { *(.debug_str) }
|
|
||||||
.debug_loc 0 : { *(.debug_loc) }
|
|
||||||
.debug_macinfo 0 : { *(.debug_macinfo) }
|
|
||||||
.debug_weaknames 0 : { *(.debug_weaknames) }
|
|
||||||
.debug_funcnames 0 : { *(.debug_funcnames) }
|
|
||||||
.debug_typenames 0 : { *(.debug_typenames) }
|
|
||||||
.debug_varnames 0 : { *(.debug_varnames) }
|
|
||||||
}
|
|
|
@ -24,6 +24,6 @@
|
||||||
|
|
||||||
CROSS_COMPILE ?= nios-elf-
|
CROSS_COMPILE ?= nios-elf-
|
||||||
|
|
||||||
STANDALONE_LOAD_ADDR = 0x00800000 -L $(gcclibdir)/m32 -T nios.lds
|
STANDALONE_LOAD_ADDR = 0x00800000 -L $(gcclibdir)/m32
|
||||||
|
|
||||||
PLATFORM_CPPFLAGS += -m32 -DCONFIG_NIOS -D__NIOS__ -ffixed-g7 -gstabs
|
PLATFORM_CPPFLAGS += -m32 -DCONFIG_NIOS -D__NIOS__ -ffixed-g7 -gstabs
|
||||||
|
|
|
@ -83,8 +83,6 @@ void board_init (void)
|
||||||
{
|
{
|
||||||
bd_t *bd;
|
bd_t *bd;
|
||||||
init_fnc_t **init_fnc_ptr;
|
init_fnc_t **init_fnc_ptr;
|
||||||
char *s, *e;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
/* Pointer is writable since we allocated a register for it.
|
/* Pointer is writable since we allocated a register for it.
|
||||||
* Nios treats CONFIG_SYS_GBL_DATA_OFFSET as an address.
|
* Nios treats CONFIG_SYS_GBL_DATA_OFFSET as an address.
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
#include <asm/byteorder.h>
|
#include <asm/byteorder.h>
|
||||||
|
#include <asm/cache.h>
|
||||||
|
|
||||||
int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
|
int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
|
||||||
{
|
{
|
||||||
|
@ -32,6 +33,10 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
|
||||||
if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
|
if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
|
/* flushes data and instruction caches before calling the kernel */
|
||||||
|
flush_dcache (0,CONFIG_SYS_DCACHE_SIZE);
|
||||||
|
flush_icache (0,CONFIG_SYS_ICACHE_SIZE);
|
||||||
|
|
||||||
/* For now we assume the Microtronix linux ... which only
|
/* For now we assume the Microtronix linux ... which only
|
||||||
* needs to be called ;-)
|
* needs to be called ;-)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
CROSS_COMPILE ?= nios2-elf-
|
CROSS_COMPILE ?= nios2-elf-
|
||||||
|
|
||||||
STANDALONE_LOAD_ADDR = 0x02000000 -L $(gcclibdir) -T nios2.lds
|
STANDALONE_LOAD_ADDR = 0x02000000 -L $(gcclibdir)
|
||||||
|
|
||||||
PLATFORM_CPPFLAGS += -DCONFIG_NIOS2 -D__NIOS2__
|
PLATFORM_CPPFLAGS += -DCONFIG_NIOS2 -D__NIOS2__
|
||||||
PLATFORM_CPPFLAGS += -ffixed-r15 -G0
|
PLATFORM_CPPFLAGS += -ffixed-r15 -G0
|
||||||
|
|
Loading…
Add table
Reference in a new issue