Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Tom Rini
9 years ago
commit
a851604ca3
@ -0,0 +1,37 @@ |
||||
/*
|
||||
* DRAM init helper functions |
||||
* |
||||
* (C) Copyright 2015 Hans de Goede <hdegoede@redhat.com> |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#include <common.h> |
||||
#include <asm/io.h> |
||||
#include <asm/arch/dram.h> |
||||
|
||||
/*
|
||||
* Wait up to 1s for value to be set in given part of reg. |
||||
*/ |
||||
void mctl_await_completion(u32 *reg, u32 mask, u32 val) |
||||
{ |
||||
unsigned long tmo = timer_get_us() + 1000000; |
||||
|
||||
while ((readl(reg) & mask) != val) { |
||||
if (timer_get_us() > tmo) |
||||
panic("Timeout initialising DRAM\n"); |
||||
} |
||||
} |
||||
|
||||
/*
|
||||
* Test if memory at offset offset matches memory at begin of DRAM |
||||
*/ |
||||
bool mctl_mem_matches(u32 offset) |
||||
{ |
||||
/* Try to write different values to RAM at two addresses */ |
||||
writel(0, CONFIG_SYS_SDRAM_BASE); |
||||
writel(0xaa55aa55, CONFIG_SYS_SDRAM_BASE + offset); |
||||
/* Check if the same value is actually observed when reading back */ |
||||
return readl(CONFIG_SYS_SDRAM_BASE) == |
||||
readl(CONFIG_SYS_SDRAM_BASE + offset); |
||||
} |
||||
@ -0,0 +1,42 @@ |
||||
/* |
||||
* Utility functions for FEL mode. |
||||
* |
||||
* Copyright (c) 2015 Google, Inc |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#include <asm-offsets.h> |
||||
#include <config.h> |
||||
#include <asm/system.h> |
||||
#include <linux/linkage.h> |
||||
|
||||
ENTRY(save_boot_params) |
||||
ldr r0, =fel_stash |
||||
str sp, [r0, #0] |
||||
str lr, [r0, #4] |
||||
mrs lr, cpsr @ Read CPSR
|
||||
str lr, [r0, #8] |
||||
mrc p15, 0, lr, c1, c0, 0 @ Read CP15 SCTLR Register
|
||||
str lr, [r0, #12] |
||||
mrc p15, 0, lr, c12, c0, 0 @ Read VBAR
|
||||
str lr, [r0, #16] |
||||
mrc p15, 0, lr, c1, c0, 0 @ Read CP15 Control Register
|
||||
str lr, [r0, #20] |
||||
b save_boot_params_ret |
||||
ENDPROC(save_boot_params) |
||||
|
||||
ENTRY(return_to_fel) |
||||
mov sp, r0 |
||||
mov lr, r1 |
||||
ldr r0, =fel_stash |
||||
ldr r1, [r0, #20] |
||||
mcr p15, 0, r1, c1, c0, 0 @ Write CP15 Control Register
|
||||
ldr r1, [r0, #16] |
||||
mcr p15, 0, r1, c12, c0, 0 @ Write VBAR
|
||||
ldr r1, [r0, #12] |
||||
mcr p15, 0, r1, c1, c0, 0 @ Write CP15 SCTLR Register
|
||||
ldr r1, [r0, #8] |
||||
msr cpsr, r1 @ Write CPSR
|
||||
bx lr |
||||
ENDPROC(return_to_fel) |
||||
@ -1,82 +0,0 @@ |
||||
/* |
||||
* (C) Copyright 2013 |
||||
* Henrik Nordstrom <henrik@henriknordstrom.net> |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") |
||||
OUTPUT_ARCH(arm) |
||||
ENTRY(s_init) |
||||
SECTIONS |
||||
{ |
||||
. = 0x00002000; |
||||
|
||||
. = ALIGN(4); |
||||
.text : |
||||
{ |
||||
*(.text.s_init) |
||||
*(.text*) |
||||
} |
||||
|
||||
. = ALIGN(4); |
||||
.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } |
||||
|
||||
. = ALIGN(4); |
||||
.data : { |
||||
*(.data*) |
||||
} |
||||
|
||||
. = ALIGN(4); |
||||
.u_boot_list : { |
||||
KEEP(*(SORT(.u_boot_list*))); |
||||
} |
||||
|
||||
. = ALIGN(4); |
||||
. = .; |
||||
|
||||
. = ALIGN(4); |
||||
.rel.dyn : { |
||||
__rel_dyn_start = .; |
||||
*(.rel*) |
||||
__rel_dyn_end = .; |
||||
} |
||||
|
||||
.dynsym : { |
||||
__dynsym_start = .; |
||||
*(.dynsym) |
||||
} |
||||
|
||||
. = ALIGN(4); |
||||
.note.gnu.build-id : |
||||
{ |
||||
*(.note.gnu.build-id) |
||||
} |
||||
_end = .; |
||||
|
||||
. = ALIGN(4096); |
||||
.mmutable : { |
||||
*(.mmutable) |
||||
} |
||||
|
||||
.bss_start __rel_dyn_start (OVERLAY) : { |
||||
KEEP(*(.__bss_start)); |
||||
__bss_base = .; |
||||
} |
||||
|
||||
.bss __bss_base (OVERLAY) : { |
||||
*(.bss*) |
||||
. = ALIGN(4); |
||||
__bss_limit = .; |
||||
} |
||||
|
||||
.bss_end __bss_limit (OVERLAY) : { |
||||
KEEP(*(.__bss_end)); |
||||
} |
||||
|
||||
/DISCARD/ : { *(.dynstr*) } |
||||
/DISCARD/ : { *(.dynamic*) } |
||||
/DISCARD/ : { *(.plt*) } |
||||
/DISCARD/ : { *(.interp*) } |
||||
/DISCARD/ : { *(.gnu*) } |
||||
/DISCARD/ : { *(.note*) } |
||||
} |
||||
@ -0,0 +1,15 @@ |
||||
CONFIG_SPL=y |
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER" |
||||
CONFIG_FDTFILE="sun5i-a13-ampe-a76.dtb" |
||||
CONFIG_USB_MUSB_SUNXI=y |
||||
CONFIG_USB0_VBUS_PIN="PG12" |
||||
CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:45,ri:82,up:22,lo:22,hs:1,vs:1,sync:3,vmode:0" |
||||
CONFIG_VIDEO_LCD_POWER="AXP0-0" |
||||
CONFIG_VIDEO_LCD_BL_EN="AXP0-1" |
||||
CONFIG_VIDEO_LCD_BL_PWM="PB2" |
||||
+S:CONFIG_ARM=y |
||||
+S:CONFIG_ARCH_SUNXI=y |
||||
+S:CONFIG_MACH_SUN5I=y |
||||
+S:CONFIG_DRAM_CLK=432 |
||||
+S:CONFIG_DRAM_ZQ=123 |
||||
+S:CONFIG_DRAM_EMR1=4 |
||||
Loading…
Reference in new issue