Age | Commit message (Collapse) | Author | Files | Lines |
|
u-boot: Add LICENSE and S variable
- two variables are removed in upstream include files.
weston: Add 1.11.0 recipe
wayland-kms: Add wayland-native dependency
- To use wayland-scanner, wayland-native should be in DEPENDS.
gstreamer1.0-plugin-vspfilter: Add pkgconfig.bbclass
v2 (jsmoeller):
- fix weston dependencies on pyro (RecipeSpecificSysroot)
- downgrade wayland-ivi-extension alongside weston version
Bug-AGL: SPEC-646
Change-Id: I70fbdde2a67d7220e18efda7f6a5a9d5b59981df
Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
|
|
* this patch is already present in poky morty:
poky/meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch
Change-Id: I75c97b8089497c4a6264daabcf2e8a9c26a3f647
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
|
|
The upstream version of AGL boots Linux in EL1. This mode is not
privileged enough to put in place the correct configuration of
an hypervisor (e.g., KVM).
This patch leverages the ATF rcar platform configuration variables to
boot the Linux kernel in EL2, instead of EL1, allowing Linux-based
hypervisors such as KVM to configure all the necessary stubs to
properly run virtual machines.
This patch has been successfully tested with ATF, KVM and AGL rootfs
on the Renesas R-Car M3.
Changelog:
- Added arm-trusted-firmware patch, which makes this work easy
to be tested by the community
- This patch version does not contain Linux kernel modifications.
In fact, these resulted not necessary with the proposed ATF patch
and a recent kernel (higher than 4.6)
Bug-AGL: SPEC-497
Change-Id: I5a22411135b33137cb2236562b3de9c966f1be21
Signed-off-by: Michele Paolino <m.paolino@virtualopensystems.com>
|
|
Bug-AGL: SPEC-605
Change-Id: Ifed6c633b35bd86b9ae4775ebbb4ec1ea6b91911
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
|
|
* replace /usr/local with path /usr/share/renesas using:
RENESAS_DATADIR = "/usr"
- meta-rcar-gen3/include/rcar-gen3-path-common.inc
Bug-AGL: SPEC-533
Change-Id: I865ea809c3c59ba136027fc8b99628df20c16275
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
|
|
Users of gles-user-module can hit link issues since it does not have
libgbm and wayland-kms in its DEPENDS, but they are required to link
against the libraries it provides. To fix this, add them to DEPENDS
per OpenEmbedded best practices. Doing so requires spliting the EGL
headers into a separate recipe to avoid a circular dependency problem
with wayland-kms.
Bug-AGL: SPEC-429
Change-Id: If7c678b1dd0b222074dfb81823874f48ce790d88
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
|
|
Honour the LDFLAGS also in the libteec and tee-supplicant.
Fixes:
ERROR: optee-client-1.1.0+renesas+gitAUTOINC+db9c64d458-r0 do_package_qa:
QA Issue: No GNU_HASH in the elf binary: /usr/bin/tee-supplicant' [ldflags]
Bug-AGL: SPEC-509
Change-Id: I6cb4f2f6c54945ef24a7ff72441c6d91b999b9a4
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
|
|
* remove backport of init, weston-start, weston.service
and use upstream recipes file instead.
* it will be easier to maintain and integrate the BSP.
Bug-AGL: SPEC-452
Change-Id: I2bec631391c7f70916f50553fa33550f09cbf921
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
|
|
gles-control.inc and multimedia-control.inc provide var
USE_MULTIMEDIA and USE_WAYLAND_IVI_SHELL to weston-ini-conf
recipes.
Bug-AGL: SPEC-530
Change-Id: Icb063710c9e63d0532e228b400e4e392c3d6b08d
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
|
|
This reverts commit 4979e05406c77524cf90b308ce4bf2a72032ee65.
Change-Id: I842db06014c123b7f8e37fd6f071d9d58da9838f
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
|
|
* dlcsrv_REL should not be package inside gles-user-module
package. gles-user-module-debug should be a better target.
Change-Id: I32f7ce7711b25eabb3b157b4e29b87ec31b10e34
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
|
|
* Create a new recipes weston-ini-conf.
* Benefit: If you change weston.ini, you don't have to
rebuild weston.
Bug-AGL: SPEC-477
Change-Id: I7a7ab91953b000bbef5d66e1dca840cdaec47f2d
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
|
|
the populate_sysroot of gles-user-module must depends on the
populate_sysroot of the virtual/mesa, because header from
gles-user-module depends on the header from virtual/mesa.
Change-Id: I8368bba6a19ca628a3496a3eebbc18a3c41c322d
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
|
|
This solves the following warning related to package config dependency:
glmark2-2014.03+AUTOINC+fa71af2dfa-r0 do_package_qa: QA Issue: glmark2
rdepends on libwayland-egl, but it isn't a build dependency, missing
mesa in DEPENDS or PACKAGECONFIG? [build-deps]
jsmoeller: Edit Signed-off-by (e -> é) to match character for gerrit.
Change-Id: I2c448f3ddaef88c80bb5a3807bc8f96de269e5f4
Signed-off-by: Stéphane Desneux <stephane.desneux@iot.bzh>
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
|
|
Change-Id: If5101784f574a96185351e96b7c0cbd120fd90dc
Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
|
|
* rc.pvr.service should depend on weston.service not the opposite
Change-Id: Ib0516772da08a77504ae4fe98ea3c27aa9b6048a
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
|
|
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
|
|
* move wayland forward port into directory :
recipes-forward-port/wayland_fp_morty
* move renesas fix on forward port into directory :
recipes-forward-port/wayland
* weston recipes bbappend do not overwrite SRC_URI,
replace SRC_URI softly (Easier to maintain).
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
|
|
* gstreamer recipes bbappend do not overwrite SRC_URI,
replace SRC_URI softly (Easier to maintain).
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
|
|
* allow compatibility with mesa 12
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
|
|
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
|
|
Change-Id: Ic561435cb07317bd6885b18a8c14b7f30a56f547
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
|
|
Change-Id: I31b58674f5898f02372cf1ec0b4a3aa8ec0c6b6b
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
|
|
This patch corrects the problem of git submodule
when network of build environment uses http/https proxy.
Change-Id: I5ac7a63da7336f3422231863aa08c5fe69ad54df
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit updates ClickThrough copyscript to work with ZIP archive,
which is downloaded directly from URL, instead of tarball.
Change-Id: Idb3de7922d2445d8efe7934b0b9b37796607c528
Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
The operation mode of the PMIC for Salvator-X and ULCB are different:
- ULCB : PULSE MODE (PMIC_LEVEL_MODE=0)
- Salvator-X : LEVEL MODE (PMIC_LEVEL_MODE=1(default))
This commit updates arm-trusted-firmware recipe to check
PMIC_LEVEL_MODE option and to control the corresponding PMIC.
Change-Id: I152c1286d525000f58c678ec37eb6aac9502ac45
Signed-off-by: Yusuke Goda <yusuke.goda.sx@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
H3ULCB will support new board with chip WS2.0.
There will be 2 device trees for H3ULCB corresponding to 2 board types:
- r8a7795-es1-h3ulcb.dtb: for H3ULCB WS1.1
- r8a7795-h3ulcb.dtb: for H3ULCB WS2.0
Change-Id: Ic11ee3f3e734641b020e3332721babd465cce2ae
Signed-off-by: Yusuke Goda <yusuke.goda.sx@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit modifies md5sum values in copyscript and libraries versions
in cms-user-module corresponding to new CMS packages.
New packages will update following items:
BCM
- Update to v0.6.1.
- Calculation accuracy has improved.
DGC
- Update to v0.6.1.
- Add scene change detection to read register.
- Improve calculation accuracy and performance.
BLC
- Update to v0.6.0.
- Fix bug.
Change-Id: I10a9e201ea518bb5ea43fc9929424e5240ce5a68
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit modifies md5sum values of Video packages to ver.3.0.9.
Change-Id: I6fcb2f2dea27b02c1c9454a4fe56d57cf1c3c12d
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit updates SRCREV in recipe for following changes:
- Update version to v0.6.
- Fix range overflow in parsing streamid of sysfs I/F.
Change-Id: I773122bebf0716a699ad8a212c6cb770d58830c4
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit modifies md5sum values for 4/E M3 Beta2(TDM Plugin)
packages to update following items:
Extension
- Multiplicity/ADMAC/Connectivity.
New Support
- TDM Software Plugin.
Change-Id: I87a17cab5a03a347a3034a62f78987bf3bfda417
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This patch changes the GFX initscript from rc.pvr to prvinit.
Due to Linux culture, filename on /usr/bin should not have rc.* format.
Change-Id: I0fd9c1862b5f58219190e7f14ee3baf0ea465f9f
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit updates SRCREV of weston for following items:
v4l2-renderer
- Check color format at importing dmabuf.
- Translate clipping region for subtraction from opaque region.
- Fix calculation of clip region.
vsp2-renderer
- Fix destination rect for rendering.
- Fallback to GL at zooming output.
- Reset scaler usage counter correctly.
Change-Id: I83d9c3905eeeec48e09dae24f50e29fef4b5cc43
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit updates QoS driver SRCREV for following fixes:
- Fix year of Copyright.
- Fix driver version.
Change-Id: Ic0e04a5b287e797b4b85d8edd3941bdcb1d574dd
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit changes following contents:
- Update IPL and Secure Monitor Rev1.0.14 rev2.
- Update optee_os Rev1.0.8.
Change-Id: Ibc16e31545b762451eb3704f817cd0d53fc1a50d
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit updates u-boot version corresponding to BSP v3.5.3
for following items:
- Add workaround for PRR register of R-Car M3 WS1.1.
(Fix printing cpu info.)
- Fix USB2.0 ch2 found device for R-Car H3 WS2.0.
- Revert "armv8: Add ISB after cpacr_el1 update" for I/D cache ON.
Change-Id: I952aabfeec8b8518760494ba987f2cdd045b6f66
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit upgrades Linux BSP to v3.5.3
and adds device tree file for M3 Salvator-XS board to salvator-x.conf.
Linux BSP to v3.5.3 updates following items:
Kernel core
- Add workaround for PRR register of R-Car M3 WS1.1.
(Fix printing cpu info.)
- Add device tree file for Salvator-XS board with R-Car M3.
- Fix R-Car M3 Salvator-X device tree file for MIX function
of Audio driver.
Power Management
- Mark the OPP to be used during system suspend.
- Enable CPUIdle function.
- Apply new CPUIdle parameters.
Audio driver
- Confirm this driver can resume with Suspend to RAM during capture.
- Avoid SSI_MODEx settings for SSI8.
- Clear DE bit only in PDMACHCR when it stops.
- Tidyup Audio-DMAC channel for DVC.
- Enable PCM RATE until 192000.
- Fix the setting of saved_rate during the resume process.
Display driver
- Fix the problem that the flicker may occur during rendering
by the application.
- Add brs option check for VGA connector.
- Add routing set for digital RGB previously.
DMA Engine driver
- Fix release resources after interrupt process.
Ethernet driver
- Add phy-reset-gpios.
This driver can work after Suspend to RAM with Salvator-XS board.
- Fix GIS_PTMF bit clearing in ravb_ptp_interrupt.
I2C driver
- Revert and fix about unnecessary function related to Suspend to RAM.
MSIOF driver
- Fix SPI division value setting of R-Car M3
based on hardware specification.
- Allow interrupts during msiof slave mode transfer wait.
- Revert and fix about unnecessary function related to Suspend to RAM.
RWDT driver
- Fix timeout count calculation.
SCIF/HSCIF driver
- Fix panic when serial console and DMA are enabled.
- Revert about unnecessary function related to Suspend to RAM.
SD/MMC driver
- Wait for CBSY instead of SCLKDIVEN.
- Add re-tuning condition.
- Add internal DMAC reset at startup.
- Add the driver strength setting.
eMMC HS400 mode can work with R-Car M3 WS1.1 on Salvator-XS board.
Thermal driver
- Fix to support thermal for both M3 WS1.0 and WS1.1.
Video Capture driver
- Fix resuming procedure.
- Fix first field detection control.
- Fix 720x480p transfer rate.
- Fix video standard selection register setting.
Change-Id: I3b0d6237c9d0c56a9f2870f1fde89ea215f163cd
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
Carry patches to fix poky meta ppp build with 4.9 kernel
used in Yocto BSP v2.16. Fixes are in poky master branch
but have not yet been migrated to krogoth. Carry them in
a bbappend until that happens.
(From Poky rev: 81339d0113a9aafd4cce878f30071a3c1a8e2dcf
8d3a2726f6725977d83dc71a5cd08ba9a062001b)
Change-Id: Ibb9a0569ceafe3758cf23fb18647a8795e6c8b92
Signed-off-by: Stephen Lawrence <stephen.lawrence@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit backport the following commit from poky upstream:
commit 0f25619268d4eb4e4a40cac7cdb40de5bca9ade1
Author: Jackie Huang <jackie.huang@windriver.com>
Date: Sun Oct 9 08:56:07 2016 +0800
net-tools: fix building with linux-4.8
Fix a build error when using the linux-4.8 headers that results
in:
In file included from
.../sysroots/qemuarm64/usr/include/linux/if_tunnel.h:6:0,
from iptunnel.c:39:
.../qemuarm64/usr/include/linux/ip.h:85:8: error: redefinition of
'struct iphdr'
struct iphdr {
^~~~~
In file included from iptunnel.c:29:0:
.../qemuarm64/usr/include/netinet/ip.h:44:8: note: originally
defined here
struct iphdr
^~~~~
(From OE-Core rev: 94d15885c516e3bfee4fb68dfb568f4da6904052)
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without this fix, net-tools can not be compile with Linux kernel 4.8
and 4.9.
Change-Id: Iea47634822f471f5032bd7822f51735add209d91
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit configures weston to use the Genivi Compositor components
ivi-shell and ivi-extension rather than the default desktop-shell.
Default status is disabled.
To enable ivi-shell and ivi-extension,
please uncomment the following line in local.conf:
DISTRO_FEATURES_append = " ivi-shell"
Change-Id: Ia6aa51175c83bf4b9f3e887cd114b3755c1e4e09
Signed-off-by: Stephen Lawrence <stephen.lawrence@renesas.com>
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
installed
The poky systemd class has a do_install() postfunc
rm_sysvinit_initddir() that deletes the /etc/init.d directory
of a package if the systemd system unit directory contains some files.
gles-user-module supports both systemd and
sysV but uses /etc/init.d in both cases as the location
of the required script rc.pvr.
In the case when systemd only is enabled,
the class deletes the init.d directory and the file.
Until the script is converted to a service file workaround the issue
by moving the install location of rc.pvr when systemd alone is used.
(cherry picked with edits from commit 50b03a9d6cc674144f42a656b43d3e3f2805661c)
Change-Id: I8b29d610d6465bc8a786ff330f896832824f0932
Signed-off-by: Stephen Lawrence <stephen.lawrence@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit is to add judge state for ULCB.
If machine is ulcb, "RCAR_GEN3_ULCB=1" will be added to compile option.
Change-Id: Ia05f33a4362c4a7a302c8c0fc5785415f27b15b5
Signed-off-by: Yusuke Goda <yusuke.goda.sx@renesas.com>
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit addes "ulcb" into MACHINEOVERRIDES.
"ulcb" contains h3ulcb and m3ulcb.
It will help the implementation in the future
become easier to maintain for ULCB group.
Change-Id: I3c5d66f1e36e85f07d96a74f566fc1ffd5a76ee6
Signed-off-by: Yusuke Goda <yusuke.goda.sx@renesas.com>
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
Because ULCB is not mounted VIN,
they will use /dev/media0 for v4l2-renderer.
Change-Id: Idbd40a5745c8f109455c57f77bb605c9f2964d78
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit modifies md5sum value in copyscript and libraries versions
in cms-user-module corresponding to new CMS packages.
New packages will update following items:
BCM
- Performance improvement.
DGC
- BCM function FB.
- Add peak/apl/bottom/midluma to read register.
- Rounding bug that decreases by 1/255 of LUT data by levelmap.
- Drop 0-15,236-255 frequency of 64-histogram at 16-235 signal.
- The value of each bin becomes x4 by histogram 64-256 interpolation.
- S curve is generated in the range of 16-235 table in 16-235 signal.
Change-Id: Iffcd777d08e26d53c4dee750ef78ba2b639e141a
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit will update SRCREV of EthernetAVB components for
following changes:
avb-mse
- Update version to v0.5.
- Add avb-mch in DEPENDS.
- Add compile options.
- Modify mapping of ALSA/V4L2 device names.
- Fix some problems.
avb-mch
- Update version to v0.3.
- Add main functions.
avb-streaming
- Update version to v2.7.0.
- Fix minor defect.
avb-applications
- Update version to v2.7.0.
- Change URL scheme of git submodule jdksavdecc-c.
LIC_FILES_CHKSUM are also updated kernel-module-avb-mse and
kernel-module-avb-mch due to change of year in Copyright.
Change-Id: I80707a1602603696c592fb2c181de2384ddb7ebc
Signed-off-by: Masaru Nagai <masaru.nagai.vx@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit modifies SRCREV of open-avb for some fixes of gptp.
Change-Id: I7c7cb9751f13efa60dde9679351b2cc2ba51182f
Signed-off-by: Masaru Nagai <masaru.nagai.vx@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit updates md5 value for ADSP packages
to latest release for Linux H3 beta (Extension Plugin).
- [Extension] Multiplicity/ADMAC/Connectivity
Change-Id: Ie9855c3f709770a828547aed3cb0809189722ee2
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit modifies md5 values of Video packages
corresponding to Linux H3 beta release (ver.3.0.8)
Change-Id: If1538495d60d7fb9c01c6eb1cc6004cb45a88969
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|
|
This commit updates md5 value for Audio packages
to latest release for Linux H3 beta.
Change-Id: Id9d5c948442fb0df9804fbed6999ad6c02d5a9e7
Signed-off-by: Thao Nguyen <thao.nguyen.yb@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
|