summaryrefslogtreecommitdiff
path: root/board/amcc/luan
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-01-13 15:04:37 +0100
committerStefan Roese <sr@denx.de>2008-01-13 15:04:37 +0100
commit8d79953d03e6c5b24215609997dafe4daa623cd6 (patch)
treecb9a4246cde2d32fa600461da008c7d59b57cf4b /board/amcc/luan
parent47cc23cbe9a669c510183f4f049bf703ef445f3b (diff)
parent2b2f43ed6a30ece77f76191c845ac95267daa31a (diff)
downloadu-boot-imx-8d79953d03e6c5b24215609997dafe4daa623cd6.zip
u-boot-imx-8d79953d03e6c5b24215609997dafe4daa623cd6.tar.gz
u-boot-imx-8d79953d03e6c5b24215609997dafe4daa623cd6.tar.bz2
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'board/amcc/luan')
-rw-r--r--board/amcc/luan/luan.c6
-rw-r--r--board/amcc/luan/u-boot.lds2
2 files changed, 7 insertions, 1 deletions
diff --git a/board/amcc/luan/luan.c b/board/amcc/luan/luan.c
index 0067ce0..f964511 100644
--- a/board/amcc/luan/luan.c
+++ b/board/amcc/luan/luan.c
@@ -39,6 +39,8 @@ extern flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
************************************************************************/
int board_early_init_f(void)
{
+ u32 mfr;
+
mtebc( pb0ap, 0x03800000 ); /* set chip selects */
mtebc( pb0cr, 0xffc58000 ); /* ebc0_b0cr, 4MB at 0xffc00000 CS0 */
mtebc( pb1ap, 0x03800000 );
@@ -64,6 +66,10 @@ int board_early_init_f(void)
mtdcr( uic0sr, 0x00000000 ); /* clear all interrupts */
mtdcr( uic0sr, 0xffffffff );
+ mfsdr(sdr_mfr, mfr);
+ mfr |= SDR0_MFR_FIXD; /* Workaround for PCI/DMA */
+ mtsdr(sdr_mfr, mfr);
+
return 0;
}
diff --git a/board/amcc/luan/u-boot.lds b/board/amcc/luan/u-boot.lds
index 72ce685..00ca84c 100644
--- a/board/amcc/luan/u-boot.lds
+++ b/board/amcc/luan/u-boot.lds
@@ -132,7 +132,7 @@ SECTIONS
__init_end = .;
__bss_start = .;
- .bss :
+ .bss (NOLOAD) :
{
*(.sbss) *(.scommon)
*(.dynbss)