- random whitespace cleanup

diff --git a/package/Makefile.in b/package/Makefile.in
index 8f0aefe6513c4478923c3fff1db3c69520b3e76a..a2fccb8d232a525f15a3be0d9b4a3c2e3fe41bf0 100644 (file)
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -1,4 +1,4 @@
-ifndef MAKE
+ifndef MAKE
 MAKE:=make
 endif
 ifndef HOSTMAKE

diff --git a/package/hal/hal.mk b/package/hal/hal.mk
index e452ebd6ad924508351edc5b45bbcd8716a22675..537b60a41bda3a1322e924fd4f9a377f496ca6eb 100644 (file)
--- a/package/hal/hal.mk
+++ b/package/hal/hal.mk
@@ -13,7 +13,7 @@ HAL_TARGET_BINARY:=usr/sbin/hald
 
 GLIB_CFLAGS:=-I$(STAGING_DIR)/usr/include/glib-2.0 \
             -I$(STAGING_DIR)/lib/glib/include
-GLIB_LIBS:=$(STAGING_DIR)/lib/libglib-2.0.so   \
+GLIB_LIBS:=$(STAGING_DIR)/lib/libglib-2.0.so \
           $(STAGING_DIR)/lib/libgmodule-2.0.so \
           $(STAGING_DIR)/lib/libgobject-2.0.so \
           $(STAGING_DIR)/lib/libgthread-2.0.so
@@ -77,14 +77,15 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald
        rm -rf $(TARGET_DIR)/etc/PolicyKit
        $(INSTALL) -m 0755 -D package/hal/S98haldaemon $(TARGET_DIR)/etc/init.d
        rm -rf $(TARGET_DIR)/etc/rc.d
-       for file in hald-addon-acpi* hald-addon-cpufreq         \
-                   hald-addon-keyboard hald-addon-pmu          \
-                   hald-probe-pc-floppy hald-probe-printer     \
-                   hald-probe-serial hald-probe-smbios         \
-                   hal-storage-eject hal-storage-closetray     \
-                   hal-system-power-pmu hald-probe-input       \
-                   hald-probe-hiddev hald-addon-hid-ups; do    \
-               rm -f $(TARGET_DIR)/usr/libexec/$$file;         \
+       for file in hald-addon-acpi* hald-addon-cpufreq \
+               hald-addon-keyboard hald-addon-pmu \
+               hald-probe-pc-floppy hald-probe-printer \
+               hald-probe-serial hald-probe-smbios \
+               hal-storage-eject hal-storage-closetray \
+               hal-system-power-pmu hald-probe-input \
+               hald-probe-hiddev hald-addon-hid-ups; \
+       do \
+               rm -f $(TARGET_DIR)/usr/libexec/$$file; \
        done
        -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libhal*
 

diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index e5560353c05e14955cc7d209b38c4f75bbf9ab86..fd2c8bdc3dcea3d4b275640b419dda9bf957fde9 100644 (file)
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -92,11 +92,11 @@ $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION):
        -ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/usr/lib/libvolume_id.so
 
 $(STAGING_DIR)/usr/lib/libvolume_id.la: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
