Merge git://git.denx.de/u-boot-tegra

[people/ms/u-boot.git] / arch / powerpc / cpu / mpc85xx / mp.c

diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index 5f198eb305d0d24d8bd7b206f0b4fdc995c2c778..2ea9f5c7be0fe4c4869776d0920c051046394b33 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
@@ -11,7 +11,7 @@
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <asm/fsl_law.h>
-#include <asm/fsl_ddr_sdram.h>
+#include <fsl_ddr_sdram.h>
 #include "mp.h"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -30,8 +30,8 @@ u32 get_my_id()
  */
 int hold_cores_in_reset(int verbose)
 {
-       /* Default to no, overriden by 'y', 'yes', 'Y', 'Yes', or '1' */
-       if (getenv_yesno("mp_holdoff") == 1) {
+       /* Default to no, overridden by 'y', 'yes', 'Y', 'Yes', or '1' */
+       if (env_get_yesno("mp_holdoff") == 1) {
                if (verbose) {
                        puts("Secondary cores are being held in reset.\n");
                        puts("See 'mp_holdoff' environment variable\n");