Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch the kernel7.img RaspberryPi kernel in the armv7 image to GENERIC

Browse Source 
and thus reducing the number of kernels built in an evbarmv7 release.
This commit is contained in:
skrll 2019-05-18 07:33:10 +00:00
parent 94d05cbf81
commit 2c9023a65e
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/evbarm/instkernel/instkernel/Makefile
View File

@ -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.fs
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

17
distrib/utils/embedded/conf/armv7.conf
View File

@ -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=

4
etc/etc.evbarm/Makefile.inc
View File

@ -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