-       $(INSTALL) -m 0755 -D package/udev/libvolume_id.la.tmpl         $(STAGING_DIR)/usr/lib/libvolume_id.la
-       $(SED) 's/REPLACE_CURRENT/$(UDEV_VOLUME_ID_CURRENT)/g'          $(STAGING_DIR)/usr/lib/libvolume_id.la
-       $(SED) 's/REPLACE_AGE/$(UDEV_VOLUME_ID_AGE)/g'                  $(STAGING_DIR)/usr/lib/libvolume_id.la
-       $(SED) 's/REPLACE_REVISION/$(UDEV_VOLUME_ID_REVISION)/g'        $(STAGING_DIR)/usr/lib/libvolume_id.la
-       $(SED) 's,REPLACE_LIB_DIR,$(STAGING_DIR)/usr/lib,g'             $(STAGING_DIR)/usr/lib/libvolume_id.la
+       $(INSTALL) -m 0755 -D package/udev/libvolume_id.la.tmpl $(STAGING_DIR)/usr/lib/libvolume_id.la
+       $(SED) 's/REPLACE_CURRENT/$(UDEV_VOLUME_ID_CURRENT)/g' $(STAGING_DIR)/usr/lib/libvolume_id.la
+       $(SED) 's/REPLACE_AGE/$(UDEV_VOLUME_ID_AGE)/g' $(STAGING_DIR)/usr/lib/libvolume_id.la
+       $(SED) 's/REPLACE_REVISION/$(UDEV_VOLUME_ID_REVISION)/g' $(STAGING_DIR)/usr/lib/libvolume_id.la
+       $(SED) 's,REPLACE_LIB_DIR,$(STAGING_DIR)/usr/lib,g' $(STAGING_DIR)/usr/lib/libvolume_id.la
 
 $(TARGET_DIR)/lib/udev/vol_id: $(STAGING_DIR)/usr/lib/libvolume_id.la
        $(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(TARGET_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)

diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk
index b5f41db016bb7596b7eb99c27d2ebe4219ea6349..254145382a18981e9d80422d86738e63dd1956a4 100644 (file)
--- a/package/vpnc/vpnc.mk
+++ b/package/vpnc/vpnc.mk
@@ -31,22 +31,18 @@ $(VPNC_BINARY): $(VPNC_DIR)/.configured
                CC=$(TARGET_CC) -C $(VPNC_DIR)
 
 $(VPNC_TARGET_BINARY): $(VPNC_BINARY)
-       $(MAKE) $(TARGET_CONFIGURE_OPTS)                \
-               DESTDIR=$(TARGET_DIR)                   \
-               BINDIR=/usr/local/bin                   \
-               SBINDIR=/usr/local/sbin                 \
-               ETCDIR=/etc/vpnc                        \
-               MANDIR=/usr/local/share/man             \
-               VERSION=$(VPNC_VERSION)                 \
-               INCLUDE=$(STAGING_DIR)/usr/include      \
-               LDFLAGS="-g -lgcrypt -lgpg-error"       \
+       $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+               DESTDIR=$(TARGET_DIR) \
+               BINDIR=/usr/local/bin \
+               SBINDIR=/usr/local/sbin \
+               ETCDIR=/etc/vpnc \
+               MANDIR=/usr/share/man \
+               VERSION=$(VPNC_VERSION) \
+               INCLUDE=$(STAGING_DIR)/usr/include \
+               LDFLAGS="-g -lgcrypt -lgpg-error" \
                -C $(VPNC_DIR) install
        $(STRIP) $(STRIP_STRIP_UNNEEDED) $(VPNC_TARGET_BINARY)
 
-#              CFLAGS+="-W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g -DVERSION=\"$(VPNC_VERSION)\" -c"       \
-
-
-
 vpnc: uclibc $(VPNC_TARGET_BINARY)
 
 vpnc-source: $(DL_DIR)/$(VPNC_SOURCE)

diff --git a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk
index fc294aa6d0586e061a078135e01a80c2b7c4a4d2..35fa7c34351677826089f0da9dd6f315f9f31291 100644 (file)
--- a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk
+++ b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk
@@ -31,11 +31,11 @@ DataflashBoot-clean:
 DataflashBoot-dirclean:
        rm -rf $(DATAFLASHBOOT_DIR)
 
-dataflash:      $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY)
+dataflash: $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY)
        mkdir -p $(BINARIES_DIR)
-       cp $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY) $(BINARIES_DIR)/$(BOARD_NAME)-$(DATAFLASHBOOT_BINARY)
-ifneq  ($(TARGET_ATMEL_COPYTO),)
-       cp $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY) /tftpboot/$(BOARD_NAME)-$(DATAFLASHBOOT_BINARY)
+       cp $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY) $(BINARIES_DIR)/$(BOARD_NAME)-$(DATAFLASHBOOT_BINARY)
+ifneq ($(TARGET_ATMEL_COPYTO),)
+       cp $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY) /tftpboot/$(BOARD_NAME)-$(DATAFLASHBOOT_BINARY)
 endif
 
 #############################################################

diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in
index 4aa557935dd27d5376f7756157c8525a1f9416e6..e920be9335572a33d0ef47021de8e2e3b9517634 100644 (file)
--- a/target/device/Atmel/Makefile.in
+++ b/target/device/Atmel/Makefile.in
@@ -44,7 +44,7 @@ LINUX26_BINLOC=$(LINUX26_FORMAT)
 
 LINUX26_COPYTO:=/tftpboot
 
