diff options
| author | mark.vels@team-embedded.nl <mark.vels@team-embedded.nl> | 2010-10-05 17:46:19 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-13 21:28:54 +0200 |
| commit | 812493ad872a56c81a20232a7e89be11ec388c87 (patch) | |
| tree | 7793ab5089b3683483924478cd658985107796e6 | |
| parent | e1b4c57096b87b4ada56df4154d9acee6a59141f (diff) | |
| download | u-boot-imx-812493ad872a56c81a20232a7e89be11ec388c87.zip u-boot-imx-812493ad872a56c81a20232a7e89be11ec388c87.tar.gz u-boot-imx-812493ad872a56c81a20232a7e89be11ec388c87.tar.bz2 | |
Fix define for MPC5121 ADS board.
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>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | board/freescale/mpc5121ads/mpc5121ads.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -700,7 +700,7 @@ mpc5121ads_rev2_config \ : unconfig @mkdir -p $(obj)include @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 @$(MKCONFIG) -n $@ -a mpc5121ads powerpc mpc512x mpc5121ads freescale diff --git a/board/freescale/mpc5121ads/mpc5121ads.c b/board/freescale/mpc5121ads/mpc5121ads.c index a84644d..8cc6853 100644 --- a/board/freescale/mpc5121ads/mpc5121ads.c +++ b/board/freescale/mpc5121ads/mpc5121ads.c @@ -102,7 +102,7 @@ int board_early_init_f(void) * 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); #else 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; 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); /* initialize function mux & slew rate IO inter alia on IO Pins */ |