From 6c543597bb4b1ecf5d8589f7abb0f39929fb7fd1 Mon Sep 17 00:00:00 2001
From: Andy Fleming <afleming@freescale.com>
Date: Mon, 13 Aug 2007 14:38:06 -0500
Subject: [PATCH] Fix minor 85xx warnings
Some patches had inserted warnings into the build:
* mpc8560ads declared data without using it
* cpu_init declared ecm and immap without using it in all CONFIGs
* MPC8548CDS.h had its default filenames changed so that they contained
"\m" in the paths. Made the defaults not Windows-specific (or
anything-specific)
Signed-off-by: Andy Fleming <afleming@freescale.com>
---
board/mpc8560ads/mpc8560ads.c | 1 -
cpu/mpc85xx/cpu_init.c | 4 +++-
include/configs/MPC8548CDS.h | 6 ++++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/board/mpc8560ads/mpc8560ads.c b/board/mpc8560ads/mpc8560ads.c
index 41acb97af7..eef524b45e 100644
--- a/board/mpc8560ads/mpc8560ads.c
+++ b/board/mpc8560ads/mpc8560ads.c
@@ -554,7 +554,6 @@ ft_soc_setup(void *blob, bd_t *bd)
{
u32 *p;
int len;
- ulong data;
p = ft_get_prop(blob, "/" OF_SOC "/cpm@e0000000/brg-frequency", &len);
diff --git a/cpu/mpc85xx/cpu_init.c b/cpu/mpc85xx/cpu_init.c
index 888417f864..c7fe130ee0 100644
--- a/cpu/mpc85xx/cpu_init.c
+++ b/cpu/mpc85xx/cpu_init.c
@@ -194,10 +194,12 @@ void cpu_init_f (void)
int cpu_init_r(void)
{
+#if defined(CONFIG_CLEAR_LAW0) || defined(CONFIG_L2_CACHE)
volatile immap_t *immap = (immap_t *)CFG_IMMR;
+#endif
+#ifdef CONFIG_CLEAR_LAW0
volatile ccsr_local_ecm_t *ecm = &immap->im_local_ecm;
-#ifdef CONFIG_CLEAR_LAW0
/* clear alternate boot location LAW (used for sdram, or ddr bank) */
ecm->lawar0 = 0;
#endif
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index d7afdbd606..dfe4f5b7a1 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -623,6 +623,7 @@ extern unsigned long get_clock_freq(void);
#define ENET_ENV ""
#endif
+#if 0
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \
@@ -634,9 +635,9 @@ extern unsigned long get_clock_freq(void);
"cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \
"consoledev=ttyS1\0" \
"ramdiskaddr=2000000\0" \
- "ramdiskfile=mpc8548cds\ramdisk.uboot\0" \
+ "ramdiskfile=ramdisk.uboot\0" \
"dtbaddr=c00000\0" \
- "dtbfile=mpc8548cds\mpc8548cds.dtb\0" \
+ "dtbfile=mpc8548cds.dtb\0" \
"eoi=mw e00400b0 0\0" \
"iack=md e00400a0 1\0" \
"ddrreg=md ${a}000 8; md ${a}080 8;md ${a}100 d; md ${a}140 4; md ${a}bf0 4;" \
@@ -658,6 +659,7 @@ extern unsigned long get_clock_freq(void);
PCI_ENV1 \
PCI_ENV2 \
ENET_ENV
+#endif
#define CONFIG_NFSBOOTCOMMAND \
--
GitLab