diff options
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/cpu/broadwell/sdram.c | 4 | ||||
| -rw-r--r-- | arch/x86/cpu/coreboot/sdram.c | 4 | ||||
| -rw-r--r-- | arch/x86/cpu/efi/sdram.c | 4 | ||||
| -rw-r--r-- | arch/x86/cpu/ivybridge/sdram.c | 4 | ||||
| -rw-r--r-- | arch/x86/cpu/qemu/dram.c | 4 | ||||
| -rw-r--r-- | arch/x86/cpu/quark/dram.c | 4 | ||||
| -rw-r--r-- | arch/x86/include/asm/u-boot-x86.h | 2 | ||||
| -rw-r--r-- | arch/x86/lib/efi/efi.c | 6 | ||||
| -rw-r--r-- | arch/x86/lib/fsp/fsp_dram.c | 4 |
9 files changed, 26 insertions, 10 deletions
diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c index 74736cd..774aba6 100644 --- a/arch/x86/cpu/broadwell/sdram.c +++ b/arch/x86/cpu/broadwell/sdram.c @@ -28,9 +28,11 @@ ulong board_get_usable_ram_top(ulong total_size) return mrc_common_board_get_usable_ram_top(total_size); } -void dram_init_banksize(void) +int dram_init_banksize(void) { mrc_common_dram_init_banksize(); + + return 0; } void broadwell_fill_pei_data(struct pei_data *pei_data) diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c index 7115e7a..82407af 100644 --- a/arch/x86/cpu/coreboot/sdram.c +++ b/arch/x86/cpu/coreboot/sdram.c @@ -104,7 +104,7 @@ int dram_init(void) return 0; } -void dram_init_banksize(void) +int dram_init_banksize(void) { int i, j; @@ -121,4 +121,6 @@ void dram_init_banksize(void) } } } + + return 0; } diff --git a/arch/x86/cpu/efi/sdram.c b/arch/x86/cpu/efi/sdram.c index 5159944..413e55b 100644 --- a/arch/x86/cpu/efi/sdram.c +++ b/arch/x86/cpu/efi/sdram.c @@ -22,8 +22,10 @@ int dram_init(void) return 0; } -void dram_init_banksize(void) +int dram_init_banksize(void) { gd->bd->bi_dram[0].start = efi_get_ram_base(); gd->bd->bi_dram[0].size = CONFIG_EFI_RAM_SIZE; + + return 0; } diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c index 201368c..643d804 100644 --- a/arch/x86/cpu/ivybridge/sdram.c +++ b/arch/x86/cpu/ivybridge/sdram.c @@ -46,9 +46,11 @@ ulong board_get_usable_ram_top(ulong total_size) return mrc_common_board_get_usable_ram_top(total_size); } -void dram_init_banksize(void) +int dram_init_banksize(void) { mrc_common_dram_init_banksize(); + + return 0; } static int read_seed_from_cmos(struct pei_data *pei_data) diff --git a/arch/x86/cpu/qemu/dram.c b/arch/x86/cpu/qemu/dram.c index a88d0d2..9d84af5 100644 --- a/arch/x86/cpu/qemu/dram.c +++ b/arch/x86/cpu/qemu/dram.c @@ -26,10 +26,12 @@ int dram_init(void) return 0; } -void dram_init_banksize(void) +int dram_init_banksize(void) { gd->bd->bi_dram[0].start = 0; gd->bd->bi_dram[0].size = gd->ram_size; + + return 0; } /* diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c index 40c830a..47beb86 100644 --- a/arch/x86/cpu/quark/dram.c +++ b/arch/x86/cpu/quark/dram.c @@ -162,10 +162,12 @@ int dram_init(void) return 0; } -void dram_init_banksize(void) +int dram_init_banksize(void) { gd->bd->bi_dram[0].start = 0; gd->bd->bi_dram[0].size = gd->ram_size; + + return 0; } /* diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index cc7fc73..33c6e2b 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.h @@ -41,7 +41,7 @@ void x86_disable_caches(void); int x86_init_cache(void); void reset_cpu(ulong addr); ulong board_get_usable_ram_top(ulong total_size); -void dram_init_banksize(void); +int dram_init_banksize(void); int default_print_cpuinfo(void); /* Set up a UART which can be used with printch(), printhex8(), etc. */ diff --git a/arch/x86/lib/efi/efi.c b/arch/x86/lib/efi/efi.c index 533318b..b1746fa 100644 --- a/arch/x86/lib/efi/efi.c +++ b/arch/x86/lib/efi/efi.c @@ -92,7 +92,7 @@ int dram_init(void) return 0; } -void dram_init_banksize(void) +int dram_init_banksize(void) { struct efi_mem_desc *desc, *end; struct efi_entry_memmap *map; @@ -103,7 +103,7 @@ void dram_init_banksize(void) if (ret) { /* We should have stopped in dram_init(), something is wrong */ debug("%s: Missing memory map\n", __func__); - return; + return -ENXIO; } end = (struct efi_mem_desc *)((ulong)map + size); desc = map->desc; @@ -123,6 +123,8 @@ void dram_init_banksize(void) EFI_PAGE_SHIFT; num_banks++; } + + return 0; } int checkcpu(void) diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c index fcfe693..8b880cd 100644 --- a/arch/x86/lib/fsp/fsp_dram.c +++ b/arch/x86/lib/fsp/fsp_dram.c @@ -41,10 +41,12 @@ int dram_init(void) return 0; } -void dram_init_banksize(void) +int dram_init_banksize(void) { gd->bd->bi_dram[0].start = 0; gd->bd->bi_dram[0].size = gd->ram_size; + + return 0; } /* |