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/s3c2xx0 | |
| 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/s3c2xx0')
| -rw-r--r-- | sys/arm/s3c2xx0/s3c24x0_machdep.c | 6 | ||||
| -rw-r--r-- | sys/arm/s3c2xx0/std.ln2410sbc | 1 | ||||
| -rw-r--r-- | sys/arm/s3c2xx0/std.s3c2410 | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/sys/arm/s3c2xx0/s3c24x0_machdep.c b/sys/arm/s3c2xx0/s3c24x0_machdep.c index 4f14c5c..f531bd0 100644 --- a/sys/arm/s3c2xx0/s3c24x0_machdep.c +++ b/sys/arm/s3c2xx0/s3c24x0_machdep.c @@ -118,9 +118,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]; @@ -241,8 +238,7 @@ initarm(struct arm_boot_params *abp) set_cpufuncs(); cpufuncs.cf_sleep = s3c24x0_sleep; - 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/s3c2xx0/std.ln2410sbc b/sys/arm/s3c2xx0/std.ln2410sbc index 2b53144..d73d62d 100644 --- a/sys/arm/s3c2xx0/std.ln2410sbc +++ b/sys/arm/s3c2xx0/std.ln2410sbc @@ -7,4 +7,5 @@ options KERNPHYSADDR=0x30000000 options KERNVIRTADDR=0xc0000000 options PHYSADDR=0x30000000 options STARTUP_PAGETABLE_ADDR=0x30800000 +options NO_EVENTTIMERS diff --git a/sys/arm/s3c2xx0/std.s3c2410 b/sys/arm/s3c2xx0/std.s3c2410 index 31ec680..8d30f4e 100644 --- a/sys/arm/s3c2xx0/std.s3c2410 +++ b/sys/arm/s3c2xx0/std.s3c2410 @@ -4,3 +4,4 @@ files "../s3c2xx0/files.s3c2xx0" cpu CPU_ARM9 makeoptions CONF_CFLAGS=-mcpu=arm920t +options NO_EVENTTIMERS |
