From 2aef8f32b680f02fabaa3ade4cba493b12611b78 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 13 May 2017 15:57:40 +0200 Subject: ARM: rmobile: Allow R8A7796 Salvator-X configuration The Salvator-X can have both H3 and M3 CPU on it, drop the select R8A7795 to allow both configurations. Signed-off-by: Marek Vasut Cc: Hiroyuki Yokoyama Cc: Nobuhiro Iwamatsu --- configs/salvator-x_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'configs') diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig index b150029..8f9b5b5 100644 --- a/configs/salvator-x_defconfig +++ b/configs/salvator-x_defconfig @@ -5,6 +5,7 @@ CONFIG_RCAR_GEN3=y CONFIG_TARGET_SALVATOR_X=y CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y +CONFIG_R8A7795=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set -- cgit v1.1 From c94cb71d95d1a152d27685bc95897999ea17278d Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 13 May 2017 15:57:42 +0200 Subject: ARM: rmobile: salvator-x: Move OF_LIBFDT and CMD_FDT to board config Move these two Kconfig symbols to the salvator-x_defconfig. Signed-off-by: Marek Vasut Cc: Hiroyuki Yokoyama Cc: Nobuhiro Iwamatsu --- configs/salvator-x_defconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configs') diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig index 8f9b5b5..9fb0b89 100644 --- a/configs/salvator-x_defconfig +++ b/configs/salvator-x_defconfig @@ -5,9 +5,11 @@ CONFIG_RCAR_GEN3=y CONFIG_TARGET_SALVATOR_X=y CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_FDT=y CONFIG_R8A7795=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set +CONFIG_OF_LIBFDT=y -- cgit v1.1 From f7fda5d1c05e6c86cf60cbd16b7258be56477dfc Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 13 May 2017 15:57:43 +0200 Subject: ARM: rmobile: salvator-x: Set default device tree Set default device tree file in the salvator-x_defconfig and use it in the environment. Signed-off-by: Marek Vasut Cc: Hiroyuki Yokoyama Cc: Nobuhiro Iwamatsu --- configs/salvator-x_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'configs') diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig index 9fb0b89..8cef607 100644 --- a/configs/salvator-x_defconfig +++ b/configs/salvator-x_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_SALVATOR_X=y +CONFIG_DEFAULT_FDT_FILE=r8a7795-salvator-x.dtb CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_FDT=y -- cgit v1.1 From 50fb0c451f8219d26612451933c7905457459bc4 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 13 May 2017 15:57:46 +0200 Subject: ARM: rmobile: salvator-x: Add SD support Add support for the SD card slots on the Salvator-X board. Signed-off-by: Marek Vasut Cc: Hiroyuki Yokoyama Cc: Nobuhiro Iwamatsu --- configs/salvator-x_defconfig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'configs') diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig index 8cef607..1478b6a 100644 --- a/configs/salvator-x_defconfig +++ b/configs/salvator-x_defconfig @@ -8,9 +8,11 @@ CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_FDT=y CONFIG_R8A7795=y -# CONFIG_CMD_IMI is not set +CONFIG_SH_SDHI=y # CONFIG_CMD_IMLS is not set -# CONFIG_CMD_XIMG is not set +CONFIG_CMD_EDITENV=y +CONFIG_CMD_SAVEENV=y CONFIG_DOS_PARTITION=y -# CONFIG_MMC is not set +CONFIG_MMC=y +CONFIG_GENERIC_MMC=y CONFIG_OF_LIBFDT=y -- cgit v1.1 From 90e53f8b455e762c04cb154a381c8f1513af847f Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 13 May 2017 15:57:47 +0200 Subject: ARM: rmobile: salvator-x: Add RAVB ethernet support Add support for the AVB ethernet on the Salvator-X board. Signed-off-by: Marek Vasut Cc: Hiroyuki Yokoyama Cc: Nobuhiro Iwamatsu --- configs/salvator-x_defconfig | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'configs') diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig index 1478b6a..3738fe4 100644 --- a/configs/salvator-x_defconfig +++ b/configs/salvator-x_defconfig @@ -12,7 +12,14 @@ CONFIG_SH_SDHI=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_EDITENV=y CONFIG_CMD_SAVEENV=y +CONFIG_CMD_NET=y +CONFIG_CMD_NFS=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_DHCP=y CONFIG_DOS_PARTITION=y CONFIG_MMC=y CONFIG_GENERIC_MMC=y CONFIG_OF_LIBFDT=y +CONFIG_DM_ETH=y +CONFIG_RENESAS_RAVB=y -- cgit v1.1 From d1018f5f9f6433a0ba5da64a431c4e6fa6299962 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 13 May 2017 15:57:49 +0200 Subject: ARM: rmobile: salvator-x: Add USB support Add support for the EHCI USB. Signed-off-by: Marek Vasut Cc: Hiroyuki Yokoyama Cc: Nobuhiro Iwamatsu --- configs/salvator-x_defconfig | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'configs') diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig index 3738fe4..60e0b72 100644 --- a/configs/salvator-x_defconfig +++ b/configs/salvator-x_defconfig @@ -17,6 +17,12 @@ CONFIG_CMD_NFS=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_DHCP=y +CONFIG_CMD_USB=y +CONFIG_USB=y +CONFIG_USB_HOST=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_USB_EHCI_RCAR_GEN3=y CONFIG_DOS_PARTITION=y CONFIG_MMC=y CONFIG_GENERIC_MMC=y -- cgit v1.1 From ad663de0530f0edb607cf03d52697992a21d7ed4 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 13 May 2017 15:57:52 +0200 Subject: ARM: rmobile: salvator-x: Rename the defconfig to match the SoC Rename the salvator-x_defconfig to r8a7795_salvator-x_defconfig in preparation for the r8a7796 support on salvator-x board. Signed-off-by: Marek Vasut Cc: Hiroyuki Yokoyama Cc: Nobuhiro Iwamatsu --- configs/r8a7795_salvator-x_defconfig | 31 +++++++++++++++++++++++++++++++ configs/salvator-x_defconfig | 31 ------------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 configs/r8a7795_salvator-x_defconfig delete mode 100644 configs/salvator-x_defconfig (limited to 'configs') diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig new file mode 100644 index 0000000..60e0b72 --- /dev/null +++ b/configs/r8a7795_salvator-x_defconfig @@ -0,0 +1,31 @@ +CONFIG_ARM=y +CONFIG_ARCH_RMOBILE=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_RCAR_GEN3=y +CONFIG_TARGET_SALVATOR_X=y +CONFIG_DEFAULT_FDT_FILE=r8a7795-salvator-x.dtb +CONFIG_VERSION_VARIABLE=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_FDT=y +CONFIG_R8A7795=y +CONFIG_SH_SDHI=y +# CONFIG_CMD_IMLS is not set +CONFIG_CMD_EDITENV=y +CONFIG_CMD_SAVEENV=y +CONFIG_CMD_NET=y +CONFIG_CMD_NFS=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_USB=y +CONFIG_USB=y +CONFIG_USB_HOST=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_USB_EHCI_RCAR_GEN3=y +CONFIG_DOS_PARTITION=y +CONFIG_MMC=y +CONFIG_GENERIC_MMC=y +CONFIG_OF_LIBFDT=y +CONFIG_DM_ETH=y +CONFIG_RENESAS_RAVB=y diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig deleted file mode 100644 index 60e0b72..0000000 --- a/configs/salvator-x_defconfig +++ /dev/null @@ -1,31 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_RCAR_GEN3=y -CONFIG_TARGET_SALVATOR_X=y -CONFIG_DEFAULT_FDT_FILE=r8a7795-salvator-x.dtb -CONFIG_VERSION_VARIABLE=y -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_FDT=y -CONFIG_R8A7795=y -CONFIG_SH_SDHI=y -# CONFIG_CMD_IMLS is not set -CONFIG_CMD_EDITENV=y -CONFIG_CMD_SAVEENV=y -CONFIG_CMD_NET=y -CONFIG_CMD_NFS=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_USB=y -CONFIG_USB=y -CONFIG_USB_HOST=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_EHCI_RCAR_GEN3=y -CONFIG_DOS_PARTITION=y -CONFIG_MMC=y -CONFIG_GENERIC_MMC=y -CONFIG_OF_LIBFDT=y -CONFIG_DM_ETH=y -CONFIG_RENESAS_RAVB=y -- cgit v1.1 From adf3057f379a48af1c81a34e8ae39a58bb88c49c Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 13 May 2017 15:57:53 +0200 Subject: ARM: rmobile: salvator-x: Add R8A7796 support Add minor ifdeffery and default board config for the Salvator-XS board with R8A7796 M3 SoC. Signed-off-by: Marek Vasut Cc: Hiroyuki Yokoyama Cc: Nobuhiro Iwamatsu --- configs/r8a7796_salvator-x_defconfig | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 configs/r8a7796_salvator-x_defconfig (limited to 'configs') diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig new file mode 100644 index 0000000..d6f1840 --- /dev/null +++ b/configs/r8a7796_salvator-x_defconfig @@ -0,0 +1,31 @@ +CONFIG_ARM=y +CONFIG_ARCH_RMOBILE=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_RCAR_GEN3=y +CONFIG_TARGET_SALVATOR_X=y +CONFIG_DEFAULT_FDT_FILE=r8a7796-salvator-x.dtb +CONFIG_VERSION_VARIABLE=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_FDT=y +CONFIG_R8A7796=y +CONFIG_SH_SDHI=y +# CONFIG_CMD_IMLS is not set +CONFIG_CMD_EDITENV=y +CONFIG_CMD_SAVEENV=y +CONFIG_CMD_NET=y +CONFIG_CMD_NFS=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_USB=y +CONFIG_USB=y +CONFIG_USB_HOST=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_USB_EHCI_RCAR_GEN3=y +CONFIG_DOS_PARTITION=y +CONFIG_MMC=y +CONFIG_GENERIC_MMC=y +CONFIG_OF_LIBFDT=y +CONFIG_DM_ETH=y +CONFIG_RENESAS_RAVB=y -- cgit v1.1