From d7641cd9c889c7747402a18e632bbce9d9b7cdbc Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Fri, 13 Dec 2019 20:51:54 +0200 Subject: [PATCH 1/6] Mount overlay for /usr --- board/common/overlay/etc/fstab.sys | 2 +- board/common/overlay/usr/share/dataskel/.overlay/.empty | 0 board/common/overlay/usr/share/dataskel/usr/.empty | 0 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 board/common/overlay/usr/share/dataskel/.overlay/.empty create mode 100644 board/common/overlay/usr/share/dataskel/usr/.empty diff --git a/board/common/overlay/etc/fstab.sys b/board/common/overlay/etc/fstab.sys index e5bb8d8767..1ea6b2cd4b 100644 --- a/board/common/overlay/etc/fstab.sys +++ b/board/common/overlay/etc/fstab.sys @@ -4,4 +4,4 @@ devpts /dev/pts devpts gid=5,mode=620 0 0 tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /tmp tmpfs mode=1777 0 0 sysfs /sys sysfs defaults 0 0 - +overlay /usr overlay lowerdir=/usr,upperdir=/data/usr,workdir=/data/.overlay 0 0 diff --git a/board/common/overlay/usr/share/dataskel/.overlay/.empty b/board/common/overlay/usr/share/dataskel/.overlay/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/board/common/overlay/usr/share/dataskel/usr/.empty b/board/common/overlay/usr/share/dataskel/usr/.empty new file mode 100644 index 0000000000..e69de29bb2 From 0659ef300faeb8f174358a94b01525477e6cdd1a Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Fri, 13 Dec 2019 20:55:38 +0200 Subject: [PATCH 2/6] Change bash history to /data/.bash_history --- board/common/cleanups.sh | 1 + board/common/overlay/etc/fstab.disk | 2 +- board/common/overlay/etc/fstab.sys | 1 - board/common/overlay/etc/profile | 2 ++ 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/board/common/cleanups.sh b/board/common/cleanups.sh index 9ba4af279e..9f85a16f7c 100755 --- a/board/common/cleanups.sh +++ b/board/common/cleanups.sh @@ -19,6 +19,7 @@ rm -rf ${TARGET}/etc/ssl/man rm -rf ${TARGET}/etc/ssl/misc rm -rf ${TARGET}/etc/ssl/private rm -rf ${TARGET}/etc/logrotate.d +rm -rf ${TARGET}/etc/fstab rm -f ${TARGET}/etc/rc_maps.cfg rm -f ${TARGET}/etc/udev/hwdb.d/20-pci-vendor-model.hwdb diff --git a/board/common/overlay/etc/fstab.disk b/board/common/overlay/etc/fstab.disk index c69e0d4af5..dce382fda9 100644 --- a/board/common/overlay/etc/fstab.disk +++ b/board/common/overlay/etc/fstab.disk @@ -1,4 +1,4 @@ # /dev/mmcblk0p1 /boot vfat ro,defaults 0 0 /dev/mmcblk0p3 /data ext4 defaults,noatime 0 0 - +overlay /usr overlay lowerdir=/usr,upperdir=/data/usr,workdir=/data/.overlay 0 0 diff --git a/board/common/overlay/etc/fstab.sys b/board/common/overlay/etc/fstab.sys index 1ea6b2cd4b..ef75600d75 100644 --- a/board/common/overlay/etc/fstab.sys +++ b/board/common/overlay/etc/fstab.sys @@ -4,4 +4,3 @@ devpts /dev/pts devpts gid=5,mode=620 0 0 tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /tmp tmpfs mode=1777 0 0 sysfs /sys sysfs defaults 0 0 -overlay /usr overlay lowerdir=/usr,upperdir=/data/usr,workdir=/data/.overlay 0 0 diff --git a/board/common/overlay/etc/profile b/board/common/overlay/etc/profile index 0224094d57..99e7b1a3fe 100644 --- a/board/common/overlay/etc/profile +++ b/board/common/overlay/etc/profile @@ -27,6 +27,8 @@ if [ "$PS1" ]; then export TERM=linux fi; +export HISTFILE=/data/.bash_history + # custom local profile test -f /data/etc/profile && source /data/etc/profile From c97c991cb2a4e52bdc47ea5c4b5e57b7154042df Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Fri, 13 Dec 2019 21:55:38 +0200 Subject: [PATCH 3/6] Odroid C2: update kernel to 3.16:6b8c51b738ad6c03baed36bb44e56172959ca265 --- configs/odroidc2_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig index dae8341881..f3107c5b9c 100644 --- a/configs/odroidc2_defconfig +++ b/configs/odroidc2_defconfig @@ -10,7 +10,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/odroidc2/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/d76f4018945d768cfaed56d40a0e66b89bdb437a.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/6b8c51b738ad6c03baed36bb44e56172959ca265.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="odroidc2" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="meson64_odroidc2" From 4aa87f28e032bd60f4a816e59e47f1718d57fa75 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Fri, 13 Dec 2019 22:19:33 +0200 Subject: [PATCH 4/6] Mount fs from /etc/fstab.overlay only if overlayfs supported --- board/common/overlay/etc/fstab.disk | 1 - board/common/overlay/etc/fstab.overlay | 2 ++ board/common/overlay/etc/init.d/S01mountall | 1 + .../usr/share/dataskel/{.overlay => .overlay-usr}/.empty | 0 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 board/common/overlay/etc/fstab.overlay rename board/common/overlay/usr/share/dataskel/{.overlay => .overlay-usr}/.empty (100%) diff --git a/board/common/overlay/etc/fstab.disk b/board/common/overlay/etc/fstab.disk index dce382fda9..aac1314772 100644 --- a/board/common/overlay/etc/fstab.disk +++ b/board/common/overlay/etc/fstab.disk @@ -1,4 +1,3 @@ # /dev/mmcblk0p1 /boot vfat ro,defaults 0 0 /dev/mmcblk0p3 /data ext4 defaults,noatime 0 0 -overlay /usr overlay lowerdir=/usr,upperdir=/data/usr,workdir=/data/.overlay 0 0 diff --git a/board/common/overlay/etc/fstab.overlay b/board/common/overlay/etc/fstab.overlay new file mode 100644 index 0000000000..f19791e871 --- /dev/null +++ b/board/common/overlay/etc/fstab.overlay @@ -0,0 +1,2 @@ +# +overlay /usr overlay lowerdir=/usr,upperdir=/data/usr,workdir=/data/.overlay-usr 0 0 diff --git a/board/common/overlay/etc/init.d/S01mountall b/board/common/overlay/etc/init.d/S01mountall index cafa43c0b3..1fa1ac2eca 100755 --- a/board/common/overlay/etc/init.d/S01mountall +++ b/board/common/overlay/etc/init.d/S01mountall @@ -6,6 +6,7 @@ mount_fs() { msg_begin "Mounting filesystems" /bin/mount -T /etc/fstab.disk -a && /bin/mount -T /etc/fstab.extra -a && + if grep -qw overlay /proc/filesystems; then /bin/mount -T /data/etc/fstab.overlay -a; fi && if [[ -r /data/etc/fstab.user ]]; then /bin/mount -T /data/etc/fstab.user -a; fi test $? == 0 && msg_done || msg_fail diff --git a/board/common/overlay/usr/share/dataskel/.overlay/.empty b/board/common/overlay/usr/share/dataskel/.overlay-usr/.empty similarity index 100% rename from board/common/overlay/usr/share/dataskel/.overlay/.empty rename to board/common/overlay/usr/share/dataskel/.overlay-usr/.empty From 832d4574bea48bccac269fac44dc9e4cb4e51636 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 14 Dec 2019 12:07:40 +0200 Subject: [PATCH 5/6] Mount overlayfs after loading fs module --- board/common/overlay/etc/init.d/S01mountall | 12 +++++++++++- .../overlay/usr/share/dataskel/.overlay-usr/.empty | 0 2 files changed, 11 insertions(+), 1 deletion(-) delete mode 100644 board/common/overlay/usr/share/dataskel/.overlay-usr/.empty diff --git a/board/common/overlay/etc/init.d/S01mountall b/board/common/overlay/etc/init.d/S01mountall index 1fa1ac2eca..84f75caa4e 100755 --- a/board/common/overlay/etc/init.d/S01mountall +++ b/board/common/overlay/etc/init.d/S01mountall @@ -6,12 +6,21 @@ mount_fs() { msg_begin "Mounting filesystems" /bin/mount -T /etc/fstab.disk -a && /bin/mount -T /etc/fstab.extra -a && - if grep -qw overlay /proc/filesystems; then /bin/mount -T /data/etc/fstab.overlay -a; fi && if [[ -r /data/etc/fstab.user ]]; then /bin/mount -T /data/etc/fstab.user -a; fi test $? == 0 && msg_done || msg_fail } +mount_overlay() { + modprobe overlay &>/dev/null + grep -qw overlay /proc/filesystems || return + + msg_begin "Mounting overlay filesystems" + grep -oE '/data/.overlay-[^ ]+' /etc/fstab.overlay | xargs mkdir -p + /bin/mount -T /etc/fstab.overlay -a + test $? == 0 && msg_done || msg_fail +} + remount_rw() { msg_begin "Remounting boot partition read-write" mount -o remount,rw /boot @@ -30,6 +39,7 @@ mk_tty_login() { case "$1" in start) mount_fs + mount_overlay # we need to source conf again, now that /data is available source /etc/init.d/os_conf diff --git a/board/common/overlay/usr/share/dataskel/.overlay-usr/.empty b/board/common/overlay/usr/share/dataskel/.overlay-usr/.empty deleted file mode 100644 index e69de29bb2..0000000000 From 7aa90e9e2a9f528ba7bdadf584645c4267250944 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 15 Dec 2019 13:10:12 +0200 Subject: [PATCH 6/6] Remove ipv6.disable from kernel boot arguments --- board/bananapim1/boot-fwupdater.cmd | 2 +- board/bananapim1/boot.cmd | 2 +- board/nanopineo/boot-fwupdater.cmd | 2 +- board/nanopineo/boot.cmd | 2 +- board/nanopineo2/boot-fwupdater.cmd | 2 +- board/nanopineo2/boot.cmd | 2 +- board/odroidc1/boot.ini | 2 +- board/odroidc2/boot.ini | 2 +- board/odroidxu4/boot.ini | 2 +- board/orangepione/boot-fwupdater.cmd | 2 +- board/orangepione/boot.cmd | 2 +- board/orangepizero/boot-fwupdater.cmd | 2 +- board/orangepizero/boot.cmd | 2 +- board/pine64/uEnv.txt | 2 +- board/raspberrypi/cmdline.txt | 2 +- board/raspberrypi2/cmdline.txt | 2 +- board/raspberrypi3/cmdline.txt | 2 +- board/raspberrypi4/cmdline.txt | 2 +- board/tinkerboard/extlinux/extlinux.conf | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/board/bananapim1/boot-fwupdater.cmd b/board/bananapim1/boot-fwupdater.cmd index ce854c9be1..122ff944e0 100644 --- a/board/bananapim1/boot-fwupdater.cmd +++ b/board/bananapim1/boot-fwupdater.cmd @@ -1,4 +1,4 @@ -setenv bootargs console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1 ipv6.disable=1 ${extra} +setenv bootargs console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1 ${extra} setenv fdt_high ffffffff setenv video-mode sunxi:1024x768-24@60,monitor=hdmi,hpd=1,edid=1 fatload mmc 0 0x41000000 uImage diff --git a/board/bananapim1/boot.cmd b/board/bananapim1/boot.cmd index 9e9ec4851b..c9d5d43bbd 100644 --- a/board/bananapim1/boot.cmd +++ b/board/bananapim1/boot.cmd @@ -1,4 +1,4 @@ -setenv bootargs console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1 ipv6.disable=1 ${extra} +setenv bootargs console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1 ${extra} setenv fdt_high ffffffff setenv video-mode sunxi:1024x768-24@60,monitor=hdmi,hpd=1,edid=1 fatload mmc 0 0x41000000 uImage diff --git a/board/nanopineo/boot-fwupdater.cmd b/board/nanopineo/boot-fwupdater.cmd index 7f1524e9b5..16ba6f4ff0 100644 --- a/board/nanopineo/boot-fwupdater.cmd +++ b/board/nanopineo/boot-fwupdater.cmd @@ -1,4 +1,4 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 fatload mmc 0 0x46000000 zImage fatload mmc 0 0x47000000 rootfs.cpio.uboot diff --git a/board/nanopineo/boot.cmd b/board/nanopineo/boot.cmd index 197bc56790..f5940c7f3a 100644 --- a/board/nanopineo/boot.cmd +++ b/board/nanopineo/boot.cmd @@ -1,4 +1,4 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 fatload mmc 0 0x46000000 zImage fatload mmc 0 0x48000000 sun8i-h3-nanopi-neo.dtb diff --git a/board/nanopineo2/boot-fwupdater.cmd b/board/nanopineo2/boot-fwupdater.cmd index 1bb0d7388a..233cf6e7dd 100644 --- a/board/nanopineo2/boot-fwupdater.cmd +++ b/board/nanopineo2/boot-fwupdater.cmd @@ -1,4 +1,4 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 fatload mmc 0 0x46000000 Image fatload mmc 0 0x47000000 rootfs.cpio.uboot diff --git a/board/nanopineo2/boot.cmd b/board/nanopineo2/boot.cmd index c81f03256b..d821befda8 100644 --- a/board/nanopineo2/boot.cmd +++ b/board/nanopineo2/boot.cmd @@ -1,4 +1,4 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 fatload mmc 0 0x46000000 Image fatload mmc 0 0x48000000 sun50i-h5-nanopi-neo2.dtb diff --git a/board/odroidc1/boot.ini b/board/odroidc1/boot.ini index b230a88975..6b4e1063e8 100644 --- a/board/odroidc1/boot.ini +++ b/board/odroidc1/boot.ini @@ -47,7 +47,7 @@ setenv vpu "0" setenv hdmioutput "0" # Boot Arguments -setenv bootargs "console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout_mode} ${disableuhs}" +setenv bootargs "console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout_mode} ${disableuhs}" # Booting fatload mmc 0:1 0x21000000 uImage diff --git a/board/odroidc2/boot.ini b/board/odroidc2/boot.ini index db05b6623f..421bcb5fbe 100644 --- a/board/odroidc2/boot.ini +++ b/board/odroidc2/boot.ini @@ -120,7 +120,7 @@ setenv max_freq "1536" # 1.536GHz ########################################### # Boot Arguments -setenv bootargs "console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 net.ifnames=0 elevator=noop hdmimode=${m} m_bpp=${m_bpp} vout=${vout} disablehpd=${hpd} max_freq=${max_freq} maxcpus=${maxcpus} monitor_onoff=${monitor_onoff} disableuhs=${disableuhs} mmc_removable=${mmc_removable} usbmulticam=${usbmulticam}" +setenv bootargs "console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 net.ifnames=0 elevator=noop hdmimode=${m} m_bpp=${m_bpp} vout=${vout} disablehpd=${hpd} max_freq=${max_freq} maxcpus=${maxcpus} monitor_onoff=${monitor_onoff} disableuhs=${disableuhs} mmc_removable=${mmc_removable} usbmulticam=${usbmulticam}" # Booting diff --git a/board/odroidxu4/boot.ini b/board/odroidxu4/boot.ini index 12328a6185..33855cf8ad 100644 --- a/board/odroidxu4/boot.ini +++ b/board/odroidxu4/boot.ini @@ -2,6 +2,6 @@ ODROIDXU-UBOOT-CONFIG setenv fdt_high "0xffffffff" setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; fatload mmc 0:1 0x44000000 exynos5422-odroidxu4.dtb; bootz 0x40008000 - 0x44000000" -setenv bootargs "console=tty1 root=/dev/mmcblk1p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1" +setenv bootargs "console=tty1 root=/dev/mmcblk1p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1" boot diff --git a/board/orangepione/boot-fwupdater.cmd b/board/orangepione/boot-fwupdater.cmd index d9d05135d3..b3b4297938 100644 --- a/board/orangepione/boot-fwupdater.cmd +++ b/board/orangepione/boot-fwupdater.cmd @@ -1,4 +1,4 @@ -setenv bootargs earlyprintk console=tty1 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 +setenv bootargs earlyprintk console=tty1 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $ramdisk_addr_r uInitrd diff --git a/board/orangepione/boot.cmd b/board/orangepione/boot.cmd index 6d8aa9fa12..bf480b2ecd 100644 --- a/board/orangepione/boot.cmd +++ b/board/orangepione/boot.cmd @@ -1,4 +1,4 @@ -setenv bootargs earlyprintk console=tty1 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 +setenv bootargs earlyprintk console=tty1 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-one.dtb diff --git a/board/orangepizero/boot-fwupdater.cmd b/board/orangepizero/boot-fwupdater.cmd index a30cfaa885..497bd524b5 100644 --- a/board/orangepizero/boot-fwupdater.cmd +++ b/board/orangepizero/boot-fwupdater.cmd @@ -1,4 +1,4 @@ -setenv bootargs earlyprintk console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 +setenv bootargs earlyprintk console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $ramdisk_addr_r uInitrd diff --git a/board/orangepizero/boot.cmd b/board/orangepizero/boot.cmd index df62ad4a6e..65c51b0481 100644 --- a/board/orangepizero/boot.cmd +++ b/board/orangepizero/boot.cmd @@ -1,4 +1,4 @@ -setenv bootargs earlyprintk console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 +setenv bootargs earlyprintk console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb diff --git a/board/pine64/uEnv.txt b/board/pine64/uEnv.txt index d98c9a0722..8eea22ec0c 100644 --- a/board/pine64/uEnv.txt +++ b/board/pine64/uEnv.txt @@ -1,7 +1,7 @@ console=tty1 selinux=permissive enforcing=0 -optargs=no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 +optargs=no_console_suspend panic=10 quiet loglevel=1 kernel_filename=kernel.img #initrd_filename=ramdisk.img #recovery_initrd_filename=ramdisk-recovery.img diff --git a/board/raspberrypi/cmdline.txt b/board/raspberrypi/cmdline.txt index 16d676103d..79f7e0ae94 100644 --- a/board/raspberrypi/cmdline.txt +++ b/board/raspberrypi/cmdline.txt @@ -1 +1 @@ -dwc_otg.fiq_fix_enable=1 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro rootflags=noload panic=10 quiet loglevel=1 ipv6.disable=1 +dwc_otg.fiq_fix_enable=1 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro rootflags=noload panic=10 quiet loglevel=1 diff --git a/board/raspberrypi2/cmdline.txt b/board/raspberrypi2/cmdline.txt index 16d676103d..79f7e0ae94 100644 --- a/board/raspberrypi2/cmdline.txt +++ b/board/raspberrypi2/cmdline.txt @@ -1 +1 @@ -dwc_otg.fiq_fix_enable=1 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro rootflags=noload panic=10 quiet loglevel=1 ipv6.disable=1 +dwc_otg.fiq_fix_enable=1 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro rootflags=noload panic=10 quiet loglevel=1 diff --git a/board/raspberrypi3/cmdline.txt b/board/raspberrypi3/cmdline.txt index 16d676103d..79f7e0ae94 100644 --- a/board/raspberrypi3/cmdline.txt +++ b/board/raspberrypi3/cmdline.txt @@ -1 +1 @@ -dwc_otg.fiq_fix_enable=1 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro rootflags=noload panic=10 quiet loglevel=1 ipv6.disable=1 +dwc_otg.fiq_fix_enable=1 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro rootflags=noload panic=10 quiet loglevel=1 diff --git a/board/raspberrypi4/cmdline.txt b/board/raspberrypi4/cmdline.txt index 16d676103d..79f7e0ae94 100644 --- a/board/raspberrypi4/cmdline.txt +++ b/board/raspberrypi4/cmdline.txt @@ -1 +1 @@ -dwc_otg.fiq_fix_enable=1 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro rootflags=noload panic=10 quiet loglevel=1 ipv6.disable=1 +dwc_otg.fiq_fix_enable=1 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro rootflags=noload panic=10 quiet loglevel=1 diff --git a/board/tinkerboard/extlinux/extlinux.conf b/board/tinkerboard/extlinux/extlinux.conf index 8749359650..2e185ae176 100755 --- a/board/tinkerboard/extlinux/extlinux.conf +++ b/board/tinkerboard/extlinux/extlinux.conf @@ -1,4 +1,4 @@ label kernel-4.4 kernel /zImage fdt /rk3288-miniarm.dtb - append console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1 ipv6.disable=1 + append console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1