From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cvIDo-0005XN-IS for barebox@lists.infradead.org; Tue, 04 Apr 2017 06:45:46 +0000 Date: Tue, 4 Apr 2017 08:45:22 +0200 From: Sascha Hauer Message-ID: <20170404064522.7k7ao43jtmtqj5vt@pengutronix.de> References: <20170328091416.16715-1-o.rempel@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170328091416.16715-1-o.rempel@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH v1] i.MX: hab: fix compile after define renames To: Oleksij Rempel Cc: barebox@lists.infradead.org On Tue, Mar 28, 2017 at 11:14:16AM +0200, Oleksij Rempel wrote: > 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 > --- > drivers/hab/hab.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Applied, thanks Sascha > > 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 > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox