V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Blackfin: Remove relocation fixups 

Blackfin pieces like commit 0630535e2d.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2009-10-09 02:22:11 -04:00
parent 14abfe361b
commit 370ec73455
3 changed files with 3 additions and 3 deletions
include/asm-blackfin
config.hglobal_data.h
lib_blackfin
board.c

3
include/asm-blackfin/config.h
View File

@ -18,6 +18,9 @@
# define CONFIG_BFIN_SCRATCH_REG retn # define CONFIG_BFIN_SCRATCH_REG retn
#endif #endif
/* Relocation to SDRAM works on all Blackfin boards */
#define CONFIG_RELOC_FIXUP_WORKS
/* Make sure the structure is properly aligned */ /* Make sure the structure is properly aligned */
#if ((CONFIG_SYS_GBL_DATA_ADDR & -4) != CONFIG_SYS_GBL_DATA_ADDR) #if ((CONFIG_SYS_GBL_DATA_ADDR & -4) != CONFIG_SYS_GBL_DATA_ADDR)
# error CONFIG_SYS_GBL_DATA_ADDR: must be 4 byte aligned # error CONFIG_SYS_GBL_DATA_ADDR: must be 4 byte aligned

1
include/asm-blackfin/global_data.h
View File

@ -44,7 +44,6 @@ typedef struct global_data {
unsigned long baudrate; unsigned long baudrate;
unsigned long have_console; /* serial_init() was called */ unsigned long have_console; /* serial_init() was called */
phys_size_t ram_size; /* RAM size */ phys_size_t ram_size; /* RAM size */
unsigned long reloc_off; /* Relocation Offset */
unsigned long env_addr; /* Address of Environment struct */ unsigned long env_addr; /* Address of Environment struct */
unsigned long env_valid; /* Checksum of Environment valid? */ unsigned long env_valid; /* Checksum of Environment valid? */
#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER) #if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)

2
lib_blackfin/board.c
View File

@ -296,7 +296,6 @@ static void board_net_init_r(bd_t *bd)
void board_init_r(gd_t * id, ulong dest_addr) void board_init_r(gd_t * id, ulong dest_addr)
{ {
extern void malloc_bin_reloc(void);
char *s; char *s;
bd_t *bd; bd_t *bd;
gd = id; gd = id;
@ -310,7 +309,6 @@ void board_init_r(gd_t * id, ulong dest_addr)
/* initialize malloc() area */ /* initialize malloc() area */
mem_malloc_init(CONFIG_SYS_MALLOC_BASE, CONFIG_SYS_MALLOC_LEN); mem_malloc_init(CONFIG_SYS_MALLOC_BASE, CONFIG_SYS_MALLOC_LEN);
malloc_bin_reloc();
#if !defined(CONFIG_SYS_NO_FLASH) #if !defined(CONFIG_SYS_NO_FLASH)
/* Initialize the flash and protect u-boot by default */ /* Initialize the flash and protect u-boot by default */