scripts/mkimg.arm.sh: fix rpi config.txt

- remove custom entries
- fix armhf to include all boards

scripts/mkimg.arm.sh

@@ -7,19 +7,32 @@ rpi_gen_cmdline() {
 }
 
 rpi_gen_config() {
+	cat <<-EOF
+	# do not modify this file as it will be overwritten on upgrade.
+	# create and/or modify usercfg.txt instead.
+	# https://www.raspberrypi.org/documentation/configuration/config-txt
+	EOF
 	case "$ARCH" in
 	armhf)
 		cat <<-EOF
-		disable_splash=1
-		boot_delay=0
-		gpu_mem=256
-		gpu_mem_256=64
 		[pi0]
 		kernel=boot/vmlinuz-rpi
 		initramfs boot/initramfs-rpi
+		[pi0w]
+		kernel=boot/vmlinuz-rpi
+		initramfs boot/initramfs-rpi
 		[pi1]
 		kernel=boot/vmlinuz-rpi
 		initramfs boot/initramfs-rpi
+		[pi2]
+		kernel=boot/vmlinuz-rpi2
+		initramfs boot/initramfs-rpi2
+		[pi3]
+		kernel=boot/vmlinuz-rpi2
+		initramfs boot/initramfs-rpi2
+		[pi3+]
+		kernel=boot/vmlinuz-rpi2
+		initramfs boot/initramfs-rpi2
 		[all]
 		include usercfg.txt
 		EOF
@@ -41,14 +54,9 @@ rpi_gen_config() {
 	;;
 	aarch64)
 		cat <<-EOF
-		disable_splash=1
-		boot_delay=0
 		arm_control=0x200
 		kernel=boot/vmlinuz-rpi
 		initramfs boot/initramfs-rpi
-		# uncomment line to enable serial on ttyS0 on rpi3
-		# NOTE: This fixes the core_freq to 250Mhz
-		# enable_uart=1
 		include usercfg.txt
 		EOF
 	;;