diff options
Diffstat (limited to 'conf/machine')
-rw-r--r-- | conf/machine/am335x-evm.conf | 3 | ||||
-rw-r--r-- | conf/machine/am3517-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/am37x-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/am437x-evm.conf | 4 | ||||
-rw-r--r-- | conf/machine/am57xx-evm.conf | 4 | ||||
-rw-r--r-- | conf/machine/beagleboard.conf | 2 | ||||
-rw-r--r-- | conf/machine/beaglebone.conf | 2 | ||||
-rw-r--r-- | conf/machine/dra7xx-evm.conf | 4 | ||||
-rw-r--r-- | conf/machine/k2e-evm.conf | 4 | ||||
-rw-r--r-- | conf/machine/k2g-evm.conf | 4 | ||||
-rw-r--r-- | conf/machine/k2hk-evm.conf | 4 | ||||
-rw-r--r-- | conf/machine/k2l-evm.conf | 4 | ||||
-rw-r--r-- | conf/machine/omap5-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/pandaboard.conf | 2 |
14 files changed, 15 insertions, 28 deletions
diff --git a/conf/machine/am335x-evm.conf b/conf/machine/am335x-evm.conf index 86a828cc..1833d71f 100644 --- a/conf/machine/am335x-evm.conf +++ b/conf/machine/am335x-evm.conf | |||
@@ -11,8 +11,9 @@ MACHINE_FEATURES += "touchscreen" | |||
11 | 11 | ||
12 | IMAGE_FSTYPES += "ubifs ubi tar.xz" | 12 | IMAGE_FSTYPES += "ubifs ubi tar.xz" |
13 | 13 | ||
14 | # Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both | ||
14 | SERIAL_CONSOLE = "" | 15 | SERIAL_CONSOLE = "" |
15 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0 115200;ttyS3 115200;ttyO3" | 16 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3" |
16 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 17 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |
17 | 18 | ||
18 | # UBI information. Note that this is board and kernel specific. Changes | 19 | # UBI information. Note that this is board and kernel specific. Changes |
diff --git a/conf/machine/am3517-evm.conf b/conf/machine/am3517-evm.conf index 883e9a44..23a18325 100644 --- a/conf/machine/am3517-evm.conf +++ b/conf/machine/am3517-evm.conf | |||
@@ -12,7 +12,7 @@ MACHINE_FEATURES += "touchscreen ethernet" | |||
12 | IMAGE_FSTYPES += "ubi tar.gz" | 12 | IMAGE_FSTYPES += "ubi tar.gz" |
13 | EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" | 13 | EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" |
14 | 14 | ||
15 | SERIAL_CONSOLE = "115200 ttyO2" | 15 | SERIAL_CONSOLE = "115200 ttyS2" |
16 | USE_VT = "2" | 16 | USE_VT = "2" |
17 | 17 | ||
18 | KERNEL_DEVICETREE = "am3517-evm.dtb" | 18 | KERNEL_DEVICETREE = "am3517-evm.dtb" |
diff --git a/conf/machine/am37x-evm.conf b/conf/machine/am37x-evm.conf index c1776df6..0e5ba691 100644 --- a/conf/machine/am37x-evm.conf +++ b/conf/machine/am37x-evm.conf | |||
@@ -14,7 +14,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" | |||
14 | 14 | ||
15 | KERNEL_DEVICETREE = "omap3-evm-37xx.dtb" | 15 | KERNEL_DEVICETREE = "omap3-evm-37xx.dtb" |
16 | 16 | ||
17 | SERIAL_CONSOLE = "115200 ttyO0" | 17 | SERIAL_CONSOLE = "115200 ttyS0" |
18 | 18 | ||
19 | # NOTE: there are NAND and OneNAND versions of this board... | 19 | # NOTE: there are NAND and OneNAND versions of this board... |
20 | # do ubiattach /dev/ubi_ctrl -m 4 | 20 | # do ubiattach /dev/ubi_ctrl -m 4 |
diff --git a/conf/machine/am437x-evm.conf b/conf/machine/am437x-evm.conf index 98af5ecd..fa2e5143 100644 --- a/conf/machine/am437x-evm.conf +++ b/conf/machine/am437x-evm.conf | |||
@@ -11,9 +11,7 @@ MACHINE_FEATURES += "touchscreen" | |||
11 | 11 | ||
12 | IMAGE_FSTYPES += "ubifs ubi tar.xz" | 12 | IMAGE_FSTYPES += "ubifs ubi tar.xz" |
13 | 13 | ||
14 | SERIAL_CONSOLE = "" | 14 | SERIAL_CONSOLE = "115200 ttyS0" |
15 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0" | ||
16 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | ||
17 | 15 | ||
18 | # UBI information. Note that this is board and kernel specific. Changes | 16 | # UBI information. Note that this is board and kernel specific. Changes |
19 | # in your kernel port may require changes in these variables. For more | 17 | # in your kernel port may require changes in these variables. For more |
diff --git a/conf/machine/am57xx-evm.conf b/conf/machine/am57xx-evm.conf index eef98f2c..d8a729aa 100644 --- a/conf/machine/am57xx-evm.conf +++ b/conf/machine/am57xx-evm.conf | |||
@@ -8,9 +8,7 @@ MACHINE_FEATURES += "touchscreen" | |||
8 | 8 | ||
9 | IMAGE_FSTYPES += "tar.xz" | 9 | IMAGE_FSTYPES += "tar.xz" |
10 | 10 | ||
11 | SERIAL_CONSOLE = "" | 11 | SERIAL_CONSOLE = "115200 ttyS2" |
12 | SERIAL_CONSOLES = "115200;ttyS2 115200;ttyO2" | ||
13 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | ||
14 | 12 | ||
15 | KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb \ | 13 | KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb \ |
16 | am57xx-evm.dtb am57xx-evm-reva3.dtb \ | 14 | am57xx-evm.dtb am57xx-evm-reva3.dtb \ |
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index 4f05a0e3..8dc77b1b 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf | |||
@@ -12,7 +12,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp" | |||
12 | 12 | ||
13 | KERNEL_DEVICETREE = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb" | 13 | KERNEL_DEVICETREE = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb" |
14 | 14 | ||
15 | SERIAL_CONSOLE = "115200 ttyO2" | 15 | SERIAL_CONSOLE = "115200 ttyS2" |
16 | 16 | ||
17 | UBOOT_MACHINE = "omap3_beagle_config" | 17 | UBOOT_MACHINE = "omap3_beagle_config" |
18 | 18 | ||
diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf index 72f3ba53..ff964ac8 100644 --- a/conf/machine/beaglebone.conf +++ b/conf/machine/beaglebone.conf | |||
@@ -12,6 +12,6 @@ MACHINE_GUI_CLASS = "bigscreen" | |||
12 | 12 | ||
13 | IMAGE_FSTYPES += "tar.gz" | 13 | IMAGE_FSTYPES += "tar.gz" |
14 | 14 | ||
15 | SERIAL_CONSOLE = "115200 ttyO0" | 15 | SERIAL_CONSOLE = "115200 ttyS0" |
16 | 16 | ||
17 | UBOOT_MACHINE = "am335x_boneblack_config" | 17 | UBOOT_MACHINE = "am335x_boneblack_config" |
diff --git a/conf/machine/dra7xx-evm.conf b/conf/machine/dra7xx-evm.conf index 86d2dbf7..ed37770d 100644 --- a/conf/machine/dra7xx-evm.conf +++ b/conf/machine/dra7xx-evm.conf | |||
@@ -8,9 +8,7 @@ MACHINE_FEATURES += "touchscreen" | |||
8 | 8 | ||
9 | IMAGE_FSTYPES += "tar.xz" | 9 | IMAGE_FSTYPES += "tar.xz" |
10 | 10 | ||
11 | SERIAL_CONSOLE = "" | 11 | SERIAL_CONSOLE = "115200 ttyS0" |
12 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0" | ||
13 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | ||
14 | 12 | ||
15 | KERNEL_DEVICETREE = "dra7-evm.dtb dra7-evm-lcd-lg.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb \ | 13 | KERNEL_DEVICETREE = "dra7-evm.dtb dra7-evm-lcd-lg.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb \ |
16 | dra72-evm.dtb dra72-evm-lcd-lg.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \ | 14 | dra72-evm.dtb dra72-evm-lcd-lg.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \ |
diff --git a/conf/machine/k2e-evm.conf b/conf/machine/k2e-evm.conf index 95b0e428..072d5afd 100644 --- a/conf/machine/k2e-evm.conf +++ b/conf/machine/k2e-evm.conf | |||
@@ -12,9 +12,7 @@ BOOT_MONITOR_MAKE_TARGET = "k2e" | |||
12 | 12 | ||
13 | IMAGE_FSTYPES += "ubifs ubi tar.xz" | 13 | IMAGE_FSTYPES += "ubifs ubi tar.xz" |
14 | 14 | ||
15 | SERIAL_CONSOLE = "" | 15 | SERIAL_CONSOLE = "115200 ttyS0" |
16 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0" | ||
17 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | ||
18 | 16 | ||
19 | SYSVINIT_ENABLED_GETTYS = "" | 17 | SYSVINIT_ENABLED_GETTYS = "" |
20 | 18 | ||
diff --git a/conf/machine/k2g-evm.conf b/conf/machine/k2g-evm.conf index 458dfe40..32228682 100644 --- a/conf/machine/k2g-evm.conf +++ b/conf/machine/k2g-evm.conf | |||
@@ -14,9 +14,7 @@ BOOT_MONITOR_MAKE_TARGET = "k2g" | |||
14 | 14 | ||
15 | IMAGE_FSTYPES += "ubifs ubi tar.xz" | 15 | IMAGE_FSTYPES += "ubifs ubi tar.xz" |
16 | 16 | ||
17 | SERIAL_CONSOLE = "" | 17 | SERIAL_CONSOLE = "115200 ttyS0" |
18 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0" | ||
19 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | ||
20 | 18 | ||
21 | SYSVINIT_ENABLED_GETTYS = "" | 19 | SYSVINIT_ENABLED_GETTYS = "" |
22 | 20 | ||
diff --git a/conf/machine/k2hk-evm.conf b/conf/machine/k2hk-evm.conf index 6adb0160..c58e0f13 100644 --- a/conf/machine/k2hk-evm.conf +++ b/conf/machine/k2hk-evm.conf | |||
@@ -12,9 +12,7 @@ BOOT_MONITOR_MAKE_TARGET = "k2hk" | |||
12 | 12 | ||
13 | IMAGE_FSTYPES += "ubifs ubi tar.xz" | 13 | IMAGE_FSTYPES += "ubifs ubi tar.xz" |
14 | 14 | ||
15 | SERIAL_CONSOLE = "" | 15 | SERIAL_CONSOLE = "115200 ttyS0" |
16 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0" | ||
17 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | ||
18 | 16 | ||
19 | SYSVINIT_ENABLED_GETTYS = "" | 17 | SYSVINIT_ENABLED_GETTYS = "" |
20 | 18 | ||
diff --git a/conf/machine/k2l-evm.conf b/conf/machine/k2l-evm.conf index b4721d0c..bddcd3c1 100644 --- a/conf/machine/k2l-evm.conf +++ b/conf/machine/k2l-evm.conf | |||
@@ -12,9 +12,7 @@ BOOT_MONITOR_MAKE_TARGET = "k2l" | |||
12 | 12 | ||
13 | IMAGE_FSTYPES += "ubifs ubi tar.xz" | 13 | IMAGE_FSTYPES += "ubifs ubi tar.xz" |
14 | 14 | ||
15 | SERIAL_CONSOLE = "" | 15 | SERIAL_CONSOLE = "115200 ttyS0" |
16 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0" | ||
17 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | ||
18 | 16 | ||
19 | SYSVINIT_ENABLED_GETTYS = "" | 17 | SYSVINIT_ENABLED_GETTYS = "" |
20 | 18 | ||
diff --git a/conf/machine/omap5-evm.conf b/conf/machine/omap5-evm.conf index 7a71accd..290efc78 100644 --- a/conf/machine/omap5-evm.conf +++ b/conf/machine/omap5-evm.conf | |||
@@ -8,7 +8,7 @@ IMAGE_FSTYPES += "ubi tar.gz" | |||
8 | 8 | ||
9 | KERNEL_DEVICETREE = "omap5-uevm.dtb" | 9 | KERNEL_DEVICETREE = "omap5-uevm.dtb" |
10 | 10 | ||
11 | SERIAL_CONSOLE = "115200 ttyO2" | 11 | SERIAL_CONSOLE = "115200 ttyS2" |
12 | 12 | ||
13 | # UBI information. Note that this is board and kernel specific. Changes | 13 | # UBI information. Note that this is board and kernel specific. Changes |
14 | # in your kernel port may require changes in these variables. For more | 14 | # in your kernel port may require changes in these variables. For more |
diff --git a/conf/machine/pandaboard.conf b/conf/machine/pandaboard.conf index 920cd1e6..8a0a284d 100644 --- a/conf/machine/pandaboard.conf +++ b/conf/machine/pandaboard.conf | |||
@@ -10,7 +10,7 @@ IMAGE_FSTYPES += "tar.gz" | |||
10 | 10 | ||
11 | KERNEL_DEVICETREE = "omap4-panda.dtb omap4-panda-a4.dtb omap4-panda-es.dtb" | 11 | KERNEL_DEVICETREE = "omap4-panda.dtb omap4-panda-a4.dtb omap4-panda-es.dtb" |
12 | 12 | ||
13 | SERIAL_CONSOLE = "115200 ttyO2" | 13 | SERIAL_CONSOLE = "115200 ttyS2" |
14 | 14 | ||
15 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" | 15 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" |
16 | MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat sgx" | 16 | MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat sgx" |