6 files changed, 222 insertions, 0 deletions
diff --git a/arch/arm/boards/vexpress/Kconfig b/arch/arm/boards/vexpress/Kconfig
new file mode 100644
index 0000000000..24289014cb
--- /dev/null
+++ b/arch/arm/boards/vexpress/Kconfig
@@ -0,0 +1,10 @@
+
+if MACH_VERSATILEPB
+
+config ARCH_TEXT_BASE
+	hex
+	default 0x01000000
+
+config BOARDINFO
+	default "ARM Versatile/PB (ARM926EJ-S)"
+endif
diff --git a/arch/arm/boards/vexpress/Makefile b/arch/arm/boards/vexpress/Makefile
new file mode 100644
index 0000000000..98921a48b4
--- /dev/null
+++ b/arch/arm/boards/vexpress/Makefile
@@ -0,0 +1,4 @@
+obj-y += init.o
+
+obj-y += lowlevel.o
+pbl-y += lowlevel.o
diff --git a/arch/arm/boards/vexpress/config.h b/arch/arm/boards/vexpress/config.h
new file mode 100644
index 0000000000..25bb18f787
--- /dev/null
+++ b/arch/arm/boards/vexpress/config.h
@@ -0,0 +1,5 @@
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#endif	/* __CONFIG_H */
diff --git a/arch/arm/boards/vexpress/env/config b/arch/arm/boards/vexpress/env/config
new file mode 100644
index 0000000000..852f2428cf
--- /dev/null
+++ b/arch/arm/boards/vexpress/env/config
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# use 'dhcp' to do dhcp in barebox and in kernel
+# use 'none' if you want to skip kernel ip autoconfiguration
+ip=dhcp
+# set in c
+#global.hostname=vexpress
+global.dhcp.vendor_id=barebox-${global.hostname}
+
+# or set your networking parameters here
+#eth0.ipaddr=a.b.c.d
+#eth0.netmask=a.b.c.d
+#eth0.gateway=a.b.c.d
+#eth0.serverip=a.b.c.d
+
+# can be either 'nfs', 'tftp' or 'nor'
+kernel_loc=tftp
+# can be either 'net', 'nor' or 'initrd'
+rootfs_loc=initrd
+
+# can be either 'jffs2' or 'ubifs'
+rootfs_type=ubifs
+rootfsimage=root.$rootfs_type
+
+kernelimage=zImage
+#kernelimage=uImage
+#kernelimage=Image
+#kernelimage=Image.lzo
+
+nfsroot="$eth0.serverip:/opt/work/busybox/arm9/rootfs_arm"
+
+nor_parts="256k(barebox)ro,64k(bareboxenv),1536k(kernel),-(root)"
+rootfs_mtdblock_nor=3
+
+autoboot_timeout=3
+
+bootargs="console=ttyAMA0,115200n8 CONSOLE=/dev/ttyAMA0"
+
+# set a fancy prompt (if support is compiled in)
+PS1="\e[1;31m[barebox@\h]:\w\e[0m\n# "
diff --git a/arch/arm/boards/vexpress/init.c b/arch/arm/boards/vexpress/init.c
new file mode 100644
index 0000000000..f940824be1
--- /dev/null
+++ b/arch/arm/boards/vexpress/init.c
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com>
+ *
+ * GPLv2 only
+ */
+
+#include <common.h>
+#include <init.h>
+#include <asm/armlinux.h>
+#include <asm/system_info.h>
+#include <generated/mach-types.h>
+#include <mach/devices.h>
+#include <environment.h>
+#include <partition.h>
+#include <sizes.h>
+#include <io.h>
+#include <globalvar.h>
+
+struct vexpress_init {
+	void (*core_init)(void);
+	void (*mem_init)(void);
+	void (*console_init)(void);
+	void (*devices_init)(void);
+	char *hostname;
+};
+
+struct vexpress_init *v2m_init;
+
+static void vexpress_ax_mem_init(void)
+{
+	vexpress_add_ddram(SZ_512M);
+}
+
+#define V2M_SYS_FLASH	0x03c
+
+static void vexpress_ax_devices_init(void)
+{
+	add_cfi_flash_device(0, 0x08000000, SZ_64M, 0);
+	add_cfi_flash_device(1, 0x0c000000, SZ_64M, 0);
+	add_generic_device("smc911x", DEVICE_ID_DYNAMIC, NULL, 0x1a000000,
+			64 * 1024, IORESOURCE_MEM, NULL);
+	armlinux_set_bootparams((void *)(0x80000100));
+}
+
+static void vexpress_ax_console_init(void)
+{
+	vexpress_register_uart(0);
+	vexpress_register_uart(1);
+	vexpress_register_uart(2);
+	vexpress_register_uart(3);
+}
+
+struct vexpress_init vexpress_init_ax = {
+	.core_init = vexpress_init,
+	.mem_init = vexpress_ax_mem_init,
+	.console_init = vexpress_ax_console_init,
+	.devices_init = vexpress_ax_devices_init,
+};
+
+static void vexpress_a9_mem_init(void)
+{
+	vexpress_a9_add_ddram(SZ_512M, SZ_512M);
+}
+
+static void vexpress_a9_devices_init(void)
+{
+	add_cfi_flash_device(0, 0x40000000, SZ_64M, 0);
+	add_cfi_flash_device(1, 0x44000000, SZ_64M, 0);
+	add_generic_device("smc911x", DEVICE_ID_DYNAMIC, NULL, 0x4e000000,
+			64 * 1024, IORESOURCE_MEM, NULL);
+
+	armlinux_set_architecture(MACH_TYPE_VEXPRESS);
+	armlinux_set_bootparams((void *)(0x60000100));
+}
+
+static void vexpress_a9_console_init(void)
+{
+	vexpress_a9_register_uart(0);
+	vexpress_a9_register_uart(1);
+	vexpress_a9_register_uart(2);
+	vexpress_a9_register_uart(3);
+}
+
+struct vexpress_init vexpress_init_a9 = {
+	.core_init = vexpress_a9_init,
+	.mem_init = vexpress_a9_mem_init,
+	.console_init = vexpress_a9_console_init,
+	.devices_init = vexpress_a9_devices_init,
+	.hostname = "vexpress-a9",
+};
+
+static int vexpress_mem_init(void)
+{
+	v2m_init->mem_init();
+
+	return 0;
+}
+mem_initcall(vexpress_mem_init);
+
+static int vexpress_devices_init(void)
+{
+	writel(1, v2m_sysreg_base + V2M_SYS_FLASH);
+	v2m_init->devices_init();
+
+	devfs_add_partition("nor0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self");
+	devfs_add_partition("nor0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env0");
+
+
+	globalvar_add_simple("hostname");
+	setenv("global.hostname", v2m_init->hostname);
+
+	return 0;
+}
+device_initcall(vexpress_devices_init);
+
+static int vexpress_console_init(void)
+{
+	v2m_init->console_init();
+
+	return 0;
+}
+console_initcall(vexpress_console_init);
+
+static int vexpress_core_init(void)
+{
+	if (cpu_is_cortex_a9()) {
+		v2m_init = &vexpress_init_a9;
+	} else {
+		v2m_init = &vexpress_init_ax;
+		if (cpu_is_cortex_a5())
+			v2m_init->hostname = "vexpress-a5";
+		else if (cpu_is_cortex_a7())
+			v2m_init->hostname = "vexpress-a7";
+		else if (cpu_is_cortex_a15())
+			v2m_init->hostname = "vexpress-a15";
+	}
+
+	v2m_init->core_init();
+
+	return 0;
+}
+postcore_initcall(vexpress_core_init);
diff --git a/arch/arm/boards/vexpress/lowlevel.c b/arch/arm/boards/vexpress/lowlevel.c
new file mode 100644
index 0000000000..71de1b150b
--- /dev/null
+++ b/arch/arm/boards/vexpress/lowlevel.c
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com>
+ *
+ * GPLv2 only
+ */
+
+#include <common.h>
+#include <sizes.h>
+#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+#include <asm/system_info.h>
+
+void __naked barebox_arm_reset_vector(void)
+{
+	arm_cpu_lowlevel_init();
+
+	if (cpu_is_cortex_a9())
+		barebox_arm_entry(0x60000000, SZ_512M, 0);
+	else
+		barebox_arm_entry(0x80000000, SZ_512M, 0);
+}