diff options
Diffstat (limited to 'arch/arm/boards')
-rw-r--r-- | arch/arm/boards/vexpress/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/boards/vexpress/defaultenv-vexpress/config | 38 | ||||
-rw-r--r-- | arch/arm/boards/vexpress/init.c | 115 | ||||
-rw-r--r-- | arch/arm/boards/vexpress/lowlevel.c | 20 |
4 files changed, 21 insertions, 154 deletions
diff --git a/arch/arm/boards/vexpress/Makefile b/arch/arm/boards/vexpress/Makefile index c89d7bf182..2da0494d49 100644 --- a/arch/arm/boards/vexpress/Makefile +++ b/arch/arm/boards/vexpress/Makefile @@ -1,4 +1,2 @@ obj-y += init.o - lwl-y += lowlevel.o -bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-vexpress diff --git a/arch/arm/boards/vexpress/defaultenv-vexpress/config b/arch/arm/boards/vexpress/defaultenv-vexpress/config deleted file mode 100644 index 6c0abda40c..0000000000 --- a/arch/arm/boards/vexpress/defaultenv-vexpress/config +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -# use 'dhcp' to do dhcp in barebox and in kernel -# use 'none' if you want to skip kernel ip autoconfiguration -ip=dhcp -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 index f89dff9392..1bbc8c3476 100644 --- a/arch/arm/boards/vexpress/init.c +++ b/arch/arm/boards/vexpress/init.c @@ -11,129 +11,23 @@ #include <generated/mach-types.h> #include <mach/devices.h> #include <environment.h> -#include <partition.h> #include <linux/sizes.h> #include <io.h> #include <envfs.h> #include <globalvar.h> #include <linux/amba/sp804.h> -#include <mci.h> - -struct vexpress_init { - void (*core_init)(void); - void (*mem_init)(void); - void (*console_init)(void); - void (*devices_init)(void); -}; - -struct mmci_platform_data mmci_plat = { - .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, - .clkdiv_init = SDI_CLKCR_CLKDIV_INIT, -}; - -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); - vexpress_register_mmc(&mmci_plat); - add_generic_device("smc911x", DEVICE_ID_DYNAMIC, NULL, 0x1a000000, - 64 * 1024, IORESOURCE_MEM, NULL); -} - -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_legacy_mem_init(void) -{ - vexpress_a9_legacy_add_ddram(SZ_512M, SZ_512M); -} - -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); - add_generic_device("smc911x", DEVICE_ID_DYNAMIC, NULL, 0x4e000000, - 64 * 1024, IORESOURCE_MEM, NULL); - vexpress_a9_legacy_register_mmc(&mmci_plat); - armlinux_set_architecture(MACH_TYPE_VEXPRESS); -} - -static void vexpress_a9_legacy_console_init(void) -{ - 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_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, -}; - -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"); - - if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC)) - defaultenv_append_directory(defaultenv_vexpress); - - 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) { char *hostname = "vexpress-unknown"; if (amba_is_arm_sp804(IOMEM(0x10011000))) { - v2m_init = &vexpress_init_a9_legacy; + vexpress_a9_legacy_init(); hostname = "vexpress-a9-legacy"; } else { - v2m_init = &vexpress_init_ax; + vexpress_init(); if (cpu_is_cortex_a5()) hostname = "vexpress-a5"; else if (cpu_is_cortex_a7()) @@ -144,10 +38,9 @@ static int vexpress_core_init(void) hostname = "vexpress-a15"; } - barebox_set_model("ARM Vexpress"); - barebox_set_hostname(hostname); + writel(1, v2m_sysreg_base + V2M_SYS_FLASH); - v2m_init->core_init(); + barebox_set_hostname(hostname); return 0; } diff --git a/arch/arm/boards/vexpress/lowlevel.c b/arch/arm/boards/vexpress/lowlevel.c index 204d29d8f0..0a226b295c 100644 --- a/arch/arm/boards/vexpress/lowlevel.c +++ b/arch/arm/boards/vexpress/lowlevel.c @@ -11,12 +11,26 @@ #include <asm/system_info.h> #include <linux/amba/sp804.h> -void __naked barebox_arm_reset_vector(void) +static inline void start_vexpress_common(void *internal_dt) { + void *fdt = internal_dt - get_runtime_offset(); + arm_cpu_lowlevel_init(); if (amba_is_arm_sp804(IOMEM(0x10011000))) - barebox_arm_entry(0x60000000, SZ_512M, NULL); + barebox_arm_entry(0x60000000, SZ_512M, fdt); else - barebox_arm_entry(0x80000000, SZ_512M, NULL); + barebox_arm_entry(0x80000000, SZ_512M, fdt); +} + +extern char __dtb_vexpress_v2p_ca9_start[]; +ENTRY_FUNCTION(start_vexpress_ca9, r0, r1, r2) +{ + start_vexpress_common(__dtb_vexpress_v2p_ca9_start); +} + +extern char __dtb_vexpress_v2p_ca15_start[]; +ENTRY_FUNCTION(start_vexpress_ca15, r0, r1, r2) +{ + start_vexpress_common(__dtb_vexpress_v2p_ca15_start); } |