Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-26 06:30:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86: Use the standard dram_init() function

Browse source 
Instead of having an x86-specific DRAM init function, adjust things so we
can use the normal one.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2014-11-06 13:20:05 -07:00
parent 76f90f3020
commit 07387d1769
3 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/x86/cpu/coreboot/sdram.c
View file

@ -11,6 +11,7 @@
#include <asm/e820.h> #include <asm/e820.h>
#include <asm/u-boot-x86.h> #include <asm/u-boot-x86.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include <asm/init_helpers.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/arch/sysinfo.h> #include <asm/arch/sysinfo.h>
@ -79,7 +80,7 @@ ulong board_get_usable_ram_top(ulong total_size)
return (ulong)dest_addr; return (ulong)dest_addr;
} }
int dram_init_f(void) int dram_init(void)
{ {
int i; int i;
phys_size_t ram_size = 0; phys_size_t ram_size = 0;
@ -94,7 +95,8 @@ int dram_init_f(void)
gd->ram_size = ram_size; gd->ram_size = ram_size;
if (ram_size == 0) if (ram_size == 0)
return -1; return -1;
return 0;
return calculate_relocation_address();
} }
int dram_init_banksize(void) int dram_init_banksize(void)
@ -116,8 +118,3 @@ int dram_init_banksize(void)
} }
return 0; return 0;
} }
int dram_init(void)
{
return dram_init_banksize();
}

4
arch/x86/include/asm/u-boot-x86.h
View file

@ -27,8 +27,8 @@ unsigned long get_tbclk_mhz(void);
void timer_set_base(uint64_t base); void timer_set_base(uint64_t base);
int pcat_timer_init(void); int pcat_timer_init(void);
/* Architecture specific - can be in arch/x86/cpu/, arch/x86/lib/, or $(BOARD)/ */ /* Architecture specific DRAM init */
int dram_init_f(void); int dram_init(void);
/* cpu/.../interrupts.c */ /* cpu/.../interrupts.c */
int cpu_init_interrupts(void); int cpu_init_interrupts(void);

6
common/board_f.c
View file

@ -902,14 +902,10 @@ static init_fnc_t init_sequence_f[] = {
#endif #endif
#if defined(CONFIG_HARD_SPI) #if defined(CONFIG_HARD_SPI)
init_func_spi, init_func_spi,
#endif
#ifdef CONFIG_X86
dram_init_f, /* configure available RAM banks */
calculate_relocation_address,
#endif #endif
announce_dram_init, announce_dram_init,
/* TODO: unify all these dram functions? */ /* TODO: unify all these dram functions? */
#ifdef CONFIG_ARM #if defined(CONFIG_ARM) || defined(CONFIG_X86)
dram_init, /* configure available RAM banks */ dram_init, /* configure available RAM banks */
#endif #endif
#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) #if defined(CONFIG_MIPS) || defined(CONFIG_PPC)