at91bootstrap3: bump to v3.6.2

PATCH New Thomas Petazzoni 4 participants 6 messages Jun 15, 2014 – Jun 17, 2014 1 message not in the archive Arm/Microchip (AT91) SoC support

lore

Share & tools

lore

Thomas Petazzoni

author

2014-06-15 13:33 UTC #0 lore raw

PATCH 1/2 at91bootstrap3: bump to v3.6.2

In preparation to add support for the SAMA5D3 Xplained board, this commit bumps the version of the at91bootstrap3 bootloader to v3.6.2. While doing this, it also:

- Allows this bootloader on Cortex-A5 based platforms, since SAMA5D3 are based on Cortex-A5.

- Removes a patch that no longer applies, and which has been taken into account in at91bootstrap3 upstream.

- Switches to the upstream Github location as the source.

- Updates the installation commands to match upstream changes in the installation process.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 boot/at91bootstrap3/Config.in                      |   2 +-
 .../at91bootstrap3-u-boot-relocation-fix.patch     | 747 ---------------------
 boot/at91bootstrap3/at91bootstrap3.mk              |   8 +-
 3 files changed, 4 insertions(+), 753 deletions(-)
 delete mode 100644 boot/at91bootstrap3/at91bootstrap3-u-boot-relocation-fix.patch

boot/at91bootstrap3/Config.in +1 -1

index 110f808..8ac40ed 100644
@@ -1,5 +1,5 @@
 config BR2_TARGET_AT91BOOTSTRAP3
-	depends on BR2_arm926t
+	depends on BR2_arm926t || BR2_cortex_a5
 	bool "AT91 Bootstrap 3"
 	help
 	  AT91Bootstrap is a first level bootloader for the Atmel AT91

boot/at91bootstrap3/at91bootstrap3-u-boot-relocation-fix.patch deleted +0 ~~-747~~

747 lines not on this page · raw message

boot/at91bootstrap3/at91bootstrap3.mk +3 -5

index 4f74b1d..07df75d 100644
@@ -4,10 +4,8 @@
 #
 ################################################################################
 
-AT91BOOTSTRAP3_VERSION = 3.2
-AT91BOOTSTRAP3_SITE = \
-	ftp://www.at91.com/pub/at91bootstrap/AT91Bootstrap$(AT91BOOTSTRAP3_VERSION)
-AT91BOOTSTRAP3_SOURCE = at91bootstrap_9n12.tar.gz
+AT91BOOTSTRAP3_VERSION = v3.6.2
+AT91BOOTSTRAP3_SITE = $(call github,linux4sam,at91bootstrap,$(AT91BOOTSTRAP3_VERSION))
 
 AT91BOOTSTRAP3_INSTALL_IMAGES = YES
 AT91BOOTSTRAP3_INSTALL_TARGET = NO

@@ -47,7 +45,7 @@ define AT91BOOTSTRAP3_BUILD_CMDS
 endef
 
 define AT91BOOTSTRAP3_INSTALL_IMAGES_CMDS
