[ptxdist] [PATCH] add patch for building at91bootstrap with gcc 4.6.x

[ptxdist] [PATCH] add patch for building at91bootstrap with gcc 4.6.x

[Alexander Dahl]

Signed-off-by: Alexander Dahl <post@lespocky.de>
---
 .../0002-fix-overlap-linker-error.patch            |   23 ++++++++++++++++++++
 patches/Bootstrap-v1.16/series                     |    1 +
 2 files changed, 24 insertions(+), 0 deletions(-)
 create mode 100755 patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch

diff --git a/patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch b/patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch
new file mode 100755
index 0000000..a86979f
--- /dev/null
+++ b/patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch
@@ -0,0 +1,23 @@
+circumvent gcc 4.6.x linker overlap error, suggestion from AT91 forum at
+http://www.at91.com/forum/viewtopic.php/f,12/t,20624/
+---
+ elf32-littlearm.lds |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+Index: Bootstrap-v1.16/elf32-littlearm.lds
+===================================================================
+--- Bootstrap-v1.16.orig/elf32-littlearm.lds
++++ Bootstrap-v1.16/elf32-littlearm.lds
+@@ -14,7 +14,11 @@
+ 	}
+ 
+ 	/* collect all initialized .data sections */
+-	.data : AT ( ADDR (.text) + SIZEOF (.text) ) { 
++    . = ALIGN(4);
++    .dummy : {
++        _edummy = .;
++    }
++	.data : AT ( LOADADDR(.dummy) ) {
+ 		_sdata = .;
+ 		*(.vectors)
+ 		*(.data)
diff --git a/patches/Bootstrap-v1.16/series b/patches/Bootstrap-v1.16/series
index 3355399..86f4119 100644
--- a/patches/Bootstrap-v1.16/series
+++ b/patches/Bootstrap-v1.16/series
@@ -1 +1,2 @@
 0001-crt0_gnu.S-fix-image-size.patch
+0002-fix-overlap-linker-error.patch
-- 
1.7.2.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] add patch for building at91bootstrap with gcc 4.6.x

[Michael Olbrich]

Hmmm, I cannot trigger the problem (without the patch). Can you elaborate,
what exact config/toolchain etc. your using?

On Thu, Jan 26, 2012 at 04:04:54PM +0100, Alexander Dahl wrote:
> 
> Signed-off-by: Alexander Dahl <post@lespocky.de>
> ---
>  .../0002-fix-overlap-linker-error.patch            |   23 ++++++++++++++++++++
>  patches/Bootstrap-v1.16/series                     |    1 +
>  2 files changed, 24 insertions(+), 0 deletions(-)
>  create mode 100755 patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch
> 
> diff --git a/patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch b/patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch
> new file mode 100755
> index 0000000..a86979f
> --- /dev/null
> +++ b/patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch
> @@ -0,0 +1,23 @@

Please add a proper patch haeder here.

Michael

> +circumvent gcc 4.6.x linker overlap error, suggestion from AT91 forum at
> +http://www.at91.com/forum/viewtopic.php/f,12/t,20624/
> +---
> + elf32-littlearm.lds |    6 +++++-
> + 1 file changed, 5 insertions(+), 1 deletion(-)
> +
> +Index: Bootstrap-v1.16/elf32-littlearm.lds
> +===================================================================
> +--- Bootstrap-v1.16.orig/elf32-littlearm.lds
> ++++ Bootstrap-v1.16/elf32-littlearm.lds
> +@@ -14,7 +14,11 @@
> + 	}
> + 
> + 	/* collect all initialized .data sections */
> +-	.data : AT ( ADDR (.text) + SIZEOF (.text) ) { 
> ++    . = ALIGN(4);
> ++    .dummy : {
> ++        _edummy = .;
> ++    }
> ++	.data : AT ( LOADADDR(.dummy) ) {
> + 		_sdata = .;
> + 		*(.vectors)
> + 		*(.data)
> diff --git a/patches/Bootstrap-v1.16/series b/patches/Bootstrap-v1.16/series
> index 3355399..86f4119 100644
> --- a/patches/Bootstrap-v1.16/series
> +++ b/patches/Bootstrap-v1.16/series
> @@ -1 +1,2 @@
>  0001-crt0_gnu.S-fix-image-size.patch
> +0002-fix-overlap-linker-error.patch
> -- 
> 1.7.2.5
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] add patch for building at91bootstrap with gcc 4.6.x

[Alexander Dahl]

Hei Michael, 

Am 26.01.2012 16:36, schrieb Michael Olbrich:
> Hmmm, I cannot trigger the problem (without the patch). Can you elaborate,
> what exact config/toolchain etc. your using?

See my mail from January 13th, where I described the problem. It occurs
with the OSELAS toolchain 2011.11.0 compiling for arm-v5te.

>>
>> Signed-off-by: Alexander Dahl <post@lespocky.de>
>> ---
>>  .../0002-fix-overlap-linker-error.patch            |   23 ++++++++++++++++++++
>>  patches/Bootstrap-v1.16/series                     |    1 +
>>  2 files changed, 24 insertions(+), 0 deletions(-)
>>  create mode 100755 patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch
>>
>> diff --git a/patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch b/patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch
>> new file mode 100755
>> index 0000000..a86979f
>> --- /dev/null
>> +++ b/patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch
>> @@ -0,0 +1,23 @@
> 
> Please add a proper patch haeder here.

I don't understand what you mean. The inner patch added
(0002-fix-overlap-linker-error.patch) was generated with `quilt refresh
-u --no-timestamps --diffstat --sort --strip-trailing-whitespace` as I
always use it for our internal patches. The outer patch was created by
git the way you already applied patches from me. Which one is wrong and
in what way?

Greets
Alex

-- 
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601  D1D5 8FBA 7744 CC87 10D0 ***

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] add patch for building at91bootstrap with gcc 4.6.x

