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