Merge branch 'master' into next

[u-boot] / include / configs / sc3.h

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 7e00ab8c7100ac24707f3959a0df4f84350b834e..d4697ad3f715ee0c8ae7a3791aa48890ebdecf61 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -63,6 +63,7 @@
 #define CONFIG_405GP   1
 
 #define CONFIG_BOARD_EARLY_INIT_F      1
+#define CONFIG_MISC_INIT_R             1       /* Call misc_init_r() */
 
 /*
  * Define IDE_USES_ISA_EMULATION for slower IDE access in the ISA-IO address range
@@ -375,11 +376,6 @@
  * CONFIG_SYS_FLASH_BASE   -> start address of internal flash
  * CONFIG_SYS_MONITOR_BASE -> start of u-boot
  */
-#ifndef __ASSEMBLER__
-extern unsigned long offsetOfBigFlash;
-extern unsigned long offsetOfEnvironment;
-#endif
-
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFFE00000
 #define CONFIG_SYS_MONITOR_BASE        0xFFFC0000     /* placed last 256k */