From 7276dbc4e6a1d9199dbade162cb1d144bf5cd4f4 Mon Sep 17 00:00:00 2001 From: Khang Nguyen Date: Mon, 26 Feb 2018 09:01:16 +0700 Subject: rcar-gen3: linux-renesas: Enable RPMSG_VIRTIO config depend on ICCOM This commit modifies recipe to enable RPMSG_VIRTIO config depend on ICCOM distro feature. Signed-off-by: Khang Nguyen Signed-off-by: Takamitsu Honda --- ...essage-to-be-able-to-configure-RPMSG_VIRT.patch | 27 ++++++++++++++++++++++ .../linux-libc-headers/linux-libc-headers_4.14.bb | 6 +++++ ...essage-to-be-able-to-configure-RPMSG_VIRT.patch | 27 ++++++++++++++++++++++ .../recipes-kernel/linux/linux-renesas/iccom.cfg | 1 + .../recipes-kernel/linux/linux-renesas_4.14.bb | 11 +++++++++ 5 files changed, 72 insertions(+) create mode 100644 meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-rpmsg-Add-message-to-be-able-to-configure-RPMSG_VIRT.patch create mode 100644 meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0001-rpmsg-Add-message-to-be-able-to-configure-RPMSG_VIRT.patch create mode 100644 meta-rcar-gen3/recipes-kernel/linux/linux-renesas/iccom.cfg diff --git a/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-rpmsg-Add-message-to-be-able-to-configure-RPMSG_VIRT.patch b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-rpmsg-Add-message-to-be-able-to-configure-RPMSG_VIRT.patch new file mode 100644 index 0000000..8c0a2af --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-rpmsg-Add-message-to-be-able-to-configure-RPMSG_VIRT.patch @@ -0,0 +1,27 @@ +From 1cdbf4ed4717eefa2b6237c1e63e351b62990522 Mon Sep 17 00:00:00 2001 +From: Dien Pham +Date: Fri, 23 Feb 2018 18:29:32 +0700 +Subject: [PATCH] rpmsg: Add message to be able to configure RPMSG_VIRTIO from + defconfig + +Signed-off-by: Dien Pham +--- + drivers/rpmsg/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/rpmsg/Kconfig b/drivers/rpmsg/Kconfig +index 0fe6eac..5b1e61b 100644 +--- a/drivers/rpmsg/Kconfig ++++ b/drivers/rpmsg/Kconfig +@@ -47,7 +47,7 @@ config RPMSG_QCOM_SMD + platforms. + + config RPMSG_VIRTIO +- tristate ++ tristate "Enable remote processor message and virtual I/O configure" + select RPMSG + select VIRTIO + +-- +1.9.1 + diff --git a/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.bb b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.bb index 6f31703..8585fa9 100644 --- a/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.bb +++ b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.bb @@ -1,4 +1,5 @@ require recipes-kernel/linux-libc-headers/linux-libc-headers.inc +require include/iccom-control.inc RENESAS_BSP_URL = " \ git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-bsp.git" @@ -7,4 +8,9 @@ SRCREV = "4a7e26bdbc8d210369eab25765c277200cd910a8" SRC_URI = "${RENESAS_BSP_URL};branch=${BRANCH}" +# Enable RPMSG_VIRTIO depend on ICCOM +SRC_URI_append = " \ + ${@base_conditional("USE_ICCOM", "1", " file://0001-rpmsg-Add-message-to-be-able-to-configure-RPMSG_VIRT.patch", "", d)} \ +" + S = "${WORKDIR}/git" diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0001-rpmsg-Add-message-to-be-able-to-configure-RPMSG_VIRT.patch b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0001-rpmsg-Add-message-to-be-able-to-configure-RPMSG_VIRT.patch new file mode 100644 index 0000000..8c0a2af --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0001-rpmsg-Add-message-to-be-able-to-configure-RPMSG_VIRT.patch @@ -0,0 +1,27 @@ +From 1cdbf4ed4717eefa2b6237c1e63e351b62990522 Mon Sep 17 00:00:00 2001 +From: Dien Pham +Date: Fri, 23 Feb 2018 18:29:32 +0700 +Subject: [PATCH] rpmsg: Add message to be able to configure RPMSG_VIRTIO from + defconfig + +Signed-off-by: Dien Pham +--- + drivers/rpmsg/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/rpmsg/Kconfig b/drivers/rpmsg/Kconfig +index 0fe6eac..5b1e61b 100644 +--- a/drivers/rpmsg/Kconfig ++++ b/drivers/rpmsg/Kconfig +@@ -47,7 +47,7 @@ config RPMSG_QCOM_SMD + platforms. + + config RPMSG_VIRTIO +- tristate ++ tristate "Enable remote processor message and virtual I/O configure" + select RPMSG + select VIRTIO + +-- +1.9.1 + diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/iccom.cfg b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/iccom.cfg new file mode 100644 index 0000000..a3923c1 --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/iccom.cfg @@ -0,0 +1 @@ +CONFIG_RPMSG_VIRTIO=y diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb index 61f3803..5cce5ba 100644 --- a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb +++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Linux kernel for the R-Car Generation 3 based board" require include/avb-control.inc +require include/iccom-control.inc require recipes-kernel/linux/linux-yocto.inc FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/:" @@ -22,6 +23,16 @@ SRC_URI_append = " \ ${@base_conditional("USE_AVB", "1", " file://usb-video-class.cfg", "", d)} \ " +# Enable RPMSG_VIRTIO depend on ICCOM +SUPPORT_ICCOM = " \ + file://0001-rpmsg-Add-message-to-be-able-to-configure-RPMSG_VIRT.patch \ + file://iccom.cfg \ +" + +SRC_URI_append = " \ + ${@base_conditional("USE_ICCOM", "1", "${SUPPORT_ICCOM}", "", d)} \ +" + # Add SCHED_DEBUG config fragment to support CAS SRC_URI_append = " \ ${@bb.utils.contains('MACHINE_FEATURES','cas','file://capacity_aware_migration_strategy.cfg','',d)} \ -- cgit 1.2.3-korg