Merge git://www.denx.de/git/u-boot-marvell

[people/ms/u-boot.git] / include / configs / origen.h

diff --git a/include/configs/origen.h b/include/configs/origen.h
index dae8fd5aa487eee74b199e81ee176a25740c9ffe..26fe4024b6a3e0ad28cae7679c542b862406b6b8 100644 (file)
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -11,9 +11,6 @@
 
 #include <configs/exynos4-common.h>
 
-#define CONFIG_SYS_PROMPT              "ORIGEN # "
-
-
 /* High Level Configuration Options */
 #define CONFIG_EXYNOS4210              1       /* which is a EXYNOS4210 SoC */
 #define CONFIG_ORIGEN                  1       /* working with ORIGEN*/
@@ -40,8 +37,6 @@
 #define CONFIG_BAUDRATE                        115200
 
 /* Console configuration */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_DEFAULT_CONSOLE         "console=ttySAC1,115200n8\0"
 
 #define CONFIG_SYS_MEM_TOP_HIDE        (1 << 20)       /* ram console */
@@ -53,12 +48,6 @@
 #define S5P_CHECK_DIDLE                        0xBAD00000
 #define S5P_CHECK_LPA                  0xABAD0000
 
-#undef CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FS_GENERIC
-#define CONFIG_CMD_BOOTZ
 #define CONFIG_SUPPORT_RAW_INITRD
 
 /* MMC SPL */
@@ -96,8 +85,6 @@
        "fi;" \
        "load mmc ${mmcdev} ${loadaddr} uImage; bootm ${loadaddr} "
 
-#define CONFIG_IDENT_STRING            " for ORIGEN"
-
 #define CONFIG_CLK_1000_400_200
 
 /* MIU (Memory Interleaving Unit) */
@@ -115,7 +102,7 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x02040000
 
-/* U-boot copy size from boot Media to DRAM.*/
+/* U-Boot copy size from boot Media to DRAM.*/
 #define COPY_BL2_SIZE          0x80000
 #define BL2_START_OFFSET       ((CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)/512)
 #define BL2_SIZE_BLOC_COUNT    (COPY_BL2_SIZE/512)