diff --git a/meta-digi-arm/conf/machine/ccardimx28js.conf b/meta-digi-arm/conf/machine/ccardimx28js.conf
index 126c32c6d..f1766f202 100644
--- a/meta-digi-arm/conf/machine/ccardimx28js.conf
+++ b/meta-digi-arm/conf/machine/ccardimx28js.conf
@@ -8,10 +8,8 @@ IMXBOOTLETS_MACHINE = "CCARDIMX28JS"
 
 KERNEL_DEVICETREE = "imx28-${MACHINE}.dtb"
 
-# Configure the serial console for kernel 2.x and 3.x and let the
-# post-installation script drop the not-supported one on first boot
-SERIAL_CONSOLES ?= "115200;ttyAM0 115200;ttyAMA0"
-SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
+# Serial console
+SERIAL_CONSOLES ?= "115200;${@base_conditional('IS_KERNEL_2X', '1' , 'ttyAM0', 'ttyAMA0', d)}"
 
 # Bluetooth tty
 BT_TTY ?= "${@base_conditional('IS_KERNEL_2X', '1' , 'ttySP0', 'ttyAPP0', d)}"