aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-05-06 12:14:58 +0000
committerTimo Teräs <timo.teras@iki.fi>2015-05-06 15:15:14 +0300
commitef23ae7ab99cee0a97ce76e44af9ba0cddfc00b2 (patch)
tree0cadb74f35660d325ebd4152f1be202700658dc2
parent33786d5391f09230b5b50d286d27063912f3a489 (diff)
downloadalpine-iso-ef23ae7ab99cee0a97ce76e44af9ba0cddfc00b2.tar.bz2
alpine-iso-ef23ae7ab99cee0a97ce76e44af9ba0cddfc00b2.tar.xz
fix rpi config.txt and add include for additional user config
-rwxr-xr-xMakefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9a1c715..0c3b5ca 100755
--- a/Makefile
+++ b/Makefile
@@ -461,7 +461,8 @@ $(RPI_TAR_GZ): $(ALL_MODLOOP) $(ALL_INITFS) $(ALL_ISO_KERNEL) $(ISO_REPOS_DIRSTA
echo -en "disable_splash=1\nboot_delay=0\ndevice_tree_address=0x100\nkernel_address=0x8000\n" > $(RPI_TEMP)/config.txt
echo -en "[pi1]\ncmdline=cmdline-rpi.txt\nkernel=boot/vmlinuz-rpi\ninitramfs boot/initramfs-rpi 0x01000000\n" >> $(RPI_TEMP)/config.txt
echo -en "[pi2]\ncmdline=cmdline-rpi2.txt\nkernel=boot/vmlinuz-rpi2\ninitramfs boot/initramfs-rpi2 0x01000000\n" >> $(RPI_TEMP)/config.txt
- echo -en "[all\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)/
cp -a $(DESTDIR)/modloop.*/tmp/usr/lib/linux-*-rpi*/*.dtb $(RPI_TEMP)/
cp -a $(DESTDIR)/modloop.*/tmp/usr/lib/linux-*-rpi*/overlays $(RPI_TEMP)/