Skip to contentSkip to conversation

MX28: Cleanup mxsboot within make mrproper

PATCH New Marek Vasut 2 participants 6 messages Aug 29, 2012 – Sep 4, 2012

Subsystems (3)
Arm (32-bit) Arm i.MX and Layerscape Kbuild
lore
Share & tools
lore

Marek Vasut

author
#0 lore raw

PATCH 1/2 MX28: Cleanup mxsboot within make mrproper

Delete the "mxsboot" binary if make mrproper is called.

Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>
CC Albert Aribaud <[email protected]>
---
 Makefile |    1 +
 1 file changed, 1 insertion(+)
Makefile +1 -0
index ce40ab3..9e9d57c 100644
@@ -755,6 +755,7 @@ clean:
 	       $(obj)tools/gen_eth_addr    $(obj)tools/img2srec		  \
 	       $(obj)tools/mk{env,}image   $(obj)tools/mpc86x_clk	  \
 	       $(obj)tools/mk{smdk5250,}spl				  \
+	       $(obj)tools/mxsboot					  \
 	       $(obj)tools/ncb		   $(obj)tools/ubsha1
 	@rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image}	  \
 	       $(obj)board/matrix_vision/*/bootscript.img		  \
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 2/2 MX28: Fixup the ad-hoc use of DIGCTL_MICROSECONDS

Use proper struct-based access for this register in the SPL code.

Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>
---
 arch/arm/cpu/arm926ejs/mxs/spl_boot.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
arch/arm/cpu/arm926ejs/mxs/spl_boot.c +5 -3
index ddafddb..ad66c57 100644
@@ -38,12 +38,14 @@
  * takes a few seconds to roll. The boot doesn't take that long, so to keep the
  * code simple, it doesn't take rolling into consideration.
  */
-#define	HW_DIGCTRL_MICROSECONDS	0x8001c0c0
 void early_delay(int delay)
 {
-	uint32_t st = readl(HW_DIGCTRL_MICROSECONDS);
+	struct mxs_digctl_regs *digctl_regs =
+		(struct mxs_digctl_regs *)MXS_DIGCTL_BASE;
+
+	uint32_t st = readl(&digctl_regs->hw_digctl_microseconds);
 	st += delay;
-	while (st > readl(HW_DIGCTRL_MICROSECONDS))
+	while (st > readl(&digctl_regs->hw_digctl_microseconds))
 		;
 }
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/2 MX28: Fixup the ad-hoc use of DIGCTL_MICROSECONDS

Quoted 23 lines · Marek Vasut

Use proper struct-based access for this register in the SPL code.

Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>
---
 arch/arm/cpu/arm926ejs/mxs/spl_boot.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
arch/arm/cpu/arm926ejs/mxs/spl_boot.c +0 -2
index ddafddb..ad66c57 100644
@@ -38,12 +38,14 @@
  * takes a few seconds to roll. The boot doesn't take that long, so to keep the
  * code simple, it doesn't take rolling into consideration.
  */
-#define	HW_DIGCTRL_MICROSECONDS	0x8001c0c0
 void early_delay(int delay)
 {
-	uint32_t st = readl(HW_DIGCTRL_MICROSECONDS);

arch/arm/cpu/arm926ejs/mxs/spl_boot.c line 51

Quoted 10 lines
arch/arm/cpu/arm926ejs/mxs/spl_boot.c +5 -1
+	struct mxs_digctl_regs *digctl_regs =
+		(struct mxs_digctl_regs *)MXS_DIGCTL_BASE;
+
+	uint32_t st = readl(&digctl_regs->hw_digctl_microseconds);
 	st += delay;
-	while (st > readl(HW_DIGCTRL_MICROSECONDS))
+	while (st > readl(&digctl_regs->hw_digctl_microseconds))
 		;
 }
Acked-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#3 lore raw

PATCH 2/2 MX28: Fixup the ad-hoc use of DIGCTL_MICROSECONDS

In reply to Marek Vasut
Quoted 7 lines · Marek Vasut

Use proper struct-based access for this register in the SPL code.

Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>

---

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#4 lore raw

PATCH 1/2 MX28: Cleanup mxsboot within make mrproper

In reply to Marek Vasut
Quoted 17 lines · Marek Vasut

Delete the "mxsboot" binary if make mrproper is called.

Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>
CC Albert Aribaud <[email protected]>
---
 Makefile |    1 +
 1 file changed, 1 insertion(+)
Makefile +0 -0
index ce40ab3..9e9d57c 100644

Makefile clean: · line 761

Quoted 7 lines
Makefile +1 -0
@@ -755,6 +755,7 @@ clean:
 	       $(obj)tools/gen_eth_addr    $(obj)tools/img2srec		  \
 	       $(obj)tools/mk{env,}image   $(obj)tools/mpc86x_clk	  \
 	       $(obj)tools/mk{smdk5250,}spl				  \
+	       $(obj)tools/mxsboot					  \
 	       $(obj)tools/ncb		   $(obj)tools/ubsha1
 	@rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image}	  \
 	       $(obj)board/matrix_vision/*/bootscript.img		  \
Acked-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#5 lore raw

PATCH 1/2 MX28: Cleanup mxsboot within make mrproper

In reply to Marek Vasut
Quoted 17 lines · Marek Vasut

Delete the "mxsboot" binary if make mrproper is called.

Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>
CC Albert Aribaud <[email protected]>
---
 Makefile |    1 +
 1 file changed, 1 insertion(+)
Makefile +0 -0
index ce40ab3..9e9d57c 100644

Makefile clean: · line 761

Quoted 7 lines
Makefile +1 -0
@@ -755,6 +755,7 @@ clean:
 	       $(obj)tools/gen_eth_addr    $(obj)tools/img2srec		  \
 	       $(obj)tools/mk{env,}image   $(obj)tools/mpc86x_clk	  \
 	       $(obj)tools/mk{smdk5250,}spl				  \
+	       $(obj)tools/mxsboot					  \
 	       $(obj)tools/ncb		   $(obj)tools/ubsha1
 	@rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image}	  \
 	       $(obj)board/matrix_vision/*/bootscript.img		  \

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================