diff options
author | Tom Rini <trini@konsulko.com> | 2016-02-08 09:48:04 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-02-08 09:48:04 -0500 |
commit | 57dc53a72460e8e301fa1cc7951b41db8e731485 (patch) | |
tree | 856a679e994fdc529a97763e851ed2e546ba3742 /arch/blackfin/cpu | |
parent | 7b6dc11c1aa69e5cc22d1659f50594edcfab5a9e (diff) | |
parent | 2300184f702656b72394e458bf15f7aaba8af892 (diff) | |
download | u-boot-imx-57dc53a72460e8e301fa1cc7951b41db8e731485.zip u-boot-imx-57dc53a72460e8e301fa1cc7951b41db8e731485.tar.gz u-boot-imx-57dc53a72460e8e301fa1cc7951b41db8e731485.tar.bz2 |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Diffstat (limited to 'arch/blackfin/cpu')
-rw-r--r-- | arch/blackfin/cpu/Makefile | 2 | ||||
-rw-r--r-- | arch/blackfin/cpu/cpu.c | 2 | ||||
-rw-r--r-- | arch/blackfin/cpu/cpu.h | 2 | ||||
-rw-r--r-- | arch/blackfin/cpu/interrupts.c | 2 | ||||
-rw-r--r-- | arch/blackfin/cpu/start.S | 4 | ||||
-rw-r--r-- | arch/blackfin/cpu/traps.c | 2 | ||||
-rw-r--r-- | arch/blackfin/cpu/u-boot.lds | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/arch/blackfin/cpu/Makefile b/arch/blackfin/cpu/Makefile index 7cd0bbf..7ba5f1b 100644 --- a/arch/blackfin/cpu/Makefile +++ b/arch/blackfin/cpu/Makefile @@ -1,5 +1,5 @@ # -# U-boot - Makefile +# U-Boot - Makefile # # Copyright (c) 2005-2008 Analog Device Inc. # diff --git a/arch/blackfin/cpu/cpu.c b/arch/blackfin/cpu/cpu.c index 91aa5cc..529322a 100644 --- a/arch/blackfin/cpu/cpu.c +++ b/arch/blackfin/cpu/cpu.c @@ -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. * diff --git a/arch/blackfin/cpu/cpu.h b/arch/blackfin/cpu/cpu.h index f6aa1b6..a5fe02e 100644 --- a/arch/blackfin/cpu/cpu.h +++ b/arch/blackfin/cpu/cpu.h @@ -1,5 +1,5 @@ /* - * U-boot - cpu.h + * U-Boot - cpu.h * * Copyright (c) 2005-2007 Analog Devices Inc. * diff --git a/arch/blackfin/cpu/interrupts.c b/arch/blackfin/cpu/interrupts.c index 9189816..45c92c3 100644 --- a/arch/blackfin/cpu/interrupts.c +++ b/arch/blackfin/cpu/interrupts.c @@ -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. * diff --git a/arch/blackfin/cpu/start.S b/arch/blackfin/cpu/start.S index f31abfa..823a1df 100644 --- a/arch/blackfin/cpu/start.S +++ b/arch/blackfin/cpu/start.S @@ -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__ diff --git a/arch/blackfin/cpu/traps.c b/arch/blackfin/cpu/traps.c index 10f72f8..21760d0 100644 --- a/arch/blackfin/cpu/traps.c +++ b/arch/blackfin/cpu/traps.c @@ -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. * diff --git a/arch/blackfin/cpu/u-boot.lds b/arch/blackfin/cpu/u-boot.lds index ae1b813..f407fb2 100644 --- a/arch/blackfin/cpu/u-boot.lds +++ b/arch/blackfin/cpu/u-boot.lds @@ -1,5 +1,5 @@ /* - * U-boot - u-boot.lds.S + * U-Boot - u-boot.lds.S * * Copyright (c) 2005-2010 Analog Device Inc. * |