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 d7792978f73dfe4e6b5ecbe4aee1f6effcca7ffe..1ceee9a4297869d53361c66893f643223c014607 100644 (file)
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -14,18 +14,17 @@
 #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_BAUDRATE_TABLE      { 38400, 115200 }