Return to GENERIC CVS log

Up to [local] / sys / arch / jornada / conf

Sync up my latest modifications related to OpenBSD/jornada.
At this point PCMCIA is not done (this is primary goal since it's only
expansion bus for SA-1110) but some other chip subsystems rather work.
One of most recent problems sit in ported NetBSD pcic driver. It cause memory
abort passing odd addr to bus_space_write_2 (APB transactions are word-wide,
but I try to emulate 2-bytes accesses in bus_space_map for sa1111).
Other problematic/untested areas: sacic, saic. UART driver is a stub and not
really useful.
But even with this problems I have overdone my plans with this porting effort.

# $OpenBSD: GENERIC,v 1.16 2007/05/31 23:18:25 uwe Exp $ 
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
#
# For further information on hardware support for this architecture, see
# the intro(4) man page.  For further information about kernel options
# for this architecture, see the options(4) man page.  For an explanation
# of each device driver in this file see the section 4 man page for the
# device.

machine		jornada arm
include		"../../../conf/GENERIC"
maxusers	32			# estimated number of users

options		ARM32

makeoptions	KERNEL_BASE_PHYS="0xc0200000"
makeoptions	KERNEL_BASE_VIRT="0xc0200000"
makeoptions	BOARDTYPE="jornada720"	# XXX Jornada 728 differs only by doubling RAM
#makeoptions DEBUG="-g"

#rmoption	DDB

options		CPU_SA1110		# Support the StrongARM 1110 core
options		VERBOSE_PMAP_DEVMAP
options		DO_NOT_RESET_SA1

#options	BOOTCONSOLE_COM	# use UART3 as boot console (instead of framebuffer)

#config	bsd	swap generic
#config bsd root on nfs swap on nfs
config bsd root on wd0a swap on wd0b

# The main bus device
mainbus0	at root
cpu0		at mainbus?

# SA-1110 space and integrated peripherals
saip0		at mainbus?

# Chip companion (SA1111)
# sacc's INT line is connected to GPIO 0 on sa11x0
sacc0		at saip? addr 0x40000000 intr 0 size 0x2000
sacic0		at sacc?
sacgpio0	at sacc?
sacpcic0	at sacc?

options		PCMCIADEBUG
options		PCMCIAVERBOSE

pcmcia*		at sacpcic?

com*		at pcmcia?
wdc*		at pcmcia?

wd*			at wdc? flags 0x0000

# Jornada framebuffer
jfb0		at saip? addr 0x48200000
wsdisplay*	at jfb?

# Interrupt Controller
saic0		at saip? addr 0x90050000 size 0x24

# OST (Operating System Timer)
saost0		at saip? addr 0x90000000 size 0x20

# Serial Port 3 (UART)
#sacom0		at saip? addr 0x80050000 size 0x24

# MCP/SSP (Serial Port 4)
sassp0		at saip? addr 0x80070000
spibus*		at sassp?

# Onboard MCU (keyboard, touchscreen)
jmcu0		at spibus?
wskbd*		at jmcu?

# GPIO controller
sagpio0		at saip? addr 0x90040000 

# Jornada ts
#jts0		at jmcu?
#wsmouse*	at jts?

#pseudo-device	crypto		1