Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / include / configs / rcar-gen2-common.h

diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 68e3a23500fd83e6c4874ebd337c05c109ed0fcd..1ceee9a4297869d53361c66893f643223c014607 100644 (file)
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -11,29 +11,21 @@
 
 #include <asm/arch/rmobile.h>
 
-/* Support File sytems */
-#define CONFIG_SUPPORT_VFAT
-#define CONFIG_FS_EXT4
-#define CONFIG_EXT4_WRITE
-
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
 
 #undef CONFIG_SHOW_BOOT_PROGRESS
 
 #define CONFIG_ARCH_CPU_INIT
 
 #define CONFIG_TMU_TIMER
+#ifndef CONFIG_PINCTRL_PFC
 #define CONFIG_SH_GPIO_PFC
+#endif
 
 /* console */
-
-#define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PBSIZE              256
-#define CONFIG_SYS_MAXARGS             16
-#define CONFIG_SYS_BARGSIZE            512
 #define CONFIG_SYS_BAUDRATE_TABLE      { 38400, 115200 }
 
 #define CONFIG_SYS_SDRAM_BASE          (RCAR_GEN2_SDRAM_BASE)