mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 15:41:40 +00:00
sh: Fix build errors for generic board
This includes the following fixes: - Define needed __init_end symbol - see initr_reloc_global_data() - Drop SH-specific struct bd_info - Add an empty relocate_code() function This prevents build errors with generic board, but the code will still need work. Perhaps this is a better alternative than deleting the code. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
b0b359536e
commit
f41e6088eb
11 changed files with 36 additions and 19 deletions
|
@ -83,3 +83,9 @@ int dcache_status(void)
|
|||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void relocate_code(ulong start_addr_sp, gd_t *new_gd, ulong relocaaddr)
|
||||
{
|
||||
/* TODO(sh maintainer): Implement this */
|
||||
while (1);
|
||||
}
|
||||
|
|
|
@ -46,8 +46,9 @@ _init:
|
|||
mov.l ._gd_init, r13 /* global data */
|
||||
mov.l ._stack_init, r15 /* stack */
|
||||
|
||||
mov.l ._sh_generic_init, r0
|
||||
jsr @r0
|
||||
#TODO(sh maintainer): Fix this up to call the correct code
|
||||
#mov.l ._sh_generic_init, r0
|
||||
#jsr @r0
|
||||
nop
|
||||
|
||||
loop:
|
||||
|
@ -62,4 +63,4 @@ loop:
|
|||
._bss_end: .long bss_end
|
||||
._gd_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE)
|
||||
._stack_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
|
||||
._sh_generic_init: .long sh_generic_init
|
||||
#._sh_generic_init: .long sh_generic_init
|
||||
|
|
|
@ -66,3 +66,9 @@ int dcache_status(void)
|
|||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void relocate_code(ulong start_addr_sp, gd_t *new_gd, ulong relocaaddr)
|
||||
{
|
||||
/* TODO(sh maintainer): Implement this */
|
||||
while (1);
|
||||
}
|
||||
|
|
|
@ -45,8 +45,9 @@ _sh_start:
|
|||
mov.l ._gd_init, r13 /* global data */
|
||||
mov.l ._stack_init, r15 /* stack */
|
||||
|
||||
mov.l ._sh_generic_init, r0
|
||||
jsr @r0
|
||||
#TODO(sh maintainer): Fix this up to call the correct code
|
||||
#mov.l ._sh_generic_init, r0
|
||||
#jsr @r0
|
||||
nop
|
||||
|
||||
loop:
|
||||
|
@ -61,4 +62,4 @@ loop:
|
|||
._bss_end: .long bss_end
|
||||
._gd_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE)
|
||||
._stack_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
|
||||
._sh_generic_init: .long sh_generic_init
|
||||
#._sh_generic_init: .long sh_generic_init
|
||||
|
|
|
@ -75,3 +75,9 @@ int cpu_eth_init(bd_t *bis)
|
|||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
void relocate_code(ulong start_addr_sp, gd_t *new_gd, ulong relocaaddr)
|
||||
{
|
||||
/* TODO(sh maintainer): Implement this */
|
||||
while (1);
|
||||
}
|
||||
|
|
|
@ -42,8 +42,9 @@ _sh_start:
|
|||
mov.l ._gd_init, r13 /* global data */
|
||||
mov.l ._stack_init, r15 /* stack */
|
||||
|
||||
mov.l ._sh_generic_init, r0
|
||||
jsr @r0
|
||||
#TODO(sh maintainer): Fix this up to call the correct code
|
||||
#mov.l ._sh_generic_init, r0
|
||||
#jsr @r0
|
||||
nop
|
||||
|
||||
loop:
|
||||
|
@ -58,4 +59,4 @@ loop:
|
|||
._bss_end: .long bss_end
|
||||
._gd_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE)
|
||||
._stack_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
|
||||
._sh_generic_init: .long sh_generic_init
|
||||
#._sh_generic_init: .long sh_generic_init
|
||||
|
|
|
@ -67,6 +67,7 @@ SECTIONS
|
|||
KEEP(*(SORT(.u_boot_list*)));
|
||||
}
|
||||
|
||||
PROVIDE (__init_end = .);
|
||||
PROVIDE (reloc_dst_end = .);
|
||||
/* _reloc_dst_end = .; */
|
||||
|
||||
|
|
|
@ -12,16 +12,8 @@
|
|||
#ifndef __ASM_SH_U_BOOT_H_
|
||||
#define __ASM_SH_U_BOOT_H_
|
||||
|
||||
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_boot_params; /* where this board expects params */
|
||||
} 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_SH
|
||||
|
|
|
@ -65,6 +65,7 @@ SECTIONS
|
|||
KEEP(*(SORT(.u_boot_list*)));
|
||||
}
|
||||
|
||||
PROVIDE (__init_end = .);
|
||||
PROVIDE (reloc_dst_end = .);
|
||||
/* _reloc_dst_end = .; */
|
||||
|
||||
|
|
|
@ -65,6 +65,7 @@ SECTIONS
|
|||
KEEP(*(SORT(.u_boot_list*)));
|
||||
}
|
||||
|
||||
PROVIDE (__init_end = .);
|
||||
PROVIDE (reloc_dst_end = .);
|
||||
/* _reloc_dst_end = .; */
|
||||
|
||||
|
|
|
@ -66,6 +66,7 @@ SECTIONS
|
|||
KEEP(*(SORT(.u_boot_list*)));
|
||||
}
|
||||
|
||||
PROVIDE (__init_end = .);
|
||||
PROVIDE (reloc_dst_end = .);
|
||||
/* _reloc_dst_end = .; */
|
||||
|
||||
|
|
Loading…
Reference in a new issue