[Michael Olbrich]

On Fri, Jan 27, 2012 at 10:25:21AM +0100, Alexander Dahl wrote:
> Am 26.01.2012 16:36, schrieb Michael Olbrich:
> > Hmmm, I cannot trigger the problem (without the patch). Can you elaborate,
> > what exact config/toolchain etc. your using?
> 
> See my mail from January 13th, where I described the problem. It occurs
> with the OSELAS toolchain 2011.11.0 compiling for arm-v5te.

Yes, I tried that and didn't get any build error. Which at91bootstrap
config do I select to this error?

> >>
> >> Signed-off-by: Alexander Dahl <post@lespocky.de>
> >> ---
> >>  .../0002-fix-overlap-linker-error.patch            |   23 ++++++++++++++++++++
> >>  patches/Bootstrap-v1.16/series                     |    1 +
> >>  2 files changed, 24 insertions(+), 0 deletions(-)
> >>  create mode 100755 patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch
> >>
> >> diff --git a/patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch b/patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch
> >> new file mode 100755
> >> index 0000000..a86979f
> >> --- /dev/null
> >> +++ b/patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch
> >> @@ -0,0 +1,23 @@
> > 
> > Please add a proper patch haeder here.
> 
> I don't understand what you mean. The inner patch added
> (0002-fix-overlap-linker-error.patch) was generated with `quilt refresh
> -u --no-timestamps --diffstat --sort --strip-trailing-whitespace` as I
> always use it for our internal patches. The outer patch was created by
> git the way you already applied patches from me. Which one is wrong and
> in what way?

Try this:

$ ptxdist clean at91bootstrap
$ ptxdist --git extract at91bootstrap
$ cd platform-<some-platform>/build-target/Bootstrap-v1.16
# fix the commit message:
$ git commit --amend --reset-author -s
# regenerate the patches:
$ git ptx-patches

now patches/Bootstrap-v1.16/0002-fix-overlap-linker-error.patch should have
a proper patch header.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] add patch for building at91bootstrap with gcc 4.6.x

[Alexander Dahl]