-	$(MAKE) $(AT91BOOTSTRAP3_MAKE_OPT) -C $(@D) bootstrap
+	cp $(@D)/binaries/*.bin $(BINARIES_DIR)
 endef
 
 $(eval $(generic-package))

Signature · 1 line

2.0.0

Thomas Petazzoni

author

2014-06-15 13:33 UTC #1 lore raw

PATCH 2/2 configs: add defconfig for the Atmel SAMA5D3 Xplained board

Signed-off-by Thomas Petazzoni <[email protected]>

---
 board/atmel/xplained/readme.txt  | 73 ++++++++++++++++++++++++++++++++++++++++
 configs/atmel_xplained_defconfig | 28 +++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 board/atmel/xplained/readme.txt
 create mode 100644 configs/atmel_xplained_defconfig

board/atmel/xplained/readme.txt new file +73 -0

new file mode 100644
index 0000000..e29a116
@@ -0,0 +1,73 @@
+Atmel SAMA5D3 Xplained board
+============================
+
+This document explains how to set up a basic Buildroot system on the
+Atmel SAMA5D3 Xplained board, whose main site is
+http://www.atmel.com/tools/ATSAMA5D3-XPLD.aspx. Additional details can
+also be found on the http://www.at91.com/linux4sam/bin/view/Linux4SAM/
+web site.
+
+Note that the default Buildroot configuration is prepared to boot from
+an SD card: the first stage bootloader, second stage bootloader,
+kernel image and root filesystem are all located on the SD card. Some
+adjustements in the bootloader configuration will be needed to boot
+from NAND flash.
+
+Configuring and building Buildroot
+----------------------------------
+
+  make atmel_xplained_defconfig
+  make
+
+Preparing the SD card
+---------------------
+
+The SD card must be partitionned with at least two partitions: one
+FAT16 partition for the bootloaders, kernel image and Device Tree
+blob, and one ext4 partition for the root filesystem. To partition the
+SD card:
+
+sudo sfdisk -uM /dev/mmcblk0 <<EOF
+,64,6
+;
+EOF
+
+This creates a 64 MB partition for the FAT16 filesystem (type 6) and
+uses the rest for the ext4 filesystem used for the root filesystem.
+
+Then, format both partitions:
+
+sudo mkfs.msdos -n boot /dev/mmcblk0p1
+sudo mkfs.ext4 -L rootfs -O ^huge_file /dev/mmcblk0p2
+
+ Note: the -O ^huge_file option is needed to avoid enabling the huge
+ files features of ext4 (to support files larges than 2 TB), which
+ needs the kernel option CONFIG_LBDAF to be enabled.
+
+Mount both partitions (if not done automatically by your system):
+
+sudo mount /dev/mmcblk0p1 /media/boot
+sudo mount /dev/mmcblk0p2 /media/rootfs
+
+Copy the bootloaders, kernel image and Device Tree blob to the first
+partition:
+
+cp output/images/sama5d3_xplained-sdcardboot-uboot-3.6.2.bin /media/boot/boot.bin
+cp output/images/u-boot.bin /media/boot/u-boot.bin
+cp output/images/zImage /media/boot/zImage
+cp output/images/at91-sama5d3_xplained.dtb /media/boot/at91-sama5d3_xplained.dtb
+
+Extract the root filesystem to the second partition:
+
+sudo tar -C /media/rootfs -xf output/images/rootfs.tar
+
+Unmount both partitions:
+
+sudo umount /media/boot
+sudo umount /media/rootfs
+
+Insert your SD card in your Xplained board, and enjoy. The default
+U-Boot environment will properly load the kernel and Device Tree blob
+from the first partition of the SD card, so everything works
+automatically.
+

configs/atmel_xplained_defconfig new file +28 -0

new file mode 100644
index 0000000..8c06489
@@ -0,0 +1,28 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a5=y
+
+# Toolchain configuration
+BR2_ARM_EABIHF=y
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.15"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_15=y
+
+# Kernel configuration
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15"
+BR2_LINUX_KERNEL_DEFCONFIG="sama5"
+BR2_LINUX_KERNEL_ZIMAGE=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained"
+
+# First stage bootloader
+BR2_TARGET_AT91BOOTSTRAP3=y
+BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot"
+
+# Second stage bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="sama5d3_xplained_mmc"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.04"

Signature · 1 line

2.0.0

Yann E. MORIN

2014-06-15 16:58 UTC #2 lore raw

PATCH 1/2 at91bootstrap3: bump to v3.6.2

In reply to Thomas Petazzoni

Thomas, All,

On 2014-06-15 15:33 +0200, Thomas Petazzoni spake thusly:

Quoted 3 lines

In preparation to add support for the SAMA5D3 Xplained board, this commit bumps the version of the at91bootstrap3 bootloader to v3.6.2.

[--SNIP--]

boot/at91bootstrap3/at91bootstrap3.mk

Quoted 4 lines

boot/at91bootstrap3/at91bootstrap3.mk +0 -0
index 4f74b1d..07df75d 100644

[--SNIP--]

boot/at91bootstrap3/at91bootstrap3.mk define AT91BOOTSTRAP3_BUILD_CMDS · line 48

Quoted 6 lines

boot/at91bootstrap3/at91bootstrap3.mk +1 -1

@@ -47,7 +45,7 @@ define AT91BOOTSTRAP3_BUILD_CMDS
 endef
 
 define AT91BOOTSTRAP3_INSTALL_IMAGES_CMDS
-	$(MAKE) $(AT91BOOTSTRAP3_MAKE_OPT) -C $(@D) bootstrap
+	cp $(@D)/binaries/*.bin $(BINARIES_DIR)

Some of the bootloaders install their files in a sub-directory of $(BINARIES_DIR) (for example rpi-userland, syslinux...), while others (such as this one) install their files directly in $(BINARIES_DIR), and still others install their files in $(TARGET_DIR)/boot (eg. grub.)

Sometime ago, I proposed a patch to install the rpi-userland files in $(TARGET_DIR)/boot, but that was refused, on the principle that the boot partition should not necesarily be exposed/mounted on the running system. That's however what grub1 does.

Also, there is a new convention being ironed out, about how the boot files should be layed out. It's The Boot Loader Specification, defined at FDO: http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec/

This specification is mostly geared toward "classical PC" (desktop and servers, and clearly embedded systems are a bit left-out. However, for the parts of the specification that make sense, I think we should follow.

At one point, it states:

---8<---
This placeholder file system shall be determined during installation time, and an fstab entry for it shall be created mounting it to /boot. ---8<---

So, here are a few questions, probably in the order we should decide:

- should we instate a policy on where bootloaders install their files?

If 'no', then we can just stop here. If 'yes', then here are a few more questions:

- should we follow The Boot Loader Specification when it makes sense, ie. boot files that are installed on a filesystem should be installed in $(TARGET_DIR)/boot ?

- if installing files in $(BINARIES_DIR), should we instate a policy to install them in a sub-dir? What shall that sub-dir be named? Currently, when followed, the behaviour is to install in a sub-dir named after the bootloader (eg. $(BINARIES_DIR)/rpi-userland). Should we stick to that, or just name that directory $(BINARIES_DIR)/boot ?

Here are my answers:
- yes, we should follow the spec when it makes sense
- yes, boot filesresiding on a filesystem should be installed in

    $(TARGET_DIR)/boot
  - when not installing in$(TARGET_DIR)/boot, we should install boot
    files in $(BINARIES_DIR)/boot. We can provide a symlink 
    bootloader-name -> boot.

(Note, this is not considered a show-stopper for this patch to go in or not, just random thoughts it spurred in my head. ;-) )

Regards,
Yann E. MORIN.

Quoted 10 lines

boot/at91bootstrap3/at91bootstrap3.mk +0 -0

 endef
 
 $(eval $(generic-package))

Signature · 6 lines

2.0.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Arnout Vandecappelle

2014-06-16 21:56 UTC #3 lore raw

[Buildroot] Location of bootloader files [was: Re: [PATCH 1/2] at91bootstrap3: bump to v3.6.2]

Quoted 24 lines · Yann E. MORIN

Thomas, All,
On 2014-06-15 15:33 +0200, Thomas Petazzoni spake thusly:
Quoted 3 lines
In preparation to add support for the SAMA5D3 Xplained board, this commit bumps the version of the at91bootstrap3 bootloader to v3.6.2.
[--SNIP--]
boot/at91bootstrap3/at91bootstrap3.mk
Quoted 4 lines
boot/at91bootstrap3/at91bootstrap3.mk +0 -0
index 4f74b1d..07df75d 100644
[--SNIP--]
boot/at91bootstrap3/at91bootstrap3.mk define AT91BOOTSTRAP3_BUILD_CMDS · line 48
Quoted 6 lines
boot/at91bootstrap3/at91bootstrap3.mk +1 -1
@@ -47,7 +45,7 @@ define AT91BOOTSTRAP3_BUILD_CMDS
 endef
 
 define AT91BOOTSTRAP3_INSTALL_IMAGES_CMDS
-	$(MAKE) $(AT91BOOTSTRAP3_MAKE_OPT) -C $(@D) bootstrap
+	cp $(@D)/binaries/*.bin $(BINARIES_DIR)
Some of the bootloaders install their files in a sub-directory of $(BINARIES_DIR) (for example rpi-userland, syslinux...), while others (such as this one) install their files directly in $(BINARIES_DIR), and still others install their files in $(TARGET_DIR)/boot (eg. grub.)

Quoted 4 lines

Sometime ago, I proposed a patch to install the rpi-userland files in $(TARGET_DIR)/boot, but that was refused, on the principle that the boot partition should not necesarily be exposed/mounted on the running system. That's however what grub1 does.

I think for most bootloaders, it just doesn't make sense to install them inside
the target rootfs, because the (ROM) bootloader anyway can't access these files there. Grub is special because the actual bootloader is created by a separate installer. For the other bootloaders, there is IMHO no point at all to install the bootloader in the target filesystem.

Quoted 4 lines

Also, there is a new convention being ironed out, about how the boot files should be layed out. It's The Boot Loader Specification, defined at FDO: http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec/

Actually, the spec is mostly about the contents of $BOOT/loader/*.conf. It
specifies that the bootloader should read these files. It also specifies that the kernel image should be in $BOOT/<id>/... It does not specify where the bootloader itself should reside.

Quoted 11 lines

This specification is mostly geared toward "classical PC" (desktop and servers, and clearly embedded systems are a bit left-out. However, for the parts of the specification that make sense, I think we should follow.
At one point, it states:
---8<---
This placeholder file system shall be determined during installation time, and an fstab entry for it shall be created mounting it to /boot. ---8<---

It also specifies that /boot should be a separate partition. So it should _not_
be within $TARGET_DIR.

Quoted 11 lines

So, here are a few questions, probably in the order we should decide:
- should we instate a policy on where bootloaders install their files?
If 'no', then we can just stop here. If 'yes', then here are a few more questions:
- should we follow The Boot Loader Specification when it makes sense, ie. boot files that are installed on a filesystem should be installed in $(TARGET_DIR)/boot ?

No. It doesn't make sense for anything except grub.

Quoted 7 lines

- if installing files in $(BINARIES_DIR), should we instate a policy to install them in a sub-dir? What shall that sub-dir be named? Currently, when followed, the behaviour is to install in a sub-dir named after the bootloader (eg. $(BINARIES_DIR)/rpi-userland). Should we stick to that, or just name that directory $(BINARIES_DIR)/boot ?

I don't think $(BINARIES_DIR)/boot is a good place, because that should contain
everything except the boot loader :-). Also, if you want to do that, you probably also want to put the kernel and DTB there. And then there's nothing left in $(BINARIES_DIR)...

Regards,
Arnout

Quoted 26 lines

Here are my answers:
- yes, we should follow the spec when it makes sense
- yes, boot filesresiding on a filesystem should be installed in
    $(TARGET_DIR)/boot
  - when not installing in$(TARGET_DIR)/boot, we should install boot
    files in $(BINARIES_DIR)/boot. We can provide a symlink 
    bootloader-name -> boot.
(Note, this is not considered a show-stopper for this patch to go in or not, just random thoughts it spurred in my head. ;-) )
Regards,
Yann E. MORIN.
Quoted 10 lines
boot/at91bootstrap3/at91bootstrap3.mk +0 -0
 endef
 
 $(eval $(generic-package))
Signature · 6 lines
2.0.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
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

Thomas Petazzoni

author

2014-06-17 07:35 UTC #4 lore raw

[Buildroot] Location of bootloader files [was: Re: [PATCH 1/2] at91bootstrap3: bump to v3.6.2]

Arnout, Yann,

Quoted 10 lines · Arnout Vandecappelle

Quoted 9 lines
Some of the bootloaders install their files in a sub-directory of $(BINARIES_DIR) (for example rpi-userland, syslinux...), while others (such as this one) install their files directly in $(BINARIES_DIR), and still others install their files in $(TARGET_DIR)/boot (eg. grub.)
Sometime ago, I proposed a patch to install the rpi-userland files in $(TARGET_DIR)/boot, but that was refused, on the principle that the boot partition should not necesarily be exposed/mounted on the running system. That's however what grub1 does.

Quoted 5 lines

I think for most bootloaders, it just doesn't make sense to install them inside
the target rootfs, because the (ROM) bootloader anyway can't access these files there. Grub is special because the actual bootloader is created by a separate installer. For the other bootloaders, there is IMHO no point at all to install the bootloader in the target filesystem.

Fully agreed. Most ARM SoCs capable of loading the bootloader for MMC/eMMC require the bootloader to be stored in a FAT (often FAT16) filesystem. And such a filesystem cannot be used to store the root filesystem. So you necessarily need to have at least two partitions:
one FAT partition with the bootloader, and one ext2/3/4 partition (or any other filesystem) for the root filesystem. So as Arnout says, there absolutely no point in having the bootloaders installed *inside* the root filesystem.

There are also some other SoCs where the bootloaders are not even inside a root filesystem: you have to write the bootloader image, raw, somewhere at the beginning of the MMC/eMMC storage (not exactly at the beginning, as it would overwrite the partition table, but somewhere after the first sector, but before the start of the first partition). I *think* i.MX28 might be in this category, but it's mainly my colleague Maxime Ripard who did some i.MX28 stuff, so I might remember incorrect here.

So really, Grub is the exception here, not the rule.

Quoted 11 lines

Quoted 6 lines
- if installing files in $(BINARIES_DIR), should we instate a policy to install them in a sub-dir? What shall that sub-dir be named? Currently, when followed, the behaviour is to install in a sub-dir named after the bootloader (eg. $(BINARIES_DIR)/rpi-userland). Should we stick to that, or just name that directory $(BINARIES_DIR)/boot ?
I don't think $(BINARIES_DIR)/boot is a good place, because that should contain
everything except the boot loader :-). Also, if you want to do that, you probably also want to put the kernel and DTB there. And then there's nothing left in $(BINARIES_DIR)...

I'm also unsure we should do something other than what we do currently. The user generally ends up with very few files in $(BINARIES_DIR), so it's pretty obvious what to do. The readme.txt for each board gives some additional details. We could always decide to have certain packages install a README.<bootloader> file in $(BINARIES_DIR) with some references/details on how to use the binaries installed here, but I'm not even sure that's really necessary.

Best regards,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

A message that is not in the archive (sent off-list or not yet received): [email protected]

Alexandre Belloni

2014-06-16 08:28 UTC #6 lore raw

PATCH 1/2 at91bootstrap3: bump to v3.6.2

Quoted 16 lines · Nicolas Ferre

On 15/06/2014 15:33, Thomas Petazzoni :
Quoted 15 lines
In preparation to add support for the SAMA5D3 Xplained board, this commit bumps the version of the at91bootstrap3 bootloader to v3.6.2. While doing this, it also:
- Allows this bootloader on Cortex-A5 based platforms, since SAMA5D3 are based on Cortex-A5.
- Removes a patch that no longer applies, and which has been taken into account in at91bootstrap3 upstream.
- Switches to the upstream Github location as the source.
- Updates the installation commands to match upstream changes in the installation process.

I would add that it also removes the support for the following boards (not that we actually care about a lot of those):
- afeb9260
- at91cap9adk
- at91cap9stk
- at91sam9g45ek
- at91sam9g45ekes
- at91sam9m10ek
- at91sam9m10ekes

Quoted 809 lines

Quoted 1 line

Signed-off-by Thomas Petazzoni <[email protected]>

Nice, thanks!

Acked-by Nicolas Ferre <[email protected]>

Quoted 798 lines

---
 boot/at91bootstrap3/Config.in                      |   2 +-
 .../at91bootstrap3-u-boot-relocation-fix.patch     | 747 ---------------------
 boot/at91bootstrap3/at91bootstrap3.mk              |   8 +-
 3 files changed, 4 insertions(+), 753 deletions(-)
 delete mode 100644 boot/at91bootstrap3/at91bootstrap3-u-boot-relocation-fix.patch

boot/at91bootstrap3/Config.in +1 -1

index 110f808..8ac40ed 100644
@@ -1,5 +1,5 @@
 config BR2_TARGET_AT91BOOTSTRAP3
-	depends on BR2_arm926t
+	depends on BR2_arm926t || BR2_cortex_a5
 	bool "AT91 Bootstrap 3"
 	help
 	  AT91Bootstrap is a first level bootloader for the Atmel AT91

boot/at91bootstrap3/at91bootstrap3-u-boot-relocation-fix.patch deleted +0 ~~-747~~

deleted file mode 100644
index 62bbd2a..0000000
@@ -1,747 +0,0 @@
-Every AT91SAM plaforms were broken between 2010.12 and 2011.03 because
-of the relocation changes.
-
-We have to get JUMP_ADDR consistent with what is used by u-boot
-(CONFIG_SYS_TEXT_BASE).
-
-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.
-
-It means that now, you have to flash your kernel at 0x0008C000 instead
-of 0x00042000. And so you also have to load it from that address from
-u-boot.
-
-Then, remember that you could decrease IMG_SIZE to boot faster.
-
-Signed-off-by: Alexandre Belloni <[email protected]>
-Signed-off-by: Simon Dawson <[email protected]>
-
-diff -Nurp a/board/afeb9260/afeb9260_defconfig b/board/afeb9260/afeb9260_defconfig
---- a/board/afeb9260/afeb9260_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/afeb9260/afeb9260_defconfig	2012-07-25 20:52:17.967694276 +0100
-@@ -97,9 +97,9 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_ADDRESS="0x00004000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_APP_CHECK=y
- # CONFIG_LONG_TEST is not set
- # CONFIG_DEBUG is not set
-diff -Nurp a/board/at91cap9adk/at91cap9adk_defconfig b/board/at91cap9adk/at91cap9adk_defconfig
---- a/board/at91cap9adk/at91cap9adk_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91cap9adk/at91cap9adk_defconfig	2012-07-25 20:52:30.603693814 +0100
-@@ -96,8 +96,8 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_ADDRESS="0x00004000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_APP_CHECK=y
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91cap9adk/at91cap9df_defconfig b/board/at91cap9adk/at91cap9df_defconfig
---- a/board/at91cap9adk/at91cap9df_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91cap9adk/at91cap9df_defconfig	2012-07-25 20:52:23.807694041 +0100
-@@ -96,8 +96,8 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_ADDRESS="0x00004000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_APP_CHECK=y
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91cap9adk/at91cap9f_defconfig b/board/at91cap9adk/at91cap9f_defconfig
---- a/board/at91cap9adk/at91cap9f_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91cap9adk/at91cap9f_defconfig	2012-07-25 21:25:20.839605245 +0100
-@@ -72,7 +72,7 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
- CONFIG_IMG_ADDRESS="0x00008000"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_APP_CHECK=y
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91cap9stk/at91cap9stk_defconfig b/board/at91cap9stk/at91cap9stk_defconfig
---- a/board/at91cap9stk/at91cap9stk_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91cap9stk/at91cap9stk_defconfig	2012-07-25 20:52:59.663692456 +0100
-@@ -96,8 +96,8 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_ADDRESS="0x00004000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_APP_CHECK=y
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91cap9stk/at91cap9stkdf_defconfig b/board/at91cap9stk/at91cap9stkdf_defconfig
---- a/board/at91cap9stk/at91cap9stkdf_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91cap9stk/at91cap9stkdf_defconfig	2012-07-25 20:52:52.255692671 +0100
-@@ -96,8 +96,8 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_ADDRESS="0x00004000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_APP_CHECK=y
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91cap9stk/at91cap9stkf_defconfig b/board/at91cap9stk/at91cap9stkf_defconfig
---- a/board/at91cap9stk/at91cap9stkf_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91cap9stk/at91cap9stkf_defconfig	2012-07-25 21:25:35.235605140 +0100
-@@ -72,7 +72,7 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
- CONFIG_IMG_ADDRESS="0x00008000"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_APP_CHECK=y
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91sam9260ek/at91sam9260dfc_defconfig b/board/at91sam9260ek/at91sam9260dfc_defconfig
---- a/board/at91sam9260ek/at91sam9260dfc_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9260ek/at91sam9260dfc_defconfig	2012-07-25 20:35:23.259739521 +0100
-@@ -97,9 +97,9 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_ADDRESS="0x00004000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_APP_CHECK=y
- # CONFIG_LONG_TEST is not set
- # CONFIG_DEBUG is not set
-diff -Nurp a/board/at91sam9260ek/at91sam9260df_defconfig b/board/at91sam9260ek/at91sam9260df_defconfig
---- a/board/at91sam9260ek/at91sam9260df_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9260ek/at91sam9260df_defconfig	2012-07-25 20:34:19.231742964 +0100
-@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x20058000"
- # CONFIG_LONG_TEST is not set
- # CONFIG_DEBUG is not set
-diff -Nurp a/board/at91sam9260ek/at91sam9260ek_defconfig b/board/at91sam9260ek/at91sam9260ek_defconfig
---- a/board/at91sam9260ek/at91sam9260ek_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9260ek/at91sam9260ek_defconfig	2012-07-25 20:32:17.711747794 +0100
-@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x20058000"
- # CONFIG_LONG_TEST is not set
- # CONFIG_DEBUG is not set
-diff -Nurp a/board/at91sam9260ek/at91sam9260nf_defconfig b/board/at91sam9260ek/at91sam9260nf_defconfig
---- a/board/at91sam9260ek/at91sam9260nf_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9260ek/at91sam9260nf_defconfig	2012-07-25 21:25:57.079604719 +0100
-@@ -87,8 +87,8 @@ CONFIG_LOAD_UBOOT=y
- CONFIG_IMG_ADDRESS="0x00020000"
- CONFIG_SETTING_ADDRESS="0x01FE0000"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x20058000"
- # CONFIG_LONG_TEST is not set
- # CONFIG_DEBUG is not set
-diff -Nurp a/board/at91sam9261ek/at91sam9261dfc_defconfig b/board/at91sam9261ek/at91sam9261dfc_defconfig
---- a/board/at91sam9261ek/at91sam9261dfc_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9261ek/at91sam9261dfc_defconfig	2012-07-25 20:37:07.515735228 +0100
-@@ -97,9 +97,9 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_ADDRESS="0x00004000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_APP_CHECK=y
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9261ek/at91sam9261df_defconfig b/board/at91sam9261ek/at91sam9261df_defconfig
---- a/board/at91sam9261ek/at91sam9261df_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9261ek/at91sam9261df_defconfig	2012-07-25 20:36:44.351735615 +0100
-@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x20058000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9261ek/at91sam9261ek_defconfig b/board/at91sam9261ek/at91sam9261ek_defconfig
---- a/board/at91sam9261ek/at91sam9261ek_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9261ek/at91sam9261ek_defconfig	2012-07-25 20:36:09.111737459 +0100
-@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x20058000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9261ek/at91sam9261nf_defconfig b/board/at91sam9261ek/at91sam9261nf_defconfig
---- a/board/at91sam9261ek/at91sam9261nf_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9261ek/at91sam9261nf_defconfig	2012-07-25 21:24:45.843607437 +0100
-@@ -86,8 +86,8 @@ CONFIG_LOAD_UBOOT=y
- CONFIG_IMG_ADDRESS="0x00020000"
- CONFIG_SETTING_ADDRESS="0x01FE0000"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x20058000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9263ek/at91sam9263dfc_defconfig b/board/at91sam9263ek/at91sam9263dfc_defconfig
---- a/board/at91sam9263ek/at91sam9263dfc_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9263ek/at91sam9263dfc_defconfig	2012-07-25 20:38:55.555730059 +0100
-@@ -100,9 +100,9 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_ADDRESS="0x00004000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_APP_CHECK=y
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9263ek/at91sam9263df_defconfig b/board/at91sam9263ek/at91sam9263df_defconfig
---- a/board/at91sam9263ek/at91sam9263df_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9263ek/at91sam9263df_defconfig	2012-07-25 20:38:37.395730195 +0100
-@@ -105,11 +105,11 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x2006b000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9263ek/at91sam9263ek_defconfig b/board/at91sam9263ek/at91sam9263ek_defconfig
---- a/board/at91sam9263ek/at91sam9263ek_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9263ek/at91sam9263ek_defconfig	2012-07-25 20:38:08.379732395 +0100
-@@ -105,11 +105,11 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x2006b000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9263ek/at91sam9263nf_defconfig b/board/at91sam9263ek/at91sam9263nf_defconfig
---- a/board/at91sam9263ek/at91sam9263nf_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9263ek/at91sam9263nf_defconfig	2012-07-25 21:25:39.195605069 +0100
-@@ -89,8 +89,8 @@ CONFIG_LOAD_UBOOT=y
- CONFIG_IMG_ADDRESS="0x00020000"
- CONFIG_SETTING_ADDRESS="0x01FE0000"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x2006b000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9g10ek/at91sam9g10df_defconfig b/board/at91sam9g10ek/at91sam9g10df_defconfig
---- a/board/at91sam9g10ek/at91sam9g10df_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9g10ek/at91sam9g10df_defconfig	2012-07-25 20:40:18.087726292 +0100
-@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x20068000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9g10ek/at91sam9g10ek_defconfig b/board/at91sam9g10ek/at91sam9g10ek_defconfig
---- a/board/at91sam9g10ek/at91sam9g10ek_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9g10ek/at91sam9g10ek_defconfig	2012-07-25 20:39:53.543727636 +0100
-@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x20068000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9g10ek/at91sam9g10nf_defconfig b/board/at91sam9g10ek/at91sam9g10nf_defconfig
---- a/board/at91sam9g10ek/at91sam9g10nf_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9g10ek/at91sam9g10nf_defconfig	2012-07-25 21:25:28.975605503 +0100
-@@ -86,8 +86,8 @@ CONFIG_LOAD_UBOOT=y
- CONFIG_IMG_ADDRESS="0x00020000"
- CONFIG_SETTING_ADDRESS="0x01FE0000"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x20068000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9g20ek/at91sam9g20dfc_defconfig b/board/at91sam9g20ek/at91sam9g20dfc_defconfig
---- a/board/at91sam9g20ek/at91sam9g20dfc_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9g20ek/at91sam9g20dfc_defconfig	2012-07-25 20:41:48.275722343 +0100
-@@ -97,9 +97,9 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_ADDRESS="0x00004000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_APP_CHECK=y
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9g20ek/at91sam9g20df_defconfig b/board/at91sam9g20ek/at91sam9g20df_defconfig
---- a/board/at91sam9g20ek/at91sam9g20df_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9g20ek/at91sam9g20df_defconfig	2012-07-25 20:42:07.091721310 +0100
-@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x20058000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9g20ek/at91sam9g20ek_defconfig b/board/at91sam9g20ek/at91sam9g20ek_defconfig
---- a/board/at91sam9g20ek/at91sam9g20ek_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9g20ek/at91sam9g20ek_defconfig	2012-07-25 20:41:23.179723541 +0100
-@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x20058000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9g20ek/at91sam9g20nf_defconfig b/board/at91sam9g20ek/at91sam9g20nf_defconfig
---- a/board/at91sam9g20ek/at91sam9g20nf_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9g20ek/at91sam9g20nf_defconfig	2012-07-25 21:25:49.291603975 +0100
-@@ -87,8 +87,8 @@ CONFIG_LOAD_UBOOT=y
- CONFIG_IMG_ADDRESS="0x00020000"
- CONFIG_SETTING_ADDRESS="0x01FE0000"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x20058000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9g45ek/at91sam9g45df_defconfig b/board/at91sam9g45ek/at91sam9g45df_defconfig
---- a/board/at91sam9g45ek/at91sam9g45df_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9g45ek/at91sam9g45df_defconfig	2012-07-25 20:47:46.055707221 +0100
-@@ -102,10 +102,10 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_GLBDRV_ADDR="0x7006b000"
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91sam9g45ek/at91sam9g45ek_defconfig b/board/at91sam9g45ek/at91sam9g45ek_defconfig
---- a/board/at91sam9g45ek/at91sam9g45ek_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9g45ek/at91sam9g45ek_defconfig	2012-07-25 20:47:02.303708341 +0100
-@@ -102,10 +102,10 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_GLBDRV_ADDR="0x7006b000"
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91sam9g45ek/at91sam9g45nf_defconfig b/board/at91sam9g45ek/at91sam9g45nf_defconfig
---- a/board/at91sam9g45ek/at91sam9g45nf_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9g45ek/at91sam9g45nf_defconfig	2012-07-25 21:25:24.547605601 +0100
-@@ -86,7 +86,7 @@ CONFIG_LOAD_UBOOT=y
- CONFIG_IMG_ADDRESS="0x00020000"
- CONFIG_SETTING_ADDRESS="0x01FE0000"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_GLBDRV_ADDR="0x7006b000"
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91sam9g45ekes/at91sam9g45dfes_defconfig b/board/at91sam9g45ekes/at91sam9g45dfes_defconfig
---- a/board/at91sam9g45ekes/at91sam9g45dfes_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9g45ekes/at91sam9g45dfes_defconfig	2012-07-25 20:47:33.895706968 +0100
-@@ -102,10 +102,10 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_GLBDRV_ADDR="0x7006b000"
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91sam9g45ekes/at91sam9g45ekes_defconfig b/board/at91sam9g45ekes/at91sam9g45ekes_defconfig
---- a/board/at91sam9g45ekes/at91sam9g45ekes_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9g45ekes/at91sam9g45ekes_defconfig	2012-07-25 20:46:49.043708951 +0100
-@@ -102,10 +102,10 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_GLBDRV_ADDR="0x7006b000"
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91sam9g45ekes/at91sam9g45nfes_defconfig b/board/at91sam9g45ekes/at91sam9g45nfes_defconfig
---- a/board/at91sam9g45ekes/at91sam9g45nfes_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9g45ekes/at91sam9g45nfes_defconfig	2012-07-25 21:25:44.823604805 +0100
-@@ -86,7 +86,7 @@ CONFIG_LOAD_UBOOT=y
- CONFIG_IMG_ADDRESS="0x00020000"
- CONFIG_SETTING_ADDRESS="0x01FE0000"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_GLBDRV_ADDR="0x7006b000"
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91sam9m10ek/at91sam9m10df_defconfig b/board/at91sam9m10ek/at91sam9m10df_defconfig
---- a/board/at91sam9m10ek/at91sam9m10df_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9m10ek/at91sam9m10df_defconfig	2012-07-25 20:44:34.975714928 +0100
-@@ -102,10 +102,10 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_GLBDRV_ADDR="0x7006b000"
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91sam9m10ek/at91sam9m10ek_defconfig b/board/at91sam9m10ek/at91sam9m10ek_defconfig
---- a/board/at91sam9m10ek/at91sam9m10ek_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9m10ek/at91sam9m10ek_defconfig	2012-07-25 20:43:34.543717453 +0100
-@@ -102,10 +102,10 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_GLBDRV_ADDR="0x7006b000"
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91sam9m10ek/at91sam9m10nf_defconfig b/board/at91sam9m10ek/at91sam9m10nf_defconfig
---- a/board/at91sam9m10ek/at91sam9m10nf_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9m10ek/at91sam9m10nf_defconfig	2012-07-25 21:21:40.419615800 +0100
-@@ -86,7 +86,7 @@ CONFIG_LOAD_UBOOT=y
- CONFIG_IMG_ADDRESS="0x00020000"
- CONFIG_SETTING_ADDRESS="0x01FE0000"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_GLBDRV_ADDR="0x7006b000"
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91sam9m10ekes/at91sam9m10dfes_defconfig b/board/at91sam9m10ekes/at91sam9m10dfes_defconfig
---- a/board/at91sam9m10ekes/at91sam9m10dfes_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9m10ekes/at91sam9m10dfes_defconfig	2012-07-25 20:44:18.687715650 +0100
-@@ -102,10 +102,10 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_GLBDRV_ADDR="0x7006b000"
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91sam9m10ekes/at91sam9m10ekes_defconfig b/board/at91sam9m10ekes/at91sam9m10ekes_defconfig
---- a/board/at91sam9m10ekes/at91sam9m10ekes_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9m10ekes/at91sam9m10ekes_defconfig	2012-07-25 20:43:57.255716814 +0100
-@@ -102,10 +102,10 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_GLBDRV_ADDR="0x7006b000"
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91sam9m10ekes/at91sam9m10nfes_defconfig b/board/at91sam9m10ekes/at91sam9m10nfes_defconfig
---- a/board/at91sam9m10ekes/at91sam9m10nfes_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9m10ekes/at91sam9m10nfes_defconfig	2012-07-25 21:26:10.179603831 +0100
-@@ -86,7 +86,7 @@ CONFIG_LOAD_UBOOT=y
- CONFIG_IMG_ADDRESS="0x00020000"
- CONFIG_SETTING_ADDRESS="0x01FE0000"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
-+CONFIG_IMG_SIZE="0x00080000"
- CONFIG_JUMP_ADDR="0x73F00000"
- CONFIG_GLBDRV_ADDR="0x7006b000"
- # CONFIG_LONG_TEST is not set
-diff -Nurp a/board/at91sam9n12ek/at91sam9n12df_defconfig b/board/at91sam9n12ek/at91sam9n12df_defconfig
---- a/board/at91sam9n12ek/at91sam9n12df_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9n12ek/at91sam9n12df_defconfig	2012-07-25 20:52:40.675693207 +0100
-@@ -107,7 +107,7 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
- CONFIG_IMG_SIZE="0x00050000"
-diff -Nurp a/board/at91sam9rlek/at91sam9rldf_defconfig b/board/at91sam9rlek/at91sam9rldf_defconfig
---- a/board/at91sam9rlek/at91sam9rldf_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9rlek/at91sam9rldf_defconfig	2012-07-25 20:48:53.183703493 +0100
-@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x2006b000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9rlek/at91sam9rlek_defconfig b/board/at91sam9rlek/at91sam9rlek_defconfig
---- a/board/at91sam9rlek/at91sam9rlek_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9rlek/at91sam9rlek_defconfig	2012-07-25 20:48:29.659704460 +0100
-@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x2006b000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9rlek/at91sam9rlnf_defconfig b/board/at91sam9rlek/at91sam9rlnf_defconfig
---- a/board/at91sam9rlek/at91sam9rlnf_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9rlek/at91sam9rlnf_defconfig	2012-07-25 21:24:49.335607485 +0100
-@@ -85,8 +85,8 @@ CONFIG_LOAD_UBOOT=y
- CONFIG_IMG_ADDRESS="0x00020000"
- CONFIG_SETTING_ADDRESS="0x01FE0000"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x2006b000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9x5ek/at91sam9x5df_defconfig b/board/at91sam9x5ek/at91sam9x5df_defconfig
---- a/board/at91sam9x5ek/at91sam9x5df_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9x5ek/at91sam9x5df_defconfig	2012-07-25 20:52:45.375693059 +0100
-@@ -106,7 +106,7 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
- CONFIG_IMG_SIZE="0x00050000"
-diff -Nurp a/board/at91sam9xeek/at91sam9xedfc_defconfig b/board/at91sam9xeek/at91sam9xedfc_defconfig
---- a/board/at91sam9xeek/at91sam9xedfc_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9xeek/at91sam9xedfc_defconfig	2012-07-25 20:50:10.643699991 +0100
-@@ -96,9 +96,9 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_ADDRESS="0x00004000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_APP_CHECK=y
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9xeek/at91sam9xedf_defconfig b/board/at91sam9xeek/at91sam9xedf_defconfig
---- a/board/at91sam9xeek/at91sam9xedf_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9xeek/at91sam9xedf_defconfig	2012-07-25 20:50:26.967699568 +0100
-@@ -103,11 +103,11 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x23F00000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9xeek/at91sam9xeek_defconfig b/board/at91sam9xeek/at91sam9xeek_defconfig
---- a/board/at91sam9xeek/at91sam9xeek_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9xeek/at91sam9xeek_defconfig	2012-07-25 20:49:46.131699600 +0100
-@@ -103,11 +103,11 @@ CONFIG_LOAD_UBOOT=y
- # CONFIG_LOAD_64KB is not set
- # CONFIG_LOAD_1MB is not set
- # CONFIG_LOAD_4MB is not set
--CONFIG_IMG_ADDRESS="0x00008400"
-+CONFIG_IMG_ADDRESS="0x00004000"
- CONFIG_SETTING_ADDRESS="0x00408400"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x23F00000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y
-diff -Nurp a/board/at91sam9xeek/at91sam9xenf_defconfig b/board/at91sam9xeek/at91sam9xenf_defconfig
---- a/board/at91sam9xeek/at91sam9xenf_defconfig	2011-11-18 08:13:09.000000000 +0000
-+++ b/board/at91sam9xeek/at91sam9xenf_defconfig	2012-07-25 21:26:05.627603826 +0100
-@@ -88,8 +88,8 @@ CONFIG_LOAD_UBOOT=y
- CONFIG_IMG_ADDRESS="0x00020000"
- CONFIG_SETTING_ADDRESS="0x01FE0000"
- CONFIG_SETTING_SIZE="0x00001000"
--CONFIG_IMG_SIZE="0x00040000"
--CONFIG_JUMP_ADDR="0x23F00000"
-+CONFIG_IMG_SIZE="0x00080000"
-+CONFIG_JUMP_ADDR="0x21F00000"
- CONFIG_GLBDRV_ADDR="0x23F00000"
- # CONFIG_LONG_TEST is not set
- CONFIG_DEBUG=y

boot/at91bootstrap3/at91bootstrap3.mk +3 -5

index 4f74b1d..07df75d 100644
@@ -4,10 +4,8 @@
 #
 ################################################################################
 
-AT91BOOTSTRAP3_VERSION = 3.2
-AT91BOOTSTRAP3_SITE = \
-	ftp://www.at91.com/pub/at91bootstrap/AT91Bootstrap$(AT91BOOTSTRAP3_VERSION)
-AT91BOOTSTRAP3_SOURCE = at91bootstrap_9n12.tar.gz
+AT91BOOTSTRAP3_VERSION = v3.6.2
+AT91BOOTSTRAP3_SITE = $(call github,linux4sam,at91bootstrap,$(AT91BOOTSTRAP3_VERSION))
 
 AT91BOOTSTRAP3_INSTALL_IMAGES = YES
 AT91BOOTSTRAP3_INSTALL_TARGET = NO

@@ -47,7 +45,7 @@ define AT91BOOTSTRAP3_BUILD_CMDS
 endef
 
 define AT91BOOTSTRAP3_INSTALL_IMAGES_CMDS
-	$(MAKE) $(AT91BOOTSTRAP3_MAKE_OPT) -C $(@D) bootstrap
+	cp $(@D)/binaries/*.bin $(BINARIES_DIR)
 endef
 
 $(eval $(generic-package))

Signature · 1 line

Nicolas Ferre

Signature · 3 lines

Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com