mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Oleksij Rempel <o.rempel@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Subject: [PATCH v1] i.MX: hab: fix compile after define renames
Date: Tue, 28 Mar 2017 11:14:16 +0200	[thread overview]
Message-ID: <20170328091416.16715-1-o.rempel@pengutronix.de> (raw)

Some defines was renamed by this patch:
| commit 75e98198234ce18ab15f581cf7b52aaf0b46d792
| i.MX: Add fusemap for VF610

which was not included in my initial patch. So fix it.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
 drivers/hab/hab.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/hab/hab.c b/drivers/hab/hab.c
index 56d49e8e3..512ff7ecf 100644
--- a/drivers/hab/hab.c
+++ b/drivers/hab/hab.c
@@ -126,7 +126,7 @@ static int imx_hab_read_srk_hash_ocotp(u8 *__srk)
 	int ret, i;
 
 	for (i = 0; i < SRK_HASH_SIZE / sizeof(uint32_t); i++) {
-		ret = imx_ocotp_read_field(IMX6_OCOTP_SRK_HASH(i), &srk[i]);
+		ret = imx_ocotp_read_field(OCOTP_SRK_HASH(i), &srk[i]);
 		if (ret < 0)
 			return ret;
 	}
@@ -140,13 +140,13 @@ static int imx_hab_write_srk_hash_ocotp(const u8 *__newsrk, unsigned flags)
 	int ret, i;
 
 	for (i = 0; i < SRK_HASH_SIZE / sizeof(uint32_t); i++) {
-		ret = imx_ocotp_write_field(IMX6_OCOTP_SRK_HASH(i), newsrk[i]);
+		ret = imx_ocotp_write_field(OCOTP_SRK_HASH(i), newsrk[i]);
 		if (ret < 0)
 			return ret;
 	}
 
 	if (flags & IMX_SRK_HASH_WRITE_LOCK) {
-		ret = imx_ocotp_write_field(IMX6_OCOTP_SRK_LOCK, 1);
+		ret = imx_ocotp_write_field(OCOTP_SRK_LOCK, 1);
 		if (ret < 0)
 			return ret;
 	}
@@ -161,7 +161,7 @@ static int imx_hab_permanent_write_enable_ocotp(int enable)
 
 static int imx_hab_lockdown_device_ocotp(void)
 {
-	return imx_ocotp_write_field(IMX6_OCOTP_SEC_CONFIG, 1);
+	return imx_ocotp_write_field(OCOTP_SEC_CONFIG_1, 1);
 }
 
 static int imx_hab_device_locked_down_ocotp(void)
@@ -169,7 +169,7 @@ static int imx_hab_device_locked_down_ocotp(void)
 	int ret;
 	unsigned int v;
 
-	ret = imx_ocotp_read_field(IMX6_OCOTP_SEC_CONFIG, &v);
+	ret = imx_ocotp_read_field(OCOTP_SEC_CONFIG_1, &v);
 	if (ret < 0)
 		return ret;
 
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2017-03-28  9:14 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-28  9:14 Oleksij Rempel [this message]
2017-04-04  6:45 ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170328091416.16715-1-o.rempel@pengutronix.de \
    --to=o.rempel@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox