PERFORCE change 71347 for review
John-Mark Gurney
jmg at FreeBSD.org
Sat Feb 19 15:15:12 PST 2005
http://perforce.freebsd.org/chv.cgi?CH=71347
Change 71347 by jmg at jmg_carbon on 2005/02/19 23:14:23
add ep93xx support code
and TS-7200 specific stuff...
this include much debugging output, and only gets up to
setttb...
Affected files ...
.. //depot/projects/arm/src/sys/arm/arm/locore.S#2 edit
.. //depot/projects/arm/src/sys/arm/arm/pmap.c#2 edit
.. //depot/projects/arm/src/sys/arm/conf/TS7200#1 add
.. //depot/projects/arm/src/sys/arm/ep93xx/ep93xx.c#1 add
.. //depot/projects/arm/src/sys/arm/ep93xx/ep93xx_space.c#1 add
.. //depot/projects/arm/src/sys/arm/ep93xx/ep93xxreg.h#1 add
.. //depot/projects/arm/src/sys/arm/ep93xx/ep93xxvar.h#1 add
.. //depot/projects/arm/src/sys/arm/ep93xx/epclk.c#1 add
.. //depot/projects/arm/src/sys/arm/ep93xx/epclkreg.h#1 add
.. //depot/projects/arm/src/sys/arm/ep93xx/epsocvar.h#1 add
.. //depot/projects/arm/src/sys/arm/ep93xx/files.ep93xx#1 add
.. //depot/projects/arm/src/sys/arm/ep93xx/files.ts7200#1 add
.. //depot/projects/arm/src/sys/arm/ep93xx/std.ts7200#1 add
.. //depot/projects/arm/src/sys/arm/ep93xx/ts7200_machdep.c#1 add
.. //depot/projects/arm/src/sys/arm/ep93xx/tsarmreg.h#1 add
.. //depot/projects/arm/src/sys/arm/ep93xx/tsarmvar.h#1 add
.. //depot/projects/arm/src/sys/arm/ep93xx/uart_bus_ep93xx.c#1 add
.. //depot/projects/arm/src/sys/arm/ep93xx/uart_cpu_ep93xx.c#1 add
.. //depot/projects/arm/src/sys/conf/options.arm#2 edit
.. //depot/projects/arm/src/sys/dev/uart/uart_cpu.h#2 edit
.. //depot/projects/arm/src/sys/dev/uart/uart_dev_epuart.c#1 add
.. //depot/projects/arm/src/sys/dev/uart/uart_tty.c#2 edit
Differences ...
==== //depot/projects/arm/src/sys/arm/arm/locore.S#2 (text+ko) ====
@@ -65,7 +65,6 @@
ASENTRY_NP(_start)
-
/* Check if we are running on RAM, if not move ourself to RAM */
#if 0
cmp pc, #PHYSADDR
@@ -195,12 +194,11 @@
.word STARTUP_PAGETABLE_ADDR
mmu_init_table:
/* fill all table VA==PA */
- MMU_INIT(0x00000000, 0x00000000, 1<<(32-L1_S_SHIFT), L1_TYPE_S|L1_S_AP(AP_KRW))
/* map SDRAM VA==PA, WT cacheable */
MMU_INIT(PHYSADDR, PHYSADDR , 64, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW))
/* map VA 0xc0000000..0xc3ffffff to PA */
MMU_INIT(KERNBASE, PHYSADDR, 64, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW))
- MMU_INIT(0xfe800000, 0xfe800000, 1<<(32-L1_S_SHIFT), L1_TYPE_S|L1_S_AP(AP_KRW))
+ MMU_INIT(0xf0100000, 0x80800000, 1<<(32-L1_S_SHIFT), L1_TYPE_S|L1_S_AP(AP_KRW))
.word 0 /* end of table */
#endif
@@ -315,6 +313,11 @@
mov pc, r7
#endif
+ENTRY(asm_putc)
+ ldr r1, =0xf01c0000
+ strb r0, [r1]
+ mov pc, lr
+
/*
* setjump + longjmp
*/
==== //depot/projects/arm/src/sys/arm/arm/pmap.c#2 (text+ko) ====
@@ -4398,7 +4398,12 @@
proto = L1_S_DOM(PMAP_DOMAIN_KERNEL) | L1_C_PROTO;
+#ifdef VERBOSE_INIT_ARM
+ printf("pmap_link_l2pt: pa=0x%x va=0x%x\n", l2pv->pv_pa, l2pv->pv_va);
+#endif
+
pde[slot + 0] = proto | (l2pv->pv_pa + 0x000);
+
#ifdef ARM32_NEW_VM_LAYOUT
PTE_SYNC(&pde[slot]);
#else
@@ -4489,7 +4494,7 @@
panic("pmap_map_chunk: no L1 table provided");
#ifdef VERBOSE_INIT_ARM
- printf("pmap_map_chunk: pa=0x%lx va=0x%lx size=0x%lx resid=0x%lx "
+ printf("pmap_map_chunk: pa=0x%x va=0x%x size=0x%x resid=0x%x "
"prot=0x%x cache=%d\n", pa, va, size, resid, prot, cache);
#endif
@@ -4628,7 +4633,7 @@
for (i = 0; pmap_devmap_table[i].pd_size != 0; i++) {
#ifdef VERBOSE_INIT_ARM
- printf("devmap: %08lx -> %08lx @ %08lx\n",
+ printf("devmap: %08x -> %08x @ %08x\n",
pmap_devmap_table[i].pd_pa,
pmap_devmap_table[i].pd_pa +
pmap_devmap_table[i].pd_size - 1,
==== //depot/projects/arm/src/sys/conf/options.arm#2 (text+ko) ====
@@ -10,4 +10,5 @@
KERNPHYSADDR opt_global.h
KERNVIRTADDR opt_global.h
STARTUP_PAGETABLE_ADDR opt_global.h
+VERBOSE_INIT_ARM opt_global.h
XSCALE_CACHE_READ_WRITE_ALLOCATE opt_global.h
==== //depot/projects/arm/src/sys/dev/uart/uart_cpu.h#2 (text+ko) ====
@@ -43,6 +43,7 @@
extern struct uart_ops uart_i8251_ops;
extern struct uart_ops uart_ns8250_ops;
+extern struct uart_ops uart_epuart_ops;
extern struct uart_ops uart_sab82532_ops;
extern struct uart_ops uart_z8530_ops;
==== //depot/projects/arm/src/sys/dev/uart/uart_tty.c#2 (text+ko) ====
More information about the p4-projects
mailing list