[BACK]Return to GENERIC CVS log [TXT][DIR] Up to [local] / sys / arch / jornada / conf

Diff for /sys/arch/jornada/conf/GENERIC between version 1.3 and 1.4

version 1.3, 2008/03/05 13:36:22 version 1.4, 2008/05/11 10:26:11
Line 18 
Line 18 
 makeoptions     KERNEL_BASE_PHYS="0xc0200000"  makeoptions     KERNEL_BASE_PHYS="0xc0200000"
 makeoptions     KERNEL_BASE_VIRT="0xc0200000"  makeoptions     KERNEL_BASE_VIRT="0xc0200000"
 makeoptions     BOARDTYPE="jornada720"  # XXX Jornada 728 differs only by doubling RAM  makeoptions     BOARDTYPE="jornada720"  # XXX Jornada 728 differs only by doubling RAM
 makeoptions DEBUG="-g"  #makeoptions DEBUG="-g"
   
 #rmoption       DDB  #rmoption       DDB
 #rmoption       USER_CONF  
   
 options         CPU_SA1110              # Support the StrongARM 1110 core  options         CPU_SA1110              # Support the StrongARM 1110 core
 options         VERBOSE_PMAP_DEVMAP  options         VERBOSE_PMAP_DEVMAP
Line 30 
Line 29 
 #options        BOOTCONSOLE_COM # use UART3 as boot console (instead of framebuffer)  #options        BOOTCONSOLE_COM # use UART3 as boot console (instead of framebuffer)
   
 #config bsd     swap generic  #config bsd     swap generic
 config bsd root on nfs swap on nfs  #config bsd root on nfs swap on nfs
   config bsd root on wd0a swap on wd0b
   
 # The main bus device  # The main bus device
 mainbus0        at root  mainbus0        at root
Line 41 
Line 41 
   
 # Chip companion (SA1111)  # Chip companion (SA1111)
 # sacc's INT line is connected to GPIO 0 on sa11x0  # sacc's INT line is connected to GPIO 0 on sa11x0
 sacc0           at saip? addr 0x40000000 intr 0  sacc0           at saip? addr 0x40000000 intr 0 size 0x2000
 sacic0          at sacc?  sacic0          at sacc?
 sacgpio0        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  # Jornada framebuffer
 jfb0            at saip? addr 0x48200000  jfb0            at saip? addr 0x48200000
 wsdisplay*      at jfb?  wsdisplay*      at jfb?
Line 56 
Line 67 
 saost0          at saip? addr 0x90000000 size 0x20  saost0          at saip? addr 0x90000000 size 0x20
   
 # Serial Port 3 (UART)  # Serial Port 3 (UART)
 sacom0          at saip? addr 0x80050000 size 0x24 intr 17  #sacom0         at saip? addr 0x80050000 size 0x24
   
 # MCP/SSP (Serial Port 4)  # MCP/SSP (Serial Port 4)
 sassp0          at saip? addr 0x80070000  sassp0          at saip? addr 0x80070000
 spibus*         at sassp?  spibus*         at sassp?
   
 # Onboard MCU (keyboard, touchscreen)  # Onboard MCU (keyboard, touchscreen)
 #jmcu0          at spibus?  jmcu0           at spibus?
 #wskbd*         at jmcu?  wskbd*          at jmcu?
   
 # GPIO controller  # GPIO controller
 sagpio0         at saip? addr 0x90040000  sagpio0         at saip? addr 0x90040000
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4
CVSweb