conflicting symbols we can combine the configs.
Multiple umg files are still required however. The bsd.umg target in
the kernel is replaced by targets for bsd.IMX.umg, bsd.OMAP.umg and
bsd.SUNXI.umg.
REV= ${OSrev}
-BSD_RD= bsd.rd.OMAP
IMAGE= miniroot-${BOARD}-${REV}.fs
MKUBOOT?= mkuboot
-# $OpenBSD: Makefile,v 1.8 2015/05/19 00:05:59 jsg Exp $
+# $OpenBSD: Makefile,v 1.9 2015/05/20 01:44:20 jsg Exp $
REV= ${OSrev}
.else
ALLSOC= IMX OMAP SUNXI
-ALLBSD=
-ALLBSDRD=
+ALLBSD= bsd
+ALLBSDRD= ${BSD_RD}
.for SOC in ${ALLSOC}
-ALLBSD+= bsd.${SOC}
-ALLBSDRD+= ${BSD_RD}.${SOC} ${BSD_RD}.${SOC}.umg
-all: ${ALLBSDRD}
+ALLBSDRD+= ${BSD_RD}.${SOC}.umg
.endfor
+all: ${ALLBSDRD}
-.for SOC in ${ALLSOC}
-bsd.${SOC}:
- cd ${TOP}/../../sys/arch/armv7/conf && config RAMDISK-${SOC}
- cd ${TOP}/../../sys/arch/armv7/compile/RAMDISK-${SOC} && \
+bsd:
+ cd ${TOP}/../../sys/arch/armv7/conf && config RAMDISK
+ cd ${TOP}/../../sys/arch/armv7/compile/RAMDISK && \
${MAKE} clean && exec ${MAKE}
- cp ${TOP}/../../sys/arch/armv7/compile/RAMDISK-${SOC}/bsd bsd.${SOC}
+ cp ${TOP}/../../sys/arch/armv7/compile/RAMDISK/bsd bsd
-${BSD_RD}.${SOC}: ${CBIN} ${IMAGE} bsd.${SOC} rdsetroot
- cp bsd.${SOC} ${BSD_RD}.${SOC}
- ${.OBJDIR}/rdsetroot ${BSD_RD}.${SOC} ${IMAGE}
+${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
+ cp bsd ${BSD_RD}
+ ${.OBJDIR}/rdsetroot ${BSD_RD} ${IMAGE}
+
+.for SOC in ${ALLSOC}
+${BSD_RD}.${SOC}.umg: ${BSD_RD}
mkuboot -a arm -o linux -e ${KERNADDR_${SOC}} -l ${KERNADDR_${SOC}} \
- ${BSD_RD}.${SOC} ${BSD_RD}.${SOC}.umg
+ ${BSD_RD} ${BSD_RD}.${SOC}.umg
.endfor
${IMAGE}: rd_setup do_files rd_teardown
-# $OpenBSD: install.md,v 1.7 2015/05/04 19:55:26 rpe Exp $
+# $OpenBSD: install.md,v 1.8 2015/05/20 01:44:20 jsg Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
local _disk=$1
mount /dev/${_disk}i /mnt/mnt
- BEAGLE=$(scan_dmesg '/^omap0 at mainbus0: \(BeagleBoard\).*/s//\1/p')
- BEAGLEBONE=$(scan_dmesg '/^omap0 at mainbus0: \(BeagleBone\).*/s//\1/p')
- PANDA=$(scan_dmesg '/^omap0 at mainbus0: \(PandaBoard\)/s//\1/p')
- IMX=$(scan_dmesg '/^imx0 at mainbus0: \(i.MX6.*\)/s//IMX/p')
- SUNXI=$(scan_dmesg '/^sunxi0 at mainbus0: \(A.*\)/s//SUNXI/p')
+ BEAGLE=$(scan_dmesg '/^omap0 at mainbus0: TI OMAP3 \(BeagleBoard\).*/s//\1/p')
+ BEAGLEBONE=$(scan_dmesg '/^omap0 at mainbus0: TI AM335x \(BeagleBone\).*/s//\1/p')
+ PANDA=$(scan_dmesg '/^omap0 at mainbus0: TI OMAP4 \(PandaBoard\)/s//\1/p')
- if [[ -f /mnt/bsd.${MDPLAT} ]]; then
- mv /mnt/bsd.${MDPLAT} /mnt/bsd
- fi
if [[ -f /mnt/bsd.${MDPLAT}.umg ]]; then
mv /mnt/bsd.${MDPLAT}.umg /mnt/mnt/bsd.umg
fi
- if [[ -f /mnt/bsd.mp.${MDPLAT} ]]; then
- mv /mnt/bsd.mp.${MDPLAT} /mnt/bsd.mp
- fi
- if [[ -f /mnt/bsd.rd.${MDPLAT} ]]; then
- mv /mnt/bsd.rd.${MDPLAT} /mnt/bsd.rd
- fi
if [[ -f /mnt/bsd.rd.${MDPLAT}.umg ]]; then
mv /mnt/bsd.rd.${MDPLAT}.umg /mnt/mnt/bsdrd.umg
fi
local newfs_args=${NEWFSARGS_msdos}
# imx needs an ext2fs filesystem
- IMX=$(scan_dmesg '/^imx0 at mainbus0: \(i.MX6.*\)/s//IMX/p')
- if [[ -n $IMX ]]; then
+ if [[ ${MDPLAT} == "IMX" ]]; then
bootparttype="83"
bootfstype="ext2fs"
newfs_args=${NEWFSARGS_ext2fs}
-# $OpenBSD: Makefile.inc,v 1.7 2015/05/19 00:05:59 jsg Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2015/05/20 01:44:20 jsg Exp $
ALLSOC=IMX OMAP SUNXI
-KERNELS=
-MDEXT=
+MDEXT= bsd.rd
.for SOC in ${ALLSOC}
-KERNELS+= GENERIC-${SOC} bsd.${SOC}
MDEXT+= bsd.${SOC}.umg
-MDEXT+= bsd.rd.${SOC}
MDEXT+= bsd.rd.${SOC}.umg
.endfor
KERNADDR_IMX=0x10300000
KERNADDR_SUNXI=0x40300000
-.for CONF K in ${KERNELS}
-. if !target($K)
-$K:
- cd ../sys/arch/${MACHINE}/conf && config ${CONF}
- cd ../sys/arch/${MACHINE}/compile/${CONF} && \
- ${MAKE} clean && exec ${MAKE}
-. endif
-ALL_KERNELS += $K
-.endfor
+bootblocks:
kernels: bootblocks ${ALL_KERNELS}
.for CONF K in ${KERNELS}
cp ../sys/arch/${MACHINE}/compile/${CONF}/bsd ${RELEASEDIR}/$K
-.endfor
.for SOC in ${ALLSOC}
mkuboot -a arm -o linux -e ${KERNADDR_${SOC}} -l ${KERNADDR_${SOC}} \
- ${RELEASEDIR}/bsd.${SOC} ${RELEASEDIR}/bsd.${SOC}.umg
+ ${RELEASEDIR}/$K ${RELEASEDIR}/$K.${SOC}.umg
+.endfor
.endfor
-
-ALL_KERNELS=
-
-bootblocks:
MDEXT+= miniroot-am335x-${OSrev}.fs miniroot-beagle-${OSrev}.fs \
miniroot-imx-${OSrev}.fs miniroot-panda-${OSrev}.fs \
-GENERIC-IMX
-GENERIC-OMAP
-GENERIC-SUNXI
-RAMDISK-IMX
-RAMDISK-OMAP
-RAMDISK-SUNXI
+GENERIC
+RAMDISK
--- /dev/null
+# $OpenBSD: GENERIC,v 1.1 2015/05/20 01:44:20 jsg 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 armv7 arm
+include "../../../conf/GENERIC"
+
+makeoptions KERNEL_BASE_VIRT="0xc0300000"
+
+maxusers 32 # estimated number of users
+option CPU_ARMv7 # Support the ARMv7
+
+#option WSDISPLAY_COMPAT_USL # VT handling
+#option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
+option WSDISPLAY_DEFAULTSCREENS=1
+#option WSDISPLAY_COMPAT_PCVT # emulate some ioctls
+
+option CONF_HAVE_GPIO
+option USBVERBOSE
+
+config bsd swap generic
+
+# The main bus device
+mainbus0 at root
+cpu0 at mainbus?
+
+# Cortex-A9
+cortex0 at mainbus?
+ampintc* at cortex?
+amptimer* at cortex?
+#agtimer* at cortex?
+armliicc* at cortex?
+
+# iMX
+imx0 at mainbus? # iMX SoC
+imxccm* at imx? # clock control module
+imxiomuxc* at imx? # iomux controller
+imxdog* at imx? # watchdog timer
+imxocotp* at imx? # on-chip otp controller
+imxgpio* at imx? # user-visible GPIO pins?
+imxenet* at imx? # ethernet
+imxuart* at imx? # onboard uarts
+imxiic* at imx? # i2c
+iic* at imxiic?
+imxesdhc* at imx? # SDHC controller
+sdmmc* at imxesdhc? # SD/MMC bus
+ahci* at imx? # AHCI/SATA
+ehci* at imx? # EHCI (shim)
+usb* at ehci?
+
+# OMAP3xxx/OMAP4xxx SoC
+omap0 at mainbus?
+omapid* at omap?
+
+# OMAP on-chip devices
+intc* at omap? # OMAP3 interrupt controller
+edma* at omap? # OMAP3 dma controller
+prcm* at omap? # power/clock controller
+sitaracm* at omap? # sitara control module
+omdog* at omap? # watchdog timer
+omgpio* at omap? # user-visible GPIO pins?
+gpio* at omgpio?
+#tiiic* at omap?
+#iic* at tiiic?
+gptimer* at omap? # general purpose timers
+dmtimer* at omap? # am335x dual mode timers
+omusbtll* at omap?
+cpsw* at omap?
+com* at omap? # onboard uarts
+ommmc* at omap? # SD/MMC card controller
+sdmmc* at ommmc? # SD/MMC bus
+
+ehci* at omap? # EHCI (shim)
+usb* at ehci?
+
+# Sunxi A1x/A20 SoC
+sunxi0 at mainbus?
+
+# Sunxi on-chip devices
+a1xintc* at sunxi? # A1x interrupt controller
+sxipio* at sunxi? # GPIO pins for leds & PHYs
+gpio* at sxipio?
+sxiccmu* at sunxi? # Clock Control Module/Unit
+sxitimer* at sunxi?
+sxidog* at sunxi? # watchdog timer
+sxirtc* at sunxi? # Real Time Clock
+sxiuart* at sunxi? # onboard UARTs
+sxie* at sunxi?
+ahci* at sunxi? # AHCI/SATA (shim)
+ehci* at sunxi? # EHCI (shim)
+usb* at ehci? #flags 0x1
+#ohci* at sunxi?
+#usb* at ohci?
+
+# USB bus support
+usb* at ehci? flags 0x1
+uhub* at usb?
+uhub* at uhub?
+
+ualea* at uhub? # Araneus Alea II TRNG
+umodem* at uhub? # USB Modems/Serial
+ucom* at umodem?
+uvisor* at uhub? # Handspring Visor
+ucom* at uvisor?
+uvscom* at uhub? # SUNTAC Slipper U VS-10U serial
+ucom* at uvscom?
+ubsa* at uhub? # Belkin serial adapter
+ucom* at ubsa?
+uftdi* at uhub? # FTDI FT8U100AX serial adapter
+ucom* at uftdi?
+uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter
+ucom* at uplcom?
+umct* at uhub? # MCT USB-RS232 serial adapter
+ucom* at umct?
+uaudio* at uhub? # USB Audio
+audio* at uaudio?
+umidi* at uhub? # USB MIDI
+midi* at umidi?
+ulpt* at uhub? # USB Printers
+umass* at uhub? # USB Mass Storage devices
+uhidev* at uhub? # Human Interface Devices
+ums* at uhidev? # USB mouse
+wsmouse* at ums? mux 0
+ukbd* at uhidev? # USB keyboard
+wskbd* at ukbd? mux 1
+uslhcom* at uhidev? # Silicon Labs CP2110 USB HID UART
+ucom* at uslhcom?
+uhid* at uhidev? # USB generic HID support
+aue* at uhub? # ADMtek AN986 Pegasus Ethernet
+atu* at uhub? # Atmel AT76c50x based 802.11b
+axe* at uhub? # ASIX Electronics AX88172 USB Ethernet
+axen* at uhub? # ASIX Electronics AX88179 USB Ethernet
+cue* at uhub? # CATC USB-EL1201A based Ethernet
+kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet
+smsc* at uhub? # SMSC LAN95xx Ethernet
+cdce* at uhub? # CDC Ethernet
+upl* at uhub? # Prolific PL2301/PL2302 host-to-host
+ugl* at uhub? # Genesys Logic GL620USB-A host-to-host
+udav* at uhub? # Davicom DM9601 based Ethernet
+url* at uhub? # Realtek RTL8150L based adapters
+wi* at uhub? # WaveLAN IEEE 802.11DS
+udsbr* at uhub? # D-Link DSB-R100 radio
+radio* at udsbr? # USB radio
+ugen* at uhub? # USB Generic driver
+rum* at uhub? # Ralink RT2501USB/RT2601USB
+
+atphy* at mii? # Attansic F1 PHYs
+rgephy* at mii? # Realtek 8169S/8110S PHY
+rlphy* at mii? # Realtek 8139 internal PHYs
+ukphy* at mii? # "unknown" PHYs
+
+scsibus* at scsi?
+sd* at scsibus?
+cd* at scsibus?
+st* at scsibus?
+ch* at scsibus?
+uk* at scsibus?
+
+# GPIO "pin bus" drivers
+gpioiic* at gpio? # I2C bus bit-banging
+iic* at gpioiic?
+gpioow* at gpio? # 1-Wire bus bit-banging
+onewire* at gpioow?
+
+# 1-Wire devices
+option ONEWIREVERBOSE
+owid* at onewire? # ID
+owsbm* at onewire? # Smart Battery Monitor
+owtemp* at onewire? # Temperature
+owctr* at onewire? # Counter device
+
+# Pseudo-Devices
+pseudo-device hotplug 1 # devices hot plugging
+++ /dev/null
-# $OpenBSD: GENERIC-IMX,v 1.13 2015/05/19 00:05:59 jsg Exp $
-#
-# GENERIC machine description file
-#
-# This machine description file is used to generate the default OpenBSD
-# kernel. The generic kernel does not include all options, subsystems
-# and device drivers, but should be useful for most applications.
-#
-# The machine description file can be customised for your specific
-# machine to reduce the kernel size and improve its performance.
-#
-# 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 armv7 arm
-include "../../../conf/GENERIC"
-
-makeoptions KERNEL_BASE_PHYS="0x10300000"
-makeoptions KERNEL_BASE_VIRT="0xc0300000"
-
-#options APERTURE
-
-#options BOOT_CONFIG # boot-time kernel config
-
-# estimated number of users
-
-maxusers 32
-
-# CPU options
-options CPU_ARMv7 # Support the ARMv7
-
-#option WSDISPLAY_COMPAT_USL # VT handling
-#option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
-option WSDISPLAY_DEFAULTSCREENS=1
-#option WSDISPLAY_COMPAT_PCVT # emulate some ioctls
-
-option USBVERBOSE
-
-config bsd swap generic
-
-# The main bus device
-mainbus0 at root
-cpu0 at mainbus?
-
-# Cortex-A9 (iMX6)
-cortex0 at mainbus?
-ampintc* at cortex?
-amptimer* at cortex?
-armliicc* at cortex?
-
-# iMX SoC
-imx0 at mainbus?
-
-# iMX on-chip devices
-imxccm* at imx? # clock control module
-imxiomuxc* at imx? # iomux controller
-imxdog* at imx? # watchdog timer
-imxocotp* at imx? # on-chip otp controller
-imxgpio* at imx? # user-visible GPIO pins?
-imxesdhc* at imx? # SDHC controller
-imxenet* at imx? # ethernet
-imxuart* at imx? # onboard uarts
-imxiic* at imx? # i2c
-
-ahci* at imx? # AHCI/SATA
-
-ehci* at imx? # EHCI (shim)
-usb* at ehci?
-
-# USB bus support
-usb* at ehci? flags 0x1
-uhub* at usb?
-uhub* at uhub?
-
-uhub* at usb? # USB Hubs
-uhub* at uhub? # USB Hubs
-ualea* at uhub? # Araneus Alea II TRNG
-umodem* at uhub? # USB Modems/Serial
-ucom* at umodem?
-uvisor* at uhub? # Handspring Visor
-ucom* at uvisor?
-uvscom* at uhub? # SUNTAC Slipper U VS-10U serial
-ucom* at uvscom?
-ubsa* at uhub? # Belkin serial adapter
-ucom* at ubsa?
-uftdi* at uhub? # FTDI FT8U100AX serial adapter
-ucom* at uftdi?
-uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter
-ucom* at uplcom?
-umct* at uhub? # MCT USB-RS232 serial adapter
-ucom* at umct?
-uaudio* at uhub? # USB Audio
-audio* at uaudio?
-umidi* at uhub? # USB MIDI
-midi* at umidi?
-ulpt* at uhub? # USB Printers
-umass* at uhub? # USB Mass Storage devices
-uhidev* at uhub? # Human Interface Devices
-ums* at uhidev? # USB mouse
-wsmouse* at ums? mux 0
-ukbd* at uhidev? # USB keyboard
-wskbd* at ukbd? mux 1
-uslhcom* at uhidev? # Silicon Labs CP2110 USB HID UART
-ucom* at uslhcom?
-uhid* at uhidev? # USB generic HID support
-aue* at uhub? # ADMtek AN986 Pegasus Ethernet
-atu* at uhub? # Atmel AT76c50x based 802.11b
-axe* at uhub? # ASIX Electronics AX88172 USB Ethernet
-axen* at uhub? # ASIX Electronics AX88179 USB Ethernet
-cue* at uhub? # CATC USB-EL1201A based Ethernet
-kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet
-smsc* at uhub? # SMSC LAN95xx Ethernet
-cdce* at uhub? # CDC Ethernet
-upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network'
-ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network'
-udav* at uhub? # Davicom DM9601 based Ethernet
-url* at uhub? # Realtek RTL8150L based adapters
-wi* at uhub? # WaveLAN IEEE 802.11DS
-udsbr* at uhub? # D-Link DSB-R100 radio
-radio* at udsbr? # USB radio
-ugen* at uhub? # USB Generic driver
-rum* at uhub? # Ralink RT2501USB/RT2601USB
-
-atphy* at mii? # Attansic F1 PHYs
-ukphy* at mii? # "unknown" PHYs
-
-scsibus* at scsi?
-sd* at scsibus?
-st* at scsibus?
-cd* at scsibus?
-ch* at scsibus?
-uk* at scsibus?
-
-sdmmc* at imxesdhc? # SD/MMC bus
-
-# I2C bus support
-iic* at imxiic?
-
-# Pseudo-Devices
-pseudo-device hotplug 1 # devices hot plugging
+++ /dev/null
-# $OpenBSD: GENERIC-OMAP,v 1.16 2015/05/19 00:05:59 jsg Exp $
-#
-# GENERIC machine description file
-#
-# This machine description file is used to generate the default OpenBSD
-# kernel. The generic kernel does not include all options, subsystems
-# and device drivers, but should be useful for most applications.
-#
-# The machine description file can be customised for your specific
-# machine to reduce the kernel size and improve its performance.
-#
-# 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 armv7 arm
-include "../../../conf/GENERIC"
-
-makeoptions KERNEL_BASE_PHYS="0x80300000"
-makeoptions KERNEL_BASE_VIRT="0xc0300000"
-
-option CONF_HAVE_GPIO
-
-#options APERTURE
-
-#options BOOT_CONFIG # boot-time kernel config
-
-# estimated number of users
-
-maxusers 32
-
-# CPU options
-options CPU_ARMv7 # Support the ARMv7
-
-#option WSDISPLAY_COMPAT_USL # VT handling
-#option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
-option WSDISPLAY_DEFAULTSCREENS=1
-#option WSDISPLAY_COMPAT_PCVT # emulate some ioctls
-
-option USBVERBOSE
-
-config bsd swap generic
-
-# The main bus device
-mainbus0 at root
-cpu0 at mainbus?
-
-# OMAP3xxx/OMAP4xxx SoC
-omap0 at mainbus?
-omapid* at omap?
-
-# Cortex-A9 (OMAP4)
-cortex0 at mainbus?
-ampintc* at cortex?
-amptimer* at cortex?
-#armliicc* at cortex? # L2 cache controller
-
-# OMAP3 only
-intc* at omap? # interrupt controller
-edma* at omap? # dma controller
-
-# OMAP on-chip devices
-prcm* at omap? # power/clock controller
-sitaracm* at omap? # sitara control module
-omdog* at omap? # watchdog timer
-omgpio* at omap? # user-visible GPIO pins?
-gpio* at omgpio?
-#tiiic* at omap?
-#iic* at tiiic?
-gptimer* at omap? # general purpose timers
-dmtimer* at omap? # am335x dual mode timers
-ommmc* at omap? # SD/MMC card controller
-omusbtll* at omap?
-cpsw* at omap?
-
-#omkbd* at omap?
-#wskbd* at omkbd? mux 1
-
-ehci* at omap? # EHCI (shim)
-usb* at ehci?
-
-#usbotg0 at omap?
-#usb* at ohci?
-
-## USB bus support
-usb* at ehci? flags 0x1
-uhub* at usb?
-uhub* at uhub?
-
-uhub* at usb? # USB Hubs
-uhub* at uhub? # USB Hubs
-ualea* at uhub? # Araneus Alea II TRNG
-umodem* at uhub? # USB Modems/Serial
-ucom* at umodem?
-uvisor* at uhub? # Handspring Visor
-ucom* at uvisor?
-uvscom* at uhub? # SUNTAC Slipper U VS-10U serial
-ucom* at uvscom?
-ubsa* at uhub? # Belkin serial adapter
-ucom* at ubsa?
-uftdi* at uhub? # FTDI FT8U100AX serial adapter
-ucom* at uftdi?
-uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter
-ucom* at uplcom?
-umct* at uhub? # MCT USB-RS232 serial adapter
-ucom* at umct?
-uaudio* at uhub? # USB Audio
-audio* at uaudio?
-umidi* at uhub? # USB MIDI
-midi* at umidi?
-ulpt* at uhub? # USB Printers
-umass* at uhub? # USB Mass Storage devices
-uhidev* at uhub? # Human Interface Devices
-ums* at uhidev? # USB mouse
-wsmouse* at ums? mux 0
-ukbd* at uhidev? # USB keyboard
-wskbd* at ukbd? mux 1
-uslhcom* at uhidev? # Silicon Labs CP2110 USB HID UART
-ucom* at uslhcom?
-uhid* at uhidev? # USB generic HID support
-aue* at uhub? # ADMtek AN986 Pegasus Ethernet
-atu* at uhub? # Atmel AT76c50x based 802.11b
-axe* at uhub? # ASIX Electronics AX88172 USB Ethernet
-axen* at uhub? # ASIX Electronics AX88179 USB Ethernet
-cue* at uhub? # CATC USB-EL1201A based Ethernet
-kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet
-smsc* at uhub? # SMSC LAN95xx Ethernet
-cdce* at uhub? # CDC Ethernet
-upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network'
-ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network'
-udav* at uhub? # Davicom DM9601 based Ethernet
-url* at uhub? # Realtek RTL8150L based adapters
-wi* at uhub? # WaveLAN IEEE 802.11DS
-udsbr* at uhub? # D-Link DSB-R100 radio
-radio* at udsbr? # USB radio
-ugen* at uhub? # USB Generic driver
-rum* at uhub? # Ralink RT2501USB/RT2601USB
-
-ukphy* at mii? # "unknown" PHYs
-atphy* at mii? # Attansic F1 PHYs
-
-scsibus* at scsi?
-sd* at scsibus?
-st* at scsibus?
-cd* at scsibus?
-ch* at scsibus?
-uk* at scsibus?
-
-# onboard uarts
-com* at omap?
-
-# LCD
-#omdisplay0 at omap? # LCD DISPLAY
-#wsdisplay* at omdisplay? console ?
-
-sdmmc* at ommmc? # SD/MMC bus
-
-# APM emulation
-#apm0 at pxaip?
-
-# Pseudo-Devices
-pseudo-device hotplug 1 # devices hot plugging
+++ /dev/null
-# $OpenBSD: GENERIC-SUNXI,v 1.14 2015/05/19 00:05:59 jsg Exp $
-#
-# GENERIC machine description file
-#
-# This machine description file is used to generate the default OpenBSD
-# kernel. The generic kernel does not include all options, subsystems
-# and device drivers, but should be useful for most applications.
-#
-# The machine description file can be customised for your specific
-# machine to reduce the kernel size and improve its performance.
-#
-# 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 armv7 arm
-include "../../../conf/GENERIC"
-
-makeoptions KERNEL_BASE_PHYS="0x40300000"
-makeoptions KERNEL_BASE_VIRT="0xc0300000"
-
-option CONF_HAVE_GPIO
-
-#options APERTURE
-
-#options BOOT_CONFIG # boot-time kernel config
-
-# estimated number of users
-
-maxusers 32
-
-# CPU options
-options CPU_ARMv7 # Support the ARMv7
-
-#option WSDISPLAY_COMPAT_USL # VT handling
-#option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
-option WSDISPLAY_DEFAULTSCREENS=1
-#option WSDISPLAY_COMPAT_PCVT # emulate some ioctls
-
-option USBVERBOSE
-
-config bsd swap generic
-
-# The main bus device
-mainbus0 at root
-cpu0 at mainbus?
-
-# Sunxi A1x/A20 SoC
-sunxi0 at mainbus?
-
-# A1x only
-a1xintc* at sunxi? # interrupt controller
-
-# A20 only
-cortex0 at mainbus?
-ampintc* at cortex?
-#agtimer* at cortex?
-
-# Sunxi on-chip devices
-sxipio* at sunxi? # GPIO pins for leds & PHYs
-sxiccmu* at sunxi? # Clock Control Module/Unit
-sxitimer* at sunxi?
-sxidog* at sunxi? # watchdog timer
-sxirtc* at sunxi? # Real Time Clock
-sxiuart* at sunxi? # onboard UARTs
-sxie* at sunxi?
-ahci* at sunxi? # AHCI/SATA (shim)
-ehci* at sunxi? # EHCI (shim)
-#ohci* at sunxi? # OHCI (shim)
-#usbotg0 at sunxi?
-
-gpio* at sxipio?
-
-# USB bus support
-usb* at ehci? #flags 0x1
-#usb* at ohci?
-
-uhub* at usb? # USB Hubs
-uhub* at uhub? # USB Hubs
-ualea* at uhub? # Araneus Alea II TRNG
-umodem* at uhub? # USB Modems/Serial
-ucom* at umodem?
-uvisor* at uhub? # Handspring Visor
-ucom* at uvisor?
-uvscom* at uhub? # SUNTAC Slipper U VS-10U serial
-ucom* at uvscom?
-ubsa* at uhub? # Belkin serial adapter
-ucom* at ubsa?
-uftdi* at uhub? # FTDI FT8U100AX serial adapter
-ucom* at uftdi?
-uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter
-ucom* at uplcom?
-umct* at uhub? # MCT USB-RS232 serial adapter
-ucom* at umct?
-uaudio* at uhub? # USB Audio
-audio* at uaudio?
-umidi* at uhub? # USB MIDI
-midi* at umidi?
-ulpt* at uhub? # USB Printers
-umass* at uhub? # USB Mass Storage devices
-uhidev* at uhub? # Human Interface Devices
-ums* at uhidev? # USB mouse
-wsmouse* at ums? mux 0
-ukbd* at uhidev? # USB keyboard
-wskbd* at ukbd? mux 1
-uslhcom* at uhidev? # Silicon Labs CP2110 USB HID UART
-ucom* at uslhcom?
-uhid* at uhidev? # USB generic HID support
-aue* at uhub? # ADMtek AN986 Pegasus Ethernet
-atu* at uhub? # Atmel AT76c50x based 802.11b
-axe* at uhub? # ASIX Electronics AX88172 USB Ethernet
-axen* at uhub? # ASIX Electronics AX88179 USB Ethernet
-cue* at uhub? # CATC USB-EL1201A based Ethernet
-kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet
-smsc* at uhub? # SMSC LAN95xx Ethernet
-cdce* at uhub? # CDC Ethernet
-upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network'
-ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network'
-udav* at uhub? # Davicom DM9601 based Ethernet
-url* at uhub? # Realtek RTL8150L based adapters
-wi* at uhub? # WaveLAN IEEE 802.11DS
-udsbr* at uhub? # D-Link DSB-R100 radio
-radio* at udsbr? # USB radio
-ugen* at uhub? # USB Generic driver
-rum* at uhub? # Ralink RT2501USB/RT2601USB
-# XXX missing usable drivers, like run(4).
-
-ukphy* at mii? # "unknown" PHYs
-rlphy* at mii? # Realtek 8139 internal PHYs
-rgephy* at mii? # Realtek 8169S/8110S PHY
-
-scsibus* at scsi?
-sd* at scsibus?
-st* at scsibus?
-cd* at scsibus?
-ch* at scsibus?
-uk* at scsibus?
-
-# GPIO "pin bus" drivers
-gpioiic* at gpio? # I2C bus bit-banging
-iic* at gpioiic?
-gpioow* at gpio? # 1-Wire bus bit-banging
-onewire* at gpioow?
-
-# 1-Wire devices
-option ONEWIREVERBOSE
-owid* at onewire? # ID
-owsbm* at onewire? # Smart Battery Monitor
-owtemp* at onewire? # Temperature
-owctr* at onewire? # Counter device
-
-# Pseudo-Devices
-pseudo-device hotplug 1 # devices hot plugging
-# $OpenBSD: Makefile.armv7,v 1.8 2015/05/19 00:05:59 jsg Exp $
+# $OpenBSD: Makefile.armv7,v 1.9 2015/05/20 01:44:20 jsg Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
# until we get native booting working, put this in the tree.
-
-bsdrd.umg: bsd.rd
- mkuboot -a arm -o linux -e ${KERNEL_BASE_PHYS} -l ${KERNEL_BASE_PHYS} bsd.rd bsdrd.umg
-
-bsd.umg: bsd
- mkuboot -a arm -o linux -e ${KERNEL_BASE_PHYS} -l ${KERNEL_BASE_PHYS} bsd bsd.umg
+KERNADDR_OMAP=0x80300000
+KERNADDR_IMX=0x10300000
+KERNADDR_SUNXI=0x40300000
+
+.for SOC in IMX OMAP SUNXI
+bsd.${SOC}.umg: bsd
+ mkuboot -a arm -o linux -e ${KERNADDR_${SOC}} -l ${KERNADDR_${SOC}} \
+ bsd bsd.${SOC}.umg
+.endfor
bsd.rd: bsd
cp bsd bsd.rd
--- /dev/null
+# $OpenBSD: RAMDISK,v 1.1 2015/05/20 01:44:20 jsg Exp $
+
+machine armv7 arm
+
+makeoptions KERNEL_BASE_VIRT="0xc0300000"
+
+maxusers 4 # estimated number of users
+option CPU_ARMv7 # Support the ARMv7
+
+option TIMEZONE=0
+option DST=0
+option SMALL_KERNEL
+option NO_PROPOLICE
+option BOOT_CONFIG
+
+option MINIROOTSIZE=10240
+option RAMDISK_HOOKS
+
+option FFS
+option MSDOSFS
+option INET
+option INET6
+option EXT2FS
+
+option USBVERBOSE
+
+config bsd root on rd0a swap on rd0b
+
+# The main bus device
+mainbus0 at root
+cpu0 at mainbus?
+
+# Cortex-A9
+cortex0 at mainbus?
+ampintc* at cortex?
+amptimer* at cortex?
+#agtimer* at cortex?
+armliicc* at cortex?
+
+# iMX
+imx0 at mainbus? # iMX SoC
+imxccm* at imx? # clock control module
+imxiomuxc* at imx? # iomux controller
+imxdog* at imx? # watchdog timer
+imxocotp* at imx? # on-chip otp controller
+imxgpio* at imx? # user-visible GPIO pins?
+imxenet* at imx? # ethernet
+imxuart* at imx? # onboard uarts
+imxiic* at imx? # i2c
+iic* at imxiic?
+imxesdhc* at imx? # SDHC controller
+sdmmc* at imxesdhc? # SD/MMC bus
+ahci* at imx? # AHCI/SATA
+ehci* at imx? # EHCI (shim)
+usb* at ehci?
+
+# OMAP3xxx/OMAP4xxx SoC
+omap0 at mainbus?
+omapid* at omap?
+
+# OMAP on-chip devices
+intc* at omap? # OMAP3 interrupt controller
+edma* at omap? # OMAP3 dma controller
+prcm* at omap? # power/clock controller
+sitaracm* at omap? # sitara control module
+omdog* at omap? # watchdog timer
+omgpio* at omap? # user-visible GPIO pins?
+gpio* at omgpio?
+#tiiic* at omap?
+#iic* at tiiic?
+gptimer* at omap? # general purpose timers
+dmtimer* at omap? # am335x dual mode timers
+omusbtll* at omap?
+cpsw* at omap?
+com* at omap? # onboard uarts
+ommmc* at omap? # SD/MMC card controller
+sdmmc* at ommmc? # SD/MMC bus
+
+ehci* at omap? # EHCI (shim)
+usb* at ehci?
+
+# Sunxi A1x/A20 SoC
+sunxi0 at mainbus?
+
+# Sunxi on-chip devices
+a1xintc* at sunxi? # A1x interrupt controller
+sxipio* at sunxi? # GPIO pins for leds & PHYs
+gpio* at sxipio?
+sxiccmu* at sunxi? # Clock Control Module/Unit
+sxitimer* at sunxi?
+sxidog* at sunxi? # watchdog timer
+sxirtc* at sunxi? # Real Time Clock
+sxiuart* at sunxi? # onboard UARTs
+sxie* at sunxi?
+ahci* at sunxi? # AHCI/SATA (shim)
+ehci* at sunxi? # EHCI (shim)
+usb* at ehci? #flags 0x1
+#ohci* at sunxi?
+#usb* at ohci?
+
+# USB bus support
+usb* at ehci? flags 0x1
+uhub* at usb?
+uhub* at uhub?
+
+umodem* at uhub? # USB Modems/Serial
+ucom* at umodem?
+uvisor* at uhub? # Handspring Visor
+ucom* at uvisor?
+uvscom* at uhub? # SUNTAC Slipper U VS-10U serial
+ucom* at uvscom?
+ubsa* at uhub? # Belkin serial adapter
+ucom* at ubsa?
+uftdi* at uhub? # FTDI FT8U100AX serial adapter
+ucom* at uftdi?
+uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter
+ucom* at uplcom?
+umct* at uhub? # MCT USB-RS232 serial adapter
+ucom* at umct?
+uaudio* at uhub? # USB Audio
+audio* at uaudio?
+umidi* at uhub? # USB MIDI
+midi* at umidi?
+ulpt* at uhub? # USB Printers
+umass* at uhub? # USB Mass Storage devices
+uhidev* at uhub? # Human Interface Devices
+ukbd* at uhidev? # USB keyboard
+wskbd* at ukbd? mux 1
+uslhcom* at uhidev? # Silicon Labs CP2110 USB HID UART
+ucom* at uslhcom?
+uhid* at uhidev? # USB generic HID support
+aue* at uhub? # ADMtek AN986 Pegasus Ethernet
+atu* at uhub? # Atmel AT76c50x based 802.11b
+axe* at uhub? # ASIX Electronics AX88172 USB Ethernet
+axen* at uhub? # ASIX Electronics AX88179 USB Ethernet
+cue* at uhub? # CATC USB-EL1201A based Ethernet
+kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet
+smsc* at uhub? # SMSC LAN95xx Ethernet
+cdce* at uhub? # CDC Ethernet
+upl* at uhub? # Prolific PL2301/PL2302 host-to-host
+ugl* at uhub? # Genesys Logic GL620USB-A host-to-host
+udav* at uhub? # Davicom DM9601 based Ethernet
+url* at uhub? # Realtek RTL8150L based adapters
+wi* at uhub? # WaveLAN IEEE 802.11DS
+udsbr* at uhub? # D-Link DSB-R100 radio
+radio* at udsbr? # USB radio
+ugen* at uhub? # USB Generic driver
+rum* at uhub? # Ralink RT2501USB/RT2601USB
+
+atphy* at mii? # Attansic F1 PHYs
+rgephy* at mii? # Realtek 8169S/8110S PHY
+rlphy* at mii? # Realtek 8139 internal PHYs
+ukphy* at mii? # "unknown" PHYs
+
+scsibus* at scsi?
+sd* at scsibus?
+cd* at scsibus?
+
+pseudo-device loop 1
+pseudo-device bpfilter 1
+pseudo-device rd 1
+++ /dev/null
-# $OpenBSD: RAMDISK-IMX,v 1.15 2015/05/19 00:05:59 jsg Exp $
-
-machine armv7 arm
-maxusers 4
-
-option TIMEZONE=0
-option DST=0
-option SMALL_KERNEL
-option NO_PROPOLICE
-option BOOT_CONFIG
-
-option MINIROOTSIZE=10240
-option RAMDISK_HOOKS
-
-option USBVERBOSE
-
-option FFS
-option MSDOSFS
-option INET
-option INET6
-option EXT2FS
-
-makeoptions KERNEL_BASE_PHYS="0x10300000"
-makeoptions KERNEL_BASE_VIRT="0xc0300000"
-option CPU_ARMv7 # Support the ARMv7
-
-config bsd root on rd0a swap on rd0b
-
-mainbus0 at root
-cpu0 at mainbus?
-
-cortex0 at mainbus? # Cortex-A9 (iMX6)
-ampintc* at cortex?
-amptimer* at cortex?
-armliicc* at cortex?
-
-imx0 at mainbus? # iMX SoC
-imxccm* at imx? # clock control module
-imxiomuxc* at imx? # iomux controller
-imxdog* at imx? # watchdog timer
-imxocotp* at imx? # on-chip otp controller
-imxgpio* at imx? # user-visible GPIO pins?
-imxesdhc* at imx? # SDHC controller
-imxenet* at imx? # ethernet
-imxuart* at imx? # onboard uarts
-imxiic* at imx? # i2c
-ahci* at imx? # AHCI/SATA
-ehci* at imx?
-usb* at ehci?
-
-usb* at ehci? flags 0x1
-uhub* at usb?
-uhub* at uhub?
-
-uhub* at usb?
-uhub* at uhub?
-umodem* at uhub? # USB Modems/Serial
-ucom* at umodem?
-uvisor* at uhub? # Handspring Visor
-ucom* at uvisor?
-uvscom* at uhub? # SUNTAC Slipper U VS-10U serial
-ucom* at uvscom?
-ubsa* at uhub? # Belkin serial adapter
-ucom* at ubsa?
-uftdi* at uhub? # FTDI FT8U100AX serial adapter
-ucom* at uftdi?
-uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter
-ucom* at uplcom?
-umct* at uhub? # MCT USB-RS232 serial adapter
-ucom* at umct?
-uaudio* at uhub? # USB Audio
-audio* at uaudio?
-umidi* at uhub? # USB MIDI
-midi* at umidi?
-ulpt* at uhub? # USB Printers
-umass* at uhub?
-uhidev* at uhub? # Human Interface Devices
-ukbd* at uhidev? # USB keyboard
-wskbd* at ukbd? mux 1
-uslhcom* at uhidev? # Silicon Labs CP2110 USB HID UART
-ucom* at uslhcom?
-uhid* at uhidev? # USB generic HID support
-aue* at uhub? # ADMtek AN986 Pegasus Ethernet
-atu* at uhub? # Atmel AT76c50x based 802.11b
-axe* at uhub? # ASIX Electronics AX88172 USB Ethernet
-axen* at uhub? # ASIX Electronics AX88179 USB Ethernet
-cue* at uhub? # CATC USB-EL1201A based Ethernet
-kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet
-smsc* at uhub? # SMSC LAN95xx Ethernet
-cdce* at uhub? # CDC Ethernet
-upl* at uhub? # Prolific PL2301/PL2302 host-to-host
-ugl* at uhub? # Genesys Logic GL620USB-A host-to-host
-udav* at uhub? # Davicom DM9601 based Ethernet
-url* at uhub? # Realtek RTL8150L based adapters
-wi* at uhub? # WaveLAN IEEE 802.11DS
-udsbr* at uhub? # D-Link DSB-R100 radio
-radio* at udsbr? # USB radio
-ugen* at uhub? # USB Generic driver
-rum* at uhub? # Ralink RT2501USB/RT2601USB
-
-atphy* at mii? # Attansic F1 PHYs
-ukphy* at mii? # "unknown" PHYs
-
-scsibus* at scsi?
-sd* at scsibus?
-cd* at scsibus?
-
-sdmmc* at imxesdhc? # SD/MMC bus
-
-iic* at imxiic?
-
-pseudo-device loop 1
-pseudo-device bpfilter 1
-pseudo-device rd 1
+++ /dev/null
-# $OpenBSD: RAMDISK-OMAP,v 1.12 2015/05/19 00:05:59 jsg Exp $
-
-machine armv7 arm
-maxusers 4
-
-option TIMEZONE=0
-option DST=0
-option SMALL_KERNEL
-option NO_PROPOLICE
-option BOOT_CONFIG
-
-option MINIROOTSIZE=10240
-option RAMDISK_HOOKS
-
-option USBVERBOSE
-
-option FFS
-option MSDOSFS
-option INET
-option INET6
-
-makeoptions KERNEL_BASE_PHYS="0x80300000"
-makeoptions KERNEL_BASE_VIRT="0xc0300000"
-option CPU_ARMv7 # Support the ARMv7
-
-config bsd root on rd0a swap on rd0b
-
-mainbus0 at root
-cpu0 at mainbus?
-
-omap0 at mainbus? # OMAP3xxx/OMAP4xxx SoC
-omapid* at omap?
-
-cortex0 at mainbus? # Cortex-A9 (OMAP4)
-ampintc* at cortex?
-amptimer* at cortex?
-#armliicc* at cortex? # L2 cache controller
-
-intc* at omap? # OMAP3 interrupt controller
-
-prcm* at omap? # power/clock controller
-sitaracm* at omap? # sitara control module
-omdog* at omap? # watchdog timer
-omgpio* at omap? # user-visible GPIO pins?
-gptimer* at omap? # general purpose timers
-dmtimer* at omap? # am335x dual mode timers
-ommmc* at omap? # SD/MMC card controller
-sdmmc* at ommmc?
-omusbtll* at omap?
-cpsw* at omap?
-
-#omkbd0 at omap?
-#wskbd* at omkbd? mux 1
-
-ehci* at omap?
-usb* at ehci?
-
-#mcspi0 at omap? addr 0x48098000 intr 65
-#mcspi1 at omap? addr 0x4809A000 intr 66
-
-#atlas0 at omap? intr 85 # really a spi device, not omap
-#wskbd* at atlas? mux 1
-
-#usbotg0 at omap?
-#usb* at ohci?
-
-usb* at ehci? flags 0x1
-uhub* at usb?
-
-uhub* at uhub?
-uhub* at usb?
-umass* at uhub?
-scsibus* at umass?
-uhidev* at uhub? # Human Interface Devices
-ukbd* at uhidev? # USB keyboard
-wskbd* at ukbd? mux 1
-uhid* at uhidev? # USB generic HID support
-smsc* at uhub? # SMSC LAN95xx Ethernet
-rum* at uhub? # Ralink RT2501USB/RT2601USB
-
-ukphy* at mii? # "unknown" PHYs
-atphy* at mii? # Attansic F1 PHYs
-
-scsibus* at scsi?
-sd* at scsibus?
-cd* at scsibus?
-
-com* at omap?
-
-#omdisplay0 at omap?
-#wsdisplay* at omdisplay? console ?
-
-pseudo-device loop 1
-pseudo-device bpfilter 1
-pseudo-device rd 1
+++ /dev/null
-# $OpenBSD: RAMDISK-SUNXI,v 1.13 2015/05/19 00:05:59 jsg Exp $
-
-machine armv7 arm
-maxusers 4
-
-option TIMEZONE=0
-option DST=0
-option SMALL_KERNEL
-option NO_PROPOLICE
-option BOOT_CONFIG
-
-option MINIROOTSIZE=10240
-option RAMDISK_HOOKS
-
-option USBVERBOSE
-
-option FFS
-option MSDOSFS
-option INET
-option INET6
-
-makeoptions KERNEL_BASE_PHYS="0x40300000"
-makeoptions KERNEL_BASE_VIRT="0xc0300000"
-option CPU_ARMv7 # Support the ARMv7
-
-config bsd root on rd0a swap on rd0b
-
-mainbus0 at root
-cpu0 at mainbus?
-
-sunxi0 at mainbus?
-a1xintc* at sunxi? # A1x interrupt controller
-
-cortex0 at mainbus? # A20
-ampintc* at cortex?
-#agtimer* at cortex?
-
-sxipio* at sunxi? # GPIO pins for leds & PHYs
-sxiccmu* at sunxi? # Clock Control Module/Unit
-sxitimer* at sunxi?
-sxidog* at sunxi? # watchdog timer
-sxirtc* at sunxi? # Real Time Clock
-sxiuart* at sunxi? # onboard uarts
-sxie* at sunxi?
-ahci* at sunxi? # AHCI/SATA (shim)
-ehci* at sunxi?
-#ohci* at sunxi?
-#usbotg0 at sunxi?
-
-usb* at ehci? #flags 0x1
-#usb* at ohci?
-
-uhub* at usb?
-uhub* at uhub?
-umass* at uhub?
-scsibus* at umass?
-uhidev* at uhub? # Human Interface Devices
-ukbd* at uhidev? # USB keyboard
-wskbd* at ukbd? mux 1
-uhid* at uhidev? # USB generic HID support
-rum* at uhub? # Ralink RT2501USB/RT2601USB
-
-ukphy* at mii? # "unknown" PHYs
-rlphy* at mii? # Realtek 8139 internal PHYs
-rgephy* at mii? # Realtek 8169S/8110S PHY
-
-scsibus* at scsi?
-sd* at scsibus?
-cd* at scsibus?
-
-pseudo-device loop 1
-pseudo-device bpfilter 1
-pseudo-device rd 1
projects / openbsd / commitdiff