summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/machine/imx25pdk.conf2
-rw-r--r--conf/machine/imx28evk.conf2
-rw-r--r--conf/machine/imx6qdlsabreauto.conf2
-rw-r--r--conf/machine/imx6qdlsabresd.conf2
-rw-r--r--conf/machine/imx6slevk.conf2
-rw-r--r--conf/machine/imx6sllevk.conf2
-rw-r--r--conf/machine/imx6sxsabreauto.conf2
-rw-r--r--conf/machine/imx6sxsabresd.conf2
-rw-r--r--conf/machine/imx6ullevk.conf2
-rw-r--r--conf/machine/imx7ulpevk.conf2
-rw-r--r--conf/machine/imx8mmevk.conf2
-rw-r--r--conf/machine/imx8mqevk.conf2
-rw-r--r--conf/machine/imx8qmmek.conf2
-rw-r--r--conf/machine/imx8qxpmek.conf2
-rw-r--r--conf/machine/include/imx-base.inc4
15 files changed, 16 insertions, 16 deletions
diff --git a/conf/machine/imx25pdk.conf b/conf/machine/imx25pdk.conf
index e22d9f4e..9e8ad003 100644
--- a/conf/machine/imx25pdk.conf
+++ b/conf/machine/imx25pdk.conf
@@ -13,7 +13,7 @@ UBOOT_MACHINE ?= "mx25pdk_defconfig"
13 13
14KERNEL_DEVICETREE = "imx25-pdk.dtb" 14KERNEL_DEVICETREE = "imx25-pdk.dtb"
15 15
16SERIAL_CONSOLE = "115200 ttymxc0" 16SERIAL_CONSOLES = "115200;ttymxc0"
17 17
18MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" 18MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
19 19
diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index 937fd143..7c359e54 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -18,7 +18,7 @@ UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config,sdcard"
18 18
19KERNEL_DEVICETREE = "imx28-evk.dtb" 19KERNEL_DEVICETREE = "imx28-evk.dtb"
20 20
21SERIAL_CONSOLE = "115200 ttyAMA0" 21SERIAL_CONSOLES = "115200;ttyAMA0"
22 22
23MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" 23MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
24 24
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index fabd4cd0..64a13a8a 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -38,7 +38,7 @@ UBOOT_SUFFIX = "img"
38SPL_BINARY = "SPL" 38SPL_BINARY = "SPL"
39WKS_FILE = "imx-uboot-spl-bootpart.wks" 39WKS_FILE = "imx-uboot-spl-bootpart.wks"
40 40
41SERIAL_CONSOLE = "115200 ttymxc3" 41SERIAL_CONSOLES = "115200;ttymxc3"
42 42
43MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" 43MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
44 44
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 7cde5059..ff1a3c76 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -38,7 +38,7 @@ UBOOT_SUFFIX = "img"
38SPL_BINARY = "SPL" 38SPL_BINARY = "SPL"
39WKS_FILE = "imx-uboot-spl-bootpart.wks" 39WKS_FILE = "imx-uboot-spl-bootpart.wks"
40 40
41SERIAL_CONSOLE = "115200 ttymxc0" 41SERIAL_CONSOLES = "115200;ttymxc0"
42 42
43MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" 43MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
44 44
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index ffcbaaa7..5d81272f 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -19,7 +19,7 @@ UBOOT_CONFIG[epdc] = "mx6slevk_epdc_config"
19UBOOT_CONFIG[spinor] = "mx6slevk_spinor_config" 19UBOOT_CONFIG[spinor] = "mx6slevk_spinor_config"
20UBOOT_CONFIG[mfgtool] = "mx6slevk_config" 20UBOOT_CONFIG[mfgtool] = "mx6slevk_config"
21 21
22SERIAL_CONSOLE = "115200 ttymxc0" 22SERIAL_CONSOLES = "115200;ttymxc0"
23 23
24MACHINE_FEATURES += " pci wifi bluetooth" 24MACHINE_FEATURES += " pci wifi bluetooth"
25 25
diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf
index 84d1e319..ef155202 100644
--- a/conf/machine/imx6sllevk.conf
+++ b/conf/machine/imx6sllevk.conf
@@ -18,7 +18,7 @@ UBOOT_CONFIG[sd] = "mx6sllevk_config,sdcard"
18UBOOT_CONFIG[epdc] = "mx6sllevk_epdc_config" 18UBOOT_CONFIG[epdc] = "mx6sllevk_epdc_config"
19UBOOT_CONFIG[mfgtool] = "mx6sllevk_config" 19UBOOT_CONFIG[mfgtool] = "mx6sllevk_config"
20 20
21SERIAL_CONSOLE = "115200 ttymxc0" 21SERIAL_CONSOLES = "115200;ttymxc0"
22 22
23MACHINE_FEATURES += " pci wifi bluetooth" 23MACHINE_FEATURES += " pci wifi bluetooth"
24 24
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index ca5c9746..b26605d4 100644
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -21,7 +21,7 @@ UBOOT_CONFIG[qspi1] = "mx6sxsabreauto_qspi1_config"
21UBOOT_CONFIG[nand] = "mx6sxsabreauto_nand_config,ubifs" 21UBOOT_CONFIG[nand] = "mx6sxsabreauto_nand_config,ubifs"
22UBOOT_CONFIG[mfgtool] = "mx6sxsabreauto_config" 22UBOOT_CONFIG[mfgtool] = "mx6sxsabreauto_config"
23 23
24SERIAL_CONSOLE = "115200 ttymxc3" 24SERIAL_CONSOLES = "115200;ttymxc3"
25 25
26MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" 26MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
27 27
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index 3a969e4a..5793a0b0 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -22,7 +22,7 @@ UBOOT_CONFIG[qspi2] = "mx6sxsabresd_qspi2_config"
22UBOOT_CONFIG[m4fastup] = "mx6sxsabresd_m4fastup_config" 22UBOOT_CONFIG[m4fastup] = "mx6sxsabresd_m4fastup_config"
23UBOOT_CONFIG[mfgtool] = "mx6sxsabresd_config" 23UBOOT_CONFIG[mfgtool] = "mx6sxsabresd_config"
24 24
25SERIAL_CONSOLE = "115200 ttymxc0" 25SERIAL_CONSOLES = "115200;ttymxc0"
26 26
27MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" 27MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
28 28
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index 7cf9c328..b05216ac 100644
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -19,6 +19,6 @@ PREFERRED_PROVIDER_u-boot = "u-boot-imx"
19PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" 19PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
20PREFERRED_PROVIDER_virtual/kernel = "linux-imx" 20PREFERRED_PROVIDER_virtual/kernel = "linux-imx"
21 21
22SERIAL_CONSOLE = "115200 ttymxc0" 22SERIAL_CONSOLES = "115200;ttymxc0"
23 23
24MACHINE_FEATURES += "wifi bluetooth" 24MACHINE_FEATURES += "wifi bluetooth"
diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf
index d077de74..8a295206 100644
--- a/conf/machine/imx7ulpevk.conf
+++ b/conf/machine/imx7ulpevk.conf
@@ -24,4 +24,4 @@ UBOOT_CONFIG[mfgtool] = "mx7ulp_evk_config"
24MACHINE_FIRMWARE_append = " firmware-imx-brcm" 24MACHINE_FIRMWARE_append = " firmware-imx-brcm"
25 25
26# Set Serial console 26# Set Serial console
27SERIAL_CONSOLE = "115200 ttyLP0" 27SERIAL_CONSOLES = "115200;ttyLP0"
diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf
index 44b3249f..a0523a70 100644
--- a/conf/machine/imx8mmevk.conf
+++ b/conf/machine/imx8mmevk.conf
@@ -41,7 +41,7 @@ UBOOT_DTB_NAME = "fsl-imx8mm-evk.dtb"
41IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}" 41IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}"
42 42
43# Set Serial console 43# Set Serial console
44SERIAL_CONSOLE = "115200 ttymxc1" 44SERIAL_CONSOLES = "115200;ttymxc1"
45 45
46IMAGE_BOOTLOADER = "imx-boot" 46IMAGE_BOOTLOADER = "imx-boot"
47 47
diff --git a/conf/machine/imx8mqevk.conf b/conf/machine/imx8mqevk.conf
index 96f12203..23037967 100644
--- a/conf/machine/imx8mqevk.conf
+++ b/conf/machine/imx8mqevk.conf
@@ -38,7 +38,7 @@ UBOOT_DTB_NAME = "fsl-imx8mq-evk.dtb"
38IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi" 38IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi"
39 39
40# Set Serial console 40# Set Serial console
41SERIAL_CONSOLE = "115200 ttymxc0" 41SERIAL_CONSOLES = "115200;ttymxc0"
42 42
43IMAGE_BOOTLOADER = "imx-boot" 43IMAGE_BOOTLOADER = "imx-boot"
44 44
diff --git a/conf/machine/imx8qmmek.conf b/conf/machine/imx8qmmek.conf
index e1f26b44..c20908a2 100644
--- a/conf/machine/imx8qmmek.conf
+++ b/conf/machine/imx8qmmek.conf
@@ -16,7 +16,7 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
16LOADADDR = "" 16LOADADDR = ""
17 17
18# We have to disable SERIAL_CONSOLE due to auto-serial-console 18# We have to disable SERIAL_CONSOLE due to auto-serial-console
19SERIAL_CONSOLE = "115200 ttyAMA0" 19SERIAL_CONSOLES = "115200;ttyAMA0"
20 20
21# we do not want to have getty running on tty1 as we run 21# we do not want to have getty running on tty1 as we run
22# auto-serial-console there 22# auto-serial-console there
diff --git a/conf/machine/imx8qxpmek.conf b/conf/machine/imx8qxpmek.conf
index 2ffbcacc..e11e147a 100644
--- a/conf/machine/imx8qxpmek.conf
+++ b/conf/machine/imx8qxpmek.conf
@@ -15,7 +15,7 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
15LOADADDR = "" 15LOADADDR = ""
16 16
17# We have to disable SERIAL_CONSOLE due to auto-serial-console 17# We have to disable SERIAL_CONSOLE due to auto-serial-console
18SERIAL_CONSOLE = "115200 ttyAMA0" 18SERIAL_CONSOLES = "115200;ttyAMA0"
19 19
20# we do not want to have getty running on tty1 as we run 20# we do not want to have getty running on tty1 as we run
21# auto-serial-console there 21# auto-serial-console there
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 92959ee2..7a19335b 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -310,8 +310,8 @@ SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in"
310 310
311WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" 311WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
312 312
313SERIAL_CONSOLE = "115200 ttymxc0" 313SERIAL_CONSOLES = "115200;ttymxc0"
314SERIAL_CONSOLE_mxs = "115200 ttyAMA0" 314SERIAL_CONSOLES_mxs = "115200;ttyAMA0"
315 315
316KERNEL_IMAGETYPE = "zImage" 316KERNEL_IMAGETYPE = "zImage"
317KERNEL_IMAGETYPE_aarch64 = "Image" 317KERNEL_IMAGETYPE_aarch64 = "Image"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 11:15:53 +0000