Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[karo-tx-uboot.git] / include / configs / smdkv310.h

diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index fb0f04f706319d98920817d9f3846d409132ed4a..5e430660f12439de595c6af35e6fcc8d0abe66f5 100644 (file)
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2011 Samsung Electronics
  *
- * Configuration settings for the SAMSUNG SMDKV310 (S5PC210) board.
+ * Configuration settings for the SAMSUNG SMDKV310 (EXYNOS4210) board.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -28,7 +28,7 @@
 /* High Level Configuration Options */
 #define CONFIG_SAMSUNG                 1       /* in a SAMSUNG core */
 #define CONFIG_S5P                     1       /* S5P Family */
-#define CONFIG_S5PC210                 1       /* which is in a S5PC210 SoC */
+#define CONFIG_EXYNOS4210              1       /* which is a EXYNOS4210 SoC */
 #define CONFIG_SMDKV310                        1       /* working with SMDKV310*/
 
 #include <asm/arch/cpu.h>              /* get chip and board defs */
@@ -62,15 +62,15 @@
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (1 << 20))
 
 /* select serial console configuration */
-#define CONFIG_SERIAL_MULTI            1
 #define CONFIG_SERIAL1                 1       /* use SERIAL 1 */
 #define CONFIG_BAUDRATE                        115200
-#define S5PC210_DEFAULT_UART_OFFSET    0x010000
+#define EXYNOS4_DEFAULT_UART_OFFSET    0x010000
 
 /* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC             1
-#define CONFIG_MMC                     1
-#define CONFIG_S5P_MMC                 1
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC
+#define CONFIG_SDHCI
+#define CONFIG_S5P_SDHCI
 
 /* PWM */
 #define CONFIG_PWM                     1
@@ -93,13 +93,15 @@
 
 /* MMC SPL */
 #define CONFIG_SPL
+#define COPY_BL2_FNPTR_ADDR    0x00002488
+
+#define CONFIG_SPL_TEXT_BASE   0x02021410
 
 #define CONFIG_BOOTCOMMAND     "fatload mmc 0 40007000 uImage; bootm 40007000"
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER         /* use "hush" command parser    */
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_SYS_PROMPT              "SMDKV310 # "
 #define CONFIG_SYS_CBSIZE              256     /* Console I/O Buffer Size*/
 #define CONFIG_SYS_PBSIZE              384     /* Print Buffer Size */
@@ -114,12 +116,6 @@
 
 #define CONFIG_SYS_HZ                  1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
-/* Stack sizes */
-#define CONFIG_STACKSIZE               (256 << 10)     /* 256KB */
-
 /* SMDKV310 has 4 bank of DRAM */
 #define CONFIG_NR_DRAM_BANKS   4
 #define SDRAM_BANK_SIZE                (512UL << 20UL) /* 512 MB */
@@ -137,11 +133,6 @@
 #undef CONFIG_CMD_IMLS
 #define CONFIG_IDENT_STRING            " for SMDKC210/V310"
 
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ           (4*1024)        /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ           (4*1024)        /* FIQ stack */
-#endif
-
 #define CONFIG_CLK_1000_400_200
 
 /* MIU (Memory Interleaving Unit) */