mmc: refactor MMC startup to make it easier to support new modes

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

diff --git a/drivers/mmc/rpmb.c b/drivers/mmc/rpmb.c
index 05936f5d1f344e7928c19ba116581cdae172b7aa..0b6b6222bdce9ae7c44a4510d01dfa18de40c22c 100644 (file)
--- a/drivers/mmc/rpmb.c
+++ b/drivers/mmc/rpmb.c
@@ -10,8 +10,9 @@
 
 #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 +67,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;