Module Name: src
Committed By: jmcneill
Date: Sun Dec 13 23:02:56 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
src/etc/etc.evbarm: Makefile.inc
Added Files:
src/sys/arch/evbarm/conf: TEGRA TEGRA_INSTALL
Removed Files:
src/sys/arch/evbarm/conf: JETSONTK1 JETSONTK1_INSTALL NYAN-BIG
Log Message:
Remove JETSONTK1 and NYAN-BIG kernels, add a new unified kernel named TEGRA.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/embedded/conf/armv7.conf
cvs rdiff -u -r1.78 -r1.79 src/etc/etc.evbarm/Makefile.inc
cvs rdiff -u -r1.42 -r0 src/sys/arch/evbarm/conf/JETSONTK1
cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/conf/JETSONTK1_INSTALL
cvs rdiff -u -r1.3 -r0 src/sys/arch/evbarm/conf/NYAN-BIG
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/TEGRA \
src/sys/arch/evbarm/conf/TEGRA_INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.8 src/distrib/utils/embedded/conf/armv7.conf:1.9
--- src/distrib/utils/embedded/conf/armv7.conf:1.8 Fri Aug 21 17:08:11 2015
+++ src/distrib/utils/embedded/conf/armv7.conf Sun Dec 13 23:02:56 2015
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.8 2015/08/21 17:08:11 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.9 2015/12/13 23:02:56 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -11,7 +11,7 @@ kernels_beagle="BEAGLEBOARD BEAGLEBONE"
kernels_awin="BPI CUBIEBOARD CUBIETRUCK HUMMINGBIRD_A31"
kernels_rpi="RPI2"
kernels_amlogic="ODROID-C1"
-kernels_tegra="JETSONTK1"
+kernels_tegra="TEGRA"
make_label() {
make_label_evbarm
@@ -89,15 +89,17 @@ EOF
}
populate_tegra() {
- jetsontk1_kernelimg=netbsd-JETSONTK1.ub
+ tegra_kernelimg=netbsd-TEGRA.ub
- # Create a boot.scr for Jetson TK1 U-Boot
- cat > "${mnt}/boot/boot-JETSONTK1.txt" << EOF
+ # Create a boot.scr for Tegra U-Boot
+ cat > "${mnt}/boot/boot-TEGRA.txt" << EOF
setenv bootargs root=ld1a
-fatload mmc 1:1 0x90000000 ${jetsontk1_kernelimg}
-bootm 0x90000000
+fatload mmc 1:1 \${kernel_addr_r} ${tegra_kernelimg}
+fatload mmc 1:1 \${fdt_addr_r} tegra124-\${board}.dtb
+fdt addr \${fdt_addr_r}
+bootm \${kernel_addr_r} - \${fdt_addr_r}
EOF
- "${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/tegra boot" "${mnt}/boot/boot-JETSONTK1.txt" "${mnt}/boot/boot.scr"
+ "${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/tegra boot" "${mnt}/boot/boot-TEGRA.txt" "${mnt}/boot/boot.scr"
}
populate() {
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.78 src/etc/etc.evbarm/Makefile.inc:1.79
--- src/etc/etc.evbarm/Makefile.inc:1.78 Sat Jul 18 00:57:35 2015
+++ src/etc/etc.evbarm/Makefile.inc Sun Dec 13 23:02:56 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.78 2015/07/18 00:57:35 matt Exp $
+# $NetBSD: Makefile.inc,v 1.79 2015/12/13 23:02:56 jmcneill Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -103,8 +103,8 @@ EVBARM_BOARDS.armv7hf+= CUBOX-I
EVBARM_BOARDS.armv7+= HUMMINGBIRD_A31
EVBARM_BOARDS.armv7hf+= HUMMINGBIRD_A31
#EVBARM_BOARDS.armv7+= IGEPV2
-EVBARM_BOARDS.armv7+= JETSONTK1
-EVBARM_BOARDS.armv7hf+= JETSONTK1
+EVBARM_BOARDS.armv7+= TEGRA
+EVBARM_BOARDS.armv7hf+= TEGRA
EVBARM_BOARDS.armv7+= KOBO
EVBARM_BOARDS.armv7hf+= KOBO
EVBARM_BOARDS.armv7+= MIRABOX
Added files:
Index: src/sys/arch/evbarm/conf/TEGRA
diff -u /dev/null src/sys/arch/evbarm/conf/TEGRA:1.1
--- /dev/null Sun Dec 13 23:02:56 2015
+++ src/sys/arch/evbarm/conf/TEGRA Sun Dec 13 23:02:56 2015
@@ -0,0 +1,165 @@
+#
+# $NetBSD: TEGRA,v 1.1 2015/12/13 23:02:56 jmcneill Exp $
+#
+# NVIDIA Tegra K1 (T124)
+#
+
+include "arch/evbarm/conf/std.tegra"
+include "arch/evbarm/conf/GENERIC.common"
+
+options CPU_CORTEXA15
+options SOC_TEGRA124
+options MULTIPROCESSOR
+
+options FDT # Flattened Device Tree support
+pseudo-device openfirm # /dev/openfirm
+
+options DIAGNOSTIC # internal consistency checks
+#options DEBUG
+#options LOCKDEBUG
+#options PMAP_DEBUG # Enable pmap_debug_level code
+#options IPKDB # remote kernel debugging
+#options VERBOSE_INIT_ARM # verbose bootstraping messages
+makeoptions DEBUG="-g" # compile full symbol table
+makeoptions COPY_SYMTAB=1
+
+config netbsd root on ? type ?
+
+mainbus0 at root
+cpu* at mainbus?
+
+# A15 core devices
+armperiph0 at mainbus?
+armgic0 at armperiph? # Interrupt Controller
+armgtmr0 at armperiph? # ARM Generic Timer
+
+# On-board I/O
+tegrafdt0 at mainbus?
+fdt0 at tegrafdt0
+simplebus* at fdt?
+fdt* at simplebus?
+
+fregulator* at fdt?
+
+# Interrupt controller
+tegralic* at fdt? # LIC
+gic* at fdt? # GIC
+
+# Memory controller
+tegramc* at fdt? # MC
+
+# FUSE controller
+tegrafuse* at fdt? # FUSE
+
+# Power management controller
+tegrapmc* at fdt? # PMC
+
+# Clock and Reset controller
+tegracar0 at fdt? # CAR
+
+# GPIO controller
+tegragpio* at fdt? # GPIO
+gpio* at gpiobus?
+
+# Timers
+tegratimer* at fdt? # Timers
+
+# MPIO / Pinmux
+tegrampio* at fdt? # MPIO
+
+# XUSB PADCTL
+tegraxusbpad* at fdt? # XUSB PADCTL
+
+# PCIE
+tegrapcie0 at fdt? # PCIE
+pci* at tegrapcie0
+ppb* at pci? dev ? function ?
+pci* at ppb?
+
+# Ethernet
+re* at pci? dev ? function ? # Realtek RTL8111GS
+rgephy* at mii? phy ?
+ukphy* at mii? phy ?
+
+# Mini-PCIe Wireless
+options ATHHAL_AR5212,ATHHAL_RF2425 # AR5BHB63
+ath* at pci? dev ? function ? # Atheros IEEE 802.11
+athn* at pci? dev ? function ? # Atheros IEEE 802.11
+
+# UART
+com* at fdt? # UART
+options CONSADDR=0x70006300, CONSPEED=115200
+
+# I2C
+tegrai2c* at fdt? # I2C
+iic* at tegrai2c?
+titemp* at iic?
+seeprom* at iic?
+as3722pmic* at iic?
+
+#titemp0 at iic0 addr 0x4c # TI TMP451
+#seeprom0 at iic0 addr 0x56 size 256 # Atmel 24C02 serial EEPROM
+#ddc0 at iic3 addr 0x50 # HDMI DDC
+#as3722pmic0 at iic4 addr 0x40 # AMS AS3722 PMIC
+
+# RTC
+tegrartc* at fdt? # RTC
+
+# SDMMC
+sdhc* at fdt? # SDMMC
+sdmmc* at sdhc?
+ld* at sdmmc?
+
+# SATA
+ahcisata* at fdt? # SATA
+atabus* at ata?
+atapibus* at atapi?
+wd* at atabus? drive ?
+cd* at atapibus? drive ?
+
+# HDA
+hdaudio* at fdt? # HDA
+hdafg* at hdaudiobus?
+audio* at audiobus?
+options HDAUDIOVERBOSE
+options HDAUDIO_32BIT_ACCESS
+options HDAUDIO_ENABLE_HDMI
+options HDAUDIO_ENABLE_DISPLAYPORT
+
+# HDMI CEC
+tegracec0 at fdt? # HDMI CEC
+hdmicec* at hdmicecbus?
+
+# Display
+tegradrm* at fdt? # Display
+tegrafb* at tegrafbbus?
+wsdisplay* at wsemuldisplaydev?
+options VCONS_DRAW_INTR
+options WSEMUL_VT100
+options WS_DEFAULT_FG=WSCOL_WHITE
+options WS_DEFAULT_BG=WSCOL_BLACK
+options WS_KERNEL_FG=WSCOL_GREEN
+options WS_KERNEL_BG=WSCOL_BLACK
+options WSDISPLAY_COMPAT_PCVT
+options WSDISPLAY_COMPAT_SYSCONS
+options WSDISPLAY_COMPAT_USL
+options WSDISPLAY_COMPAT_RAWKBD
+options WSDISPLAY_DEFAULTSCREENS=4
+pseudo-device wsmux
+pseudo-device wsfont
+
+# GPU
+nouveau* at fdt? # GPU
+
+# Thermal throttling controller
+tegrasoctherm* at fdt? # SOC_THERM
+
+# USB 2.0
+tegrausbphy* at fdt? # USB PHY
+ehci* at fdt? # USB
+usb* at ehci?
+
+include "dev/usb/usbdevices.config"
+midi* at midibus?
+
+cinclude "arch/evbarm/conf/TEGRA.local"
Index: src/sys/arch/evbarm/conf/TEGRA_INSTALL
diff -u /dev/null src/sys/arch/evbarm/conf/TEGRA_INSTALL:1.1
--- /dev/null Sun Dec 13 23:02:56 2015
+++ src/sys/arch/evbarm/conf/TEGRA_INSTALL Sun Dec 13 23:02:56 2015
@@ -0,0 +1,10 @@
+# $NetBSD: TEGRA_INSTALL,v 1.1 2015/12/13 23:02:56 jmcneill Exp $
+#
+# TEGRA_INSTALL -- NVIDIA TEGRA kernel with
+# installation-sized ramdisk
+#
+
+include "arch/evbarm/conf/TEGRA"
+include "arch/evbarm/conf/INSTALL"
+
+options BOOTHOWTO=RB_SINGLE
