mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-16 04:01:31 +00:00
sandbox: Switch over to generic board
Add generic board support for sandbox. and remove the old board init code. Select CONFIG_SYS_GENERIC_BOARD for sandbox now that this is supported. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@ti.com>
This commit is contained in:
parent
781adb5710
commit
a733b06b69
11 changed files with 66 additions and 324 deletions
|
@ -18,5 +18,8 @@
|
|||
# MA 02111-1307 USA
|
||||
|
||||
PLATFORM_CPPFLAGS += -DCONFIG_SANDBOX -D__SANDBOX__ -U_FORTIFY_SOURCE
|
||||
PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM
|
||||
PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM -DCONFIG_SYS_GENERIC_BOARD
|
||||
PLATFORM_LIBS += -lrt
|
||||
|
||||
# Support generic board on sandbox
|
||||
__HAVE_ARCH_GENERIC_BOARD := y
|
||||
|
|
|
@ -20,6 +20,9 @@
|
|||
* MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef __SANDBOX_ASM_IO_H
|
||||
#define __SANDBOX_ASM_IO_H
|
||||
|
||||
/*
|
||||
* Given a physical address and a length, return a virtual address
|
||||
* that can be used to access the memory range with the caching
|
||||
|
@ -52,3 +55,5 @@ static inline void unmap_sysmem(const void *vaddr)
|
|||
|
||||
/* Map from a pointer to our RAM buffer */
|
||||
phys_addr_t map_to_sysmem(void *ptr);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -36,26 +36,8 @@
|
|||
#ifndef _U_BOOT_H_
|
||||
#define _U_BOOT_H_ 1
|
||||
|
||||
typedef struct bd_info {
|
||||
unsigned long bi_memstart; /* start of DRAM memory */
|
||||
phys_size_t bi_memsize; /* size of DRAM memory in bytes */
|
||||
unsigned long bi_flashstart; /* start of FLASH memory */
|
||||
unsigned long bi_flashsize; /* size of FLASH memory */
|
||||
unsigned long bi_flashoffset; /* reserved area for startup monitor */
|
||||
unsigned long bi_sramstart; /* start of SRAM memory */
|
||||
unsigned long bi_sramsize; /* size of SRAM memory */
|
||||
unsigned long bi_bootflags; /* boot / reboot flag (for LynxOS) */
|
||||
unsigned short bi_ethspeed; /* Ethernet speed in Mbps */
|
||||
unsigned long bi_intfreq; /* Internal Freq, in MHz */
|
||||
unsigned long bi_busfreq; /* Bus Freq, in MHz */
|
||||
unsigned int bi_baudrate; /* Console Baudrate */
|
||||
unsigned long bi_boot_params; /* where this board expects params */
|
||||
struct /* RAM configuration */
|
||||
{
|
||||
ulong start;
|
||||
ulong size;
|
||||
} bi_dram[CONFIG_NR_DRAM_BANKS];
|
||||
} bd_t;
|
||||
/* Use the generic board which requires a unified bd_info */
|
||||
#include <asm-generic/u-boot.h>
|
||||
|
||||
/* For image.h:image_check_target_arch() */
|
||||
#define IH_ARCH_DEFAULT IH_ARCH_SANDBOX
|
||||
|
|
|
@ -27,7 +27,6 @@ include $(TOPDIR)/config.mk
|
|||
|
||||
LIB = $(obj)lib$(ARCH).o
|
||||
|
||||
COBJS-y += board.o
|
||||
COBJS-y += interrupts.o
|
||||
|
||||
SRCS := $(COBJS-y:.o=.c)
|
||||
|
|
|
@ -1,285 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2011 The Chromium OS Authors.
|
||||
*
|
||||
* (C) Copyright 2002-2006
|
||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
||||
*
|
||||
* (C) Copyright 2002
|
||||
* Sysgo Real-Time Solutions, GmbH <www.elinos.com>
|
||||
* Marius Groeger <mgroeger@sysgo.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
|
||||
*/
|
||||
|
||||
/*
|
||||
* This file was taken from ARM and changed to remove things we don't
|
||||
* need. This is most of it, so have tried to avoid being over-zealous!
|
||||
* For example, we want to have an emulation of the 'DRAM' used by
|
||||
* U-Boot.
|
||||
*
|
||||
* has been talk upstream of unifying the architectures w.r.t board.c,
|
||||
* so the less change here the better.
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <command.h>
|
||||
#include <malloc.h>
|
||||
#include <stdio_dev.h>
|
||||
#include <timestamp.h>
|
||||
#include <version.h>
|
||||
#include <serial.h>
|
||||
|
||||
#include <os.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
static gd_t gd_mem;
|
||||
|
||||
/************************************************************************
|
||||
* Init Utilities *
|
||||
************************************************************************
|
||||
* Some of this code should be moved into the core functions,
|
||||
* or dropped completely,
|
||||
* but let's get it working (again) first...
|
||||
*/
|
||||
|
||||
static int display_banner(void)
|
||||
{
|
||||
display_options();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Configure and report on the DRAM configuration, which in our case is
|
||||
* fairly simple.
|
||||
*/
|
||||
static int display_dram_config(void)
|
||||
{
|
||||
ulong size = 0;
|
||||
int i;
|
||||
|
||||
debug("RAM Configuration:\n");
|
||||
|
||||
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
|
||||
#ifdef DEBUG
|
||||
printf("Bank #%d: %08lx ", i, gd->bd->bi_dram[i].start);
|
||||
print_size(gd->bd->bi_dram[i].size, "\n");
|
||||
#endif
|
||||
size += gd->bd->bi_dram[i].size;
|
||||
}
|
||||
puts("DRAM: ");
|
||||
print_size(size, "\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Breathe some life into the board...
|
||||
*
|
||||
* Initialize a serial port as console, and carry out some hardware
|
||||
* tests.
|
||||
*
|
||||
* 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 dependent #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);
|
||||
|
||||
void __dram_init_banksize(void)
|
||||
{
|
||||
gd->bd->bi_dram[0].start = 0;
|
||||
gd->bd->bi_dram[0].size = gd->ram_size;
|
||||
}
|
||||
|
||||
void dram_init_banksize(void)
|
||||
__attribute__((weak, alias("__dram_init_banksize")));
|
||||
|
||||
init_fnc_t *init_sequence[] = {
|
||||
#if defined(CONFIG_ARCH_CPU_INIT)
|
||||
arch_cpu_init, /* basic arch cpu dependent setup */
|
||||
#endif
|
||||
#if defined(CONFIG_BOARD_EARLY_INIT_F)
|
||||
board_early_init_f,
|
||||
#endif
|
||||
timer_init, /* initialize timer */
|
||||
env_init, /* initialize environment */
|
||||
serial_init, /* serial communications setup */
|
||||
console_init_f, /* stage 1 init of console */
|
||||
sandbox_early_getopt_check, /* process command line flags (err/help) */
|
||||
display_banner, /* say that we are here */
|
||||
#if defined(CONFIG_DISPLAY_CPUINFO)
|
||||
print_cpuinfo, /* display cpu info (and speed) */
|
||||
#endif
|
||||
#if defined(CONFIG_DISPLAY_BOARDINFO)
|
||||
checkboard, /* display board info */
|
||||
#endif
|
||||
dram_init, /* configure available RAM banks */
|
||||
NULL,
|
||||
};
|
||||
|
||||
void board_init_f(ulong bootflag)
|
||||
{
|
||||
init_fnc_t **init_fnc_ptr;
|
||||
uchar *mem;
|
||||
unsigned long addr_sp, addr, size;
|
||||
|
||||
gd = &gd_mem;
|
||||
assert(gd);
|
||||
|
||||
memset((void *)gd, 0, sizeof(gd_t));
|
||||
|
||||
#if defined(CONFIG_OF_EMBED)
|
||||
/* Get a pointer to the FDT */
|
||||
gd->fdt_blob = _binary_dt_dtb_start;
|
||||
#elif defined(CONFIG_OF_SEPARATE)
|
||||
/* FDT is at end of image */
|
||||
gd->fdt_blob = (void *)(_end_ofs + _TEXT_BASE);
|
||||
#endif
|
||||
|
||||
for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
|
||||
if ((*init_fnc_ptr)() != 0)
|
||||
hang();
|
||||
}
|
||||
|
||||
size = CONFIG_SYS_SDRAM_SIZE;
|
||||
mem = os_malloc(CONFIG_SYS_SDRAM_SIZE);
|
||||
|
||||
assert(mem);
|
||||
gd->arch.ram_buf = mem;
|
||||
addr = (ulong)(mem + size);
|
||||
|
||||
/*
|
||||
* 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);
|
||||
gd->bd = (bd_t *) addr_sp;
|
||||
debug("Reserving %zu Bytes for Board Info at: %08lx\n",
|
||||
sizeof(bd_t), addr_sp);
|
||||
|
||||
/* Ram ist board specific, so move it to board code ... */
|
||||
dram_init_banksize();
|
||||
display_dram_config(); /* and display it */
|
||||
|
||||
/* We don't relocate, so just run the post-relocation code */
|
||||
board_init_r(NULL, 0);
|
||||
|
||||
/* NOTREACHED - no way out of command loop except booting */
|
||||
}
|
||||
|
||||
/************************************************************************
|
||||
*
|
||||
* 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)
|
||||
{
|
||||
|
||||
if (id)
|
||||
gd = id;
|
||||
|
||||
gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */
|
||||
|
||||
serial_initialize();
|
||||
|
||||
#ifdef CONFIG_POST
|
||||
post_output_backlog();
|
||||
#endif
|
||||
|
||||
/* The Malloc area is at the top of simulated DRAM */
|
||||
mem_malloc_init((ulong)gd->arch.ram_buf + gd->ram_size -
|
||||
TOTAL_MALLOC_LEN, TOTAL_MALLOC_LEN);
|
||||
|
||||
/* initialize environment */
|
||||
env_relocate();
|
||||
|
||||
stdio_init(); /* get the devices list going. */
|
||||
|
||||
jumptable_init();
|
||||
|
||||
console_init_r(); /* fully init console as a device */
|
||||
|
||||
#if defined(CONFIG_DISPLAY_BOARDINFO_LATE)
|
||||
checkboard();
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_ARCH_MISC_INIT)
|
||||
/* miscellaneous arch dependent initialisations */
|
||||
arch_misc_init();
|
||||
#endif
|
||||
#if defined(CONFIG_MISC_INIT_R)
|
||||
/* miscellaneous platform dependent initialisations */
|
||||
misc_init_r();
|
||||
#endif
|
||||
|
||||
/* set up exceptions */
|
||||
interrupt_init();
|
||||
/* enable exceptions */
|
||||
enable_interrupts();
|
||||
|
||||
#ifdef CONFIG_BOARD_LATE_INIT
|
||||
board_late_init();
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_POST
|
||||
post_run(NULL, POST_RAM | post_bootmode_get(0));
|
||||
#endif
|
||||
|
||||
sandbox_main_loop_init();
|
||||
|
||||
/*
|
||||
* For now, run the main loop. Later we might let this be done
|
||||
* in the main program.
|
||||
*/
|
||||
while (1)
|
||||
main_loop();
|
||||
|
||||
/* NOTREACHED - no way out of command loop except booting */
|
||||
}
|
||||
|
||||
void hang(void)
|
||||
{
|
||||
puts("### ERROR ### Please RESET the board ###\n");
|
||||
for (;;)
|
||||
;
|
||||
}
|
|
@ -56,6 +56,6 @@ int timer_init(void)
|
|||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = CONFIG_DRAM_SIZE;
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -49,9 +49,11 @@
|
|||
#include <mpc5xxx.h>
|
||||
#endif
|
||||
|
||||
#include <os.h>
|
||||
#include <post.h>
|
||||
#include <spi.h>
|
||||
#include <watchdog.h>
|
||||
#include <asm/errno.h>
|
||||
#include <asm/io.h>
|
||||
#ifdef CONFIG_MP
|
||||
#include <asm/mp.h>
|
||||
|
@ -61,6 +63,9 @@
|
|||
#include <asm/init_helpers.h>
|
||||
#include <asm/relocate.h>
|
||||
#endif
|
||||
#ifdef CONFIG_SANDBOX
|
||||
#include <asm/state.h>
|
||||
#endif
|
||||
#include <linux/compiler.h>
|
||||
|
||||
/*
|
||||
|
@ -155,6 +160,7 @@ static int init_baud_rate(void)
|
|||
|
||||
static int display_text_info(void)
|
||||
{
|
||||
#ifndef CONFIG_SANDBOX
|
||||
ulong bss_start, bss_end;
|
||||
|
||||
#ifdef CONFIG_SYS_SYM_OFFSETS
|
||||
|
@ -166,6 +172,7 @@ static int display_text_info(void)
|
|||
#endif
|
||||
debug("U-Boot code: %08X -> %08lX BSS: -> %08lX\n",
|
||||
CONFIG_SYS_TEXT_BASE, bss_start, bss_end);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MODEM_SUPPORT
|
||||
debug("Modem Support enabled\n");
|
||||
|
@ -284,6 +291,8 @@ static int setup_mon_len(void)
|
|||
{
|
||||
#ifdef CONFIG_SYS_SYM_OFFSETS
|
||||
gd->mon_len = _bss_end_ofs;
|
||||
#elif defined(CONFIG_SANDBOX)
|
||||
gd->mon_len = (ulong)&_end - (ulong)_init;
|
||||
#else
|
||||
/* TODO: use (ulong)&__bss_end - (ulong)&__text_start; ? */
|
||||
gd->mon_len = (ulong)&__bss_end - CONFIG_SYS_MONITOR_BASE;
|
||||
|
@ -296,6 +305,17 @@ __weak int arch_cpu_init(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SANDBOX
|
||||
static int setup_ram_buf(void)
|
||||
{
|
||||
gd->arch.ram_buf = os_malloc(CONFIG_SYS_SDRAM_SIZE);
|
||||
assert(gd->arch.ram_buf);
|
||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int setup_fdt(void)
|
||||
{
|
||||
#ifdef CONFIG_OF_EMBED
|
||||
|
@ -470,7 +490,7 @@ static int reserve_malloc(void)
|
|||
static int reserve_board(void)
|
||||
{
|
||||
gd->dest_addr_sp -= sizeof(bd_t);
|
||||
gd->bd = (bd_t *)gd->dest_addr_sp;
|
||||
gd->bd = (bd_t *)map_sysmem(gd->dest_addr_sp, sizeof(bd_t));
|
||||
memset(gd->bd, '\0', sizeof(bd_t));
|
||||
debug("Reserving %zu Bytes for Board Info at: %08lx\n",
|
||||
sizeof(bd_t), gd->dest_addr_sp);
|
||||
|
@ -489,7 +509,7 @@ static int setup_machine(void)
|
|||
static int reserve_global_data(void)
|
||||
{
|
||||
gd->dest_addr_sp -= sizeof(gd_t);
|
||||
gd->new_gd = (gd_t *)gd->dest_addr_sp;
|
||||
gd->new_gd = (gd_t *)map_sysmem(gd->dest_addr_sp, sizeof(gd_t));
|
||||
debug("Reserving %zu Bytes for Global Data at: %08lx\n",
|
||||
sizeof(gd_t), gd->dest_addr_sp);
|
||||
return 0;
|
||||
|
@ -506,9 +526,9 @@ static int reserve_fdt(void)
|
|||
gd->fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob) + 0x1000, 32);
|
||||
|
||||
gd->dest_addr_sp -= gd->fdt_size;
|
||||
gd->new_fdt = (void *)gd->dest_addr_sp;
|
||||
debug("Reserving %lu Bytes for FDT at: %p\n",
|
||||
gd->fdt_size, gd->new_fdt);
|
||||
gd->new_fdt = map_sysmem(gd->dest_addr_sp, gd->fdt_size);
|
||||
debug("Reserving %lu Bytes for FDT at: %08lx\n",
|
||||
gd->fdt_size, gd->dest_addr_sp);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -709,8 +729,9 @@ static int setup_reloc(void)
|
|||
memcpy(gd->new_gd, (char *)gd, sizeof(gd_t));
|
||||
|
||||
debug("Relocation Offset is: %08lx\n", gd->reloc_off);
|
||||
debug("Relocating to %08lx, new gd at %p, sp at %08lx\n",
|
||||
gd->dest_addr, gd->new_gd, gd->dest_addr_sp);
|
||||
debug("Relocating to %08lx, new gd at %08lx, sp at %08lx\n",
|
||||
gd->dest_addr, (ulong)map_to_sysmem(gd->new_gd),
|
||||
gd->dest_addr_sp);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -736,6 +757,8 @@ static int jump_to_copy(void)
|
|||
* (CPU cache)
|
||||
*/
|
||||
board_init_f_r_trampoline(gd->start_addr_sp);
|
||||
#elif defined(CONFIG_SANDBOX)
|
||||
board_init_r(gd->new_gd, 0);
|
||||
#else
|
||||
relocate_code(gd->dest_addr_sp, gd->new_gd, gd->dest_addr);
|
||||
#endif
|
||||
|
@ -757,6 +780,9 @@ static init_fnc_t init_sequence_f[] = {
|
|||
!defined(CONFIG_MPC83xx) && !defined(CONFIG_MPC85xx) && \
|
||||
!defined(CONFIG_MPC86xx) && !defined(CONFIG_X86)
|
||||
zero_global_data,
|
||||
#endif
|
||||
#ifdef CONFIG_SANDBOX
|
||||
setup_ram_buf,
|
||||
#endif
|
||||
setup_fdt,
|
||||
setup_mon_len,
|
||||
|
@ -816,8 +842,11 @@ static init_fnc_t init_sequence_f[] = {
|
|||
init_baud_rate, /* initialze baudrate settings */
|
||||
serial_init, /* serial communications setup */
|
||||
console_init_f, /* stage 1 init of console */
|
||||
#if defined(CONFIG_X86) && defined(CONFIG_OF_CONTROL)
|
||||
prepare_fdt, /* TODO(sjg@chromium.org): remove */
|
||||
#ifdef CONFIG_SANDBOX
|
||||
sandbox_early_getopt_check,
|
||||
#endif
|
||||
#ifdef CONFIG_OF_CONTROL
|
||||
fdtdec_prepare_fdt,
|
||||
#endif
|
||||
display_options, /* say that we are here */
|
||||
display_text_info, /* show debugging info if required */
|
||||
|
@ -1007,5 +1036,9 @@ void board_init_f_r(void)
|
|||
void hang(void)
|
||||
{
|
||||
puts("### ERROR ### Please RESET the board ###\n");
|
||||
#ifdef CONFIG_SANDBOX
|
||||
os_exit(0);
|
||||
#else
|
||||
for (;;);
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -136,7 +136,7 @@ static int initr_reloc_global_data(void)
|
|||
{
|
||||
#ifdef CONFIG_SYS_SYM_OFFSETS
|
||||
monitor_flash_len = _end_ofs;
|
||||
#else
|
||||
#elif !defined(CONFIG_SANDBOX)
|
||||
monitor_flash_len = (ulong)&__init_end - gd->dest_addr;
|
||||
#endif
|
||||
#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
|
||||
|
@ -264,7 +264,8 @@ static int initr_malloc(void)
|
|||
|
||||
/* The malloc area is immediately below the monitor copy in DRAM */
|
||||
malloc_start = gd->dest_addr - TOTAL_MALLOC_LEN;
|
||||
mem_malloc_init(malloc_start, TOTAL_MALLOC_LEN);
|
||||
mem_malloc_init((ulong)map_sysmem(malloc_start, TOTAL_MALLOC_LEN),
|
||||
TOTAL_MALLOC_LEN);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -691,6 +692,9 @@ static int initr_modem(void)
|
|||
|
||||
static int run_main_loop(void)
|
||||
{
|
||||
#ifdef CONFIG_SANDBOX
|
||||
sandbox_main_loop_init();
|
||||
#endif
|
||||
/* main_loop() can return to retry autoboot, if so just run it again */
|
||||
for (;;)
|
||||
main_loop();
|
||||
|
|
|
@ -29,7 +29,7 @@ extern char _data[], _sdata[], _edata[];
|
|||
extern char __bss_start[], __bss_stop[];
|
||||
extern char __init_begin[], __init_end[];
|
||||
extern char _sinittext[], _einittext[];
|
||||
extern char _end[];
|
||||
extern char _end[], _init[];
|
||||
extern char __per_cpu_load[], __per_cpu_start[], __per_cpu_end[];
|
||||
extern char __kprobes_text_start[], __kprobes_text_end[];
|
||||
extern char __entry_text_start[], __entry_text_end[];
|
||||
|
|
|
@ -22,9 +22,6 @@
|
|||
#ifndef __CONFIG_H
|
||||
#define __CONFIG_H
|
||||
|
||||
#define CONFIG_NR_DRAM_BANKS 1
|
||||
#define CONFIG_DRAM_SIZE (128 << 20)
|
||||
|
||||
/* Number of bits in a C 'long' on this architecture */
|
||||
#define CONFIG_SANDBOX_BITS_PER_LONG 64
|
||||
|
||||
|
@ -76,7 +73,11 @@
|
|||
#define CONFIG_PHYS_64BIT
|
||||
|
||||
/* Size of our emulated memory */
|
||||
#define CONFIG_SYS_SDRAM_BASE 0
|
||||
#define CONFIG_SYS_SDRAM_SIZE (128 << 20)
|
||||
#define CONFIG_SYS_TEXT_BASE 0
|
||||
#define CONFIG_SYS_MONITOR_BASE 0
|
||||
#define CONFIG_NR_DRAM_BANKS 1
|
||||
|
||||
#define CONFIG_BAUDRATE 115200
|
||||
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
|
||||
|
|
|
@ -357,7 +357,7 @@ int fdtdec_prepare_fdt(void)
|
|||
if (((uintptr_t)gd->fdt_blob & 3) || fdt_check_header(gd->fdt_blob)) {
|
||||
printf("No valid FDT found - please append one to U-Boot "
|
||||
"binary, use u-boot-dtb.bin or define "
|
||||
"CONFIG_OF_EMBED\n");
|
||||
"CONFIG_OF_EMBED. For sandbox, use -d <file.dtb>\n");
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
|
|
Loading…
Add table
Reference in a new issue