-ifeq   ($(DEFAULT_KERNEL_HEADERS),2.6.22.1)
+ifeq ($(DEFAULT_KERNEL_HEADERS),2.6.22.1)
 KERNEL_HEADERS_PATCH_DIR:=target/device/Atmel/linux/kernel-patches-$(DOWNLOAD_LINUX26_VERSION)
 else
 # Patch during kernel header build

diff --git a/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/target/device/Atmel/at91bootstrap/at91bootstrap.mk
index 5c84f0f87cd5a9dee417c23cbe413bbae53ee665..ee12122449692a0d48a9fa94ac343df120b4607e 100644 (file)
--- a/target/device/Atmel/at91bootstrap/at91bootstrap.mk
+++ b/target/device/Atmel/at91bootstrap/at91bootstrap.mk
@@ -27,10 +27,10 @@ AT91BOOTSTRAP_JUMP_ADDR:=$(strip  $(subst ",, $(BR2_AT91BOOTSTRAP_JUMP_ADDR)))
 AT91BOOTSTRAP_IMG_SIZE:=$(strip  $(subst ",, $(BR2_AT91BOOTSTRAP_IMG_SIZE)))
 
 AT91_CUSTOM_FLAGS:=
-ifneq  ($(AT91BOOTSTRAP_JUMP_ADDR),)
+ifneq ($(AT91BOOTSTRAP_JUMP_ADDR),)
 AT91_CUSTOM_FLAGS+=-DJUMP_ADDR=$(AT91BOOTSTRAP_JUMP_ADDR) 
 endif
-ifneq  ($(AT91BOOTSTRAP_IMG_SIZE),)
+ifneq ($(AT91BOOTSTRAP_IMG_SIZE),)
 AT91_CUSTOM_FLAGS+=-DIMG_SIZE=$(AT91BOOTSTRAP_IMG_SIZE) 
 endif
 
@@ -43,31 +43,31 @@ $(AT91BOOTSTRAP_DIR)/.unpacked: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)
        toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) target/device/Atmel/at91bootstrap/ at91bootstrap\*.patch
        touch $(AT91BOOTSTRAP_DIR)/.unpacked
 
-atbu:  $(AT91BOOTSTRAP_DIR)/.unpacked
+atbu: $(AT91BOOTSTRAP_DIR)/.unpacked
 
 $(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config
-       $(MAKE)                                 \
+       $(MAKE) \
                MEMORY=$(AT91BOOTSTRAP_MEMORY)  \
                CROSS_COMPILE=$(TARGET_CROSS)   \
                -C $(AT91BOOTSTRAP_DIR)         \
                $(BOARD_NAME)_defconfig
-       touch   $(AT91BOOTSTRAP_DIR)/.configured
+       touch $(AT91BOOTSTRAP_DIR)/.configured
 
 $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured
-       $(MAKE)                                 \
+       $(MAKE) \
                MEMORY=$(AT91BOOTSTRAP_MEMORY)  \
                CROSS_COMPILE=$(TARGET_CROSS)   \
                AT91_CUSTOM_FLAGS="$(AT91_CUSTOM_FLAGS)" \
                -C $(AT91BOOTSTRAP_DIR)
 
-$(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY):       $(AT91BOOTSTRAP_TARGET)
+$(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY): $(AT91BOOTSTRAP_TARGET)
        mkdir -p $(BINARIES_DIR)
-       cp $(AT91BOOTSTRAP_TARGET)      $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
-       cp $(AT91BOOTSTRAP_TARGET)      /tftpboot/$(AT91BOOTSTRAP_BINARY)
+       cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
+       cp $(AT91BOOTSTRAP_TARGET) /tftpboot/$(AT91BOOTSTRAP_BINARY)
 
 .PHONY:        at91bootstrap at91bootstrap-source
 
-at91bootstrap: $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
+at91bootstrap: $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
 
 at91bootstrap-source: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)
 

diff --git a/target/device/Atmel/u-boot/u-boot.mk b/target/device/Atmel/u-boot/u-boot.mk
index 4a8967f37de9753e261dfa96fc6363a5c5702949..35b9f2166e5027d7dc8957b6a5a2d78d1b8dcfa2 100644 (file)
--- a/target/device/Atmel/u-boot/u-boot.mk
+++ b/target/device/Atmel/u-boot/u-boot.mk
@@ -49,14 +49,14 @@ $(DL_DIR)/$(UBOOT_PATCH_SOURCE):
        $(WGET) -P $(DL_DIR) $(UBOOT_PATCH_SITE)/$(UBOOT_PATCH_SOURCE)
 
 $(UBOOT_DIR)/.unpacked: $(DL_DIR)/$(UBOOT_SOURCE)
-       mkdir -p   $(BUILD_DIR)
+       mkdir -p $(BUILD_DIR)
        $(UBOOT_CAT) $(DL_DIR)/$(UBOOT_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-       touch   $@
+       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   $@
+       bzcat $(DL_DIR)/$(UBOOT_PATCH_SOURCE) | tar -C $(UBOOT_PATCHES) -xvf -
+       touch $@
 
 $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE): $(UBOOT_DIR)/.unpacked $(UBOOT_PATCHES)/.unpacked
        toolchain/patch-kernel.sh $(UBOOT_DIR) $(UBOOT_PATCHES) *.patch
@@ -66,106 +66,107 @@ $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE): $(UBOOT_DIR)/.unpacked $(UBOOT_PATC
 #      cp $(UBOOT_ATMEL_BMP) $(UBOOT_DIR)/tools/logos/.
 
 $(UBOOT_BUILD_DIR)/.configured: $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE)
-ifneq  ($(strip $(UBOOT_CONFIG_FILE)),)
+ifneq ($(strip $(UBOOT_CONFIG_FILE)),)
        cp $(UBOOT_CONFIG_FILE) $(UBOOT_DIR)/include/configs/.
 endif
-       $(MAKE)                         \
-               O=$(UBOOT_BUILD_DIR)    \
-               CONFIG_NOSOFTFLOAT=1            \
-               -C $(UBOOT_DIR)         \
+       $(MAKE) \
+               O=$(UBOOT_BUILD_DIR) \
+               CONFIG_NOSOFTFLOAT=1 \
+               -C $(UBOOT_DIR) \
                $(UBOOT_CONFIG)
        $(SED) 's/ $$(SREC) $$(BIN)//' $(UBOOT_DIR)/examples/Makefile
        touch $(UBOOT_BUILD_DIR)/.configured
-#      $(MAKE) O=$(UBOOT_BUILD_DIR) -C $(UBOOT_DIR) 
+#      $(MAKE) O=$(UBOOT_BUILD_DIR) -C $(UBOOT_DIR)
 
 $(MKIMAGE_BINLOC): $(UBOOT_BUILD_DIR)/.configured
        $(MAKE) \
-               O=$(UBOOT_BUILD_DIR)            \
-               CROSS_COMPILE=                  \
-               CONFIG_NOSOFTFLOAT=1            \
-               TOPDIR=$(UBOOT_DIR)             \
-               SRCTREE=$(UBOOT_DIR)            \
-               -C $(UBOOT_DIR) tools
+               O=$(UBOOT_BUILD_DIR) \
+               CROSS_COMPILE= \
+               CONFIG_NOSOFTFLOAT=1 \
+               TOPDIR=$(UBOOT_DIR) \
+               SRCTREE=$(UBOOT_DIR) \
+               -C $(UBOOT_DIR) tools
        touch $(MKIMAGE_BINLOC)
 
-$(UBOOT_BUILD_DIR)/u-boot.bin: $(UBOOT_BUILD_DIR)/.configured $(UBOOT_CUSTOM)
+$(UBOOT_BUILD_DIR)/u-boot.bin: $(UBOOT_BUILD_DIR)/.configured $(UBOOT_CUSTOM)
        echo TARGET_CROSS=$(TARGET_CROSS)
-       $(MAKE) O=$(UBOOT_BUILD_DIR)            \
-               CROSS_COMPILE=$(TARGET_CROSS)   \
-               CONFIG_NOSOFTFLOAT=1            \
-               TOPDIR=$(UBOOT_DIR)             \
-               SRCTREE=$(UBOOT_DIR)            \
-               TFTPBOOT=/tftpboot              \
+       $(MAKE) O=$(UBOOT_BUILD_DIR) \
+               CROSS_COMPILE=$(TARGET_CROSS) \
+               CONFIG_NOSOFTFLOAT=1 \
+               TOPDIR=$(UBOOT_DIR) \
+               SRCTREE=$(UBOOT_DIR) \
+               TFTPBOOT=/tftpboot \
                -C $(UBOOT_DIR)
 
-$(BINARIES_DIR)/$(UBOOT_BIN):  $(UBOOT_BUILD_DIR)/u-boot.bin
+$(BINARIES_DIR)/$(UBOOT_BIN): $(UBOOT_BUILD_DIR)/u-boot.bin
        mkdir -p $(BINARIES_DIR)
        cp $(UBOOT_BUILD_DIR)/u-boot.bin $(BINARIES_DIR)/$(UBOOT_BIN)
 
-/tftpboot/$(UBOOT_BIN):        $(UBOOT_BUILD_DIR)/u-boot.bin
+/tftpboot/$(UBOOT_BIN): $(UBOOT_BUILD_DIR)/u-boot.bin
        mkdir -p /tftpboot
        cp $(UBOOT_BUILD_DIR)/u-boot.bin /tftpboot/$(UBOOT_BIN)
 
-uboot-bin:     $(BINARIES_DIR)/$(UBOOT_BIN)    /tftpboot/$(UBOOT_BIN)
+uboot-bin: $(BINARIES_DIR)/$(UBOOT_BIN) /tftpboot/$(UBOOT_BIN)
 
-$(UBOOT_CUSTOM).test:  .config $(UBOOT_BUILD_DIR)/.configured
-       echo    "/* Automatically generated file, do not edit */"               >  $(UBOOT_CUSTOM).test
-ifneq  ($(TARGET_HOSTNAME),)
-       echo    "#if defined(CONFIG_HOSTNAME)"                                  >> $(UBOOT_CUSTOM).test
-       echo    "#undef  CONFIG_HOSTNAME"                                       >> $(UBOOT_CUSTOM).test
-       echo    "#define CONFIG_HOSTNAME                $(TARGET_HOSTNAME)"     >> $(UBOOT_CUSTOM).test
-       echo    "#endif"                                                        >> $(UBOOT_CUSTOM).test
+$(UBOOT_CUSTOM).test: .config $(UBOOT_BUILD_DIR)/.configured
+       echo "/* Automatically generated file, do not edit */" \
+       > $(UBOOT_CUSTOM).test
+ifneq ($(TARGET_HOSTNAME),)
+       echo "#if defined(CONFIG_HOSTNAME)">> $(UBOOT_CUSTOM).test
+       echo "#undef CONFIG_HOSTNAME">> $(UBOOT_CUSTOM).test
+       echo "#define CONFIG_HOSTNAME $(TARGET_HOSTNAME)">> $(UBOOT_CUSTOM).test
+       echo "#endif">> $(UBOOT_CUSTOM).test
 endif
-ifneq  ($(TARGET_UBOOT_IPADDR),)
-       echo    "#define CONFIG_IPADDR          $(TARGET_UBOOT_IPADDR)"         >> $(UBOOT_CUSTOM).test
+ifneq ($(TARGET_UBOOT_IPADDR),)
+       echo "#define CONFIG_IPADDR $(TARGET_UBOOT_IPADDR)">> $(UBOOT_CUSTOM).test
 endif
-ifneq  ($(TARGET_UBOOT_SERVERIP),)
-       echo    "#define CONFIG_SERVERIP        $(TARGET_UBOOT_SERVERIP)"       >> $(UBOOT_CUSTOM).test
+ifneq ($(TARGET_UBOOT_SERVERIP),)
+       echo "#define CONFIG_SERVERIP $(TARGET_UBOOT_SERVERIP)">> $(UBOOT_CUSTOM).test
 endif
-ifneq  ($(TARGET_UBOOT_GATEWAY),)
-       echo    "#define CONFIG_GATEWAYIP       $(TARGET_UBOOT_GATEWAY)"        >> $(UBOOT_CUSTOM).test
+ifneq ($(TARGET_UBOOT_GATEWAY),)
+       echo "#define CONFIG_GATEWAYIP $(TARGET_UBOOT_GATEWAY)">> $(UBOOT_CUSTOM).test
 endif
-ifneq  ($(TARGET_UBOOT_NETMASK),)
-       echo    "#define CONFIG_NETMASK         $(TARGET_UBOOT_NETMASK)"        >> $(UBOOT_CUSTOM).test
+ifneq ($(TARGET_UBOOT_NETMASK),)
+       echo "#define CONFIG_NETMASK $(TARGET_UBOOT_NETMASK)">> $(UBOOT_CUSTOM).test
 endif
-ifneq  ($(TARGET_UBOOT_ETHADDR),)
-       echo    "#define CONFIG_ETHADDR         $(TARGET_UBOOT_ETHADDR)"        >> $(UBOOT_CUSTOM).test
+ifneq ($(TARGET_UBOOT_ETHADDR),)
+       echo "#define CONFIG_ETHADDR $(TARGET_UBOOT_ETHADDR)">> $(UBOOT_CUSTOM).test
 endif
        diff -q $(UBOOT_CUSTOM).test $(UBOOT_CUSTOM) || cp -af $(UBOOT_CUSTOM).test $(UBOOT_CUSTOM)
 
-$(UBOOT_SCR):  .config
-ifneq  ($(TARGET_UBOOT_IPADDR),)
-       echo setenv ipaddr              $(TARGET_UBOOT_IPADDR)                  >  $(UBOOT_SCR)
+$(UBOOT_SCR): .config
+ifneq ($(TARGET_UBOOT_IPADDR),)
+       echo setenv ipaddr $(TARGET_UBOOT_IPADDR)> $(UBOOT_SCR)
 endif
-ifneq  ($(TARGET_UBOOT_SERVERIP),)
-       echo setenv serverip            $(TARGET_UBOOT_SERVERIP)                >> $(UBOOT_SCR)
+ifneq ($(TARGET_UBOOT_SERVERIP),)
+       echo setenv serverip $(TARGET_UBOOT_SERVERIP)>> $(UBOOT_SCR)
 endif
-ifneq  ($(TARGET_UBOOT_GATEWAY),)
-       echo setenv gatewayip           $(TARGET_UBOOT_GATEWAY)                 >> $(UBOOT_SCR)
+ifneq ($(TARGET_UBOOT_GATEWAY),)
+       echo setenv gatewayip $(TARGET_UBOOT_GATEWAY)>> $(UBOOT_SCR)
 endif
-ifneq  ($(TARGET_UBOOT_NETMASK),)
-       echo setenv netmask             $(TARGET_UBOOT_NETMASK)                 >> $(UBOOT_SCR)
+ifneq ($(TARGET_UBOOT_NETMASK),)
+       echo setenv netmask $(TARGET_UBOOT_NETMASK)>> $(UBOOT_SCR)
 endif
-       echo setenv linux               $(LINUX26_KERNEL)                       >> $(UBOOT_SCR)
-       echo setenv kernel-version      $(LINUX26_VERSION)                      >> $(UBOOT_SCR)
-       echo setenv kernel-date         $(DATE)                                 >> $(UBOOT_SCR)
-       echo setenv hostname            $(TARGET_HOSTNAME)                      >> $(UBOOT_SCR)
-       echo setenv fs-date             $(DATE)                                 >> $(UBOOT_SCR)
-       echo setenv rd-1                rootfs.$(BR2_ARCH)-$(DATE).ext2         >> $(UBOOT_SCR)
-       echo setenv rd-2                rootfs.$(BR2_ARCH)-$(DATE).jffs2        >> $(UBOOT_SCR)
-       echo setenv rd                  rootfs.$(BR2_ARCH)-$(DATE).ext2         >> $(UBOOT_SCR)
-       echo setenv ver                 1                                       >> $(UBOOT_SCR)
-ifneq  ($(TARGET_UBOOT_ETHADDR),)
-       echo setenv ethaddr             $(TARGET_UBOOT_ETHADDR)                 >> $(UBOOT_SCR)
+       echo setenv linux $(LINUX26_KERNEL)>> $(UBOOT_SCR)
+       echo setenv kernel-version $(LINUX26_VERSION)>> $(UBOOT_SCR)
+       echo setenv kernel-date $(DATE)>> $(UBOOT_SCR)
+       echo setenv hostname $(TARGET_HOSTNAME) >> $(UBOOT_SCR)
+       echo setenv fs-date $(DATE)>> $(UBOOT_SCR)
+       echo setenv rd-1 rootfs.$(BR2_ARCH)-$(DATE).ext2>> $(UBOOT_SCR)
+       echo setenv rd-2 rootfs.$(BR2_ARCH)-$(DATE).jffs2>> $(UBOOT_SCR)
+       echo setenv rd rootfs.$(BR2_ARCH)-$(DATE).ext2>> $(UBOOT_SCR)
+       echo setenv ver 1>> $(UBOOT_SCR)
+ifneq ($(TARGET_UBOOT_ETHADDR),)
+       echo setenv ethaddr $(TARGET_UBOOT_ETHADDR)>> $(UBOOT_SCR)
 endif
-       echo setenv fstype              ram                                     >> $(UBOOT_SCR)
-       echo fs                                                                 >> $(UBOOT_SCR)
-       echo os                                                                 >> $(UBOOT_SCR)
-       echo setargs                                                            >> $(UBOOT_SCR)
-       echo saveenv                                                            >> $(UBOOT_SCR)
-
-$(UBOOT_SCR).$(PROJECT):       $(UBOOT_SCR)     $(MKIMAGE)
-       $(MKIMAGE)  -A arm \
+       echo setenv fstype ram>> $(UBOOT_SCR)
+       echo fs >> $(UBOOT_SCR)
+       echo os >> $(UBOOT_SCR)
+       echo setargs>> $(UBOOT_SCR)
+       echo saveenv>> $(UBOOT_SCR)
+
+$(UBOOT_SCR).$(PROJECT): $(UBOOT_SCR) $(MKIMAGE)
+       $(MKIMAGE) -A arm \
                                -O linux        \
                                -T script       \
                                -C none         \
@@ -174,35 +175,35 @@ $(UBOOT_SCR).$(PROJECT):  $(UBOOT_SCR)     $(MKIMAGE)
                                -n "autoscr config" \
                                -d $(UBOOT_SCR) \
                                $(UBOOT_SCR).$(PROJECT)
-       cp      $(UBOOT_SCR).$(PROJECT) /tftpboot
+       cp $(UBOOT_SCR).$(PROJECT) /tftpboot
 
-$(MKIMAGE):    $(MKIMAGE_BINLOC) 
-       cp -f $(MKIMAGE_BINLOC)  $(MKIMAGE)
+$(MKIMAGE): $(MKIMAGE_BINLOC) 
+       cp -f $(MKIMAGE_BINLOC) $(MKIMAGE)
 
-uboot: $(MKIMAGE)      uboot-bin $(UBOOT_SCR).$(PROJECT)
+uboot: $(MKIMAGE) uboot-bin $(UBOOT_SCR).$(PROJECT)
 
 uboot-source: $(DL_DIR)/$(UBOOT_SOURCE)
 
 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)
