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

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-04-09 00:02:16 -0700 (Wed, 09 Apr 2008)
New Revision: 21677

Log:
u-boot: bump version


Removed:
   trunk/buildroot/target/u-boot/u-boot-1.3.0-avr32-100-atmel.2.patch

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:

Sorry, the patch is too large to include (3196 lines).
Please use ViewCVS to see it!

http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=21677

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-04-09 00:02:20 -0700 (Wed, 09 Apr 2008)
New Revision: 21678

Log:
u-boot: fix custom patch handling


Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2008-04-09 07:02:16 UTC (rev 21677)
+++ trunk/buildroot/target/u-boot/Makefile.in	2008-04-09 07:02:20 UTC (rev 21678)
@@ -40,7 +40,7 @@
 ifneq ($(strip $(BR2_TARGET_UBOOT_CUSTOM_PATCH)),"")
 	@mkdir -p $(U_BOOT_PATCH_DIR)
 	cp -dpr $(BR2_TARGET_UBOOT_CUSTOM_PATCH) $(U_BOOT_PATCH_DIR)
-	toolchain/patch-kernel.sh $(U_BOOT_DIR) $(U_BOOT_PATCH_DIR) *.patch
+	toolchain/patch-kernel.sh $(U_BOOT_DIR) $(U_BOOT_PATCH_DIR) \*.patch
 endif
 	touch $@
 

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-04-23 03:30:03 -0700 (Wed, 23 Apr 2008)
New Revision: 21806

Log:
u-boot: set ARCH and CROSS_COMPILE


Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2008-04-23 07:22:31 UTC (rev 21805)
+++ trunk/buildroot/target/u-boot/Makefile.in	2008-04-23 10:30:03 UTC (rev 21806)
@@ -11,6 +11,8 @@
 U_BOOT_CAT:=$(BZCAT)
 U_BOOT_BIN:=u-boot.bin
 U_BOOT_TOOLS_BIN:=mkimage
+# u-boot still uses arch=ppc for powerpc
+U_BOOT_ARCH=$(echo $(KERNEL_ARCH)|$(SED) 's/powerpc/ppc/')
 
 ifneq ($(BR2_TARGET_U_BOOT_CONFIG_BOARD),)
 U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/configs/$(subst _config,,$(BR2_TARGET_U_BOOT_CONFIG_BOARD)).h
@@ -104,7 +106,8 @@
 	$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
-		$(MAKE) -C $(U_BOOT_DIR)
+		$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(KERNEL_ARCH) \
+		 -C $(U_BOOT_DIR)
 
 $(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
 	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-04-23 06:03:47 -0700 (Wed, 23 Apr 2008)
New Revision: 21807

Log:
u-boot: clean: also remove mkimage from staging_dir


Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2008-04-23 10:30:03 UTC (rev 21806)
+++ trunk/buildroot/target/u-boot/Makefile.in	2008-04-23 13:03:47 UTC (rev 21807)
@@ -117,6 +117,7 @@
 
 u-boot-clean:
 	-$(MAKE) -C $(U_BOOT_DIR) clean
+	rm -f $(STAGING_DIR)/usr/bin/$(U_BOOT_TOOLS_BIN)
 
 u-boot-dirclean:
 	rm -rf $(U_BOOT_DIR)

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-04-23 06:03:50 -0700 (Wed, 23 Apr 2008)
New Revision: 21808

Log:
u-boot: use correct ARCH


Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2008-04-23 13:03:47 UTC (rev 21807)
+++ trunk/buildroot/target/u-boot/Makefile.in	2008-04-23 13:03:50 UTC (rev 21808)
@@ -12,7 +12,7 @@
 U_BOOT_BIN:=u-boot.bin
 U_BOOT_TOOLS_BIN:=mkimage
 # u-boot still uses arch=ppc for powerpc
-U_BOOT_ARCH=$(echo $(KERNEL_ARCH)|$(SED) 's/powerpc/ppc/')
+U_BOOT_ARCH:=$(shell echo $(KERNEL_ARCH)|$(HOST_SED_DIR)/bin/sed 's/powerpc/ppc/')
 
 ifneq ($(BR2_TARGET_U_BOOT_CONFIG_BOARD),)
 U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/configs/$(subst _config,,$(BR2_TARGET_U_BOOT_CONFIG_BOARD)).h
@@ -106,7 +106,7 @@
 	$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
-		$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(KERNEL_ARCH) \
+		$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) \
 		 -C $(U_BOOT_DIR)
 
 $(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-04-23 06:03:53 -0700 (Wed, 23 Apr 2008)
New Revision: 21809

Log:
u-boot: tools in target (mkimage, fw_printenv and fw_setenv)


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


Changeset:
Modified: trunk/buildroot/target/u-boot/Config.in
===================================================================
--- trunk/buildroot/target/u-boot/Config.in	2008-04-23 13:03:50 UTC (rev 21808)
+++ trunk/buildroot/target/u-boot/Config.in	2008-04-23 13:03:53 UTC (rev 21809)
@@ -70,3 +70,15 @@
 	help
 	  If the option has been enabled, the output can be
 	  silenced by setting the environment variable "silent".
+
+config BR2_TARGET_UBOOT_TOOL_MKIMAGE
+	bool "mkimage tool in target"
+	depends on BR2_TARGET_UBOOT
+	help
+	  Install mkimage tool in target.
+
+config BR2_TARGET_UBOOT_TOOL_ENV
+	bool "fw_printenv tool in target"
+	depends on BR2_TARGET_UBOOT
+	help
+	  Install fw_printenv / fw_setenv tools in target.

Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2008-04-23 13:03:50 UTC (rev 21808)
+++ trunk/buildroot/target/u-boot/Makefile.in	2008-04-23 13:03:53 UTC (rev 21809)
@@ -20,6 +20,15 @@
 U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/config.h
 endif
 
+U_BOOT_TARGET_TOOLS:=
+ifeq ($(strip $(BR2_TARGET_UBOOT_TOOL_MKIMAGE)),y)
+U_BOOT_TARGET_TOOLS+=$(TARGET_DIR)/usr/bin/mkimage
+endif
+ifeq ($(strip $(BR2_TARGET_UBOOT_TOOL_ENV)),y)
+U_BOOT_TARGET_TOOLS+=$(TARGET_DIR)/usr/sbin/fw_printenv
+endif
+
+
 # Define a helper function
 define insert_define
 @echo "#ifdef $(strip $(1))" >> $(U_BOOT_INC_CONF_FILE)
@@ -113,11 +122,23 @@
 	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)
 	cp -dpf $(U_BOOT_DIR)/tools/$(U_BOOT_TOOLS_BIN) $(STAGING_DIR)/usr/bin/
 
