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

Fix DPRAM offset/size for MPC8541/8555. 

Simplify TQM85xx Makefile handling.
This commit is contained in:
Wolfgang Denk 2005-12-06 15:02:31 +01:00
parent 41253be442
commit a889bd27ef
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -2,6 +2,9 @@
Changes for U-Boot 1.1.4: Changes for U-Boot 1.1.4:
====================================================================== ======================================================================
* Fix DPRAM offset/size for MPC8541/8555.
Simplify TQM85xx Makefile handling.
* Fix data overflow (typo?) in rtc/ds1302.c * Fix data overflow (typo?) in rtc/ds1302.c
* Fix U-Boot compilation for MIPS boards using ELDK 4.0 * Fix U-Boot compilation for MIPS boards using ELDK 4.0

7
Makefile
View File

@ -1329,12 +1329,7 @@ TQM8540_config \
TQM8541_config \ TQM8541_config \
TQM8555_config \ TQM8555_config \
TQM8560_config: unconfig TQM8560_config: unconfig
@case "$@" in \ @CTYPE=$(subst TQM,,$(@:_config=)); \
TQM8540_config) CTYPE=8540;; \
TQM8541_config) CTYPE=8541;; \
TQM8555_config) CTYPE=8555;; \
TQM8560_config) CTYPE=8560;; \
esac; \
>include/config.h ; \ >include/config.h ; \
echo "... TQM"$${CTYPE}; \ echo "... TQM"$${CTYPE}; \
echo "#define CONFIG_MPC$${CTYPE}">>include/config.h; \ echo "#define CONFIG_MPC$${CTYPE}">>include/config.h; \

4
cpu/mpc85xx/ether_fcc.c
View File

@ -307,7 +307,9 @@ static int fec_init(struct eth_device* dev, bd_t *bis)
* Allocate space in the reserved FCC area of DPRAM for the * Allocate space in the reserved FCC area of DPRAM for the
* internal buffers. No one uses this space (yet), so we * internal buffers. No one uses this space (yet), so we
* can do this. Later, we will add resource management for * can do this. Later, we will add resource management for
* this area. CPM_FCC_SPECIAL_BASE: 0xb000. * this area.
* CPM_FCC_SPECIAL_BASE: 0xB000 for MPC8540, MPC8560
* 0x9000 for MPC8541, MPC8555
*/ */
mem_addr = CPM_FCC_SPECIAL_BASE + ((info->ether_index) * 64); mem_addr = CPM_FCC_SPECIAL_BASE + ((info->ether_index) * 64);
pram_ptr->fen_genfcc.fcc_riptr = mem_addr; pram_ptr->fen_genfcc.fcc_riptr = mem_addr;

9
include/asm-ppc/cpm_85xx.h
View File

@ -77,9 +77,14 @@
* downloading RAM microcode. * downloading RAM microcode.
*/ */
#define CPM_DATAONLY_BASE ((uint)128) #define CPM_DATAONLY_BASE ((uint)128)
#define CPM_DP_NOSPACE ((uint)0x7FFFFFFF)
#if defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555)
#define CPM_FCC_SPECIAL_BASE ((uint)0x00009000)
#define CPM_DATAONLY_SIZE ((uint)(8 * 1024) - CPM_DATAONLY_BASE)
#else /* MPC8540, MPC8560 */
#define CPM_FCC_SPECIAL_BASE ((uint)0x0000B000)
#define CPM_DATAONLY_SIZE ((uint)(16 * 1024) - CPM_DATAONLY_BASE) #define CPM_DATAONLY_SIZE ((uint)(16 * 1024) - CPM_DATAONLY_BASE)
#define CPM_DP_NOSPACE ((uint)0x7fffffff) #endif
#define CPM_FCC_SPECIAL_BASE ((uint)0x0000b000)
/* The number of pages of host memory we allocate for CPM. This is /* The number of pages of host memory we allocate for CPM. This is
* done early in kernel initialization to get physically contiguous * done early in kernel initialization to get physically contiguous