Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

This commit is contained in:
Tom Rini 2016-02-08 09:48:04 -05:00
commit 57dc53a724
330 changed files with 640 additions and 621 deletions

4
README
View File

@ -460,7 +460,7 @@ The following options need to be configured:
CONFIG_SYS_CPC_REINIT_F
This CONFIG is defined when the CPC is configured as SRAM at the
time of U-boot entry and is required to be re-initialized.
time of U-Boot entry and is required to be re-initialized.
CONFIG_DEEP_SLEEP
Indicates this SoC supports deep sleep feature. If deep sleep is
@ -2963,7 +2963,7 @@ CBFS (Coreboot Filesystem) support
- Parallel Flash support:
CONFIG_SYS_NO_FLASH
Traditionally U-boot was run on systems with parallel NOR
Traditionally U-Boot was run on systems with parallel NOR
flash. This option is used to disable support for parallel NOR
flash. This option should be defined if the board does not have
parallel flash.

View File

@ -46,7 +46,7 @@ void reset_cpu(ulong addr)
int arch_cpu_init(void)
{
/*
* It might be necessary to flush data cache, if U-boot is loaded
* It might be necessary to flush data cache, if U-Boot is loaded
* from kickstart bootloader, e.g. from S1L loader
*/
flush_dcache_all();

View File

@ -41,5 +41,5 @@ lowlevel_init:
orr r0, #0x00000004
str r0, [r1]
/* Return to U-boot via saved link register */
/* Return to U-Boot via saved link register */
mov pc, lr

View File

@ -37,7 +37,7 @@ _monitor_vectors:
/*
* secure monitor handler
* U-boot calls this "software interrupt" in start.S
* U-Boot calls this "software interrupt" in start.S
* This is executed on a "smc" instruction, we use a "smc #0" to switch
* to non-secure state.
* r0, r1, r2: passed to the callee

View File

@ -1,6 +1,6 @@
if ARM64
config ARMV8_MULTIENTRY
boolean "Enable multiple CPUs to enter into U-boot"
boolean "Enable multiple CPUs to enter into U-Boot"
endif

View File

@ -59,7 +59,7 @@
status = "okay";
};
/* for U-boot only */
/* for U-Boot only */
/ {
soc {
u-boot,dm-pre-reloc;

View File

@ -61,7 +61,7 @@
status = "okay";
};
/* for U-boot only */
/* for U-Boot only */
/ {
soc {
u-boot,dm-pre-reloc;

View File

@ -66,7 +66,7 @@
status = "okay";
};
/* for U-boot only */
/* for U-Boot only */
/ {
soc {
u-boot,dm-pre-reloc;

View File

@ -47,7 +47,7 @@
status = "okay";
};
/* for U-boot only */
/* for U-Boot only */
/ {
soc {
u-boot,dm-pre-reloc;

View File

@ -68,7 +68,7 @@
status = "okay";
};
/* for U-boot only */
/* for U-Boot only */
&serial0 {
u-boot,dm-pre-reloc;
};

View File

@ -63,7 +63,7 @@
status = "okay";
};
/* for U-boot only */
/* for U-Boot only */
/ {
soc {
u-boot,dm-pre-reloc;

View File

@ -49,7 +49,7 @@
status = "okay";
};
/* for U-boot only */
/* for U-Boot only */
/ {
soc {
u-boot,dm-pre-reloc;

View File

@ -45,7 +45,7 @@
status = "okay";
};
/* for U-boot only */
/* for U-Boot only */
/ {
soc {
u-boot,dm-pre-reloc;

View File

@ -42,10 +42,10 @@ struct spl_machine_param {
u32 mem_iv_size; /* Memory channel interleaving size */
enum ddr_mode mem_type; /* Type of on-board memory */
/*
* U-boot size - The iROM mmc copy function used by the SPL takes a
* block count paramter to describe the u-boot size unlike the spi
* boot copy function which just uses the u-boot size directly. Align
* the u-boot size to block size (512 bytes) when populating the SPL
* U-Boot size - The iROM mmc copy function used by the SPL takes a
* block count paramter to describe the U-Boot size unlike the spi
* boot copy function which just uses the U-Boot size directly. Align
* the U-Boot size to block size (512 bytes) when populating the SPL
* table only for mmc boot.
*/
u32 uboot_size;

View File

@ -30,10 +30,10 @@ relocate_wait_code:
* because that comes out to be the last 4KB of the iRAM
* (Base Address - 0x02020000, Limit Address - 0x020740000).
*
* U-boot and kernel are aware of this code and flags by the simple
* U-Boot and kernel are aware of this code and flags by the simple
* fact that we are implementing a workaround in the last 4KB
* of the iRAM and we have already defined these flag and address
* values in both kernel and U-boot for our use.
* values in both kernel and U-Boot for our use.
*/
code_base:
b 1f

View File

@ -177,7 +177,7 @@ static void exynos_spi_copy(unsigned int uboot_size, unsigned int uboot_addr)
#endif
/*
* Copy U-boot from mmc to RAM:
* Copy U-Boot from mmc to RAM:
* COPY_BL2_FNPTR_ADDR: Address in iRAM, which Contains
* Pointer to API (Data transfer from mmc to ram)
*/

View File

@ -283,5 +283,5 @@ lowlevel_init:
#endif /* CONFIG_SPL_BUILD */
/* Return to U-boot via saved link register */
/* Return to U-Boot via saved link register */
mov pc, lr

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - cpu.c CPU specific functions
* U-Boot - cpu.c CPU specific functions
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - cpu.h
* U-Boot - cpu.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - interrupts.c Interrupt related routines
* U-Boot - interrupts.c Interrupt related routines
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - start.S Startup file for Blackfin u-boot
* U-Boot - start.S Startup file for Blackfin U-Boot
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*
@ -51,7 +51,7 @@ ENTRY(_start)
#ifdef CONFIG_HW_WATCHDOG
/* Program the watchdog with default timeout of ~5 seconds.
* That should be long enough to bootstrap ourselves up and
* then the common u-boot code can take over.
* then the common U-Boot code can take over.
*/
r1 = WDDIS;
# ifdef __ADSPBF60x__

View File

@ -1,5 +1,5 @@
/*
* U-boot - traps.c Routines related to interrupts and exceptions
* U-Boot - traps.c Routines related to interrupts and exceptions
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - u-boot.lds.S
* U-Boot - u-boot.lds.S
*
* Copyright (c) 2005-2010 Analog Device Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - bitops.h Routines for bit operations
* U-Boot - bitops.h Routines for bit operations
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - blackfin_local.h
* U-Boot - blackfin_local.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - byteorder.h
* U-Boot - byteorder.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - deferred register layout
* U-Boot - deferred register layout
*
* Copyright 2004-2009 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - delay.h Routines for introducing delays
* U-Boot - delay.h Routines for introducing delays
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - global_data.h Declarations for global data of u-boot
* U-Boot - global_data.h Declarations for global data of U-Boot
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - io.h IO routines
* U-Boot - io.h IO routines
*
* Copyright 2004-2009 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - linkage.h
* U-Boot - linkage.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - posix_types.h
* U-Boot - posix_types.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - processor.h
* U-Boot - processor.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - setup.h
* U-Boot - setup.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2008-2012 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - string.h String functions
* U-Boot - string.h String functions
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - system.h
* U-Boot - system.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - types.h
* U-Boot - types.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - u-boot.h Structure declarations for board specific data
* U-Boot - u-boot.h Structure declarations for board specific data
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot Makefile
# U-Boot Makefile
#
# Copyright (c) 2005-2008 Analog Devices Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - boot.c - misc boot helper functions
* U-Boot - boot.c - misc boot helper functions
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - cache.c
* U-Boot - cache.c
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - cmd_cache_dump.c
* U-Boot - cmd_cache_dump.c
*
* Copyright (c) 2007-2008 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - architecture specific kgdb code
* U-Boot - architecture specific kgdb code
*
* Copyright 2009 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - muldi3.c contains routines for mult and div
* U-Boot - muldi3.c contains routines for mult and div
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - section.c
* U-Boot - section.c
*
* Copyright (c) 2014 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - string.c Contains library routines.
* U-Boot - string.c Contains library routines.
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - muldi3.c contains routines for mult and div
* U-Boot - muldi3.c contains routines for mult and div
*
*
* SPDX-License-Identifier: GPL-2.0+

View File

@ -57,7 +57,7 @@
.set noreorder
ENTRY(_start)
/* U-boot entry point */
/* U-Boot entry point */
b reset
nop

View File

@ -1,5 +1,5 @@
/*
* U-boot - linkage.h
* U-Boot - linkage.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -12,7 +12,7 @@
/*
* Note: For P5040, the fourth SerDes bank (with two lanes) is on SerDes2, but
* U-boot only supports one SerDes controller. Therefore, we ignore bank 4 in
* U-Boot only supports one SerDes controller. Therefore, we ignore bank 4 in
* this table. This works because most of the SerDes code is for errata
* work-arounds, and there are no P5040 errata that effect bank 4.
*/

View File

@ -13,7 +13,7 @@
/* Currently, this board information is not passed to
* Linux kernel from U-Boot, but may be passed to other
* Operating systems. This is because U-boot emulates
* Operating systems. This is because U-Boot emulates
* a SUN PROM loader (from Linux point of view).
*/
#include <asm-generic/u-boot.h>

View File

@ -1,5 +1,5 @@
/*
* Added to U-boot,
* Added to U-Boot,
* Daniel Hellstrom, Gaisler Research, daniel@gaisler.com
* Copyright (C) 2007
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - x86 Startup Code
* U-Boot - x86 Startup Code
*
* (C) Copyright 2002
* Daniel Engström, Omicron Ceti AB, <daniel@omicron.se>

View File

@ -162,7 +162,7 @@ int boot_linux_kernel(ulong setup_base, ulong load_address, bool image_64bit)
* boot_params structure, and then jump to the kernel. We
* assume that %cs is 0x10, 4GB flat, and read/execute, and
* the data segments are 0x18, 4GB flat, and read/write.
* U-boot is setting them up that way for itself in
* U-Boot is setting them up that way for itself in
* arch/i386/cpu/cpu.c.
*
* Note that we cannot currently boot a kernel while running as

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file for BCT brettl2
* U-Boot - main board file for BCT brettl2
*
* Copyright (c) 2010 BCT Electronic GmbH
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2008-2010 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2008-2009 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,4 +1,4 @@
/* U-boot - bf525-ucr2.c board specific routines
/* U-Boot - bf525-ucr2.c board specific routines
*
* (C) Copyright 2000-2004
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2005-2009 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2010 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2005-2009 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2010 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2007 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - flash-defines.h
* U-Boot - flash-defines.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - flash.c Flash driver for PSD4256GV
* U-Boot - flash.c Flash driver for PSD4256GV
*
* Copyright (c) 2005-2007 Analog Devices Inc.
* This file is based on BF533EzFlash.c originally written by Analog Devices, Inc.

View File

@ -1,5 +1,5 @@
/*
* U-boot - psd4256.h
* U-Boot - psd4256.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2005-2009 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2005-2009 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2005-2009 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2007 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2008 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2007 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2007 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2005-2008 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2008-2011 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2008-2011 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
/*
* U-boot - main board file
* U-Boot - main board file
*
* Copyright (c) 2008-2011 Analog Devices Inc.
*

View File

@ -1,5 +1,5 @@
#
# U-boot - Makefile
# U-Boot - Makefile
#
# Copyright (c) 2005-2008 Analog Device Inc.
#

View File

@ -1,5 +1,5 @@
/*
* U-boot - blackstamp.c BlackStamp board specific routines
* U-Boot - blackstamp.c BlackStamp board specific routines
* Most code stolen from boards/bf533-stamp/bf533-stamp.c
* Edited to the BlackStamp by Ben Matthews for UR LLE
*

Some files were not shown because too many files have changed in this diff Show More