-u-boot: gcc $(BINARIES_DIR)/$(U_BOOT_BIN)
+$(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/$(U_BOOT_BIN)
+	$(TARGET_CC) -I$(U_BOOT_DIR)/include -DUSE_HOSTCC -o $@ \
+		$(U_BOOT_DIR)/tools/mkimage.c $(U_BOOT_DIR)/tools/crc32.c
+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
 
+$(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/$(U_BOOT_BIN)
+	$(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(LINUX_HEADERS_DIR)/include \
+		-DUSE_HOSTCC -o $@ \
+		$(U_BOOT_DIR)/tools/env/*.c $(U_BOOT_DIR)/tools/crc32.c
+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
+	ln -s fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
+
+u-boot: gcc $(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TARGET_TOOLS)
+
 u-boot-clean:
 	-$(MAKE) -C $(U_BOOT_DIR) clean
-	rm -f $(STAGING_DIR)/usr/bin/$(U_BOOT_TOOLS_BIN)
+	rm -f $(STAGING_DIR)/usr/bin/$(U_BOOT_TOOLS_BIN) $(U_BOOT_TARGET_TOOLS)
 
 u-boot-dirclean:
 	rm -rf $(U_BOOT_DIR)

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-04-23 07:52:35 -0700 (Wed, 23 Apr 2008)
New Revision: 21810

Log:
u-boot: don't error on existing symlink


Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2008-04-23 13:03:53 UTC (rev 21809)
+++ trunk/buildroot/target/u-boot/Makefile.in	2008-04-23 14:52:35 UTC (rev 21810)
@@ -132,7 +132,7 @@
 		-DUSE_HOSTCC -o $@ \
 		$(U_BOOT_DIR)/tools/env/*.c $(U_BOOT_DIR)/tools/crc32.c
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
-	ln -s fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
+	ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
 
 u-boot: gcc $(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TARGET_TOOLS)
 

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-04-23 07:52:38 -0700 (Wed, 23 Apr 2008)
New Revision: 21811

Log:
u-boot: support platform-independent patches

Support platform independent patches (.patch) and use .patch.$ARCH for
platform dependent ones like elsewhere.


Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2008-04-23 14:52:35 UTC (rev 21810)
+++ trunk/buildroot/target/u-boot/Makefile.in	2008-04-23 14:52:38 UTC (rev 21811)
@@ -47,7 +47,8 @@
 
 $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked
 	toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot/ \
-		u-boot-$(U_BOOT_VERSION)-$(BR2_ARCH)-\*.patch\*
+		u-boot-$(U_BOOT_VERSION)-\*.patch \
+		u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH)
 ifneq ($(strip $(BR2_TARGET_UBOOT_CUSTOM_PATCH)),"")
 	@mkdir -p $(U_BOOT_PATCH_DIR)
 	cp -dpr $(BR2_TARGET_UBOOT_CUSTOM_PATCH) $(U_BOOT_PATCH_DIR)

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

[Thiago A. Corrêa]

Hmmm I have never seen patch.$ARCH in buildroot.

It's usually -$ARCH.patch like toolchain/kernel-headers
package/qtopia4 and others.

On Wed, Apr 23, 2008 at 11:52 AM,  <jacmet@uclibc.org> wrote:
> Author: jacmet
>  Date: 2008-04-23 07:52:38 -0700 (Wed, 23 Apr 2008)
>  New Revision: 21811
>
>  Log:
>  u-boot: support platform-independent patches
>
>  Support platform independent patches (.patch) and use .patch.$ARCH for
>  platform dependent ones like elsewhere.
>
>
>
>  Modified:
>    trunk/buildroot/target/u-boot/Makefile.in
>
>
>  Changeset:
>  Modified: trunk/buildroot/target/u-boot/Makefile.in
>  ===================================================================
>  --- trunk/buildroot/target/u-boot/Makefile.in   2008-04-23 14:52:35 UTC (rev 21810)
>  +++ trunk/buildroot/target/u-boot/Makefile.in   2008-04-23 14:52:38 UTC (rev 21811)
>  @@ -47,7 +47,8 @@
>
>   $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked
>         toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot/ \
>  -               u-boot-$(U_BOOT_VERSION)-$(BR2_ARCH)-\*.patch\*
>  +               u-boot-$(U_BOOT_VERSION)-\*.patch \
>  +               u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH)
>   ifneq ($(strip $(BR2_TARGET_UBOOT_CUSTOM_PATCH)),"")
>         @mkdir -p $(U_BOOT_PATCH_DIR)
>         cp -dpr $(BR2_TARGET_UBOOT_CUSTOM_PATCH) $(U_BOOT_PATCH_DIR)
>
>
>
>  _______________________________________________
>  buildroot mailing list
>  buildroot at uclibc.org
>  http://busybox.net/mailman/listinfo/buildroot
>

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

[Peter Korsgaard]

>>>>> "Thiago" == Thiago A Corr?a <thiago.correa@gmail.com> writes:

 Thiago> Hmmm I have never seen patch.$ARCH in buildroot.
 Thiago> It's usually -$ARCH.patch like toolchain/kernel-headers
 Thiago> package/qtopia4 and others.

packages/Makefile.autotools.in does it like that (used by jamvm and
libmad). It's nice, as it makes it easy to only apply arch specific
patches if you're compiling for those archs (E.G. we had issues with
avr32 patches screwing up stuff on other archs before).

The qtopia makefile seems buggy in this regard.

-- 
Bye, Peter Korsgaard

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

[Ulf Samuelsson]

> Author: jacmet
> Date: 2008-04-23 06:03:53 -0700 (Wed, 23 Apr 2008)
> New Revision: 21809
> 
> Log:
> u-boot: tools in target (mkimage, fw_printenv and fw_setenv)
> 
> 

Why install mkimage in the target???
It is used to create the linux kernel image so that U-Boot can load it.
If you download a new image, I would expect it is already created
using mkimage on the host.

> Modified:
>   trunk/buildroot/target/u-boot/Config.in
>   trunk/buildroot/target/u-boot/Makefile.in
> 
> 


Best Regards
Ulf Samuelsson

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

[Ulf Samuelsson]

> Hmmm I have never seen patch.$ARCH in buildroot.
> 
> It's usually -$ARCH.patch like toolchain/kernel-headers
> package/qtopia4 and others.


If you patch with "*.patch",  then *all* architecture dependent patches will be applied
if you use "-$ARCH.patch"

You want to apply 
* architecture independent patches
* architecture dependent patches pertaining to your architecture.

so ".patch.$ARCH" is much cleaner


Best Regards
Ulf Samuelsson

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

[Bernhard Fischer]

On Wed, Apr 23, 2008 at 06:22:46PM +0200, Ulf Samuelsson wrote:
>
>> Hmmm I have never seen patch.$ARCH in buildroot.
>> 
>> It's usually -$ARCH.patch like toolchain/kernel-headers
>> package/qtopia4 and others.
>
>
>If you patch with "*.patch",  then *all* architecture dependent patches will be applied
>if you use "-$ARCH.patch"
>
>You want to apply 
>* architecture independent patches
>* architecture dependent patches pertaining to your architecture.
>
>so ".patch.$ARCH" is much cleaner

The concept of per-arch patches is broken per se. You're better off to
fix or drop the dysfunctional patches.

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

[Ulf Samuelsson]

> On Wed, Apr 23, 2008 at 06:22:46PM +0200, Ulf Samuelsson wrote:
>>
>>> Hmmm I have never seen patch.$ARCH in buildroot.
>>> 
>>> It's usually -$ARCH.patch like toolchain/kernel-headers
>>> package/qtopia4 and others.
>>
>>
>>If you patch with "*.patch",  then *all* architecture dependent patches will be applied
>>if you use "-$ARCH.patch"
>>
>>You want to apply 
>>* architecture independent patches
>>* architecture dependent patches pertaining to your architecture.
>>
>>so ".patch.$ARCH" is much cleaner
> 
> The concept of per-arch patches is broken per se. You're better off to
> fix or drop the dysfunctional patches.


The per-arch patch is low maintenance, while your idea is high maintenance.

Best Regards
Ulf Samuelsson

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

[Peter Korsgaard]

>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:

 >> Author: jacmet
 >> Date: 2008-04-23 06:03:53 -0700 (Wed, 23 Apr 2008)
 >> New Revision: 21809
 >> 
 >> Log:
 >> u-boot: tools in target (mkimage, fw_printenv and fw_setenv)
 >> 
 >> 

 Ulf> Why install mkimage in the target???

To create images and more importantly, to see the version info of
images in the flash (mkimage -l).

 Ulf> It is used to create the linux kernel image so that U-Boot can load it.
 Ulf> If you download a new image, I would expect it is already created
 Ulf> using mkimage on the host.

Sure, but uImages are not just for kernels, E.G. the board I'm working
on has firmware for 2 fpgas in seperate uImages. It's handy to be able
to check the version info of the installed images under Linux, similar
to the imls u-boot command.

-- 
Bye, Peter Korsgaard

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

[Peter Korsgaard]

>>>>> "Bernhard" == Bernhard Fischer <rep.dot.nop@gmail.com> writes:

Hi,

 Bernhard> The concept of per-arch patches is broken per se. You're
 Bernhard> better off to fix or drop the dysfunctional patches.

Sure, having clean patches (or even better, all fixes integrated
upstream) would be better, but this atleast keeps the adverse affects
down for users of other archs.

-- 
Bye, Peter Korsgaard

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

[Ulf Samuelsson]

> Ulf> Why install mkimage in the target???
> 
> To create images and more importantly, to see the version info of
> images in the flash (mkimage -l).
> 
> Ulf> It is used to create the linux kernel image so that U-Boot can load it.
> Ulf> If you download a new image, I would expect it is already created
> Ulf> using mkimage on the host.
> 
> Sure, but uImages are not just for kernels, E.G. the board I'm working
> on has firmware for 2 fpgas in seperate uImages. It's handy to be able
> to check the version info of the installed images under Linux, similar
> to the imls u-boot command.
> 

OK, that makes sense.
You learn something every day.

> -- 
> Bye, Peter Korsgaard
>


Best Regards
Ulf Samuelsson

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

[Bernhard Fischer]

On Wed, Apr 23, 2008 at 07:39:38PM +0200, Ulf Samuelsson wrote:
>
>
>> On Wed, Apr 23, 2008 at 06:22:46PM +0200, Ulf Samuelsson wrote:
>>>
>>>> Hmmm I have never seen patch.$ARCH in buildroot.
>>>> 
>>>> It's usually -$ARCH.patch like toolchain/kernel-headers
>>>> package/qtopia4 and others.
>>>
>>>
>>>If you patch with "*.patch",  then *all* architecture dependent patches will be applied
>>>if you use "-$ARCH.patch"
>>>
>>>You want to apply 
>>>* architecture independent patches
>>>* architecture dependent patches pertaining to your architecture.
>>>
>>>so ".patch.$ARCH" is much cleaner
>> 
>> The concept of per-arch patches is broken per se. You're better off to
>> fix or drop the dysfunctional patches.
>
>
>The per-arch patch is low maintenance, while your idea is high maintenance.

We already had that argument, so let me just repeat that you have to
fixup your port anyway, sooner or later. 'nuff said

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-06-11 06:07:03 -0700 (Wed, 11 Jun 2008)
New Revision: 22292

Log:
u-boot: evaluate U_BOOT_ARCH at use time, rather than Makefile parse time

U_BOOT_ARCH seems to race with KERNEL_ARCH in some situations,
so it end up empty. It's only used once, so fix it by using a
use-time evaluated variable instead (=).



Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2008-06-11 13:05:23 UTC (rev 22291)
+++ trunk/buildroot/target/u-boot/Makefile.in	2008-06-11 13:07:03 UTC (rev 22292)
@@ -12,7 +12,7 @@
 U_BOOT_BIN:=u-boot.bin
 U_BOOT_TOOLS_BIN:=mkimage
 # u-boot still uses arch=ppc for powerpc
-U_BOOT_ARCH:=$(shell echo $(KERNEL_ARCH)|$(HOST_SED_DIR)/bin/sed 's/powerpc/ppc/')
+U_BOOT_ARCH=$(shell echo $(KERNEL_ARCH)|$(HOST_SED_DIR)/bin/sed 's/powerpc/ppc/')
 
 ifneq ($(BR2_TARGET_U_BOOT_CONFIG_BOARD),)
 U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/configs/$(subst _config,,$(BR2_TARGET_U_BOOT_CONFIG_BOARD)).h

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

[Hamish Moffatt]

On Wed, Jun 11, 2008 at 06:07:04AM -0700, jacmet at uclibc.org wrote:
> -U_BOOT_ARCH:=$(shell echo $(KERNEL_ARCH)|$(HOST_SED_DIR)/bin/sed 's/powerpc/ppc/')
> +U_BOOT_ARCH=$(shell echo $(KERNEL_ARCH)|$(HOST_SED_DIR)/bin/sed 's/powerpc/ppc/')

How about

U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)

anyway.. less ugly than calling the shell + sed.

Hamish
-- 
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-06-12 00:27:48 -0700 (Thu, 12 Jun 2008)
New Revision: 22298

Log:
u-boot: cleanup arch handling

Thanks to Hamish Moffatt.


Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2008-06-11 18:29:48 UTC (rev 22297)
+++ trunk/buildroot/target/u-boot/Makefile.in	2008-06-12 07:27:48 UTC (rev 22298)
@@ -12,7 +12,7 @@
 U_BOOT_BIN:=u-boot.bin
 U_BOOT_TOOLS_BIN:=mkimage
 # u-boot still uses arch=ppc for powerpc
-U_BOOT_ARCH=$(shell echo $(KERNEL_ARCH)|$(HOST_SED_DIR)/bin/sed 's/powerpc/ppc/')
+U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
 
 ifneq ($(BR2_TARGET_U_BOOT_CONFIG_BOARD),)
 U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/configs/$(subst _config,,$(BR2_TARGET_U_BOOT_CONFIG_BOARD)).h

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

[Peter Korsgaard]

>>>>> "Hamish" == Hamish Moffatt <hamish@cloud.net.au> writes:

Hi,

 >> +U_BOOT_ARCH=$(shell echo $(KERNEL_ARCH)|$(HOST_SED_DIR)/bin/sed 's/powerpc/ppc/')

 Hamish> How about
 Hamish> U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)

 Hamish> anyway.. less ugly than calling the shell + sed.

Ah yes, ofcause - Fixed. U-boot supports ARCH=powerpc from 1.3.3 on
though.

-- 
Bye, Peter Korsgaard

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-06-13 06:46:42 -0700 (Fri, 13 Jun 2008)
New Revision: 22323

Log:
u-boot: don't depend on gcc (not needed and not provided by ext toolchain)


Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2008-06-13 13:31:41 UTC (rev 22322)
+++ trunk/buildroot/target/u-boot/Makefile.in	2008-06-13 13:46:42 UTC (rev 22323)
@@ -135,7 +135,7 @@
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
 	ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
 
-u-boot: gcc $(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TARGET_TOOLS)
+u-boot: $(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TARGET_TOOLS)
 
 u-boot-clean:
 	-$(MAKE) -C $(U_BOOT_DIR) clean

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-06-17 01:04:15 -0700 (Tue, 17 Jun 2008)
New Revision: 22394

Log:
u-boot tools: make sure destination directory exists


Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2008-06-17 07:52:43 UTC (rev 22393)
+++ trunk/buildroot/target/u-boot/Makefile.in	2008-06-17 08:04:15 UTC (rev 22394)
@@ -124,11 +124,13 @@
 	cp -dpf $(U_BOOT_DIR)/tools/$(U_BOOT_TOOLS_BIN) $(STAGING_DIR)/usr/bin/
 
 $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/$(U_BOOT_BIN)
+	mkdir -p $(@D)
 	$(TARGET_CC) -I$(U_BOOT_DIR)/include -DUSE_HOSTCC -o $@ \
 		$(U_BOOT_DIR)/tools/mkimage.c $(U_BOOT_DIR)/tools/crc32.c
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
 
 $(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/$(U_BOOT_BIN)
+	mkdir -p $(@D)
 	$(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(LINUX_HEADERS_DIR)/include \
 		-DUSE_HOSTCC -o $@ \
 		$(U_BOOT_DIR)/tools/env/*.c $(U_BOOT_DIR)/tools/crc32.c

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

[ulf at uclibc.org]

Author: ulf
Date: 2008-07-04 15:18:56 -0700 (Fri, 04 Jul 2008)
New Revision: 22638

Log:
Bump U-Boot version to 1.3.3

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2008-07-04 21:58:00 UTC (rev 22637)
+++ trunk/buildroot/target/u-boot/Makefile.in	2008-07-04 22:18:56 UTC (rev 22638)
@@ -3,7 +3,7 @@
 # U-Boot
 #
 #############################################################
-U_BOOT_VERSION:=1.3.2
+U_BOOT_VERSION:=1.3.3
 U_BOOT_SOURCE:=u-boot-$(U_BOOT_VERSION).tar.bz2
 U_BOOT_SITE:=ftp://ftp.denx.de/pub/u-boot
 U_BOOT_DIR:=$(PROJECT_BUILD_DIR)/u-boot-$(U_BOOT_VERSION)

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

[Peter Korsgaard]

>>>>> "ulf" == ulf  <ulf@uclibc.org> writes:

 ulf> Author: ulf
 ulf> Date: 2008-07-04 15:18:56 -0700 (Fri, 04 Jul 2008)
 ulf> New Revision: 22638

 ulf> Log:
 ulf> Bump U-Boot version to 1.3.3

That breaks mkimage (BR2_TARGET_UBOOT_TOOL_MKIMAGE).

-- 
Bye, Peter Korsgaard

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-07-08 03:53:17 -0700 (Tue, 08 Jul 2008)
New Revision: 22689

Log:
uboot: revert r22638

Go back to 1.3.2 as r22638 breaks mkimage

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2008-07-08 10:37:05 UTC (rev 22688)
+++ trunk/buildroot/target/u-boot/Makefile.in	2008-07-08 10:53:17 UTC (rev 22689)
@@ -3,7 +3,7 @@
 # U-Boot
 #
 #############################################################
-U_BOOT_VERSION:=1.3.3
+U_BOOT_VERSION:=1.3.2
 U_BOOT_SOURCE:=u-boot-$(U_BOOT_VERSION).tar.bz2
 U_BOOT_SITE:=ftp://ftp.denx.de/pub/u-boot
 U_BOOT_DIR:=$(PROJECT_BUILD_DIR)/u-boot-$(U_BOOT_VERSION)

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-08-20 13:04:11 -0700 (Wed, 20 Aug 2008)
New Revision: 23121

Log:
u-boot: fix wrong syntax in Makefile

Patch by Markus Heidelberg <markus.heidelberg@web.de>

Some $(call insert_define, ..., ...) calls were lacking the comma after
the variable. That didn't lead to a syntax error but it didn't have any
effect on the output u-boot/include/config.h

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2008-08-20 14:28:58 UTC (rev 23120)
+++ trunk/buildroot/target/u-boot/Makefile.in	2008-08-20 20:04:11 UTC (rev 23121)
@@ -98,16 +98,16 @@
 	$(call insert_define, "CONFIG_ETHADDR", $(BR2_TARGET_UBOOT_ETHADDR))
 endif
 ifneq ($(strip $(BR2_TARGET_UBOOT_ETH1ADDR)),"")
-	$(call insert_define "CONFIG_ETH2ADDR", $(BR2_TARGET_UBOOT_ETH1ADDR))
+	$(call insert_define, "CONFIG_ETH2ADDR", $(BR2_TARGET_UBOOT_ETH1ADDR))
 endif
 ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTARGS)),"")
-	$(call insert_define "CONFIG_BOOTARGS", $(BR2_TARGET_UBOOT_BOOTARGS))
+	$(call insert_define, "CONFIG_BOOTARGS", $(BR2_TARGET_UBOOT_BOOTARGS))
 endif
 ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTCMD)),"")
-	$(call insert_define "CONFIG_BOOTCOMMAND", $(BR2_TARGET_UBOOT_BOOTCMD))
+	$(call insert_define, "CONFIG_BOOTCOMMAND", $(BR2_TARGET_UBOOT_BOOTCMD))
 endif
 ifneq ($(strip $(BR2_TARGET_UBOOT_SILENT)),"")
-	$(call insert_define "CONFIG_SILENT_CONSOLE", "")
+	$(call insert_define, "CONFIG_SILENT_CONSOLE", "")
 endif
 	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(U_BOOT_INC_CONF_FILE)
 	touch $@

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-08-20 13:04:14 -0700 (Wed, 20 Aug 2008)
New Revision: 23122

Log:
u-boot: fix broken insert_define in Makefile

Patch by Markus Heidelberg <markus.heidelberg@web.de>

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2008-08-20 20:04:11 UTC (rev 23121)
+++ trunk/buildroot/target/u-boot/Makefile.in	2008-08-20 20:04:14 UTC (rev 23122)
@@ -34,7 +34,7 @@
 @echo "#ifdef $(strip $(1))" >> $(U_BOOT_INC_CONF_FILE)
 @echo "#undef $(strip $(1))" >> $(U_BOOT_INC_CONF_FILE)
 @echo "#endif" >> $(U_BOOT_INC_CONF_FILE)
- at echo "#define $(strip $(1)) $(2)" >> $(U_BOOT_INC_CONF_FILE)
+ at echo '#define $(strip $(1)) $(2)' >> $(U_BOOT_INC_CONF_FILE)
 endef
 
 $(DL_DIR)/$(U_BOOT_SOURCE):
@@ -78,36 +78,36 @@
 	@echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
 	@echo "#define __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
 ifneq ($(strip $(BR2_PROJECT)),"")
-	$(call insert_define, "CONFIG_HOSTNAME", $(BR2_PROJECT))
+	$(call insert_define, CONFIG_HOSTNAME, $(BR2_PROJECT))
 endif
 ifneq ($(strip $(BR2_TARGET_UBOOT_SERVERIP)),"")
-	$(call insert_define, "CONFIG_SERVERIP", $(BR2_TARGET_UBOOT_SERVERIP))
+	$(call insert_define, CONFIG_SERVERIP, $(BR2_TARGET_UBOOT_SERVERIP))
 endif
 
 ifneq ($(strip $(BR2_TARGET_UBOOT_IPADDR)),"")
-	$(call insert_define, "CONFIG_IPADDR", $(BR2_TARGET_UBOOT_IPADDR))
+	$(call insert_define, CONFIG_IPADDR, $(BR2_TARGET_UBOOT_IPADDR))
 ifneq ($(strip $(BR2_TARGET_UBOOT_GATEWAY)),"")
-	$(call insert_define, "CONFIG_GATEWAYIP", $(BR2_TARGET_UBOOT_GATEWAY))
+	$(call insert_define, CONFIG_GATEWAYIP, $(BR2_TARGET_UBOOT_GATEWAY))
 endif
 ifneq ($(strip $(BR2_TARGET_UBOOT_NETMASK)),"")
-	$(call insert_define, "CONFIG_NETMASK", $(BR2_TARGET_UBOOT_NETMASK))
+	$(call insert_define, CONFIG_NETMASK, $(BR2_TARGET_UBOOT_NETMASK))
 endif
 endif # end BR2_TARGET_U_BOOT_IPADDR
 
 ifneq ($(strip $(BR2_TARGET_UBOOT_ETHADDR)),"")
-	$(call insert_define, "CONFIG_ETHADDR", $(BR2_TARGET_UBOOT_ETHADDR))
+	$(call insert_define, CONFIG_ETHADDR, $(BR2_TARGET_UBOOT_ETHADDR))
 endif
 ifneq ($(strip $(BR2_TARGET_UBOOT_ETH1ADDR)),"")
-	$(call insert_define, "CONFIG_ETH2ADDR", $(BR2_TARGET_UBOOT_ETH1ADDR))
+	$(call insert_define, CONFIG_ETH2ADDR, $(BR2_TARGET_UBOOT_ETH1ADDR))
 endif
 ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTARGS)),"")
-	$(call insert_define, "CONFIG_BOOTARGS", $(BR2_TARGET_UBOOT_BOOTARGS))
+	$(call insert_define, CONFIG_BOOTARGS, $(BR2_TARGET_UBOOT_BOOTARGS))
 endif
 ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTCMD)),"")
-	$(call insert_define, "CONFIG_BOOTCOMMAND", $(BR2_TARGET_UBOOT_BOOTCMD))
+	$(call insert_define, CONFIG_BOOTCOMMAND, $(BR2_TARGET_UBOOT_BOOTCMD))
 endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_SILENT)),"")
-	$(call insert_define, "CONFIG_SILENT_CONSOLE", "")
+ifeq ($(strip $(BR2_TARGET_UBOOT_SILENT)),y)
+	$(call insert_define, CONFIG_SILENT_CONSOLE,)
 endif
 	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(U_BOOT_INC_CONF_FILE)
 	touch $@

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-08-20 13:04:18 -0700 (Wed, 20 Aug 2008)
New Revision: 23123

Log:
u-boot: bump version

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2008-08-20 20:04:14 UTC (rev 23122)
+++ trunk/buildroot/target/u-boot/Makefile.in	2008-08-20 20:04:18 UTC (rev 23123)
@@ -3,7 +3,7 @@
 # U-Boot
 #
 #############################################################
-U_BOOT_VERSION:=1.3.2
+U_BOOT_VERSION:=1.3.4
 U_BOOT_SOURCE:=u-boot-$(U_BOOT_VERSION).tar.bz2
 U_BOOT_SITE:=ftp://ftp.denx.de/pub/u-boot
 U_BOOT_DIR:=$(PROJECT_BUILD_DIR)/u-boot-$(U_BOOT_VERSION)
@@ -126,7 +126,8 @@
 $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/$(U_BOOT_BIN)
 	mkdir -p $(@D)
 	$(TARGET_CC) -I$(U_BOOT_DIR)/include -DUSE_HOSTCC -o $@ \
-		$(U_BOOT_DIR)/tools/mkimage.c $(U_BOOT_DIR)/tools/crc32.c
+		$(U_BOOT_DIR)/tools/mkimage.c \
+		$(addprefix $(U_BOOT_DIR)/tools/,crc32.c image.c md5.c sha1.c fdt*.c)
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
 
 $(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/$(U_BOOT_BIN)

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

[ulf at uclibc.org]

Author: ulf
Date: 2009-01-03 00:00:46 +0000 (Sat, 03 Jan 2009)
New Revision: 24652

Log:
Add Memory configuration to U-Boot build, remove some debugging info

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2009-01-02 20:31:44 UTC (rev 24651)
+++ trunk/buildroot/target/u-boot/Makefile.in	2009-01-03 00:00:46 UTC (rev 24652)
@@ -42,8 +42,9 @@
 @echo "#ifdef $(strip $(1))" >> $(U_BOOT_INC_CONF_FILE)
 @echo "#undef $(strip $(1))" >> $(U_BOOT_INC_CONF_FILE)
 @echo "#endif" >> $(U_BOOT_INC_CONF_FILE)
- at echo '#define $(strip $(1)) $(2)' >> $(U_BOOT_INC_CONF_FILE)
+ at echo '#define $(strip $(1)) $(strip $(subst ",,$(2)))' >> $(U_BOOT_INC_CONF_FILE)
 endef
+#"))
 
 $(DL_DIR)/$(U_BOOT_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(U_BOOT_SITE)/$(U_BOOT_SOURCE)
@@ -80,18 +81,15 @@
 
 $(U_BOOT_DIR)/.header_modified: $(U_BOOT_DIR)/.configured
 	# Modify configuration header in $(U_BOOT_INC_CONF_FILE)
-	
 	@echo >> $(U_BOOT_INC_CONF_FILE)
 	@echo "/* Add a wrapper around the values Buildroot sets. */" >> $(U_BOOT_INC_CONF_FILE)
 	@echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
 	@echo "#define __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
+	$(call insert_define, DATE, $(DATE))	
+	$(call insert_define, CONFIG_LOAD_SCRIPTS, 1)
 ifneq ($(strip $(BR2_PROJECT)),"")
 	$(call insert_define, CONFIG_HOSTNAME, $(BR2_PROJECT))
 endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_SERVERIP)),"")
