Change in coreboot[4.8_branch]: cpu/allwinner: Prepend the BOOT0 header to the bootblock.bin
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35401 )
Change subject: cpu/allwinner: Prepend the BOOT0 header to the bootblock.bin ......................................................................
cpu/allwinner: Prepend the BOOT0 header to the bootblock.bin
Instead of prepending the BOOT0 header to the full coreboot.rom to create a new file called BOOT0, prepend to the bootblock.bin that gets included in BOOTBLOCK FMAP region.
Change-Id: I974a6aaa1a340c6b26f78b9d038be0f580331831 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/cpu/allwinner/a10/Makefile.inc 1 file changed, 3 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/35401/1
diff --git a/src/cpu/allwinner/a10/Makefile.inc b/src/cpu/allwinner/a10/Makefile.inc index a6cd4b4..9f5f6ac 100644 --- a/src/cpu/allwinner/a10/Makefile.inc +++ b/src/cpu/allwinner/a10/Makefile.inc @@ -25,8 +25,6 @@ romstage-y += uart.c uart_console.c ramstage-y += uart.c uart_console.c
-real-target: $(obj)/BOOT0 - get_bootblock_size= \ $(eval bb_s=$(shell $(CBFSTOOL) $(1) print | grep bootblocksize | \ sed 's/[^0-9 ]//g')) \ @@ -46,11 +44,11 @@ # under util/arm_boot_tools/mksunxiboot. The boot ROM will load at most 24KiB of # data to SRAM. The BOOT0 header takes 32 bytes, so bootblock is limited to # 24KiB - 32 bytes. -# TODO: make mksunxiboot take the bootblock size as a parameter # TODO: print an error if bootblock is too large (maybe place ROMSTAGE at the # exact offset needed to collide with the bootblock) # FIXME: A10 loads 24KiB. According to Oliver other chips load a little more # -$(obj)/BOOT0: $(obj)/coreboot.rom $(MKSUNXIBOOT) - @printf " BOOT0 $(subst $(obj)/,,$(^))\n" + +$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin $(MKSUNXIBOOT) + @printf " Prepending BOOT0 header $(subst $(obj)/,,$(^))\n" $(MKSUNXIBOOT) $(word 1, $^) $@
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35401
to look at the new patch set (#2).
Change subject: cpu/allwinner: Prepend the BOOT0 header to the bootblock.bin ......................................................................
cpu/allwinner: Prepend the BOOT0 header to the bootblock.bin
Instead of prepending the BOOT0 header to the full coreboot.rom to create a new file called BOOT0, prepend to the bootblock.bin that gets included in BOOTBLOCK FMAP region.
This updates mksunxiboot to reflect that it only operates on the raw bootblock.bin and not the final image which as some padding in the BOOTBLOCK FMAP region: - given the necessary alignment on some boot media assume that the remainder bytes after the bootblock will be filled with 1's - don't allow bootblocks larger than 24K as the BROM won't load these fully anyway.
Change-Id: I974a6aaa1a340c6b26f78b9d038be0f580331831 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/cpu/allwinner/a10/Makefile.inc M util/arm_boot_tools/mksunxiboot/mksunxiboot.c 2 files changed, 15 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/35401/2
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35401 )
Change subject: cpu/allwinner: Prepend the BOOT0 header to the bootblock.bin ......................................................................
Patch Set 2:
(3 comments)
https://review.coreboot.org/c/coreboot/+/35401/2/util/arm_boot_tools/mksunxi... File util/arm_boot_tools/mksunxiboot/mksunxiboot.c:
https://review.coreboot.org/c/coreboot/+/35401/2/util/arm_boot_tools/mksunxi... PS2, Line 65: static int fill_check_sum(struct boot_file_head *hdr, const void *boot_code, size_t load_size) line over 80 characters
https://review.coreboot.org/c/coreboot/+/35401/2/util/arm_boot_tools/mksunxi... PS2, Line 91: for (i = 0; i < hdr->length - load_size- HEADER_SIZE; i +=4) need consistent spacing around '-' (ctx:VxW)
https://review.coreboot.org/c/coreboot/+/35401/2/util/arm_boot_tools/mksunxi... PS2, Line 91: for (i = 0; i < hdr->length - load_size- HEADER_SIZE; i +=4) spaces required around that '+=' (ctx:WxV)
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35401
to look at the new patch set (#3).
Change subject: cpu/allwinner: Prepend the BOOT0 header to the bootblock.bin ......................................................................
cpu/allwinner: Prepend the BOOT0 header to the bootblock.bin
Instead of prepending the BOOT0 header to the full coreboot.rom to create a new file called BOOT0, prepend to the bootblock.bin that gets included in BOOTBLOCK FMAP region.
This updates mksunxiboot to reflect that it only operates on the raw bootblock.bin and not the final image which as some padding in the BOOTBLOCK FMAP region: - given the necessary alignment on some boot media assume that the remainder bytes after the bootblock will be filled with 1's - don't allow bootblocks larger than 24K as the BROM won't load these fully anyway.
Change-Id: I974a6aaa1a340c6b26f78b9d038be0f580331831 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/cpu/allwinner/a10/Makefile.inc M util/arm_boot_tools/mksunxiboot/mksunxiboot.c 2 files changed, 15 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/35401/3
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35401 )
Change subject: cpu/allwinner: Prepend the BOOT0 header to the bootblock.bin ......................................................................
Patch Set 3:
(2 comments)
https://review.coreboot.org/c/coreboot/+/35401/3/util/arm_boot_tools/mksunxi... File util/arm_boot_tools/mksunxiboot/mksunxiboot.c:
https://review.coreboot.org/c/coreboot/+/35401/3/util/arm_boot_tools/mksunxi... PS3, Line 65: static int fill_check_sum(struct boot_file_head *hdr, const void *boot_code, size_t load_size) line over 80 characters
https://review.coreboot.org/c/coreboot/+/35401/3/util/arm_boot_tools/mksunxi... PS3, Line 91: for (i = 0; i < hdr->length - load_size - HEADER_SIZE; i +=4) spaces required around that '+=' (ctx:WxV)
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35401
to look at the new patch set (#4).
Change subject: cpu/allwinner: Prepend the BOOT0 header to the bootblock.bin ......................................................................
cpu/allwinner: Prepend the BOOT0 header to the bootblock.bin
Instead of prepending the BOOT0 header to the full coreboot.rom to create a new file called BOOT0, prepend to the bootblock.bin that gets included in BOOTBLOCK FMAP region.
This updates mksunxiboot to reflect that it only operates on the raw bootblock.bin and not the final image which as some padding in the BOOTBLOCK FMAP region: - given the necessary alignment on some boot media assume that the remainder bytes after the bootblock will be filled with 1's - don't allow bootblocks larger than 24K as the BROM won't load these fully anyway.
Change-Id: I974a6aaa1a340c6b26f78b9d038be0f580331831 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/cpu/allwinner/a10/Makefile.inc M util/arm_boot_tools/mksunxiboot/mksunxiboot.c 2 files changed, 16 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/35401/4
Martin L Roth has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/35401?usp=email )
Change subject: cpu/allwinner: Prepend the BOOT0 header to the bootblock.bin ......................................................................
Abandoned
This patch has not been touched in over 12 months. Anyone who wants to take over work on this patch, please feel free to restore it and do any work needed to get it merged. If you create a new patch based on this work, please credit the original author.
-
Arthur Heymans (Code Review) -
build bot (Jenkins) (Code Review)
-
Martin L Roth (Code Review)