* [U-Boot] [PATCH 1/2] MX28: Cleanup mxsboot within make mrproper
@ 2012-08-29 1:15 Marek Vasut
2012-08-29 1:15 ` [U-Boot] [PATCH 2/2] MX28: Fixup the ad-hoc use of DIGCTL_MICROSECONDS Marek Vasut
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Marek Vasut @ 2012-08-29 1:15 UTC (permalink / raw)
To: u-boot
Delete the "mxsboot" binary if make mrproper is called.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
CC: Albert Aribaud <albert.u.boot@aribaud.net>
---
Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile
index ce40ab3..9e9d57c 100644
--- a/Makefile
+++ b/Makefile
@@ -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 \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 2/2] MX28: Fixup the ad-hoc use of DIGCTL_MICROSECONDS
2012-08-29 1:15 [U-Boot] [PATCH 1/2] MX28: Cleanup mxsboot within make mrproper Marek Vasut
@ 2012-08-29 1:15 ` Marek Vasut
2012-08-29 7:51 ` Stefano Babic
2012-09-04 10:02 ` Stefano Babic
2012-08-29 7:51 ` [U-Boot] [PATCH 1/2] MX28: Cleanup mxsboot within make mrproper Stefano Babic
2012-09-04 10:02 ` Stefano Babic
2 siblings, 2 replies; 6+ messages in thread
From: Marek Vasut @ 2012-08-29 1:15 UTC (permalink / raw)
To: u-boot
Use proper struct-based access for this register in the SPL code.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <festevam@freescale.com>
---
arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index ddafddb..ad66c57 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -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))
;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 2/2] MX28: Fixup the ad-hoc use of DIGCTL_MICROSECONDS
2012-08-29 1:15 ` [U-Boot] [PATCH 2/2] MX28: Fixup the ad-hoc use of DIGCTL_MICROSECONDS Marek Vasut
@ 2012-08-29 7:51 ` Stefano Babic
2012-09-04 10:02 ` Stefano Babic
1 sibling, 0 replies; 6+ messages in thread
From: Stefano Babic @ 2012-08-29 7:51 UTC (permalink / raw)
To: u-boot
On 29/08/2012 03:15, Marek Vasut wrote:
> Use proper struct-based access for this register in the SPL code.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Fabio Estevam <festevam@freescale.com>
> ---
> arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
> index ddafddb..ad66c57 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
> @@ -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))
> ;
> }
>
>
Acked-by: Stefano Babic <sbabic@denx.de>
Best regards,
Stefano Babic
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 2/2] MX28: Fixup the ad-hoc use of DIGCTL_MICROSECONDS
2012-08-29 1:15 ` [U-Boot] [PATCH 2/2] MX28: Fixup the ad-hoc use of DIGCTL_MICROSECONDS Marek Vasut
2012-08-29 7:51 ` Stefano Babic
@ 2012-09-04 10:02 ` Stefano Babic
1 sibling, 0 replies; 6+ messages in thread
From: Stefano Babic @ 2012-09-04 10:02 UTC (permalink / raw)
To: u-boot
On 29/08/2012 03:15, Marek Vasut wrote:
> Use proper struct-based access for this register in the SPL code.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Fabio Estevam <festevam@freescale.com>
> ---
Applied to u-boot-imx, thanks.
Best regards,
Stefano Babic
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 1/2] MX28: Cleanup mxsboot within make mrproper
2012-08-29 1:15 [U-Boot] [PATCH 1/2] MX28: Cleanup mxsboot within make mrproper Marek Vasut
2012-08-29 1:15 ` [U-Boot] [PATCH 2/2] MX28: Fixup the ad-hoc use of DIGCTL_MICROSECONDS Marek Vasut
@ 2012-08-29 7:51 ` Stefano Babic
2012-09-04 10:02 ` Stefano Babic
2 siblings, 0 replies; 6+ messages in thread
From: Stefano Babic @ 2012-08-29 7:51 UTC (permalink / raw)
To: u-boot
On 29/08/2012 03:15, Marek Vasut wrote:
> Delete the "mxsboot" binary if make mrproper is called.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Fabio Estevam <festevam@gmail.com>
> CC: Albert Aribaud <albert.u.boot@aribaud.net>
> ---
> Makefile | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Makefile b/Makefile
> index ce40ab3..9e9d57c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -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 <sbabic@denx.de>
Best regards,
Stefano Babic
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 1/2] MX28: Cleanup mxsboot within make mrproper
2012-08-29 1:15 [U-Boot] [PATCH 1/2] MX28: Cleanup mxsboot within make mrproper Marek Vasut
2012-08-29 1:15 ` [U-Boot] [PATCH 2/2] MX28: Fixup the ad-hoc use of DIGCTL_MICROSECONDS Marek Vasut
2012-08-29 7:51 ` [U-Boot] [PATCH 1/2] MX28: Cleanup mxsboot within make mrproper Stefano Babic
@ 2012-09-04 10:02 ` Stefano Babic
2 siblings, 0 replies; 6+ messages in thread
From: Stefano Babic @ 2012-09-04 10:02 UTC (permalink / raw)
To: u-boot
On 29/08/2012 03:15, Marek Vasut wrote:
> Delete the "mxsboot" binary if make mrproper is called.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Fabio Estevam <festevam@gmail.com>
> CC: Albert Aribaud <albert.u.boot@aribaud.net>
> ---
> Makefile | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Makefile b/Makefile
> index ce40ab3..9e9d57c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -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
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-09-04 10:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-29 1:15 [U-Boot] [PATCH 1/2] MX28: Cleanup mxsboot within make mrproper Marek Vasut
2012-08-29 1:15 ` [U-Boot] [PATCH 2/2] MX28: Fixup the ad-hoc use of DIGCTL_MICROSECONDS Marek Vasut
2012-08-29 7:51 ` Stefano Babic
2012-09-04 10:02 ` Stefano Babic
2012-08-29 7:51 ` [U-Boot] [PATCH 1/2] MX28: Cleanup mxsboot within make mrproper Stefano Babic
2012-09-04 10:02 ` Stefano Babic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox