From: ulf at uclibc.org <ulf@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot
Date: Fri, 20 Jul 2007 00:54:22 -0700 (PDT) [thread overview]
Message-ID: <20070720075422.525D4A6875@busybox.net> (raw)
Author: ulf
Date: 2007-07-20 00:54:21 -0700 (Fri, 20 Jul 2007)
New Revision: 19169
Log:
U-Boot cleanup
Modified:
trunk/buildroot/target/device/Atmel/u-boot/u-boot.mk
Changeset:
Modified: trunk/buildroot/target/device/Atmel/u-boot/u-boot.mk
===================================================================
--- trunk/buildroot/target/device/Atmel/u-boot/u-boot.mk 2007-07-20 07:47:31 UTC (rev 19168)
+++ trunk/buildroot/target/device/Atmel/u-boot/u-boot.mk 2007-07-20 07:54:21 UTC (rev 19169)
@@ -45,13 +45,12 @@
$(UBOOT_DIR)/.unpacked: $(DL_DIR)/$(UBOOT_SOURCE)
mkdir -p $(BUILD_DIR)
$(UBOOT_CAT) $(DL_DIR)/$(UBOOT_SOURCE) | tar -C $(BUILD_DIR) -xvf -
- touch $(UBOOT_DIR)/.unpacked
- ls $(UBOOT_DIR)/.unpacked
+ 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 $(UBOOT_PATCHES)/.unpacked
+ touch $@
$(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE): $(UBOOT_DIR)/.unpacked $(UBOOT_PATCHES)/.unpacked
toolchain/patch-kernel.sh $(UBOOT_DIR) $(UBOOT_PATCHES) *.patch
@@ -105,10 +104,10 @@
$(UBOOT_BUILD_DIR)/.customized: .config $(UBOOT_BUILD_DIR)/.configured
echo "/* Automatically generated file, do not edit */" > $(UBOOT_CUSTOM)
-ifneq ($(HOSTNAME),)
+ifneq ($(TARGET_HOSTNAME),)
echo "#if defined(CONFIG_HOSTNAME)" >> $(UBOOT_CUSTOM)
echo "#undef CONFIG_HOSTNAME" >> $(UBOOT_CUSTOM)
- echo "#define CONFIG_HOSTNAME $(HOSTNAME)" >> $(UBOOT_CUSTOM)
+ echo "#define CONFIG_HOSTNAME $(TARGET_HOSTNAME)" >> $(UBOOT_CUSTOM)
echo "#endif" >> $(UBOOT_CUSTOM)
endif
ifneq ($(TARGET_UBOOT_IPADDR),)
@@ -144,7 +143,7 @@
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 $(HOSTNAME) >> $(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)
@@ -159,7 +158,7 @@
echo setargs >> $(UBOOT_SCR)
echo saveenv >> $(UBOOT_SCR)
-$(UBOOT_SCR).$(HOSTNAME): $(UBOOT_SCR) $(MKIMAGE)
+$(UBOOT_SCR).$(PROJECT): $(UBOOT_SCR) $(MKIMAGE)
$(MKIMAGE) -A arm \
-O linux \
-T script \
@@ -168,13 +167,13 @@
-e 0 \
-n "autoscr config" \
-d $(UBOOT_SCR) \
- $(UBOOT_SCR).$(HOSTNAME)
- cp $(UBOOT_SCR).$(HOSTNAME) /tftpboot
+ $(UBOOT_SCR).$(PROJECT)
+ cp $(UBOOT_SCR).$(PROJECT) /tftpboot
$(MKIMAGE): $(MKIMAGE_BINLOC)
cp -f $(MKIMAGE_BINLOC) $(MKIMAGE)
-uboot: $(MKIMAGE) uboot-bin $(UBOOT_SCR).$(HOSTNAME)
+uboot: $(MKIMAGE) uboot-bin $(UBOOT_SCR).$(PROJECT)
uboot-source: $(DL_DIR)/$(UBOOT_SOURCE)
@@ -184,7 +183,7 @@
rm -f $(BINARIES_DIR)/$(UBOOT_BIN)
rm -fr $(UBOOT_DIR)
rm -f $(UBOOT_SCR)
- rm -f $(UBOOT_SCR).$(HOSTNAME)
+ rm -f $(UBOOT_SCR).$(PROJECT)
# -$(MAKE) -C $(UBOOT_DIR)/uboot-tools clean
uboot-dirclean: uboot-clean
@@ -246,10 +245,30 @@
endif
uboot-test:
+ - at echo source=$(DL_DIR)/$(UBOOT_SOURCE)
+ - at ls $(DL_DIR)/$(UBOOT_SOURCE)
+ - at echo patch=$(DL_DIR)/$(UBOOT_PATCH_SOURCE)
+ - at ls $(DL_DIR)/$(UBOOT_PATCH_SOURCE)
+ - at echo unpacked=$(UBOOT_PATCHES)/.unpacked
+ - at ls $(UBOOT_PATCHES)/.unpacked
+ - at echo patch-unpacked=$(UBOOT_PATCHES)/.unpacked
+ - at ls $(UBOOT_PATCHES)/.unpacked
+ - at echo patched-source=$(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE)
+ - at ls $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE)
+ - at echo configured=$(UBOOT_BUILD_DIR)/.configured
+ - at ls $(UBOOT_BUILD_DIR)/.configured
+ - at echo mkimage=$(MKIMAGE_BINLOC)
+ - at ls $(MKIMAGE_BINLOC)
+ - at echo u-boot.bin=$(UBOOT_BUILD_DIR)/u-boot.bin
+ - at ls $(UBOOT_BUILD_DIR)/u-boot.bin
+ - at echo binaries-u-boot.bin=$(BINARIES_DIR)/$(UBOOT_BIN)
+ - at ls $(BINARIES_DIR)/$(UBOOT_BIN)
+ - at echo tftpboot=/tftpboot/$(UBOOT_BIN)
+ - at ls /tftpboot/$(UBOOT_BIN)
- at echo "mkimage = $(MKIMAGE)"
- at ls $(MKIMAGE)
- - at echo "u-boot script=$(UBOOT_SCR).$(HOSTNAME)"
- - at ls $(UBOOT_SCR).$(HOSTNAME)
+ - at echo "u-boot script=$(UBOOT_SCR).$(PROJECT)"
+ - at ls $(UBOOT_SCR).$(PROJECT)
- at echo "u-boot script (ASCII)=$(UBOOT_SCR)"
- at ls $(UBOOT_SCR)
- at echo "mkimage binary=$(MKIMAGE_BINLOC)"
next reply other threads:[~2007-07-20 7:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-20 7:54 ulf at uclibc.org [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-07-20 11:13 [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot ulf at uclibc.org
2007-07-20 14:39 sjhill at uclibc.org
2007-07-29 7:05 ulf at uclibc.org
2007-07-30 10:17 ` Bernhard Fischer
2007-07-30 14:54 ` [Buildroot] svn commit:trunk/buildroot/target/device/Atmel/u-boot Ulf Samuelsson
2007-08-28 21:07 [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot ulf at uclibc.org
2007-09-01 10:54 aldot at uclibc.org
2007-09-04 16:20 ulf at uclibc.org
2007-10-21 20:09 ulf at uclibc.org
2008-03-02 10:25 thomasez at uclibc.org
2008-04-10 21:03 ulf at uclibc.org
2008-04-11 20:55 ` Jean-Christian de Rivaz
2008-04-11 21:32 ` Peter Korsgaard
2008-04-12 7:42 ` Jean-Christian de Rivaz
2008-04-12 8:13 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070720075422.525D4A6875@busybox.net \
--to=ulf@uclibc.org \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox