diff --git a/mkimage.sh b/mkimage.sh
index f1619fd07b172094a46910ddf1baa1ca74e6eea5..29b054bf4ea66fc86c9f9f7dce24b20b753fa03b 100755
--- a/mkimage.sh
+++ b/mkimage.sh
@@ -101,22 +101,13 @@ set -- "$@" --include="brightnessctl brightness-udev ca-certificates debian-arch
 #	--skip=cleanup/reproducible
 # apt preferences
 set -- "$@" --setup-hook='{ echo "Package: *"; echo "Pin: release n=reform, l=reform"; echo "Pin-Priority: 990"; } > "$1"/etc/apt/preferences.d/reform.pref'
-# We write out /etc/default/flash-kernel with kernel cmdline arguments for
-# imx8mq because u-boot for that SoM is not guaranteed to have ${bootargs}
-# available in boot.scr. Other platforms set ${bootargs} to overwrite imx8mq
-# specific values defined here.
-# It would be possible to not encode imx8mq specific bootargs here by adding
-# a custom boot.scr derived from bootscr.uboot-generic which adds imx8mq
-# specific bootargs if it detects that platform and finds ${bootargs} to be
-# empty.
-# Another way to avoid this list here would be to add code to
+# The board specific kernel commandline arguments now live in
 # /usr/share/flash-kernel/ubootenv.d/00reform2_ubootenv which does the
 # platform detection and then adds the options to ${bootargs}.
-set -- "$@" --essential-hook='{ echo LINUX_KERNEL_CMDLINE=\"console=ttymxc0,115200 console=ttyAML0,115200 console=ttyS0,115200 console=tty1\"; echo LINUX_KERNEL_CMDLINE_DEFAULTS=\"ro no_console_suspend cma=512M@3G pci=nomsi,pcie_bus_perf libata.force=noncq nvme_core.default_ps_max_latency_us=0 cryptomgr.notests iommu.passthrough=1 arm-smmu.disable_bypass=0\"; } > "$1"/etc/default/flash-kernel'
-# even when above has been taken care of, we still want to overwrite
-# /etc/default/flash-kernel because by default it will contain
+set -- "$@" --essential-hook='{ echo LINUX_KERNEL_CMDLINE=\"\"; echo LINUX_KERNEL_CMDLINE_DEFAULTS=\"\"; } > "$1"/etc/default/flash-kernel'
+# We still want to overwrite /etc/default/flash-kernel because by default it will contain
 # LINUX_KERNEL_CMDLINE="quiet" and we don't want that
-#set -- "$@" --essential-hook='{ echo LINUX_KERNEL_CMDLINE=\"\"; echo LINUX_KERNEL_CMDLINE_DEFAULTS=\"\"; } > "$1"/etc/default/flash-kernel'
+#
 # select timezone and locales
 # FIXME: this should be done by a firstboot script
 set -- "$@" \