armadeus-commitlog Mailing List for armadeus (Page 6)
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
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: sszy <ss...@us...> - 2024-03-14 16:30:10
|
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 67f85188c1e7351eacf362801fc407f6662b9e91 (commit)
from 04b1fec3452fccd1a28a1b296e7887cb2576eac1 (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 67f85188c1e7351eacf362801fc407f6662b9e91
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Mar 14 17:29:32 2024 +0100
[BUILDROOT] 2024.02: patch to fix expat
-----------------------------------------------------------------------
Summary of changes:
...kage-expat-security-bump-to-version-2.6.2.patch | 55 ++++++++++++++++++++++
patches/buildroot/2024.02/cleanup_buildroot.sh | 2 +
2 files changed, 57 insertions(+)
create mode 100644 patches/buildroot/2024.02/0424-package-expat-security-bump-to-version-2.6.2.patch
diff --git a/patches/buildroot/2024.02/0424-package-expat-security-bump-to-version-2.6.2.patch b/patches/buildroot/2024.02/0424-package-expat-security-bump-to-version-2.6.2.patch
new file mode 100644
index 000000000..53bd3f81d
--- /dev/null
+++ b/patches/buildroot/2024.02/0424-package-expat-security-bump-to-version-2.6.2.patch
@@ -0,0 +1,55 @@
+From 623bafb092165e0a32611c8b1f628d3e362eb2fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Thu, 14 Mar 2024 17:02:25 +0100
+Subject: [PATCH 1/1] package/expat: security bump to version 2.6.2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Security fixes:
+ - CVE-2024-28757 -- Prevent billion laughs attacks with isolated
+ use of external parsers. Please see the commit message of
+ commit 1d50b80cf31de87750103656f6eb693746854aa8 for details.
+
+https://blog.hartwork.org/posts/expat-2-6-2-released/
+https://github.com/libexpat/libexpat/blob/R_2_6_2/expat/Changes
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/expat/expat.hash | 8 ++++----
+ package/expat/expat.mk | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/package/expat/expat.hash b/package/expat/expat.hash
+index 980a9ab6a79d..63890b54df29 100644
+--- a/package/expat/expat.hash
++++ b/package/expat/expat.hash
+@@ -1,7 +1,7 @@
+-# From https://sourceforge.net/projects/expat/files/expat/2.6.1/
+-md5 84d0ee1c554212dc8f068e538de5b823 expat-2.6.1.tar.xz
+-sha1 1a1804b7c565a8b21abbd3433ef67ed8a4476960 expat-2.6.1.tar.xz
++# From https://sourceforge.net/projects/expat/files/expat/2.6.2/
++md5 0cb75c8feb842c0794ba89666b762a2d expat-2.6.1.tar.xz
++sha1 d9e5f953dcacda3c9e69b4886382c3d8847b81bd expat-2.6.1.tar.xz
+
+ # Locally calculated
+-sha256 cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e expat-2.6.0.tar.xz
++sha256 ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364 expat-2.6.2.tar.xz
+ sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING
+diff --git a/package/expat/expat.mk b/package/expat/expat.mk
+index e09fcc673fa5..c6b7fc8b44f0 100644
+--- a/package/expat/expat.mk
++++ b/package/expat/expat.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-EXPAT_VERSION = 2.6.1
++EXPAT_VERSION = 2.6.2
+ EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
+ EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz
+ EXPAT_INSTALL_STAGING = YES
+--
+2.43.2
+
diff --git a/patches/buildroot/2024.02/cleanup_buildroot.sh b/patches/buildroot/2024.02/cleanup_buildroot.sh
index 999816294..cd5eab3f5 100755
--- a/patches/buildroot/2024.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2024.02/cleanup_buildroot.sh
@@ -25,6 +25,8 @@ rm -rf buildroot/package/cmux/cmux.hash
rm -rf buildroot/package/cmux/cmux.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
+rm -rf buildroot/package/expat/expat.hash
+rm -rf buildroot/package/expat/expat.mk
rm -rf buildroot/package/expect/expect.mk
rm -rf buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
rm -rf buildroot/package/gnokii/Config.in
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-03-06 03:00:46
|
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 04b1fec3452fccd1a28a1b296e7887cb2576eac1 (commit)
from 532bc70b01a6a8c140ec7924b31dd5b444c3a13a (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 04b1fec3452fccd1a28a1b296e7887cb2576eac1
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Feb 26 10:27:16 2024 +0100
[BUILDROOT] Bump to BR2024.02
BR patches are prefixed with 4-digit numbers like U-Boot and Linux
patches.
-----------------------------------------------------------------------
Summary of changes:
Makefile | 4 ++--
buildroot/configs/opos6ul_defconfig | 2 +-
.../0001-add_armadeus_device.patch} | 0
.../0002-add_armadeus_specific_packages.patch} | 0
.../0003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch} | 0
.../0004-armadeus-add-custom-patches-to-atf.patch} | 0
.../0005-armadeus-gpsd-add-options-setting-in-menuconfig.patch} | 0
.../0009-armadeus-xc3sprog-new-package.patch} | 0
.../0010-armadeus-sam7-pgm-ng-new-package.patch} | 0
.../0018-armadeus-add-pcidebug-package.patch} | 0
.../0019-armadeus-add-cmux-package.patch} | 0
.../0025-armadeus-apf-config-add-package.patch} | 0
.../0029-armadeus-lora-forwarder-add-package.patch} | 0
.../0030-armadeus-lmic-pi-add-package.patch} | 0
.../0031-armadeus-lepton-add-package.patch} | 0
.../0031-armadeus-lepton-fix-makefile.patch} | 0
.../0035-armadeus-fixes-uclibc-build-with-ucontext.patch} | 0
.../0039-armadeus-add-sd8977-driver-and-firmware.patch} | 0
.../0040-armadeus-add-thingerio-client-package.patch} | 0
.../0044-armadeus-expect-forces-unbuffer-instalation.patch} | 0
.../0045-armadeus-add-pwm-music-package.patch} | 0
.../0047-armadeus-add-ldconfig-target-install-option.patch} | 0
.../0050-U-Boot-add_support_for_custom_configuration_file.patch} | 0
.../0081-adds_quake_package.patch} | 0
.../0118-armadeus-snes9x-add-package.patch} | 0
.../0121-target-arm926t_is_arm926ej-s.patch} | 0
.../0123-armadeus-pywebradio-add-package.patch} | 0
.../0124-e-uae-add_package.patch} | 0
.../0188-marble-add_package.patch} | 0
.../0201-armadeus-add_gnokii.patch} | 0
.../0204-wpa-supplicant-add-option-ieee80211w.patch} | 0
.../0205-busybox-coreutils-stty-add-rs485-config-options.patch} | 0
.../0209-armadeus-add_matiec.patch} | 0
.../0237-armadeus-busybox-speed-up-mdev.patch} | 0
.../0341-python-flask-socketio-new-package.patch} | 0
.../0412-package-libimxdmabuffer-new-package.patch} | 0
.../0413-package-libimxvpuapi2-new-package.patch} | 0
.../0414-package-gstreamer1-gst1-imx2-new-package.patch} | 0
.../0417-package-freescale-imx-imx-gpu-viv-removes-uneeded-li.patch} | 0
.../0422-package-libimxdmabuffer-bump-to-v1.1.2.patch} | 0
.../0423-package-libimxvpuapi2-bump-to-2.2.2.patch} | 0
patches/buildroot/{2023.11 => 2024.02}/cleanup_buildroot.sh | 0
42 files changed, 3 insertions(+), 3 deletions(-)
copy patches/buildroot/{2015.02/001-add_armadeus_device.patch => 2024.02/0001-add_armadeus_device.patch} (100%)
copy patches/buildroot/{2015.02/002-add_armadeus_specific_packages.patch => 2024.02/0002-add_armadeus_specific_packages.patch} (100%)
copy patches/buildroot/{2019.02/003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch => 2024.02/0003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch} (100%)
copy patches/buildroot/{2022.02/004-armadeus-add-custom-patches-to-atf.patch => 2024.02/0004-armadeus-add-custom-patches-to-atf.patch} (100%)
copy patches/buildroot/{2019.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch => 2024.02/0005-armadeus-gpsd-add-options-setting-in-menuconfig.patch} (100%)
copy patches/buildroot/{2015.02/009-armadeus-xc3sprog-new-package.patch => 2024.02/0009-armadeus-xc3sprog-new-package.patch} (100%)
copy patches/buildroot/{2015.02/010-armadeus-sam7-pgm-ng-new-package.patch => 2024.02/0010-armadeus-sam7-pgm-ng-new-package.patch} (100%)
copy patches/buildroot/{2019.02/018-armadeus-add-pcidebug-package.patch => 2024.02/0018-armadeus-add-pcidebug-package.patch} (100%)
copy patches/buildroot/{2023.02/019-armadeus-add-cmux-package.patch => 2024.02/0019-armadeus-add-cmux-package.patch} (100%)
copy patches/buildroot/{2021.02/025-armadeus-apf-config-add-package.patch => 2024.02/0025-armadeus-apf-config-add-package.patch} (100%)
copy patches/buildroot/{2019.02/029-armadeus-lora-forwarder-add-package.patch => 2024.02/0029-armadeus-lora-forwarder-add-package.patch} (100%)
copy patches/buildroot/{2021.02/030-armadeus-lmic-pi-add-package.patch => 2024.02/0030-armadeus-lmic-pi-add-package.patch} (100%)
copy patches/buildroot/{2023.11/031-armadeus-lepton-add-package.patch => 2024.02/0031-armadeus-lepton-add-package.patch} (100%)
copy patches/buildroot/{2017.02/031-armadeus-lepton-fix-makefile.patch => 2024.02/0031-armadeus-lepton-fix-makefile.patch} (100%)
copy patches/buildroot/{2019.02/035-armadeus-fixes-uclibc-build-with-ucontext.patch => 2024.02/0035-armadeus-fixes-uclibc-build-with-ucontext.patch} (100%)
copy patches/buildroot/{2019.02/039-armadeus-add-sd8977-driver-and-firmware.patch => 2024.02/0039-armadeus-add-sd8977-driver-and-firmware.patch} (100%)
copy patches/buildroot/{2019.02/040-armadeus-add-thingerio-client-package.patch => 2024.02/0040-armadeus-add-thingerio-client-package.patch} (100%)
copy patches/buildroot/{2019.02/044-armadeus-expect-forces-unbuffer-instalation.patch => 2024.02/0044-armadeus-expect-forces-unbuffer-instalation.patch} (100%)
copy patches/buildroot/{2021.02/045-armadeus-add-pwm-music-package.patch => 2024.02/0045-armadeus-add-pwm-music-package.patch} (100%)
copy patches/buildroot/{2022.02/047-armadeus-add-ldconfig-target-install-option.patch => 2024.02/0047-armadeus-add-ldconfig-target-install-option.patch} (100%)
copy patches/buildroot/{2019.02/050-U-Boot-add_support_for_custom_configuration_file.patch => 2024.02/0050-U-Boot-add_support_for_custom_configuration_file.patch} (100%)
copy patches/buildroot/{2019.02/081-adds_quake_package.patch => 2024.02/0081-adds_quake_package.patch} (100%)
copy patches/buildroot/{2022.02/118-armadeus-snes9x-add-package.patch => 2024.02/0118-armadeus-snes9x-add-package.patch} (100%)
copy patches/buildroot/{2015.02/121-target-arm926t_is_arm926ej-s.patch => 2024.02/0121-target-arm926t_is_arm926ej-s.patch} (100%)
copy patches/buildroot/{2021.02/123-armadeus-pywebradio-add-package.patch => 2024.02/0123-armadeus-pywebradio-add-package.patch} (100%)
copy patches/buildroot/{2019.02/124-e-uae-add_package.patch => 2024.02/0124-e-uae-add_package.patch} (100%)
copy patches/buildroot/{2022.02/188-marble-add_package.patch => 2024.02/0188-marble-add_package.patch} (100%)
copy patches/buildroot/{2019.02/201-armadeus-add_gnokii.patch => 2024.02/0201-armadeus-add_gnokii.patch} (100%)
copy patches/buildroot/{2015.02/204-wpa-supplicant-add-option-ieee80211w.patch => 2024.02/0204-wpa-supplicant-add-option-ieee80211w.patch} (100%)
copy patches/buildroot/{2019.02/205-busybox-coreutils-stty-add-rs485-config-options.patch => 2024.02/0205-busybox-coreutils-stty-add-rs485-config-options.patch} (100%)
copy patches/buildroot/{2015.02/209-armadeus-add_matiec.patch => 2024.02/0209-armadeus-add_matiec.patch} (100%)
copy patches/buildroot/{2020.02/237-armadeus-busybox-speed-up-mdev.patch => 2024.02/0237-armadeus-busybox-speed-up-mdev.patch} (100%)
copy patches/buildroot/{2023.02/341-python-flask-socketio-new-package.patch => 2024.02/0341-python-flask-socketio-new-package.patch} (100%)
copy patches/buildroot/{2023.02/412-package-libimxdmabuffer-new-package.patch => 2024.02/0412-package-libimxdmabuffer-new-package.patch} (100%)
copy patches/buildroot/{2021.02/413-package-libimxvpuapi2-new-package.patch => 2024.02/0413-package-libimxvpuapi2-new-package.patch} (100%)
copy patches/buildroot/{2021.02/414-package-gstreamer1-gst1-imx2-new-package.patch => 2024.02/0414-package-gstreamer1-gst1-imx2-new-package.patch} (100%)
copy patches/buildroot/{2022.02/417-package-freescale-imx-imx-gpu-viv-removes-uneeded-li.patch => 2024.02/0417-package-freescale-imx-imx-gpu-viv-removes-uneeded-li.patch} (100%)
copy patches/buildroot/{2023.02/422-package-libimxdmabuffer-bump-to-v1.1.2.patch => 2024.02/0422-package-libimxdmabuffer-bump-to-v1.1.2.patch} (100%)
copy patches/buildroot/{2023.02/423-package-libimxvpuapi2-bump-to-2.2.2.patch => 2024.02/0423-package-libimxvpuapi2-bump-to-2.2.2.patch} (100%)
copy patches/buildroot/{2023.11 => 2024.02}/cleanup_buildroot.sh (100%)
diff --git a/Makefile b/Makefile
index 21a4a04a9..99faac76d 100644
--- a/Makefile
+++ b/Makefile
@@ -26,8 +26,8 @@ ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
#--- User configurable stuff:
-BUILDROOT_MAJOR_VERSION ?= 2023.11
-BUILDROOT_MINOR_VERSION ?= 2
+BUILDROOT_MAJOR_VERSION ?= 2024.02
+BUILDROOT_MINOR_VERSION ?=
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 416788c5d..2628ed5cf 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -149,7 +149,7 @@ BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_EXT2_LABEL="ROOTFS"
-BR2_TARGET_ROOTFS_EXT2_SIZE="190M"
+BR2_TARGET_ROOTFS_EXT2_SIZE="210M"
BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,^metadata_csum,uninit_bg"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/patches/buildroot/2015.02/001-add_armadeus_device.patch b/patches/buildroot/2024.02/0001-add_armadeus_device.patch
similarity index 100%
copy from patches/buildroot/2015.02/001-add_armadeus_device.patch
copy to patches/buildroot/2024.02/0001-add_armadeus_device.patch
diff --git a/patches/buildroot/2015.02/002-add_armadeus_specific_packages.patch b/patches/buildroot/2024.02/0002-add_armadeus_specific_packages.patch
similarity index 100%
copy from patches/buildroot/2015.02/002-add_armadeus_specific_packages.patch
copy to patches/buildroot/2024.02/0002-add_armadeus_specific_packages.patch
diff --git a/patches/buildroot/2019.02/003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch b/patches/buildroot/2024.02/0003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch
similarity index 100%
copy from patches/buildroot/2019.02/003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch
copy to patches/buildroot/2024.02/0003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch
diff --git a/patches/buildroot/2022.02/004-armadeus-add-custom-patches-to-atf.patch b/patches/buildroot/2024.02/0004-armadeus-add-custom-patches-to-atf.patch
similarity index 100%
copy from patches/buildroot/2022.02/004-armadeus-add-custom-patches-to-atf.patch
copy to patches/buildroot/2024.02/0004-armadeus-add-custom-patches-to-atf.patch
diff --git a/patches/buildroot/2019.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch b/patches/buildroot/2024.02/0005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
similarity index 100%
copy from patches/buildroot/2019.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
copy to patches/buildroot/2024.02/0005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
diff --git a/patches/buildroot/2015.02/009-armadeus-xc3sprog-new-package.patch b/patches/buildroot/2024.02/0009-armadeus-xc3sprog-new-package.patch
similarity index 100%
copy from patches/buildroot/2015.02/009-armadeus-xc3sprog-new-package.patch
copy to patches/buildroot/2024.02/0009-armadeus-xc3sprog-new-package.patch
diff --git a/patches/buildroot/2015.02/010-armadeus-sam7-pgm-ng-new-package.patch b/patches/buildroot/2024.02/0010-armadeus-sam7-pgm-ng-new-package.patch
similarity index 100%
copy from patches/buildroot/2015.02/010-armadeus-sam7-pgm-ng-new-package.patch
copy to patches/buildroot/2024.02/0010-armadeus-sam7-pgm-ng-new-package.patch
diff --git a/patches/buildroot/2019.02/018-armadeus-add-pcidebug-package.patch b/patches/buildroot/2024.02/0018-armadeus-add-pcidebug-package.patch
similarity index 100%
copy from patches/buildroot/2019.02/018-armadeus-add-pcidebug-package.patch
copy to patches/buildroot/2024.02/0018-armadeus-add-pcidebug-package.patch
diff --git a/patches/buildroot/2023.02/019-armadeus-add-cmux-package.patch b/patches/buildroot/2024.02/0019-armadeus-add-cmux-package.patch
similarity index 100%
copy from patches/buildroot/2023.02/019-armadeus-add-cmux-package.patch
copy to patches/buildroot/2024.02/0019-armadeus-add-cmux-package.patch
diff --git a/patches/buildroot/2021.02/025-armadeus-apf-config-add-package.patch b/patches/buildroot/2024.02/0025-armadeus-apf-config-add-package.patch
similarity index 100%
copy from patches/buildroot/2021.02/025-armadeus-apf-config-add-package.patch
copy to patches/buildroot/2024.02/0025-armadeus-apf-config-add-package.patch
diff --git a/patches/buildroot/2019.02/029-armadeus-lora-forwarder-add-package.patch b/patches/buildroot/2024.02/0029-armadeus-lora-forwarder-add-package.patch
similarity index 100%
copy from patches/buildroot/2019.02/029-armadeus-lora-forwarder-add-package.patch
copy to patches/buildroot/2024.02/0029-armadeus-lora-forwarder-add-package.patch
diff --git a/patches/buildroot/2021.02/030-armadeus-lmic-pi-add-package.patch b/patches/buildroot/2024.02/0030-armadeus-lmic-pi-add-package.patch
similarity index 100%
copy from patches/buildroot/2021.02/030-armadeus-lmic-pi-add-package.patch
copy to patches/buildroot/2024.02/0030-armadeus-lmic-pi-add-package.patch
diff --git a/patches/buildroot/2023.11/031-armadeus-lepton-add-package.patch b/patches/buildroot/2024.02/0031-armadeus-lepton-add-package.patch
similarity index 100%
copy from patches/buildroot/2023.11/031-armadeus-lepton-add-package.patch
copy to patches/buildroot/2024.02/0031-armadeus-lepton-add-package.patch
diff --git a/patches/buildroot/2017.02/031-armadeus-lepton-fix-makefile.patch b/patches/buildroot/2024.02/0031-armadeus-lepton-fix-makefile.patch
similarity index 100%
copy from patches/buildroot/2017.02/031-armadeus-lepton-fix-makefile.patch
copy to patches/buildroot/2024.02/0031-armadeus-lepton-fix-makefile.patch
diff --git a/patches/buildroot/2019.02/035-armadeus-fixes-uclibc-build-with-ucontext.patch b/patches/buildroot/2024.02/0035-armadeus-fixes-uclibc-build-with-ucontext.patch
similarity index 100%
copy from patches/buildroot/2019.02/035-armadeus-fixes-uclibc-build-with-ucontext.patch
copy to patches/buildroot/2024.02/0035-armadeus-fixes-uclibc-build-with-ucontext.patch
diff --git a/patches/buildroot/2019.02/039-armadeus-add-sd8977-driver-and-firmware.patch b/patches/buildroot/2024.02/0039-armadeus-add-sd8977-driver-and-firmware.patch
similarity index 100%
copy from patches/buildroot/2019.02/039-armadeus-add-sd8977-driver-and-firmware.patch
copy to patches/buildroot/2024.02/0039-armadeus-add-sd8977-driver-and-firmware.patch
diff --git a/patches/buildroot/2019.02/040-armadeus-add-thingerio-client-package.patch b/patches/buildroot/2024.02/0040-armadeus-add-thingerio-client-package.patch
similarity index 100%
copy from patches/buildroot/2019.02/040-armadeus-add-thingerio-client-package.patch
copy to patches/buildroot/2024.02/0040-armadeus-add-thingerio-client-package.patch
diff --git a/patches/buildroot/2019.02/044-armadeus-expect-forces-unbuffer-instalation.patch b/patches/buildroot/2024.02/0044-armadeus-expect-forces-unbuffer-instalation.patch
similarity index 100%
copy from patches/buildroot/2019.02/044-armadeus-expect-forces-unbuffer-instalation.patch
copy to patches/buildroot/2024.02/0044-armadeus-expect-forces-unbuffer-instalation.patch
diff --git a/patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch b/patches/buildroot/2024.02/0045-armadeus-add-pwm-music-package.patch
similarity index 100%
copy from patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch
copy to patches/buildroot/2024.02/0045-armadeus-add-pwm-music-package.patch
diff --git a/patches/buildroot/2022.02/047-armadeus-add-ldconfig-target-install-option.patch b/patches/buildroot/2024.02/0047-armadeus-add-ldconfig-target-install-option.patch
similarity index 100%
copy from patches/buildroot/2022.02/047-armadeus-add-ldconfig-target-install-option.patch
copy to patches/buildroot/2024.02/0047-armadeus-add-ldconfig-target-install-option.patch
diff --git a/patches/buildroot/2019.02/050-U-Boot-add_support_for_custom_configuration_file.patch b/patches/buildroot/2024.02/0050-U-Boot-add_support_for_custom_configuration_file.patch
similarity index 100%
copy from patches/buildroot/2019.02/050-U-Boot-add_support_for_custom_configuration_file.patch
copy to patches/buildroot/2024.02/0050-U-Boot-add_support_for_custom_configuration_file.patch
diff --git a/patches/buildroot/2019.02/081-adds_quake_package.patch b/patches/buildroot/2024.02/0081-adds_quake_package.patch
similarity index 100%
copy from patches/buildroot/2019.02/081-adds_quake_package.patch
copy to patches/buildroot/2024.02/0081-adds_quake_package.patch
diff --git a/patches/buildroot/2022.02/118-armadeus-snes9x-add-package.patch b/patches/buildroot/2024.02/0118-armadeus-snes9x-add-package.patch
similarity index 100%
copy from patches/buildroot/2022.02/118-armadeus-snes9x-add-package.patch
copy to patches/buildroot/2024.02/0118-armadeus-snes9x-add-package.patch
diff --git a/patches/buildroot/2015.02/121-target-arm926t_is_arm926ej-s.patch b/patches/buildroot/2024.02/0121-target-arm926t_is_arm926ej-s.patch
similarity index 100%
copy from patches/buildroot/2015.02/121-target-arm926t_is_arm926ej-s.patch
copy to patches/buildroot/2024.02/0121-target-arm926t_is_arm926ej-s.patch
diff --git a/patches/buildroot/2021.02/123-armadeus-pywebradio-add-package.patch b/patches/buildroot/2024.02/0123-armadeus-pywebradio-add-package.patch
similarity index 100%
copy from patches/buildroot/2021.02/123-armadeus-pywebradio-add-package.patch
copy to patches/buildroot/2024.02/0123-armadeus-pywebradio-add-package.patch
diff --git a/patches/buildroot/2019.02/124-e-uae-add_package.patch b/patches/buildroot/2024.02/0124-e-uae-add_package.patch
similarity index 100%
copy from patches/buildroot/2019.02/124-e-uae-add_package.patch
copy to patches/buildroot/2024.02/0124-e-uae-add_package.patch
diff --git a/patches/buildroot/2022.02/188-marble-add_package.patch b/patches/buildroot/2024.02/0188-marble-add_package.patch
similarity index 100%
copy from patches/buildroot/2022.02/188-marble-add_package.patch
copy to patches/buildroot/2024.02/0188-marble-add_package.patch
diff --git a/patches/buildroot/2019.02/201-armadeus-add_gnokii.patch b/patches/buildroot/2024.02/0201-armadeus-add_gnokii.patch
similarity index 100%
copy from patches/buildroot/2019.02/201-armadeus-add_gnokii.patch
copy to patches/buildroot/2024.02/0201-armadeus-add_gnokii.patch
diff --git a/patches/buildroot/2015.02/204-wpa-supplicant-add-option-ieee80211w.patch b/patches/buildroot/2024.02/0204-wpa-supplicant-add-option-ieee80211w.patch
similarity index 100%
copy from patches/buildroot/2015.02/204-wpa-supplicant-add-option-ieee80211w.patch
copy to patches/buildroot/2024.02/0204-wpa-supplicant-add-option-ieee80211w.patch
diff --git a/patches/buildroot/2019.02/205-busybox-coreutils-stty-add-rs485-config-options.patch b/patches/buildroot/2024.02/0205-busybox-coreutils-stty-add-rs485-config-options.patch
similarity index 100%
copy from patches/buildroot/2019.02/205-busybox-coreutils-stty-add-rs485-config-options.patch
copy to patches/buildroot/2024.02/0205-busybox-coreutils-stty-add-rs485-config-options.patch
diff --git a/patches/buildroot/2015.02/209-armadeus-add_matiec.patch b/patches/buildroot/2024.02/0209-armadeus-add_matiec.patch
similarity index 100%
copy from patches/buildroot/2015.02/209-armadeus-add_matiec.patch
copy to patches/buildroot/2024.02/0209-armadeus-add_matiec.patch
diff --git a/patches/buildroot/2020.02/237-armadeus-busybox-speed-up-mdev.patch b/patches/buildroot/2024.02/0237-armadeus-busybox-speed-up-mdev.patch
similarity index 100%
copy from patches/buildroot/2020.02/237-armadeus-busybox-speed-up-mdev.patch
copy to patches/buildroot/2024.02/0237-armadeus-busybox-speed-up-mdev.patch
diff --git a/patches/buildroot/2023.02/341-python-flask-socketio-new-package.patch b/patches/buildroot/2024.02/0341-python-flask-socketio-new-package.patch
similarity index 100%
copy from patches/buildroot/2023.02/341-python-flask-socketio-new-package.patch
copy to patches/buildroot/2024.02/0341-python-flask-socketio-new-package.patch
diff --git a/patches/buildroot/2023.02/412-package-libimxdmabuffer-new-package.patch b/patches/buildroot/2024.02/0412-package-libimxdmabuffer-new-package.patch
similarity index 100%
copy from patches/buildroot/2023.02/412-package-libimxdmabuffer-new-package.patch
copy to patches/buildroot/2024.02/0412-package-libimxdmabuffer-new-package.patch
diff --git a/patches/buildroot/2021.02/413-package-libimxvpuapi2-new-package.patch b/patches/buildroot/2024.02/0413-package-libimxvpuapi2-new-package.patch
similarity index 100%
copy from patches/buildroot/2021.02/413-package-libimxvpuapi2-new-package.patch
copy to patches/buildroot/2024.02/0413-package-libimxvpuapi2-new-package.patch
diff --git a/patches/buildroot/2021.02/414-package-gstreamer1-gst1-imx2-new-package.patch b/patches/buildroot/2024.02/0414-package-gstreamer1-gst1-imx2-new-package.patch
similarity index 100%
copy from patches/buildroot/2021.02/414-package-gstreamer1-gst1-imx2-new-package.patch
copy to patches/buildroot/2024.02/0414-package-gstreamer1-gst1-imx2-new-package.patch
diff --git a/patches/buildroot/2022.02/417-package-freescale-imx-imx-gpu-viv-removes-uneeded-li.patch b/patches/buildroot/2024.02/0417-package-freescale-imx-imx-gpu-viv-removes-uneeded-li.patch
similarity index 100%
copy from patches/buildroot/2022.02/417-package-freescale-imx-imx-gpu-viv-removes-uneeded-li.patch
copy to patches/buildroot/2024.02/0417-package-freescale-imx-imx-gpu-viv-removes-uneeded-li.patch
diff --git a/patches/buildroot/2023.02/422-package-libimxdmabuffer-bump-to-v1.1.2.patch b/patches/buildroot/2024.02/0422-package-libimxdmabuffer-bump-to-v1.1.2.patch
similarity index 100%
copy from patches/buildroot/2023.02/422-package-libimxdmabuffer-bump-to-v1.1.2.patch
copy to patches/buildroot/2024.02/0422-package-libimxdmabuffer-bump-to-v1.1.2.patch
diff --git a/patches/buildroot/2023.02/423-package-libimxvpuapi2-bump-to-2.2.2.patch b/patches/buildroot/2024.02/0423-package-libimxvpuapi2-bump-to-2.2.2.patch
similarity index 100%
copy from patches/buildroot/2023.02/423-package-libimxvpuapi2-bump-to-2.2.2.patch
copy to patches/buildroot/2024.02/0423-package-libimxvpuapi2-bump-to-2.2.2.patch
diff --git a/patches/buildroot/2023.11/cleanup_buildroot.sh b/patches/buildroot/2024.02/cleanup_buildroot.sh
similarity index 100%
copy from patches/buildroot/2023.11/cleanup_buildroot.sh
copy to patches/buildroot/2024.02/cleanup_buildroot.sh
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-03-01 16:08: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 532bc70b01a6a8c140ec7924b31dd5b444c3a13a (commit)
from 1ee3179d996a563d22c4e1a36455d6d479ba16d3 (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 532bc70b01a6a8c140ec7924b31dd5b444c3a13a
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Mar 1 17:07:57 2024 +0100
[LINUX] 4.9.legacy: cpupower: patch to fix kernel building with GCC 10
-----------------------------------------------------------------------
Summary of changes:
.../0820-cpupower-avoid-multiple-definition-with-gcc-fno-comm.patch} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
copy patches/linux/{5.4.imx_legacy/0546-cpupower-avoid-multiple-definition-with-gcc-fno-comm.patch => 4.9.mx6_legacy/0820-cpupower-avoid-multiple-definition-with-gcc-fno-comm.patch} (99%)
diff --git a/patches/linux/5.4.imx_legacy/0546-cpupower-avoid-multiple-definition-with-gcc-fno-comm.patch b/patches/linux/4.9.mx6_legacy/0820-cpupower-avoid-multiple-definition-with-gcc-fno-comm.patch
similarity index 99%
copy from patches/linux/5.4.imx_legacy/0546-cpupower-avoid-multiple-definition-with-gcc-fno-comm.patch
copy to patches/linux/4.9.mx6_legacy/0820-cpupower-avoid-multiple-definition-with-gcc-fno-comm.patch
index 5589c9813..a82ca2356 100644
--- a/patches/linux/5.4.imx_legacy/0546-cpupower-avoid-multiple-definition-with-gcc-fno-comm.patch
+++ b/patches/linux/4.9.mx6_legacy/0820-cpupower-avoid-multiple-definition-with-gcc-fno-comm.patch
@@ -81,5 +81,5 @@ index 5b5eb1da0cce..c559d3115330 100644
/* Hard to define the right names ...: */
enum power_range_e {
--
-2.26.3
+2.43.0
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-03-01 14:43:33
|
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 1ee3179d996a563d22c4e1a36455d6d479ba16d3 (commit)
via 33b1ea5386c9e2795c41ebe4c922acd42278c15c (commit)
from e891faf9746089c7b8e2dcd2c009b567682d40f6 (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 1ee3179d996a563d22c4e1a36455d6d479ba16d3
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Mar 1 15:37:47 2024 +0100
[BUILDROOT] apf27_defconfig: add fb-test-app and evtest
commit 33b1ea5386c9e2795c41ebe4c922acd42278c15c
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Mar 1 15:31:55 2024 +0100
[BUILDROOT] Bump BR to 2023.11.2
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
buildroot/configs/apf27_defconfig | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index fee1f37e4..21a4a04a9 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2023.11
-BUILDROOT_MINOR_VERSION ?= 1
+BUILDROOT_MINOR_VERSION ?= 2
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index c9934f1f7..ff3f68348 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -52,6 +52,8 @@ BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
BR2_PACKAGE_ASCII_INVADERS=y
+BR2_PACKAGE_FB_TEST_APP=y
+BR2_PACKAGE_EVTEST=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_DTC=y
BR2_PACKAGE_DTC_PROGRAMS=y
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-02-28 21:18:59
|
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 e891faf9746089c7b8e2dcd2c009b567682d40f6 (commit)
from e23e21d2a8157993bd66fdd21c7cf75ca0a4340c (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 e891faf9746089c7b8e2dcd2c009b567682d40f6
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Feb 28 22:17:44 2024 +0100
[DEMOS] capture: add support for NEON usage in BAYER to RGB conversion
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/demos/Config.in | 7 ++++
buildroot/package/armadeus/demos/demos.mk | 4 +++
target/demos/camera/capture/Makefile | 8 +++--
target/demos/camera/capture/capture.c | 52 ++++++++++++++++++++++++++++++
4 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/buildroot/package/armadeus/demos/Config.in b/buildroot/package/armadeus/demos/Config.in
index da6aeda41..c731bd30d 100644
--- a/buildroot/package/armadeus/demos/Config.in
+++ b/buildroot/package/armadeus/demos/Config.in
@@ -54,6 +54,13 @@ config BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE_VPU
help
Use i.MX27/i.MX51 VPU to encode stream in H.264
+config BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE_USE_NEON
+ bool "use NEON"
+ depends on BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE
+ select BR2_PACKAGE_BAYER2RGB_NEON
+ help
+ Use NEON (if present) to perform CSC (currently only Bayer -> RGB)
+
config BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO
bool "Oscilloscope"
depends on BR2_PACKAGE_AS_DEVICES
diff --git a/buildroot/package/armadeus/demos/demos.mk b/buildroot/package/armadeus/demos/demos.mk
index ac6d32b26..458d36db0 100644
--- a/buildroot/package/armadeus/demos/demos.mk
+++ b/buildroot/package/armadeus/demos/demos.mk
@@ -38,6 +38,10 @@ DEMOS_DEPENDENCIES += sdl jpeg-turbo
DEMOS_DEPENDENCIES += freescale-tools
endif
endif
+ ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE_USE_NEON),y)
+ DEMOS_DEPENDENCIES += bayer2rgb-neon
+ ARMADEUS-DEMOS_PARAMS = "NEON=yes"
+ endif
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_GPS),y)
diff --git a/target/demos/camera/capture/Makefile b/target/demos/camera/capture/Makefile
index 506b0e712..4f6c56d8b 100644
--- a/target/demos/camera/capture/Makefile
+++ b/target/demos/camera/capture/Makefile
@@ -9,11 +9,15 @@ STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(STAGING_DIR)/usr/bin/sdl-config --cflags)
#CFLAGS+=-Wall -g
-LDFLAGS= -lSDL -lpthread -lturbojpeg
+LDFLAGS = -lSDL -lpthread -lturbojpeg
ifeq ($(VPU),yes)
CFLAGS += -I$(STAGING_DIR)/usr/include/ -DUSE_VPU
LDFLAGS += -L$(STAGING_DIR)/usr/lib/ -lvpu
endif
+ifeq ($(NEON),yes)
+CFLAGS += -DUSE_NEON
+LDFLAGS += -lbayer2rgb3
+endif
EXEC= capture
SRC= capture.c csc.c
@@ -33,7 +37,7 @@ Q=@
all: $(EXEC)
$(EXEC): $(OBJ)
- @echo " LD $@"
+ @echo " LD $@ ($(LDFLAGS))"
$(Q)$(CC) -o $@ $^ $(LDFLAGS)
capture.o: capture.c vpu_codec.h
diff --git a/target/demos/camera/capture/capture.c b/target/demos/camera/capture/capture.c
index 94d1004b3..04aafb397 100644
--- a/target/demos/camera/capture/capture.c
+++ b/target/demos/camera/capture/capture.c
@@ -37,6 +37,10 @@
#include <linux/videodev2.h>
#include <SDL/SDL.h> /* TODO: make it compatible with Framebuffer only */
+#ifdef USE_NEON
+#include <bayer2rgb/bayer2rgb.h>
+#endif
+
#ifdef USE_VPU
#include "vpu_codec.h"
#endif
@@ -544,7 +548,51 @@ static void simple_bayer_to_rgb(void *bayer_src, int size, int line_size, int im
//fprintf(stdout, "%s: %d x %d\n", __func__, i, j);
}
+#ifdef USE_NEON
+struct x_image_in {
+ struct image_in image;
+ void const *memory;
+ size_t total_size;
+};
+struct x_image_out {
+ struct image_out image;
+ void const *memory;
+ size_t total_size;
+};
+
+static void neon_bayer_to_rgb(void *bayer_src, int size, int line_size, int img_pix_height, void *rgb_dst, int dst_bpp)
+{
+ struct image_in src;
+ struct image_out dst;
+
+ src = (struct image_in) {
+ .data = (uint8_t *)bayer_src,
+ .info = {
+ .bpp = 8,
+ .endian = BAYER_E_LITTLE,
+ .w = 640,
+ .h = 480,
+ .stride = line_size,
+ },
+ };
+ src.type = BAYER_BGGR;
+
+ dst = (struct image_out) {
+ .data = rgb_dst,
+ .quality = 0,
+ .info = {
+ .bpp = 32,
+ .w = 640,
+ .h = 480,
+ .stride = 640*4,
+ },
+ };
+ dst.quality = ~0ul;
+
+ bayer2rgb_convert_neon(&src, &dst, NULL);
+}
+#endif
static void simple_copy(void *yuv, int size, void* rgb)
{
@@ -572,7 +620,11 @@ static void process_image(/*const */void *pCaptured, int size)
} else if (mycamera.pixelformat == V4L2_PIX_FMT_JPEG) {
jpeg_to_rgb(mycamera.width, mycamera.height, image->pixels, (char *)pCaptured, size);
} else if (mycamera.pixelformat == V4L2_PIX_FMT_SRGGB8) {
+#ifdef USE_NEON
+ neon_bayer_to_rgb(pCaptured, mycamera.sizeimage, mycamera.width, mycamera.height, image->pixels, screen->format->BitsPerPixel);
+#else
simple_bayer_to_rgb(pCaptured, mycamera.sizeimage, mycamera.width, mycamera.height, image->pixels, screen->format->BitsPerPixel);
+#endif
} else if (mycamera.pixelformat == V4L2_PIX_FMT_SGRBG8) {
BAYERToRGB(&_GR8, &_BRG32,
(char *)pCaptured, image->pixels, mycamera.width, mycamera.height,
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-02-27 11:01: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 e23e21d2a8157993bd66fdd21c7cf75ca0a4340c (commit)
from 29d98ceb696c05511150b5b754a3d0773f125c63 (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 e23e21d2a8157993bd66fdd21c7cf75ca0a4340c
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Feb 27 12:00:45 2024 +0100
.gitlab-ci.yml: move build to build-merge-request
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b4070249..16401e9ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,16 +34,18 @@ stages:
- ARMADEUS_PLATFORM: [apf27, apf28, apf51, apf6, opos6ul, opos6ulnano, opos8mm-legacy-5.10]
timeout: 4h
-build:
+build-merge-request:
rules:
- - if: $CI_PIPELINE_SOURCE != "schedule"
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ when: manual
extends: .build_template
artifacts:
- name: "$ARMADEUS_PLATFORM-$CI_COMMIT_SHORT_SHA-build.log"
- when: on_failure
+ name: "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME-$ARMADEUS_PLATFORM-$CI_COMMIT_SHORT_SHA-images"
paths:
+ - output-images
- build.log
- expire_in: 1 week
+ when: always
+ expire_in: 3 days
build-nightly:
rules:
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-02-08 23:28: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 29d98ceb696c05511150b5b754a3d0773f125c63 (commit)
via 93e6b7572ef39b39d8fa439629533ba24cdff2c8 (commit)
via 0b3a6711844530be9222bfd9fdeffc15f426b74f (commit)
from 661aafd78004df2422a955a59230a2b206f997dc (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 29d98ceb696c05511150b5b754a3d0773f125c63
Author: Julien BOIBESSOT <jul...@ar...>
Date: Fri Feb 9 00:28:26 2024 +0100
[BUILDROOT] opos8mm-legacy-5.10_defconfig: add some missing useful packages
commit 93e6b7572ef39b39d8fa439629533ba24cdff2c8
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Feb 8 17:28:09 2024 +0100
[BUILD] help: legacy-5.10 is the default supported OPOS8MM config
commit 0b3a6711844530be9222bfd9fdeffc15f426b74f
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Feb 8 17:26:03 2024 +0100
[DEMOS] capture: add support for BAYER BGGR8 camera format
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
buildroot/configs/opos8mm-legacy-5.10_defconfig | 16 ++++++++++
target/demos/camera/capture/capture.c | 41 ++++++++++++++++++++++++-
3 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index cf59c60e8..fee1f37e4 100644
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ help:
@echo ' opos6ul_legacy_defconfig - get default config for an OPOS6UL+Dev kit (3.14 Freescale kernel)'
@echo ' opos6ulnano_defconfig - get default config for an OPOS6ULNANO+Dev kit (4.9+ mainline/vanilla kernel)'
@echo ' opos6ulsp_defconfig - get default config for an OPOS6ULSP+Dev kit (4.19+ mainline/vanilla kernel)'
- @echo ' opos8mm-legacy-5.4_defconfig - get default config for an OPOS8MM+Dev kit (5.4 NXP kernel)'
+ @echo ' opos8mm-legacy-5.10_defconfig - get default config for an OPOS8MM+Dev kit (5.10 NXP kernel)'
@echo ''
@echo 'Build:'
@echo ' all - make world '
diff --git a/buildroot/configs/opos8mm-legacy-5.10_defconfig b/buildroot/configs/opos8mm-legacy-5.10_defconfig
index d3472dc54..b5564119a 100644
--- a/buildroot/configs/opos8mm-legacy-5.10_defconfig
+++ b/buildroot/configs/opos8mm-legacy-5.10_defconfig
@@ -33,6 +33,8 @@ BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
BR2_PACKAGE_LINUX_TOOLS_GPIO=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_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_ALSACONF=y
BR2_PACKAGE_ALSA_UTILS_ACONNECT=y
@@ -71,6 +73,9 @@ BR2_PACKAGE_GST1_IMX2_G2D=y
BR2_PACKAGE_GST1_IMX2_VPU=y
BR2_PACKAGE_GST1_LIBAV=y
BR2_PACKAGE_GST1_RTSP_SERVER=y
+BR2_PACKAGE_V4L2GRAB=y
+BR2_PACKAGE_V4L2LOOPBACK=y
+BR2_PACKAGE_V4L2LOOPBACK_UTILS=y
BR2_PACKAGE_YAVTA=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
@@ -83,14 +88,19 @@ BR2_PACKAGE_TREE=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_ASCII_INVADERS=y
+BR2_PACKAGE_SL=y
BR2_PACKAGE_GLMARK2=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FBV=y
+BR2_PACKAGE_SDL_MIXER=y
+BR2_PACKAGE_SDL_NET=y
BR2_PACKAGE_MURATA_CYW_FW=y
BR2_PACKAGE_MURATA_CYW_FW_CYW43455=y
BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1MW=y
+BR2_PACKAGE_CPUBURN_ARM=y
BR2_PACKAGE_EVTEST=y
BR2_PACKAGE_FREESCALE_IMX=y
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y
@@ -105,8 +115,10 @@ BR2_PACKAGE_HWDATA_IAB_OUI_TXT=y
BR2_PACKAGE_HWDATA_PNP_IDS=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_LIBIMXDMABUFFER=y
+BR2_PACKAGE_PICOCOM=y
BR2_PACKAGE_SPI_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_USB_MODESWITCH=y
BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
BR2_PACKAGE_DTC=y
BR2_PACKAGE_DTC_PROGRAMS=y
@@ -118,6 +130,7 @@ BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_LIBIMXVPUAPI2=y
BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM=y
BR2_PACKAGE_LIBTIRPC=y
+BR2_PACKAGE_HAVEGED=y
BR2_PACKAGE_BLUEZ_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
@@ -131,9 +144,12 @@ BR2_PACKAGE_CAN_UTILS=y
BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DROPBEAR=y
BR2_PACKAGE_GESFTPSERVER=y
+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_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y
BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
diff --git a/target/demos/camera/capture/capture.c b/target/demos/camera/capture/capture.c
index 662004638..94d1004b3 100644
--- a/target/demos/camera/capture/capture.c
+++ b/target/demos/camera/capture/capture.c
@@ -510,6 +510,42 @@ static void jpeg_to_rgb(int desired_width, int desired_height,
return;
}
+static void simple_bayer_to_rgb(void *bayer_src, int size, int line_size, int img_pix_height, void *rgb_dst, int dst_bpp)
+{
+ Uint32 *dest32 = (Uint32*)rgb_dst;
+ Uint8 *src = (Uint8 *)bayer_src;
+ int i, j, pos = 0;
+ Uint8 R, G, B, A;
+ Uint16 pixel;
+ static int first_time = 1;
+
+ if (first_time) {
+ fprintf(stdout, "%s: image size %d line size %d\n", __func__, size, line_size);
+ first_time = 0;
+ }
+
+ if (dst_bpp == 32) {
+ for (j = 0; j < img_pix_height-1; j++) {
+ for (i = 0; i < line_size; i++) {
+ B = src[i + (j*line_size)];
+ G = src[i+1 + (j*line_size)];
+ R = src[i+1 + line_size + (j*line_size)];
+ *dest32++ = (R << 16) | (G << 8) | B;
+ i++;
+ B = src[i-1 + (j*line_size)];
+ G = src[i + (j*line_size)];
+ R = src[i + line_size + (j*line_size)];
+ *dest32++ = (R << 16) | (G << 8) | B;
+ }
+ }
+ } else {
+ fprintf(stdout, "%s: unsupported screen bpp (%d)\n", __func__, dst_bpp);
+ }
+ //fprintf(stdout, "%s: %d x %d\n", __func__, i, j);
+}
+
+
+
static void simple_copy(void *yuv, int size, void* rgb)
{
memcpy(rgb, yuv, size);
@@ -535,6 +571,8 @@ static void process_image(/*const */void *pCaptured, int size)
rgb565_to_rgb(pCaptured, mycamera.sizeimage, image->pixels, screen->format->BitsPerPixel);
} else if (mycamera.pixelformat == V4L2_PIX_FMT_JPEG) {
jpeg_to_rgb(mycamera.width, mycamera.height, image->pixels, (char *)pCaptured, size);
+ } else if (mycamera.pixelformat == V4L2_PIX_FMT_SRGGB8) {
+ simple_bayer_to_rgb(pCaptured, mycamera.sizeimage, mycamera.width, mycamera.height, image->pixels, screen->format->BitsPerPixel);
} else if (mycamera.pixelformat == V4L2_PIX_FMT_SGRBG8) {
BAYERToRGB(&_GR8, &_BRG32,
(char *)pCaptured, image->pixels, mycamera.width, mycamera.height,
@@ -1091,7 +1129,8 @@ static Uint32 get_a_supported_pix_fmt(void)
}
if ((fmtdesc.pixelformat == V4L2_PIX_FMT_RGB565) ||
(fmtdesc.pixelformat == V4L2_PIX_FMT_RGB32) ||
- (fmtdesc.pixelformat == V4L2_PIX_FMT_RGB24) ) {
+ (fmtdesc.pixelformat == V4L2_PIX_FMT_RGB24) ||
+ (fmtdesc.pixelformat == V4L2_PIX_FMT_SRGGB8) ) {
fprintf(stdout, "Using camera format %d (%c%c%c%c)\n", i, FOURCC_TO_STR(fmtdesc.pixelformat));
ret = fmtdesc.pixelformat;
goto end_of_fmt;
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-01-31 10:09: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 661aafd78004df2422a955a59230a2b206f997dc (commit)
from 15e5cbd41288cfa2b5c1de61bfc3ed9dcfa52425 (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 661aafd78004df2422a955a59230a2b206f997dc
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Jan 31 11:07:33 2024 +0100
.gitlab-ci.yml: build nightly
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1ace50f8..0b4070249 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,11 @@ stages:
matrix:
- ARMADEUS_PLATFORM: [apf27, apf28, apf51, apf6, opos6ul, opos6ulnano, opos8mm-legacy-5.10]
timeout: 4h
+
+build:
+ rules:
+ - if: $CI_PIPELINE_SOURCE != "schedule"
+ extends: .build_template
artifacts:
name: "$ARMADEUS_PLATFORM-$CI_COMMIT_SHORT_SHA-build.log"
when: on_failure
@@ -40,12 +45,7 @@ stages:
- build.log
expire_in: 1 week
-build:
- rules:
- - if: $CI_PIPELINE_SOURCE != "schedule"
- extends: .build_template
-
-build-weekly:
+build-nightly:
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
extends: .build_template
@@ -53,4 +53,6 @@ build-weekly:
name: "$ARMADEUS_PLATFORM-$CI_COMMIT_SHORT_SHA-images"
paths:
- output-images
- expire_in: 1 month
+ - build.log
+ when: always
+ expire_in: 3 days
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-01-15 16:15:12
|
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 65667395fd7a221920b623c71ad3a4e6ae96d895 (commit)
from 7401570584c9b232594ad9791508b8ba51e87318 (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 65667395fd7a221920b623c71ad3a4e6ae96d895
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jan 15 17:13:11 2024 +0100
[BUILDROOT] Bump BR to 2023.11.1
-----------------------------------------------------------------------
Summary of changes:
Makefile | 4 +-
.../424-package-tree-update-_SITE-URL.patch | 61 ----------------------
patches/buildroot/2023.11/cleanup_buildroot.sh | 2 -
3 files changed, 2 insertions(+), 65 deletions(-)
delete mode 100644 patches/buildroot/2023.11/424-package-tree-update-_SITE-URL.patch
diff --git a/Makefile b/Makefile
index 1d4619f2f..cf59c60e8 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,9 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2023.11
-BUILDROOT_MINOR_VERSION ?=
+BUILDROOT_MINOR_VERSION ?= 1
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
-BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION)-$(BUILDROOT_MINOR_VERSION)
+BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION)
endif
diff --git a/patches/buildroot/2023.11/424-package-tree-update-_SITE-URL.patch b/patches/buildroot/2023.11/424-package-tree-update-_SITE-URL.patch
deleted file mode 100644
index 2d56b1e9c..000000000
--- a/patches/buildroot/2023.11/424-package-tree-update-_SITE-URL.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From c66303eea3db1ae4c0737b435265132fa957a2b0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
- <seb...@ar...>
-Date: Tue, 12 Dec 2023 14:38:11 +0100
-Subject: [PATCH 1/1] package/tree: update _SITE URL
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The current TREE_SITE URL doesn't work anymore.
-Moreover the README states:
-"
-The main distribution site for tree is here:
-http://oldmanprogrammer.net/source.php?dir=projects/tree
-
-Backup GIT sites are:
-https://gitlab.com/OldManProgrammer/unix-tree
-https://github.com/Old-Man-Programmer/tree
-
-Old site for as long as it lasts:
-http://mama.indstate.edu/users/ice/tree/
-ftp://mama.indstate.edu/linux/tree/
-"
-
-Use http://oldmanprogrammer.net/tar/tree/ for TREE_SITE
-
-Signed-off-by: Sébastien Szymanski <seb...@ar...>
----
- package/tree/Config.in | 2 +-
- package/tree/tree.mk | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/package/tree/Config.in b/package/tree/Config.in
-index 234995f109f4..4821b5896095 100644
---- a/package/tree/Config.in
-+++ b/package/tree/Config.in
-@@ -7,7 +7,7 @@ config BR2_PACKAGE_TREE
- dircolors if the LS_COLORS environment variable is set and
- output is to tty.
-
-- http://mama.indstate.edu/users/ice/tree/
-+ http://oldmanprogrammer.net/source.php?dir=projects/tree
-
- comment "tree needs a toolchain w/ wchar"
- depends on !BR2_USE_WCHAR
-diff --git a/package/tree/tree.mk b/package/tree/tree.mk
-index 83a427b74d37..479a172a72b8 100644
---- a/package/tree/tree.mk
-+++ b/package/tree/tree.mk
-@@ -6,7 +6,7 @@
-
- TREE_VERSION = 2.1.1
- TREE_SOURCE = tree-$(TREE_VERSION).tgz
--TREE_SITE = http://mama.indstate.edu/users/ice/tree/src
-+TREE_SITE = http://oldmanprogrammer.net/tar/tree
- TREE_LICENSE = GPL-2.0+
- TREE_LICENSE_FILES = LICENSE
-
---
-2.41.0
-
diff --git a/patches/buildroot/2023.11/cleanup_buildroot.sh b/patches/buildroot/2023.11/cleanup_buildroot.sh
index 0a99a1c2f..999816294 100755
--- a/patches/buildroot/2023.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2023.11/cleanup_buildroot.sh
@@ -82,8 +82,6 @@ rm -rf buildroot/package/snes9x/snes9x.mk
rm -rf buildroot/package/thingerio/Config.in
rm -rf buildroot/package/thingerio/thingerio.hash
rm -rf buildroot/package/thingerio/thingerio.mk
-rm -rf buildroot/package/tree/Config.in
-rm -rf buildroot/package/tree/tree.mk
rm -rf buildroot/package/wpa_supplicant/Config.in
rm -rf buildroot/package/wpa_supplicant/wpa_supplicant.mk
rm -rf buildroot/package/xc3sprog/Config.in
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-12-18 13:10:19
|
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/u-boot".
The branch, armadeus-2024.01-opos93 has been updated
via b9b9bf5c59aba34cebea76a98cce3377979048d4 (commit)
from 46d14b3e2e5e1d4a6a261f725c34cbfad17649c0 (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 b9b9bf5c59aba34cebea76a98cce3377979048d4
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Dec 18 14:06:50 2023 +0100
net: phy: realtek: adapt for OPOS93
* disable Green Ethernet and EEE
* LED configuration
-----------------------------------------------------------------------
Summary of changes:
drivers/net/phy/realtek.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index 7e1036b227..31065ca46b 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -258,10 +258,23 @@ static int rtl8211f_config(struct phy_device *phydev)
phy_write(phydev, MDIO_DEVAD_NONE,
MIIM_RTL8211F_PAGE_SELECT, 0x0);
- /* Set green LED for Link, yellow LED for Active */
+ /* disable Green Ethernet */
+ phy_write(phydev, MDIO_DEVAD_NONE,
+ MIIM_RTL8211F_PAGE_SELECT, 0x0a43);
+ phy_write(phydev, MDIO_DEVAD_NONE, 0x1b, 0x8011);
+ phy_write(phydev, MDIO_DEVAD_NONE, 0x1c, 0x573f);
+ phy_write(phydev, MDIO_DEVAD_NONE,
+ MIIM_RTL8211F_PAGE_SELECT, 0x0);
+
+ /* disable EEE */
+ phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0x0);
+
phy_write(phydev, MDIO_DEVAD_NONE,
MIIM_RTL8211F_PAGE_SELECT, 0xd04);
- phy_write(phydev, MDIO_DEVAD_NONE, 0x10, 0x617f);
+ phy_write(phydev, MDIO_DEVAD_NONE, 0x10, 0x8110);
+
+ /* disable EEE LED */
+ phy_write(phydev, MDIO_DEVAD_NONE, 0x11, 0x0);
phy_write(phydev, MDIO_DEVAD_NONE,
MIIM_RTL8211F_PAGE_SELECT, 0x0);
hooks/post-receive
--
armadeus/u-boot
|
|
From: sszy <ss...@us...> - 2023-12-15 15:20:26
|
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/u-boot".
The branch, armadeus-2024.01-opos93 has been created
at 46d14b3e2e5e1d4a6a261f725c34cbfad17649c0 (commit)
- Log -----------------------------------------------------------------
commit 46d14b3e2e5e1d4a6a261f725c34cbfad17649c0
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jun 26 17:48:22 2023 +0200
Add OPOS93 and OPOS93Dev support
commit 0b98a0dd1f48bcde8a031898e2f6ad02ae1ab718
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Dec 15 11:24:06 2023 +0100
Makefile: pass -ansi option to cmd_gen_envp
Without the '-ansi' option, the 'linux' string in env. files is replaced
with the string '1 '. For example, in the
board/armadeus/opos6uldev/opos6uldev.env file,
kernelimg=opos6ul-linux.bin
becomes
kernelimg=opos6ul-1 .bin
in the include/generated/env.in.
That's because 'linux' is a System-specific Predefined Macros. [1]
Pass the '-ansi' option as suggested by the GCC documentation. [1]
Fix the two .env files using C++ comment style for their SPDX licence.
[1] https://gcc.gnu.org/onlinedocs/gcc-13.2.0/cpp/System-specific-Predefined-Macros.html
commit 84beb652eb55b90b92510b3c5c6ef9e3f289c009
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jun 23 10:12:04 2020 +0200
regulator: fixed: add .set_value
commit 31af41e8f9be941689d8102d50c57bc8564268fe
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jul 24 11:30:03 2023 +0200
usb: ehci-mx6: add i.MX93 support
commit 6e7e47e2dae352b3f21e3742eace488137145f5c
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jul 24 13:45:13 2023 +0200
arm: dts: imx93: add USB OTG nodes
i.MX93 has two USB OTG ports.
commit 5105c98f8887a948d375ef439c55fc466881e2cf
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jul 24 11:40:39 2023 +0200
arm: dts: imx93-evk: remove wrong eqos compatible string
The correct compatible string for i.MX93 variant of DWC EQoS MAC is now
"nxp,imx93-dwmac-eqos".
commit 28dbcd6e9439a29331f0121c9cec078b0e30a1b8
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Jul 26 18:28:55 2023 +0200
net: phy: realtek: Add support for RTL8211F(D)(I)-VD-CG
Add support for the RTL8211F(D)(I)-VD-CG PHY present on the i.MX93 EVK
board.
commit f5283be59156db7638b6192b9f55b1ad3293d0d2
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Jul 26 17:41:29 2023 +0200
net: dwc_eth_qos: Add board_interface_eth_init() for i.MX93
Add a common board_interface_eth_init() called by the DWC MAC driver to
setup the MAC <-> PHY interface according to the PHY mode obtained from
DT.
Remove the board-side configuration in the i.MX93 EVK files.
commit 8b2681cca5bbc178f0f4a452612d97233deff508
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jul 24 11:32:46 2023 +0200
net: dwc_eth_qos: add i.MX93 support
Add support for DWC EQoS MAC on i.MX93.
commit da55b73488c9bcd26be6bdca510e1ad6432336f0
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jul 24 12:47:37 2023 +0200
imx9: imx93_evk: don't call board_init_r
According to the REAMDME file, board_init_f must return normally and not
call board_init_r.
-----------------------------------------------------------------------
hooks/post-receive
--
armadeus/u-boot
|
|
From: sszy <ss...@us...> - 2023-12-13 09:53: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 7401570584c9b232594ad9791508b8ba51e87318 (commit)
from 60f6c9b694529ad1f764a6d4a720565fb50cca02 (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 7401570584c9b232594ad9791508b8ba51e87318
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Dec 13 10:39:40 2023 +0100
.gitlab-ci.yml: use rules:if instead of except/only
except/only are deprecated.
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13da20946..e1ace50f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,11 +2,9 @@
#
# Authors:
# kev...@ar...
+# seb...@ar...
#
-#workflow:
-# rules:
-# - if: $CI_PIPELINE_SOURCE == 'web'
-# - if: $CI_PIPELINE_SOURCE == 'schedule'
+
variables:
DOCKER_TLS_CERTDIR: "/certs"
@@ -43,13 +41,13 @@ stages:
expire_in: 1 week
build:
- except:
- - schedules
+ rules:
+ - if: $CI_PIPELINE_SOURCE != "schedule"
extends: .build_template
build-weekly:
- only:
- - schedules
+ rules:
+ - if: $CI_PIPELINE_SOURCE == "schedule"
extends: .build_template
artifacts:
name: "$ARMADEUS_PLATFORM-$CI_COMMIT_SHORT_SHA-images"
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-12-12 18:25:12
|
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 60f6c9b694529ad1f764a6d4a720565fb50cca02 (commit)
via 93c79b27498676e46ec81cbd393e8243d7965f97 (commit)
from 06d2e893315efacf51332eb1876ce04ce4dc33bc (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 60f6c9b694529ad1f764a6d4a720565fb50cca02
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Dec 12 19:23:24 2023 +0100
.gitlab-ci.yml: generate build.log when job fails
commit 93c79b27498676e46ec81cbd393e8243d7965f97
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Dec 12 14:52:48 2023 +0100
[BUILDROOT] 2023.11: patch to fix tree downloading
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 13 ++++-
.../424-package-tree-update-_SITE-URL.patch | 61 ++++++++++++++++++++++
patches/buildroot/2023.11/cleanup_buildroot.sh | 2 +
3 files changed, 75 insertions(+), 1 deletion(-)
create mode 100644 patches/buildroot/2023.11/424-package-tree-update-_SITE-URL.patch
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 986789f70..13da20946 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,12 +24,23 @@ stages:
- buildroot/downloads
script:
- make "$ARMADEUS_PLATFORM"_autoconf
- - make
+ - |
+ make > >(tee build.log |grep '>>>') 2>&1 || {
+ echo "Build failed"
+ tail -200 build.log
+ exit 1
+ }
- cp -r -L buildroot/output/images output-images
parallel:
matrix:
- ARMADEUS_PLATFORM: [apf27, apf28, apf51, apf6, opos6ul, opos6ulnano, opos8mm-legacy-5.10]
timeout: 4h
+ artifacts:
+ name: "$ARMADEUS_PLATFORM-$CI_COMMIT_SHORT_SHA-build.log"
+ when: on_failure
+ paths:
+ - build.log
+ expire_in: 1 week
build:
except:
diff --git a/patches/buildroot/2023.11/424-package-tree-update-_SITE-URL.patch b/patches/buildroot/2023.11/424-package-tree-update-_SITE-URL.patch
new file mode 100644
index 000000000..2d56b1e9c
--- /dev/null
+++ b/patches/buildroot/2023.11/424-package-tree-update-_SITE-URL.patch
@@ -0,0 +1,61 @@
+From c66303eea3db1ae4c0737b435265132fa957a2b0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Tue, 12 Dec 2023 14:38:11 +0100
+Subject: [PATCH 1/1] package/tree: update _SITE URL
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The current TREE_SITE URL doesn't work anymore.
+Moreover the README states:
+"
+The main distribution site for tree is here:
+http://oldmanprogrammer.net/source.php?dir=projects/tree
+
+Backup GIT sites are:
+https://gitlab.com/OldManProgrammer/unix-tree
+https://github.com/Old-Man-Programmer/tree
+
+Old site for as long as it lasts:
+http://mama.indstate.edu/users/ice/tree/
+ftp://mama.indstate.edu/linux/tree/
+"
+
+Use http://oldmanprogrammer.net/tar/tree/ for TREE_SITE
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/tree/Config.in | 2 +-
+ package/tree/tree.mk | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/tree/Config.in b/package/tree/Config.in
+index 234995f109f4..4821b5896095 100644
+--- a/package/tree/Config.in
++++ b/package/tree/Config.in
+@@ -7,7 +7,7 @@ config BR2_PACKAGE_TREE
+ dircolors if the LS_COLORS environment variable is set and
+ output is to tty.
+
+- http://mama.indstate.edu/users/ice/tree/
++ http://oldmanprogrammer.net/source.php?dir=projects/tree
+
+ comment "tree needs a toolchain w/ wchar"
+ depends on !BR2_USE_WCHAR
+diff --git a/package/tree/tree.mk b/package/tree/tree.mk
+index 83a427b74d37..479a172a72b8 100644
+--- a/package/tree/tree.mk
++++ b/package/tree/tree.mk
+@@ -6,7 +6,7 @@
+
+ TREE_VERSION = 2.1.1
+ TREE_SOURCE = tree-$(TREE_VERSION).tgz
+-TREE_SITE = http://mama.indstate.edu/users/ice/tree/src
++TREE_SITE = http://oldmanprogrammer.net/tar/tree
+ TREE_LICENSE = GPL-2.0+
+ TREE_LICENSE_FILES = LICENSE
+
+--
+2.41.0
+
diff --git a/patches/buildroot/2023.11/cleanup_buildroot.sh b/patches/buildroot/2023.11/cleanup_buildroot.sh
index 999816294..0a99a1c2f 100755
--- a/patches/buildroot/2023.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2023.11/cleanup_buildroot.sh
@@ -82,6 +82,8 @@ rm -rf buildroot/package/snes9x/snes9x.mk
rm -rf buildroot/package/thingerio/Config.in
rm -rf buildroot/package/thingerio/thingerio.hash
rm -rf buildroot/package/thingerio/thingerio.mk
+rm -rf buildroot/package/tree/Config.in
+rm -rf buildroot/package/tree/tree.mk
rm -rf buildroot/package/wpa_supplicant/Config.in
rm -rf buildroot/package/wpa_supplicant/wpa_supplicant.mk
rm -rf buildroot/package/xc3sprog/Config.in
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-10-16 16:18: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/u-boot".
The branch, opos6ul-2018.05 has been updated
via 27dbcd82ccfcf1d2e72b237176c0392f9a04754f (commit)
via c165aa831e10015680ab923f738c1f28adbb99b1 (commit)
via 7948e293a59f484397318bfb9b40d4dd2890ca90 (commit)
via f5ab41acbc02401210fddfbee1c34e96972190e2 (commit)
via 92980c03846bf97d307690200837cf29fec4472a (commit)
via 21ec8b0dd62cbd82932df5bc5b1be9e25d1400be (commit)
via add1e026f72969c57c93f265190d68fd0108bfb2 (commit)
via 2e1712740b7912fcc5fb94da879b263ccd3a20f2 (commit)
via 61639ff85eb12f29f20e0f6f80081a93cf5ac043 (commit)
from dd82cef7c8679adcbc1d1e5701e06e1735b02a22 (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 27dbcd82ccfcf1d2e72b237176c0392f9a04754f
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Oct 16 15:59:39 2023 +0200
opos6ul{,nano,sp}dev: use load instead of fatload
commit c165aa831e10015680ab923f738c1f28adbb99b1
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Oct 16 15:44:55 2023 +0200
opos6ul{,nano,sp}dev: load rootfs at 32KiB offset instead of 32MiB
commit 7948e293a59f484397318bfb9b40d4dd2890ca90
Author: Ye Li <ye...@nx...>
Date: Mon Mar 8 19:26:57 2021 -0800
usb: ehci-hcd: Add IAA handshake for removing async QH
According to EHCI spec, software needs to do handshake with HC for
safely removing QH from async list. This handshake is implemented by
setting IAAD (Interrupt on Async Advance Doorbell) bit in USB_USBCMD
register and poll the IAA (Interrupt on Async Advance bit) in the
USB_USBSTS to ensure the HC has released all on-chip state that may
potentially reference one of the data structures just removed.
Current codes only check active status of the last QTD, but this can't
ensure the QH is released from HC. We can meet unrecoverable
"EHCI timed out on TD" errors when running UEFI SCT tests on USB disk.
The USB_ASYNCLISTADDR register is changed to a invalid address when the
issue happens. It is fixed after adding the IAA handshake.
Steps to reproduce the issue:
1. Build the UEFI SCT from https://github.com/tianocore/edk2-test
2. Build the EDK2 UEFI Shell from https://github.com/tianocore/edk2
3. Copy SCT files and Shell.efi to USB disk FAT partition
4. Load the Shell.efi from USB FAT, and run bootefi to execute it
5. After booting into Shell, enter the SCT directory and run "sct -a"
to execute all tests.
6. Tests run about 1 hour and stop with many EHCI timeout errors like
EHCI timed out on TD - token=0x801f8c80
Signed-off-by: Ye Li <ye...@nx...>
(cherry picked from commit e1769da17ed339bc937d30c49176bc3664b261af)
commit f5ab41acbc02401210fddfbee1c34e96972190e2
Author: Marek Vasut <mar...@gm...>
Date: Mon Apr 6 14:29:44 2020 +0200
usb: Keep async schedule running only across mass storage xfers
Rather than keeping the asynchronous schedule running always, keep it
running only across USB mass storage transfers for now, as it seems
that keeping it running all the time interferes with certain control
transfers during device enumeration.
Note that running the async schedule all the time should not be an
issue, especially on EHCI HCD, as that one implements most of the
transfers using async schedule.
Note that we have usb_disable_asynch(), which however is utterly broken.
The usb_disable_asynch() blocks the USB core from doing async transfers
by setting a global flag. The async schedule should however be disabled
per USB controller. Moreover, setting a global flag does not prevent the
controller from using the async schedule, which e.g. the EHCI HCD does.
This patch implements additional callback to the controller, which
permits it to lock the async schedule and keep it running across
multiple transfers. Once the schedule is unlocked, it must also be
disabled. This thus prevents the async schedule from running outside
of the USB mass storage transfers.
Signed-off-by: Marek Vasut <mar...@gm...>
Cc: Lukasz Majewski <lu...@de...>
Cc: Tom Rini <tr...@ko...>
Tested-by: Tom Rini <tr...@ko...> [omap3_beagle, previously failing]
(cherry picked from commit 31232de07ef2bd97ff67625976eecd97eeb1bd3d)
commit 92980c03846bf97d307690200837cf29fec4472a
Author: Marek Vasut <mar...@gm...>
Date: Sun Oct 6 16:13:38 2019 +0200
usb: ehci-hcd: Keep async schedule running
Profiling the EHCI driver shows a significant performance problem in
ehci_submit_async(). Specifically, this function keeps enabling and
disabling async schedule back and forth for every single transaction.
However, enabling/disabling the async schedule does not take effect
immediatelly, but instead may take up to 1 mS (8 uFrames) to complete.
This impacts USB storage significantly, esp. since the recent reduction
of maximum transfer size to support more USB storage devices. This in
turn results in sharp increase in the number of ehci_submit_async()
calls. Since one USB storage BBB transfer does three such calls and
the maximum transfer size is 120 kiB, the overhead is 6 mS per 120 kiB,
which is unacceptable.
However, this overhead can be removed simply by keeping the async
schedule running. Specifically, the first transfer starts the async
schedule and then each and every subsequent transfer only adds a new
QH into that schedule, waits until the QH is completed and does NOT
disable the async schedule. The async schedule is stopped only by
shutting down the controller, which must happen before moving out
of U-Boot, otherwise the controller will corrupt memory.
Signed-off-by: Marek Vasut <mar...@gm...>
Cc: Bin Meng <bme...@gm...>
Cc: Simon Glass <sj...@ch...>
(cherry picked from commit 02b0e1a36c5bc20174299312556ec4e266872bd6)
commit 21ec8b0dd62cbd82932df5bc5b1be9e25d1400be
Author: Chris Packham <jud...@gm...>
Date: Thu Oct 4 20:03:53 2018 +1300
fsl/usb: Workaround for USB erratum-A005275
Workaround makes FS as default mode on all affected socs.
Add support to check erratum-A005275 validity for an soc. This info is
required to determine whether a given soc is affected by this erratum.
Add quirk for this erratum "has_fsl_erratum_a005275" . This quirk is used
to enable workaround for the errata
Force FS mode as default by:
- making EPS as FS
- setting PFSC bit to disable HS chirping
This workaround can be disabled by mentioning "no_erratum_a005275" in
hwconfig string
Signed-off-by: Chris Packham <jud...@gm...>
Reviewed-by: York Sun <yor...@nx...>
(cherry picked from commit 4eaf7f525a0874a1eff0f5666004896cc5c89fa3)
commit add1e026f72969c57c93f265190d68fd0108bfb2
Author: Marek Vasut <mar...@gm...>
Date: Wed Aug 8 14:29:55 2018 +0200
usb: ehci: Make the PHY handling generic
Pull out the EHCI PHY functions into the ehci-hcd.c to let other
EHCI drivers use them.
Signed-off-by: Marek Vasut <mar...@gm...>
(cherry picked from commit b43cdf9b3fe246a8920d2b62ee41fc1722315ef0)
commit 2e1712740b7912fcc5fb94da879b263ccd3a20f2
Author: Marek Vasut <mar...@gm...>
Date: Sat Oct 5 19:18:38 2019 +0200
usb: storage: Only clear READY flag on error
Clear the USB_READY flag in the storage driver only in case there
is an error, otherwise usb_stor_BBB_transport() waits 5 mS before
doing anything every single time.
This is because the USB_READY flag is only ever set in
usb_test_unit_ready(), which is called only upon storage device
probe, not between each and every request. However, the device
cannot move out of USB_READY state once it was initialized.
Signed-off-by: Marek Vasut <mar...@gm...>
Cc: Bin Meng <bme...@gm...>
Cc: Simon Glass <sj...@ch...>
(cherry picked from commit da3d1c499fbb7cfe1c1dc1bc47699a2f30df4384)
commit 61639ff85eb12f29f20e0f6f80081a93cf5ac043
Author: Marek Vasut <mar...@gm...>
Date: Mon Sep 16 00:16:25 2019 +0200
usb: storage: Limit transfer size to 120 kiB
Due to constant influx of more and more weird and broken USB sticks,
do as Linux does in commit 779b457f66e10de3471479373463b27fd308dc85
usb: storage: scsiglue: further describe our 240 sector limit
Just so we have some sort of documentation as to why
we limit our Mass Storage transfers to 240 sectors,
let's update the comment to make clearer that
devices were found that would choke with larger
transfers.
While at that, also make sure to clarify that other
operating systems have similar, albeit different,
limits on mass storage transfers.
And reduce the maximum transfer length of USB storage to 120 kiB.
Signed-off-by: Marek Vasut <mar...@gm...>
Reviewed-by: Bin Meng <bme...@gm...>
Cc: Bin Meng <bme...@gm...>
Cc: Simon Glass <sj...@ch...>
(cherry picked from commit 7d6fd7f0ba71cd93d94079132f958d9630f27a89)
-----------------------------------------------------------------------
Summary of changes:
arch/powerpc/cpu/mpc85xx/Kconfig | 8 ++
arch/powerpc/cpu/mpc85xx/cmd_errata.c | 4 +
common/usb.c | 6 +
common/usb_storage.c | 53 ++++----
drivers/usb/common/fsl-errata.c | 28 +++++
drivers/usb/host/ehci-fsl.c | 7 ++
drivers/usb/host/ehci-generic.c | 56 +--------
drivers/usb/host/ehci-hcd.c | 223 +++++++++++++++++++++++++++++-----
drivers/usb/host/ehci.h | 11 ++
drivers/usb/host/usb-uclass.c | 11 ++
include/configs/opos6uldev.h | 15 +--
include/fsl_usb.h | 1 +
include/usb.h | 11 ++
13 files changed, 317 insertions(+), 117 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 19e8d02bf4..ea347ad474 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -659,6 +659,7 @@ config ARCH_P1010
select SYS_FSL_ERRATUM_A004477
select SYS_FSL_ERRATUM_A004508
select SYS_FSL_ERRATUM_A005125
+ select SYS_FSL_ERRATUM_A005275
select SYS_FSL_ERRATUM_A006261
select SYS_FSL_ERRATUM_A007075
select SYS_FSL_ERRATUM_ESDHC111
@@ -821,6 +822,7 @@ config ARCH_P2041
select FSL_LAW
select SYS_FSL_ERRATUM_A004510
select SYS_FSL_ERRATUM_A004849
+ select SYS_FSL_ERRATUM_A005275
select SYS_FSL_ERRATUM_A006261
select SYS_FSL_ERRATUM_CPU_A003999
select SYS_FSL_ERRATUM_DDR_A003
@@ -845,6 +847,7 @@ config ARCH_P3041
select SYS_FSL_DDR_VER_44
select SYS_FSL_ERRATUM_A004510
select SYS_FSL_ERRATUM_A004849
+ select SYS_FSL_ERRATUM_A005275
select SYS_FSL_ERRATUM_A005812
select SYS_FSL_ERRATUM_A006261
select SYS_FSL_ERRATUM_CPU_A003999
@@ -910,6 +913,7 @@ config ARCH_P5020
select FSL_LAW
select SYS_FSL_DDR_VER_44
select SYS_FSL_ERRATUM_A004510
+ select SYS_FSL_ERRATUM_A005275
select SYS_FSL_ERRATUM_A006261
select SYS_FSL_ERRATUM_DDR_A003
select SYS_FSL_ERRATUM_DDR_A003474
@@ -935,6 +939,7 @@ config ARCH_P5040
select SYS_FSL_DDR_VER_44
select SYS_FSL_ERRATUM_A004510
select SYS_FSL_ERRATUM_A004699
+ select SYS_FSL_ERRATUM_A005275
select SYS_FSL_ERRATUM_A005812
select SYS_FSL_ERRATUM_A006261
select SYS_FSL_ERRATUM_DDR_A003
@@ -1299,6 +1304,9 @@ config SYS_FSL_ERRATUM_A005812
config SYS_FSL_ERRATUM_A005871
bool
+config SYS_FSL_ERRATUM_A005275
+ bool
+
config SYS_FSL_ERRATUM_A006261
bool
diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index eda2e7e63d..e455d8baf5 100644
--- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c
+++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
@@ -307,6 +307,10 @@ static int do_errata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
(SVR_REV(svr) <= CONFIG_SYS_FSL_A004447_SVR_REV))
puts("Work-around for Erratum I2C-A004447 enabled\n");
#endif
+#ifdef CONFIG_SYS_FSL_ERRATUM_A005275
+ if (has_erratum_a005275())
+ puts("Work-around for Erratum A005275 enabled\n");
+#endif
#ifdef CONFIG_SYS_FSL_ERRATUM_A006261
if (has_erratum_a006261())
puts("Work-around for Erratum A006261 enabled\n");
diff --git a/common/usb.c b/common/usb.c
index 78178c54c8..2b8b01a7c3 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -171,6 +171,12 @@ int usb_detect_change(void)
return change;
}
+/* Lock or unlock async schedule on the controller */
+__weak int usb_lock_async(struct usb_device *dev, int lock)
+{
+ return 0;
+}
+
/*
* disables the asynch behaviour of the control message. This is used for data
* transfers that uses the exclusiv access to the control and bulk messages.
diff --git a/common/usb_storage.c b/common/usb_storage.c
index 9cd64744f8..722097ced6 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -941,31 +941,32 @@ do_retry:
static void usb_stor_set_max_xfer_blk(struct usb_device *udev,
struct us_data *us)
{
- unsigned short blk;
- size_t __maybe_unused size;
- int __maybe_unused ret;
-
-#ifndef CONFIG_DM_USB
-#ifdef CONFIG_USB_EHCI_HCD
/*
- * The U-Boot EHCI driver can handle any transfer length as long as
- * there is enough free heap space left, but the SCSI READ(10) and
- * WRITE(10) commands are limited to 65535 blocks.
+ * Limit the total size of a transfer to 120 KB.
+ *
+ * Some devices are known to choke with anything larger. It seems like
+ * the problem stems from the fact that original IDE controllers had
+ * only an 8-bit register to hold the number of sectors in one transfer
+ * and even those couldn't handle a full 256 sectors.
+ *
+ * Because we want to make sure we interoperate with as many devices as
+ * possible, we will maintain a 240 sector transfer size limit for USB
+ * Mass Storage devices.
+ *
+ * Tests show that other operating have similar limits with Microsoft
+ * Windows 7 limiting transfers to 128 sectors for both USB2 and USB3
+ * and Apple Mac OS X 10.11 limiting transfers to 256 sectors for USB2
+ * and 2048 for USB3 devices.
*/
- blk = USHRT_MAX;
-#else
- blk = 20;
-#endif
-#else
+ unsigned short blk = 240;
+
+#if CONFIG_IS_ENABLED(DM_USB)
+ size_t size;
+ int ret;
+
ret = usb_get_max_xfer_size(udev, (size_t *)&size);
- if (ret < 0) {
- /* unimplemented, let's use default 20 */
- blk = 20;
- } else {
- if (size > USHRT_MAX * 512)
- size = USHRT_MAX * 512;
+ if ((ret >= 0) && (size < blk * 512))
blk = size / 512;
- }
#endif
us->max_xfer_blk = blk;
@@ -1159,6 +1160,7 @@ static unsigned long usb_stor_read(struct blk_desc *block_dev, lbaint_t blknr,
ss = (struct us_data *)udev->privptr;
usb_disable_asynch(1); /* asynch transfer not allowed */
+ usb_lock_async(udev, 1);
srb->lun = block_dev->lun;
buf_addr = (uintptr_t)buffer;
start = blknr;
@@ -1182,6 +1184,7 @@ retry_it:
srb->pdata = (unsigned char *)buf_addr;
if (usb_read_10(srb, ss, start, smallblks)) {
debug("Read ERROR\n");
+ ss->flags &= ~USB_READY;
usb_request_sense(srb, ss);
if (retry--)
goto retry_it;
@@ -1192,12 +1195,12 @@ retry_it:
blks -= smallblks;
buf_addr += srb->datalen;
} while (blks != 0);
- ss->flags &= ~USB_READY;
debug("usb_read: end startblk " LBAF
", blccnt %x buffer %" PRIxPTR "\n",
start, smallblks, buf_addr);
+ usb_lock_async(udev, 0);
usb_disable_asynch(0); /* asynch transfer allowed */
if (blkcnt >= ss->max_xfer_blk)
debug("\n");
@@ -1242,6 +1245,7 @@ static unsigned long usb_stor_write(struct blk_desc *block_dev, lbaint_t blknr,
ss = (struct us_data *)udev->privptr;
usb_disable_asynch(1); /* asynch transfer not allowed */
+ usb_lock_async(udev, 1);
srb->lun = block_dev->lun;
buf_addr = (uintptr_t)buffer;
@@ -1268,6 +1272,7 @@ retry_it:
srb->pdata = (unsigned char *)buf_addr;
if (usb_write_10(srb, ss, start, smallblks)) {
debug("Write ERROR\n");
+ ss->flags &= ~USB_READY;
usb_request_sense(srb, ss);
if (retry--)
goto retry_it;
@@ -1278,11 +1283,11 @@ retry_it:
blks -= smallblks;
buf_addr += srb->datalen;
} while (blks != 0);
- ss->flags &= ~USB_READY;
debug("usb_write: end startblk " LBAF ", blccnt %x buffer %"
PRIxPTR "\n", start, smallblks, buf_addr);
+ usb_lock_async(udev, 0);
usb_disable_asynch(0); /* asynch transfer allowed */
if (blkcnt >= ss->max_xfer_blk)
debug("\n");
@@ -1473,10 +1478,10 @@ int usb_stor_get_info(struct usb_device *dev, struct us_data *ss,
memset(pccb->pdata, 0, 8);
if (usb_read_capacity(pccb, ss) != 0) {
printf("READ_CAP ERROR\n");
+ ss->flags &= ~USB_READY;
cap[0] = 2880;
cap[1] = 0x200;
}
- ss->flags &= ~USB_READY;
debug("Read Capacity returns: 0x%08x, 0x%08x\n", cap[0], cap[1]);
#if 0
if (cap[0] > (0x200000 * 10)) /* greater than 10 GByte */
diff --git a/drivers/usb/common/fsl-errata.c b/drivers/usb/common/fsl-errata.c
index 386130d7a1..9eb1d23067 100644
--- a/drivers/usb/common/fsl-errata.c
+++ b/drivers/usb/common/fsl-errata.c
@@ -6,6 +6,7 @@
*/
#include <common.h>
+#include <hwconfig.h>
#include <fsl_errata.h>
#include<fsl_usb.h>
#if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
@@ -44,6 +45,33 @@ bool has_dual_phy(void)
return false;
}
+bool has_erratum_a005275(void)
+{
+ u32 svr = get_svr();
+ u32 soc = SVR_SOC_VER(svr);
+
+ if (hwconfig("no_erratum_a005275"))
+ return false;
+
+ switch (soc) {
+#ifdef CONFIG_PPC
+ case SVR_P3041:
+ case SVR_P2041:
+ case SVR_P2040:
+ return IS_SVR_REV(svr, 1, 0) || IS_SVR_REV(svr, 1, 1);
+ case SVR_P5010:
+ case SVR_P5020:
+ case SVR_P5021:
+ return IS_SVR_REV(svr, 1, 0) || IS_SVR_REV(svr, 2, 0);
+ case SVR_P5040:
+ case SVR_P1010:
+ return IS_SVR_REV(svr, 1, 0);
+#endif
+ }
+
+ return false;
+}
+
bool has_erratum_a006261(void)
{
u32 svr = get_svr();
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index a04f6a31c8..a8fb2b8ac3 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -93,6 +93,7 @@ static int ehci_fsl_probe(struct udevice *dev)
struct usb_ehci *ehci = NULL;
struct ehci_hccr *hccr;
struct ehci_hcor *hcor;
+ struct ehci_ctrl *ehci_ctrl = &priv->ehci;
/*
* Get the base address for EHCI controller from the device node
@@ -107,6 +108,8 @@ static int ehci_fsl_probe(struct udevice *dev)
hcor = (struct ehci_hcor *)
((void *)hccr + HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
+ ehci_ctrl->has_fsl_erratum_a005275 = has_erratum_a005275();
+
if (ehci_fsl_init(priv, ehci, hccr, hcor) < 0)
return -ENXIO;
@@ -145,6 +148,8 @@ U_BOOT_DRIVER(ehci_fsl) = {
int ehci_hcd_init(int index, enum usb_init_type init,
struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{
+ struct ehci_ctrl *ehci_ctrl = container_of(hccr,
+ struct ehci_ctrl, hccr);
struct usb_ehci *ehci = NULL;
switch (index) {
@@ -163,6 +168,8 @@ int ehci_hcd_init(int index, enum usb_init_type init,
*hcor = (struct ehci_hcor *)((uint32_t) *hccr +
HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
+ ehci_ctrl->has_fsl_erratum_a005275 = has_erratum_a005275();
+
return ehci_fsl_init(index, ehci, *hccr, *hcor);
}
diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c
index 5a56f66cfa..cc2f33826a 100644
--- a/drivers/usb/host/ehci-generic.c
+++ b/drivers/usb/host/ehci-generic.c
@@ -26,56 +26,6 @@ struct generic_ehci {
int reset_count;
};
-static int ehci_setup_phy(struct udevice *dev, int index)
-{
- struct generic_ehci *priv = dev_get_priv(dev);
- int ret;
-
- ret = generic_phy_get_by_index(dev, index, &priv->phy);
- if (ret) {
- if (ret != -ENOENT) {
- dev_err(dev, "failed to get usb phy\n");
- return ret;
- }
- } else {
- ret = generic_phy_init(&priv->phy);
- if (ret) {
- dev_err(dev, "failed to init usb phy\n");
- return ret;
- }
-
- ret = generic_phy_power_on(&priv->phy);
- if (ret) {
- dev_err(dev, "failed to power on usb phy\n");
- return generic_phy_exit(&priv->phy);
- }
- }
-
- return 0;
-}
-
-static int ehci_shutdown_phy(struct udevice *dev)
-{
- struct generic_ehci *priv = dev_get_priv(dev);
- int ret = 0;
-
- if (generic_phy_valid(&priv->phy)) {
- ret = generic_phy_power_off(&priv->phy);
- if (ret) {
- dev_err(dev, "failed to power off usb phy\n");
- return ret;
- }
-
- ret = generic_phy_exit(&priv->phy);
- if (ret) {
- dev_err(dev, "failed to power off usb phy\n");
- return ret;
- }
- }
-
- return 0;
-}
-
static int ehci_usb_probe(struct udevice *dev)
{
struct generic_ehci *priv = dev_get_priv(dev);
@@ -145,7 +95,7 @@ static int ehci_usb_probe(struct udevice *dev)
}
}
- err = ehci_setup_phy(dev, 0);
+ err = ehci_setup_phy(dev, &priv->phy, 0);
if (err)
goto reset_err;
@@ -160,7 +110,7 @@ static int ehci_usb_probe(struct udevice *dev)
return 0;
phy_err:
- ret = ehci_shutdown_phy(dev);
+ ret = ehci_shutdown_phy(dev, &priv->phy);
if (ret)
dev_err(dev, "failed to shutdown usb phy\n");
@@ -185,7 +135,7 @@ static int ehci_usb_remove(struct udevice *dev)
if (ret)
return ret;
- ret = ehci_shutdown_phy(dev);
+ ret = ehci_shutdown_phy(dev, &priv->phy);
if (ret)
return ret;
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 663f748ffc..7d2d72f1fc 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -296,6 +296,73 @@ static void ehci_update_endpt2_dev_n_port(struct usb_device *udev,
QH_ENDPT2_HUBADDR(hubaddr));
}
+static int ehci_enable_async(struct ehci_ctrl *ctrl)
+{
+ u32 cmd;
+ int ret;
+
+ /* Enable async. schedule. */
+ cmd = ehci_readl(&ctrl->hcor->or_usbcmd);
+ if (cmd & CMD_ASE)
+ return 0;
+
+ cmd |= CMD_ASE;
+ ehci_writel(&ctrl->hcor->or_usbcmd, cmd);
+
+ ret = handshake((uint32_t *)&ctrl->hcor->or_usbsts, STS_ASS, STS_ASS,
+ 100 * 1000);
+ if (ret < 0)
+ printf("EHCI fail timeout STS_ASS set\n");
+
+ return ret;
+}
+
+static int ehci_disable_async(struct ehci_ctrl *ctrl)
+{
+ u32 cmd;
+ int ret;
+
+ if (ctrl->async_locked)
+ return 0;
+
+ /* Disable async schedule. */
+ cmd = ehci_readl(&ctrl->hcor->or_usbcmd);
+ if (!(cmd & CMD_ASE))
+ return 0;
+
+ cmd &= ~CMD_ASE;
+ ehci_writel(&ctrl->hcor->or_usbcmd, cmd);
+
+ ret = handshake((uint32_t *)&ctrl->hcor->or_usbsts, STS_ASS, 0,
+ 100 * 1000);
+ if (ret < 0)
+ printf("EHCI fail timeout STS_ASS reset\n");
+
+ return ret;
+}
+
+static int ehci_iaa_cycle(struct ehci_ctrl *ctrl)
+{
+ u32 cmd, status;
+ int ret;
+
+ /* Enable Interrupt on Async Advance Doorbell. */
+ cmd = ehci_readl(&ctrl->hcor->or_usbcmd);
+ cmd |= CMD_IAAD;
+ ehci_writel(&ctrl->hcor->or_usbcmd, cmd);
+
+ ret = handshake(&ctrl->hcor->or_usbsts, STS_IAA, STS_IAA,
+ 10 * 1000); /* 10ms timeout */
+ if (ret < 0)
+ printf("EHCI fail timeout STS_IAA set\n");
+
+ status = ehci_readl(&ctrl->hcor->or_usbsts);
+ if (status & STS_IAA)
+ ehci_writel(&ctrl->hcor->or_usbsts, STS_IAA);
+
+ return ret;
+}
+
static int
ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
int length, struct devrequest *req)
@@ -307,9 +374,8 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
volatile struct qTD *vtd;
unsigned long ts;
uint32_t *tdp;
- uint32_t endpt, maxpacket, token, usbsts;
+ uint32_t endpt, maxpacket, token, usbsts, qhtoken;
uint32_t c, toggle;
- uint32_t cmd;
int timeout;
int ret = 0;
struct ehci_ctrl *ctrl = ehci_get_ctrl(dev);
@@ -409,9 +475,15 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
endpt = QH_ENDPT1_RL(8) | QH_ENDPT1_C(c) |
QH_ENDPT1_MAXPKTLEN(maxpacket) | QH_ENDPT1_H(0) |
QH_ENDPT1_DTC(QH_ENDPT1_DTC_DT_FROM_QTD) |
- QH_ENDPT1_EPS(ehci_encode_speed(dev->speed)) |
QH_ENDPT1_ENDPT(usb_pipeendpoint(pipe)) | QH_ENDPT1_I(0) |
QH_ENDPT1_DEVADDR(usb_pipedevice(pipe));
+
+ /* Force FS for fsl HS quirk */
+ if (!ctrl->has_fsl_erratum_a005275)
+ endpt |= QH_ENDPT1_EPS(ehci_encode_speed(dev->speed));
+ else
+ endpt |= QH_ENDPT1_EPS(ehci_encode_speed(QH_FULL_SPEED));
+
qh->qh_endpt1 = cpu_to_hc32(endpt);
endpt = QH_ENDPT2_MULT(1) | QH_ENDPT2_UFCMASK(0) | QH_ENDPT2_UFSMASK(0);
qh->qh_endpt2 = cpu_to_hc32(endpt);
@@ -545,23 +617,12 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
flush_dcache_range((unsigned long)qtd,
ALIGN_END_ADDR(struct qTD, qtd, qtd_count));
- /* Set async. queue head pointer. */
- ehci_writel(&ctrl->hcor->or_asynclistaddr, virt_to_phys(&ctrl->qh_list));
-
usbsts = ehci_readl(&ctrl->hcor->or_usbsts);
ehci_writel(&ctrl->hcor->or_usbsts, (usbsts & 0x3f));
- /* Enable async. schedule. */
- cmd = ehci_readl(&ctrl->hcor->or_usbcmd);
- cmd |= CMD_ASE;
- ehci_writel(&ctrl->hcor->or_usbcmd, cmd);
-
- ret = handshake((uint32_t *)&ctrl->hcor->or_usbsts, STS_ASS, STS_ASS,
- 100 * 1000);
- if (ret < 0) {
- printf("EHCI fail timeout STS_ASS set\n");
+ ret = ehci_enable_async(ctrl);
+ if (ret)
goto fail;
- }
/* Wait for TDs to be processed. */
ts = get_timer(0);
@@ -581,6 +642,16 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
break;
WATCHDOG_RESET();
} while (get_timer(ts) < timeout);
+ qhtoken = hc32_to_cpu(qh->qh_overlay.qt_token);
+
+ ctrl->qh_list.qh_link = cpu_to_hc32(virt_to_phys(&ctrl->qh_list) | QH_LINK_TYPE_QH);
+ flush_dcache_range((unsigned long)&ctrl->qh_list,
+ ALIGN_END_ADDR(struct QH, &ctrl->qh_list, 1));
+
+ /* Set IAAD, poll IAA */
+ ret = ehci_iaa_cycle(ctrl);
+ if (ret)
+ goto fail;
/*
* Invalidate the memory area occupied by buffer
@@ -599,25 +670,16 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
if (QT_TOKEN_GET_STATUS(token) & QT_TOKEN_STATUS_ACTIVE)
printf("EHCI timed out on TD - token=%#x\n", token);
- /* Disable async schedule. */
- cmd = ehci_readl(&ctrl->hcor->or_usbcmd);
- cmd &= ~CMD_ASE;
- ehci_writel(&ctrl->hcor->or_usbcmd, cmd);
-
- ret = handshake((uint32_t *)&ctrl->hcor->or_usbsts, STS_ASS, 0,
- 100 * 1000);
- if (ret < 0) {
- printf("EHCI fail timeout STS_ASS reset\n");
+ ret = ehci_disable_async(ctrl);
+ if (ret)
goto fail;
- }
- token = hc32_to_cpu(qh->qh_overlay.qt_token);
- if (!(QT_TOKEN_GET_STATUS(token) & QT_TOKEN_STATUS_ACTIVE)) {
- debug("TOKEN=%#x\n", token);
- switch (QT_TOKEN_GET_STATUS(token) &
+ if (!(QT_TOKEN_GET_STATUS(qhtoken) & QT_TOKEN_STATUS_ACTIVE)) {
+ debug("TOKEN=%#x\n", qhtoken);
+ switch (QT_TOKEN_GET_STATUS(qhtoken) &
~(QT_TOKEN_STATUS_SPLITXSTATE | QT_TOKEN_STATUS_PERR)) {
case 0:
- toggle = QT_TOKEN_GET_DT(token);
+ toggle = QT_TOKEN_GET_DT(qhtoken);
usb_settoggle(dev, usb_pipeendpoint(pipe),
usb_pipeout(pipe), toggle);
dev->status = 0;
@@ -635,11 +697,11 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
break;
default:
dev->status = USB_ST_CRC_ERR;
- if (QT_TOKEN_GET_STATUS(token) & QT_TOKEN_STATUS_HALTED)
+ if (QT_TOKEN_GET_STATUS(qhtoken) & QT_TOKEN_STATUS_HALTED)
dev->status |= USB_ST_STALLED;
break;
}
- dev->act_len = length - QT_TOKEN_GET_TOTALBYTES(token);
+ dev->act_len = length - QT_TOKEN_GET_TOTALBYTES(qhtoken);
} else {
dev->act_len = 0;
#ifndef CONFIG_USB_EHCI_FARADAY
@@ -832,6 +894,10 @@ static int ehci_submit_root(struct usb_device *dev, unsigned long pipe,
} else {
int ret;
+ /* Disable chirp for HS erratum */
+ if (ctrl->has_fsl_erratum_a005275)
+ reg |= PORTSC_FSL_PFSC;
+
reg |= EHCI_PS_PR;
reg &= ~EHCI_PS_PE;
ehci_writel(status_reg, reg);
@@ -1508,6 +1574,16 @@ static int _ehci_submit_int_msg(struct usb_device *dev, unsigned long pipe,
return result;
}
+static int _ehci_lock_async(struct ehci_ctrl *ctrl, int lock)
+{
+ ctrl->async_locked = lock;
+
+ if (lock)
+ return 0;
+
+ return ehci_disable_async(ctrl);
+}
+
#ifndef CONFIG_DM_USB
int submit_bulk_msg(struct usb_device *dev, unsigned long pipe,
void *buffer, int length)
@@ -1544,6 +1620,13 @@ int destroy_int_queue(struct usb_device *dev, struct int_queue *queue)
{
return _ehci_destroy_int_queue(dev, queue);
}
+
+int usb_lock_async(struct usb_device *dev, int lock)
+{
+ struct ehci_ctrl *ctrl = ehci_get_ctrl(dev);
+
+ return _ehci_lock_async(ctrl, lock);
+}
#endif
#ifdef CONFIG_DM_USB
@@ -1606,6 +1689,13 @@ static int ehci_get_max_xfer_size(struct udevice *dev, size_t *size)
return 0;
}
+static int ehci_lock_async(struct udevice *dev, int lock)
+{
+ struct ehci_ctrl *ctrl = dev_get_priv(dev);
+
+ return _ehci_lock_async(ctrl, lock);
+}
+
int ehci_register(struct udevice *dev, struct ehci_hccr *hccr,
struct ehci_hcor *hcor, const struct ehci_ops *ops,
uint tweaks, enum usb_init_type init)
@@ -1672,6 +1762,73 @@ struct dm_usb_ops ehci_usb_ops = {
.poll_int_queue = ehci_poll_int_queue,
.destroy_int_queue = ehci_destroy_int_queue,
.get_max_xfer_size = ehci_get_max_xfer_size,
+ .lock_async = ehci_lock_async,
};
#endif
+
+#ifdef CONFIG_PHY
+int ehci_setup_phy(struct udevice *dev, struct phy *phy, int index)
+{
+ int ret;
+
+ if (!phy)
+ return 0;
+
+ ret = generic_phy_get_by_index(dev, index, phy);
+ if (ret) {
+ if (ret != -ENOENT) {
+ dev_err(dev, "failed to get usb phy\n");
+ return ret;
+ }
+ } else {
+ ret = generic_phy_init(phy);
+ if (ret) {
+ dev_err(dev, "failed to init usb phy\n");
+ return ret;
+ }
+
+ ret = generic_phy_power_on(phy);
+ if (ret) {
+ dev_err(dev, "failed to power on usb phy\n");
+ return generic_phy_exit(phy);
+ }
+ }
+
+ return 0;
+}
+
+int ehci_shutdown_phy(struct udevice *dev, struct phy *phy)
+{
+ int ret = 0;
+
+ if (!phy)
+ return 0;
+
+ if (generic_phy_valid(phy)) {
+ ret = generic_phy_power_off(phy);
+ if (ret) {
+ dev_err(dev, "failed to power off usb phy\n");
+ return ret;
+ }
+
+ ret = generic_phy_exit(phy);
+ if (ret) {
+ dev_err(dev, "failed to power off usb phy\n");
+ return ret;
+ }
+ }
+
+ return 0;
+}
+#else
+int ehci_setup_phy(struct udevice *dev, struct phy *phy, int index)
+{
+ return 0;
+}
+
+int ehci_shutdown_phy(struct udevice *dev, struct phy *phy)
+{
+ return 0;
+}
+#endif
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 07de472f91..83d1da9372 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -8,7 +8,9 @@
#ifndef USB_EHCI_H
#define USB_EHCI_H
+#include <stdbool.h>
#include <usb.h>
+#include <generic-phy.h>
/* Section 2.2.3 - N_PORTS */
#define MAX_HC_PORTS 15
@@ -42,6 +44,7 @@ struct ehci_hcor {
#define STS_ASS (1 << 15)
#define STS_PSS (1 << 14)
#define STS_HALT (1 << 12)
+#define STS_IAA (1 << 5)
uint32_t or_usbintr;
#define INTR_UE (1 << 0) /* USB interrupt enable */
#define INTR_UEE (1 << 1) /* USB error interrupt enable */
@@ -65,6 +68,8 @@ struct ehci_hcor {
#define PORTSC_PSPD_FS 0x0
#define PORTSC_PSPD_LS 0x1
#define PORTSC_PSPD_HS 0x2
+#define PORTSC_FSL_PFSC BIT(24) /* PFSC bit to disable HS chirping */
+
uint32_t or_systune;
} __attribute__ ((packed, aligned(4)));
@@ -250,6 +255,8 @@ struct ehci_ctrl {
uint32_t *periodic_list;
int periodic_schedules;
int ntds;
+ bool has_fsl_erratum_a005275; /* Freescale HS silicon quirk */
+ bool async_locked;
struct ehci_ops ops;
void *priv; /* client's private data */
};
@@ -288,4 +295,8 @@ int ehci_register(struct udevice *dev, struct ehci_hccr *hccr,
int ehci_deregister(struct udevice *dev);
extern struct dm_usb_ops ehci_usb_ops;
+/* EHCI PHY functions */
+int ehci_setup_phy(struct udevice *dev, struct phy *phy, int index);
+int ehci_shutdown_phy(struct udevice *dev, struct phy *phy);
+
#endif /* USB_EHCI_H */
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index 611ea97a72..da54ac690e 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -22,6 +22,17 @@ struct usb_uclass_priv {
int companion_device_count;
};
+int usb_lock_async(struct usb_device *udev, int lock)
+{
+ struct udevice *bus = udev->controller_dev;
+ struct dm_usb_ops *ops = usb_get_ops(bus);
+
+ if (!ops->lock_async)
+ return -ENOSYS;
+
+ return ops->lock_async(bus, lock);
+}
+
int usb_disable_asynch(int disable)
{
int old_value = asynch_allowed;
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 326258d1de..f79d73bc39 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -128,6 +128,7 @@
"mmcroot=/dev/mmcblk0p2 ro\0" \
"mmcrootfstype=ext4 rootwait\0" \
"kernelimg=" __stringify(CONFIG_BOARD_NAME) "-linux.bin\0" \
+ "rootfs_loadaddr=0x80008000\0" \
"videomode=video=ctfb:x:800,y:480,depth:18,pclk:30030,le:30,ri:210,up:23,lo:22,hs:16,vs:1,sync:1073741824,vmode:0\0" \
"check_env=if test -n ${flash_env_version}; " \
"then env default env_version; " \
@@ -176,12 +177,12 @@
"else echo dtb update in failed; " \
"fi;\0" \
"update_dtb=run download_dtb flash_dtb\0" \
- "download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ext4\0" \
+ "download_rootfs=tftpboot ${rootfs_loadaddr} ${board_name}-rootfs.ext4\0" \
"flash_rootfs=" \
"if mmc dev 0 0; then " \
"setexpr nbblocks ${filesize} / 0x200; " \
"setexpr nbblocks ${nbblocks} + 1; " \
- "if mmc write ${loadaddr} 0x40800 ${nbblocks}; then " \
+ "if mmc write ${rootfs_loadaddr} 0x40800 ${nbblocks}; then " \
"echo Flashing of rootfs image succeed; " \
"else echo Flashing of rootfs image failed; " \
"fi; " \
@@ -191,18 +192,18 @@
"if mmc dev 0 0; then " \
"setexpr nbblocks ${filesize} / 0x200; " \
"setexpr nbblocks ${nbblocks} + 1; " \
- "if mmc write ${loadaddr} 0x800 ${nbblocks}; then " \
+ "if mmc write ${rootfs_loadaddr} 0x800 ${nbblocks}; then " \
"echo Flashing of rootfs image in failsafe partition succeed; " \
"else echo Flashing of rootfs image in failsafe partition failed; " \
"fi; " \
"fi;\0" \
"update_failsafe=run download_rootfs flash_failsafe\0" \
- "download_userdata=tftpboot ${loadaddr} ${board_name}-user_data.ext4\0" \
+ "download_userdata=tftpboot ${rootfs_loadaddr} ${board_name}-user_data.ext4\0" \
"flash_userdata=" \
"if mmc dev 0 0; then " \
"setexpr nbblocks ${filesize} / 0x200; " \
"setexpr nbblocks ${nbblocks} + 1; " \
- "if mmc write ${loadaddr} 0 ${nbblocks}; then " \
+ "if mmc write ${rootfs_loadaddr} 0 ${nbblocks}; then " \
"echo Flashing of user_data image succeed; " \
"else echo Flashing of user_data image failed; " \
"fi; " \
@@ -235,9 +236,9 @@
"nfs ${loadaddr} ${serverip}:${rootpath}/boot/${kernelimg} && " \
"nfs ${fdt_addr} ${serverip}:${rootpath}/boot/${cpu_type}-${fdt_name}.dtb && " \
"bootz ${loadaddr} - ${fdt_addr};\0" \
- "show_update_logo=if fatload usb 0:1 ${loadaddr} /update/update.bmp; " \
+ "show_update_logo=if load usb 0:1 ${loadaddr} /update/update.bmp; " \
"then bmp display ${loadaddr}; fi\0" \
- "usb_update_rootfs=if fatload usb 0:1 ${loadaddr} /update/${board_name}-rootfs.ext4; " \
+ "usb_update_rootfs=if load usb 0:1 ${rootfs_loadaddr} /update/${board_name}-rootfs.ext4; " \
"then run flash_rootfs; fi\0" \
"usb_update=usb start 1; run show_update_logo; run usb_update_rootfs;\0" \
EXTRA_ENV_SETTINGS_OPOS6UL_SP
diff --git a/include/fsl_usb.h b/include/fsl_usb.h
index e9e1dd6905..c0f076b06d 100644
--- a/include/fsl_usb.h
+++ b/include/fsl_usb.h
@@ -87,6 +87,7 @@ struct ccsr_usb_phy {
/* USB Erratum Checking code */
#if defined(CONFIG_PPC) || defined(CONFIG_ARM)
bool has_dual_phy(void);
+bool has_erratum_a005275(void);
bool has_erratum_a006261(void);
bool has_erratum_a007075(void);
bool has_erratum_a007798(void);
diff --git a/include/usb.h b/include/usb.h
index b6b48a8c60..c01a09dd63 100644
--- a/include/usb.h
+++ b/include/usb.h
@@ -263,6 +263,7 @@ int usb_bulk_msg(struct usb_device *dev, unsigned int pipe,
void *data, int len, int *actual_length, int timeout);
int usb_submit_int_msg(struct usb_device *dev, unsigned long pipe,
void *buffer, int transfer_len, int interval);
+int usb_lock_async(struct usb_device *dev, int lock);
int usb_disable_asynch(int disable);
int usb_maxpacket(struct usb_device *dev, unsigned long pipe);
int usb_get_configuration_no(struct usb_device *dev, int cfgno,
@@ -785,6 +786,16 @@ struct dm_usb_ops {
* in a USB transfer. USB class driver needs to be aware of this.
*/
int (*get_max_xfer_size)(struct udevice *bus, size_t *size);
+
+ /**
+ * lock_async() - Keep async schedule after a transfer
+ *
+ * It may be desired to keep the asynchronous schedule running even
+ * after a transfer finishes, usually when doing multiple transfers
+ * back-to-back. This callback allows signalling the USB controller
+ * driver to do just that.
+ */
+ int (*lock_async)(struct udevice *udev, int lock);
};
#define usb_get_ops(dev) ((struct dm_usb_ops *)(dev)->driver->ops)
hooks/post-receive
--
armadeus/u-boot
|
|
From: sszy <ss...@us...> - 2023-09-05 09:00:25
|
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 3b053ca3524becb922836804bad8e3b67ea95894 (commit)
from bed971cf990ab2d2bf3ab64bc426911f93018a31 (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 3b053ca3524becb922836804bad8e3b67ea95894
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Sep 5 10:58:55 2023 +0200
[BUILDROOT] 2022.02: patch to fix libzlib downloading
-----------------------------------------------------------------------
Summary of changes:
.../422-package-libzlib-bump-to-version-1.3.patch | 54 ++++++++++++++++++++++
1 file changed, 54 insertions(+)
create mode 100644 patches/buildroot/2022.02/422-package-libzlib-bump-to-version-1.3.patch
diff --git a/patches/buildroot/2022.02/422-package-libzlib-bump-to-version-1.3.patch b/patches/buildroot/2022.02/422-package-libzlib-bump-to-version-1.3.patch
new file mode 100644
index 000000000..a4aa54084
--- /dev/null
+++ b/patches/buildroot/2022.02/422-package-libzlib-bump-to-version-1.3.patch
@@ -0,0 +1,54 @@
+From ef9f37d44152d236eb829142cfbc59925b222fe8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Tue, 5 Sep 2023 10:51:27 +0200
+Subject: [PATCH 1/1] package/libzlib: bump to version 1.3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+https://github.com/madler/zlib/releases/tag/v1.3
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+
+test-pgk's results with BR2_PACKAGE_ZLIB=y and BR2_PACKAGE_LIBZLIB=y :
+
+ bootlin-armv5-uclibc [1/6]: OK
+ bootlin-armv7-glibc [2/6]: OK
+ bootlin-armv7m-uclibc [3/6]: OK
+ bootlin-x86-64-musl [4/6]: OK
+ br-arm-full-static [5/6]: OK
+ sourcery-arm [6/6]: OK
+6 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
+
+ package/libzlib/libzlib.hash | 2 +-
+ package/libzlib/libzlib.mk | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/libzlib/libzlib.hash b/package/libzlib/libzlib.hash
+index df5e8d723a12..23bfda84749f 100644
+--- a/package/libzlib/libzlib.hash
++++ b/package/libzlib/libzlib.hash
+@@ -1,4 +1,4 @@
+ # From http://www.zlib.net/
+-sha256 d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98 zlib-1.2.13.tar.xz
++sha256 8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7 zlib-1.3.tar.xz
+ # License files, locally calculated
+ sha256 845efc77857d485d91fb3e0b884aaa929368c717ae8186b66fe1ed2495753243 LICENSE
+diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk
+index e344cc7ad9c1..da452af8e9ec 100644
+--- a/package/libzlib/libzlib.mk
++++ b/package/libzlib/libzlib.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-LIBZLIB_VERSION = 1.2.13
++LIBZLIB_VERSION = 1.3
+ LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz
+ LIBZLIB_SITE = http://www.zlib.net
+ LIBZLIB_LICENSE = Zlib
+--
+2.41.0
+
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-08-16 13:04:08
|
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/u-boot".
The branch, opos6ul-2018.05 has been updated
via dd82cef7c8679adcbc1d1e5701e06e1735b02a22 (commit)
from 979806a06266e394d6c837163d1fb489659d0c69 (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 dd82cef7c8679adcbc1d1e5701e06e1735b02a22
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Aug 16 15:01:39 2023 +0200
opos6ul{,nano}: add opos6ul{,spl}_spl_board_init weak function
-----------------------------------------------------------------------
Summary of changes:
arch/arm/include/asm/arch-mx6/opos6ul.h | 1 +
arch/arm/include/asm/arch-mx6/opos6ulnano.h | 1 +
arch/arm/mach-imx/mx6/opos6ul-nano.c | 6 ++++++
arch/arm/mach-imx/mx6/opos6ul.c | 6 ++++++
4 files changed, 14 insertions(+)
diff --git a/arch/arm/include/asm/arch-mx6/opos6ul.h b/arch/arm/include/asm/arch-mx6/opos6ul.h
index f1f00a5090..b9b6a339ae 100644
--- a/arch/arm/include/asm/arch-mx6/opos6ul.h
+++ b/arch/arm/include/asm/arch-mx6/opos6ul.h
@@ -8,5 +8,6 @@
int opos6ul_board_init(void);
int opos6ul_board_late_init(void);
+void opos6ul_spl_board_init(void);
#endif
diff --git a/arch/arm/include/asm/arch-mx6/opos6ulnano.h b/arch/arm/include/asm/arch-mx6/opos6ulnano.h
index cb0571c8ad..08a7e8fef4 100644
--- a/arch/arm/include/asm/arch-mx6/opos6ulnano.h
+++ b/arch/arm/include/asm/arch-mx6/opos6ulnano.h
@@ -8,5 +8,6 @@
int opos6ulnano_board_init(void);
int opos6ulnano_board_late_init(void);
+void opos6ulnano_spl_board_init(void);
#endif
diff --git a/arch/arm/mach-imx/mx6/opos6ul-nano.c b/arch/arm/mach-imx/mx6/opos6ul-nano.c
index f3dbe18e28..edcdd21a4f 100644
--- a/arch/arm/mach-imx/mx6/opos6ul-nano.c
+++ b/arch/arm/mach-imx/mx6/opos6ul-nano.c
@@ -264,9 +264,15 @@ static void spl_dram_init(void)
mx6_dram_cfg(&ddr_sysinfo, &mx6_mmcd_calib, &mem_ddr);
}
+void __weak opos6ulnano_spl_board_init(void)
+{
+}
+
void spl_board_init(void)
{
preloader_console_init();
+
+ opos6ulnano_spl_board_init();
}
void board_init_f(ulong dummy)
diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-imx/mx6/opos6ul.c
index 89723e4e5a..1263769a40 100644
--- a/arch/arm/mach-imx/mx6/opos6ul.c
+++ b/arch/arm/mach-imx/mx6/opos6ul.c
@@ -282,9 +282,15 @@ static void spl_dram_init(void)
mx6_dram_cfg(&ddr_sysinfo, &mx6_mmcd_calib, &mem_ddr);
}
+void __weak opos6ul_spl_board_init(void)
+{
+}
+
void spl_board_init(void)
{
preloader_console_init();
+
+ opos6ul_spl_board_init();
}
void board_init_f(ulong dummy)
hooks/post-receive
--
armadeus/u-boot
|
|
From: sszy <ss...@us...> - 2023-08-01 10:06:33
|
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 bed971cf990ab2d2bf3ab64bc426911f93018a31 (commit)
via 8a353091658eb9776926f71a16eee7e7a0d8ef84 (commit)
from 6a31d334dbee32988699b221173320d61efbf748 (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 bed971cf990ab2d2bf3ab64bc426911f93018a31
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Aug 1 11:51:07 2023 +0200
[BUILDROOT] apf{27,51,6} / opos6ul{,nano,sp}: bump kernel to 5.10.188
commit 8a353091658eb9776926f71a16eee7e7a0d8ef84
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Aug 1 11:45:55 2023 +0200
[BUILDROOT] apf28: bump linux to 5.10.188
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 2 +-
buildroot/configs/apf28_defconfig | 9 +-
buildroot/configs/apf51_defconfig | 2 +-
buildroot/configs/apf6_defconfig | 2 +-
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 2 +-
.../device/armadeus/apf28/apf28-linux-5.10.config | 223 +++++++++++++++++++++
...28dev-use-OF-graph-to-describe-the-displa.patch | 94 +++++++++
9 files changed, 328 insertions(+), 10 deletions(-)
create mode 100644 buildroot/target/device/armadeus/apf28/apf28-linux-5.10.config
create mode 100644 patches/linux/5.10/0300-RM-dts-apf28dev-use-OF-graph-to-describe-the-displa.patch
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index b5cf9b2ea..c9934f1f7 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -24,7 +24,7 @@ BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.167"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.188"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index d09ee09d9..b1a5865d5 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -4,7 +4,7 @@ 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_KERNEL_HEADERS_4_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_PTHREAD_DEBUG=y
@@ -25,14 +25,15 @@ BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.186"
-BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.188"
+BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/apf28-linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
BR2_LINUX_KERNEL_UIMAGE=y
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="40008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev"
+BR2_PACKAGE_LINUX_TOOLS_GPIO=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index b25832c1d..292c9be6d 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -26,7 +26,7 @@ BR2_CPU_NAME="imx51"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.167"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.188"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 9d60f423e..ff6afc921 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -25,7 +25,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.167"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.188"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index eacf10bbc..f13d2da27 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -23,7 +23,7 @@ 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="5.10.167"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.188"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 37e64153b..3b6dbf4a9 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -23,7 +23,7 @@ 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="5.10.167"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.188"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index d4166ab52..5255b5607 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -24,7 +24,7 @@ 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="5.10.167"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.188"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-5.10.config b/buildroot/target/device/armadeus/apf28/apf28-linux-5.10.config
new file mode 100644
index 000000000..4c77732c9
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-5.10.config
@@ -0,0 +1,223 @@
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_CGROUPS=y
+CONFIG_NAMESPACES=y
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_NET_NS is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_PERF_EVENTS=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_ARCH_MULTI_V7 is not set
+CONFIG_ARCH_MXS=y
+CONFIG_AEABI=y
+# CONFIG_GCC_PLUGINS is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+CONFIG_CAN=m
+CONFIG_CAN_FLEXCAN=m
+# CONFIG_WIRELESS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_DATAFLASH=y
+CONFIG_MTD_SST25L=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_MTD_NAND_GPMI_NAND=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_UBI=y
+# CONFIG_BLK_DEV is not set
+CONFIG_EEPROM_AT24=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_NETDEVICES=y
+# CONFIG_NET_VENDOR_ALACRITECH is not set
+# CONFIG_NET_VENDOR_AMAZON is not set
+# CONFIG_NET_VENDOR_AQUANTIA is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_AURORA is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CADENCE is not set
+# CONFIG_NET_VENDOR_CAVIUM is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_CORTINA is not set
+# CONFIG_NET_VENDOR_EZCHIP is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_GOOGLE is not set
+# CONFIG_NET_VENDOR_HISILICON is not set
+# CONFIG_NET_VENDOR_HUAWEI is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETRONOME is not set
+# CONFIG_NET_VENDOR_NI is not set
+# CONFIG_NET_VENDOR_PENSANDO is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RENESAS is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+# CONFIG_NET_VENDOR_XILINX is not set
+CONFIG_USB_USBNET=y
+CONFIG_USB_NET_SMSC95XX=y
+# CONFIG_WLAN is not set
+CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_MXS_LRADC=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_MXS_AUART=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_I2C_COMPAT is not set
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MXS=y
+CONFIG_SPI=y
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_MXS=y
+CONFIG_SPI_SPIDEV=m
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_STMP3XXX_RTC_WATCHDOG=y
+CONFIG_MFD_MXS_LRADC=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_GPIO=y
+CONFIG_DRM=y
+CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_DRM_MXSFB=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_PWM=y
+CONFIG_BACKLIGHT_GPIO=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_LOGO=y
+CONFIG_HID_A4TECH=y
+CONFIG_HID_APPLE=y
+CONFIG_HID_BELKIN=y
+CONFIG_HID_CHERRY=y
+CONFIG_HID_CHICONY=y
+CONFIG_HID_CYPRESS=y
+CONFIG_HID_EZKEY=y
+CONFIG_HID_ITE=y
+CONFIG_HID_KENSINGTON=y
+CONFIG_HID_LOGITECH=y
+CONFIG_HID_REDRAGON=y
+CONFIG_HID_MICROSOFT=y
+CONFIG_HID_MONTEREY=y
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_MXS_PHY=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_ETH=m
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_MMC=y
+CONFIG_MMC_MXS=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_STMP=y
+CONFIG_DMADEVICES=y
+CONFIG_MXS_DMA=y
+CONFIG_IIO=y
+CONFIG_MXS_LRADC_ADC=y
+CONFIG_IIO_SYSFS_TRIGGER=y
+CONFIG_PWM=y
+CONFIG_PWM_MXS=y
+CONFIG_NVMEM_MXS_OCOTP=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+# CONFIG_DNOTIFY is not set
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_CACHEFILES=m
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RUBIN=y
+CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_15=y
+CONFIG_CRYPTO_DEV_MXS_DCP=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC7=m
+CONFIG_FONTS=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_INFO=y
+CONFIG_FRAME_WARN=2048
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DEBUG_USER=y
+# CONFIG_RUNTIME_TESTING_MENU is not set
diff --git a/patches/linux/5.10/0300-RM-dts-apf28dev-use-OF-graph-to-describe-the-displa.patch b/patches/linux/5.10/0300-RM-dts-apf28dev-use-OF-graph-to-describe-the-displa.patch
new file mode 100644
index 000000000..281f7c33d
--- /dev/null
+++ b/patches/linux/5.10/0300-RM-dts-apf28dev-use-OF-graph-to-describe-the-displa.patch
@@ -0,0 +1,94 @@
+From 5d173d3a41373a70234fc0126f8cd6a8cd897bf7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Tue, 1 Aug 2023 10:31:59 +0200
+Subject: [PATCH 1/1] ARM: dts: apf28dev: use OF graph to describe the display
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+To make use of the new eLCDIF DRM driver OF graph description is
+required. Describe the display using OF graph nodes.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/imx28-apf28dev.dts | 47 ++++++++++++++--------------
+ 1 file changed, 24 insertions(+), 23 deletions(-)
+
+diff --git a/arch/arm/boot/dts/imx28-apf28dev.dts b/arch/arm/boot/dts/imx28-apf28dev.dts
+index 1b253b47006c..a81316929adb 100644
+--- a/arch/arm/boot/dts/imx28-apf28dev.dts
++++ b/arch/arm/boot/dts/imx28-apf28dev.dts
+@@ -77,30 +77,11 @@ lcdif@80030000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&lcdif_16bit_pins_a
+ &lcdif_pins_apf28dev>;
+- display = <&display0>;
+ status = "okay";
+
+- display0: display0 {
+- bits-per-pixel = <16>;
+- bus-width = <16>;
+-
+- display-timings {
+- native-mode = <&timing0>;
+- timing0: timing0 {
+- 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 = <1>;
+- vsync-active = <1>;
+- de-active = <1>;
+- pixelclk-active = <0>;
+- };
++ port {
++ lcdif_out: endpoint {
++ remote-endpoint = <&panel_in>;
+ };
+ };
+ };
+@@ -192,6 +173,14 @@ reg_can0_vcc: regulator@1 {
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ };
++
++ reg_3v3: regulator-3v3@2 {
++ compatible = "regulator-fixed";
++ reg = <2>;
++ regulator-name = "regulator-3v3";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ };
+ };
+
+ leds {
+@@ -204,7 +193,19 @@ user {
+ };
+ };
+
+- backlight {
++ panel: panel {
++ compatible = "armadeus,st0700-adapt";
++ power-supply = <®_3v3>;
++ backlight = <&backlight>;
++
++ port {
++ panel_in: endpoint {
++ remote-endpoint = <&lcdif_out>;
++ };
++ };
++ };
++
++ backlight: backlight {
+ compatible = "pwm-backlight";
+
+ pwms = <&pwm 3 191000>;
+--
+2.41.0
+
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-07-31 09:40: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 6a31d334dbee32988699b221173320d61efbf748 (commit)
from e75a482ad4dd45f34e2a373159c40c102d12786f (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 6a31d334dbee32988699b221173320d61efbf748
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jul 31 11:15:04 2023 +0200
[BUILDROOT] 2022.02: patch to fix yavta downloading
-----------------------------------------------------------------------
Summary of changes:
.../421-package-yavta-update-_SITE-URL.patch | 34 ++++++++++++++++++++++
patches/buildroot/2022.02/cleanup_buildroot.sh | 1 +
2 files changed, 35 insertions(+)
create mode 100644 patches/buildroot/2022.02/421-package-yavta-update-_SITE-URL.patch
diff --git a/patches/buildroot/2022.02/421-package-yavta-update-_SITE-URL.patch b/patches/buildroot/2022.02/421-package-yavta-update-_SITE-URL.patch
new file mode 100644
index 000000000..df1a28aeb
--- /dev/null
+++ b/patches/buildroot/2022.02/421-package-yavta-update-_SITE-URL.patch
@@ -0,0 +1,34 @@
+From 70aac373afb7c081e0b3eb06ea9fbd6232c74b58 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Mon, 10 Jul 2023 19:37:19 +0200
+Subject: [PATCH 1/1] package/yavta: update _SITE URL
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It looks like the project moved to https://git.ideasonboard.org/yavta.git.
+
+Update YAVA_SITE URL accordingly.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/yavta/yavta.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/package/yavta/yavta.mk b/package/yavta/yavta.mk
+index d16bee69b117..db481b77b957 100644
+--- a/package/yavta/yavta.mk
++++ b/package/yavta/yavta.mk
+@@ -5,7 +5,7 @@
+ ################################################################################
+
+ YAVTA_VERSION = 583bedefc2a247d2cfd32d1b4a0abbe3e2015c70
+-YAVTA_SITE = https://git.ideasonboard.org/git/yavta.git
++YAVTA_SITE = https://git.ideasonboard.org/yavta.git
+ YAVTA_SITE_METHOD = git
+ YAVTA_LICENSE = GPL-2.0+
+ YAVTA_LICENSE_FILES = COPYING.GPL
+--
+2.41.0
+
diff --git a/patches/buildroot/2022.02/cleanup_buildroot.sh b/patches/buildroot/2022.02/cleanup_buildroot.sh
index 93349ad03..2bc789a0f 100755
--- a/patches/buildroot/2022.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2022.02/cleanup_buildroot.sh
@@ -100,6 +100,7 @@ rm -rf buildroot/package/xc3sprog/Config.in
rm -rf buildroot/package/xc3sprog/xc3sprog-fixes-version-detection.patch
rm -rf buildroot/package/xc3sprog/xc3sprog-fixes-xc2c32a_qf32-jtag-id.patch
rm -rf buildroot/package/xc3sprog/xc3sprog.mk
+rm -rf buildroot/package/yavta/yavta.mk
rm -rf buildroot/system/Config.in
rm -rf buildroot/toolchain/toolchain-external/Config.in
rm -rf buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-07-10 08:11: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 e75a482ad4dd45f34e2a373159c40c102d12786f (commit)
from f1a73e59fe5871b358c6f5f1c5b9995846121ba5 (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 e75a482ad4dd45f34e2a373159c40c102d12786f
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jul 10 10:10:21 2023 +0200
[LINUX] 5.10: apf27: patch to enable UART3
-----------------------------------------------------------------------
Summary of changes:
.../5.10/0205-ARM-dts-apf27-enable-UART3.patch | 51 ++++++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 patches/linux/5.10/0205-ARM-dts-apf27-enable-UART3.patch
diff --git a/patches/linux/5.10/0205-ARM-dts-apf27-enable-UART3.patch b/patches/linux/5.10/0205-ARM-dts-apf27-enable-UART3.patch
new file mode 100644
index 000000000..2cf64ad28
--- /dev/null
+++ b/patches/linux/5.10/0205-ARM-dts-apf27-enable-UART3.patch
@@ -0,0 +1,51 @@
+From e74d92cea7f0c007c91c90d8f32b87b2f3e4a10f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 7 Jul 2023 17:42:41 +0200
+Subject: [PATCH 205/205] ARM: dts: apf27: enable UART3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On APF27 SoM, the UART3 is connected to a RS-232-Compatible transceiver.
+Enable the UART3.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/imx27-apf27.dts | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx27-apf27.dts b/arch/arm/boot/dts/imx27-apf27.dts
+index dea082947f4b..81b4e13da411 100644
+--- a/arch/arm/boot/dts/imx27-apf27.dts
++++ b/arch/arm/boot/dts/imx27-apf27.dts
+@@ -68,6 +68,13 @@ MX27_PAD_UART1_RXD__UART1_RXD 0x0
+ >;
+ };
+
++ pinctrl_uart3: uart3grp {
++ fsl,pins = <
++ MX27_PAD_UART3_TXD__UART3_TXD 0x0
++ MX27_PAD_UART3_RXD__UART3_RXD 0x0
++ >;
++ };
++
+ pinctrl_usbotg: usbotg {
+ fsl,pins = <
+ MX27_PAD_USBOTG_NXT__USBOTG_NXT 0x0
+@@ -93,6 +100,12 @@ &uart1 {
+ status = "okay";
+ };
+
++&uart3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart3>;
++ status = "okay";
++};
++
+ &fec {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_fec1>;
+--
+2.39.3
+
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-07-03 09:13:31
|
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 f1a73e59fe5871b358c6f5f1c5b9995846121ba5 (commit)
from 45e7a6dc8080eb8cf1f0257c7446da3aa348659c (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 f1a73e59fe5871b358c6f5f1c5b9995846121ba5
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jul 3 11:12:52 2023 +0200
[BUILDROOT] 2022.02: patch to fix pkgconfig downloading
-----------------------------------------------------------------------
Summary of changes:
.../420-package-pkgconf-fix-broken-URL.patch | 34 ++++++++++++++++++++++
patches/buildroot/2022.02/cleanup_buildroot.sh | 1 +
2 files changed, 35 insertions(+)
create mode 100644 patches/buildroot/2022.02/420-package-pkgconf-fix-broken-URL.patch
diff --git a/patches/buildroot/2022.02/420-package-pkgconf-fix-broken-URL.patch b/patches/buildroot/2022.02/420-package-pkgconf-fix-broken-URL.patch
new file mode 100644
index 000000000..41229894e
--- /dev/null
+++ b/patches/buildroot/2022.02/420-package-pkgconf-fix-broken-URL.patch
@@ -0,0 +1,34 @@
+From ac0919499de4dbfdcdf52245395758a77100c95b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Mon, 3 Jul 2023 10:56:45 +0200
+Subject: [PATCH 1/1] package/pkgconf: fix broken URL
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Release tarball location has changed [1], update PKGCONF_SITE.
+
+[1] https://github.com/pkgconf/pkgconf/commit/437c2a3218bfcb1cae7fa38a4ccd0cb29575ff07
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/pkgconf/pkgconf.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk
+index e9587fae6b2c..1d73b691e173 100644
+--- a/package/pkgconf/pkgconf.mk
++++ b/package/pkgconf/pkgconf.mk
+@@ -5,7 +5,7 @@
+ ################################################################################
+
+ PKGCONF_VERSION = 1.6.3
+-PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf
++PKGCONF_SITE = https://distfiles.ariadne.space/pkgconf
+ PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.xz
+ PKGCONF_LICENSE = pkgconf license
+ PKGCONF_LICENSE_FILES = COPYING
+--
+2.39.3
+
diff --git a/patches/buildroot/2022.02/cleanup_buildroot.sh b/patches/buildroot/2022.02/cleanup_buildroot.sh
index 81a23016a..93349ad03 100755
--- a/patches/buildroot/2022.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2022.02/cleanup_buildroot.sh
@@ -68,6 +68,7 @@ rm -rf buildroot/package/matiec/matiec.mk
rm -rf buildroot/package/pci_debug/Config.in
rm -rf buildroot/package/pci_debug/pci_debug.hash
rm -rf buildroot/package/pci_debug/pci_debug.mk
+rm -rf buildroot/package/pkgconf/pkgconf.mk
rm -rf buildroot/package/pwmmusic/Config.in
rm -rf buildroot/package/pwmmusic/pwmmusic.mk
rm -rf buildroot/package/python-flask-socketio/Config.in
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-06-14 15:14:51
|
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 45e7a6dc8080eb8cf1f0257c7446da3aa348659c (commit)
via 4d8976a41a7c731b46c458250b726436db87293d (commit)
from 4ec6ea24dd6e83236ea5cbe41ba8512e16f7bf52 (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 45e7a6dc8080eb8cf1f0257c7446da3aa348659c
Merge: 4ec6ea24d 4d8976a41
Author: Kevin JOLY <kev...@po...>
Date: Wed Jun 14 15:14:44 2023 +0000
Merge branch 'docker-image-from-debian-slim' into 'master'
Use Debian bullseye-slim base image for docker
See merge request armadeus/armadeus-bsp!5
commit 4d8976a41a7c731b46c458250b726436db87293d
Author: Kevin Joly <kev...@ar...>
Date: Wed Jun 14 16:24:47 2023 +0200
Use Debian bullseye-slim base image for docker
-----------------------------------------------------------------------
Summary of changes:
docker/Dockerfile | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 67e46161a..1dcee1c0a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,20 +1,22 @@
-FROM debian:11
+FROM debian:bullseye-slim
-RUN apt update
-RUN apt install -y build-essential gcc g++ autoconf automake libtool bison flex gettext
-RUN apt install -y patch subversion texinfo wget git-core
-RUN apt install -y libncurses5 libncurses5-dev
-RUN apt install -y zlib1g-dev liblzo2-2 liblzo2-dev
-RUN apt install -y libacl1 libacl1-dev gawk cvs curl lzma
-RUN apt install -y uuid-dev mercurial unzip
-RUN apt install -y libftdi-dev
-RUN apt install -y bc quilt
-RUN apt install -y cpio rsync
+RUN apt update && \
+ apt install -y build-essential gcc g++ autoconf automake libtool bison flex gettext \
+ patch subversion texinfo wget git-core \
+ libncurses5 libncurses5-dev \
+ zlib1g-dev liblzo2-2 liblzo2-dev \
+ libacl1 libacl1-dev gawk cvs curl lzma \
+ uuid-dev mercurial unzip \
+ libftdi-dev \
+ bc quilt \
+ cpio rsync \
+ locales && \
+ rm -rf /var/lib/apt/lists/*
# Locales
-RUN apt install -y locales
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
locale-gen
+
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-06-13 07:48: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 4ec6ea24dd6e83236ea5cbe41ba8512e16f7bf52 (commit)
from 89106400315a3d1cb60a0ddd1d47b17699c999b1 (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 4ec6ea24dd6e83236ea5cbe41ba8512e16f7bf52
Author: Erwan MATHIEU <er...@in...>
Date: Mon Jun 12 21:35:21 2023 +0200
Allow autoconf target to work with external buildroot layout
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index cf9c7d2a1..1c30b08d6 100644
--- a/Makefile
+++ b/Makefile
@@ -177,7 +177,7 @@ linux-clean: $(BUILDROOT_OUTPUT_DIR)/.configured
# for the one who doesn't want config menu:
%_autoconf: $(BUILDROOT_DIR)/.patched
- @if [ -e "$(BUILDROOT_DIR)/configs/$(patsubst %_autoconf,%,$@)_defconfig" ]; then \
+ @if [ -e "$(ARMADEUS_CONFIG_DIR)/$(patsubst %_autoconf,%,$@)_defconfig" ] || [ -e "$(ARMADEUS_CONFIG_DIR)/$(patsubst %_autoconf,%,$@)/$(patsubst %_autoconf,%,$@)_defconfig" ] || [ -e "$(BR2_EXTERNAL)/configs/$(patsubst %_autoconf,%,$@)_defconfig" ]; then \
rm -f $(BUILDROOT_CONFIG_DIR)/.config ; \
$(MAKE) -C $(BUILDROOT_DIR) $(patsubst %_autoconf,%,$@)_defconfig ; \
touch $(BUILDROOT_OUTPUT_DIR)/.configured ; \
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-06-12 15:03:11
|
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 89106400315a3d1cb60a0ddd1d47b17699c999b1 (commit)
via 293701bade391ce9a0f3395506475b0807e9ff81 (commit)
from 2b072a72072f3c1c0f1792629ba0953743b4cdda (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 89106400315a3d1cb60a0ddd1d47b17699c999b1
Merge: 2b072a720 293701bad
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jun 12 15:02:57 2023 +0000
Merge branch 'fix-symlink-artifacts' into 'master'
Fix symlink in Gitlab artifacts
See merge request armadeus/armadeus-bsp!4
commit 293701bade391ce9a0f3395506475b0807e9ff81
Author: Kevin Joly <kev...@ar...>
Date: Mon Jun 12 10:20:37 2023 +0200
Fix symlink in Gitlab artifacts
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4bebe4dda..986789f70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,6 +25,7 @@ stages:
script:
- make "$ARMADEUS_PLATFORM"_autoconf
- make
+ - cp -r -L buildroot/output/images output-images
parallel:
matrix:
- ARMADEUS_PLATFORM: [apf27, apf28, apf51, apf6, opos6ul, opos6ulnano, opos8mm-legacy-5.10]
@@ -42,5 +43,5 @@ build-weekly:
artifacts:
name: "$ARMADEUS_PLATFORM-$CI_COMMIT_SHORT_SHA-images"
paths:
- - buildroot/output/images/
+ - output-images
expire_in: 1 month
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-05-05 07:38:39
|
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 2b072a72072f3c1c0f1792629ba0953743b4cdda (commit)
from 8768da3e39a1eefb6205c6476ad5f053e0af9601 (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 2b072a72072f3c1c0f1792629ba0953743b4cdda
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri May 5 09:38:21 2023 +0200
[BUILDROOT] Bump BR to 2022.02.12
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
patches/buildroot/2022.02/cleanup_buildroot.sh | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 29ed2ba13..cf9c7d2a1 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2022.02
-BUILDROOT_MINOR_VERSION ?= 11
+BUILDROOT_MINOR_VERSION ?= 12
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
diff --git a/patches/buildroot/2022.02/cleanup_buildroot.sh b/patches/buildroot/2022.02/cleanup_buildroot.sh
index b9faa4f11..81a23016a 100755
--- a/patches/buildroot/2022.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2022.02/cleanup_buildroot.sh
@@ -24,7 +24,6 @@ rm -rf buildroot/package/cmux/Config.in
rm -rf buildroot/package/cmux/cmux.hash
rm -rf buildroot/package/cmux/cmux.mk
rm -rf buildroot/package/cog/0001-make-cursor-great-again.patch
-rm -rf buildroot/package/cog/Config.in
rm -rf buildroot/package/cog/cog.hash
rm -rf buildroot/package/cog/cog.mk
rm -rf buildroot/package/e-uae/Config.in
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-04-06 08:43:08
|
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 8768da3e39a1eefb6205c6476ad5f053e0af9601 (commit)
from 3a68a525a7f4056e241d480a7190cc7b7e53f284 (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 8768da3e39a1eefb6205c6476ad5f053e0af9601
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Apr 6 10:42:31 2023 +0200
[LINUX] 5.10: apf27: patch for FPGA access from Linux
-----------------------------------------------------------------------
Summary of changes:
.../5.10/0204-ARM-dts-apf27-add-weim-support.patch | 36 ++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 patches/linux/5.10/0204-ARM-dts-apf27-add-weim-support.patch
diff --git a/patches/linux/5.10/0204-ARM-dts-apf27-add-weim-support.patch b/patches/linux/5.10/0204-ARM-dts-apf27-add-weim-support.patch
new file mode 100644
index 000000000..4d213127b
--- /dev/null
+++ b/patches/linux/5.10/0204-ARM-dts-apf27-add-weim-support.patch
@@ -0,0 +1,36 @@
+From e89a5534b2d6e621dafc7f5229c317f038e536b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Thu, 6 Apr 2023 10:38:08 +0200
+Subject: [PATCH 204/204] ARM: dts: apf27: add weim support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+APF27 has a FPGA connected on the WEIM bus, add support of it.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/imx27-apf27.dts | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx27-apf27.dts b/arch/arm/boot/dts/imx27-apf27.dts
+index 32232cce9f06..dea082947f4b 100644
+--- a/arch/arm/boot/dts/imx27-apf27.dts
++++ b/arch/arm/boot/dts/imx27-apf27.dts
+@@ -162,3 +162,12 @@ &usbotg {
+ disable-over-current;
+ status = "okay";
+ };
++
++&weim {
++ status = "okay";
++
++ fpga@5,0 {
++ reg = <5 0 0x02000000>;
++ fsl,weim-cs-timing = <0x00000600 0x00000D01 0x0>;
++ };
++};
+--
+2.39.2
+
hooks/post-receive
--
armadeus
|