aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-10-09 22:44:59 +0000
committerwdenk <wdenk>2004-10-09 22:44:59 +0000
commit30d56fae23bf830c9f9817a7f151b248a01ebe96 (patch)
tree331d303b7168827f469c141ee143a4a1e0be4658
parent63cfcbb4e20b9091e20d397fd9fee480996424d4 (diff)
downloadu-boot-linaro-stable-30d56fae23bf830c9f9817a7f151b248a01ebe96.tar.gz
Patch by Sam Song, 21 August 2004:
- Fix a typo in README - Align "(RO)" output for "flinfo" after "protect on" - Add RESET support for RPXlite_DW board; adjust CPU:BUS frequency ratio 1:1 when core frequency less than 50MHz
-rw-r--r--CHANGELOG6
-rw-r--r--README2
-rw-r--r--drivers/cfi_flash.c2
-rw-r--r--include/configs/RPXlite_DW.h12
4 files changed, 17 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f12e48fde..ce1e7342a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,12 @@
Changes since U-Boot 1.1.1:
======================================================================
+* Patch by Sam Song, 21 August 2004:
+ - Fix a typo in README
+ - Align "(RO)" output for "flinfo" after "protect on"
+ - Add RESET support for RPXlite_DW board; adjust CPU:BUS frequency
+ ratio 1:1 when core frequency less than 50MHz
+
* Patches by himba, 21 Aug 2004:
- fix some "use of label at end of compound statement" warnings
- Define type of LCD panel on lubbock board if CONFIG_LCD is used
diff --git a/README b/README
index 43539a9b2..f39add7a7 100644
--- a/README
+++ b/README
@@ -787,7 +787,7 @@ The following options need to be configured:
supported (PIP405, MIP405, MPC5200); define
CONFIG_USB_UHCI to enable it.
define CONFIG_USB_KEYBOARD to enable the USB Keyboard
- end define CONFIG_USB_STORAGE to enable the USB
+ and define CONFIG_USB_STORAGE to enable the USB
storage devices.
Note:
Supported are USB Keyboards and USB Floppy drives
diff --git a/drivers/cfi_flash.c b/drivers/cfi_flash.c
index cd22d60da..fcf213cda 100644
--- a/drivers/cfi_flash.c
+++ b/drivers/cfi_flash.c
@@ -462,7 +462,7 @@ void flash_print_info (flash_info_t * info)
if ((i % 5) == 0)
printf ("\n ");
printf (" %08lX%s",
- info->start[i], info->protect[i] ? " (RO)" : " ");
+ info->start[i], info->protect[i] ? " (RO) " : " ");
#endif
}
putc ('\n');
diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h
index 369842b13..d0e427d1c 100644
--- a/include/configs/RPXlite_DW.h
+++ b/include/configs/RPXlite_DW.h
@@ -82,8 +82,8 @@
"net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0" \
"gatewayip=172.16.115.254\0" \
"netmask=255.255.255.0\0" \
- "kernel_addr=ff880000\0" \
- "ramdisk_addr=ff980000\0" \
+ "kernel_addr=ff080000\0" \
+ "ramdisk_addr=ff200000\0" \
""
#define CONFIG_BOOTCOMMAND "run flash_self"
@@ -178,6 +178,8 @@
#define CFG_ENV_SIZE 0x8000 /* Total Size of Environment Sector */
#endif
+#define CFG_RESET_ADDRESS ((ulong)((((immap_t *)CFG_IMMR)->im_clkrst.res)))
+
/*-----------------------------------------------------------------------
* Cache Configuration
*/
@@ -249,8 +251,12 @@
* power management and some other internal clocks
*/
#define SCCR_MASK SCCR_EBDF00
-/* Up to 64MHz system clock, we use 1:2 SYSTEM/BUS ratio */
+/* Up to 48MHz system clock, we use 1:1 SYSTEM/BUS ratio */
+#if defined(RPXlite_64MHz)
#define CFG_SCCR ( SCCR_TBS | SCCR_EBDF01 ) /* %%%SCCR:0x02020000 */
+#else
+#define CFG_SCCR ( SCCR_TBS | SCCR_EBDF00 ) /* %%%SCCR:0x02000000 */
+#endif
/*-----------------------------------------------------------------------
* PCMCIA stuff