-	$(call insert_define, CONFIG_SERVERIP, $(BR2_TARGET_UBOOT_SERVERIP))
-endif
-
 ifneq ($(strip $(BR2_TARGET_UBOOT_IPADDR)),"")
 	$(call insert_define, CONFIG_IPADDR, $(BR2_TARGET_UBOOT_IPADDR))
 ifneq ($(strip $(BR2_TARGET_UBOOT_GATEWAY)),"")
@@ -101,22 +99,51 @@
 	$(call insert_define, CONFIG_NETMASK, $(BR2_TARGET_UBOOT_NETMASK))
 endif
 endif # end BR2_TARGET_U_BOOT_IPADDR
-
+ifneq ($(strip $(BR2_TARGET_UBOOT_SERVERIP)),"")
+	$(call insert_define, CONFIG_SERVERIP, $(BR2_TARGET_UBOOT_SERVERIP))
+endif
 ifneq ($(strip $(BR2_TARGET_UBOOT_ETHADDR)),"")
 	$(call insert_define, CONFIG_ETHADDR, $(BR2_TARGET_UBOOT_ETHADDR))
 endif
+ifneq ($(strip $(BR2_TARGET_UBOOT_ETH1ADDR)),)
 ifneq ($(strip $(BR2_TARGET_UBOOT_ETH1ADDR)),"")
-	$(call insert_define, CONFIG_ETH2ADDR, $(BR2_TARGET_UBOOT_ETH1ADDR))
+	$(call insert_define, CONFIG_ETH1ADDR, $(BR2_TARGET_UBOOT_ETH1ADDR))
 endif
+endif
+ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTARGS)),)
 ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTARGS)),"")
 	$(call insert_define, CONFIG_BOOTARGS, $(BR2_TARGET_UBOOT_BOOTARGS))
 endif
+endif
+ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTCMD)),)
 ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTCMD)),"")
 	$(call insert_define, CONFIG_BOOTCOMMAND, $(BR2_TARGET_UBOOT_BOOTCMD))
 endif
+endif
 ifeq ($(BR2_TARGET_UBOOT_SILENT),y)
 	$(call insert_define, CONFIG_SILENT_CONSOLE,)
 endif
+ifneq ($(strip $(BR2_TARGET_UBOOT_KERNEL_START)),"")
+	$(call insert_define, KERNEL_START, $(BR2_TARGET_UBOOT_KERNEL_START))
+endif
+ifneq ($(strip $(BR2_TARGET_UBOOT_KERNEL_LOCATION)),"")
+	$(call insert_define, KERNEL_LOCATION, $(BR2_TARGET_UBOOT_KERNEL_LOCATION))
+endif
+ifneq ($(strip $(BR2_TARGET_UBOOT_FILESYSTEM_START)),"")
+	$(call insert_define, FILESYSTEM_START, $(BR2_TARGET_UBOOT_FILESYSTEM_START))
+endif
+ifneq ($(strip $(BR2_TARGET_UBOOT_FILESYSTEM_LOCATION)),"")
+	$(call insert_define, FILESYSTEM_LOCATION, $(BR2_TARGET_UBOOT_FILESYSTEM_LOCATION))
+endif
+ifneq ($(strip $(BR2_TARGET_UBOOT_FILESYSTEM_SIZE)),"")
+	$(call insert_define, FILESYSTEM_SIZE, $(BR2_TARGET_UBOOT_FILESYSTEM_SIZE))
+endif
+ifneq ($(strip $(BR2_TARGET_UBOOT_END_OF_FLASH)),"")
+	$(call insert_define, END_OF_FLASH, $(BR2_TARGET_UBOOT_END_OF_FLASH))
+endif
+ifneq ($(strip $(BR2_TARGET_UBOOT_MEMORY_SIZE)),"")
+	$(call insert_define, MEMORY_SIZE, $(BR2_TARGET_UBOOT_MEMORY_SIZE))
+endif
 	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(U_BOOT_INC_CONF_FILE)
 	touch $@
 
@@ -162,6 +189,10 @@
 
 u-boot-source: $(DL_DIR)/$(U_BOOT_SOURCE)
 
+u-boot-unpacked: $(U_BOOT_DIR)/.patched
+
+u-boot-configured: $(U_BOOT_DIR)/.header_modified
+
 #############################################################
 #
 # Toplevel Makefile options
@@ -186,13 +217,6 @@
 	@echo BR2_TARGET_UBOOT_BOOTARGS = $(BR2_TARGET_UBOOT_BOOTARGS)
 	@echo BR2_TARGET_UBOOT_BOOTCMD = $(BR2_TARGET_UBOOT_BOOTCMD)
 	@echo BR2_TARGET_UBOOT_SILENT = $(BR2_TARGET_UBOOT_SILENT)
-	@echo BR2_BOOTSOURCE=$(BR2_BOOTSOURCE)
-	@echo BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=$(BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD)
-	@echo BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH=$(BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH)
-	@echo BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH=$(BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH)
-	@echo BR2_TARGET_UBOOT_BOOTSOURCE_FLASH=$(BR2_TARGET_UBOOT_BOOTSOURCE_FLASH)
-	@echo BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD=$(BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD)
-	@echo BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM=$(BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM)
 	@echo UBOOT_BOARD_NAME=$(UBOOT_BOARD_NAME)
 	@echo TEST=$(TEST)
 	@exit 0

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

[ulf at uclibc.org]

Author: ulf
Date: 2009-01-03 00:02:07 +0000 (Sat, 03 Jan 2009)
New Revision: 24653

Log:
Add Memory configration to u-boot (Config.in) and remove comments from 'choice's', Rearrange options for clarity

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


Changeset:
Modified: trunk/buildroot/target/u-boot/Config.in
===================================================================
--- trunk/buildroot/target/u-boot/Config.in	2009-01-03 00:00:46 UTC (rev 24652)
+++ trunk/buildroot/target/u-boot/Config.in	2009-01-03 00:02:07 UTC (rev 24653)
@@ -11,6 +11,14 @@
 	  Build "Das U-Boot" Boot Monitor
 
 if BR2_TARGET_UBOOT
+config BR2_TARGET_UBOOT_BOARDNAME
+	string "board name"
+	depends on BR2_TARGET_UBOOT
+	default "$(BOARD_NAME)"
+	help
+	  One of U-Boot supported boards to be built.
+	  This will be suffixed with _config to meet U-Boot standard naming.
+
 choice
 	prompt "U-Boot Version"
 	default BR2_TARGET_UBOOT_2009_01_RC1
@@ -20,27 +28,18 @@
 config BR2_TARGET_UBOOT_2009_01_RC1
 	bool "u-boot-2009.01-rc1"
 	depends on BR2_TARGET_UBOOT
-	help
-	  Use u-boot from December 2008 (RC1)
 
 config BR2_TARGET_UBOOT_2008_10
 	bool "u-boot-2008.10"
 	depends on BR2_TARGET_UBOOT
-	help
-	  Use u-boot from October 2008
 	
 config BR2_TARGET_UBOOT_1_3_4
 	bool "u-boot-1.3.4"
 	depends on BR2_TARGET_UBOOT
-	help
-	  Use u-boot from mid 2008
 	
 config BR2_TARGET_UBOOT_2009_01
 	bool "u-boot-2009.01"
 	depends on BR2_TARGET_UBOOT
-	help
-	  Use u-boot from January 2009
-	  Release date 2009-01-17
 
 endchoice
 
@@ -51,14 +50,6 @@
 	default "1.3.4"		if BR2_TARGET_UBOOT_1_3_4
 	default "2009.01"	if BR2_TARGET_UBOOT_2009_01
 
-config BR2_TARGET_UBOOT_BOARDNAME
-	string "board name"
-	depends on BR2_TARGET_UBOOT
-	default "$(BOARD_NAME)"
-	help
-	  One of U-Boot supported boards to be built.
-	  This will be suffixed with _config to meet U-Boot standard naming.
-
 config BR2_TARGET_UBOOT_CUSTOM_PATCH
 	string "custom patch"
 	depends on BR2_TARGET_UBOOT
@@ -74,42 +65,27 @@
 	config BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD
 	bool "Boot from dataflashcard"
 	depends on BR2_BOOTSOURCE_DATAFLASHCARD
-	help
-	  
 
 	config BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
 	bool "Boot from dataflash
 	depends on BR2_BOOTSOURCE_DATAFLASH
-	help
-	  
 
 	config BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH
 	bool "Boot from a NAND flash"
 	depends on BR2_BOOTSOURCE_NANDFLASH
-	help
-	  Build u-boot with environment in the NAND flash
 
 	config BR2_TARGET_UBOOT_BOOTSOURCE_FLASH
 	bool "Boot from a parallell flash"
 	depends on BR2_BOOTSOURCE_FLASH
-	help
-	  Build u-boot with environment in a flash RAM
 
 	config BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD
-	bool "Boot from a NAND flash"
+	bool "Boot from an SD-Card"
 	depends on BR2_BOOTSOURCE_SDCARD
-	help
-	  Build u-boot with environment on an SD-Card
-	  Not yet supported
 
 	config BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM
-	bool "Boot from a serial EEPROM"
+	bool "Boot from a serial EEPROM (Not yet supported)"
 	depends on BR2_BOOTSOURCE_EEPROM
-	help
-	  Build u-boot with environment in a serial EEPROM
-	  Not yet supported
 
-
 endchoice
 
 config BR2_TARGET_UBOOT_BOOTSOURCE
@@ -122,6 +98,181 @@
 	default "sdcard"	if BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD
 	default "eeprom"	if BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM
 
+config BR2_TARGET_UBOOT_SILENT
+	bool "silent console"
+	depends on BR2_TARGET_UBOOT
+	help
+	  If the option has been enabled, the output can be
+	  silenced by setting the environment variable "silent".
+
+config BR2_TARGET_UBOOT_TOOL_MKIMAGE
+	bool "mkimage tool in target"
+	depends on BR2_TARGET_UBOOT
+	help
+	  Install mkimage tool in target.
+
+config BR2_TARGET_UBOOT_TOOL_ENV
+	bool "fw_printenv tool in target"
+	depends on BR2_TARGET_UBOOT
+	help
+	  Install fw_printenv / fw_setenv tools in target.
+
+
+choice
+	prompt "SDRAM Memory size"
+	default BR2_TARGET_UBOOT_SDRAM_SIZE_64M
+	help
+	  Size of the onboard SDRAM
+
+config BR2_TARGET_UBOOT_SDRAM_SIZE_256MB
+	bool "256 MB"
+
+config BR2_TARGET_UBOOT_SDRAM_SIZE_128MB
+	bool "128 MB"
+
+config BR2_TARGET_UBOOT_SDRAM_SIZE_64MB
+	bool "64 MB"
+
+config BR2_TARGET_UBOOT_SDRAM_SIZE_32MB
+	bool "32 MB"
+
+config BR2_TARGET_UBOOT_SDRAM_SIZE_16MB
+	bool "16 MB"
+
+config BR2_TARGET_UBOOT_SDRAM_SIZE_8MB
+	bool "8 MB"
+
+endchoice
+
+config BR2_TARGET_UBOOT_MEMORY_SIZE
+	string
+	default "256M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_256MB
+	default "128M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_128MB
+	default "64M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_64MB
+	default "32M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_32MB
+	default "16M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_16MB
+	default "8M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_8MB
+
+choice
+	prompt "Kernel Size"
+	default BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB
+
+config BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB
+	bool "Kernel size is less than 1.25 MB"
+
+config BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB
+	bool "Kernel size is less than 1.50 MB"
+
+config BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB
+	bool "Kernel size is less than 1.75 MB"
+
+config BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB
+	bool "Kernel size is less than 2.00 MB"
+
+config BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB
+	bool "Kernel size is less than 2.25 MB"
+
+config BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB
+	bool "Kernel size is less than 2.50 MB"
+
+endchoice
+
+choice
+	prompt "Dataflash Size"
+	default BR2_TARGET_UBOOT_DATAFLASH_SIZE_2_00MB
+
+config BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB
+	bool "Dataflash size is 8 MB"
+
+config BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB
+	bool "Dataflash size is 4 MB"
+
+config BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB
+	bool "Dataflash size is 2 MB"
+
+config BR2_TARGET_UBOOT_DATAFLASH_SIZE_1MB
+	bool "Dataflash size is 1 MB"
+
+config BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB
+	bool "Dataflash size is 0.5 MB"
+
+config BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB
+	bool "Dataflash size is 0.25 MB"
+
+endchoice
+
+config BR2_TARGET_UBOOT_DATAFLASH_SIZE
+	string
+	default "8M"	if BR2_TARGET_DATAFLASH_SIZE_8MB
+	default "4M"	if BR2_TARGET_DATAFLASH_SIZE_4MB
+	default "2M"	if BR2_TARGET_DATAFLASH_SIZE_2MB
+	default "1M"	if BR2_TARGET_DATAFLASH_SIZE_1MB
+	default "0.5M"	if BR2_TARGET_DATAFLASH_SIZE_0_50MB
+	default "0.25M"	if BR2_TARGET_DATAFLASH_SIZE_0_25MB
+
+config BR2_TARGET_UBOOT_END_OF_FLASH
+	string
+	default "C083FFFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB
+	default "C041FFFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB
+	default "C020FFFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB
+	default "C0107FFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_1MB
+	default "C0083FFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB
+	default "C0041FFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB
+	help
+	  
+
+config BR2_TARGET_UBOOT_KERNEL_START
+	string "Kernel SDRAM address"
+	default "21000000"
+	help
+	  Kernel is loaded to this address in SDRAM 
+
+config BR2_TARGET_UBOOT_KERNEL_LOCATION
+	string "Kernel flash address"
+	default "C0042000"
+	help
+	  Kernel location in dataflash
+
+config BR2_TARGET_UBOOT_FILESYSTEM_START
+	string
+	default "2114A000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB
+	default "2118C000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB
+  	default "211CE000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB
+  	default "21210000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB
+  	default "21252000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB
+  	default "21294000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB
+	help
+	  Kernel is loaded to this SDRAM address
+	  Assumes SDRAM starts at 20000000
+	  Will need to be updated if the SDRAM is located elsewhere
+
+config BR2_TARGET_UBOOT_FILESYSTEM_LOCATION
+	string
+	default "C018C000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB
+  	default "C01CE000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB
+  	default "C0210000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB
+  	default "C0252000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB
+  	default "C0294000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB
+  	default "C02D6000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB
+	help
+	  Determine location for File System in Dataflash
+	  This needs to be updated for other memory technologies
+
+config BR2_TARGET_UBOOT_FILESYSTEM_SIZE
+	string "File System Size"
+	default "6000000"
+	help
+	  
+
+menuconfig BR2_TARGET_UBOOT_NETWORK
+	bool "Network Settings"
+	default y
+	depends on BR2_TARGET_UBOOT
+	help
+	  Network settings for U-boot
+
+if BR2_TARGET_UBOOT_NETWORK
+
 config BR2_TARGET_UBOOT_SERVERIP
 	string "server ip"
 	depends on BR2_TARGET_UBOOT
@@ -164,25 +315,8 @@
 	depends on BR2_TARGET_AVR32
 	help
 	  Target MAC address for the second ethernet interface.
+endif
 
-config BR2_TARGET_UBOOT_SILENT
-	bool "silent console"
-	depends on BR2_TARGET_UBOOT
-	help
-	  If the option has been enabled, the output can be
-	  silenced by setting the environment variable "silent".
-
-config BR2_TARGET_UBOOT_TOOL_MKIMAGE
-	bool "mkimage tool in target"
-	depends on BR2_TARGET_UBOOT
-	help
-	  Install mkimage tool in target.
-
-config BR2_TARGET_UBOOT_TOOL_ENV
-	bool "fw_printenv tool in target"
-	depends on BR2_TARGET_UBOOT
-	help
-	  Install fw_printenv / fw_setenv tools in target.
 endif
 
 config BR2_BOOTSOURCE_DATAFLASHCARD

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

[nkukard at uclibc.org]

Author: nkukard
Date: 2009-01-03 15:03:16 +0000 (Sat, 03 Jan 2009)
New Revision: 24671

Log:
Fixed missing "


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


Changeset:
Modified: trunk/buildroot/target/u-boot/Config.in
===================================================================
--- trunk/buildroot/target/u-boot/Config.in	2009-01-03 14:43:18 UTC (rev 24670)
+++ trunk/buildroot/target/u-boot/Config.in	2009-01-03 15:03:16 UTC (rev 24671)
@@ -67,7 +67,7 @@
 	depends on BR2_BOOTSOURCE_DATAFLASHCARD
 
 	config BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	bool "Boot from dataflash
+	bool "Boot from dataflash"
 	depends on BR2_BOOTSOURCE_DATAFLASH
 
 	config BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH

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

[Ulf Samuelsson]

