Convert DOS to UNIX style.

diff --git a/target/device/Atmel/u-boot/u-boot.mk b/target/device/Atmel/u-boot/u-boot.mk
index 781f3a10994037b2f1d52f6cce02168b73d2849e..c8e86016c44c2a2ea04b2d0beca2afd2535b0a36 100644 (file)
--- a/target/device/Atmel/u-boot/u-boot.mk
+++ b/target/device/Atmel/u-boot/u-boot.mk
@@ -1,22 +1,22 @@
-#############################################################\r
-#\r
-# u-boot mkimage to build to target u-boot filesystems and\r
-# \r
-# u-boot.bin - the boot loader for the target - which needs soft float, so \r
-#              we won't make it.\r
-#\r
-#\r
-#############################################################\r
-UBOOT_VERSION:=1.2.0-atmel\r
+#############################################################
+#
+# u-boot mkimage to build to target u-boot filesystems and
+# 
+# u-boot.bin - the boot loader for the target - which needs soft float, so 
+#              we won't make it.
+#
+#
+#############################################################
+UBOOT_VERSION:=1.2.0-atmel
 UBOOT_DIR:=$(BUILD_DIR)/u-boot-$(UBOOT_VERSION)
-UBOOT_BUILD_DIR:=$(PROJECT_BUILD_DIR)/u-boot-$(UBOOT_VERSION)\r
-UBOOT_SOURCE:=u-boot-$(UBOOT_VERSION).tar.bz2\r
+UBOOT_BUILD_DIR:=$(PROJECT_BUILD_DIR)/u-boot-$(UBOOT_VERSION)
+UBOOT_SOURCE:=u-boot-$(UBOOT_VERSION).tar.bz2
 #UBOOT_SOURCE:=u-boot-1.1.5-atmel.tar.bz2
