diff --git a/classes/extlinuxconf-stm32mp.bbclass b/classes/extlinuxconf-stm32mp.bbclass
index a33ba12..22f1e00 100644
--- a/classes/extlinuxconf-stm32mp.bbclass
+++ b/classes/extlinuxconf-stm32mp.bbclass
@@ -74,7 +74,7 @@ UBOOT_EXTLINUX_TARGETS ?= ""
 # Configure FIT kernel image for extlinux file creation
 UBOOT_EXTLINUX_FIT ??= "0"
 
-UBOOT_EXTLINUX_CONSOLE ??= "console=${console}"
+UBOOT_EXTLINUX_CONSOLE ??= "console=${console},${baudrate}"
 UBOOT_EXTLINUX_LABELS ??= "linux"
 UBOOT_EXTLINUX_FDT ??= ""
 UBOOT_EXTLINUX_FDTDIR ??= "../"
diff --git a/conf/machine/include/st-machine-common-stm32mp.inc b/conf/machine/include/st-machine-common-stm32mp.inc
index 5a535a7..a1e9bc0 100644
--- a/conf/machine/include/st-machine-common-stm32mp.inc
+++ b/conf/machine/include/st-machine-common-stm32mp.inc
@@ -60,7 +60,6 @@ MACHINE_FEATURES:append = " fw-update"
 
 # Default serial consoles (TTYs) to enable using getty
 # Before kernel 4.18, serial console are ttyS3 but after is ttySTM0
-SERIAL_CONSOLES = "115200;ttySTM0"
 SERIAL_CONSOLE = "115200 ttySTM0"
 
 # Don't include kernels in standard images
diff --git a/conf/machine/include/st-machine-extlinux-config-stm32mp.inc b/conf/machine/include/st-machine-extlinux-config-stm32mp.inc
index 74a69dd..72daa60 100644
--- a/conf/machine/include/st-machine-extlinux-config-stm32mp.inc
+++ b/conf/machine/include/st-machine-extlinux-config-stm32mp.inc
@@ -1,7 +1,5 @@
 #@DESCRIPTION: STM32MP machine extlinux file configuration
 
-# Define extlinux console for stm32mp machine
-UBOOT_EXTLINUX_CONSOLE = "console=${@d.getVar('SERIAL_CONSOLE').split()[1]},${@d.getVar('SERIAL_CONSOLE').split()[0]}"
 # Define FIT option for extlinux file generation
 UBOOT_EXTLINUX_FIT = "${@bb.utils.contains('MACHINE_FEATURES', 'fit', '1', '0', d)}"
 # Define default FDTDIR for all configs