Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

Browse Source
master
Wolfgang Denk 17 years ago
parent 42ffcec3f9 12bc4e9425
commit fed4de0135
14 changed files with 59 additions and 21 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      common/env_nand.c
  2. 2
      cpu/mcf5227x/config.mk
  3. 2
      cpu/mcf523x/config.mk
  4. 2
      cpu/mcf52x2/config.mk
  5. 2
      cpu/mcf532x/config.mk
  6. 2
      cpu/mcf5445x/config.mk
  7. 2
      cpu/mcf547x_8x/config.mk
  8. 14
      cpu/mpc86xx/speed.c
  9. 22
      drivers/net/fsl_mcdmafec.c
  10. 4
      include/asm-m68k/global_data.h
  11. 1
      include/configs/M5475EVB.h
  12. 1
      include/configs/M5485EVB.h
  13. 8
      include/net.h
  14. 12
      post/board/lwmon5/sysmon.c

6
common/env_nand.c
Unescape View File

@ -102,7 +102,7 @@ uchar env_get_char_spec (int index)
int env_init(void)
{
#if defined(ENV_IS_EMBEDDED)
ulong total;
size_t total;
int crc1_ok = 0, crc2_ok = 0;
env_t *tmp_env1, *tmp_env2;
@ -188,7 +188,7 @@ int saveenv(void)
#else /* ! CFG_ENV_OFFSET_REDUND */
int saveenv(void)
{
ulong total;
size_t total;
int ret = 0;
puts ("Erasing Nand...");
@ -268,7 +268,7 @@ void env_relocate_spec (void)
void env_relocate_spec (void)
{
#if !defined(ENV_IS_EMBEDDED)
ulong total;
size_t total;
int ret;
total = CFG_ENV_SIZE;

2
cpu/mcf5227x/config.mk
Unescape View File

@ -24,7 +24,7 @@
#
PLATFORM_RELFLAGS += -ffixed-d7 -msep-data
ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2)
ifeq ($(findstring 4.2,$(shell $(CROSS_COMPILE)gcc --version)),4.2)
PLATFORM_CPPFLAGS += -mcpu=5208 -fPIC
else
PLATFORM_CPPFLAGS += -m5307 -fPIC

2
cpu/mcf523x/config.mk
Unescape View File

@ -24,7 +24,7 @@
#
PLATFORM_RELFLAGS += -ffixed-d7 -msep-data
ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2)
ifeq ($(findstring 4.2,$(shell $(CROSS_COMPILE)gcc --version)),4.2)
PLATFORM_CPPFLAGS += -mcpu=5235 -fPIC
else
PLATFORM_CPPFLAGS += -m5307 -fPIC

2
cpu/mcf52x2/config.mk
Unescape View File

@ -34,7 +34,7 @@ is5275:=$(shell grep CONFIG_M5275 $(TOPDIR)/include/$(cfg))
is5282:=$(shell grep CONFIG_M5282 $(TOPDIR)/include/$(cfg))
ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2)
ifeq ($(findstring 4.2,$(shell $(CROSS_COMPILE)gcc --version)),4.2)
ifneq (,$(findstring CONFIG_M5249,$(is5249)))
PLATFORM_CPPFLAGS += -mcpu=5249

2
cpu/mcf532x/config.mk
Unescape View File

@ -24,7 +24,7 @@
#
PLATFORM_RELFLAGS += -ffixed-d7 -msep-data
ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2)
ifeq ($(findstring 4.2,$(shell $(CROSS_COMPILE)gcc --version)),4.2)
PLATFORM_CPPFLAGS += -mcpu=5329 -fPIC
else
PLATFORM_CPPFLAGS += -m5307 -fPIC

2
cpu/mcf5445x/config.mk
Unescape View File

@ -24,7 +24,7 @@
#
PLATFORM_RELFLAGS += -ffixed-d7 -msep-data
ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2)
ifeq ($(findstring 4.2,$(shell $(CROSS_COMPILE)gcc --version)),4.2)
PLATFORM_CPPFLAGS += -mcpu=54455 -fPIC
else
PLATFORM_CPPFLAGS += -m5407 -fPIC

2
cpu/mcf547x_8x/config.mk
Unescape View File

@ -24,7 +24,7 @@
#
PLATFORM_RELFLAGS += -ffixed-d7 -msep-data
ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2)
ifeq ($(findstring 4.2,$(shell $(CROSS_COMPILE)gcc --version)),4.2)
PLATFORM_CPPFLAGS += -mcpu=5485 -fPIC
else
PLATFORM_CPPFLAGS += -m5407 -fPIC

14
cpu/mpc86xx/speed.c
Unescape View File

@ -105,8 +105,20 @@ int get_clocks(void)
get_sys_info(&sys_info);
gd->cpu_clk = sys_info.freqProcessor;
gd->bus_clk = sys_info.freqSystemBus;
/*
* The base clock for I2C depends on the actual SOC. Unfortunately,
* there is no pattern that can be used to determine the frequency, so
* the only choice is to look up the actual SOC number and use the value
* for that SOC. This information is taken from application note
* AN2919.
*/
#ifdef CONFIG_MPC8610
gd->i2c1_clk = sys_info.freqSystemBus;
gd->i2c2_clk = sys_info.freqSystemBus;
#else
gd->i2c1_clk = sys_info.freqSystemBus / 2;
#endif
gd->i2c2_clk = gd->i2c1_clk;
if (gd->cpu_clk != 0)
return 0;

22
drivers/net/fsl_mcdmafec.c
Unescape View File

