Skip to contentSkip to conversation

ARM: vexpress: add support for more core tiles

PATCH New Andre Przywara 2 participants 6 messages Apr 9, 2013 – May 23, 2013 Arm/versatile express platform

lore
Share & tools
lore
#0 lore raw

v3 cover ARM: vexpress: add support for more core tiles

This series adds support for the Cortex-A5 and Cortex-A15 core tiles for the ARM Versatile Express boards.

The first two patches have been around for about one and a half years in the Linaro tree now, they refactor the A9 support and add support for A5. I kept the original commits and authors, just resolved some trivial merge conflicts and checkpatch complaints. As per request, I merged the first two original patches into one for better readability.

Patch 3/4 adds support for the A15 core tile, this is actually the same as the A5 for now, but will be extended later.

Patch 4/4 enables bootz and hush parser for all boards, just for convenience.

Changes:
v3:
- drop now unneeded default prompt definition in patch 4
v2:
- merge patch 1/5 and 2/5 as per Albert's request
- add support for raw initrd for full bootz experience

Regards,
Andre.

--
Andre Przywara
Linaro Virtualization Team

#1 lore raw

PATCH v3 1/4 ARM: vexpress: refactoring of Versatile Express CA9x4 support

From: Ryan Harkin <[email protected]>

The current ca9x4_ct_vxp platform contains support for a Versatile Express motherboard with a quad core A9 core tile.

This patch separates the Versatile Express motherboard code and the A9 specific code, to ease supporting more core tiles in the next patches.

Andre: merged the first two of Ryan's original patches and did some checkpatch fixes.

---
 MAINTAINERS                                        |  2 +-
 board/armltd/vexpress/Makefile                     |  2 +-
 .../vexpress/{ca9x4_ct_vxp.c => vexpress_common.c} |  6 ++--
 boards.cfg                                         |  2 +-
 include/configs/vexpress_ca9x4.h                   | 34 ++++++++++++++++++++++
 .../configs/{ca9x4_ct_vxp.h => vexpress_common.h}  |  1 -
 6 files changed, 40 insertions(+), 7 deletions(-)
 rename board/armltd/vexpress/{ca9x4_ct_vxp.c => vexpress_common.c} (98%)
 create mode 100644 include/configs/vexpress_ca9x4.h
 rename include/configs/{ca9x4_ct_vxp.h => vexpress_common.h} (99%)
MAINTAINERS +1 -1
index 1614b91..761c36c 100644
@@ -960,7 +960,7 @@ Hugo Villeneuve <[email protected]>
 
 Matt Waddel <[email protected]>
 
-	ca9x4_ct_vxp	ARM ARMV7 (Quad Core)
+	vexpress_ca9x4	ARM ARMV7 (Quad Core)
 
 Otavio Salvador <[email protected]>
 
board/armltd/vexpress/Makefile +1 -1
index 8749590..6719f3d 100644
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	:= ca9x4_ct_vxp.o
+COBJS	:= vexpress_common.o
 
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
board/armltd/vexpress/vexpress_common.c renamed from board/armltd/vexpress/ca9x4_ct_vxp.c +3 -3
similarity index 98%
rename from board/armltd/vexpress/ca9x4_ct_vxp.c
rename to board/armltd/vexpress/vexpress_common.c
index d5e109e..c4f2520 100644
@@ -166,8 +166,8 @@ static void vexpress_timer_init(void)
 	 */
 	writel(SYSTIMER_RELOAD, &systimer_base->timer0load);
 	writel(SYSTIMER_RELOAD, &systimer_base->timer0value);
-	writel(SYSTIMER_EN | SYSTIMER_32BIT | \
-	       readl(&systimer_base->timer0control), \
+	writel(SYSTIMER_EN | SYSTIMER_32BIT |
+	       readl(&systimer_base->timer0control),
 	       &systimer_base->timer0control);
 
 	reset_timer_masked();
@@ -251,7 +251,7 @@ unsigned long long get_ticks(void)
 	return get_timer(0);
 }
 
-ulong get_tbclk (void)
+ulong get_tbclk(void)
 {
 	return (ulong)CONFIG_SYS_HZ;
 }
boards.cfg +1 -1
index 5fc70be..908e3bc 100644
@@ -232,7 +232,7 @@ versatilepb                  arm         arm926ejs   versatile           armltd
 versatileqemu                arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB
 integratorap_cm946es         arm         arm946es    integrator          armltd         -               integratorap:CM946ES
 integratorcp_cm946es         arm         arm946es    integrator          armltd         -               integratorcp:CM946ES
-ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
+vexpress_ca9x4               arm         armv7       vexpress            armltd
 am335x_evm                   arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1
 am335x_evm_spiboot           arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,SPI_BOOT
 am335x_evm_uart1             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL2,CONS_INDEX=2
include/configs/vexpress_ca9x4.h new file +34 -0
new file mode 100644
index 0000000..c3b6986
@@ -0,0 +1,34 @@
+/*
+ * (C) Copyright 2011 Linaro
+ * Ryan Harkin, <[email protected]>
+ *
+ * Configuration for Versatile Express. Parts were derived from other ARM
+ *   configurations.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __VEXPRESS_CA9X4_H
+#define __VEXPRESS_CA9X4_H
+
+#define CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
+#include "vexpress_common.h"
+#define CONFIG_BOOTP_VCI_STRING     "U-boot.armv7.vexpress_ca9x4"
+
+#endif /* VEXPRESS_CA9X4_H */
include/configs/vexpress_common.h renamed from include/configs/ca9x4_ct_vxp.h +0 -1
similarity index 99%
rename from include/configs/ca9x4_ct_vxp.h
rename to include/configs/vexpress_common.h
index a7cd1d4..9a3431e 100644
@@ -97,7 +97,6 @@
 #define CONFIG_BOOTP_HOSTNAME
 #define CONFIG_BOOTP_PXE
 #define CONFIG_BOOTP_PXE_CLIENTARCH	0x100
-#define CONFIG_BOOTP_VCI_STRING		"U-boot.armv7.ca9x4_ct_vxp"
 
 /* Miscellaneous configurable options */
 #undef	CONFIG_SYS_CLKS_IN_HZ
Signature · 1 line
1.7.12.1
#2 lore raw

PATCH v3 2/4 ARM: vexpress: create A5 specific board config

In reply to Andre Przywara

From: Ryan Harkin <[email protected]>

This patch creates a new config for the A5 dual core tile that includes the generic config for the Versatile Express platform.

The generic config has been modified to provide support for the Extended Memory Map, as used on the A5 core tile. A5 does not support the legacy memory map.

---
 MAINTAINERS                             |   1 +
 board/armltd/vexpress/vexpress_common.c |  29 ++++--
 boards.cfg                              |   1 +
 include/configs/vexpress_ca5x2.h        |  34 +++++++
 include/configs/vexpress_common.h       | 152 ++++++++++++++++++++++++++++----
 5 files changed, 192 insertions(+), 25 deletions(-)
 create mode 100644 include/configs/vexpress_ca5x2.h
MAINTAINERS +1 -0
index 761c36c..dccee97 100644
@@ -961,6 +961,7 @@ Hugo Villeneuve <[email protected]>
 Matt Waddel <[email protected]>
 
 	vexpress_ca9x4	ARM ARMV7 (Quad Core)
+	vexpress_ca5x2	ARM ARMV7 (Dual Core)
 
 Otavio Salvador <[email protected]>
 
board/armltd/vexpress/vexpress_common.c +23 -6
index c4f2520..2c54869 100644
@@ -45,8 +45,7 @@
 static ulong timestamp;
 static ulong lastdec;
 
-static struct wdt *wdt_base = (struct wdt *)WDT_BASE;
-static struct systimer *systimer_base = (struct systimer *)SYSTIMER_BASE;
+static struct systimer *systimer_base = (struct systimer *)V2M_TIMER01;
 static struct sysctrl *sysctrl_base = (struct sysctrl *)SCTL_BASE;
 
 static void flash__init(void);
@@ -173,13 +172,31 @@ static void vexpress_timer_init(void)
 	reset_timer_masked();
 }
 
+int v2m_cfg_write(u32 devfn, u32 data)
+{
+	/* Configuration interface broken? */
+	u32 val;
+
+	devfn |= SYS_CFG_START | SYS_CFG_WRITE;
+
+	val = readl(V2M_SYS_CFGSTAT);
+	writel(val & ~SYS_CFG_COMPLETE, V2M_SYS_CFGSTAT);
+
+	writel(data, V2M_SYS_CFGDATA);
+	writel(devfn, V2M_SYS_CFGCTRL);
+
+	do {
+		val = readl(V2M_SYS_CFGSTAT);
+	} while (val == 0);
+
+	return !!(val & SYS_CFG_ERR);
+}
+
 /* Use the ARM Watchdog System to cause reset */
 void reset_cpu(ulong addr)
 {
-	writeb(WDT_EN, &wdt_base->wdogcontrol);
-	writel(WDT_RESET_LOAD, &wdt_base->wdogload);
-	while (1)
-		;
+	if (v2m_cfg_write(SYS_CFG_REBOOT | SYS_CFG_SITE_MB, 0))
+		printf("Unable to reboot\n");
 }
 
 /*
boards.cfg +1 -0
index 908e3bc..df8d5e5 100644
@@ -232,6 +232,7 @@ versatilepb                  arm         arm926ejs   versatile           armltd
 versatileqemu                arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB
 integratorap_cm946es         arm         arm946es    integrator          armltd         -               integratorap:CM946ES
 integratorcp_cm946es         arm         arm946es    integrator          armltd         -               integratorcp:CM946ES
+vexpress_ca5x2               arm         armv7       vexpress            armltd
 vexpress_ca9x4               arm         armv7       vexpress            armltd
 am335x_evm                   arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1
 am335x_evm_spiboot           arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,SPI_BOOT
include/configs/vexpress_ca5x2.h new file +34 -0
new file mode 100644
index 0000000..9331134
@@ -0,0 +1,34 @@
+/*
+ * (C) Copyright 2011 Linaro
+ * Ryan Harkin, <[email protected]>
+ *
+ * Configuration for Versatile Express. Parts were derived from other ARM
+ *   configurations.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __VEXPRESS_CA5X2_h
+#define __VEXPRESS_CA5X2_h
+
+#define CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP
+#include "vexpress_common.h"
+#define CONFIG_BOOTP_VCI_STRING     "U-boot.armv7.vexpress_ca5x2"
+
+#endif /* __VEXPRESS_CA5X2_h */
include/configs/vexpress_common.h +133 -19

