sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

vexpress: detect the board periph mapping and detecting the sp804 mapping 

at 0x10011000 for a9 legacy otherwise at 0x1c110000

as the new board also support Cortex-A9

so this is working

qemu/arm-softmmu/qemu-system-arm -M vexpress-a15 -m 1024 -smp 1 -kernel build/vexpress/barebox -pflash build/vexpress/flash -nographic -cpu cortex-a9

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2013-02-12 14:03:27 +01:00 committed by Sascha Hauer
parent ed4da3f2de
commit 64b873ccba
5 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
arch/arm/boards/vexpress/init.c
View File

@ -15,6 +15,7 @@
#include <sizes.h>
#include <io.h>
#include <globalvar.h>
#include <linux/amba/sp804.h>
struct vexpress_init {
void (*core_init)(void);
@ -57,12 +58,12 @@ struct vexpress_init vexpress_init_ax = {
.devices_init = vexpress_ax_devices_init,
};
static void vexpress_a9_mem_init(void)
static void vexpress_a9_legacy_mem_init(void)
{
vexpress_a9_add_ddram(SZ_512M, SZ_512M);
vexpress_a9_legacy_add_ddram(SZ_512M, SZ_512M);
}
static void vexpress_a9_devices_init(void)
static void vexpress_a9_legacy_devices_init(void)
{
add_cfi_flash_device(0, 0x40000000, SZ_64M, 0);
add_cfi_flash_device(1, 0x44000000, SZ_64M, 0);
@ -73,20 +74,20 @@ static void vexpress_a9_devices_init(void)
armlinux_set_bootparams((void *)(0x60000100));
}
static void vexpress_a9_console_init(void)
static void vexpress_a9_legacy_console_init(void)
{
vexpress_a9_register_uart(0);
vexpress_a9_register_uart(1);
vexpress_a9_register_uart(2);
vexpress_a9_register_uart(3);
vexpress_a9_legacy_register_uart(0);
vexpress_a9_legacy_register_uart(1);
vexpress_a9_legacy_register_uart(2);
vexpress_a9_legacy_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",
struct vexpress_init vexpress_init_a9_legacy = {
.core_init = vexpress_a9_legacy_init,
.mem_init = vexpress_a9_legacy_mem_init,
.console_init = vexpress_a9_legacy_console_init,
.devices_init = vexpress_a9_legacy_devices_init,
.hostname = "vexpress-a9-legacy",
};
static int vexpress_mem_init(void)
@ -123,14 +124,16 @@ console_initcall(vexpress_console_init);
static int vexpress_core_init(void)
{
if (cpu_is_cortex_a9()) {
v2m_init = &vexpress_init_a9;
if (amba_is_arm_sp804(IOMEM(0x10011000))) {
v2m_init = &vexpress_init_a9_legacy;
} 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_a9())
v2m_init->hostname = "vexpress-a9";
else if (cpu_is_cortex_a15())
v2m_init->hostname = "vexpress-a15";
}

3
arch/arm/boards/vexpress/lowlevel.c
View File

@ -9,12 +9,13 @@
#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
#include <asm/system_info.h>
#include <linux/amba/sp804.h>
void __naked barebox_arm_reset_vector(void)
{
arm_cpu_lowlevel_init();
if (cpu_is_cortex_a9())
if (amba_is_arm_sp804(IOMEM(0x10011000)))
barebox_arm_entry(0x60000000, SZ_512M, 0);
else
barebox_arm_entry(0x80000000, SZ_512M, 0);

4
arch/arm/mach-vexpress/devices.c
View File

@ -12,7 +12,7 @@
#include <mach/devices.h>
void vexpress_a9_add_ddram(u32 ddr0_size, u32 ddr1_size)
void vexpress_a9_legacy_add_ddram(u32 ddr0_size, u32 ddr1_size)
{
arm_add_mem_device("ram0", 0x60000000, ddr0_size);
@ -21,7 +21,7 @@ void vexpress_a9_add_ddram(u32 ddr0_size, u32 ddr1_size)
}
void vexpress_a9_register_uart(unsigned id)
void vexpress_a9_legacy_register_uart(unsigned id)
{
resource_size_t start;

6
arch/arm/mach-vexpress/include/mach/devices.h
View File

@ -7,13 +7,13 @@
#ifndef __ASM_ARCH_DEVICES_H__
#define __ASM_ARCH_DEVICES_H__
void vexpress_a9_add_ddram(u32 ddr0_size, u32 ddr1_size);
void vexpress_a9_legacy_add_ddram(u32 ddr0_size, u32 ddr1_size);
void vexpress_add_ddram(u32 size);
void vexpress_a9_register_uart(unsigned id);
void vexpress_a9_legacy_register_uart(unsigned id);
void vexpress_register_uart(unsigned id);
void vexpress_a9_init(void);
void vexpress_a9_legacy_init(void);
void vexpress_init(void);
extern void *v2m_wdt_base;

2
arch/arm/mach-vexpress/v2m.c
View File

@ -64,7 +64,7 @@ static void __init v2m_sp804_init(void __iomem *base)
amba_apb_device_add(NULL, "sp804", DEVICE_ID_SINGLE, (resource_size_t)base, 4096, NULL, 0);
}
void vexpress_a9_init(void)
void vexpress_a9_legacy_init(void)
{
v2m_wdt_base = IOMEM(0x1000f000);
v2m_sysreg_base = IOMEM(0x10001000);