Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-9]: src Pull up following revision(s) (requested by jmcneill in t...
details: https://anonhg.NetBSD.org/src/rev/d0237717ecd1
branches: netbsd-9
changeset: 461468:d0237717ecd1
user: martin <martin%NetBSD.org@localhost>
date: Wed Nov 27 13:46:44 2019 +0000
description:
Pull up following revision(s) (requested by jmcneill in ticket #491):
sys/arch/evbarm/conf/BEAGLEBOARD_INSTALL: file removal
sys/arch/arm/ti/ti_dpll_clock.c: revision 1.2
sys/arch/arm/ti/ti_sysc.c: revision 1.1
sys/arch/arm/ti/ti_rng.c: revision 1.1
sys/arch/arm/ti/ti_rng.c: revision 1.2
sys/dev/i2c/tps65950.c: file removal
sys/arch/evbarm/conf/std.ti: file removal
sys/dev/i2c/files.i2c: revision 1.101
sys/dev/i2c/files.i2c: revision 1.102
sys/dev/i2c/at24cxx.c: revision 1.32
sys/dev/i2c/files.i2c: revision 1.103
sys/dev/i2c/twl4030.c: revision 1.1
sys/dev/i2c/files.i2c: revision 1.104
sys/dev/i2c/twl4030.c: revision 1.2
sys/dev/i2c/twl4030.c: revision 1.3
sys/arch/arm/ti/ti_com.c: revision 1.6
sys/arch/arm/ti/ti_com.c: revision 1.7
sys/arch/arm/ti/ti_com.c: revision 1.8
sys/dev/fdt/cpufreq_dt.c: revision 1.11
sys/arch/arm/ti/ti_iic.c: revision 1.1
sys/dev/fdt/cpufreq_dt.c: revision 1.12
sys/arch/arm/ti/ti_usb.c: revision 1.1
sys/arch/arm/ti/ti_iic.c: revision 1.2
sys/dev/fdt/cpufreq_dt.c: revision 1.13
sys/arch/arm/ti/ti_iic.c: revision 1.3
sys/arch/arm/ti/ti_iic.c: revision 1.4
sys/arch/evbarm/conf/files.ti: file removal
sys/arch/evbarm/conf/BEAGLEBOARDXM: file removal
sys/arch/arm/dts/omap3-n900.dts: revision 1.1
sys/arch/arm/ti/ti_edma.h: revision 1.1
sys/arch/evbarm/conf/OVERO_INSTALL: file removal
sys/arch/arm/ti/ti_usbtll.c: revision 1.1
sys/arch/arm/ti/files.ti: revision 1.5
etc/etc.evbarm/Makefile.inc: revision 1.108
sys/arch/arm/ti/files.ti: revision 1.6
sys/dev/i2c/tps65217pmic.c: revision 1.13
etc/etc.evbarm/Makefile.inc: revision 1.109
sys/arch/arm/ti/files.ti: revision 1.7
sys/dev/i2c/tps65217pmic.c: revision 1.14
sys/arch/arm/ti/files.ti: revision 1.8
sys/arch/arm/ti/files.ti: revision 1.9
sys/dev/fdt/usbnopphy.c: revision 1.1
sys/arch/evbarm/conf/GENERIC: revision 1.55
sys/arch/evbarm/conf/GENERIC: revision 1.56
sys/arch/evbarm/conf/GENERIC: revision 1.57
sys/arch/evbarm/conf/GENERIC: revision 1.58
sys/arch/evbarm/conf/GENERIC: revision 1.59
sys/arch/evbarm/conf/BEAGLEBONE: file removal
sys/arch/arm/ti/omap2_gpmcreg.h: revision 1.1
sys/arch/arm/ti/ti_otgreg.h: revision 1.1
sys/arch/arm/ti/ti_tptc.c: revision 1.1
sys/arch/evbarm/conf/IGEPV2: file removal
sys/arch/arm/ti/am3_prcm.c: revision 1.10
sys/dev/i2c/tda19988.c: revision 1.1
sys/arch/evbarm/conf/OVERO: file removal
sys/dev/i2c/tda19988.c: revision 1.2
sys/dev/i2c/tda19988.c: revision 1.3
sys/arch/arm/ti/omap3_dss.c: revision 1.1
sys/arch/evbarm/conf/BEAGLEBONE_INSTALL: file removal
sys/arch/arm/ti/ti_omapintc.c: revision 1.2
etc/etc.evbarm/Makefile.inc: revision 1.112
etc/etc.evbarm/Makefile.inc: revision 1.113
sys/arch/arm/ti/ti_div_clock.c: revision 1.1
etc/etc.evbarm/Makefile.inc: revision 1.114
sys/arch/evbarm/conf/N900: revision 1.32
sys/arch/evbarm/conf/N900: revision 1.33
distrib/utils/embedded/conf/armv7.conf: revision 1.36
sys/arch/evbarm/conf/GENERIC: revision 1.60
distrib/utils/embedded/conf/armv7.conf: revision 1.37
sys/arch/arm/ti/omap2_nand.c: revision 1.1
sys/arch/evbarm/conf/GENERIC: revision 1.61
sys/arch/arm/ti/omap2_nand.c: revision 1.2
sys/arch/evbarm/conf/GENERIC: revision 1.62
distrib/utils/embedded/conf/armv7.conf: revision 1.39
sys/arch/evbarm/conf/GENERIC: revision 1.63
sys/arch/arm/ti/ti_fb.c: revision 1.1
sys/arch/evbarm/conf/GENERIC: revision 1.64
sys/arch/evbarm/conf/GENERIC: revision 1.65
sys/arch/evbarm/conf/GENERIC: revision 1.66
sys/arch/evbarm/conf/GENERIC: revision 1.67
sys/arch/arm/ti/ti_platform.c: revision 1.7
sys/arch/arm/ti/ti_platform.c: revision 1.8
sys/arch/arm/ti/am3_prcm.c: revision 1.2
sys/arch/arm/ti/ti_platform.c: revision 1.9
sys/arch/arm/ti/am3_prcm.c: revision 1.3
sys/arch/arm/ti/am3_prcm.c: revision 1.4
sys/arch/arm/ti/am3_prcm.c: revision 1.5
sys/arch/arm/ti/am3_prcm.c: revision 1.6
sys/arch/arm/ti/am3_prcm.c: revision 1.7
sys/arch/evbarm/conf/DEVKIT8000: file removal
sys/arch/arm/ti/am3_prcm.c: revision 1.8
sys/arch/arm/ti/am3_prcm.c: revision 1.9
sys/dev/fdt/syscon.c: revision 1.4
sys/arch/arm/ti/files.ti: revision 1.10
sys/arch/arm/ti/ti_mux_clock.c: revision 1.1
sys/arch/arm/ti/ti_sdhc.c: revision 1.1
sys/arch/arm/ti/files.ti: revision 1.11
sys/arch/arm/ti/if_cpswreg.h: revision 1.1
sys/arch/arm/ti/ti_sdhc.c: revision 1.2
sys/arch/arm/ti/files.ti: revision 1.12
sys/arch/arm/ti/ti_sdhc.c: revision 1.3
sys/arch/arm/ti/files.ti: revision 1.13
sys/arch/arm/ti/files.ti: revision 1.14
sys/arch/arm/ti/files.ti: revision 1.15
sys/arch/arm/ti/files.ti: revision 1.16
sys/arch/arm/ti/omap3_cm.c: revision 1.1
sys/arch/arm/ti/files.ti: revision 1.17
sys/arch/arm/ti/omap3_cm.c: revision 1.2
sys/arch/arm/ti/files.ti: revision 1.18
sys/arch/arm/ti/omap3_cm.c: revision 1.3
sys/arch/arm/ti/files.ti: revision 1.19
sys/arch/arm/ti/omap3_cm.c: revision 1.4
sys/arch/arm/ti/ti_motg.c: revision 1.1
sys/arch/arm/ti/ti_rngreg.h: revision 1.1
sys/arch/arm/ti/ti_sdhcreg.h: revision 1.1
sys/arch/arm/dts/omap3-beagle-xm.dts: revision 1.1
sys/arch/arm/ti/am3_platform.c: revision 1.1
sys/arch/arm/ti/ti_sdhcreg.h: revision 1.2
sys/arch/arm/ti/ti_lcdc.h: revision 1.1
sys/arch/evbarm/conf/BEAGLEBOARDXM_INSTALL: file removal
sys/arch/evbarm/conf/README.evbarm: revision 1.22
sys/arch/evbarm/conf/README.evbarm: revision 1.23
sys/arch/arm/ti/ti_platform.c: file removal
sys/arch/evbarm/conf/README.evbarm: revision 1.24
sys/arch/arm/ti/ti_omaptimer.c: revision 1.2
sys/arch/arm/ti/ti_prcm.c: revision 1.2
sys/arch/evbarm/conf/README.evbarm: revision 1.25
sys/arch/arm/ti/ti_omaptimer.c: revision 1.3
sys/arch/arm/ti/ti_prcm.c: revision 1.3
sys/arch/evbarm/conf/README.evbarm: revision 1.26
sys/arch/arm/ti/ti_omaptimer.c: revision 1.4
sys/arch/evbarm/conf/README.evbarm: revision 1.27
sys/arch/arm/ti/ti_ehci.c: revision 1.1
sys/arch/arm/ti/files.ti: revision 1.20
sys/arch/arm/ti/ti_cpufreq.c: revision 1.1
sys/arch/arm/ti/ti_cpufreq.c: revision 1.2
sys/arch/arm/fdt/smsh_fdt.c: revision 1.2
sys/arch/arm/ti/omap3_dssreg.h: revision 1.1
sys/arch/evbarm/conf/OVERO: revision 1.56
sys/arch/evbarm/conf/TI: file removal
sys/arch/arm/dts/omap3-beagle.dts: revision 1.1
sys/dev/fdt/fdtvar.h: revision 1.55
sys/dev/fdt/fdtvar.h: revision 1.56
distrib/utils/embedded/files/armv7_boot_nonefi.cmd: revision 1.2
sys/dev/fdt/fdt_phy.c: revision 1.6
sys/arch/arm/ti/ti_iicreg.h: revision 1.1
sys/arch/arm/ti/ti_lcdc.c: revision 1.1
sys/arch/arm/ti/ti_gpio.c: revision 1.1
sys/arch/arm/ti/ti_iicreg.h: revision 1.2
sys/arch/arm/ti/ti_lcdc.c: revision 1.2
sys/dev/fdt/files.fdt: revision 1.46
sys/arch/arm/ti/ti_gpio.c: revision 1.2
sys/arch/arm/ti/ti_iicreg.h: revision 1.3
sys/arch/arm/ti/ti_lcdc.c: revision 1.3
sys/dev/fdt/files.fdt: revision 1.47
sys/arch/arm/ti/ti_gpio.c: revision 1.3
sys/dev/fdt/pinctrl_single.c: revision 1.1
sys/arch/evbarm/conf/files.generic: revision 1.9
sys/arch/arm/ti/ti_gpmc.c: revision 1.1
sys/arch/arm/ti/ti_lcdcreg.h: revision 1.1
sys/arch/evbarm/conf/BEAGLEBOARD: file removal
sys/arch/arm/ti/omap3_prm.c: revision 1.1
sys/arch/arm/ti/ti_platform.h: file removal
sys/arch/arm/ti/omap3_platform.c: revision 1.1
sys/arch/arm/ti/ti_prcm.h: revision 1.2
sys/arch/arm/ti/omap3_platform.c: revision 1.2
sys/arch/arm/ti/ti_prcm.h: revision 1.3
sys/arch/arm/ti/ti_prcm.h: revision 1.4
sys/dev/fdt/fdt_clock.c: revision 1.9
sys/arch/arm/ti/ti_edma.c: revision 1.1
sys/arch/arm/ti/ti_otg.c: revision 1.1
distrib/utils/embedded/files/armv7_boot.cmd: revision 1.15
sys/arch/arm/ti/if_cpsw.c: revision 1.7
sys/arch/evbarm/conf/std.igepv2: file removal
sys/arch/arm/ti/if_cpsw.c: revision 1.8
sys/arch/arm/ti/ti_dpll_clock.c: revision 1.1
Adapt ti fdt glue to support GENERIC kernel.
Do not search 64-bit directories for dts files
Fix am33xx_platform_early_putchar for pre-MMU output
Add bus driver for TI sysc interconncet.
Make com work again
Add EDMA TPCC and TPTC drivers.
Add driver for one-register-per-pin type pinctrl devices.
Add MMCHS support.
Add USB support.
Disable autoidle
Place devmap above KERNEL_IO_VBASE
Use Timer2 for timecounter, and enable hw module.
Add support for TI AM335x
Add atmel,24c256 compat data
Add I2C support.
Add tiiic, tps65217pmic
Add FDT support
Fix early putchar, add reset func
No support for tegra210 in armv7 kernel
Switch to GENERIC kernels only.
Get mac address from DT
Skip nodes with an "opp-suspend" property and fix tables that have disabled
nodes in the middle.
enumerate devices under child "clocks" node
Add support for platform specific opp table filters.
Add fdtbus_clock_count to count the number of clock references on a given node
enumerate devices under child "clocks" node
Add AM335x DVFS support.
Enable TI AM335x DVFS support
Add support for GPIO controller.
Add tigpio
Unhook BEAGLEBONE kernel from the build
Remove BEAGLEBONE kernel config (AM335x SoC is supported by GENERIC now).
Add support for hardware RNG.
Add tirng
Add explicit FDT_OPP for operating-points-v2 so the link set won't be empty
Rename SOC_TI_AM335X to SOC_AM33XX and rename ti_platform.c to
am3_platform.c
Set stdout-path on TI OMAP3 BeagleBoard
Add support for TI OMAP3.
Add OMAP3 support.
Move a lot of *.dtb files to a dtb/ subdirectory on the FAT partition.
Mkimage (eroneously) creates a FAT16 partition (despite the configuration
asking for FAT32), and that has a root directory size limit.
Idea from Jared.
Skip xref if it is 0
Add generic USB PHY driver
Add driver for TI TWL4030 Power Management IC
Use the hwmod clk to get the timer rate and explicitly enable the
timecounter timer.
Add OMAP3 USB support.
Add twl, usbnopphy, tiusb, tiusbtll
Move omap3 dtb files to /boot/dtb
Remove BEAGLEBOARD kernel from list of kernels to build
Remove BEAGLEBOARD kernel (supported by GENERIC now)
Fix PRM_RSTCTRL_RST_DPLL3 definition, now reset works.
Remove DEVKIT8000 kernel (GENERIC should work now)
Remove DPLL5 init ported from old omap code, it is not required
Set the stdout-path on xM like Ti OMAP3 BeagleBoard
Remove BEAGLEBOARDXM from the build
Remove BEAGLEBOARDXM kernel (supported by GENERIC now)
Handle different register layout on OMAP3
Add omapfb to FDT-ized TI port.
Use dss as console on Nokia N900.
Enable IRQ status bits for omap3 type and set speed properly
Add RTC support
Remove tps65950pm (hardware now supported by twl4030.c)
Add NAND flash support.
Add tigpmc, omapnand
Attach tiusb before the default pass since it adds a bus to reduce kernel output
Replace tps65950pm with twl (the former has been removed)
Fix non-FDT build
Cleanup and remove dependency on arch/arm/omap
Add support for GPIO interrupts and fix reading the state of output pins.
Match smsc,lan9115 and honour local-mac-address/mac-address properties
Only one instance of twl(4) is needed
Remove OVERO from build, and commented out N900 kernel config
OMAP3 SoC and all peripherals in the OVERO kernel are now supported by
GENERIC.
Remove commented out IGEPV2 entry
OMAP3 SoC and all peripherals in the IGEPV2 kernel are now supported by
GENERIC.
No longer used.
Also match ti,omap2-onenand
Defer power monitor polling to the sysmon taskq thread to avoid i2c transactions in intr context
Add driver for NXP TDA19988 HDMI encoder
Add support for AM335x display controller (LCDC).
Add tdahdmi, tilcdc, tifb
Test DRM_MODE_* flags, not VID_*
Comment out mode fixup (not needed it seems)
Use 297MHz for display clock
Select closest rate to desired pixel clock
Speed up mode setting a bit and turn off the display while changing modes
diffstat:
distrib/utils/embedded/conf/armv7.conf | 45 +-
distrib/utils/embedded/files/armv7_boot.cmd | 19 +-
distrib/utils/embedded/files/armv7_boot_nonefi.cmd | 9 -
etc/etc.evbarm/Makefile.inc | 12 +-
sys/arch/arm/dts/omap3-beagle-xm.dts | 38 +
sys/arch/arm/dts/omap3-beagle.dts | 35 +
sys/arch/arm/dts/omap3-n900.dts | 35 +
sys/arch/arm/fdt/smsh_fdt.c | 22 +-
sys/arch/arm/ti/am3_platform.c | 150 ++
sys/arch/arm/ti/am3_prcm.c | 96 +-
sys/arch/arm/ti/files.ti | 128 +-
sys/arch/arm/ti/if_cpsw.c | 59 +-
sys/arch/arm/ti/if_cpswreg.h | 238 +++
sys/arch/arm/ti/omap2_gpmcreg.h | 236 +++
sys/arch/arm/ti/omap2_nand.c | 535 ++++++++
sys/arch/arm/ti/omap3_cm.c | 214 +++
sys/arch/arm/ti/omap3_dss.c | 1260 ++++++++++++++++++++
sys/arch/arm/ti/omap3_dssreg.h | 373 +++++
sys/arch/arm/ti/omap3_platform.c | 200 +++
sys/arch/arm/ti/omap3_prm.c | 77 +
sys/arch/arm/ti/ti_com.c | 9 +-
sys/arch/arm/ti/ti_cpufreq.c | 113 +
sys/arch/arm/ti/ti_div_clock.c | 202 +++
sys/arch/arm/ti/ti_dpll_clock.c | 345 +++++
sys/arch/arm/ti/ti_edma.c | 550 ++++++++
sys/arch/arm/ti/ti_edma.h | 173 ++
sys/arch/arm/ti/ti_ehci.c | 157 ++
sys/arch/arm/ti/ti_fb.c | 161 ++
sys/arch/arm/ti/ti_gpio.c | 538 ++++++++
sys/arch/arm/ti/ti_gpmc.c | 77 +
sys/arch/arm/ti/ti_iic.c | 710 +++++++++++
sys/arch/arm/ti/ti_iicreg.h | 106 +
sys/arch/arm/ti/ti_lcdc.c | 664 ++++++++++
sys/arch/arm/ti/ti_lcdc.h | 110 +
sys/arch/arm/ti/ti_lcdcreg.h | 136 ++
sys/arch/arm/ti/ti_motg.c | 237 +++
sys/arch/arm/ti/ti_mux_clock.c | 211 +++
sys/arch/arm/ti/ti_omapintc.c | 49 +-
sys/arch/arm/ti/ti_omaptimer.c | 147 +-
sys/arch/arm/ti/ti_otg.c | 127 ++
sys/arch/arm/ti/ti_otgreg.h | 74 +
sys/arch/arm/ti/ti_platform.c | 145 --
sys/arch/arm/ti/ti_platform.h | 8 -
sys/arch/arm/ti/ti_prcm.c | 23 +-
sys/arch/arm/ti/ti_prcm.h | 12 +-
sys/arch/arm/ti/ti_rng.c | 151 ++
sys/arch/arm/ti/ti_rngreg.h | 44 +
sys/arch/arm/ti/ti_sdhc.c | 676 ++++++++++
sys/arch/arm/ti/ti_sdhcreg.h | 99 +
sys/arch/arm/ti/ti_sysc.c | 72 +
sys/arch/arm/ti/ti_tptc.c | 75 +
sys/arch/arm/ti/ti_usb.c | 221 +++
sys/arch/arm/ti/ti_usbtll.c | 203 +++
sys/arch/evbarm/conf/BEAGLEBOARD | 174 --
sys/arch/evbarm/conf/BEAGLEBOARDXM | 156 --
sys/arch/evbarm/conf/BEAGLEBOARDXM_INSTALL | 11 -
sys/arch/evbarm/conf/BEAGLEBOARD_INSTALL | 11 -
sys/arch/evbarm/conf/BEAGLEBONE | 186 --
sys/arch/evbarm/conf/BEAGLEBONE_INSTALL | 11 -
sys/arch/evbarm/conf/DEVKIT8000 | 15 -
sys/arch/evbarm/conf/GENERIC | 135 +-
sys/arch/evbarm/conf/IGEPV2 | 268 ----
sys/arch/evbarm/conf/N900 | 7 +-
sys/arch/evbarm/conf/OVERO | 359 -----
sys/arch/evbarm/conf/OVERO_INSTALL | 10 -
sys/arch/evbarm/conf/README.evbarm | 8 +-
sys/arch/evbarm/conf/TI | 50 -
sys/arch/evbarm/conf/files.generic | 3 +-
sys/arch/evbarm/conf/files.ti | 9 -
sys/arch/evbarm/conf/std.igepv2 | 28 -
sys/arch/evbarm/conf/std.ti | 30 -
sys/dev/fdt/cpufreq_dt.c | 61 +-
sys/dev/fdt/fdt_clock.c | 12 +-
sys/dev/fdt/fdt_phy.c | 9 +-
sys/dev/fdt/fdtvar.h | 18 +-
sys/dev/fdt/files.fdt | 11 +-
sys/dev/fdt/pinctrl_single.c | 204 +++
sys/dev/fdt/syscon.c | 9 +-
sys/dev/fdt/usbnopphy.c | 140 ++
sys/dev/i2c/at24cxx.c | 5 +-
sys/dev/i2c/files.i2c | 21 +-
sys/dev/i2c/tda19988.c | 940 ++++++++++++++
sys/dev/i2c/tps65217pmic.c | 220 +++-
sys/dev/i2c/tps65950.c | 449 -------
sys/dev/i2c/twl4030.c | 411 ++++++
85 files changed, 12205 insertions(+), 2182 deletions(-)
diffs (truncated from 15754 to 300 lines):
diff -r 6b54bf529784 -r d0237717ecd1 distrib/utils/embedded/conf/armv7.conf
--- a/distrib/utils/embedded/conf/armv7.conf Wed Nov 27 13:40:18 2019 +0000
+++ b/distrib/utils/embedded/conf/armv7.conf Wed Nov 27 13:46:44 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.35 2019/07/21 16:05:24 rin Exp $
+# $NetBSD: armv7.conf,v 1.35.2.1 2019/11/27 13:46:45 martin Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -7,10 +7,7 @@
. ${DIR}/conf/evbarm.conf
-# altera, exynos, sunxi, tegra
kernels_generic="GENERIC"
-# non-FDTised / special kernels
-kernels_beagle="BEAGLEBOARD BEAGLEBONE"
make_label() {
make_label_evbarm
@@ -50,10 +47,6 @@
"${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/armv7 boot" "${mnt}/boot/boot.cmd" "${mnt}/boot/boot.scr"
}
-populate_beagle() {
- :
-}
-
populate_rpi() {
firmwaredir="${src}/external/broadcom/rpi-firmware/dist"
firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
@@ -105,10 +98,6 @@
>> "$tmp/selected_sets"
}
-populate_altera() {
- :
-}
-
populate_amlogic() {
odroidc1_kernelimg=netbsd-GENERIC.ub
@@ -117,24 +106,16 @@
ODROIDC-UBOOT-CONFIG
setenv bootargs "awge0.mac-address=\${ethaddr}"
-setenv bootcmd "fatload mmc 0:1 0x21000000 ${odroidc1_kernelimg}; fatload mmc 0:1 0x20000000 meson8b-odroidc1.dtb; bootm 0x21000000 - 0x20000000"
+setenv bootcmd "fatload mmc 0:1 0x21000000 ${odroidc1_kernelimg}; fatload mmc 0:1 0x20000000 dtb/meson8b-odroidc1.dtb; bootm 0x21000000 - 0x20000000"
run bootcmd
EOF
}
-populate_sunxi() {
- :
-}
-
-populate_tegra() {
- :
-}
-
populate() {
echo "${bar} looking for kernels in ${kernel} ${bar}"
kernels=""
# .ub kernels
- for k in $kernels_generic $kernels_beagle; do
+ for k in $kernels_generic; do
f="${kernel}/netbsd-${k}.ub.gz"
test -f "${f}" && kernels="${kernels} ${f}"
done
@@ -154,28 +135,34 @@
done
done
+ # "kernels" includes some .dtb files that should go into a separate
+ # directory
+ mkdir -p "${mnt}/boot/dtb"
+
# install kernels to /boot partition
for k in ${kernels}; do
tgt="$(basename ${k} | sed 's/\.gz$//')"
- echo "${bar} installing ${k} to /boot/${tgt} ${bar}"
+ case "${tgt}" in
+ sun*.dtb|am335x-*.dtb|omap3-*.dtb|meson8b-*.dtb|tegra*.dtb|vexpress*.dtb)
+ pfx="dtb/";;
+ *)
+ pfx=;;
+ esac
+ echo "${bar} installing ${k} to /boot/${tgt} (on ${mnt}, pfx=${pfx}) ${bar}"
case "${k}" in
*.gz)
- ${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${tgt}"
+ ${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${pfx}${tgt}"
;;
*)
- cp "${k}" "${mnt}/boot/${tgt}"
+ cp "${k}" "${mnt}/boot/${pfx}${tgt}"
;;
esac ||
fail "Copy of ${k} to ${mnt}/boot/${tgt} failed"
done
# board specific configuration
- populate_altera
populate_amlogic
- populate_beagle
populate_rpi
- populate_sunxi
- populate_tegra
# common configuration
populate_common
diff -r 6b54bf529784 -r d0237717ecd1 distrib/utils/embedded/files/armv7_boot.cmd
--- a/distrib/utils/embedded/files/armv7_boot.cmd Wed Nov 27 13:40:18 2019 +0000
+++ b/distrib/utils/embedded/files/armv7_boot.cmd Wed Nov 27 13:46:44 2019 +0000
@@ -1,21 +1,8 @@
-if test "${board}" = "am335x" ; then
- setenv kernel netbsd-BEAGLEBONE.ub
- setenv mmcpart 0:1
- setenv bootargs root=ld0a
-else
- setenv use_efi 1
-fi
-
if test "${soc}" = "tegra210" ; then
# enable PCIe
pci enum
fi
-if test "${use_efi}" = "1" ; then
- setenv boot_scripts
- setenv boot_script_dhcp
- run distro_bootcmd
-else
- fatload mmc ${mmcpart} ${kernel_addr_r} ${kernel}
- bootm ${kernel_addr_r} ${bootargs}
-fi
+setenv boot_scripts
+setenv boot_script_dhcp
+run distro_bootcmd
diff -r 6b54bf529784 -r d0237717ecd1 distrib/utils/embedded/files/armv7_boot_nonefi.cmd
--- a/distrib/utils/embedded/files/armv7_boot_nonefi.cmd Wed Nov 27 13:40:18 2019 +0000
+++ b/distrib/utils/embedded/files/armv7_boot_nonefi.cmd Wed Nov 27 13:46:44 2019 +0000
@@ -33,15 +33,6 @@
setenv mmcpart 1:1
setenv use_fdt 1
fi
-if test "${soc}" = "tegra210" ; then
- setenv kernel netbsd.ub
- setenv bootargs root=wd0a
- setenv mmcpart 1:1
- setenv use_fdt 1
- setenv fdtfile ${soc}-${board}.dtb
- # enable PCIe
- pci enum
-fi
if test "${kernel}" = "" ; then
echo '>>>'
diff -r 6b54bf529784 -r d0237717ecd1 etc/etc.evbarm/Makefile.inc
--- a/etc/etc.evbarm/Makefile.inc Wed Nov 27 13:40:18 2019 +0000
+++ b/etc/etc.evbarm/Makefile.inc Wed Nov 27 13:46:44 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.107 2019/06/02 17:13:15 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.107.2.1 2019/11/27 13:46:45 martin Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -82,30 +82,20 @@
EVBARM_BOARDS.armv7hf+= BCM5301X
#EVBARM_BOARDS.armv7+= BCM56340
#EVBARM_BOARDS.armv7hf+= BCM56340
-KERNEL_SETS.armv7+= BEAGLEBOARD
-KERNEL_SETS.armv7hf+= BEAGLEBOARD
-EVBARM_BOARDS.armv7+= BEAGLEBOARDXM
-EVBARM_BOARDS.armv7hf+= BEAGLEBOARDXM
-KERNEL_SETS.armv7+= BEAGLEBONE
-KERNEL_SETS.armv7hf+= BEAGLEBONE
EVBARM_BOARDS.armv7+= CUBOX
EVBARM_BOARDS.armv7hf+= CUBOX
EVBARM_BOARDS.armv7+= CUBOX-I
EVBARM_BOARDS.armv7hf+= CUBOX-I
-#EVBARM_BOARDS.armv7+= IGEPV2
EVBARM_BOARDS.armv7+= IMX6UL-STARTER
EVBARM_BOARDS.armv7hf+= IMX6UL-STARTER
EVBARM_BOARDS.armv7+= KOBO
EVBARM_BOARDS.armv7hf+= KOBO
EVBARM_BOARDS.armv7+= MIRABOX
EVBARM_BOARDS.armv7hf+= MIRABOX
-#EVBARM_BOARDS.armv7+= N900
EVBARM_BOARDS.armv7+= NETWALKER
EVBARM_BOARDS.armv7hf+= NETWALKER
EVBARM_BOARDS.armv7+= OMAP5EVM
EVBARM_BOARDS.armv7hf+= OMAP5EVM
-EVBARM_BOARDS.armv7+= OVERO
-EVBARM_BOARDS.armv7hf+= OVERO
EVBARM_BOARDS.armv7+= PANDABOARD
EVBARM_BOARDS.armv7hf+= PANDABOARD
diff -r 6b54bf529784 -r d0237717ecd1 sys/arch/arm/dts/omap3-beagle-xm.dts
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/dts/omap3-beagle-xm.dts Wed Nov 27 13:46:44 2019 +0000
@@ -0,0 +1,38 @@
+/* $NetBSD: omap3-beagle-xm.dts,v 1.1.2.2 2019/11/27 13:46:45 martin Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Sevan Janiyan <sevan%NetBSD.org@localhost>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include_next "omap3-beagle-xm.dts"
+
+/ {
+ chosen {
+ stdout-path = &uart3;
+ };
+};
diff -r 6b54bf529784 -r d0237717ecd1 sys/arch/arm/dts/omap3-beagle.dts
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/dts/omap3-beagle.dts Wed Nov 27 13:46:44 2019 +0000
@@ -0,0 +1,35 @@
+/* $NetBSD: omap3-beagle.dts,v 1.1.2.2 2019/11/27 13:46:45 martin Exp $ */
+
+/*-
+ * Copyright (c) 2019 Jared McNeill <jmcneill%invisible.ca@localhost>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include_next "omap3-beagle.dts"
+
+/ {
+ chosen {
+ stdout-path = &uart3;
+ };
+};
diff -r 6b54bf529784 -r d0237717ecd1 sys/arch/arm/dts/omap3-n900.dts
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/dts/omap3-n900.dts Wed Nov 27 13:46:44 2019 +0000
@@ -0,0 +1,35 @@
+/* $NetBSD: omap3-n900.dts,v 1.1.2.2 2019/11/27 13:46:45 martin Exp $ */
+
+/*-
+ * Copyright (c) 2019 Jared McNeill <jmcneill%invisible.ca@localhost>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Home |
Main Index |
Thread Index |
Old Index