From: Richard Retanubun <RichardRetanubun@ruggedcom.com>
Date: Fri, 17 Oct 2008 12:55:51 +0000 (-0400)
Subject: mpc83xx: Removed #ifdef CONFIG_MPC834X dependency on upmconfig function
X-Git-Tag: v2009.01-rc1~140
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=4a7f6b750d8de543fdf8e58acd86745010054571;ds=sidebyside

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>
---

diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c
index 05c2f33f9e..aa9b18d116 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
 }