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

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

diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 0265684e6737de59aad3b256d939f8517d1e92c2..9859f307181ca631195e11b90f917fd1df41fa5c 100644 (file)
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -29,7 +29,6 @@
 
 /* Console configuration */
 
-#define CONFIG_BOOTARGS                        "Please use defined boot"
 #define CONFIG_BOOTCOMMAND             "run mmcboot"
 #define CONFIG_DEFAULT_CONSOLE         "console=ttySAC1,115200n8\0"
 
@@ -77,7 +76,6 @@
 #define CONFIG_BOOTBLOCK       "10"
 #define CONFIG_UBIBLOCK                "9"
 
-#define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         CONFIG_MMC_DEFAULT_DEV
 #define CONFIG_ENV_SIZE                        4096
 #define CONFIG_ENV_OFFSET              ((32 - 4) << 10) /* 32KiB - 4KiB */