aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@alpinelinux.org>2019-04-04 09:43:48 +0000
committerCarlo Landmeter <clandmeter@alpinelinux.org>2019-05-06 07:45:03 +0000
commit59bb1ba251e0e7138ee79936a84dec66e4cf6ce2 (patch)
treea379b093c8946b2bd882d5191dc5d03ac525584d /scripts
parent8e4b6e3657cf4be9ca3c2028f2ca5f06baf034b3 (diff)
downloadaports-59bb1ba251e0e7138ee79936a84dec66e4cf6ce2.tar.bz2
aports-59bb1ba251e0e7138ee79936a84dec66e4cf6ce2.tar.xz
scripts/mkimg.arm.sh: fix rpi config.txt
- remove custom entries - fix armhf to include all boards
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/mkimg.arm.sh26
1 files changed, 17 insertions, 9 deletions
diff --git a/scripts/mkimg.arm.sh b/scripts/mkimg.arm.sh
index a074d6ae2d..649fd385bc 100755
--- a/scripts/mkimg.arm.sh
+++ b/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
;;