From: David Brownell <david-b@pacbell.net>
To: u-boot@lists.denx.de
Subject: [U-Boot-Users] [patch u-boot git 3/3] use correct at91rm9200 register name
Date: Fri, 18 Jan 2008 12:55:00 -0800 [thread overview]
Message-ID: <200801181255.00957.david-b@pacbell.net> (raw)
This fixes a naming bug for at91rm9200 lowlevel init code:
NOR boot flash is on chipselect 0, not chipselect 2. This
makes code use the register name from chip datasheets.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---
cpu/arm920t/at91rm9200/lowlevel_init.S | 6 +++---
include/configs/at91rm9200dk.h | 2 +-
include/configs/cmc_pu2.h | 2 +-
include/configs/csb637.h | 2 +-
include/configs/mp2usb.h | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
--- u-boot.orig/cpu/arm920t/at91rm9200/lowlevel_init.S 2008-01-14 00:29:44.000000000 -0800
+++ u-boot/cpu/arm920t/at91rm9200/lowlevel_init.S 2008-01-14 00:31:32.000000000 -0800
@@ -46,7 +46,7 @@
#define MC_ASR 0xFFFFFF04
#define MC_AASR 0xFFFFFF08
#define EBI_CFGR 0xFFFFFF64
-#define SMC2_CSR 0xFFFFFF70
+#define SMC_CSR0 0xFFFFFF70
/* clocks */
#define PLLAR 0xFFFFFC28
@@ -146,8 +146,8 @@ SMRDATA:
.word MC_AASR_VAL
.word EBI_CFGR
.word EBI_CFGR_VAL
- .word SMC2_CSR
- .word SMC2_CSR_VAL
+ .word SMC_CSR0
+ .word SMC_CSR0_VAL
.word PLLAR
.word PLLAR_VAL
.word PLLBR
--- u-boot.orig/include/configs/at91rm9200dk.h 2008-01-14 00:35:42.000000000 -0800
+++ u-boot/include/configs/at91rm9200dk.h 2008-01-14 00:36:02.000000000 -0800
@@ -51,7 +51,7 @@
#define MC_ASR_VAL 0x00000000
#define MC_AASR_VAL 0x00000000
#define EBI_CFGR_VAL 0x00000000
-#define SMC2_CSR_VAL 0x00003284 /* 16bit, 2 TDF, 4 WS */
+#define SMC_CSR0_VAL 0x00003284 /* 16bit, 2 TDF, 4 WS */
/* clocks */
#define PLLAR_VAL 0x20263E04 /* 179.712000 MHz for PCK */
--- u-boot.orig/include/configs/cmc_pu2.h 2008-01-14 00:35:43.000000000 -0800
+++ u-boot/include/configs/cmc_pu2.h 2008-01-14 00:36:05.000000000 -0800
@@ -50,7 +50,7 @@
#define MC_ASR_VAL 0x00000000
#define MC_AASR_VAL 0x00000000
#define EBI_CFGR_VAL 0x00000000
-#define SMC2_CSR_VAL 0x100032ad /* 16bit, 2 TDF, 4 WS */
+#define SMC_CSR0_VAL 0x100032ad /* 16bit, 2 TDF, 4 WS */
/* clocks */
#define PLLAR_VAL 0x2026BE04 /* 179,712 MHz for PCK */
--- u-boot.orig/include/configs/csb637.h 2008-01-14 00:35:43.000000000 -0800
+++ u-boot/include/configs/csb637.h 2008-01-14 00:36:08.000000000 -0800
@@ -51,7 +51,7 @@
#define MC_ASR_VAL 0x00000000
#define MC_AASR_VAL 0x00000000
#define EBI_CFGR_VAL 0x00000000
-#define SMC2_CSR_VAL 0x00003284 /* 16bit, 2 TDF, 4 WS */
+#define SMC_CSR0_VAL 0x00003284 /* 16bit, 2 TDF, 4 WS */
/* clocks */
#define PLLAR_VAL 0x2031BE01 /* 184.320000 MHz for PCK */
--- u-boot.orig/include/configs/mp2usb.h 2008-01-14 00:35:43.000000000 -0800
+++ u-boot/include/configs/mp2usb.h 2008-01-14 00:36:11.000000000 -0800
@@ -55,7 +55,7 @@
#define MC_ASR_VAL 0x00000000
#define MC_AASR_VAL 0x00000000
#define EBI_CFGR_VAL 0x00000000
-#define SMC2_CSR_VAL 0x00003084 /* 16bit, 2 TDF, 4 WS */
+#define SMC_CSR0_VAL 0x00003084 /* 16bit, 2 TDF, 4 WS */
/* clocks */
#define PLLAR_VAL 0x20263E04 /* 180 MHz for PCK */
next reply other threads:[~2008-01-18 20:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-18 20:55 David Brownell [this message]
2008-03-23 0:29 ` [U-Boot-Users] [patch u-boot git 3/3] use correct at91rm9200 register name Wolfgang Denk
2008-03-30 14:36 ` Jean-Christophe PLAGNIOL-VILLARD
2008-03-30 14:43 ` [U-Boot-Users] [PATCH] use correct at91rm9200 register name in m501sk board Jean-Christophe PLAGNIOL-VILLARD
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=200801181255.00957.david-b@pacbell.net \
--to=david-b@pacbell.net \
--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