GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 01:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix define for MPC5121 ADS board.

Browse source 
Originally the Makefile defines CONFIG_ADS5121_REV2 when configuring
for board mpc5121ads_rev2. The config in include/configs/mpc5121ads.h
expects a define CONFIG_MPC5121ADS_REV2 for this.
Therefore there are two defines used but only 1 is defined.
This patch renames references to CONFIG_ADS5121_REV2 to CONFIG_MPC5121ADS_REV2
to have one common define.

This patch fixes faulty mem size detection caused by wrong config in
include/configs/mpc5121ads.h

Signed-off-by: Mark Vels <mark.vels@team-embedded.nl>
This commit is contained in:
mark.vels@team-embedded.nl 2010-10-05 17:46:19 +02:00 • committed by Wolfgang Denk
parent e1b4c57096
commit 812493ad87
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -700,7 +700,7 @@ mpc5121ads_rev2_config \
: unconfig : unconfig
@mkdir -p $(obj)include @mkdir -p $(obj)include
@if [ "$(findstring rev2,$@)" ] ; then \ @if [ "$(findstring rev2,$@)" ] ; then \
echo "#define CONFIG_ADS5121_REV2 1" > $(obj)include/config.h; \ echo "#define CONFIG_MPC5121ADS_REV2 1" > $(obj)include/config.h; \
fi fi
@$(MKCONFIG) -n $@ -a mpc5121ads powerpc mpc512x mpc5121ads freescale @$(MKCONFIG) -n $@ -a mpc5121ads powerpc mpc512x mpc5121ads freescale

4
board/freescale/mpc5121ads/mpc5121ads.c
View file

@ -102,7 +102,7 @@ int board_early_init_f(void)
* write commands in order to establish the device ID. * write commands in order to establish the device ID.
*/ */
#ifdef CONFIG_ADS5121_REV2 #ifdef CONFIG_MPC5121ADS_REV2
out_8((u8 *)(CONFIG_SYS_CPLD_BASE + 0x08), 0xC1); out_8((u8 *)(CONFIG_SYS_CPLD_BASE + 0x08), 0xC1);
#else #else
if (in_8((u8 *)(CONFIG_SYS_CPLD_BASE + 0x08)) & 0x04) { if (in_8((u8 *)(CONFIG_SYS_CPLD_BASE + 0x08)) & 0x04) {
@ -329,7 +329,7 @@ int checkboard (void)
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR; volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
u32 spridr = in_be32(&im->sysconf.spridr); u32 spridr = in_be32(&im->sysconf.spridr);
printf ("Board: ADS5121 rev. 0x%04x (CPLD rev. 0x%02x)\n", printf ("Board: MPC5121ADS rev. 0x%04x (CPLD rev. 0x%02x)\n",
brd_rev, cpld_rev); brd_rev, cpld_rev);
/* initialize function mux & slew rate IO inter alia on IO Pins */ /* initialize function mux & slew rate IO inter alia on IO Pins */