summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arm/at91/at91_machdep.c5
-rw-r--r--sys/arm/conf/KB920X12
-rw-r--r--sys/arm/econa/econa_machdep.c5
-rw-r--r--sys/arm/include/atomic.h4
-rw-r--r--sys/arm/mv/mv_machdep.c6
-rw-r--r--sys/arm/s3c2xx0/s3c24x0_machdep.c9
-rw-r--r--sys/arm/sa11x0/assabet_machdep.c5
-rw-r--r--sys/arm/xscale/i80321/ep80219_machdep.c5
-rw-r--r--sys/arm/xscale/i80321/iq31244_machdep.c5
-rw-r--r--sys/arm/xscale/i8134x/crb_machdep.c2
-rw-r--r--sys/arm/xscale/ixp425/avila_machdep.c5
-rw-r--r--sys/arm/xscale/pxa/pxa_machdep.c5
12 files changed, 13 insertions, 55 deletions
diff --git a/sys/arm/at91/at91_machdep.c b/sys/arm/at91/at91_machdep.c
index 23732ef..23e40fd 100644
--- a/sys/arm/at91/at91_machdep.c
+++ b/sys/arm/at91/at91_machdep.c
@@ -115,10 +115,6 @@ extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
-extern void *_end;
-
-extern int *end;
-
struct pcpu __pcpu;
struct pcpu *pcpup = &__pcpu;
@@ -126,7 +122,6 @@ struct pcpu *pcpup = &__pcpu;
vm_paddr_t phys_avail[10];
vm_paddr_t dump_avail[4];
-vm_offset_t physical_pages;
struct pv_addr systempage;
struct pv_addr msgbufpv;
diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X
index ea50c8b..c3c0e28 100644
--- a/sys/arm/conf/KB920X
+++ b/sys/arm/conf/KB920X
@@ -21,10 +21,16 @@
ident KB920X
include "../at91/std.kb920x"
+# bring in the sam specific timers and such
+#include "../at91/std.at91sam9"
+nodevice at91rm9200
+device at91sam9
+device at91sam9x25
# The AT91 platform doesn't use /boot/loader, so we have to statically wire
# hints.
hints "KB920X.hints"
-#makeoptions MODULES_OVERRIDE=""
+makeoptions MODULES_OVERRIDE=""
+options LINUX_BOOT_ABI
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
options DDB
@@ -81,7 +87,7 @@ device lxtphy
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
device md
-device at91_twi # TWI: Two Wire Interface
+#device at91_twi # TWI: Two Wire Interface
device at91_spi # SPI:
device spibus
# MMC/SD
@@ -137,6 +143,8 @@ device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
device wlan_amrr # AMRR transmit rate control algorithm
+
+#device cfi
options IEEE80211_SUPPORT_MESH
options AH_SUPPORT_AR5416
diff --git a/sys/arm/econa/econa_machdep.c b/sys/arm/econa/econa_machdep.c
index 62c8a1b..de18fd1 100644
--- a/sys/arm/econa/econa_machdep.c
+++ b/sys/arm/econa/econa_machdep.c
@@ -103,10 +103,6 @@ extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
-extern void *_end;
-
-extern int *end;
-
struct pcpu __pcpu;
struct pcpu *pcpup = &__pcpu;
@@ -114,7 +110,6 @@ struct pcpu *pcpup = &__pcpu;
vm_paddr_t phys_avail[10];
vm_paddr_t dump_avail[4];
-vm_offset_t physical_pages;
struct pv_addr systempage;
struct pv_addr msgbufpv;
diff --git a/sys/arm/include/atomic.h b/sys/arm/include/atomic.h
index a64fc4a..949b191 100644
--- a/sys/arm/include/atomic.h
+++ b/sys/arm/include/atomic.h
@@ -347,7 +347,9 @@ atomic_readandclear_32(volatile u_int32_t *p)
#define atomic_cmpset_ptr(dst, old, new) \
atomic_cmpset_32((volatile u_int *)(dst), (u_int)(old), (u_int)(new))
#define atomic_cmpset_rel_ptr atomic_cmpset_ptr
-#define atomic_cmpset_acq_ptr atomic_cmpset_ptr
+#define atomic_cmpset_acq_ptr(dst, old, new) \
+ atomic_cmpset_ptr((volatile uint32_t *)(dst), (volatile uint32_t)(old), \
+ (volatile uint32_t)(new))
#define atomic_store_ptr atomic_store_32
#define atomic_store_rel_ptr atomic_store_ptr
diff --git a/sys/arm/mv/mv_machdep.c b/sys/arm/mv/mv_machdep.c
index bb08933..0c12aea 100644
--- a/sys/arm/mv/mv_machdep.c
+++ b/sys/arm/mv/mv_machdep.c
@@ -115,16 +115,11 @@ extern unsigned char _edata[];
extern unsigned char __bss_start[];
extern unsigned char _end[];
-#ifdef DDB
-extern vm_offset_t ksym_start, ksym_end;
-#endif
-
extern u_int data_abort_handler_address;
extern u_int prefetch_abort_handler_address;
extern u_int undefined_handler_address;
extern vm_offset_t pmap_bootstrap_lastaddr;
-extern int *end;
struct pv_addr kernel_pt_table[KERNEL_PT_MAX];
struct pcpu __pcpu;
@@ -134,7 +129,6 @@ struct pcpu *pcpup = &__pcpu;
vm_paddr_t phys_avail[10];
vm_paddr_t dump_avail[4];
-vm_offset_t physical_pages;
vm_offset_t pmap_bootstrap_lastaddr;
const struct pmap_devmap *pmap_devmap_bootstrap_table;
diff --git a/sys/arm/s3c2xx0/s3c24x0_machdep.c b/sys/arm/s3c2xx0/s3c24x0_machdep.c
index caf4ba8..4f14c5c 100644
--- a/sys/arm/s3c2xx0/s3c24x0_machdep.c
+++ b/sys/arm/s3c2xx0/s3c24x0_machdep.c
@@ -118,10 +118,6 @@ extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
-extern void *_end;
-
-extern int *end;
-
struct pcpu __pcpu;
struct pcpu *pcpup = &__pcpu;
@@ -129,7 +125,6 @@ struct pcpu *pcpup = &__pcpu;
vm_paddr_t phys_avail[10];
vm_paddr_t dump_avail[4];
-vm_offset_t physical_pages;
struct pv_addr systempage;
struct pv_addr msgbufpv;
@@ -203,10 +198,6 @@ static const struct pmap_devmap s3c24x0_devmap[] = {
#define ioreg_read32(a) (*(volatile uint32_t *)(a))
#define ioreg_write32(a,v) (*(volatile uint32_t *)(a)=(v))
-#ifdef DDB
-extern vm_offset_t ksym_start, ksym_end;
-#endif
-
struct arm32_dma_range s3c24x0_range = {
.dr_sysbase = 0,
.dr_busbase = 0,
diff --git a/sys/arm/sa11x0/assabet_machdep.c b/sys/arm/sa11x0/assabet_machdep.c
index 9bc80d5..3a3e0f9 100644
--- a/sys/arm/sa11x0/assabet_machdep.c
+++ b/sys/arm/sa11x0/assabet_machdep.c
@@ -119,14 +119,10 @@ extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
-extern void *_end;
-
extern vm_offset_t sa1110_uart_vaddr;
extern vm_offset_t sa1_cache_clean_addr;
-extern int *end;
-
struct pcpu __pcpu;
struct pcpu *pcpup = &__pcpu;
@@ -140,7 +136,6 @@ vm_paddr_t dump_avail[4];
vm_paddr_t physical_start;
vm_paddr_t physical_end;
vm_paddr_t physical_freestart;
-vm_offset_t physical_pages;
struct pv_addr systempage;
struct pv_addr irqstack;
diff --git a/sys/arm/xscale/i80321/ep80219_machdep.c b/sys/arm/xscale/i80321/ep80219_machdep.c
index 0508244..fe781cc 100644
--- a/sys/arm/xscale/i80321/ep80219_machdep.c
+++ b/sys/arm/xscale/i80321/ep80219_machdep.c
@@ -115,10 +115,6 @@ extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
-extern void *_end;
-
-extern int *end;
-
struct pcpu __pcpu;
struct pcpu *pcpup = &__pcpu;
@@ -126,7 +122,6 @@ struct pcpu *pcpup = &__pcpu;
vm_paddr_t phys_avail[10];
vm_paddr_t dump_avail[4];
-vm_offset_t physical_pages;
struct pv_addr systempage;
struct pv_addr msgbufpv;
diff --git a/sys/arm/xscale/i80321/iq31244_machdep.c b/sys/arm/xscale/i80321/iq31244_machdep.c
index 9790c0b..e9f3fae 100644
--- a/sys/arm/xscale/i80321/iq31244_machdep.c
+++ b/sys/arm/xscale/i80321/iq31244_machdep.c
@@ -115,10 +115,6 @@ extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
-extern void *_end;
-
-extern int *end;
-
struct pcpu __pcpu;
struct pcpu *pcpup = &__pcpu;
@@ -126,7 +122,6 @@ struct pcpu *pcpup = &__pcpu;
vm_paddr_t phys_avail[10];
vm_paddr_t dump_avail[4];
-vm_offset_t physical_pages;
struct pv_addr systempage;
struct pv_addr msgbufpv;
diff --git a/sys/arm/xscale/i8134x/crb_machdep.c b/sys/arm/xscale/i8134x/crb_machdep.c
index 8567b17..2fa7ca1 100644
--- a/sys/arm/xscale/i8134x/crb_machdep.c
+++ b/sys/arm/xscale/i8134x/crb_machdep.c
@@ -117,7 +117,6 @@ extern u_int prefetch_abort_handler_address;
extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
-extern int *end;
struct pcpu __pcpu;
struct pcpu *pcpup = &__pcpu;
@@ -126,7 +125,6 @@ struct pcpu *pcpup = &__pcpu;
vm_paddr_t phys_avail[10];
vm_paddr_t dump_avail[4];
-vm_offset_t physical_pages;
struct pv_addr systempage;
struct pv_addr msgbufpv;
diff --git a/sys/arm/xscale/ixp425/avila_machdep.c b/sys/arm/xscale/ixp425/avila_machdep.c
index 5c1819c..6c87510 100644
--- a/sys/arm/xscale/ixp425/avila_machdep.c
+++ b/sys/arm/xscale/ixp425/avila_machdep.c
@@ -119,10 +119,6 @@ extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
-extern void *_end;
-
-extern int *end;
-
struct pcpu __pcpu;
struct pcpu *pcpup = &__pcpu;
@@ -130,7 +126,6 @@ struct pcpu *pcpup = &__pcpu;
vm_paddr_t phys_avail[10];
vm_paddr_t dump_avail[4];
-vm_offset_t physical_pages;
struct pv_addr systempage;
struct pv_addr msgbufpv;
diff --git a/sys/arm/xscale/pxa/pxa_machdep.c b/sys/arm/xscale/pxa/pxa_machdep.c
index da5787a..d0e3f0c 100644
--- a/sys/arm/xscale/pxa/pxa_machdep.c
+++ b/sys/arm/xscale/pxa/pxa_machdep.c
@@ -115,10 +115,6 @@ extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
-extern void *_end;
-
-extern int *end;
-
struct pcpu __pcpu;
struct pcpu *pcpup = &__pcpu;
@@ -126,7 +122,6 @@ struct pcpu *pcpup = &__pcpu;
vm_paddr_t phys_avail[PXA2X0_SDRAM_BANKS * 2 + 4];
vm_paddr_t dump_avail[PXA2X0_SDRAM_BANKS * 2 + 4];
-vm_offset_t physical_pages;
struct pv_addr systempage;
struct pv_addr msgbufpv;
OpenPOWER on IntegriCloud