Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / include / configs / rcar-gen3-common.h

diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 6c23249861fb7d1e56ee5c6c1d3a95ee011f5f10..6deed0dcd70af394e99b814f2fbcdaa1f6760d21 100644 (file)
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -12,11 +12,6 @@
 
 #include <asm/arch/rmobile.h>
 
-#define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_EXT4
-#define CONFIG_CMD_EXT4_WRITE
-
 #define CONFIG_REMAKE_ELF
 
 /* boot option */
@@ -36,12 +31,8 @@
 
 #define CONFIG_ARCH_CPU_INIT
 
-#define CONFIG_SH_GPIO_PFC
-
 /* console */
 #define CONFIG_SYS_CBSIZE              2048
-#define CONFIG_SYS_PBSIZE              \
-       (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_MAXARGS             64
@@ -49,7 +40,7 @@
 
 /* MEMORY */
 #define CONFIG_SYS_TEXT_BASE           0x50000000
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_TEXT_BASE + 0x7fff0)
+#define CONFIG_SYS_INIT_SP_ADDR                CONFIG_SYS_TEXT_BASE
 
 #define DRAM_RSV_SIZE                  0x08000000
 #if defined(CONFIG_R8A7795)
@@ -92,10 +83,6 @@
        "fdt_high=0xffffffffffffffff\0" \
        "initrd_high=0xffffffffffffffff\0"
 
-#define CONFIG_BOOTARGS        \
-       "console=ttySC0,115200 rw root=/dev/nfs "       \
-       "nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
-
 #define CONFIG_BOOTCOMMAND     \
        "tftp 0x48080000 Image; " \
        "tftp 0x48000000 Image-"CONFIG_DEFAULT_FDT_FILE"; " \