diff --git a/buildroot-external/board/hardkernel/odroid-c2/cmdline.txt b/buildroot-external/board/hardkernel/odroid-c2/cmdline.txt
new file mode 100644
index 000000000..b4cd5464a
--- /dev/null
+++ b/buildroot-external/board/hardkernel/odroid-c2/cmdline.txt
@@ -0,0 +1 @@
+console=tty0 console=ttyAML0,115200n8
diff --git a/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh b/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh
index 540f3a48a..c9be21855 100755
--- a/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh
+++ b/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh
@@ -13,8 +13,7 @@ function hassos_pre_image() {
     mkdir -p "${BOOT_DATA}/overlays"
     cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
     cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
-
-    echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"
+    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
 
     # SPL
     create_spl_image
diff --git a/buildroot-external/board/hardkernel/odroid-c4/cmdline.txt b/buildroot-external/board/hardkernel/odroid-c4/cmdline.txt
new file mode 100644
index 000000000..b4cd5464a
--- /dev/null
+++ b/buildroot-external/board/hardkernel/odroid-c4/cmdline.txt
@@ -0,0 +1 @@
+console=tty0 console=ttyAML0,115200n8
diff --git a/buildroot-external/board/hardkernel/odroid-c4/hassos-hook.sh b/buildroot-external/board/hardkernel/odroid-c4/hassos-hook.sh
index 06cc30b09..34a71d51f 100755
--- a/buildroot-external/board/hardkernel/odroid-c4/hassos-hook.sh
+++ b/buildroot-external/board/hardkernel/odroid-c4/hassos-hook.sh
@@ -12,8 +12,7 @@ function hassos_pre_image() {
     mkdir -p "${BOOT_DATA}/overlays"
     cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
     cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
-
-    echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"
+    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
 
     # SPL
     create_spl_image
diff --git a/buildroot-external/board/hardkernel/odroid-n2/cmdline.txt b/buildroot-external/board/hardkernel/odroid-n2/cmdline.txt
new file mode 100644
index 000000000..b4cd5464a
--- /dev/null
+++ b/buildroot-external/board/hardkernel/odroid-n2/cmdline.txt
@@ -0,0 +1 @@
+console=tty0 console=ttyAML0,115200n8
diff --git a/buildroot-external/board/hardkernel/odroid-n2/hassos-hook.sh b/buildroot-external/board/hardkernel/odroid-n2/hassos-hook.sh
index 43bfaed79..2beb6e245 100755
--- a/buildroot-external/board/hardkernel/odroid-n2/hassos-hook.sh
+++ b/buildroot-external/board/hardkernel/odroid-n2/hassos-hook.sh
@@ -12,8 +12,7 @@ function hassos_pre_image() {
     mkdir -p "${BOOT_DATA}/overlays"
     cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
     cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
-
-    echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"
+    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
 
     # SPL
     create_spl_image
diff --git a/buildroot-external/board/hardkernel/odroid-xu4/cmdline.txt b/buildroot-external/board/hardkernel/odroid-xu4/cmdline.txt
new file mode 100644
index 000000000..cd2045ff0
--- /dev/null
+++ b/buildroot-external/board/hardkernel/odroid-xu4/cmdline.txt
@@ -0,0 +1 @@
+console=tty1 console=ttySAC2,115200
diff --git a/buildroot-external/board/hardkernel/odroid-xu4/hassos-hook.sh b/buildroot-external/board/hardkernel/odroid-xu4/hassos-hook.sh
index 38490cff9..437a39fb4 100644
--- a/buildroot-external/board/hardkernel/odroid-xu4/hassos-hook.sh
+++ b/buildroot-external/board/hardkernel/odroid-xu4/hassos-hook.sh
@@ -11,8 +11,7 @@ function hassos_pre_image() {
 
     cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
     cp "${BINARIES_DIR}/exynos5422-odroidxu4.dtb" "${BOOT_DATA}/exynos5422-odroidxu4.dtb"
-
-    echo "console=tty1 console=ttySAC2,115200" > "${BOOT_DATA}/cmdline.txt"
+    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
 
     # SPL
     create_spl_image
diff --git a/buildroot-external/board/khadas/vim3/cmdline.txt b/buildroot-external/board/khadas/vim3/cmdline.txt
new file mode 100644
index 000000000..b4cd5464a
--- /dev/null
+++ b/buildroot-external/board/khadas/vim3/cmdline.txt
@@ -0,0 +1 @@
+console=tty0 console=ttyAML0,115200n8
diff --git a/buildroot-external/board/khadas/vim3/hassos-hook.sh b/buildroot-external/board/khadas/vim3/hassos-hook.sh
index 1081c5445..627609133 100755
--- a/buildroot-external/board/khadas/vim3/hassos-hook.sh
+++ b/buildroot-external/board/khadas/vim3/hassos-hook.sh
@@ -10,8 +10,7 @@ function hassos_pre_image() {
     cp "${BINARIES_DIR}/meson-g12b-s922x-khadas-vim3.dtb" "${BOOT_DATA}/meson-g12b-s922x-khadas-vim3.dtb"
 
     cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
-
-    echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"
+    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
 
     # SPL
     create_spl_image
diff --git a/buildroot-external/board/pc/generic-x86-64/cmdline.txt b/buildroot-external/board/pc/generic-x86-64/cmdline.txt
new file mode 100644
index 000000000..04415e630
--- /dev/null
+++ b/buildroot-external/board/pc/generic-x86-64/cmdline.txt
@@ -0,0 +1 @@
+console=tty1
diff --git a/buildroot-external/board/pc/generic-x86-64/hassos-hook.sh b/buildroot-external/board/pc/generic-x86-64/hassos-hook.sh
index dcd8a9d47..f64466167 100755
--- a/buildroot-external/board/pc/generic-x86-64/hassos-hook.sh
+++ b/buildroot-external/board/pc/generic-x86-64/hassos-hook.sh
@@ -9,8 +9,7 @@ function hassos_pre_image() {
 
     cp "${BINARIES_DIR}/barebox.bin" "${BOOT_DATA}/EFI/BOOT/BOOTx64.EFI"
     cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi.dtb" "${BOOT_DATA}/EFI/barebox/state.dtb"
-
-    echo "console=tty1" > "${BOOT_DATA}/cmdline.txt"
+    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
 }
 
 
diff --git a/buildroot-external/board/pc/ova/cmdline.txt b/buildroot-external/board/pc/ova/cmdline.txt
new file mode 100644
index 000000000..333f840e6
--- /dev/null
+++ b/buildroot-external/board/pc/ova/cmdline.txt
@@ -0,0 +1 @@
+console=ttyS0 console=tty1
diff --git a/buildroot-external/board/pc/ova/hassos-hook.sh b/buildroot-external/board/pc/ova/hassos-hook.sh
index 090d1b827..10f429daf 100755
--- a/buildroot-external/board/pc/ova/hassos-hook.sh
+++ b/buildroot-external/board/pc/ova/hassos-hook.sh
@@ -9,8 +9,7 @@ function hassos_pre_image() {
 
     cp "${BINARIES_DIR}/barebox.bin" "${BOOT_DATA}/EFI/BOOT/BOOTx64.EFI"
     cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi.dtb" "${BOOT_DATA}/EFI/barebox/state.dtb"
-
-    echo "console=ttyS0 console=tty1" > "${BOOT_DATA}/cmdline.txt"
+    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
 }
 
 
diff --git a/buildroot-external/board/raspberrypi/cmdline.txt b/buildroot-external/board/raspberrypi/cmdline.txt
new file mode 100644
index 000000000..6973ef3f6
--- /dev/null
+++ b/buildroot-external/board/raspberrypi/cmdline.txt
@@ -0,0 +1 @@
+dwc_otg.lpm_enable=0 console=tty1
diff --git a/buildroot-external/board/raspberrypi/hassos-hook.sh b/buildroot-external/board/raspberrypi/hassos-hook.sh
index 3cd37630e..cf3171c4d 100755
--- a/buildroot-external/board/raspberrypi/hassos-hook.sh
+++ b/buildroot-external/board/raspberrypi/hassos-hook.sh
@@ -14,7 +14,11 @@ function hassos_pre_image() {
     else
         cp "${BOARD_DIR}/../config.txt" "${BOOT_DATA}/config.txt"
     fi
-    cp "${BOARD_DIR}/../config.txt" "${BOOT_DATA}/config.txt"
+    if [ -f "${BOARD_DIR}/cmdline.txt" ]; then
+        cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
+    else
+        cp "${BOARD_DIR}/../cmdline.txt" "${BOOT_DATA}/cmdline.txt"
+    fi
     cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
 
     # EEPROM update for Raspberry Pi 4/Compute Module 4
@@ -23,9 +27,6 @@ function hassos_pre_image() {
         cp "${BINARIES_DIR}/rpi-eeprom/pieeprom.upd" "${BOOT_DATA}/pieeprom.upd"
     fi
 
-    # Set cmd options
-    echo "dwc_otg.lpm_enable=0 console=tty1" > "${BOOT_DATA}/cmdline.txt"
-
     # Enable 64bit support
     if [[ "${BOARD_ID}" =~ "64" ]]; then
         sed -i "s|#arm_64bit|arm_64bit|g" "${BOOT_DATA}/config.txt"