summaryrefslogtreecommitdiff
path: root/board/prodrive
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-10-09 00:03:18 +0200
committerWolfgang Denk <wd@denx.de>2009-10-09 00:03:18 +0200
commitcd77dd109c4a439519a78c32eddc42bdebc7a61f (patch)
treec5534647cb1786044ef0f7e4ad4067725eddf11d /board/prodrive
parent95c44ec485b46ffb43dbdaa299f1491a500fdadf (diff)
parentafc3ba0fc4195624e79e21244380ed7cc2fd6969 (diff)
downloadu-boot-imx-cd77dd109c4a439519a78c32eddc42bdebc7a61f.zip
u-boot-imx-cd77dd109c4a439519a78c32eddc42bdebc7a61f.tar.gz
u-boot-imx-cd77dd109c4a439519a78c32eddc42bdebc7a61f.tar.bz2
Merge branch 'reloc'
Diffstat (limited to 'board/prodrive')
-rw-r--r--board/prodrive/alpr/fpga.c4
-rw-r--r--board/prodrive/alpr/u-boot.lds1
-rw-r--r--board/prodrive/p3mx/p3mx.c10
-rw-r--r--board/prodrive/p3mx/u-boot.lds1
-rw-r--r--board/prodrive/p3p440/u-boot.lds1
5 files changed, 2 insertions, 15 deletions
diff --git a/board/prodrive/alpr/fpga.c b/board/prodrive/alpr/fpga.c
index 0ecebc9..7571cd9 100644
--- a/board/prodrive/alpr/fpga.c
+++ b/board/prodrive/alpr/fpga.c
@@ -244,8 +244,8 @@ int alpr_fpga_init (void)
{
int i;
- PRINTF ("%s:%d: Initialize FPGA interface (relocation offset = 0x%.8lx)\n", __FUNCTION__, __LINE__, gd->reloc_off);
- fpga_init (gd->reloc_off);
+ PRINTF ("%s:%d: Initialize FPGA interface\n", __FUNCTION__, __LINE__);
+ fpga_init ();
for (i = 0; i < CONFIG_FPGA_COUNT; i++) {
PRINTF ("%s:%d: Adding fpga %d\n", __FUNCTION__, __LINE__, i);
diff --git a/board/prodrive/alpr/u-boot.lds b/board/prodrive/alpr/u-boot.lds
index e7c5fe6..6633f91 100644
--- a/board/prodrive/alpr/u-boot.lds
+++ b/board/prodrive/alpr/u-boot.lds
@@ -69,7 +69,6 @@ SECTIONS
board/prodrive/alpr/init.o (.text)
*(.text)
- *(.fixup)
*(.got1)
}
_etext = .;
diff --git a/board/prodrive/p3mx/p3mx.c b/board/prodrive/p3mx/p3mx.c
index 0247bb8..05eca52 100644
--- a/board/prodrive/p3mx/p3mx.c
+++ b/board/prodrive/p3mx/p3mx.c
@@ -316,16 +316,6 @@ int misc_init_r ()
return 0;
}
-int board_early_init_r(void)
-{
- /* now relocate the debug serial driver */
- mpsc_putchar += gd->reloc_off;
- mpsc_getchar += gd->reloc_off;
- mpsc_test_char += gd->reloc_off;
-
- return 0;
-}
-
void after_reloc (ulong dest_addr, gd_t * gd)
{
memoryMapDeviceSpace (BOOT_DEVICE, CONFIG_SYS_BOOT_SPACE, CONFIG_SYS_BOOT_SIZE);
diff --git a/board/prodrive/p3mx/u-boot.lds b/board/prodrive/p3mx/u-boot.lds
index 632921a..d021331 100644
--- a/board/prodrive/p3mx/u-boot.lds
+++ b/board/prodrive/p3mx/u-boot.lds
@@ -63,7 +63,6 @@ SECTIONS
/* common/env_embedded.o(.text) */
*(.text)
- *(.fixup)
*(.got1)
}
_etext = .;
diff --git a/board/prodrive/p3p440/u-boot.lds b/board/prodrive/p3p440/u-boot.lds
index 9327970..b1c2dff 100644
--- a/board/prodrive/p3p440/u-boot.lds
+++ b/board/prodrive/p3p440/u-boot.lds
@@ -69,7 +69,6 @@ SECTIONS
board/prodrive/p3p440/init.o (.text)
*(.text)
- *(.fixup)
*(.got1)
}
_etext = .;