Merge branch 'master' of git://git.denx.de/u-boot-sh

[u-boot] / drivers / mmc / rpmb.c

diff --git a/drivers/mmc/rpmb.c b/drivers/mmc/rpmb.c
index 05936f5d1f344e7928c19ba116581cdae172b7aa..dfbdb0deb107f06ac3604000ccc8beeac1fa1fca 100644 (file)
--- a/drivers/mmc/rpmb.c
+++ b/drivers/mmc/rpmb.c
@@ -1,17 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2014, Staubli Faverges
  * Pierre Aubert
  *
  * eMMC- Replay Protected Memory Block
  * According to JEDEC Standard No. 84-A441
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <config.h>
 #include <common.h>
+#include <memalign.h>
 #include <mmc.h>
-#include <sha256.h>
+#include <u-boot/sha256.h>
 #include "mmc_private.h"
 
 /* Request codes */
@@ -66,7 +66,7 @@ struct s_rpmb {
        unsigned char mac[RPMB_SZ_MAC];
        unsigned char data[RPMB_SZ_DATA];
        unsigned char nonce[RPMB_SZ_NONCE];
-       unsigned long write_counter;
+       unsigned int write_counter;
        unsigned short address;
        unsigned short block_count;
        unsigned short result;