Move more armv6 kernel configs to GENERIC

zxombie · zxombie · commit cf14b342e312 · 2017-09-24T15:14:09.000+02:00
To allow more redundant kernel configs to be removed from FreeBSD move
to use GENERIC in more places.
diff --git a/board/BananaPi/README b/board/BananaPi/README
@@ -97,8 +97,8 @@ slow speed of SD, a full buildworld can take 30-40 hours:
 
  $ make buildworld
  $ make installworld
- $ make KERNCONF=CUBIEBOARD2 buildkernel
- $ make KERNCONF=CUBIEBOARD2 installkernel
+ $ make KERNCONF=GENERIC buildkernel
+ $ make KERNCONF=GENERIC installkernel
 
 If you want to try this, you'll want an 8G image.  You can put the
 source tree into the image when you build it by including the
diff --git a/board/BeagleBone/README b/board/BeagleBone/README
@@ -148,8 +148,8 @@ slow speed of SD, a full buildworld can take 30-40 hours:
 
  $ make buildworld
  $ make installworld
- $ make KERNCONF=BEAGLEBONE buildkernel
- $ make KERNCONF=BEAGLEBONE installkernel
+ $ make KERNCONF=GENERIC buildkernel
+ $ make KERNCONF=GENERIC installkernel
 
 If you want to try this, you'll want an 8G image.  You can put the
 source tree into the image when you build it by including the
diff --git a/board/BeagleBone/overlay/etc/src.conf b/board/BeagleBone/overlay/etc/src.conf
@@ -1 +1 @@
-KERNCONF=BEAGLEBONE
+KERNCONF=GENERIC
diff --git a/board/BeagleBone/setup.sh b/board/BeagleBone/setup.sh
@@ -1,4 +1,4 @@
-KERNCONF=BEAGLEBONE
+KERNCONF=GENERIC
 BEAGLEBONE_UBOOT_PORT="u-boot-beaglebone"
 BEAGLEBONE_UBOOT_BIN="u-boot.img"
 BEAGLEBONE_UBOOT_PATH="/usr/local/share/u-boot/${BEAGLEBONE_UBOOT_PORT}"
diff --git a/board/PandaBoard/setup.sh b/board/PandaBoard/setup.sh
@@ -1,4 +1,4 @@
-KERNCONF=PANDABOARD
+KERNCONF=GENERIC
 PANDABOARD_UBOOT_SRC=${TOPDIR}/u-boot-2012.07
 IMAGE_SIZE=$((1000 * 1000 * 1000))
 TARGET_ARCH=armv6
diff --git a/board/RaspberryPi2/setup.sh b/board/RaspberryPi2/setup.sh
@@ -1,4 +1,4 @@
-KERNCONF=RPI2
+KERNCONF=GENERIC
 UBLDR_LOADADDR=0x2000000
 RPI_UBOOT="u-boot-rpi2"
 RPI_UBOOT_BIN="u-boot.bin"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-KERNCONF=BEAGLEBONE`
	`1`	`+KERNCONF=GENERIC`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-KERNCONF=BEAGLEBONE`
	`1`	`+KERNCONF=GENERIC`
`2`	`2`	`BEAGLEBONE_UBOOT_PORT="u-boot-beaglebone"`
`3`	`3`	`BEAGLEBONE_UBOOT_BIN="u-boot.img"`
`4`	`4`	`BEAGLEBONE_UBOOT_PATH="/usr/local/share/u-boot/${BEAGLEBONE_UBOOT_PORT}"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-KERNCONF=PANDABOARD`
	`1`	`+KERNCONF=GENERIC`
`2`	`2`	`PANDABOARD_UBOOT_SRC=${TOPDIR}/u-boot-2012.07`
`3`	`3`	`IMAGE_SIZE=$((1000 * 1000 * 1000))`
`4`	`4`	`TARGET_ARCH=armv6`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-KERNCONF=RPI2`
	`1`	`+KERNCONF=GENERIC`
`2`	`2`	`UBLDR_LOADADDR=0x2000000`
`3`	`3`	`RPI_UBOOT="u-boot-rpi2"`
`4`	`4`	`RPI_UBOOT_BIN="u-boot.bin"`