armadeus-commitlog Mailing List for armadeus (Page 23)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Julien B a. A. <ar...@us...> - 2017-10-30 15:29:48
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ad1c27b502b04d3808974032a2283eab896c7b20 (commit)
from 1a87d7c936bb70d3b08ff80d2016b6ea169ef175 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ad1c27b502b04d3808974032a2283eab896c7b20
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Oct 30 16:29:00 2017 +0100
[BUILDROOT] opos6ul(nano): Add socat, dnsmasq & law gst1 plugin to configs needing them.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 2 ++
buildroot/configs/opos6ul_legacy_defconfig | 2 ++
buildroot/configs/opos6ullegacy-4.1_defconfig | 3 +++
buildroot/configs/opos6ulnano_defconfig | 2 ++
buildroot/configs/opos6ultest_defconfig | 2 ++
5 files changed, 11 insertions(+)
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 7a3537f..ad81c31 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -96,6 +96,7 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL=y
BR2_PACKAGE_CAN_UTILS=y
+BR2_PACKAGE_DNSMASQ=y
BR2_PACKAGE_DROPBEAR=y
BR2_PACKAGE_ETHTOOL=y
BR2_PACKAGE_GESFTPSERVER=y
@@ -108,6 +109,7 @@ BR2_PACKAGE_LRZSZ=y
BR2_PACKAGE_PPPD=y
BR2_PACKAGE_RPCBIND=y
BR2_PACKAGE_RSYNC=y
+BR2_PACKAGE_SOCAT=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
diff --git a/buildroot/configs/opos6ul_legacy_defconfig b/buildroot/configs/opos6ul_legacy_defconfig
index cdc4d10..fec6432 100644
--- a/buildroot/configs/opos6ul_legacy_defconfig
+++ b/buildroot/configs/opos6ul_legacy_defconfig
@@ -74,6 +74,7 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL=y
BR2_PACKAGE_CAN_UTILS=y
+BR2_PACKAGE_DNSMASQ=y
BR2_PACKAGE_DROPBEAR=y
BR2_PACKAGE_ETHTOOL=y
BR2_PACKAGE_GESFTPSERVER=y
@@ -85,6 +86,7 @@ BR2_PACKAGE_LRZSZ=y
BR2_PACKAGE_PPPD=y
BR2_PACKAGE_RPCBIND=y
BR2_PACKAGE_RSYNC=y
+BR2_PACKAGE_SOCAT=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
diff --git a/buildroot/configs/opos6ullegacy-4.1_defconfig b/buildroot/configs/opos6ullegacy-4.1_defconfig
index 810255b..13b1db5 100644
--- a/buildroot/configs/opos6ullegacy-4.1_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.1_defconfig
@@ -58,6 +58,7 @@ BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ALPHA=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAW=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIPART=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP=y
@@ -126,6 +127,7 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL=y
BR2_PACKAGE_CAN_UTILS=y
+BR2_PACKAGE_DNSMASQ=y
BR2_PACKAGE_DROPBEAR=y
BR2_PACKAGE_ETHTOOL=y
BR2_PACKAGE_GESFTPSERVER=y
@@ -137,6 +139,7 @@ BR2_PACKAGE_LRZSZ=y
BR2_PACKAGE_PPPD=y
BR2_PACKAGE_RPCBIND=y
BR2_PACKAGE_RSYNC=y
+BR2_PACKAGE_SOCAT=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index eb691bf..09ecbee 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -94,6 +94,7 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL=y
BR2_PACKAGE_CAN_UTILS=y
+BR2_PACKAGE_DNSMASQ=y
BR2_PACKAGE_DROPBEAR=y
BR2_PACKAGE_ETHTOOL=y
BR2_PACKAGE_GESFTPSERVER=y
@@ -106,6 +107,7 @@ BR2_PACKAGE_LRZSZ=y
BR2_PACKAGE_PPPD=y
BR2_PACKAGE_RPCBIND=y
BR2_PACKAGE_RSYNC=y
+BR2_PACKAGE_SOCAT=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
diff --git a/buildroot/configs/opos6ultest_defconfig b/buildroot/configs/opos6ultest_defconfig
index fee33a7..32924a2 100644
--- a/buildroot/configs/opos6ultest_defconfig
+++ b/buildroot/configs/opos6ultest_defconfig
@@ -111,6 +111,7 @@ BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL=y
BR2_PACKAGE_BOA=y
BR2_PACKAGE_CAN_UTILS=y
+BR2_PACKAGE_DNSMASQ=y
BR2_PACKAGE_DROPBEAR=y
BR2_PACKAGE_ETHTOOL=y
BR2_PACKAGE_GESFTPSERVER=y
@@ -124,6 +125,7 @@ BR2_PACKAGE_LRZSZ=y
BR2_PACKAGE_PPPD=y
BR2_PACKAGE_RPCBIND=y
BR2_PACKAGE_RSYNC=y
+BR2_PACKAGE_SOCAT=y
BR2_PACKAGE_TCPDUMP=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-10-18 09:28:38
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 1a87d7c936bb70d3b08ff80d2016b6ea169ef175 (commit)
via e4d5a0ecf281cfe903f3a082561d57f5e41aa5d3 (commit)
via efa1767c3bc656041af991eabcaa22c16f5b427f (commit)
via 13a0a31dff924bcdb5abd2386d20c074a610e0bc (commit)
via e67f617eff24390d4c9f402b52d5c3268d1c1ae7 (commit)
via d8fcc4f29667c6626c700d0e1e80958313d1161c (commit)
via 15cba131ba0c00ee1a8ac7fe52ce572f83ad2c0f (commit)
from adf264e1040dde7f1af51d7465a560aa4ae2600e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1a87d7c936bb70d3b08ff80d2016b6ea169ef175
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Oct 18 11:24:36 2017 +0200
[BUILDROOT] opos6ullegacy-4.1_defconfig: add Lepton utilities
commit e4d5a0ecf281cfe903f3a082561d57f5e41aa5d3
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Oct 18 11:23:40 2017 +0200
[LINUX] 4.1-leagacy: add support for OPOS6ULL (OPOS6UL with i.MX6ULL)
commit efa1767c3bc656041af991eabcaa22c16f5b427f
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Oct 18 11:13:37 2017 +0200
[LINUX] opos6ul: Add spidev module to 4.1-legacy config
commit 13a0a31dff924bcdb5abd2386d20c074a610e0bc
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Oct 17 15:45:40 2017 +0200
[BUILDROOT] opos6ul: legacy-4.1: add some video related packages (gstreamer+capture+v4l2loopback)
commit e67f617eff24390d4c9f402b52d5c3268d1c1ae7
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Oct 17 15:43:36 2017 +0200
[BUILDROOT] genimage.cfg: do not populate failsafe partition with default rootfs as it may oversize it
commit d8fcc4f29667c6626c700d0e1e80958313d1161c
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Oct 16 16:48:03 2017 +0200
[BUILDROOT] opos6ultest_defconfig: add some packages from non test configs
commit 15cba131ba0c00ee1a8ac7fe52ce572f83ad2c0f
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Oct 16 16:46:49 2017 +0200
[BUILDROOT] opos6ul(nano): add python-requests & links to mainline defconfigs
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 2 +
buildroot/configs/opos6ullegacy-4.1_defconfig | 42 +-
buildroot/configs/opos6ulnano_defconfig | 2 +
buildroot/configs/opos6ultest_defconfig | 8 +
.../target/device/armadeus/opos6ul/genimage.cfg | 2 +-
.../opos6ul-linux-4.1.legacy.config.fragment | 1 +
...pos6ul-and-opos6uldev-add-initial-support.patch | 685 +++++++++++++++++++++
...s-dts-fixes-imx6ul-pwm-clocks-declaration.patch | 26 +
8 files changed, 766 insertions(+), 2 deletions(-)
create mode 100644 buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.1.legacy.config.fragment
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 7aa956a..7a3537f 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -78,6 +78,7 @@ BR2_PACKAGE_PYTHON_DATEUTIL=y
BR2_PACKAGE_PYTHON_NUMPY=y
BR2_PACKAGE_PYTHON_PAHO_MQTT=y
BR2_PACKAGE_PYTHON_PYCLI=y
+BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT=y
BR2_PACKAGE_PYTHON_SERIAL=y
BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
BR2_PACKAGE_PYTHON_SPIDEV=y
@@ -102,6 +103,7 @@ BR2_PACKAGE_HOSTAPD=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPROUTE2=y
BR2_PACKAGE_IW=y
+BR2_PACKAGE_LINKS=y
BR2_PACKAGE_LRZSZ=y
BR2_PACKAGE_PPPD=y
BR2_PACKAGE_RPCBIND=y
diff --git a/buildroot/configs/opos6ullegacy-4.1_defconfig b/buildroot/configs/opos6ullegacy-4.1_defconfig
index 414a766..810255b 100644
--- a/buildroot/configs/opos6ullegacy-4.1_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.1_defconfig
@@ -31,17 +31,56 @@ BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="imx_4.1.15_2.0.0_ga"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.1.mx6_legacy"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="target/device/armadeus/opos6ul/opos6ul-linux-4.1.legacy.config.fragment"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev imx6ull-opos6ulldev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_DEMOS=y
+BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_FAAD2=y
+BR2_PACKAGE_GSTREAMER1=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ALPHA=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIPART=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOBOX=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOCROP=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOFILTER=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF=y
+BR2_PACKAGE_GST1_PLUGINS_BAD=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265=y
+BR2_PACKAGE_GST1_PLUGINS_UGLY=y
+BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264=y
+BR2_PACKAGE_GST1_LIBAV=y
+BR2_PACKAGE_V4L2LOOPBACK=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_PV=y
@@ -70,6 +109,7 @@ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_IMX_TEST=y
BR2_PACKAGE_KBD=y
+BR2_PACKAGE_LEPTONMODULE=y
BR2_PACKAGE_SPI_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_LIBVORBIS=y
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 7aaf8a4..eb691bf 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -76,6 +76,7 @@ BR2_PACKAGE_PYTHON_DATEUTIL=y
BR2_PACKAGE_PYTHON_NUMPY=y
BR2_PACKAGE_PYTHON_PAHO_MQTT=y
BR2_PACKAGE_PYTHON_PYCLI=y
+BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT=y
BR2_PACKAGE_PYTHON_SERIAL=y
BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
BR2_PACKAGE_PYTHON_SPIDEV=y
@@ -100,6 +101,7 @@ BR2_PACKAGE_HOSTAPD=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPROUTE2=y
BR2_PACKAGE_IW=y
+BR2_PACKAGE_LINKS=y
BR2_PACKAGE_LRZSZ=y
BR2_PACKAGE_PPPD=y
BR2_PACKAGE_RPCBIND=y
diff --git a/buildroot/configs/opos6ultest_defconfig b/buildroot/configs/opos6ultest_defconfig
index 6583d2a..fee33a7 100644
--- a/buildroot/configs/opos6ultest_defconfig
+++ b/buildroot/configs/opos6ultest_defconfig
@@ -42,8 +42,10 @@ BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_PV=y
BR2_PACKAGE_RAMSMP=y
+BR2_PACKAGE_RT_TESTS=y
BR2_PACKAGE_SPIDEV_TEST=y
BR2_PACKAGE_STRACE=y
+BR2_PACKAGE_STRESS_NG=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
@@ -86,6 +88,11 @@ BR2_PACKAGE_PYTHON_DATEUTIL=y
BR2_PACKAGE_PYTHON_NUMPY=y
BR2_PACKAGE_PYTHON_PAHO_MQTT=y
BR2_PACKAGE_PYTHON_PYCLI=y
+BR2_PACKAGE_PYTHON_PYGAME=y
+BR2_PACKAGE_PYTHON_PYGAME_IMAGE=y
+BR2_PACKAGE_PYTHON_PYGAME_EXAMPLES=y
+BR2_PACKAGE_PYTHON_PYGAME_FONT=y
+BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT=y
BR2_PACKAGE_PYTHON_SERIAL=y
BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
BR2_PACKAGE_PYTHON_SPIDEV=y
@@ -122,6 +129,7 @@ BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+BR2_PACKAGE_CPULOAD=y
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_FSCK=y
BR2_PACKAGE_NANO=y
diff --git a/buildroot/target/device/armadeus/opos6ul/genimage.cfg b/buildroot/target/device/armadeus/opos6ul/genimage.cfg
index 41d8f3a..ec509ed 100644
--- a/buildroot/target/device/armadeus/opos6ul/genimage.cfg
+++ b/buildroot/target/device/armadeus/opos6ul/genimage.cfg
@@ -10,7 +10,7 @@ image opos6ul-user_data.ext4 {
partition failsafe {
partition-type = 0x83
offset = 1M
- image = "rootfs.ext4"
+# image = "rootfs.ext4"
size = 128M
}
diff --git a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.1.legacy.config.fragment b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.1.legacy.config.fragment
new file mode 100644
index 0000000..a7c3a23
--- /dev/null
+++ b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.1.legacy.config.fragment
@@ -0,0 +1 @@
+CONFIG_SPI_SPIDEV=m
diff --git a/patches/linux/4.1.mx6_legacy/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch b/patches/linux/4.1.mx6_legacy/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
index 71b640c..9acff9c 100644
--- a/patches/linux/4.1.mx6_legacy/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
+++ b/patches/linux/4.1.mx6_legacy/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
@@ -28,6 +28,14 @@ Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/Makefile
imx6ul-14x14-evk-btwifi.dtb \
imx6ul-14x14-evk-csi.dtb \
imx6ul-14x14-evk-emmc.dtb \
+@@ -415,6 +416,7 @@ dtb-$(CONFIG_SOC_IMX6ULL) += \
+ imx6ull-14x14-ddr3-arm2-usb.dtb \
+ imx6ull-14x14-ddr3-arm2-wm8958.dtb \
+ imx6ull-14x14-evk.dtb \
++ imx6ull-opos6ulldev.dtb \
+ imx6ull-14x14-evk-btwifi.dtb \
+ imx6ull-14x14-evk-emmc.dtb \
+ imx6ull-14x14-evk-gpmi-weim.dtb \
Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
===================================================================
--- /dev/null
@@ -705,3 +713,680 @@ Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ };
+ };
+};
+Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6ull-opos6ull.dtsi
+===================================================================
+--- /dev/null
++++ linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6ull-opos6ull.dtsi
+@@ -0,0 +1,212 @@
++/*
++ * Copyright 2016 Armadeus Systems <su...@ar...>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ * a) This file is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This file is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this file; if not, write to the Free
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301 USA
++ *
++ * Or, alternatively,
++ *
++ * b) Permission is hereby granted, free of charge, to any person
++ * obtaining a copy of this software and associated documentation
++ * files (the "Software"), to deal in the Software without
++ * restriction, including without limitation the rights to use,
++ * copy, modify, merge, publish, distribute, sublicense, and/or
++ * sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following
++ * conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++#include <dt-bindings/input/input.h>
++#include "imx6ull.dtsi"
++
++/ {
++ memory {
++ reg = <0x80000000 0>; /* will be filled by U-Boot */
++ };
++
++ pxp_v4l2 {
++ compatible = "fsl,imx6ul-pxp-v4l2", "fsl,imx6sx-pxp-v4l2", "fsl,imx6sl-pxp-v4l2";
++ status = "okay";
++ };
++
++ reg_3v3: regulator-3v3 {
++ compatible = "regulator-fixed";
++ regulator-name = "3V3";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ };
++
++ usdhc3_pwrseq: usdhc3_pwrseq {
++ compatible = "mmc-pwrseq-simple";
++ reset-gpios = <&gpio2 9 GPIO_ACTIVE_LOW>;
++ };
++};
++
++&cpu0 {
++ arm-supply = <®_arm>;
++ soc-supply = <®_soc>;
++ dc-supply = <®_3v3>;
++};
++
++&fec1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_enet1>;
++ phy-mode = "rmii";
++ phy-reset-duration = <1>;
++ phy-reset-gpios = <&gpio4 2 GPIO_ACTIVE_LOW>;
++ phy-handle = <ðphy1>;
++ phy-supply = <®_3v3>;
++ status = "okay";
++
++ mdio: mdio {
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ ethphy1: ethernet-phy@1 {
++ compatible = "ethernet-phy-ieee802.3-c22";
++ reg = <1>;
++ interrupt-parent = <&gpio4>;
++ interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
++ status = "okay";
++ };
++ };
++};
++
++&pxp {
++ status = "okay";
++};
++
++/* Bluetooth */
++&uart8 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart8>;
++ fsl,uart-has-rtscts;
++ status = "okay";
++};
++
++/* eMMC */
++&usdhc1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc1>;
++ bus-width = <8>;
++ no-1-8-v;
++ non-removable;
++ status = "okay";
++};
++
++/* WiFi */
++&usdhc2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc2>;
++ bus-width = <4>;
++ no-1-8-v;
++ non-removable;
++ mmc-pwrseq = <&usdhc3_pwrseq>;
++ status = "okay";
++
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ brcmf: bcrmf@1 {
++ compatible = "brcm,bcm4329-fmac";
++ reg = <1>;
++ interrupt-parent = <&gpio2>;
++ interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
++ interrupt-names = "host-wake";
++ };
++};
++
++&iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hog_1>;
++ imx6ul-opos6ul {
++ pinctrl_enet1: enet1grp {
++ fsl,pins = <
++ MX6UL_PAD_GPIO1_IO06__ENET1_MDIO 0x1b0b0
++ MX6UL_PAD_GPIO1_IO07__ENET1_MDC 0x1b0b0
++ MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER 0x130b0
++ MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN 0x130b0
++ MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x130b0
++ MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x130b0
++ MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0
++ MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0
++ MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN 0x1b0b0
++ /* INT# */
++ MX6UL_PAD_NAND_DQS__GPIO4_IO16 0x1b0b0
++ /* RST# */
++ MX6UL_PAD_NAND_DATA00__GPIO4_IO02 0x130b0
++ MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x4001b031
++ >;
++ };
++
++ pinctrl_uart8: uart8grp {
++ fsl,pins = <
++ MX6UL_PAD_ENET2_TX_EN__UART8_DCE_RX 0x1b0b0
++ MX6UL_PAD_ENET2_TX_DATA1__UART8_DCE_TX 0x1b0b0
++ MX6UL_PAD_ENET2_RX_ER__UART8_DCE_RTS 0x1b0b0
++ MX6UL_PAD_ENET2_TX_CLK__UART8_DCE_CTS 0x1b0b0
++ /* BT_REG_ON */
++ MX6UL_PAD_ENET2_RX_EN__GPIO2_IO10 0x130b0
++ >;
++ };
++
++ pinctrl_usdhc1: usdhc1grp {
++ fsl,pins = <
++ MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059
++ MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10059
++ MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x17059
++ MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059
++ MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059
++ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059
++ MX6UL_PAD_NAND_READY_B__USDHC1_DATA4 0x17059
++ MX6UL_PAD_NAND_CE0_B__USDHC1_DATA5 0x17059
++ MX6UL_PAD_NAND_CE1_B__USDHC1_DATA6 0x17059
++ MX6UL_PAD_NAND_CLE__USDHC1_DATA7 0x17059
++ >;
++ };
++
++ pinctrl_usdhc2: usdhc2grp {
++ fsl,pins = <
++ MX6UL_PAD_LCD_DATA18__USDHC2_CMD 0x1b0b0
++ MX6UL_PAD_LCD_DATA19__USDHC2_CLK 0x100b0
++ MX6UL_PAD_LCD_DATA20__USDHC2_DATA0 0x1b0b0
++ MX6UL_PAD_LCD_DATA21__USDHC2_DATA1 0x1b0b0
++ MX6UL_PAD_LCD_DATA22__USDHC2_DATA2 0x1b0b0
++ MX6UL_PAD_LCD_DATA23__USDHC2_DATA3 0x1b0b0
++ /* WL_REG_ON */
++ MX6UL_PAD_ENET2_RX_DATA1__GPIO2_IO09 0x130b0
++ /* WL_IRQ */
++ MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08 0x1b0b0
++ >;
++ };
++ };
++};
+Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6ull-opos6ulldev.dts
+===================================================================
+--- /dev/null
++++ linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6ull-opos6ulldev.dts
+@@ -0,0 +1,455 @@
++/*
++ * Copyright 2016 Armadeus Systems <su...@ar...>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ * a) This file is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This file is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this file; if not, write to the Free
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301 USA
++ *
++ * Or, alternatively,
++ *
++ * b) Permission is hereby granted, free of charge, to any person
++ * obtaining a copy of this software and associated documentation
++ * files (the "Software"), to deal in the Software without
++ * restriction, including without limitation the rights to use,
++ * copy, modify, merge, publish, distribute, sublicense, and/or
++ * sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following
++ * conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++
++#include <dt-bindings/input/input.h>
++#include "imx6ull-opos6ull.dtsi"
++
++/ {
++ model = "Armadeus Systems OPOS6ULL SoM on OPOS6ULDev board";
++ compatible = "armadeus,opos6uldev", "armadeus,opos6ull", "fsl,imx6ull";
++
++ chosen {
++ stdout-path = &uart1;
++ };
++
++ lcd_backlight {
++ compatible = "pwm-backlight";
++ pwms = <&pwm3 0 191000>;
++ brightness-levels = <0 4 8 16 32 64 128 255>;
++ default-brightness-level = <7>;
++ status = "okay";
++ };
++
++ gpio-keys {
++ compatible = "gpio-keys";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_gpio_keys>;
++
++ user-button {
++ label = "User button";
++ gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
++ linux,code = <BTN_MISC>;
++ wakeup-source;
++ };
++ };
++
++ leds {
++ compatible = "gpio-leds";
++
++ user_led {
++ label = "User";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_led>;
++ gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "heartbeat";
++ };
++ };
++
++ onewire {
++ compatible = "w1-gpio";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_w1>;
++ gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
++ status = "okay";
++ };
++
++ reg_5v: regulator-5v {
++ compatible = "regulator-fixed";
++ regulator-name = "5V";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ };
++
++ reg_usbotg1_vbus: regulator-usbotg1vbus {
++ compatible = "regulator-fixed";
++ regulator-name = "usbotg1vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usbotg1_vbus>;
++ gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
++ enable-active-high;
++ };
++
++ reg_usbotg2_vbus: regulator-usbotg2vbus {
++ compatible = "regulator-fixed";
++ regulator-name = "usbotg2vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usbotg2_vbus>;
++ gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
++ enable-active-high;
++ };
++};
++
++&pwm3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm3>;
++ status = "okay";
++};
++
++&adc1 {
++ vref-supply = <®_3v3>;
++ status = "okay";
++};
++
++&flexcan1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_flexcan1>;
++ xceiver-supply = <®_5v>;
++ status = "okay";
++};
++
++&flexcan2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_flexcan2>;
++ xceiver-supply = <®_5v>;
++ status = "okay";
++};
++
++&ecspi4 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ecspi4>;
++ fsl,spi-num-chipselects = <2>;
++ cs-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>, <&gpio4 3 GPIO_ACTIVE_LOW>;
++ status = "okay";
++
++ spidev0: spi@0 {
++ compatible = "spidev";
++ reg = <0>;
++ spi-max-frequency = <5000000>;
++ };
++
++ spidev1: spi@1 {
++ compatible = "spidev";
++ reg = <1>;
++ spi-max-frequency = <5000000>;
++ };
++};
++
++&i2c1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c1>;
++ clock_frequency = <400000>;
++ status = "okay";
++};
++
++&i2c2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c2>;
++ clock_frequency = <400000>;
++ status = "okay";
++};
++
++&lcdif {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_lcdif>;
++ display = <&display0>;
++ disp-dev = "lcd"; /* not handled by mxsfb yet */
++ lcd-supply = <®_3v3>;
++ status = "okay";
++
++ display0: display0 {
++ bits-per-pixel = <32>;
++ bus-width = <18>;
++
++ display-timings {
++ native-mode = <&timing0>;
++
++ timing0: ST0700 {
++ clock-frequency = <33000033>;
++ hactive = <800>;
++ vactive = <480>;
++ hback-porch = <96>;
++ hfront-porch = <96>;
++ vback-porch = <20>;
++ vfront-porch = <21>;
++ hsync-len = <64>;
++ vsync-len = <4>;
++ hsync-active = <0>;
++ vsync-active = <0>;
++ de-active = <1>;
++ pixelclk-active = <0>;
++ };
++
++ timing1: LQ043 {
++ clock-frequency = <8690000>;
++ hactive = <480>;
++ vactive = <272>;
++ hback-porch = <16>;
++ hfront-porch = <16>;
++ vback-porch = <4>;
++ vfront-porch = <2>;
++ hsync-len = <4>;
++ vsync-len = <4>;
++ hsync-active = <0>;
++ vsync-active = <0>;
++ de-active = <0>;
++ pixelclk-active = <1>;
++ };
++ };
++ };
++};
++
++&snvs_pwrkey {
++ status = "disabled";
++};
++
++&tsc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_tsc>;
++ xnur-gpio = <&gpio1 3 GPIO_ACTIVE_LOW>;
++ measure-delay-time = <0xffff>;
++ pre-charge-time = <0xffff>;
++ status = "okay";
++};
++
++&uart1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart1>;
++ status = "okay";
++};
++
++&uart2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart2>;
++ status = "okay";
++};
++
++&usbotg1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usbotg1_id>;
++ vbus-supply = <®_usbotg1_vbus>;
++ dr_mode = "otg";
++ disable-over-current;
++ status = "okay";
++};
++
++&usbotg2 {
++ vbus-supply = <®_usbotg2_vbus>;
++ dr_mode = "host";
++ disable-over-current;
++ status = "okay";
++};
++
++&iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_gpios>;
++ imx6ul-opos6uldev {
++
++ pinctrl_pwm3: pwm3grp {
++ fsl,pins = <
++ MX6UL_PAD_NAND_ALE__PWM3_OUT 0x1b0b0
++ >;
++ };
++
++ pinctrl_ecspi4: ecspi4grp {
++ fsl,pins = <
++ MX6UL_PAD_NAND_DATA04__ECSPI4_SCLK 0x1b0b0
++ MX6UL_PAD_NAND_DATA05__ECSPI4_MOSI 0x1b0b0
++ MX6UL_PAD_NAND_DATA06__ECSPI4_MISO 0x1b0b0
++ MX6UL_PAD_NAND_DATA01__GPIO4_IO03 0x1b0b0
++ MX6UL_PAD_NAND_DATA07__GPIO4_IO09 0x1b0b0
++ >;
++ };
++
++ pinctrl_flexcan1: flexcan1grp {
++ fsl,pins = <
++ MX6UL_PAD_UART3_CTS_B__FLEXCAN1_TX 0x0b0b0
++ MX6UL_PAD_UART3_RTS_B__FLEXCAN1_RX 0x0b0b0
++ >;
++ };
++
++ pinctrl_flexcan2: flexcan2grp {
++ fsl,pins = <
++ MX6UL_PAD_UART2_CTS_B__FLEXCAN2_TX 0x0b0b0
++ MX6UL_PAD_UART2_RTS_B__FLEXCAN2_RX 0x0b0b0
++ >;
++ };
++
++ pinctrl_gpios: gpiosgrp {
++ fsl,pins = <
++ MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x0b0b0
++ MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x0b0b0
++ MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x0b0b0
++ MX6UL_PAD_NAND_RE_B__GPIO4_IO00 0x0b0b0
++ MX6UL_PAD_GPIO1_IO08__GPIO1_IO08 0x0b0b0
++ MX6UL_PAD_UART1_CTS_B__GPIO1_IO18 0x0b0b0
++ MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x0b0b0
++ MX6UL_PAD_NAND_WE_B__GPIO4_IO01 0x0b0b0
++ MX6UL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x0b0b0
++ MX6UL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x0b0b0
++ MX6UL_PAD_SNVS_TAMPER3__GPIO5_IO03 0x0b0b0
++ MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04 0x0b0b0
++ MX6UL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x0b0b0
++ MX6UL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x0b0b0
++ MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x0b0b0
++ MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x0b0b0
++ >;
++ };
++
++ pinctrl_w1: w1grp {
++ fsl,pins = <
++ MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x0b0b0
++ >;
++ };
++
++ pinctrl_gpio_keys: gpio_keysgrp {
++ fsl,pins = <
++ MX6UL_PAD_ENET2_TX_DATA0__GPIO2_IO11 0x0b0b0
++ >;
++ };
++
++ pinctrl_i2c1: i2c1grp {
++ fsl,pins = <
++ MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0
++ MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0
++ >;
++ };
++
++ pinctrl_i2c2: i2c2grp {
++ fsl,pins = <
++ MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
++ MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
++ >;
++ };
++
++ pinctrl_lcdif: lcdifgrp {
++ fsl,pins = <
++ MX6UL_PAD_LCD_CLK__LCDIF_CLK 0x100b1
++ MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE 0x100b1
++ MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC 0x100b1
++ MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC 0x100b1
++ MX6UL_PAD_LCD_DATA00__LCDIF_DATA00 0x100b1
++ MX6UL_PAD_LCD_DATA01__LCDIF_DATA01 0x100b1
++ MX6UL_PAD_LCD_DATA02__LCDIF_DATA02 0x100b1
++ MX6UL_PAD_LCD_DATA03__LCDIF_DATA03 0x100b1
++ MX6UL_PAD_LCD_DATA04__LCDIF_DATA04 0x100b1
++ MX6UL_PAD_LCD_DATA05__LCDIF_DATA05 0x100b1
++ MX6UL_PAD_LCD_DATA06__LCDIF_DATA06 0x100b1
++ MX6UL_PAD_LCD_DATA07__LCDIF_DATA07 0x100b1
++ MX6UL_PAD_LCD_DATA08__LCDIF_DATA08 0x100b1
++ MX6UL_PAD_LCD_DATA09__LCDIF_DATA09 0x100b1
++ MX6UL_PAD_LCD_DATA10__LCDIF_DATA10 0x100b1
++ MX6UL_PAD_LCD_DATA11__LCDIF_DATA11 0x100b1
++ MX6UL_PAD_LCD_DATA12__LCDIF_DATA12 0x100b1
++ MX6UL_PAD_LCD_DATA13__LCDIF_DATA13 0x100b1
++ MX6UL_PAD_LCD_DATA14__LCDIF_DATA14 0x100b1
++ MX6UL_PAD_LCD_DATA15__LCDIF_DATA15 0x100b1
++ MX6UL_PAD_LCD_DATA16__LCDIF_DATA16 0x100b1
++ MX6UL_PAD_LCD_DATA17__LCDIF_DATA17 0x100b1
++ >;
++ };
++
++ pinctrl_led: ledgrp {
++ fsl,pins = <
++ MX6UL_PAD_LCD_RESET__GPIO3_IO04 0x0b0b0
++ >;
++ };
++
++ pinctrl_tsc: tscgrp {
++ fsl,pins = <
++ MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0xb0
++ MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0xb0
++ MX6UL_PAD_GPIO1_IO03__GPIO1_IO03 0xb0
++ MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0xb0
++ >;
++ };
++
++ pinctrl_uart1: uart1grp {
++ fsl,pins = <
++ MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1
++ MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1
++ >;
++ };
++
++ pinctrl_uart2: uart2grp {
++ fsl,pins = <
++ MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1
++ MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1
++ >;
++ };
++
++ pinctrl_usbotg1_id: usbotg1_idgrp {
++ fsl,pins = <
++ MX6UL_PAD_GPIO1_IO00__ANATOP_OTG1_ID 0x1b0b0
++ >;
++ };
++
++ pinctrl_usbotg1_vbus: usbotg1_vbusgrp {
++ fsl,pins = <
++ MX6UL_PAD_GPIO1_IO05__GPIO1_IO05 0x1b0b0
++ >;
++ };
++
++ pinctrl_usbotg2_vbus: usbotg2_vbusgrp {
++ fsl,pins = <
++ MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x1b0b0
++ >;
++ };
++
++ pinctrl_csi1: csi1grp {
++ fsl,pins = <
++ MX6UL_PAD_CSI_MCLK__CSI_MCLK 0x1b088
++ MX6UL_PAD_CSI_PIXCLK__CSI_PIXCLK 0x1b088
++ MX6UL_PAD_CSI_VSYNC__CSI_VSYNC 0x1b088
++ MX6UL_PAD_CSI_HSYNC__CSI_HSYNC 0x1b088
++ MX6UL_PAD_CSI_DATA00__CSI_DATA02 0x1b088
++ MX6UL_PAD_CSI_DATA01__CSI_DATA03 0x1b088
++ MX6UL_PAD_CSI_DATA02__CSI_DATA04 0x1b088
++ MX6UL_PAD_CSI_DATA03__CSI_DATA05 0x1b088
++ MX6UL_PAD_CSI_DATA04__CSI_DATA06 0x1b088
++ MX6UL_PAD_CSI_DATA05__CSI_DATA07 0x1b088
++ MX6UL_PAD_CSI_DATA06__CSI_DATA08 0x1b088
++ MX6UL_PAD_CSI_DATA07__CSI_DATA09 0x1b088
++ >;
++ };
++ };
++};
diff --git a/patches/linux/4.1.mx6_legacy/0805-armadeus-dts-fixes-imx6ul-pwm-clocks-declaration.patch b/patches/linux/4.1.mx6_legacy/0805-armadeus-dts-fixes-imx6ul-pwm-clocks-declaration.patch
index 3326173..2ad7bef 100644
--- a/patches/linux/4.1.mx6_legacy/0805-armadeus-dts-fixes-imx6ul-pwm-clocks-declaration.patch
+++ b/patches/linux/4.1.mx6_legacy/0805-armadeus-dts-fixes-imx6ul-pwm-clocks-declaration.patch
@@ -39,3 +39,29 @@ Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6ul.dtsi
clock-names = "ipg", "per";
#pwm-cells = <2>;
};
+Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6ull.dtsi
+===================================================================
+--- linux-imx_4.1.15_2.0.0_ga.orig/arch/arm/boot/dts/imx6ull.dtsi
++++ linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6ull.dtsi
+@@ -444,8 +444,8 @@
+ compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
+ reg = <0x02084000 0x4000>;
+ interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
+- clocks = <&clks IMX6UL_CLK_DUMMY>,
+- <&clks IMX6UL_CLK_DUMMY>;
++ clocks = <&clks IMX6UL_CLK_PWM2>,
++ <&clks IMX6UL_CLK_PWM2>;
+ clock-names = "ipg", "per";
+ #pwm-cells = <2>;
+ };
+@@ -464,8 +464,8 @@
+ compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
+ reg = <0x0208c000 0x4000>;
+ interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
+- clocks = <&clks IMX6UL_CLK_DUMMY>,
+- <&clks IMX6UL_CLK_DUMMY>;
++ clocks = <&clks IMX6UL_CLK_PWM4>,
++ <&clks IMX6UL_CLK_PWM4>;
+ clock-names = "ipg", "per";
+ #pwm-cells = <2>;
+ };
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2017-10-12 08:26:45
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via adf264e1040dde7f1af51d7465a560aa4ae2600e (commit)
from fc105c775744196311bc3a698a5e5ffa9bdeb15e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit adf264e1040dde7f1af51d7465a560aa4ae2600e
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Oct 12 10:33:17 2017 +0200
[UBOOT] Use sha1 string instead of branch name
With the branch name we cannot make BR download updates of U-Boot.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 294c977..7aa956a 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -122,7 +122,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.code.sf.net/p/armadeus/u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="opos6ul"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="f18cf828482830e692c3c71201bcd89d14c3a1e5"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6ul"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-10-10 15:00:18
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via fc105c775744196311bc3a698a5e5ffa9bdeb15e (commit)
from 1c66094afe66d9675509b9bbc8ac9bac9a346f86 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fc105c775744196311bc3a698a5e5ffa9bdeb15e
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Oct 10 16:44:46 2017 +0200
[LINUX] apf6: 3.19 & 4.0: add spidev support on APF6Dev
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config | 1 +
buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config | 1 +
.../3.19/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch | 8 +++++++-
.../4.0/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch | 8 +++++++-
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config
index 99a2137..b381f5c 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config
@@ -169,6 +169,7 @@ CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_IMX=y
CONFIG_SPI=y
CONFIG_SPI_IMX=y
+CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=y
# CONFIG_HWMON is not set
CONFIG_WATCHDOG=y
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config b/buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config
index 78a92ce..cbdbc48 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config
@@ -167,6 +167,7 @@ CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_IMX=y
CONFIG_SPI=y
CONFIG_SPI_IMX=y
+CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=y
# CONFIG_HWMON is not set
CONFIG_THERMAL=y
diff --git a/patches/linux/3.19/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.19/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 4e6e63a..36161ee 100644
--- a/patches/linux/3.19/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.19/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -172,7 +172,7 @@ Index: linux-3.19.8/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
+++ linux-3.19.8/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,555 @@
+@@ -0,0 +1,561 @@
+/*
+ * Copyright 2015 Armadeus Systems
+ *
@@ -356,6 +356,12 @@ Index: linux-3.19.8/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ <&gpio4 10 GPIO_ACTIVE_LOW>,
+ <&gpio4 11 GPIO_ACTIVE_LOW>;
+ status = "okay";
++
++ spidev0: spi@0 {
++ compatible = "spidev";
++ reg = <0>;
++ spi-max-frequency = <54000000>;
++ };
+};
+
+&hdmi {
diff --git a/patches/linux/4.0/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/4.0/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index b5059e6..3637be6 100644
--- a/patches/linux/4.0/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/4.0/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -172,7 +172,7 @@ Index: linux-4.0.9/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
+++ linux-4.0.9/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,555 @@
+@@ -0,0 +1,561 @@
+/*
+ * Copyright 2015 Armadeus Systems
+ *
@@ -356,6 +356,12 @@ Index: linux-4.0.9/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ <&gpio4 10 GPIO_ACTIVE_LOW>,
+ <&gpio4 11 GPIO_ACTIVE_LOW>;
+ status = "okay";
++
++ spidev0: spi@0 {
++ compatible = "spidev";
++ reg = <0>;
++ spi-max-frequency = <54000000>;
++ };
+};
+
+&hdmi {
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-10-09 15:34:15
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 1c66094afe66d9675509b9bbc8ac9bac9a346f86 (commit)
from fae5b75e64026f99cf4b6dbef1e99f0fcb777148 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1c66094afe66d9675509b9bbc8ac9bac9a346f86
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Oct 9 17:33:59 2017 +0200
[BUILDROOT] 2017.02: apf6: add a defconfig to generate a Xorg rootfs which mimics Dawn Small Linux distribution (WIP)
-----------------------------------------------------------------------
Summary of changes:
...test_defconfig => apf6dawnsmalllinux_defconfig} | 62 +++++++++++++---------
1 file changed, 36 insertions(+), 26 deletions(-)
copy buildroot/configs/{apf6test_defconfig => apf6dawnsmalllinux_defconfig} (82%)
diff --git a/buildroot/configs/apf6test_defconfig b/buildroot/configs/apf6dawnsmalllinux_defconfig
similarity index 82%
copy from buildroot/configs/apf6test_defconfig
copy to buildroot/configs/apf6dawnsmalllinux_defconfig
index 967b1d5..1edf78b 100644
--- a/buildroot/configs/apf6test_defconfig
+++ b/buildroot/configs/apf6dawnsmalllinux_defconfig
@@ -7,15 +7,14 @@ BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_TOOLCHAIN_EXTERNAL=y
-BR2_ENABLE_LOCALE_PURGE=y
BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
BR2_TARGET_TZ_INFO=y
BR2_TARGET_TZ_ZONELIST="europe"
BR2_TARGET_LOCALTIME="Europe/Paris"
+BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="apf6 imx6"
@@ -30,20 +29,14 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.8"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_DEMOS=y
-BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
-BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE=y
-BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
-BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_TESTSUITE=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
@@ -73,8 +66,6 @@ BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE=y
BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE=y
BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV=y
BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD=y
-BR2_PACKAGE_MADPLAY=y
-BR2_PACKAGE_MPLAYER=y
BR2_PACKAGE_GZIP=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
@@ -87,18 +78,40 @@ BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
-BR2_PACKAGE_DOOM_WAD=y
-BR2_PACKAGE_OPENTYRIAN=y
-BR2_PACKAGE_PRBOOM=y
-BR2_PACKAGE_QUAKE_PAK=y
-BR2_PACKAGE_SDLQUAKE=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_JPEG is not set
# BR2_PACKAGE_FBV_GIF is not set
-BR2_PACKAGE_SDL_WATER=y
+BR2_PACKAGE_XORG7=y
+BR2_PACKAGE_XSERVER_XORG_SERVER=y
+BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE=y
+BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV=y
+BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD=y
+BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE=y
+BR2_PACKAGE_XAPP_SETXKBMAP=y
+BR2_PACKAGE_XAPP_XBACKLIGHT=y
+BR2_PACKAGE_XAPP_XCALC=y
+BR2_PACKAGE_XAPP_XCLOCK=y
+BR2_PACKAGE_XAPP_XCONSOLE=y
+BR2_PACKAGE_XAPP_XEYES=y
+BR2_PACKAGE_XAPP_XINPUT_CALIBRATOR=y
+BR2_PACKAGE_XAPP_XKBUTILS=y
+BR2_PACKAGE_XAPP_XMAG=y
+BR2_PACKAGE_XAPP_XMESSAGE=y
+BR2_PACKAGE_DILLO=y
+BR2_PACKAGE_XTERM=y
+BR2_PACKAGE_XVKBD=y
+BR2_PACKAGE_FLUXBOX=y
+BR2_PACKAGE_MATCHBOX=y
+BR2_PACKAGE_MATCHBOX_SM=y
+BR2_PACKAGE_MATCHBOX_COMMON=y
+BR2_PACKAGE_MATCHBOX_DESKTOP=y
+BR2_PACKAGE_MATCHBOX_KEYBOARD=y
+BR2_PACKAGE_MATCHBOX_PANEL=y
+BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR=y
+BR2_PACKAGE_OPENBOX=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
BR2_PACKAGE_APF_CONFIG=y
@@ -109,15 +122,10 @@ BR2_PACKAGE_PCI_DEBUG=y
BR2_PACKAGE_PCIUTILS=y
BR2_PACKAGE_TI_UTILS=y
BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_LUA_READLINE=y
-BR2_PACKAGE_PYTHON=y
-BR2_PACKAGE_PYTHON_CURSES=y
-BR2_PACKAGE_PYTHON_READLINE=y
-BR2_PACKAGE_PYTHON_NUMPY=y
-BR2_PACKAGE_PYTHON_SERIAL=y
-BR2_PACKAGE_PYTHON_TWISTED=y
+BR2_PACKAGE_LIBSHA1=y
BR2_PACKAGE_DTC=y
BR2_PACKAGE_DTC_PROGRAMS=y
+BR2_PACKAGE_LIBPCIACCESS=y
BR2_PACKAGE_LIBV4L=y
BR2_PACKAGE_LIBV4L_UTILS=y
BR2_PACKAGE_TSLIB=y
@@ -128,11 +136,11 @@ BR2_PACKAGE_DROPBEAR=y
BR2_PACKAGE_HOSTAPD=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPROUTE2=y
+BR2_PACKAGE_IRSSI=y
+BR2_PACKAGE_IRSSI_TRUE_COLOR=y
BR2_PACKAGE_IW=y
-BR2_PACKAGE_LIGHTTPD=y
-BR2_PACKAGE_LIGHTTPD_ZLIB=y
-BR2_PACKAGE_LIGHTTPD_LUA=y
BR2_PACKAGE_LINKS=y
+BR2_PACKAGE_LINKS_GRAPHICS=y
BR2_PACKAGE_LRZSZ=y
BR2_PACKAGE_PPPD=y
BR2_PACKAGE_RPCBIND=y
@@ -143,7 +151,9 @@ BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_FSCK=y
+BR2_PACKAGE_JOE=y
BR2_PACKAGE_NANO=y
+BR2_PACKAGE_VIM=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_EXT2_LABEL="ROOTFS"
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-10-06 11:01:22
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via fae5b75e64026f99cf4b6dbef1e99f0fcb777148 (commit)
via f989b9328bfd6b41851668a3bf6a816b41d9a7e7 (commit)
via 2890dd182f77ce0cb222d2b1b349d6d5daa616c8 (commit)
from 0cc59bc4489aa9a928e5af36361984708e428439 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fae5b75e64026f99cf4b6dbef1e99f0fcb777148
Author: Julien BOIBESSOT <jul...@ar...>
Date: Fri Oct 6 13:00:43 2017 +0200
[BUILDROOT] 2017.02: bump imx-usb-loader version to have i.MX6ULL support
commit f989b9328bfd6b41851668a3bf6a816b41d9a7e7
Author: Julien BOIBESSOT <jul...@ar...>
Date: Fri Oct 6 12:43:55 2017 +0200
[TOOLS] opos6ul_recovery.py: fixes error message when no imx-usb-loader is found on Host.
commit 2890dd182f77ce0cb222d2b1b349d6d5daa616c8
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Oct 4 17:25:21 2017 +0200
[BUILDROOT] apf6legacy*_defconfigs: add multipart and jpegenc plugins to gstreamer
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6legacy-4.1_defconfig | 2 ++
buildroot/configs/apf6legacy_defconfig | 2 ++
.../buildroot/2017.02/221-imx-usb-loader-version-bump.patch | 13 ++++++++-----
software/uboot_recover/opos6ul_recovery.py | 2 +-
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/buildroot/configs/apf6legacy-4.1_defconfig b/buildroot/configs/apf6legacy-4.1_defconfig
index 8b4b141..3943be5 100644
--- a/buildroot/configs/apf6legacy-4.1_defconfig
+++ b/buildroot/configs/apf6legacy-4.1_defconfig
@@ -56,10 +56,12 @@ BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO=y
BR2_PACKAGE_GST1_PLUGINS_GOOD=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ALPHA=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIPART=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP=y
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index 012d985..69df1f7 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -50,10 +50,12 @@ BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO=y
BR2_PACKAGE_GST1_PLUGINS_GOOD=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ALPHA=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIPART=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP=y
diff --git a/patches/buildroot/2017.02/221-imx-usb-loader-version-bump.patch b/patches/buildroot/2017.02/221-imx-usb-loader-version-bump.patch
index 1830aa6..6156ad5 100644
--- a/patches/buildroot/2017.02/221-imx-usb-loader-version-bump.patch
+++ b/patches/buildroot/2017.02/221-imx-usb-loader-version-bump.patch
@@ -1,3 +1,5 @@
+Mostly to have i.MX6ULL support.
+
Index: buildroot/package/imx-usb-loader/imx-usb-loader.mk
===================================================================
--- buildroot.orig/package/imx-usb-loader/imx-usb-loader.mk
@@ -7,14 +9,15 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader.mk
################################################################################
-IMX_USB_LOADER_VERSION = 9b0e81cf9511c3a27cf635407714caa2793b570c
-+IMX_USB_LOADER_VERSION = a2cf488d7adca0b43b61ebaec602e2964ab51874
++IMX_USB_LOADER_VERSION = 75d82372406d6910cb8173ba815819a8ccfa5e45
IMX_USB_LOADER_SITE = $(call github,boundarydevices,imx_usb_loader,$(IMX_USB_LOADER_VERSION))
IMX_USB_LOADER_LICENSE = LGPLv2.1+
IMX_USB_LOADER_LICENSE_FILES = COPYING
Index: buildroot/package/imx-usb-loader/imx-usb-loader.hash
===================================================================
--- buildroot.orig/package/imx-usb-loader/imx-usb-loader.hash
-+++ /dev/null
-@@ -1,2 +0,0 @@
--# locally computed
--sha256 40e1e36791e91366b13f57b16b32e75cf05e7177b2813f1bf2446419d0ed44eb imx-usb-loader-9b0e81cf9511c3a27cf635407714caa2793b570c.tar.gz
++++ buildroot/package/imx-usb-loader/imx-usb-loader.hash
+@@ -1,2 +1,3 @@
+ # locally computed
+ sha256 40e1e36791e91366b13f57b16b32e75cf05e7177b2813f1bf2446419d0ed44eb imx-usb-loader-9b0e81cf9511c3a27cf635407714caa2793b570c.tar.gz
++sha256 69071f75462451595f8ca96f5566933af2942f0d2bc2873433ea53392d5ce073 imx-usb-loader-75d82372406d6910cb8173ba815819a8ccfa5e45.tar.gz
diff --git a/software/uboot_recover/opos6ul_recovery.py b/software/uboot_recover/opos6ul_recovery.py
index 8aa5930..aa91e22 100644
--- a/software/uboot_recover/opos6ul_recovery.py
+++ b/software/uboot_recover/opos6ul_recovery.py
@@ -105,7 +105,7 @@ if __name__ == "__main__":
port = '/dev/ttyUSB0'
if not os.path.exists(USB_DOWNLOAD_APP):
- print color.RED + "Error: imx_usb is not present. Please compile Armadeus BSP first: make apf6_defconfig; make" + color.END
+ print color.RED + "Error: imx_usb is not present. Please compile Armadeus BSP first: make opos6ul_defconfig; make" + color.END
sys.exit(1)
if not os.path.exists(U_BOOT_SPL) or not os.path.exists(U_BOOT_IMG):
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-10-03 13:30:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 0cc59bc4489aa9a928e5af36361984708e428439 (commit)
from d6fbc0a4406e45416759dcbe6451771101a002a5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0cc59bc4489aa9a928e5af36361984708e428439
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Oct 3 15:30:05 2017 +0200
[BUILDROOT] apf6legacy*_defconfigs: add gdkpixbufoverlay lugin to gstreamer (overlay of png images)
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6legacy-4.1_defconfig | 1 +
buildroot/configs/apf6legacy_defconfig | 1 +
2 files changed, 2 insertions(+)
diff --git a/buildroot/configs/apf6legacy-4.1_defconfig b/buildroot/configs/apf6legacy-4.1_defconfig
index b004572..8b4b141 100644
--- a/buildroot/configs/apf6legacy-4.1_defconfig
+++ b/buildroot/configs/apf6legacy-4.1_defconfig
@@ -70,6 +70,7 @@ BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOFILTER=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF=y
BR2_PACKAGE_GST1_PLUGINS_BAD=y
BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR=y
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index 2707d9a..012d985 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -64,6 +64,7 @@ BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOFILTER=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF=y
BR2_PACKAGE_GST1_PLUGINS_BAD=y
BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR=y
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-10-03 08:28:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via d6fbc0a4406e45416759dcbe6451771101a002a5 (commit)
via 5789d321f6245fd08966b76afeba0506bdbfa3c8 (commit)
from fbb0a22e9ac7882f2f5a66082cfc554850172479 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d6fbc0a4406e45416759dcbe6451771101a002a5
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Oct 2 16:51:17 2017 +0200
[ROOTFS] S30wifi: fixes error messages on 4.x+ kernels (WI_EN handled inside kernel and not externally). Speed up chip reset while we are at it.
commit 5789d321f6245fd08966b76afeba0506bdbfa3c8
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Oct 2 16:47:57 2017 +0200
Indentation
-----------------------------------------------------------------------
Summary of changes:
.../rootfs/target_overlay/etc/init.d/S30wifi | 26 ++++++++++-----
.../rootfs/target_skeleton/etc/init.d/S30wifi | 38 +++++++++++++---------
2 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/buildroot/target/device/armadeus/rootfs/target_overlay/etc/init.d/S30wifi b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/init.d/S30wifi
index 91e738e..c768640 100755
--- a/buildroot/target/device/armadeus/rootfs/target_overlay/etc/init.d/S30wifi
+++ b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/init.d/S30wifi
@@ -4,26 +4,34 @@
#
start_chip() {
+ res=0
if [ ! -d /sys/class/gpio/gpio40 ]; then
- echo 40 > /sys/class/gpio/export
+ echo 40 > /sys/class/gpio/export 2>/dev/null
+ res=$?
+ fi
+ if [ "$res" != "0" ]; then
+ # On > 4.x kernels gpio40 (WI_EN) is driven by sdhc driver
+ return
fi
-
echo out > /sys/class/gpio/gpio40/direction
-
- sleep 1
+ usleep 100000
echo 1 > /sys/class/gpio/gpio40/value
- sleep 1
+ usleep 100000
echo 0 > /sys/class/gpio/gpio40/value
- sleep 1
+ usleep 100000
echo 1 > /sys/class/gpio/gpio40/value
- sleep 1
+ usleep 100000
}
stop_chip() {
+ res=0
if [ ! -d /sys/class/gpio/gpio40 ]; then
- echo 40 > /sys/class/gpio/export
+ echo 40 > /sys/class/gpio/export 2>/dev/null
+ res=$?
+ fi
+ if [ "$res" != "0" ]; then
+ return
fi
-
echo out > /sys/class/gpio/gpio40/direction
sleep 1
}
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/init.d/S30wifi b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/init.d/S30wifi
index 2284242..c768640 100755
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/init.d/S30wifi
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/init.d/S30wifi
@@ -4,26 +4,34 @@
#
start_chip() {
+ res=0
if [ ! -d /sys/class/gpio/gpio40 ]; then
- echo 40 > /sys/class/gpio/export
+ echo 40 > /sys/class/gpio/export 2>/dev/null
+ res=$?
+ fi
+ if [ "$res" != "0" ]; then
+ # On > 4.x kernels gpio40 (WI_EN) is driven by sdhc driver
+ return
fi
-
echo out > /sys/class/gpio/gpio40/direction
-
- sleep 1
+ usleep 100000
echo 1 > /sys/class/gpio/gpio40/value
- sleep 1
+ usleep 100000
echo 0 > /sys/class/gpio/gpio40/value
- sleep 1
+ usleep 100000
echo 1 > /sys/class/gpio/gpio40/value
- sleep 1
+ usleep 100000
}
stop_chip() {
+ res=0
if [ ! -d /sys/class/gpio/gpio40 ]; then
- echo 40 > /sys/class/gpio/export
+ echo 40 > /sys/class/gpio/export 2>/dev/null
+ res=$?
+ fi
+ if [ "$res" != "0" ]; then
+ return
fi
-
echo out > /sys/class/gpio/gpio40/direction
sleep 1
}
@@ -55,7 +63,7 @@ restart() {
calibrate() {
if [ ! -z "$1" ]; then
echo "Calibrating"
-
+
stop
calibrator set ref_nvs /usr/share/ti-utils/ini_files/127x/TQS_S_2.6.ini
@@ -79,17 +87,17 @@ calibrate() {
case "$1" in
start)
- start
+ start
;;
stop)
- stop
+ stop
;;
restart|reload)
- restart
+ restart
;;
calibrate)
- calibrate "$2"
- ;;
+ calibrate "$2"
+ ;;
*)
echo $"Usage: $0 {start|stop|restart|calibrate <MAC address>}"
exit 1
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-10-02 08:52:05
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via fbb0a22e9ac7882f2f5a66082cfc554850172479 (commit)
via bb3f7476baf9f0af05b6420bf0201aeb1a58822a (commit)
via 9d842854ac13f6b6f9427f6d3d01fc5620b26935 (commit)
from 928a1aa1046d26f819119dc38a043b579e513013 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fbb0a22e9ac7882f2f5a66082cfc554850172479
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Oct 2 10:51:22 2017 +0200
[BUILDROOT] apf6legacy*_defconfig: re-add VPU/IPU/GPU gstreamer plugins plus some H.26x software one
commit bb3f7476baf9f0af05b6420bf0201aeb1a58822a
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Oct 2 10:43:41 2017 +0200
[DEMOS] capture: add RGB24 support (needed by some v4l2loopback examples)
commit 9d842854ac13f6b6f9427f6d3d01fc5620b26935
Author: Julien BOIBESSOT <jul...@ar...>
Date: Sat Sep 30 19:16:54 2017 +0200
[DEMOS] capture: add a runtime option to activate debug messages and improve format matching messages
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6legacy-4.1_defconfig | 7 ++++
buildroot/configs/apf6legacy_defconfig | 7 ++++
buildroot/package/armadeus/demos/demos.mk | 2 +-
target/demos/camera/capture/capture.c | 63 ++++++++++++++++++++++++------
4 files changed, 66 insertions(+), 13 deletions(-)
diff --git a/buildroot/configs/apf6legacy-4.1_defconfig b/buildroot/configs/apf6legacy-4.1_defconfig
index a0f8497..b004572 100644
--- a/buildroot/configs/apf6legacy-4.1_defconfig
+++ b/buildroot/configs/apf6legacy-4.1_defconfig
@@ -76,8 +76,15 @@ BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265=y
BR2_PACKAGE_GST1_PLUGINS_UGLY=y
+BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264=y
BR2_PACKAGE_GST1_IMX=y
+BR2_PACKAGE_GST1_IMX_G2D=y
+BR2_PACKAGE_GST1_IMX_IPU=y
+BR2_PACKAGE_GST1_IMX_VPU=y
+BR2_PACKAGE_GST1_IMX_V4L2VIDEOSRC=y
BR2_PACKAGE_GST1_LIBAV=y
BR2_PACKAGE_V4L2LOOPBACK=y
BR2_PACKAGE_GDB=y
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index ab8e4bd..2707d9a 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -70,8 +70,15 @@ BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265=y
BR2_PACKAGE_GST1_PLUGINS_UGLY=y
+BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264=y
BR2_PACKAGE_GST1_IMX=y
+BR2_PACKAGE_GST1_IMX_G2D=y
+BR2_PACKAGE_GST1_IMX_IPU=y
+BR2_PACKAGE_GST1_IMX_VPU=y
+BR2_PACKAGE_GST1_IMX_V4L2VIDEOSRC=y
BR2_PACKAGE_GST1_LIBAV=y
BR2_PACKAGE_V4L2LOOPBACK=y
BR2_PACKAGE_GDB=y
diff --git a/buildroot/package/armadeus/demos/demos.mk b/buildroot/package/armadeus/demos/demos.mk
index 22611eb..cbd37d6 100644
--- a/buildroot/package/armadeus/demos/demos.mk
+++ b/buildroot/package/armadeus/demos/demos.mk
@@ -4,7 +4,7 @@
#
#############################################################
-DEMOS_VERSION = 1.1
+DEMOS_VERSION = 1.11
DEMOS_SITE = $(TOPDIR)/../target/demos
DEMOS_SITE_METHOD = local
diff --git a/target/demos/camera/capture/capture.c b/target/demos/camera/capture/capture.c
index bb4a917..f0ce152 100644
--- a/target/demos/camera/capture/capture.c
+++ b/target/demos/camera/capture/capture.c
@@ -68,6 +68,7 @@ static int fd = -1;
struct buffer * buffers = NULL;
static unsigned int n_buffers = 0;
int g_use_codec = 0;
+static int debug = 0;
SDL_Surface *screen = NULL, *image = NULL;
@@ -83,6 +84,8 @@ struct camera mycamera;
unsigned int force_yuv420 = 0;
+#define FOURCC_TO_STR(fmt) fmt & 0xff, (fmt >> 8) & 0xff, (fmt >> 16) & 0xff, (fmt >> 24) & 0xff
+
static void errno_exit(const char *s)
{
fprintf(stderr, "%s error %d, %s\n", s, errno, strerror (errno));
@@ -346,6 +349,27 @@ static void yuv420_to_rgb(void *yuv, int size, void *rgb, int bpp)
}
}
+static void rgb_to_rgb(void *rgb_src, int size, void *rgb_dst, int bpp)
+{
+ Uint32 *dest32 = (Uint32*) rgb_dst;
+ Uint8 *src = (Uint8 *)rgb_src;
+ int i, pos = 0;
+ Uint8 R, G, B, A;
+ Uint32 color;
+
+ if (bpp == 32) {
+ for (i=size/4; i; i--) {
+ R = src[pos++];
+ G = src[pos++];
+ B = src[pos++];
+ A = 0xff;
+ *dest32++ = (A << 24) | (R << 16) | (G << 8) | B;
+ }
+ } else {
+ fprintf(stdout, "%s: unsupported screen bpp (%d)\n", __func__, bpp);
+ }
+}
+
#if 0
static void rgb565_to_yuv420(void *rgb, int size, void *yuv)
{
@@ -420,6 +444,7 @@ static void process_image(/*const */void *pCaptured, int size)
int sec, usec, run_time;
static struct timeval now, last;
static int fps;
+ static int first_time = 1;
if (mycamera.pixelformat == V4L2_PIX_FMT_YUYV) {
yuyv_to_rgb(pCaptured, mycamera.sizeimage, image->pixels, screen->format->BitsPerPixel);
@@ -427,9 +452,16 @@ static void process_image(/*const */void *pCaptured, int size)
uyvy_to_rgb(pCaptured, mycamera.sizeimage, image->pixels, screen->format->BitsPerPixel);
} else if (mycamera.pixelformat == V4L2_PIX_FMT_YUV420) {
yuv420_to_rgb(pCaptured, mycamera.sizeimage, image->pixels, screen->format->BitsPerPixel);
+ } else if (mycamera.pixelformat == V4L2_PIX_FMT_RGB24) {
+ rgb_to_rgb(pCaptured, mycamera.sizeimage, image->pixels, screen->format->BitsPerPixel);
} else {
- if ((mycamera.pixelformat != V4L2_PIX_FMT_RGB565) || (mycamera.pixelformat != V4L2_PIX_FMT_RGB32)) {
- printf("Unknown image format\n");
+ if ( (mycamera.pixelformat != V4L2_PIX_FMT_RGB565)
+ && (mycamera.pixelformat != V4L2_PIX_FMT_RGB32) )
+ {
+ if (first_time) {
+ printf("Unknown camera image format (%c%c%c%c)!!\n", FOURCC_TO_STR(mycamera.pixelformat));
+ first_time = 0;
+ }
}
if (size == 0)
size = mycamera.sizeimage;
@@ -869,14 +901,15 @@ static Uint32 get_a_supported_pix_fmt(void)
fmtdesc.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
if (-1 == ioctl(fd, VIDIOC_ENUM_FMT, &fmtdesc))
break;
-
- /*fprintf(stdout, "Trying format N°%d %c%c%c%c (%s)\n",
- fmtdesc.index, fmtdesc.pixelformat & 0xff,
- fmtdesc.pixelformat >> 8 & 0xff, fmtdesc.pixelformat >> 16 & 0xff,
- fmtdesc.pixelformat >> 24 & 0xff, fmtdesc.description);*/
- if ((fmtdesc.pixelformat == V4L2_PIX_FMT_RGB565) || (fmtdesc.pixelformat == V4L2_PIX_FMT_RGB32)) {
- fprintf(stdout, "Using img format (%d 0x%08x): ", i, fmtdesc.pixelformat);
- fprintf(stdout, "RGB565/RGB32\n");
+ if (debug) {
+ fprintf(stdout, "Trying format %d %c%c%c%c (%s)\n",
+ fmtdesc.index, FOURCC_TO_STR(fmtdesc.pixelformat),
+ fmtdesc.description);
+ }
+ if ((fmtdesc.pixelformat == V4L2_PIX_FMT_RGB565) ||
+ (fmtdesc.pixelformat == V4L2_PIX_FMT_RGB32) ||
+ (fmtdesc.pixelformat == V4L2_PIX_FMT_RGB24) ) {
+ fprintf(stdout, "Using img format (%d %c%c%c%c)\n", i, FOURCC_TO_STR(fmtdesc.pixelformat));
return fmtdesc.pixelformat;
}
}
@@ -990,7 +1023,7 @@ static void init_capture_device(unsigned int capt_width, unsigned int capt_heigh
fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUV420;
}
if (!fmt.fmt.pix.pixelformat) {
- fprintf(stderr, "%s does not support requested img formats\n",
+ fprintf(stderr, "%s does not support our img formats (RGB565, RGB32, YUYV, YUV420)\n",
dev_name);
exit(EXIT_FAILURE);
}
@@ -1086,11 +1119,12 @@ static void usage(FILE *fp, int argc, char **argv)
" --cam_height H Use H as camera picture height (instead of %d)\n"
" --use_vpu IP Uses processor VPU to encode video (at camera size) and send it to IP addr\n"
" -f | --force Forces YUV420/YU12 format on camera\n"
+ " -b | --verbose Display some debug informations\n"
"",
argv[0], SCREEN_WIDTH, SCREEN_HEIGHT, CAM_WIDTH, CAM_HEIGHT);
}
-static const char short_options [] = "d:hmruwtf";
+static const char short_options [] = "d:hmruwtfb";
static const struct option long_options [] = {
{ "device", required_argument, NULL, 'd' },
@@ -1104,6 +1138,7 @@ static const struct option long_options [] = {
{ "cam_height", required_argument, NULL, 'z' },
{ "use_vpu", required_argument, NULL, 'v' },
{ "force", no_argument, NULL, 'f' },
+ { "verbose", no_argument, NULL, 'b' },
{ 0, 0, 0, 0 }
};
@@ -1155,6 +1190,10 @@ int main(int argc, char **argv)
case 0: /* getopt_long() flag */
break;
+ case 'b':
+ debug = 1;
+ break;
+
case 'd':
dev_name = optarg;
break;
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-09-13 14:13:22
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 928a1aa1046d26f819119dc38a043b579e513013 (commit)
from aabe802580378f8fab28b0fc2cd768440594aec8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 928a1aa1046d26f819119dc38a043b579e513013
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Sep 13 16:12:34 2017 +0200
[TOOLS] fix scripts/quiltify.sh usage with (new) SVN
-----------------------------------------------------------------------
Summary of changes:
scripts/quiltify.sh | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 00b26c4..4286d00 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -102,10 +102,14 @@ if [ "$1" == "export" ]; then
echo -e "\n--- You can now check your work before commiting --> \n"
if [ -d ".git" ]; then
git status
- elif [ -d ".svn" ]; then
- svn status -q
else
- echo "No VCS found"
+ foo=`svn info`
+ if [ "$?" == "0" ]; then
+ svn status -q
+ else
+ echo "No VCS found"
+ exit 1
+ fi
fi
if [ "$QUILT_TARGET_NAME" == "Buildroot" ]; then
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-09-07 15:14:54
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via aabe802580378f8fab28b0fc2cd768440594aec8 (commit)
from d0162bb83c107513a69a7146e3fa5d60435dfadc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit aabe802580378f8fab28b0fc2cd768440594aec8
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Sep 7 17:14:27 2017 +0200
[HARDWARE] Add a basic (WIP) APF6Dev SVG view
-----------------------------------------------------------------------
Summary of changes:
.../apf6/svg/BreadboardViewGraphic_APF6Dev.svg | 9946 ++++++++++++++++++++
1 file changed, 9946 insertions(+)
create mode 100644 hardware/apf6/svg/BreadboardViewGraphic_APF6Dev.svg
diff --git a/hardware/apf6/svg/BreadboardViewGraphic_APF6Dev.svg b/hardware/apf6/svg/BreadboardViewGraphic_APF6Dev.svg
new file mode 100644
index 0000000..652b2cc
--- /dev/null
+++ b/hardware/apf6/svg/BreadboardViewGraphic_APF6Dev.svg
@@ -0,0 +1,9946 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="584.64563"
+ height="411.02362"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="BreadboardViewGraphic_APF6Dev.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ x2="-182.577"
+ gradientUnits="userSpaceOnUse"
+ y2="-335.05099"
+ x1="-192.873"
+ y1="-335.05099"
+ id="linearGradient7886"
+ gradientTransform="matrix(1,0,0,-1,273,-448.8574)">
+ <stop
+ id="stop7888"
+ style="stop-color:#333333"
+ offset="0" />
+ <stop
+ id="stop7890"
+ style="stop-color:#cecece;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective2447" />
+ <inkscape:perspective
+ id="perspective10"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <linearGradient
+ gradientTransform="matrix(1,0,0,-1,273,-448.8574)"
+ id="SVGID_1_"
+ y1="-335.05099"
+ x1="-192.873"
+ y2="-335.05099"
+ gradientUnits="userSpaceOnUse"
+ x2="-182.577">
+ <stop
+ offset="0"
+ style="stop-color:#333333"
+ id="stop12705" />
+ <stop
+ offset="1"
+ style="stop-color:#3C3C3C"
+ id="stop12707" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#SVGID_1_-5"
+ id="linearGradient12846-6"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,-1,273,-448.8574)"
+ x1="-192.873"
+ y1="-335.05099"
+ x2="-182.577"
+ y2="-335.05099" />
+ <linearGradient
+ gradientTransform="matrix(1,0,0,-1,273,-448.8574)"
+ id="SVGID_1_-5"
+ y1="-335.05099"
+ x1="-192.873"
+ y2="-335.05099"
+ gradientUnits="userSpaceOnUse"
+ x2="-182.577">
+ <stop
+ offset="0"
+ style="stop-color:#333333"
+ id="stop12705-3" />
+ <stop
+ offset="1"
+ style="stop-color:#3C3C3C"
+ id="stop12707-8" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#SVGID_1_-5-3"
+ id="linearGradient12846-6-5"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,-1,273,-448.8574)"
+ x1="-192.873"
+ y1="-335.05099"
+ x2="-182.577"
+ y2="-335.05099" />
+ <linearGradient
+ gradientTransform="matrix(1,0,0,-1,273,-448.8574)"
+ id="SVGID_1_-5-3"
+ y1="-335.05099"
+ x1="-192.873"
+ y2="-335.05099"
+ gradientUnits="userSpaceOnUse"
+ x2="-182.577">
+ <stop
+ offset="0"
+ style="stop-color:#333333"
+ id="stop12705-3-5" />
+ <stop
+ offset="1"
+ style="stop-color:#3C3C3C"
+ id="stop12707-8-6" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#SVGID_1_-5-3-8"
+ id="linearGradient12846-6-5-8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,-1,273,-448.8574)"
+ x1="-192.873"
+ y1="-335.05099"
+ x2="-182.577"
+ y2="-335.05099" />
+ <linearGradient
+ gradientTransform="matrix(1,0,0,-1,273,-448.8574)"
+ id="SVGID_1_-5-3-8"
+ y1="-335.05099"
+ x1="-192.873"
+ y2="-335.05099"
+ gradientUnits="userSpaceOnUse"
+ x2="-182.577">
+ <stop
+ offset="0"
+ style="stop-color:#333333"
+ id="stop12705-3-5-8" />
+ <stop
+ offset="1"
+ style="stop-color:#3C3C3C"
+ id="stop12707-8-6-6" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7886"
+ id="linearGradient7892"
+ x1="406"
+ y1="166.27362"
+ x2="494"
+ y2="166.27362"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7886"
+ id="linearGradient8164"
+ x1="225.09451"
+ y1="-153.25"
+ x2="264.20081"
+ y2="-153.25"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(6.363961,-8.4852814)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.4142136"
+ inkscape:cx="437.9558"
+ inkscape:cy="219.47521"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer2"
+ showgrid="true"
+ units="mm"
+ inkscape:window-width="1920"
+ inkscape:window-height="1027"
+ inkscape:window-x="0"
+ inkscape:window-y="31"
+ inkscape:window-maximized="1"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5347"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="7,356"
+ id="guide5351" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="59,394.5"
+ id="guide5353" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="566,164"
+ id="guide5778" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="575,163"
+ id="guide5780" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="pcb"
+ style="display:inline"
+ transform="translate(0,92.125959)">
+ <path
+ style="fill:#007300;fill-opacity:1;stroke:none;display:inline"
+ d="m 2.1910804,-88.38267 0,401.90625 582.8749996,0 0,-401.90625 z M 16.75724,296.31309 c 5.72331,0 7.15714,2.16112 7.15714,6.1071 0,3.94597 -1.25706,6.42126 -6.98037,6.42126 -5.7233,0 -9.1587996,-1.94496 -9.1587996,-5.89093 0,-3.94598 3.2587296,-6.63743 8.9820296,-6.63743 z m 554.24268,0.75 c 5.72329,0 6.89624,3.47178 6.89624,7.41776 0,3.94597 -1.67295,6.12837 -7.39624,6.12837 -5.7233,0 -7.58912,-3.6824 -7.58912,-7.62837 0,-3.94598 2.36582,-5.91776 8.08912,-5.91776 z"
+ id="rect3006"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccssssssssss" />
+ <path
+ sodipodi:type="arc"
+ style="fill:none;stroke:#e9ae36;stroke-width:3.54330707;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path4577"
+ sodipodi:cx="18.75"
+ sodipodi:cy="104.64862"
+ sodipodi:rx="7.75"
+ sodipodi:ry="7.625"
+ d="m 26.5,104.64862 a 7.75,7.625 0 1 1 -15.5,0 7.75,7.625 0 1 1 15.5,0 z"
+ transform="matrix(0.92891776,0,0,0.94414592,-7.417208,-177.70679)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:none;stroke:#e9ae36;stroke-width:3.54330707;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+ id="path4577-3"
+ sodipodi:cx="18.75"
+ sodipodi:cy="104.64862"
+ sodipodi:rx="7.75"
+ sodipodi:ry="7.625"
+ d="m 26.5,104.64862 a 7.75,7.625 0 1 1 -15.5,0 7.75,7.625 0 1 1 15.5,0 z"
+ transform="matrix(0.92891776,0,0,0.94414592,-1.9172079,204.79321)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:none;stroke:#e9ae36;stroke-width:3.54330707;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+ id="path4577-7"
+ sodipodi:cx="18.75"
+ sodipodi:cy="104.64862"
+ sodipodi:rx="7.75"
+ sodipodi:ry="7.625"
+ d="m 26.5,104.64862 a 7.75,7.625 0 1 1 -15.5,0 7.75,7.625 0 1 1 15.5,0 z"
+ transform="matrix(0.92891776,0,0,0.94414592,555.13368,-140.15591)" />
+ <g
+ id="g6431"
+ transform="translate(-4,-2.5)">
+ <rect
+ y="0.89766169"
+ x="523"
+ height="163"
+ width="32"
+ id="rect6411"
+ style="fill:#919155;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ <g
+ transform="translate(-32,-6.9999997)"
+ id="g5804">
+ <g
+ id="g5738"
+ transform="translate(270.56706,127.89601)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.377,13.437 87.935,12.878 87.935,11.701 87.377,11.143 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="89.118,11.701 87.935,11.701 87.377,11.143 89.674,11.143 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.118,12.878 89.118,11.701 89.674,11.143 89.674,13.437 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="89.674,13.437 87.377,13.437 87.935,12.878 89.118,12.878 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ <g
+ style="display:inline"
+ id="g5738-4"
+ transform="translate(261.56454,127.89476)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-9"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.377,11.143 87.377,13.437 87.935,12.878 87.935,11.701 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-5"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="89.674,11.143 89.118,11.701 87.935,11.701 87.377,11.143 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-0"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.674,13.437 89.118,12.878 89.118,11.701 89.674,11.143 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-4"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="89.118,12.878 89.674,13.437 87.377,13.437 87.935,12.878 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-8"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ </g>
+ <g
+ transform="translate(-32,-16)"
+ id="g5804-7"
+ style="display:inline">
+ <g
+ id="g5738-1"
+ transform="translate(270.56706,127.89601)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-7"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.935,11.701 87.377,11.143 87.377,13.437 87.935,12.878 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-2"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="87.377,11.143 89.674,11.143 89.118,11.701 87.935,11.701 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-7"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.674,11.143 89.674,13.437 89.118,12.878 89.118,11.701 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-2"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="87.935,12.878 89.118,12.878 89.674,13.437 87.377,13.437 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-2"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ <g
+ style="display:inline"
+ id="g5738-4-6"
+ transform="translate(261.56454,127.89476)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-9-1"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.935,12.878 87.935,11.701 87.377,11.143 87.377,13.437 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-5-0"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="87.935,11.701 87.377,11.143 89.674,11.143 89.118,11.701 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-0-6"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.118,11.701 89.674,11.143 89.674,13.437 89.118,12.878 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-4-1"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="87.377,13.437 87.935,12.878 89.118,12.878 89.674,13.437 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-8-5"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ </g>
+ <g
+ transform="translate(-31.999995,-24.999998)"
+ id="g5804-9"
+ style="display:inline">
+ <g
+ id="g5738-49"
+ transform="translate(270.56706,127.89601)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-0"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.935,12.878 87.935,11.701 87.377,11.143 87.377,13.437 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-9"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="87.935,11.701 87.377,11.143 89.674,11.143 89.118,11.701 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-1"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.118,11.701 89.674,11.143 89.674,13.437 89.118,12.878 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-7"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="87.377,13.437 87.935,12.878 89.118,12.878 89.674,13.437 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-7"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ <g
+ style="display:inline"
+ id="g5738-4-1"
+ transform="translate(261.56454,127.89476)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-9-15"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.377,13.437 87.935,12.878 87.935,11.701 87.377,11.143 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-5-9"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="89.118,11.701 87.935,11.701 87.377,11.143 89.674,11.143 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-0-7"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.118,12.878 89.118,11.701 89.674,11.143 89.674,13.437 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-4-7"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="89.674,13.437 87.377,13.437 87.935,12.878 89.118,12.878 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-8-6"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ </g>
+ <g
+ transform="translate(-31.99748,-33.99875)"
+ id="g5804-73"
+ style="display:inline">
+ <g
+ id="g5738-6"
+ transform="translate(270.56706,127.89601)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-5"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.935,12.878 87.935,11.701 87.377,11.143 87.377,13.437 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-6"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="87.935,11.701 87.377,11.143 89.674,11.143 89.118,11.701 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-3"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.118,11.701 89.674,11.143 89.674,13.437 89.118,12.878 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-9"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="87.377,13.437 87.935,12.878 89.118,12.878 89.674,13.437 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-4"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ <g
+ style="display:inline"
+ id="g5738-4-8"
+ transform="translate(261.56454,127.89476)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-9-12"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.377,13.437 87.935,12.878 87.935,11.701 87.377,11.143 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-5-93"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="89.118,11.701 87.935,11.701 87.377,11.143 89.674,11.143 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-0-9"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.118,12.878 89.118,11.701 89.674,11.143 89.674,13.437 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-4-0"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="89.674,13.437 87.377,13.437 87.935,12.878 89.118,12.878 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-8-8"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ </g>
+ <g
+ transform="translate(-31.99748,-42.99875)"
+ id="g5804-73-8"
+ style="display:inline">
+ <g
+ id="g5738-6-5"
+ transform="translate(270.56706,127.89601)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-5-0"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.377,13.437 87.935,12.878 87.935,11.701 87.377,11.143 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-6-9"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="89.118,11.701 87.935,11.701 87.377,11.143 89.674,11.143 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-3-6"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.118,12.878 89.118,11.701 89.674,11.143 89.674,13.437 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-9-3"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="89.674,13.437 87.377,13.437 87.935,12.878 89.118,12.878 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-4-8"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ <g
+ style="display:inline"
+ id="g5738-4-8-5"
+ transform="translate(261.56454,127.89476)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-9-12-6"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.377,11.143 87.377,13.437 87.935,12.878 87.935,11.701 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-5-93-1"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="89.674,11.143 89.118,11.701 87.935,11.701 87.377,11.143 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-0-9-1"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.674,13.437 89.118,12.878 89.118,11.701 89.674,11.143 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-4-0-5"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="89.118,12.878 89.674,13.437 87.377,13.437 87.935,12.878 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-8-8-9"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ </g>
+ <g
+ transform="translate(-31.99748,-51.99875)"
+ id="g5804-73-84"
+ style="display:inline">
+ <g
+ id="g5738-6-8"
+ transform="translate(270.56706,127.89601)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-5-1"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.935,12.878 87.935,11.701 87.377,11.143 87.377,13.437 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-6-0"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="87.935,11.701 87.377,11.143 89.674,11.143 89.118,11.701 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-3-3"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.118,11.701 89.674,11.143 89.674,13.437 89.118,12.878 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-9-0"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="87.377,13.437 87.935,12.878 89.118,12.878 89.674,13.437 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-4-4"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ <g
+ style="display:inline"
+ id="g5738-4-8-4"
+ transform="translate(261.56454,127.89476)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-9-12-4"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.377,13.437 87.935,12.878 87.935,11.701 87.377,11.143 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-5-93-4"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="89.118,11.701 87.935,11.701 87.377,11.143 89.674,11.143 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-0-9-7"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.118,12.878 89.118,11.701 89.674,11.143 89.674,13.437 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-4-0-6"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="89.674,13.437 87.377,13.437 87.935,12.878 89.118,12.878 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-8-8-3"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ </g>
+ <g
+ transform="translate(-31.99748,-60.99875)"
+ id="g5804-73-1"
+ style="display:inline">
+ <g
+ id="g5738-6-7"
+ transform="translate(270.56706,127.89601)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-5-5"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.935,12.878 87.935,11.701 87.377,11.143 87.377,13.437 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-6-96"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="87.935,11.701 87.377,11.143 89.674,11.143 89.118,11.701 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-3-2"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.118,11.701 89.674,11.143 89.674,13.437 89.118,12.878 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-9-1"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="87.377,13.437 87.935,12.878 89.118,12.878 89.674,13.437 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-4-7"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ <g
+ style="display:inline"
+ id="g5738-4-8-8"
+ transform="translate(261.56454,127.89476)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-9-12-5"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.377,13.437 87.935,12.878 87.935,11.701 87.377,11.143 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-5-93-7"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="89.118,11.701 87.935,11.701 87.377,11.143 89.674,11.143 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-0-9-4"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.118,12.878 89.118,11.701 89.674,11.143 89.674,13.437 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-4-0-1"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="89.674,13.437 87.377,13.437 87.935,12.878 89.118,12.878 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-8-8-8"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ </g>
+ <g
+ transform="translate(-31.99748,-69.99875)"
+ id="g5804-73-5"
+ style="display:inline">
+ <g
+ id="g5738-6-9"
+ transform="translate(270.56706,127.89601)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-5-7"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.377,11.143 87.377,13.437 87.935,12.878 87.935,11.701 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-6-5"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="89.674,11.143 89.118,11.701 87.935,11.701 87.377,11.143 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-3-38"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.674,13.437 89.118,12.878 89.118,11.701 89.674,11.143 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-9-8"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="89.118,12.878 89.674,13.437 87.377,13.437 87.935,12.878 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-4-3"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ <g
+ style="display:inline"
+ id="g5738-4-8-1"
+ transform="translate(261.56454,127.89476)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-9-12-8"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.935,11.701 87.377,11.143 87.377,13.437 87.935,12.878 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-5-93-9"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="87.377,11.143 89.674,11.143 89.118,11.701 87.935,11.701 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-0-9-6"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.674,11.143 89.674,13.437 89.118,12.878 89.118,11.701 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-4-0-4"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="87.935,12.878 89.118,12.878 89.674,13.437 87.377,13.437 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-8-8-33"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ </g>
+ <g
+ transform="translate(-31.99748,-78.99875)"
+ id="g5804-73-3"
+ style="display:inline">
+ <g
+ id="g5738-6-86"
+ transform="translate(270.56706,127.89601)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-5-04"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.935,11.701 87.377,11.143 87.377,13.437 87.935,12.878 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-6-8"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="87.377,11.143 89.674,11.143 89.118,11.701 87.935,11.701 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-3-8"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.674,11.143 89.674,13.437 89.118,12.878 89.118,11.701 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-9-89"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="87.935,12.878 89.118,12.878 89.674,13.437 87.377,13.437 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-4-77"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ <g
+ style="display:inline"
+ id="g5738-4-8-6"
+ transform="translate(261.56454,127.89476)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-9-12-43"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.935,12.878 87.935,11.701 87.377,11.143 87.377,13.437 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-5-93-0"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="87.935,11.701 87.377,11.143 89.674,11.143 89.118,11.701 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-0-9-3"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.118,11.701 89.674,11.143 89.674,13.437 89.118,12.878 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-4-0-0"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="87.377,13.437 87.935,12.878 89.118,12.878 89.674,13.437 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-8-8-92"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ </g>
+ <g
+ transform="translate(-31.99748,-87.99875)"
+ id="g5804-73-54"
+ style="display:inline">
+ <g
+ id="g5738-6-0"
+ transform="translate(270.56706,127.89601)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-5-59"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.377,11.143 87.377,13.437 87.935,12.878 87.935,11.701 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-6-4"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="89.674,11.143 89.118,11.701 87.935,11.701 87.377,11.143 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-3-69"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.674,13.437 89.118,12.878 89.118,11.701 89.674,11.143 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-9-2"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="89.118,12.878 89.674,13.437 87.377,13.437 87.935,12.878 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-4-2"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ <g
+ style="display:inline"
+ id="g5738-4-8-47"
+ transform="translate(261.56454,127.89476)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-9-12-7"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.935,11.701 87.377,11.143 87.377,13.437 87.935,12.878 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-5-93-5"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="87.377,11.143 89.674,11.143 89.118,11.701 87.935,11.701 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-0-9-48"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.674,11.143 89.674,13.437 89.118,12.878 89.118,11.701 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-4-0-12"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="87.935,12.878 89.118,12.878 89.674,13.437 87.377,13.437 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-8-8-89"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ </g>
+ <g
+ transform="translate(-31.99748,-96.99875)"
+ id="g5804-73-36"
+ style="display:inline">
+ <g
+ id="g5738-6-80"
+ transform="translate(270.56706,127.89601)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-5-2"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.377,13.437 87.935,12.878 87.935,11.701 87.377,11.143 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-6-1"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="89.118,11.701 87.935,11.701 87.377,11.143 89.674,11.143 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-3-0"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.118,12.878 89.118,11.701 89.674,11.143 89.674,13.437 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-9-5"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="89.674,13.437 87.377,13.437 87.935,12.878 89.118,12.878 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-4-1"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ <g
+ style="display:inline"
+ id="g5738-4-8-10"
+ transform="translate(261.56454,127.89476)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-9-12-85"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.377,11.143 87.377,13.437 87.935,12.878 87.935,11.701 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-5-93-06"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="89.674,11.143 89.118,11.701 87.935,11.701 87.377,11.143 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-0-9-46"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.674,13.437 89.118,12.878 89.118,11.701 89.674,11.143 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-4-0-2"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="89.118,12.878 89.674,13.437 87.377,13.437 87.935,12.878 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-8-8-5"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ </g>
+ <g
+ transform="translate(-31.99748,-105.99875)"
+ id="g5804-73-86"
+ style="display:inline">
+ <g
+ id="g5738-6-2"
+ transform="translate(270.56706,127.89601)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-5-8"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.935,12.878 87.935,11.701 87.377,11.143 87.377,13.437 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-6-47"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="87.935,11.701 87.377,11.143 89.674,11.143 89.118,11.701 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-3-24"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.118,11.701 89.674,11.143 89.674,13.437 89.118,12.878 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-9-06"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="87.377,13.437 87.935,12.878 89.118,12.878 89.674,13.437 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-4-29"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ <g
+ style="display:inline"
+ id="g5738-4-8-9"
+ transform="translate(261.56454,127.89476)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-9-12-0"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.377,13.437 87.935,12.878 87.935,11.701 87.377,11.143 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-5-93-8"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="89.118,11.701 87.935,11.701 87.377,11.143 89.674,11.143 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-0-9-13"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.118,12.878 89.118,11.701 89.674,11.143 89.674,13.437 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-4-0-11"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="89.674,13.437 87.377,13.437 87.935,12.878 89.118,12.878 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-8-8-0"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ </g>
+ <g
+ transform="translate(-31.99748,-114.99875)"
+ id="g5804-73-34"
+ style="display:inline">
+ <g
+ id="g5738-6-03"
+ transform="translate(270.56706,127.89601)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-5-9"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.377,11.143 87.377,13.437 87.935,12.878 87.935,11.701 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-6-19"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="89.674,11.143 89.118,11.701 87.935,11.701 87.377,11.143 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-3-693"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.674,13.437 89.118,12.878 89.118,11.701 89.674,11.143 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-9-38"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="89.118,12.878 89.674,13.437 87.377,13.437 87.935,12.878 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-4-0"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ <g
+ style="display:inline"
+ id="g5738-4-8-56"
+ transform="translate(261.56454,127.89476)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-9-12-64"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.935,11.701 87.377,11.143 87.377,13.437 87.935,12.878 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-5-93-00"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="87.377,11.143 89.674,11.143 89.118,11.701 87.935,11.701 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-0-9-462"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.674,11.143 89.674,13.437 89.118,12.878 89.118,11.701 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-4-0-67"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="87.935,12.878 89.118,12.878 89.674,13.437 87.377,13.437 "
+ style="fill:#9a916c;display:inline"
+ id="dnc24pin_12_-1-4-6-8-8-56"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ </g>
+ </g>
+ <g
+ transform="translate(-31.99748,-123.99875)"
+ id="g5804-73-9"
+ style="display:inline">
+ <g
+ id="g5738-6-87"
+ transform="translate(270.56706,127.89601)">
+ <rect
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.7"
+ height="1.4774991"
+ style="fill:#8c8663;display:inline"
+ x="-35.4804"
+ y="304.95795"
+ width="1.4774991"
+ id="rect3223-82_12_-3-3-6-5-28"
+ transform="matrix(0,-1,1,0,0,0)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.8"
+ points="87.377,13.437 87.935,12.878 87.935,11.701 87.377,11.143 "
+ style="fill:#b8af82;display:inline"
+ id="polygon3225-89_12_-5-4-8-6-2"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.9"
+ points="89.118,11.701 87.935,11.701 87.377,11.143 89.674,11.143 "
+ style="fill:#80795b;display:inline"
+ id="polygon3227-07_12_-58-9-9-3-9"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.10"
+ points="89.118,12.878 89.118,11.701 89.674,11.143 89.674,13.437 "
+ style="fill:#5e5b43;display:inline"
+ id="polygon3229-8_12_-1-8-2-9-9"
+ transform="matrix(0,-1.2499992,1.2499992,0,290.33545,145.39908)" />
+ <polygon
+ gorn="0.3.0.0.0.0.0.0.0.0.0.0.0.25.9.11"
+ points="89.67...
[truncated message content] |
|
From: Julien B a. A. <ar...@us...> - 2017-09-07 10:52:41
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via d0162bb83c107513a69a7146e3fa5d60435dfadc (commit)
via 2645734638e54a599696c8d843f0f196e08beea2 (commit)
from d6822f9304fc240f4e2a00608af11d2ad65e864e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d0162bb83c107513a69a7146e3fa5d60435dfadc
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Sep 7 12:52:01 2017 +0200
[BUILDROOT] package/freescale-imx: add i.MX6UL support
commit 2645734638e54a599696c8d843f0f196e08beea2
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Sep 7 12:50:57 2017 +0200
[BUILDROOT] add opos6ullegacy-4.1_defconfig (for OPOS6UL with Freescale/NXP 4.1 kernel)
-----------------------------------------------------------------------
Summary of changes:
...pt-rt_defconfig => opos6ullegacy-4.1_defconfig} | 40 +++++++++-------------
...32-armadeus-imx-lib-fixes-build-on-imx6ul.patch | 25 ++++++++++++++
patches/buildroot/2017.02/cleanup_buildroot.sh | 2 ++
3 files changed, 43 insertions(+), 24 deletions(-)
copy buildroot/configs/{opos6ul-preempt-rt_defconfig => opos6ullegacy-4.1_defconfig} (80%)
create mode 100644 patches/buildroot/2017.02/032-armadeus-imx-lib-fixes-build-on-imx6ul.patch
diff --git a/buildroot/configs/opos6ul-preempt-rt_defconfig b/buildroot/configs/opos6ullegacy-4.1_defconfig
similarity index 80%
copy from buildroot/configs/opos6ul-preempt-rt_defconfig
copy to buildroot/configs/opos6ullegacy-4.1_defconfig
index 8b434c8..414a766 100644
--- a/buildroot/configs/opos6ul-preempt-rt_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.1_defconfig
@@ -4,13 +4,17 @@ BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_TOOLCHAIN_EXTERNAL=y
-BR2_ENABLE_LOCALE_PURGE=y
+# Needed to have FSL 4.1 custom kernel includes:
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PACKAGE_HOST_GDB=y
+BR2_PACKAGE_HOST_GDB_TUI=y
+BR2_PACKAGE_HOST_GDB_PYTHON=y
BR2_TARGET_GENERIC_HOSTNAME="opos6ul"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
-BR2_TARGET_TZ_INFO=y
BR2_TARGET_TZ_ZONELIST="europe"
BR2_TARGET_LOCALTIME="Europe/Paris"
BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
@@ -22,11 +26,11 @@ BR2_BOARD_NAME="opos6ul"
BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.10"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-preempt-rt-linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="imx_4.1.15_2.0.0_ga"
+BR2_LINUX_KERNEL_PATCH="../patches/linux/4.1.mx6_legacy"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -61,26 +65,13 @@ BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_EVTEST=y
+BR2_PACKAGE_FREESCALE_IMX=y
+BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL=y
BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_IMX_TEST=y
BR2_PACKAGE_KBD=y
BR2_PACKAGE_SPI_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_PYTHON3=y
-BR2_PACKAGE_PYTHON3_CURSES=y
-BR2_PACKAGE_PYTHON3_DECIMAL=y
-BR2_PACKAGE_PYTHON3_READLINE=y
-BR2_PACKAGE_PYTHON3_SSL=y
-BR2_PACKAGE_PYTHON3_SQLITE=y
-BR2_PACKAGE_PYTHON3_PYEXPAT=y
-BR2_PACKAGE_PYTHON3_ZLIB=y
-BR2_PACKAGE_PYTHON_CAN=y
-BR2_PACKAGE_PYTHON_DATEUTIL=y
-BR2_PACKAGE_PYTHON_NUMPY=y
-BR2_PACKAGE_PYTHON_PAHO_MQTT=y
-BR2_PACKAGE_PYTHON_PYCLI=y
-BR2_PACKAGE_PYTHON_SERIAL=y
-BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
-BR2_PACKAGE_PYTHON_SPIDEV=y
BR2_PACKAGE_LIBVORBIS=y
BR2_PACKAGE_DTC=y
BR2_PACKAGE_DTC_PROGRAMS=y
@@ -104,6 +95,7 @@ BR2_PACKAGE_IPROUTE2=y
BR2_PACKAGE_IW=y
BR2_PACKAGE_LRZSZ=y
BR2_PACKAGE_PPPD=y
+BR2_PACKAGE_RPCBIND=y
BR2_PACKAGE_RSYNC=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
diff --git a/patches/buildroot/2017.02/032-armadeus-imx-lib-fixes-build-on-imx6ul.patch b/patches/buildroot/2017.02/032-armadeus-imx-lib-fixes-build-on-imx6ul.patch
new file mode 100644
index 0000000..476bbde
--- /dev/null
+++ b/patches/buildroot/2017.02/032-armadeus-imx-lib-fixes-build-on-imx6ul.patch
@@ -0,0 +1,25 @@
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/freescale-imx/Config.in
+===================================================================
+--- buildroot.orig/package/freescale-imx/Config.in
++++ buildroot/package/freescale-imx/Config.in
+@@ -30,6 +30,9 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFOR
+ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
+ bool "imx6q"
+
++config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL
++ bool "imx6ul"
++
+ endchoice
+
+ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM
+@@ -41,6 +44,7 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFOR
+ default "IMX51" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51
+ default "IMX53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53
+ default "IMX6Q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
++ default "IMX6UL" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL
+
+ config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
+ bool
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index 663c5d4..37c81ba 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -40,6 +40,8 @@ rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
rm -rf buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.patch
rm -rf buildroot/package/fbgrab/0002-fix-1.3-version.patch
+rm -rf buildroot/package/freescale-imx/Config.in
+rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib.mk
rm -rf buildroot/package/gnash/Config.in
rm -rf buildroot/package/gnash/gnash.mk
rm -rf buildroot/package/gnokii/Config.in
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-09-07 09:51:30
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via d6822f9304fc240f4e2a00608af11d2ad65e864e (commit)
via 29372924938cfd42d2552cc4f3546abf1282caf5 (commit)
via 31ca579c0f64946420aec3a8604fc8e8a65a69bd (commit)
from 494d200cacafd58994d91bb203e2d2530cae7ed8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d6822f9304fc240f4e2a00608af11d2ad65e864e
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Sep 7 11:50:09 2017 +0200
[LINUX] 4.1-legacy: mxsfb: fixes native-mode OF display's property handling
commit 29372924938cfd42d2552cc4f3546abf1282caf5
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Sep 7 11:23:46 2017 +0200
[LINUX] 4.1-legacy: fixes i.MX6UL PWM clocks declaration
commit 31ca579c0f64946420aec3a8604fc8e8a65a69bd
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Sep 6 18:01:56 2017 +0200
[LINUX] 4.1-legacy: add device tree for OPOS6UL(DEV)
-----------------------------------------------------------------------
Summary of changes:
...pos6ul-and-opos6uldev-add-initial-support.patch | 67 +++++++++----
...s-dts-fixes-imx6ul-pwm-clocks-declaration.patch | 41 ++++++++
...xsfb-fixes-multi-display-timings-handling.patch | 111 +++++++++++++++++++++
3 files changed, 198 insertions(+), 21 deletions(-)
copy patches/linux/{4.8 => 4.1.mx6_legacy}/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch (93%)
create mode 100644 patches/linux/4.1.mx6_legacy/0805-armadeus-dts-fixes-imx6ul-pwm-clocks-declaration.patch
create mode 100644 patches/linux/4.1.mx6_legacy/0806-armadeus-mxsfb-fixes-multi-display-timings-handling.patch
diff --git a/patches/linux/4.8/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch b/patches/linux/4.1.mx6_legacy/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
similarity index 93%
copy from patches/linux/4.8/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
copy to patches/linux/4.1.mx6_legacy/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
index 19d13c8..71b640c 100644
--- a/patches/linux/4.8/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
+++ b/patches/linux/4.1.mx6_legacy/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
@@ -16,23 +16,23 @@ Signed-off-by: Sébastien Szymanski <seb...@ar...>
create mode 100644 arch/arm/boot/dts/imx6ul-opos6ul.dtsi
create mode 100644 arch/arm/boot/dts/imx6ul-opos6uldev.dts
-Index: linux-4.8.10/arch/arm/boot/dts/Makefile
+Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/Makefile
===================================================================
---- linux-4.8.10.orig/arch/arm/boot/dts/Makefile
-+++ linux-4.8.10/arch/arm/boot/dts/Makefile
-@@ -407,6 +407,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
- imx6sx-sdb.dtb
- dtb-$(CONFIG_SOC_IMX6UL) += \
+--- linux-imx_4.1.15_2.0.0_ga.orig/arch/arm/boot/dts/Makefile
++++ linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/Makefile
+@@ -387,6 +387,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
+ imx6ul-14x14-ddr3-arm2-spdif.dtb \
+ imx6ul-14x14-ddr3-arm2-wm8958.dtb \
imx6ul-14x14-evk.dtb \
+ imx6ul-opos6uldev.dtb \
- imx6ul-pico-hobbit.dtb \
- imx6ul-tx6ul-0010.dtb \
- imx6ul-tx6ul-0011.dtb \
-Index: linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+ imx6ul-14x14-evk-btwifi.dtb \
+ imx6ul-14x14-evk-csi.dtb \
+ imx6ul-14x14-evk-emmc.dtb \
+Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
===================================================================
--- /dev/null
-+++ linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
-@@ -0,0 +1,192 @@
++++ linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+@@ -0,0 +1,212 @@
+/*
+ * Copyright 2016 Armadeus Systems <su...@ar...>
+ *
@@ -80,6 +80,7 @@ Index: linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
++#include <dt-bindings/input/input.h>
+#include "imx6ul.dtsi"
+
+/ {
@@ -87,6 +88,11 @@ Index: linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+ reg = <0x80000000 0>; /* will be filled by U-Boot */
+ };
+
++ pxp_v4l2 {
++ compatible = "fsl,imx6ul-pxp-v4l2", "fsl,imx6sx-pxp-v4l2", "fsl,imx6sl-pxp-v4l2";
++ status = "okay";
++ };
++
+ reg_3v3: regulator-3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "3V3";
@@ -100,6 +106,12 @@ Index: linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+ };
+};
+
++&cpu0 {
++ arm-supply = <®_arm>;
++ soc-supply = <®_soc>;
++ dc-supply = <®_3v3>;
++};
++
+&fec1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_enet1>;
@@ -124,6 +136,10 @@ Index: linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+ };
+};
+
++&pxp {
++ status = "okay";
++};
++
+/* Bluetooth */
+&uart8 {
+ pinctrl-names = "default";
@@ -165,6 +181,9 @@ Index: linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+};
+
+&iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hog_1>;
++ imx6ul-opos6ul {
+ pinctrl_enet1: enet1grp {
+ fsl,pins = <
+ MX6UL_PAD_GPIO1_IO06__ENET1_MDIO 0x1b0b0
@@ -224,12 +243,13 @@ Index: linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+ MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08 0x1b0b0
+ >;
+ };
++ };
+};
-Index: linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6ul-opos6uldev.dts
===================================================================
--- /dev/null
-+++ linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6uldev.dts
-@@ -0,0 +1,450 @@
++++ linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+@@ -0,0 +1,455 @@
+/*
+ * Copyright 2016 Armadeus Systems <su...@ar...>
+ *
@@ -278,6 +298,8 @@ Index: linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ */
+
+/dts-v1/;
++
++#include <dt-bindings/input/input.h>
+#include "imx6ul-opos6ul.dtsi"
+
+/ {
@@ -370,14 +392,14 @@ Index: linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ status = "okay";
+};
+
-+&can1 {
++&flexcan1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_flexcan1>;
+ xceiver-supply = <®_5v>;
+ status = "okay";
+};
+
-+&can2 {
++&flexcan2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_flexcan2>;
+ xceiver-supply = <®_5v>;
@@ -422,6 +444,7 @@ Index: linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_lcdif>;
+ display = <&display0>;
++ disp-dev = "lcd"; /* not handled by mxsfb yet */
+ lcd-supply = <®_3v3>;
+ status = "okay";
+
@@ -430,7 +453,9 @@ Index: linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ bus-width = <18>;
+
+ display-timings {
-+ ST0700 {
++ native-mode = <&timing0>;
++
++ timing0: ST0700 {
+ clock-frequency = <33000033>;
+ hactive = <800>;
+ vactive = <480>;
@@ -446,7 +471,7 @@ Index: linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ pixelclk-active = <0>;
+ };
+
-+ LQ043 {
++ timing1: LQ043 {
+ clock-frequency = <8690000>;
+ hactive = <480>;
+ vactive = <272>;
@@ -509,7 +534,7 @@ Index: linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+&iomuxc {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpios>;
-+
++ imx6ul-opos6uldev {
+
+ pinctrl_pwm3: pwm3grp {
+ fsl,pins = <
@@ -678,5 +703,5 @@ Index: linux-4.8.10/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ MX6UL_PAD_CSI_DATA07__CSI_DATA09 0x1b088
+ >;
+ };
-+
++ };
+};
diff --git a/patches/linux/4.1.mx6_legacy/0805-armadeus-dts-fixes-imx6ul-pwm-clocks-declaration.patch b/patches/linux/4.1.mx6_legacy/0805-armadeus-dts-fixes-imx6ul-pwm-clocks-declaration.patch
new file mode 100644
index 0000000..3326173
--- /dev/null
+++ b/patches/linux/4.1.mx6_legacy/0805-armadeus-dts-fixes-imx6ul-pwm-clocks-declaration.patch
@@ -0,0 +1,41 @@
+No comments ;-)
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6ul.dtsi
+===================================================================
+--- linux-imx_4.1.15_2.0.0_ga.orig/arch/arm/boot/dts/imx6ul.dtsi
++++ linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6ul.dtsi
+@@ -455,8 +455,8 @@
+ compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
+ reg = <0x02084000 0x4000>;
+ interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
+- clocks = <&clks IMX6UL_CLK_DUMMY>,
+- <&clks IMX6UL_CLK_DUMMY>;
++ clocks = <&clks IMX6UL_CLK_PWM2>,
++ <&clks IMX6UL_CLK_PWM2>;
+ clock-names = "ipg", "per";
+ #pwm-cells = <2>;
+ };
+@@ -465,8 +465,8 @@
+ compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
+ reg = <0x02088000 0x4000>;
+ interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+- clocks = <&clks IMX6UL_CLK_DUMMY>,
+- <&clks IMX6UL_CLK_DUMMY>;
++ clocks = <&clks IMX6UL_CLK_PWM3>,
++ <&clks IMX6UL_CLK_PWM3>;
+ clock-names = "ipg", "per";
+ #pwm-cells = <2>;
+ };
+@@ -475,8 +475,8 @@
+ compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
+ reg = <0x0208c000 0x4000>;
+ interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
+- clocks = <&clks IMX6UL_CLK_DUMMY>,
+- <&clks IMX6UL_CLK_DUMMY>;
++ clocks = <&clks IMX6UL_CLK_PWM4>,
++ <&clks IMX6UL_CLK_PWM4>;
+ clock-names = "ipg", "per";
+ #pwm-cells = <2>;
+ };
diff --git a/patches/linux/4.1.mx6_legacy/0806-armadeus-mxsfb-fixes-multi-display-timings-handling.patch b/patches/linux/4.1.mx6_legacy/0806-armadeus-mxsfb-fixes-multi-display-timings-handling.patch
new file mode 100644
index 0000000..47700cf
--- /dev/null
+++ b/patches/linux/4.1.mx6_legacy/0806-armadeus-mxsfb-fixes-multi-display-timings-handling.patch
@@ -0,0 +1,111 @@
+Makes "native-mode" property of displays in device tree works as expected.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-imx_4.1.15_2.0.0_ga/drivers/video/fbdev/mxsfb.c
+===================================================================
+--- linux-imx_4.1.15_2.0.0_ga.orig/drivers/video/fbdev/mxsfb.c
++++ linux-imx_4.1.15_2.0.0_ga/drivers/video/fbdev/mxsfb.c
+@@ -1102,6 +1102,30 @@ static int mxsfb_restore_mode(struct mxs
+ return 0;
+ }
+
++static int mxsfb_fb_add_videomode_from_timings(struct display_timings *timings, struct fb_info *fb_info, int index)
++{
++ struct videomode vm;
++ struct fb_videomode fb_vm;
++ int ret;
++
++ ret = videomode_from_timings(timings, &vm, index);
++ if (ret < 0)
++ return ret;
++
++ ret = fb_videomode_from_videomode(&vm, &fb_vm);
++ if (ret < 0)
++ return ret;
++
++ if (!(vm.flags & DISPLAY_FLAGS_DE_HIGH))
++ fb_vm.sync |= FB_SYNC_OE_LOW_ACT;
++ if (vm.flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)
++ fb_vm.sync |= FB_SYNC_CLK_LAT_FALL;
++
++ fb_add_videomode(&fb_vm, &fb_info->modelist);
++
++ return 0;
++}
++
+ static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host)
+ {
+ struct fb_info *fb_info = host->fb_info;
+@@ -1160,7 +1184,7 @@ static int mxsfb_init_fbinfo_dt(struct m
+ if (!ret) {
+ memcpy(host->disp_dev, disp_dev, strlen(disp_dev));
+ /* Timing is from encoder driver */
+- goto put_display_node;
++ //goto put_display_node;
+ }
+
+ timings = of_get_display_timings(display_np);
+@@ -1179,22 +1203,19 @@ static int mxsfb_init_fbinfo_dt(struct m
+ }
+
+ for (i = 0; i < of_get_child_count(timings_np); i++) {
+- struct videomode vm;
+- struct fb_videomode fb_vm;
++ if (i == timings->native_mode)
++ continue;
+
+- ret = videomode_from_timings(timings, &vm, i);
++ ret = mxsfb_fb_add_videomode_from_timings(timings, fb_info, i);
+ if (ret < 0)
+ goto put_timings_node;
+- ret = fb_videomode_from_videomode(&vm, &fb_vm);
+- if (ret < 0)
+- goto put_timings_node;
+-
+- if (!(vm.flags & DISPLAY_FLAGS_DE_HIGH))
+- fb_vm.sync |= FB_SYNC_OE_LOW_ACT;
+- if (vm.flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)
+- fb_vm.sync |= FB_SYNC_CLK_LAT_FALL;
+- fb_add_videomode(&fb_vm, &fb_info->modelist);
+ }
++ /* add native mode in last so it is used first o_O */
++ ret = mxsfb_fb_add_videomode_from_timings(timings, fb_info, timings->native_mode);
++ if (ret < 0)
++ goto put_timings_node;
++
++ return ret;
+
+ put_timings_node:
+ of_node_put(timings_np);
+@@ -1230,7 +1251,7 @@ static int mxsfb_init_fbinfo(struct mxsf
+ sprintf(fb_info->fix.id, "mxs-lcdif%d", host->id);
+
+ if (!list_empty(&fb_info->modelist)) {
+- /* first video mode in the modelist as default video mode */
++ /* first video mode in the modelist as default video mode */
+ modelist = list_first_entry(&fb_info->modelist,
+ struct fb_modelist, list);
+ fb_videomode_to_var(var, &modelist->mode);
+@@ -1276,7 +1297,7 @@ static void mxsfb_dispdrv_init(struct pl
+ host->dispdrv = mxc_dispdrv_gethandle(disp_dev, &setting);
+ if (IS_ERR(host->dispdrv)) {
+ host->dispdrv = NULL;
+- dev_info(dev, "failed to find mxc display driver %s\n",
++ dev_info(dev, "failed to find mxc display driver (%s) (don't care ;-))\n",
+ disp_dev);
+ } else {
+ dev_info(dev, "registered mxc display driver %s\n",
+Index: linux-imx_4.1.15_2.0.0_ga/drivers/video/of_display_timing.c
+===================================================================
+--- linux-imx_4.1.15_2.0.0_ga.orig/drivers/video/of_display_timing.c
++++ linux-imx_4.1.15_2.0.0_ga/drivers/video/of_display_timing.c
+@@ -226,7 +226,7 @@ struct display_timings *of_get_display_t
+ */
+ of_node_put(native_mode);
+
+- pr_debug("%s: got %d timings. Using timing #%d as default\n",
++ printk("%s: got %d timings. Tagging timing #%d as native/default\n",
+ of_node_full_name(np), disp->num_timings,
+ disp->native_mode + 1);
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-09-04 14:41:38
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 494d200cacafd58994d91bb203e2d2530cae7ed8 (commit)
from 7b0b1b160efa00ad7495074547bbad29c2c77eb2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 494d200cacafd58994d91bb203e2d2530cae7ed8
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Sep 4 16:41:13 2017 +0200
[BUILDROOT] 2017.02: imx-test: add i.MX6UL support (compilation)
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2017.02/176-imx-test-add_package.patch | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/patches/buildroot/2017.02/176-imx-test-add_package.patch b/patches/buildroot/2017.02/176-imx-test-add_package.patch
index 5951c47..705e55b 100644
--- a/patches/buildroot/2017.02/176-imx-test-add_package.patch
+++ b/patches/buildroot/2017.02/176-imx-test-add_package.patch
@@ -16,7 +16,7 @@ Index: buildroot/package/imx-test/imx-test.mk
===================================================================
--- /dev/null
+++ buildroot/package/imx-test/imx-test.mk
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,60 @@
+#############################################################
+#
+# imx-test (test tools from Freescale BSP)
@@ -28,21 +28,29 @@ Index: buildroot/package/imx-test/imx-test.mk
+IMX_TEST_DEPENDENCIES = imx-lib
+
+DIRS = mxc_spi_test mxc_uart_test mxc_usb_test
-+DIRS += mxc_vpu_test mxc_fb_test mxc_v4l2_test
++DIRS += mxc_fb_test mxc_v4l2_test
+
+ifeq ($(BR2_CPU_NAME),imx27)
+BUILD_PLATFORM = IMX27
+BUILD_CFLAGS = -DCONFIG_ARCH_MX2
++DIRS += mxc_vpu_test
+else ifeq ($(BR2_CPU_NAME),imx51)
+BUILD_PLATFORM = IMX51
+BUILD_CFLAGS = -DCONFIG_ARCH_MX5
-+DIRS += mxc_ipudev_test
-+else
++DIRS += mxc_ipudev_test mxc_vpu_test
++else ifeq ($(BR2_CPU_NAME),imx6)
+BUILD_PLATFORM = IMX6
+BUILD_CFLAGS = -DCONFIG_ARCH_MX6 -lpthread
-+DIRS += mxc_ipudev_test
-+ifeq ($(BR2_PACKAGE_PXPLIB),y)
++DIRS += mxc_ipudev_test mxc_vpu_test
++ifeq ($(BR2_PACKAGE_IMX_LIB),y)
++DIRS += pxp_lib_test
++endif
++else
++BUILD_PLATFORM = IMX6UL
++BUILD_CFLAGS = -DCONFIG_ARCH_MX6 -lpthread
++ifeq ($(BR2_PACKAGE_IMX_LIB),y)
+DIRS += pxp_lib_test
++BUILD_CFLAGS += -lpxp
+endif
+DIRS += pxp_v4l2_test
+endif
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-09-01 16:32:35
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 7b0b1b160efa00ad7495074547bbad29c2c77eb2 (commit)
from 6e8bad6b0d9a1345ce8995ad77799f7dfe7c79ea (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7b0b1b160efa00ad7495074547bbad29c2c77eb2
Author: Julien BOIBESSOT <jul...@ar...>
Date: Fri Sep 1 18:31:46 2017 +0200
[DEMOS] capture: add a runtime option to force YUV420 mode on camera
-----------------------------------------------------------------------
Summary of changes:
target/demos/camera/capture/capture.c | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/target/demos/camera/capture/capture.c b/target/demos/camera/capture/capture.c
index 988de51..bb4a917 100644
--- a/target/demos/camera/capture/capture.c
+++ b/target/demos/camera/capture/capture.c
@@ -81,6 +81,7 @@ struct camera {
struct camera mycamera;
+unsigned int force_yuv420 = 0;
static void errno_exit(const char *s)
{
@@ -895,10 +896,15 @@ static Uint32 get_a_supported_pix_fmt(void)
fprintf(stdout, "Using img format (%d 0x%08x): ", i, fmtdesc.pixelformat);
if (fmtdesc.pixelformat == V4L2_PIX_FMT_YUYV)
fprintf(stdout, "YUYV (YUV:4:2:2)\n");
- if (fmtdesc.pixelformat == V4L2_PIX_FMT_YUV420)
+ else if (fmtdesc.pixelformat == V4L2_PIX_FMT_UYVY)
+ fprintf(stdout, "UYVY (YUV:4:2:2)\n");
+ else if (fmtdesc.pixelformat == V4L2_PIX_FMT_YUV420)
fprintf(stdout, "YUV:4:2:0\n");
- if (fmtdesc.pixelformat == V4L2_PIX_FMT_JPEG)
+ else if (fmtdesc.pixelformat == V4L2_PIX_FMT_JPEG)
fprintf(stdout, "JPEG\n");
+ else
+ fprintf(stdout, "??? \n");
+
return fmtdesc.pixelformat;
}
}
@@ -978,7 +984,11 @@ static void init_capture_device(unsigned int capt_width, unsigned int capt_heigh
CLEAR(fmt);
- fmt.fmt.pix.pixelformat = get_a_supported_pix_fmt();
+ if (!force_yuv420) {
+ fmt.fmt.pix.pixelformat = get_a_supported_pix_fmt();
+ } else {
+ fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUV420;
+ }
if (!fmt.fmt.pix.pixelformat) {
fprintf(stderr, "%s does not support requested img formats\n",
dev_name);
@@ -1075,11 +1085,12 @@ static void usage(FILE *fp, int argc, char **argv)
" --cam_width W Use W as camera picture width (instead of %d)\n"
" --cam_height H Use H as camera picture height (instead of %d)\n"
" --use_vpu IP Uses processor VPU to encode video (at camera size) and send it to IP addr\n"
+ " -f | --force Forces YUV420/YU12 format on camera\n"
"",
argv[0], SCREEN_WIDTH, SCREEN_HEIGHT, CAM_WIDTH, CAM_HEIGHT);
}
-static const char short_options [] = "d:hmruwt";
+static const char short_options [] = "d:hmruwtf";
static const struct option long_options [] = {
{ "device", required_argument, NULL, 'd' },
@@ -1092,6 +1103,7 @@ static const struct option long_options [] = {
{ "cam_width", required_argument, NULL, 'y' },
{ "cam_height", required_argument, NULL, 'z' },
{ "use_vpu", required_argument, NULL, 'v' },
+ { "force", no_argument, NULL, 'f' },
{ 0, 0, 0, 0 }
};
@@ -1147,6 +1159,10 @@ int main(int argc, char **argv)
dev_name = optarg;
break;
+ case 'f':
+ force_yuv420 = 1;
+ break;
+
case 'h':
usage(stdout, argc, argv);
exit(EXIT_SUCCESS);
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-08-30 14:35:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 6e8bad6b0d9a1345ce8995ad77799f7dfe7c79ea (commit)
from 86d458b05d889aea757520ddc948711ddc3a2690 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6e8bad6b0d9a1345ce8995ad77799f7dfe7c79ea
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Aug 30 16:35:06 2017 +0200
[BUILDROOT] 2017.02: add LeptonModule package
-----------------------------------------------------------------------
Summary of changes:
.../2017.02/031-armadeus-lepton-add-package.patch | 64 ++++++++++++++++++++++
patches/buildroot/2017.02/cleanup_buildroot.sh | 2 +
2 files changed, 66 insertions(+)
create mode 100644 patches/buildroot/2017.02/031-armadeus-lepton-add-package.patch
diff --git a/patches/buildroot/2017.02/031-armadeus-lepton-add-package.patch b/patches/buildroot/2017.02/031-armadeus-lepton-add-package.patch
new file mode 100644
index 0000000..f901f18
--- /dev/null
+++ b/patches/buildroot/2017.02/031-armadeus-lepton-add-package.patch
@@ -0,0 +1,64 @@
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+TODO: choose which tool to install, check Licenses
+
+Index: buildroot/package/leptonmodule/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/leptonmodule/Config.in
+@@ -0,0 +1,12 @@
++config BR2_PACKAGE_LEPTONMODULE
++ bool "leptonmodule"
++ depends on BR2_INSTALL_LIBSTDCPP
++ depends on BR2_TOOLCHAIN_HAS_THREADS # v4l2lepton
++ help
++ Misc tools to play with FLIR Lepton(tm) thermal camera.
++ Needs spidev support in your Linux kernel.
++
++ https://github.com/groupgets/LeptonModule/
++
++comment "leptonmodule needs a toolchain w/ C++, threads"
++ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+Index: buildroot/package/leptonmodule/leptonmodule.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/leptonmodule/leptonmodule.mk
+@@ -0,0 +1,26 @@
++################################################################################
++#
++# leptonmodule
++#
++################################################################################
++
++LEPTONMODULE_VERSION = cross-compiling
++#LEPTONMODULE_SITE = $(call github,groupgets,LeptonModule,$(LEPTONMODULE_VERSION))
++LEPTONMODULE_SITE = $(call github,artemysfr,LeptonModule,$(LEPTONMODULE_VERSION))
++
++LEPTONMODULE_LICENSE = BSD 2-clause "Simplified" LeptonSDK Proprietary ??
++LEPTONMODULE_LICENSE_FILES = LICENSE
++
++define LEPTONMODULE_BUILD_CMDS
++ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" -C $(@D)/software/flirpi
++ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" -C $(@D)/software/raspberrypi_capture
++ $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" CXXFLAGS="$(TARGET_CFLAGS) -lpthread" CFLAGS="$(TARGET_CFLAGS)" -C $(@D)/software/v4l2lepton v4l2lepton
++endef
++
++define LEPTONMODULE_INSTALL_TARGET_CMDS
++ $(INSTALL) -D -m 0755 $(@D)/software/flirpi/fblept $(TARGET_DIR)/usr/bin/
++ $(INSTALL) -D -m 0755 $(@D)/software/raspberrypi_capture/raspberrypi_capture $(TARGET_DIR)/usr/bin/
++ $(INSTALL) -D -m 0755 $(@D)/software/v4l2lepton/v4l2lepton $(TARGET_DIR)/usr/bin/
++endef
++
++$(eval $(generic-package))
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -428,6 +428,7 @@ endmenu
+ source "package/iucode-tool/Config.in"
+ source "package/kbd/Config.in"
+ source "package/lcdproc/Config.in"
++ source "package/leptonmodule/Config.in"
+ source "package/libuio/Config.in"
+ source "package/libump/Config.in"
+ source "package/linux-backports/Config.in"
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index 67db5e2..663c5d4 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -62,6 +62,8 @@ rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.hash
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
rm -rf buildroot/package/kodi/Config.in
rm -rf buildroot/package/kodi/kodi.mk
+rm -rf buildroot/package/leptonmodule/Config.in
+rm -rf buildroot/package/leptonmodule/leptonmodule.mk
rm -rf buildroot/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch
rm -rf buildroot/package/libpng/libpng.hash
rm -rf buildroot/package/libpng/libpng.mk
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-08-24 16:42:00
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 86d458b05d889aea757520ddc948711ddc3a2690 (commit)
from 7f72ecdfdb4ef70c0642af450b55c8eb5fcee6d2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 86d458b05d889aea757520ddc948711ddc3a2690
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Aug 24 18:40:30 2017 +0200
[LINUX] 4.1: apf6: add spidev driver & configuration (J5 connector of APF6Dev. SPI1/CS0). Add some tests tools in BR defconfig, while we are at it...
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6legacy-4.1_defconfig | 3 ++-
.../device/armadeus/apf6/apf6legacy-linux-4.1.config | 1 +
...450-armadeus-add-apf6q-and-apf6dl-device-trees.patch | 8 +++++++-
...madeus-remove-spidev-oops-warning-at-load-time.patch | 17 +++++++++++++++++
4 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644 patches/linux/4.1.mx6_legacy/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
diff --git a/buildroot/configs/apf6legacy-4.1_defconfig b/buildroot/configs/apf6legacy-4.1_defconfig
index 1c6b847..a0f8497 100644
--- a/buildroot/configs/apf6legacy-4.1_defconfig
+++ b/buildroot/configs/apf6legacy-4.1_defconfig
@@ -84,6 +84,7 @@ BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_PV=y
BR2_PACKAGE_RAMSMP=y
+BR2_PACKAGE_SPIDEV_TEST=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
@@ -104,7 +105,6 @@ BR2_PACKAGE_EVTEST=y
BR2_PACKAGE_FREESCALE_IMX=y
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y
BR2_PACKAGE_IMX_CODEC=y
-BR2_PACKAGE_IMX_LIB=y
BR2_PACKAGE_IMX_PARSER=y
BR2_PACKAGE_IMX_VPUWRAP=y
BR2_PACKAGE_IMX_GPU_VIV=y
@@ -116,6 +116,7 @@ BR2_PACKAGE_IMX_TEST=y
BR2_PACKAGE_KBD=y
BR2_PACKAGE_PCI_DEBUG=y
BR2_PACKAGE_PCIUTILS=y
+BR2_PACKAGE_SPI_TOOLS=y
BR2_PACKAGE_TI_UTILS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_LIBVORBIS=y
diff --git a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-4.1.config b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-4.1.config
index 4cffb05..32035eb 100644
--- a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-4.1.config
+++ b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-4.1.config
@@ -220,6 +220,7 @@ CONFIG_I2C_IMX=y
CONFIG_SPI=y
CONFIG_SPI_GPIO=y
CONFIG_SPI_IMX=y
+CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_MAX732X=y
CONFIG_GPIO_PCA953X=y
diff --git a/patches/linux/4.1.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/4.1.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 7e7111b..63aad13 100644
--- a/patches/linux/4.1.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/4.1.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -188,7 +188,7 @@ Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
+++ linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,552 @@
+@@ -0,0 +1,558 @@
+/*
+ * Copyright 2015 Armadeus Systems
+ *
@@ -375,6 +375,12 @@ Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ <&gpio4 10 GPIO_ACTIVE_LOW>,
+ <&gpio4 11 GPIO_ACTIVE_LOW>;
+ status = "okay";
++
++ spidev0: spi@0 {
++ compatible = "spidev";
++ reg = <0>;
++ spi-max-frequency = <54000000>;
++ };
+};
+
+&hdmi_audio {
diff --git a/patches/linux/4.1.mx6_legacy/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch b/patches/linux/4.1.mx6_legacy/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
new file mode 100644
index 0000000..a0614d4
--- /dev/null
+++ b/patches/linux/4.1.mx6_legacy/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
@@ -0,0 +1,17 @@
+Prevent kernel oops (warning) when modprobing spidev module on recent Linux
+kernels with device tree support.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-imx_4.1.15_2.0.0_ga/drivers/spi/spidev.c
+===================================================================
+--- linux-imx_4.1.15_2.0.0_ga.orig/drivers/spi/spidev.c
++++ linux-imx_4.1.15_2.0.0_ga/drivers/spi/spidev.c
+@@ -707,6 +707,7 @@ static struct class *spidev_class;
+ #ifdef CONFIG_OF
+ static const struct of_device_id spidev_dt_ids[] = {
+ { .compatible = "rohm,dh2228fv" },
++ { .compatible = "spidev" },
+ {},
+ };
+ MODULE_DEVICE_TABLE(of, spidev_dt_ids);
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-08-23 12:42:38
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 7f72ecdfdb4ef70c0642af450b55c8eb5fcee6d2 (commit)
via 6976fc6a711d6289e848d9cfada1a0d4b34b5dd0 (commit)
via 548c562c744103494377aa623da0ef57ac621c43 (commit)
from df3368ccf38003549f30e764b651fb86fa2dacb2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7f72ecdfdb4ef70c0642af450b55c8eb5fcee6d2
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Aug 23 14:42:21 2017 +0200
[BUILDROOT] apf6legacy-4.1_defconfig: add imx-test by default and activate BR glibc toolchain to be able to use Freescale kernel includes
commit 6976fc6a711d6289e848d9cfada1a0d4b34b5dd0
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Aug 23 14:22:26 2017 +0200
[BUILDROOT] bump imx-test version to 5.4 (for 4.1 Freescale kernels)
commit 548c562c744103494377aa623da0ef57ac621c43
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Aug 22 15:37:01 2017 +0200
[DEBUG] imx6regs: move IPUx_FS_XXX_FLOW_N registers declaration and add IPUx_PROC_TASKS_STAT one
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6legacy-4.1_defconfig | 9 +-
.../2017.02/176-imx-test-add_package.patch | 150 ++++++++++++++++++---
patches/buildroot/2017.02/cleanup_buildroot.sh | 5 +-
target/linux/debug/imxregs/imx6regs.h | 14 +-
4 files changed, 147 insertions(+), 31 deletions(-)
diff --git a/buildroot/configs/apf6legacy-4.1_defconfig b/buildroot/configs/apf6legacy-4.1_defconfig
index e7b8602..1c6b847 100644
--- a/buildroot/configs/apf6legacy-4.1_defconfig
+++ b/buildroot/configs/apf6legacy-4.1_defconfig
@@ -6,7 +6,13 @@ BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_TOOLCHAIN_EXTERNAL=y
+# Needed to have FSL 4.1 custom kernel includes:
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PACKAGE_HOST_GDB=y
+BR2_PACKAGE_HOST_GDB_TUI=y
+BR2_PACKAGE_HOST_GDB_PYTHON=y
BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
@@ -106,6 +112,7 @@ BR2_PACKAGE_IMX_GPU_VIV_APITRACE=y
BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES=y
BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO=y
BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_IMX_TEST=y
BR2_PACKAGE_KBD=y
BR2_PACKAGE_PCI_DEBUG=y
BR2_PACKAGE_PCIUTILS=y
diff --git a/patches/buildroot/2017.02/176-imx-test-add_package.patch b/patches/buildroot/2017.02/176-imx-test-add_package.patch
index 9a00fdb..5951c47 100644
--- a/patches/buildroot/2017.02/176-imx-test-add_package.patch
+++ b/patches/buildroot/2017.02/176-imx-test-add_package.patch
@@ -4,33 +4,47 @@ Index: buildroot/package/imx-test/Config.in
===================================================================
--- /dev/null
+++ buildroot/package/imx-test/Config.in
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,7 @@
+config BR2_PACKAGE_IMX_TEST
+ bool "imx-test"
+ select BR2_PACKAGE_IMX_LIB
+ help
-+ Freescale specific test utilities for i.MX processors family.
++ Freescale specific utilities for testing some i.MX processors
++ hardware features.
++ Requires a Freescale Linux kernel (to have corresponding drivers).
Index: buildroot/package/imx-test/imx-test.mk
===================================================================
--- /dev/null
+++ buildroot/package/imx-test/imx-test.mk
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,52 @@
+#############################################################
+#
+# imx-test (test tools from Freescale BSP)
+#
+#############################################################
-+IMX_TEST_VERSION = 10.11.01
++IMX_TEST_VERSION = 5.4
+IMX_TEST_SOURCE = imx-test-$(IMX_TEST_VERSION).tar.gz
+IMX_TEST_SITE = ftp://ftp2.armadeus.com/armadeusw/download
+IMX_TEST_DEPENDENCIES = imx-lib
+
++DIRS = mxc_spi_test mxc_uart_test mxc_usb_test
++DIRS += mxc_vpu_test mxc_fb_test mxc_v4l2_test
++
+ifeq ($(BR2_CPU_NAME),imx27)
+BUILD_PLATFORM = IMX27
+BUILD_CFLAGS = -DCONFIG_ARCH_MX2
-+else
++else ifeq ($(BR2_CPU_NAME),imx51)
+BUILD_PLATFORM = IMX51
+BUILD_CFLAGS = -DCONFIG_ARCH_MX5
++DIRS += mxc_ipudev_test
++else
++BUILD_PLATFORM = IMX6
++BUILD_CFLAGS = -DCONFIG_ARCH_MX6 -lpthread
++DIRS += mxc_ipudev_test
++ifeq ($(BR2_PACKAGE_PXPLIB),y)
++DIRS += pxp_lib_test
++endif
++DIRS += pxp_v4l2_test
+endif
+
+define IMX_TEST_BUILD_CMDS
@@ -39,29 +53,26 @@ Index: buildroot/package/imx-test/imx-test.mk
+ LINUXPATH=$(LINUX_DIR) \
+ CROSS_COMPILE="$(HOST_DIR)/usr/bin/arm-linux-" \
+ PLATFORM=$(BUILD_PLATFORM) \
-+ DIRS="mxc_sahara_test mxc_scc2 mxc_spi_test mxc_vpu_test mxc_uart_test mxc_usb_test" \
-+ CFLAGS="$(BUILD_CFLAGS) -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include" \
++ DIRS="$(DIRS)" \
++ CFLAGS="$(BUILD_CFLAGS)" \
+ -C $(@D)
+endef
+
+define IMX_TEST_INSTALL_TARGET_CMDS
-+ $(MAKE) LINUXPATH=$(LINUX_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) install -C $(@D)/module_test
-+ $(MAKE) DESTDIR=$(TARGET_DIR)/unit_tests PLATFORM=IMX51 install -C $(@D)
-+endef
-+
-+define IMX_TEST_UNINSTALL_TARGET_CMDS
-+ rm -rf $(TARGET_DIR)/unit_tests
-+endef
-+
-+define IMX_TEST_CLEAN_CMDS
-+ -$(MAKE) -C $(@D) clean
++ $(MAKE) LINUXPATH=$(LINUX_DIR) \
++ INSTALL_MOD_PATH=$(TARGET_DIR) \
++ CROSS_COMPILE="$(HOST_DIR)/usr/bin/arm-linux-" \
++ -C $(@D)/module_test install
++ $(MAKE) DESTDIR=$(TARGET_DIR)/unit_tests \
++ PLATFORM=$(BUILD_PLATFORM) \
++ -C $(@D) install
+endef
+
+$(eval $(generic-package))
-Index: buildroot/package/imx-test/imx-test-01_fixes.patch
+Index: buildroot/package/imx-test/10.11.01/imx-test-01_fixes.patch
===================================================================
--- /dev/null
-+++ buildroot/package/imx-test/imx-test-01_fixes.patch
++++ buildroot/package/imx-test/10.11.01/imx-test-01_fixes.patch
@@ -0,0 +1,50 @@
+Add some fixes for imx-test. Some are temporary.
+
@@ -113,10 +124,10 @@ Index: buildroot/package/imx-test/imx-test-01_fixes.patch
+ #endif
+ error_code = -IOCTL_SCC2_INVALID_CMD;
+ break;
-Index: buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
+Index: buildroot/package/imx-test/10.11.01/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
===================================================================
--- /dev/null
-+++ buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
++++ buildroot/package/imx-test/10.11.01/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
@@ -0,0 +1,16 @@
+linux/videodev.h include doesn't exist anymore on V4L2 only (=recent kernels).
+
@@ -138,7 +149,7 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -406,6 +406,7 @@ endif
+@@ -412,6 +412,7 @@ endmenu
source "package/hwloc/Config.in"
source "package/i2c-tools/Config.in"
source "package/i7z/Config.in"
@@ -146,3 +157,98 @@ Index: buildroot/package/Config.in
source "package/input-event-daemon/Config.in"
source "package/input-tools/Config.in"
source "package/intel-microcode/Config.in"
+Index: buildroot/package/imx-test/5.4/0001-imx-test-fixes.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-test/5.4/0001-imx-test-fixes.patch
+@@ -0,0 +1,90 @@
++Add some fixes for imx-test.
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++--- imx-test-5.4/test/mxc_ipudev_test/mxc_ipudev_test.c 2016-03-10 16:08:10.000000000 +0100
+++++ imx-test-5.4.mod/test/mxc_ipudev_test/mxc_ipudev_test.c 2017-08-08 17:32:52.983398969 +0200
++@@ -117,7 +117,7 @@
++ {
++ printf("====== ipu task ======\n");
++ printf("input:\n");
++- printf("\tforamt: 0x%x\n", t->input.format);
+++ printf("\tformat: 0x%x\n", t->input.format);
++ printf("\twidth: %d\n", t->input.width);
++ printf("\theight: %d\n", t->input.height);
++ printf("\tcrop.w = %d\n", t->input.crop.w);
++@@ -132,7 +132,7 @@
++ printf("\thigh motion\n");
++ }
++ printf("output:\n");
++- printf("\tforamt: 0x%x\n", t->output.format);
+++ printf("\tformat: 0x%x\n", t->output.format);
++ printf("\twidth: %d\n", t->output.width);
++ printf("\theight: %d\n", t->output.height);
++ printf("\troate: %d\n", t->output.rotate);
++@@ -142,7 +142,7 @@
++ printf("\tcrop.pos.y = %d\n", t->output.crop.pos.y);
++ if (t->overlay_en) {
++ printf("overlay:\n");
++- printf("\tforamt: 0x%x\n", t->overlay.format);
+++ printf("\tformat: 0x%x\n", t->overlay.format);
++ printf("\twidth: %d\n", t->overlay.width);
++ printf("\theight: %d\n", t->overlay.height);
++ printf("\tcrop.w = %d\n", t->overlay.crop.w);
++--- imx-test-5.4/test/mxc_v4l2_test/mxc_v4l2_overlay.c 2016-03-10 16:08:10.000000000 +0100
+++++ imx-test-5.4.mod/test/mxc_v4l2_test/mxc_v4l2_overlay.c 2017-08-08 15:34:22.159544071 +0200
++@@ -73,8 +73,8 @@
++ int g_sensor_height = 480;
++ int g_sensor_top = 0;
++ int g_sensor_left = 0;
++-int g_display_width = 240;
++-int g_display_height = 320;
+++int g_display_width = 320;
+++int g_display_height = 240;
++ int g_display_top = 0;
++ int g_display_left = 0;
++ int g_rotate = 0;
++@@ -550,7 +550,7 @@
++ else if (strcmp(argv[i], "-a") == 0) {
++ g_alpha_mode = atoi(argv[++i]);
++ }
++- else if (strcmp(argv[i], "-help") == 0) {
+++ else if (strcmp(argv[i], "-h") == 0) {
++ printf("MXC Video4Linux overlay Device Test\n\n" \
++ " -iw <input width>\n -ih <input height>\n" \
++ " -it <input top>\n -il <input left>\n" \
++@@ -598,7 +598,7 @@
++ struct mxcfb_loc_alpha l_alpha;
++ int ret = 0;
++ struct sigaction act;
++- struct v4l2_dbg_chip_ident chip;
+++// struct v4l2_dbg_chip_ident chip;
++
++ /* for ctrl-c */
++ sigemptyset(&act.sa_mask);
++@@ -618,14 +618,14 @@
++ printf("Unable to open %s\n", v4l_device);
++ return TFAIL;
++ }
++-
+++/*
++ if (ioctl(fd_v4l, VIDIOC_DBG_G_CHIP_IDENT, &chip))
++ {
++ printf("VIDIOC_DBG_G_CHIP_IDENT failed.\n");
++ return TFAIL;
++ }
++ printf("sensor chip is %s\n", chip.match.name);
++-
+++*/
++ if ((fd_fb_0 = open(fb_device_0, O_RDWR )) < 0) {
++ printf("Unable to open frame buffer 0\n");
++ return TFAIL;
++@@ -717,7 +717,7 @@
++ }
++
++ if (!g_overlay) {
++- g_alpha.alpha = 255;
+++ g_alpha.alpha = 128; //255;
++ g_alpha.enable = 1;
++ if (ioctl(fd_fb_0, MXCFB_SET_GBL_ALPHA, &g_alpha) < 0) {
++ printf("Set global alpha failed\n");
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index abaefe8..67db5e2 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -51,9 +51,10 @@ rm -rf buildroot/package/gpsd/S50gpsd
rm -rf buildroot/package/gpsd/gpsd.mk
rm -rf buildroot/package/gsmmux/Config.in
rm -rf buildroot/package/gsmmux/gsmmux.mk
+rm -rf buildroot/package/imx-test/10.11.01/imx-test-01_fixes.patch
+rm -rf buildroot/package/imx-test/10.11.01/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
+rm -rf buildroot/package/imx-test/5.4/0001-imx-test-fixes.patch
rm -rf buildroot/package/imx-test/Config.in
-rm -rf buildroot/package/imx-test/imx-test-01_fixes.patch
-rm -rf buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
rm -rf buildroot/package/imx-test/imx-test.mk
rm -rf buildroot/package/imx-usb-loader/Config.in
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
diff --git a/target/linux/debug/imxregs/imx6regs.h b/target/linux/debug/imxregs/imx6regs.h
index 7706da7..27a21e6 100644
--- a/target/linux/debug/imxregs/imx6regs.h
+++ b/target/linux/debug/imxregs/imx6regs.h
@@ -50,6 +50,12 @@ static struct reg_info regs[] =
{ "IPU1_INT_CTRL_14", 0x02600070, 0, 0xffffffff, 'x', "IPU1 (#0) Interrupt Control Register 14" },
{ "IPU1_INT_CTRL_15", 0x02600074, 0, 0xffffffff, 'x', "IPU1 (#0) Interrupt Control Register 15" },
+{ "IPU1_FS_PROC_FLOW_1", 0x026000a8, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Processing Flow 1 Register" },
+{ "IPU1_FS_PROC_FLOW_2", 0x026000ac, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Processing Flow 2 Register" },
+{ "IPU1_FS_PROC_FLOW_3", 0x026000b0, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Processing Flow 3 Register" },
+{ "IPU1_FS_DISP_FLOW_1", 0x026000b4, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Displaying Flow 1 Register" },
+{ "IPU1_FS_DISP_FLOW_2", 0x026000b8, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Displaying Flow 2 Register" },
+
{ "IPU1_INT_STAT_1", 0x02600200, 0, 0xffffffff, 'x', "IPU1 (#0) Interrupt Status Register 1" },
{ "IPU1_INT_STAT_2", 0x02600204, 0, 0xffffffff, 'x', "IPU1 (#0) Interrupt Status Register 2" },
{ "IPU1_INT_STAT_3", 0x02600208, 0, 0xffffffff, 'x', "IPU1 (#0) Interrupt Status Register 3" },
@@ -66,6 +72,8 @@ static struct reg_info regs[] =
{ "IPU1_INT_STAT_14", 0x02600234, 0, 0xffffffff, 'x', "IPU1 (#0) Interrupt Status Register 14" },
{ "IPU1_INT_STAT_15", 0x02600238, 0, 0xffffffff, 'x', "IPU1 (#0) Interrupt Status Register 15" },
+{ "IPU1_PROC_TASKS_STAT",0x02600250, 0, 0xffffffff, 'x', "IPU1 (#0) Processing Status Tasks Register" },
+
{ "IPU1_IDMAC_CONF", 0x02608000, 0, 0xffffffff, 'x', "IPU1 (#0) IDMAC Configuration Register" },
{ "IPU1_IDMAC_CH_EN_1", 0x02608004, 0, 0xffffffff, 'x', "IPU1 (#0) IDMAC Channel Enable 1 Register" },
{ "IPU1_IDMAC_CH_EN_2", 0x02608008, 0, 0xffffffff, 'x', "IPU1 (#0) IDMAC Channel Enable 2 Register" },
@@ -74,12 +82,6 @@ static struct reg_info regs[] =
{ "IPU1_IDMAC_BNDM_EN_1", 0x02608040, 0, 0xffffffff, 'x', "IPU1 (#0) IDMAC Band Mode Enable 1 Register" },
{ "IPU1_IDMAC_BNDM_EN_2", 0x02608044, 0, 0xffffffff, 'x', "IPU1 (#0) IDMAC Band Mode Enable 2 Register" },
-{ "IPU1_FS_PROC_FLOW_1", 0x026000a8, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Processing Flow 1 Register" },
-{ "IPU1_FS_PROC_FLOW_2", 0x026000ac, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Processing Flow 2 Register" },
-{ "IPU1_FS_PROC_FLOW_3", 0x026000b0, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Processing Flow 3 Register" },
-{ "IPU1_FS_DISP_FLOW_1", 0x026000b4, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Displaying Flow 1 Register" },
-{ "IPU1_FS_DISP_FLOW_2", 0x026000b8, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Displaying Flow 2 Register" },
-
{ "IPU1_IC_CONF", 0x02620000, 0, 0xffffffff, 'x', "IPU1 (#0) IC Configuration Register" },
{ "IPU1_CSI0_SENS_CONF", 0x02630000, 0, 0xffffffff, 'x', "IPU1 (#0) CSI0 Sensor Configuration Register" },
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2017-08-18 15:24:09
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via df3368ccf38003549f30e764b651fb86fa2dacb2 (commit)
from 4128330005cfe02702ed59d25da222a8678e6b41 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit df3368ccf38003549f30e764b651fb86fa2dacb2
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Aug 18 17:30:58 2017 +0200
[UBOOT] opos6ulnano: bump to commit 5b608772040dec0638711b6bb7b788da62c38c61
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ulnano_defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 4c84404..7aaf8a4 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -120,7 +120,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_BOARDNAME="opos6ulnanodev"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.code.sf.net/p/armadeus/u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="eac402feb5a4132665fec84ed243c1008011c8f2"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="5b608772040dec0638711b6bb7b788da62c38c61"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6ulnanodev"
BR2_TARGET_UBOOT_NEEDS_DTC=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2017-08-10 13:37:29
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 4128330005cfe02702ed59d25da222a8678e6b41 (commit)
from 102abb4f4b5df7d4f0f4a5cfa464690a51253717 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4128330005cfe02702ed59d25da222a8678e6b41
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Aug 10 15:43:06 2017 +0200
[BUILDROOT] 2017.02: backport patches to fix dbus hang at startup
-----------------------------------------------------------------------
Summary of changes:
.../2017.02/229-dbus-bump-version-to-1.10.22.patch | 47 +++++++
...stream-patch-to-fix-startup-hang-with-wit.patch | 139 +++++++++++++++++++++
patches/buildroot/2017.02/cleanup_buildroot.sh | 4 +-
3 files changed, 189 insertions(+), 1 deletion(-)
create mode 100644 patches/buildroot/2017.02/229-dbus-bump-version-to-1.10.22.patch
create mode 100644 patches/buildroot/2017.02/230-dbus-add-upstream-patch-to-fix-startup-hang-with-wit.patch
diff --git a/patches/buildroot/2017.02/229-dbus-bump-version-to-1.10.22.patch b/patches/buildroot/2017.02/229-dbus-bump-version-to-1.10.22.patch
new file mode 100644
index 0000000..2047f2b
--- /dev/null
+++ b/patches/buildroot/2017.02/229-dbus-bump-version-to-1.10.22.patch
@@ -0,0 +1,47 @@
+From 32c744c62da4ec88bb3de3098f15264c4507132e Mon Sep 17 00:00:00 2001
+From: Adam Duskett <Adu...@gm...>
+Date: Fri, 28 Jul 2017 08:50:26 -0400
+Subject: [PATCH/2017.02.x 1/2] dbus: bump version to 1.10.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Adam Duskett <adu...@gm...>
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <ar...@mi...>
+
+(cherry picked from commit 29f0bd345bde90fcf0060c33623ade34fa9c288c)
+Change site to https to avoid a redirection.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/dbus/dbus.hash | 3 ++-
+ package/dbus/dbus.mk | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash
+index af8143d..b005242 100644
+--- a/package/dbus/dbus.hash
++++ b/package/dbus/dbus.hash
+@@ -1,2 +1,3 @@
+ # Locally calculated after checking pgp signature
+-sha256 a7b0ba6ea3e8d0e08afec5e3030d0245614268276620c536726f8fa6e5c43388 dbus-1.10.16.tar.gz
++# http://dbus.freedesktop.org/releases/dbus/dbus-1.10.22.tar.gz.asc
++sha256 e2b1401e3eedc7b5c9a2034d31254c886e1fcbc7858006e0a1c59158fe4b7b97 dbus-1.10.22.tar.gz
+diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
+index 66b90bc..e05fbff 100644
+--- a/package/dbus/dbus.mk
++++ b/package/dbus/dbus.mk
+@@ -4,8 +4,8 @@
+ #
+ ################################################################################
+
+-DBUS_VERSION = 1.10.16
+-DBUS_SITE = http://dbus.freedesktop.org/releases/dbus
++DBUS_VERSION = 1.10.22
++DBUS_SITE = https://dbus.freedesktop.org/releases/dbus
+ DBUS_LICENSE = AFLv2.1 or GPLv2+ (library, tools), GPLv2+ (tools)
+ DBUS_LICENSE_FILES = COPYING
+ DBUS_INSTALL_STAGING = YES
+--
+2.7.3
+
diff --git a/patches/buildroot/2017.02/230-dbus-add-upstream-patch-to-fix-startup-hang-with-wit.patch b/patches/buildroot/2017.02/230-dbus-add-upstream-patch-to-fix-startup-hang-with-wit.patch
new file mode 100644
index 0000000..9f4dad4
--- /dev/null
+++ b/patches/buildroot/2017.02/230-dbus-add-upstream-patch-to-fix-startup-hang-with-wit.patch
@@ -0,0 +1,139 @@
+From 515df8f93851d0c9556d7add5422041e2e5a1ae7 Mon Sep 17 00:00:00 2001
+From: Marcus Hoffmann <m.h...@ca...>
+Date: Fri, 4 Aug 2017 18:58:32 +0200
+Subject: [PATCH/2017.02.x 2/2] dbus: add upstream patch to fix startup hang
+ with with expat >= 2.2.1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+After c0ad6ded018ffbc33f7f5 expat: security bump to version 2.2.1
+the system can hang on startup under certain circumstances.
+
+This happens when:
+ * we use systemd as init system
+ * the random nonblocking pool takes a while to initialize
+ * this apparently doesn't happen on qemu, so this would not have
+ been caught by the runtime testing infrastructure
+ * it also doesn't seem to happen when network booting
+
+For a more detailed description of the bug see here:
+https://bugs.freedesktop.org/show_bug.cgi?id=101858
+
+The patch should be in next dbus version 1.10.24
+
+Set DBUS_AUTORECONF = YES because configure.ac is changed.
+
+Signed-off-by: Marcus Hoffmann <m.h...@ca...>
+[Arnout: add upstream commit sha + Marcus's Sob to the patch]
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <ar...@mi...>
+(cherry picked from commit 5a5e76381f8b000baa09c902ca89d45725c47f04)
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ ...er-expat-Tell-Expat-not-to-defend-against.patch | 78 ++++++++++++++++++++++
+ package/dbus/dbus.mk | 3 +
+ 2 files changed, 81 insertions(+)
+ create mode 100644 package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
+
+diff --git a/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch b/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
+new file mode 100644
+index 0000000..fd9e01d
+--- /dev/null
++++ b/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
+@@ -0,0 +1,78 @@
++From 1252dc1d1f465b8ab6b36ff7252e395e66a040cf Mon Sep 17 00:00:00 2001
++From: Simon McVittie <sm...@de...>
++Date: Fri, 21 Jul 2017 10:46:39 +0100
++Subject: [PATCH 1/2] config-loader-expat: Tell Expat not to defend against
++ hash collisions
++
++By default, Expat uses cryptographic-quality random numbers as a salt for
++its hash algorithm, and since 2.2.1 it gets them from the getrandom
++syscall on Linux. That syscall refuses to return any entropy until the
++kernel's CSPRNG (random pool) has been initialized. Unfortunately, this
++can take as long as 40 seconds on embedded devices with few entropy
++sources, which is too long: if the system dbus-daemon blocks for that
++length of time, important D-Bus clients like systemd and systemd-logind
++time out and fail to connect to it.
++
++We're parsing small configuration files here, and we trust them
++completely, so we don't need to defend against hash collisions: nobody
++is going to be crafting them to cause pathological performance.
++
++Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101858
++Signed-off-by: Simon McVittie <sm...@de...>
++Tested-by: Christopher Hewitt <he...@ie...>
++Reviewed-by: Philip Withnall <wit...@en...>
++
++Upstream commit 1252dc1d1f465b8ab6b36ff7252e395e66a040cf
++Signed-off-by: Marcus Hoffmann <m.h...@ca...>
++---
++ bus/config-loader-expat.c | 14 ++++++++++++++
++ configure.ac | 8 ++++++++
++ 2 files changed, 22 insertions(+)
++
++diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c
++index b571fda3..27cbe2d0 100644
++--- a/bus/config-loader-expat.c
+++++ b/bus/config-loader-expat.c
++@@ -203,6 +203,20 @@ bus_config_load (const DBusString *file,
++ goto failed;
++ }
++
+++ /* We do not need protection against hash collisions (CVE-2012-0876)
+++ * because we are only parsing trusted XML; and if we let Expat block
+++ * waiting for the CSPRNG to be initialized, as it does by default to
+++ * defeat CVE-2012-0876, it can cause timeouts during early boot on
+++ * entropy-starved embedded devices.
+++ *
+++ * TODO: When Expat gets a more explicit API for this than
+++ * XML_SetHashSalt, check for that too, and use it preferentially.
+++ * https://github.com/libexpat/libexpat/issues/91 */
+++#if defined(HAVE_XML_SETHASHSALT)
+++ /* Any nonzero number will do. https://xkcd.com/221/ */
+++ XML_SetHashSalt (expat, 4);
+++#endif
+++
++ if (!_dbus_string_get_dirname (file, &dirname))
++ {
++ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
++diff --git a/configure.ac b/configure.ac
++index 52da11fb..c4022ed7 100644
++--- a/configure.ac
+++++ b/configure.ac
++@@ -938,6 +938,14 @@ XML_CFLAGS=
++ AC_SUBST([XML_CFLAGS])
++ AC_SUBST([XML_LIBS])
++
+++save_cflags="$CFLAGS"
+++save_libs="$LIBS"
+++CFLAGS="$CFLAGS $XML_CFLAGS"
+++LIBS="$LIBS $XML_LIBS"
+++AC_CHECK_FUNCS([XML_SetHashSalt])
+++CFLAGS="$save_cflags"
+++LIBS="$save_libs"
+++
++ # Thread lib detection
++ AC_ARG_VAR([THREAD_LIBS])
++ save_libs="$LIBS"
++--
++2.11.0
++
+diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
+index e05fbff..f2974f2 100644
+--- a/package/dbus/dbus.mk
++++ b/package/dbus/dbus.mk
+@@ -6,6 +6,9 @@
+
+ DBUS_VERSION = 1.10.22
+ DBUS_SITE = https://dbus.freedesktop.org/releases/dbus
++
++# 0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
++DBUS_AUTORECONF = YES
+ DBUS_LICENSE = AFLv2.1 or GPLv2+ (library, tools), GPLv2+ (tools)
+ DBUS_LICENSE_FILES = COPYING
+ DBUS_INSTALL_STAGING = YES
+--
+2.7.3
+
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index 3c04391..abaefe8 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -33,6 +33,9 @@ rm -rf buildroot/package/cmux/cmux.hash
rm -rf buildroot/package/cmux/cmux.mk
rm -rf buildroot/package/cunit/Config.in
rm -rf buildroot/package/cunit/cunit.mk
+rm -rf buildroot/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
+rm -rf buildroot/package/dbus/dbus.hash
+rm -rf buildroot/package/dbus/dbus.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
rm -rf buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.patch
@@ -58,7 +61,6 @@ rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.hash
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
rm -rf buildroot/package/kodi/Config.in
rm -rf buildroot/package/kodi/kodi.mk
-rm -rf buildroot/package/libnl/libnl.hash
rm -rf buildroot/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch
rm -rf buildroot/package/libpng/libpng.hash
rm -rf buildroot/package/libpng/libpng.mk
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-08-08 08:29:32
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 102abb4f4b5df7d4f0f4a5cfa464690a51253717 (commit)
from a21d1e5f65d1aac96660b379ae735c8ee80a2620 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 102abb4f4b5df7d4f0f4a5cfa464690a51253717
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Aug 8 10:29:02 2017 +0200
[DEMOS] fb_alpha: factorize some printed infos
-----------------------------------------------------------------------
Summary of changes:
target/demos/fb_alpha/fb_alpha.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/target/demos/fb_alpha/fb_alpha.c b/target/demos/fb_alpha/fb_alpha.c
index 2c7d1c1..3a764af 100644
--- a/target/demos/fb_alpha/fb_alpha.c
+++ b/target/demos/fb_alpha/fb_alpha.c
@@ -124,12 +124,13 @@ int main(int argc, char **argv)
case 'g':
gbl_alpha.enable = atoi(optarg);
if (gbl_alpha.enable == 1) {
- printf("enable global alpha blending\n");
+ printf("enabling");
key.enable = 1;
} else {
- printf("disable global alpha blending\n");
+ printf("disabling");
key.enable = 0;
}
+ printf(" global alpha blending\n");
break;
case 'a':
@@ -140,10 +141,11 @@ int main(int argc, char **argv)
l_alpha.alpha_in_pixel = 1;
l_alpha.enable = atoi(optarg);
if (l_alpha.enable == 1) {
- printf("enable local alpha blending\n");
+ printf("enabling");
} else {
- printf("disable local alpha blending\n");
+ printf("disabling");
}
+ printf(" local alpha blending\n");
break;
case 'k':
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2017-08-07 17:12:52
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via a21d1e5f65d1aac96660b379ae735c8ee80a2620 (commit)
from 19f5f27466f95f48b676143174905d65e6194f22 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a21d1e5f65d1aac96660b379ae735c8ee80a2620
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Aug 7 19:11:57 2017 +0200
[DEMOS] capture: add support for 32 bits framebuffer (HDMI on APF6) and now display framerate
-----------------------------------------------------------------------
Summary of changes:
target/demos/camera/capture/capture.c | 172 ++++++++++++++++++++++++++++++++--
1 file changed, 163 insertions(+), 9 deletions(-)
diff --git a/target/demos/camera/capture/capture.c b/target/demos/camera/capture/capture.c
index a0175ff..988de51 100644
--- a/target/demos/camera/capture/capture.c
+++ b/target/demos/camera/capture/capture.c
@@ -167,7 +167,8 @@ static void yuv422_to_greyscale(void *yuv, int size, void *grey)
}
}
#endif
-static void yuv422_to_rgb565(void *yuv, int size, void *rgb)
+
+static void yuyv_to_rgb565(void *yuv, int size, void *rgb)
{
unsigned int Y, Y2, U, V, yuv32, rgb32;
int R, G, B;
@@ -201,6 +202,97 @@ static void yuv422_to_rgb565(void *yuv, int size, void *rgb)
}
}
+static void yuyv_to_rgb32(void *yuv, int size, void *rgb)
+{
+ unsigned int Y, Y2, U, V, yuv32, rgb32;
+ int R, G, B;
+ int i;
+ Uint32 *dest = (Uint32*) rgb;
+ Uint32 *src = (Uint32*) yuv;
+
+ for (i=size/4; i; i--)
+ {
+ yuv32 = *(src++);
+
+ /* packed format */
+ Y = (yuv32 & 0x000000ff);
+ U = (yuv32 & 0x0000ff00) >> 8;
+ Y2 = (yuv32 & 0x00ff0000) >> 16;
+ V = (yuv32 & 0xff000000) >> 24;
+
+ R = YUV2R(Y, U, V);
+ G = YUV2G(Y, U, V);
+ B = YUV2B(Y, U, V);
+ rgb32 = ((R << 16) | (G << 8) | B);
+ *(dest++) = rgb32;
+
+ R = YUV2R(Y2, U, V);
+ G = YUV2G(Y2, U, V);
+ B = YUV2B(Y2, U, V);
+ rgb32 = ((R << 16) | (G << 8) | B);
+ *(dest++) = rgb32;
+ }
+}
+
+static void yuyv_to_rgb(void *yuv, int size, void *rgb, int bpp)
+{
+ if (bpp == 32) {
+ yuyv_to_rgb32(yuv, size, rgb);
+ } else if (bpp = 16) {
+ yuyv_to_rgb565(yuv, size, rgb);
+ } else {
+ fprintf(stdout, "yuyv_to_rgb: unsupported screen bpp\n");
+ }
+}
+
+static void uyvy_to_rgb32(void *yuv, int size, void *rgb)
+{
+ unsigned int Y, Y2, U, V, yuv32, rgb32;
+ int R, G, B;
+ int i;
+ Uint32 *dest = (Uint32*) rgb;
+ Uint32 *src = (Uint32*) yuv;
+
+ for (i=size/4; i; i--)
+ {
+ yuv32 = *(src++);
+
+ /* packed format */
+ U = (yuv32 & 0x000000ff);
+ Y = (yuv32 & 0x0000ff00) >> 8;
+ V = (yuv32 & 0x00ff0000) >> 16;
+ Y2 = (yuv32 & 0xff000000) >> 24;
+
+ R = YUV2R(Y, U, V);
+ G = YUV2G(Y, U, V);
+ B = YUV2B(Y, U, V);
+ //rgb32 = ((R>>3) << 11) | ((G>>2) << 5) | (B>>3);
+ rgb32 = ((R << 16) | (G << 8) | B);
+ *(dest++) = rgb32;
+// rgb32 = yuv2rgb(Y, U, V);
+
+ R = YUV2R(Y2, U, V);
+ G = YUV2G(Y2, U, V);
+ B = YUV2B(Y2, U, V);
+ //rgb32 |= (((R>>3) << 11) | ((G>>2) << 5) | (B>>3)) << 16;
+ rgb32 = ((R << 16) | (G << 8) | B);
+// rgb32 |= yuv2rgb(Y2, U, V) << 16;
+
+ *(dest++) = rgb32;
+ }
+}
+
+static void uyvy_to_rgb(void *yuv, int size, void *rgb, int bpp)
+{
+ if (bpp == 32) {
+ uyvy_to_rgb32(yuv, size, rgb);
+ } else if (bpp = 16) {
+ yuyv_to_rgb565(yuv, size, rgb);
+ } else {
+ fprintf(stdout, "uyvy_to_rgb: unsupported screen bpp\n");
+ }
+}
+
/* Only grayscale conversion for the moment
As yuv420 is slightly complicated to decode it would be worth using libv4l
*/
@@ -221,6 +313,38 @@ static void yuv420_to_rgb565(void *yuv, int size, void *rgb)
}
}
+static void yuv420_to_rgb32(void *yuv, int size, void *rgb)
+{
+ Uint8 yuv8;
+ Uint32 yuv32;
+ Uint8 R, G, B;
+ int i, j;
+ int nbpix = mycamera.width * mycamera.height;
+ Uint16 *dest16 = (Uint16*) rgb;
+ Uint32 *dest32 = (Uint32*) rgb;
+ Uint32 *src = (Uint32*) yuv;
+
+ nbpix = mycamera.width * mycamera.height;
+ for (i=nbpix/4; i; i--) {
+ yuv32 = *(src++);
+ for (j=0; j<4; j++) {
+ R = G = B = (&yuv32)[j];
+ *(dest32++) = (R << 16) | (G << 8) | (B);
+ }
+ }
+}
+
+static void yuv420_to_rgb(void *yuv, int size, void *rgb, int bpp)
+{
+ if (bpp == 32) {
+ yuv420_to_rgb32(yuv, size, rgb);
+ } else if (bpp = 16) {
+ yuv420_to_rgb565(yuv, size, rgb);
+ } else {
+ fprintf(stdout, "yuv420_to_rgb: unsupported screen bpp\n");
+ }
+}
+
#if 0
static void rgb565_to_yuv420(void *rgb, int size, void *yuv)
{
@@ -292,13 +416,18 @@ static void simple_copy(void *yuv, int size, void* rgb)
static void process_image(/*const */void *pCaptured, int size)
{
SDL_Rect update_rec;
+ int sec, usec, run_time;
+ static struct timeval now, last;
+ static int fps;
if (mycamera.pixelformat == V4L2_PIX_FMT_YUYV) {
- yuv422_to_rgb565(pCaptured, mycamera.sizeimage, image->pixels);
+ yuyv_to_rgb(pCaptured, mycamera.sizeimage, image->pixels, screen->format->BitsPerPixel);
+ } else if (mycamera.pixelformat == V4L2_PIX_FMT_UYVY) {
+ uyvy_to_rgb(pCaptured, mycamera.sizeimage, image->pixels, screen->format->BitsPerPixel);
} else if (mycamera.pixelformat == V4L2_PIX_FMT_YUV420) {
- yuv420_to_rgb565(pCaptured, mycamera.sizeimage, image->pixels);
+ yuv420_to_rgb(pCaptured, mycamera.sizeimage, image->pixels, screen->format->BitsPerPixel);
} else {
- if (mycamera.pixelformat != V4L2_PIX_FMT_RGB565) {
+ if ((mycamera.pixelformat != V4L2_PIX_FMT_RGB565) || (mycamera.pixelformat != V4L2_PIX_FMT_RGB32)) {
printf("Unknown image format\n");
}
if (size == 0)
@@ -313,6 +442,26 @@ static void process_image(/*const */void *pCaptured, int size)
update_rec.h = mycamera.height;
SDL_BlitSurface(image, NULL, screen, &update_rec);
SDL_Flip(screen);
+
+ /* Calculate FPS */
+ gettimeofday(&now, NULL);
+ if (now.tv_sec == last.tv_sec) {
+ fps++;
+ } else {
+ printf("FPS = %d\r", fps);
+ fflush(stdout);
+ fps = 0;
+ }
+ sec = now.tv_sec - last.tv_sec;
+ usec = now.tv_usec - last.tv_usec;
+ if (usec < 0) {
+ sec--;
+ usec = usec + 1000000;
+ }
+ run_time = (sec * 1000000) + usec;
+// printf("Run time %d ms (%d, %d) (%d, %d)\n", run_time, now.tv_sec, now.tv_usec, last.tv_sec, last.tv_usec);
+ last.tv_sec = now.tv_sec;
+ last.tv_usec = now.tv_usec;
}
static int read_frame(void)
@@ -712,7 +861,7 @@ static Uint32 get_a_supported_pix_fmt(void)
struct v4l2_fmtdesc fmtdesc;
int i;
- /* First check if a LCD native format is available (-> no CSC) */
+ /* First check if a LCD native format is available (-> no need for CSC) */
for (i = 0;; i++) {
CLEAR(fmtdesc);
fmtdesc.index = i;
@@ -720,9 +869,13 @@ static Uint32 get_a_supported_pix_fmt(void)
if (-1 == ioctl(fd, VIDIOC_ENUM_FMT, &fmtdesc))
break;
- if (fmtdesc.pixelformat == V4L2_PIX_FMT_RGB565) {
+ /*fprintf(stdout, "Trying format N°%d %c%c%c%c (%s)\n",
+ fmtdesc.index, fmtdesc.pixelformat & 0xff,
+ fmtdesc.pixelformat >> 8 & 0xff, fmtdesc.pixelformat >> 16 & 0xff,
+ fmtdesc.pixelformat >> 24 & 0xff, fmtdesc.description);*/
+ if ((fmtdesc.pixelformat == V4L2_PIX_FMT_RGB565) || (fmtdesc.pixelformat == V4L2_PIX_FMT_RGB32)) {
fprintf(stdout, "Using img format (%d 0x%08x): ", i, fmtdesc.pixelformat);
- fprintf(stdout, "RGB565\n");
+ fprintf(stdout, "RGB565/RGB32\n");
return fmtdesc.pixelformat;
}
}
@@ -736,6 +889,7 @@ static Uint32 get_a_supported_pix_fmt(void)
break;
if ((fmtdesc.pixelformat == V4L2_PIX_FMT_YUYV)
+ || (fmtdesc.pixelformat == V4L2_PIX_FMT_UYVY)
|| (fmtdesc.pixelformat == V4L2_PIX_FMT_YUV420)
|| (fmtdesc.pixelformat == V4L2_PIX_FMT_JPEG)) {
fprintf(stdout, "Using img format (%d 0x%08x): ", i, fmtdesc.pixelformat);
@@ -1044,7 +1198,7 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE);
}
fprintf(stderr, "SDL OK\n");
- screen = SDL_SetVideoMode(width, height, 16, SDL_ANYFORMAT /*| SDL_DOUBLEBUF | SDL_HWSURFACE*/);
+ screen = SDL_SetVideoMode(width, height, 0, SDL_ANYFORMAT /*| SDL_DOUBLEBUF | SDL_HWSURFACE*/);
if (screen) {
printf("Video mode: %dx%dx%d\n", screen->w, screen->h,
screen->format->BitsPerPixel);
@@ -1061,7 +1215,7 @@ int main(int argc, char **argv)
open_capture_device();
init_capture_device(camwidth, camheight);
- image = SDL_CreateRGBSurface(/*SDL_HWSURFACE*/0, mycamera.width, mycamera.height, 16, 0, 0, 0, 0);
+ image = SDL_CreateRGBSurface(/*SDL_HWSURFACE*/0, mycamera.width, mycamera.height, screen->format->BitsPerPixel, 0, 0, 0, 0);
// printf("image fmt: RGB%d%d%d\n", image->format->Rshift, image->format->Gshift, image->format->Bshift);
start_capturing();
mainloop();
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2017-08-01 14:17:20
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 19f5f27466f95f48b676143174905d65e6194f22 (commit)
from 6f28862e88894652307d39866e02679d11fa53e2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 19f5f27466f95f48b676143174905d65e6194f22
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Aug 1 16:24:01 2017 +0200
[BUILDROOT] Bump to Buildroot 2017.02.5
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
patches/buildroot/{2017.02.3 => 2017.02.5} | 0
.../2017.02/031-armadeus-fixes-libnl-patch-hash.patch | 10 ----------
3 files changed, 1 insertion(+), 11 deletions(-)
rename patches/buildroot/{2017.02.3 => 2017.02.5} (100%)
delete mode 100644 patches/buildroot/2017.02/031-armadeus-fixes-libnl-patch-hash.patch
diff --git a/Makefile b/Makefile
index c16e666..7ebbfab 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
#--- User configurable stuff:
-BUILDROOT_VERSION=2017.02.3
+BUILDROOT_VERSION=2017.02.5
include ./Makefile.in
BUILDROOT_SITE:=https://buildroot.org/downloads
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
diff --git a/patches/buildroot/2017.02.3 b/patches/buildroot/2017.02.5
similarity index 100%
rename from patches/buildroot/2017.02.3
rename to patches/buildroot/2017.02.5
diff --git a/patches/buildroot/2017.02/031-armadeus-fixes-libnl-patch-hash.patch b/patches/buildroot/2017.02/031-armadeus-fixes-libnl-patch-hash.patch
deleted file mode 100644
index c5324fb..0000000
--- a/patches/buildroot/2017.02/031-armadeus-fixes-libnl-patch-hash.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: buildroot/package/libnl/libnl.hash
-===================================================================
---- buildroot.orig/package/libnl/libnl.hash
-+++ buildroot/package/libnl/libnl.hash
-@@ -1,3 +1,4 @@
- # From https://github.com/thom311/libnl/releases/download/libnl3_2_27/libnl-3.2.27.tar.gz.sha256sum
- sha256 4bbbf92b3c78a90f423cf96260bf419a28b75db8cced47051217a56795f58ec6 libnl-3.2.27.tar.gz
--sha256 b7bb929194eefc56c786a7e1ae5176b54713f9013ccec63760f232742ae80361 3e18948f17148e6a3c4255bdeaaf01ef6081ceeb.patch
-+# Locally computed
-+sha256 a308873157080f1e2e6693b2a151e15d8dfe77884b073ba3dc9bd42772dd1aef 3e18948f17148e6a3c4255bdeaaf01ef6081ceeb.patch
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2017-08-01 12:41:00
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 6f28862e88894652307d39866e02679d11fa53e2 (commit)
via 1b8fe9c2ef7c739eae77b735a792780b15416e79 (commit)
from be1e02cc704ef7a1396eda727bb40f5fafceca30 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6f28862e88894652307d39866e02679d11fa53e2
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Aug 1 14:45:23 2017 +0200
[BUILDROOT] uClibc: update config to 1.0.22
uClibc supports now "savedefconfig" target. The config file now only
contains differences from default options.
commit 1b8fe9c2ef7c739eae77b735a792780b15416e79
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Aug 1 14:12:22 2017 +0200
[BUILDROOT] uClibc-ng: enable UCLIBC_SUPPORT_AI_ADDRCONFIG
This makes ifaddrs.h to be installed and fixes libtirpc build.
-----------------------------------------------------------------------
Summary of changes:
.../target/device/armadeus/uClibc-ng-1.0.14.config | 2 +-
.../target/device/armadeus/uClibc-ng-1.0.22.config | 35 ++++++++++++++++++++++
buildroot/target/device/armadeus/uClibc-ng.config | 2 +-
3 files changed, 37 insertions(+), 2 deletions(-)
create mode 100644 buildroot/target/device/armadeus/uClibc-ng-1.0.22.config
diff --git a/buildroot/target/device/armadeus/uClibc-ng-1.0.14.config b/buildroot/target/device/armadeus/uClibc-ng-1.0.14.config
index 82c5b45..aedde2c 100644
--- a/buildroot/target/device/armadeus/uClibc-ng-1.0.14.config
+++ b/buildroot/target/device/armadeus/uClibc-ng-1.0.14.config
@@ -148,7 +148,7 @@ UCLIBC_HAS_RPC=y
UCLIBC_HAS_FULL_RPC=y
UCLIBC_HAS_REENTRANT_RPC=y
UCLIBC_USE_NETLINK=y
-# UCLIBC_SUPPORT_AI_ADDRCONFIG is not set
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
# UCLIBC_HAS_BSD_RES_CLOSE is not set
UCLIBC_HAS_COMPAT_RES_STATE=y
# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
diff --git a/buildroot/target/device/armadeus/uClibc-ng-1.0.22.config b/buildroot/target/device/armadeus/uClibc-ng-1.0.22.config
new file mode 100644
index 0000000..a655955
--- /dev/null
+++ b/buildroot/target/device/armadeus/uClibc-ng-1.0.22.config
@@ -0,0 +1,35 @@
+CONFIG_ARM_EABI=y
+ARCH_WANTS_LITTLE_ENDIAN=y
+DO_C99_MATH=y
+# UCLIBC_STATIC_LDCONFIG is not set
+# LDSO_RUNPATH is not set
+UCLIBC_HAS_THREADS_NATIVE=y
+PTHREADS_DEBUG_SUPPORT=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_SUSV4_LEGACY=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS_GETPT=y
+UCLIBC_HAS_LIBUTIL=y
+UCLIBC_HAS_IPV6=y
+UCLIBC_HAS_RPC=y
+UCLIBC_HAS_FULL_RPC=y
+UCLIBC_HAS_REENTRANT_RPC=y
+UCLIBC_USE_NETLINK=y
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
+UCLIBC_HAS_RESOLVER_SUPPORT=y
+UCLIBC_HAS_CTYPE_CHECKED=y
+UCLIBC_HAS_LOCALE=y
+UCLIBC_HAS_XLOCALE=y
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_FTW=y
+UCLIBC_HAS_GNU_GLOB=y
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="/usr"
+UCLIBC_BUILD_NOW=y
+UCLIBC_HAS_BACKTRACE=y
diff --git a/buildroot/target/device/armadeus/uClibc-ng.config b/buildroot/target/device/armadeus/uClibc-ng.config
index 51cd20e..57bfdf3 120000
--- a/buildroot/target/device/armadeus/uClibc-ng.config
+++ b/buildroot/target/device/armadeus/uClibc-ng.config
@@ -1 +1 @@
-uClibc-ng-1.0.14.config
\ No newline at end of file
+uClibc-ng-1.0.22.config
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2017-08-01 11:57:17
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via be1e02cc704ef7a1396eda727bb40f5fafceca30 (commit)
from 8ce0ba8e8b0c0d8b2e4ff6fe4462dc536d3b6ffd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit be1e02cc704ef7a1396eda727bb40f5fafceca30
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Aug 1 14:02:45 2017 +0200
[LINUX] apf6: 3.19: fix HDMI on i.MX6 SoCs without VPU
-----------------------------------------------------------------------
Summary of changes:
...lk-Change-hdmi_isfr-clock-s-parent-to-be-.patch | 34 +++++++++++++++
...lk-Change-hsi_tx-clock-to-be-a-shared-clo.patch | 43 ++++++++++++++++++
...lk-Add-support-for-mipi_core_cfg-clock-as.patch | 51 ++++++++++++++++++++++
...lk-Add-support-for-mipi_ipg-clock-as-a-sh.patch | 48 ++++++++++++++++++++
...fine-hdmi_isfr-s-parent-to-make-HDMI-work.patch | 50 +++++++++++++++++++++
5 files changed, 226 insertions(+)
create mode 100644 patches/linux/3.19/0711-ARM-imx6q-clk-Change-hdmi_isfr-clock-s-parent-to-be-.patch
create mode 100644 patches/linux/3.19/0712-ARM-imx6q-clk-Change-hsi_tx-clock-to-be-a-shared-clo.patch
create mode 100644 patches/linux/3.19/0713-ARM-imx6q-clk-Add-support-for-mipi_core_cfg-clock-as.patch
create mode 100644 patches/linux/3.19/0714-ARM-imx6q-clk-Add-support-for-mipi_ipg-clock-as-a-sh.patch
create mode 100644 patches/linux/3.19/0715-clk-imx6-refine-hdmi_isfr-s-parent-to-make-HDMI-work.patch
diff --git a/patches/linux/3.19/0711-ARM-imx6q-clk-Change-hdmi_isfr-clock-s-parent-to-be-.patch b/patches/linux/3.19/0711-ARM-imx6q-clk-Change-hdmi_isfr-clock-s-parent-to-be-.patch
new file mode 100644
index 0000000..ed06b65
--- /dev/null
+++ b/patches/linux/3.19/0711-ARM-imx6q-clk-Change-hdmi_isfr-clock-s-parent-to-be-.patch
@@ -0,0 +1,34 @@
+From 974a7115986ee5d0b2db9cc8cd551e6f88e01378 Mon Sep 17 00:00:00 2001
+From: Liu Ying <Yin...@fr...>
+Date: Thu, 12 Feb 2015 14:01:27 +0800
+Subject: [PATCH 1/4] ARM: imx6q: clk: Change hdmi_isfr clock's parent to be
+ video_27m clock
+
+According to the table 33-1 in the i.MX6Q reference manual, the hdmi_isfr
+clock's parent should be the video_27m clock. The i.MX6DL reference manual
+has the same statement. This patch changes the hdmi_isfr clock's parent
+from the pll3_pfd1_540m clock to the video_27m clock.
+
+Suggested-by: Philipp Zabel <p....@pe...>
+Signed-off-by: Liu Ying <Yin...@fr...>
+Signed-off-by: Shawn Guo <sha...@li...>
+---
+ arch/arm/mach-imx/clk-imx6q.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
+index 8335bfc..ab6acd9 100644
+--- a/arch/arm/mach-imx/clk-imx6q.c
++++ b/arch/arm/mach-imx/clk-imx6q.c
+@@ -401,7 +401,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
+ clk[IMX6QDL_CLK_GPU2D_CORE] = imx_clk_gate2("gpu2d_core", "gpu2d_core_podf", base + 0x6c, 24);
+ clk[IMX6QDL_CLK_GPU3D_CORE] = imx_clk_gate2("gpu3d_core", "gpu3d_core_podf", base + 0x6c, 26);
+ clk[IMX6QDL_CLK_HDMI_IAHB] = imx_clk_gate2("hdmi_iahb", "ahb", base + 0x70, 0);
+- clk[IMX6QDL_CLK_HDMI_ISFR] = imx_clk_gate2("hdmi_isfr", "pll3_pfd1_540m", base + 0x70, 4);
++ clk[IMX6QDL_CLK_HDMI_ISFR] = imx_clk_gate2("hdmi_isfr", "video_27m", base + 0x70, 4);
+ clk[IMX6QDL_CLK_I2C1] = imx_clk_gate2("i2c1", "ipg_per", base + 0x70, 6);
+ clk[IMX6QDL_CLK_I2C2] = imx_clk_gate2("i2c2", "ipg_per", base + 0x70, 8);
+ clk[IMX6QDL_CLK_I2C3] = imx_clk_gate2("i2c3", "ipg_per", base + 0x70, 10);
+--
+2.7.3
+
diff --git a/patches/linux/3.19/0712-ARM-imx6q-clk-Change-hsi_tx-clock-to-be-a-shared-clo.patch b/patches/linux/3.19/0712-ARM-imx6q-clk-Change-hsi_tx-clock-to-be-a-shared-clo.patch
new file mode 100644
index 0000000..5f18571
--- /dev/null
+++ b/patches/linux/3.19/0712-ARM-imx6q-clk-Change-hsi_tx-clock-to-be-a-shared-clo.patch
@@ -0,0 +1,43 @@
+From 721fee59d26e46700476f4c70572e9e0f1cc8fd3 Mon Sep 17 00:00:00 2001
+From: Liu Ying <Yin...@fr...>
+Date: Thu, 12 Feb 2015 14:01:28 +0800
+Subject: [PATCH 2/4] ARM: imx6q: clk: Change hsi_tx clock to be a shared clock
+ gate
+
+The CG8 field of the CCM CCGR3 register is named as 'mipi_core_cfg'
+clock, according to the i.MX6q/sdl reference manuals. This clock is
+actually the gate for several clocks, including the hsi_tx_sel clock's
+output and the video_27m clock's output. So, this patch changes the
+hsi_tx clock to be a shared clock gate.
+
+Suggested-by: Philipp Zabel <p....@pe...>
+Signed-off-by: Liu Ying <Yin...@fr...>
+Signed-off-by: Shawn Guo <sha...@li...>
+---
+ arch/arm/mach-imx/clk-imx6q.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
+index ab6acd9..6843ea9 100644
+--- a/arch/arm/mach-imx/clk-imx6q.c
++++ b/arch/arm/mach-imx/clk-imx6q.c
+@@ -119,6 +119,7 @@ static unsigned int share_count_asrc;
+ static unsigned int share_count_ssi1;
+ static unsigned int share_count_ssi2;
+ static unsigned int share_count_ssi3;
++static unsigned int share_count_mipi_core_cfg;
+
+ static void __init imx6q_clocks_init(struct device_node *ccm_node)
+ {
+@@ -416,7 +417,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
+ clk[IMX6QDL_CLK_LDB_DI0] = imx_clk_gate2("ldb_di0", "ldb_di0_podf", base + 0x74, 12);
+ clk[IMX6QDL_CLK_LDB_DI1] = imx_clk_gate2("ldb_di1", "ldb_di1_podf", base + 0x74, 14);
+ clk[IMX6QDL_CLK_IPU2_DI1] = imx_clk_gate2("ipu2_di1", "ipu2_di1_sel", base + 0x74, 10);
+- clk[IMX6QDL_CLK_HSI_TX] = imx_clk_gate2("hsi_tx", "hsi_tx_podf", base + 0x74, 16);
++ clk[IMX6QDL_CLK_HSI_TX] = imx_clk_gate2_shared("hsi_tx", "hsi_tx_podf", base + 0x74, 16, &share_count_mipi_core_cfg);
+ if (cpu_is_imx6dl())
+ /*
+ * The multiplexer and divider of the imx6q clock gpu2d get
+--
+2.7.3
+
diff --git a/patches/linux/3.19/0713-ARM-imx6q-clk-Add-support-for-mipi_core_cfg-clock-as.patch b/patches/linux/3.19/0713-ARM-imx6q-clk-Add-support-for-mipi_core_cfg-clock-as.patch
new file mode 100644
index 0000000..af1d61d
--- /dev/null
+++ b/patches/linux/3.19/0713-ARM-imx6q-clk-Add-support-for-mipi_core_cfg-clock-as.patch
@@ -0,0 +1,51 @@
+From 5ccc248cc53708337a2bfe4ea380c20948e8bbed Mon Sep 17 00:00:00 2001
+From: Liu Ying <Yin...@fr...>
+Date: Thu, 12 Feb 2015 14:01:29 +0800
+Subject: [PATCH 3/4] ARM: imx6q: clk: Add support for mipi_core_cfg clock as a
+ shared clock gate
+
+The CG8 field of the CCM CCGR3 register is named as 'mipi_core_cfg' clock,
+according to the i.MX6q/sdl reference manuals. This clock is actually the
+gate for several clocks, including the hsi_tx_sel clock's output and the
+video_27m clock's output. The MIPI DSI host controller embedded in the
+i.MX6q/sdl SoCs uses the video_27m clock to generate PLL reference clock and
+MIPI core configuration clock. In order to gate/ungate the two MIPI DSI
+host controller relevant clocks, this patch adds the mipi_core_cfg clock as
+a shared clock gate.
+
+Suggested-by: Philipp Zabel <p....@pe...>
+Signed-off-by: Liu Ying <Yin...@fr...>
+Signed-off-by: Shawn Guo <sha...@li...>
+---
+ arch/arm/mach-imx/clk-imx6q.c | 1 +
+ include/dt-bindings/clock/imx6qdl-clock.h | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
+index 6843ea9..e59e2c6 100644
+--- a/arch/arm/mach-imx/clk-imx6q.c
++++ b/arch/arm/mach-imx/clk-imx6q.c
+@@ -418,6 +418,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
+ clk[IMX6QDL_CLK_LDB_DI1] = imx_clk_gate2("ldb_di1", "ldb_di1_podf", base + 0x74, 14);
+ clk[IMX6QDL_CLK_IPU2_DI1] = imx_clk_gate2("ipu2_di1", "ipu2_di1_sel", base + 0x74, 10);
+ clk[IMX6QDL_CLK_HSI_TX] = imx_clk_gate2_shared("hsi_tx", "hsi_tx_podf", base + 0x74, 16, &share_count_mipi_core_cfg);
++ clk[IMX6QDL_CLK_MIPI_CORE_CFG] = imx_clk_gate2_shared("mipi_core_cfg", "video_27m", base + 0x74, 16, &share_count_mipi_core_cfg);
+ if (cpu_is_imx6dl())
+ /*
+ * The multiplexer and divider of the imx6q clock gpu2d get
+diff --git a/include/dt-bindings/clock/imx6qdl-clock.h b/include/dt-bindings/clock/imx6qdl-clock.h
+index 25625bf..dbc828c 100644
+--- a/include/dt-bindings/clock/imx6qdl-clock.h
++++ b/include/dt-bindings/clock/imx6qdl-clock.h
+@@ -249,6 +249,7 @@
+ #define IMX6QDL_PLL7_BYPASS 236
+ #define IMX6QDL_CLK_GPT_3M 237
+ #define IMX6QDL_CLK_VIDEO_27M 238
+-#define IMX6QDL_CLK_END 239
++#define IMX6QDL_CLK_MIPI_CORE_CFG 239
++#define IMX6QDL_CLK_END 240
+
+ #endif /* __DT_BINDINGS_CLOCK_IMX6QDL_H */
+--
+2.7.3
+
diff --git a/patches/linux/3.19/0714-ARM-imx6q-clk-Add-support-for-mipi_ipg-clock-as-a-sh.patch b/patches/linux/3.19/0714-ARM-imx6q-clk-Add-support-for-mipi_ipg-clock-as-a-sh.patch
new file mode 100644
index 0000000..089a34a
--- /dev/null
+++ b/patches/linux/3.19/0714-ARM-imx6q-clk-Add-support-for-mipi_ipg-clock-as-a-sh.patch
@@ -0,0 +1,48 @@
+From e654df7a1a4843429b5d1d6ee40cac9ecef75304 Mon Sep 17 00:00:00 2001
+From: Liu Ying <Yin...@fr...>
+Date: Thu, 12 Feb 2015 14:01:30 +0800
+Subject: [PATCH 4/4] ARM: imx6q: clk: Add support for mipi_ipg clock as a
+ shared clock gate
+
+The CG8 field of the CCM CCGR3 register is the 'mipi_core_cfg' gate clock,
+according to the i.MX6q/sdl reference manuals. This clock is actually the
+gate for several clocks, including the ipg clock's output. The MIPI DSI host
+controller embedded in the i.MX6q/sdl SoCs takes the ipg clock as the pclk -
+the APB clock signal . In order to gate/ungate the ipg clock, this patch adds
+a new shared clock gate named as "mipi_ipg".
+
+Signed-off-by: Liu Ying <Yin...@fr...>
+Signed-off-by: Shawn Guo <sha...@li...>
+---
+ arch/arm/mach-imx/clk-imx6q.c | 1 +
+ include/dt-bindings/clock/imx6qdl-clock.h | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
+index e59e2c6..469a150 100644
+--- a/arch/arm/mach-imx/clk-imx6q.c
++++ b/arch/arm/mach-imx/clk-imx6q.c
+@@ -419,6 +419,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
+ clk[IMX6QDL_CLK_IPU2_DI1] = imx_clk_gate2("ipu2_di1", "ipu2_di1_sel", base + 0x74, 10);
+ clk[IMX6QDL_CLK_HSI_TX] = imx_clk_gate2_shared("hsi_tx", "hsi_tx_podf", base + 0x74, 16, &share_count_mipi_core_cfg);
+ clk[IMX6QDL_CLK_MIPI_CORE_CFG] = imx_clk_gate2_shared("mipi_core_cfg", "video_27m", base + 0x74, 16, &share_count_mipi_core_cfg);
++ clk[IMX6QDL_CLK_MIPI_IPG] = imx_clk_gate2_shared("mipi_ipg", "ipg", base + 0x74, 16, &share_count_mipi_core_cfg);
+ if (cpu_is_imx6dl())
+ /*
+ * The multiplexer and divider of the imx6q clock gpu2d get
+diff --git a/include/dt-bindings/clock/imx6qdl-clock.h b/include/dt-bindings/clock/imx6qdl-clock.h
+index dbc828c..8780868 100644
+--- a/include/dt-bindings/clock/imx6qdl-clock.h
++++ b/include/dt-bindings/clock/imx6qdl-clock.h
+@@ -250,6 +250,7 @@
+ #define IMX6QDL_CLK_GPT_3M 237
+ #define IMX6QDL_CLK_VIDEO_27M 238
+ #define IMX6QDL_CLK_MIPI_CORE_CFG 239
+-#define IMX6QDL_CLK_END 240
++#define IMX6QDL_CLK_MIPI_IPG 240
++#define IMX6QDL_CLK_END 241
+
+ #endif /* __DT_BINDINGS_CLOCK_IMX6QDL_H */
+--
+2.7.3
+
diff --git a/patches/linux/3.19/0715-clk-imx6-refine-hdmi_isfr-s-parent-to-make-HDMI-work.patch b/patches/linux/3.19/0715-clk-imx6-refine-hdmi_isfr-s-parent-to-make-HDMI-work.patch
new file mode 100644
index 0000000..0c3cf55
--- /dev/null
+++ b/patches/linux/3.19/0715-clk-imx6-refine-hdmi_isfr-s-parent-to-make-HDMI-work.patch
@@ -0,0 +1,50 @@
+From ad681a6629d462a154941605c9fd76c70bbb1d6d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Tue, 1 Aug 2017 12:08:24 +0200
+Subject: [PATCH 1/1] clk: imx6: refine hdmi_isfr's parent to make HDMI work on
+ i.MX6 SoCs w/o VPU
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On i.MX6 SoCs without VPU (in my case MCIMX6D4AVT10AC), the hdmi driver
+fails to probe:
+
+[ 2.540030] dwhdmi-imx 120000.hdmi: Unsupported HDMI controller
+(0000:00:00)
+[ 2.548199] imx-drm display-subsystem: failed to bind 120000.hdmi
+(ops dw_hdmi_imx_ops): -19
+[ 2.557403] imx-drm display-subsystem: master bind failed: -19
+
+That's because hdmi_isfr's parent, video_27m, is not correctly ungated.
+As explained in commit 5ccc248cc537 ("ARM: imx6q: clk: Add support for
+mipi_core_cfg clock as a shared clock gate"), video_27m is gated by
+CCM_CCGR3[CG8].
+
+On i.MX6 SoCs with VPU, the hdmi is working thanks to the
+CCM_CMEOR[mod_en_ov_vpu] bit which makes the video_27m ungated whatever
+is in CCM_CCGR3[CG8]. The issue can be reproduced by setting
+CCMEOR[mod_en_ov_vpu] to 0.
+
+Make the HDMI work in every case by setting hdmi_isfr's parent to
+mipi_core_cfg.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ drivers/clk/imx/clk-imx6q.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: linux-3.19.8/arch/arm/mach-imx/clk-imx6q.c
+===================================================================
+--- linux-3.19.8.orig/arch/arm/mach-imx/clk-imx6q.c
++++ linux-3.19.8/arch/arm/mach-imx/clk-imx6q.c
+@@ -402,7 +402,7 @@ static void __init imx6q_clocks_init(str
+ clk[IMX6QDL_CLK_GPU2D_CORE] = imx_clk_gate2("gpu2d_core", "gpu2d_core_podf", base + 0x6c, 24);
+ clk[IMX6QDL_CLK_GPU3D_CORE] = imx_clk_gate2("gpu3d_core", "gpu3d_core_podf", base + 0x6c, 26);
+ clk[IMX6QDL_CLK_HDMI_IAHB] = imx_clk_gate2("hdmi_iahb", "ahb", base + 0x70, 0);
+- clk[IMX6QDL_CLK_HDMI_ISFR] = imx_clk_gate2("hdmi_isfr", "video_27m", base + 0x70, 4);
++ clk[IMX6QDL_CLK_HDMI_ISFR] = imx_clk_gate2("hdmi_isfr", "mipi_core_cfg", base + 0x70, 4);
+ clk[IMX6QDL_CLK_I2C1] = imx_clk_gate2("i2c1", "ipg_per", base + 0x70, 6);
+ clk[IMX6QDL_CLK_I2C2] = imx_clk_gate2("i2c2", "ipg_per", base + 0x70, 8);
+ clk[IMX6QDL_CLK_I2C3] = imx_clk_gate2("i2c3", "ipg_per", base + 0x70, 10);
hooks/post-receive
--
armadeus
|