diff options
Diffstat (limited to 'board/ep8260')
| -rw-r--r-- | board/ep8260/Makefile | 2 | ||||
| -rw-r--r-- | board/ep8260/ep8260.c | 1 | ||||
| -rw-r--r-- | board/ep8260/flash.c | 8 | ||||
| -rw-r--r-- | board/ep8260/mii_phy.c | 7 | ||||
| -rw-r--r-- | board/ep8260/u-boot.lds | 6 |
5 files changed, 13 insertions, 11 deletions
diff --git a/board/ep8260/Makefile b/board/ep8260/Makefile index 1c631dce42..477e5eedeb 100644 --- a/board/ep8260/Makefile +++ b/board/ep8260/Makefile @@ -28,7 +28,7 @@ LIB = lib$(BOARD).a OBJS = $(BOARD).o flash.o mii_phy.o $(LIB): .depend $(OBJS) - $(AR) crv $@ $^ + $(AR) crv $@ $(OBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/ep8260/ep8260.c b/board/ep8260/ep8260.c index dc33edb865..a49c53e7c4 100644 --- a/board/ep8260/ep8260.c +++ b/board/ep8260/ep8260.c @@ -307,4 +307,3 @@ initdram(int board_type) #endif /* CFG_RAMBOOT */ return (size * 1024 * 1024); } - diff --git a/board/ep8260/flash.c b/board/ep8260/flash.c index d9dbdbee92..cdfdcf2664 100644 --- a/board/ep8260/flash.c +++ b/board/ep8260/flash.c @@ -67,7 +67,7 @@ ulong flash_get_size( ulong baseaddr, flash_info_t *info ) flashtest_l = V_ULONG(baseaddr + 4); if ((int)flashtest_h == AMD_MANUFACT) { - info->flash_id = FLASH_MAN_AMD; + info->flash_id = FLASH_MAN_AMD; } else { info->flash_id = FLASH_UNKNOWN; info->sector_count = 0; @@ -102,10 +102,10 @@ ulong flash_get_size( ulong baseaddr, flash_info_t *info ) for (i = 0; i < info->sector_count; i++) { /* read sector protection at sector address, (A7 .. A0) = 0x02 */ if ((V_ULONG( info->start[i] + 16 ) & 0x00010001) || - (V_ULONG( info->start[i] + 20 ) & 0x00010001)) { + (V_ULONG( info->start[i] + 20 ) & 0x00010001)) { info->protect[i] = 1; /* D0 = 1 if protected */ } else { - info->protect[i] = 0; + info->protect[i] = 0; } } @@ -387,7 +387,7 @@ static int write_dword (flash_info_t *info, ulong dest, unsigned char * pdata) /* data polling for D7 */ start = get_timer (0); while (((V_ULONG( dest ) & 0x00800080) != (ch & 0x00800080)) || - ((V_ULONG( dest + 4 ) & 0x00800080) != (cl & 0x00800080))) { + ((V_ULONG( dest + 4 ) & 0x00800080) != (cl & 0x00800080))) { if (get_timer(start) > CFG_FLASH_WRITE_TOUT) { return (1); } diff --git a/board/ep8260/mii_phy.c b/board/ep8260/mii_phy.c index e3b7878aa1..813f020ee9 100644 --- a/board/ep8260/mii_phy.c +++ b/board/ep8260/mii_phy.c @@ -38,7 +38,7 @@ mii_discover_phy(void) if (phy_reg & 0x0400) printf("Phy operating at %d MBit/s in %s-duplex mode\n", phy_reg & 0x4000 ? 100 : 10, - phy_reg & 0x0200 ? "full" : "half"); + phy_reg & 0x0200 ? "full" : "half"); else printf("bad link!!\n"); /* @@ -59,7 +59,7 @@ mii_phy_read(unsigned short reg) tmp = 0x6002 | (adr << 7) | (reg << 2); regs->bcsr4 = 0xC3; for (i = 0; i < 64; i++) { - regs->bcsr4 ^= MII_MDCK; + regs->bcsr4 ^= MII_MDCK; } for (i = 0; i < 16; i++) { regs->bcsr4 &= ~MII_MDCK; @@ -92,7 +92,7 @@ mii_phy_write(unsigned short reg, unsigned short val) } for (i = 0; i < 16; i++) { regs->bcsr4 &= ~MII_MDCK; - if (tmp & 0x8000) regs->bcsr4 |= MII_MDIO; + if (tmp & 0x8000) regs->bcsr4 |= MII_MDIO; else regs->bcsr4 &= ~MII_MDIO; regs->bcsr4 |= MII_MDCK; tmp <<= 1; @@ -105,4 +105,3 @@ mii_phy_write(unsigned short reg, unsigned short val) val <<= 1; } } - diff --git a/board/ep8260/u-boot.lds b/board/ep8260/u-boot.lds index a6c2ef5b89..4ea3c86153 100644 --- a/board/ep8260/u-boot.lds +++ b/board/ep8260/u-boot.lds @@ -95,6 +95,11 @@ SECTIONS _edata = .; PROVIDE (edata = .); + __u_boot_cmd_start = .; + .u_boot_cmd : { *(.u_boot_cmd) } + __u_boot_cmd_end = .; + + __start___ex_table = .; __ex_table : { *(__ex_table) } __stop___ex_table = .; @@ -117,4 +122,3 @@ SECTIONS _end = . ; PROVIDE (end = .); } - |
