Module Name: src
Committed By: skrll
Date: Sat May 18 07:33:11 UTC 2019
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
src/distrib/utils/embedded/conf: armv7.conf
src/etc/etc.evbarm: Makefile.inc
Log Message:
Switch the kernel7.img RaspberryPi kernel in the armv7 image to GENERIC
and thus reducing the number of kernels built in an evbarmv7 release.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/distrib/evbarm/instkernel/instkernel/Makefile
cvs rdiff -u -r1.33 -r1.34 src/distrib/utils/embedded/conf/armv7.conf
cvs rdiff -u -r1.105 -r1.106 src/etc/etc.evbarm/Makefile.inc
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.30 src/distrib/evbarm/instkernel/instkernel/Makefile:1.31
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.30 Thu Dec 14 06:29:15 2017
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Sat May 18 07:33:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2017/12/14 06:29:15 skrll Exp $
+# $NetBSD: Makefile,v 1.31 2019/05/18 07:33:10 skrll Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,7 +12,7 @@ SSHRAMDISK= ${SSHRAMDISKDIR}/sshramdisk.
MDSETTARGETS=
.for i in ${BUILD_KERNELS:M*_INSTALL}
-.if ${i} == "RPI_INSTALL" || ${i} == "RPI2_INSTALL"
+.if ${i} == "RPI_INSTALL"
MDSETTARGETS+= ${i} ${SSHRAMDISK} netbsd-${i}
MDSET_SUFFIXES.netbsd-${i}= bin create-bin img create-img
.else
Index: src/distrib/utils/embedded/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.33 src/distrib/utils/embedded/conf/armv7.conf:1.34
--- src/distrib/utils/embedded/conf/armv7.conf:1.33 Sat Apr 13 10:58:11 2019
+++ src/distrib/utils/embedded/conf/armv7.conf Sat May 18 07:33:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.33 2019/04/13 10:58:11 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.34 2019/05/18 07:33:10 skrll Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -11,7 +11,6 @@ resize=true
kernels_generic="GENERIC"
# non-FDTised / special kernels
kernels_beagle="BEAGLEBOARD BEAGLEBONE"
-kernels_rpi="RPI2"
make_label() {
make_label_evbarm
@@ -55,10 +54,10 @@ populate_rpi() {
firmwaredir="${src}/external/broadcom/rpi-firmware/dist"
firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
- # RPI2 kernel needs to be installed as kernel7.img
- if [ -f "${mnt}/boot/netbsd-RPI2.img" ]; then
- echo "${bar} renaming netbsd-RPI2.img to kernel7.img ${bar}"
- mv "${mnt}/boot/netbsd-RPI2.img" "${mnt}/boot/kernel7.img"
+ # The GENERIC .img kernel needs to be installed as kernel7.img for RPI2
+ if [ -f "${mnt}/boot/netbsd-GENERIC.img" ]; then
+ echo "${bar} renaming netbsd-GENERIC.img to kernel7.img ${bar}"
+ mv "${mnt}/boot/netbsd-GENERIC.img" "${mnt}/boot/kernel7.img"
cat > "${mnt}/boot/cmdline.txt" << EOF
root=ld0a console=${console}
@@ -67,6 +66,8 @@ root=ld0a console=${console}
EOF
cat > ${mnt}/boot/config.txt << EOF
+# 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
enable_uart=1
force_turbo=0
@@ -134,12 +135,12 @@ populate() {
test -f "${f}" && kernels="${kernels} ${f}"
done
# .img kernels
- for k in $kernels_rpi; do
+ for k in $kernels_generic; do
f="${kernel}/netbsd-${k}.img.gz"
test -f "${f}" && kernels="${kernels} ${f}"
done
# .dtb files
- for k in $kernels_generic $kernels_rpi $; do
+ for k in $kernels_generic $; do
test -d "${KERNOBJDIR}/${k}" && \
dtbs="$(${MAKE} -C ${KERNOBJDIR}/${k} -v DTB)" || \
dtbs=
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.105 src/etc/etc.evbarm/Makefile.inc:1.106
--- src/etc/etc.evbarm/Makefile.inc:1.105 Sun Mar 31 13:04:54 2019
+++ src/etc/etc.evbarm/Makefile.inc Sat May 18 07:33:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.105 2019/03/31 13:04:54 jmcneill Exp $
+# $NetBSD: Makefile.inc,v 1.106 2019/05/18 07:33:10 skrll Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -108,8 +108,6 @@ EVBARM_BOARDS.armv7+= OVERO
EVBARM_BOARDS.armv7hf+= OVERO
EVBARM_BOARDS.armv7+= PANDABOARD
EVBARM_BOARDS.armv7hf+= PANDABOARD
-EVBARM_BOARDS.armv7+= RPI2
-EVBARM_BOARDS.armv7hf+= RPI2
KERNEL_SETS.arm64+= GENERIC64
.endif
