diff options
| author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2020-02-25 23:38:46 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-02-25 23:38:46 +0000 |
| commit | c723ef018f55c708b398f7d5b9868cd2b20c22f4 (patch) | |
| tree | d07194c23930b056016e82c86c7d92efd2d51c9c /lib | |
| parent | 093dce703296c82865fdaaa231f6287942d5039d (diff) | |
| parent | e21a788ee197ec66f6b8552e2274297bf4a095a8 (diff) | |
| download | platform_external_arm-trusted-firmware-c723ef018f55c708b398f7d5b9868cd2b20c22f4.tar.gz platform_external_arm-trusted-firmware-c723ef018f55c708b398f7d5b9868cd2b20c22f4.tar.bz2 platform_external_arm-trusted-firmware-c723ef018f55c708b398f7d5b9868cd2b20c22f4.zip | |
Merge changes from topic "console_t_cleanup" into integration
* changes:
coreboot: Use generic base address
skeletton: Use generic console_t data structure
cdns: Use generic console_t data structure
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/coreboot/coreboot_table.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/coreboot/coreboot_table.c b/lib/coreboot/coreboot_table.c index 63bdc6359..253fac2ac 100644 --- a/lib/coreboot/coreboot_table.c +++ b/lib/coreboot/coreboot_table.c @@ -75,7 +75,7 @@ static void expand_and_mmap(uintptr_t baseaddr, size_t size) static void setup_cbmem_console(uintptr_t baseaddr) { static console_cbmc_t console; - assert(!console.base); /* should only have one CBMEM console */ + assert(!console.console.base); /* should only have one CBMEM console */ /* CBMEM console structure stores its size in first header field. */ uint32_t size = *(uint32_t *)baseaddr; |