Patchwork [U-Boot,4/6] arm: mx5: Add SPL support code to MX5

login
register
mail settings
Submitter Marek Vasut
Date April 19, 2013, 4:10 a.m.
Message ID <1366344655-8535-4-git-send-email-marex@denx.de>
Download mbox | patch
Permalink /patch/237842/
State Changes Requested
Delegated to: Stefano Babic
Headers show

Comments

Marek Vasut - April 19, 2013, 4:10 a.m.
Fix minor adjustments needed to get SPL framework building on MX5.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Tom Rini <trini@ti.com>
---
 arch/arm/include/asm/arch-mx5/spl.h | 19 +++++++++++++++++++
 spl/Makefile                        |  4 ++++
 2 files changed, 23 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-mx5/spl.h
Benoît Thébaudeau - April 19, 2013, 9:03 a.m.
Dear Marek Vasut,

On Friday, April 19, 2013 6:10:53 AM, Marek Vasut wrote:
> Fix minor adjustments needed to get SPL framework building on MX5.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> Cc: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Scott Wood <scottwood@freescale.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Tom Rini <trini@ti.com>
> ---
>  arch/arm/include/asm/arch-mx5/spl.h | 19 +++++++++++++++++++
>  spl/Makefile                        |  4 ++++
>  2 files changed, 23 insertions(+)
>  create mode 100644 arch/arm/include/asm/arch-mx5/spl.h
> 
> diff --git a/arch/arm/include/asm/arch-mx5/spl.h
> b/arch/arm/include/asm/arch-mx5/spl.h
> new file mode 100644
> index 0000000..e0b6e3e
> --- /dev/null
> +++ b/arch/arm/include/asm/arch-mx5/spl.h
> @@ -0,0 +1,19 @@
> +/*
> + * Copyright (C) 2013 Marek Vasut <marex@denx.de>
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + */
> +
> +#ifndef __ASM_ARCH_SPL_H__
> +#define __ASM_ARCH_SPL_H__
> +
> +#define BOOT_DEVICE_NONE	0
> +#define BOOT_DEVICE_NAND	1
> +
> +#endif	/* __ASM_ARCH_SPL_H__ */
> diff --git a/spl/Makefile b/spl/Makefile
> index b5a8de7..90f932a 100644
> --- a/spl/Makefile
> +++ b/spl/Makefile
> @@ -88,6 +88,10 @@ ifneq
> ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(C
>  LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
>  endif
>  
> +ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
> +LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
> +endif
> +
>  ifneq ($(CONFIG_TEGRA),)
>  LIBS-y += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o
>  LIBS-y += arch/$(ARCH)/cpu/tegra-common/libcputegra-common.o
> --
> 1.7.11.7

Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>

Best regards,
Benoît
Philip Paeps - April 19, 2013, 1:10 p.m.
On 2013-04-19 06:10:53 (+0200), Marek Vasut <marex@denx.de> wrote:
> Fix minor adjustments needed to get SPL framework building on MX5.

The same adjustment is needed to make other mx* build.  Perhaps spl.h
should live under arch/arm/include/asm/imx-common to avoid duplicating
it for others?

 - Philip
Marek Vasut - April 20, 2013, 10:28 a.m.
Dear Philip Paeps,

> On 2013-04-19 06:10:53 (+0200), Marek Vasut <marex@denx.de> wrote:
> > Fix minor adjustments needed to get SPL framework building on MX5.
> 
> The same adjustment is needed to make other mx* build.  Perhaps spl.h
> should live under arch/arm/include/asm/imx-common to avoid duplicating
> it for others?

Yes, sounds reasonable.

>  - Philip
>
> -- 
> Philip Paeps
> Senior Reality Engineer
> Ministry of Information

Is that from 1984 ? :-)

Best regards,
Marek Vasut
Marek Vasut - April 21, 2013, 12:38 a.m.
Dear Philip Paeps,

> On 2013-04-19 06:10:53 (+0200), Marek Vasut <marex@denx.de> wrote:
> > Fix minor adjustments needed to get SPL framework building on MX5.
> 
> The same adjustment is needed to make other mx* build.  Perhaps spl.h
> should live under arch/arm/include/asm/imx-common to avoid duplicating
> it for others?

Apparently, this doesn't work. The include isn't found.

Best regards,
Marek Vasut
Stefano Babic - May 5, 2013, 4:06 p.m.
On 19/04/2013 06:10, Marek Vasut wrote:
> Fix minor adjustments needed to get SPL framework building on MX5.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> Cc: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Scott Wood <scottwood@freescale.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Tom Rini <trini@ti.com>
> ---

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Patch

diff --git a/arch/arm/include/asm/arch-mx5/spl.h b/arch/arm/include/asm/arch-mx5/spl.h
new file mode 100644
index 0000000..e0b6e3e
--- /dev/null
+++ b/arch/arm/include/asm/arch-mx5/spl.h
@@ -0,0 +1,19 @@ 
+/*
+ * Copyright (C) 2013 Marek Vasut <marex@denx.de>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ */
+
+#ifndef __ASM_ARCH_SPL_H__
+#define __ASM_ARCH_SPL_H__
+
+#define BOOT_DEVICE_NONE	0
+#define BOOT_DEVICE_NAND	1
+
+#endif	/* __ASM_ARCH_SPL_H__ */
diff --git a/spl/Makefile b/spl/Makefile
index b5a8de7..90f932a 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -88,6 +88,10 @@  ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(C
 LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
 endif
 
+ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
+LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
+endif
+
 ifneq ($(CONFIG_TEGRA),)
 LIBS-y += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o
 LIBS-y += arch/$(ARCH)/cpu/tegra-common/libcputegra-common.o