aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-06-29 16:51:02 +0000
committerKoen Kooi <koen@openembedded.org>2008-06-29 16:51:02 +0000
commitd2f85defad9eb20118ebc76f5186f2ed883bb408 (patch)
treeeefd2671e5040fc8579a7e4608927eae50a4cacc
parent960b6cbba24f580cf64120c8374d3b4584e40ecd (diff)
downloadopenembedded-d2f85defad9eb20118ebc76f5186f2ed883bb408.tar.gz
openembedded-d2f85defad9eb20118ebc76f5186f2ed883bb408.tar.bz2
openembedded-d2f85defad9eb20118ebc76f5186f2ed883bb408.zip
beagleboard, omap3evm: attempt to remove \r
-rw-r--r--conf/machine/beagleboard.conf2
-rw-r--r--conf/machine/omap3evm.conf64
2 files changed, 33 insertions, 33 deletions
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 85ce4c76a7..d1e19aa3e4 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -19,7 +19,7 @@ include conf/machine/include/tune-cortexa8.inc
IMAGE_FSTYPES += "tar.bz2 jffs2"
-EXTRA_IMAGECMD_jffs2 = "-lnp "
+EXTRA_IMAGECMD_jffs2 = "-lnp "
# Guesswork
SERIAL_CONSOLE = "115200 ttyS2"
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
index 05cd3fe448..416db2c937 100644
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -1,32 +1,32 @@
-#@TYPE: Machine
-#@NAME: omap3 EVM
-#@DESCRIPTION: Machine configuration for the TI omap3 EVM
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-XSERVER = "xserver-kdrive-fbdev"
-GUI_MACHINE_CLASS = "smallscreen"
-
-#include conf/machine/include/tune-arm1136jf-s.inc
-# requires gcc 4.3.0:
-include conf/machine/include/tune-cortexa8.inc
-
-# Ship all kernel modules
-MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-
-IMAGE_FSTYPES ?= "jffs2 tar.bz2"
-EXTRA_IMAGECMD_jffs2 = "-lnp "
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
-
-KERNEL_IMAGETYPE = "uImage"
-
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-UBOOT_ARCH = "arm"
-
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen"
-
+#@TYPE: Machine
+#@NAME: omap3 EVM
+#@DESCRIPTION: Machine configuration for the TI omap3 EVM
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+GUI_MACHINE_CLASS = "smallscreen"
+
+#include conf/machine/include/tune-arm1136jf-s.inc
+# requires gcc 4.3.0:
+include conf/machine/include/tune-cortexa8.inc
+
+# Ship all kernel modules
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+
+IMAGE_FSTYPES ?= "jffs2 tar.bz2"
+EXTRA_IMAGECMD_jffs2 = "-lnp "
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+UBOOT_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen"
+