[Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot
@ 2007-09-01 10:54 aldot at uclibc.org
  0 siblings, 0 replies; 16+ messages in thread
From: aldot at uclibc.org @ 2007-09-01 10:54 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-09-01 03:54:50 -0700 (Sat, 01 Sep 2007)
New Revision: 19743

Log:
- fix glitch introduced in my whitespace removal (brm)


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-08-31 21:45:52 UTC (rev 19742)
+++ trunk/buildroot/target/device/Atmel/u-boot/u-boot.mk	2007-09-01 10:54:50 UTC (rev 19743)
@@ -112,10 +112,10 @@
 	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 "#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
+	echo "#endif" >> $(UBOOT_CUSTOM).test
 endif
 ifneq ($(TARGET_UBOOT_IPADDR),)
 	echo "#define CONFIG_IPADDR $(TARGET_UBOOT_IPADDR)">> $(UBOOT_CUSTOM).test
@@ -136,34 +136,34 @@
 
 $(UBOOT_SCR): .config
 ifneq ($(TARGET_UBOOT_IPADDR),)
-	echo setenv ipaddr $(TARGET_UBOOT_IPADDR)> $(UBOOT_SCR)
+	echo setenv ipaddr $(TARGET_UBOOT_IPADDR) > $(UBOOT_SCR)
 endif
 ifneq ($(TARGET_UBOOT_SERVERIP),)
-	echo setenv serverip $(TARGET_UBOOT_SERVERIP)>> $(UBOOT_SCR)
+	echo setenv serverip $(TARGET_UBOOT_SERVERIP) >> $(UBOOT_SCR)
 endif
 ifneq ($(TARGET_UBOOT_GATEWAY),)
-	echo setenv gatewayip $(TARGET_UBOOT_GATEWAY)>> $(UBOOT_SCR)
+	echo setenv gatewayip $(TARGET_UBOOT_GATEWAY) >> $(UBOOT_SCR)
 endif
 ifneq ($(TARGET_UBOOT_NETMASK),)
-	echo setenv netmask $(TARGET_UBOOT_NETMASK)>> $(UBOOT_SCR)
+	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 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)
+	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 ethaddr $(TARGET_UBOOT_ETHADDR) >> $(UBOOT_SCR)
 endif
-	echo setenv fstype ram>> $(UBOOT_SCR)
+	echo setenv fstype ram >> $(UBOOT_SCR)
 	echo fs >> $(UBOOT_SCR)
 	echo os >> $(UBOOT_SCR)