l?r 2009-01-03 klockan 21:46 +0100 skrev Peter Korsgaard:
> >>>>> "ulf" == ulf  <ulf@uclibc.org> writes:
> 
>  ulf> Author: ulf
>  ulf> Date: 2009-01-03 00:02:07 +0000 (Sat, 03 Jan 2009)
>  ulf> New Revision: 24653
> 
>  ulf> Log:
>  ulf> Add Memory configration to u-boot (Config.in) and remove comments from 'choice's', Rearrange options for clarity
> 
>  ulf> Modified:
>  ulf>    trunk/buildroot/target/u-boot/Config.in
> 
> 
>  ulf> Changeset:
>  ulf> Modified: trunk/buildroot/target/u-boot/Config.in
>  ulf> ===================================================================
>  ulf> --- trunk/buildroot/target/u-boot/Config.in	2009-01-03 00:00:46 UTC (rev 24652)
>  ulf> +++ trunk/buildroot/target/u-boot/Config.in	2009-01-03 00:02:07 UTC (rev 24653)
>  ulf> @@ -11,6 +11,14 @@
>  ulf>  	  Build "Das U-Boot" Boot Monitor
>  
>  ulf>  if BR2_TARGET_UBOOT
>  ulf> +config BR2_TARGET_UBOOT_BOARDNAME
>  ulf> +	string "board name"
>  ulf> +	depends on BR2_TARGET_UBOOT
>  ulf> +	default "$(BOARD_NAME)"
>  ulf> +	help
>  ulf> +	  One of U-Boot supported boards to be built.
>  ulf> +	  This will be suffixed with _config to meet U-Boot standard naming.
>  ulf> +
>  ulf>  choice
>  ulf>  	prompt "U-Boot Version"
>  ulf>  	default BR2_TARGET_UBOOT_2009_01_RC1
>  ulf> @@ -20,27 +28,18 @@
>  ulf>  config BR2_TARGET_UBOOT_2009_01_RC1
>  ulf>  	bool "u-boot-2009.01-rc1"
>  ulf>  	depends on BR2_TARGET_UBOOT
>  ulf> -	help
>  ulf> -	  Use u-boot from December 2008 (RC1)
>  
>  ulf>  config BR2_TARGET_UBOOT_2008_10
>  ulf>  	bool "u-boot-2008.10"
>  ulf>  	depends on BR2_TARGET_UBOOT
>  ulf> -	help
>  ulf> -	  Use u-boot from October 2008
>  	
>  ulf>  config BR2_TARGET_UBOOT_1_3_4
>  ulf>  	bool "u-boot-1.3.4"
>  ulf>  	depends on BR2_TARGET_UBOOT
>  ulf> -	help
>  ulf> -	  Use u-boot from mid 2008
>  	
>  ulf>  config BR2_TARGET_UBOOT_2009_01
>  ulf>  	bool "u-boot-2009.01"
>  ulf>  	depends on BR2_TARGET_UBOOT
>  ulf> -	help
>  ulf> -	  Use u-boot from January 2009
>  ulf> -	  Release date 2009-01-17
>  
>  ulf>  endchoice
>  
>  ulf> @@ -51,14 +50,6 @@
>  ulf>  	default "1.3.4"		if BR2_TARGET_UBOOT_1_3_4
>  ulf>  	default "2009.01"	if BR2_TARGET_UBOOT_2009_01
>  
>  ulf> -config BR2_TARGET_UBOOT_BOARDNAME
>  ulf> -	string "board name"
>  ulf> -	depends on BR2_TARGET_UBOOT
>  ulf> -	default "$(BOARD_NAME)"
>  ulf> -	help
>  ulf> -	  One of U-Boot supported boards to be built.
>  ulf> -	  This will be suffixed with _config to meet U-Boot standard naming.
>  ulf> -
>  ulf>  config BR2_TARGET_UBOOT_CUSTOM_PATCH
>  ulf>  	string "custom patch"
>  ulf>  	depends on BR2_TARGET_UBOOT
>  ulf> @@ -74,42 +65,27 @@
>  ulf>  	config BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD
>  ulf>  	bool "Boot from dataflashcard"
>  ulf>  	depends on BR2_BOOTSOURCE_DATAFLASHCARD
>  ulf> -	help
>  ulf> -	  
>  
>  ulf>  	config BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
>  ulf>  	bool "Boot from dataflash
>  ulf>  	depends on BR2_BOOTSOURCE_DATAFLASH
>  ulf> -	help
>  ulf> -	  
>  
>  ulf>  	config BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH
>  ulf>  	bool "Boot from a NAND flash"
>  ulf>  	depends on BR2_BOOTSOURCE_NANDFLASH
>  ulf> -	help
>  ulf> -	  Build u-boot with environment in the NAND flash
>  
>  ulf>  	config BR2_TARGET_UBOOT_BOOTSOURCE_FLASH
>  ulf>  	bool "Boot from a parallell flash"
>  ulf>  	depends on BR2_BOOTSOURCE_FLASH
>  ulf> -	help
>  ulf> -	  Build u-boot with environment in a flash RAM
>  
>  ulf>  	config BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD
>  ulf> -	bool "Boot from a NAND flash"
>  ulf> +	bool "Boot from an SD-Card"
>  ulf>  	depends on BR2_BOOTSOURCE_SDCARD
>  ulf> -	help
>  ulf> -	  Build u-boot with environment on an SD-Card
>  ulf> -	  Not yet supported
>  
>  ulf>  	config BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM
>  ulf> -	bool "Boot from a serial EEPROM"
>  ulf> +	bool "Boot from a serial EEPROM (Not yet supported)"
>  ulf>  	depends on BR2_BOOTSOURCE_EEPROM
>  ulf> -	help
>  ulf> -	  Build u-boot with environment in a serial EEPROM
>  ulf> -	  Not yet supported
> 
> Why then have it as an option?

Because it will be supported.
The way it is done, it will not be visible
until it is supported by someone "selecting" this from a BSP.


> 
>  ulf> +choice
>  ulf> +	prompt "SDRAM Memory size"
>  ulf> +	default BR2_TARGET_UBOOT_SDRAM_SIZE_64M
>  ulf> +	help
>  ulf> +	  Size of the onboard SDRAM
>  ulf> +
>  ulf> +config BR2_TARGET_UBOOT_SDRAM_SIZE_256MB
>  ulf> +	bool "256 MB"
>  ulf> +
>  ulf> +config BR2_TARGET_UBOOT_SDRAM_SIZE_128MB
>  ulf> +	bool "128 MB"
>  ulf> +
>  ulf> +config BR2_TARGET_UBOOT_SDRAM_SIZE_64MB
>  ulf> +	bool "64 MB"
>  ulf> +
>  ulf> +config BR2_TARGET_UBOOT_SDRAM_SIZE_32MB
>  ulf> +	bool "32 MB"
>  ulf> +
>  ulf> +config BR2_TARGET_UBOOT_SDRAM_SIZE_16MB
>  ulf> +	bool "16 MB"
>  ulf> +
>  ulf> +config BR2_TARGET_UBOOT_SDRAM_SIZE_8MB
>  ulf> +	bool "8 MB"
>  ulf> +
>  ulf> +endchoice
> 
> I don't believe in providing buildroot config options for every U-Boot
> option - If the boards are really that different, then just add them
> as seperate platforms in U-Boot.

?Mostly the Buildroot configuration is to setup
the environment of U-Boot rather than configuring
the U-Boot compile itself.

I do not provide, nor do I plan to provide
config options for each and every U-Boot option.
Just the ones that are needed to allow
easy downloading of the kernel to flash
and allows an easy mechanism to boot the kernel.

This means making sure that the kernel and rootfs
are stored separately and do not overlap.
Computing automatically where the kernel and rootfs
should be stored, and generating scripts
which will store them in the correct location.

It means checking that the kernel and rootfs actually
can fit into the flash at hand etc.

With the right configuration items, you can avoid
several problems you otherwise would run into

You cannot add a couple of hundred boards to support each
and every possible configuration and since U-Boot
does not have a configuration system, it is natural
to let Buildroot configure it.

Some of the stuff goes into the u-boot config.h, but
again it is for the environment.
They are mainly used by the "factory" default command
which is available as a patch.
That command will set environment variables to the
value supplied by buildroot.

> 
> How are you handling the CFG -> CONFIG -> CONFIG_SYS renaming U-boot
> has recently been doing?

U-Boot compiles OK for the boards I have tested.
Anything specific in mind?

> 
>  ulf> +	prompt "Kernel Size"
>  ulf> +	default BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB
>  ulf> +
>  ulf> +config BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB
>  ulf> +	bool "Kernel size is less than 1.25 MB"
>  ulf> +
>  ulf> +config BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB
>  ulf> +	bool "Kernel size is less than 1.50 MB"
>  ulf> +
>  ulf> +config BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB
>  ulf> +	bool "Kernel size is less than 1.75 MB"
>  ulf> +
>  ulf> +config BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB
>  ulf> +	bool "Kernel size is less than 2.00 MB"
>  ulf> +
>  ulf> +config BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB
>  ulf> +	bool "Kernel size is less than 2.25 MB"
>  ulf> +
>  ulf> +config BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB
>  ulf> +	bool "Kernel size is less than 2.50 MB"
>  ulf> +
> 

That allows easy solving a significant problem with U-Boot.
If the kernel overlaps the root fs, then you are
in trouble and it can take some time to figure out
what is going on.
Happened several times for people I know of-

Computers are useful for checking.
Why do you want to do this check manually?
Really- If you do not care, you do not have to use it.



> And again .. Please get rid of all of those.
> 
> Please clean up.
> 

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

[Peter Korsgaard]

>>>>> "ulf" == ulf  <ulf@uclibc.org> writes:

 ulf> Author: ulf
 ulf> Date: 2009-01-03 00:00:46 +0000 (Sat, 03 Jan 2009)
 ulf> New Revision: 24652

 ulf> Log:
 ulf> Add Memory configuration to U-Boot build, remove some debugging info

 ulf> Modified:
 ulf>    trunk/buildroot/target/u-boot/Makefile.in


 ulf> Changeset:
 ulf> Modified: trunk/buildroot/target/u-boot/Makefile.in
 ulf> ===================================================================
 ulf> --- trunk/buildroot/target/u-boot/Makefile.in	2009-01-02 20:31:44 UTC (rev 24651)
 ulf> +++ trunk/buildroot/target/u-boot/Makefile.in	2009-01-03 00:00:46 UTC (rev 24652)
 ulf> @@ -42,8 +42,9 @@
 ulf>  @echo "#ifdef $(strip $(1))" >> $(U_BOOT_INC_CONF_FILE)
 ulf>  @echo "#undef $(strip $(1))" >> $(U_BOOT_INC_CONF_FILE)
 ulf>  @echo "#endif" >> $(U_BOOT_INC_CONF_FILE)
 ulf> - at echo '#define $(strip $(1)) $(2)' >> $(U_BOOT_INC_CONF_FILE)
 ulf> + at echo '#define $(strip $(1)) $(strip $(subst ",,$(2)))' >> $(U_BOOT_INC_CONF_FILE)

What is this for and why isn't it mentioned in the commit message?
 
 ulf>  $(U_BOOT_DIR)/.header_modified: $(U_BOOT_DIR)/.configured
 ulf>  	# Modify configuration header in $(U_BOOT_INC_CONF_FILE)
 ulf> -	
 ulf>  	@echo >> $(U_BOOT_INC_CONF_FILE)
 ulf>  	@echo "/* Add a wrapper around the values Buildroot sets. */" >> $(U_BOOT_INC_CONF_FILE)
 ulf>  	@echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
 ulf>  	@echo "#define __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
 ulf> +	$(call insert_define, DATE, $(DATE))	
 ulf> +	$(call insert_define, CONFIG_LOAD_SCRIPTS, 1)

What is this? I don't find the string CONFIG_LOAD_SCRIPTS in U-boot.

 ulf>  ifneq ($(strip $(BR2_PROJECT)),"")
 ulf>  	$(call insert_define, CONFIG_HOSTNAME, $(BR2_PROJECT))
 ulf>  endif
 ulf> -ifneq ($(strip $(BR2_TARGET_UBOOT_SERVERIP)),"")
 ulf> -	$(call insert_define, CONFIG_SERVERIP, $(BR2_TARGET_UBOOT_SERVERIP))
 ulf> -endif
 ulf> -

Why is this gone?

 ulf>  ifneq ($(strip $(BR2_TARGET_UBOOT_IPADDR)),"")
 ulf>  	$(call insert_define, CONFIG_IPADDR, $(BR2_TARGET_UBOOT_IPADDR))
 ulf>  ifneq ($(strip $(BR2_TARGET_UBOOT_GATEWAY)),"")
 ulf> @@ -101,22 +99,51 @@
 ulf>  	$(call insert_define, CONFIG_NETMASK, $(BR2_TARGET_UBOOT_NETMASK))
 ulf>  endif
 ulf>  endif # end BR2_TARGET_U_BOOT_IPADDR
 ulf> -
 ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_SERVERIP)),"")
 ulf> +	$(call insert_define, CONFIG_SERVERIP, $(BR2_TARGET_UBOOT_SERVERIP))
 ulf> +endif

Why the move?

 ulf>  ifneq ($(strip $(BR2_TARGET_UBOOT_ETHADDR)),"")
 ulf>  	$(call insert_define, CONFIG_ETHADDR, $(BR2_TARGET_UBOOT_ETHADDR))
 ulf>  endif
 ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_ETH1ADDR)),)
 ulf>  ifneq ($(strip $(BR2_TARGET_UBOOT_ETH1ADDR)),"")
 ulf> -	$(call insert_define, CONFIG_ETH2ADDR, $(BR2_TARGET_UBOOT_ETH1ADDR))
 ulf> +	$(call insert_define, CONFIG_ETH1ADDR, $(BR2_TARGET_UBOOT_ETH1ADDR))

Huh? Why does the ETH1ADDR thingy depend on AVR32 in the first place?

 ulf>  endif
 ulf> +endif
 ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTARGS)),)
 ulf>  ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTARGS)),"")
 ulf>  	$(call insert_define, CONFIG_BOOTARGS, $(BR2_TARGET_UBOOT_BOOTARGS))
 ulf>  endif
 ulf> +endif

What is this BOOTARGS thing? It's not in Config.in

 ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTCMD)),)
 ulf>  ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTCMD)),"")
 ulf>  	$(call insert_define, CONFIG_BOOTCOMMAND, $(BR2_TARGET_UBOOT_BOOTCMD))
 ulf>  endif
 ulf> +endif

Neither is this.

 ulf>  ifeq ($(BR2_TARGET_UBOOT_SILENT),y)
 ulf>  	$(call insert_define, CONFIG_SILENT_CONSOLE,)
 ulf>  endif
 ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_KERNEL_START)),"")
 ulf> +	$(call insert_define, KERNEL_START, $(BR2_TARGET_UBOOT_KERNEL_START))
 ulf> +endif
 ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_KERNEL_LOCATION)),"")
 ulf> +	$(call insert_define, KERNEL_LOCATION, $(BR2_TARGET_UBOOT_KERNEL_LOCATION))
 ulf> +endif
 ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_FILESYSTEM_START)),"")
 ulf> +	$(call insert_define, FILESYSTEM_START, $(BR2_TARGET_UBOOT_FILESYSTEM_START))
 ulf> +endif
 ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_FILESYSTEM_LOCATION)),"")
 ulf> +	$(call insert_define, FILESYSTEM_LOCATION, $(BR2_TARGET_UBOOT_FILESYSTEM_LOCATION))
 ulf> +endif
 ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_FILESYSTEM_SIZE)),"")
 ulf> +	$(call insert_define, FILESYSTEM_SIZE, $(BR2_TARGET_UBOOT_FILESYSTEM_SIZE))
 ulf> +endif
 ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_END_OF_FLASH)),"")
 ulf> +	$(call insert_define, END_OF_FLASH, $(BR2_TARGET_UBOOT_END_OF_FLASH))
 ulf> +endif
 ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_MEMORY_SIZE)),"")
 ulf> +	$(call insert_define, MEMORY_SIZE, $(BR2_TARGET_UBOOT_MEMORY_SIZE))
 ulf> +endif

Huh, that sounds like a very target specific things - And you seem to
have forgotten to add those config settings to Config.in

 ulf> -	@echo BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD=$(BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD)
 ulf> -	@echo BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM=$(BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM)
 ulf>  	@echo UBOOT_BOARD_NAME=$(UBOOT_BOARD_NAME)
 ulf>  	@echo TEST=$(TEST)
 ulf>  	@exit 0

You still didn't get rid of that TEST thing.

Please clean up.

-- 
Bye, Peter Korsgaard

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

[Ulf Samuelsson]

l?r 2009-01-03 klockan 21:28 +0100 skrev Peter Korsgaard:
> >>>>> "ulf" == ulf  <ulf@uclibc.org> writes:
> 
>  ulf> Author: ulf
>  ulf> Date: 2009-01-03 00:00:46 +0000 (Sat, 03 Jan 2009)
>  ulf> New Revision: 24652
> 
>  ulf> Log:
>  ulf> Add Memory configuration to U-Boot build, remove some debugging info
> 
>  ulf> Modified:
>  ulf>    trunk/buildroot/target/u-boot/Makefile.in
> 
> 
>  ulf> Changeset:
>  ulf> Modified: trunk/buildroot/target/u-boot/Makefile.in
>  ulf> ===================================================================
>  ulf> --- trunk/buildroot/target/u-boot/Makefile.in	2009-01-02 20:31:44 UTC (rev 24651)
>  ulf> +++ trunk/buildroot/target/u-boot/Makefile.in	2009-01-03 00:00:46 UTC (rev 24652)
>  ulf> @@ -42,8 +42,9 @@
>  ulf>  @echo "#ifdef $(strip $(1))" >> $(U_BOOT_INC_CONF_FILE)
>  ulf>  @echo "#undef $(strip $(1))" >> $(U_BOOT_INC_CONF_FILE)
>  ulf>  @echo "#endif" >> $(U_BOOT_INC_CONF_FILE)
>  ulf> - at echo '#define $(strip $(1)) $(2)' >> $(U_BOOT_INC_CONF_FILE)
>  ulf> + at echo '#define $(strip $(1)) $(strip $(subst ",,$(2)))' >> $(U_BOOT_INC_CONF_FILE)
> 
> What is this for and why isn't it mentioned in the commit message?

