diff options
| author | Jon Loeliger <jdl@freescale.com> | 2007-11-20 14:34:57 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2007-11-20 14:34:57 -0600 |
| commit | 890e9413c0af74a3d74f37d9ab6d19784990fa0c (patch) | |
| tree | 0e802d5d143e09751f85c76bf02f94aca023d077 /board/gth2 | |
| parent | 1d8a49eca1c7bdc8db1c47a92f9014a29ead03ae (diff) | |
| parent | 9a337ddc154a10a26f117fd147b009abcdeba75a (diff) | |
| download | u-boot-imx-890e9413c0af74a3d74f37d9ab6d19784990fa0c.zip u-boot-imx-890e9413c0af74a3d74f37d9ab6d19784990fa0c.tar.gz u-boot-imx-890e9413c0af74a3d74f37d9ab6d19784990fa0c.tar.bz2 | |
Merge commit 'remotes/wd/master'
Diffstat (limited to 'board/gth2')
| -rw-r--r-- | board/gth2/gth2.c | 8 | ||||
| -rw-r--r-- | board/gth2/lowlevel_init.S | 4 | ||||
| -rw-r--r-- | board/gth2/u-boot.lds | 8 |
3 files changed, 14 insertions, 6 deletions
diff --git a/board/gth2/gth2.c b/board/gth2/gth2.c index ffeaf58..6da80dc 100644 --- a/board/gth2/gth2.c +++ b/board/gth2/gth2.c @@ -26,14 +26,13 @@ #include <asm/au1x00.h> #include <asm/addrspace.h> #include <asm/mipsregs.h> +#include <asm/io.h> #include <watchdog.h> #include "ee_access.h" static int wdi_status = 0; -unsigned long mips_io_port_base = 0; - #define SDRAM_SIZE ((64*1024*1024)-(12*4096)) @@ -147,6 +146,9 @@ int checkboard (void) default: printf ("Unsupported cpu %d, proc_id=0x%x\n", proc_id >> 24, proc_id); } + + set_io_port_base(0); + #ifdef CONFIG_IDE_PCMCIA /* PCMCIA is on a 36 bit physical address. We need to map it into a 32 bit addresses */ @@ -429,7 +431,7 @@ int misc_init_r(void){ (Rx[8] != ':') | (Rx[11] != ':') | (Rx[14] != ':')) { printf ("*** ethernet addr invalid, using default ***\n"); } else { - setenv ("ethaddr", Rx); + setenv ("ethaddr", (char *)Rx); } return (0); } diff --git a/board/gth2/lowlevel_init.S b/board/gth2/lowlevel_init.S index 983ff70..eea378a 100644 --- a/board/gth2/lowlevel_init.S +++ b/board/gth2/lowlevel_init.S @@ -413,7 +413,9 @@ noCacheJump: j clearmem nop +#if 0 .globl memtest +#endif memtest: /* Fill memory with address */ li t0, 0x80000000 @@ -434,7 +436,9 @@ mt1: lw t2, 0(t0) bne t1, zero, mt1 nop nop +#if 0 .globl clearmem +#endif clearmem: /* Clear memory */ li t0, 0x80000000 diff --git a/board/gth2/u-boot.lds b/board/gth2/u-boot.lds index 90432cb..ce53d9d 100644 --- a/board/gth2/u-boot.lds +++ b/board/gth2/u-boot.lds @@ -54,9 +54,11 @@ SECTIONS .sdata : { *(.sdata) } - __u_boot_cmd_start = .; - .u_boot_cmd : { *(.u_boot_cmd) } - __u_boot_cmd_end = .; + .u_boot_cmd : { + __u_boot_cmd_start = .; + *(.u_boot_cmd) + __u_boot_cmd_end = .; + } uboot_end_data = .; num_got_entries = (__got_end - __got_start) >> 2; |