+       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
 
-uboot-dirclean:        uboot-clean
+uboot-dirclean: uboot-clean
        rm -rf $(UBOOT_DIR)
 
 uboot-new:
-       rm -fr  $(UBOOT_BUILD_DIR)/u-boot
-       rm -fr  $(UBOOT_BUILD_DIR)/u-boot.gz
-       rm -fr  $(UBOOT_BUILD_DIR)/u-boot.bin
-       rm -fr  /tftpboot/$(UBOOT_BIN)
-       rm -fr  $(BINARIES_DIR)/$(UBOOT_BIN)
+       rm -fr $(UBOOT_BUILD_DIR)/u-boot
+       rm -fr $(UBOOT_BUILD_DIR)/u-boot.gz
+       rm -fr $(UBOOT_BUILD_DIR)/u-boot.bin
+       rm -fr /tftpboot/$(UBOOT_BIN)
+       rm -fr $(BINARIES_DIR)/$(UBOOT_BIN)
 
-.PHONY:        uboot-bin
+.PHONY: uboot-bin
 #############################################################
 #
 # Build the uboot root filesystem image
@@ -251,31 +252,31 @@ TARGETS+=uboot
 endif
 
 uboot-test:
-       -@echo  source=$(DL_DIR)/$(UBOOT_SOURCE)
-       -@ls    $(DL_DIR)/$(UBOOT_SOURCE)
-       -@echo  patch=$(DL_DIR)/$(UBOOT_PATCH_SOURCE)
-       -@ls    $(DL_DIR)/$(UBOOT_PATCH_SOURCE)
-       -@echo  unpacked=$(UBOOT_PATCHES)/.unpacked
-       -@ls    $(UBOOT_PATCHES)/.unpacked
-       -@echo  patch-unpacked=$(UBOOT_PATCHES)/.unpacked
-       -@ls    $(UBOOT_PATCHES)/.unpacked
-       -@echo  patched-source=$(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE)
-       -@ls    $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE)
-       -@echo  configured=$(UBOOT_BUILD_DIR)/.configured
-       -@ls    $(UBOOT_BUILD_DIR)/.configured
-       -@echo  mkimage=$(MKIMAGE_BINLOC)
-       -@ls    $(MKIMAGE_BINLOC)
-       -@echo  u-boot.bin=$(UBOOT_BUILD_DIR)/u-boot.bin
-       -@ls    $(UBOOT_BUILD_DIR)/u-boot.bin
-       -@echo  binaries-u-boot.bin=$(BINARIES_DIR)/$(UBOOT_BIN)
-       -@ls    $(BINARIES_DIR)/$(UBOOT_BIN)
-       -@echo  tftpboot=/tftpboot/$(UBOOT_BIN)
-       -@ls    /tftpboot/$(UBOOT_BIN)
-       -@echo  "mkimage = $(MKIMAGE)"
-       -@ls    $(MKIMAGE)
-       -@echo  "u-boot script=$(UBOOT_SCR).$(PROJECT)"
-       -@ls    $(UBOOT_SCR).$(PROJECT)
-       -@echo  "u-boot script (ASCII)=$(UBOOT_SCR)"
-       -@ls    $(UBOOT_SCR)
+       -@echo source=$(DL_DIR)/$(UBOOT_SOURCE)
+       -@ls $(DL_DIR)/$(UBOOT_SOURCE)
+       -@echo patch=$(DL_DIR)/$(UBOOT_PATCH_SOURCE)
+       -@ls $(DL_DIR)/$(UBOOT_PATCH_SOURCE)
+       -@echo unpacked=$(UBOOT_PATCHES)/.unpacked
+       -@ls $(UBOOT_PATCHES)/.unpacked
+       -@echo patch-unpacked=$(UBOOT_PATCHES)/.unpacked
+       -@ls $(UBOOT_PATCHES)/.unpacked
+       -@echo patched-source=$(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE)
+       -@ls $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE)
+       -@echo configured=$(UBOOT_BUILD_DIR)/.configured
+       -@ls $(UBOOT_BUILD_DIR)/.configured
+       -@echo mkimage=$(MKIMAGE_BINLOC)
+       -@ls $(MKIMAGE_BINLOC)
+       -@echo u-boot.bin=$(UBOOT_BUILD_DIR)/u-boot.bin
+       -@ls $(UBOOT_BUILD_DIR)/u-boot.bin
+       -@echo binaries-u-boot.bin=$(BINARIES_DIR)/$(UBOOT_BIN)
+       -@ls $(BINARIES_DIR)/$(UBOOT_BIN)
+       -@echo tftpboot=/tftpboot/$(UBOOT_BIN)
+       -@ls /tftpboot/$(UBOOT_BIN)
+       -@echo "mkimage = $(MKIMAGE)"
+       -@ls $(MKIMAGE)
+       -@echo "u-boot script=$(UBOOT_SCR).$(PROJECT)"
+       -@ls $(UBOOT_SCR).$(PROJECT)
+       -@echo "u-boot script (ASCII)=$(UBOOT_SCR)"
+       -@ls $(UBOOT_SCR)
        -@echo "mkimage binary=$(MKIMAGE_BINLOC)"