-	echo setargs>> $(UBOOT_SCR)
-	echo saveenv>> $(UBOOT_SCR)
+	echo setargs >> $(UBOOT_SCR)
+	echo saveenv >> $(UBOOT_SCR)
 
 $(UBOOT_SCR).$(PROJECT): $(UBOOT_SCR) $(MKIMAGE)
 	$(MKIMAGE) -A arm \

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot
@ 2008-04-10 21:03 ulf at uclibc.org
  2008-04-11 20:55 ` Jean-Christian de Rivaz
  0 siblings, 1 reply; 16+ messages in thread
From: ulf at uclibc.org @ 2008-04-10 21:03 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2008-04-10 14:03:27 -0700 (Thu, 10 Apr 2008)
New Revision: 21695

Log:
Avoid hardwiring tftpboot

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	2008-04-10 21:02:12 UTC (rev 21694)
+++ trunk/buildroot/target/device/Atmel/u-boot/u-boot.mk	2008-04-10 21:03:27 UTC (rev 21695)
@@ -95,18 +95,18 @@
 		CONFIG_NOSOFTFLOAT=1 \
 		TOPDIR=$(UBOOT_DIR) \
 		SRCTREE=$(UBOOT_DIR) \
-		TFTPBOOT=/tftpboot \
+		TFTPBOOT=$(TARGET_ATMEL_COPYTO) \
 		-C $(UBOOT_DIR)
 
 $(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
-	mkdir -p /tftpboot
-	cp $(UBOOT_BUILD_DIR)/u-boot.bin /tftpboot/$(UBOOT_BIN)
+$(TARGET_ATMEL_COPYTO)/$(UBOOT_BIN): $(UBOOT_BUILD_DIR)/u-boot.bin
+	mkdir -p $(TARGET_ATMEL_COPYTO)
+	cp $(UBOOT_BUILD_DIR)/u-boot.bin $(TARGET_ATMEL_COPYTO)/$(UBOOT_BIN)
 
-uboot-bin: $(BINARIES_DIR)/$(UBOOT_BIN) /tftpboot/$(UBOOT_BIN)
+uboot-bin: $(BINARIES_DIR)/$(UBOOT_BIN) $(TARGET_ATMEL_COPYTO)/$(UBOOT_BIN)
 
 $(UBOOT_CUSTOM).test: .config $(UBOOT_BUILD_DIR)/.configured
 	echo "/* Automatically generated file, do not edit */" \
@@ -175,7 +175,7 @@
 				-n "autoscr config" \
 				-d $(UBOOT_SCR) \
 				$(UBOOT_SCR).$(PROJECT)
-	cp $(UBOOT_SCR).$(PROJECT) /tftpboot
+	cp $(UBOOT_SCR).$(PROJECT) $(TARGET_ATMEL_COPYTO)
 
 $(MKIMAGE): $(MKIMAGE_BINLOC)
 	cp -f $(MKIMAGE_BINLOC) $(MKIMAGE)
@@ -200,7 +200,7 @@
 	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 $(TARGET_ATMEL_COPYTO)/$(UBOOT_BIN)
 	rm -fr $(BINARIES_DIR)/$(UBOOT_BIN)
 
 .PHONY: uboot-bin
@@ -270,8 +270,8 @@
 	- 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 tftpboot=$(TARGET_ATMEL_COPYTO)/$(UBOOT_BIN)
+	- at ls $(TARGET_ATMEL_COPYTO)/$(UBOOT_BIN)
 	- at echo "mkimage = $(MKIMAGE)"
 	- at ls $(MKIMAGE)
 	- at echo "u-boot script=$(UBOOT_SCR).$(PROJECT)"

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot
  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
  0 siblings, 1 reply; 16+ messages in thread
From: Jean-Christian de Rivaz @ 2008-04-11 20:55 UTC (permalink / raw)
  To: buildroot

ulf at uclibc.org a ?crit :
> Author: ulf
> Date: 2008-04-10 14:03:27 -0700 (Thu, 10 Apr 2008)
> New Revision: 21695
> 
> Log:
> Avoid hardwiring tftpboot
> 
> Modified:
>    trunk/buildroot/target/device/Atmel/u-boot/u-boot.mk

Thanks Ulf for this fix. I have found two others files with the exact 
same issue:
target/device/Atmel/at91bootstrap/at91bootstrap.mk
target/linux/Makefile.in.advanced

Please apply the attached patch to fix them.

Regards,
--
Jean-Christian de Rivaz
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-tftpboot.diff
Type: text/x-patch
Size: 1732 bytes
Desc: not available
Url : http://busybox.net/lists/buildroot/attachments/20080411/72e7f6c8/attachment.bin 

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot
  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
  0 siblings, 1 reply; 16+ messages in thread
From: Peter Korsgaard @ 2008-04-11 21:32 UTC (permalink / raw)
  To: buildroot

>>>>> "Jean-Christian" == Jean-Christian de Rivaz <jc@eclis.ch> writes:

 Jean-Christian> Thanks Ulf for this fix. I have found two others
 Jean-Christian> files with the exact same issue:
 Jean-Christian> target/device/Atmel/at91bootstrap/at91bootstrap.mk
 Jean-Christian> target/linux/Makefile.in.advanced

 Jean-Christian> Please apply the attached patch to fix them.

Thanks - fixed in r21712.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot
  2008-04-11 21:32   ` Peter Korsgaard
@ 2008-04-12  7:42     ` Jean-Christian de Rivaz
  2008-04-12  8:13       ` Peter Korsgaard
  0 siblings, 1 reply; 16+ messages in thread
From: Jean-Christian de Rivaz @ 2008-04-12  7:42 UTC (permalink / raw)
  To: buildroot

Peter Korsgaard a ?crit :
>>>>>> "Jean-Christian" == Jean-Christian de Rivaz <jc@eclis.ch> writes:
> 
>  Jean-Christian> Thanks Ulf for this fix. I have found two others
>  Jean-Christian> files with the exact same issue:
>  Jean-Christian> target/device/Atmel/at91bootstrap/at91bootstrap.mk
>  Jean-Christian> target/linux/Makefile.in.advanced
> 
>  Jean-Christian> Please apply the attached patch to fix them.
> 
> Thanks - fixed in r21712.
> 

