mmc: zynq: rename CONFIG_ZYNQ_SDHCI to CONFIG_MMC_SDHCI_ZYNQ

[u-boot] / tools / rkimage.c

diff --git a/tools/rkimage.c b/tools/rkimage.c
index 7b292f4235d1f43216c933cc5260b615bb73fbb0..ef31cb69444ec1573418769a84f94cd4e1d5917b 100644 (file)
--- a/tools/rkimage.c
+++ b/tools/rkimage.c
@@ -9,14 +9,10 @@
 
 #include "imagetool.h"
 #include <image.h>
+#include "rkcommon.h"
 
 static uint32_t header;
 
-static int rkimage_check_params(struct image_tool_params *params)
-{
-       return 0;
-}
-
 static int rkimage_verify_header(unsigned char *buf, int size,
                                 struct image_tool_params *params)
 {
@@ -30,7 +26,8 @@ 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)
 {
-       memcpy(buf, "RK32", 4);
+       memcpy(buf + RK_SPL_HDR_START, rkcommon_get_spl_hdr(params),
+              RK_SPL_HDR_SIZE);
 }
 
 static int rkimage_extract_subimage(void *buf, struct image_tool_params *params)
@@ -54,7 +51,7 @@ U_BOOT_IMAGE_TYPE(
        "Rockchip Boot Image support",
        4,
        &header,
-       rkimage_check_params,
+       rkcommon_check_params,
        rkimage_verify_header,
        rkimage_print_header,
        rkimage_set_header,