diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-06-19 14:00:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-19 14:00:07 +0100 |
| commit | 7fb3a70bffc7b77d1aec8fa1ea895f3f1a218315 (patch) | |
| tree | bd0e073eb708c547d6d3a06e984e940bfa42ac15 /include | |
| parent | c0b7606f914e2ab913f969fb3d1af1380a8590d3 (diff) | |
| parent | 88a0523e914cb28fded2ce398a184e0c0e8843c8 (diff) | |
| download | platform_external_arm-trusted-firmware-7fb3a70bffc7b77d1aec8fa1ea895f3f1a218315.tar.gz platform_external_arm-trusted-firmware-7fb3a70bffc7b77d1aec8fa1ea895f3f1a218315.tar.bz2 platform_external_arm-trusted-firmware-7fb3a70bffc7b77d1aec8fa1ea895f3f1a218315.zip | |
Merge pull request #1418 from antonio-nino-diaz-arm/an/arm-multi-console
plat/arm: Migrate AArch64 port to the multi console driver
Diffstat (limited to 'include')
| -rw-r--r-- | include/drivers/console.h | 6 | ||||
| -rw-r--r-- | include/plat/arm/board/common/board_arm_def.h | 2 | ||||
| -rw-r--r-- | include/plat/arm/common/plat_arm.h | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/include/drivers/console.h b/include/drivers/console.h index a4d89fe91..6e7ebbf9c 100644 --- a/include/drivers/console.h +++ b/include/drivers/console.h @@ -16,9 +16,9 @@ #define CONSOLE_T_FLUSH (U(4) * REGSZ) #define CONSOLE_T_DRVDATA (U(5) * REGSZ) -#define CONSOLE_FLAG_BOOT BIT(0) -#define CONSOLE_FLAG_RUNTIME BIT(1) -#define CONSOLE_FLAG_CRASH BIT(2) +#define CONSOLE_FLAG_BOOT (U(1) << 0) +#define CONSOLE_FLAG_RUNTIME (U(1) << 1) +#define CONSOLE_FLAG_CRASH (U(1) << 2) /* Bits 3 to 7 reserved for additional scopes in future expansion. */ #define CONSOLE_FLAG_SCOPE_MASK ((U(1) << 8) - 1) /* Bits 8 to 31 reserved for non-scope use in future expansion. */ diff --git a/include/plat/arm/board/common/board_arm_def.h b/include/plat/arm/board/common/board_arm_def.h index 2d8e4c139..030e06737 100644 --- a/include/plat/arm/board/common/board_arm_def.h +++ b/include/plat/arm/board/common/board_arm_def.h @@ -89,7 +89,7 @@ #if TRUSTED_BOARD_BOOT # define PLAT_ARM_MAX_BL2_SIZE 0x1E000 #else -# define PLAT_ARM_MAX_BL2_SIZE 0x10000 +# define PLAT_ARM_MAX_BL2_SIZE 0x11000 #endif /* diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index fc3f4ec3a..33f2c7dbe 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -155,6 +155,12 @@ struct tzc_dmc500_driver_data; void arm_tzc_dmc500_setup(struct tzc_dmc500_driver_data *plat_driver_data, const arm_tzc_regions_info_t *tzc_regions); +/* Console utility functions */ +void arm_console_boot_init(void); +void arm_console_boot_end(void); +void arm_console_runtime_init(void); +void arm_console_runtime_end(void); + /* Systimer utility function */ void arm_configure_sys_timer(void); |