Thanks. This commit with the initial commit from Ulf,  close the bugs 
2384 and 2394:
http://bugs.uclibc.org/view.php?id=2384
http://bugs.uclibc.org/view.php?id=2394

I have not found a way to close them myself. Is there one ?
-- 
Jean-Christian de Rivaz

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot
  2008-04-12  7:42     ` Jean-Christian de Rivaz
@ 2008-04-12  8:13       ` Peter Korsgaard
  0 siblings, 0 replies; 16+ messages in thread
From: Peter Korsgaard @ 2008-04-12  8:13 UTC (permalink / raw)
  To: buildroot

>>>>> "Jean-Christian" == Jean-Christian de Rivaz <jc@eclis.ch> writes:

Hi,

 Jean-Christian> Thanks. This commit with the initial commit from Ulf,
 Jean-Christian> close the bugs 2384 and 2394:
 Jean-Christian> http://bugs.uclibc.org/view.php?id=2384
 Jean-Christian> http://bugs.uclibc.org/view.php?id=2394

Thanks, done.

 Jean-Christian> I have not found a way to close them myself. Is there one ?

Not afaik.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot
@ 2008-03-02 10:25 thomasez at uclibc.org
  0 siblings, 0 replies; 16+ messages in thread
From: thomasez at uclibc.org @ 2008-03-02 10:25 UTC (permalink / raw)
  To: buildroot

Author: thomasez
Date: 2008-03-02 02:25:05 -0800 (Sun, 02 Mar 2008)
New Revision: 21146

Log:
Closing #2374


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	2008-03-01 19:29:56 UTC (rev 21145)
+++ trunk/buildroot/target/device/Atmel/u-boot/u-boot.mk	2008-03-02 10:25:05 UTC (rev 21146)
@@ -15,7 +15,7 @@
 UBOOT_SOURCE:=u-boot-$(UBOOT_VERSION).tar.bz2
 #UBOOT_SOURCE:=u-boot-1.1.5-atmel.tar.bz2
 #UBOOT_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/u-boot
-UBOOT_SITE:=$(ATMEL_MIRROR)/Source
+UBOOT_SITE:=$(ATMEL_MIRROR)
 UBOOT_PATCH_SITE:=$(ATMEL_MIRROR)
 UBOOT_CAT:=$(BZCAT)
 UBOOT_PATCH_SOURCE:=u-boot-1.2.0-atmel-patch.tar.bz2

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot
@ 2007-10-21 20:09 ulf at uclibc.org
  0 siblings, 0 replies; 16+ messages in thread
From: ulf at uclibc.org @ 2007-10-21 20:09 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-10-21 13:09:22 -0700 (Sun, 21 Oct 2007)
New Revision: 20313

Log:
Disable AVR32 U-Boot until working

Modified:
   trunk/buildroot/target/device/Atmel/u-boot/Config.in


Changeset:
Modified: trunk/buildroot/target/device/Atmel/u-boot/Config.in
===================================================================
--- trunk/buildroot/target/device/Atmel/u-boot/Config.in	2007-10-21 18:59:58 UTC (rev 20312)
+++ trunk/buildroot/target/device/Atmel/u-boot/Config.in	2007-10-21 20:09:22 UTC (rev 20313)
@@ -1,6 +1,6 @@
 config BR2_TARGET_UBOOT
 	bool "Das U-Boot Boot Monitor"
-	depends on BR2_TARGET_AT91 || BR2_TARGET_AVR32
+	depends on BR2_TARGET_AT91
 	depends on !BR2_TARGET_AT91SAM9260PF
 	default n
 	help

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot
@ 2007-09-04 16:20 ulf at uclibc.org
  0 siblings, 0 replies; 16+ messages in thread
From: ulf at uclibc.org @ 2007-09-04 16:20 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-09-04 09:20:28 -0700 (Tue, 04 Sep 2007)
New Revision: 19778

Log:
Update u-boot autoscript

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-09-04 07:35:19 UTC (rev 19777)
+++ trunk/buildroot/target/device/Atmel/u-boot/u-boot.mk	2007-09-04 16:20:28 UTC (rev 19778)
@@ -147,7 +147,7 @@
 ifneq ($(TARGET_UBOOT_NETMASK),)
 	echo setenv netmask $(TARGET_UBOOT_NETMASK) >> $(UBOOT_SCR)
 endif
