get at91rm9200ek working with ARM relocation
Subsystems (2)
v2 cover get at91rm9200ek working with ARM relocation
Dear all,
this is mostly a copy of
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/89888
This series have two relevant changes. Cause of defining the weak symbol board_reset the previous patch 'arm920t: fix linker skript for -pie linking' is not longer needed. So 'arm920t/at91/reset: board_reset: define weak symbol' is a replacement for that one.
And second integrate the suggestion of Reinhard Meyer in 'arm920t/at91/timer: replace bss variables by gd'.
Andreas Bie?mann (4):
at91rm9200ek: add configure target for RAM boot
MAKEALL: fix AT91
arm920t/at91/reset: board_reset: define weak symbol arm920t/at91/timer: replace bss variables by gd
MAKEALL | 18 +++--------------- arch/arm/cpu/arm920t/at91/reset.c | 8 +++++--- arch/arm/cpu/arm920t/at91/timer.c | 29 ++++++++++++++--------------- arch/arm/include/asm/global_data.h | 1 + board/atmel/at91rm9200ek/config.mk | 2 -- boards.cfg | 3 ++- include/configs/at91rm9200ek.h | 16 ++++++++++++++++ 7 files changed, 41 insertions(+), 36 deletions(-) delete mode 100644 board/atmel/at91rm9200ek/config.mk
Signature · 1 line
1.7.3.2
PATCH v2 1/4 at91rm9200ek: add configure target for RAM boot
This patch also removes now unnecessary config.mk in board directory and make usage of new features in boards.cfg.
---
no change since v1 but still in u-boot-atmel/at91
board/atmel/at91rm9200ek/config.mk | 2 -- boards.cfg | 3 ++- include/configs/at91rm9200ek.h | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) delete mode 100644 board/atmel/at91rm9200ek/config.mk
board/atmel/at91rm9200ek/config.mk deleted +0 -2
@@ -1,2 +0,0 @@ -# currently only NOR flash booting is supported -CONFIG_SYS_TEXT_BASE = 0x10000000
boards.cfg +2 -1
@@ -48,7 +48,8 @@ lpc2292sodimm arm arm720t - - SMN42 arm arm720t - siemens lpc2292 evb4510 arm arm720t - - s3c4510b a320evb arm arm920t - faraday a320 -at91rm9200ek arm arm920t - atmel at91 +at91rm9200ek arm arm920t at91rm9200ek atmel at91 at91rm9200ek +at91rm9200ek_ram arm arm920t at91rm9200ek atmel at91 at91rm9200ek:RAMBOOT eb_cpux9k2 arm arm920t - BuS at91 cmc_pu2 arm arm920t - - at91rm9200 csb637 arm arm920t - - at91rm9200
include/configs/at91rm9200ek.h +14 -0
@@ -33,6 +33,20 @@#include <asm/sizes.h> /* +* set some initial configurations depending on configure target +* +* at91rm9200ek_config -> boot from 0x0 in NOR Flash at CS0 +* at91rm9200ek_ram_config -> continue booting from 0x20100000 in RAM; lowlevel +* initialisation was done by some preloader +*/ +#ifdef CONFIG_RAMBOOT +#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SYS_TEXT_BASE 0x20100000 +#else +#define CONFIG_SYS_TEXT_BASE 0x10000000 +#endif + +/* * AT91C_XTAL_CLOCK is the frequency of external xtal in hertz * AT91C_MAIN_CLOCK is the frequency of PLLA output * AT91C_MASTER_CLOCK is the peripherial clock
Signature · 1 line
1.7.3.2
PATCH v2 2/4 MAKEALL: fix AT91
In reply to Andreas Bießmann * add boards_by_soc()
* remove boards already in boards.cfg from LIST_AT91
---
no change since v1 but still in u-boot-atmel/at91
MAKEALL | 18 +++--------------- 1 files changed, 3 insertions(+), 15 deletions(-)
MAKEALL +3 -15
@@ -187,6 +187,7 @@ boards_by_field() } boards_by_arch() { boards_by_field 2 "$@" ; } boards_by_cpu() { boards_by_field 3 "$@" ; } +boards_by_soc() { boards_by_field 6 "$@" ; } ######################################################################### ## MPC5xx Systems
@@ -439,11 +440,8 @@ LIST_ARMV7=" \ ## AT91 Systems ######################################################################### -LIST_at91=" \ - afeb9260 \ - at91cap9adk \ - at91rm9200dk \ - at91rm9200ek \ +LIST_at91="$(boards_by_soc at91)\ + $(boards_by_soc at91rm9200)\ at91sam9260ek \ at91sam9261ek \ at91sam9263ek \
@@ -451,19 +449,9 @@ LIST_at91=" \ at91sam9g20ek \ at91sam9m10g45ek \ at91sam9rlek \ - cmc_pu2 \ CPUAT91 \ CPU9260 \ CPU9G20 \ - csb637 \ - eb_cpux9k2 \ - kb9202 \ - meesc \ - mp2usb \ - m501sk \ - otc570 \ - pm9261 \ - pm9263 \ pm9g45 \ SBC35_A9G20 \ TNY_A9260 \
Signature · 1 line
1.7.3.2
PATCH v2 3/4 arm920t/at91/reset: board_reset: define weak symbol
In reply to Andreas BießmannFrom: Andreas Bie?mann <[email protected]>
---
remove 'arm920t: fix linker skript for -pie linking' in favor of this patch
arch/arm/cpu/arm920t/at91/reset.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
arch/arm/cpu/arm920t/at91/reset.c +5 -3
@@ -35,7 +35,10 @@#include <asm/arch/hardware.h> #include <asm/arch/at91_st.h> -void board_reset (void ) __attribute__((__weak__)); +void __attribute__((weak))board_reset (void ) +{ +/* true empty function for defining weak symbol */ +}void reset_cpu (ulong ignored) {
@@ -45,8 +48,7 @@ void reset_cpu(ulong ignored)serial_exit ();#endif -if (board_reset) -board_reset (); +board_reset ();/* Reset the cpu by setting up the watchdog timer */ writel(AT91_ST_WDMR_RSTEN | AT91_ST_WDMR_EXTEN | AT91_ST_WDMR_WDV(2),
Signature · 1 line
1.7.3.2
PATCH v2 3/4 arm920t/at91/reset: board_reset: define weak symbol
Am 30.11.2010 20:45, schrieb Andreas Bie?mann:
Quoted 4 lines
From: Andreas Bie?mann <[email protected]>
Signed-off-by Andreas Bie?mann <[email protected]>---
I can confirm this patch. It works with eb+cpux9k2 board.
regard Jens
PATCH v2 4/4 arm920t/at91/timer: replace bss variables by gd
In reply to Andreas BießmannReuse the gd->tbl value for timestamp and add gd->lastinc for lastinc bss values in arm920t/at91/timer driver.
The usage of bss values in driver before initialisation of bss is forbidden. In that special case some data in .rel.dyn gets corrupted by the arm920t/at91/timer driver.
---
changes since v1:
* use gd->tbl as timestamp
* add gd->lastinc for CONFIG_AT91FAMILY and use in favor of lastinc bss
arch/arm/cpu/arm920t/at91/timer.c | 29 ++++++++++++++--------------- arch/arm/include/asm/global_data.h | 1 + include/configs/at91rm9200ek.h | 2 ++ 3 files changed, 17 insertions(+), 15 deletions(-)
arch/arm/cpu/arm920t/at91/timer.c +14 -15
@@ -32,17 +32,16 @@#include <common.h> -#include <asm/io.h> -#include <asm/hardware.h> +#include <asm/arch/io.h> +#include <asm/arch/hardware.h> #include <asm/arch/at91_tc.h> #include <asm/arch/at91_pmc.h> +DECLARE_GLOBAL_DATA_PTR ; +/* the number of clocks per CONFIG_SYS_HZ */ #define TIMER_LOAD_VAL (CONFIG_SYS_HZ_CLOCK/CONFIG_SYS_HZ) -static u32 timestamp; -static u32 lastinc; -int timer_init (void ) {at91_tc_t *tc = (at91_tc_t *)AT91_TC_BASE ;
@@ -64,8 +63,8 @@ int timer_init(void)writel (TIMER_LOAD_VAL , &tc->tc[0 ].rc);writel (AT91_TC_CCR_SWTRG |AT91_TC_CCR_CLKEN , &tc->tc[0 ].ccr); - lastinc =0 ; - timestamp =0 ; + gd->lastinc =0 ; + gd->tbl =0 ;return 0 ; }
@@ -86,7 +85,7 @@ ulong get_timer(ulong base)void set_timer (ulong t) { - timestamp = t; + gd->tbl = t; }void __udelay (unsigned long usec)
@@ -98,8 +97,8 @@ void reset_timer_masked(void) {/* reset time */ at91_tc_t *tc = (at91_tc_t *)AT91_TC_BASE ; - lastinc =readl (&tc->tc[0 ].cv) &0x0000ffff ; - timestamp =0 ; + gd->lastinc =readl (&tc->tc[0 ].cv) &0x0000ffff ; + gd->tbl =0 ; }ulong get_timer_raw (void )
@@ -109,16 +108,16 @@ ulong get_timer_raw(void) now =readl (&tc->tc[0 ].cv) &0x0000ffff ; -if (now >= lastinc) { +if (now >= gd->lastinc) {/* normal mode */ - timestamp += now - lastinc; + gd->tbl += now - gd->lastinc; }else {/* we have an overflow ... */ - timestamp += now +TIMER_LOAD_VAL - lastinc; + gd->tbl += now +TIMER_LOAD_VAL - gd->lastinc; } - lastinc = now; + gd->lastinc = now; -return timestamp; +return gd->tbl; }ulong get_timer_masked (void )
arch/arm/include/asm/global_data.h +1 -0
@@ -60,6 +60,7 @@ typedef struct global_data {unsigned long tbl;unsigned long tbu;unsigned long long timer_reset_value; +unsigned long lastinc;#endif unsigned long relocaddr;/* Start address of U-Boot in RAM */ phys_size_t ram_size;/* RAM size */
include/configs/at91rm9200ek.h +2 -0
@@ -71,6 +71,8 @@#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG +#define CONFIG_AT91FAMILY +/* * Memory Configuration */
Signature · 1 line
1.7.3.2
v2 cover get at91rm9200ek working with ARM relocation
In reply to Andreas BießmannDear Andreas Bie?mann,
Quoted 26 lines
Dear all,
this is mostly a copy of
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/89888This series have two relevant changes. Cause of defining the weak symbol
board_resetthe previous patch 'arm920t: fix linker skript for -pie linking' is not longer needed. So 'arm920t/at91/reset:board_reset: define weak symbol' is a replacement for that one.
And second integrate the suggestion of Reinhard Meyer in 'arm920t/at91/timer: replace bss variables by gd'.Andreas Bie?mann (4):
at91rm9200ek: add configure target for RAM boot
MAKEALL: fix AT91
arm920t/at91/reset:board_reset: define weak symbol arm920t/at91/timer: replace bss variables by gdMAKEALL | 18 +++--------------- arch/arm/cpu/arm920t/at91/reset.c | 8 +++++--- arch/arm/cpu/arm920t/at91/timer.c | 29 ++++++++++++++--------------- arch/arm/include/asm/global_data.h | 1 + board/atmel/at91rm9200ek/config.mk | 2 -- boards.cfg | 3 ++- include/configs/at91rm9200ek.h | 16 ++++++++++++++++ 7 files changed, 41 insertions(+), 36 deletions(-)
Quoted 1 line
delete mode 100644
board/atmel/at91rm9200ek/config.mk
Does that base on current u-boot/master?
I will pull current master, and rebase at91,at91-next on it, also delete the then obsolete two patches currently at at91. Then your patches will be applied.
Best Regards,
Reinhard
v2 cover get at91rm9200ek working with ARM relocation
Dear Reinhard Meyer,
Am 30.11.2010 um 20:58 schrieb Reinhard Meyer:
Quoted 3 lines
Dear Andreas Bie?mann,
Does that base on current u-boot/master?
Yes, it is.
Quoted 2 lines
I will pull current master, and rebase at91,at91-next on it, also delete the then obsolete two patches currently at at91. Then your patches will be applied.
Ok, thanks.
regards
Andreas Bie?mann
v2 cover get at91rm9200ek working with ARM relocation
In reply to Andreas BießmannDear Andreas Bie?mann,
Quoted 18 lines
Dear all,
this is mostly a copy of
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/89888This series have two relevant changes. Cause of defining the weak symbol
board_resetthe previous patch 'arm920t: fix linker skript for -pie linking' is not longer needed. So 'arm920t/at91/reset:board_reset: define weak symbol' is a replacement for that one.
And second integrate the suggestion of Reinhard Meyer in 'arm920t/at91/timer: replace bss variables by gd'.Andreas Bie?mann (4):
at91rm9200ek: add configure target for RAM boot
MAKEALL: fix AT91
arm920t/at91/reset:board_reset: define weak symbol arm920t/at91/timer: replace bss variables by gd
Quoted 9 lines
MAKEALL | 18 +++--------------- arch/arm/cpu/arm920t/at91/reset.c | 8 +++++--- arch/arm/cpu/arm920t/at91/timer.c | 29 ++++++++++++++--------------- arch/arm/include/asm/global_data.h | 1 + board/atmel/at91rm9200ek/config.mk | 2 -- boards.cfg | 3 ++- include/configs/at91rm9200ek.h | 16 ++++++++++++++++ 7 files changed, 41 insertions(+), 36 deletions(-) delete mode 100644 board/atmel/at91rm9200ek/config.mk
Applied all four to u-boot-atmel/next.
Thanks,
Reinhard
v2 cover get at91rm9200ek working with ARM relocation
Dear Reinhard Meyer,
Am 05.12.2010 um 10:53 schrieb Reinhard Meyer:
[snip summary for 'get at91rm9200ek working with ARM relocation']
Quoted 1 line
Applied all four to u-boot-atmel/next.
I assume these do not go into v2010.12, is that correct?
regards
Andreas Bie?mann
v2 cover get at91rm9200ek working with ARM relocation
Le 05/12/2010 18:43, Andreas Bie?mann a ?crit :
Quoted 9 lines
Dear Reinhard Meyer,
Am 05.12.2010 um 10:53 schrieb Reinhard Meyer:
[snip summary for 'get at91rm9200ek working with ARM relocation']
Quoted 1 line
Applied all four to u-boot-atmel/next.
I assume these do not go into v2010.12, is that correct?
I would have thought they did, in order to get more boards working in 2010.12.
Quoted 3 lines
regards
Andreas Bie?mann
Amicalement,
Signature · 1 line
Albert.
v2 cover get at91rm9200ek working with ARM relocation
Dear Albert, dear Reinhard,
Am 05.12.2010 um 18:56 schrieb Albert ARIBAUD:
Quoted 5 lines
Le 05/12/2010 18:43, Andreas Bie?mann a ?crit :
Quoted 4 lines
Dear Reinhard Meyer,
Am 05.12.2010 um 10:53 schrieb Reinhard Meyer:
Quoted 7 lines
Quoted 5 lines
[snip summary for 'get at91rm9200ek working with ARM relocation']
Quoted 1 line
Applied all four to u-boot-atmel/next.
I assume these do not go into v2010.12, is that correct?
I would have thought they did, in order to get more boards working in 2010.12.
I'm just asking cause of the next branch ... I would prefer to have them in v2010.12
regards
Andreas Bie?mann
v2 cover get at91rm9200ek working with ARM relocation
Quoted 11 lines · Andreas Bie?mann
Dear Albert, dear Reinhard,
Am 05.12.2010 um 18:56 schrieb Albert ARIBAUD:
Quoted 7 lines
Le 05/12/2010 18:43, Andreas Bie?mann a ?crit :
Quoted 6 lines
Dear Reinhard Meyer,
Am 05.12.2010 um 10:53 schrieb Reinhard Meyer:
[snip summary for 'get at91rm9200ek working with ARM relocation']
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Applied all four to u-boot-atmel/next.
I assume these do not go into v2010.12, is that correct?
I would have thought they did, in order to get more boards working in 2010.12.
I'm just asking cause of the next branch ... I would prefer to have them in v2010.12
Sorry, the branch name might be a misnomer. As soon as I got two other patches applied, I'll issue a pull request.
Maybe one of you can give me a hint how to fix the issue when a patch does not apply:
error: patch failed: boards.cfg:47
error: boards.cfg: 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 status
# On branch next-1
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# .dotest/
nothing added to commit but untracked files present (use "git add" to track)
How do I resolve this? When there is a problem with git-rebase I get the offending files merged with the conflicting parts between <<<,===,>>> respectively. Easy to edit that. But with git-am I don't seem to get such an option?
Best Regards,
Reinhard
v2 cover get at91rm9200ek working with ARM relocation
Le 05/12/2010 20:14, Reinhard Meyer a ?crit :
Quoted 3 lines
Sorry, the branch name might be a misnomer. As soon as I got two other patches applied,
I'll issue a pull request.
You mean your /next branch will be merged to your /master and you'll request a pull of /master ?
Quoted 5 lines
How do I resolve this? When there is a problem with git-rebase I get the offending
files merged with the conflicting parts between <<<,===,>>> respectively. Easy to
edit that. But with git-am I don't seem to get such an option?
Add --reject to your git am command. It will produce a .rej fil which contains the rejected hunks for each failed patch.
Quoted 2 lines
Best Regards,
Reinhard
Amicalement,
Signature · 1 line
Albert.
v2 cover get at91rm9200ek working with ARM relocation
Dear Albert ARIBAUD,
Quoted 8 lines
Le 05/12/2010 20:14, Reinhard Meyer a ?crit :
Quoted 3 lines
Sorry, the branch name might be a misnomer. As soon as I got two other patches applied,
I'll issue a pull request.You mean your /next branch will be merged to your /master and you'll request a pull of /master ?
Quoted 7 lines
Quoted 5 lines
How do I resolve this? When there is a problem with git-rebase I get the offending
files merged with the conflicting parts between <<<,===,>>> respectively. Easy to
edit that. But with git-am I don't seem to get such an option?Add --reject to your git am command. It will produce a .rej fil which contains the rejected hunks for each failed patch.
At least my version does not have --reject, but using git-am --skip after the failed git-am leads exactly to what I need: the patchable files ready to be committed, and the problematic files with the <<<,===,>>> markings...
Best Regards,
Reinhard
v2 cover get at91rm9200ek working with ARM relocation
In reply to Reinhard MeyerDear Reinhard Meyer,
Quoted 4 lines · In message <[email protected]> you wrote:
Sorry, the branch name might be a misnomer. As soon as I got two other patc= hes applied,
I'll issue a pull request.
OK.
Quoted 7 lines
Maybe one of you can give me a hint how to fix the issue when a patch does not apply:
error: patch failed: boards.cfg:47
error: boards.cfg: patch does not apply
Patch failed at 0001.
First, try to figure out why this happen. If it's aproblem with the patch, then consider rejecting it. If you want to get it added, look if it's line-wrapped or similar; usually this can be fixed with reasonable efforts (assunimg it's a small and simple patch).
Try applying it using "patch -1 --dry-run".
Try applying it manually using your favorite editor.
Quoted 9 lines
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 status
# On branch next-1
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# .dotest/
nothing added to commit but untracked files present (use "git add" to track)
This is a rare case, then, wehre really nothing was applied.
Quoted 5 lines
How do I resolve this? When there is a problem with git-rebase I get the of fending
files merged with the conflicting parts between <<<,===,>>> respectiv ely. Easy to
edit that. But with git-am I don't seem to get such an option?
You will get the same behaviour if at least parts of the patch could be applied. In this case, it seems that nothing was applied at all.
Best regards,
Wolfgang Denk
Signature · 7 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
You could end up being oddly sad and full of a strange, diffuse com-
passion which would lead you to believe that it might be a good idea
to wipe out the whole human race and start again with amoebas.
- Terry Pratchett, _Guards! Guards!_v2 cover get at91rm9200ek working with ARM relocation
Dear Wolfgang Denk,
Quoted 10 lines
Dear Reinhard Meyer,
Quoted 4 lines · In message<[email protected]> you wrote:
Sorry, the branch name might be a misnomer. As soon as I got two other patc= hes applied,
I'll issue a pull request.OK.
Quoted 1 line
Quoted 8 lines
Quoted 6 lines
Maybe one of you can give me a hint how to fix the issue when a patch does not apply:
error: patch failed: boards.cfg:47
error: boards.cfg: patch does not apply
Patch failed at 0001.First, try to figure out why this happen.
Simply because boards.cfg was completely resorted (a few days ago) since the patch was made---
Reinhard
v2 cover get at91rm9200ek working with ARM relocation
Dear Reinhard Meyer,
Quoted 4 lines · In message <[email protected]> you wrote:
Quoted 2 lines
First, try to figure out why this happen.
Simply because boards.cfg was completely resorted (a few days ago) since the patch was made---
Well, the changes to boards.cfg are usually one-liners, so it's easy to add these manually (Just add them as last text line, and re-sort)
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Forty two.
v2 cover get at91rm9200ek working with ARM relocation
Dear Wolfgang Denk,
Quoted 10 lines
Dear Reinhard Meyer,
Quoted 4 lines · In message<[email protected]> you wrote:
Quoted 2 lines
First, try to figure out why this happen.
Simply because boards.cfg was completely resorted (a few days ago) since the patch was made---
Well, the changes to boards.cfg are usually one-liners, so it's easy to add these manually (Just add them as last text line, and re-sort)
Sure I can remove the changes to boards.cfg completely and later add them manually and squash it in. But I was expecting a less "hacking" way to do that.
What's possible in git-rebase should be possible in git-am, too.
Best Regards,
Reinhard
v2 cover get at91rm9200ek working with ARM relocation
Dear Reinhard Meyer,
Quoted 2 lines · In message <[email protected]> you wrote:
What's possible in git-rebase should be possible in git-am, too.
git-rebase will also show merge conflicts in such cases.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de God may be subtle, but He isn't plain mean. - Albert Einstein
v2 cover get at91rm9200ek working with ARM relocation
Dear Wolfgang Denk,
Quoted 5 lines
Quoted 2 lines · In message<[email protected]> you wrote:
What's possible in git-rebase should be possible in git-am, too.
git-rebase will also show merge conflicts in such cases.
I'm not not what you are trying to say here, since I stated that I wished git-am would behave the same way as git-rebase.
Anyway, I solved the problem:
git-am -3 <patch>
when this fails, do
git-am -3 --skip
edit the unmerged files
add them
git-am -3 --resolved
and all is fine.
Best Regards,
Reinhard