diff options
| author | Tom Rini <trini@ti.com> | 2015-02-16 14:55:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-17 06:27:44 -0500 |
| commit | a851604ca36493e8319a7d3a17594b7224d546fe (patch) | |
| tree | dff68fbdd1b098e334d0da031de250dc8852c3b9 /board | |
| parent | 0ce3f1f90ae6168805f20e473a9ed7fab5fb13a8 (diff) | |
| parent | 840fe95c3bcff7692c51b90ebc0d350792597ff0 (diff) | |
| download | u-boot-imx-a851604ca36493e8319a7d3a17594b7224d546fe.zip u-boot-imx-a851604ca36493e8319a7d3a17594b7224d546fe.tar.gz u-boot-imx-a851604ca36493e8319a7d3a17594b7224d546fe.tar.bz2 | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'board')
| -rw-r--r-- | board/nokia/rx51/lowlevel_init.S | 3 | ||||
| -rw-r--r-- | board/sunxi/Kconfig | 10 | ||||
| -rw-r--r-- | board/sunxi/MAINTAINERS | 7 |
3 files changed, 17 insertions, 3 deletions
diff --git a/board/nokia/rx51/lowlevel_init.S b/board/nokia/rx51/lowlevel_init.S index e252909..9d4ea1b 100644 --- a/board/nokia/rx51/lowlevel_init.S +++ b/board/nokia/rx51/lowlevel_init.S @@ -37,7 +37,8 @@ ih_magic: /* IH_MAGIC in big endian from include/image.h */ .global save_boot_params save_boot_params: - + /* Get return address */ + ldr lr, =save_boot_params_ret /* Copy valid attached kernel to address KERNEL_ADDRESS */ diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 4a21589..3eab81f 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -149,6 +149,16 @@ config SPL_FEL bool "SPL/FEL mode support" depends on SPL default n + help + This enables support for Fast Early Loader (FEL) mode. This + allows U-Boot to be loaded to the board over USB by the on-chip + boot rom. U-Boot should be sent in two parts: SPL first, with + 'fel write 0x2000 u-boot-spl.bin; fel exe 0x2000' then U-Boot with + 'fel write 0x4a000000 u-boot.bin; fel exe 0x4a000000'. This option + shrinks the amount of SRAM available to SPL, so only enable it if + you need FEL. Note that enabling this option only allows FEL to be + used; it is still possible to boot U-Boot from boot media. U-Boot + SPL detects when it is being loaded using FEL. config UART0_PORT_F bool "UART0 on MicroSD breakout board" diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index faa413c..9a287d3 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -46,6 +46,11 @@ S: Maintained F: board/sunxi/dram_a20_olinuxino_l2.c F: configs/A20-OLinuXino-Lime2_defconfig +AMPE A76 BOARD +M: Paul Kocialkowski <contact@paulk.fr> +S: Maintained +F: configs/Ampe_A76_defconfig + COLOMBUS BOARD M: Maxime Ripard <maxime.ripard@free-electrons.com> S: Maintained @@ -57,9 +62,7 @@ M: Hans de Goede <hdegoede@redhat.com> S: Maintained F: include/configs/sun7i.h F: configs/Cubieboard2_defconfig -F: configs/Cubieboard2_FEL_defconfig F: configs/Cubietruck_defconfig -F: configs/Cubietruck_FEL_defconfig GEMEI-G9 TABLET M: Priit Laes <plaes@plaes.org> |