@ -95,7 +95,11 @@ struct fec_info_dma fec_info[] = {
0, /* duplex and speed */
0, /* phy name */
0, /* phy name init */
#ifdef CFG_DMA_USE_INTSRAM
DBUF_LENGTH, /* RX BD */
#else
0, /* RX BD */
#endif
0, /* TX BD */
0, /* rx Index */
0, /* tx Index */
@ -164,7 +168,8 @@ static void dbg_fec_regs(struct eth_device *dev)
}
#endif
static void set_fec_duplex_speed(volatile fecdma_t * fecp, bd_t * bd, int dup_spd)
static void set_fec_duplex_speed(volatile fecdma_t * fecp, bd_t * bd,
int dup_spd)
{
if ((dup_spd >> 16) == FULL) {
/* Set maximum frame length */
@ -513,6 +518,9 @@ int mcdmafec_initialize(bd_t * bis)
{
struct eth_device *dev;
int i;
#ifdef CFG_DMA_USE_INTSRAM
u32 tmp = CFG_INTSRAM + 0x2000;
#endif
for (i = 0; i < sizeof(fec_info) / sizeof(fec_info[0]); i++) {
@ -533,6 +541,17 @@ int mcdmafec_initialize(bd_t * bis)
dev->recv = fec_recv;
/* setup Receive and Transmit buffer descriptor */
#ifdef CFG_DMA_USE_INTSRAM
fec_info[i].rxbd = (int)fec_info[i].rxbd + tmp;
tmp = fec_info[i].rxbd;
fec_info[i].txbd =
(int)fec_info[i].txbd + tmp + (PKTBUFSRX * sizeof(cbd_t));
tmp = fec_info[i].txbd;
fec_info[i].txbuf =
(int)fec_info[i].txbuf + tmp +
(CFG_TX_ETH_BUFFER * sizeof(cbd_t));
tmp = fec_info[i].txbuf;
#else
fec_info[i].rxbd =
(cbd_t *) memalign(CFG_CACHELINE_SIZE,
(PKTBUFSRX * sizeof(cbd_t)));
@ -541,6 +560,7 @@ int mcdmafec_initialize(bd_t * bis)
(CFG_TX_ETH_BUFFER * sizeof(cbd_t)));
fec_info[i].txbuf =
(char *)memalign(CFG_CACHELINE_SIZE, DBUF_LENGTH);
#endif
#ifdef ET_DEBUG
printf("rxbd %x txbd %x\n",

4
include/asm-m68k/global_data.h
Unescape View File

@ -47,6 +47,10 @@ typedef struct global_data {
unsigned long vco_clk;
unsigned long flb_clk;
#endif
#ifdef CONFIG_FSL_I2C
unsigned long i2c1_clk;
unsigned long i2c2_clk;
#endif
unsigned long ram_size; /* RAM size */
unsigned long reloc_off; /* Relocation Offset */
unsigned long reset_status; /* reset status register at boot */

1
include/configs/M5475EVB.h
Unescape View File

@ -72,6 +72,7 @@
# define CONFIG_MII_INIT 1
# define CONFIG_HAS_ETH1
# define CFG_DMA_USE_INTSRAM 1
# define CFG_DISCOVER_PHY
# define CFG_RX_ETH_BUFFER 32
# define CFG_TX_ETH_BUFFER 48

1
include/configs/M5485EVB.h
Unescape View File

@ -72,6 +72,7 @@
# define CONFIG_MII_INIT 1
# define CONFIG_HAS_ETH1
# define CFG_DMA_USE_INTSRAM 1
# define CFG_DISCOVER_PHY
# define CFG_RX_ETH_BUFFER 32
# define CFG_TX_ETH_BUFFER 48

8
include/net.h
Unescape View File

@ -412,10 +412,10 @@ extern void print_IPaddr (IPaddr_t);
* footprint in our tests.
*/
/* return IP *in network byteorder* */
static inline IPaddr_t NetReadIP(void *from)
static inline IPaddr_t NetReadIP(volatile void *from)
{
IPaddr_t ip;
memcpy((void*)&ip, from, sizeof(ip));
memcpy((void*)&ip, (void*)from, sizeof(ip));
return ip;
}
@ -434,9 +434,9 @@ static inline void NetWriteIP(void *to, IPaddr_t ip)
}
/* copy IP */
static inline void NetCopyIP(void *to, void *from)
static inline void NetCopyIP(volatile void *to, void *from)
{
memcpy(to, from, sizeof(IPaddr_t));
memcpy((void*)to, from, sizeof(IPaddr_t));
}
/* copy ulong */

12
post/board/lwmon5/sysmon.c
Unescape View File

@ -132,17 +132,17 @@ static sysmon_table_t sysmon_table[] =
{
"+ 5 V", "V", &sysmon_dspic, NULL, NULL,
100, 1000, 0, 0xFFFF, 0xFFFF,
VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0,
VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0,
100, 1000, -0x8000, 0x7FFF, 0xFFFF,
0x8000 + VOLTAGE_5V_MIN, 0x8000 + VOLTAGE_5V_MAX, 0,
0x8000 + VOLTAGE_5V_MIN, 0x8000 + VOLTAGE_5V_MAX, 0,
REG_VOLTAGE_5V,
},
{
"+ 5 V standby", "V", &sysmon_dspic, NULL, NULL,
100, 1000, 0, 0xFFFF, 0xFFFF,
VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
100, 1000, -0x8000, 0x7FFF, 0xFFFF,
0x8000 + VOLTAGE_5V_STANDBY_MIN, 0x8000 + VOLTAGE_5V_STANDBY_MAX, 0,
0x8000 + VOLTAGE_5V_STANDBY_MIN, 0x8000 + VOLTAGE_5V_STANDBY_MAX, 0,
REG_VOLTAGE_5V_STANDBY,
},
};

Write Preview
Loading…
Cancel
Save