From: Reinhard Meyer <u-boot@emk-elektronik.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 00/15] [REWORK AVR32/AT91] additional changes for avr32
Date: Mon, 18 Apr 2011 14:49:00 +0200 [thread overview]
Message-ID: <4DAC333C.8030603@emk-elektronik.de> (raw)
In-Reply-To: <1297266050-14449-1-git-send-email-biessmann@corscience.de>
Dear Andreas Bie?mann,
> This series do some cleanup all avr32 boards. This series is on top of 'Get
> AVR32 boards working with partial linking' rebased to
> u-boot-atmel/rework110202.
>
> In summary the board specific config.mk and u-boot.lds files are deleted in
> favor of a version at architecture level. Theses files had all the same
> content cause they where pure copies of the atstk100x ones.
>
> I have splitted the patches to each board cause some of them should be
> actively maintained and the respectively maintainer should have a chance to
> give some feedback.
>
> Andreas Bie?mann (15):
> avr32/config.mk: simplify PLATFORM_RELFLAGS
> avr32: use single linker script
> atngw100: fix "#define XXXX 1"
> atstk1002: fix "#define XXXX 1"
> atstk1003: fix "#define XXXX 1"
> atstk1004: fix "#define XXXX 1"
> atstk1006: fix "#define XXXX 1"
> favr-32-ezkit: fix "#define XXXX 1"
> hammerhead: fix "#define XXXX 1"
> mimc200: fix "#define XXXX 1"
> atngw100: move CONFIG_SYS_TEXT_BASE to header
> atstk100x: move CONFIG_SYS_TEXT_BASE to header
> favr-32-ezkit: move CONFIG_SYS_TEXT_BASE to header
> mimc200: move CONFIG_SYS_TEXT_BASE to header
> hammerhead: move CONFIG_SYS_TEXT_BASE to header
>
> arch/avr32/config.mk | 4 +
> .../atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds | 0
> board/atmel/atngw100/config.mk | 2 -
> board/atmel/atngw100/u-boot.lds | 72 --------------------
> board/atmel/atstk1000/config.mk | 3 -
> board/earthlcd/favr-32-ezkit/config.mk | 3 -
> board/earthlcd/favr-32-ezkit/u-boot.lds | 70 -------------------
> board/mimc/mimc200/config.mk | 2 -
> board/mimc/mimc200/u-boot.lds | 72 --------------------
> board/miromico/hammerhead/config.mk | 2 -
> board/miromico/hammerhead/u-boot.lds | 72 --------------------
> include/configs/atngw100.h | 55 ++++++++-------
> include/configs/atstk1002.h | 49 +++++++-------
> include/configs/atstk1003.h | 43 ++++++------
> include/configs/atstk1004.h | 43 ++++++------
> include/configs/atstk1006.h | 49 +++++++-------
> include/configs/favr-32-ezkit.h | 47 +++++++------
> include/configs/hammerhead.h | 49 +++++++-------
> include/configs/mimc200.h | 57 ++++++++--------
> 19 files changed, 204 insertions(+), 490 deletions(-)
> rename {board/atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds (100%)
> delete mode 100644 board/atmel/atngw100/config.mk
> delete mode 100644 board/atmel/atngw100/u-boot.lds
> delete mode 100644 board/atmel/atstk1000/config.mk
> delete mode 100644 board/earthlcd/favr-32-ezkit/config.mk
> delete mode 100644 board/earthlcd/favr-32-ezkit/u-boot.lds
> delete mode 100644 board/mimc/mimc200/config.mk
> delete mode 100644 board/mimc/mimc200/u-boot.lds
> delete mode 100644 board/miromico/hammerhead/config.mk
> delete mode 100644 board/miromico/hammerhead/u-boot.lds
Some of the patches did not apply. What did apply is now found in u-boot-atmel/next2.
I have no idea why they do not apply, since the AVR32 part has not changed since 110202.
Can you please rebase the series against next or resubmit the failed parts against next2?
Best Regards,
Reinhard
reinhard at sieb:~/embedded/u-boot-atmel$ git am U-Boot-2-3-avr32-fix-linking.patch
Applying avr32: fix linking
reinhard at sieb:~/embedded/u-boot-atmel$ git am U-Boot-01-15-avr32-config.mk-simplify-PLATFORM_RELFLAGS.patch
Applying avr32/config.mk: simplify PLATFORM_RELFLAGS
reinhard at sieb:~/embedded/u-boot-atmel$ git am U-Boot-02-15-avr32-use-single-linker-script.patch
Applying avr32: use single linker script
error: patch failed: board/atmel/atngw100/u-boot.lds:1
error: board/atmel/atngw100/u-boot.lds: patch does not apply
error: patch failed: board/earthlcd/favr-32-ezkit/u-boot.lds:1
error: board/earthlcd/favr-32-ezkit/u-boot.lds: patch does not apply
error: patch failed: board/mimc/mimc200/u-boot.lds:1
error: board/mimc/mimc200/u-boot.lds: patch does not apply
error: patch failed: board/miromico/hammerhead/u-boot.lds:1
error: board/miromico/hammerhead/u-boot.lds: patch does not apply
Patch failed at 0001.
When you have resolved this problem run "git-am --resolved".
If you would prefer to skip this patch, instead run "git-am --skip".
reinhard at sieb:~/embedded/u-boot-atmel$ git am --skip
Nothing to do.
reinhard at sieb:~/embedded/u-boot-atmel$ git am U-Boot-03-15-atngw100-fix-define-XXXX-1.patch
Applying atngw100: fix "#define XXXX 1"
reinhard at sieb:~/embedded/u-boot-atmel$ git am U-Boot-04-15-atstk1002-fix-define-XXXX-1.patch
Applying atstk1002: fix "#define XXXX 1"
reinhard at sieb:~/embedded/u-boot-atmel$ git am U-Boot-05-15-atstk1003-fix-define-XXXX-1.patch
Applying atstk1003: fix "#define XXXX 1"
reinhard at sieb:~/embedded/u-boot-atmel$ git am U-Boot-06-15-atstk1004-fix-define-XXXX-1.patch
Applying atstk1004: fix "#define XXXX 1"
reinhard at sieb:~/embedded/u-boot-atmel$ git am U-Boot-07-15-atstk1006-fix-define-XXXX-1.patch
Applying atstk1006: fix "#define XXXX 1"
reinhard at sieb:~/embedded/u-boot-atmel$ git am U-Boot-08-15-favr-32-ezkit-fix-define-XXXX-1.patch
Applying favr-32-ezkit: fix "#define XXXX 1"
reinhard at sieb:~/embedded/u-boot-atmel$ git am U-Boot-09-15-hammerhead-fix-define-XXXX-1.patch
Applying hammerhead: fix "#define XXXX 1"
reinhard at sieb:~/embedded/u-boot-atmel$ git am U-Boot-10-15-mimc200-fix-define-XXXX-1.patch
Applying mimc200: fix "#define XXXX 1"
reinhard at sieb:~/embedded/u-boot-atmel$ git am U-Boot-11-15-atngw100-move-CONFIG_SYS_TEXT_BASE-to-header.patch
Applying atngw100: move CONFIG_SYS_TEXT_BASE to header
reinhard at sieb:~/embedded/u-boot-atmel$ git am U-Boot-12-15-atstk100x-move-CONFIG_SYS_TEXT_BASE-to-header.patch
Applying atstk100x: move CONFIG_SYS_TEXT_BASE to header
error: patch failed: board/atmel/atstk1000/config.mk:1
error: board/atmel/atstk1000/config.mk: patch does not apply
Patch failed at 0001.
When you have resolved this problem run "git-am --resolved".
If you would prefer to skip this patch, instead run "git-am --skip".
reinhard at sieb:~/embedded/u-boot-atmel$ git am --skip
Nothing to do.
reinhard at sieb:~/embedded/u-boot-atmel$ git am U-Boot-13-15-favr-32-ezkit-move-CONFIG_SYS_TEXT_BASE-to-header.patch
Applying favr-32-ezkit: move CONFIG_SYS_TEXT_BASE to header
error: patch failed: board/earthlcd/favr-32-ezkit/config.mk:1
error: board/earthlcd/favr-32-ezkit/config.mk: patch does not apply
Patch failed at 0001.
When you have resolved this problem run "git-am --resolved".
If you would prefer to skip this patch, instead run "git-am --skip".
reinhard at sieb:~/embedded/u-boot-atmel$ git am --skip
Nothing to do.
reinhard at sieb:~/embedded/u-boot-atmel$ git am U-Boot-14-15-mimc200-move-CONFIG_SYS_TEXT_BASE-to-header.patch
Applying mimc200: move CONFIG_SYS_TEXT_BASE to header
reinhard at sieb:~/embedded/u-boot-atmel$ git am U-Boot-15-15-hammerhead-move-CONFIG_SYS_TEXT_BASE-to-header.patch
Applying hammerhead: move CONFIG_SYS_TEXT_BASE to header
reinhard at sieb:~/embedded/u-boot-atmel$
next prev parent reply other threads:[~2011-04-18 12:49 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-09 15:40 [U-Boot] [PATCH 00/15] [REWORK AVR32/AT91] additional changes for avr32 Andreas Bießmann
2011-02-09 15:40 ` [U-Boot] [PATCH 01/15] avr32/config.mk: simplify PLATFORM_RELFLAGS Andreas Bießmann
2011-02-09 15:40 ` [U-Boot] [PATCH 02/15] avr32: use single linker script Andreas Bießmann
2011-02-09 15:40 ` [U-Boot] [PATCH 03/15] atngw100: fix "#define XXXX 1" Andreas Bießmann
2011-02-09 15:40 ` [U-Boot] [PATCH 04/15] atstk1002: " Andreas Bießmann
2011-02-09 15:40 ` [U-Boot] [PATCH 05/15] atstk1003: " Andreas Bießmann
2011-02-09 15:40 ` [U-Boot] [PATCH 06/15] atstk1004: " Andreas Bießmann
2011-02-09 15:40 ` [U-Boot] [PATCH 07/15] atstk1006: " Andreas Bießmann
2011-02-09 15:40 ` [U-Boot] [PATCH 08/15] favr-32-ezkit: " Andreas Bießmann
2011-02-09 15:40 ` [U-Boot] [PATCH 09/15] hammerhead: " Andreas Bießmann
2011-02-09 15:40 ` [U-Boot] [PATCH 10/15] mimc200: " Andreas Bießmann
2011-02-09 15:40 ` [U-Boot] [PATCH 11/15] atngw100: move CONFIG_SYS_TEXT_BASE to header Andreas Bießmann
2011-02-09 15:40 ` [U-Boot] [PATCH 12/15] atstk100x: " Andreas Bießmann
2011-02-09 15:40 ` [U-Boot] [PATCH 13/15] favr-32-ezkit: " Andreas Bießmann
2011-02-09 15:40 ` [U-Boot] [PATCH 14/15] mimc200: " Andreas Bießmann
2011-02-09 15:40 ` [U-Boot] [PATCH 15/15] hammerhead: " Andreas Bießmann
2011-04-13 9:06 ` [U-Boot] [PATCH 00/15] [REWORK AVR32/AT91] additional changes for avr32 Andreas Bießmann
2011-04-18 12:49 ` Reinhard Meyer [this message]
2011-04-18 13:39 ` Andreas Bießmann
2011-04-19 15:49 ` Reinhard Meyer
2011-04-19 16:44 ` Andreas Bießmann
2011-04-19 19:36 ` Reinhard Meyer
2011-04-18 14:12 ` [U-Boot] [PATCH V2 00/15] *** SUBJECT HERE *** Andreas Bießmann
2011-04-18 14:12 ` [U-Boot] [PATCH V2 01/15] avr32/config.mk: simplify PLATFORM_RELFLAGS Andreas Bießmann
2011-04-18 14:12 ` [U-Boot] [PATCH V2 02/15] avr32: use single linker script Andreas Bießmann
2011-04-18 14:12 ` [U-Boot] [PATCH V2 03/15] atngw100: fix "#define XXXX 1" Andreas Bießmann
2011-04-18 14:12 ` [U-Boot] [PATCH V2 04/15] atstk1002: " Andreas Bießmann
2011-04-18 14:12 ` [U-Boot] [PATCH V2 05/15] atstk1003: " Andreas Bießmann
2011-04-18 14:12 ` [U-Boot] [PATCH V2 06/15] atstk1004: " Andreas Bießmann
2011-04-18 14:12 ` [U-Boot] [PATCH V2 07/15] atstk1006: " Andreas Bießmann
2011-04-18 14:12 ` [U-Boot] [PATCH V2 08/15] favr-32-ezkit: " Andreas Bießmann
2011-04-18 14:12 ` [U-Boot] [PATCH V2 09/15] hammerhead: " Andreas Bießmann
2011-04-18 14:12 ` [U-Boot] [PATCH V2 10/15] mimc200: " Andreas Bießmann
2011-04-18 14:12 ` [U-Boot] [PATCH V2 11/15] atngw100: move CONFIG_SYS_TEXT_BASE to header Andreas Bießmann
2011-04-18 14:12 ` [U-Boot] [PATCH V2 12/15] atstk100x: " Andreas Bießmann
2011-04-18 14:12 ` [U-Boot] [PATCH V2 13/15] favr-32-ezkit: " Andreas Bießmann
2011-04-18 14:12 ` [U-Boot] [PATCH V2 14/15] mimc200: " Andreas Bießmann
2011-04-18 14:12 ` [U-Boot] [PATCH V2 15/15] hammerhead: " Andreas Bießmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DAC333C.8030603@emk-elektronik.de \
--to=u-boot@emk-elektronik.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox