Removed #ifdef CONFIG_MPC834X dependency on upmconfig function

Removed #ifdef CONFIG_MPC834X dependency on upmconfig function.

---
 cpu/mpc83xx/cpu.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

index 99ab216..848b8fd 100644
@@ -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 *) CFG_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
}

1.5.5.GIT

On Thu, 16 Oct 2008 13:49:42 -0400 richardretanubun <[email protected]> wrote:

Hi Richard,

please elaborate your commit messages to include /why/ this change is needed, not only what it does (in this particular case we can easily see what it does). Adding material from your prior mail will achieve most of this.

I'm guessing s/ggg/gg/? I've seen this before; please edit your git configuration/environment to fix this once and for all (it conflicts with the commit's author (From:) and comes into play whenever commit statistics are generated).

biggest problem is it looks like this is line wrapped anyway:

Applying: Removed #ifdef CONFIG_MPC834X dependency on upmconfig function
fatal: corrupt patch at line 20

other than that, looks good ;)

Thanks,

Kim

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.

---
Hi Kim,

Thanks for the comments, hopefully this will do the trick.

 cpu/mpc83xx/cpu.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

index 99ab216..848b8fd 100644
@@ -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 *) CFG_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
 }
 
 

1.5.5.GIT