diff --git a/04_build_linux.sh b/04_build_linux.sh
index 7231fa4..ceb40c3 100755
--- a/04_build_linux.sh
+++ b/04_build_linux.sh
@@ -22,6 +22,8 @@ cp -v ../patches/linux/Makefile arch/riscv/boot/dts/microchip/
 make ARCH=riscv CROSS_COMPILE=${CC} clean
 make ARCH=riscv CROSS_COMPILE=${CC} mpfs_defconfig
 
+./scripts/config --set-str CONFIG_CMDLINE ""
+./scripts/config --disable CONFIG_CMDLINE_FALLBACK
 ./scripts/config --enable CONFIG_EEPROM_AT24
 ./scripts/config --enable CONFIG_OF_OVERLAY
 ./scripts/config --enable CONFIG_GPIO_MICROCHIP_CORE
diff --git a/06_generate_debian_console_root.sh b/06_generate_debian_console_root.sh
index 68c5760..8a9e18a 100755
--- a/06_generate_debian_console_root.sh
+++ b/06_generate_debian_console_root.sh
@@ -38,7 +38,7 @@ sync
 mkdir -p ./deploy/input/ || true
 echo "label Linux eMMC" > ./deploy/input/extlinux.conf
 echo "    kernel /Image" >> ./deploy/input/extlinux.conf
-echo "    append root=/dev/mmcblk1p3 ro rootfstype=ext4 rootwait console=ttyS0,115200 net.ifnames=0" >> ./deploy/input/extlinux.conf
+echo "    append root=/dev/mmcblk1p3 ro rootfstype=ext4 rootwait console=ttyS0,115200 earlycon uio_pdrv_genirq.of_id=generic-uio net.ifnames=0" >> ./deploy/input/extlinux.conf
 echo "    fdtdir /" >> ./deploy/input/extlinux.conf
 echo "    fdt /mpfs-beaglev-fire.dtb" >> ./deploy/input/extlinux.conf
 echo "    #fdtoverlays /overlays/<file>.dtbo" >> ./deploy/input/extlinux.conf
diff --git a/patches/linux/mpfs_defconfig b/patches/linux/mpfs_defconfig
index c9e9a52..a0fda5a 100644
--- a/patches/linux/mpfs_defconfig
+++ b/patches/linux/mpfs_defconfig
@@ -305,10 +305,7 @@ CONFIG_COMPAT=y
 #
 # Boot options
 #
-CONFIG_CMDLINE="earlycon uio_pdrv_genirq.of_id=generic-uio"
-CONFIG_CMDLINE_FALLBACK=y
-# CONFIG_CMDLINE_EXTEND is not set
-# CONFIG_CMDLINE_FORCE is not set
+CONFIG_CMDLINE=""
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
 CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y