File 0003-Revert-rockchip-mkimage-remove-plac.patch of Package u-boot-firefly-rk3399.12341

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-Revert-rockchip-mkimage-remove-plac.patch of Package u-boot-firefly-rk3399.12341

From f45226d20a4bcdeedc3226f272ecd07ed9fa743c Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gardet@free.fr>
Date: Thu, 22 Jun 2017 10:04:06 +0200
Subject: [PATCH] Revert 'rockchip: mkimage: remove placeholder functions from
 rkimage'

Revert commit 253c60a557d6740f15169a1f15772d7e64928d9b as it breaks the
return value of 'mkimage -T rkimage' and print the following  error:
'./tools/mkimage: Can't print header for Rockchip Boot Image support: Success'

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>

Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>
---
 tools/rkimage.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/tools/rkimage.c b/tools/rkimage.c
index 9880b1569f..44d098c775 100644
--- a/tools/rkimage.c
+++ b/tools/rkimage.c
@@ -13,6 +13,16 @@
 
 static uint32_t header;
 
+static int rkimage_verify_header(unsigned char *buf, int size,
+				 struct image_tool_params *params)
+{
+	return 0;
+}
+
+static void rkimage_print_header(const void *buf)
+{
+}
+
 static void rkimage_set_header(void *buf, struct stat *sbuf, int ifd,
 			       struct image_tool_params *params)
 {
@@ -23,6 +33,11 @@ static void rkimage_set_header(void *buf, struct stat *sbuf, int ifd,
 		rkcommon_rc4_encode_spl(buf, 4, params->file_size);
 }
 
+static int rkimage_extract_subimage(void *buf, struct image_tool_params *params)
+{
+	return 0;
+}
+
 static int rkimage_check_image_type(uint8_t type)
 {
 	if (type == IH_TYPE_RKIMAGE)
@@ -40,10 +55,10 @@ U_BOOT_IMAGE_TYPE(
 	4,
 	&header,
 	rkcommon_check_params,
-	NULL,
-	NULL,
+	rkimage_verify_header,
+	rkimage_print_header,
 	rkimage_set_header,
-	NULL,
+	rkimage_extract_subimage,
 	rkimage_check_image_type,
 	NULL,
 	NULL

Places

File 0003-Revert-rockchip-mkimage-remove-plac.patch of Package u-boot-firefly-rk3399.12341

Places