-	echo setenv linux $(LINUX26_KERNEL) >> $(UBOOT_SCR)
+	echo setenv linux $(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE).gz >> $(UBOOT_SCR)
 	echo setenv kernel-version $(LINUX26_VERSION) >> $(UBOOT_SCR)
 	echo setenv kernel-date $(DATE) >> $(UBOOT_SCR)
 	echo setenv hostname $(TARGET_HOSTNAME) >> $(UBOOT_SCR)

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot
@ 2007-08-28 21:07 ulf at uclibc.org
  0 siblings, 0 replies; 16+ messages in thread
From: ulf at uclibc.org @ 2007-08-28 21:07 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-08-28 14:07:32 -0700 (Tue, 28 Aug 2007)
New Revision: 19721

Log:
Fix bad regexp in u-boot.mk

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-08-28 20:04:15 UTC (rev 19720)
+++ trunk/buildroot/target/device/Atmel/u-boot/u-boot.mk	2007-08-28 21:07:32 UTC (rev 19721)
@@ -59,7 +59,7 @@
 	touch $@
 
 $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE): $(UBOOT_DIR)/.unpacked $(UBOOT_PATCHES)/.unpacked
-	toolchain/patch-kernel.sh $(UBOOT_DIR) $(UBOOT_PATCHES) *.patch
+	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/.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot
@ 2007-07-29  7:05 ulf at uclibc.org
  2007-07-30 10:17 ` Bernhard Fischer
  0 siblings, 1 reply; 16+ messages in thread
From: ulf at uclibc.org @ 2007-07-29  7:05 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-07-29 00:05:13 -0700 (Sun, 29 Jul 2007)
New Revision: 19312

Log:
Reintroduce ATMEL_MIRROR in u-boot

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-29 06:51:35 UTC (rev 19311)
+++ trunk/buildroot/target/device/Atmel/u-boot/u-boot.mk	2007-07-29 07:05:13 UTC (rev 19312)
@@ -8,6 +8,8 @@
 #
 #############################################################
 UBOOT_VERSION:=1.2.0-atmel
+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)
 UBOOT_SOURCE:=u-boot-$(UBOOT_VERSION).tar.bz2
@@ -41,10 +43,10 @@
 UBOOT_CUSTOM:=$(UBOOT_DIR)/include/custom.h
 
 $(DL_DIR)/$(UBOOT_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(UBOOT_SITE)/$(UBOOT_SOURCE)
+	$(WGET) -P $(DL_DIR) $(UBOOT_SITE)/$(UBOOT_SOURCE)
 
 $(DL_DIR)/$(UBOOT_PATCH_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(UBOOT_PATCH_SITE)/$(UBOOT_PATCH_SOURCE)
+	$(WGET) -P $(DL_DIR) $(UBOOT_PATCH_SITE)/$(UBOOT_PATCH_SOURCE)
 
 $(UBOOT_DIR)/.unpacked: $(DL_DIR)/$(UBOOT_SOURCE)
 	mkdir -p   $(BUILD_DIR)

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot
  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
  0 siblings, 1 reply; 16+ messages in thread
From: Bernhard Fischer @ 2007-07-30 10:17 UTC (permalink / raw)
  To: buildroot

On Sun, Jul 29, 2007 at 12:05:16AM -0700, ulf at uclibc.org wrote:
>Author: ulf
>Date: 2007-07-29 00:05:13 -0700 (Sun, 29 Jul 2007)
>New Revision: 19312
>
>Log:
>Reintroduce ATMEL_MIRROR in u-boot
>
>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-29 06:51:35 UTC (rev 19311)
>+++ trunk/buildroot/target/device/Atmel/u-boot/u-boot.mk	2007-07-29 07:05:13 UTC (rev 19312)
>@@ -8,6 +8,8 @@
> #
> #############################################################
> UBOOT_VERSION:=1.2.0-atmel
>+ATMEL_MIRROR:=$(strip  $(subst ",, $(BR2_ATMEL_MIRROR)))
>+#"))

This is redundant.
What about doing this once, cleanly?

target/device/Atmel/Makefile.in would be the obvious place where i'd put
this once and for all..

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [Buildroot] svn commit:trunk/buildroot/target/device/Atmel/u-boot
  2007-07-30 10:17 ` Bernhard Fischer