It just removes the '"' characters around the config variable.

>  
>  ulf>  $(U_BOOT_DIR)/.header_modified: $(U_BOOT_DIR)/.configured
>  ulf>  	# Modify configuration header in $(U_BOOT_INC_CONF_FILE)
>  ulf> -	
>  ulf>  	@echo >> $(U_BOOT_INC_CONF_FILE)
>  ulf>  	@echo "/* Add a wrapper around the values Buildroot sets. */" >> $(U_BOOT_INC_CONF_FILE)
>  ulf>  	@echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
>  ulf>  	@echo "#define __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
>  ulf> +	$(call insert_define, DATE, $(DATE))	
>  ulf> +	$(call insert_define, CONFIG_LOAD_SCRIPTS, 1)
> 
> What is this? I don't find the string CONFIG_LOAD_SCRIPTS in U-boot.

It is used by the "factory" command which is available in one of the
patches.
By typing "factory" you setup your environment to the factory
default created by the configuration.

> 
>  ulf>  ifneq ($(strip $(BR2_PROJECT)),"")
>  ulf>  	$(call insert_define, CONFIG_HOSTNAME, $(BR2_PROJECT))
>  ulf>  endif
>  ulf> -ifneq ($(strip $(BR2_TARGET_UBOOT_SERVERIP)),"")
>  ulf> -	$(call insert_define, CONFIG_SERVERIP, $(BR2_TARGET_UBOOT_SERVERIP))
>  ulf> -endif
>  ulf> -
> 
> Why is this gone?

Just moved it.

> 
>  ulf>  ifneq ($(strip $(BR2_TARGET_UBOOT_IPADDR)),"")
>  ulf>  	$(call insert_define, CONFIG_IPADDR, $(BR2_TARGET_UBOOT_IPADDR))
>  ulf>  ifneq ($(strip $(BR2_TARGET_UBOOT_GATEWAY)),"")
>  ulf> @@ -101,22 +99,51 @@
>  ulf>  	$(call insert_define, CONFIG_NETMASK, $(BR2_TARGET_UBOOT_NETMASK))
>  ulf>  endif
>  ulf>  endif # end BR2_TARGET_U_BOOT_IPADDR
>  ulf> -
>  ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_SERVERIP)),"")
>  ulf> +	$(call insert_define, CONFIG_SERVERIP, $(BR2_TARGET_UBOOT_SERVERIP))
>  ulf> +endif
> 
> Why the move?

I think the ip address should be before the server ip address
in the list.

> 
>  ulf>  ifneq ($(strip $(BR2_TARGET_UBOOT_ETHADDR)),"")
>  ulf>  	$(call insert_define, CONFIG_ETHADDR, $(BR2_TARGET_UBOOT_ETHADDR))
>  ulf>  endif
>  ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_ETH1ADDR)),)
>  ulf>  ifneq ($(strip $(BR2_TARGET_UBOOT_ETH1ADDR)),"")
>  ulf> -	$(call insert_define, CONFIG_ETH2ADDR, $(BR2_TARGET_UBOOT_ETH1ADDR))
>  ulf> +	$(call insert_define, CONFIG_ETH1ADDR, $(BR2_TARGET_UBOOT_ETH1ADDR))
> 
> Huh? Why does the ETH1ADDR thingy depend on AVR32 in the first place?
> 

It is for the second Ethernet controller.
It should not be there for parts with a single ethernet controller.
Anyone can add support for other parts in Buildroot in the future, 
but it should be off by default.

>  ulf>  endif
>  ulf> +endif
>  ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTARGS)),)
>  ulf>  ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTARGS)),"")
>  ulf>  	$(call insert_define, CONFIG_BOOTARGS, $(BR2_TARGET_UBOOT_BOOTARGS))
>  ulf>  endif
>  ulf> +endif
> 
> What is this BOOTARGS thing? It's not in Config.in
> 

I did not add them, I just make sure that if they are empty
they are not forwarded to U-Boot.
Anyone can of course add them in a board support package.

>  ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTCMD)),)
>  ulf>  ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTCMD)),"")
>  ulf>  	$(call insert_define, CONFIG_BOOTCOMMAND, $(BR2_TARGET_UBOOT_BOOTCMD))
>  ulf>  endif
>  ulf> +endif
> 
> Neither is this.
> 
>  ulf>  ifeq ($(BR2_TARGET_UBOOT_SILENT),y)
>  ulf>  	$(call insert_define, CONFIG_SILENT_CONSOLE,)
>  ulf>  endif
>  ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_KERNEL_START)),"")
>  ulf> +	$(call insert_define, KERNEL_START, $(BR2_TARGET_UBOOT_KERNEL_START))
>  ulf> +endif
>  ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_KERNEL_LOCATION)),"")
>  ulf> +	$(call insert_define, KERNEL_LOCATION, $(BR2_TARGET_UBOOT_KERNEL_LOCATION))
>  ulf> +endif
>  ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_FILESYSTEM_START)),"")
>  ulf> +	$(call insert_define, FILESYSTEM_START, $(BR2_TARGET_UBOOT_FILESYSTEM_START))
>  ulf> +endif
>  ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_FILESYSTEM_LOCATION)),"")
>  ulf> +	$(call insert_define, FILESYSTEM_LOCATION, $(BR2_TARGET_UBOOT_FILESYSTEM_LOCATION))
>  ulf> +endif
>  ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_FILESYSTEM_SIZE)),"")
>  ulf> +	$(call insert_define, FILESYSTEM_SIZE, $(BR2_TARGET_UBOOT_FILESYSTEM_SIZE))
>  ulf> +endif
>  ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_END_OF_FLASH)),"")
>  ulf> +	$(call insert_define, END_OF_FLASH, $(BR2_TARGET_UBOOT_END_OF_FLASH))
>  ulf> +endif
>  ulf> +ifneq ($(strip $(BR2_TARGET_UBOOT_MEMORY_SIZE)),"")
>  ulf> +	$(call insert_define, MEMORY_SIZE, $(BR2_TARGET_UBOOT_MEMORY_SIZE))
>  ulf> +endif
> 
> Huh, that sounds like a very target specific things - And you seem to
> have forgotten to add those config settings to Config.in

I do not think that they are target specific,
Anyone which will boot linux will have a location in SDRAM
where linux is loaded, and there will be a
location in flash where the kernel is stored.
Same for root fs.
They are automatically calculated based on the kernel size
so you do not configure them directly.
Currently this is only supported for dataflash in Config.in
but feel free to add for other memory technologies

> 
>  ulf> -	@echo BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD=$(BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD)
>  ulf> -	@echo BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM=$(BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM)
>  ulf>  	@echo UBOOT_BOARD_NAME=$(UBOOT_BOARD_NAME)
>  ulf>  	@echo TEST=$(TEST)
>  ulf>  	@exit 0
> 
> You still didn't get rid of that TEST thing.
> 
> Please clean up.
> 

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

[Peter Korsgaard]

>>>>> "ulf" == ulf  <ulf@uclibc.org> writes:

 ulf> Author: ulf
 ulf> Date: 2009-01-03 00:02:07 +0000 (Sat, 03 Jan 2009)
 ulf> New Revision: 24653

 ulf> Log:
 ulf> Add Memory configration to u-boot (Config.in) and remove comments from 'choice's', Rearrange options for clarity

 ulf> Modified:
 ulf>    trunk/buildroot/target/u-boot/Config.in


 ulf> Changeset:
 ulf> Modified: trunk/buildroot/target/u-boot/Config.in
 ulf> ===================================================================
 ulf> --- trunk/buildroot/target/u-boot/Config.in	2009-01-03 00:00:46 UTC (rev 24652)
 ulf> +++ trunk/buildroot/target/u-boot/Config.in	2009-01-03 00:02:07 UTC (rev 24653)
 ulf> @@ -11,6 +11,14 @@
 ulf>  	  Build "Das U-Boot" Boot Monitor
 
 ulf>  if BR2_TARGET_UBOOT
 ulf> +config BR2_TARGET_UBOOT_BOARDNAME
 ulf> +	string "board name"
 ulf> +	depends on BR2_TARGET_UBOOT
 ulf> +	default "$(BOARD_NAME)"
 ulf> +	help
 ulf> +	  One of U-Boot supported boards to be built.
 ulf> +	  This will be suffixed with _config to meet U-Boot standard naming.
 ulf> +
 ulf>  choice
 ulf>  	prompt "U-Boot Version"
 ulf>  	default BR2_TARGET_UBOOT_2009_01_RC1
 ulf> @@ -20,27 +28,18 @@
 ulf>  config BR2_TARGET_UBOOT_2009_01_RC1
 ulf>  	bool "u-boot-2009.01-rc1"
 ulf>  	depends on BR2_TARGET_UBOOT
 ulf> -	help
 ulf> -	  Use u-boot from December 2008 (RC1)
 
 ulf>  config BR2_TARGET_UBOOT_2008_10
 ulf>  	bool "u-boot-2008.10"
 ulf>  	depends on BR2_TARGET_UBOOT
 ulf> -	help
 ulf> -	  Use u-boot from October 2008
 	
 ulf>  config BR2_TARGET_UBOOT_1_3_4
 ulf>  	bool "u-boot-1.3.4"
 ulf>  	depends on BR2_TARGET_UBOOT
 ulf> -	help
 ulf> -	  Use u-boot from mid 2008
 	
 ulf>  config BR2_TARGET_UBOOT_2009_01
 ulf>  	bool "u-boot-2009.01"
 ulf>  	depends on BR2_TARGET_UBOOT
 ulf> -	help
 ulf> -	  Use u-boot from January 2009
 ulf> -	  Release date 2009-01-17
 
 ulf>  endchoice
 
 ulf> @@ -51,14 +50,6 @@
 ulf>  	default "1.3.4"		if BR2_TARGET_UBOOT_1_3_4
 ulf>  	default "2009.01"	if BR2_TARGET_UBOOT_2009_01
 
 ulf> -config BR2_TARGET_UBOOT_BOARDNAME
 ulf> -	string "board name"
 ulf> -	depends on BR2_TARGET_UBOOT
 ulf> -	default "$(BOARD_NAME)"
 ulf> -	help
 ulf> -	  One of U-Boot supported boards to be built.
 ulf> -	  This will be suffixed with _config to meet U-Boot standard naming.
 ulf> -
 ulf>  config BR2_TARGET_UBOOT_CUSTOM_PATCH
 ulf>  	string "custom patch"
 ulf>  	depends on BR2_TARGET_UBOOT
 ulf> @@ -74,42 +65,27 @@
 ulf>  	config BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD
 ulf>  	bool "Boot from dataflashcard"
 ulf>  	depends on BR2_BOOTSOURCE_DATAFLASHCARD
 ulf> -	help
 ulf> -	  
 
 ulf>  	config BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
 ulf>  	bool "Boot from dataflash
 ulf>  	depends on BR2_BOOTSOURCE_DATAFLASH
 ulf> -	help
 ulf> -	  
 
 ulf>  	config BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH
 ulf>  	bool "Boot from a NAND flash"
 ulf>  	depends on BR2_BOOTSOURCE_NANDFLASH
 ulf> -	help
 ulf> -	  Build u-boot with environment in the NAND flash
 
 ulf>  	config BR2_TARGET_UBOOT_BOOTSOURCE_FLASH
 ulf>  	bool "Boot from a parallell flash"
 ulf>  	depends on BR2_BOOTSOURCE_FLASH
 ulf> -	help
 ulf> -	  Build u-boot with environment in a flash RAM
 
 ulf>  	config BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD
 ulf> -	bool "Boot from a NAND flash"
 ulf> +	bool "Boot from an SD-Card"
 ulf>  	depends on BR2_BOOTSOURCE_SDCARD
 ulf> -	help
 ulf> -	  Build u-boot with environment on an SD-Card
 ulf> -	  Not yet supported
 
 ulf>  	config BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM
 ulf> -	bool "Boot from a serial EEPROM"
 ulf> +	bool "Boot from a serial EEPROM (Not yet supported)"
 ulf>  	depends on BR2_BOOTSOURCE_EEPROM
 ulf> -	help
 ulf> -	  Build u-boot with environment in a serial EEPROM
 ulf> -	  Not yet supported

Why then have it as an option?

 ulf> +choice
 ulf> +	prompt "SDRAM Memory size"
 ulf> +	default BR2_TARGET_UBOOT_SDRAM_SIZE_64M
 ulf> +	help
 ulf> +	  Size of the onboard SDRAM
 ulf> +
 ulf> +config BR2_TARGET_UBOOT_SDRAM_SIZE_256MB
 ulf> +	bool "256 MB"
 ulf> +
 ulf> +config BR2_TARGET_UBOOT_SDRAM_SIZE_128MB
 ulf> +	bool "128 MB"
 ulf> +
 ulf> +config BR2_TARGET_UBOOT_SDRAM_SIZE_64MB
 ulf> +	bool "64 MB"
 ulf> +
 ulf> +config BR2_TARGET_UBOOT_SDRAM_SIZE_32MB
 ulf> +	bool "32 MB"
 ulf> +
 ulf> +config BR2_TARGET_UBOOT_SDRAM_SIZE_16MB
 ulf> +	bool "16 MB"
 ulf> +
 ulf> +config BR2_TARGET_UBOOT_SDRAM_SIZE_8MB
 ulf> +	bool "8 MB"
 ulf> +
 ulf> +endchoice

I don't believe in providing buildroot config options for every U-Boot
option - If the boards are really that different, then just add them
as seperate platforms in U-Boot.

How are you handling the CFG -> CONFIG -> CONFIG_SYS renaming U-boot
has recently been doing?

 ulf> +	prompt "Kernel Size"
 ulf> +	default BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB
 ulf> +
 ulf> +config BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB
 ulf> +	bool "Kernel size is less than 1.25 MB"
 ulf> +
 ulf> +config BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB
 ulf> +	bool "Kernel size is less than 1.50 MB"
 ulf> +
 ulf> +config BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB
 ulf> +	bool "Kernel size is less than 1.75 MB"
 ulf> +
 ulf> +config BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB
 ulf> +	bool "Kernel size is less than 2.00 MB"
 ulf> +
 ulf> +config BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB
 ulf> +	bool "Kernel size is less than 2.25 MB"
 ulf> +
 ulf> +config BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB
 ulf> +	bool "Kernel size is less than 2.50 MB"
 ulf> +

And again .. Please get rid of all of those.

Please clean up.

-- 
Bye, Peter Korsgaard

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-01-05 15:52:44 +0000 (Mon, 05 Jan 2009)
New Revision: 24692

Log:
u-boot: unbreak build after r24646

Unset variables aren't the same as "".

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2009-01-05 15:47:00 UTC (rev 24691)
+++ trunk/buildroot/target/u-boot/Makefile.in	2009-01-05 15:52:44 UTC (rev 24692)
@@ -33,7 +33,7 @@
 
 # u-boot still uses arch=ppc for powerpc
 U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
