Skip to contentSkip to conversation

ARM: i.MX6: sabresd: switch to multiboard support

PATCH In review Fabio Estevam 2 participants 3 messages Feb 20, 2014 – Feb 21, 2014

Subsystems (4)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v2 1/2 ARM: i.MX6: sabresd: switch to multiboard support

From: Fabio Estevam <[email protected]>

Add multiboard support for mx6sabresd.

---
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(-)
arch/arm/boards/freescale-mx6-sabresd/board.c +11 -2
index c87b555..4917943 100644
@@ -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);
arch/arm/configs/freescale-mx6-sabresd_defconfig +1 -1
index a2a7dcc..9fd3ce2 100644
@@ -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
arch/arm/mach-imx/Kconfig +6 -4
index 5933f81..706b02d 100644
@@ -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
 
 # ----------------------------------------------------------
Signature · 7 lines
1.8.1.2


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
author reviewer
#1 lore raw

PATCH v2 2/2 ARM: i.MX6: sabresd: switch to multi image support

From: Fabio Estevam <[email protected]>

The image will be named after the official name of this board:

barebox-freescale-mx6-sabresd.img

---
Changes since v1:
- Add flash-header-mx6-sabresd.imxcfg

 arch/arm/boards/freescale-mx6-sabresd/Makefile     |   4 +-
 .../flash-header-mx6-sabresd.imxcfg                | 106 ++++++++++++
 .../boards/freescale-mx6-sabresd/flash_header.c    | 178 ---------------------
 arch/arm/boards/freescale-mx6-sabresd/lowlevel.c   |  11 +-
 arch/arm/dts/Makefile                              |   1 +
 images/Makefile.imx                                |   5 +
 6 files changed, 123 insertions(+), 182 deletions(-)
 create mode 100644 arch/arm/boards/freescale-mx6-sabresd/flash-header-mx6-sabresd.imxcfg
 delete mode 100644 arch/arm/boards/freescale-mx6-sabresd/flash_header.c
arch/arm/boards/freescale-mx6-sabresd/Makefile +2 -2
index d44f697..f72c641 100644
@@ -1,3 +1,3 @@
-obj-y += board.o
-lwl-y += flash_header.o
+obj-y += board.o flash-header-mx6-sabresd.dcd.o
+extra-y += flash-header-mx6-sabresd.dcd.S flash-header-mx6-sabresd.dcd
 lwl-y += lowlevel.o
arch/arm/boards/freescale-mx6-sabresd/flash-header-mx6-sabresd.imxcfg new file +106 -0

106 lines not on this page · raw message

arch/arm/boards/freescale-mx6-sabresd/flash_header.c deleted +0 -178

178 lines not on this page · raw message

arch/arm/boards/freescale-mx6-sabresd/lowlevel.c +9 -2
index aec46fd..c8b542a 100644
@@ -3,8 +3,15 @@
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 
-void __naked barebox_arm_reset_vector(void)
+extern char __dtb_imx6q_sabresd_start[];
+
+ENTRY_FUNCTION(start_imx6q_sabresd, r0, r1, r2)
 {
+	uint32_t fdt;
+
 	arm_cpu_lowlevel_init();
-	barebox_arm_entry(0x10000000, SZ_1G, 0);
+
+	fdt = (uint32_t)__dtb_imx6q_sabresd_start - get_runtime_offset();
+
+	barebox_arm_entry(0x10000000, SZ_1G, fdt);
 }
arch/arm/dts/Makefile +1 -0
index 07508e3..ba57be1 100644
@@ -54,6 +54,7 @@ pbl-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += socfpga_cyclone5_socrates.dtb.o
 pbl-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += socfpga_cyclone5_sockit.dtb.o
 pbl-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD) += imx6dl-hummingboard.dtb.o
 pbl-$(CONFIG_MACH_SABRELITE) += imx6q-sabrelite.dtb.o imx6dl-sabrelite.dtb.o
+pbl-$(CONFIG_MACH_SABRESD) += imx6q-sabresd.dtb.o
 pbl-$(CONFIG_MACH_NITROGEN6X) += imx6q-nitrogen6x.dtb.o imx6dl-nitrogen6x.dtb.o
 
 .SECONDARY: $(obj)/$(BUILTIN_DTB).dtb.S
images/Makefile.imx +5 -0
index 9aca871..37b9a99 100644
@@ -109,6 +109,11 @@ CFG_start_imx6dl_sabrelite.pblx.imximg = $(board)/freescale-mx6-sabrelite/flash-
 FILE_barebox-freescale-imx6dl-sabrelite.img = start_imx6dl_sabrelite.pblx.imximg
 image-$(CONFIG_MACH_SABRELITE) += barebox-freescale-imx6dl-sabrelite.img
 
+pblx-$(CONFIG_MACH_SABRESD) += start_imx6q_sabresd
+CFG_start_imx6q_sabresd.pblx.imximg = $(board)/freescale-mx6-sabresd/flash-header-mx6-sabresd.imxcfg
+FILE_barebox-freescale-imx6q-sabresd.img = start_imx6q_sabresd.pblx.imximg
+image-$(CONFIG_MACH_SABRESD) += barebox-freescale-imx6q-sabresd.img
+
 pblx-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD) += start_imx6dl_hummingboard
 CFG_start_imx6dl_hummingboard.pblx.imximg = $(board)/solidrun-hummingboard/flash-header-solidrun-hummingboard.imxcfg
 FILE_barebox-solidrun-imx6dl-hummingboard.img = start_imx6dl_hummingboard.pblx.imximg
Signature · 7 lines
1.8.1.2


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
maintainer
#2 lore raw
In reply to Fabio Estevam

Hi Fabio,

It seems you are just a little bit too late: We already have this in -next:

commit d7db7df1879e17d547e123f9a56abeac26aab203

Author: Lucas Stach <[email protected]>
Date:   Mon Feb 17 13:04:12 2014 +0100

ARM: i.MX6: sabresd: switch to multi-image

Sascha

Quoted 99 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Add multiboard support for mx6sabresd.

---
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(-)
arch/arm/boards/freescale-mx6-sabresd/board.c +11 -2
index c87b555..4917943 100644
@@ -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);
arch/arm/configs/freescale-mx6-sabresd_defconfig +1 -1
index a2a7dcc..9fd3ce2 100644
@@ -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
arch/arm/mach-imx/Kconfig +6 -4
index 5933f81..706b02d 100644
@@ -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
 
 # ----------------------------------------------------------
Signature · 1 line
1.8.1.2
Signature · 9 lines
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
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox