On Fri, 18 Mar 2022 00:00:42 -0500 Samuel Holland <sam...@sholland.org> wrote:
> This series adds support for the TOC0 image format used by the Allwinner > secure boot ROM (SBROM). This series has been tested on the following > SoCs/boards, with the eFuse burnt to enable secure mode: > - A50: Ainol Q88 Tablet > - A64: Pine A64 Plus > - H5: Orange Pi Zero Plus > - H6: Pine H64 Model B > - H616: Orange Pi Zero 2 > > This time I also tested it on boards that are not switched to secure > mode (with A64, H3, and H5). > > Due to both series changing Makefile.spl, the last patch depends on: > https://patchwork.ozlabs.org/project/uboot/list/?series=267136 > I have seen no comments on that series, so I assume that it is ready to > merge along with this one. Fixed up the 32-bit build issue in patch 2/3, then merged into sunxi/master (together with Icenowy's RISC-V series). All landed in mainline now. Thanks! Andre > > Changes in v5: > - Rebased on top of suniv platform additions > - Took care of additional hardcoded offset in SPL SPI code > - Dropped controversial Kconfig patch > > Changes in v4: > - Do not select TOOLS_LIBCRYPTO anywhere > > Changes in v3: > - Removed TOOLS_LIBCRYPTO selection for sunxi, since most boards > do not need it > - Added __packed to all new "ABI" structs > - Added entry to MAINTAINERS for sunxi tools > - Fixed offset of magic passed to memcmp > - Refactored functions to not return pointers (fixes ambiguous NULL) > > Changes in v2: > - Moved certificate and key item structures out of sunxi_image.h > - Renamed "main" and "item" variables for clarity > - Improved error messages, and added a hint about key generation > - Added a comment explaining the purpose of the various key files > - Mentioned testing this code on A50 in the commit message > - Moved SPL header signature checks out of sunxi_image.h > - Refactored SPL header signature checks to use fewer casts > - Rebase on top of Icenowy's RISC-V support series > - Rename Kconfig symbols to include the full image type name > > Samuel Holland (3): > tools: mkimage: Add Allwinner TOC0 support > sunxi: Support SPL in both eGON and TOC0 images > sunxi: Support building a SPL as a TOC0 image > > MAINTAINERS | 1 + > arch/arm/include/asm/arch-sunxi/spl.h | 3 +- > arch/arm/mach-sunxi/Kconfig | 2 + > arch/arm/mach-sunxi/board.c | 39 +- > arch/arm/mach-sunxi/spl_spi_sunxi.c | 2 +- > board/sunxi/Kconfig | 24 + > boot/image.c | 1 + > include/image.h | 1 + > include/sunxi_image.h | 37 ++ > scripts/Makefile.spl | 5 +- > tools/Makefile | 7 +- > tools/sunxi_toc0.c | 907 ++++++++++++++++++++++++++ > 12 files changed, 1013 insertions(+), 16 deletions(-) > create mode 100644 board/sunxi/Kconfig > create mode 100644 tools/sunxi_toc0.c >