Module Name: src Committed By: skrll Date: Mon Dec 16 11:00:31 UTC 2019
Modified Files: src/distrib/evbarm/instkernel/instkernel: Makefile src/distrib/utils/embedded/conf: arm64.conf armv7.conf rpi.conf rpi_inst.conf src/external/broadcom/rpi-firmware/dist: bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf src/sys/arch/evbarm/conf: mk.generic mk.generic64 mk.rpi Added Files: src/external/broadcom/rpi-firmware/dist: fixup4.dat fixup4cd.dat start4.elf start4cd.elf Removed Files: src/sys/arch/evbarm/compile: rpi-mkknlimg.sh Log Message: Update to new RaspberryPi firware commit 0c01dbefba45a08c47f8538d5a071a0fba6b7e83 Author: popcornmix <popcorn...@gmail.com> Date: Wed Dec 11 15:30:08 2019 +0000 and include firmware for RPI4 Firmware has bee updated to support mainline linux kernels as described in https://github.com/raspberrypi/linux/issues/3237 To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/distrib/evbarm/instkernel/instkernel/Makefile cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/embedded/conf/arm64.conf cvs rdiff -u -r1.39 -r1.40 src/distrib/utils/embedded/conf/armv7.conf cvs rdiff -u -r1.34 -r1.35 src/distrib/utils/embedded/conf/rpi.conf cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/embedded/conf/rpi_inst.conf cvs rdiff -u -r1.11 -r1.12 \ src/external/broadcom/rpi-firmware/dist/bootcode.bin \ src/external/broadcom/rpi-firmware/dist/fixup.dat \ src/external/broadcom/rpi-firmware/dist/fixup_cd.dat \ src/external/broadcom/rpi-firmware/dist/start.elf \ src/external/broadcom/rpi-firmware/dist/start_cd.elf cvs rdiff -u -r0 -r1.1 src/external/broadcom/rpi-firmware/dist/fixup4.dat \ src/external/broadcom/rpi-firmware/dist/fixup4cd.dat \ src/external/broadcom/rpi-firmware/dist/start4.elf \ src/external/broadcom/rpi-firmware/dist/start4cd.elf cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/compile/rpi-mkknlimg.sh cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/mk.generic cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.generic64 cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/mk.rpi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/evbarm/instkernel/instkernel/Makefile diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.32 src/distrib/evbarm/instkernel/instkernel/Makefile:1.33 --- src/distrib/evbarm/instkernel/instkernel/Makefile:1.32 Mon Aug 12 08:04:28 2019 +++ src/distrib/evbarm/instkernel/instkernel/Makefile Mon Dec 16 11:00:30 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2019/08/12 08:04:28 martin Exp $ +# $NetBSD: Makefile,v 1.33 2019/12/16 11:00:30 skrll Exp $ .include <bsd.own.mk> .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -14,8 +14,7 @@ MDSETTARGETS= .for i in ${BUILD_KERNELS:M*_INSTALL} .if ${i} == "RPI_INSTALL" MDSETTARGETS+= ${i} ${SSHRAMDISK} netbsd-${i} -MDSET_SUFFIXES.netbsd-${i}= bin create-bin img create-img -MDSET_.RPI_INSTALL.netbsd-RPI_INSTALL.img.deps= netbsd-RPI_INSTALL.bin +MDSET_SUFFIXES.netbsd-${i}= img create-img .else MDSETTARGETS+= ${i} ${RAMDISK} - .endif @@ -23,12 +22,9 @@ MDSETTARGETS+= ${i} ${RAMDISK} - MDSET_RELEASEDIR= installation/instkernel -MDSET_SUFFIXES.-= srec create-srec bin create-bin +MDSET_SUFFIXES.-= srec create-srec img create-img create-srec= ${OBJCOPY} -O srec ${.TARGET:R} ${.TARGET} -create-bin= ${OBJCOPY} -O binary ${.TARGET:R} ${.TARGET} -create-img= \ - ${HOST_SH} ${NETBSDSRCDIR}/sys/arch/evbarm/compile/rpi-mkknlimg.sh \ - ${.TARGET:R}.bin ${.TARGET} +create-img= ${OBJCOPY} -O binary ${.TARGET:R} ${.TARGET} .include "${DISTRIBDIR}/common/Makefile.mdset" Index: src/distrib/utils/embedded/conf/arm64.conf diff -u src/distrib/utils/embedded/conf/arm64.conf:1.7 src/distrib/utils/embedded/conf/arm64.conf:1.8 --- src/distrib/utils/embedded/conf/arm64.conf:1.7 Mon Dec 16 08:01:20 2019 +++ src/distrib/utils/embedded/conf/arm64.conf Mon Dec 16 11:00:30 2019 @@ -1,4 +1,4 @@ -# $NetBSD: arm64.conf,v 1.7 2019/12/16 08:01:20 skrll Exp $ +# $NetBSD: arm64.conf,v 1.8 2019/12/16 11:00:30 skrll Exp $ # ARM64 customization script used by mkimage # board=arm64 @@ -67,13 +67,16 @@ populate_rockchip() { populate_rpi() { firmwaredir="${src}/external/broadcom/rpi-firmware/dist" - firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf" + firmwarefiles="LICENCE.broadcom bootcode.bin fixup4cd.dat fixup4.dat fixup_cd.dat fixup.dat start4cd.elf start4.elf start_cd.elf start.elf" cat > "${mnt}/boot/cmdline.txt" << EOF root=ld0a console=${console} EOF cat > "${mnt}/boot/config.txt" << EOF +# +upstream_kernel=1 +# arm_64bit=1 kernel=netbsd.img kernel_address=0x200000 Index: src/distrib/utils/embedded/conf/armv7.conf diff -u src/distrib/utils/embedded/conf/armv7.conf:1.39 src/distrib/utils/embedded/conf/armv7.conf:1.40 --- src/distrib/utils/embedded/conf/armv7.conf:1.39 Wed Oct 30 21:43:42 2019 +++ src/distrib/utils/embedded/conf/armv7.conf Mon Dec 16 11:00:30 2019 @@ -1,4 +1,4 @@ -# $NetBSD: armv7.conf,v 1.39 2019/10/30 21:43:42 jmcneill Exp $ +# $NetBSD: armv7.conf,v 1.40 2019/12/16 11:00:30 skrll Exp $ # ARMv7 customization script used by mkimage # board=armv7 @@ -63,6 +63,8 @@ root=ld0a console=${console} EOF cat > ${mnt}/boot/config.txt << EOF +# +upstream_kernel=1 # Boot options, see https://www.raspberrypi.org/documentation/configuration/config-txt/boot.md kernel_address=0x01000040 # UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md Index: src/distrib/utils/embedded/conf/rpi.conf diff -u src/distrib/utils/embedded/conf/rpi.conf:1.34 src/distrib/utils/embedded/conf/rpi.conf:1.35 --- src/distrib/utils/embedded/conf/rpi.conf:1.34 Tue Dec 12 21:00:28 2017 +++ src/distrib/utils/embedded/conf/rpi.conf Mon Dec 16 11:00:30 2019 @@ -1,10 +1,10 @@ -# $NetBSD: rpi.conf,v 1.34 2017/12/12 21:00:28 jmcneill Exp $ +# $NetBSD: rpi.conf,v 1.35 2019/12/16 11:00:30 skrll Exp $ # Raspberry Pi customization script used by mkimage # board=rpi kerneldir=$src/sys/arch/evbarm/compile/RPI/ -kernel=$kerneldir/netbsd-RPI.img +kernel=$kerneldir/netbsd-RPI.bin kernels_rpi="RPI RPI2" resize=true @@ -47,7 +47,7 @@ EOF } populate() { - rpi2_kernel="$(echo $kernel | sed 's/RPI/RPI2/g')" + rpi2_kernel="$(echo $kernel | sed -e 's/RPI/RPI2/g')" cat > ${mnt}/boot/cmdline.txt << EOF root=ld0a console=fb @@ -56,6 +56,8 @@ root=ld0a console=fb EOF cat > ${mnt}/boot/config.txt << EOF +# +upstream_kernel=1 # UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md enable_uart=1 force_turbo=0 Index: src/distrib/utils/embedded/conf/rpi_inst.conf diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.11 src/distrib/utils/embedded/conf/rpi_inst.conf:1.12 --- src/distrib/utils/embedded/conf/rpi_inst.conf:1.11 Thu Dec 14 06:29:15 2017 +++ src/distrib/utils/embedded/conf/rpi_inst.conf Mon Dec 16 11:00:30 2019 @@ -1,4 +1,4 @@ -# $NetBSD: rpi_inst.conf,v 1.11 2017/12/14 06:29:15 skrll Exp $ +# $NetBSD: rpi_inst.conf,v 1.12 2019/12/16 11:00:30 skrll Exp $ # Raspberry Pi customization script used by mkimage # @@ -99,9 +99,11 @@ EOF echo "${bar} installing kernel ${bar}" case ${kernel} in *.gz) + echo " ${kernel} uncompressed to kernel.img" ${GZIP_CMD} -dc ${kernel} > ${mnt}/boot/kernel.img ;; *) + echo " ${kernel} copied" cp ${kernel} ${mnt}/boot/kernel.img ;; esac || fail "copy of ${kernel} to ${mnt}/boot/kernel.img failed" Index: src/external/broadcom/rpi-firmware/dist/bootcode.bin Binary files are different Index: src/external/broadcom/rpi-firmware/dist/fixup.dat Binary files are different Index: src/external/broadcom/rpi-firmware/dist/fixup_cd.dat Binary files are different Index: src/external/broadcom/rpi-firmware/dist/start.elf Binary files are different Index: src/external/broadcom/rpi-firmware/dist/start_cd.elf Binary files are different Index: src/sys/arch/evbarm/conf/mk.generic diff -u src/sys/arch/evbarm/conf/mk.generic:1.8 src/sys/arch/evbarm/conf/mk.generic:1.9 --- src/sys/arch/evbarm/conf/mk.generic:1.8 Sun Apr 14 07:57:51 2019 +++ src/sys/arch/evbarm/conf/mk.generic Mon Dec 16 11:00:30 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mk.generic,v 1.8 2019/04/14 07:57:51 skrll Exp $ +# $NetBSD: mk.generic,v 1.9 2019/12/16 11:00:30 skrll Exp $ .include "$S/arch/arm/nvidia/tegra_xusb-fw.mk" @@ -17,16 +17,11 @@ MKUBOOTIMAGEARGS= -A arm -T kernel_noloa MKUBOOTIMAGEARGS+= -e 0 MKUBOOTIMAGEARGS+= -n "NetBSD/${BOARDTYPE:U${MACHINE_ARCH}} ${_OSRELEASE}" -MKKNLIMG= ${THISARM}/compile/rpi-mkknlimg.sh - SYSTEM_LD_TAIL_EXTRA+=; \ - echo ${OBJCOPY} -S -O binary $@ $@.bin; \ - ${OBJCOPY} -S -O binary $@ $@.bin; \ - echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \ - ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \ - echo ${MKKNLIMG} $@.bin $@.img; \ - ${HOST_SH} ${MKKNLIMG} $@.bin $@.img; + echo ${OBJCOPY} -S -O binary $@ $@.img; \ + ${OBJCOPY} -S -O binary $@ $@.img; \ + echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.img $@.ub; \ + ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.img $@.ub -EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@} -EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@} EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.img@} +EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@} Index: src/sys/arch/evbarm/conf/mk.generic64 diff -u src/sys/arch/evbarm/conf/mk.generic64:1.4 src/sys/arch/evbarm/conf/mk.generic64:1.5 --- src/sys/arch/evbarm/conf/mk.generic64:1.4 Wed Dec 4 11:25:04 2019 +++ src/sys/arch/evbarm/conf/mk.generic64 Mon Dec 16 11:00:30 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mk.generic64,v 1.4 2019/12/04 11:25:04 jmcneill Exp $ +# $NetBSD: mk.generic64,v 1.5 2019/12/16 11:00:30 skrll Exp $ SYSTEM_FIRST_OBJ= start.o SYSTEM_FIRST_SFILE= ${ARM}/aarch64/start.S @@ -8,14 +8,11 @@ _OSRELEASE!= ${HOST_SH} $S/conf/osrelea BOARDTYPE= evbarm64 MKUBOOTIMAGEARGS= -f arm64 -u -a 0x200000 -MKKNLIMG= ${THISARM}/compile/rpi-mkknlimg.sh SYSTEM_LD_TAIL_EXTRA+= && \ echo ${OBJCOPY} -S -O binary $@ $@.bin && \ ${OBJCOPY} -S -O binary $@ $@.bin && \ - echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub && \ - ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub && \ - echo ${MKKNLIMG} $@.ub $@.img && \ - ${HOST_SH} ${MKKNLIMG} $@.ub $@.img + echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.img && \ + ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.img EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.img@} Index: src/sys/arch/evbarm/conf/mk.rpi diff -u src/sys/arch/evbarm/conf/mk.rpi:1.6 src/sys/arch/evbarm/conf/mk.rpi:1.7 --- src/sys/arch/evbarm/conf/mk.rpi:1.6 Thu Oct 18 09:01:54 2018 +++ src/sys/arch/evbarm/conf/mk.rpi Mon Dec 16 11:00:30 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mk.rpi,v 1.6 2018/10/18 09:01:54 skrll Exp $ +# $NetBSD: mk.rpi,v 1.7 2019/12/16 11:00:30 skrll Exp $ SYSTEM_FIRST_OBJ= armv6_start.o SYSTEM_FIRST_SFILE= ${ARM}/arm/armv6_start.S @@ -8,12 +8,8 @@ _OSRELEASE!= ${HOST_SH} $S/conf/osrelea KERNEL_BASE_PHYS=0x00008000 KERNEL_BASE_VIRT=0x80008000 -MKKNLIMG= ${THISARM}/compile/rpi-mkknlimg.sh - SYSTEM_LD_TAIL_EXTRA+=; \ echo ${OBJCOPY} -S -O binary $@ $@.bin; \ - ${OBJCOPY} -S -O binary $@ $@.bin; \ - echo ${MKKNLIMG} $@.bin $@.img; \ - ${HOST_SH} ${MKKNLIMG} $@.bin $@.img; + ${OBJCOPY} -S -O binary $@ $@.bin; -EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.img@} +EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@} Added files: Index: src/external/broadcom/rpi-firmware/dist/fixup4.dat Binary files are different Index: src/external/broadcom/rpi-firmware/dist/fixup4cd.dat Binary files are different Index: src/external/broadcom/rpi-firmware/dist/start4.elf Binary files are different Index: src/external/broadcom/rpi-firmware/dist/start4cd.elf Binary files are different