-       -@ls    $(MKIMAGE_BINLOC)
+       -@ls $(MKIMAGE_BINLOC)

diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
index c65e241cbfce586f7723dfaa6bc56cb75c72b872..3028521362ff7b7b81ed1b19ad1a7ffa2ba54f85 100644 (file)
--- a/target/linux/Makefile.in
+++ b/target/linux/Makefile.in
@@ -55,7 +55,7 @@ LINUX26_BINLOC=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT)
 endif
 
 # File name for the Linux kernel binary
-ifndef LINUX26_KERNEL
+ifndef LINUX26_KERNEL
 LINUX26_KERNEL=$(BINARIES_DIR)/linux-kernel-$(LINUX26_VERSION)-$(KERNEL_ARCH)
 endif
 

diff --git a/toolchain/external-toolchain/ext-tool.mk b/toolchain/external-toolchain/ext-tool.mk
index 582b157494f593c93f55941ea927390513e0434c..df1c5c5e7d9fe29decb546663530560a62705b95 100644 (file)
--- a/toolchain/external-toolchain/ext-tool.mk
+++ b/toolchain/external-toolchain/ext-tool.mk
@@ -3,7 +3,7 @@
 #
 # $1: source
 # $2: destination
-# $2: strip (y|n)      default is to strip
+# $2: strip (y|n)       default is to strip
 #
 copy_toolchain_lib_root =                                                                      \
        LIB="$(strip $1)";                                                                      \