diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2018-10-25 11:54:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-25 11:54:22 +0200 |
| commit | 583cb003b3fb4958d5626857a16ee2cce6b6815c (patch) | |
| tree | 0b93dd0e4e1e5b03a650393c9077d18410c67767 /drivers/arm | |
| parent | 2ebacb880b4c35a44aece43d6967c1eb2018cf86 (diff) | |
| parent | cc5859ca19ff546c35eb0331000dae090b6eabcf (diff) | |
Merge pull request #1640 from soby-mathew/sm/fin_con_reg
Multi-console: Deprecate the `finish_console_register` macro
Diffstat (limited to 'drivers/arm')
| -rw-r--r-- | drivers/arm/pl011/aarch32/pl011_console.S | 3 | ||||
| -rw-r--r-- | drivers/arm/pl011/aarch64/pl011_console.S | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/arm/pl011/aarch32/pl011_console.S b/drivers/arm/pl011/aarch32/pl011_console.S index 841ea446..46ff2258 100644 --- a/drivers/arm/pl011/aarch32/pl011_console.S +++ b/drivers/arm/pl011/aarch32/pl011_console.S @@ -6,6 +6,7 @@ #include <arch.h> #include <asm_macros.S> #include <assert_macros.S> +#define USE_FINISH_CONSOLE_REG_2 #include <console_macros.S> #include <pl011.h> @@ -116,7 +117,7 @@ func console_pl011_register mov r0, r4 pop {r4, lr} - finish_console_register pl011 + finish_console_register pl011 putc=1, getc=1, flush=1 register_fail: pop {r4, pc} diff --git a/drivers/arm/pl011/aarch64/pl011_console.S b/drivers/arm/pl011/aarch64/pl011_console.S index d6a2d6b8..3886f3b7 100644 --- a/drivers/arm/pl011/aarch64/pl011_console.S +++ b/drivers/arm/pl011/aarch64/pl011_console.S @@ -6,6 +6,7 @@ #include <arch.h> #include <asm_macros.S> #include <assert_macros.S> +#define USE_FINISH_CONSOLE_REG_2 #include <console_macros.S> #include <pl011.h> @@ -110,7 +111,7 @@ func console_pl011_register mov x0, x6 mov x30, x7 - finish_console_register pl011 + finish_console_register pl011 putc=1, getc=1, flush=1 register_fail: ret x7 |