diff options
| author | cognet <cognet@FreeBSD.org> | 2006-05-22 23:25:34 +0000 |
|---|---|---|
| committer | cognet <cognet@FreeBSD.org> | 2006-05-22 23:25:34 +0000 |
| commit | 671ec01c105ba0af4fc551a74c213d42074ec7d7 (patch) | |
| tree | 3eae1429f369d93aeac36600e907b55283a15aaf /sys/arm/sa11x0 | |
| parent | 9dfa5a2cdbbb60da86949b433f5978a0d58a0944 (diff) | |
| download | FreeBSD-src-671ec01c105ba0af4fc551a74c213d42074ec7d7.zip FreeBSD-src-671ec01c105ba0af4fc551a74c213d42074ec7d7.tar.gz | |
Use macros instead of hardcoding the address for SACOM1. Also don't
pretend we're working with SACOM3, as we're really mapping SACOM1.
Submitted by: kevlo
Diffstat (limited to 'sys/arm/sa11x0')
| -rw-r--r-- | sys/arm/sa11x0/assabet_machdep.c | 6 | ||||
| -rw-r--r-- | sys/arm/sa11x0/sa11x0_reg.h | 2 | ||||
| -rw-r--r-- | sys/arm/sa11x0/uart_dev_sa1110.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/sys/arm/sa11x0/assabet_machdep.c b/sys/arm/sa11x0/assabet_machdep.c index efc3c3c..ccf7ae0 100644 --- a/sys/arm/sa11x0/assabet_machdep.c +++ b/sys/arm/sa11x0/assabet_machdep.c @@ -93,6 +93,8 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <sys/reboot.h> +#include <arm/sa11x0/sa11x0_reg.h> + #define MDROOT_ADDR 0xd0400000 #define KERNEL_PT_VMEM 0 /* Page table for mapping video memory */ @@ -334,8 +336,8 @@ initarm(void *arg, void *arg2) /* Map the vector page. */ pmap_map_entry(l1pagetable, vector_page, systempage.pv_pa, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - /* Map SACOM3. */ - pmap_map_entry(l1pagetable, 0xd000d000, 0x80010000, + /* Map SACOM1. */ + pmap_map_entry(l1pagetable, SACOM1_VBASE, SACOM1_BASE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE); pmap_map_entry(l1pagetable, 0x90050000, 0x90050000, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE); diff --git a/sys/arm/sa11x0/sa11x0_reg.h b/sys/arm/sa11x0/sa11x0_reg.h index 86ad31d..fdc2753 100644 --- a/sys/arm/sa11x0/sa11x0_reg.h +++ b/sys/arm/sa11x0/sa11x0_reg.h @@ -59,7 +59,7 @@ #define SALCD_BASE 0xB0100000 /* LCD */ /* Register base virtual addresses mapped by initarm() */ -#define SACOM3_BASE 0xd000d000 +#define SACOM1_VBASE 0xd000d000 /* Interrupt controller registers */ #define SAIPIC_NPORTS 9 diff --git a/sys/arm/sa11x0/uart_dev_sa1110.c b/sys/arm/sa11x0/uart_dev_sa1110.c index ac9b026..4fa99ea 100644 --- a/sys/arm/sa11x0/uart_dev_sa1110.c +++ b/sys/arm/sa11x0/uart_dev_sa1110.c @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include <dev/uart/uart.h> #include <dev/uart/uart_cpu.h> #include <dev/uart/uart_bus.h> +#include <arm/sa11x0/sa11x0_reg.h> #include <arm/sa11x0/uart_dev_sa1110.h> #include "uart_if.h" @@ -79,7 +80,7 @@ static void sa1110_addr_change(struct uart_bas *bas) { - bas->bsh = 0xd000d000; + bas->bsh = SACOM1_VBASE; did_mmu = 1; } |
