LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/wd/git/u-boot/custodians

This commit is contained in:
Wolfgang Denk 2008-07-13 14:44:12 +02:00
parent dc42c7c080 0740ac26f4
commit c90d115913
18 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAKEALL
View File

@ -691,7 +691,7 @@ LIST_coldfire=" \
M52277EVB \ M52277EVB \
M5235EVB \ M5235EVB \
M5249EVB \ M5249EVB \
M5253EVB \ M5253EVBE \
M5271EVB \ M5271EVB \
M5272C3 \ M5272C3 \
M5275EVB \ M5275EVB \

2
board/BuS/EB+MCF-EV123/mii.c
View File

@ -201,7 +201,7 @@ int mii_discover_phy(struct eth_device *dev)
} }
#endif /* CFG_DISCOVER_PHY */ #endif /* CFG_DISCOVER_PHY */
int mii_init(void) __attribute__((weak,alias("__mii_init"))); void mii_init(void) __attribute__((weak,alias("__mii_init")));
void __mii_init(void) void __mii_init(void)
{ {

2
board/cobra5272/mii.c
View File

@ -200,7 +200,7 @@ int mii_discover_phy(struct eth_device *dev)
} }
#endif /* CFG_DISCOVER_PHY */ #endif /* CFG_DISCOVER_PHY */
int mii_init(void) __attribute__((weak,alias("__mii_init"))); void mii_init(void) __attribute__((weak,alias("__mii_init")));
void __mii_init(void) void __mii_init(void)
{ {

3
board/freescale/m5235evb/m5235evb.c
View File

@ -75,9 +75,11 @@ phys_size_t initdram(int board_type)
sdram->dacr0 = sdram->dacr0 =
SDRAMC_DARCn_BA(CFG_SDRAM_BASE) | SDRAMC_DARCn_CASL_C1 | SDRAMC_DARCn_BA(CFG_SDRAM_BASE) | SDRAMC_DARCn_CASL_C1 |
SDRAMC_DARCn_CBM_CMD20 | SDRAMC_DARCn_PS_32; SDRAMC_DARCn_CBM_CMD20 | SDRAMC_DARCn_PS_32;
asm("nop");
/* Initialize DMR0 */ /* Initialize DMR0 */
sdram->dmr0 = ((dramsize - 1) & 0xFFFC0000) | SDRAMC_DMRn_V; sdram->dmr0 = ((dramsize - 1) & 0xFFFC0000) | SDRAMC_DMRn_V;
asm("nop");
/* Set IP (bit 3) in DACR */ /* Set IP (bit 3) in DACR */
sdram->dacr0 |= SDRAMC_DARCn_IP; sdram->dacr0 |= SDRAMC_DARCn_IP;
@ -100,6 +102,7 @@ phys_size_t initdram(int board_type)
/* Finish the configuration by issuing the MRS. */ /* Finish the configuration by issuing the MRS. */
sdram->dacr0 |= SDRAMC_DARCn_IMRS; sdram->dacr0 |= SDRAMC_DARCn_IMRS;
asm("nop");
/* Write to the SDRAM Mode Register */ /* Write to the SDRAM Mode Register */
*(u32 *) (CFG_SDRAM_BASE + 0x400) = 0xA5A59696; *(u32 *) (CFG_SDRAM_BASE + 0x400) = 0xA5A59696;

2
cpu/mcf5227x/cpu_init.c
View File

@ -106,7 +106,7 @@ void cpu_init_f(void)
*/ */
int cpu_init_r(void) int cpu_init_r(void)
{ {
#ifdef CONFIG_MCFTMR #ifdef CONFIG_MCFRTC
volatile rtc_t *rtc = (volatile rtc_t *)(CFG_MCFRTC_BASE); volatile rtc_t *rtc = (volatile rtc_t *)(CFG_MCFRTC_BASE);
volatile rtcex_t *rtcex = (volatile rtcex_t *)&rtc->extended; volatile rtcex_t *rtcex = (volatile rtcex_t *)&rtc->extended;
u32 oscillator = CFG_RTC_OSCILLATOR; u32 oscillator = CFG_RTC_OSCILLATOR;

12
cpu/mcf52x2/cpu_init.c
View File

@ -419,8 +419,7 @@ void cpu_init_f(void)
else is doing it! */ else is doing it! */
#if defined(CFG_CS0_BASE) & defined(CFG_CS0_SIZE) & \ #if defined(CFG_CS0_BASE) & defined(CFG_CS0_SIZE) & \
defined(CFG_CS0_WIDTH) & defined(CFG_CS0_RO) & \ defined(CFG_CS0_WIDTH) & defined(CFG_CS0_WS)
defined(CFG_CS0_WS)
MCFCSM_CSAR0 = (CFG_CS0_BASE >> 16) & 0xFFFF; MCFCSM_CSAR0 = (CFG_CS0_BASE >> 16) & 0xFFFF;
@ -447,8 +446,7 @@ void cpu_init_f(void)
#endif #endif
#if defined(CFG_CS1_BASE) & defined(CFG_CS1_SIZE) & \ #if defined(CFG_CS1_BASE) & defined(CFG_CS1_SIZE) & \
defined(CFG_CS1_WIDTH) & defined(CFG_CS1_RO) & \ defined(CFG_CS1_WIDTH) & defined(CFG_CS1_WS)
defined(CFG_CS1_WS)
MCFCSM_CSAR1 = (CFG_CS1_BASE >> 16) & 0xFFFF; MCFCSM_CSAR1 = (CFG_CS1_BASE >> 16) & 0xFFFF;
@ -476,8 +474,7 @@ void cpu_init_f(void)
#endif #endif
#if defined(CFG_CS2_BASE) & defined(CFG_CS2_SIZE) & \ #if defined(CFG_CS2_BASE) & defined(CFG_CS2_SIZE) & \
defined(CFG_CS2_WIDTH) & defined(CFG_CS2_RO) & \ defined(CFG_CS2_WIDTH) & defined(CFG_CS2_WS)
defined(CFG_CS2_WS)
MCFCSM_CSAR2 = (CFG_CS2_BASE >> 16) & 0xFFFF; MCFCSM_CSAR2 = (CFG_CS2_BASE >> 16) & 0xFFFF;
@ -505,8 +502,7 @@ void cpu_init_f(void)
#endif #endif
#if defined(CFG_CS3_BASE) & defined(CFG_CS3_SIZE) & \ #if defined(CFG_CS3_BASE) & defined(CFG_CS3_SIZE) & \
defined(CFG_CS3_WIDTH) & defined(CFG_CS3_RO) & \ defined(CFG_CS3_WIDTH) & defined(CFG_CS3_WS)
defined(CFG_CS3_WS)
MCFCSM_CSAR3 = (CFG_CS3_BASE >> 16) & 0xFFFF; MCFCSM_CSAR3 = (CFG_CS3_BASE >> 16) & 0xFFFF;

2
cpu/mcf52x2/speed.c
View File

@ -69,7 +69,7 @@ int get_clocks (void)
/* Setup PLL */ /* Setup PLL */
pll->syncr = 0x01080000; pll->syncr = 0x01080000;
while (!(pll->synsr & FMPLL_SYNSR_LOCK) while (!(pll->synsr & FMPLL_SYNSR_LOCK))
; ;
pll->syncr = 0x01000000; pll->syncr = 0x01000000;
while (!(pll->synsr & FMPLL_SYNSR_LOCK)) while (!(pll->synsr & FMPLL_SYNSR_LOCK))

6
cpu/mcf5445x/config.mk
View File

@ -29,3 +29,9 @@ PLATFORM_CPPFLAGS += -mcpu=54455 -fPIC
else else
PLATFORM_CPPFLAGS += -m5407 -fPIC PLATFORM_CPPFLAGS += -m5407 -fPIC
endif endif
ifneq (,$(findstring -linux-,$(shell $(CC) --version)))
ifneq (,$(findstring GOT,$(shell $(LD) --help)))
PLATFORM_LDFLAGS += --got=single
endif
endif

2
cpu/mcf5445x/cpu_init.c
View File

@ -110,7 +110,7 @@ void cpu_init_f(void)
*/ */
int cpu_init_r(void) int cpu_init_r(void)
{ {
#ifdef CONFIG_MCFTMR #ifdef CONFIG_MCFRTC
volatile rtc_t *rtc = (volatile rtc_t *)(CFG_MCFRTC_BASE); volatile rtc_t *rtc = (volatile rtc_t *)(CFG_MCFRTC_BASE);
volatile rtcex_t *rtcex = (volatile rtcex_t *)&rtc->extended; volatile rtcex_t *rtcex = (volatile rtcex_t *)&rtc->extended;

2
cpu/mcf5445x/start.S
View File

@ -253,7 +253,7 @@ clear_bss:
/* exception code */ /* exception code */
.globl _fault .globl _fault
_fault: _fault:
jmp _fault bra _fault
.globl _exc_handler .globl _exc_handler
_exc_handler: _exc_handler:

6
cpu/mcf547x_8x/config.mk
View File

@ -29,3 +29,9 @@ PLATFORM_CPPFLAGS += -mcpu=5485 -fPIC
else else
PLATFORM_CPPFLAGS += -m5407 -fPIC PLATFORM_CPPFLAGS += -m5407 -fPIC
endif endif
ifneq (,$(findstring -linux-,$(shell $(CC) --version)))
ifneq (,$(findstring GOT,$(shell $(LD) --help)))
PLATFORM_LDFLAGS += --got=single
endif
endif

2
cpu/mcf547x_8x/start.S
View File

@ -259,7 +259,7 @@ clear_bss:
/* exception code */ /* exception code */
.globl _fault .globl _fault
_fault: _fault:
jmp _fault bra _fault
.globl _exc_handler .globl _exc_handler
_exc_handler: _exc_handler:

4
drivers/serial/mcfuart.c
View File

@ -63,8 +63,8 @@ int serial_init(void)
uart->umr = UART_UMR_SB_STOP_BITS_1; uart->umr = UART_UMR_SB_STOP_BITS_1;
/* Setting up BaudRate */ /* Setting up BaudRate */
counter = (u32) (gd->bus_clk / (gd->baudrate)); counter = (u32) ((gd->bus_clk / 32) + (gd->baudrate / 2));
counter >>= 5; counter = counter / gd->baudrate;
/* write to CTUR: divide counter upper byte */ /* write to CTUR: divide counter upper byte */
uart->ubg1 = (u8) ((counter & 0xff00) >> 8); uart->ubg1 = (u8) ((counter & 0xff00) >> 8);

2
include/asm-m68k/timer.h
View File

@ -33,7 +33,7 @@
/****************************************************************************/ /****************************************************************************/
/* DMA Timer module registers */ /* DMA Timer module registers */
typedef struct dtimer_ctrl { typedef struct dtimer_ctrl {
#if defined(CONFIG_M5249) || defined(CONFIG_M5253) #if defined(CONFIG_M5249) || defined(CONFIG_M5253) || defined(CONFIG_M5272)
u16 tmr; /* 0x00 Mode register */ u16 tmr; /* 0x00 Mode register */
u16 res1; /* 0x02 */ u16 res1; /* 0x02 */
u16 trr; /* 0x04 Reference register */ u16 trr; /* 0x04 Reference register */

2
include/configs/EB+MCF-EV123.h
View File

@ -84,6 +84,8 @@
#define CONFIG_CMD_MII #define CONFIG_CMD_MII
#define CONFIG_CMD_NET #define CONFIG_CMD_NET
#define CONFIG_MCFTMR
#define CONFIG_MCFFEC #define CONFIG_MCFFEC
#ifdef CONFIG_MCFFEC #ifdef CONFIG_MCFFEC
# define CONFIG_NET_MULTI 1 # define CONFIG_NET_MULTI 1

4
include/configs/M5475EVB.h
View File

@ -303,9 +303,9 @@
#define CFG_CS0_CTRL 0x00101980 #define CFG_CS0_CTRL 0x00101980
#ifdef CFG_NOR1SZ #ifdef CFG_NOR1SZ
#define CFG_CS1_BASE 0xF8000000 #define CFG_CS1_BASE 0xE0000000
#define CFG_CS1_MASK (((CFG_NOR1SZ << 20) - 1) & 0xFFFF0001) #define CFG_CS1_MASK (((CFG_NOR1SZ << 20) - 1) & 0xFFFF0001)
#define CFG_CS1_CTRL 0x00000D80 #define CFG_CS1_CTRL 0x00101D80
#endif #endif
#endif /* _M5475EVB_H */ #endif /* _M5475EVB_H */

4
include/configs/M5485EVB.h
View File

@ -289,9 +289,9 @@
#define CFG_CS0_CTRL 0x00101980 #define CFG_CS0_CTRL 0x00101980
#ifdef CFG_NOR1SZ #ifdef CFG_NOR1SZ
#define CFG_CS1_BASE 0xF8000000 #define CFG_CS1_BASE 0xE0000000
#define CFG_CS1_MASK (((CFG_NOR1SZ << 20) - 1) & 0xFFFF0001) #define CFG_CS1_MASK (((CFG_NOR1SZ << 20) - 1) & 0xFFFF0001)
#define CFG_CS1_CTRL 0x00000D80 #define CFG_CS1_CTRL 0x00101D80
#endif #endif
#endif /* _M5485EVB_H */ #endif /* _M5485EVB_H */

6
lib_m68k/board.c
View File

@ -176,7 +176,7 @@ typedef int (init_fnc_t) (void);
static int init_baudrate (void) static int init_baudrate (void)
{ {
uchar tmp[64]; /* long enough for environment variables */ char tmp[64]; /* long enough for environment variables */
int i = getenv_r ("baudrate", tmp, sizeof (tmp)); int i = getenv_r ("baudrate", tmp, sizeof (tmp));
gd->baudrate = (i > 0) gd->baudrate = (i > 0)
@ -267,7 +267,7 @@ board_init_f (ulong bootflag)
#ifdef CONFIG_PRAM #ifdef CONFIG_PRAM
int i; int i;
ulong reg; ulong reg;
uchar tmp[64]; /* long enough for environment variables */ char tmp[64]; /* long enough for environment variables */
#endif #endif
/* Pointer is writable since we allocated a register for it */ /* Pointer is writable since we allocated a register for it */
@ -752,7 +752,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
*/ */
{ {
ulong pram; ulong pram;
uchar memsz[32]; char memsz[32];
#ifdef CONFIG_PRAM #ifdef CONFIG_PRAM
char *s; char *s;