beagleboard, omap3evm: attempt to remove \r

diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 85ce4c7..d1e19aa 100644 (file)
--- 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 "\r
+EXTRA_IMAGECMD_jffs2 = "-lnp "
 
 # Guesswork
 SERIAL_CONSOLE = "115200 ttyS2"

diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
index 05cd3fe..416db2c 100644 (file)
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -1,32 +1,32 @@
-#@TYPE: Machine\r
-#@NAME: omap3 EVM\r
-#@DESCRIPTION: Machine configuration for the TI omap3 EVM\r
-TARGET_ARCH = "arm"\r
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a"\r
-\r
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"\r
-XSERVER = "xserver-kdrive-fbdev"\r
-GUI_MACHINE_CLASS = "smallscreen"\r
-\r
-#include conf/machine/include/tune-arm1136jf-s.inc\r
-# requires gcc 4.3.0:\r
-include conf/machine/include/tune-cortexa8.inc\r
-\r
-# Ship all kernel modules\r
-MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"\r
-\r
-IMAGE_FSTYPES ?= "jffs2 tar.bz2"\r
-EXTRA_IMAGECMD_jffs2 = "-lnp "\r
-\r
-SERIAL_CONSOLE = "115200 ttyS0"\r
-\r
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"\r
-\r
-KERNEL_IMAGETYPE = "uImage"\r
-\r
-UBOOT_ENTRYPOINT = "0x80008000"\r
-UBOOT_LOADADDRESS = "0x80008000"\r
-UBOOT_ARCH = "arm"\r
-\r
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen"\r
-\r
+#@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"
+