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/x86 | |
| parent | 7b6dc11c1aa69e5cc22d1659f50594edcfab5a9e (diff) | |
| parent | 2300184f702656b72394e458bf15f7aaba8af892 (diff) | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/cpu/resetvec.S | 2 | ||||
| -rw-r--r-- | arch/x86/lib/bootm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/cpu/resetvec.S b/arch/x86/cpu/resetvec.S index 68a5b947d8..183275b9c2 100644 --- a/arch/x86/cpu/resetvec.S +++ b/arch/x86/cpu/resetvec.S @@ -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> diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index f441c84df5..783be691af 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -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 |