diff options
| author | gonzo <gonzo@FreeBSD.org> | 2012-08-15 03:03:03 +0000 |
|---|---|---|
| committer | gonzo <gonzo@FreeBSD.org> | 2012-08-15 03:03:03 +0000 |
| commit | 032427f3e9854fccfdddaea8fb15ae4603391a11 (patch) | |
| tree | 68d86df1ea7d9bfea335c91632747716f5a0df4a /sys/arm/econa | |
| parent | eca813ad76756aea4f70787cf7827d4b319cfe94 (diff) | |
| download | FreeBSD-src-032427f3e9854fccfdddaea8fb15ae4603391a11.zip FreeBSD-src-032427f3e9854fccfdddaea8fb15ae4603391a11.tar.gz | |
Merging projects/armv6, part 1
Cummulative patch of changes that are not vendor-specific:
- ARMv6 and ARMv7 architecture support
- ARM SMP support
- VFP/Neon support
- ARM Generic Interrupt Controller driver
- Simplification of startup code for all platforms
Diffstat (limited to 'sys/arm/econa')
| -rw-r--r-- | sys/arm/econa/econa_machdep.c | 6 | ||||
| -rw-r--r-- | sys/arm/econa/std.econa | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/arm/econa/econa_machdep.c b/sys/arm/econa/econa_machdep.c index de18fd1..9779b6a 100644 --- a/sys/arm/econa/econa_machdep.c +++ b/sys/arm/econa/econa_machdep.c @@ -103,9 +103,6 @@ extern u_int undefined_handler_address; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; -struct pcpu __pcpu; -struct pcpu *pcpup = &__pcpu; - /* Physical and virtual addresses for some global pages */ vm_paddr_t phys_avail[10]; @@ -191,8 +188,7 @@ initarm(struct arm_boot_params *abp) boothowto = RB_VERBOSE; lastaddr = parse_boot_param(abp); set_cpufuncs(); - pcpu_init(pcpup, 0, sizeof(struct pcpu)); - PCPU_SET(curthread, &thread0); + pcpu0_init(); /* Do basic tuning, hz etc */ init_param1(); diff --git a/sys/arm/econa/std.econa b/sys/arm/econa/std.econa index 660648d..46d8194 100644 --- a/sys/arm/econa/std.econa +++ b/sys/arm/econa/std.econa @@ -12,3 +12,5 @@ options KERNVIRTADDR=0xc1000000 # Used in ldscript.arm options FLASHADDR=0xD0000000 options LOADERRAMADDR=0x00000000 options STARTUP_PAGETABLE_ADDR=0x00100000 + +options NO_EVENTTIMERS |
