diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-02-12 14:03:27 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-13 09:21:44 +0100 |
| commit | 64b873ccba69a6311e03de1c68585f32f5a86524 (patch) | |
| tree | 186ffb7ad10ba36b51a6ce68f300ce57c40bbfca /arch/arm/mach-vexpress | |
| parent | ed4da3f2de93bf445f10b762aeb1fc75967b5660 (diff) | |
| download | barebox-64b873ccba69a6311e03de1c68585f32f5a86524.tar.gz barebox-64b873ccba69a6311e03de1c68585f32f5a86524.tar.xz | |
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>
Diffstat (limited to 'arch/arm/mach-vexpress')
| -rw-r--r-- | arch/arm/mach-vexpress/devices.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-vexpress/include/mach/devices.h | 6 | ||||
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-vexpress/devices.c b/arch/arm/mach-vexpress/devices.c index 69c93efbcd..6ccce5261f 100644 --- a/arch/arm/mach-vexpress/devices.c +++ b/arch/arm/mach-vexpress/devices.c @@ -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; diff --git a/arch/arm/mach-vexpress/include/mach/devices.h b/arch/arm/mach-vexpress/include/mach/devices.h index adeada8ab5..3146a475eb 100644 --- a/arch/arm/mach-vexpress/include/mach/devices.h +++ b/arch/arm/mach-vexpress/include/mach/devices.h @@ -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; diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 12d5d1a6f4..d6dde83e46 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -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); |