ARM: rmobile: Build u-boot-spl.srec on Gen2

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

diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 39c40d3f828f54b6240e8d3cfa8f8a4b05a1775d..60692204062accd621ae26d15dc36c963ccf64cd 100644 (file)
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -11,39 +11,25 @@
 
 #include <asm/arch/rmobile.h>
 
-#define CONFIG_CMD_DFL
-#define CONFIG_CMD_SDRAM
-
-#define CONFIG_SYS_THUMB_BUILD
-
-/* Support File sytems */
-#define CONFIG_FAT_WRITE
-#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
 
-#define CONFIG_BAUDRATE                38400
-#define CONFIG_BOOTARGS                ""
+#ifdef CONFIG_SPL
+#define CONFIG_SPL_TARGET      "spl/u-boot-spl.srec"
+#endif
 
 #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_CBSIZE              256
 #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)
@@ -57,7 +43,6 @@
 #define CONFIG_SYS_BOOTMAPSZ           (8 * 1024 * 1024)
 
 /* ENV setting */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_ADDR        0xC0000
 
 /* Common ENV setting */