-ifeq ($(UBOOT_BOARD_NAME),"")
+ifeq ($(UBOOT_BOARD_NAME),)
 UBOOT_BOARD_NAME:=$(strip $(subst ",,$(BR2_TARGET_UBOOT_BOARDNAME)))
 #"))
 endif

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-01-05 16:12:34 +0000 (Mon, 05 Jan 2009)
New Revision: 24693

Log:
u-boot: revert U_BOOT_TARGET part of r24646

More u-boot build unbreaking. r24646 added U_BOOT_TARGET which uses the
nonexisting BOARDNAME variable, which means that the filename expands
to -u-boot-*, confusing ln.

There's limited point in having that symlink in the first please, so simply
revert that hunk.

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2009-01-05 15:52:44 UTC (rev 24692)
+++ trunk/buildroot/target/u-boot/Makefile.in	2009-01-05 16:12:34 UTC (rev 24693)
@@ -14,7 +14,6 @@
 U_BOOT_PATCH_DIR:=$(PROJECT_BUILD_DIR)/u-boot-$(U_BOOT_VERSION)-patches
 U_BOOT_CAT:=$(BZCAT)
 U_BOOT_BIN:=u-boot.bin
-U_BOOT_TARGET:=$(BOARD_NAME)-u-boot-$(U_BOOT_VERSION)-$(DATE).bin
 U_BOOT_TOOLS_BIN:=mkimage
 U_BOOT_TOOLS:=$(STAGING_DIR)/usr/bin/$(U_BOOT_TOOLS_BIN)
 MKIMAGE:=$(U_BOOT_TOOLS)
@@ -179,10 +178,8 @@
 		 -C $(U_BOOT_DIR)
 
 $(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
-	rm -f $(BINARIES_DIR)/$(U_BOOT_TARGET)
 	rm -f $(BINARIES_DIR)/$(U_BOOT_BIN)
-	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/$(U_BOOT_TARGET)
-	(cd $(BINARIES_DIR); ln -s $(U_BOOT_TARGET) $(U_BOOT_BIN)) 
+	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)
 
 $(U_BOOT_TOOLS):	$(U_BOOT_DIR)/tools/$(U_BOOT_TOOLS_BIN)
 	cp -dpf $(U_BOOT_DIR)/tools/$(U_BOOT_TOOLS_BIN) $(STAGING_DIR)/usr/bin/

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-01-05 16:16:30 +0000 (Mon, 05 Jan 2009)
New Revision: 24694

Log:
u-boot: unbreak build after r24674

Disable broken autoscript handling so the build atleast completes

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2009-01-05 16:12:34 UTC (rev 24693)
+++ trunk/buildroot/target/u-boot/Makefile.in	2009-01-05 16:16:30 UTC (rev 24694)
@@ -199,7 +199,7 @@
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
 	ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
 
-u-boot: $(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TOOLS) $(U_BOOT_TARGET_TOOLS) u-boot-autoscript
+u-boot: $(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TOOLS) $(U_BOOT_TARGET_TOOLS)
 
 u-boot-autoscript: $(U_BOOT_AUTOSCRIPT).$(PROJECT)
 

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

[Ulf Samuelsson]

m?n 2009-01-05 klockan 16:12 +0000 skrev jacmet at uclibc.org:
> Author: jacmet
> Date: 2009-01-05 16:12:34 +0000 (Mon, 05 Jan 2009)
> New Revision: 24693
> 
> Log:
> u-boot: revert U_BOOT_TARGET part of r24646
> 
> More u-boot build unbreaking. r24646 added U_BOOT_TARGET which uses the
> nonexisting BOARDNAME variable, which means that the filename expands
> to -u-boot-*, confusing ln.
> 
> There's limited point in having that symlink in the first please, so simply
> revert that hunk.
>

If you have a script that needs the filename u-boot.bin
then it make sense.

> Modified:
>    trunk/buildroot/target/u-boot/Makefile.in
> 
> 

The "complex" file name is needed, unless you only
work with a single board.

We obviously need to find  a way that does not break the build of
course.

Many targets define BR2_BOARD_NAME in their Config.in's
and it may make sense to have a common BR2_BOARD_NAME
Then it will be always be defined.
Default to "uclibc" is probably OK.


> Changeset:
> Modified: trunk/buildroot/target/u-boot/Makefile.in
> ===================================================================
> --- trunk/buildroot/target/u-boot/Makefile.in	2009-01-05 15:52:44 UTC (rev 24692)
> +++ trunk/buildroot/target/u-boot/Makefile.in	2009-01-05 16:12:34 UTC (rev 24693)
> @@ -14,7 +14,6 @@
>  U_BOOT_PATCH_DIR:=$(PROJECT_BUILD_DIR)/u-boot-$(U_BOOT_VERSION)-patches
>  U_BOOT_CAT:=$(BZCAT)
>  U_BOOT_BIN:=u-boot.bin
> -U_BOOT_TARGET:=$(BOARD_NAME)-u-boot-$(U_BOOT_VERSION)-$(DATE).bin
>  U_BOOT_TOOLS_BIN:=mkimage
>  U_BOOT_TOOLS:=$(STAGING_DIR)/usr/bin/$(U_BOOT_TOOLS_BIN)
>  MKIMAGE:=$(U_BOOT_TOOLS)
> @@ -179,10 +178,8 @@
>  		 -C $(U_BOOT_DIR)
>  
>  $(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
> -	rm -f $(BINARIES_DIR)/$(U_BOOT_TARGET)
>  	rm -f $(BINARIES_DIR)/$(U_BOOT_BIN)
> -	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/$(U_BOOT_TARGET)
> -	(cd $(BINARIES_DIR); ln -s $(U_BOOT_TARGET) $(U_BOOT_BIN)) 
> +	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)
>  
>  $(U_BOOT_TOOLS):	$(U_BOOT_DIR)/tools/$(U_BOOT_TOOLS_BIN)
>  	cp -dpf $(U_BOOT_DIR)/tools/$(U_BOOT_TOOLS_BIN) $(STAGING_DIR)/usr/bin/
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

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

[Ulf Samuelsson]

m?n 2009-01-05 klockan 19:12 +0100 skrev Ulf Samuelsson:
> m?n 2009-01-05 klockan 16:12 +0000 skrev jacmet at uclibc.org:
> > Author: jacmet
> > Date: 2009-01-05 16:12:34 +0000 (Mon, 05 Jan 2009)
> > New Revision: 24693
> > 
> > Log:
> > u-boot: revert U_BOOT_TARGET part of r24646
> > 
> > More u-boot build unbreaking. r24646 added U_BOOT_TARGET which uses the
> > nonexisting BOARDNAME variable, which means that the filename expands
> > to -u-boot-*, confusing ln.
> > 
> > There's limited point in having that symlink in the first please, so simply
> > revert that hunk.
> >
> 
> If you have a script that needs the filename u-boot.bin
> then it make sense.
> 
> > Modified:
> >    trunk/buildroot/target/u-boot/Makefile.in
> > 
> > 
> 
> The "complex" file name is needed, unless you only
> work with a single board.
> 
> We obviously need to find  a way that does not break the build of
> course.
> 
> Many targets define BR2_BOARD_NAME in their Config.in's
> and it may make sense to have a common BR2_BOARD_NAME
> Then it will be always be defined.
> Default to "uclibc" is probably OK.
> 
> 

Even better is to define it as 

?U_BOOT_TARGET:=$(PROJECT)-u-boot-$(U_BOOT_VERSION)-$(DATE).bin

That is always defined, so that should not break the build.

BR
/Ulf

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

[Peter Korsgaard]

>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:

Hi,

 Ulf> The "complex" file name is needed, unless you only
 Ulf> work with a single board.

I don't get it - Isn't that why we have binaries/<project>? Even so,
isn't that the same problem with the other files? (file system images,
kernels)?

 Ulf> We obviously need to find  a way that does not break the build of
 Ulf> course.

 Ulf> Many targets define BR2_BOARD_NAME in their Config.in's
 Ulf> and it may make sense to have a common BR2_BOARD_NAME
 Ulf> Then it will be always be defined.
 Ulf> Default to "uclibc" is probably OK.

Isn't that what we have BR2_PROJECT for?

-- 
Bye, Peter Korsgaard

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

[Peter Korsgaard]

>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:

 Ulf> Even better is to define it as 

 Ulf> ?U_BOOT_TARGET:=$(PROJECT)-u-boot-$(U_BOOT_VERSION)-$(DATE).bin

But why would we want to do this? We don't add project name, version
number or date to the file system images and so on.

Having a fixed name seems simpler to me (E.G. if you have an update
script in your uboot to tftp a new bootloader and write it to flash,
having a fixed name is a lot easier than typing in the correct
version+date.

-- 
Bye, Peter Korsgaard

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

[Ulf Samuelsson]

m?n 2009-01-05 klockan 21:12 +0100 skrev Peter Korsgaard:
> >>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:
> 
> Hi,
> 
>  Ulf> The "complex" file name is needed, unless you only
>  Ulf> work with a single board.
> 
> I don't get it - Isn't that why we have binaries/<project>? 

YOu copy things to binaries/PROJECT to have a single directory
which you can compress, but if you copy the stuff to
the tftp directory then you have a mess.
You have to manually rename this.

> 
> Even so,
> isn't that the same problem with the other files? (file system images,
> kernels)?

The kernel is already doing this in the "advanced" makefile.

The rootfs should be doing it. and in this case PROJECT Is definitely
the right one to use.

>  Ulf> We obviously need to find  a way that does not break the build of
>  Ulf> course.
> 
>  Ulf> Many targets define BR2_BOARD_NAME in their Config.in's
>  Ulf> and it may make sense to have a common BR2_BOARD_NAME
>  Ulf> Then it will be always be defined.
>  Ulf> Default to "uclibc" is probably OK.
> 
> Isn't that what we have BR2_PROJECT for?
> 


Yes and no,

You can use BR2_PROJECT, but if you:

make XXXX_config 
when building u-boot-<VERSION>, it also makes sense to name the binary

<XXXX>-u-boot-<VERSION>-<DATE>.bin

because regardless of which project you are building,
the binary should end up the same.

<DATE> is there to give you some kind of revision information
so you do not overwrite older working results.
It is not perfect, but I think it is good enough.

If you are building several projects where the U-Boot differs
I.E: if a header file is first copied to "include/configs" 
then it would make sense to call it:

?<PROJECT>-u-boot-<VERSION>-<DATE>.bin

The difference is minor, so I guess we go with PROJECT for now.

BR
Ulf Samuelsson

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

[Peter Korsgaard]

>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:

 Ulf> m?n 2009-01-05 klockan 21:12 +0100 skrev Peter Korsgaard:
 >> >>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:
 >> 
 >> Hi,
 >> 
 Ulf> The "complex" file name is needed, unless you only
 Ulf> work with a single board.
 >> 
 >> I don't get it - Isn't that why we have binaries/<project>? 

 Ulf> YOu copy things to binaries/PROJECT to have a single directory
 Ulf> which you can compress, but if you copy the stuff to
 Ulf> the tftp directory then you have a mess.
 Ulf> You have to manually rename this.

tftp directory? Is that this ATMEL_COPY_TO thing? I don't recall that
ever being discussed on the list.

Lets just start by making things simple before adding all kinds of
extra stuff. Buildroot should imho just worry about building stuff and
putting it under binaries/<project>, and not install it somewhere for
tftp/nfs/whatever.

 >> Even so,
 >> isn't that the same problem with the other files? (file system images,
 >> kernels)?

 Ulf> The kernel is already doing this in the "advanced" makefile.

 Ulf> The rootfs should be doing it. and in this case PROJECT Is definitely
 Ulf> the right one to use.

 Ulf> We obviously need to find  a way that does not break the build of
 Ulf> course.

I don't agree. Having things under binaries/<project> is enough.

 Ulf> Many targets define BR2_BOARD_NAME in their Config.in's
 Ulf> and it may make sense to have a common BR2_BOARD_NAME
 Ulf> Then it will be always be defined.
 Ulf> Default to "uclibc" is probably OK.
 >> 
 >> Isn't that what we have BR2_PROJECT for?

 Ulf> Yes and no,

 Ulf> You can use BR2_PROJECT, but if you:

 Ulf> make XXXX_config 
 Ulf> when building u-boot-<VERSION>, it also makes sense to name the binary

 Ulf> <XXXX>-u-boot-<VERSION>-<DATE>.bin

 Ulf> because regardless of which project you are building,
 Ulf> the binary should end up the same.

 Ulf> <DATE> is there to give you some kind of revision information
 Ulf> so you do not overwrite older working results.
 Ulf> It is not perfect, but I think it is good enough.

Sorry, I still don't think this belongs in buildroot.


-- 
Bye, Peter Korsgaard

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

[ulf at uclibc.org]

Author: ulf
Date: 2009-01-06 14:16:27 +0000 (Tue, 06 Jan 2009)
New Revision: 24697

Log:
Use PROJECT-u-boot-VERSION-DATE.bin as u-boot target
Provide link using "u-boot.bin"

Add BR2_TARGET_UBOOT_DEFAULT_ENV config
If this is set, Buildroot will generate
a default environment to allow easy downloading
of the kernel and root file system
Both as compile time data and an autoscript.

Make u-boot depend on $(U_BOOT_TARGETS)
Add "u-boot-autoscript" to U_BOOT_TARGETS if 
BR2_TARGET_UBOOT_DEFAULT_ENV is set.

Take kernel name from Linux build.

Use correct ARCH when mkimaging the autoscript.
Do not use TARGET_ATMEL_COPYTO for generic u-boot.

Hide dataflash memory configurations when 
different boot memory is used.



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


Changeset:
Modified: trunk/buildroot/target/u-boot/Config.in
===================================================================
--- trunk/buildroot/target/u-boot/Config.in	2009-01-06 11:59:55 UTC (rev 24696)
+++ trunk/buildroot/target/u-boot/Config.in	2009-01-06 14:16:27 UTC (rev 24697)
@@ -121,7 +121,15 @@
 	help
 	  Install fw_printenv / fw_setenv tools in target.
 
+menuconfig BR2_TARGET_UBOOT_DEFAULT_ENV
+	bool "Generate a default environment"
+	default n
+	depends on BR2_TARGET_UBOOT
+	help
+	  Will generate variables for factory default command
+	  and autoscript.
 
+if BR2_TARGET_UBOOT_DEFAULT_ENV
 choice
 	prompt "SDRAM Memory size"
 	default BR2_TARGET_UBOOT_SDRAM_SIZE_64M
@@ -183,6 +191,7 @@
 
 choice
 	prompt "Dataflash Size"
+	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
 	default BR2_TARGET_UBOOT_DATAFLASH_SIZE_2_00MB
 
 config BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB
@@ -207,6 +216,7 @@
 
 config BR2_TARGET_UBOOT_DATAFLASH_SIZE
 	string
+	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
 	default "8M"	if BR2_TARGET_DATAFLASH_SIZE_8MB
 	default "4M"	if BR2_TARGET_DATAFLASH_SIZE_4MB
 	default "2M"	if BR2_TARGET_DATAFLASH_SIZE_2MB
@@ -216,6 +226,7 @@
 
 config BR2_TARGET_UBOOT_END_OF_FLASH
 	string
+	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
 	default "C083FFFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB
 	default "C041FFFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB
 	default "C020FFFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB
@@ -233,7 +244,10 @@
 
 config BR2_TARGET_UBOOT_KERNEL_LOCATION
 	string "Kernel flash address"
-	default "C0042000"
+	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || \
+			BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH 
+	default "C0042000" if BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
+	default ""
 	help
 	  Kernel location in dataflash
 
@@ -252,6 +266,8 @@
 
 config BR2_TARGET_UBOOT_FILESYSTEM_LOCATION
 	string
+	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || \
+			BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH 
 	default "C018C000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB
   	default "C01CE000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB
   	default "C0210000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB
@@ -323,6 +339,8 @@
 
 endif
 
+endif
+
 config BR2_BOOTSOURCE_DATAFLASHCARD
 	bool
 	help

Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2009-01-06 11:59:55 UTC (rev 24696)
+++ trunk/buildroot/target/u-boot/Makefile.in	2009-01-06 14:16:27 UTC (rev 24697)
@@ -14,11 +14,20 @@
 U_BOOT_PATCH_DIR:=$(PROJECT_BUILD_DIR)/u-boot-$(U_BOOT_VERSION)-patches
 U_BOOT_CAT:=$(BZCAT)
 U_BOOT_BIN:=u-boot.bin
+U_BOOT_TARGET_BIN:=$(PROJECT)-u-boot-$(U_BOOT_VERSION)-$(DATE).bin
+
 U_BOOT_TOOLS_BIN:=mkimage
 U_BOOT_TOOLS:=$(STAGING_DIR)/usr/bin/$(U_BOOT_TOOLS_BIN)
 MKIMAGE:=$(U_BOOT_TOOLS)
+U_BOOT_AUTOSCRIPT=$(BINARIES_DIR)/autoscript
 
-U_BOOT_AUTOSCRIPT=$(BINARIES_DIR)/autoscript
+U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TOOLS) $(U_BOOT_TARGET_TOOLS)
+
+ifeq ($(strip $(subst ",,$(BR2_TARGET_UBOOT_DEFAULT_ENV))),y)
+#"))
+U_BOOT_TARGETS += u-boot-autoscript
+endif
+
 TARGET_UBOOT_IPADDR:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_IPADDR)))
 #"))
 TARGET_UBOOT_SERVERIP:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_SERVERIP)))
@@ -179,7 +188,9 @@
 
 $(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
 	rm -f $(BINARIES_DIR)/$(U_BOOT_BIN)
-	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)
+	rm -f $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN)
+	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN)
+	(cd $(BINARIES_DIR); ln -s $(U_BOOT_TARGET_BIN) $(U_BOOT_BIN))
 
 $(U_BOOT_TOOLS):	$(U_BOOT_DIR)/tools/$(U_BOOT_TOOLS_BIN)
 	cp -dpf $(U_BOOT_DIR)/tools/$(U_BOOT_TOOLS_BIN) $(STAGING_DIR)/usr/bin/
@@ -199,7 +210,7 @@
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
 	ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
 
-u-boot: $(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TOOLS) $(U_BOOT_TARGET_TOOLS)
+u-boot: $(U_BOOT_TARGETS)
 
 u-boot-autoscript: $(U_BOOT_AUTOSCRIPT).$(PROJECT)
 
@@ -238,13 +249,13 @@
 ifneq ($(TARGET_UBOOT_NETMASK),)
 	echo setenv netmask $(TARGET_UBOOT_NETMASK) >> $(U_BOOT_AUTOSCRIPT)
 endif
-	echo setenv linux $(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE).gz >> $(U_BOOT_AUTOSCRIPT)
+	echo setenv linux $(LINUX26_KERNEL_NAME).gz >> $(U_BOOT_AUTOSCRIPT)
 	echo setenv kernel-version $(LINUX26_VERSION) >> $(U_BOOT_AUTOSCRIPT)
 	echo setenv kernel-date $(DATE) >> $(U_BOOT_AUTOSCRIPT)
 	echo setenv hostname $(TARGET_HOSTNAME) >> $(U_BOOT_AUTOSCRIPT)
 	echo setenv fs-date $(DATE) >> $(U_BOOT_AUTOSCRIPT)
-	echo setenv rd-1 rootfs.$(BR2_ARCH)-$(DATE).ext2 >> $(U_BOOT_AUTOSCRIPT)
-	echo setenv rd-2 rootfs.$(BR2_ARCH)-$(DATE).jffs2 >> $(U_BOOT_AUTOSCRIPT)
+	echo setenv rd-1 rootfs.$(ARCH)-$(DATE).ext2 >> $(U_BOOT_AUTOSCRIPT)
+	echo setenv rd-2 rootfs.$(ARCH)-$(DATE).jffs2 >> $(U_BOOT_AUTOSCRIPT)
 	echo setenv rd rootfs.$(BR2_ARCH)-$(DATE).ext2 >> $(U_BOOT_AUTOSCRIPT)
 	echo setenv ver 1 >> $(U_BOOT_AUTOSCRIPT)
 ifneq ($(TARGET_UBOOT_ETHADDR),)
