[meta-xilinx] [meta-xilinx-tools][PATCH 1/2] pmu-firmware: Keep recipe path consistent with meta-xilinx
Manjukumar Harthikote Matha
MANJUKUM at xilinx.com
Tue Jan 9 14:39:13 PST 2018
Applied
Thanks,
Manju
> -----Original Message-----
> From: Manjukumar Matha [mailto:manjukumar.harthikote-matha at xilinx.com]
> Sent: Wednesday, January 03, 2018 4:14 PM
> To: meta-xilinx at yoctoproject.org
> Cc: Cyril Chemparathy <cyrilc at xilinx.com>; Manjukumar Harthikote Matha
> <MANJUKUM at xilinx.com>
> Subject: [meta-xilinx-tools][PATCH 1/2] pmu-firmware: Keep recipe path consistent
> with meta-xilinx
>
> From: Cyril Chemparathy <cyril.chemparathy at xilinx.com>
>
> Make recipe path for pmu-firmware consistent with the recipe path in meta-xilinx-
> bsp layer. We can implement a preferred provider switch to select the pmu-
> firmware recipe between meta-xilinx-tools and meta-xilinx-bsp
>
> Signed-off-by: Cyril Chemparathy <cyril.chemparathy at xilinx.com>
> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha at xilinx.com>
> ---
> .../0001-zcu100-poweroff-support.patch | 42 ++++++++++++++++++++++
> recipes-bsp/pmu-firmware/pmu-firmware_git.bb | 18 ++++++++++
> .../0001-zcu100-poweroff-support.patch | 42 ----------------------
> recipes-bsp/pmu/pmu-firmware_git.bb | 18 ----------
> 4 files changed, 60 insertions(+), 60 deletions(-) create mode 100755 recipes-
> bsp/pmu-firmware/pmu-firmware/0001-zcu100-poweroff-support.patch
> create mode 100644 recipes-bsp/pmu-firmware/pmu-firmware_git.bb
> delete mode 100755 recipes-bsp/pmu/pmu-firmware/0001-zcu100-poweroff-
> support.patch
> delete mode 100644 recipes-bsp/pmu/pmu-firmware_git.bb
>
> diff --git a/recipes-bsp/pmu-firmware/pmu-firmware/0001-zcu100-poweroff-
> support.patch b/recipes-bsp/pmu-firmware/pmu-firmware/0001-zcu100-
> poweroff-support.patch
> new file mode 100755
> index 0000000..734aa31
> --- /dev/null
> +++ b/recipes-bsp/pmu-firmware/pmu-firmware/0001-zcu100-poweroff-support
> +++ .patch
> @@ -0,0 +1,42 @@
> +From 31d733ec064ad7fd96552e98fff81fb5da42a205 Mon Sep 17 00:00:00
> 2001
> +From: Sreeja Vadakattu <svadakat at xilinx.com>
> +Date: Tue, 16 May 2017 16:46:34 +0530
> +Subject: [EMBEDDEDSW PATCH] zcu100 poweroff support
> +
> +Signed-off-by: Sreeja Vadakattu <svadakat at xilinx.com>
> +---
> + lib/sw_apps/zynqmp_pmufw/src/pm_core.c | 11 +++++++++++
> + 1 files changed, 11 insertions(+), 0 deletions(-)
> +
> +diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_core.c
> +b/lib/sw_apps/zynqmp_pmufw/src/pm_core.c
> +index 13072de..587f4cc 100644
> +--- a/lib/sw_apps/zynqmp_pmufw/src/pm_core.c
> ++++ b/lib/sw_apps/zynqmp_pmufw/src/pm_core.c
> +@@ -535,6 +535,11 @@ static void PmGetApiVersion(const PmMaster *const
> master)
> + PmDbg(DEBUG_DETAILED,"version %d.%d\r\n", PM_VERSION_MAJOR,
> + PM_VERSION_MINOR);
> +
> ++ /* GPIO MIO34 power off for zcu100 poweroff is done by writing 0 -
> default setting is 1 on that pin */
> ++ u32 reg = XPfw_Read32(PMU_LOCAL_GPO1_READ);
> ++ reg |= PMU_IOMODULE_GPO1_MIO_2_MASK;
> ++ XPfw_Write32(PMU_IOMODULE_GPO1, reg);
> ++
> + IPI_RESPONSE2(master->ipiMask, XST_SUCCESS, version); }
> +
> +@@ -778,6 +783,12 @@ static void PmSystemShutdown(PmMaster* const
> master, const u32 type,
> + /* For shutdown type the subtype is irrelevant: shut the caller down */
> + if (PMF_SHUTDOWN_TYPE_SHUTDOWN == type) {
> + status = PmMasterFsm(master,
> PM_MASTER_EVENT_FORCE_DOWN);
> ++
> ++ /* GPIO MIO34 power off for zcu100 poweroff is done by writing
> 0 */
> ++ u32 reg = XPfw_Read32(PMU_LOCAL_GPO1_READ);
> ++ reg &= ~PMU_IOMODULE_GPO1_MIO_2_MASK;
> ++ XPfw_Write32(PMU_IOMODULE_GPO1, reg);
> ++
> + goto done;
> + }
> +
> +--
> +1.7.1
> +
> diff --git a/recipes-bsp/pmu-firmware/pmu-firmware_git.bb b/recipes-bsp/pmu-
> firmware/pmu-firmware_git.bb
> new file mode 100644
> index 0000000..630b881
> --- /dev/null
> +++ b/recipes-bsp/pmu-firmware/pmu-firmware_git.bb
> @@ -0,0 +1,18 @@
> +DESCRIPTION = "PMU Firmware"
> +
> +PROVIDES = "virtual/pmufw"
> +
> +SRC_URI_append_zcu100-zynqmp = " file://0001-zcu100-poweroff-
> support.patch"
> +
> +inherit xsctapp xsctyaml deploy
> +
> +COMPATIBLE_MACHINE = "^$"
> +COMPATIBLE_MACHINE_zynqmp = "zynqmp"
> +
> +XSCTH_COMPILER_DEBUG_FLAGS = "-O2 -DDEBUG_MODE -DENABLE_EM"
> +XSCTH_PROC_zynqmp = "psu_pmu_0"
> +XSCTH_APP = "ZynqMP PMU Firmware"
> +
> +do_deploy_append() {
> + ln -sf ${PN}-${MACHINE}.elf ${DEPLOYDIR}/pmu-${MACHINE}.elf }
> diff --git a/recipes-bsp/pmu/pmu-firmware/0001-zcu100-poweroff-support.patch
> b/recipes-bsp/pmu/pmu-firmware/0001-zcu100-poweroff-support.patch
> deleted file mode 100755
> index 734aa31..0000000
> --- a/recipes-bsp/pmu/pmu-firmware/0001-zcu100-poweroff-support.patch
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -From 31d733ec064ad7fd96552e98fff81fb5da42a205 Mon Sep 17 00:00:00 2001
> -From: Sreeja Vadakattu <svadakat at xilinx.com>
> -Date: Tue, 16 May 2017 16:46:34 +0530
> -Subject: [EMBEDDEDSW PATCH] zcu100 poweroff support
> -
> -Signed-off-by: Sreeja Vadakattu <svadakat at xilinx.com>
> ----
> - lib/sw_apps/zynqmp_pmufw/src/pm_core.c | 11 +++++++++++
> - 1 files changed, 11 insertions(+), 0 deletions(-)
> -
> -diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_core.c
> b/lib/sw_apps/zynqmp_pmufw/src/pm_core.c
> -index 13072de..587f4cc 100644
> ---- a/lib/sw_apps/zynqmp_pmufw/src/pm_core.c
> -+++ b/lib/sw_apps/zynqmp_pmufw/src/pm_core.c
> -@@ -535,6 +535,11 @@ static void PmGetApiVersion(const PmMaster *const
> master)
> - PmDbg(DEBUG_DETAILED,"version %d.%d\r\n", PM_VERSION_MAJOR,
> - PM_VERSION_MINOR);
> -
> -+ /* GPIO MIO34 power off for zcu100 poweroff is done by writing 0 -
> default setting is 1 on that pin */
> -+ u32 reg = XPfw_Read32(PMU_LOCAL_GPO1_READ);
> -+ reg |= PMU_IOMODULE_GPO1_MIO_2_MASK;
> -+ XPfw_Write32(PMU_IOMODULE_GPO1, reg);
> -+
> - IPI_RESPONSE2(master->ipiMask, XST_SUCCESS, version);
> - }
> -
> -@@ -778,6 +783,12 @@ static void PmSystemShutdown(PmMaster* const
> master, const u32 type,
> - /* For shutdown type the subtype is irrelevant: shut the caller down */
> - if (PMF_SHUTDOWN_TYPE_SHUTDOWN == type) {
> - status = PmMasterFsm(master,
> PM_MASTER_EVENT_FORCE_DOWN);
> -+
> -+ /* GPIO MIO34 power off for zcu100 poweroff is done by writing
> 0 */
> -+ u32 reg = XPfw_Read32(PMU_LOCAL_GPO1_READ);
> -+ reg &= ~PMU_IOMODULE_GPO1_MIO_2_MASK;
> -+ XPfw_Write32(PMU_IOMODULE_GPO1, reg);
> -+
> - goto done;
> - }
> -
> ---
> -1.7.1
> -
> diff --git a/recipes-bsp/pmu/pmu-firmware_git.bb b/recipes-bsp/pmu/pmu-
> firmware_git.bb
> deleted file mode 100644
> index 630b881..0000000
> --- a/recipes-bsp/pmu/pmu-firmware_git.bb
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -DESCRIPTION = "PMU Firmware"
> -
> -PROVIDES = "virtual/pmufw"
> -
> -SRC_URI_append_zcu100-zynqmp = " file://0001-zcu100-poweroff-
> support.patch"
> -
> -inherit xsctapp xsctyaml deploy
> -
> -COMPATIBLE_MACHINE = "^$"
> -COMPATIBLE_MACHINE_zynqmp = "zynqmp"
> -
> -XSCTH_COMPILER_DEBUG_FLAGS = "-O2 -DDEBUG_MODE -DENABLE_EM"
> -XSCTH_PROC_zynqmp = "psu_pmu_0"
> -XSCTH_APP = "ZynqMP PMU Firmware"
> -
> -do_deploy_append() {
> - ln -sf ${PN}-${MACHINE}.elf ${DEPLOYDIR}/pmu-${MACHINE}.elf
> -}
> --
> 2.7.4
More information about the meta-xilinx
mailing list