* [Buildroot] [PATCHv2] barebox: Allow to pass a custom configuration file
From: Maxime Ripard @ 2012-11-03 16:05 UTC (permalink / raw)
To: buildroot
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
boot/barebox/Config.in | 21 +++++++++++++++++++++
boot/barebox/barebox.mk | 26 +++++++++++++++++++++-----
2 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 574bfae..1f5f81b 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -67,12 +67,33 @@ config BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION
endif
+
+choice
+ prompt "Barebox configuration"
+ default BR2_TARGET_BAREBOX_USE_DEFCONFIG
+
+config BR2_TARGET_BAREBOX_USE_DEFCONFIG
+ bool "Using a defconfig"
+
+config BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG
+ bool "Using a custom config file"
+
+endchoice
+
config BR2_TARGET_BAREBOX_BOARD_DEFCONFIG
string "board defconfig"
+ depends on BR2_TARGET_BAREBOX_USE_DEFCONFIG
help
Name of the board for which Barebox should be built, without
the _defconfig suffix.
+
+config BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE
+ string "Configuration file path"
+ depends on BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG
+ help
+ Path to the barebox configuration file
+
config BR2_TARGET_BAREBOX_BAREBOXENV
bool "bareboxenv tool in target"
help
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 9550cdc..78c4aa9 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -37,8 +37,6 @@ ifneq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)
BAREBOX_INSTALL_TARGET = NO
endif
-BAREBOX_BOARD_DEFCONFIG = $(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))
-
ifeq ($(KERNEL_ARCH),i386)
BAREBOX_ARCH=x86
else ifeq ($(KERNEL_ARCH),powerpc)
@@ -49,8 +47,16 @@ endif
BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)"
+
+ifeq ($(BR2_TARGET_BAREBOX_USE_DEFCONFIG),y)
+BAREBOX_SOURCE_CONFIG = $(@D)/arch/$(BAREBOX_ARCH)/configs/$(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig
+else ifeq ($(BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG),y)
+BAREBOX_SOURCE_CONFIG = $(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE)
+endif
+
define BAREBOX_CONFIGURE_CMDS
- $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) $(BAREBOX_BOARD_DEFCONFIG)_defconfig
+ cp $(BAREBOX_SOURCE_CONFIG) $(@D)/arch/$(BAREBOX_ARCH)/configs/buildroot_defconfig
+ $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
endef
ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)
@@ -80,8 +86,8 @@ $(eval $(generic-package))
ifeq ($(BR2_TARGET_BAREBOX),y)
# we NEED a board defconfig file unless we're at make source
ifeq ($(filter source,$(MAKECMDGOALS)),)
-ifeq ($(BAREBOX_BOARD_DEFCONFIG),)
-$(error No Barebox defconfig file. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG setting)
+ifeq ($(BAREBOX_SOURCE_CONFIG),)
+$(error No Barebox config file. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG or BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE settings)
endif
endif
@@ -94,4 +100,14 @@ barebox-savedefconfig: barebox-configure
$(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) \
$(subst barebox-,,$@)
+ifeq ($(BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG),y)
+barebox-update-config: barebox-configure $(BAREBOX_DIR)/.config
+ cp -f $(BAREBOX_DIR)/.config $(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE)
+
+barebox-update-defconfig: barebox-savedefconfig
+ cp -f $(BAREBOX_DIR)/defconfig $(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE)
+else
+barebox-update-config: ;
+barebox-update-defconfig: ;
+endif
endif
--
1.7.9.5
^ permalink raw reply related
* [Buildroot] [git commit] iproute2: fix em_ipset build issue
From: Peter Korsgaard @ 2012-11-03 15:58 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=1b5ce0e9a2867851cdb81aaa68b4007d5517250f
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Fixes http://autobuild.buildroot.net/results/be19e39c19b62946ea48dd6b3dfd55f5c3ccd7c9
em_ipset.c uses xtables.h from iptables, but the configure script fails
to to check for this, so forcibly disable it if not available.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/iproute2/iproute2.mk | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 03767cc..6f5ee51 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -24,6 +24,11 @@ define IPROUTE2_WITH_IPTABLES
$(SED) "s/-DIPT/-DXT/" $(IPROUTE2_DIR)/tc/Makefile
echo "TC_CONFIG_XT:=y" >>$(IPROUTE2_DIR)/Config
endef
+else
+define IPROUTE2_WITH_IPTABLES
+ # em_ipset needs xtables, but configure misdetects it
+ echo "TC_CONFIG_IPSET:=n" >>$(IPROUTE2_DIR)/Config
+endef
endif
define IPROUTE2_CONFIGURE_CMDS
^ permalink raw reply related
* [Buildroot] [git commit] package: don't hide webservers when !BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
From: Peter Korsgaard @ 2012-11-03 11:53 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=22a6be4d43c9318cb21c8f351ef3c1132400008c
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The busybox web server isn't providing the same binary name / cmdline
arguments as the "big" webservers, so they aren't equivalent.
As discussed on the dev day, don't hide them when _SHOW_OTHERS isn't
enabled.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/Config.in | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/package/Config.in b/package/Config.in
index a4f75c9..c895e7a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -543,9 +543,7 @@ source "package/argus/Config.in"
source "package/avahi/Config.in"
source "package/axel/Config.in"
source "package/bluez_utils/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/boa/Config.in"
-endif
source "package/bind/Config.in"
source "package/bmon/Config.in"
source "package/bridge-utils/Config.in"
@@ -563,9 +561,7 @@ source "package/dropbear/Config.in"
source "package/ebtables/Config.in"
source "package/ethtool/Config.in"
source "package/heirloom-mailx/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/hiawatha/Config.in"
-endif
source "package/hostapd/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/ifplugd/Config.in"
@@ -579,9 +575,7 @@ source "package/ipset/Config.in"
source "package/iptables/Config.in"
source "package/iw/Config.in"
source "package/kismet/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/lighttpd/Config.in"
-endif
source "package/links/Config.in"
source "package/linphone/Config.in"
source "package/lrzsz/Config.in"
@@ -635,9 +629,9 @@ source "package/tcpdump/Config.in"
source "package/tcpreplay/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/tftpd/Config.in"
+endif
source "package/thttpd/Config.in"
source "package/tinyhttpd/Config.in"
-endif
source "package/tn5250/Config.in"
source "package/transmission/Config.in"
source "package/ttcp/Config.in"
^ permalink raw reply related
* [Buildroot] Reproducing autobuilder tests
From: Thomas Petazzoni @ 2012-11-03 11:50 UTC (permalink / raw)
To: buildroot
Hello,
For people willing to help in solving the build failures reported by
our autobuilders, I've put up a script called br-reproduce-build that
will, provided the SHA1 identifying a build, reproduce this exact same
build on your machine.
This script is available at:
http://git.buildroot.net/buildroot-test/plain/utils/br-reproduce-build
You need to customize the BASE_GIT to point to a local directory that
cointains a Buildroot Git repository, and OUTPUT_DIR to point to the
directory where you want the build to take place.
The script is available in the buildroot-test Git repository at
http://git.buildroot.net/buildroot-test/. Don't hesitate to report any
problem or send patches.
Best regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] perl: prepare the removal of microperl
From: Peter Korsgaard @ 2012-11-03 11:06 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=87422ed7e5a11bed94cd72ef80d1e5e1970c17fd
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/autoconf/Config.in | 2 +-
package/autoconf/autoconf.mk | 2 +-
package/automake/Config.in | 2 +-
package/automake/automake.mk | 2 +-
package/microperl/Config.in | 1 +
package/ntp/Config.in | 4 ++--
package/samba/Config.in | 4 ++--
7 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/package/autoconf/Config.in b/package/autoconf/Config.in
index 00b3e2c..5f2f148 100644
--- a/package/autoconf/Config.in
+++ b/package/autoconf/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_AUTOCONF
bool "autoconf"
- select BR2_PACKAGE_MICROPERL
+ select BR2_PACKAGE_PERL
help
Extensible program for developing configure scripts. These
scripts handle all the mundane system/feature detection.
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 3f84e3e..0cb50db 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -10,7 +10,7 @@ AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
ac_cv_prog_gnu_m4_gnu=no
-AUTOCONF_DEPENDENCIES = microperl host-m4
+AUTOCONF_DEPENDENCIES = host-m4 perl
HOST_AUTOCONF_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
ac_cv_prog_gnu_m4_gnu=no
diff --git a/package/automake/Config.in b/package/automake/Config.in
index 935f1f1..9a9673a 100644
--- a/package/automake/Config.in
+++ b/package/automake/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_AUTOMAKE
bool "automake"
select BR2_PACKAGE_AUTOCONF
- select BR2_PACKAGE_MICROPERL
+ select BR2_PACKAGE_PERL
help
Tool for automatically generating Makefile's for input to
configure scripts (made by autoconf).
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 477b10b..faa1b36 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -9,7 +9,7 @@ AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
AUTOMAKE_LICENSE = GPLv2+
AUTOMAKE_LICENSE_FILES = COPYING
-AUTOMAKE_DEPENDENCIES = host-autoconf autoconf microperl
+AUTOMAKE_DEPENDENCIES = host-autoconf autoconf perl
HOST_AUTOMAKE_DEPENDENCIES = host-autoconf
diff --git a/package/microperl/Config.in b/package/microperl/Config.in
index 66bbedd..19d104a 100644
--- a/package/microperl/Config.in
+++ b/package/microperl/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_MICROPERL
bool "microperl"
# needs fork()
depends on BR2_USE_MMU
+ depends on BR2_DEPRECATED
help
Perl without operating-specific functions such as readdir.
diff --git a/package/ntp/Config.in b/package/ntp/Config.in
index 5996596..ec5dbbb 100644
--- a/package/ntp/Config.in
+++ b/package/ntp/Config.in
@@ -20,7 +20,7 @@ config BR2_PACKAGE_NTP_NTP_KEYGEN
config BR2_PACKAGE_NTP_NTP_WAIT
bool "ntp-wait"
- depends on BR2_PACKAGE_MICROPERL
+ depends on BR2_PACKAGE_PERL
help
ntp-wait waits until the locally running ntpd is in state 4
(synchronized). This could be useful at boot time, to delay the
@@ -59,7 +59,7 @@ config BR2_PACKAGE_NTP_NTPSNMPD
config BR2_PACKAGE_NTP_NTPTRACE
bool "ntptrace"
- depends on BR2_PACKAGE_MICROPERL
+ depends on BR2_PACKAGE_PERL
help
ntptrace is a perl script that uses the ntpq utility program to
follow the chain of NTP servers from a given host back to the
diff --git a/package/samba/Config.in b/package/samba/Config.in
index 928b40b..b4028b1 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -36,12 +36,12 @@ config BR2_PACKAGE_SAMBA_FINDSMB
default y
depends on BR2_PACKAGE_SAMBA_SMBCLIENT
depends on BR2_PACKAGE_SAMBA_NMBLOOKUP
- depends on BR2_PACKAGE_MICROPERL
+ depends on BR2_PACKAGE_PERL
help
Script to browse network
comment "findsmb - disabled (requires nmblookup, smbclient and perl)"
- depends on !BR2_PACKAGE_SAMBA_SMBCLIENT || !BR2_PACKAGE_SAMBA_NMBLOOKUP || !BR2_PACKAGE_MICROPERL
+ depends on !BR2_PACKAGE_SAMBA_SMBCLIENT || !BR2_PACKAGE_SAMBA_NMBLOOKUP || !BR2_PACKAGE_PERL
config BR2_PACKAGE_SAMBA_NET
bool "net"
^ permalink raw reply related
* [Buildroot] [git commit] perl: add option "custom install"
From: Peter Korsgaard @ 2012-11-03 11:00 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=fa3afe2d81874b315759c1fb3b705ed54b15ce2c
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
allows same behaviour (and footprint) as microperl
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/perl/Config.in | 16 ++++++++++++++++
package/perl/perl.mk | 32 ++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/package/perl/Config.in b/package/perl/Config.in
index 98b41da..0642deb 100644
--- a/package/perl/Config.in
+++ b/package/perl/Config.in
@@ -16,6 +16,22 @@ config BR2_PACKAGE_PERL
if BR2_PACKAGE_PERL
+config BR2_PACKAGE_PERL_CUSTOM_INSTALL
+ bool "custom install"
+ help
+ Don't use the full install target
+ Install only a selection of modules (like microperl).
+
+config BR2_PACKAGE_PERL_MODULES
+ string "additional modules"
+ depends on BR2_PACKAGE_PERL_CUSTOM_INSTALL
+ help
+ List of space-separated perl modules to copy to the rootfs.
+
+ Examples: constant.pm Getopt/Std.pm Time/Local.pm
+
+ Module dependencies are not automatic so check your needs.
+
config BR2_PACKAGE_PERL_DB_FILE
bool "DB_File"
select BR2_PACKAGE_BERKELEYDB
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 56abbc1..81dff04 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -89,7 +89,38 @@ PERL_RUN_PERL = $(QEMU_USER) $(@D)/perl -Ilib
PERL_ARCHNAME = $(shell $(PERL_RUN_PERL) -MConfig -e "print Config->{archname}")
PERL_LIB = $(TARGET_DIR)/usr/lib/perl5/$(PERL_VERSION)
PERL_ARCHLIB = $(PERL_LIB)/$(PERL_ARCHNAME)
+PERL_MODS = $(call qstrip,$(BR2_PACKAGE_PERL_MODULES))
+# Minimal set of modules required for 'perl -V' to work
+PERL_ARCH_MODS = Config.pm Config_git.pl Config_heavy.pl
+PERL_BASE_MODS = strict.pm vars.pm warnings.pm warnings/register.pm
+define PERL_INSTALL_MODULES
+ for i in $(PERL_ARCH_MODS); do \
+ $(INSTALL) -m 0644 -D $(@D)/lib/$$i $(PERL_ARCHLIB)/$$i; \
+ done
+ for i in $(PERL_BASE_MODS); do \
+ $(INSTALL) -m 0644 -D $(@D)/lib/$$i $(PERL_LIB)/$$i; \
+ done
+ for i in $(PERL_MODS); do \
+ j=`echo $$i|cut -d : -f 1` ; \
+ if [ -d $(@D)/lib/$$j ] ; then \
+ cp -af $(@D)/lib/$$j $(PERL_LIB) ; \
+ fi ; \
+ if [ -f $(@D)/lib/$$i ] ; then \
+ $(INSTALL) -m 0644 -D $(@D)/lib/$$i $(PERL_LIB)/$$i; \
+ fi ; \
+ done
+ # Remove test files
+ find $(PERL_LIB) -type f -name *.t -exec rm -f {} \;
+endef
+
+ifeq ($(BR2_PACKAGE_PERL_CUSTOM_INSTALL),y)
+define PERL_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/perl $(TARGET_DIR)/usr/bin/perl
+ $(INSTALL) -m 0755 -D $(@D)/libperl.so $(PERL_ARCHLIB)/CORE/libperl.so
+ $(PERL_INSTALL_MODULES)
+endef
+else
define PERL_INSTALL_TARGET_CMDS
$(MAKE) INSTALL_DEPENDENCE= \
INSTALLFLAGS=-p \
@@ -98,6 +129,7 @@ define PERL_INSTALL_TARGET_CMDS
rm -f $(PERL_ARCHLIB)/CORE/*.h
find $(PERL_ARCHLIB) -type f -name *.bs -exec rm -f {} \;
endef
+endif
define PERL_CLEAN_CMDS
-$(MAKE) -C $(@D) clean
^ permalink raw reply related
* [Buildroot] [git commit] perl: add GDBM_File
From: Peter Korsgaard @ 2012-11-03 10:52 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=1ff20d33e3f213ea1efc2e6939516b1ea43393c4
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/perl/Config.in | 6 ++++++
package/perl/perl.mk | 3 +++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/package/perl/Config.in b/package/perl/Config.in
index 6cb89f0..98b41da 100644
--- a/package/perl/Config.in
+++ b/package/perl/Config.in
@@ -22,6 +22,12 @@ config BR2_PACKAGE_PERL_DB_FILE
help
Build the DB_File module.
+config BR2_PACKAGE_PERL_GDBM_FILE
+ bool "GDBM_File"
+ select BR2_PACKAGE_GDBM
+ help
+ Build the GDBM_File module.
+
endif
comment "perl requires an architecture supported by qemu"
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 186158b..56abbc1 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -16,6 +16,9 @@ PERL_DEPENDENCIES = host-qemu
ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
PERL_DEPENDENCIES += berkeleydb
endif
+ifeq ($(BR2_PACKAGE_GDBM),y)
+ PERL_DEPENDENCIES += gdbm
+endif
PERL_CONF_OPT = -des \
-Dusecrosscompile \
^ permalink raw reply related
* [Buildroot] [git commit] gdbm: new package
From: Peter Korsgaard @ 2012-11-03 10:48 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=e0cf9e86b92a831adfadb97baa3919039a3e5669
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/Config.in | 1 +
package/gdbm/Config.in | 8 ++++++++
package/gdbm/gdbm.mk | 12 ++++++++++++
3 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/package/Config.in b/package/Config.in
index 684ceec..a4f75c9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -345,6 +345,7 @@ endmenu
menu "Database"
source "package/berkeleydb/Config.in"
+source "package/gdbm/Config.in"
source "package/mysql_client/Config.in"
source "package/sqlcipher/Config.in"
source "package/sqlite/Config.in"
diff --git a/package/gdbm/Config.in b/package/gdbm/Config.in
new file mode 100644
index 0000000..d5aae83
--- /dev/null
+++ b/package/gdbm/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_GDBM
+ bool "gdbm"
+ help
+ GNU dbm is a set of database routines that use extensible hashing.
+ It works similar to the standard UNIX dbm routines.
+
+ http://www.gnu.org/software/gdbm/gdbm.html
+
diff --git a/package/gdbm/gdbm.mk b/package/gdbm/gdbm.mk
new file mode 100644
index 0000000..4971b12
--- /dev/null
+++ b/package/gdbm/gdbm.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# gdbm
+#
+#############################################################
+GDBM_VERSION = 1.10
+GDBM_SITE = $(BR2_GNU_MIRROR)/gdbm
+GDBM_LICENSE = GPLv3
+GDBM_LICENSE_FILES = COPYING
+GDBM_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
^ permalink raw reply related
* [Buildroot] [git commit] perl: add DB_File
From: Peter Korsgaard @ 2012-11-03 10:41 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=df9a5973e9ff5c659e0901ef4b1e07f820ff149a
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/perl/Config.in | 10 ++++++++++
package/perl/perl.mk | 4 ++++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/package/perl/Config.in b/package/perl/Config.in
index 0a41a97..6cb89f0 100644
--- a/package/perl/Config.in
+++ b/package/perl/Config.in
@@ -14,5 +14,15 @@ config BR2_PACKAGE_PERL
http://www.perl.org/
+if BR2_PACKAGE_PERL
+
+config BR2_PACKAGE_PERL_DB_FILE
+ bool "DB_File"
+ select BR2_PACKAGE_BERKELEYDB
+ help
+ Build the DB_File module.
+
+endif
+
comment "perl requires an architecture supported by qemu"
depends on BR2_avr32 || BR2_bfin || BR2_sh2 || BR2_sh2a || BR2_sh3 || BR2_sh3eb || BR2_sh64
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 7ac1aed..186158b 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -11,7 +11,11 @@ PERL_SOURCE = perl-$(PERL_VERSION).tar.bz2
PERL_LICENSE = Artistic
PERL_LICENSE_FILES = Artistic
PERL_INSTALL_STAGING = YES
+
PERL_DEPENDENCIES = host-qemu
+ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
+ PERL_DEPENDENCIES += berkeleydb
+endif
PERL_CONF_OPT = -des \
-Dusecrosscompile \
^ permalink raw reply related
* [Buildroot] [git commit] perl: new package
From: Peter Korsgaard @ 2012-11-03 10:23 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=4bb3d3bd1c38ecae81a403e1b741ad3cf96db16e
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/Config.in | 1 +
package/perl/Config.in | 18 ++++++
package/perl/perl-configure-qemu.patch | 53 +++++++++++++++++
package/perl/perl-make-ext.patch | 24 ++++++++
package/perl/perl-mkppport.patch | 37 ++++++++++++
package/perl/perl.mk | 99 ++++++++++++++++++++++++++++++++
6 files changed, 232 insertions(+), 0 deletions(-)
diff --git a/package/Config.in b/package/Config.in
index ab966e0..684ceec 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -279,6 +279,7 @@ source "package/wsapi/Config.in"
source "package/xavante/Config.in"
endmenu
endif
+source "package/perl/Config.in"
source "package/microperl/Config.in"
source "package/php/Config.in"
source "package/python/Config.in"
diff --git a/package/perl/Config.in b/package/perl/Config.in
new file mode 100644
index 0000000..0a41a97
--- /dev/null
+++ b/package/perl/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_PERL
+ bool "perl"
+ depends on !BR2_avr32
+ depends on !BR2_bfin
+ depends on !BR2_sh2
+ depends on !BR2_sh2a
+ depends on !BR2_sh3
+ depends on !BR2_sh3eb
+ depends on !BR2_sh64
+ help
+ Larry Wall's Practical Extraction and Report Language
+ An interpreted scripting language, known among some as "Unix's Swiss
+ Army Chainsaw".
+
+ http://www.perl.org/
+
+comment "perl requires an architecture supported by qemu"
+ depends on BR2_avr32 || BR2_bfin || BR2_sh2 || BR2_sh2a || BR2_sh3 || BR2_sh3eb || BR2_sh64
diff --git a/package/perl/perl-configure-qemu.patch b/package/perl/perl-configure-qemu.patch
new file mode 100644
index 0000000..c2d6b92
--- /dev/null
+++ b/package/perl/perl-configure-qemu.patch
@@ -0,0 +1,53 @@
+Add qemu support
+
+see https://rt.perl.org/rt3//Public/Bug/Display.html?id=114798
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/Configure
+===================================================================
+--- a/Configure
++++ b/Configure
+@@ -2837,6 +2837,9 @@
+ ;;
+ *) echo "Using usrinc $usrinc." >&4 ;;
+ esac
++ case "$targetrun" in
++ *qemu*) targethost=dummy ;;
++ esac
+ case "$targethost" in
+ '') echo "Targethost not defined." >&4; croak=y ;;
+ *) echo "Using targethost $targethost." >&4
+@@ -2868,7 +2871,7 @@
+ case "$targetfrom" in
+ '') targetfrom=scp ;;
+ esac
+- run=$run-$targetrun
++ run=$run-`basename $targetrun`
+ to=$to-$targetto
+ from=$from-$targetfrom
+ case "$targetdir" in
+@@ -2908,6 +2911,14 @@
+ $targetrun -l $targetuser $targethost "cd \$cwd && ./\$exe \$@"
+ EOF
+ ;;
++ *qemu*)
++ to=:
++ from=:
++ cat >$run <<EOF
++#!/bin/sh
++$targetrun -L $qemulib "\$@"
++EOF
++ ;;
+ *) echo "Unknown targetrun '$targetrun'" >&4
+ exit 1
+ ;;
+@@ -5048,7 +5059,7 @@
+ echo " ";
+ echo "Checking if your compiler accepts $flag" 2>&1;
+ echo "int main(void) { return 0; }" > gcctest.c;
+-if $cc -O2 $flag -o gcctest gcctest.c 2>gcctest.out && ./gcctest; then
++if $cc -O2 $flag -o gcctest gcctest.c 2>gcctest.out && $run ./gcctest; then
+ echo "Yes, it does." 2>&1;
+ if $test -s gcctest.out ; then
+ echo "But your platform does not like it:";
diff --git a/package/perl/perl-make-ext.patch b/package/perl/perl-make-ext.patch
new file mode 100644
index 0000000..e0195e7
--- /dev/null
+++ b/package/perl/perl-make-ext.patch
@@ -0,0 +1,24 @@
+Don't use RUN with make (only for perl)
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/make_ext.pl
+===================================================================
+--- a/make_ext.pl
++++ b/make_ext.pl
+@@ -458,11 +458,13 @@
+ # Give makefile an opportunity to rewrite itself.
+ # reassure users that life goes on...
+ my @args = ('config', @$pass_through);
+- system(@run, @make, @args) and print "@run @make @args failed, continuing anyway...\n";
++# system(@run, @make, @args) and print "@run @make @args failed, continuing anyway...\n";
++ system(@make, @args) and print "@make @args failed, continuing anyway...\n";
+ }
+ my @targ = ($target, @$pass_through);
+ print "Making $target in $ext_dir\n at run @make @targ\n";
+- my $code = system(@run, @make, @targ);
++# my $code = system(@run, @make, @targ);
++ my $code = system(@make, @targ);
+ die "Unsuccessful make($ext_dir): code=$code" if $code != 0;
+
+ chdir $return_dir || die "Cannot cd to $return_dir: $!";
diff --git a/package/perl/perl-mkppport.patch b/package/perl/perl-mkppport.patch
new file mode 100644
index 0000000..97f27a2
--- /dev/null
+++ b/package/perl/perl-mkppport.patch
@@ -0,0 +1,37 @@
+Add RUN
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/mkppport
+===================================================================
+--- a/mkppport
++++ b/mkppport
+@@ -1,6 +1,7 @@
+ use strict;
+ use warnings;
+
++use Config;
+ use Getopt::Long;
+ use File::Spec;
+ use File::Compare qw( compare );
+@@ -136,14 +137,18 @@
+ #----------------------------------------------
+ sub run
+ {
++ my @run = $Config{run};
++ @run = () if not defined $run[0] or $run[0] eq '';
+ my @args = ("-I" . File::Spec->catdir((File::Spec->updir) x 2, 'lib'), @_);
+ my $run = $perl =~ m/\s/ ? qq("$perl") : $perl;
+ for (@args) {
+ $_ = qq("$_") if $^O eq 'VMS' && /^[^"]/;
+ $run .= " $_";
+ }
+- print "running $run\n";
+- system $run and die "$run failed: $?\n";
++# print "running $run\n";
++# system $run and die "$run failed: $?\n";
++ print "running ", join(' ', @run, $run), "\n";
++ system join(' ', @run, $run) and die "@run $run failed: $?\n";
+ }
+
+ __END__
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
new file mode 100644
index 0000000..7ac1aed
--- /dev/null
+++ b/package/perl/perl.mk
@@ -0,0 +1,99 @@
+#############################################################
+#
+# perl
+#
+#############################################################
+
+PERL_VERSION_MAJOR = 16
+PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1
+PERL_SITE = http://www.cpan.org/src/5.0
+PERL_SOURCE = perl-$(PERL_VERSION).tar.bz2
+PERL_LICENSE = Artistic
+PERL_LICENSE_FILES = Artistic
+PERL_INSTALL_STAGING = YES
+PERL_DEPENDENCIES = host-qemu
+
+PERL_CONF_OPT = -des \
+ -Dusecrosscompile \
+ -Dtargetrun=$(QEMU_USER) \
+ -Dqemulib=$(STAGING_DIR) \
+ -Dar="$(TARGET_AR)" \
+ -Dcc="$(TARGET_CC)" \
+ -Dcpp="$(TARGET_CC)" \
+ -Dld="$(TARGET_LD)" \
+ -Dnm="$(TARGET_NM)" \
+ -Dranlib="$(TARGET_RANLIB)" \
+ -Dccflags="$(TARGET_CFLAGS)" \
+ -Dldflags="$(TARGET_LDFLAGS) -lgcc_s -lm" \
+ -Dlddlflags="-shared" \
+ -Dlibc=$(STAGING_DIR)/lib/libc.so \
+ -Duseshrplib \
+ -Dprefix=/usr \
+ -Uoptimize
+
+ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1)
+ PERL_CONF_OPT += -Dusedevel
+endif
+
+ifneq ($(BR2_LARGEFILE),y)
+ PERL_CONF_OPT += -Uuselargefiles
+endif
+
+define PERL_CONFIGURE_CMDS
+ rm -f $(@D)/config.sh
+ (cd $(@D); ./Configure $(PERL_CONF_OPT))
+ echo "# patched values" >>$(@D)/config.sh
+ $(SED) '/^myarchname=/d' \
+ -e '/^mydomain=/d' \
+ -e '/^myhostname=/d' \
+ -e '/^myuname=/d' \
+ -e '/^osname=/d' \
+ -e '/^osvers=/d' \
+ -e '/^perladmin=/d' \
+ $(@D)/config.sh
+ echo "myarchname='$(GNU_TARGET_NAME)'" >>$(@D)/config.sh
+ echo "mydomain=''" >>$(@D)/config.sh
+ echo "myhostname='$(BR2_TARGET_GENERIC_HOSTNAME)'" >>$(@D)/config.sh
+ echo "myuname='Buildroot $(BR2_VERSION_FULL)'" >>$(@D)/config.sh
+ echo "osname='linux'" >>$(@D)/config.sh
+ echo "osvers='$(BR2_LINUX_KERNEL_VERSION)'" >>$(@D)/config.sh
+ echo "perladmin='root'" >>$(@D)/config.sh
+ (cd $(@D); ./Configure -S)
+ cp $(@D)/config.h $(@D)/xconfig.h
+ $(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h
+endef
+
+define PERL_BUILD_CMDS
+ echo "#!/bin/sh" > $(@D)/Cross/miniperl
+ echo "$(QEMU_USER) $(@D)/miniperl \"\$$@\"" >>$(@D)/Cross/miniperl
+ chmod +x $(@D)/Cross/miniperl
+ PERL_MM_OPT="PERL=$(@D)/Cross/miniperl" \
+ $(MAKE) -C $(@D) all
+endef
+
+define PERL_INSTALL_STAGING_CMDS
+ $(MAKE) INSTALL_DEPENDENCE= \
+ INSTALLFLAGS= \
+ DESTDIR="$(STAGING_DIR)" \
+ -C $(@D) install.perl
+endef
+
+PERL_RUN_PERL = $(QEMU_USER) $(@D)/perl -Ilib
+PERL_ARCHNAME = $(shell $(PERL_RUN_PERL) -MConfig -e "print Config->{archname}")
+PERL_LIB = $(TARGET_DIR)/usr/lib/perl5/$(PERL_VERSION)
+PERL_ARCHLIB = $(PERL_LIB)/$(PERL_ARCHNAME)
+
+define PERL_INSTALL_TARGET_CMDS
+ $(MAKE) INSTALL_DEPENDENCE= \
+ INSTALLFLAGS=-p \
+ DESTDIR="$(TARGET_DIR)" \
+ -C $(@D) install.perl
+ rm -f $(PERL_ARCHLIB)/CORE/*.h
+ find $(PERL_ARCHLIB) -type f -name *.bs -exec rm -f {} \;
+endef
+
+define PERL_CLEAN_CMDS
+ -$(MAKE) -C $(@D) clean
+endef
+
+$(eval $(generic-package))
^ permalink raw reply related
* [Buildroot] [git commit] host-qemu: new package
From: Peter Korsgaard @ 2012-11-03 10:14 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=63c287bd27220be6db59033981988f296dccd2ef
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
only user mode for the current target architecture
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/qemu/qemu.mk | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 82 insertions(+), 0 deletions(-)
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
new file mode 100644
index 0000000..de72e04
--- /dev/null
+++ b/package/qemu/qemu.mk
@@ -0,0 +1,82 @@
+#############################################################
+#
+# qemu
+#
+#############################################################
+
+QEMU_VERSION = 1.2.0
+QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
+QEMU_SITE = http://wiki.qemu.org/download
+
+# BR ARCH qemu
+# ------- ----
+# arm arm
+# armeb armeb
+# avr32 not supported
+# bfin not supported
+# i386 i386
+# i486 i386
+# i586 i386
+# i686 i386
+# x86_64 x86_64
+# m68k m68k
+# microblaze microblaze
+# mips mips
+# mipsel mipsel
+# mips64 ?
+# mips64el ?
+# powerpc ppc
+# sh2 not supported
+# sh2a not supported
+# sh3 not supported
+# sh3eb not supported
+# sh4 sh4
+# sh4eb sh4eb
+# sh4a ?
+# sh4aeb ?
+# sh64 not supported
+# sparc sparc
+
+QEMU_ARCH = $(ARCH)
+ifeq ($(QEMU_ARCH),i486)
+ QEMU_ARCH = i386
+endif
+ifeq ($(QEMU_ARCH),i586)
+ QEMU_ARCH = i386
+endif
+ifeq ($(QEMU_ARCH),i686)
+ QEMU_ARCH = i386
+endif
+ifeq ($(QEMU_ARCH),powerpc)
+ QEMU_ARCH = ppc
+endif
+HOST_QEMU_TARGETS=$(QEMU_ARCH)-linux-user
+
+define HOST_QEMU_CONFIGURE_CMDS
+ (cd $(@D); ./configure \
+ --target-list="$(HOST_QEMU_TARGETS)" \
+ --prefix="$(HOST_DIR)/usr" \
+ --interp-prefix=$(STAGING_DIR) \
+ --cc="$(HOSTCC)" \
+ --host-cc="$(HOSTCC)" \
+ --extra-cflags="$(HOST_CFLAGS)" \
+ --extra-ldflags="$(HOST_LDFLAGS)" \
+ )
+endef
+
+define HOST_QEMU_BUILD_CMDS
+ $(MAKE) -C $(@D) all
+endef
+
+define HOST_QEMU_INSTALL_CMDS
+ $(MAKE) -C $(@D) install
+endef
+
+define HOST_QEMU_CLEAN_CMDS
+ $(MAKE) -C $(@D) clean
+endef
+
+$(eval $(host-generic-package))
+
+# variable used by other packages
+QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(QEMU_ARCH)
^ permalink raw reply related
* [Buildroot] [PATCH] lcdapi: fix autobuilder failures
From: Peter Korsgaard @ 2012-11-03 9:39 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351586827-17432-1-git-send-email-spdawson@gmail.com>
>>>>> "spdawson" == spdawson <spdawson@gmail.com> writes:
spdawson> From: Simon Dawson <spdawson@gmail.com> Version 0.3 of the
spdawson> lcdapi package does not correctly handle CXXFLAGS passed in
spdawson> from the environment/command line. In particular, the passing
spdawson> in of CXXFLAGS clobbers the -fPIC flag which is set in the
spdawson> top-level lcdapi makefile.
spdawson> The following autobuild logs highlight the problem.
spdawson> http://autobuild.buildroot.net/results/9a47b4a70d29308f668d65d983ba6146c0c56365/build-end.log
spdawson> http://autobuild.buildroot.net/results/4a4f6e2e7f80d5a23c9d26069094e9dafb1468e7/build-end.log
spdawson> http://autobuild.buildroot.net/results/0d96c207a9db44cf2791a66cad5162a739e7053a/build-end.log
spdawson> This has been fixed upstream in version 0.4; this patch
spdawson> simply bumps the version number in the Buildroot lcdapi
spdawson> package.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] lcdapi: fix autobuilder failures
From: Peter Korsgaard @ 2012-11-03 9:32 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=29d084073b336157fc469ab6ddbfcc59084fe542
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Version 0.3 of the lcdapi package does not correctly handle CXXFLAGS passed
in from the environment/command line. In particular, the passing in of CXXFLAGS
clobbers the -fPIC flag which is set in the top-level lcdapi makefile.
The following autobuild logs highlight the problem.
http://autobuild.buildroot.net/results/9a47b4a70d29308f668d65d983ba6146c0c56365/build-end.log
http://autobuild.buildroot.net/results/4a4f6e2e7f80d5a23c9d26069094e9dafb1468e7/build-end.log
http://autobuild.buildroot.net/results/0d96c207a9db44cf2791a66cad5162a739e7053a/build-end.log
This has been fixed upstream in version 0.4; this patch simply bumps the
version number in the Buildroot lcdapi package.
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/lcdapi/lcdapi.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/lcdapi/lcdapi.mk b/package/lcdapi/lcdapi.mk
index 8125018..b024252 100644
--- a/package/lcdapi/lcdapi.mk
+++ b/package/lcdapi/lcdapi.mk
@@ -3,7 +3,7 @@
# lcdapi
#
#############################################################
-LCDAPI_VERSION = v0.3
+LCDAPI_VERSION = v0.4
LCDAPI_SITE = http://github.com/spdawson/lcdapi/tarball/$(LCDAPI_VERSION)
LCDAPI_LICENSE = LGPLv2.1+
LCDAPI_LICENSE_FILES = COPYING
^ permalink raw reply related
* [Buildroot] [git commit] iproute2: fix build with toolchains providing setns(2)
From: Peter Korsgaard @ 2012-11-03 8:21 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=102f79865e21158c9153148bef189f810aad5814
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Fixes http://autobuild.buildroot.net/results/b2f28621bc9d6048057c406048b3f7d665cef165
ipnetns.c contains a replacement setns implementation, which is used
if the toolchain doesn't provide any (HAVE_SETNS not set).
We don't have any knowledge of toolchain setns support on buildroot
level, but the (handwritten) configure script contains a test for it,
so run the configure script before building.
The configure script isn't written for cross compilation, so it needs
to be massaged slightly to use the cross compiler / flags.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/iproute2/iproute2.mk | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 62328ab..03767cc 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -27,6 +27,8 @@ endef
endif
define IPROUTE2_CONFIGURE_CMDS
+ $(SED) 's/gcc/$$CC $$CFLAGS/g' $(@D)/configure
+ cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure
# arpd needs berkeleydb
$(SED) "/^TARGETS=/s: arpd : :" $(IPROUTE2_DIR)/misc/Makefile
echo "IPT_LIB_DIR:=/usr/lib/xtables" >>$(IPROUTE2_DIR)/Config
^ permalink raw reply related
* [Buildroot] [git commit] gdisk: close(2) needs unistd.h
From: Peter Korsgaard @ 2012-11-03 7:59 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=b7053563f5c4d55edac75eaf833f473b7818b6e8
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Fixes http://autobuild.buildroot.net/results/c557ee7cd1247e024b5edccf5f824eb4d5212e25
Fixed upstream as well in the (big) 0.8.3 commit:
http://gptfdisk.git.sourceforge.net/git/gitweb.cgi?p=gptfdisk/gptfdisk;a=commit;h=3488294d718a0e8b7f312c80c9e5729671173f6a
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/gdisk/gdisk-0.6.14-unistd.patch | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/package/gdisk/gdisk-0.6.14-unistd.patch b/package/gdisk/gdisk-0.6.14-unistd.patch
new file mode 100644
index 0000000..97627da
--- /dev/null
+++ b/package/gdisk/gdisk-0.6.14-unistd.patch
@@ -0,0 +1,19 @@
+[PATCH] close(2) needs unistd.h
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ diskio-unix.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: gdisk-0.6.14/diskio-unix.cc
+===================================================================
+--- gdisk-0.6.14.orig/diskio-unix.cc
++++ gdisk-0.6.14/diskio-unix.cc
+@@ -22,6 +22,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
++#include <unistd.h>
+ #include <iostream>
+
+ #include "diskio.h"
^ permalink raw reply related
* [Buildroot] [autobuild.buildroot.net] Build results for 2012-11-02
From: Thomas Petazzoni @ 2012-11-03 7:32 UTC (permalink / raw)
To: buildroot
Hello,
On 2012-11-02, 109 random build tests have been done and
submitted on autobuild.buildroot.net.
75 builds have been successful
34 builds have failed
Below the results of the failed builds. Successful builds are omitted.
Build 5644608cfdb9423d8cc3a59d4b72cca6912f0149
==============================================
Status : NOK
Failure reason : icu-4.8.1.1
Architecture : i686
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 00:11:07
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/5644608cfdb9423d8cc3a59d4b72cca6912f0149/build-end.log
Complete log : http://autobuild.buildroot.net/results/5644608cfdb9423d8cc3a59d4b72cca6912f0149/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/5644608cfdb9423d8cc3a59d4b72cca6912f0149/config
Defconfig : http://autobuild.buildroot.net/results/5644608cfdb9423d8cc3a59d4b72cca6912f0149/defconfig
Build af1ff2542bb0c23338452a632f1dda8aee60267f
==============================================
Status : NOK
Failure reason : sconeserver-178
Architecture : arm
Submitted by : Peter Korsgaard (gcc10)
Submitted at : 2012-11-02 00:47:40
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/af1ff2542bb0c23338452a632f1dda8aee60267f/build-end.log
Complete log : http://autobuild.buildroot.net/results/af1ff2542bb0c23338452a632f1dda8aee60267f/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/af1ff2542bb0c23338452a632f1dda8aee60267f/config
Defconfig : http://autobuild.buildroot.net/results/af1ff2542bb0c23338452a632f1dda8aee60267f/defconfig
Build 7ba1af4938e68497439ac6192d5d03e653312d78
==============================================
Status : NOK
Failure reason : squid-3.2.3
Architecture : mipsel
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 01:06:17
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/7ba1af4938e68497439ac6192d5d03e653312d78/build-end.log
Complete log : http://autobuild.buildroot.net/results/7ba1af4938e68497439ac6192d5d03e653312d78/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/7ba1af4938e68497439ac6192d5d03e653312d78/config
Defconfig : http://autobuild.buildroot.net/results/7ba1af4938e68497439ac6192d5d03e653312d78/defconfig
Build 1647ecc0dc386f1e9ffa976fd7a0a4bff8ede9d1
==============================================
Status : NOK
Failure reason : libmbus-0.7.0
Architecture : powerpc
Submitted by : Peter Korsgaard (gcc14)
Submitted at : 2012-11-02 02:29:37
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/1647ecc0dc386f1e9ffa976fd7a0a4bff8ede9d1/build-end.log
Complete log : http://autobuild.buildroot.net/results/1647ecc0dc386f1e9ffa976fd7a0a4bff8ede9d1/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/1647ecc0dc386f1e9ffa976fd7a0a4bff8ede9d1/config
Defconfig : http://autobuild.buildroot.net/results/1647ecc0dc386f1e9ffa976fd7a0a4bff8ede9d1/defconfig
Build 1033a2824faadf1685472508f82632c89d7aa9c3
==============================================
Status : NOK
Failure reason : lua-5.1.5
Architecture : mips
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 02:39:03
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/1033a2824faadf1685472508f82632c89d7aa9c3/build-end.log
Complete log : http://autobuild.buildroot.net/results/1033a2824faadf1685472508f82632c89d7aa9c3/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/1033a2824faadf1685472508f82632c89d7aa9c3/config
Defconfig : http://autobuild.buildroot.net/results/1033a2824faadf1685472508f82632c89d7aa9c3/defconfig
Build d709d58cd7d53d28f4a650020b9714642aafe953
==============================================
Status : NOK
Failure reason : sconeserver-178
Architecture : arm
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 04:16:27
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/d709d58cd7d53d28f4a650020b9714642aafe953/build-end.log
Complete log : http://autobuild.buildroot.net/results/d709d58cd7d53d28f4a650020b9714642aafe953/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/d709d58cd7d53d28f4a650020b9714642aafe953/config
Defconfig : http://autobuild.buildroot.net/results/d709d58cd7d53d28f4a650020b9714642aafe953/defconfig
Build d65313df09f1636925a45cec0d0cdba2e3137f9d
==============================================
Status : NOK
Failure reason : bzip2-1.0.6
Architecture : bfin
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 04:18:42
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/d65313df09f1636925a45cec0d0cdba2e3137f9d/build-end.log
Complete log : http://autobuild.buildroot.net/results/d65313df09f1636925a45cec0d0cdba2e3137f9d/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/d65313df09f1636925a45cec0d0cdba2e3137f9d/config
Defconfig : http://autobuild.buildroot.net/results/d65313df09f1636925a45cec0d0cdba2e3137f9d/defconfig
Build d6b7fbf6b1b30624c0ec98b453dcadf4ebce960e
==============================================
Status : NOK
Failure reason : python-2.7.2
Architecture : bfin
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 04:53:40
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/d6b7fbf6b1b30624c0ec98b453dcadf4ebce960e/build-end.log
Complete log : http://autobuild.buildroot.net/results/d6b7fbf6b1b30624c0ec98b453dcadf4ebce960e/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/d6b7fbf6b1b30624c0ec98b453dcadf4ebce960e/config
Defconfig : http://autobuild.buildroot.net/results/d6b7fbf6b1b30624c0ec98b453dcadf4ebce960e/defconfig
Build 2616982e908b195329f5550420354bf25f550f7e
==============================================
Status : NOK
Failure reason : lua-5.1.5
Architecture : x86_64
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 05:19:56
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/2616982e908b195329f5550420354bf25f550f7e/build-end.log
Complete log : http://autobuild.buildroot.net/results/2616982e908b195329f5550420354bf25f550f7e/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/2616982e908b195329f5550420354bf25f550f7e/config
Defconfig : http://autobuild.buildroot.net/results/2616982e908b195329f5550420354bf25f550f7e/defconfig
Build 6595c9e5ff84276d4a085849b2cdd754295f068f
==============================================
Status : NOK
Failure reason : webkit-1.2.7
Architecture : arm
Submitted by : Peter Korsgaard (gcc10)
Submitted at : 2012-11-02 05:48:51
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/6595c9e5ff84276d4a085849b2cdd754295f068f/build-end.log
Complete log : http://autobuild.buildroot.net/results/6595c9e5ff84276d4a085849b2cdd754295f068f/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/6595c9e5ff84276d4a085849b2cdd754295f068f/config
Defconfig : http://autobuild.buildroot.net/results/6595c9e5ff84276d4a085849b2cdd754295f068f/defconfig
Build 892ed10cbd92933efbb54cb4f8041742466ec66f
==============================================
Status : NOK
Failure reason : icu-4.8.1.1
Architecture : i686
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 09:44:05
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/892ed10cbd92933efbb54cb4f8041742466ec66f/build-end.log
Complete log : http://autobuild.buildroot.net/results/892ed10cbd92933efbb54cb4f8041742466ec66f/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/892ed10cbd92933efbb54cb4f8041742466ec66f/config
Defconfig : http://autobuild.buildroot.net/results/892ed10cbd92933efbb54cb4f8041742466ec66f/defconfig
Build 117209dd6993aa78217ad99f661749efe0aaae00
==============================================
Status : NOK
Failure reason : libmbus-0.7.0
Architecture : arm
Submitted by : Peter Korsgaard (gcc10)
Submitted at : 2012-11-02 10:27:44
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/117209dd6993aa78217ad99f661749efe0aaae00/build-end.log
Complete log : http://autobuild.buildroot.net/results/117209dd6993aa78217ad99f661749efe0aaae00/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/117209dd6993aa78217ad99f661749efe0aaae00/config
Defconfig : http://autobuild.buildroot.net/results/117209dd6993aa78217ad99f661749efe0aaae00/defconfig
Build 5d46e91e4a6993da43b1beb21b4a01bcc0d2563e
==============================================
Status : NOK
Failure reason : lua-5.1.5
Architecture : x86_64
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 10:49:45
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/5d46e91e4a6993da43b1beb21b4a01bcc0d2563e/build-end.log
Complete log : http://autobuild.buildroot.net/results/5d46e91e4a6993da43b1beb21b4a01bcc0d2563e/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/5d46e91e4a6993da43b1beb21b4a01bcc0d2563e/config
Defconfig : http://autobuild.buildroot.net/results/5d46e91e4a6993da43b1beb21b4a01bcc0d2563e/defconfig
Build 8e3114f373255e096f1722b21843b40363a5d833
==============================================
Status : NOK
Failure reason : gdbhost-7.4.1
Architecture : arm
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 10:59:56
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/8e3114f373255e096f1722b21843b40363a5d833/build-end.log
Complete log : http://autobuild.buildroot.net/results/8e3114f373255e096f1722b21843b40363a5d833/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/8e3114f373255e096f1722b21843b40363a5d833/config
Defconfig : http://autobuild.buildroot.net/results/8e3114f373255e096f1722b21843b40363a5d833/defconfig
Build a268e7771c34bdf53f5e07360103c99bfd7e7734
==============================================
Status : NOK
Failure reason : libmbus-0.7.0
Architecture : arm
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 11:40:15
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/a268e7771c34bdf53f5e07360103c99bfd7e7734/build-end.log
Complete log : http://autobuild.buildroot.net/results/a268e7771c34bdf53f5e07360103c99bfd7e7734/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/a268e7771c34bdf53f5e07360103c99bfd7e7734/config
Defconfig : http://autobuild.buildroot.net/results/a268e7771c34bdf53f5e07360103c99bfd7e7734/defconfig
Build c9fcd9b411be351fabf6ba99543d4e09315d2a5e
==============================================
Status : NOK
Failure reason : libffi-3.0.11
Architecture : sh2a
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 11:42:04
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/c9fcd9b411be351fabf6ba99543d4e09315d2a5e/build-end.log
Complete log : http://autobuild.buildroot.net/results/c9fcd9b411be351fabf6ba99543d4e09315d2a5e/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/c9fcd9b411be351fabf6ba99543d4e09315d2a5e/config
Defconfig : http://autobuild.buildroot.net/results/c9fcd9b411be351fabf6ba99543d4e09315d2a5e/defconfig
Build d4db894b3bbd868bbfedf5d2efd334e1a9db1e8c
==============================================
Status : NOK
Failure reason : libmbus-0.7.0
Architecture : arm
Submitted by : Peter Korsgaard (gcc10)
Submitted at : 2012-11-02 12:01:04
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/d4db894b3bbd868bbfedf5d2efd334e1a9db1e8c/build-end.log
Complete log : http://autobuild.buildroot.net/results/d4db894b3bbd868bbfedf5d2efd334e1a9db1e8c/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/d4db894b3bbd868bbfedf5d2efd334e1a9db1e8c/config
Defconfig : http://autobuild.buildroot.net/results/d4db894b3bbd868bbfedf5d2efd334e1a9db1e8c/defconfig
Build 80cdbd6cf0e2e7d6623c7ee46f83c68d0e52f612
==============================================
Status : NOK
Failure reason : pcsc-lite-1.8.6
Architecture : avr32
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 12:18:59
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/80cdbd6cf0e2e7d6623c7ee46f83c68d0e52f612/build-end.log
Complete log : http://autobuild.buildroot.net/results/80cdbd6cf0e2e7d6623c7ee46f83c68d0e52f612/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/80cdbd6cf0e2e7d6623c7ee46f83c68d0e52f612/config
Defconfig : http://autobuild.buildroot.net/results/80cdbd6cf0e2e7d6623c7ee46f83c68d0e52f612/defconfig
Build 40450aa397988aeb8a1d1899a2ffbb812e8dfd3a
==============================================
Status : NOK
Failure reason : webkit-1.2.7
Architecture : arm
Submitted by : Peter Korsgaard (gcc10)
Submitted at : 2012-11-02 14:29:20
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/40450aa397988aeb8a1d1899a2ffbb812e8dfd3a/build-end.log
Complete log : http://autobuild.buildroot.net/results/40450aa397988aeb8a1d1899a2ffbb812e8dfd3a/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/40450aa397988aeb8a1d1899a2ffbb812e8dfd3a/config
Defconfig : http://autobuild.buildroot.net/results/40450aa397988aeb8a1d1899a2ffbb812e8dfd3a/defconfig
Build 0d948cee3fad0746a8acfcb3380cfe1bcee65bb2
==============================================
Status : NOK
Failure reason : alsa-lib-1.0.25
Architecture : bfin
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 15:46:35
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/0d948cee3fad0746a8acfcb3380cfe1bcee65bb2/build-end.log
Complete log : http://autobuild.buildroot.net/results/0d948cee3fad0746a8acfcb3380cfe1bcee65bb2/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/0d948cee3fad0746a8acfcb3380cfe1bcee65bb2/config
Defconfig : http://autobuild.buildroot.net/results/0d948cee3fad0746a8acfcb3380cfe1bcee65bb2/defconfig
Build b3bd22531d53fd0ebe7fc02834625fef003b58fd
==============================================
Status : NOK
Failure reason : alsa-lib-1.0.25
Architecture : bfin
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 15:47:00
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/b3bd22531d53fd0ebe7fc02834625fef003b58fd/build-end.log
Complete log : http://autobuild.buildroot.net/results/b3bd22531d53fd0ebe7fc02834625fef003b58fd/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/b3bd22531d53fd0ebe7fc02834625fef003b58fd/config
Defconfig : http://autobuild.buildroot.net/results/b3bd22531d53fd0ebe7fc02834625fef003b58fd/defconfig
Build 56300ea7ab1c13c7b8c71a905893831ff6dc0057
==============================================
Status : NOK
Failure reason : xlib_libX11-1.4.2
Architecture : mipsel
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 16:13:47
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/56300ea7ab1c13c7b8c71a905893831ff6dc0057/build-end.log
Complete log : http://autobuild.buildroot.net/results/56300ea7ab1c13c7b8c71a905893831ff6dc0057/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/56300ea7ab1c13c7b8c71a905893831ff6dc0057/config
Defconfig : http://autobuild.buildroot.net/results/56300ea7ab1c13c7b8c71a905893831ff6dc0057/defconfig
Build 59790770aea75919d2dfaaade67ffb10129ac4cf
==============================================
Status : NOK
Failure reason : boost-1.49.0
Architecture : arm
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 17:07:37
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/59790770aea75919d2dfaaade67ffb10129ac4cf/build-end.log
Complete log : http://autobuild.buildroot.net/results/59790770aea75919d2dfaaade67ffb10129ac4cf/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/59790770aea75919d2dfaaade67ffb10129ac4cf/config
Defconfig : http://autobuild.buildroot.net/results/59790770aea75919d2dfaaade67ffb10129ac4cf/defconfig
Build 13840e5511e90429456c6a5ecb623da8436cdea9
==============================================
Status : NOK
Failure reason : iproute2-3.6.0
Architecture : arm
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 17:45:00
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/13840e5511e90429456c6a5ecb623da8436cdea9/build-end.log
Complete log : http://autobuild.buildroot.net/results/13840e5511e90429456c6a5ecb623da8436cdea9/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/13840e5511e90429456c6a5ecb623da8436cdea9/config
Defconfig : http://autobuild.buildroot.net/results/13840e5511e90429456c6a5ecb623da8436cdea9/defconfig
Build 4609dd68fa921a5dbfb51a26ae3d4557ab4d275c
==============================================
Status : NOK
Failure reason : microperl-5.12.4
Architecture : sh2a
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 18:53:52
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/4609dd68fa921a5dbfb51a26ae3d4557ab4d275c/build-end.log
Complete log : http://autobuild.buildroot.net/results/4609dd68fa921a5dbfb51a26ae3d4557ab4d275c/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/4609dd68fa921a5dbfb51a26ae3d4557ab4d275c/config
Defconfig : http://autobuild.buildroot.net/results/4609dd68fa921a5dbfb51a26ae3d4557ab4d275c/defconfig
Build 7334442237e324d983e7f88ee754de9c16e5ee84
==============================================
Status : NOK
Failure reason : xlib_libX11-1.4.2
Architecture : mips64el
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 19:01:18
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/7334442237e324d983e7f88ee754de9c16e5ee84/build-end.log
Complete log : http://autobuild.buildroot.net/results/7334442237e324d983e7f88ee754de9c16e5ee84/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/7334442237e324d983e7f88ee754de9c16e5ee84/config
Defconfig : http://autobuild.buildroot.net/results/7334442237e324d983e7f88ee754de9c16e5ee84/defconfig
Build 013fbb051d0133631b58fc1e1a3d878b95e5b28c
==============================================
Status : NOK
Failure reason : libmbus-0.7.0
Architecture : i686
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 19:25:20
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/013fbb051d0133631b58fc1e1a3d878b95e5b28c/build-end.log
Complete log : http://autobuild.buildroot.net/results/013fbb051d0133631b58fc1e1a3d878b95e5b28c/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/013fbb051d0133631b58fc1e1a3d878b95e5b28c/config
Defconfig : http://autobuild.buildroot.net/results/013fbb051d0133631b58fc1e1a3d878b95e5b28c/defconfig
Build a621a48c9013c3d7d158f3eba500f6968b0ae31b
==============================================
Status : NOK
Failure reason : gsl-1.15
Architecture : arm
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 19:49:51
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/a621a48c9013c3d7d158f3eba500f6968b0ae31b/build-end.log
Complete log : http://autobuild.buildroot.net/results/a621a48c9013c3d7d158f3eba500f6968b0ae31b/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/a621a48c9013c3d7d158f3eba500f6968b0ae31b/config
Defconfig : http://autobuild.buildroot.net/results/a621a48c9013c3d7d158f3eba500f6968b0ae31b/defconfig
Build 3037d3b85f3b8b056a6848c7d5c3f334c7eb8c35
==============================================
Status : NOK
Failure reason : dbus-1.4.20
Architecture : microblaze
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 19:59:44
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/3037d3b85f3b8b056a6848c7d5c3f334c7eb8c35/build-end.log
Complete log : http://autobuild.buildroot.net/results/3037d3b85f3b8b056a6848c7d5c3f334c7eb8c35/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/3037d3b85f3b8b056a6848c7d5c3f334c7eb8c35/config
Defconfig : http://autobuild.buildroot.net/results/3037d3b85f3b8b056a6848c7d5c3f334c7eb8c35/defconfig
Build 215e324f771e6d3825f4e89273191c65a1598374
==============================================
Status : NOK
Failure reason : libnspr-4.8.7
Architecture : arm
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 21:05:13
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/215e324f771e6d3825f4e89273191c65a1598374/build-end.log
Complete log : http://autobuild.buildroot.net/results/215e324f771e6d3825f4e89273191c65a1598374/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/215e324f771e6d3825f4e89273191c65a1598374/config
Defconfig : http://autobuild.buildroot.net/results/215e324f771e6d3825f4e89273191c65a1598374/defconfig
Build 87c0b07dc305a91e5264ba367bcbde98ab941640
==============================================
Status : NOK
Failure reason : lua-5.1.5
Architecture : x86_64
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 21:18:10
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/87c0b07dc305a91e5264ba367bcbde98ab941640/build-end.log
Complete log : http://autobuild.buildroot.net/results/87c0b07dc305a91e5264ba367bcbde98ab941640/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/87c0b07dc305a91e5264ba367bcbde98ab941640/config
Defconfig : http://autobuild.buildroot.net/results/87c0b07dc305a91e5264ba367bcbde98ab941640/defconfig
Build b4cc0e4dbfff40cb648e9ed5c600152b89a1b65b
==============================================
Status : NOK
Failure reason : dbus-1.4.20
Architecture : microblaze
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 22:22:18
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/b4cc0e4dbfff40cb648e9ed5c600152b89a1b65b/build-end.log
Complete log : http://autobuild.buildroot.net/results/b4cc0e4dbfff40cb648e9ed5c600152b89a1b65b/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/b4cc0e4dbfff40cb648e9ed5c600152b89a1b65b/config
Defconfig : http://autobuild.buildroot.net/results/b4cc0e4dbfff40cb648e9ed5c600152b89a1b65b/defconfig
Build 8cb1e0bcc6ea385f6d913652cc3e6892d585e5dd
==============================================
Status : NOK
Failure reason : gdbhost-7.4.1
Architecture : mipsel
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 22:36:28
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/8cb1e0bcc6ea385f6d913652cc3e6892d585e5dd/build-end.log
Complete log : http://autobuild.buildroot.net/results/8cb1e0bcc6ea385f6d913652cc3e6892d585e5dd/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/8cb1e0bcc6ea385f6d913652cc3e6892d585e5dd/config
Defconfig : http://autobuild.buildroot.net/results/8cb1e0bcc6ea385f6d913652cc3e6892d585e5dd/defconfig
Build ff024d61123c0b875499c28c1d1c6aa7ba33cb9b
==============================================
Status : NOK
Failure reason : lcdapi-v0.3
Architecture : x86_64
Submitted by : Thomas Petazzoni (Free Electrons build server)
Submitted at : 2012-11-02 23:42:23
Git commit ID : http://git.buildroot.net/buildroot/commit/?id=3ff05f80ffb82e077a332b0c0625f4696a138528
End of log : http://autobuild.buildroot.net/results/ff024d61123c0b875499c28c1d1c6aa7ba33cb9b/build-end.log
Complete log : http://autobuild.buildroot.net/results/ff024d61123c0b875499c28c1d1c6aa7ba33cb9b/build.log.bz2
Configuration : http://autobuild.buildroot.net/results/ff024d61123c0b875499c28c1d1c6aa7ba33cb9b/config
Defconfig : http://autobuild.buildroot.net/results/ff024d61123c0b875499c28c1d1c6aa7ba33cb9b/defconfig
--
http://autobuild.buildroot.net
^ permalink raw reply
* [Buildroot] [PATCH 0/3] Update AT91SAM926* patches and configs
From: Peter Korsgaard @ 2012-11-02 22:52 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351203333-26588-1-git-send-email-alexandre.belloni@piout.net>
>>>>> "Alexandre" == Alexandre Belloni <alexandre.belloni@piout.net> writes:
Alexandre> As u-boot took the patch in the mainline, I updated the
Alexandre> at91bootstrap and u-boot patches accordingly.
Alexandre> Also, update defconfigs to use latest u-boot.
Alexandre> Tested on at91sam9261ek with u-boot 2011.12, 2012.04.1 and 2012.10.
Committed series, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] dbus: bump version
From: Peter Korsgaard @ 2012-11-02 22:51 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=b72f3f625c97bca59549b3fedfd51b3dc993fb27
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Fixes security issues:
- CVE-2012-3524: Don't access environment variables (fd.o #52202)
Thanks to work and input from Colin Walters, Simon McVittie,
Geoffrey Thomas, and others.
- Be more careful about monotonic time vs. real time, fixing
DBUS_COOKIE_SHA1 spec-compliance (fd.o #48580, David Zeuthen)
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/dbus/dbus.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index f848bfd..b7cc378 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -3,7 +3,7 @@
# dbus
#
#############################################################
-DBUS_VERSION = 1.4.20
+DBUS_VERSION = 1.4.24
DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
DBUS_INSTALL_STAGING = YES
^ permalink raw reply related
* [Buildroot] [git commit] at91sam92*: update defconfigs to use latest u-boot
From: Peter Korsgaard @ 2012-11-02 22:36 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=8f4ffd8c0b7fcc36309b0dbd73463745042496f9
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
configs/at91sam9260dfc_defconfig | 6 ------
configs/at91sam9261ek_defconfig | 6 ------
configs/at91sam9263ek_defconfig | 6 ------
3 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index 921afa8..085997a 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -9,17 +9,11 @@ BR2_PACKAGE_HOST_SAM_BA=y
# First stage bootloader
BR2_TARGET_AT91BOOTSTRAP=y
BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9260ek"
-BR2_TARGET_AT91BOOTSTRAP_DATAFLASH=y
# Second stage bootloader
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="at91sam9260ek_dataflash_cs0"
-BR2_TARGET_UBOOT_2011_12=y
# Kernel
BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_USE_DEFCONFIG=y
BR2_LINUX_KERNEL_DEFCONFIG="at91sam9260"
-
-# Filesystem
-BR2_TARGET_ROOTFS_TAR=y
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index aafb166..c53e732 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -9,17 +9,11 @@ BR2_PACKAGE_HOST_SAM_BA=y
# First stage bootloader
BR2_TARGET_AT91BOOTSTRAP=y
BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9261ek"
-BR2_TARGET_AT91BOOTSTRAP_DATAFLASH=y
# Second stage bootloader
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="at91sam9261ek_dataflash_cs0"
-BR2_TARGET_UBOOT_2011_12=y
# Kernel
BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_USE_DEFCONFIG=y
BR2_LINUX_KERNEL_DEFCONFIG="at91sam9261"
-
-# Filesystem
-BR2_TARGET_ROOTFS_TAR=y
diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index 2cd82c0..208e057 100644
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -9,17 +9,11 @@ BR2_PACKAGE_HOST_SAM_BA=y
# First stage bootloader
BR2_TARGET_AT91BOOTSTRAP=y
BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9263ek"
-BR2_TARGET_AT91BOOTSTRAP_DATAFLASH=y
# Second stage bootloader
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="at91sam9263ek_dataflash_cs0"
-BR2_TARGET_UBOOT_2011_12=y
# Kernel
BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_USE_DEFCONFIG=y
BR2_LINUX_KERNEL_DEFCONFIG="at91sam9263"
-
-# Filesystem
-BR2_TARGET_ROOTFS_TAR=y
^ permalink raw reply related
* [Buildroot] [PATCH 2/2] legal-info: split _LICENSE and _REDISTRIBUTE constants
From: Arnout Vandecappelle @ 2012-11-02 22:32 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351848341-5905-3-git-send-email-luca@lucaceresoli.net>
On 11/02/12 10:25, Luca Ceresoli wrote:
> Currently packages can be described in two ways: proprietary (tarball not
> saved, license not described in further detail), and others (tarball
> saved, license described).
>
> Split the logic to allow the license to be always described whether or not
> the source code can be redistributed.
>
> Signed-off-by: Luca Ceresoli<luca@lucaceresoli.net>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(untested)
Pending the discussion at the BR developer days, of course; my ack is just
concerning the implementation.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply
* [Buildroot] BR2_PREFER_STATIC_LIB and LDFLAGS+= -static
From: Arnout Vandecappelle @ 2012-11-02 22:21 UTC (permalink / raw)
To: buildroot
In-Reply-To: <F9C551623D2CBB4C9488801D14F864C6287244@ex-mb1.corp.adtran.com>
On 11/02/12 18:06, ANDY KENNEDY wrote:
> All,
>
> Near line 302 in package/Makefile.in was added TARGET_LDFLAGS += -static
> to satisfy a request I made a while back. This really needs to be
> --static so that it filters down through autoconf the correct way. If
> -static is passed in LDFLAGS, autoconf regularly mishandles this by
> setting a variable then never reconfiguring the package's make system
> to build static. However, the --static to ld is the same as -static,
> but autoconf does not compare for --static, thus, packages get built as
> desired.
I don't really understand how it can go wrong... Can you give an example
of a package with a configure script that handles it the wrong way?
>
> Can someone change this in package/Makefile.in or should I submit a
> dinky patch for this?
Yes, please submit a patch.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply
* [Buildroot] [PATCH] uClibc: install libc.so even if BR2_PREFER_STATIC_LIB is enabled
From: Thomas Petazzoni @ 2012-11-02 22:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351764953-24251-1-git-send-email-arnout@mind.be>
Dear Arnout Vandecappelle (Essensium/Mind),
On Thu, 1 Nov 2012 11:15:53 +0100, Arnout Vandecappelle
(Essensium/Mind) wrote:
> BR2_PREFER_STATIC_LIB _prefers_ static linking, but doesn't force it
> for all packages. So some binaries may still be built without
> -static, and they will need libc.so on the target.
>
> Therefore, put libc.so.0 in the target unconditionally.
>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> Untested!
This is an exact revert of c95174a8dfb6f72b80768b73b8f04448f846c122. Do
we really want to make circles and redo/undo our changes? :-)
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] u-boot: update at91 patches to match mainline
From: Peter Korsgaard @ 2012-11-02 20:27 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=a1504a791ce8bc6222d7d604295550e2fcbef8a6
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The patch that was included in buildroot was not the same as the final
one submitted in the mainline.
Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
...011.12-change-kernel-address-in-dataflash.patch | 210 +++++++++++---------
...012.04-change-kernel-address-in-dataflash.patch | 210 +++++++++++---------
2 files changed, 224 insertions(+), 196 deletions(-)
diff --git a/boot/uboot/uboot-2011.12/uboot-2011.12-change-kernel-address-in-dataflash.patch b/boot/uboot/uboot-2011.12/uboot-2011.12-change-kernel-address-in-dataflash.patch
index 4cdbb98..c7d9a7e 100644
--- a/boot/uboot/uboot-2011.12/uboot-2011.12-change-kernel-address-in-dataflash.patch
+++ b/boot/uboot/uboot-2011.12/uboot-2011.12-change-kernel-address-in-dataflash.patch
@@ -1,7 +1,9 @@
-From 9fc4787c7a6c797db649831f86e49c4bf9780b4e Mon Sep 17 00:00:00 2001
+From e139cb31d32a4f39241bfd83bf622a97d08f6c9d Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@piout.net>
-Date: Mon, 2 Jan 2012 03:51:11 +0100
-Subject: [PATCH] Change kernel address in dataflash to match u-boot's size
+Date: Mon, 2 Jul 2012 04:26:58 +0000
+Subject: [PATCH] AT91SAM9*: Change kernel address in dataflash to
+ match u-boot's size
+
On at91sam platforms, u-boot grew larger than the allocated size in
dataflash, the layout was:
@@ -9,173 +11,185 @@ bootstrap 0x00000000
ubootenv 0x00004200
uboot 0x00008400
kernel 0x00042000
+fs 0x00252000
u-boot with the defconfig doesn't seem to fit in 0x42000 - 0x8400 =
0x39C00 bytes anymore.
Now, the layout is:
bootstrap 0x00000000
-uboot 0x00004000
-ubootenv 0x00084000
-ubootenv2 0x00088000
-kernel 0x0008C000
+ubootenv 0x00004200
+uboot 0x00008400
+kernel 0x00084000
+fs 0x00294000
Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
+Signed-off-by: Andreas Bie??mann <andreas.devel@googlemail.com>
---
- include/configs/at91sam9260ek.h | 18 ++++++++++++------
- include/configs/at91sam9261ek.h | 18 ++++++++++++------
- include/configs/at91sam9263ek.h | 10 +++++++---
- include/configs/at91sam9rlek.h | 10 +++++++---
- 4 files changed, 38 insertions(+), 18 deletions(-)
+ board/atmel/at91sam9260ek/partition.c | 6 +++---
+ board/atmel/at91sam9261ek/partition.c | 6 +++---
+ board/atmel/at91sam9263ek/partition.c | 6 +++---
+ board/atmel/at91sam9rlek/partition.c | 6 +++---
+ include/configs/at91sam9260ek.h | 5 +++--
+ include/configs/at91sam9261ek.h | 5 +++--
+ include/configs/at91sam9263ek.h | 2 +-
+ include/configs/at91sam9rlek.h | 3 ++-
+ 8 files changed, 21 insertions(+), 18 deletions(-)
+diff --git a/board/atmel/at91sam9260ek/partition.c b/board/atmel/at91sam9260ek/partition.c
+index 2629c67..9ec054f 100644
+--- a/board/atmel/at91sam9260ek/partition.c
++++ b/board/atmel/at91sam9260ek/partition.c
+@@ -34,7 +34,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+ {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"},
+ {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+- {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
+- {0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
+- {0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
++ {0x00008400, 0x00083FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
++ {0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
++ {0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
+ };
+diff --git a/board/atmel/at91sam9261ek/partition.c b/board/atmel/at91sam9261ek/partition.c
+index c739b11..51cac77 100644
+--- a/board/atmel/at91sam9261ek/partition.c
++++ b/board/atmel/at91sam9261ek/partition.c
+@@ -34,7 +34,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+ {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"},
+ {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+- {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
+- {0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
+- {0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
++ {0x00008400, 0x00083FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
++ {0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
++ {0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
+ };
+diff --git a/board/atmel/at91sam9263ek/partition.c b/board/atmel/at91sam9263ek/partition.c
+index 7e1d46f..d48fab7 100644
+--- a/board/atmel/at91sam9263ek/partition.c
++++ b/board/atmel/at91sam9263ek/partition.c
+@@ -33,7 +33,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+ {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"},
+ {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+- {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
+- {0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
+- {0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
++ {0x00008400, 0x00083FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
++ {0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
++ {0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
+ };
+diff --git a/board/atmel/at91sam9rlek/partition.c b/board/atmel/at91sam9rlek/partition.c
+index 7e1d46f..d48fab7 100644
+--- a/board/atmel/at91sam9rlek/partition.c
++++ b/board/atmel/at91sam9rlek/partition.c
+@@ -33,7 +33,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+ {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"},
+ {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+- {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
+- {0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
+- {0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
++ {0x00008400, 0x00083FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
++ {0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
++ {0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
+ };
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
-index db52ee6..b537760 100644
+index 07b1968..ef25fa5 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
-@@ -185,10 +185,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS0 */
- #define CONFIG_ENV_IS_IN_DATAFLASH 1
- #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
--#define CONFIG_ENV_OFFSET 0x4200
-+#define CONFIG_ENV_OFFSET 0x84000
+@@ -187,7 +187,7 @@
+ #define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE 0x4200
+ #define CONFIG_ENV_SIZE 0x4200
-#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE 0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND "cp.b 0xC008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
"mtdparts=atmel_nand:-(root) " \
-@@ -199,10 +201,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS1 */
- #define CONFIG_ENV_IS_IN_DATAFLASH 1
- #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
--#define CONFIG_ENV_OFFSET 0x4200
-+#define CONFIG_ENV_OFFSET 0x84000
+@@ -201,7 +201,7 @@
+ #define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE 0x4200
+ #define CONFIG_ENV_SIZE 0x4200
-#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE 0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND "cp.b 0xD008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND "cp.b 0xD0084000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
"mtdparts=atmel_nand:-(root) " \
-@@ -231,6 +235,8 @@
+@@ -230,6 +230,7 @@
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1
+#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
/*
* Size of malloc() pool
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
-index 5140b26..fa461da 100644
+index 6fd0b83..014437b 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
-@@ -187,10 +187,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS0 */
- #define CONFIG_ENV_IS_IN_DATAFLASH
- #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
--#define CONFIG_ENV_OFFSET 0x4200
-+#define CONFIG_ENV_OFFSET 0x84000
+@@ -189,7 +189,7 @@
+ #define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE 0x4200
+ #define CONFIG_ENV_SIZE 0x4200
-#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE 0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND "cp.b 0xC008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
"mtdparts=atmel_nand:-(root) " \
-@@ -201,10 +203,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS3 */
- #define CONFIG_ENV_IS_IN_DATAFLASH
- #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + 0x8400)
--#define CONFIG_ENV_OFFSET 0x4200
-+#define CONFIG_ENV_OFFSET 0x84000
+@@ -203,7 +203,7 @@
+ #define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE 0x4200
+ #define CONFIG_ENV_SIZE 0x4200
-#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE 0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND "cp.b 0xD008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND "cp.b 0xD0084000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
"mtdparts=atmel_nand:-(root) " \
-@@ -233,6 +237,8 @@
+@@ -232,6 +232,7 @@
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
+#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
/*
* Size of malloc() pool
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
-index 8399246..253bee4 100644
+index f2163f1..4309f71 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
-@@ -314,10 +314,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS0 */
- #define CONFIG_ENV_IS_IN_DATAFLASH 1
- #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
--#define CONFIG_ENV_OFFSET 0x4200
-+#define CONFIG_ENV_OFFSET 0x84000
+@@ -318,7 +318,7 @@
+ #define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE 0x4200
+ #define CONFIG_ENV_SIZE 0x4200
-#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE 0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND "cp.b 0xC008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
"mtdparts=atmel_nand:-(root) "\
-@@ -347,6 +349,8 @@
- #define CONFIG_AUTO_COMPLETE
- #define CONFIG_SYS_HUSH_PARSER
- #define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-+#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-
- /*
- * Size of malloc() pool
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
-index 79ea1f2..423f523 100644
+index 45f8baf..c5952e9 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
-@@ -153,10 +153,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS0 */
- #define CONFIG_ENV_IS_IN_DATAFLASH 1
- #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
--#define CONFIG_ENV_OFFSET 0x4200
-+#define CONFIG_ENV_OFFSET 0x84000
+@@ -155,7 +155,7 @@
+ #define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE 0x4200
+ #define CONFIG_ENV_SIZE 0x4200
-#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE 0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND "cp.b 0xC008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
"mtdparts=atmel_nand:-(root) "\
-@@ -183,6 +185,8 @@
+@@ -182,6 +182,7 @@
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1
+#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
/*
* Size of malloc() pool
--
-1.7.5.4
+1.7.9.5
diff --git a/boot/uboot/uboot-2012.04.01/uboot-2012.04-change-kernel-address-in-dataflash.patch b/boot/uboot/uboot-2012.04.01/uboot-2012.04-change-kernel-address-in-dataflash.patch
index 4cdbb98..c7d9a7e 100644
--- a/boot/uboot/uboot-2012.04.01/uboot-2012.04-change-kernel-address-in-dataflash.patch
+++ b/boot/uboot/uboot-2012.04.01/uboot-2012.04-change-kernel-address-in-dataflash.patch
@@ -1,7 +1,9 @@
-From 9fc4787c7a6c797db649831f86e49c4bf9780b4e Mon Sep 17 00:00:00 2001
+From e139cb31d32a4f39241bfd83bf622a97d08f6c9d Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@piout.net>
-Date: Mon, 2 Jan 2012 03:51:11 +0100
-Subject: [PATCH] Change kernel address in dataflash to match u-boot's size
+Date: Mon, 2 Jul 2012 04:26:58 +0000
+Subject: [PATCH] AT91SAM9*: Change kernel address in dataflash to
+ match u-boot's size
+
On at91sam platforms, u-boot grew larger than the allocated size in
dataflash, the layout was:
@@ -9,173 +11,185 @@ bootstrap 0x00000000
ubootenv 0x00004200
uboot 0x00008400
kernel 0x00042000
+fs 0x00252000
u-boot with the defconfig doesn't seem to fit in 0x42000 - 0x8400 =
0x39C00 bytes anymore.
Now, the layout is:
bootstrap 0x00000000
-uboot 0x00004000
-ubootenv 0x00084000
-ubootenv2 0x00088000
-kernel 0x0008C000
+ubootenv 0x00004200
+uboot 0x00008400
+kernel 0x00084000
+fs 0x00294000
Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
+Signed-off-by: Andreas Bie??mann <andreas.devel@googlemail.com>
---
- include/configs/at91sam9260ek.h | 18 ++++++++++++------
- include/configs/at91sam9261ek.h | 18 ++++++++++++------
- include/configs/at91sam9263ek.h | 10 +++++++---
- include/configs/at91sam9rlek.h | 10 +++++++---
- 4 files changed, 38 insertions(+), 18 deletions(-)
+ board/atmel/at91sam9260ek/partition.c | 6 +++---
+ board/atmel/at91sam9261ek/partition.c | 6 +++---
+ board/atmel/at91sam9263ek/partition.c | 6 +++---
+ board/atmel/at91sam9rlek/partition.c | 6 +++---
+ include/configs/at91sam9260ek.h | 5 +++--
+ include/configs/at91sam9261ek.h | 5 +++--
+ include/configs/at91sam9263ek.h | 2 +-
+ include/configs/at91sam9rlek.h | 3 ++-
+ 8 files changed, 21 insertions(+), 18 deletions(-)
+diff --git a/board/atmel/at91sam9260ek/partition.c b/board/atmel/at91sam9260ek/partition.c
+index 2629c67..9ec054f 100644
+--- a/board/atmel/at91sam9260ek/partition.c
++++ b/board/atmel/at91sam9260ek/partition.c
+@@ -34,7 +34,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+ {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"},
+ {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+- {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
+- {0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
+- {0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
++ {0x00008400, 0x00083FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
++ {0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
++ {0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
+ };
+diff --git a/board/atmel/at91sam9261ek/partition.c b/board/atmel/at91sam9261ek/partition.c
+index c739b11..51cac77 100644
+--- a/board/atmel/at91sam9261ek/partition.c
++++ b/board/atmel/at91sam9261ek/partition.c
+@@ -34,7 +34,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+ {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"},
+ {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+- {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
+- {0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
+- {0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
++ {0x00008400, 0x00083FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
++ {0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
++ {0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
+ };
+diff --git a/board/atmel/at91sam9263ek/partition.c b/board/atmel/at91sam9263ek/partition.c
+index 7e1d46f..d48fab7 100644
+--- a/board/atmel/at91sam9263ek/partition.c
++++ b/board/atmel/at91sam9263ek/partition.c
+@@ -33,7 +33,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+ {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"},
+ {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+- {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
+- {0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
+- {0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
++ {0x00008400, 0x00083FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
++ {0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
++ {0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
+ };
+diff --git a/board/atmel/at91sam9rlek/partition.c b/board/atmel/at91sam9rlek/partition.c
+index 7e1d46f..d48fab7 100644
+--- a/board/atmel/at91sam9rlek/partition.c
++++ b/board/atmel/at91sam9rlek/partition.c
+@@ -33,7 +33,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+ {0x00000000, 0x000041FF, FLAG_PROTECT_SET, 0, "Bootstrap"},
+ {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+- {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
+- {0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
+- {0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
++ {0x00008400, 0x00083FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
++ {0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
++ {0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
+ };
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
-index db52ee6..b537760 100644
+index 07b1968..ef25fa5 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
-@@ -185,10 +185,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS0 */
- #define CONFIG_ENV_IS_IN_DATAFLASH 1
- #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
--#define CONFIG_ENV_OFFSET 0x4200
-+#define CONFIG_ENV_OFFSET 0x84000
+@@ -187,7 +187,7 @@
+ #define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE 0x4200
+ #define CONFIG_ENV_SIZE 0x4200
-#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE 0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND "cp.b 0xC008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
"mtdparts=atmel_nand:-(root) " \
-@@ -199,10 +201,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS1 */
- #define CONFIG_ENV_IS_IN_DATAFLASH 1
- #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
--#define CONFIG_ENV_OFFSET 0x4200
-+#define CONFIG_ENV_OFFSET 0x84000
+@@ -201,7 +201,7 @@
+ #define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE 0x4200
+ #define CONFIG_ENV_SIZE 0x4200
-#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE 0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND "cp.b 0xD008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND "cp.b 0xD0084000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
"mtdparts=atmel_nand:-(root) " \
-@@ -231,6 +235,8 @@
+@@ -230,6 +230,7 @@
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1
+#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
/*
* Size of malloc() pool
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
-index 5140b26..fa461da 100644
+index 6fd0b83..014437b 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
-@@ -187,10 +187,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS0 */
- #define CONFIG_ENV_IS_IN_DATAFLASH
- #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
--#define CONFIG_ENV_OFFSET 0x4200
-+#define CONFIG_ENV_OFFSET 0x84000
+@@ -189,7 +189,7 @@
+ #define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE 0x4200
+ #define CONFIG_ENV_SIZE 0x4200
-#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE 0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND "cp.b 0xC008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
"mtdparts=atmel_nand:-(root) " \
-@@ -201,10 +203,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS3 */
- #define CONFIG_ENV_IS_IN_DATAFLASH
- #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + 0x8400)
--#define CONFIG_ENV_OFFSET 0x4200
-+#define CONFIG_ENV_OFFSET 0x84000
+@@ -203,7 +203,7 @@
+ #define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE 0x4200
+ #define CONFIG_ENV_SIZE 0x4200
-#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE 0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND "cp.b 0xD008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND "cp.b 0xD0084000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
"mtdparts=atmel_nand:-(root) " \
-@@ -233,6 +237,8 @@
+@@ -232,6 +232,7 @@
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
+#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
/*
* Size of malloc() pool
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
-index 8399246..253bee4 100644
+index f2163f1..4309f71 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
-@@ -314,10 +314,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS0 */
- #define CONFIG_ENV_IS_IN_DATAFLASH 1
- #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
--#define CONFIG_ENV_OFFSET 0x4200
-+#define CONFIG_ENV_OFFSET 0x84000
+@@ -318,7 +318,7 @@
+ #define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE 0x4200
+ #define CONFIG_ENV_SIZE 0x4200
-#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE 0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND "cp.b 0xC008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
"mtdparts=atmel_nand:-(root) "\
-@@ -347,6 +349,8 @@
- #define CONFIG_AUTO_COMPLETE
- #define CONFIG_SYS_HUSH_PARSER
- #define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-+#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-
- /*
- * Size of malloc() pool
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
-index 79ea1f2..423f523 100644
+index 45f8baf..c5952e9 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
-@@ -153,10 +153,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS0 */
- #define CONFIG_ENV_IS_IN_DATAFLASH 1
- #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
--#define CONFIG_ENV_OFFSET 0x4200
-+#define CONFIG_ENV_OFFSET 0x84000
+@@ -155,7 +155,7 @@
+ #define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE 0x4200
+ #define CONFIG_ENV_SIZE 0x4200
-#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE 0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND "cp.b 0xC008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
"mtdparts=atmel_nand:-(root) "\
-@@ -183,6 +185,8 @@
+@@ -182,6 +182,7 @@
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1
+#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
/*
* Size of malloc() pool
--
-1.7.5.4
+1.7.9.5
^ permalink raw reply related
* [Buildroot] [git commit] at91bootstrap: update patch for latest u-boot
From: Peter Korsgaard @ 2012-11-02 20:26 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=654f869cab0617f7b37077ad27494520a9cc10f9
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The u-boot patch got mainlined but not exactly as it was submitted to
buildroot. Update the at91bootstrap to match what is in the mainline.
Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
.../at91bootstrap-1.16-u-boot-relocation-fix.patch | 127 +++++++++-----------
1 files changed, 56 insertions(+), 71 deletions(-)
diff --git a/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch b/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch
index 884519c..0c9b911 100644
--- a/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch
+++ b/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch
@@ -1,3 +1,8 @@
+From d4e4a1aad559e35d84b445d1379be94ad036984e Mon Sep 17 00:00:00 2001
+From: Alexandre Belloni <alexandre.belloni@piout.net>
+Date: Thu, 25 Oct 2012 22:57:14 +0200
+Subject: [PATCH] u-boot relocation fix
+
Every AT91SAM plaforms were broken between 2010.12 and 2011.03 because
of the relocation changes.
@@ -8,13 +13,11 @@ I didn't know what to do with at91sam9m10g45ek as it doesn't seems to be
converted yet. But anyway, that means that it is either not working or
doesn't care so changing it here shouldn't harm.
-I also chose to "repartition" the dataflash. u-boot is now living at
-0x4000, letting 16kB for the bootstrap. We also have to increase the
-IMG_SIZE as u-boot as grown larger than the default value.
-As requested on the u-boot ML, we assume that it could be up to 512kB
-big.
+We also have to increase the IMG_SIZE as u-boot as grown larger than the
+default value. As requested on the u-boot ML, we assume that it could
+be up to 495kB big.
-It means that now, you have to flash your kernel at 0x0008C000 instead
+It means that now, you have to flash your kernel at 0x00084000 instead
of 0x00042000. And so you also have to load it from that adress from
u-boot.
@@ -22,36 +25,34 @@ Then, remember that you could decrease IMG_SIZE to boot faster.
Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
---
- board/at91sam9260ek/dataflash/at91sam9260ek.h | 6 +++---
+ board/at91sam9260ek/dataflash/at91sam9260ek.h | 4 ++--
board/at91sam9260ek/nandflash/at91sam9260ek.h | 2 +-
- board/at91sam9261ek/dataflash/at91sam9261ek.h | 6 +++---
+ board/at91sam9261ek/dataflash/at91sam9261ek.h | 4 ++--
board/at91sam9261ek/nandflash/at91sam9261ek.h | 2 +-
- board/at91sam9263ek/dataflash/at91sam9263ek.h | 6 +++---
+ board/at91sam9263ek/dataflash/at91sam9263ek.h | 4 ++--
board/at91sam9263ek/nandflash/at91sam9263ek.h | 2 +-
- board/at91sam9g10ek/dataflash/at91sam9g10ek.h | 6 +++---
+ board/at91sam9g10ek/dataflash/at91sam9g10ek.h | 4 ++--
board/at91sam9g10ek/nandflash/at91sam9g10ek.h | 2 +-
- board/at91sam9g20ek/dataflash/at91sam9g20ek.h | 6 +++---
+ board/at91sam9g20ek/dataflash/at91sam9g20ek.h | 4 ++--
board/at91sam9g20ek/nandflash/at91sam9g20ek.h | 2 +-
- board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h | 4 ++--
- .../at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h | 4 ++--
- board/at91sam9rlek/dataflash/at91sam9rlek.h | 6 +++---
+ board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h | 2 +-
+ .../at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h | 2 +-
+ board/at91sam9rlek/dataflash/at91sam9rlek.h | 4 ++--
board/at91sam9rlek/nandflash/at91sam9rlek.h | 2 +-
- board/at91sam9xeek/dataflash/at91sam9xeek.h | 6 +++---
+ board/at91sam9xeek/dataflash/at91sam9xeek.h | 4 ++--
board/at91sam9xeek/nandflash/at91sam9xeek.h | 2 +-
- 16 files changed, 32 insertions(+), 32 deletions(-)
+ 16 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/board/at91sam9260ek/dataflash/at91sam9260ek.h b/board/at91sam9260ek/dataflash/at91sam9260ek.h
-index 1834246..5c52bc6 100644
+index 1834246..91081a1 100644
--- a/board/at91sam9260ek/dataflash/at91sam9260ek.h
+++ b/board/at91sam9260ek/dataflash/at91sam9260ek.h
-@@ -73,11 +73,11 @@
- /* ******************************************************************* */
+@@ -74,10 +74,10 @@
#define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS0 */
--#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+ #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
-+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
-+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */
#define MACH_TYPE 0x44B /* AT91SAM9260-EK */
-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
@@ -73,17 +74,15 @@ index 2cac601..f8fdff2 100644
/* ******************************************************************* */
/* Application Settings */
diff --git a/board/at91sam9261ek/dataflash/at91sam9261ek.h b/board/at91sam9261ek/dataflash/at91sam9261ek.h
-index 8ce30e9..675f80b 100644
+index 8ce30e9..276ba3d 100644
--- a/board/at91sam9261ek/dataflash/at91sam9261ek.h
+++ b/board/at91sam9261ek/dataflash/at91sam9261ek.h
-@@ -96,11 +96,11 @@
- /* ******************************************************************* */
+@@ -97,10 +97,10 @@
#define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */
--#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+ #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
-+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
-+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */
#define MACH_TYPE 0x350 /* AT91SAM9261-EK */
-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
@@ -105,17 +104,15 @@ index badc3ac..e628c97 100644
/* ******************************************************************* */
/* Application Settings */
diff --git a/board/at91sam9263ek/dataflash/at91sam9263ek.h b/board/at91sam9263ek/dataflash/at91sam9263ek.h
-index 5c9da4b..d07b5d1 100644
+index 5c9da4b..870f9e2 100644
--- a/board/at91sam9263ek/dataflash/at91sam9263ek.h
+++ b/board/at91sam9263ek/dataflash/at91sam9263ek.h
-@@ -95,11 +95,11 @@
- /* ******************************************************************* */
+@@ -96,10 +96,10 @@
#define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */
--#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+ #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
-+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
-+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */
#define MACH_TYPE 0x4B2 /* AT91SAM9263-EK */
-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
@@ -137,17 +134,15 @@ index 505afc7..8ab4f46 100644
/* ******************************************************************* */
/* Application Settings */
diff --git a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h
-index b2faf44..0882644 100644
+index b2faf44..f4f556b 100644
--- a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h
+++ b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h
-@@ -97,11 +97,11 @@
- /* ******************************************************************* */
+@@ -98,10 +98,10 @@
#define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */
--#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+ #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
-+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
-+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */
#define MACH_TYPE 0x350 /* AT91SAM9261-EK */
-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
@@ -169,17 +164,15 @@ index 66c40a3..6c3ecda 100644
/* ******************************************************************* */
/* Application Settings */
diff --git a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h
-index eea0439..44bd578 100644
+index eea0439..7fc70d6 100644
--- a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h
+++ b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h
-@@ -74,11 +74,11 @@
- /* ******************************************************************* */
+@@ -75,10 +75,10 @@
#define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS1 */
--#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+ #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
-+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
-+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */
#define MACH_TYPE 0x658 /* AT91SAM9G20-EK */
-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
@@ -201,47 +194,41 @@ index 31bd499..e797e4d 100644
/* ******************************************************************* */
/* Application Settings */
diff --git a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h
-index a60fd41..144dd6d 100644
+index a60fd41..5587a00 100644
--- a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h
+++ b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h
-@@ -88,8 +88,8 @@
- /* ******************************************************************* */
+@@ -89,7 +89,7 @@
#define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */
--#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+ #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
-+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
-+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */
#define MACH_TYPE 0x9CD /* AT91SAM9M10-EKES */
#define JUMP_ADDR 0x73F00000 /* Final Jump Address */
diff --git a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h
-index 5c726b5..3152b79 100644
+index 5c726b5..9090097 100644
--- a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h
+++ b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h
-@@ -84,8 +84,8 @@
- /* ******************************************************************* */
+@@ -85,7 +85,7 @@
#define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */
--#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+ #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
-+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
-+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */
#define MACH_TYPE 0x726 /* AT91SAM9M10G45-EK */
#define JUMP_ADDR 0x73F00000 /* Final Jump Address */
diff --git a/board/at91sam9rlek/dataflash/at91sam9rlek.h b/board/at91sam9rlek/dataflash/at91sam9rlek.h
-index 05c42dc..be277b6 100644
+index 05c42dc..150f17e 100644
--- a/board/at91sam9rlek/dataflash/at91sam9rlek.h
+++ b/board/at91sam9rlek/dataflash/at91sam9rlek.h
-@@ -88,11 +88,11 @@
- /* ******************************************************************* */
+@@ -89,10 +89,10 @@
#define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */
--#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+ #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
-+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
-+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */
#define MACH_TYPE 1326 /* AT91SAM9RL-EK */
-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
@@ -263,17 +250,15 @@ index 656b4ba..594db8f 100644
/* ******************************************************************* */
/* Application Settings */
diff --git a/board/at91sam9xeek/dataflash/at91sam9xeek.h b/board/at91sam9xeek/dataflash/at91sam9xeek.h
-index 27d1822..e3172da 100644
+index 27d1822..08e515d 100644
--- a/board/at91sam9xeek/dataflash/at91sam9xeek.h
+++ b/board/at91sam9xeek/dataflash/at91sam9xeek.h
-@@ -73,11 +73,11 @@
- /* ******************************************************************* */
+@@ -74,10 +74,10 @@
#define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS1 */
--#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
+ #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */
-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */
-+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
-+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */
++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */
#define MACH_TYPE 0x44B /* AT91SAM9XE-EK same id as AT91SAM9260-EK*/
-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
@@ -295,5 +280,5 @@ index 5dbc63e..9fac7cb 100644
/* ******************************************************************* */
/* Application Settings */
--
-1.7.5.4
+1.7.9.5
^ permalink raw reply related
* [Buildroot] [git commit] linux: bump 3.6.x stable version
From: Peter Korsgaard @ 2012-11-02 20:23 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=593d13e35b573d50bc7b6cd5173d4893a198cb57
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
linux/Config.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/linux/Config.in b/linux/Config.in
index a849849..60d7794 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
prompt "Kernel version"
config BR2_LINUX_KERNEL_3_6
- bool "3.6.4"
+ bool "3.6.5"
config BR2_LINUX_KERNEL_SAME_AS_HEADERS
bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
config BR2_LINUX_KERNEL_VERSION
string
- default "3.6.4" if BR2_LINUX_KERNEL_3_6
+ default "3.6.5" if BR2_LINUX_KERNEL_3_6
default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox