Switch to the generic bounce buffer support.diff -r1.8 -r1.9 src/sys/arch/cats/conf/std.cats
(matt)
--- src/sys/arch/cats/conf/std.cats 2008/01/27 12:37:11 1.8
+++ src/sys/arch/cats/conf/std.cats 2012/09/21 14:22:37 1.9
@@ -1,18 +1,19 @@ | @@ -1,18 +1,19 @@ | |||
1 | # $NetBSD: std.cats,v 1.8 2008/01/27 12:37:11 chris Exp $ | 1 | # $NetBSD: std.cats,v 1.9 2012/09/21 14:22:37 matt Exp $ | |
2 | # | 2 | # | |
3 | # standard NetBSD/cats options | 3 | # standard NetBSD/cats options | |
4 | 4 | |||
5 | machine cats arm | 5 | machine cats arm | |
6 | include "conf/std" # MI standard options | 6 | include "conf/std" # MI standard options | |
7 | include "arch/arm/conf/std.arm" # arch standard options | 7 | include "arch/arm/conf/std.arm" # arch standard options | |
8 | 8 | |||
9 | options EXEC_AOUT | 9 | options EXEC_AOUT | |
10 | options EXEC_SCRIPT | 10 | options EXEC_SCRIPT | |
11 | options EXEC_ELF32 | 11 | options EXEC_ELF32 | |
12 | 12 | |||
13 | # To support easy transit to ../arch/arm/arm32 | 13 | # To support easy transit to ../arch/arm/arm32 | |
14 | options ARM32 | 14 | options ARM32 | |
15 | options _ARM32_NEED_BUS_DMA_BOUNCE | |||
15 | 16 | |||
16 | #options ARM32_NEW_VM_LAYOUT # Not yet supported | 17 | #options ARM32_NEW_VM_LAYOUT # Not yet supported | |
17 | 18 | |||
18 | options ARM_INTR_IMPL="<arm/footbridge/footbridge_intr.h>" | 19 | options ARM_INTR_IMPL="<arm/footbridge/footbridge_intr.h>" |
--- src/sys/arch/netwinder/conf/std.netwinder 2008/01/27 12:37:12 1.15
+++ src/sys/arch/netwinder/conf/std.netwinder 2012/09/21 14:22:37 1.16
@@ -1,22 +1,23 @@ | @@ -1,22 +1,23 @@ | |||
1 | # $NetBSD: std.netwinder,v 1.15 2008/01/27 12:37:12 chris Exp $ | 1 | # $NetBSD: std.netwinder,v 1.16 2012/09/21 14:22:37 matt Exp $ | |
2 | # | 2 | # | |
3 | # standard NetBSD/netwinder options | 3 | # standard NetBSD/netwinder options | |
4 | 4 | |||
5 | machine netwinder arm | 5 | machine netwinder arm | |
6 | include "conf/std" # MI standard options | 6 | include "conf/std" # MI standard options | |
7 | include "arch/arm/conf/std.arm" # arch standard options | 7 | include "arch/arm/conf/std.arm" # arch standard options | |
8 | 8 | |||
9 | options EXEC_AOUT | 9 | options EXEC_AOUT | |
10 | options EXEC_SCRIPT | 10 | options EXEC_SCRIPT | |
11 | options EXEC_ELF32 | 11 | options EXEC_ELF32 | |
12 | 12 | |||
13 | # To support easy transit to ../arch/arm/arm32 | 13 | # To support easy transit to ../arch/arm/arm32 | |
14 | options ARM32 | 14 | options ARM32 | |
15 | options _ARM32_NEED_BUS_DMA_BOUNCE | |||
15 | 16 | |||
16 | options ARM_INTR_IMPL="<arm/footbridge/footbridge_intr.h>" | 17 | options ARM_INTR_IMPL="<arm/footbridge/footbridge_intr.h>" | |
17 | 18 | |||
18 | makeoptions LOADADDRESS="0xF000C000" | 19 | makeoptions LOADADDRESS="0xF000C000" | |
19 | makeoptions ENTRYPOINT="nwstart" | 20 | makeoptions ENTRYPOINT="nwstart" | |
20 | 21 | |||
21 | # Firmware leaves pckbc uninited | 22 | # Firmware leaves pckbc uninited | |
22 | options PCKBC_CNATTACH_SELFTEST | 23 | options PCKBC_CNATTACH_SELFTEST |