[-- Attachment #1: Type: text/plain, Size: 2640 bytes --]

Hei Michael, 

Am 30.01.2012 15:20, schrieb Michael Olbrich:
>> See my mail from January 13th, where I described the problem. It occurs
>> with the OSELAS toolchain 2011.11.0 compiling for arm-v5te.
> 
> Yes, I tried that and didn't get any build error. Which at91bootstrap
> config do I select to this error?

Okay I try to give some more information. Meanwhile I switched to the
2011.11.1 toolchain, but the error can be reproduced with this:

arm-v5te-linux-gnueabi-gcc -nostartfiles -nostdlib
-Wl,-Map=nandflash_at91sam9g20ek.map,--cref -T
./../../elf32-littlearm.lds -Ttext 0x200000 -n -o
nandflash_at91sam9g20ek.elf crt0_gnu.o at91sam9g20ek.o main.o gpio.o
pmc.o debug.o sdramc.o nandflash.o _udivsi3.o _umodsi3.o div0.o udiv.o
string.o
/home/adahl/opt/OSELAS.Toolchain-2011.11.1/arm-v5te-linux-gnueabi/gcc-4.6.2-glibc-2.14.1-binutils-2.21.1a-kernel-2.6.39-sanitized/bin/../lib/gcc/arm-v5te-linux-gnueabi/4.6.2/../../../../arm-v5te-linux-gnueabi/bin/ld:
section .text.startup loaded at [00200e84,00200eab] overlaps section
data loaded at [00200e84,00200f47]
collect2: ld returned 1 exit status

You see the toolchain is for arm-v5te-linux-gnueabi and uses gcc 4.6,
it's the toolchain build from the tag v2011.11.1 from the git repo
http://git.pengutronix.de/?p=OSELAS.Toolchain.git;a=summary and the
toolchain is built on the same up-to-date i686 Debian Squeeze VMware
virtual machine where I try to compile the at91bootstrap.

In the platformconfig I chose this: 

% grep -irn bootstrap configs
configs/arm-ncl/platformconfig:124:PTXCONF_AT91BOOTSTRAP=y
configs/arm-ncl/platformconfig:125:PTXCONF_AT91BOOTSTRAP_VERSION="1.16"
configs/arm-ncl/platformconfig:126:PTXCONF_AT91BOOTSTRAP_MD5="2d222312cf0af81c56db8747d6a38c7c"
configs/arm-ncl/platformconfig:127:PTXCONF_AT91BOOTSTRAP_CONFIG="at91sam9g20ek"
configs/arm-ncl/platformconfig:128:#
PTXCONF_AT91BOOTSTRAP_BOOT_DATAFLASH is not set
configs/arm-ncl/platformconfig:129:PTXCONF_AT91BOOTSTRAP_BOOT_NAND=y
configs/arm-ncl/platformconfig:130:# PTXCONF_AT91BOOTSTRAP2 is not set

I did a `ptxdist clean at91bootstrap` before and made sure there are no
customized rules or patches used, it's at91bootstrap as it comes with
ptxdist 2012.01.0, which is the version I use for testing this. Do you
need any more information to reproduce this? I attached the
platformconfig, hope this is helpful somehow.

Greets
Alex

-- 
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601  D1D5 8FBA 7744 CC87 10D0 ***

[-- Attachment #2: platformconfig --]
[-- Type: text/plain, Size: 6143 bytes --]

#
# Automatically generated make config: don't edit
# PTXdist 2012.01.0
#
PTXCONF_PLATFORMCONFIG_VERSION="2012.01.0"
PTXCONF__platformconfig_MAGIC__=y

#
# ------------------------------------
#

#
# Target Platform Configuration 
#

#
# ------------------------------------
#
PTXCONF_PLATFORM="at91sam9g20ncl"
PTXCONF_PLATFORM_VERSION="1"

#
# architecture                  
#
# PTXCONF_ARCH_ALPHA is not set
# PTXCONF_ARCH_AVR32 is not set
# PTXCONF_ARCH_AVR is not set
PTXCONF_ARCH_ARM=y
# PTXCONF_ARCH_BLACKFIN is not set
# PTXCONF_ARCH_X86 is not set
# PTXCONF_ARCH_MINGW is not set
# PTXCONF_ARCH_PPC is not set
# PTXCONF_ARCH_M68K is not set
# PTXCONF_ARCH_SPARC is not set
# PTXCONF_ARCH_MICROBLAZE is not set
# PTXCONF_ARCH_MIPS is not set
# PTXCONF_ARCH_CRIS is not set
# PTXCONF_ARCH_PARISC is not set
# PTXCONF_ARCH_SH is not set
PTXCONF_ARCH_SUPPORTS_ENDIAN_BIG=y
PTXCONF_ARCH_SUPPORTS_ENDIAN_LITTLE=y
# PTXCONF_ENDIAN_BIG is not set
PTXCONF_ENDIAN_LITTLE=y
# PTXCONF_ARCH_ARM_V6 is not set
# PTXCONF_ARCH_ARM_IWMMXT is not set
# PTXCONF_ARCH_ARM_NEON is not set
# PTXCONF_HAS_HARDFLOAT is not set
PTXCONF_HAS_MMU=y
PTXCONF_SIZEOF_LONG_DOUBLE="8"
PTXCONF_ARCH_STRING="arm"

#
# paths & directories           
#
PTXCONF_SYSROOT_TARGET="${PTXDIST_PLATFORMDIR}/sysroot-target"
PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host"
PTXCONF_SYSROOT_CROSS="${PTXDIST_PLATFORMDIR}/sysroot-cross"

#
# toolchain                     
#
PTXCONF_CROSSCHAIN_VENDOR="OSELAS.Toolchain-2011.11.1"
PTXCONF_CROSSCHAIN_CHECK="4.6.2"
PTXCONF_LIBC_GLIBC=y
# PTXCONF_LIBC_UCLIBC is not set
PTXCONF_GLIBC_VERSION="2.14.1"
PTXCONF_GNU_TARGET="arm-v5te-linux-gnueabi"
PTXCONF_COMPILER_PREFIX="${PTXCONF_GNU_TARGET}-"
PTXCONF_COMPILER_PREFIX_KERNEL="${PTXCONF_COMPILER_PREFIX}"
PTXCONF_COMPILER_PREFIX_BOOTLOADER="${PTXCONF_COMPILER_PREFIX}"

#
# extra toolchain options       
#
PTXCONF_TARGET_EXTRA_CPPFLAGS=""
PTXCONF_TARGET_EXTRA_CFLAGS="-Wcast-align"
PTXCONF_TARGET_EXTRA_CXXFLAGS="-Wcast-align"
PTXCONF_TARGET_EXTRA_LDFLAGS=""
PTXCONF_KERNEL=y
# PTXCONF_KERNEL_INSTALL is not set
PTXCONF_KERNEL_MODULES=y
PTXCONF_KERNEL_MODULES_INSTALL=y
PTXCONF_KERNEL_MODULES_BUILD="modules"
PTXCONF_KERNEL_VERSION="2.6.36.4"
PTXCONF_KERNEL_MD5="c05dd941d0e249695e9f72568888e1bf"
PTXCONF_KERNEL_ARCH_STRING="arm"
# PTXCONF_KERNEL_IMAGE_BZ is not set
# PTXCONF_KERNEL_IMAGE_Z is not set
PTXCONF_KERNEL_IMAGE_U=y
# PTXCONF_KERNEL_IMAGE_VM is not set
# PTXCONF_KERNEL_IMAGE_VMLINUX is not set
# PTXCONF_KERNEL_IMAGE_RAW is not set
# PTXCONF_KERNEL_IMAGE_SIMPLE is not set
PTXCONF_KERNEL_IMAGE="uImage"
# PTXCONF_KERNEL_XZ is not set
# PTXCONF_KERNEL_LZOP is not set

#
# patching & configuration      
#
PTXCONF_KERNEL_SERIES="series${PTXDIST_PLATFORMSUFFIX}"
PTXCONF_KERNEL_CONFIG="kernelconfig-${PTXCONF_KERNEL_VERSION}"

#
# Development features
#
PTXCONF_KERNEL_EXTRA_MAKEVARS="CONFIG_DEBUG_SECTION_MISMATCH=y"
# PTXCONF_HOST_DTC is not set
# PTXCONF_DTC is not set

#
# console options               
#
PTXCONF_CONSOLE_NAME="/dev/ttyS0"
PTXCONF_CONSOLE_SPEED="115200"

#
# extra kernel                  
#

#
# bootloaders                   
#
PTXCONF_AT91BOOTSTRAP=y
PTXCONF_AT91BOOTSTRAP_VERSION="1.16"
PTXCONF_AT91BOOTSTRAP_MD5="2d222312cf0af81c56db8747d6a38c7c"
PTXCONF_AT91BOOTSTRAP_CONFIG="at91sam9g20ek"
# PTXCONF_AT91BOOTSTRAP_BOOT_DATAFLASH is not set
PTXCONF_AT91BOOTSTRAP_BOOT_NAND=y
# PTXCONF_AT91BOOTSTRAP2 is not set
# PTXCONF_BAREBOX is not set
PTXCONF_BOOTLOADER=y
# PTXCONF_GRUB is not set
# PTXCONF_HOST_MXS_UTILS is not set
PTXCONF_LOADADDRESS="0x21E00000"
# PTXCONF_U_BOOT_V2 is not set
PTXCONF_U_BOOT=y
PTXCONF_U_BOOT_VERSION="2010.09"
PTXCONF_U_BOOT_MD5="6dcc2cc47ecc96d4da984556d601a8c0"
PTXCONF_U_BOOT_PROMPT="uboot> "
PTXCONF_U_BOOT_SERIES="series"
PTXCONF_U_BOOT_CONFIG="at91sam9g20ncl_nandflash_config"

#
# target install
#
# PTXCONF_U_BOOT_INSTALL_SREC is not set
# PTXCONF_U_BOOT_INSTALL_ELF is not set

#
# rootfs tools install
#
PTXCONF_U_BOOT_INSTALL_PRINTENV=y
# PTXCONF_X_LOAD is not set

#
# flash                         
#
PTXCONF_FLASH_BLOCKSIZE="128k"

#
# image creation options        
#
# PTXCONF_IMAGE_CPIO is not set
# PTXCONF_IMAGE_CPIO_GZ is not set
# PTXCONF_IMAGE_EXT2 is not set
# PTXCONF_IMAGE_HD is not set
# PTXCONF_IMAGE_VDI is not set

#
# ipkg options                  
#
PTXCONF_IMAGE_IPKG_PUSH_TO_REPOSITORY=y
PTXCONF_IMAGE_IPKG_FORCED_PUSH=y
# PTXCONF_IMAGE_IPKG_SIGN_OPENSSL is not set
# PTXCONF_IMAGE_INSTALL_FROM_IPKG_REPOSITORY is not set
PTXCONF_IMAGE_IPKG_INDEX=y
PTXCONF_IMAGE_IPKG_EXTRA_ARGS=""
# PTXCONF_IMAGE_JFFS2 is not set
PTXCONF_IMAGE_KERNEL=y
# PTXCONF_IMAGE_KERNEL_INITRAMFS is not set
PTXCONF_IMAGE_KERNEL_INSTALL_EARLY=y
# PTXCONF_IMAGE_KERNEL_LZOP is not set
# PTXCONF_IMAGE_SQUASHFS is not set
PTXCONF_IMAGE_TGZ=y
PTXCONF_IMAGE_UBI=y
PTXCONF_IMAGE_UBI_SUB_PAGE_SIZE="512"
PTXCONF_IMAGE_UBI_VID_HEADER_OFFSET="512"
PTXCONF_IMAGE_UBI_PEB_SIZE="128KiB"
PTXCONF_IMAGE_UBI_ROOT_VOL=y
PTXCONF_IMAGE_UBI_ROOT_VOL_SIZE="45MiB"
PTXCONF_IMAGE_UBI_ROOT_VOL_NAME="rootfs0"
# PTXCONF_UBI_CREATE_DATA is not set
PTXCONF_IMAGE_UBIFS=y
PTXCONF_IMAGE_UBIFS_MINIMUM_IO_UNIT_SIZE="2048"
PTXCONF_IMAGE_UBIFS_LEB_SIZE="126KiB"
PTXCONF_IMAGE_UBIFS_EXTRA_ARGS=""
PTXCONF_IMAGE_UBIFS_ROOT=y
PTXCONF_IMAGE_UBIFS_ROOT_MAX_LEB_COUNT="360"
# PTXCONF_IMAGE_UBIFS_DATA is not set
# PTXCONF_IMAGE_UIMAGE is not set
PTXCONF_CROSS_MODULE_INIT_TOOLS=y
# PTXCONF_HOST_CDRKIT is not set
# PTXCONF_HOST_CMAKE is not set
# PTXCONF_HOST_CRAMFS is not set
# PTXCONF_HOST_DOSFSTOOLS is not set
# PTXCONF_HOST_E2FSPROGS is not set
# PTXCONF_HOST_GENEXT2FS is not set
# PTXCONF_HOST_GENPART is not set
# PTXCONF_HOST_GETTEXT is not set
# PTXCONF_HOST_LIBBLKID is not set
# PTXCONF_HOST_LIBBZ2 is not set
# PTXCONF_HOST_LIBCAP is not set
PTXCONF_HOST_LIBLZO=y
PTXCONF_HOST_LIBUUID=y
# PTXCONF_HOST_LZOP is not set
# PTXCONF_HOST_MKELFIMAGE is not set
PTXCONF_HOST_MTD_UTILS=y
# PTXCONF_HOST_MTOOLS is not set
# PTXCONF_HOST_OPENSSL is not set
# PTXCONF_HOST_SQUASHFS_TOOLS is not set
PTXCONF_HOST_UMKIMAGE=y
PTXCONF_HOST_UTIL_LINUX_NG=y
# PTXCONF_HOST_XL_TOOLS is not set
# PTXCONF_HOST_XZ is not set
PTXCONF_HOST_ZLIB=y

[-- Attachment #3: Type: text/plain, Size: 48 bytes --]

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] add patch for building at91bootstrap with gcc 4.6.x

[Michael Olbrich]

On Tue, Jan 31, 2012 at 05:54:41PM +0100, Alexander Dahl wrote:
> Am 30.01.2012 15:20, schrieb Michael Olbrich:
> >> See my mail from January 13th, where I described the problem. It occurs
> >> with the OSELAS toolchain 2011.11.0 compiling for arm-v5te.
> > 
> > Yes, I tried that and didn't get any build error. Which at91bootstrap
> > config do I select to this error?
> 
> Okay I try to give some more information. Meanwhile I switched to the
> 2011.11.1 toolchain, but the error can be reproduced with this:
> 
> arm-v5te-linux-gnueabi-gcc -nostartfiles -nostdlib
> -Wl,-Map=nandflash_at91sam9g20ek.map,--cref -T
> ./../../elf32-littlearm.lds -Ttext 0x200000 -n -o
> nandflash_at91sam9g20ek.elf crt0_gnu.o at91sam9g20ek.o main.o gpio.o
> pmc.o debug.o sdramc.o nandflash.o _udivsi3.o _umodsi3.o div0.o udiv.o
> string.o
> /home/adahl/opt/OSELAS.Toolchain-2011.11.1/arm-v5te-linux-gnueabi/gcc-4.6.2-glibc-2.14.1-binutils-2.21.1a-kernel-2.6.39-sanitized/bin/../lib/gcc/arm-v5te-linux-gnueabi/4.6.2/../../../../arm-v5te-linux-gnueabi/bin/ld:
> section .text.startup loaded at [00200e84,00200eab] overlaps section
> data loaded at [00200e84,00200f47]
> collect2: ld returned 1 exit status
> 
> You see the toolchain is for arm-v5te-linux-gnueabi and uses gcc 4.6,
> it's the toolchain build from the tag v2011.11.1 from the git repo
> http://git.pengutronix.de/?p=OSELAS.Toolchain.git;a=summary and the
> toolchain is built on the same up-to-date i686 Debian Squeeze VMware
> virtual machine where I try to compile the at91bootstrap.
> 
> In the platformconfig I chose this: 
> 
> % grep -irn bootstrap configs
> configs/arm-ncl/platformconfig:124:PTXCONF_AT91BOOTSTRAP=y
> configs/arm-ncl/platformconfig:125:PTXCONF_AT91BOOTSTRAP_VERSION="1.16"
> configs/arm-ncl/platformconfig:126:PTXCONF_AT91BOOTSTRAP_MD5="2d222312cf0af81c56db8747d6a38c7c"
> configs/arm-ncl/platformconfig:127:PTXCONF_AT91BOOTSTRAP_CONFIG="at91sam9g20ek"
> configs/arm-ncl/platformconfig:128:#
> PTXCONF_AT91BOOTSTRAP_BOOT_DATAFLASH is not set
> configs/arm-ncl/platformconfig:129:PTXCONF_AT91BOOTSTRAP_BOOT_NAND=y
> configs/arm-ncl/platformconfig:130:# PTXCONF_AT91BOOTSTRAP2 is not set
> 
> I did a `ptxdist clean at91bootstrap` before and made sure there are no
> customized rules or patches used, it's at91bootstrap as it comes with
> ptxdist 2012.01.0, which is the version I use for testing this. Do you
> need any more information to reproduce this? I attached the
> platformconfig, hope this is helpful somehow.

Yes thank you. Now I can reproduce this. It only happens with NAND and the
default in ptxdist is dataflash...
I've looked at the patch more closely. The file is indented with tabs and
your patch uses spaces. Please fix that. Also fix the patch header as I
described in my last mail. See e.g. the other patch to see how it should
look like.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] add patch fixing at91bootstrap build with gcc 4.6.x, and recreate patch series

[Alexander Dahl]

Signed-off-by: Alexander Dahl <post@lespocky.de>
---
 .../0001-crt0_gnu.S-fix-image-size.patch           |    4 --
 ...32-littlearm.lds-fix-overlap-linker-error.patch |   31 ++++++++++++++++++++
 patches/Bootstrap-v1.16/series                     |    4 ++
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 patches/Bootstrap-v1.16/0002-elf32-littlearm.lds-fix-overlap-linker-error.patch

diff --git a/patches/Bootstrap-v1.16/0001-crt0_gnu.S-fix-image-size.patch b/patches/Bootstrap-v1.16/0001-crt0_gnu.S-fix-image-size.patch
index b2a4b5e..707d105 100644
--- a/patches/Bootstrap-v1.16/0001-crt0_gnu.S-fix-image-size.patch
+++ b/patches/Bootstrap-v1.16/0001-crt0_gnu.S-fix-image-size.patch
@@ -1,4 +1,3 @@
-From ed5f0b461a5652c7852f1fd7846be7b4814237de Mon Sep 17 00:00:00 2001
 From: Marc Kleine-Budde <mkl@pengutronix.de>
 Date: Thu, 17 Feb 2011 15:21:09 +0100
 Subject: [PATCH] crt0_gnu.S: fix image size
@@ -46,6 +45,3 @@ index a33952f..bf02b93 100644
  	}
  
  	/* collect all uninitialized .bss sections */
