diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/am335x-evm.conf | 1 | ||||
-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 | 2 | ||||
-rw-r--r-- | conf/machine/am57xx-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/am65xx-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/beagle-x15.conf | 2 | ||||
-rw-r--r-- | conf/machine/beagleboard.conf | 2 | ||||
-rw-r--r-- | conf/machine/dra7xx-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/include/davinci.inc | 2 | ||||
-rw-r--r-- | conf/machine/k2e-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/k2g-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/k2hk-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/k2l-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/omap3evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/omap5-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/omapl138-lcdk.conf | 2 | ||||
-rw-r--r-- | conf/machine/pandaboard.conf | 2 |
18 files changed, 17 insertions, 18 deletions
diff --git a/conf/machine/am335x-evm.conf b/conf/machine/am335x-evm.conf index ba452dbd..f8696dc3 100644 --- a/conf/machine/am335x-evm.conf +++ b/conf/machine/am335x-evm.conf | |||
@@ -10,7 +10,6 @@ MACHINE_FEATURES += "touchscreen" | |||
10 | IMAGE_FSTYPES += "ubifs ubi tar.xz" | 10 | IMAGE_FSTYPES += "ubifs ubi tar.xz" |
11 | 11 | ||
12 | # Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both | 12 | # Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both |
13 | SERIAL_CONSOLE = "" | ||
14 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3" | 13 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3" |
15 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 14 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |
16 | 15 | ||
diff --git a/conf/machine/am3517-evm.conf b/conf/machine/am3517-evm.conf index e14ec1e8..87e3f1e0 100644 --- a/conf/machine/am3517-evm.conf +++ b/conf/machine/am3517-evm.conf | |||
@@ -10,7 +10,7 @@ MACHINE_FEATURES += "touchscreen ethernet" | |||
10 | IMAGE_FSTYPES += "ubi tar.gz" | 10 | IMAGE_FSTYPES += "ubi tar.gz" |
11 | EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" | 11 | EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" |
12 | 12 | ||
13 | SERIAL_CONSOLE = "115200 ttyS2" | 13 | SERIAL_CONSOLES = "115200;ttyS2" |
14 | USE_VT = "2" | 14 | USE_VT = "2" |
15 | 15 | ||
16 | KERNEL_DEVICETREE = "am3517-evm.dtb" | 16 | KERNEL_DEVICETREE = "am3517-evm.dtb" |
diff --git a/conf/machine/am37x-evm.conf b/conf/machine/am37x-evm.conf index f96be3ce..e9d1838a 100644 --- a/conf/machine/am37x-evm.conf +++ b/conf/machine/am37x-evm.conf | |||
@@ -12,7 +12,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" | |||
12 | 12 | ||
13 | KERNEL_DEVICETREE = "omap3-evm-37xx.dtb" | 13 | KERNEL_DEVICETREE = "omap3-evm-37xx.dtb" |
14 | 14 | ||
15 | SERIAL_CONSOLE = "115200 ttyS0" | 15 | SERIAL_CONSOLES = "115200;ttyS0" |
16 | 16 | ||
17 | # NOTE: there are NAND and OneNAND versions of this board... | 17 | # NOTE: there are NAND and OneNAND versions of this board... |
18 | # do ubiattach /dev/ubi_ctrl -m 4 | 18 | # do ubiattach /dev/ubi_ctrl -m 4 |
diff --git a/conf/machine/am437x-evm.conf b/conf/machine/am437x-evm.conf index 06ce4f8b..43353ce8 100644 --- a/conf/machine/am437x-evm.conf +++ b/conf/machine/am437x-evm.conf | |||
@@ -9,7 +9,7 @@ MACHINE_FEATURES += "touchscreen" | |||
9 | 9 | ||
10 | IMAGE_FSTYPES += "ubifs ubi tar.xz" | 10 | IMAGE_FSTYPES += "ubifs ubi tar.xz" |
11 | 11 | ||
12 | SERIAL_CONSOLE = "115200 ttyS0" | 12 | SERIAL_CONSOLES = "115200;ttyS0" |
13 | 13 | ||
14 | # UBI information. Note that this is board and kernel specific. Changes | 14 | # UBI information. Note that this is board and kernel specific. Changes |
15 | # in your kernel port may require changes in these variables. For more | 15 | # 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 545cd951..329f33f6 100644 --- a/conf/machine/am57xx-evm.conf +++ b/conf/machine/am57xx-evm.conf | |||
@@ -8,7 +8,7 @@ MACHINE_FEATURES += "touchscreen" | |||
8 | 8 | ||
9 | IMAGE_FSTYPES += "tar.xz" | 9 | IMAGE_FSTYPES += "tar.xz" |
10 | 10 | ||
11 | SERIAL_CONSOLE = "115200 ttyS2" | 11 | SERIAL_CONSOLES = "115200;ttyS2" |
12 | 12 | ||
13 | KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb \ | 13 | KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb \ |
14 | am57xx-evm.dtb am57xx-evm-cam-mt9t111.dtb am57xx-evm-cam-ov10635.dtb \ | 14 | am57xx-evm.dtb am57xx-evm-cam-mt9t111.dtb am57xx-evm-cam-ov10635.dtb \ |
diff --git a/conf/machine/am65xx-evm.conf b/conf/machine/am65xx-evm.conf index 4bf8993e..49e9c10c 100644 --- a/conf/machine/am65xx-evm.conf +++ b/conf/machine/am65xx-evm.conf | |||
@@ -8,7 +8,7 @@ MACHINE_FEATURES += "touchscreen" | |||
8 | 8 | ||
9 | IMAGE_FSTYPES += "tar.xz cpio cpio.xz wic.xz" | 9 | IMAGE_FSTYPES += "tar.xz cpio cpio.xz wic.xz" |
10 | 10 | ||
11 | SERIAL_CONSOLE = "115200 ttyS2" | 11 | SERIAL_CONSOLES = "115200;ttyS2" |
12 | 12 | ||
13 | KERNEL_DEVICETREE = " \ | 13 | KERNEL_DEVICETREE = " \ |
14 | ti/k3-am654-base-board.dtb \ | 14 | ti/k3-am654-base-board.dtb \ |
diff --git a/conf/machine/beagle-x15.conf b/conf/machine/beagle-x15.conf index da275ad6..275a5ce0 100644 --- a/conf/machine/beagle-x15.conf +++ b/conf/machine/beagle-x15.conf | |||
@@ -8,7 +8,7 @@ KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-be | |||
8 | 8 | ||
9 | MACHINE_GUI_CLASS = "bigscreen" | 9 | MACHINE_GUI_CLASS = "bigscreen" |
10 | 10 | ||
11 | SERIAL_CONSOLE = "115200 ttyS2" | 11 | SERIAL_CONSOLES = "115200;ttyS2" |
12 | 12 | ||
13 | UBOOT_MACHINE = "am57xx_evm_config" | 13 | UBOOT_MACHINE = "am57xx_evm_config" |
14 | 14 | ||
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index 8dc77b1b..37d23aa7 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 ttyS2" | 15 | SERIAL_CONSOLES = "115200;ttyS2" |
16 | 16 | ||
17 | UBOOT_MACHINE = "omap3_beagle_config" | 17 | UBOOT_MACHINE = "omap3_beagle_config" |
18 | 18 | ||
diff --git a/conf/machine/dra7xx-evm.conf b/conf/machine/dra7xx-evm.conf index b9554ab9..f8df9572 100644 --- a/conf/machine/dra7xx-evm.conf +++ b/conf/machine/dra7xx-evm.conf | |||
@@ -8,7 +8,7 @@ MACHINE_FEATURES += "touchscreen" | |||
8 | 8 | ||
9 | IMAGE_FSTYPES += "tar.xz" | 9 | IMAGE_FSTYPES += "tar.xz" |
10 | 10 | ||
11 | SERIAL_CONSOLE = "115200 ttyS0" | 11 | SERIAL_CONSOLES = "115200;ttyS0" |
12 | 12 | ||
13 | KERNEL_DEVICETREE = "dra7-evm.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb \ | 13 | KERNEL_DEVICETREE = "dra7-evm.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb \ |
14 | dra72-evm.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \ | 14 | dra72-evm.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \ |
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc index 59e423d7..6de64839 100644 --- a/conf/machine/include/davinci.inc +++ b/conf/machine/include/davinci.inc | |||
@@ -16,7 +16,7 @@ UBOOT_LOADADDRESS = "0x80008000" | |||
16 | 16 | ||
17 | EXTRA_IMAGEDEPENDS += "u-boot" | 17 | EXTRA_IMAGEDEPENDS += "u-boot" |
18 | 18 | ||
19 | SERIAL_CONSOLE ?= "115200 ttyS0" | 19 | SERIAL_CONSOLES ?= "115200;ttyS0" |
20 | EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" | 20 | EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" |
21 | 21 | ||
22 | MACHINE_FEATURES = "kernel26 serial ethernet usbhost usbgadget mmc alsa" | 22 | MACHINE_FEATURES = "kernel26 serial ethernet usbhost usbgadget mmc alsa" |
diff --git a/conf/machine/k2e-evm.conf b/conf/machine/k2e-evm.conf index 072d5afd..e9f500f1 100644 --- a/conf/machine/k2e-evm.conf +++ b/conf/machine/k2e-evm.conf | |||
@@ -12,7 +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 = "115200 ttyS0" | 15 | SERIAL_CONSOLES = "115200;ttyS0" |
16 | 16 | ||
17 | SYSVINIT_ENABLED_GETTYS = "" | 17 | SYSVINIT_ENABLED_GETTYS = "" |
18 | 18 | ||
diff --git a/conf/machine/k2g-evm.conf b/conf/machine/k2g-evm.conf index e77feccc..a8ddc667 100644 --- a/conf/machine/k2g-evm.conf +++ b/conf/machine/k2g-evm.conf | |||
@@ -15,7 +15,7 @@ BOOT_MONITOR_MAKE_TARGET = "k2g" | |||
15 | 15 | ||
16 | IMAGE_FSTYPES += "ubifs ubi tar.xz" | 16 | IMAGE_FSTYPES += "ubifs ubi tar.xz" |
17 | 17 | ||
18 | SERIAL_CONSOLE = "115200 ttyS0" | 18 | SERIAL_CONSOLES = "115200;ttyS0" |
19 | 19 | ||
20 | SYSVINIT_ENABLED_GETTYS = "" | 20 | SYSVINIT_ENABLED_GETTYS = "" |
21 | 21 | ||
diff --git a/conf/machine/k2hk-evm.conf b/conf/machine/k2hk-evm.conf index 6f1762dd..de79de9a 100644 --- a/conf/machine/k2hk-evm.conf +++ b/conf/machine/k2hk-evm.conf | |||
@@ -12,7 +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 = "115200 ttyS0" | 15 | SERIAL_CONSOLES = "115200;ttyS0" |
16 | 16 | ||
17 | SYSVINIT_ENABLED_GETTYS = "" | 17 | SYSVINIT_ENABLED_GETTYS = "" |
18 | 18 | ||
diff --git a/conf/machine/k2l-evm.conf b/conf/machine/k2l-evm.conf index c021161c..e326ba24 100644 --- a/conf/machine/k2l-evm.conf +++ b/conf/machine/k2l-evm.conf | |||
@@ -12,7 +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 = "115200 ttyS0" | 15 | SERIAL_CONSOLES = "115200;ttyS0" |
16 | 16 | ||
17 | SYSVINIT_ENABLED_GETTYS = "" | 17 | SYSVINIT_ENABLED_GETTYS = "" |
18 | 18 | ||
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf index a38bd7ad..a7457c04 100644 --- a/conf/machine/omap3evm.conf +++ b/conf/machine/omap3evm.conf | |||
@@ -10,7 +10,7 @@ MACHINE_FEATURES += "touchscreen ethernet" | |||
10 | IMAGE_FSTYPES += "jffs2 tar.gz" | 10 | IMAGE_FSTYPES += "jffs2 tar.gz" |
11 | EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" | 11 | EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" |
12 | 12 | ||
13 | SERIAL_CONSOLE = "115200 ttyS0" | 13 | SERIAL_CONSOLES = "115200;ttyS0" |
14 | USE_VT = "0" | 14 | USE_VT = "0" |
15 | 15 | ||
16 | EXTRA_IMAGEDEPENDS += "x-load" | 16 | EXTRA_IMAGEDEPENDS += "x-load" |
diff --git a/conf/machine/omap5-evm.conf b/conf/machine/omap5-evm.conf index 290efc78..28044cb9 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 ttyS2" | 11 | SERIAL_CONSOLES = "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/omapl138-lcdk.conf b/conf/machine/omapl138-lcdk.conf index a6d6bf92..06db2f8d 100644 --- a/conf/machine/omapl138-lcdk.conf +++ b/conf/machine/omapl138-lcdk.conf | |||
@@ -14,7 +14,7 @@ UBOOT_LOADADDRESS = "0xc0008000" | |||
14 | 14 | ||
15 | IMAGE_FSTYPES += "tar.xz" | 15 | IMAGE_FSTYPES += "tar.xz" |
16 | 16 | ||
17 | SERIAL_CONSOLE = "115200 ttyS2" | 17 | SERIAL_CONSOLES = "115200;ttyS2" |
18 | 18 | ||
19 | KERNEL_DEVICETREE = "da850-evm.dtb da850-lcdk.dtb" | 19 | KERNEL_DEVICETREE = "da850-evm.dtb da850-lcdk.dtb" |
20 | 20 | ||
diff --git a/conf/machine/pandaboard.conf b/conf/machine/pandaboard.conf index 8a0a284d..f01472d9 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 ttyS2" | 13 | SERIAL_CONSOLES = "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" |