@@ -257,7 +268,7 @@
 	echo saveenv >> $(U_BOOT_AUTOSCRIPT)
 
 $(U_BOOT_AUTOSCRIPT).$(PROJECT): $(U_BOOT_AUTOSCRIPT) $(MKIMAGE)
-	$(MKIMAGE) -A arm \
+	$(MKIMAGE) -A $(ARCH) \
 				-O linux \
 				-T script \
 				-C none \
@@ -266,7 +277,6 @@
 				-n "autoscr config" \
 				-d $(U_BOOT_AUTOSCRIPT) \
 				$(U_BOOT_AUTOSCRIPT).$(PROJECT)
-	cp $(U_BOOT_AUTOSCRIPT).$(PROJECT) $(TARGET_ATMEL_COPYTO)
 
 
 

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

[Peter Korsgaard]

>>>>> "ulf" == ulf  <ulf@uclibc.org> writes:

 ulf> Author: ulf
 ulf> Date: 2009-01-06 14:16:27 +0000 (Tue, 06 Jan 2009)
 ulf> New Revision: 24697

 ulf> Log:
 ulf> Use PROJECT-u-boot-VERSION-DATE.bin as u-boot target
 ulf> Provide link using "u-boot.bin"

Ohh, didn't we just discuss it? I don't think this belongs in
buildroot.

If you really want it, couldn't you then do it in you
copy-to-tftp-thingy?
 
 ulf> +menuconfig BR2_TARGET_UBOOT_DEFAULT_ENV
 ulf> +	bool "Generate a default environment"
 ulf> +	default n
 ulf> +	depends on BR2_TARGET_UBOOT
 ulf> +	help

default n is implied, so don't add that.
Isn't this all within the if BR2_TARGET_UBOOT section, so you don't
need the depends?

 ulf> -	echo setenv linux $(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE).gz >> $(U_BOOT_AUTOSCRIPT)
 ulf> +	echo setenv linux $(LINUX26_KERNEL_NAME).gz >> $(U_BOOT_AUTOSCRIPT)

Why .gz?

 ulf>  	echo setenv kernel-version $(LINUX26_VERSION) >> $(U_BOOT_AUTOSCRIPT)
 ulf>  	echo setenv kernel-date $(DATE) >> $(U_BOOT_AUTOSCRIPT)
 ulf>  	echo setenv hostname $(TARGET_HOSTNAME) >> $(U_BOOT_AUTOSCRIPT)
 ulf>  	echo setenv fs-date $(DATE) >> $(U_BOOT_AUTOSCRIPT)
 ulf> -	echo setenv rd-1 rootfs.$(BR2_ARCH)-$(DATE).ext2 >> $(U_BOOT_AUTOSCRIPT)
 ulf> -	echo setenv rd-2 rootfs.$(BR2_ARCH)-$(DATE).jffs2 >> $(U_BOOT_AUTOSCRIPT)
 ulf> +	echo setenv rd-1 rootfs.$(ARCH)-$(DATE).ext2 >> $(U_BOOT_AUTOSCRIPT)
 ulf> +	echo setenv rd-2 rootfs.$(ARCH)-$(DATE).jffs2 >> $(U_BOOT_AUTOSCRIPT)

Why .ext2 and .jffs2? This doesn't seem very generic.

Please fix.

-- 
Bye, Peter Korsgaard

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

[Ulf Samuelsson]

tis 2009-01-06 klockan 15:26 +0100 skrev Peter Korsgaard:
> >>>>> "ulf" == ulf  <ulf@uclibc.org> writes:
> 
>  ulf> Author: ulf
>  ulf> Date: 2009-01-06 14:16:27 +0000 (Tue, 06 Jan 2009)
>  ulf> New Revision: 24697
> 
>  ulf> Log:
>  ulf> Use PROJECT-u-boot-VERSION-DATE.bin as u-boot target
>  ulf> Provide link using "u-boot.bin"
> 
> Ohh, didn't we just discuss it? I don't think this belongs in
> buildroot.
> 

I see that now, I did not read emails for an hour or so.

> If you really want it, couldn't you then do it in you
> copy-to-tftp-thingy?

I really want everything that simplifies the process of 
bringing the board up and running in the fastest possible time
and removes possible causes of errors.

?If a part of bringing up the board requires manual typing,
which can be replaced by a simple recipe in buildroot,
then I consider it to be a good candidate
for having support in buildroot.

When information is coming from the buildroot .config file,
then definitely I consider it to be ripe.
?This implies exporting relevant information from Buildroot.


---------------

I have pointed out the problem of copying stuff
to the tftpboot directory.

You have pointed out that you do not like it,
but you have not given any motivation why.
Obviously breaking the build is a good one,
but otherwise I have seen no real motivation.
Some features are not needed by everybody,
but that is not a good reason to block other
people to use this feature.

Doing it in a COPY_TO part will solve the problem
if you copy it directly, but if you 
take the BINAIRES file and send to someone
by mail, then they will have the problem,
so it is essential that the file has the 
correct file name which makes people understand
what it is.

Commercial linux companies like Timesys adopt
the same type of scheme when they deliver packages.
Using simple names like uImage and u-boot.bin
simply does not cut it in a more demanding environment.

I would not mind to replace the link to u-boot.bin
with a real file, if that is the worry.

-----------------




>  
>  ulf> +menuconfig BR2_TARGET_UBOOT_DEFAULT_ENV
>  ulf> +	bool "Generate a default environment"
>  ulf> +	default n
>  ulf> +	depends on BR2_TARGET_UBOOT
>  ulf> +	help
> 
> default n is implied, so don't add that.

OK.

> Isn't this all within the if BR2_TARGET_UBOOT section, so you don't
> need the depends?
> 
>  ulf> -	echo setenv linux $(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE).gz >> $(U_BOOT_AUTOSCRIPT)
>  ulf> +	echo setenv linux $(LINUX26_KERNEL_NAME).gz >> $(U_BOOT_AUTOSCRIPT)
> 
> Why .gz?
> 

to indicate that it is compressed.

>  ulf>  	echo setenv kernel-version $(LINUX26_VERSION) >> $(U_BOOT_AUTOSCRIPT)
>  ulf>  	echo setenv kernel-date $(DATE) >> $(U_BOOT_AUTOSCRIPT)
>  ulf>  	echo setenv hostname $(TARGET_HOSTNAME) >> $(U_BOOT_AUTOSCRIPT)
>  ulf>  	echo setenv fs-date $(DATE) >> $(U_BOOT_AUTOSCRIPT)
>  ulf> -	echo setenv rd-1 rootfs.$(BR2_ARCH)-$(DATE).ext2 >> $(U_BOOT_AUTOSCRIPT)
>  ulf> -	echo setenv rd-2 rootfs.$(BR2_ARCH)-$(DATE).jffs2 >> $(U_BOOT_AUTOSCRIPT)
>  ulf> +	echo setenv rd-1 rootfs.$(ARCH)-$(DATE).ext2 >> $(U_BOOT_AUTOSCRIPT)
>  ulf> +	echo setenv rd-2 rootfs.$(ARCH)-$(DATE).jffs2 >> $(U_BOOT_AUTOSCRIPT)
> 
> Why .ext2 and .jffs2? This doesn't seem very generic.

These are the two of the most used filesystems.
If a user needs to use a different file name, then
it is easy for them to do a "setenv rd-3 <filename>"
from within u-boot.

> 
> Please fix.
> 

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-01-08 14:58:51 +0000 (Thu, 08 Jan 2009)
New Revision: 24723

Log:
target/u-boot: cleanup

Fix s/Linux/U-Boot/ typo, default to the latest stable version, mark
old versions as deprecated and comment out unreleased version for now.

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


Changeset:
Modified: trunk/buildroot/target/u-boot/Config.in
===================================================================
--- trunk/buildroot/target/u-boot/Config.in	2009-01-08 14:58:45 UTC (rev 24722)
+++ trunk/buildroot/target/u-boot/Config.in	2009-01-08 14:58:51 UTC (rev 24723)
@@ -14,10 +14,10 @@
 
 choice
 	prompt "U-Boot Version"
-	default BR2_TARGET_UBOOT_2009_01_RC1
+	default BR2_TARGET_UBOOT_2008_10
 	help
-	  Select the specific Linux version you want to use
-	
+	  Select the specific U-Boot version you want to use
+
 config BR2_TARGET_UBOOT_2009_01_RC1
 	bool "u-boot-2009.01-rc1"
 	depends on BR2_TARGET_UBOOT
@@ -25,20 +25,22 @@
 config BR2_TARGET_UBOOT_2008_10
 	bool "u-boot-2008.10"
 	depends on BR2_TARGET_UBOOT
-	
+
 config BR2_TARGET_UBOOT_1_3_4
 	bool "u-boot-1.3.4"
 	depends on BR2_TARGET_UBOOT
-	
+	depends on BR2_DEPRECATED
+
 config BR2_TARGET_UBOOT_1_2_0_ATMEL
 	bool "u-boot-1.2.0-atmel"
 	depends on BR2_TARGET_AT91
 	depends on BR2_TARGET_UBOOT
-	
-config BR2_TARGET_UBOOT_2009_01
-	bool "u-boot-2009.01"
-	depends on BR2_TARGET_UBOOT
+	depends on BR2_DEPRECATED
 
+#config BR2_TARGET_UBOOT_2009_01
+#	bool "u-boot-2009.01"
+#	depends on BR2_TARGET_UBOOT
+
 endchoice
 
 config BR2_UBOOT_VERSION

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-01-08 14:58:54 +0000 (Thu, 08 Jan 2009)
New Revision: 24724

Log:
target/u-boot: more cleanups

As discussed on the list.

- No sense in depending on BR2_TARGET_UBOOT when the configurations are
  within a if BR2_TARGET_UBOOT conditional.
- n is default, so remove 'default n'
- clarify nested conditionals

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


Changeset:
Modified: trunk/buildroot/target/u-boot/Config.in
===================================================================
--- trunk/buildroot/target/u-boot/Config.in	2009-01-08 14:58:51 UTC (rev 24723)
+++ trunk/buildroot/target/u-boot/Config.in	2009-01-08 14:58:54 UTC (rev 24724)
@@ -6,7 +6,6 @@
 if BR2_TARGET_UBOOT
 config BR2_TARGET_UBOOT_BOARDNAME
 	string "board name"
-	depends on BR2_TARGET_UBOOT
 	default "$(BOARD_NAME)"
 	help
 	  One of U-Boot supported boards to be built.
@@ -20,26 +19,21 @@
 
 config BR2_TARGET_UBOOT_2009_01_RC1
 	bool "u-boot-2009.01-rc1"
-	depends on BR2_TARGET_UBOOT
 
 config BR2_TARGET_UBOOT_2008_10
 	bool "u-boot-2008.10"
-	depends on BR2_TARGET_UBOOT
 
 config BR2_TARGET_UBOOT_1_3_4
 	bool "u-boot-1.3.4"
-	depends on BR2_TARGET_UBOOT
 	depends on BR2_DEPRECATED
 
 config BR2_TARGET_UBOOT_1_2_0_ATMEL
 	bool "u-boot-1.2.0-atmel"
 	depends on BR2_TARGET_AT91
-	depends on BR2_TARGET_UBOOT
 	depends on BR2_DEPRECATED
 
 #config BR2_TARGET_UBOOT_2009_01
 #	bool "u-boot-2009.01"
-#	depends on BR2_TARGET_UBOOT
 
 endchoice
 
@@ -58,7 +52,6 @@
 
 config BR2_TARGET_UBOOT_CUSTOM_PATCH
 	string "custom patch"
-	depends on BR2_TARGET_UBOOT
 	help
 	  If your board requires a custom patch, add the path to the file here.
 	  Most users may leave this empty
@@ -106,27 +99,22 @@
 
 config BR2_TARGET_UBOOT_SILENT
 	bool "silent console"
-	depends on BR2_TARGET_UBOOT
 	help
 	  If the option has been enabled, the output can be
 	  silenced by setting the environment variable "silent".
 
 config BR2_TARGET_UBOOT_TOOL_MKIMAGE
 	bool "mkimage tool in target"
-	depends on BR2_TARGET_UBOOT
 	help
 	  Install mkimage tool in target.
 
 config BR2_TARGET_UBOOT_TOOL_ENV
 	bool "fw_printenv tool in target"
-	depends on BR2_TARGET_UBOOT
 	help
 	  Install fw_printenv / fw_setenv tools in target.
 
 menuconfig BR2_TARGET_UBOOT_DEFAULT_ENV
 	bool "Generate a default environment"
-	default n
-	depends on BR2_TARGET_UBOOT
 	help
 	  Will generate variables for factory default command
 	  and autoscript.
@@ -236,18 +224,17 @@
 	default "C0083FFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB
 	default "C0041FFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB
 	help
-	  
 
 config BR2_TARGET_UBOOT_KERNEL_START
 	string "Kernel SDRAM address"
 	default "21000000"
 	help
-	  Kernel is loaded to this address in SDRAM 
+	  Kernel is loaded to this address in SDRAM
 
 config BR2_TARGET_UBOOT_KERNEL_LOCATION
 	string "Kernel flash address"
 	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || \
-			BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH 
+			BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
 	default "C0042000" if BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
 	default ""
 	help
@@ -269,7 +256,7 @@
 config BR2_TARGET_UBOOT_FILESYSTEM_LOCATION
 	string
 	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || \
-			BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH 
+			BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
 	default "C018C000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB
   	default "C01CE000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB
   	default "C0210000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB
@@ -284,12 +271,10 @@
 	string "File System Size"
 	default "6000000"
 	help
-	  
 
 menuconfig BR2_TARGET_UBOOT_NETWORK
 	bool "Network Settings"
 	default y
-	depends on BR2_TARGET_UBOOT
 	help
 	  Network settings for U-boot
 
@@ -297,35 +282,30 @@
 
 config BR2_TARGET_UBOOT_SERVERIP
 	string "server ip"
-	depends on BR2_TARGET_UBOOT
 	default "10.175.196.221"
 	help
 	  TFTP server ip address
 
 config BR2_TARGET_UBOOT_IPADDR
 	string "ip address"
-	depends on BR2_TARGET_UBOOT
 	default "10.175.196.18"
 	help
 	  Target ip address
 
 config BR2_TARGET_UBOOT_GATEWAY
 	string "gateway ip"
-	depends on BR2_TARGET_UBOOT
 	default "10.175.196.1"
 	help
 	  Gateway ip address
 
 config BR2_TARGET_UBOOT_NETMASK
 	string "netmask"
-	depends on BR2_TARGET_UBOOT
 	default "255.255.255.0"
 	help
 	  Network Mask
 
 config BR2_TARGET_UBOOT_ETHADDR
 	string "ethernet address"
-	depends on BR2_TARGET_UBOOT
 	default "04:25:fe:ed:00:18"
 	help
 	  Target MAC address for the ethernet interface.
@@ -333,16 +313,16 @@
 
 config BR2_TARGET_UBOOT_ETH1ADDR
 	string "ethernet 2 address"
-	depends on BR2_TARGET_UBOOT
 	depends on BR2_TARGET_AVR32
 	help
 	  Target MAC address for the second ethernet interface.
-endif
 
-endif
+endif # BR2_TARGET_UBOOT_NETWORK
 
-endif
+endif # BR2_TARGET_UBOOT_DEFAULT_ENV
 
+endif # BR2_TARGET_UBOOT
+
 config BR2_BOOTSOURCE_DATAFLASHCARD
 	bool
 	help

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

[ulf at uclibc.org]

Author: ulf
Date: 2009-01-11 21:39:54 +0000 (Sun, 11 Jan 2009)
New Revision: 24770

Log:
Remove premature deprecation of u-boot-1.2.0-atmel

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


Changeset:
Modified: trunk/buildroot/target/u-boot/Config.in
===================================================================
--- trunk/buildroot/target/u-boot/Config.in	2009-01-11 21:15:46 UTC (rev 24769)
+++ trunk/buildroot/target/u-boot/Config.in	2009-01-11 21:39:54 UTC (rev 24770)
@@ -30,7 +30,6 @@
 config BR2_TARGET_UBOOT_1_2_0_ATMEL
 	bool "u-boot-1.2.0-atmel"
 	depends on BR2_TARGET_AT91
-	depends on BR2_DEPRECATED
 
 #config BR2_TARGET_UBOOT_2009_01
 #	bool "u-boot-2009.01"

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

[ulf at uclibc.org]

Author: ulf
Date: 2009-01-20 08:11:26 +0000 (Tue, 20 Jan 2009)
New Revision: 24918

Log:
U_BOOT_ARCH_PATCH_DIR should contain a value or should not be defined, empty string is not allowed

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2009-01-20 06:17:12 UTC (rev 24917)
+++ trunk/buildroot/target/u-boot/Makefile.in	2009-01-20 08:11:26 UTC (rev 24918)
@@ -88,7 +88,7 @@
 	toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot/$(U_BOOT_VERSION) \
 		u-boot-$(U_BOOT_VERSION)-\*.patch \
 		u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH)
-ifneq ($(strip $(U_BOOT_ARCH_PATCH_DIR)),"")
+ifneq ($(strip $(U_BOOT_ARCH_PATCH_DIR)),)
 	toolchain/patch-kernel.sh $(U_BOOT_DIR) $(U_BOOT_ARCH_PATCH_DIR) \*.patch
 endif
 ifneq ($(strip $(BR2_TARGET_UBOOT_CUSTOM_PATCH)),"")

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-01-21 15:49:06 +0000 (Wed, 21 Jan 2009)
New Revision: 24939

