Merge git://git.denx.de/u-boot-dm

[people/ms/u-boot.git] / tools / rkspi.c

diff --git a/tools/rkspi.c b/tools/rkspi.c
index 87bd1a9e6eb950cab10962076bc8719dd5a8cda8..4332ce17652172f7c43a6cb5eb3107791b3bee87 100644 (file)
--- a/tools/rkspi.c
+++ b/tools/rkspi.c
@@ -17,16 +17,6 @@ enum {
        RKSPI_SECT_LEN          = RK_BLK_SIZE * 4,
 };
 
-static int rkspi_verify_header(unsigned char *buf, int size,
-                              struct image_tool_params *params)
-{
-       return 0;
-}
-
-static void rkspi_print_header(const void *buf)
-{
-}
-
 static void rkspi_set_header(void *buf, struct stat *sbuf, int ifd,
                             struct image_tool_params *params)
 {
@@ -58,11 +48,6 @@ static void rkspi_set_header(void *buf, struct stat *sbuf, int ifd,
        }
 }
 
-static int rkspi_extract_subimage(void *buf, struct image_tool_params *params)
-{
-       return 0;
-}
-
 static int rkspi_check_image_type(uint8_t type)
 {
        if (type == IH_TYPE_RKSPI)
@@ -78,7 +63,7 @@ static int rkspi_check_image_type(uint8_t type)
 static int rkspi_vrec_header(struct image_tool_params *params,
                             struct image_type_params *tparams)
 {
-       int padding = rkcommon_vrec_header(params, tparams, 2048);
+       int padding = rkcommon_vrec_header(params, tparams, RK_INIT_SIZE_ALIGN);
        /*
         * The file size has not been adjusted at this point (our caller will
         * eventually add the header/padding to the file_size), so we need to
@@ -112,10 +97,10 @@ U_BOOT_IMAGE_TYPE(
        0,
        NULL,
        rkcommon_check_params,
-       rkspi_verify_header,
-       rkspi_print_header,
+       rkcommon_verify_header,
+       rkcommon_print_header,
        rkspi_set_header,
-       rkspi_extract_subimage,
+       NULL,
        rkspi_check_image_type,
        NULL,
        rkspi_vrec_header