Hi Fabio,
It seems you are just a little bit too late: We already have this in
-next:
commit d7db7df1879e17d547e123f9a56abeac26aab203
Author: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
Date: Mon Feb 17 13:04:12 2014 +0100
ARM: i.MX6: sabresd: switch to multi-image
Signed-off-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Sascha
On Thu, Feb 20, 2014 at 08:31:26PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
>
> Add multiboard support for mx6sabresd.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
> ---
> Changes since v1:
> - None
>
> arch/arm/boards/freescale-mx6-sabresd/board.c | 13 +++++++++++--
> arch/arm/configs/freescale-mx6-sabresd_defconfig | 2 +-
> arch/arm/mach-imx/Kconfig | 10 ++++++----
> 3 files changed, 18 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/boards/freescale-mx6-sabresd/board.c b/arch/arm/boards/freescale-mx6-sabresd/board.c
> index c87b555..4917943 100644
> --- a/arch/arm/boards/freescale-mx6-sabresd/board.c
> +++ b/arch/arm/boards/freescale-mx6-sabresd/board.c
> @@ -81,6 +81,9 @@ static void sabresd_phy_reset(void)
>
> static int sabresd_devices_init(void)
> {
> + if (!of_machine_is_compatible("fsl,imx6q-sabresd"))
> + return 0;
> +
> armlinux_set_architecture(3980);
>
> devfs_add_partition("disk0", 0, SZ_1M, DEVFS_PARTITION_FIXED, "self0");
> @@ -91,6 +94,9 @@ device_initcall(sabresd_devices_init);
>
> static int sabresd_coredevices_init(void)
> {
> + if (!of_machine_is_compatible("fsl,imx6q-sabresd"))
> + return 0;
> +
> sabresd_phy_reset();
>
> phy_register_fixup_for_uid(PHY_ID_AR8031, AR_PHY_ID_MASK,
> @@ -104,12 +110,15 @@ static int sabresd_coredevices_init(void)
> */
> fs_initcall(sabresd_coredevices_init);
>
> -static int sabresd_core_init(void)
> +static int sabresd_postcore_init(void)
> {
> + if (!of_machine_is_compatible("fsl,imx6q-sabresd"))
> + return 0;
> +
> imx6_init_lowlevel();
>
> barebox_set_hostname("sabresd");
>
> return 0;
> }
> -core_initcall(sabresd_core_init);
> +postcore_initcall(sabresd_postcore_init);
> diff --git a/arch/arm/configs/freescale-mx6-sabresd_defconfig b/arch/arm/configs/freescale-mx6-sabresd_defconfig
> index a2a7dcc..9fd3ce2 100644
> --- a/arch/arm/configs/freescale-mx6-sabresd_defconfig
> +++ b/arch/arm/configs/freescale-mx6-sabresd_defconfig
> @@ -1,5 +1,5 @@
> CONFIG_ARCH_IMX=y
> -CONFIG_ARCH_IMX6=y
> +CONFIG_IMX_MULTI_BOARDS=y
> CONFIG_MACH_SABRESD=y
> CONFIG_IMX_IIM=y
> CONFIG_IMX_IIM_FUSE_BLOW=y
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index 5933f81..706b02d 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -225,6 +225,12 @@ config MACH_SABRELITE
> select HAVE_DEFAULT_ENVIRONMENT_NEW
> select HAVE_PBL_MULTI_IMAGES
>
> +config MACH_SABRESD
> + bool "Freescale i.MX6 SabreSD"
> + select ARCH_IMX6
> + select HAVE_DEFAULT_ENVIRONMENT_NEW
> + select HAVE_PBL_MULTI_IMAGES
> +
> config MACH_NITROGEN6X
> bool "BoundaryDevices Nitrogen6x"
> select ARCH_IMX6
> @@ -452,10 +458,6 @@ config MACH_MX6Q_ARM2
> bool "Freescale i.MX6q Armadillo2"
> select ARCH_IMX6
>
> -config MACH_SABRESD
> - bool "Freescale i.MX6 SabreSD"
> - select ARCH_IMX6
> -
> endchoice
>
> # ----------------------------------------------------------
> --
> 1.8.1.2
>
>
--
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@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
