diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-08-22 12:35:41 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-08-22 12:35:41 +0000 |
commit | 6547bced933fface8e0f0dde08f0e0fe1777ddf9 (patch) | |
tree | dd9ff179b33488ed7acf0829c89c7f1057dcd3b0 /target | |
parent | 3471ebe0a3d5c74856ce8fe813345136a5f2aaf3 (diff) | |
download | buildroot-novena-6547bced933fface8e0f0dde08f0e0fe1777ddf9.tar.gz buildroot-novena-6547bced933fface8e0f0dde08f0e0fe1777ddf9.zip |
- global whitespace trimming
Diffstat (limited to 'target')
-rw-r--r-- | target/cloop/cloop.mk | 14 | ||||
-rw-r--r-- | target/device/AMD/DBAu1500/linux26.mk | 4 | ||||
-rw-r--r-- | target/device/Atmel/DataFlashBoot/DataflashBoot.mk | 2 | ||||
-rw-r--r-- | target/device/Atmel/Makefile.in | 14 | ||||
-rw-r--r-- | target/device/Atmel/at91bootstrap/at91bootstrap.mk | 28 | ||||
-rw-r--r-- | target/device/Atmel/u-boot/u-boot.mk | 42 | ||||
-rw-r--r-- | target/device/Sharp/LNode80/linux.mk | 24 | ||||
-rw-r--r-- | target/device/Soekris/net4521/linux.mk | 24 | ||||
-rw-r--r-- | target/device/Soekris/soekris_gpio/Makefile | 22 | ||||
-rw-r--r-- | target/device/Via/epia-mii/linux.mk | 24 | ||||
-rw-r--r-- | target/device/jp/q5/linux.mk | 24 | ||||
-rw-r--r-- | target/ext2/ext2root.mk | 2 | ||||
-rw-r--r-- | target/initramfs/initramfs.mk | 4 | ||||
-rw-r--r-- | target/iso9660/iso9660.mk | 2 | ||||
-rw-r--r-- | target/linux-experimental/Makefile.in | 122 | ||||
-rw-r--r-- | target/linux/Makefile.in | 2 |
16 files changed, 177 insertions, 177 deletions
diff --git a/target/cloop/cloop.mk b/target/cloop/cloop.mk index 180d43f72..5f55bf5a9 100644 --- a/target/cloop/cloop.mk +++ b/target/cloop/cloop.mk @@ -18,7 +18,7 @@ CLOOP_SITE=http://developer.linuxtag.net/knoppix/sources CLOOP_TARGET:=$(IMAGE).cloop ### Note: not used yet! ck ### $(DL_DIR)/$(CLOOP_PATCH1): -### $(WGET) -P $(DL_DIR) $(CLOOP_PATCH1_URL)/$(CLOOP_PATCH1) +### $(WGET) -P $(DL_DIR) $(CLOOP_PATCH1_URL)/$(CLOOP_PATCH1) $(DL_DIR)/$(CLOOP_SOURCE): $(WGET) -P $(DL_DIR) $(CLOOP_SITE)/$(CLOOP_SOURCE) @@ -26,8 +26,8 @@ $(DL_DIR)/$(CLOOP_SOURCE): $(CLOOP_DIR)/.unpacked: $(DL_DIR)/$(CLOOP_SOURCE) ### $(DL_DIR)/$(CLOOP_PATCH1) $(ZCAT) $(DL_DIR)/$(CLOOP_SOURCE) | tar -C $(BUILD_DIR) -xvf - touch $@ -### $(ZCAT) $(DL_DIR)/$(CLOOP_PATCH1) | patch -p1 -d $(CLOOP_DIR) -### toolchain/patch-kernel.sh $(CLOOP_DIR) target/cloop/ cloop\*.patch +### $(ZCAT) $(DL_DIR)/$(CLOOP_PATCH1) | patch -p1 -d $(CLOOP_DIR) +### toolchain/patch-kernel.sh $(CLOOP_DIR) target/cloop/ cloop\*.patch $(CLOOP_DIR)/create_compressed_fs: $(CLOOP_DIR)/.unpacked $(MAKE) CFLAGS="-Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DUSE_ERROR_SILENT" -C $(CLOOP_DIR) \ @@ -63,7 +63,7 @@ cloop-module: $(CLOOP_DIR)/cloop.o # mkisofs 2.01a34-unofficial-iconv from http://users.utu.fi/jahhein/mkisofs/ # optional: # symlinks: scan/change symbolic links - v1.2 - by Mark Lord -# from ftp://ftp.ibiblio.org/pub/Linux/utils/file/ +# from ftp://ftp.ibiblio.org/pub/Linux/utils/file/ # ############################################################# @@ -119,7 +119,7 @@ clooproot-dirclean: # other_fs: /mnt/compressed/var/tmp -> /tmp # # ls -lrsS root_fs_*.* -# 1296 -rw-r--r-- 1 claus users 1325478 Mar 13 16:52 root_fs_powerpc.cloop -# 1448 -rw-r--r-- 1 claus users 1482752 Mar 13 16:52 root_fs_powerpc.cramfs -# 1840 -rw-r--r-- 1 claus users 1883408 Mar 13 13:14 root_fs_powerpc.jffs2 +# 1296 -rw-r--r-- 1 claus users 1325478 Mar 13 16:52 root_fs_powerpc.cloop +# 1448 -rw-r--r-- 1 claus users 1482752 Mar 13 16:52 root_fs_powerpc.cramfs +# 1840 -rw-r--r-- 1 claus users 1883408 Mar 13 13:14 root_fs_powerpc.jffs2 ############################################################# diff --git a/target/device/AMD/DBAu1500/linux26.mk b/target/device/AMD/DBAu1500/linux26.mk index 7a457c7b0..7ef013f00 100644 --- a/target/device/AMD/DBAu1500/linux26.mk +++ b/target/device/AMD/DBAu1500/linux26.mk @@ -63,7 +63,7 @@ $(LINUX26_DIR)/.patched: $(LINUX26_DIR)/.unpacked #toolchain/patch-kernel.sh $(LINUX26_DIR) $(LINUX26_PATCH_DIR) touch $(LINUX26_DIR)/.patched -$(LINUX26_DIR)/.configured: $(LINUX26_DIR)/.patched $(LINUX26_KCONFIG) +$(LINUX26_DIR)/.configured: $(LINUX26_DIR)/.patched $(LINUX26_KCONFIG) -cp $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) oldconfig touch $(LINUX26_DIR)/.configured @@ -73,7 +73,7 @@ linux26-menuconfig: $(LINUX26_DIR)/.patched $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) menuconfig -[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured -$(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured +$(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) prepare touch $(LINUX26_DIR)/.depend_done diff --git a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk index 35fa7c343..716e147b8 100644 --- a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk +++ b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk @@ -5,7 +5,7 @@ ############################################################# DATAFLASHBOOT_VERSION:=1.05 DATAFLASHBOOT_NAME:=DataflashBoot-$(DATAFLASHBOOT_VERSION) -ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) +ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) #")) DATAFLASHBOOT_SITE:=$(ATMEL_MIRROR)/Source DATAFLASHBOOT_SOURCE:=$(DATAFLASHBOOT_NAME).tar.bz2 diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in index e920be933..728c51c9e 100644 --- a/target/device/Atmel/Makefile.in +++ b/target/device/Atmel/Makefile.in @@ -3,9 +3,9 @@ ifeq ($(strip $(BR2_TARGET_ATMEL)),y) ATMEL_PATH:=target/device/Atmel -BOARD_NAME:=$(strip $(subst ",, $(BR2_BOARD_NAME))) +BOARD_NAME:=$(strip $(subst ",, $(BR2_BOARD_NAME))) #")) -BOARD_PATH:=$(strip $(subst ",, $(BR2_BOARD_PATH))) +BOARD_PATH:=$(strip $(subst ",, $(BR2_BOARD_PATH))) #")) ATMEL_TARGET:=$(ATMEL_PATH)/root @@ -13,24 +13,24 @@ TARGET_SKELETON:=$(ATMEL_TARGET)/target_skeleton TARGET_DEVICE_TABLE:=$(ATMEL_TARGET)/device_table.txt TARGET_SKELETON_LINKS:=$(ATMEL_TARGET)/skel.tar.gz -TARGET_ATMEL_COPYTO:=$(strip $(subst ",, $(BR2_TARGET_ATMEL_COPYTO))) +TARGET_ATMEL_COPYTO:=$(strip $(subst ",, $(BR2_TARGET_ATMEL_COPYTO))) # These are set by Config.in -DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) +DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) #")) ifeq ($(DOWNLOAD_LINUX26_VERSION),) DOWNLOAD_LINUX26_VERSION=$(LINUX_HEADERS_VERSION) endif -LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION))) +LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION))) #")) ifeq ($(LINUX26_VERSION),) LINUX26_VERSION=$(LINUX_HEADERS_VERSION) endif -LINUX26_RC_PATCH:=$(strip $(subst ",, $(BR2_LINUX26_RC_PATCH))) +LINUX26_RC_PATCH:=$(strip $(subst ",, $(BR2_LINUX26_RC_PATCH))) #")) -LINUX_BSP_PATCH:=$(strip $(subst ",, $(BR2_LINUX_BSP_ATMEL_PATCH))) +LINUX_BSP_PATCH:=$(strip $(subst ",, $(BR2_LINUX_BSP_ATMEL_PATCH))) #")) # These are set by "new" Config.in diff --git a/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/target/device/Atmel/at91bootstrap/at91bootstrap.mk index ee1212244..5faef4175 100644 --- a/target/device/Atmel/at91bootstrap/at91bootstrap.mk +++ b/target/device/Atmel/at91bootstrap/at91bootstrap.mk @@ -7,31 +7,31 @@ AT91BOOTSTRAP_VERSION:=2.3 AT91BOOTSTRAP_PATCH_LEVEL:=2 AT91BOOTSTRAP_PATCHED_VERSION:=$(AT91BOOTSTRAP_VERSION).$(AT91BOOTSTRAP_PATCH_LEVEL) AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION) -ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) +ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) #")) AT91BOOTSTRAP_SITE:=$(ATMEL_MIRROR)/Source AT91BOOTSTRAP_SOURCE:=$(AT91BOOTSTRAP_NAME).tar.bz2 AT91BOOTSTRAP_DIR:=$(PROJECT_BUILD_DIR)/$(AT91BOOTSTRAP_NAME) -AT91BOOTSTRAP:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP))) +AT91BOOTSTRAP:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP))) #")) AT91BOOTSTRAP_ZCAT:=bzcat -AT91BOOTSTRAP_MEMORY:=$(strip $(subst ",, $(BR2_TARGET_AT91BOOTSTRAP_MEMORY))) +AT91BOOTSTRAP_MEMORY:=$(strip $(subst ",, $(BR2_TARGET_AT91BOOTSTRAP_MEMORY))) #")) AT91BOOTSTRAP_BINARY:=$(BOARD_NAME)-$(AT91BOOTSTRAP_MEMORY)boot-$(AT91BOOTSTRAP_PATCHED_VERSION).bin AT91BOOTSTRAP_TARGET:=$(AT91BOOTSTRAP_DIR)/binaries/$(AT91BOOTSTRAP_BINARY) -AT91BOOTSTRAP_JUMP_ADDR:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP_JUMP_ADDR))) -AT91BOOTSTRAP_IMG_SIZE:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP_IMG_SIZE))) +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),) -AT91_CUSTOM_FLAGS+=-DJUMP_ADDR=$(AT91BOOTSTRAP_JUMP_ADDR) +AT91_CUSTOM_FLAGS+=-DJUMP_ADDR=$(AT91BOOTSTRAP_JUMP_ADDR) endif ifneq ($(AT91BOOTSTRAP_IMG_SIZE),) -AT91_CUSTOM_FLAGS+=-DIMG_SIZE=$(AT91BOOTSTRAP_IMG_SIZE) +AT91_CUSTOM_FLAGS+=-DIMG_SIZE=$(AT91BOOTSTRAP_IMG_SIZE) endif $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE): @@ -47,16 +47,16 @@ atbu: $(AT91BOOTSTRAP_DIR)/.unpacked $(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config $(MAKE) \ - MEMORY=$(AT91BOOTSTRAP_MEMORY) \ - CROSS_COMPILE=$(TARGET_CROSS) \ - -C $(AT91BOOTSTRAP_DIR) \ + MEMORY=$(AT91BOOTSTRAP_MEMORY) \ + CROSS_COMPILE=$(TARGET_CROSS) \ + -C $(AT91BOOTSTRAP_DIR) \ $(BOARD_NAME)_defconfig touch $(AT91BOOTSTRAP_DIR)/.configured $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured $(MAKE) \ - MEMORY=$(AT91BOOTSTRAP_MEMORY) \ - CROSS_COMPILE=$(TARGET_CROSS) \ + MEMORY=$(AT91BOOTSTRAP_MEMORY) \ + CROSS_COMPILE=$(TARGET_CROSS) \ AT91_CUSTOM_FLAGS="$(AT91_CUSTOM_FLAGS)" \ -C $(AT91BOOTSTRAP_DIR) @@ -65,13 +65,13 @@ $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY): $(AT91BOOTSTRAP_TARGET) cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY) cp $(AT91BOOTSTRAP_TARGET) /tftpboot/$(AT91BOOTSTRAP_BINARY) -.PHONY: at91bootstrap at91bootstrap-source +.PHONY: at91bootstrap at91bootstrap-source at91bootstrap: $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY) at91bootstrap-source: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) -.PHONY: at91bootstrap-clean at91bootstrap-dirclean +.PHONY: at91bootstrap-clean at91bootstrap-dirclean at91bootstrap-clean: make -C $(AT91BOOTSTRAP_DIR) clean diff --git a/target/device/Atmel/u-boot/u-boot.mk b/target/device/Atmel/u-boot/u-boot.mk index 35b9f2166..5bd1ce278 100644 --- a/target/device/Atmel/u-boot/u-boot.mk +++ b/target/device/Atmel/u-boot/u-boot.mk @@ -1,14 +1,14 @@ ############################################################# # # 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. +# +# 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 -ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) +ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) #")) UBOOT_DIR:=$(BUILD_DIR)/u-boot-$(UBOOT_VERSION) UBOOT_BUILD_DIR:=$(PROJECT_BUILD_DIR)/u-boot-$(UBOOT_VERSION) @@ -30,15 +30,15 @@ UBOOT_PATCHES:=$(PROJECT_BUILD_DIR)/u-boot-patches UBOOT_ATMEL_BMP:=$(UBOOT_PATCHES)/atmel.bmp UBOOT_SCR=$(BINARIES_DIR)/autoscript -TARGET_UBOOT_IPADDR:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_IPADDR))) +TARGET_UBOOT_IPADDR:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_IPADDR))) #")) -TARGET_UBOOT_SERVERIP:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_SERVERIP))) +TARGET_UBOOT_SERVERIP:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_SERVERIP))) #")) -TARGET_UBOOT_GATEWAY:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_GATEWAY))) +TARGET_UBOOT_GATEWAY:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_GATEWAY))) #")) -TARGET_UBOOT_NETMASK:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_NETMASK))) +TARGET_UBOOT_NETMASK:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_NETMASK))) #")) -TARGET_UBOOT_ETHADDR:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_ETHADDR))) +TARGET_UBOOT_ETHADDR:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_ETHADDR))) #")) UBOOT_CUSTOM:=$(UBOOT_DIR)/include/custom.h @@ -61,9 +61,9 @@ $(UBOOT_PATCHES)/.unpacked: $(DL_DIR)/$(UBOOT_PATCH_SOURCE) $(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) -# 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/. +# 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/. $(UBOOT_BUILD_DIR)/.configured: $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE) ifneq ($(strip $(UBOOT_CONFIG_FILE)),) @@ -76,7 +76,7 @@ endif $(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) \ @@ -167,17 +167,17 @@ endif $(UBOOT_SCR).$(PROJECT): $(UBOOT_SCR) $(MKIMAGE) $(MKIMAGE) -A arm \ - -O linux \ - -T script \ - -C none \ - -a 0 \ - -e 0 \ + -O linux \ + -T script \ + -C none \ + -a 0 \ + -e 0 \ -n "autoscr config" \ - -d $(UBOOT_SCR) \ + -d $(UBOOT_SCR) \ $(UBOOT_SCR).$(PROJECT) cp $(UBOOT_SCR).$(PROJECT) /tftpboot -$(MKIMAGE): $(MKIMAGE_BINLOC) +$(MKIMAGE): $(MKIMAGE_BINLOC) cp -f $(MKIMAGE_BINLOC) $(MKIMAGE) uboot: $(MKIMAGE) uboot-bin $(UBOOT_SCR).$(PROJECT) @@ -191,7 +191,7 @@ uboot-clean: rm -fr $(UBOOT_DIR) rm -f $(UBOOT_SCR) rm -f $(UBOOT_SCR).$(PROJECT) -# -$(MAKE) -C $(UBOOT_DIR)/uboot-tools clean +# -$(MAKE) -C $(UBOOT_DIR)/uboot-tools clean uboot-dirclean: uboot-clean rm -rf $(UBOOT_DIR) diff --git a/target/device/Sharp/LNode80/linux.mk b/target/device/Sharp/LNode80/linux.mk index 3fd52193e..4dcef714b 100644 --- a/target/device/Sharp/LNode80/linux.mk +++ b/target/device/Sharp/LNode80/linux.mk @@ -2,21 +2,21 @@ # # Linux kernel targets # -# Note: If you have any patches to apply, create the directory +# Note: If you have any patches to apply, create the directory # sources/kernel-patches and put your patches in there and number -# them in the order you wish to apply them... i.e. +# them in the order you wish to apply them... i.e. # -# sources/kernel-patches/001-my-special-stuff.bz2 -# sources/kernel-patches/003-gcc-Os.bz2 -# sources/kernel-patches/004_no-warnings.bz2 -# sources/kernel-patches/030-lowlatency-mini.bz2 -# sources/kernel-patches/031-lowlatency-fixes-5.bz2 -# sources/kernel-patches/099-shutup.bz2 -# etc... +# sources/kernel-patches/001-my-special-stuff.bz2 +# sources/kernel-patches/003-gcc-Os.bz2 +# sources/kernel-patches/004_no-warnings.bz2 +# sources/kernel-patches/030-lowlatency-mini.bz2 +# sources/kernel-patches/031-lowlatency-fixes-5.bz2 +# sources/kernel-patches/099-shutup.bz2 +# etc... # # these patches will all be applied by the patch-kernel.sh # script (which will also abort the build if it finds rejects) -# -Erik +# -Erik # ############################################################# ifneq ($(filter $(TARGETS),linux),) @@ -79,14 +79,14 @@ $(LINUX_KCONFIG): sleep 5; \ fi -$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG) +$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG) $(SED) "s,^ARCH.*,ARCH=$(LINUX_KARCH),g;" $(LINUX_DIR)/Makefile $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile -cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config $(MAKE) PATH=$(TARGET_PATH) -C $(LINUX_DIR) oldconfig include/linux/version.h touch $(LINUX_DIR)/.configured -$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured +$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured $(MAKE) PATH=$(TARGET_PATH) -C $(LINUX_DIR) dep touch $(LINUX_DIR)/.depend_done diff --git a/target/device/Soekris/net4521/linux.mk b/target/device/Soekris/net4521/linux.mk index bda61788b..8e0b3be97 100644 --- a/target/device/Soekris/net4521/linux.mk +++ b/target/device/Soekris/net4521/linux.mk @@ -2,21 +2,21 @@ # # Linux kernel targets # -# Note: If you have any patches to apply, create the directory +# Note: If you have any patches to apply, create the directory # sources/kernel-patches and put your patches in there and number -# them in the order you wish to apply them... i.e. +# them in the order you wish to apply them... i.e. # -# sources/kernel-patches/001-my-special-stuff.bz2 -# sources/kernel-patches/003-gcc-Os.bz2 -# sources/kernel-patches/004_no-warnings.bz2 -# sources/kernel-patches/030-lowlatency-mini.bz2 -# sources/kernel-patches/031-lowlatency-fixes-5.bz2 -# sources/kernel-patches/099-shutup.bz2 -# etc... +# sources/kernel-patches/001-my-special-stuff.bz2 +# sources/kernel-patches/003-gcc-Os.bz2 +# sources/kernel-patches/004_no-warnings.bz2 +# sources/kernel-patches/030-lowlatency-mini.bz2 +# sources/kernel-patches/031-lowlatency-fixes-5.bz2 +# sources/kernel-patches/099-shutup.bz2 +# etc... # # these patches will all be applied by the patch-kernel.sh # script (which will also abort the build if it finds rejects) -# -Erik +# -Erik # ############################################################# ifneq ($(filter $(TARGETS),linux),) @@ -80,14 +80,14 @@ $(LINUX_KCONFIG): sleep 5; \ fi -$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG) +$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG) $(SED) "s,^ARCH.*,ARCH=$(LINUX_KARCH),g;" $(LINUX_DIR)/Makefile $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile -cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config $(MAKE) PATH=$(TARGET_PATH) -C $(LINUX_DIR) oldconfig include/linux/version.h touch $(LINUX_DIR)/.configured -$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured +$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured $(MAKE) PATH=$(TARGET_PATH) -C $(LINUX_DIR) dep touch $(LINUX_DIR)/.depend_done diff --git a/target/device/Soekris/soekris_gpio/Makefile b/target/device/Soekris/soekris_gpio/Makefile index d96c9b707..ac31bbfee 100644 --- a/target/device/Soekris/soekris_gpio/Makefile +++ b/target/device/Soekris/soekris_gpio/Makefile @@ -5,32 +5,32 @@ include $(LINUX_KCONFIG) -CFLAGS =-O2 -DMODULE -D__KERNEL__ -I$(LINUX_SOURCE_DIR)/include -Wall +CFLAGS =-O2 -DMODULE -D__KERNEL__ -I$(LINUX_SOURCE_DIR)/include -Wall TARGET := gpio ifdef CONFIG_SMP CFLAGS +=-D__SMP__-DSMP endif -all: gpio.o writelcd.o +all: gpio.o writelcd.o gpio.o: common.o 4501driver.o 4801driver.o - $(LD) -r 4501driver.o 4801driver.o common.o -o gpio.o + $(LD) -r 4501driver.o 4801driver.o common.o -o gpio.o -4501gpio.o: common.o 4501driver.o - $(LD) -r 4501driver.o common.o -o 4501gpio.o +4501gpio.o: common.o 4501driver.o + $(LD) -r 4501driver.o common.o -o 4501gpio.o -4501driver.o: 4501driver.c 4501driver.h +4501driver.o: 4501driver.c 4501driver.h $(CC) $(CFLAGS) -c 4501driver.c -o 4501driver.o -4801gpio.o: common.o 4801driver.o - $(LD) -r 4801driver.o common.o -o 4801gpio.o +4801gpio.o: common.o 4801driver.o + $(LD) -r 4801driver.o common.o -o 4801gpio.o -4801driver.o: 4801driver.c 4801driver.h +4801driver.o: 4801driver.c 4801driver.h $(CC) $(CFLAGS) -c 4801driver.c -o 4801driver.o -writelcd.o: common_writelcd.o 4801driver.o 4501driver.o - $(LD) -r 4801driver.o 4501driver.o common_writelcd.o -o writelcd.o +writelcd.o: common_writelcd.o 4801driver.o 4501driver.o + $(LD) -r 4801driver.o 4501driver.o common_writelcd.o -o writelcd.o common.o: common.c common.h $(CC) $(CFLAGS) -c common.c -o common.o diff --git a/target/device/Via/epia-mii/linux.mk b/target/device/Via/epia-mii/linux.mk index 0fdd7c004..9b5ea4600 100644 --- a/target/device/Via/epia-mii/linux.mk +++ b/target/device/Via/epia-mii/linux.mk @@ -2,21 +2,21 @@ # # Linux kernel targets # -# Note: If you have any patches to apply, create the directory +# Note: If you have any patches to apply, create the directory # sources/kernel-patches and put your patches in there and number -# them in the order you wish to apply them... i.e. +# them in the order you wish to apply them... i.e. # -# sources/kernel-patches/001-my-special-stuff.bz2 -# sources/kernel-patches/003-gcc-Os.bz2 -# sources/kernel-patches/004_no-warnings.bz2 -# sources/kernel-patches/030-lowlatency-mini.bz2 -# sources/kernel-patches/031-lowlatency-fixes-5.bz2 -# sources/kernel-patches/099-shutup.bz2 -# etc... +# sources/kernel-patches/001-my-special-stuff.bz2 +# sources/kernel-patches/003-gcc-Os.bz2 +# sources/kernel-patches/004_no-warnings.bz2 +# sources/kernel-patches/030-lowlatency-mini.bz2 +# sources/kernel-patches/031-lowlatency-fixes-5.bz2 +# sources/kernel-patches/099-shutup.bz2 +# etc... # # these patches will all be applied by the patch-kernel.sh # script (which will also abort the build if it finds rejects) -# -Erik +# -Erik # ############################################################# ifneq ($(filter $(TARGETS),linux),) @@ -71,13 +71,13 @@ $(LINUX_KCONFIG): $(MAKE) menuconfig; \ fi -$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG) +$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG) $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile -cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config $(MAKE) -C $(LINUX_DIR) oldconfig include/linux/version.h touch $(LINUX_DIR)/.configured -$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured +$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured $(MAKE) -C $(LINUX_DIR) dep touch $(LINUX_DIR)/.depend_done diff --git a/target/device/jp/q5/linux.mk b/target/device/jp/q5/linux.mk index 8e74a308a..3a277f8e0 100644 --- a/target/device/jp/q5/linux.mk +++ b/target/device/jp/q5/linux.mk @@ -2,21 +2,21 @@ # # Linux kernel targets # -# Note: If you have any patches to apply, create the directory +# Note: If you have any patches to apply, create the directory # sources/kernel-patches and put your patches in there and number -# them in the order you wish to apply them... i.e. +# them in the order you wish to apply them... i.e. # -# sources/kernel-patches/001-my-special-stuff.bz2 -# sources/kernel-patches/003-gcc-Os.bz2 -# sources/kernel-patches/004_no-warnings.bz2 -# sources/kernel-patches/030-lowlatency-mini.bz2 -# sources/kernel-patches/031-lowlatency-fixes-5.bz2 -# sources/kernel-patches/099-shutup.bz2 -# etc... +# sources/kernel-patches/001-my-special-stuff.bz2 +# sources/kernel-patches/003-gcc-Os.bz2 +# sources/kernel-patches/004_no-warnings.bz2 +# sources/kernel-patches/030-lowlatency-mini.bz2 +# sources/kernel-patches/031-lowlatency-fixes-5.bz2 +# sources/kernel-patches/099-shutup.bz2 +# etc... # # these patches will all be applied by the patch-kernel.sh # script (which will also abort the build if it finds rejects) -# -Erik +# -Erik # ############################################################# ifneq ($(filter $(TARGETS),linux),) @@ -80,7 +80,7 @@ $(LINUX_KCONFIG): sleep 5; \ fi -$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG) +$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG) $(SED) "s,^ARCH.*,ARCH=$(LINUX_KARCH),g;" $(LINUX_DIR)/Makefile $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile -cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config @@ -90,7 +90,7 @@ endif $(MAKE) PATH=$(TARGET_PATH) -C $(LINUX_DIR) oldconfig include/linux/version.h touch $(LINUX_DIR)/.configured -$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured +$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured $(MAKE) PATH=$(TARGET_PATH) -C $(LINUX_DIR) dep touch $(LINUX_DIR)/.depend_done diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk index 099108161..fd0016df8 100644 --- a/target/ext2/ext2root.mk +++ b/target/ext2/ext2root.mk @@ -58,7 +58,7 @@ ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),) EXT2_OPTS += -m $(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)) endif -EXT2_BASE := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_OUTPUT)) +EXT2_BASE := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_OUTPUT)) #") EXT2_ROOTFS_COMPRESSOR:= diff --git a/target/initramfs/initramfs.mk b/target/initramfs/initramfs.mk index 8dd75b5a5..5476b23cb 100644 --- a/target/initramfs/initramfs.mk +++ b/target/initramfs/initramfs.mk @@ -1,7 +1,7 @@ ############################################################# # # Make a initramfs_list file to be used by gen_init_cpio -# gen_init_cpio is part of the 2.6 linux kernels to build an +# gen_init_cpio is part of the 2.6 linux kernels to build an # initial ramdisk filesystem based on cpio # ############################################################# @@ -31,7 +31,7 @@ endif # Use fakeroot to pretend to create all needed device nodes echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - # Use fakeroot so gen_initramfs_list.sh believes the previous fakery + # Use fakeroot so gen_initramfs_list.sh believes the previous fakery echo "$(CONFIG_SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(TARGET_DIR) > $(INITRAMFS_TARGET)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk index 4d468dcab..9cdf486fa 100644 --- a/target/iso9660/iso9660.mk +++ b/target/iso9660/iso9660.mk @@ -22,7 +22,7 @@ $(MKISOFS_DIR)/.unpacked: $(DL_DIR)/$(MKISOFS_SOURCE) $(MKISOFS_DIR)/.configured: $(MKISOFS_DIR)/.unpacked (cd $(MKISOFS_DIR); rm -rf config.cache; \ ) - touch $(MKISOFS_DIR)/.configured + touch $(MKISOFS_DIR)/.configured $(MKISOFS_TARGET): $(MKISOFS_DIR)/.configured $(MAKE) -C $(MKISOFS_DIR) diff --git a/target/linux-experimental/Makefile.in b/target/linux-experimental/Makefile.in index 6f37aa74c..ab9a6135d 100644 --- a/target/linux-experimental/Makefile.in +++ b/target/linux-experimental/Makefile.in @@ -9,13 +9,13 @@ ifneq ($(filter $(TARGETS),linux26),) ifeq ($(LINUX_HEADERS_VERSION),) # Version of Linux to download and then apply patches to # XXX: andersee, i do not understand why we need this (BF) -DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) +DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) # ")) -LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION))) +LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION))) # ")) -LINUX26_RC_PATCH:=$(strip $(subst ",, $(BR2_LINUX26_RC_PATCH))) +LINUX26_RC_PATCH:=$(strip $(subst ",, $(BR2_LINUX26_RC_PATCH))) # ")) -LINUX_BSP_PATCH:=$(strip $(subst ",, $(BR2_LINUX_BSP_ATMEL_PATCH))) +LINUX_BSP_PATCH:=$(strip $(subst ",, $(BR2_LINUX_BSP_ATMEL_PATCH))) # " )) MKIMAGE:=$(BUILD_DIR)/mkimage @@ -26,13 +26,13 @@ endif LINUX26_VERSION=$(DOWNLOAD_LINUX26_VERSION) -else # --------------------------------------------------- +else # --------------------------------------------------- # Define DOWNLOAD_LINUX26_VERSION unless defined ifeq ($(strip $(BR2_DOWNLOAD_LINUX26_VERSION)),) DOWNLOAD_LINUX26_VERSION=$(LINUX_HEADERS_VERSION) else -DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) +DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) # ")) endif @@ -41,15 +41,15 @@ endif ifeq ($(strip $(BR2_LINUX26_VERSION)),) LINUX26_VERSION=$(LINUX_HEADERS_VERSION) else -LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION))) +LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION))) # ")) endif -endif # --------------------------------------------------- +endif # --------------------------------------------------- # Handle case when we want to build using an "rc" patch # Example: to build 2.6.21-rc1 you need to: -# * Download linux-2.6.20 +# * Download linux-2.6.20 # * Apply patch-2.6.21-rc1 LINUX26_SOURCE:=linux-$(DOWNLOAD_LINUX26_VERSION).tar.bz2 @@ -57,7 +57,7 @@ LINUX26_SITE=http://ftp.kernel.org/pub/linux/kernel/v2.6 LINUX26_BZCAT:=$(BZCAT) # Linux kernel binary -LINUX26_FORMAT:=$(strip $(subst ",, $(BR2_LINUX26_FORMAT))) +LINUX26_FORMAT:=$(strip $(subst ",, $(BR2_LINUX26_FORMAT))) # " )) # Linux kernel configuration file @@ -102,11 +102,11 @@ LINUX_DIR=$(LINUX26_DIR) LINUX_KERNEL=$(LINUX26_KERNEL) # kernel patches -ifeq ($(strip $(subst ",, $(LINUX26_PATCH_DIR))),) +ifeq ($(strip $(subst ",, $(LINUX26_PATCH_DIR))),) # "))) LINUX26_PATCH_DIR:=$(BR2_BOARD_PATH)/kernel-patches/ endif -PATCH_DIR=$(strip $(subst ",, $(LINUX26_PATCH_DIR))) +PATCH_DIR=$(strip $(subst ",, $(LINUX26_PATCH_DIR))) # " )) LINUX26_MAKE_FLAGS = $(TARGET_CONFIGURE_OPTS) ARCH=$(KERNEL_ARCH) \ @@ -120,24 +120,24 @@ $(LINUX26_KCONFIG): echo "and install it as $(LINUX26_KCONFIG)"; \ echo ""; \ sleep 5; \ - fi; + fi # Check if we have a release candidate. -# This makes life complex -# To build linux-2.6.21-rc2 you need to: -# * Download linux.2.6.20.tar.bz2 -# * Download patch-2.6.21-rc2.bz2 -# I:E you have to download the *previous* major version - -ifneq ($(LINUX26_RC_PATCH),) +# This makes life complex +# To build linux-2.6.21-rc2 you need to: +# * Download linux.2.6.20.tar.bz2 +# * Download patch-2.6.21-rc2.bz2 +# I:E you have to download the *previous* major version + +ifneq ($(LINUX26_RC_PATCH),) # We have a "release candidate" LINUX26_RC_PATCH_SOURCE:=$(PROJECT_BUILD_DIR)/linux-patch/$(LINUX26_RC_PATCH) # Create rule to download the patch $(LINUX26_RC_PATCH_SOURCE): mkdir -p $(PROJECT_BUILD_DIR)/linux-patch/ - $(WGET) -P $(PROJECT_BUILD_DIR)/linux-patch $(LINUX26_SITE)/$(LINUX26_RC_PATCH) -# $(LINUX26_BZCAT) $(PROJECT_BUILD_DIR)/linux-patch/$(LINUX26_RC_PATCH).bz2 + $(WGET) -P $(PROJECT_BUILD_DIR)/linux-patch $(LINUX26_SITE)/$(LINUX26_RC_PATCH) +# $(LINUX26_BZCAT) $(PROJECT_BUILD_DIR)/linux-patch/$(LINUX26_RC_PATCH).bz2 else # We have a vanilla style linux kernel LINUX26_RC_PATCH_SOURCE:= @@ -155,7 +155,7 @@ ifneq ($(DOWNLOAD_LINUX26_VERSION),$(LINUX26_VERSION)) # Rename the dir from the downloaded version to the AFTER patch version mv -f $(LINUX26_BUILD_DIR)/linux-$(DOWNLOAD_LINUX26_VERSION) $(LINUX26_DIR) endif -ifneq ($(LINUX26_RC_PATCH),) +ifneq ($(LINUX26_RC_PATCH),) -(cd $(LINUX26_DIR); $(LINUX26_BZCAT) $(LINUX26_RC_PATCH_SOURCE) | patch -p1) endif -(cd $(TOOL_BUILD_DIR); ln -snf $(LINUX26_DIR) linux) @@ -168,7 +168,7 @@ $(LINUX26_DIR)/.patched: $(LINUX26_DIR)/.unpacked toolchain/patch-kernel.sh $(LINUX26_DIR) $(LINUX26_PATCH_DIR) touch $@ -$(LINUX26_DIR)/.configured: $(LINUX26_DIR)/.patched $(LINUX26_KCONFIG) +$(LINUX26_DIR)/.configured: $(LINUX26_DIR)/.patched $(LINUX26_KCONFIG) -ls -l $(LINUX26_DIR)/.patched -ls -l $(LINUX26_KCONFIG) -ls -l $(LINUX26_DIR)/.configured @@ -194,7 +194,7 @@ endif $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) oldconfig include/linux/version.h touch $@ -$(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured +$(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) prepare touch $@ @@ -211,8 +211,8 @@ $(LINUX26_DIR)/vmlinux: $(LINUX26_DIR)/.depend_done $(STAGING_DIR)/include/linux #----------------------------------------------------------------------------------- -# Rule can be enabled by setting -# LINUX26_TARGET:= $(TARGET_DIR)/boot/$(LINUX26_BINLOC) +# Rule can be enabled by setting +# LINUX26_TARGET:= $(TARGET_DIR)/boot/$(LINUX26_BINLOC) # $(TARGET_DIR)/boot/$(LINUX26_FORMAT): $(LINUX26_DIR)/$(LINUX26_FORMAT) [ -d $(TARGET_DIR)/boot/ ] || mkdir $(TARGET_DIR)/boot @@ -220,33 +220,33 @@ $(TARGET_DIR)/boot/$(LINUX26_FORMAT): $(LINUX26_DIR)/$(LINUX26_FORMAT) touch -c $@ #----------------------------------------------------------------------------------- -# Rule can be enabled by setting -# LINUX26_TARGET:= $(BINARIES_DIR)/$(LINUX26_KERNEL) -# LINUX26_FORMAT:= vmlinux +# Rule can be enabled by setting +# LINUX26_TARGET:= $(BINARIES_DIR)/$(LINUX26_KERNEL) +# LINUX26_FORMAT:= vmlinux -$(BINARIES_DIR)/$(LINUX26_KERNEL): $(LINUX26_DIR)/uImage +$(BINARIES_DIR)/$(LINUX26_KERNEL): $(LINUX26_DIR)/uImage cp -dpf $(LINUX26_DIR)/uImage $(BINARIES_DIR)/$(LINUX26_KERNEL) cp -dpf $(LINUX26_DIR)/uImage /tftpboot/$(LINUX26_KERNEL) - mkdir -p $(TARGET_DIR)/boot/ + mkdir -p $(TARGET_DIR)/boot/ cp -dpf $(LINUX26_DIR)/.config $(TARGET_DIR)/boot/$(BOARD_NAME)-linux-$(LINUX26_VERSION).config - cp -dpf .config $(TARGET_DIR)/boot/$(BOARD_NAME)-buildroot.config - cp -dpf $(BUSYBOX_DIR)/.config $(TARGET_DIR)/boot/busybox.config + cp -dpf .config $(TARGET_DIR)/boot/$(BOARD_NAME)-buildroot.config + cp -dpf $(BUSYBOX_DIR)/.config $(TARGET_DIR)/boot/busybox.config $(PROJECT_BUILD_DIR)/linux.bin: $(LINUX26_DIR)/vmlinux ${KERNEL_CROSS}objcopy -O binary -S $(LINUX26_DIR)/vmlinux $(PROJECT_BUILD_DIR)/linux.bin -$(LINUX26_DIR)/uImage: $(LINUX26_DIR)/arch/$(ARCH)/boot/uImage - cp -dpf $(LINUX26_DIR)/arch/$(ARCH)/boot/uImage $(LINUX26_DIR)/uImage - +$(LINUX26_DIR)/uImage: $(LINUX26_DIR)/arch/$(ARCH)/boot/uImage + cp -dpf $(LINUX26_DIR)/arch/$(ARCH)/boot/uImage $(LINUX26_DIR)/uImage + -$(PROJECT_BUILD_DIR)/xxxx: $(PROJECT_BUILD_DIR)/linux.bin $(MKIMAGE) +$(PROJECT_BUILD_DIR)/xxxx: $(PROJECT_BUILD_DIR)/linux.bin $(MKIMAGE) gzip -v9 -c $(PROJECT_BUILD_DIR)/linux.bin > $(PROJECT_BUILD_DIR)/linux.bin.gz - $(MKIMAGE) -A $(ARCH) \ - -O linux \ - -C gzip \ - -a 0x20008000 \ - -e 0x20008000 \ - -d $(PROJECT_BUILD_DIR)/linux.bin.gz \ + $(MKIMAGE) -A $(ARCH) \ + -O linux \ + -C gzip \ + -a 0x20008000 \ + -e 0x20008000 \ + -d $(PROJECT_BUILD_DIR)/linux.bin.gz \ $(LINUX26_DIR)/uImage rm -f $(PROJECT_BUILD_DIR)/linux.bin.gz #----------------------------------------------------------------------------------- @@ -296,23 +296,23 @@ linux26-dirclean: rm -rf $(LINUX26_DIR) linux-update: - cp -dpf $(LINUX26_DIR)/.config $(LINUX26_KCONFIG) + cp -dpf $(LINUX26_DIR)/.config $(LINUX26_KCONFIG) linux-test: - @echo "LINUX_HEADERS_VERSION" $(LINUX_HEADERS_VERSION) - @echo "BR2_PACKAGE_LINUX" $(BR2_PACKAGE_LINUX) - @echo "BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION" $(BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION) - @echo "BR2_CUSTOM_LINUX26_VERSION" $(BR2_CUSTOM_LINUX26_VERSION) - @echo "BR2_CUSTOM_LINUX26_RC_PATCH" $(BR2_CUSTOM_LINUX26_RC_PATCH) - @echo "BR2_LINUX_BSP_PATCH" $(BR2_LINUX_BSP_PATCH) - @echo "BR2_DOWNLOAD_LINUX26_VERSION" $(BR2_DOWNLOAD_LINUX26_VERSION) - @echo "BR2_LINUX26_VERSION" $(BR2_LINUX26_VERSION) - @echo "LINUX26_VERSION" $(LINUX26_VERSION) - @echo "BR2_LINUX26_RC_PATCH" $(BR2_LINUX26_RC_PATCH) - @echo "BR2_PACKAGE_LINUX26_KCONFIG" $(BR2_PACKAGE_LINUX_KCONFIG) - @echo "LINUX26_KCONFIG" $(LINUX26_KCONFIG) - @echo "BR2_LINUX_BIN_CUSTOM" $(BR2_LINUX_BIN_CUSTOM) - @echo "BR2_PACKAGE_LINUX_FORMAT" $(BR2_PACKAGE_LINUX_FORMAT) - @echo "BR2_LINUX_IN_ROOTFS" $(BR2_LINUX_IN_ROOTFS) - @echo "BR2_LINUX_2_6_22_1" $(BR2_LINUX_2_6_22_1) + @echo "LINUX_HEADERS_VERSION" $(LINUX_HEADERS_VERSION) + @echo "BR2_PACKAGE_LINUX" $(BR2_PACKAGE_LINUX) + @echo "BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION" $(BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION) + @echo "BR2_CUSTOM_LINUX26_VERSION" $(BR2_CUSTOM_LINUX26_VERSION) + @echo "BR2_CUSTOM_LINUX26_RC_PATCH" $(BR2_CUSTOM_LINUX26_RC_PATCH) + @echo "BR2_LINUX_BSP_PATCH" $(BR2_LINUX_BSP_PATCH) + @echo "BR2_DOWNLOAD_LINUX26_VERSION" $(BR2_DOWNLOAD_LINUX26_VERSION) + @echo "BR2_LINUX26_VERSION" $(BR2_LINUX26_VERSION) + @echo "LINUX26_VERSION" $(LINUX26_VERSION) + @echo "BR2_LINUX26_RC_PATCH" $(BR2_LINUX26_RC_PATCH) + @echo "BR2_PACKAGE_LINUX26_KCONFIG" $(BR2_PACKAGE_LINUX_KCONFIG) + @echo "LINUX26_KCONFIG" $(LINUX26_KCONFIG) + @echo "BR2_LINUX_BIN_CUSTOM" $(BR2_LINUX_BIN_CUSTOM) + @echo "BR2_PACKAGE_LINUX_FORMAT" $(BR2_PACKAGE_LINUX_FORMAT) + @echo "BR2_LINUX_IN_ROOTFS" $(BR2_LINUX_IN_ROOTFS) + @echo "BR2_LINUX_2_6_22_1" $(BR2_LINUX_2_6_22_1) diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in index 302852136..e83bfd53c 100644 --- a/target/linux/Makefile.in +++ b/target/linux/Makefile.in @@ -83,7 +83,7 @@ $(LINUX26_KCONFIG): echo "and install it as $(LINUX26_KCONFIG)"; \ echo ""; \ sleep 5; \ - fi; + fi ifneq ($(strip $(LINUX26_VERSION)),$(strip $(LINUX_HEADERS_VERSION))) $(DL_DIR)/$(LINUX26_SOURCE): |