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 /plat | |
| parent | 2ebacb880b4c35a44aece43d6967c1eb2018cf86 (diff) | |
| parent | cc5859ca19ff546c35eb0331000dae090b6eabcf (diff) | |
| download | platform_external_arm-trusted-firmware-583cb003b3fb4958d5626857a16ee2cce6b6815c.tar.gz platform_external_arm-trusted-firmware-583cb003b3fb4958d5626857a16ee2cce6b6815c.tar.bz2 platform_external_arm-trusted-firmware-583cb003b3fb4958d5626857a16ee2cce6b6815c.zip | |
Merge pull request #1640 from soby-mathew/sm/fin_con_reg
Multi-console: Deprecate the `finish_console_register` macro
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/imx/common/lpuart_console.S | 3 | ||||
| -rw-r--r-- | plat/layerscape/common/aarch64/ls_console.S | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/plat/imx/common/lpuart_console.S b/plat/imx/common/lpuart_console.S index ad71b89f2..668fd6249 100644 --- a/plat/imx/common/lpuart_console.S +++ b/plat/imx/common/lpuart_console.S @@ -6,6 +6,7 @@ #include <arch.h> #include <asm_macros.S> +#define USE_FINISH_CONSOLE_REG_2 #include <console_macros.S> #include <assert_macros.S> #include "imx8_lpuart.h" @@ -26,7 +27,7 @@ func console_lpuart_register mov x0, x6 mov x30, x7 - finish_console_register lpuart + finish_console_register lpuart putc=1, getc=1 register_fail: ret x7 diff --git a/plat/layerscape/common/aarch64/ls_console.S b/plat/layerscape/common/aarch64/ls_console.S index 5c87465eb..ec4390a69 100644 --- a/plat/layerscape/common/aarch64/ls_console.S +++ b/plat/layerscape/common/aarch64/ls_console.S @@ -6,6 +6,7 @@ #include <arch.h> #include <asm_macros.S> +#define USE_FINISH_CONSOLE_REG_2 #include <console_macros.S> #include <assert_macros.S> #include "ls_16550.h" @@ -106,7 +107,7 @@ func console_ls_16550_register mov x0, x6 mov x30, x7 - finish_console_register ls_16550 + finish_console_register ls_16550 putc=1, getc=1, flush=1 register_fail: ret x7 |