mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
Merge branch 'master' of git://git.denx.de/u-boot-mips
This commit is contained in:
Tom Rini
commit
38cd8c4253
10 changed files with 45 additions and 330 deletions
|
|
@ -136,10 +136,11 @@ reset:
|
|||
|
||||
/* Set up temporary stack */
|
||||
li sp, CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_INIT_SP_OFFSET
|
||||
move fp, sp
|
||||
|
||||
la t9, board_init_f
|
||||
jr t9
|
||||
nop
|
||||
move ra, zero
|
||||
|
||||
/*
|
||||
* void relocate_code (addr_sp, gd, addr_moni)
|
||||
|
|
@ -155,6 +156,7 @@ reset:
|
|||
.ent relocate_code
|
||||
relocate_code:
|
||||
move sp, a0 # set new stack pointer
|
||||
move fp, sp
|
||||
|
||||
move s0, a1 # save gd in s0
|
||||
move s2, a2 # save destination address in s2
|
||||
|
|
@ -260,8 +262,9 @@ in_ram:
|
|||
addi t1, 4
|
||||
|
||||
move a0, s0 # a0 <-- gd
|
||||
move a1, s2
|
||||
la t9, board_init_r
|
||||
jr t9
|
||||
move a1, s2
|
||||
move ra, zero
|
||||
|
||||
.end relocate_code
|
||||
|
|
|
|||
|
|
@ -130,10 +130,11 @@ reset:
|
|||
|
||||
/* Set up temporary stack */
|
||||
dli sp, CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_INIT_SP_OFFSET
|
||||
move fp, sp
|
||||
|
||||
dla t9, board_init_f
|
||||
jr t9
|
||||
nop
|
||||
move ra, zero
|
||||
|
||||
/*
|
||||
* void relocate_code (addr_sp, gd, addr_moni)
|
||||
|
|
@ -149,6 +150,7 @@ reset:
|
|||
.ent relocate_code
|
||||
relocate_code:
|
||||
move sp, a0 # set new stack pointer
|
||||
move fp, sp
|
||||
|
||||
move s0, a1 # save gd in s0
|
||||
move s2, a2 # save destination address in s2
|
||||
|
|
@ -254,8 +256,9 @@ in_ram:
|
|||
daddi t1, 8
|
||||
|
||||
move a0, s0 # a0 <-- gd
|
||||
move a1, s2
|
||||
dla t9, board_init_r
|
||||
jr t9
|
||||
move a1, s2
|
||||
move ra, zero
|
||||
|
||||
.end relocate_code
|
||||
|
|
|
|||
|
|
@ -5,9 +5,6 @@
|
|||
# SPDX-License-Identifier: GPL-2.0+
|
||||
#
|
||||
|
||||
ifndef CONFIG_SYS_GENERIC_BOARD
|
||||
obj-y += board.o
|
||||
endif
|
||||
obj-y += io.o
|
||||
|
||||
obj-$(CONFIG_CMD_BOOTM) += bootm.o
|
||||
|
|
|
|||
|
|
@ -1,320 +0,0 @@
|
|||
/*
|
||||
* (C) Copyright 2003
|
||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <command.h>
|
||||
#include <malloc.h>
|
||||
#include <serial.h>
|
||||
#include <stdio_dev.h>
|
||||
#include <version.h>
|
||||
#include <net.h>
|
||||
#include <environment.h>
|
||||
#include <nand.h>
|
||||
#include <onenand_uboot.h>
|
||||
#include <spi.h>
|
||||
|
||||
#ifdef CONFIG_BITBANGMII
|
||||
#include <miiphy.h>
|
||||
#endif
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
ulong monitor_flash_len;
|
||||
|
||||
static char *failed = "*** failed ***\n";
|
||||
|
||||
int __board_early_init_f(void)
|
||||
{
|
||||
/*
|
||||
* Nothing to do in this dummy implementation
|
||||
*/
|
||||
return 0;
|
||||
}
|
||||
int board_early_init_f(void)
|
||||
__attribute__((weak, alias("__board_early_init_f")));
|
||||
|
||||
static int init_func_ram(void)
|
||||
{
|
||||
#ifdef CONFIG_BOARD_TYPES
|
||||
int board_type = gd->board_type;
|
||||
#else
|
||||
int board_type = 0; /* use dummy arg */
|
||||
#endif
|
||||
puts("DRAM: ");
|
||||
|
||||
gd->ram_size = initdram(board_type);
|
||||
if (gd->ram_size > 0) {
|
||||
print_size(gd->ram_size, "\n");
|
||||
return 0;
|
||||
}
|
||||
puts(failed);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int display_banner(void)
|
||||
{
|
||||
|
||||
printf("\n\n%s\n\n", version_string);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
static void display_flash_config(ulong size)
|
||||
{
|
||||
puts("Flash: ");
|
||||
print_size(size, "\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
static int init_baudrate(void)
|
||||
{
|
||||
gd->baudrate = getenv_ulong("baudrate", 10, CONFIG_BAUDRATE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Breath some life into the board...
|
||||
*
|
||||
* The first part of initialization is running from Flash memory;
|
||||
* its main purpose is to initialize the RAM so that we
|
||||
* can relocate the monitor code to RAM.
|
||||
*/
|
||||
|
||||
/*
|
||||
* All attempts to come up with a "common" initialization sequence
|
||||
* that works for all boards and architectures failed: some of the
|
||||
* requirements are just _too_ different. To get rid of the resulting
|
||||
* mess of board dependend #ifdef'ed code we now make the whole
|
||||
* initialization sequence configurable to the user.
|
||||
*
|
||||
* The requirements for any new initalization function is simple: it
|
||||
* receives a pointer to the "global data" structure as it's only
|
||||
* argument, and returns an integer return code, where 0 means
|
||||
* "continue" and != 0 means "fatal error, hang the system".
|
||||
*/
|
||||
typedef int (init_fnc_t)(void);
|
||||
|
||||
init_fnc_t *init_sequence[] = {
|
||||
board_early_init_f,
|
||||
timer_init,
|
||||
env_init, /* initialize environment */
|
||||
init_baudrate, /* initialize baudrate settings */
|
||||
serial_init, /* serial communications setup */
|
||||
console_init_f,
|
||||
display_banner, /* say that we are here */
|
||||
checkboard,
|
||||
init_func_ram,
|
||||
NULL,
|
||||
};
|
||||
|
||||
|
||||
void board_init_f(ulong bootflag)
|
||||
{
|
||||
gd_t gd_data, *id;
|
||||
bd_t *bd;
|
||||
init_fnc_t **init_fnc_ptr;
|
||||
ulong addr, addr_sp, len;
|
||||
ulong *s;
|
||||
|
||||
/* Pointer is writable since we allocated a register for it.
|
||||
*/
|
||||
gd = &gd_data;
|
||||
/* compiler optimization barrier needed for GCC >= 3.4 */
|
||||
__asm__ __volatile__("" : : : "memory");
|
||||
|
||||
memset((void *)gd, 0, sizeof(gd_t));
|
||||
|
||||
for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
|
||||
if ((*init_fnc_ptr)() != 0)
|
||||
hang();
|
||||
}
|
||||
|
||||
/*
|
||||
* Now that we have DRAM mapped and working, we can
|
||||
* relocate the code and continue running from DRAM.
|
||||
*/
|
||||
addr = CONFIG_SYS_SDRAM_BASE + gd->ram_size;
|
||||
|
||||
/* We can reserve some RAM "on top" here.
|
||||
*/
|
||||
|
||||
/* round down to next 4 kB limit.
|
||||
*/
|
||||
addr &= ~(4096 - 1);
|
||||
debug("Top of RAM usable for U-Boot at: %08lx\n", addr);
|
||||
|
||||
/* Reserve memory for U-Boot code, data & bss
|
||||
* round down to next 16 kB limit
|
||||
*/
|
||||
len = bss_end() - CONFIG_SYS_MONITOR_BASE;
|
||||
addr -= len;
|
||||
addr &= ~(16 * 1024 - 1);
|
||||
|
||||
debug("Reserving %ldk for U-Boot at: %08lx\n", len >> 10, addr);
|
||||
|
||||
/* Reserve memory for malloc() arena.
|
||||
*/
|
||||
addr_sp = addr - TOTAL_MALLOC_LEN;
|
||||
debug("Reserving %dk for malloc() at: %08lx\n",
|
||||
TOTAL_MALLOC_LEN >> 10, addr_sp);
|
||||
|
||||
/*
|
||||
* (permanently) allocate a Board Info struct
|
||||
* and a permanent copy of the "global" data
|
||||
*/
|
||||
addr_sp -= sizeof(bd_t);
|
||||
bd = (bd_t *)addr_sp;
|
||||
gd->bd = bd;
|
||||
debug("Reserving %zu Bytes for Board Info at: %08lx\n",
|
||||
sizeof(bd_t), addr_sp);
|
||||
|
||||
addr_sp -= sizeof(gd_t);
|
||||
id = (gd_t *)addr_sp;
|
||||
debug("Reserving %zu Bytes for Global Data at: %08lx\n",
|
||||
sizeof(gd_t), addr_sp);
|
||||
|
||||
/* Reserve memory for boot params.
|
||||
*/
|
||||
addr_sp -= CONFIG_SYS_BOOTPARAMS_LEN;
|
||||
bd->bi_boot_params = addr_sp;
|
||||
debug("Reserving %dk for boot params() at: %08lx\n",
|
||||
CONFIG_SYS_BOOTPARAMS_LEN >> 10, addr_sp);
|
||||
|
||||
/*
|
||||
* Finally, we set up a new (bigger) stack.
|
||||
*
|
||||
* Leave some safety gap for SP, force alignment on 16 byte boundary
|
||||
* Clear initial stack frame
|
||||
*/
|
||||
addr_sp -= 16;
|
||||
addr_sp &= ~0xF;
|
||||
s = (ulong *)addr_sp;
|
||||
*s-- = 0;
|
||||
*s-- = 0;
|
||||
addr_sp = (ulong)s;
|
||||
debug("Stack Pointer at: %08lx\n", addr_sp);
|
||||
|
||||
/*
|
||||
* Save local variables to board info struct
|
||||
*/
|
||||
bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; /* start of DRAM */
|
||||
bd->bi_memsize = gd->ram_size; /* size of DRAM in bytes */
|
||||
|
||||
memcpy(id, (void *)gd, sizeof(gd_t));
|
||||
|
||||
relocate_code(addr_sp, id, addr);
|
||||
|
||||
/* NOTREACHED - relocate_code() does not return */
|
||||
}
|
||||
|
||||
/*
|
||||
* This is the next part if the initialization sequence: we are now
|
||||
* running from RAM and have a "normal" C environment, i. e. global
|
||||
* data can be written, BSS has been cleared, the stack size in not
|
||||
* that critical any more, etc.
|
||||
*/
|
||||
|
||||
void board_init_r(gd_t *id, ulong dest_addr)
|
||||
{
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
ulong size;
|
||||
#endif
|
||||
bd_t *bd;
|
||||
|
||||
gd = id;
|
||||
gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */
|
||||
|
||||
debug("Now running in RAM - U-Boot at: %08lx\n", dest_addr);
|
||||
|
||||
gd->reloc_off = dest_addr - CONFIG_SYS_MONITOR_BASE;
|
||||
|
||||
monitor_flash_len = image_copy_end() - dest_addr;
|
||||
|
||||
serial_initialize();
|
||||
|
||||
bd = gd->bd;
|
||||
|
||||
/* The Malloc area is immediately below the monitor copy in DRAM */
|
||||
mem_malloc_init(CONFIG_SYS_MONITOR_BASE + gd->reloc_off -
|
||||
TOTAL_MALLOC_LEN, TOTAL_MALLOC_LEN);
|
||||
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
/* configure available FLASH banks */
|
||||
size = flash_init();
|
||||
display_flash_config(size);
|
||||
bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
|
||||
bd->bi_flashsize = size;
|
||||
|
||||
#if CONFIG_SYS_MONITOR_BASE == CONFIG_SYS_FLASH_BASE
|
||||
bd->bi_flashoffset = monitor_flash_len; /* reserved area for U-Boot */
|
||||
#else
|
||||
bd->bi_flashoffset = 0;
|
||||
#endif
|
||||
#else
|
||||
bd->bi_flashstart = 0;
|
||||
bd->bi_flashsize = 0;
|
||||
bd->bi_flashoffset = 0;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
puts("NAND: ");
|
||||
nand_init(); /* go init the NAND */
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_CMD_ONENAND)
|
||||
onenand_init();
|
||||
#endif
|
||||
|
||||
/* relocate environment function pointers etc. */
|
||||
env_relocate();
|
||||
|
||||
#if defined(CONFIG_PCI)
|
||||
/*
|
||||
* Do pci configuration
|
||||
*/
|
||||
pci_init();
|
||||
#endif
|
||||
|
||||
/** leave this here (after malloc(), environment and PCI are working) **/
|
||||
/* Initialize stdio devices */
|
||||
stdio_init();
|
||||
|
||||
jumptable_init();
|
||||
|
||||
/* Initialize the console (after the relocation and devices init) */
|
||||
console_init_r();
|
||||
/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
|
||||
|
||||
/* Initialize from environment */
|
||||
load_addr = getenv_ulong("loadaddr", 16, load_addr);
|
||||
|
||||
#ifdef CONFIG_CMD_SPI
|
||||
puts("SPI: ");
|
||||
spi_init(); /* go init the SPI */
|
||||
puts("ready\n");
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_MISC_INIT_R)
|
||||
/* miscellaneous platform dependent initialisations */
|
||||
misc_init_r();
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_BITBANGMII
|
||||
bb_miiphy_init();
|
||||
#endif
|
||||
#if defined(CONFIG_CMD_NET)
|
||||
puts("Net: ");
|
||||
eth_initialize(gd->bd);
|
||||
#endif
|
||||
|
||||
/* main_loop() can return to retry autoboot, if so just run it again. */
|
||||
for (;;)
|
||||
main_loop();
|
||||
|
||||
/* NOTREACHED - no way out of command loop except booting */
|
||||
}
|
||||
|
|
@ -6,10 +6,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <command.h>
|
||||
#include <image.h>
|
||||
#include <u-boot/zlib.h>
|
||||
#include <asm/byteorder.h>
|
||||
#include <asm/addrspace.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
|
@ -52,6 +49,20 @@ void arch_lmb_reserve(struct lmb *lmb)
|
|||
lmb_reserve(lmb, sp, CONFIG_SYS_SDRAM_BASE + gd->ram_size - sp);
|
||||
}
|
||||
|
||||
static int boot_setup_linux(bootm_headers_t *images)
|
||||
{
|
||||
int ret;
|
||||
ulong rd_len;
|
||||
|
||||
rd_len = images->rd_end - images->rd_start;
|
||||
ret = boot_ramdisk_high(&images->lmb, images->rd_start,
|
||||
rd_len, &images->initrd_start, &images->initrd_end);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void linux_cmdline_init(void)
|
||||
{
|
||||
linux_argc = 1;
|
||||
|
|
@ -224,6 +235,8 @@ static void boot_jump_linux(bootm_headers_t *images)
|
|||
int do_bootm_linux(int flag, int argc, char * const argv[],
|
||||
bootm_headers_t *images)
|
||||
{
|
||||
int ret;
|
||||
|
||||
/* No need for those on MIPS */
|
||||
if (flag & BOOTM_STATE_OS_BD_T)
|
||||
return -1;
|
||||
|
|
@ -243,6 +256,10 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
|
|||
return 0;
|
||||
}
|
||||
|
||||
ret = boot_setup_linux(images);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
boot_cmdline_linux(images);
|
||||
boot_prep_linux(images);
|
||||
boot_jump_linux(images);
|
||||
|
|
|
|||
|
|
@ -15,6 +15,9 @@
|
|||
#define CONFIG_DBAU1X00 1
|
||||
#define CONFIG_SOC_AU1X00 1 /* alchemy series cpu */
|
||||
|
||||
#define CONFIG_SYS_GENERIC_BOARD
|
||||
#define CONFIG_DISPLAY_BOARDINFO
|
||||
|
||||
#ifdef CONFIG_DBAU1000
|
||||
/* Also known as Merlot */
|
||||
#define CONFIG_SOC_AU1000 1
|
||||
|
|
|
|||
|
|
@ -15,6 +15,9 @@
|
|||
#define CONFIG_PB1X00 1
|
||||
#define CONFIG_SOC_AU1X00 1 /* alchemy series cpu */
|
||||
|
||||
#define CONFIG_SYS_GENERIC_BOARD
|
||||
#define CONFIG_DISPLAY_BOARDINFO
|
||||
|
||||
#ifdef CONFIG_PB1000
|
||||
#define CONFIG_SOC_AU1000 1
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -13,6 +13,9 @@
|
|||
#define __CONFIG_H
|
||||
|
||||
#define CONFIG_QEMU_MIPS
|
||||
|
||||
#define CONFIG_SYS_GENERIC_BOARD
|
||||
#define CONFIG_DISPLAY_BOARDINFO
|
||||
#define CONFIG_MISC_INIT_R
|
||||
|
||||
#define CONFIG_BOOTDELAY 10 /* autoboot after 10 seconds */
|
||||
|
|
|
|||
|
|
@ -13,6 +13,9 @@
|
|||
#define __CONFIG_H
|
||||
|
||||
#define CONFIG_QEMU_MIPS
|
||||
|
||||
#define CONFIG_SYS_GENERIC_BOARD
|
||||
#define CONFIG_DISPLAY_BOARDINFO
|
||||
#define CONFIG_MISC_INIT_R
|
||||
|
||||
#define CONFIG_BOOTDELAY 10 /* autoboot after 10 seconds */
|
||||
|
|
|
|||
|
|
@ -25,6 +25,9 @@
|
|||
#ifndef __CONFIG_H
|
||||
#define __CONFIG_H
|
||||
|
||||
#define CONFIG_SYS_GENERIC_BOARD
|
||||
#define CONFIG_DISPLAY_BOARDINFO
|
||||
|
||||
#define CPU_CLOCK_RATE 324000000 /* Clock for the MIPS core */
|
||||
#define CONFIG_SYS_MIPS_TIMER_FREQ (CPU_CLOCK_RATE / 2)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue