From 308277569229137e38420dbaa1190ef1f9d4be76 Mon Sep 17 00:00:00 2001 From: Philipp Tomsich Date: Wed, 15 Mar 2017 12:08:45 +0100 Subject: rockchip: mkimage: update rkimage to support pre-padded payloads To simplify the creation of AArch64 SPL images for the RK3399, we use the ENABLE_ARM_SOC_BOOT0_HOOK option and prepend 4 bytes of padding at the start of the text section. This makes it easy for mkimage to rewrite this word with the 'RK33' boot magic. This change brings logic to calculate the header size and allocate the header back in sync. For the RK3399 we now limit the header to before the payload (i.e. the 'header0' and the padding up to the actual image) and overwrite the first word (inserted by the boot0-hook for this purpose) with the 'RK33' magic in-place. X-AffectedPlatforms: RK3399-Q7 Signed-off-by: Philipp Tomsich Tested-by: Klaus Goger --- tools/rkcommon.h | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'tools/rkcommon.h') diff --git a/tools/rkcommon.h b/tools/rkcommon.h index 3d645168c2..cc161a647c 100644 --- a/tools/rkcommon.h +++ b/tools/rkcommon.h @@ -33,19 +33,6 @@ int rkcommon_check_params(struct image_tool_params *params); */ const char *rkcommon_get_spl_hdr(struct image_tool_params *params); -/** - * rkcommon_get_spl_hdr_padto8() - check if we need to pad to 8 bytes - * - * Rockchip's bootrom starts execution right after the SPL header (i.e. - * at offset 4), but we can not reasonably align the test section of - * an AArch64 SPL at 4 bytes (as this would break natural alignment - * and any embedded constants might cause an alignment exception, which - * is illegal in privileged modes). - * - * Padding is (for now) assumed to occur with a single AArch64 'nop'. - */ -const bool rkcommon_get_spl_hdr_padto8(struct image_tool_params *params); - /** * rkcommon_get_spl_size() - get spl size for a Rockchip boot image * -- cgit v1.2.3