1
0
Fork 0
mirror of https://gitlab.com/bztsrc/bootboot.git synced 2023-02-13 20:54:32 -05:00

Merge branch 'small-fixes' into 'master'

Small fixes

See merge request bztsrc/bootboot!9
This commit is contained in:
bzt 2021-04-08 12:40:13 +00:00
commit e1682fe538
2 changed files with 2 additions and 1 deletions

View file

@ -1828,6 +1828,7 @@ viderr:
uart_puts(" * Entry point ");
uart_hex(entrypoint,8);
if(initstack != 1024) {
uart_putc('\n');
uart_puts(" * Stack Size ");
uart_hex(initstack,8);
}

View file

@ -326,7 +326,7 @@ void parsekernel(int idx, unsigned char *data, int v)
if(core_size + bss > 16 * 1024 * 1024) { if(v) { printf("invalid\r\n"); } fprintf(stderr,"mkbootimg: %s\r\n",lang[ERR_BIGSEG]); exit(1); }
if(v) {
if(!mm_addr && !fb_addr && !bb_addr && !env_addr)
printf("OKr\nComplies with BOOTBOOT Protocol Level 1, %s\r\n",lang[STATADDR]);
printf("OK\r\nComplies with BOOTBOOT Protocol Level 1, %s\r\n",lang[STATADDR]);
else
printf("OK\r\nComplies with BOOTBOOT Protocol Level %s2, %s\r\n",
(!mm_addr || (mm_addr&0xFFFFFFFF)==0xf8000000) && (!fb_addr || (fb_addr&0xFFFFFFFF)==0xfc000000) &&