aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2016-03-14 10:08:43 +0200
committerTimo Teräs <timo.teras@iki.fi>2016-03-14 10:17:36 +0200
commit3431e50498880f88122bad7f9c817bf589c9aec8 (patch)
treec31d875b1308973ba1693567be60dd13cabf49a9
parent3e183ce11eb156d7effd515cef22dda60e096122 (diff)
downloadalpine-iso-3431e50498880f88122bad7f9c817bf589c9aec8.tar.bz2
alpine-iso-3431e50498880f88122bad7f9c817bf589c9aec8.tar.xz
use unified cmdline.txt for all rpi models
add also rpi3 filter and use rpi2 kernel for it. not sure if the rpi3 filter really exists but add it just in case.
-rwxr-xr-xMakefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 730856c..d69e140 100755
--- a/Makefile
+++ b/Makefile
@@ -437,11 +437,12 @@ $(RPI_TAR_GZ): $(ALL_MODLOOP) $(ALL_INITFS) $(ALL_ISO_KERNEL) $(ISO_REPOS_DIRSTA
cp $(ISO_DIR)/boot/vmlinuz-$$flavor $(RPI_TEMP)/boot/ ; \
cp $(subst %,$$flavor,$(INITFS)) $(RPI_TEMP)/boot ; \
cp $(subst %,$$flavor,$(MODLOOP)) $(RPI_TEMP)/boot/ ; \
- echo "BOOT_IMAGE=/boot/vmlinuz-$$flavor modules=loop,squashfs,sd-mod,usb-storage modloop=/boot/modloop-$$flavor quiet $(BOOT_OPTS)" > $(RPI_TEMP)/cmdline-$$flavor.txt ; \
done
+ echo -en "modules=loop,squashfs,sd-mod,usb-storage quiet $(BOOT_OPTS)" > $(RPI_TEMP)/cmdline.txt
echo -en "disable_splash=1\nboot_delay=0\n" > $(RPI_TEMP)/config.txt
- echo -en "[pi1]\ncmdline=cmdline-rpi.txt\nkernel=boot/vmlinuz-rpi\ninitramfs boot/initramfs-rpi 0x08000000\n" >> $(RPI_TEMP)/config.txt
- echo -en "[pi2]\ncmdline=cmdline-rpi2.txt\nkernel=boot/vmlinuz-rpi2\ninitramfs boot/initramfs-rpi2 0x08000000\n" >> $(RPI_TEMP)/config.txt
+ echo -en "[pi1]\nkernel=boot/vmlinuz-rpi\ninitramfs boot/initramfs-rpi 0x08000000\n" >> $(RPI_TEMP)/config.txt
+ echo -en "[pi2]\nkernel=boot/vmlinuz-rpi2\ninitramfs boot/initramfs-rpi2 0x08000000\n" >> $(RPI_TEMP)/config.txt
+ echo -en "[pi3]\nkernel=boot/vmlinuz-rpi2\ninitramfs boot/initramfs-rpi2 0x08000000\n" >> $(RPI_TEMP)/config.txt
echo -en "[all]\n" >> $(RPI_TEMP)/config.txt
echo -en "include usercfg.txt\n" >> $(RPI_TEMP)/config.txt
cp -r $(ISO_DIR)/apks $(RPI_TEMP)/