-ATMEL_MIRROR:=$(strip  $(subst ",, $(BR2_ATMEL_MIRROR)))\r
+ATMEL_MIRROR:=$(strip  $(subst ",, $(BR2_ATMEL_MIRROR)))
 #UBOOT_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/u-boot
 UBOOT_SITE:=$(ATMEL_MIRROR)/Source
-UBOOT_PATCH_SITE:=$(ATMEL_MIRROR)/Source\r
-UBOOT_CAT:=bzcat\r
+UBOOT_PATCH_SITE:=$(ATMEL_MIRROR)/Source
+UBOOT_CAT:=bzcat
 UBOOT_PATCH_SOURCE:=u-boot-1.2.0-atmel-patch.tar.bz2
 
 MKIMAGE_BINLOC:=$(UBOOT_BUILD_DIR)/tools/mkimage
@@ -26,7 +26,7 @@ UBOOT_BIN:=$(BOARD_NAME)-u-boot-$(UBOOT_VERSION)-$(DATE).bin
 
 UBOOT_PATCHES:=$(PROJECT_BUILD_DIR)/u-boot-patches
 
-UBOOT_ATMEL_BMP:=$(UBOOT_PATCHES)/atmel.bmp\r
+UBOOT_ATMEL_BMP:=$(UBOOT_PATCHES)/atmel.bmp
 
 UBOOT_SCR=$(BINARIES_DIR)/autoscript
 TARGET_UBOOT_IPADDR:=$(strip  $(subst ",, $(BR2_TARGET_UBOOT_IPADDR)))
@@ -35,31 +35,31 @@ TARGET_UBOOT_GATEWAY:=$(strip  $(subst ",, $(BR2_TARGET_UBOOT_GATEWAY)))
 TARGET_UBOOT_NETMASK:=$(strip  $(subst ",, $(BR2_TARGET_UBOOT_NETMASK)))
 TARGET_UBOOT_ETHADDR:=$(strip  $(subst ",, $(BR2_TARGET_UBOOT_ETHADDR)))
 UBOOT_CUSTOM:=$(UBOOT_DIR)/include/custom.h
-\r
-$(DL_DIR)/$(UBOOT_SOURCE):\r
+
+$(DL_DIR)/$(UBOOT_SOURCE):
         $(WGET) -P $(DL_DIR) $(UBOOT_SITE)/$(UBOOT_SOURCE)
 
-$(DL_DIR)/$(UBOOT_PATCH_SOURCE):\r
+$(DL_DIR)/$(UBOOT_PATCH_SOURCE):
         $(WGET) -P $(DL_DIR) $(UBOOT_PATCH_SITE)/$(UBOOT_PATCH_SOURCE)
-\r
+
 $(UBOOT_DIR)/.unpacked: $(DL_DIR)/$(UBOOT_SOURCE)
-       mkdir -p   $(BUILD_DIR)\r
-       $(UBOOT_CAT) $(DL_DIR)/$(UBOOT_SOURCE) | tar -C $(BUILD_DIR) -xvf -\r
-       touch   $@\r
+       mkdir -p   $(BUILD_DIR)
+       $(UBOOT_CAT) $(DL_DIR)/$(UBOOT_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+       touch   $@
 
 $(UBOOT_PATCHES)/.unpacked: $(DL_DIR)/$(UBOOT_PATCH_SOURCE)
        mkdir -p $(UBOOT_PATCHES)
        bzcat   $(DL_DIR)/$(UBOOT_PATCH_SOURCE) | tar -C $(UBOOT_PATCHES) -xvf -
-       touch   $@\r
-\r
-$(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE): $(UBOOT_DIR)/.unpacked $(UBOOT_PATCHES)/.unpacked\r
+       touch   $@
+
+$(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE): $(UBOOT_DIR)/.unpacked $(UBOOT_PATCHES)/.unpacked
        toolchain/patch-kernel.sh $(UBOOT_DIR) $(UBOOT_PATCHES) *.patch
-       touch $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE)\r
-#      cp $(UBOOT_CONFIG_FILE) $(UBOOT_DIR)/include/configs/.\r
+       touch $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE)
+#      cp $(UBOOT_CONFIG_FILE) $(UBOOT_DIR)/include/configs/.
 #      cp $(UBOOT_PATCHES)/cmd_defenv.c $(UBOOT_DIR)/common/.
-#      cp $(UBOOT_ATMEL_BMP) $(UBOOT_DIR)/tools/logos/.\r
-\r
-$(UBOOT_BUILD_DIR)/.configured: $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE)\r
+#      cp $(UBOOT_ATMEL_BMP) $(UBOOT_DIR)/tools/logos/.
+
+$(UBOOT_BUILD_DIR)/.configured: $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE)
 ifneq  ($(strip $(UBOOT_CONFIG_FILE)),)
        cp $(UBOOT_CONFIG_FILE) $(UBOOT_DIR)/include/configs/.
 endif
@@ -67,11 +67,11 @@ endif
                O=$(UBOOT_BUILD_DIR)    \
                CONFIG_NOSOFTFLOAT=1            \
                -C $(UBOOT_DIR)         \
-               $(UBOOT_CONFIG)\r
-       $(SED) 's/ $$(SREC) $$(BIN)//' $(UBOOT_DIR)/examples/Makefile\r
-       touch $(UBOOT_BUILD_DIR)/.configured\r
-#      $(MAKE) O=$(UBOOT_BUILD_DIR) -C $(UBOOT_DIR) \r
-\r
+               $(UBOOT_CONFIG)
+       $(SED) 's/ $$(SREC) $$(BIN)//' $(UBOOT_DIR)/examples/Makefile
+       touch $(UBOOT_BUILD_DIR)/.configured
+#      $(MAKE) O=$(UBOOT_BUILD_DIR) -C $(UBOOT_DIR) 
+
 $(MKIMAGE_BINLOC): $(UBOOT_BUILD_DIR)/.configured
        $(MAKE) \
                O=$(UBOOT_BUILD_DIR)            \
@@ -79,11 +79,11 @@ $(MKIMAGE_BINLOC): $(UBOOT_BUILD_DIR)/.configured
                CONFIG_NOSOFTFLOAT=1            \
                TOPDIR=$(UBOOT_DIR)             \
                SRCTREE=$(UBOOT_DIR)            \
-               -C $(UBOOT_DIR) tools\r
+               -C $(UBOOT_DIR) tools
        touch $(MKIMAGE_BINLOC)
-\r
+
 $(UBOOT_BUILD_DIR)/u-boot.bin: $(UBOOT_BUILD_DIR)/.configured $(UBOOT_CUSTOM)
-       echo TARGET_CROSS=$(TARGET_CROSS)\r
+       echo TARGET_CROSS=$(TARGET_CROSS)
        $(MAKE) O=$(UBOOT_BUILD_DIR)            \
                CROSS_COMPILE=$(TARGET_CROSS)   \
                CONFIG_NOSOFTFLOAT=1            \
@@ -93,11 +93,11 @@ $(UBOOT_BUILD_DIR)/u-boot.bin:      $(UBOOT_BUILD_DIR)/.configured $(UBOOT_CUSTOM)
                -C $(UBOOT_DIR)
 
 $(BINARIES_DIR)/$(UBOOT_BIN):  $(UBOOT_BUILD_DIR)/u-boot.bin
-       mkdir -p $(BINARIES_DIR)\r
+       mkdir -p $(BINARIES_DIR)
        cp $(UBOOT_BUILD_DIR)/u-boot.bin $(BINARIES_DIR)/$(UBOOT_BIN)
 
 /tftpboot/$(UBOOT_BIN):        $(UBOOT_BUILD_DIR)/u-boot.bin
-       mkdir -p /tftpboot\r
+       mkdir -p /tftpboot
        cp $(UBOOT_BUILD_DIR)/u-boot.bin /tftpboot/$(UBOOT_BIN)
 
 uboot-bin:     $(BINARIES_DIR)/$(UBOOT_BIN)    /tftpboot/$(UBOOT_BIN)
@@ -170,24 +170,24 @@ $(UBOOT_SCR).$(PROJECT):  $(UBOOT_SCR)     $(MKIMAGE)
                                $(UBOOT_SCR).$(PROJECT)
        cp      $(UBOOT_SCR).$(PROJECT) /tftpboot
 
-$(MKIMAGE):    $(MKIMAGE_BINLOC) \r
-       cp -f $(MKIMAGE_BINLOC)  $(MKIMAGE)\r
-\r
-uboot: $(MKIMAGE)      uboot-bin $(UBOOT_SCR).$(PROJECT)\r
+$(MKIMAGE):    $(MKIMAGE_BINLOC) 
+       cp -f $(MKIMAGE_BINLOC)  $(MKIMAGE)
+
+uboot: $(MKIMAGE)      uboot-bin $(UBOOT_SCR).$(PROJECT)
+
+uboot-source: $(DL_DIR)/$(UBOOT_SOURCE)
 
-uboot-source: $(DL_DIR)/$(UBOOT_SOURCE)\r
-\r
-uboot-clean:\r
+uboot-clean:
        rm -fr  $(UBOOT_BUILD_DIR)
        rm -fr  $(UBOOT_PATCHES)
        rm -f   $(BINARIES_DIR)/$(UBOOT_BIN)
        rm -fr  $(UBOOT_DIR)
        rm -f   $(UBOOT_SCR)
        rm -f   $(UBOOT_SCR).$(PROJECT)
-#      -$(MAKE) -C $(UBOOT_DIR)/uboot-tools clean\r
-\r
-uboot-dirclean:        uboot-clean\r
-       rm -rf $(UBOOT_DIR)\r
+#      -$(MAKE) -C $(UBOOT_DIR)/uboot-tools clean
+
+uboot-dirclean:        uboot-clean
+       rm -rf $(UBOOT_DIR)
 
 uboot-new:
        rm -fr  $(UBOOT_BUILD_DIR)/u-boot
@@ -196,52 +196,52 @@ uboot-new:
        rm -fr  /tftpboot/$(UBOOT_BIN)
        rm -fr  $(BINARIES_DIR)/$(UBOOT_BIN)
 
-.PHONY:        uboot-bin\r
-#############################################################\r
-#\r
-# Build the uboot root filesystem image\r
-#\r
-#############################################################\r
-\r
-UBOOT_TARGET:=$(IMAGE).uboot\r
-\r
-ubootroot: host-fakeroot makedevs uboot\r
-       -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;\r
-       @rm -rf $(TARGET_DIR)/usr/man\r
-       @rm -rf $(TARGET_DIR)/usr/info\r
-       -/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null\r
-       # Use fakeroot to pretend all target binaries are owned by root\r
-       rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET))\r
-       touch $(STAGING_DIR)/.fakeroot.00000\r
-       cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET))\r
-       echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET))\r
-       # Use fakeroot to pretend to create all needed device nodes\r
-       echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \\r
-               >> $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET))\r
-       # Use fakeroot so mkuboot believes the previous fakery\r
-       echo "$(UBOOT_DIR)/uboot-tools/mkuboot " \\r
-                   "$(TARGET_DIR) $(UBOOT_TARGET) " \\r
-                   "-noappend $(UBOOT_ENDIANNESS)" \\r
-               >> $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET))\r
-       chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET))\r
-       $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET))\r
-       -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET))\r
-\r
-ubootroot-source: uboot-source\r
-\r
-ubootroot-clean:\r
-       -$(MAKE) -C $(UBOOT_DIR) clean\r
-\r
-ubootroot-dirclean:\r
-       rm -rf $(UBOOT_DIR)\r
-\r
-#############################################################\r
-#\r
-# Toplevel Makefile options\r
-#\r
-#############################################################\r
-ifeq ($(strip $(BR2_TARGET_UBOOT)),y)\r
-TARGETS+=uboot\r
+.PHONY:        uboot-bin
+#############################################################
+#
+# Build the uboot root filesystem image
+#
+#############################################################
+
+UBOOT_TARGET:=$(IMAGE).uboot
+
+ubootroot: host-fakeroot makedevs uboot
+       -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+       @rm -rf $(TARGET_DIR)/usr/man
+       @rm -rf $(TARGET_DIR)/usr/info
+       -/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
+       # Use fakeroot to pretend all target binaries are owned by root
+       rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET))
+       touch $(STAGING_DIR)/.fakeroot.00000
+       cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET))
+       echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET))
+       # Use fakeroot to pretend to create all needed device nodes
+       echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \
+               >> $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET))
+       # Use fakeroot so mkuboot believes the previous fakery
+       echo "$(UBOOT_DIR)/uboot-tools/mkuboot " \
+                   "$(TARGET_DIR) $(UBOOT_TARGET) " \
+                   "-noappend $(UBOOT_ENDIANNESS)" \
+               >> $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET))
+       chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET))
+       $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET))
+       -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET))
+
+ubootroot-source: uboot-source
+
+ubootroot-clean:
+       -$(MAKE) -C $(UBOOT_DIR) clean
+
+ubootroot-dirclean:
+       rm -rf $(UBOOT_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_TARGET_UBOOT)),y)
+TARGETS+=uboot
 endif
 
 uboot-test:
@@ -267,7 +267,7 @@ uboot-test:
        -@ls    /tftpboot/$(UBOOT_BIN)
        -@echo  "mkimage = $(MKIMAGE)"
        -@ls    $(MKIMAGE)
-       -@echo  "u-boot script=$(UBOOT_SCR).$(PROJECT)"\r
+       -@echo  "u-boot script=$(UBOOT_SCR).$(PROJECT)"
        -@ls    $(UBOOT_SCR).$(PROJECT)
        -@echo  "u-boot script (ASCII)=$(UBOOT_SCR)"
        -@ls    $(UBOOT_SCR)