Merge branch 'next' of git://git.denx.de/u-boot-nios

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

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 7e00ab8c7100ac24707f3959a0df4f84350b834e..19084cec438667a7410f90e9b5a1c27d523f1725 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
@@ -250,6 +251,7 @@
  */
 #define  CONFIG_HARD_I2C               /* I2C with hardware support    */
 #undef CONFIG_SOFT_I2C                 /* I2C bit-banged               */
+#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
 
 #define I2C_INIT
 #define I2C_ACTIVE 0
@@ -375,15 +377,11 @@
  * 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 */
-#define CONFIG_SYS_MONITOR_LEN         (224 * 1024)    /* Reserve 224 KiB for Monitor  */
+
+#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* Start of U-Boot      */
+#define CONFIG_SYS_MONITOR_LEN         (0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1)
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 KiB for malloc() */
 
 /*
@@ -426,8 +424,6 @@ extern unsigned long offsetOfEnvironment;
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_BASE           0x77D00000
 
-#define CONFIG_SYS_64BIT_VSPRINTF      /* needed for nand_util.c */
-
 #define CONFIG_JFFS2_NAND 1                    /* jffs2 on nand support */
 
 /* No command line, one static partition */
@@ -461,7 +457,7 @@ extern unsigned long offsetOfEnvironment;
  * - internal SRAM (OCM=On Chip Memory) is placed to CONFIG_SYS_OCM_DATA_ADDR
  * - Stackpointer will be located to
  *   (CONFIG_SYS_INIT_RAM_ADDR&0xFFFF0000) | (CONFIG_SYS_INIT_SP_OFFSET&0x0000FFFF)
- *   in cpu/ppc4xx/start.S
+ *   in arch/powerpc/cpu/ppc4xx/start.S
  */
 
 #undef CONFIG_SYS_INIT_DCACHE_CS
@@ -500,7 +496,7 @@ extern unsigned long offsetOfEnvironment;
 #define BOOTFLAG_WARM  0x02            /* Software reboot                      */
 
 /* ################################################################################### */
-/* These defines will be used in cpu/ppc4xx/cpu_init.c to setup external chip selects  */
+/* These defines will be used in arch/powerpc/cpu/ppc4xx/cpu_init.c to setup external chip selects  */
 /* They are currently undefined cause they are initiaized in board/solidcard3/init.S   */
 
 /* This chip select accesses the boot device */