summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-12-13 00:18:44 +0000
committerwdenk <wdenk>2004-12-13 00:18:44 +0000
commit689aec1b0546653cc56e61b3758f9a675500aaf0 (patch)
tree6df46050703e5882096eed7c93b8616d8ddbf4e5
parent7e6bf358d84b413b7a402079b130a9a2a1222d74 (diff)
downloadu-boot-imx-689aec1b0546653cc56e61b3758f9a675500aaf0.zip
u-boot-imx-689aec1b0546653cc56e61b3758f9a675500aaf0.tar.gz
u-boot-imx-689aec1b0546653cc56e61b3758f9a675500aaf0.tar.bz2
Patch by Steven Scholz, 12 Dec 2004:
Fix typo in AT91 memory setup.
-rw-r--r--CHANGELOG3
-rw-r--r--board/at91rm9200dk/memsetup.S2
-rw-r--r--board/cmc_pu2/memsetup.S2
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d483e05..01ee784 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.1:
======================================================================
+* Patch by Steven Scholz, 12 Dec 2004:
+ Fix typo in AT91 memory setup.
+
* Patch by Martin Krause, 27 Oct 2004:
- add support for "STK52xx" board (including PS/2 multiplexer)
- add hardware detection for TQM5200
diff --git a/board/at91rm9200dk/memsetup.S b/board/at91rm9200dk/memsetup.S
index b8a19c5..725b62e 100644
--- a/board/at91rm9200dk/memsetup.S
+++ b/board/at91rm9200dk/memsetup.S
@@ -66,7 +66,7 @@
/* sdram */
#define PIOC_ASR 0xFFFFF870
#define PIOC_ASR_VAL 0xFFFF0000 /* Configure PIOC as peripheral (D16/D31) */
-#define PIOC_BSR 0xFFFFF804
+#define PIOC_BSR 0xFFFFF874
#define PIOC_BSR_VAL 0x00000000
#define PIOC_PDR 0xFFFFF804
#define PIOC_PDR_VAL 0xFFFF0000
diff --git a/board/cmc_pu2/memsetup.S b/board/cmc_pu2/memsetup.S
index 317f16d..e6a255f 100644
--- a/board/cmc_pu2/memsetup.S
+++ b/board/cmc_pu2/memsetup.S
@@ -66,7 +66,7 @@
/* sdram */
#define PIOC_ASR 0xFFFFF870
#define PIOC_ASR_VAL 0xFFFF0000 /* Configure PIOC as peripheral (D16/D31) */
-#define PIOC_BSR 0xFFFFF804
+#define PIOC_BSR 0xFFFFF874
#define PIOC_BSR_VAL 0x00000000
#define PIOC_PDR 0xFFFFF804
#define PIOC_PDR_VAL 0xFFFF0000