d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use macros instead of hardcoding the address for SACOM1. Also don't

Browse Source 
pretend we're working with SACOM3, as we're really mapping SACOM1.

Submitted by:   kevlo
This commit is contained in:
Olivier Houchard 2006-05-22 23:25:34 +00:00
parent 3f8f09f9af
commit 9c8c02e7a0
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arm/sa11x0/assabet_machdep.c
View File

@ -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);

2
sys/arm/sa11x0/sa11x0_reg.h
View File

@ -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

3
sys/arm/sa11x0/uart_dev_sa1110.c
View File

@ -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;
}