Log:
u-boot: unbreak target tools

Got broken by r24697.

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2009-01-21 15:29:37 UTC (rev 24938)
+++ trunk/buildroot/target/u-boot/Makefile.in	2009-01-21 15:49:06 UTC (rev 24939)
@@ -21,7 +21,7 @@
 MKIMAGE:=$(U_BOOT_TOOLS)
 U_BOOT_AUTOSCRIPT=$(BINARIES_DIR)/autoscript
 
-U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TOOLS) $(U_BOOT_TARGET_TOOLS)
+U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TOOLS)
 
 ifeq ($(strip $(subst ",,$(BR2_TARGET_UBOOT_DEFAULT_ENV))),y)
 #"))
@@ -54,10 +54,10 @@
 
 U_BOOT_TARGET_TOOLS:=
 ifeq ($(BR2_TARGET_UBOOT_TOOL_MKIMAGE),y)
-U_BOOT_TARGET_TOOLS+=$(TARGET_DIR)/usr/bin/mkimage
+U_BOOT_TARGETS+=$(TARGET_DIR)/usr/bin/mkimage
 endif
 ifeq ($(BR2_TARGET_UBOOT_TOOL_ENV),y)
-U_BOOT_TARGET_TOOLS+=$(TARGET_DIR)/usr/sbin/fw_printenv
+U_BOOT_TARGETS+=$(TARGET_DIR)/usr/sbin/fw_printenv
 endif
 
 U_BOOT_CONFIGURE_OPTS :=

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-01-22 10:15:46 +0000 (Thu, 22 Jan 2009)
New Revision: 24959

Log:
u-boot: get rid of unused 2009.01-rc3 dir (git-svn issue)


Removed:
   trunk/buildroot/target/u-boot/2009.01-rc3/


Changeset:

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

[ulf at uclibc.org]

Author: ulf
Date: 2009-01-22 18:46:00 +0000 (Thu, 22 Jan 2009)
New Revision: 24969

Log:
Use latest u-boot as default

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


Changeset:
Modified: trunk/buildroot/target/u-boot/Config.in
===================================================================
--- trunk/buildroot/target/u-boot/Config.in	2009-01-22 16:04:28 UTC (rev 24968)
+++ trunk/buildroot/target/u-boot/Config.in	2009-01-22 18:46:00 UTC (rev 24969)
@@ -13,7 +13,7 @@
 
 choice
 	prompt "U-Boot Version"
-	default BR2_TARGET_UBOOT_2008_10
+	default BR2_TARGET_UBOOT_2009_01
 	help
 	  Select the specific U-Boot version you want to use
 

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

[Peter Korsgaard]

>>>>> "ulf" == ulf  <ulf@uclibc.org> writes:

 ulf> Author: ulf
 ulf> Date: 2009-01-11 21:39:54 +0000 (Sun, 11 Jan 2009)
 ulf> New Revision: 24770

 ulf> Log:
 ulf> Remove premature deprecation of u-boot-1.2.0-atmel

 ulf> Modified:
 ulf>    trunk/buildroot/target/u-boot/Config.in

Why? Isn't 2009.01 working for you?

-- 
Bye, Peter Korsgaard

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

[Ulf Samuelsson]

l?r 2009-01-24 klockan 09:21 +0100 skrev Peter Korsgaard:
> >>>>> "ulf" == ulf  <ulf@uclibc.org> writes:
> 
>  ulf> Author: ulf
>  ulf> Date: 2009-01-11 21:39:54 +0000 (Sun, 11 Jan 2009)
>  ulf> New Revision: 24770
> 
>  ulf> Log:
>  ulf> Remove premature deprecation of u-boot-1.2.0-atmel
> 
>  ulf> Modified:
>  ulf>    trunk/buildroot/target/u-boot/Config.in
> 
> Why? Isn't 2009.01 working for you?

I have not tested on all boards yets,
and there are still problems with 2009.01
I have boards which compiles OK,
but U-Boot does not boot correctly, 

They compile and work if I enter $(UBOOT_DIR) 
and do a manual make using an external toolchain,
but I have not yet had the time to dig in.

I do not know if it ths build script or
the toolchain, but until this has been 
investigated, it is premature
to deprecate u-boot-1.2.0-atmel.



BR
Ulf Samuelsson

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

[Peter Korsgaard]

>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:

 Ulf> I do not know if it ths build script or
 Ulf> the toolchain, but until this has been 
 Ulf> investigated, it is premature
 Ulf> to deprecate u-boot-1.2.0-atmel.

Ok, let's do it after the release then.

It would be good if you could write this kind of stuff in your commit
messages in the first place.

-- 
Bye, Peter Korsgaard

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

[Dan Lyke]

On Sat, 24 Jan 2009 09:21:15 +0100
Peter Korsgaard <jacmet@uclibc.org> wrote:
> Why? Isn't 2009.01 working for you?

I can't speak for everyone, but I just (ie: this week) got patches from
Atmel, and they are still working off of 1.20. I'm hoping to ship this
product without revisiting that, and a quick attempt to look at forward
porting those patches to 2009.01 made it obvious that I'd have to
actually get in there and understanding the code.

Dan

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

[ulf at uclibc.org]

Author: ulf
Date: 2009-01-26 11:46:44 +0000 (Mon, 26 Jan 2009)
New Revision: 25049

Log:
Fix erronous mkimage target

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2009-01-26 10:38:00 UTC (rev 25048)
+++ trunk/buildroot/target/u-boot/Makefile.in	2009-01-26 11:46:44 UTC (rev 25049)
@@ -290,7 +290,7 @@
 #
 #############################################################
 ifeq ($(BR2_TARGET_UBOOT),y)
-TARGETS+=u-boot mkimage
+TARGETS+=u-boot
 endif
 
 u-boot-status:

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-01-26 14:04:10 +0000 (Mon, 26 Jan 2009)
New Revision: 25050

Log:
u-boot: mark 2008.10 version as recent

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


Changeset:
Modified: trunk/buildroot/target/u-boot/Config.in
===================================================================
--- trunk/buildroot/target/u-boot/Config.in	2009-01-26 11:46:44 UTC (rev 25049)
+++ trunk/buildroot/target/u-boot/Config.in	2009-01-26 14:04:10 UTC (rev 25050)
@@ -22,6 +22,7 @@
 
 config BR2_TARGET_UBOOT_2008_10
 	bool "u-boot-2008.10"
+	depends on BR2_DEPRECATED || BR2_RECENT
 
 config BR2_TARGET_UBOOT_1_3_4
 	bool "u-boot-1.3.4"

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-01-26 14:49:00 +0000 (Mon, 26 Jan 2009)
New Revision: 25051

Log:
u-boot: clean up after Ulf

As discussed on the list.

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2009-01-26 14:04:10 UTC (rev 25050)
+++ trunk/buildroot/target/u-boot/Makefile.in	2009-01-26 14:49:00 UTC (rev 25051)
@@ -47,11 +47,7 @@
 #"))
 endif
 
-ifneq ($(BR2_TARGET_U_BOOT_CONFIG_BOARD),)
-U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/configs/$(subst _config,,$(BR2_TARGET_U_BOOT_CONFIG_BOARD)).h
-else
 U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/config.h
-endif
 
 U_BOOT_TARGET_TOOLS:=
 ifeq ($(BR2_TARGET_UBOOT_TOOL_MKIMAGE),y)
@@ -99,13 +95,7 @@
 endif
 	touch $@
 
-$(U_BOOT_DIR)/.header_copied: $(U_BOOT_DIR)/.patched
-ifneq ($(strip $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE)),)
-	cp -dpf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_INC_CONF_FILE)
-endif
-	touch $@
-
-$(U_BOOT_DIR)/.configured: $(U_BOOT_DIR)/.header_copied
+$(U_BOOT_DIR)/.configured: $(U_BOOT_DIR)/.patched
 	$(TARGET_CONFIGURE_OPTS)		\
 		CFLAGS="$(TARGET_CFLAGS)"	\
 		LDFLAGS="$(TARGET_LDFLAGS)"	\
@@ -297,8 +287,6 @@
 	@echo
 	@echo U_BOOT_INC_CONF_FILE = $(U_BOOT_INC_CONF_FILE)
 	@echo BR2_UBOOT_VERSION = $(BR2_UBOOT_VERSION)
-	@echo BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE = $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE)
-	@echo BR2_TARGET_U_BOOT_CONFIG_BOARD = $(BR2_TARGET_U_BOOT_CONFIG_BOARD)
 	@echo BR2_TARGET_UBOOT_SERVERIP = $(BR2_TARGET_UBOOT_SERVERIP)
 	@echo BR2_TARGET_UBOOT_IPADDR = $(BR2_TARGET_UBOOT_IPADDR)
 	@echo BR2_TARGET_UBOOT_GATEWAY = $(BR2_TARGET_UBOOT_GATEWAY)
@@ -309,6 +297,5 @@
 	@echo BR2_TARGET_UBOOT_BOOTCMD = $(BR2_TARGET_UBOOT_BOOTCMD)
 	@echo BR2_TARGET_UBOOT_SILENT = $(BR2_TARGET_UBOOT_SILENT)
 	@echo UBOOT_BOARD_NAME=$(UBOOT_BOARD_NAME)
-	@echo TEST=$(TEST)
 	@exit 0
 

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-01-26 14:49:19 +0000 (Mon, 26 Jan 2009)
New Revision: 25052

Log:
u-boot: halt build early with description if no u-boot board name is set

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2009-01-26 14:49:00 UTC (rev 25051)
+++ trunk/buildroot/target/u-boot/Makefile.in	2009-01-26 14:49:19 UTC (rev 25052)
@@ -281,8 +281,14 @@
 #############################################################
 ifeq ($(BR2_TARGET_UBOOT),y)
 TARGETS+=u-boot
+
+# we NEED a board name
+ifeq ($(UBOOT_BOARD_NAME),)
+$(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting)
 endif
 
+endif
+
 u-boot-status:
 	@echo
 	@echo U_BOOT_INC_CONF_FILE = $(U_BOOT_INC_CONF_FILE)

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-02-04 23:15:51 +0000 (Wed, 04 Feb 2009)
New Revision: 25240

Log:
u-boot: fix dependency for host mkimage

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2009-02-04 23:15:48 UTC (rev 25239)
+++ trunk/buildroot/target/u-boot/Makefile.in	2009-02-04 23:15:51 UTC (rev 25240)
@@ -186,7 +186,7 @@
 	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN)
 	(cd $(BINARIES_DIR); ln -s $(U_BOOT_TARGET_BIN) $(U_BOOT_BIN))
 
-$(U_BOOT_TOOLS):	$(U_BOOT_DIR)/tools/$(U_BOOT_TOOLS_BIN)
+$(U_BOOT_TOOLS): $(U_BOOT_DIR)/$(U_BOOT_BIN)
 	cp -dpf $(U_BOOT_DIR)/tools/$(U_BOOT_TOOLS_BIN) $(STAGING_DIR)/usr/bin/
 
 $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/$(U_BOOT_BIN)

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-02-07 06:57:37 +0000 (Sat, 07 Feb 2009)
New Revision: 25260

Log:
u-boot: remove commented out line

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2009-02-07 06:57:29 UTC (rev 25259)
+++ trunk/buildroot/target/u-boot/Makefile.in	2009-02-07 06:57:37 UTC (rev 25260)
@@ -22,7 +22,6 @@
 U_BOOT_AUTOSCRIPT=$(BINARIES_DIR)/autoscript
 
 U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TOOLS)
-#U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN)
 
 ifeq ($(strip $(subst ",,$(BR2_TARGET_UBOOT_DEFAULT_ENV))),y)
 #"))

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-02-10 15:19:04 +0000 (Tue, 10 Feb 2009)
New Revision: 25290

Log:
u-boot: don't make ETH1ADDR setting depend on avr32

No sensible reason why this should only be present on avr32.

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


Changeset:
Modified: trunk/buildroot/target/u-boot/Config.in
===================================================================
--- trunk/buildroot/target/u-boot/Config.in	2009-02-10 13:01:28 UTC (rev 25289)
+++ trunk/buildroot/target/u-boot/Config.in	2009-02-10 15:19:04 UTC (rev 25290)
@@ -311,7 +311,6 @@
 
 config BR2_TARGET_UBOOT_ETH1ADDR
 	string "ethernet 2 address"
-	depends on BR2_TARGET_AVR32
 	help
 	  Target MAC address for the second ethernet interface.
 

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-02-10 15:19:24 +0000 (Tue, 10 Feb 2009)
New Revision: 25291

Log:
u-boot: remove unused BOOTARGS / BOOTCMD handling

Not available in Kconfig and no references to it in the tree.

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2009-02-10 15:19:04 UTC (rev 25290)
+++ trunk/buildroot/target/u-boot/Makefile.in	2009-02-10 15:19:24 UTC (rev 25291)
@@ -134,16 +134,6 @@
 	$(call insert_define, CONFIG_ETH1ADDR, $(BR2_TARGET_UBOOT_ETH1ADDR))
 endif
 endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTARGS)),)
-ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTARGS)),"")
-	$(call insert_define, CONFIG_BOOTARGS, $(BR2_TARGET_UBOOT_BOOTARGS))
-endif
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTCMD)),)
-ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTCMD)),"")
-	$(call insert_define, CONFIG_BOOTCOMMAND, $(BR2_TARGET_UBOOT_BOOTCMD))
-endif
-endif
 ifeq ($(BR2_TARGET_UBOOT_SILENT),y)
 	$(call insert_define, CONFIG_SILENT_CONSOLE,)
 endif
@@ -298,8 +288,6 @@
 	@echo BR2_TARGET_UBOOT_NETMASK = $(BR2_TARGET_UBOOT_NETMASK)
 	@echo BR2_TARGET_UBOOT_ETH0ADDR = $(BR2_TARGET_UBOOT_ETHADDR)
 	@echo BR2_TARGET_UBOOT_ETH1ADDR = $(BR2_TARGET_UBOOT_ETH1ADDR)
-	@echo BR2_TARGET_UBOOT_BOOTARGS = $(BR2_TARGET_UBOOT_BOOTARGS)
-	@echo BR2_TARGET_UBOOT_BOOTCMD = $(BR2_TARGET_UBOOT_BOOTCMD)
 	@echo BR2_TARGET_UBOOT_SILENT = $(BR2_TARGET_UBOOT_SILENT)
 	@echo UBOOT_BOARD_NAME=$(UBOOT_BOARD_NAME)
 	@exit 0

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

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-02-10 15:19:57 +0000 (Tue, 10 Feb 2009)
New Revision: 25293

Log:
u-boot: don't touch config.h unless explicitly requested by user

Fixes the problem of important variables like serverip being overwritten
with empty strings if the network/default env stuff isn't used.

Modified:
   trunk/buildroot/target/u-boot/Makefile.in


Changeset:
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in	2009-02-10 15:19:31 UTC (rev 25292)
+++ trunk/buildroot/target/u-boot/Makefile.in	2009-02-10 15:19:57 UTC (rev 25293)
@@ -105,15 +105,18 @@
 
 $(U_BOOT_DIR)/.header_modified: $(U_BOOT_DIR)/.configured
 	# Modify configuration header in $(U_BOOT_INC_CONF_FILE)
+ifdef BR2_TARGET_UBOOT_DEFAULT_ENV
 	@echo >> $(U_BOOT_INC_CONF_FILE)
 	@echo "/* Add a wrapper around the values Buildroot sets. */" >> $(U_BOOT_INC_CONF_FILE)
 	@echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
 	@echo "#define __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
-	$(call insert_define, DATE, $(DATE))	
+	$(call insert_define, DATE, $(DATE))
 	$(call insert_define, CONFIG_LOAD_SCRIPTS, 1)
 ifneq ($(strip $(BR2_PROJECT)),"")
 	$(call insert_define, CONFIG_HOSTNAME, $(BR2_PROJECT))
 endif
+endif # BR2_TARGET_UBOOT_DEFAULT_ENV
+ifdef BR2_TARGET_UBOOT_NETWORK
 ifneq ($(strip $(BR2_TARGET_UBOOT_IPADDR)),"")
 	$(call insert_define, CONFIG_IPADDR, $(BR2_TARGET_UBOOT_IPADDR))
 ifneq ($(strip $(BR2_TARGET_UBOOT_GATEWAY)),"")
@@ -134,9 +137,11 @@
 	$(call insert_define, CONFIG_ETH1ADDR, $(BR2_TARGET_UBOOT_ETH1ADDR))
 endif
 endif
+endif # BR2_TARGET_UBOOT_NETWORK
 ifeq ($(BR2_TARGET_UBOOT_SILENT),y)
 	$(call insert_define, CONFIG_SILENT_CONSOLE,)
 endif
+ifdef BR2_TARGET_UBOOT_DEFAULT_ENV
 ifneq ($(strip $(BR2_TARGET_UBOOT_KERNEL_START)),"")
 	$(call insert_define, KERNEL_START, $(BR2_TARGET_UBOOT_KERNEL_START))
 endif
@@ -159,6 +164,7 @@
 	$(call insert_define, MEMORY_SIZE, $(BR2_TARGET_UBOOT_MEMORY_SIZE))
 endif
 	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(U_BOOT_INC_CONF_FILE)
+endif # BR2_TARGET_UBOOT_DEFAULT_ENV
 	touch $@
 
 $(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/.header_modified