@ 2007-07-30 14:54   ` Ulf Samuelsson
  0 siblings, 0 replies; 16+ messages in thread
From: Ulf Samuelsson @ 2007-07-30 14:54 UTC (permalink / raw)
  To: buildroot

----- Original Message ----- 
From: "Bernhard Fischer" <rep.dot.nop@gmail.com>
To: <buildroot@uclibc.org>
Cc: <ulf@atmel.com>
Sent: Monday, July 30, 2007 12:17 PM
Subject: Re: [Buildroot] svn commit:trunk/buildroot/target/device/Atmel/u-boot

> On Sun, Jul 29, 2007 at 12:05:16AM -0700, ulf at uclibc.org wrote:
>>Author: ulf
>>Date: 2007-07-29 00:05:13 -0700 (Sun, 29 Jul 2007)
>>New Revision: 19312
>>
>>Log:
>>Reintroduce ATMEL_MIRROR in u-boot
>>
>>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-29 06:51:35 UTC (rev 19311)
>>+++ trunk/buildroot/target/device/Atmel/u-boot/u-boot.mk 2007-07-29 07:05:13 UTC (rev 19312)
>>@@ -8,6 +8,8 @@
>> #
>> #############################################################
>> UBOOT_VERSION:=1.2.0-atmel
>>+ATMEL_MIRROR:=$(strip  $(subst ",, $(BR2_ATMEL_MIRROR)))
>>+#"))
> 
> This is redundant.
> What about doing this once, cleanly?
> 
> target/device/Atmel/Makefile.in would be the obvious place where i'd put
> this once and for all..
>

The AVR32 patches for the toolchain is 6-8 MB and I would like to avoid that.
I am working on a patch that will allow you to download prepatched source
for the AVR32 (binutils, gcc, uclibc and gdb).
Therefore, ATMEL_MIRROR needs to be set before the toolchain is built.

The first version had ATMEL_MIRROR set in each of the files.
The I moved to a common definition, which has to be before that,
so I put it in "package/Makefile.in", and this was reverted.
Since it needs to be available before the toolchain is built, 
Stephen suggested to have it in each toolchain Makefile, resulting in the
"VENDOR" patches, which I agree should be less vendor specific.

I spend some time thinking about  this today (while waiting on the tees of the local golfcourse)
and I think that the best idea is to have another option in the 
"Toolchain type" menu so you can select an externally prepatched toolchain.
(X) Buildroot toolchain
(  )  Prepatched toolchain source
(  )  External Toolchain

If you select "Prepatched toolchain source", then you get to select vendor as a choice.
Otherwise it is hidden.
Then the 
VENDOR_SITE
VENDOR_SUFFIX
VENDOR_RELEASE
strings are set.

VENDOR_SITE could be set to $(BR2_ATMEL_MIRROR) if an Atmel 
prepatched toolchain is selected.

If it is implemented this way, then ATMEL_MIRROR could be set
once in the "target/device/Atmel/Makefile.in"

Best Regards
Ulf Samuelsson

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot
@ 2007-07-20 14:39 sjhill at uclibc.org
  0 siblings, 0 replies; 16+ messages in thread
From: sjhill at uclibc.org @ 2007-07-20 14:39 UTC (permalink / raw)
  To: buildroot

Author: sjhill
Date: 2007-07-20 07:39:01 -0700 (Fri, 20 Jul 2007)
New Revision: 19183

Log:
Convert DOS to UNIX style.


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 14:37:48 UTC (rev 19182)
+++ trunk/buildroot/target/device/Atmel/u-boot/u-boot.mk	2007-07-20 14:39:01 UTC (rev 19183)
@@ -1,22 +1,22 @@
-#############################################################
-#
-# 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
+#############################################################
+#
+# 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)
-UBOOT_SOURCE:=u-boot-$(UBOOT_VERSION).tar.bz2
+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)))
+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
-UBOOT_CAT:=bzcat
+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_PATCHES:=$(PROJECT_BUILD_DIR)/u-boot-patches
 
-UBOOT_ATMEL_BMP:=$(UBOOT_PATCHES)/atmel.bmp
+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_NETMASK:=$(strip  $(subst ",, $(BR2_TARGET_UBOOT_NETMASK)))
 TARGET_UBOOT_ETHADDR:=$(strip  $(subst ",, $(BR2_TARGET_UBOOT_ETHADDR)))
 UBOOT_CUSTOM:=$(UBOOT_DIR)/include/custom.h
-
-$(DL_DIR)/$(UBOOT_SOURCE):
+
+$(DL_DIR)/$(UBOOT_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(UBOOT_SITE)/$(UBOOT_SOURCE)
 
-$(DL_DIR)/$(UBOOT_PATCH_SOURCE):
+$(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)
-	$(UBOOT_CAT) $(DL_DIR)/$(UBOOT_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	touch	$@
+	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	$@
-
-$(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE): $(UBOOT_DIR)/.unpacked $(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
-	touch $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE)
-#	cp $(UBOOT_CONFIG_FILE) $(UBOOT_DIR)/include/configs/.
+	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/.
-
-$(UBOOT_BUILD_DIR)/.configured: $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE)
+#	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 @@
 		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) 
-
+		$(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 @@
 		CONFIG_NOSOFTFLOAT=1		\
 		TOPDIR=$(UBOOT_DIR)		\
 		SRCTREE=$(UBOOT_DIR)		\
-		-C $(UBOOT_DIR)	tools
+		-C $(UBOOT_DIR)	tools
 	touch $(MKIMAGE_BINLOC)
-
+
 $(UBOOT_BUILD_DIR)/u-boot.bin:	$(UBOOT_BUILD_DIR)/.configured $(UBOOT_CUSTOM)
-	echo TARGET_CROSS=$(TARGET_CROSS)
+	echo TARGET_CROSS=$(TARGET_CROSS)
 	$(MAKE) O=$(UBOOT_BUILD_DIR)		\
 		CROSS_COMPILE=$(TARGET_CROSS)	\
 		CONFIG_NOSOFTFLOAT=1		\
@@ -93,11 +93,11 @@
 		-C $(UBOOT_DIR)
 
 $(BINARIES_DIR)/$(UBOOT_BIN):	$(UBOOT_BUILD_DIR)/u-boot.bin
-	mkdir -p $(BINARIES_DIR)
+	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
+	mkdir -p /tftpboot
 	cp $(UBOOT_BUILD_DIR)/u-boot.bin /tftpboot/$(UBOOT_BIN)
 
 uboot-bin:	$(BINARIES_DIR)/$(UBOOT_BIN)	/tftpboot/$(UBOOT_BIN)
@@ -170,25 +170,25 @@
 				$(UBOOT_SCR).$(PROJECT)
 	cp	$(UBOOT_SCR).$(PROJECT) /tftpboot
 
-$(MKIMAGE):	$(MKIMAGE_BINLOC) 
-	cp -f $(MKIMAGE_BINLOC)	 $(MKIMAGE)
-
-uboot: $(MKIMAGE)	uboot-bin $(UBOOT_SCR).$(PROJECT)
+$(MKIMAGE):	$(MKIMAGE_BINLOC) 
+	cp -f $(MKIMAGE_BINLOC)	 $(MKIMAGE)
 
-uboot-source: $(DL_DIR)/$(UBOOT_SOURCE)
-
-uboot-clean:
+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)
-#	-$(MAKE) -C $(UBOOT_DIR)/uboot-tools clean
-
-uboot-dirclean:	uboot-clean
-	rm -rf $(UBOOT_DIR)
+#	-$(MAKE) -C $(UBOOT_DIR)/uboot-tools 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
@@ -196,52 +196,52 @@
 	rm -fr	/tftpboot/$(UBOOT_BIN)
 	rm -fr	$(BINARIES_DIR)/$(UBOOT_BIN)
 
-.PHONY:	uboot-bin
-#############################################################
-#
-# Build the uboot root filesystem image
-#
-#############################################################
-
-UBOOT_TARGET:=$(IMAGE).uboot
-
-ubootroot: host-fakeroot makedevs uboot
-	- at 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))
-	- at 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
+.PHONY:	uboot-bin
+#############################################################
+#
+# Build the uboot root filesystem image
+#
+#############################################################
+
+UBOOT_TARGET:=$(IMAGE).uboot
+
+ubootroot: host-fakeroot makedevs uboot
+	- at 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))
+	- at 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 @@
 	- at ls	/tftpboot/$(UBOOT_BIN)
 	- at echo	"mkimage = $(MKIMAGE)"
 	- at ls	$(MKIMAGE)
-	- at echo	"u-boot script=$(UBOOT_SCR).$(PROJECT)"
+	- 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)

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot
@ 2007-07-20 11:13 ulf at uclibc.org
  0 siblings, 0 replies; 16+ messages in thread
From: ulf at uclibc.org @ 2007-07-20 11:13 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-07-20 04:13:22 -0700 (Fri, 20 Jul 2007)
New Revision: 19177

Log:
Avoid repeated rebuild of u-boot

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 11:04:58 UTC (rev 19176)
+++ trunk/buildroot/target/device/Atmel/u-boot/u-boot.mk	2007-07-20 11:13:22 UTC (rev 19177)
@@ -82,7 +82,7 @@
 		-C $(UBOOT_DIR)	tools
 	touch $(MKIMAGE_BINLOC)
 
-$(UBOOT_BUILD_DIR)/u-boot.bin:	$(UBOOT_BUILD_DIR)/.configured $(UBOOT_BUILD_DIR)/.customized
+$(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)	\
@@ -102,30 +102,30 @@
 
 uboot-bin:	$(BINARIES_DIR)/$(UBOOT_BIN)	/tftpboot/$(UBOOT_BIN)
 
-$(UBOOT_BUILD_DIR)/.customized:	.config	$(UBOOT_BUILD_DIR)/.configured
-	echo	"/* Automatically generated file, do not edit */"		>  $(UBOOT_CUSTOM)
+$(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)
-	echo	"#undef	 CONFIG_HOSTNAME"					>> $(UBOOT_CUSTOM)
-	echo	"#define CONFIG_HOSTNAME		$(TARGET_HOSTNAME)"	>> $(UBOOT_CUSTOM)
-	echo	"#endif"							>> $(UBOOT_CUSTOM)
+	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)
+	echo	"#define CONFIG_IPADDR		$(TARGET_UBOOT_IPADDR)"		>> $(UBOOT_CUSTOM).test
 endif
 ifneq	($(TARGET_UBOOT_SERVERIP),)
-	echo	"#define CONFIG_SERVERIP		$(TARGET_UBOOT_SERVERIP)"	>> $(UBOOT_CUSTOM)
+	echo	"#define CONFIG_SERVERIP	$(TARGET_UBOOT_SERVERIP)"	>> $(UBOOT_CUSTOM).test
 endif
 ifneq	($(TARGET_UBOOT_GATEWAY),)
-	echo	"#define CONFIG_GATEWAYIP	$(TARGET_UBOOT_GATEWAY)"	>> $(UBOOT_CUSTOM)
+	echo	"#define CONFIG_GATEWAYIP	$(TARGET_UBOOT_GATEWAY)"	>> $(UBOOT_CUSTOM).test
 endif
 ifneq	($(TARGET_UBOOT_NETMASK),)
-	echo	"#define CONFIG_NETMASK		$(TARGET_UBOOT_NETMASK)"	>> $(UBOOT_CUSTOM)
+	echo	"#define CONFIG_NETMASK		$(TARGET_UBOOT_NETMASK)"	>> $(UBOOT_CUSTOM).test
 endif
 ifneq	($(TARGET_UBOOT_ETHADDR),)
-	echo	"#define CONFIG_ETHADDR		$(TARGET_UBOOT_ETHADDR)"	>> $(UBOOT_CUSTOM)
+	echo	"#define CONFIG_ETHADDR		$(TARGET_UBOOT_ETHADDR)"	>> $(UBOOT_CUSTOM).test
 endif
-	touch	$(UBOOT_BUILD_DIR)/.customized
+	diff -q $(UBOOT_CUSTOM).test $(UBOOT_CUSTOM) || cp -af $(UBOOT_CUSTOM).test $(UBOOT_CUSTOM)
 
 $(UBOOT_SCR):	.config
 ifneq	($(TARGET_UBOOT_IPADDR),)

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot
@ 2007-07-20  7:54 ulf at uclibc.org
  0 siblings, 0 replies; 16+ messages in thread
From: ulf at uclibc.org @ 2007-07-20  7:54 UTC (permalink / raw)
  To: buildroot

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)"

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2008-04-12  8:13 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-01 10:54 [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot aldot at uclibc.org
  -- strict thread matches above, loose matches on Subject: below --
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
2008-03-02 10:25 thomasez at uclibc.org
2007-10-21 20:09 ulf at uclibc.org
2007-09-04 16:20 ulf at uclibc.org
2007-08-28 21:07 ulf 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-07-20 14:39 [Buildroot] svn commit: trunk/buildroot/target/device/Atmel/u-boot sjhill at uclibc.org
2007-07-20 11:13 ulf at uclibc.org
2007-07-20  7:54 ulf at uclibc.org

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox