ARM: vexpress: add support for more core tiles
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 three 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.
Patch 4/5 adds support for the A15 core tile, this is actually the same as the A5 for now, but will be extended later.
Patch 5/5 enables bootz and hush parser for all boards, just for convenience.
Regards,
Andre.
--
Andre Przywara
Linaro Virtualization Team
PATCH 1/5 ARM: vexpress: move files in preparation for adding a new platform
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 is the first stage of making separating the Versatile Express motherboard code and the A9 specific code, before adding support for the dual core A5 core tile.
--- MAINTAINERS | 2 +- board/armltd/vexpress/Makefile | 2 +- board/armltd/vexpress/ca9x4_ct_vxp.c | 257 -------------------------------- board/armltd/vexpress/vexpress_common.c | 257 ++++++++++++++++++++++++++++++++ boards.cfg | 2 +- include/configs/ca9x4_ct_vxp.h | 198 ------------------------ include/configs/vexpress_common.h | 198 ++++++++++++++++++++++++ 7 files changed, 458 insertions(+), 458 deletions(-) delete mode 100644 board/armltd/vexpress/ca9x4_ct_vxp.c create mode 100644 board/armltd/vexpress/vexpress_common.c delete mode 100644 include/configs/ca9x4_ct_vxp.h create mode 100644 include/configs/vexpress_common.h
MAINTAINERS +1 -1
@@ -960,7 +960,7 @@ Hugo Villeneuve <[email protected]> Matt Waddel <[email protected]> - ca9x4_ct_vxp ARM ARMV7 (Quad Core) + vexpress_common ARM ARMV7 (Quad Core) Otavio Salvador <[email protected]>
board/armltd/vexpress/Makefile +1 -1
@@ -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/ca9x4_ct_vxp.c deleted +0 -257
257 lines not on this page · raw message
board/armltd/vexpress/vexpress_common.c new file +257 -0
257 lines not on this page · raw message
boards.cfg +1 -1
@@ -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_common 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/ca9x4_ct_vxp.h deleted +0 -198
198 lines not on this page · raw message
include/configs/vexpress_common.h new file +198 -0
198 lines not on this page · raw message
Signature · 1 line
1.7.12.1
PATCH 1/5 ARM: vexpress: move files in preparation for adding a new platform
Hi Andre,
Quoted 11 lines · Andre Przywara
From: Ryan Harkin <[email protected]>
The current
ca9x4_ct_vxpplatform contains support for a Versatile Express motherboard with a quad core A9 core tile.This patch is the first stage of making separating the Versatile Express motherboard code and the A9 specific code, before adding support for the dual core A5 core tile.
Signed-off-by Ryan Harkin <[email protected]>Signed-off-by Andre Przywara <[email protected]>
Quoted 13 lines
--- MAINTAINERS | 2 +- board/armltd/vexpress/Makefile | 2 +- board/armltd/vexpress/ca9x4_ct_vxp.c | 257 -------------------------------- board/armltd/vexpress/vexpress_common.c | 257 ++++++++++++++++++++++++++++++++ boards.cfg | 2 +- include/configs/ca9x4_ct_vxp.h | 198 ------------------------ include/configs/vexpress_common.h | 198 ++++++++++++++++++++++++ 7 files changed, 458 insertions(+), 458 deletions(-) delete mode 100644 board/armltd/vexpress/ca9x4_ct_vxp.c create mode 100644 board/armltd/vexpress/vexpress_common.c delete mode 100644 include/configs/ca9x4_ct_vxp.h create mode 100644 include/configs/vexpress_common.h
This patch seems to not take moves into account, and rather, lists these as deletes/creates. Did you use git format-patch, and if so, did you use tne -M option?
Also, the commit summary could be less generic, something like "ARM:
vexpress: rename board ca9x4_ct_vxp as vexpress_common".
Amicalement,
Signature · 1 line
Albert.
PATCH 1/5 ARM: vexpress: move files in preparation for adding a new platform
Quoted 30 lines · Albert ARIBAUD
Hi Andre,
Quoted 20 lines · Andre Przywara
From: Ryan Harkin <[email protected]>
The current
ca9x4_ct_vxpplatform contains support for a Versatile Express motherboard with a quad core A9 core tile.This patch is the first stage of making separating the Versatile Express motherboard code and the A9 specific code, before adding support for the dual core A5 core tile.
Signed-off-by Ryan Harkin <[email protected]>Signed-off-by Andre Przywara <[email protected]>--- MAINTAINERS | 2 +- board/armltd/vexpress/Makefile | 2 +- board/armltd/vexpress/ca9x4_ct_vxp.c | 257 -------------------------------- board/armltd/vexpress/vexpress_common.c | 257 ++++++++++++++++++++++++++++++++ boards.cfg | 2 +- include/configs/ca9x4_ct_vxp.h | 198 ------------------------ include/configs/vexpress_common.h | 198 ++++++++++++++++++++++++ 7 files changed, 458 insertions(+), 458 deletions(-)Quoted 4 lines
delete mode 100644
board/armltd/vexpress/ca9x4_ct_vxp.ccreate mode 100644board/armltd/vexpress/vexpress_common.cdelete mode 100644include/configs/ca9x4_ct_vxp.hcreate mode 100644include/configs/vexpress_common.h
Quoted 3 lines
This patch seems to not take moves into account, and rather, lists these as deletes/creates. Did you use git format-patch, and if so, did you use tne -M option?
Hi Albert!
Thanks for the -M hint, didn't know about it. Indeed it makes the patches more readable. Will use it in v2.
Quoted 2 lines
Also, the commit summary could be less generic, something like "ARM:
vexpress: rename boardca9x4_ct_vxpasvexpress_common".
OK, will fix this.
Thanks for the review,
Andre.
PATCH 2/5 ARM: vexpress: create A9 specific board config
In reply to Andre PrzywaraFrom: Ryan Harkin <[email protected]>
This patch creates a new config for the A9 quad core tile that includes the generic config for the Versatile Express platform.
--- MAINTAINERS | 2 +- boards.cfg | 2 +- include/configs/vexpress_ca9x4.h | 34 ++++++++++++++++++++++++++++++++++ include/configs/vexpress_common.h | 1 - 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 include/configs/vexpress_ca9x4.h
MAINTAINERS +1 -1
@@ -960,7 +960,7 @@ Hugo Villeneuve <[email protected]> Matt Waddel <[email protected]> - vexpress_common ARM ARMV7 (Quad Core) + vexpress_ca9x4 ARM ARMV7 (Quad Core) Otavio Salvador <[email protected]>
boards.cfg +1 -1
@@ -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 -vexpress_common 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
@@ -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 +0 -1
@@ -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
PATCH 2/5 ARM: vexpress: create A9 specific board config
Hi Andre,
Quoted 7 lines · Andre Przywara
From: Ryan Harkin <[email protected]>
This patch creates a new config for the A9 quad core tile that includes the generic config for the Versatile Express platform.
Signed-off-by Ryan Harkin <[email protected]>Signed-off-by Andre Przywara <[email protected]>
Quoted 7 lines
--- MAINTAINERS | 2 +- boards.cfg | 2 +- include/configs/vexpress_ca9x4.h | 34 ++++++++++++++++++++++++++++++++++ include/configs/vexpress_common.h | 1 - 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 include/configs/vexpress_ca9x4.h
Wait, so patch 1/5 renames ca9x4_ct_vxp as vexpress_common, then patch 2/5 renames vexpress_common as vexpress_ca9x4? If so then please make this a single patch without the intermediary/temporary step.
Amicalement,
Signature · 1 line
Albert.
PATCH 2/5 ARM: vexpress: create A9 specific board config
Quoted 20 lines · Albert ARIBAUD
Hi Andre,
Quoted 7 lines · Andre Przywara
From: Ryan Harkin <[email protected]>
This patch creates a new config for the A9 quad core tile that includes the generic config for the Versatile Express platform.
Signed-off-by Ryan Harkin <[email protected]>Signed-off-by Andre Przywara <[email protected]>Quoted 7 lines
--- MAINTAINERS | 2 +- boards.cfg | 2 +- include/configs/vexpress_ca9x4.h | 34 ++++++++++++++++++++++++++++++++++ include/configs/vexpress_common.h | 1 - 4 files changed, 36 insertions(+), 3 deletions(-)create mode 100644
include/configs/vexpress_ca9x4.h
Quoted 3 lines
Wait, so patch 1/5 renames
ca9x4_ct_vxpasvexpress_common, then patch 2/5 renamesvexpress_commonasvexpress_ca9x4? If so then please make this a single patch without the intermediary/temporary step.
But that would not mark the actual file copy (vexpress_common.h is almost the same as vexpress_ca9x4.h) as such, right?
So you would end up with a completely new file (_common.h) and a file with almost all content deleted (_ca9x4.h). The fact that the code just moved wouldn't be obvious.
That would be extra pity with the nice -M move features in the previous patch.
However I have no problems with merging these two, if you insist.
Regards,
Andre.
PATCH 2/5 ARM: vexpress: create A9 specific board config
Hi Andre,
Quoted 25 lines · Andre Przywara
Quoted 20 lines · Albert ARIBAUD
Hi Andre,
Quoted 7 lines · Andre Przywara
From: Ryan Harkin <[email protected]>
This patch creates a new config for the A9 quad core tile that includes the generic config for the Versatile Express platform.
Signed-off-by Ryan Harkin <[email protected]>Signed-off-by Andre Przywara <[email protected]>Quoted 7 lines
--- MAINTAINERS | 2 +- boards.cfg | 2 +- include/configs/vexpress_ca9x4.h | 34 ++++++++++++++++++++++++++++++++++ include/configs/vexpress_common.h | 1 - 4 files changed, 36 insertions(+), 3 deletions(-)create mode 100644
include/configs/vexpress_ca9x4.hQuoted 3 lines
Wait, so patch 1/5 renames
ca9x4_ct_vxpasvexpress_common, then patch 2/5 renamesvexpress_commonasvexpress_ca9x4? If so then please make this a single patch without the intermediary/temporary step.
Quoted 7 lines
But that would not mark the actual file copy (
vexpress_common.his almost the same asvexpress_ca9x4.h) as such, right?
So you would end up with a completely new file (_common.h) and a file with almost all content deleted (_ca9x4.h). The fact that the code just moved wouldn't be obvious.
That would be extra pity with the nice -M move features in the previous patch.
Try -C too, for copies, and possibly --find-copies-harder.
I don't see how eliminating the intermediate target naming would prevent git from detecting moves and copies; and it will simplify the changes undergone by non-header files such as baords.cfg and MAINTAINERS.
Quoted 1 line
However I have no problems with merging these two, if you insist.
I am fine with either of the two following solutions:
a) If patch 1/5 commonalizes vexpress code, then it should not rename any target, and patch 2/5 should do the renaming.
or
b) if patch 1/5 commonalizes and renames the target, it should give it its final name and patch 2 should be merged in.
Quoted 2 lines
Regards,
Andre.
Amicalement,
Signature · 1 line
Albert.
PATCH 3/5 ARM: vexpress: create A5 specific board config
In reply to Andre PrzywaraFrom: 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
@@ -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
@@ -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
@@ -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
@@ -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
PATCH 4/5 ARM: vexpress: add support for Versatile Express Cortex-A15-TC2
In reply to Andre PrzywaraThis 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
@@ -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
@@ -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
PATCH 5/5 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
@@ -179,6 +179,7 @@#define CONFIG_CMD_PING #define CONFIG_CMD_SAVEENV #define CONFIG_CMD_RUN +#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_FAT #define CONFIG_DOS_PARTITION 1
@@ -302,6 +303,9 @@#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_PROMPT_HUSH_PS2 "> " +#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