diff options
| author | Tom Rini <trini@konsulko.com> | 2023-04-07 10:44:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-04-07 10:44:19 -0400 |
| commit | 340bebf9c799793affefd166875d5776744988bd (patch) | |
| tree | 193a646521cf659f333c5e1c11745116259b0477 /lib/lmb.c | |
| parent | b0b77fdf3d7d2c1a5e48c3971a677f14e372c164 (diff) | |
| parent | a554ee7edee8e10b38c6899ad8556daf58ca3afe (diff) | |
Merge branch '2023-04-06-assorted-updates'
- Make use of the semi-formal "fallthrough" mechanism, update env tools
to use /run for lockfile, add 2048 game (as a way to test console
changes), update some CONFIG option logic in Kconfig, have lmb command
show regions in use, remove some duplicate serial code, add
__gnu_thumb1_case_si code and fix m68k custodian email address.
Diffstat (limited to 'lib/lmb.c')
| -rw-r--r-- | lib/lmb.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -27,7 +27,7 @@ static void lmb_dump_region(struct lmb_region *rgn, char *name) enum lmb_flags flags; int i; - printf(" %s.cnt = 0x%lx\n", name, rgn->cnt); + printf(" %s.cnt = 0x%lx / max = 0x%lx\n", name, rgn->cnt, rgn->max); for (i = 0; i < rgn->cnt; i++) { base = rgn->region[i].base; @@ -110,7 +110,7 @@ void lmb_init(struct lmb *lmb) #if IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS) lmb->memory.max = CONFIG_LMB_MAX_REGIONS; lmb->reserved.max = CONFIG_LMB_MAX_REGIONS; -#elif defined(CONFIG_LMB_MEMORY_REGIONS) +#else lmb->memory.max = CONFIG_LMB_MEMORY_REGIONS; lmb->reserved.max = CONFIG_LMB_RESERVED_REGIONS; lmb->memory.region = lmb->memory_regions; |