220 lines not on this page · raw message

Signature · 1 line
1.7.12.1
#3 lore raw

PATCH v3 3/4 ARM: vexpress: add support for Versatile Express Cortex-A15-TC2

In reply to Andre Przywara

This adds support for the Cortex-A15-TC2 core tile for the Versatile Express board by ARM. This is mostly a copy of the A5 support file, but will be extended later with A15 specific options.

---
 boards.cfg                          |  1 +
 include/configs/vexpress_ca15_tc2.h | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 include/configs/vexpress_ca15_tc2.h
boards.cfg +1 -0
index df8d5e5..e6a86a8 100644
@@ -232,6 +232,7 @@ versatilepb                  arm         arm926ejs   versatile           armltd
 versatileqemu                arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB
 integratorap_cm946es         arm         arm946es    integrator          armltd         -               integratorap:CM946ES
 integratorcp_cm946es         arm         arm946es    integrator          armltd         -               integratorcp:CM946ES
+vexpress_ca15_tc2            arm         armv7       vexpress            armltd
 vexpress_ca5x2               arm         armv7       vexpress            armltd
 vexpress_ca9x4               arm         armv7       vexpress            armltd
 am335x_evm                   arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1
include/configs/vexpress_ca15_tc2.h new file +36 -0
new file mode 100644
index 0000000..9e230ad
@@ -0,0 +1,36 @@
+/*
+ * (C) Copyright 2013 Linaro
+ * Andre Przywara, <[email protected]>
+ *
+ * Configuration for Versatile Express. Parts were derived from other ARM
+ *   configurations.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __VEXPRESS_CA15X2_TC2_h
+#define __VEXPRESS_CA15X2_TC2_h
+
+#define CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP
+#include "vexpress_common.h"
+#define CONFIG_BOOTP_VCI_STRING     "U-boot.armv7.vexpress_ca15x2_tc2"
+
+#define CONFIG_SYS_CLK_FREQ 24000000
+
+#endif
Signature · 1 line
1.7.12.1
#4 lore raw

PATCH v3 4/4 ARM: vexpress: enable bootz and hush parser for all VExpress boards

In reply to Andre Przywara
---
 include/configs/vexpress_common.h | 4 ++++
 1 file changed, 4 insertions(+)
include/configs/vexpress_common.h +4 -0
index cd268e3..3c5683a 100644
@@ -179,6 +179,8 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_RUN
+#define CONFIG_CMD_BOOTZ
+#define CONFIG_SUPPORT_RAW_INITRD
 
 #define CONFIG_CMD_FAT
 #define CONFIG_DOS_PARTITION		1
@@ -302,6 +304,8 @@
 #define CONFIG_SYS_PROMPT		"VExpress# "
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
+#define CONFIG_SYS_HUSH_PARSER
+
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE /* Boot args buffer */
 #define CONFIG_CMD_SOURCE
 #define CONFIG_SYS_LONGHELP
Signature · 1 line
1.7.12.1
#5 lore raw

v3 cover ARM: vexpress: add support for more core tiles

In reply to Andre Przywara

Hi Andre,

Quoted 23 lines · Andre Przywara

This series adds support for the Cortex-A5 and Cortex-A15 core tiles for the ARM Versatile Express boards.

The first two patches have been around for about one and a half years in the Linaro tree now, they refactor the A9 support and add support for A5. I kept the original commits and authors, just resolved some trivial merge conflicts and checkpatch complaints. As per request, I merged the first two original patches into one for better readability.

Patch 3/4 adds support for the A15 core tile, this is actually the same as the A5 for now, but will be extended later.

Patch 4/4 enables bootz and hush parser for all boards, just for convenience.

Changes:
v3:
- drop now unneeded default prompt definition in patch 4
v2:
- merge patch 1/5 and 2/5 as per Albert's request
- add support for raw initrd for full bootz experience

Quoted 7 lines

Regards,
Andre.

--
Andre Przywara
Linaro Virtualization Team

Whole series applied to u-boot-arm/master, thanks!

Amicalement,

Signature · 1 line
Albert.