Module Name: src
Committed By: skrll
Date: Sun Jan 20 10:18:04 UTC 2019
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
src/etc/etc.evbarm: Makefile.inc
Removed Files:
src/sys/arch/arm/amlogic: amlogic_board.c amlogic_canvasreg.h
amlogic_com.c amlogic_comreg.h amlogic_comvar.h amlogic_cpufreq.c
amlogic_crureg.h amlogic_dwctwo.c amlogic_genfb.c amlogic_gmac.c
amlogic_gpio.c amlogic_hdmireg.h amlogic_intr.h amlogic_io.c
amlogic_reg.h amlogic_rng.c amlogic_rtc.c amlogic_rtcreg.h
amlogic_sdhc.c amlogic_sdhcreg.h amlogic_sdio.c amlogic_sdioreg.h
amlogic_var.h amlogic_vpureg.h
src/sys/arch/evbarm/amlogic: amlogic_machdep.c platform.h
src/sys/arch/evbarm/conf: ODROID-C1 files.amlogic mk.amlogic
std.amlogic
Log Message:
Another kernel bites te dust.
Remove ODROID-C1 as it is now replaced by GENERIC. Thanks jmcneill.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/distrib/utils/embedded/conf/armv7.conf
cvs rdiff -u -r1.99 -r1.100 src/etc/etc.evbarm/Makefile.inc
cvs rdiff -u -r1.17 -r0 src/sys/arch/arm/amlogic/amlogic_board.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/amlogic/amlogic_canvasreg.h \
src/sys/arch/arm/amlogic/amlogic_comvar.h \
src/sys/arch/arm/amlogic/amlogic_hdmireg.h \
src/sys/arch/arm/amlogic/amlogic_rtc.c \
src/sys/arch/arm/amlogic/amlogic_rtcreg.h \
src/sys/arch/arm/amlogic/amlogic_sdhcreg.h \
src/sys/arch/arm/amlogic/amlogic_sdioreg.h
cvs rdiff -u -r1.6 -r0 src/sys/arch/arm/amlogic/amlogic_com.c \
src/sys/arch/arm/amlogic/amlogic_cpufreq.c \
src/sys/arch/arm/amlogic/amlogic_dwctwo.c \
src/sys/arch/arm/amlogic/amlogic_intr.h
cvs rdiff -u -r1.4 -r0 src/sys/arch/arm/amlogic/amlogic_comreg.h \
src/sys/arch/arm/amlogic/amlogic_rng.c
cvs rdiff -u -r1.13 -r0 src/sys/arch/arm/amlogic/amlogic_crureg.h
cvs rdiff -u -r1.5 -r0 src/sys/arch/arm/amlogic/amlogic_genfb.c \
src/sys/arch/arm/amlogic/amlogic_sdio.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/arm/amlogic/amlogic_gmac.c \
src/sys/arch/arm/amlogic/amlogic_gpio.c
cvs rdiff -u -r1.14 -r0 src/sys/arch/arm/amlogic/amlogic_io.c
cvs rdiff -u -r1.12 -r0 src/sys/arch/arm/amlogic/amlogic_reg.h \
src/sys/arch/arm/amlogic/amlogic_sdhc.c \
src/sys/arch/arm/amlogic/amlogic_var.h
cvs rdiff -u -r1.3 -r0 src/sys/arch/arm/amlogic/amlogic_vpureg.h
cvs rdiff -u -r1.27 -r0 src/sys/arch/evbarm/amlogic/amlogic_machdep.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/amlogic/platform.h
cvs rdiff -u -r1.24 -r0 src/sys/arch/evbarm/conf/ODROID-C1
cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/files.amlogic \
src/sys/arch/evbarm/conf/mk.amlogic
cvs rdiff -u -r1.8 -r0 src/sys/arch/evbarm/conf/std.amlogic
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.28 src/distrib/utils/embedded/conf/armv7.conf:1.29
--- src/distrib/utils/embedded/conf/armv7.conf:1.28 Fri Nov 30 20:53:02 2018
+++ src/distrib/utils/embedded/conf/armv7.conf Sun Jan 20 10:18:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.28 2018/11/30 20:53:02 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.29 2019/01/20 10:18:03 skrll Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -10,7 +10,6 @@ resize=true
# altera, exynos, sunxi, tegra
kernels_generic="GENERIC"
# non-FDTised / special kernels
-kernels_amlogic="ODROID-C1"
kernels_beagle="BEAGLEBOARD BEAGLEBONE"
kernels_rpi="RPI2"
@@ -95,7 +94,7 @@ populate_altera() {
}
populate_amlogic() {
- odroidc1_kernelimg=netbsd-ODROID-C1.ub
+ odroidc1_kernelimg=netbsd-GENERIC.ub
# Create a boot.ini for Amlogic U-Boot
cat >> "${mnt}/boot/boot.ini" << EOF
@@ -121,7 +120,7 @@ populate() {
echo "${bar} looking for kernels in ${kernel} ${bar}"
kernels=""
# .ub kernels
- for k in $kernels_generic $kernels_amlogic $kernels_beagle; do
+ for k in $kernels_generic $kernels_beagle; do
f="${kernel}/netbsd-${k}.ub.gz"
test -f "${f}" && kernels="${kernels} ${f}"
done
@@ -131,7 +130,7 @@ populate() {
test -f "${f}" && kernels="${kernels} ${f}"
done
# .dtb files
- for k in $kernels_generic $kernels_amlogic $kernels_rpi $; do
+ for k in $kernels_generic $kernels_rpi $; 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.99 src/etc/etc.evbarm/Makefile.inc:1.100
--- src/etc/etc.evbarm/Makefile.inc:1.99 Mon Nov 5 21:34:33 2018
+++ src/etc/etc.evbarm/Makefile.inc Sun Jan 20 10:18:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.99 2018/11/05 21:34:33 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.100 2019/01/20 10:18:04 skrll Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -106,8 +106,6 @@ EVBARM_BOARDS.armv7hf+= MIRABOX
#EVBARM_BOARDS.armv7+= N900
EVBARM_BOARDS.armv7+= NETWALKER
EVBARM_BOARDS.armv7hf+= NETWALKER
-KERNEL_SETS.armv7+= ODROID-C1
-KERNEL_SETS.armv7hf+= ODROID-C1
EVBARM_BOARDS.armv7+= OMAP5EVM
EVBARM_BOARDS.armv7hf+= OMAP5EVM
EVBARM_BOARDS.armv7+= OVERO