--- 
-1.7.2.3
-
diff --git a/patches/Bootstrap-v1.16/0002-elf32-littlearm.lds-fix-overlap-linker-error.patch b/patches/Bootstrap-v1.16/0002-elf32-littlearm.lds-fix-overlap-linker-error.patch
new file mode 100644
index 0000000..19b736b
--- /dev/null
+++ b/patches/Bootstrap-v1.16/0002-elf32-littlearm.lds-fix-overlap-linker-error.patch
@@ -0,0 +1,31 @@
+From: Alexander Dahl <post@lespocky.de>
+Date: Wed, 1 Feb 2012 12:49:15 +0100
+Subject: [PATCH] elf32-littlearm.lds: fix overlap linker error
+
+circumvent gcc 4.6.x linker overlap error, suggestion from AT91 forum at
+http://www.at91.com/forum/viewtopic.php/f,12/t,20624/
+
+This patch applies to Bootstrap-v1.16.
+
+Signed-off-by: Alexander Dahl <post@lespocky.de>
+---
+ elf32-littlearm.lds |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/elf32-littlearm.lds b/elf32-littlearm.lds
+index bf02b93..d85680c 100644
+--- a/elf32-littlearm.lds
++++ b/elf32-littlearm.lds
+@@ -14,7 +14,11 @@ SECTIONS
+ 	}
+ 
+ 	/* collect all initialized .data sections */
+-	.data : AT ( ADDR (.text) + SIZEOF (.text) ) { 
++	. = ALIGN(4);
++	.dummy : {
++		_edummy = .;
++	}
++	.data : AT ( LOADADDR(.dummy) ) {
+ 		_sdata = .;
+ 		*(.vectors)
+ 		*(.data)
diff --git a/patches/Bootstrap-v1.16/series b/patches/Bootstrap-v1.16/series
index 3355399..95a2b3f 100644
--- a/patches/Bootstrap-v1.16/series
+++ b/patches/Bootstrap-v1.16/series
@@ -1 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
 0001-crt0_gnu.S-fix-image-size.patch
+0002-elf32-littlearm.lds-fix-overlap-linker-error.patch
+# 6daacb9f08ce1b5f27a02b02d35aa2ee  - git-ptx-patches magic
-- 
1.7.2.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] add patch fixing at91bootstrap build with gcc 4.6.x, and recreate patch series

[Michael Olbrich]

Tnx, applied.

Michael

On Wed, Feb 01, 2012 at 12:54:50PM +0100, Alexander Dahl wrote:
> 
> Signed-off-by: Alexander Dahl <post@lespocky.de>
> ---
>  .../0001-crt0_gnu.S-fix-image-size.patch           |    4 --
>  ...32-littlearm.lds-fix-overlap-linker-error.patch |   31 ++++++++++++++++++++
>  patches/Bootstrap-v1.16/series                     |    4 ++
>  3 files changed, 35 insertions(+), 4 deletions(-)
>  create mode 100644 patches/Bootstrap-v1.16/0002-elf32-littlearm.lds-fix-overlap-linker-error.patch
> 
> diff --git a/patches/Bootstrap-v1.16/0001-crt0_gnu.S-fix-image-size.patch b/patches/Bootstrap-v1.16/0001-crt0_gnu.S-fix-image-size.patch
> index b2a4b5e..707d105 100644
> --- a/patches/Bootstrap-v1.16/0001-crt0_gnu.S-fix-image-size.patch
> +++ b/patches/Bootstrap-v1.16/0001-crt0_gnu.S-fix-image-size.patch
> @@ -1,4 +1,3 @@
> -From ed5f0b461a5652c7852f1fd7846be7b4814237de Mon Sep 17 00:00:00 2001
>  From: Marc Kleine-Budde <mkl@pengutronix.de>
>  Date: Thu, 17 Feb 2011 15:21:09 +0100
>  Subject: [PATCH] crt0_gnu.S: fix image size
> @@ -46,6 +45,3 @@ index a33952f..bf02b93 100644
>   	}
>   
>   	/* collect all uninitialized .bss sections */
> --- 
> -1.7.2.3
> -
> diff --git a/patches/Bootstrap-v1.16/0002-elf32-littlearm.lds-fix-overlap-linker-error.patch b/patches/Bootstrap-v1.16/0002-elf32-littlearm.lds-fix-overlap-linker-error.patch
> new file mode 100644
> index 0000000..19b736b
> --- /dev/null
> +++ b/patches/Bootstrap-v1.16/0002-elf32-littlearm.lds-fix-overlap-linker-error.patch
> @@ -0,0 +1,31 @@
> +From: Alexander Dahl <post@lespocky.de>
> +Date: Wed, 1 Feb 2012 12:49:15 +0100
> +Subject: [PATCH] elf32-littlearm.lds: fix overlap linker error
> +
> +circumvent gcc 4.6.x linker overlap error, suggestion from AT91 forum at
> +http://www.at91.com/forum/viewtopic.php/f,12/t,20624/
> +
> +This patch applies to Bootstrap-v1.16.
> +
> +Signed-off-by: Alexander Dahl <post@lespocky.de>
> +---
> + elf32-littlearm.lds |    6 +++++-
> + 1 files changed, 5 insertions(+), 1 deletions(-)
> +
> +diff --git a/elf32-littlearm.lds b/elf32-littlearm.lds
> +index bf02b93..d85680c 100644
> +--- a/elf32-littlearm.lds
> ++++ b/elf32-littlearm.lds
> +@@ -14,7 +14,11 @@ SECTIONS
> + 	}
> + 
> + 	/* collect all initialized .data sections */
> +-	.data : AT ( ADDR (.text) + SIZEOF (.text) ) { 
> ++	. = ALIGN(4);
> ++	.dummy : {
> ++		_edummy = .;
> ++	}
> ++	.data : AT ( LOADADDR(.dummy) ) {
> + 		_sdata = .;
> + 		*(.vectors)
> + 		*(.data)
> diff --git a/patches/Bootstrap-v1.16/series b/patches/Bootstrap-v1.16/series
> index 3355399..95a2b3f 100644
> --- a/patches/Bootstrap-v1.16/series
> +++ b/patches/Bootstrap-v1.16/series
> @@ -1 +1,5 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
>  0001-crt0_gnu.S-fix-image-size.patch
> +0002-elf32-littlearm.lds-fix-overlap-linker-error.patch
> +# 6daacb9f08ce1b5f27a02b02d35aa2ee  - git-ptx-patches magic
> -- 
> 1.7.2.5
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de