summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Retanubun <RichardRetanubun@ruggedcom.com>2008-10-17 08:55:51 -0400
committerKim Phillips <kim.phillips@freescale.com>2008-10-21 18:41:04 -0500
commit4a7f6b750d8de543fdf8e58acd86745010054571 (patch)
tree9341c6ba64e73ea5b9ae41fda097e60dac1992a6
parent3bf1be3c0cfb1129b68cc1474119e5f323536488 (diff)
downloadu-boot-imx-4a7f6b750d8de543fdf8e58acd86745010054571.zip
u-boot-imx-4a7f6b750d8de543fdf8e58acd86745010054571.tar.gz
u-boot-imx-4a7f6b750d8de543fdf8e58acd86745010054571.tar.bz2
mpc83xx: Removed #ifdef CONFIG_MPC834X dependency on upmconfig function
This is done to allow other 83XX based platforms which also have UPM (e.g. 8360) to configure and use their UPM in u-boot. Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
-rw-r--r--cpu/mpc83xx/cpu.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c
index 05c2f33..aa9b18d 100644
--- a/cpu/mpc83xx/cpu.c
+++ b/cpu/mpc83xx/cpu.c
@@ -147,7 +147,6 @@ int checkcpu(void)
*/
void upmconfig (uint upm, uint *table, uint size)
{
-#if defined(CONFIG_MPC834X)
volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
volatile lbus83xx_t *lbus = &immap->lbus;
volatile uchar *dummy = NULL;
@@ -181,10 +180,6 @@ void upmconfig (uint upm, uint *table, uint size)
/* Set the OP field in the MxMR to "normal" and the MAD field to 000000 */
*mxmr &= 0xCFFFFFC0;
-#else
- printf("Error: %s() not defined for this configuration.\n", __FUNCTION__);
- hang();
-#endif
}