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

Merge with git://www.denx.de/git/u-boot.git

Browse Source
This commit is contained in:
Peter Pearse 2007-09-11 14:26:23 +01:00
commit 9d3cb9febe
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -22,9 +22,9 @@
# #
VERSION = 1 VERSION = 1
PATCHLEVEL = 2 PATCHLEVEL = 3
SUBLEVEL = 0 SUBLEVEL = 0
EXTRAVERSION = EXTRAVERSION = -rc1
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
VERSION_FILE = $(obj)include/version_autogenerated.h VERSION_FILE = $(obj)include/version_autogenerated.h

1
cpu/arm1136/config.mk
View File

@ -31,4 +31,5 @@ PLATFORM_CPPFLAGS += -march=armv5
# #
# ========================================================================= # =========================================================================
PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
PLATFORM_CPPFLAGS +=$(call cc-option,-mno-thumb-interwork,)
PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))

8
cpu/mpc512x/fec.c
View File

@ -32,7 +32,7 @@ int fec512x_miiphy_read(char *devname, uint8 phyAddr, uint8 regAddr, uint16 * re
int fec512x_miiphy_write(char *devname, uint8 phyAddr, uint8 regAddr, uint16 data); int fec512x_miiphy_write(char *devname, uint8 phyAddr, uint8 regAddr, uint16 data);
int mpc512x_fec_init_phy(struct eth_device *dev, bd_t * bis); int mpc512x_fec_init_phy(struct eth_device *dev, bd_t * bis);
static uchar rx_buff[FEC_MAX_PKT_SIZE]; static uchar rx_buff[FEC_BUFFER_SIZE];
static int rx_buff_idx = 0; static int rx_buff_idx = 0;
/********************************************************************/ /********************************************************************/
@ -237,8 +237,8 @@ static int mpc512x_fec_init (struct eth_device *dev, bd_t * bis)
/* Set Opcode/Pause Duration Register */ /* Set Opcode/Pause Duration Register */
fec->eth->op_pause = 0x00010020; fec->eth->op_pause = 0x00010020;
/* Frame length=1518; MII mode */ /* Frame length=1522; MII mode */
fec->eth->r_cntrl = 0x05ee0024; fec->eth->r_cntrl = (FEC_MAX_FRAME_LEN << 16) | 0x24;
/* Half-duplex, heartbeat disabled */ /* Half-duplex, heartbeat disabled */
fec->eth->x_cntrl = 0x00000000; fec->eth->x_cntrl = 0x00000000;
@ -248,7 +248,7 @@ static int mpc512x_fec_init (struct eth_device *dev, bd_t * bis)
/* Setup recv fifo start and buff size */ /* Setup recv fifo start and buff size */
fec->eth->r_fstart = 0x500; fec->eth->r_fstart = 0x500;
fec->eth->r_buff_size = 0x5e0; fec->eth->r_buff_size = FEC_BUFFER_SIZE;
/* Setup BD base addresses */ /* Setup BD base addresses */
fec->eth->r_des_start = (uint32)fec->bdBase->rbd; fec->eth->r_des_start = (uint32)fec->bdBase->rbd;

7
cpu/mpc512x/fec.h
View File

@ -164,10 +164,13 @@ typedef enum {
#define FEC_RBD_NUM 32 /* The user can adjust this value */ #define FEC_RBD_NUM 32 /* The user can adjust this value */
/* packet size limit */ /* packet size limit */
#define FEC_MAX_PKT_SIZE 1536 #define FEC_MAX_FRAME_LEN 1522 /* recommended default value */
/* Buffer size must be evenly divisible by 16 */
#define FEC_BUFFER_SIZE ((FEC_MAX_FRAME_LEN + 0x10) & (~0xf))
typedef struct { typedef struct {
uint8 frame[FEC_MAX_PKT_SIZE]; uint8 frame[FEC_BUFFER_SIZE];
} mpc512x_frame; } mpc512x_frame;
typedef struct { typedef struct {

1
include/image.h
View File

@ -77,6 +77,7 @@
#define IH_CPU_NIOS2 15 /* Nios-II */ #define IH_CPU_NIOS2 15 /* Nios-II */
#define IH_CPU_BLACKFIN 16 /* Blackfin */ #define IH_CPU_BLACKFIN 16 /* Blackfin */
#define IH_CPU_AVR32 17 /* AVR32 */ #define IH_CPU_AVR32 17 /* AVR32 */
#define IH_CPU_ST200 18 /* STMicroelectronics ST200 */
/* /*
* Image Types * Image Types