diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/common/aarch64/el3_common_macros.S | 4 | ||||
| -rw-r--r-- | include/drivers/console.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/common/aarch64/el3_common_macros.S b/include/common/aarch64/el3_common_macros.S index d5f527aa3..03b977e36 100644 --- a/include/common/aarch64/el3_common_macros.S +++ b/include/common/aarch64/el3_common_macros.S @@ -20,7 +20,7 @@ * * SCTLR_EL3.I: Enable the instruction cache. * - * SCTLR_EL3.SA: Enable Stack Aligment check. A SP alignment fault + * SCTLR_EL3.SA: Enable Stack Alignment check. A SP alignment fault * exception is generated if a load or store instruction executed at * EL3 uses the SP as the base address and the SP is not aligned to a * 16-byte boundary. @@ -186,7 +186,7 @@ * XN (Execute-never). Set to zero so that this control has no * effect on memory access permissions. * - * SCTLR_EL3.SA: Set to zero to disable Stack Aligment check. + * SCTLR_EL3.SA: Set to zero to disable Stack Alignment check. * * SCTLR_EL3.A: Set to zero to disable Alignment fault checking. * ------------------------------------------------------------- diff --git a/include/drivers/console.h b/include/drivers/console.h index 0855170eb..a4d89fe91 100644 --- a/include/drivers/console.h +++ b/include/drivers/console.h @@ -34,13 +34,17 @@ typedef struct console { struct console *next; + /* + * Only the low 32 bits are used. The type is u_register_t to align the + * fields of the struct to 64 bits in AArch64 and 32 bits in AArch32 + */ u_register_t flags; int (*putc)(int character, struct console *console); int (*getc)(struct console *console); int (*flush)(struct console *console); /* Additional private driver data may follow here. */ } console_t; -#include <console_assertions.h> /* offset macro assertions for console_t */ +#include <console_assertions.h> /* offset macro assertions for console_t */ /* * NOTE: There is no publicly accessible console_register() function. Consoles |