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/arm/cpu/armv7/nonsec_virt.S | |
| parent | 7b6dc11c1aa69e5cc22d1659f50594edcfab5a9e (diff) | |
| parent | 2300184f702656b72394e458bf15f7aaba8af892 (diff) | |
| download | talos-obmc-uboot-57dc53a72460e8e301fa1cc7951b41db8e731485.tar.gz talos-obmc-uboot-57dc53a72460e8e301fa1cc7951b41db8e731485.zip | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Diffstat (limited to 'arch/arm/cpu/armv7/nonsec_virt.S')
| -rw-r--r-- | arch/arm/cpu/armv7/nonsec_virt.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index 31d1c9e348..b7563edbe6 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -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 |
