Module Name: src Committed By: skrll Date: Thu Nov 1 11:05:24 UTC 2018
Modified Files: src/distrib/utils/embedded/conf: armv7.conf src/distrib/utils/embedded/files: armv7_boot.cmd src/etc/etc.evbarm: Makefile.inc Log Message: Use the GENERIC kernel where possible in armv7.img and remove the old kernels from the bulid for SUNXI and TEGRA. While I'm here disable *_INSTALL kernel builds for boards supported by armv7.img To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/distrib/utils/embedded/conf/armv7.conf cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/embedded/files/armv7_boot.cmd cvs rdiff -u -r1.95 -r1.96 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/utils/embedded/conf/armv7.conf diff -u src/distrib/utils/embedded/conf/armv7.conf:1.25 src/distrib/utils/embedded/conf/armv7.conf:1.26 --- src/distrib/utils/embedded/conf/armv7.conf:1.25 Sat Oct 20 08:26:10 2018 +++ src/distrib/utils/embedded/conf/armv7.conf Thu Nov 1 11:05:24 2018 @@ -1,4 +1,4 @@ -# $NetBSD: armv7.conf,v 1.25 2018/10/20 08:26:10 skrll Exp $ +# $NetBSD: armv7.conf,v 1.26 2018/11/01 11:05:24 skrll Exp $ # ARMv7 customization script used by mkimage # board=armv7 @@ -7,11 +7,12 @@ resize=true . ${DIR}/conf/evbarm.conf +# exynos, sunxi, tegra +kernels_generic="GENERIC" +# non-FDTised / special kernels kernels_amlogic="ODROID-C1" kernels_beagle="BEAGLEBOARD BEAGLEBONE" kernels_rpi="RPI2" -kernels_sunxi="SUNXI" -kernels_tegra="TEGRA" make_label() { make_label_evbarm @@ -97,7 +98,7 @@ populate_amlogic() { ODROIDC-UBOOT-CONFIG setenv bootargs "root=ld0a awge0.mac-address=\${ethaddr} console=${console}" -setenv bootcmd "fatload mmc 0:1 0x21000000 ${odroidc1_kernelimg}; bootm 0x21000000" +setenv bootcmd "fatload mmc 0:1 0x21000000 ${odroidc1_kernelimg}; fatload mmc 0:1 0x20000000 meson8b-odroidc1.dtb; bootm 0x21000000 - 0x20000000" run bootcmd EOF } @@ -116,7 +117,7 @@ populate() { echo "${bar} looking for kernels in ${kernel} ${bar}" kernels="" # .ub kernels - for k in $kernels_beagle $kernels_sunxi $kernels_amlogic $kernels_tegra; do + for k in $kernels_generic $kernels_amlogic $kernels_beagle; do f="${kernel}/netbsd-${k}.ub.gz" test -f "${f}" && kernels="${kernels} ${f}" done @@ -126,7 +127,7 @@ populate() { test -f "${f}" && kernels="${kernels} ${f}" done # .dtb files - for k in $kernels_rpi $kernels_sunxi $kernels_tegra; do + for k in $kernels_generic $kernels_amlogic $kernels_rpi $; do test -d "${KERNOBJDIR}/${k}" && \ dtbs="$(${MAKE} -C ${KERNOBJDIR}/${k} -v DTB)" || \ dtbs= Index: src/distrib/utils/embedded/files/armv7_boot.cmd diff -u src/distrib/utils/embedded/files/armv7_boot.cmd:1.7 src/distrib/utils/embedded/files/armv7_boot.cmd:1.8 --- src/distrib/utils/embedded/files/armv7_boot.cmd:1.7 Sat Oct 20 08:29:11 2018 +++ src/distrib/utils/embedded/files/armv7_boot.cmd Thu Nov 1 11:05:24 2018 @@ -4,25 +4,31 @@ if test "${board}" = "am335x" ; then setenv bootargs root=ld0a fi if test "${soc}" = "exynos" ; then - setenv kernel netbsd-EXYNOS.ub + setenv kernel netbsd-GENERIC.ub setenv bootargs 'root=ld1a' setenv mmcpart 0:1 setenv use_fdt 1 fi if test "${soc}" = "sunxi" ; then - setenv kernel netbsd-SUNXI.ub + setenv kernel netbsd-GENERIC.ub setenv bootargs 'root=ld0a' setenv mmcpart 0:1 setenv use_fdt 1 fi if test "${soc}" = "tegra" ; then - setenv kernel netbsd-TEGRA.ub + setenv kernel netbsd-GENERIC.ub setenv bootargs root=ld1a setenv mmcpart 1:1 setenv use_fdt 1 fi +if test "${soc}" = "tegra124" ; then + setenv kernel netbsd-GENERIC.ub + setenv bootargs root=ld0a + setenv mmcpart 1:1 + setenv use_fdt 1 +fi if test "${soc}" = "tegra210" ; then - setenv kernel netbsd-TEGRA.ub + setenv kernel netbsd-GENERIC.ub setenv bootargs root=ld0a setenv mmcpart 1:1 setenv use_fdt 1 Index: src/etc/etc.evbarm/Makefile.inc diff -u src/etc/etc.evbarm/Makefile.inc:1.95 src/etc/etc.evbarm/Makefile.inc:1.96 --- src/etc/etc.evbarm/Makefile.inc:1.95 Sun Oct 21 07:08:40 2018 +++ src/etc/etc.evbarm/Makefile.inc Thu Nov 1 11:05:24 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.95 2018/10/21 07:08:40 skrll Exp $ +# $NetBSD: Makefile.inc,v 1.96 2018/11/01 11:05:24 skrll Exp $ # # etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets # @@ -86,16 +86,18 @@ EVBARM_BOARDS.armv7+= BCM5301X EVBARM_BOARDS.armv7hf+= BCM5301X #EVBARM_BOARDS.armv7+= BCM56340 #EVBARM_BOARDS.armv7hf+= BCM56340 -EVBARM_BOARDS.armv7+= BEAGLEBOARD -EVBARM_BOARDS.armv7hf+= BEAGLEBOARD +KERNEL_SETS.armv7+= BEAGLEBOARD +KERNEL_SETS.armv7hf+= BEAGLEBOARD EVBARM_BOARDS.armv7+= BEAGLEBOARDXM EVBARM_BOARDS.armv7hf+= BEAGLEBOARDXM -EVBARM_BOARDS.armv7+= BEAGLEBONE -EVBARM_BOARDS.armv7hf+= BEAGLEBONE +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 +KERNEL_SETS.armv7+= GENERIC +KERNEL_SETS.armv7hf+= GENERIC #EVBARM_BOARDS.armv7+= IGEPV2 EVBARM_BOARDS.armv7+= IMX6UL-STARTER EVBARM_BOARDS.armv7hf+= IMX6UL-STARTER @@ -106,8 +108,8 @@ EVBARM_BOARDS.armv7hf+= MIRABOX #EVBARM_BOARDS.armv7+= N900 EVBARM_BOARDS.armv7+= NETWALKER EVBARM_BOARDS.armv7hf+= NETWALKER -EVBARM_BOARDS.armv7+= ODROID-C1 -EVBARM_BOARDS.armv7hf+= ODROID-C1 +KERNEL_SETS.armv7+= ODROID-C1 +KERNEL_SETS.armv7hf+= ODROID-C1 EVBARM_BOARDS.armv7+= OMAP5EVM EVBARM_BOARDS.armv7hf+= OMAP5EVM EVBARM_BOARDS.armv7+= OVERO @@ -116,10 +118,10 @@ EVBARM_BOARDS.armv7+= PANDABOARD EVBARM_BOARDS.armv7hf+= PANDABOARD EVBARM_BOARDS.armv7+= RPI2 EVBARM_BOARDS.armv7hf+= RPI2 -KERNEL_SETS.armv7+= SUNXI -KERNEL_SETS.armv7hf+= SUNXI -KERNEL_SETS.armv7+= TEGRA -KERNEL_SETS.armv7hf+= TEGRA +#KERNEL_SETS.armv7+= SUNXI +#KERNEL_SETS.armv7hf+= SUNXI +#KERNEL_SETS.armv7+= TEGRA +#KERNEL_SETS.armv7hf+= TEGRA KERNEL_SETS.armv7+= VEXPRESS_A15 KERNEL_SETS.armv7hf+= VEXPRESS_A15