armadeus-commitlog Mailing List for armadeus (Page 11)
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
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Sébastien S. <ss...@us...> - 2021-04-13 09:14:55
|
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 b61898a9e9028e5f65f4338bbf9bf325ad069051 (commit)
from fa2292741a9732c1b82b0e0dc9a2404d49025eac (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 b61898a9e9028e5f65f4338bbf9bf325ad069051
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Apr 12 15:21:18 2021 +0200
[PATCH] 5.4.imx_legacy: patch to fix cpupower with gcc 10
-----------------------------------------------------------------------
Summary of changes:
...oid-multiple-definition-with-gcc-fno-comm.patch | 85 ++++++++++++++++++++++
1 file changed, 85 insertions(+)
create mode 100644 patches/linux/5.4.imx_legacy/0546-cpupower-avoid-multiple-definition-with-gcc-fno-comm.patch
diff --git a/patches/linux/5.4.imx_legacy/0546-cpupower-avoid-multiple-definition-with-gcc-fno-comm.patch b/patches/linux/5.4.imx_legacy/0546-cpupower-avoid-multiple-definition-with-gcc-fno-comm.patch
new file mode 100644
index 000000000..5589c9813
--- /dev/null
+++ b/patches/linux/5.4.imx_legacy/0546-cpupower-avoid-multiple-definition-with-gcc-fno-comm.patch
@@ -0,0 +1,85 @@
+From 2de7fb60a4740135e03cf55c1982e393ccb87b6b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <fl...@ge...>
+Date: Wed, 26 Feb 2020 14:33:59 -0500
+Subject: [PATCH 1/1] cpupower: avoid multiple definition with gcc -fno-common
+
+Building cpupower with -fno-common in CFLAGS results in errors due to
+multiple definitions of the 'cpu_count' and 'start_time' variables.
+
+./utils/idle_monitor/snb_idle.o:./utils/idle_monitor/cpupower-monitor.h:28:
+multiple definition of `cpu_count';
+./utils/idle_monitor/nhm_idle.o:./utils/idle_monitor/cpupower-monitor.h:28:
+first defined here
+...
+./utils/idle_monitor/cpuidle_sysfs.o:./utils/idle_monitor/cpuidle_sysfs.c:22:
+multiple definition of `start_time';
+./utils/idle_monitor/amd_fam14h_idle.o:./utils/idle_monitor/amd_fam14h_idle.c:85:
+first defined here
+
+The -fno-common option will be enabled by default in GCC 10.
+
+Bug: https://bugs.gentoo.org/707462
+Signed-off-by: Mike Gilbert <fl...@ge...>
+Signed-off-by: Shuah Khan <sk...@li...>
+---
+ tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c | 2 +-
+ tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c | 2 +-
+ tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c | 2 ++
+ tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h | 2 +-
+ 4 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
+index 33dc34db4f3c..20f46348271b 100644
+--- a/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
++++ b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
+@@ -82,7 +82,7 @@ static struct pci_access *pci_acc;
+ static struct pci_dev *amd_fam14h_pci_dev;
+ static int nbp1_entered;
+
+-struct timespec start_time;
++static struct timespec start_time;
+ static unsigned long long timediff;
+
+ #ifdef DEBUG
+diff --git a/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c b/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
+index 3c4cee160b0e..a65f7d011513 100644
+--- a/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
++++ b/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
+@@ -19,7 +19,7 @@ struct cpuidle_monitor cpuidle_sysfs_monitor;
+
+ static unsigned long long **previous_count;
+ static unsigned long long **current_count;
+-struct timespec start_time;
++static struct timespec start_time;
+ static unsigned long long timediff;
+
+ static int cpuidle_get_count_percent(unsigned int id, double *percent,
+diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
+index 6d44fec55ad5..7c77045fef52 100644
+--- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
++++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
+@@ -27,6 +27,8 @@ struct cpuidle_monitor *all_monitors[] = {
+ 0
+ };
+
++int cpu_count;
++
+ static struct cpuidle_monitor *monitors[MONITORS_MAX];
+ static unsigned int avail_monitors;
+
+diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
+index 5b5eb1da0cce..c559d3115330 100644
+--- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
++++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
+@@ -25,7 +25,7 @@
+ #endif
+ #define CSTATE_DESC_LEN 60
+
+-int cpu_count;
++extern int cpu_count;
+
+ /* Hard to define the right names ...: */
+ enum power_range_e {
+--
+2.26.3
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-04-12 10:00:27
|
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 fa2292741a9732c1b82b0e0dc9a2404d49025eac (commit)
from 6e33f21ca6e7119a142206c9c12adf8be5c68625 (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 fa2292741a9732c1b82b0e0dc9a2404d49025eac
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Apr 5 22:56:30 2021 +0200
[BUILDROOT] Prepare patches to BR 2021.02
-----------------------------------------------------------------------
Summary of changes:
.../001-add_armadeus_device.patch | 0
.../002-add_armadeus_specific_packages.patch | 0
...point-to-armadeus-in-out-of-tree-makefile.patch | 0
...us-gpsd-add-options-setting-in-menuconfig.patch | 0
.../007-armadeus-add-agg-package.patch | 0
.../008-armadeus-add-gnash-package.patch | 0
.../009-armadeus-xc3sprog-new-package.patch | 0
.../010-armadeus-sam7-pgm-ng-new-package.patch | 0
...12-armadeus-add-tkinter-support-to-python.patch | 0
.../014-armadeus-python-wx-add-package.patch | 0
.../016-armadeus-add-gnuboy-package.patch | 8 +--
.../018-armadeus-add-pcidebug-package.patch | 0
.../019-armadeus-add-cmux-package.patch | 0
.../021-armadeus-add-sdl_water-package.patch | 0
.../025-armadeus-apf-config-add-package.patch | 6 +--
.../029-armadeus-lora-forwarder-add-package.patch | 0
.../030-armadeus-lmic-pi-add-package.patch | 8 +--
.../031-armadeus-lepton-add-package.patch | 4 +-
.../031-armadeus-lepton-fix-makefile.patch | 0
.../034-armadeus-add-slideshow-package.patch | 0
...armadeus-fixes-uclibc-build-with-ucontext.patch | 0
...armadeus-fb-test-fixes-tty-config-on-exit.patch | 0
...9-armadeus-add-sd8977-driver-and-firmware.patch | 0
...040-armadeus-add-thingerio-client-package.patch | 0
...madeus-expect-forces-unbuffer-instalation.patch | 0
...e-gpsd-fix-python-tools-build-and-install.patch | 5 +-
...add_support_for_custom_configuration_file.patch | 0
.../081-adds_quake_package.patch | 0
.../083-pygame-armadeus_addons.patch | 0
.../107-armadeus-games-add-wolf4sdl-package.patch | 6 +--
.../118-armadeus-snes9x-add-package.patch | 0
.../121-target-arm926t_is_arm926ej-s.patch | 0
.../123-armadeus-pywebradio-add-package.patch | 0
.../124-e-uae-add_package.patch | 0
...fix_installation_bug_on_some_host_systems.patch | 0
.../172-gsmmux-add_package.patch | 0
.../176-imx-test-add_package.patch | 0
.../188-marble-add_package.patch | 0
.../201-armadeus-add_gnokii.patch | 0
.../204-wpa-supplicant-add-option-ieee80211w.patch | 0
...x-coreutils-stty-add-rs485-config-options.patch | 0
.../208-armadeus-add_beremiz.patch | 4 +-
.../209-armadeus-add_matiec.patch | 0
.../237-armadeus-busybox-speed-up-mdev.patch | 0
.../341-python-flask-socketio-new-package.patch | 0
.../378-package-x265-update-project-URL.patch | 30 ++++++------
.../{2018.02 => 2021.02}/cleanup_buildroot.sh | 57 ++++++----------------
47 files changed, 49 insertions(+), 79 deletions(-)
copy patches/buildroot/{2015.02 => 2021.02}/001-add_armadeus_device.patch (100%)
copy patches/buildroot/{2015.02 => 2021.02}/002-add_armadeus_specific_packages.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/007-armadeus-add-agg-package.patch (100%)
copy patches/buildroot/{2020.02 => 2021.02}/008-armadeus-add-gnash-package.patch (100%)
copy patches/buildroot/{2015.02 => 2021.02}/009-armadeus-xc3sprog-new-package.patch (100%)
copy patches/buildroot/{2015.02 => 2021.02}/010-armadeus-sam7-pgm-ng-new-package.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/012-armadeus-add-tkinter-support-to-python.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/014-armadeus-python-wx-add-package.patch (100%)
copy patches/buildroot/{2017.02 => 2021.02}/016-armadeus-add-gnuboy-package.patch (93%)
copy patches/buildroot/{2019.02 => 2021.02}/018-armadeus-add-pcidebug-package.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/019-armadeus-add-cmux-package.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/021-armadeus-add-sdl_water-package.patch (100%)
copy patches/buildroot/{2016.08 => 2021.02}/025-armadeus-apf-config-add-package.patch (95%)
copy patches/buildroot/{2019.02 => 2021.02}/029-armadeus-lora-forwarder-add-package.patch (100%)
copy patches/buildroot/{2016.08 => 2021.02}/030-armadeus-lmic-pi-add-package.patch (94%)
copy patches/buildroot/{2020.02 => 2021.02}/031-armadeus-lepton-add-package.patch (97%)
copy patches/buildroot/{2017.02 => 2021.02}/031-armadeus-lepton-fix-makefile.patch (100%)
copy patches/buildroot/{2020.02 => 2021.02}/034-armadeus-add-slideshow-package.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/035-armadeus-fixes-uclibc-build-with-ucontext.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/038-armadeus-fb-test-fixes-tty-config-on-exit.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/039-armadeus-add-sd8977-driver-and-firmware.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/040-armadeus-add-thingerio-client-package.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/044-armadeus-expect-forces-unbuffer-instalation.patch (100%)
copy patches/buildroot/{2020.02 => 2021.02}/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch (95%)
copy patches/buildroot/{2019.02 => 2021.02}/050-U-Boot-add_support_for_custom_configuration_file.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/081-adds_quake_package.patch (100%)
copy patches/buildroot/{2015.02 => 2021.02}/083-pygame-armadeus_addons.patch (100%)
copy patches/buildroot/{2017.02 => 2021.02}/107-armadeus-games-add-wolf4sdl-package.patch (94%)
copy patches/buildroot/{2019.02 => 2021.02}/118-armadeus-snes9x-add-package.patch (100%)
copy patches/buildroot/{2015.02 => 2021.02}/121-target-arm926t_is_arm926ej-s.patch (100%)
copy patches/buildroot/{2015.02 => 2021.02}/123-armadeus-pywebradio-add-package.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/124-e-uae-add_package.patch (100%)
copy patches/buildroot/{2015.02 => 2021.02}/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch (100%)
copy patches/buildroot/{2015.02 => 2021.02}/172-gsmmux-add_package.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/176-imx-test-add_package.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/188-marble-add_package.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/201-armadeus-add_gnokii.patch (100%)
copy patches/buildroot/{2015.02 => 2021.02}/204-wpa-supplicant-add-option-ieee80211w.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/205-busybox-coreutils-stty-add-rs485-config-options.patch (100%)
copy patches/buildroot/{2020.02 => 2021.02}/208-armadeus-add_beremiz.patch (98%)
copy patches/buildroot/{2015.02 => 2021.02}/209-armadeus-add_matiec.patch (100%)
copy patches/buildroot/{2020.02 => 2021.02}/237-armadeus-busybox-speed-up-mdev.patch (100%)
copy patches/buildroot/{2019.02 => 2021.02}/341-python-flask-socketio-new-package.patch (100%)
copy patches/buildroot/{2020.02 => 2021.02}/378-package-x265-update-project-URL.patch (78%)
copy patches/buildroot/{2018.02 => 2021.02}/cleanup_buildroot.sh (66%)
diff --git a/patches/buildroot/2015.02/001-add_armadeus_device.patch b/patches/buildroot/2021.02/001-add_armadeus_device.patch
similarity index 100%
copy from patches/buildroot/2015.02/001-add_armadeus_device.patch
copy to patches/buildroot/2021.02/001-add_armadeus_device.patch
diff --git a/patches/buildroot/2015.02/002-add_armadeus_specific_packages.patch b/patches/buildroot/2021.02/002-add_armadeus_specific_packages.patch
similarity index 100%
copy from patches/buildroot/2015.02/002-add_armadeus_specific_packages.patch
copy to patches/buildroot/2021.02/002-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/2021.02/003-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/2021.02/003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch
diff --git a/patches/buildroot/2019.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch b/patches/buildroot/2021.02/005-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/2021.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
diff --git a/patches/buildroot/2019.02/007-armadeus-add-agg-package.patch b/patches/buildroot/2021.02/007-armadeus-add-agg-package.patch
similarity index 100%
copy from patches/buildroot/2019.02/007-armadeus-add-agg-package.patch
copy to patches/buildroot/2021.02/007-armadeus-add-agg-package.patch
diff --git a/patches/buildroot/2020.02/008-armadeus-add-gnash-package.patch b/patches/buildroot/2021.02/008-armadeus-add-gnash-package.patch
similarity index 100%
copy from patches/buildroot/2020.02/008-armadeus-add-gnash-package.patch
copy to patches/buildroot/2021.02/008-armadeus-add-gnash-package.patch
diff --git a/patches/buildroot/2015.02/009-armadeus-xc3sprog-new-package.patch b/patches/buildroot/2021.02/009-armadeus-xc3sprog-new-package.patch
similarity index 100%
copy from patches/buildroot/2015.02/009-armadeus-xc3sprog-new-package.patch
copy to patches/buildroot/2021.02/009-armadeus-xc3sprog-new-package.patch
diff --git a/patches/buildroot/2015.02/010-armadeus-sam7-pgm-ng-new-package.patch b/patches/buildroot/2021.02/010-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/2021.02/010-armadeus-sam7-pgm-ng-new-package.patch
diff --git a/patches/buildroot/2019.02/012-armadeus-add-tkinter-support-to-python.patch b/patches/buildroot/2021.02/012-armadeus-add-tkinter-support-to-python.patch
similarity index 100%
copy from patches/buildroot/2019.02/012-armadeus-add-tkinter-support-to-python.patch
copy to patches/buildroot/2021.02/012-armadeus-add-tkinter-support-to-python.patch
diff --git a/patches/buildroot/2019.02/014-armadeus-python-wx-add-package.patch b/patches/buildroot/2021.02/014-armadeus-python-wx-add-package.patch
similarity index 100%
copy from patches/buildroot/2019.02/014-armadeus-python-wx-add-package.patch
copy to patches/buildroot/2021.02/014-armadeus-python-wx-add-package.patch
diff --git a/patches/buildroot/2017.02/016-armadeus-add-gnuboy-package.patch b/patches/buildroot/2021.02/016-armadeus-add-gnuboy-package.patch
similarity index 93%
copy from patches/buildroot/2017.02/016-armadeus-add-gnuboy-package.patch
copy to patches/buildroot/2021.02/016-armadeus-add-gnuboy-package.patch
index b43b91560..c9a7f584e 100644
--- a/patches/buildroot/2017.02/016-armadeus-add-gnuboy-package.patch
+++ b/patches/buildroot/2021.02/016-armadeus-add-gnuboy-package.patch
@@ -4,10 +4,10 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -224,6 +224,7 @@ endmenu
- menu "Games"
- source "package/chocolate-doom/Config.in"
- source "package/doom-wad/Config.in"
+@@ -271,6 +271,7 @@ menu "Games"
+ source "package/flare-engine/Config.in"
+ source "package/flare-game/Config.in"
+ source "package/frotz/Config.in"
+ source "package/gnuboy/Config.in"
source "package/gnuchess/Config.in"
source "package/lbreakout2/Config.in"
diff --git a/patches/buildroot/2019.02/018-armadeus-add-pcidebug-package.patch b/patches/buildroot/2021.02/018-armadeus-add-pcidebug-package.patch
similarity index 100%
copy from patches/buildroot/2019.02/018-armadeus-add-pcidebug-package.patch
copy to patches/buildroot/2021.02/018-armadeus-add-pcidebug-package.patch
diff --git a/patches/buildroot/2019.02/019-armadeus-add-cmux-package.patch b/patches/buildroot/2021.02/019-armadeus-add-cmux-package.patch
similarity index 100%
copy from patches/buildroot/2019.02/019-armadeus-add-cmux-package.patch
copy to patches/buildroot/2021.02/019-armadeus-add-cmux-package.patch
diff --git a/patches/buildroot/2019.02/021-armadeus-add-sdl_water-package.patch b/patches/buildroot/2021.02/021-armadeus-add-sdl_water-package.patch
similarity index 100%
copy from patches/buildroot/2019.02/021-armadeus-add-sdl_water-package.patch
copy to patches/buildroot/2021.02/021-armadeus-add-sdl_water-package.patch
diff --git a/patches/buildroot/2016.08/025-armadeus-apf-config-add-package.patch b/patches/buildroot/2021.02/025-armadeus-apf-config-add-package.patch
similarity index 95%
copy from patches/buildroot/2016.08/025-armadeus-apf-config-add-package.patch
copy to patches/buildroot/2021.02/025-armadeus-apf-config-add-package.patch
index 05349b9bb..f7b783927 100644
--- a/patches/buildroot/2016.08/025-armadeus-apf-config-add-package.patch
+++ b/patches/buildroot/2021.02/025-armadeus-apf-config-add-package.patch
@@ -51,10 +51,10 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -345,6 +345,7 @@ endmenu
- source "package/a10disp/Config.in"
- source "package/acpid/Config.in"
+@@ -439,6 +439,7 @@ endmenu
+ source "package/altera-stapl/Config.in"
source "package/am335x-pru-package/Config.in"
+ source "package/apcupsd/Config.in"
+ source "package/apf-config/Config.in"
source "package/avrdude/Config.in"
source "package/bcache-tools/Config.in"
diff --git a/patches/buildroot/2019.02/029-armadeus-lora-forwarder-add-package.patch b/patches/buildroot/2021.02/029-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/2021.02/029-armadeus-lora-forwarder-add-package.patch
diff --git a/patches/buildroot/2016.08/030-armadeus-lmic-pi-add-package.patch b/patches/buildroot/2021.02/030-armadeus-lmic-pi-add-package.patch
similarity index 94%
copy from patches/buildroot/2016.08/030-armadeus-lmic-pi-add-package.patch
copy to patches/buildroot/2021.02/030-armadeus-lmic-pi-add-package.patch
index 5a8874b82..ea05f6bde 100644
--- a/patches/buildroot/2016.08/030-armadeus-lmic-pi-add-package.patch
+++ b/patches/buildroot/2021.02/030-armadeus-lmic-pi-add-package.patch
@@ -42,14 +42,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -1251,6 +1251,7 @@ menu "Networking"
- source "package/libwebsock/Config.in"
+@@ -1814,6 +1814,7 @@ menu "Networking"
source "package/libwebsockets/Config.in"
+ source "package/libyang/Config.in"
source "package/lksctp-tools/Config.in"
+ source "package/lmic-pi/Config.in"
+ source "package/mbuffer/Config.in"
source "package/mongoose/Config.in"
- source "package/neon/Config.in"
- source "package/norm/Config.in"
+ source "package/nanomsg/Config.in"
Index: buildroot/package/lmic-pi/Config.in
===================================================================
--- /dev/null
diff --git a/patches/buildroot/2020.02/031-armadeus-lepton-add-package.patch b/patches/buildroot/2021.02/031-armadeus-lepton-add-package.patch
similarity index 97%
copy from patches/buildroot/2020.02/031-armadeus-lepton-add-package.patch
copy to patches/buildroot/2021.02/031-armadeus-lepton-add-package.patch
index 848699ccb..ba8f749a2 100644
--- a/patches/buildroot/2020.02/031-armadeus-lepton-add-package.patch
+++ b/patches/buildroot/2021.02/031-armadeus-lepton-add-package.patch
@@ -54,11 +54,11 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -481,6 +481,7 @@ endmenu
+@@ -497,6 +497,7 @@ endmenu
source "package/iucode-tool/Config.in"
source "package/kbd/Config.in"
source "package/lcdproc/Config.in"
+ source "package/leptonmodule/Config.in"
+ source "package/libiec61850/Config.in"
source "package/libubootenv/Config.in"
source "package/libuio/Config.in"
- source "package/linux-backports/Config.in"
diff --git a/patches/buildroot/2017.02/031-armadeus-lepton-fix-makefile.patch b/patches/buildroot/2021.02/031-armadeus-lepton-fix-makefile.patch
similarity index 100%
copy from patches/buildroot/2017.02/031-armadeus-lepton-fix-makefile.patch
copy to patches/buildroot/2021.02/031-armadeus-lepton-fix-makefile.patch
diff --git a/patches/buildroot/2020.02/034-armadeus-add-slideshow-package.patch b/patches/buildroot/2021.02/034-armadeus-add-slideshow-package.patch
similarity index 100%
copy from patches/buildroot/2020.02/034-armadeus-add-slideshow-package.patch
copy to patches/buildroot/2021.02/034-armadeus-add-slideshow-package.patch
diff --git a/patches/buildroot/2019.02/035-armadeus-fixes-uclibc-build-with-ucontext.patch b/patches/buildroot/2021.02/035-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/2021.02/035-armadeus-fixes-uclibc-build-with-ucontext.patch
diff --git a/patches/buildroot/2019.02/038-armadeus-fb-test-fixes-tty-config-on-exit.patch b/patches/buildroot/2021.02/038-armadeus-fb-test-fixes-tty-config-on-exit.patch
similarity index 100%
copy from patches/buildroot/2019.02/038-armadeus-fb-test-fixes-tty-config-on-exit.patch
copy to patches/buildroot/2021.02/038-armadeus-fb-test-fixes-tty-config-on-exit.patch
diff --git a/patches/buildroot/2019.02/039-armadeus-add-sd8977-driver-and-firmware.patch b/patches/buildroot/2021.02/039-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/2021.02/039-armadeus-add-sd8977-driver-and-firmware.patch
diff --git a/patches/buildroot/2019.02/040-armadeus-add-thingerio-client-package.patch b/patches/buildroot/2021.02/040-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/2021.02/040-armadeus-add-thingerio-client-package.patch
diff --git a/patches/buildroot/2019.02/044-armadeus-expect-forces-unbuffer-instalation.patch b/patches/buildroot/2021.02/044-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/2021.02/044-armadeus-expect-forces-unbuffer-instalation.patch
diff --git a/patches/buildroot/2020.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch b/patches/buildroot/2021.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
similarity index 95%
copy from patches/buildroot/2020.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
copy to patches/buildroot/2021.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
index f351414bf..f1edba59c 100644
--- a/patches/buildroot/2020.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
+++ b/patches/buildroot/2021.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
@@ -6,12 +6,11 @@ Index: buildroot/package/gpsd/gpsd.mk
===================================================================
--- buildroot.orig/package/gpsd/gpsd.mk
+++ buildroot/package/gpsd/gpsd.mk
-@@ -24,10 +24,23 @@ GPSD_SCONS_OPTS = \
+@@ -24,9 +24,22 @@ GPSD_SCONS_OPTS = \
sysroot=$(STAGING_DIR) \
strip=no \
python=no \
- qt=no \
- ntpshm=yes \
systemd=$(if $(BR2_INIT_SYSTEMD),yes,no)
+ifeq ($(BR2_PACKAGE_GPSD_PYTHON),y)
@@ -35,7 +34,7 @@ Index: buildroot/package/gpsd/Config.in
===================================================================
--- buildroot.orig/package/gpsd/Config.in
+++ buildroot/package/gpsd/Config.in
-@@ -102,6 +102,9 @@ config BR2_PACKAGE_GPSD_CONTROLSEND
+@@ -99,6 +99,9 @@ config BR2_PACKAGE_GPSD_CONTROLSEND
config BR2_PACKAGE_GPSD_SQUELCH
bool "squelch gpsd_report and gpsd_hexdump to save cpu"
diff --git a/patches/buildroot/2019.02/050-U-Boot-add_support_for_custom_configuration_file.patch b/patches/buildroot/2021.02/050-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/2021.02/050-U-Boot-add_support_for_custom_configuration_file.patch
diff --git a/patches/buildroot/2019.02/081-adds_quake_package.patch b/patches/buildroot/2021.02/081-adds_quake_package.patch
similarity index 100%
copy from patches/buildroot/2019.02/081-adds_quake_package.patch
copy to patches/buildroot/2021.02/081-adds_quake_package.patch
diff --git a/patches/buildroot/2015.02/083-pygame-armadeus_addons.patch b/patches/buildroot/2021.02/083-pygame-armadeus_addons.patch
similarity index 100%
copy from patches/buildroot/2015.02/083-pygame-armadeus_addons.patch
copy to patches/buildroot/2021.02/083-pygame-armadeus_addons.patch
diff --git a/patches/buildroot/2017.02/107-armadeus-games-add-wolf4sdl-package.patch b/patches/buildroot/2021.02/107-armadeus-games-add-wolf4sdl-package.patch
similarity index 94%
copy from patches/buildroot/2017.02/107-armadeus-games-add-wolf4sdl-package.patch
copy to patches/buildroot/2021.02/107-armadeus-games-add-wolf4sdl-package.patch
index c9c0ab383..f69b82763 100644
--- a/patches/buildroot/2017.02/107-armadeus-games-add-wolf4sdl-package.patch
+++ b/patches/buildroot/2021.02/107-armadeus-games-add-wolf4sdl-package.patch
@@ -64,11 +64,11 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -229,6 +229,7 @@ menu "Games"
- source "package/sl/Config.in"
+@@ -289,6 +289,7 @@ menu "Games"
source "package/stella/Config.in"
+ source "package/supertux/Config.in"
source "package/supertuxkart/Config.in"
+ source "package/wolf4sdl/Config.in"
+ source "package/xorcurses/Config.in"
endmenu
- menu "Graphic libraries and applications (graphic/text)"
diff --git a/patches/buildroot/2019.02/118-armadeus-snes9x-add-package.patch b/patches/buildroot/2021.02/118-armadeus-snes9x-add-package.patch
similarity index 100%
copy from patches/buildroot/2019.02/118-armadeus-snes9x-add-package.patch
copy to patches/buildroot/2021.02/118-armadeus-snes9x-add-package.patch
diff --git a/patches/buildroot/2015.02/121-target-arm926t_is_arm926ej-s.patch b/patches/buildroot/2021.02/121-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/2021.02/121-target-arm926t_is_arm926ej-s.patch
diff --git a/patches/buildroot/2015.02/123-armadeus-pywebradio-add-package.patch b/patches/buildroot/2021.02/123-armadeus-pywebradio-add-package.patch
similarity index 100%
copy from patches/buildroot/2015.02/123-armadeus-pywebradio-add-package.patch
copy to patches/buildroot/2021.02/123-armadeus-pywebradio-add-package.patch
diff --git a/patches/buildroot/2019.02/124-e-uae-add_package.patch b/patches/buildroot/2021.02/124-e-uae-add_package.patch
similarity index 100%
copy from patches/buildroot/2019.02/124-e-uae-add_package.patch
copy to patches/buildroot/2021.02/124-e-uae-add_package.patch
diff --git a/patches/buildroot/2015.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch b/patches/buildroot/2021.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
similarity index 100%
copy from patches/buildroot/2015.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
copy to patches/buildroot/2021.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
diff --git a/patches/buildroot/2015.02/172-gsmmux-add_package.patch b/patches/buildroot/2021.02/172-gsmmux-add_package.patch
similarity index 100%
copy from patches/buildroot/2015.02/172-gsmmux-add_package.patch
copy to patches/buildroot/2021.02/172-gsmmux-add_package.patch
diff --git a/patches/buildroot/2019.02/176-imx-test-add_package.patch b/patches/buildroot/2021.02/176-imx-test-add_package.patch
similarity index 100%
copy from patches/buildroot/2019.02/176-imx-test-add_package.patch
copy to patches/buildroot/2021.02/176-imx-test-add_package.patch
diff --git a/patches/buildroot/2019.02/188-marble-add_package.patch b/patches/buildroot/2021.02/188-marble-add_package.patch
similarity index 100%
copy from patches/buildroot/2019.02/188-marble-add_package.patch
copy to patches/buildroot/2021.02/188-marble-add_package.patch
diff --git a/patches/buildroot/2019.02/201-armadeus-add_gnokii.patch b/patches/buildroot/2021.02/201-armadeus-add_gnokii.patch
similarity index 100%
copy from patches/buildroot/2019.02/201-armadeus-add_gnokii.patch
copy to patches/buildroot/2021.02/201-armadeus-add_gnokii.patch
diff --git a/patches/buildroot/2015.02/204-wpa-supplicant-add-option-ieee80211w.patch b/patches/buildroot/2021.02/204-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/2021.02/204-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/2021.02/205-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/2021.02/205-busybox-coreutils-stty-add-rs485-config-options.patch
diff --git a/patches/buildroot/2020.02/208-armadeus-add_beremiz.patch b/patches/buildroot/2021.02/208-armadeus-add_beremiz.patch
similarity index 98%
copy from patches/buildroot/2020.02/208-armadeus-add_beremiz.patch
copy to patches/buildroot/2021.02/208-armadeus-add_beremiz.patch
index f056c8cf3..360f4752c 100644
--- a/patches/buildroot/2020.02/208-armadeus-add_beremiz.patch
+++ b/patches/buildroot/2021.02/208-armadeus-add_beremiz.patch
@@ -9,14 +9,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -287,6 +287,7 @@ endmenu
+@@ -299,6 +299,7 @@ endmenu
menu "Graphic libraries and applications (graphic/text)"
comment "Graphic applications"
+ source "package/beremiz/Config.in"
+ source "package/cage/Config.in"
source "package/cog/Config.in"
source "package/fswebcam/Config.in"
- source "package/ghostscript/Config.in"
Index: buildroot/package/beremiz/Config.in
===================================================================
--- /dev/null
diff --git a/patches/buildroot/2015.02/209-armadeus-add_matiec.patch b/patches/buildroot/2021.02/209-armadeus-add_matiec.patch
similarity index 100%
copy from patches/buildroot/2015.02/209-armadeus-add_matiec.patch
copy to patches/buildroot/2021.02/209-armadeus-add_matiec.patch
diff --git a/patches/buildroot/2020.02/237-armadeus-busybox-speed-up-mdev.patch b/patches/buildroot/2021.02/237-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/2021.02/237-armadeus-busybox-speed-up-mdev.patch
diff --git a/patches/buildroot/2019.02/341-python-flask-socketio-new-package.patch b/patches/buildroot/2021.02/341-python-flask-socketio-new-package.patch
similarity index 100%
copy from patches/buildroot/2019.02/341-python-flask-socketio-new-package.patch
copy to patches/buildroot/2021.02/341-python-flask-socketio-new-package.patch
diff --git a/patches/buildroot/2020.02/378-package-x265-update-project-URL.patch b/patches/buildroot/2021.02/378-package-x265-update-project-URL.patch
similarity index 78%
copy from patches/buildroot/2020.02/378-package-x265-update-project-URL.patch
copy to patches/buildroot/2021.02/378-package-x265-update-project-URL.patch
index 67c6132ff..3bbd037c2 100644
--- a/patches/buildroot/2020.02/378-package-x265-update-project-URL.patch
+++ b/patches/buildroot/2021.02/378-package-x265-update-project-URL.patch
@@ -35,32 +35,20 @@ Index: buildroot/package/x265/Config.in
if BR2_PACKAGE_X265
-Index: buildroot/package/x265/x265.hash
-===================================================================
---- buildroot.orig/package/x265/x265.hash
-+++ buildroot/package/x265/x265.hash
-@@ -1,5 +1,4 @@
--# From https://mailman.videolan.org/pipermail/x265-devel/2019-October/012721.html
--md5 94808045a34d88a857e5eaf3f68f4bca x265_3.2.1.tar.gz
- # Locally generated
--sha256 fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc x265_3.2.1.tar.gz
-+md5 455bf1912a076392abf153d536870bbc x265_3.2.1.tar.gz
-+sha256 b68939625356459e7055b9589451689924f236bac8deba3db21e3c2fb062d328 x265_3.2.1.tar.gz
- sha256 d8afb1bcc7a2cfc603683b168d6987ef0a48e59e0da3693bf55c5d33b67e2b49 COPYING
Index: buildroot/package/x265/x265.mk
===================================================================
--- buildroot.orig/package/x265/x265.mk
+++ buildroot/package/x265/x265.mk
@@ -6,7 +6,7 @@
- X265_VERSION = 3.2.1
+ X265_VERSION = 3.3
X265_SOURCE = x265_$(X265_VERSION).tar.gz
-X265_SITE = https://bitbucket.org/multicoreware/x265/downloads
+X265_SITE = https://bitbucket.org/multicoreware/x265_git/downloads
X265_LICENSE = GPL-2.0+
X265_LICENSE_FILES = COPYING
- X265_SUBDIR = source
-@@ -18,7 +18,7 @@ X265_DEPENDENCIES += host-nasm
+ X265_CPE_ID_VENDOR = multicorewareinc
+@@ -19,7 +19,7 @@ X265_DEPENDENCIES += host-nasm
endif
# disable altivec, it has build issues
@@ -69,3 +57,15 @@ Index: buildroot/package/x265/x265.mk
ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y)
X265_CONF_OPTS += -DENABLE_ALTIVEC=OFF
endif
+Index: buildroot/package/x265/x265.hash
+===================================================================
+--- buildroot.orig/package/x265/x265.hash
++++ buildroot/package/x265/x265.hash
+@@ -1,5 +1,4 @@
+-# From https://mailman.videolan.org/pipermail/x265-devel/2020-February/012880.html
+-md5 0c8c747b59b5411dea8cf557554636c1 x265_3.3.tar.gz
+ # Locally generated
+-sha256 f26e148ed1f4dfb33fd1eb3ff5e60e08078d1b2017e88bcbb045b3fb58300b9c x265_3.3.tar.gz
++md5 be6ea7a139b01fa6f2614d5c1197492d x265_3.3.tar.gz
++sha256 c6d744a87eda55560da715f56f878640554ddc06e2d0fcbd822fa330affc22cc x265_3.3.tar.gz
+ sha256 d8afb1bcc7a2cfc603683b168d6987ef0a48e59e0da3693bf55c5d33b67e2b49 COPYING
diff --git a/patches/buildroot/2018.02/cleanup_buildroot.sh b/patches/buildroot/2021.02/cleanup_buildroot.sh
similarity index 66%
copy from patches/buildroot/2018.02/cleanup_buildroot.sh
copy to patches/buildroot/2021.02/cleanup_buildroot.sh
index 8d7edf75b..cee97fa8a 100755
--- a/patches/buildroot/2018.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2021.02/cleanup_buildroot.sh
@@ -13,12 +13,7 @@ rm -rf buildroot/Makefile
rm -rf buildroot/arch/Config.in.arm
rm -rf buildroot/boot/uboot/Config.in
rm -rf buildroot/boot/uboot/uboot.mk
-rm -rf buildroot/linux/Config.ext.in
-rm -rf buildroot/linux/linux-ext-xenomai.mk
rm -rf buildroot/package/Config.in
-rm -rf buildroot/package/abootimg/Config.in
-rm -rf buildroot/package/abootimg/abootimg.hash
-rm -rf buildroot/package/abootimg/abootimg.mk
rm -rf buildroot/package/agg/Config.in
rm -rf buildroot/package/agg/agg.mk
rm -rf buildroot/package/alsa-utils/alsa-utils.mk
@@ -27,28 +22,22 @@ rm -rf buildroot/package/apf-config/apf-config.mk
rm -rf buildroot/package/beremiz/Config.in
rm -rf buildroot/package/beremiz/beremiz.mk
rm -rf buildroot/package/beremiz/host-beremiz-fix_compare_and_swap_problem_to_be_removed_with_kernel_3.1.patch
-rm -rf buildroot/package/busybox/0006-rfkill-build.patch
rm -rf buildroot/package/busybox/0007-stty-Add-RS485-config-options.patch
rm -rf buildroot/package/busybox/S10mdev
-rm -rf buildroot/package/busybox/busybox.mk
-rm -rf buildroot/package/can-utils/can-utils.hash
-rm -rf buildroot/package/can-utils/can-utils.mk
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/cunit/Config.in
-rm -rf buildroot/package/cunit/cunit.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
rm -rf buildroot/package/expect/expect.mk
rm -rf buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.patch
-rm -rf buildroot/package/fbgrab/0002-fix-1.3-version.patch
rm -rf buildroot/package/gnash/Config.in
rm -rf buildroot/package/gnash/gnash.mk
rm -rf buildroot/package/gnokii/Config.in
rm -rf buildroot/package/gnokii/gnokii.mk
rm -rf buildroot/package/gnuboy/Config.in
rm -rf buildroot/package/gnuboy/gnuboy.mk
+rm -rf buildroot/package/gpsd/0002-SConstruct-python-gps-cross-build.patch
rm -rf buildroot/package/gpsd/Config.in
rm -rf buildroot/package/gpsd/S50gpsd
rm -rf buildroot/package/gpsd/gpsd.mk
@@ -59,37 +48,27 @@ rm -rf buildroot/package/imx-test/10.11.01/imx-test-02-mxc_vpu_test_v4l2_fixes.p
rm -rf buildroot/package/imx-test/5.4/0001-imx-test-fixes.patch
rm -rf buildroot/package/imx-test/Config.in
rm -rf buildroot/package/imx-test/imx-test.mk
-rm -rf buildroot/package/imx-usb-loader/Config.in
-rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
-rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
rm -rf buildroot/package/leptonmodule/0001-flirpi-add-missing-dependency-to-leptcam-target.patch
rm -rf buildroot/package/leptonmodule/Config.in
rm -rf buildroot/package/leptonmodule/leptonmodule.mk
-rm -rf buildroot/package/libmbim/libmbim.hash
-rm -rf buildroot/package/libmbim/libmbim.mk
-rm -rf buildroot/package/libqmi/libqmi.hash
-rm -rf buildroot/package/libqmi/libqmi.mk
-rm -rf buildroot/package/linux-headers/2.6.29.6/0001-net-Support-inclusion-of-linux-socket.h-before-sys-s.patch
-rm -rf buildroot/package/linux-headers/2.6.29.6/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
-rm -rf buildroot/package/linux-headers/2.6.35.3/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
+rm -rf buildroot/package/libopenssl/libopenssl.mk
rm -rf buildroot/package/lmic-pi/Config.in
rm -rf buildroot/package/lmic-pi/lmic-pi.mk
rm -rf buildroot/package/lora-forwarder/0001-fix-cross-compiling.patch
rm -rf buildroot/package/lora-forwarder/0002-add-server-ip-runtime-option.patch
rm -rf buildroot/package/lora-forwarder/Config.in
rm -rf buildroot/package/lora-forwarder/lora-forwarder.mk
-rm -rf buildroot/package/ltrace/Config.in
rm -rf buildroot/package/marble/Config.in
rm -rf buildroot/package/marble/marble.mk
rm -rf buildroot/package/matiec/Config.in
rm -rf buildroot/package/matiec/host-matiec-001-fix_bison_compilation_error.patch
rm -rf buildroot/package/matiec/matiec.mk
-rm -rf buildroot/package/modem-manager/modem-manager.hash
-rm -rf buildroot/package/modem-manager/modem-manager.mk
-rm -rf buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch
-rm -rf buildroot/package/openssh/openssh.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/python-flask-socketio/Config.in
+rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.hash
+rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.mk
rm -rf buildroot/package/python-pygame/Config.in
rm -rf buildroot/package/python-wx/Config.in
rm -rf buildroot/package/python-wx/python-wx-001-fix_wxconfig.patch
@@ -100,22 +79,15 @@ rm -rf buildroot/package/pywebradio/Config.in
rm -rf buildroot/package/pywebradio/pywebradio.mk
rm -rf buildroot/package/quake-pak/Config.in
rm -rf buildroot/package/quake-pak/quake-pak.mk
-rm -rf buildroot/package/rxtx/Config.in
-rm -rf buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
-rm -rf buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
-rm -rf buildroot/package/rxtx/rxtx.mk
rm -rf buildroot/package/sam7-pgm-ng/Config.in
rm -rf buildroot/package/sam7-pgm-ng/sam7-pgm-ng.mk
+rm -rf buildroot/package/sd8977/Config.in
+rm -rf buildroot/package/sd8977/sd8977.mk
rm -rf buildroot/package/sdl_water/Config.in
rm -rf buildroot/package/sdl_water/sdl_water.mk
rm -rf buildroot/package/sdlquake/Config.in
rm -rf buildroot/package/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
rm -rf buildroot/package/sdlquake/sdlquake.mk
-rm -rf buildroot/package/shiboken/Config.in
-rm -rf buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch
-rm -rf buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch
-rm -rf buildroot/package/shiboken/shiboken-1.2.2-fix_shiboken_config_dir.patch
-rm -rf buildroot/package/shiboken/shiboken.mk
rm -rf buildroot/package/slideshow/Config.in
rm -rf buildroot/package/slideshow/slideshow-01-restart-after-end.patch
rm -rf buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
@@ -125,19 +97,18 @@ rm -rf buildroot/package/slideshow/slideshow.mk
rm -rf buildroot/package/snes9x/Config.in
rm -rf buildroot/package/snes9x/snes9x-1.39-compile.patch
rm -rf buildroot/package/snes9x/snes9x.mk
-rm -rf buildroot/package/stress-ng/stress-ng.hash
-rm -rf buildroot/package/stress-ng/stress-ng.mk
-rm -rf buildroot/package/tk/Config.in
-rm -rf buildroot/package/tk/tk.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/wolf4sdl/Config.in
rm -rf buildroot/package/wolf4sdl/wolf4sdl.mk
rm -rf buildroot/package/wpa_supplicant/Config.in
rm -rf buildroot/package/wpa_supplicant/wpa_supplicant.mk
+rm -rf buildroot/package/x265/Config.in
+rm -rf buildroot/package/x265/x265.hash
+rm -rf buildroot/package/x265/x265.mk
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/xenomai/Config.in
-rm -rf buildroot/package/xenomai/xenomai.mk
rm -rf buildroot/system/Config.in
-rm -rf buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-04-06 17:01: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 6e33f21ca6e7119a142206c9c12adf8be5c68625 (commit)
via 63315f93cc2955dee7677e97e9662ca74c5721ff (commit)
from 5a080fe7aff54ede5fb1bae0eacb0fb0d944d3f4 (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 6e33f21ca6e7119a142206c9c12adf8be5c68625
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Apr 6 12:09:20 2021 +0200
[LINUX] 4.9.legacy: patches to fix building with recent make
commit 63315f93cc2955dee7677e97e9662ca74c5721ff
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Apr 6 10:39:38 2021 +0200
[LINUX] 4.9.legacy: patch to fix kernel building on host with GCC 10
-----------------------------------------------------------------------
Summary of changes:
...-Remove-redundant-YYLOC-global-declaratio.patch | 70 +++++++++++
...ix-escaping-in-.cmd-files-for-future-Make.patch | 133 +++++++++++++++++++++
...-fix-escaping-in-.cmd-files-for-future-Ma.patch | 62 ++++++++++
3 files changed, 265 insertions(+)
create mode 100644 patches/linux/4.9.mx6_legacy/0817-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch
create mode 100644 patches/linux/4.9.mx6_legacy/0818-Kbuild-fix-escaping-in-.cmd-files-for-future-Make.patch
create mode 100644 patches/linux/4.9.mx6_legacy/0819-tools-build-fix-escaping-in-.cmd-files-for-future-Ma.patch
diff --git a/patches/linux/4.9.mx6_legacy/0817-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/patches/linux/4.9.mx6_legacy/0817-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch
new file mode 100644
index 000000000..0ae83d291
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0817-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch
@@ -0,0 +1,70 @@
+From 8e8ab8554aa4988db5e1028fbd02c51af676a7f2 Mon Sep 17 00:00:00 2001
+From: Dirk Mueller <dmu...@su...>
+Date: Tue, 14 Jan 2020 18:53:41 +0100
+Subject: [PATCH 1/1] scripts/dtc: Remove redundant YYLOC global declaration
+
+commit e33a814e772cdc36436c8c188d8c42d019fda639 upstream.
+
+gcc 10 will default to -fno-common, which causes this error at link
+time:
+
+ (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here
+
+This is because both dtc-lexer as well as dtc-parser define the same
+global symbol yyloc. Before with -fcommon those were merged into one
+defintion. The proper solution would be to to mark this as "extern",
+however that leads to:
+
+ dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls]
+ 26 | extern YYLTYPE yylloc;
+ | ^~~~~~
+In file included from dtc-lexer.l:24:
+dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here
+ 127 | extern YYLTYPE yylloc;
+ | ^~~~~~
+cc1: all warnings being treated as errors
+
+which means the declaration is completely redundant and can just be
+dropped.
+
+Signed-off-by: Dirk Mueller <dmu...@su...>
+Signed-off-by: David Gibson <da...@gi...>
+[robh: cherry-pick from upstream]
+Cc: st...@vg...
+Signed-off-by: Rob Herring <ro...@ke...>
+[nc: Also apply to dtc-lexer.lex.c_shipped due to a lack of
+ e039139be8c2, where dtc-lexer.l started being used]
+Signed-off-by: Nathan Chancellor <nat...@gm...>
+Signed-off-by: Greg Kroah-Hartman <gr...@li...>
+---
+ scripts/dtc/dtc-lexer.l | 1 -
+ scripts/dtc/dtc-lexer.lex.c_shipped | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
+index 790fbf6cf2d7..e4e0f6a8d07b 100644
+--- a/scripts/dtc/dtc-lexer.l
++++ b/scripts/dtc/dtc-lexer.l
+@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+
+-YYLTYPE yylloc;
+ extern bool treesource_error;
+
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped
+index ba525c2f9fc2..750f7a4e3ece 100644
+--- a/scripts/dtc/dtc-lexer.lex.c_shipped
++++ b/scripts/dtc/dtc-lexer.lex.c_shipped
+@@ -637,7 +637,6 @@ char *yytext;
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+
+-YYLTYPE yylloc;
+ extern bool treesource_error;
+
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+--
+2.26.3
+
diff --git a/patches/linux/4.9.mx6_legacy/0818-Kbuild-fix-escaping-in-.cmd-files-for-future-Make.patch b/patches/linux/4.9.mx6_legacy/0818-Kbuild-fix-escaping-in-.cmd-files-for-future-Make.patch
new file mode 100644
index 000000000..ad45c7e74
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0818-Kbuild-fix-escaping-in-.cmd-files-for-future-Make.patch
@@ -0,0 +1,133 @@
+From b5d7d7d919f1708f2645739d37dc19747ac0ab5b Mon Sep 17 00:00:00 2001
+From: Rasmus Villemoes <li...@ra...>
+Date: Sun, 8 Apr 2018 23:35:28 +0200
+Subject: [PATCH 1/1] Kbuild: fix # escaping in .cmd files for future Make
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+commit 9564a8cf422d7b58f6e857e3546d346fa970191e upstream.
+
+I tried building using a freshly built Make (4.2.1-69-g8a731d1), but
+already the objtool build broke with
+
+orc_dump.c: In function âorc_dumpâ:
+orc_dump.c:106:2: error: âelf_getshnumâ is deprecated [-Werror=deprecated-declarations]
+ if (elf_getshdrnum(elf, &nr_sections)) {
+
+Turns out that with that new Make, the backslash was not removed, so cpp
+didn't see a #include directive, grep found nothing, and
+-DLIBELF_USE_DEPRECATED was wrongly put in CFLAGS.
+
+Now, that new Make behaviour is documented in their NEWS file:
+
+ * WARNING: Backward-incompatibility!
+ Number signs (#) appearing inside a macro reference or function invocation
+ no longer introduce comments and should not be escaped with backslashes:
+ thus a call such as:
+ foo := $(shell echo '#')
+ is legal. Previously the number sign needed to be escaped, for example:
+ foo := $(shell echo '\#')
+ Now this latter will resolve to "\#". If you want to write makefiles
+ portable to both versions, assign the number sign to a variable:
+ C := \#
+ foo := $(shell echo '$C')
+ This was claimed to be fixed in 3.81, but wasn't, for some reason.
+ To detect this change search for 'nocomment' in the .FEATURES variable.
+
+This also fixes up the two make-cmd instances to replace # with $(pound)
+rather than with \#. There might very well be other places that need
+similar fixup in preparation for whatever future Make release contains
+the above change, but at least this builds an x86_64 defconfig with the
+new make.
+
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=197847
+Cc: Randy Dunlap <rd...@in...>
+Signed-off-by: Rasmus Villemoes <li...@ra...>
+Signed-off-by: Masahiro Yamada <yam...@so...>
+Signed-off-by: Greg Kroah-Hartman <gr...@li...>
+---
+ scripts/Kbuild.include | 5 +++--
+ tools/build/Build.include | 5 +++--
+ tools/objtool/Makefile | 2 +-
+ tools/scripts/Makefile.include | 2 ++
+ 4 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
+index 179219845dfc..63774307a751 100644
+--- a/scripts/Kbuild.include
++++ b/scripts/Kbuild.include
+@@ -8,6 +8,7 @@ squote := '
+ empty :=
+ space := $(empty) $(empty)
+ space_escape := _-_SPACE_-_
++pound := \#
+
+ ###
+ # Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o
+@@ -241,11 +242,11 @@ endif
+
+ # Replace >$< with >$$< to preserve $ when reloading the .cmd file
+ # (needed for make)
+-# Replace >#< with >\#< to avoid starting a comment in the .cmd file
++# Replace >#< with >$(pound)< to avoid starting a comment in the .cmd file
+ # (needed for make)
+ # Replace >'< with >'\''< to be able to enclose the whole string in '...'
+ # (needed for the shell)
+-make-cmd = $(call escsq,$(subst \#,\\\#,$(subst $$,$$$$,$(cmd_$(1)))))
++make-cmd = $(call escsq,$(subst $(pound),$$(pound),$(subst $$,$$$$,$(cmd_$(1)))))
+
+ # Find any prerequisites that is newer than target or that does not exist.
+ # PHONY targets skipped in both cases.
+diff --git a/tools/build/Build.include b/tools/build/Build.include
+index 1dcb95e76f70..b8165545ddf6 100644
+--- a/tools/build/Build.include
++++ b/tools/build/Build.include
+@@ -12,6 +12,7 @@
+ # Convenient variables
+ comma := ,
+ squote := '
++pound := \#
+
+ ###
+ # Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o
+@@ -43,11 +44,11 @@ echo-cmd = $(if $($(quiet)cmd_$(1)),\
+ ###
+ # Replace >$< with >$$< to preserve $ when reloading the .cmd file
+ # (needed for make)
+-# Replace >#< with >\#< to avoid starting a comment in the .cmd file
++# Replace >#< with >$(pound)< to avoid starting a comment in the .cmd file
+ # (needed for make)
+ # Replace >'< with >'\''< to be able to enclose the whole string in '...'
+ # (needed for the shell)
+-make-cmd = $(call escsq,$(subst \#,\\\#,$(subst $$,$$$$,$(cmd_$(1)))))
++make-cmd = $(call escsq,$(subst $(pound),$$(pound),$(subst $$,$$$$,$(cmd_$(1)))))
+
+ ###
+ # Find any prerequisites that is newer than target or that does not exist.
+diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
+index e6acc281dd37..8ae824dbfca3 100644
+--- a/tools/objtool/Makefile
++++ b/tools/objtool/Makefile
+@@ -35,7 +35,7 @@ CFLAGS += -Wall -Werror $(WARNINGS) -fomit-frame-pointer -O2 -g $(INCLUDES)
+ LDFLAGS += -lelf $(LIBSUBCMD)
+
+ # Allow old libelf to be used:
+-elfshdr := $(shell echo '\#include <libelf.h>' | $(CC) $(CFLAGS) -x c -E - | grep elf_getshdr)
++elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(CC) $(CFLAGS) -x c -E - | grep elf_getshdr)
+ CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED)
+
+ AWK = awk
+diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include
+index 19edc1a7a232..7ea4438b801d 100644
+--- a/tools/scripts/Makefile.include
++++ b/tools/scripts/Makefile.include
+@@ -92,3 +92,5 @@ ifneq ($(silent),1)
+ QUIET_INSTALL = @printf ' INSTALL %s\n' $1;
+ endif
+ endif
++
++pound := \#
+--
+2.26.3
+
diff --git a/patches/linux/4.9.mx6_legacy/0819-tools-build-fix-escaping-in-.cmd-files-for-future-Ma.patch b/patches/linux/4.9.mx6_legacy/0819-tools-build-fix-escaping-in-.cmd-files-for-future-Ma.patch
new file mode 100644
index 000000000..88f6110cf
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0819-tools-build-fix-escaping-in-.cmd-files-for-future-Ma.patch
@@ -0,0 +1,62 @@
+From 36c038f0a97edc9f76000f6238a37c8dd16781cb Mon Sep 17 00:00:00 2001
+From: Paul Menzel <pm...@mo...>
+Date: Tue, 5 Jun 2018 19:00:22 +0200
+Subject: [PATCH 1/1] tools build: fix # escaping in .cmd files for future Make
+
+commit 9feeb638cde083c737e295c0547f1b4f28e99583 upstream.
+
+In 2016 GNU Make made a backwards incompatible change to the way '#'
+characters were handled in Makefiles when used inside functions or
+macros:
+
+http://git.savannah.gnu.org/cgit/make.git/commit/?id=c6966b323811c37acedff05b57
+
+Due to this change, when attempting to run `make prepare' I get a
+spurious make syntax error:
+
+ /home/earnest/linux/tools/objtool/.fixdep.o.cmd:1: *** missing separator. Stop.
+
+When inspecting `.fixdep.o.cmd' it includes two lines which use
+unescaped comment characters at the top:
+
+ \# cannot find fixdep (/home/earnest/linux/tools/objtool//fixdep)
+ \# using basic dep data
+
+This is because `tools/build/Build.include' prints these '\#'
+characters:
+
+ printf '\# cannot find fixdep (%s)\n' $(fixdep) > $(dot-target).cmd; \
+ printf '\# using basic dep data\n\n' >> $(dot-target).cmd; \
+
+This completes commit 9564a8cf422d ("Kbuild: fix # escaping in .cmd files
+for future Make").
+
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=197847
+Cc: Randy Dunlap <rd...@in...>
+Cc: Rasmus Villemoes <li...@ra...>
+Cc: st...@vg...
+Signed-off-by: Paul Menzel <pm...@mo...>
+Signed-off-by: Masahiro Yamada <yam...@so...>
+Signed-off-by: Greg Kroah-Hartman <gr...@li...>
+---
+ tools/build/Build.include | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/build/Build.include b/tools/build/Build.include
+index b8165545ddf6..ab02f8df0d56 100644
+--- a/tools/build/Build.include
++++ b/tools/build/Build.include
+@@ -63,8 +63,8 @@ dep-cmd = $(if $(wildcard $(fixdep)),
+ $(fixdep) $(depfile) $@ '$(make-cmd)' > $(dot-target).tmp; \
+ rm -f $(depfile); \
+ mv -f $(dot-target).tmp $(dot-target).cmd, \
+- printf '\# cannot find fixdep (%s)\n' $(fixdep) > $(dot-target).cmd; \
+- printf '\# using basic dep data\n\n' >> $(dot-target).cmd; \
++ printf '$(pound) cannot find fixdep (%s)\n' $(fixdep) > $(dot-target).cmd; \
++ printf '$(pound) using basic dep data\n\n' >> $(dot-target).cmd; \
+ cat $(depfile) >> $(dot-target).cmd; \
+ printf '%s\n' 'cmd_$@ := $(make-cmd)' >> $(dot-target).cmd)
+
+--
+2.26.3
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-04-06 16:58:58
|
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, 6e33f21ca6e7119a142206c9c12adf8be5c68625 has been deleted
was 0e1134590081aa8fe115f76babeced145cf3cb7a
-----------------------------------------------------------------------
0e1134590081aa8fe115f76babeced145cf3cb7a [BUILDROOT] Prepare patches to BR 2021.02
-----------------------------------------------------------------------
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-04-06 16:55:47
|
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, 6e33f21ca6e7119a142206c9c12adf8be5c68625 has been created
at 0e1134590081aa8fe115f76babeced145cf3cb7a (commit)
- Log -----------------------------------------------------------------
commit 0e1134590081aa8fe115f76babeced145cf3cb7a
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Apr 5 22:56:30 2021 +0200
[BUILDROOT] Prepare patches to BR 2021.02
commit 6e33f21ca6e7119a142206c9c12adf8be5c68625
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Apr 6 12:09:20 2021 +0200
[LINUX] 4.9.legacy: patches to fix building with recent make
commit 63315f93cc2955dee7677e97e9662ca74c5721ff
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Apr 6 10:39:38 2021 +0200
[LINUX] 4.9.legacy: patch to fix kernel building on host with GCC 10
-----------------------------------------------------------------------
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-03-24 13:46:43
|
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 5a080fe7aff54ede5fb1bae0eacb0fb0d944d3f4 (commit)
from 1937158bd1a9facd9b153a83f4d067497fe1c302 (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 5a080fe7aff54ede5fb1bae0eacb0fb0d944d3f4
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Mar 24 14:36:11 2021 +0100
[U-BOOT] opos6ul*: bump to 5f63b6d5ae18fb7dde758b425a19cd5bc4f9e6a2
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul-preempt-rt_defconfig | 2 +-
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ullegacy-4.14_defconfig | 2 +-
buildroot/configs/opos6ullegacy-4.1_defconfig | 2 +-
buildroot/configs/opos6ullegacy-4.9_defconfig | 2 +-
buildroot/configs/opos6ulnano-preempt-rt_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/buildroot/configs/opos6ul-preempt-rt_defconfig b/buildroot/configs/opos6ul-preempt-rt_defconfig
index 2fc04431c..2a40d924f 100644
--- a/buildroot/configs/opos6ul-preempt-rt_defconfig
+++ b/buildroot/configs/opos6ul-preempt-rt_defconfig
@@ -126,7 +126,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.code.sf.net/p/armadeus/u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="175d7b94a15d705cccbd6bad4f214fea40383cef"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="5f63b6d5ae18fb7dde758b425a19cd5bc4f9e6a2"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6uldev"
BR2_TARGET_UBOOT_NEEDS_DTC=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index be77dd937..dccb3bfc5 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -137,7 +137,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.code.sf.net/p/armadeus/u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="175d7b94a15d705cccbd6bad4f214fea40383cef"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="5f63b6d5ae18fb7dde758b425a19cd5bc4f9e6a2"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6uldev"
BR2_TARGET_UBOOT_NEEDS_DTC=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
diff --git a/buildroot/configs/opos6ullegacy-4.14_defconfig b/buildroot/configs/opos6ullegacy-4.14_defconfig
index 8a7d52ff7..6c032803c 100644
--- a/buildroot/configs/opos6ullegacy-4.14_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.14_defconfig
@@ -174,7 +174,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.code.sf.net/p/armadeus/u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="175d7b94a15d705cccbd6bad4f214fea40383cef"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="5f63b6d5ae18fb7dde758b425a19cd5bc4f9e6a2"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6uldev"
BR2_TARGET_UBOOT_NEEDS_DTC=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
diff --git a/buildroot/configs/opos6ullegacy-4.1_defconfig b/buildroot/configs/opos6ullegacy-4.1_defconfig
index 6c052d782..e2bb69328 100644
--- a/buildroot/configs/opos6ullegacy-4.1_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.1_defconfig
@@ -168,7 +168,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.code.sf.net/p/armadeus/u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="175d7b94a15d705cccbd6bad4f214fea40383cef"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="5f63b6d5ae18fb7dde758b425a19cd5bc4f9e6a2"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6uldev"
BR2_TARGET_UBOOT_NEEDS_DTC=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
diff --git a/buildroot/configs/opos6ullegacy-4.9_defconfig b/buildroot/configs/opos6ullegacy-4.9_defconfig
index a74611c92..13d920d52 100644
--- a/buildroot/configs/opos6ullegacy-4.9_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.9_defconfig
@@ -171,7 +171,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.code.sf.net/p/armadeus/u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="175d7b94a15d705cccbd6bad4f214fea40383cef"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="5f63b6d5ae18fb7dde758b425a19cd5bc4f9e6a2"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6uldev"
BR2_TARGET_UBOOT_NEEDS_DTC=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
diff --git a/buildroot/configs/opos6ulnano-preempt-rt_defconfig b/buildroot/configs/opos6ulnano-preempt-rt_defconfig
index df1e1616f..4477b0c98 100644
--- a/buildroot/configs/opos6ulnano-preempt-rt_defconfig
+++ b/buildroot/configs/opos6ulnano-preempt-rt_defconfig
@@ -127,7 +127,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_BOARDNAME="opos6ulnanodev"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.code.sf.net/p/armadeus/u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="175d7b94a15d705cccbd6bad4f214fea40383cef"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="5f63b6d5ae18fb7dde758b425a19cd5bc4f9e6a2"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6ulnanodev"
BR2_TARGET_UBOOT_NEEDS_DTC=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index b24726d0b..52ce4266b 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -140,7 +140,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_BOARDNAME="opos6ulnanodev"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.code.sf.net/p/armadeus/u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="175d7b94a15d705cccbd6bad4f214fea40383cef"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="5f63b6d5ae18fb7dde758b425a19cd5bc4f9e6a2"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6ulnanodev"
BR2_TARGET_UBOOT_NEEDS_DTC=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index 53af107b9..422a96b29 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -137,7 +137,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.code.sf.net/p/armadeus/u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="175d7b94a15d705cccbd6bad4f214fea40383cef"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="5f63b6d5ae18fb7dde758b425a19cd5bc4f9e6a2"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6ulspdev"
BR2_TARGET_UBOOT_NEEDS_DTC=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-03-24 13:19: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 "UNNAMED PROJECT".
The branch, opos6ul-2018.05 has been updated
via 5f63b6d5ae18fb7dde758b425a19cd5bc4f9e6a2 (commit)
via 524f449e18d55720abda62338b5d369d03d80cbc (commit)
from c2e3fc055aca24f259977a89de3a20625ad2b42a (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 5f63b6d5ae18fb7dde758b425a19cd5bc4f9e6a2
Author: Peter Robinson <pbr...@gm...>
Date: Thu Jan 30 09:37:15 2020 +0000
Remove redundant YYLOC global declaration
Same as the upstream fix for building dtc with gcc 10.
Signed-off-by: Peter Robinson <pbr...@gm...>
(cherry picked from commit 018921ee79d3f30893614b3b2b63b588d8544f73)
[Sébastien Szymanski: remove the declaration from dtc-lexer.lex.c_shipped]
commit 524f449e18d55720abda62338b5d369d03d80cbc
Author: Gildas PRIME <gil...@bi...>
Date: Mon Mar 22 22:10:18 2021 +0100
opos6ulsp: fix eeprom compatible
Signed-off-by: Gildas PRIME <gil...@bi...>
-----------------------------------------------------------------------
Summary of changes:
arch/arm/dts/imx6ul-imx6ull-opos6ulsp.dtsi | 2 +-
scripts/dtc/dtc-lexer.l | 1 -
scripts/dtc/dtc-lexer.lex.c_shipped | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/arm/dts/imx6ul-imx6ull-opos6ulsp.dtsi b/arch/arm/dts/imx6ul-imx6ull-opos6ulsp.dtsi
index aef07954bb..bb431c43fc 100644
--- a/arch/arm/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+++ b/arch/arm/dts/imx6ul-imx6ull-opos6ulsp.dtsi
@@ -96,7 +96,7 @@
status = "okay";
eeprom@50 {
- compatible = "atmel,24c00";
+ compatible = "atmel,24c02";
reg = <0x50>;
};
};
diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
index fd825ebba6..24af549977 100644
--- a/scripts/dtc/dtc-lexer.l
+++ b/scripts/dtc/dtc-lexer.l
@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n
#include "srcpos.h"
#include "dtc-parser.tab.h"
-YYLTYPE yylloc;
extern bool treesource_error;
/* CAUTION: this will stop working if we ever use yyless() or yyunput() */
diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped
index 011bb9632f..79952cd3ca 100644
--- a/scripts/dtc/dtc-lexer.lex.c_shipped
+++ b/scripts/dtc/dtc-lexer.lex.c_shipped
@@ -631,7 +631,6 @@ char *yytext;
#include "srcpos.h"
#include "dtc-parser.tab.h"
-YYLTYPE yylloc;
extern bool treesource_error;
/* CAUTION: this will stop working if we ever use yyless() or yyunput() */
hooks/post-receive
--
UNNAMED PROJECT
|
|
From: Sébastien S. <ss...@us...> - 2021-03-12 08:01: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 1937158bd1a9facd9b153a83f4d067497fe1c302 (commit)
from d08f28c3e893abe1b5c9ec13701a8aa73ba99aa7 (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 1937158bd1a9facd9b153a83f4d067497fe1c302
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Mar 12 09:00:39 2021 +0100
[BUILDROOT] ops8mm: enable BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos8mm-legacy-5.4_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/buildroot/configs/opos8mm-legacy-5.4_defconfig b/buildroot/configs/opos8mm-legacy-5.4_defconfig
index 967fc88f6..167b94f7e 100644
--- a/buildroot/configs/opos8mm-legacy-5.4_defconfig
+++ b/buildroot/configs/opos8mm-legacy-5.4_defconfig
@@ -28,6 +28,7 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-l
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-opos8mmdev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
BR2_PACKAGE_LINUX_TOOLS_GPIO=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-03-11 15:38:14
|
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 d08f28c3e893abe1b5c9ec13701a8aa73ba99aa7 (commit)
from 3a59efd3d3e5b10c616240a44f46a28421d3f1f5 (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 d08f28c3e893abe1b5c9ec13701a8aa73ba99aa7
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Mar 11 16:37:41 2021 +0100
[LINUX] 4.19: opos6ulsp: fix eeprom compatible
-----------------------------------------------------------------------
Summary of changes:
.../0810-armadeus-opos6ulsp-fix-eeprom-compatible.patch | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 patches/linux/4.19/0810-armadeus-opos6ulsp-fix-eeprom-compatible.patch
diff --git a/patches/linux/4.19/0810-armadeus-opos6ulsp-fix-eeprom-compatible.patch b/patches/linux/4.19/0810-armadeus-opos6ulsp-fix-eeprom-compatible.patch
new file mode 100644
index 000000000..796a2b1cc
--- /dev/null
+++ b/patches/linux/4.19/0810-armadeus-opos6ulsp-fix-eeprom-compatible.patch
@@ -0,0 +1,13 @@
+Index: linux-4.19.169/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+===================================================================
+--- linux-4.19.169.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
++++ linux-4.19.169/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+@@ -96,7 +96,7 @@
+ status = "okay";
+
+ eeprom@50 {
+- compatible = "atmel,24c00";
++ compatible = "atmel,24c02";
+ reg = <0x50>;
+ };
+ };
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-02-25 12:20:35
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 3a59efd3d3e5b10c616240a44f46a28421d3f1f5 (commit)
from f9d24947aa90f2f7b2db04c57ef300fc10074a41 (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 3a59efd3d3e5b10c616240a44f46a28421d3f1f5
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 25 13:16:17 2021 +0100
[BUILDROOT] Bump BR to 2020.02.11
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index ec62f8f07..fceeb3b9c 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2020.02
-BUILDROOT_MINOR_VERSION ?= 10
+BUILDROOT_MINOR_VERSION ?= 11
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-02-25 08:23:52
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f9d24947aa90f2f7b2db04c57ef300fc10074a41 (commit)
via 70602ecaaf232e6879e3e673f642a8a1ae5ed040 (commit)
from a1cd69090674d0ac9948870df72a341cd3488611 (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 f9d24947aa90f2f7b2db04c57ef300fc10074a41
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 25 09:23:32 2021 +0100
[LINUX] opos8mm: enable RFKILL
commit 70602ecaaf232e6879e3e673f642a8a1ae5ed040
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 25 09:22:09 2021 +0100
[PATCH] 5.4.imx_legacy: opos8mm: add OOB IRQ on WiFi
-----------------------------------------------------------------------
Summary of changes:
.../opos8mm/opos8mm-linux-legacy-5.4_defconfig | 2 ++
...dts-imx8mm-opos8mm-enable-OOB-IRQ-on-WiFi.patch | 40 ++++++++++++++++++++++
2 files changed, 42 insertions(+)
create mode 100644 patches/linux/5.4.imx_legacy/0545-arm64-dts-imx8mm-opos8mm-enable-OOB-IRQ-on-WiFi.patch
diff --git a/buildroot/target/device/armadeus/opos8mm/opos8mm-linux-legacy-5.4_defconfig b/buildroot/target/device/armadeus/opos8mm/opos8mm-linux-legacy-5.4_defconfig
index 3e53f8f3e..631565e96 100644
--- a/buildroot/target/device/armadeus/opos8mm/opos8mm-linux-legacy-5.4_defconfig
+++ b/buildroot/target/device/armadeus/opos8mm/opos8mm-linux-legacy-5.4_defconfig
@@ -151,6 +151,8 @@ CONFIG_NL80211_TESTMODE=y
CONFIG_CFG80211_WEXT=y
CONFIG_MAC80211=m
CONFIG_MAC80211_LEDS=y
+CONFIG_RFKILL=y
+CONFIG_RFKILL_GPIO=m
CONFIG_NET_9P=y
CONFIG_PCI=y
CONFIG_PCIEPORTBUS=y
diff --git a/patches/linux/5.4.imx_legacy/0545-arm64-dts-imx8mm-opos8mm-enable-OOB-IRQ-on-WiFi.patch b/patches/linux/5.4.imx_legacy/0545-arm64-dts-imx8mm-opos8mm-enable-OOB-IRQ-on-WiFi.patch
new file mode 100644
index 000000000..3b2367aa4
--- /dev/null
+++ b/patches/linux/5.4.imx_legacy/0545-arm64-dts-imx8mm-opos8mm-enable-OOB-IRQ-on-WiFi.patch
@@ -0,0 +1,40 @@
+From 636507c84e4e393a56d06ea1644910fad5ef6b10 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Wed, 24 Feb 2021 17:38:19 +0100
+Subject: [PATCH 545/545] arm64: dts: imx8mm-opos8mm: enable OOB IRQ on WiFi
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm64/boot/dts/freescale/imx8mm-opos8mm.dtsi | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/freescale/imx8mm-opos8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm-opos8mm.dtsi
+index 064d4f9ac512..a96e7b66dbd3 100644
+--- a/arch/arm64/boot/dts/freescale/imx8mm-opos8mm.dtsi
++++ b/arch/arm64/boot/dts/freescale/imx8mm-opos8mm.dtsi
+@@ -102,6 +102,9 @@
+ brcmf: wifi@1 {
+ compatible = "brcm,bcm4329-fmac";
+ reg = <1>;
++ interrupt-parent = <&gpio3>;
++ interrupts = <5 IRQ_TYPE_LEVEL_LOW>;
++ interrupt-names = "host-wake";
+ };
+ };
+
+@@ -354,6 +357,8 @@
+ MX8MM_IOMUXC_NAND_DATA07_USDHC3_DATA3 0x92
+ /* WLAN_EN */
+ MX8MM_IOMUXC_NAND_RE_B_GPIO3_IO15 0x92
++ /* WLAN_GPIO0 */
++ MX8MM_IOMUXC_NAND_CLE_GPIO3_IO5 0x90
+ >;
+ };
+
+--
+2.26.2
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-02-15 09:52:14
|
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 a1cd69090674d0ac9948870df72a341cd3488611 (commit)
via 216ab962c24edbc4bbc573ca0dad855edd7eeac7 (commit)
from 662a9e3533d06b3d55ad1e64d2ad377440093eed (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 a1cd69090674d0ac9948870df72a341cd3488611
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Feb 15 10:52:10 2021 +0100
[BUILDROOT] 2020.02: fix patch 378
commit 216ab962c24edbc4bbc573ca0dad855edd7eeac7
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Feb 15 10:46:35 2021 +0100
[PATCH] 5.4.imx_legacy: -x on patches 0543 and 0544
-----------------------------------------------------------------------
Summary of changes:
.../378-package-x265-update-project-URL.patch | 50 ++++++++++++++--------
patches/buildroot/2020.02/cleanup_buildroot.sh | 1 +
...emove-quota-limit-in-peripheral-RX-handle.patch | 0
..._can_open-remove-IRQF_TRIGGER_FALLING-fro.patch | 0
4 files changed, 34 insertions(+), 17 deletions(-)
mode change 100755 => 100644 patches/linux/5.4.imx_legacy/0543-can-m_can-Remove-quota-limit-in-peripheral-RX-handle.patch
mode change 100755 => 100644 patches/linux/5.4.imx_legacy/0544-can-m_can-m_can_open-remove-IRQF_TRIGGER_FALLING-fro.patch
diff --git a/patches/buildroot/2020.02/378-package-x265-update-project-URL.patch b/patches/buildroot/2020.02/378-package-x265-update-project-URL.patch
index 4714dbd33..67c6132ff 100644
--- a/patches/buildroot/2020.02/378-package-x265-update-project-URL.patch
+++ b/patches/buildroot/2020.02/378-package-x265-update-project-URL.patch
@@ -1,24 +1,31 @@
-From ffea3b89cbc7ac74b9a0952c2ed06c2017cc0e8e Mon Sep 17 00:00:00 2001
+From 50d1b2ea0e9f404df8ed9186717b197c7c1a703e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
<seb...@ar...>
Date: Fri, 12 Feb 2021 09:54:20 +0100
-Subject: [PATCH 1/1] package/x265: update project URL
+Subject: [PATCH v2 1/1] package/x265: update project URL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The project moved to https://bitbucket.org/multicoreware/x265_git
+The archive file has changed (but not its content) so update the hashes
+too.
Signed-off-by: Sébastien Szymanski <seb...@ar...>
---
+
+Changes for v2:
+ - update hashes
+
package/x265/Config.in | 2 +-
+ package/x265/x265.hash | 5 ++---
package/x265/x265.mk | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ 3 files changed, 5 insertions(+), 6 deletions(-)
-diff --git a/package/x265/Config.in b/package/x265/Config.in
-index 180931db66..1067505d31 100644
---- a/package/x265/Config.in
-+++ b/package/x265/Config.in
+Index: buildroot/package/x265/Config.in
+===================================================================
+--- buildroot.orig/package/x265/Config.in
++++ buildroot/package/x265/Config.in
@@ -11,7 +11,7 @@ config BR2_PACKAGE_X265
General Public License (GPL) 2 license or a commercial
license, similar to the x264 project.
@@ -28,20 +35,32 @@ index 180931db66..1067505d31 100644
if BR2_PACKAGE_X265
-diff --git a/package/x265/x265.mk b/package/x265/x265.mk
-index 872753eea8..7bc1d11e19 100644
---- a/package/x265/x265.mk
-+++ b/package/x265/x265.mk
+Index: buildroot/package/x265/x265.hash
+===================================================================
+--- buildroot.orig/package/x265/x265.hash
++++ buildroot/package/x265/x265.hash
+@@ -1,5 +1,4 @@
+-# From https://mailman.videolan.org/pipermail/x265-devel/2019-October/012721.html
+-md5 94808045a34d88a857e5eaf3f68f4bca x265_3.2.1.tar.gz
+ # Locally generated
+-sha256 fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc x265_3.2.1.tar.gz
++md5 455bf1912a076392abf153d536870bbc x265_3.2.1.tar.gz
++sha256 b68939625356459e7055b9589451689924f236bac8deba3db21e3c2fb062d328 x265_3.2.1.tar.gz
+ sha256 d8afb1bcc7a2cfc603683b168d6987ef0a48e59e0da3693bf55c5d33b67e2b49 COPYING
+Index: buildroot/package/x265/x265.mk
+===================================================================
+--- buildroot.orig/package/x265/x265.mk
++++ buildroot/package/x265/x265.mk
@@ -6,7 +6,7 @@
- X265_VERSION = 3.3
+ X265_VERSION = 3.2.1
X265_SOURCE = x265_$(X265_VERSION).tar.gz
-X265_SITE = https://bitbucket.org/multicoreware/x265/downloads
+X265_SITE = https://bitbucket.org/multicoreware/x265_git/downloads
X265_LICENSE = GPL-2.0+
X265_LICENSE_FILES = COPYING
- X265_CPE_ID_VENDOR = multicorewareinc
-@@ -19,7 +19,7 @@ X265_DEPENDENCIES += host-nasm
+ X265_SUBDIR = source
+@@ -18,7 +18,7 @@ X265_DEPENDENCIES += host-nasm
endif
# disable altivec, it has build issues
@@ -50,6 +69,3 @@ index 872753eea8..7bc1d11e19 100644
ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y)
X265_CONF_OPTS += -DENABLE_ALTIVEC=OFF
endif
---
-2.26.2
-
diff --git a/patches/buildroot/2020.02/cleanup_buildroot.sh b/patches/buildroot/2020.02/cleanup_buildroot.sh
index 592610408..ade49c7e9 100755
--- a/patches/buildroot/2020.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2020.02/cleanup_buildroot.sh
@@ -147,6 +147,7 @@ rm -rf buildroot/package/wolf4sdl/wolf4sdl.mk
rm -rf buildroot/package/wpa_supplicant/Config.in
rm -rf buildroot/package/wpa_supplicant/wpa_supplicant.mk
rm -rf buildroot/package/x265/Config.in
+rm -rf buildroot/package/x265/x265.hash
rm -rf buildroot/package/x265/x265.mk
rm -rf buildroot/package/xc3sprog/Config.in
rm -rf buildroot/package/xc3sprog/xc3sprog-fixes-version-detection.patch
diff --git a/patches/linux/5.4.imx_legacy/0543-can-m_can-Remove-quota-limit-in-peripheral-RX-handle.patch b/patches/linux/5.4.imx_legacy/0543-can-m_can-Remove-quota-limit-in-peripheral-RX-handle.patch
old mode 100755
new mode 100644
diff --git a/patches/linux/5.4.imx_legacy/0544-can-m_can-m_can_open-remove-IRQF_TRIGGER_FALLING-fro.patch b/patches/linux/5.4.imx_legacy/0544-can-m_can-m_can_open-remove-IRQF_TRIGGER_FALLING-fro.patch
old mode 100755
new mode 100644
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-02-12 09:29: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 662a9e3533d06b3d55ad1e64d2ad377440093eed (commit)
from aa54b4e30913c3ef9a17b46b319f9bbd818eae9d (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 662a9e3533d06b3d55ad1e64d2ad377440093eed
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Feb 12 10:27:42 2021 +0100
[BUILDROOT] 2020.02: update x265 project URL
-----------------------------------------------------------------------
Summary of changes:
.../378-package-x265-update-project-URL.patch | 55 ++++++++++++++++++++++
patches/buildroot/2020.02/cleanup_buildroot.sh | 2 +
2 files changed, 57 insertions(+)
create mode 100644 patches/buildroot/2020.02/378-package-x265-update-project-URL.patch
diff --git a/patches/buildroot/2020.02/378-package-x265-update-project-URL.patch b/patches/buildroot/2020.02/378-package-x265-update-project-URL.patch
new file mode 100644
index 000000000..4714dbd33
--- /dev/null
+++ b/patches/buildroot/2020.02/378-package-x265-update-project-URL.patch
@@ -0,0 +1,55 @@
+From ffea3b89cbc7ac74b9a0952c2ed06c2017cc0e8e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 12 Feb 2021 09:54:20 +0100
+Subject: [PATCH 1/1] package/x265: update project URL
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The project moved to https://bitbucket.org/multicoreware/x265_git
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/x265/Config.in | 2 +-
+ package/x265/x265.mk | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/package/x265/Config.in b/package/x265/Config.in
+index 180931db66..1067505d31 100644
+--- a/package/x265/Config.in
++++ b/package/x265/Config.in
+@@ -11,7 +11,7 @@ config BR2_PACKAGE_X265
+ General Public License (GPL) 2 license or a commercial
+ license, similar to the x264 project.
+
+- https://bitbucket.org/multicoreware/x265/wiki/Home
++ https://bitbucket.org/multicoreware/x265_git/wiki/Home
+
+ if BR2_PACKAGE_X265
+
+diff --git a/package/x265/x265.mk b/package/x265/x265.mk
+index 872753eea8..7bc1d11e19 100644
+--- a/package/x265/x265.mk
++++ b/package/x265/x265.mk
+@@ -6,7 +6,7 @@
+
+ X265_VERSION = 3.3
+ X265_SOURCE = x265_$(X265_VERSION).tar.gz
+-X265_SITE = https://bitbucket.org/multicoreware/x265/downloads
++X265_SITE = https://bitbucket.org/multicoreware/x265_git/downloads
+ X265_LICENSE = GPL-2.0+
+ X265_LICENSE_FILES = COPYING
+ X265_CPE_ID_VENDOR = multicorewareinc
+@@ -19,7 +19,7 @@ X265_DEPENDENCIES += host-nasm
+ endif
+
+ # disable altivec, it has build issues
+-# https://bitbucket.org/multicoreware/x265/issues/320/
++# https://bitbucket.org/multicoreware/x265_git/issues/320/
+ ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y)
+ X265_CONF_OPTS += -DENABLE_ALTIVEC=OFF
+ endif
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/cleanup_buildroot.sh b/patches/buildroot/2020.02/cleanup_buildroot.sh
index af8c91f86..592610408 100755
--- a/patches/buildroot/2020.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2020.02/cleanup_buildroot.sh
@@ -146,6 +146,8 @@ rm -rf buildroot/package/wolf4sdl/Config.in
rm -rf buildroot/package/wolf4sdl/wolf4sdl.mk
rm -rf buildroot/package/wpa_supplicant/Config.in
rm -rf buildroot/package/wpa_supplicant/wpa_supplicant.mk
+rm -rf buildroot/package/x265/Config.in
+rm -rf buildroot/package/x265/x265.mk
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
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-02-11 08:38:04
|
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 aa54b4e30913c3ef9a17b46b319f9bbd818eae9d (commit)
via dd3d1ca6222f472303b5f482e055d2cb57d282c8 (commit)
via 9d7715323cb74e11cd90e55173b72d31fd36d867 (commit)
via 168f9cb98dee99ec73d53886d6fb2a10097a82b7 (commit)
via 82f7da3756a089cb78aa8d142a037b1884548f65 (commit)
via 02c78de9187f2383f99ad5368ec3e703afee2b4d (commit)
from 01ccff6f379f41a2910e7ebf74c0dc49960d2b75 (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 aa54b4e30913c3ef9a17b46b319f9bbd818eae9d
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 11 09:37:12 2021 +0100
[BUILDROOT] opos6ullegacy-4.9_defconfig: remove BR legacy config option
commit dd3d1ca6222f472303b5f482e055d2cb57d282c8
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 11 09:32:44 2021 +0100
[BUILDROOT] apf6legacy_defconfig: remove BR legacy config options
commit 9d7715323cb74e11cd90e55173b72d31fd36d867
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 11 09:28:59 2021 +0100
[BUILDROOT] apf6_defconfig: remove BR legacy config option
commit 168f9cb98dee99ec73d53886d6fb2a10097a82b7
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Feb 10 16:44:19 2021 +0100
[BUILDROOT] Bump BR to 2020.02.10
commit 82f7da3756a089cb78aa8d142a037b1884548f65
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Feb 10 16:43:26 2021 +0100
[BUILDROOT] 2020.02: wayland: go back to 1.17
commit 02c78de9187f2383f99ad5368ec3e703afee2b4d
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Feb 10 15:11:23 2021 +0100
[BUILDROOT] 2020.02: update cleanup_buildroot.sh
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
buildroot/configs/apf6_defconfig | 4 +-
buildroot/configs/apf6legacy_defconfig | 12 +-
buildroot/configs/opos6ullegacy-4.9_defconfig | 8 +-
...76-package-wayland-bump-to-version-1.18.0.patch | 268 ---------------------
.../377-package-wayland-switch-to-https.patch | 21 +-
...yland-fix-build-with-toolchains-without-c.patch | 54 -----
patches/buildroot/2020.02/cleanup_buildroot.sh | 6 +
8 files changed, 26 insertions(+), 349 deletions(-)
delete mode 100644 patches/buildroot/2020.02/376-package-wayland-bump-to-version-1.18.0.patch
delete mode 100644 patches/buildroot/2020.02/378-package-wayland-fix-build-with-toolchains-without-c.patch
diff --git a/Makefile b/Makefile
index 117af618a..ec62f8f07 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2020.02
-BUILDROOT_MINOR_VERSION ?= 9
+BUILDROOT_MINOR_VERSION ?= 10
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 73f7125d3..527365c92 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -44,6 +44,7 @@ BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_GSTREAMER1=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_COMPOSITOR=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
@@ -71,7 +72,6 @@ BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF=y
BR2_PACKAGE_GST1_PLUGINS_BAD=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
@@ -98,9 +98,9 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_ASCII_INVADERS=y
+BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBSET=y
-BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_JPEG is not set
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index 06d320f9e..33668bfcf 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -43,6 +43,7 @@ BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_GSTREAMER1=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_COMPOSITOR=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
@@ -67,9 +68,6 @@ BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF=y
-BR2_PACKAGE_GST1_PLUGINS_BAD=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
@@ -79,7 +77,6 @@ BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265=y
BR2_PACKAGE_GST1_PLUGINS_UGLY=y
BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264=y
BR2_PACKAGE_GST1_IMX=y
-BR2_PACKAGE_GST1_IMX_G2D=y
BR2_PACKAGE_GST1_IMX_IPU=y
BR2_PACKAGE_GST1_IMX_VPU=y
BR2_PACKAGE_GST1_IMX_V4L2VIDEOSRC=y
@@ -90,7 +87,6 @@ BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_PV=y
BR2_PACKAGE_RAMSMP=y
BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
@@ -98,8 +94,8 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_ASCII_INVADERS=y
-BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FB_TEST_APP=y
+BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_JPEG is not set
@@ -115,9 +111,9 @@ BR2_PACKAGE_IMX_LIB=y
BR2_PACKAGE_IMX_PARSER=y
BR2_PACKAGE_IMX_VPUWRAP=y
BR2_PACKAGE_IMX_GPU_VIV=y
-BR2_PACKAGE_IMX_GPU_VIV_APITRACE=y
BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES=y
BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO=y
+BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_KBD=y
BR2_PACKAGE_PCI_DEBUG=y
@@ -136,7 +132,6 @@ BR2_PACKAGE_HAVEGED=y
BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL=y
BR2_PACKAGE_CAN_UTILS=y
BR2_PACKAGE_DROPBEAR=y
@@ -170,3 +165,4 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL"
BR2_PACKAGE_HOST_E2TOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_IMX_USB_LOADER=y
+BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
diff --git a/buildroot/configs/opos6ullegacy-4.9_defconfig b/buildroot/configs/opos6ullegacy-4.9_defconfig
index 83216405b..a74611c92 100644
--- a/buildroot/configs/opos6ullegacy-4.9_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.9_defconfig
@@ -51,6 +51,7 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_FAAD2=y
BR2_PACKAGE_GSTREAMER1=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_COMPOSITOR=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
@@ -76,7 +77,6 @@ BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
@@ -100,16 +100,15 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_STRESS_NG=y
BR2_PACKAGE_GIT=y
BR2_PACKAGE_TREE=y
-BR2_PACKAGE_ASCII_INVADERS=y
-BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
-BR2_PACKAGE_FBGRAB=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_FB_TEST_APP=y
+BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_GIF is not set
@@ -119,6 +118,7 @@ BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_EVTEST=y
BR2_PACKAGE_FREESCALE_IMX=y
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL=y
+BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_IMX_TEST=y
BR2_PACKAGE_KBD=y
diff --git a/patches/buildroot/2020.02/376-package-wayland-bump-to-version-1.18.0.patch b/patches/buildroot/2020.02/376-package-wayland-bump-to-version-1.18.0.patch
deleted file mode 100644
index fd2aec2a9..000000000
--- a/patches/buildroot/2020.02/376-package-wayland-bump-to-version-1.18.0.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-From 5b6dd9184ef35cb9c8a674f71e80a3df1aafe110 Mon Sep 17 00:00:00 2001
-From: James Hilliard <jam...@gm...>
-Date: Mon, 4 May 2020 02:13:41 -0600
-Subject: [PATCH 376/378] package/wayland: bump to version 1.18.0
-
-Rebase/update disable tests patch.
-
-Replace autotools build system with meson as autotools is deprecated
-and will be removed.
-
-Signed-off-by: James Hilliard <jam...@gm...>
-Signed-off-by: Thomas Petazzoni <tho...@bo...>
----
- ...01-build-add-option-to-disable-tests.patch | 104 ++++++++++++++++++
- ...onfigure-add-option-to-disable-tests.patch | 73 ------------
- package/wayland/wayland.hash | 12 +-
- package/wayland/wayland.mk | 14 +--
- 4 files changed, 115 insertions(+), 88 deletions(-)
- create mode 100644 package/wayland/0001-build-add-option-to-disable-tests.patch
- delete mode 100644 package/wayland/0001-configure-add-option-to-disable-tests.patch
-
-diff --git a/package/wayland/0001-build-add-option-to-disable-tests.patch b/package/wayland/0001-build-add-option-to-disable-tests.patch
-new file mode 100644
-index 0000000000..6ab695e909
---- /dev/null
-+++ b/package/wayland/0001-build-add-option-to-disable-tests.patch
-@@ -0,0 +1,104 @@
-+From 283085496e06b5543771abe5cc746ff0b77cdd23 Mon Sep 17 00:00:00 2001
-+From: James Hilliard <jam...@gm...>
-+Date: Tue, 3 Mar 2020 15:27:51 -0700
-+Subject: [PATCH] build: add option to disable tests
-+
-+When building for a product, tests are not needed.
-+
-+Besides, one test requires a C++ compiler, which is not always
-+available.
-+
-+So, add an option to configure to disable building tests altogether.
-+
-+Signed-off-by: "Yann E. MORIN" <yan...@fr...>
-+Signed-off-by: Alexey Brodkin <abr...@sy...>
-+Signed-off-by: James Hilliard <jam...@gm...>
-+[Upstream status:
-+https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/66]
-+---
-+ Makefile.am | 2 ++
-+ configure.ac | 9 +++++++++
-+ meson.build | 4 +++-
-+ meson_options.txt | 4 ++++
-+ 4 files changed, 18 insertions(+), 1 deletion(-)
-+
-+diff --git a/Makefile.am b/Makefile.am
-+index cc87392..d5d43e3 100644
-+--- a/Makefile.am
-++++ b/Makefile.am
-+@@ -162,6 +162,7 @@ pkgconfig_DATA += egl/wayland-egl.pc
-+ include_HEADERS += egl/wayland-egl-backend.h
-+ pkgconfig_DATA += egl/wayland-egl-backend.pc
-+
-++if ENABLE_TESTS
-+ built_test_programs = \
-+ array-test \
-+ client-test \
-+@@ -295,6 +296,7 @@ os_wrappers_test_LDADD = libtest-runner.la
-+
-+ exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c
-+ exec_fd_leak_checker_LDADD = libtest-helpers.la
-++endif
-+
-+ EXTRA_DIST += tests/scanner-test.sh \
-+ protocol/tests.xml \
-+diff --git a/configure.ac b/configure.ac
-+index dda5e48..99b7c96 100644
-+--- a/configure.ac
-++++ b/configure.ac
-+@@ -77,6 +77,13 @@ AC_ARG_ENABLE([libraries],
-+ [],
-+ [enable_libraries=yes])
-+
-++AC_ARG_ENABLE([tests],
-++ [AC_HELP_STRING([--disable-tests],
-++ [Disable compilation of test programs])],
-++ [],
-++ [enable_tests=yes])
-++
-++
-+ AC_ARG_WITH([host-scanner],
-+ [AC_HELP_STRING([--with-host-scanner],
-+ [Use installed wayland-scanner from host PATH during build])],
-+@@ -99,6 +106,8 @@ AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
-+
-+ AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes)
-+
-++AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = xyes)
-++
-+ AC_ARG_WITH(icondir, [ --with-icondir=<dir> Look for cursor icons here],
-+ [ ICONDIR=$withval],
-+ [ ICONDIR=${datadir}/icons])
-+diff --git a/meson.build b/meson.build
-+index 5632f4e..b37bb7a 100644
-+--- a/meson.build
-++++ b/meson.build
-+@@ -83,7 +83,9 @@ subdir('src')
-+ if get_option('libraries')
-+ subdir('cursor')
-+ subdir('egl')
-+- subdir('tests')
-++ if get_option('tests')
-++ subdir('tests')
-++ endif
-+ endif
-+
-+ if get_option('documentation')
-+diff --git a/meson_options.txt b/meson_options.txt
-+index 76314f7..ab4be92 100644
-+--- a/meson_options.txt
-++++ b/meson_options.txt
-+@@ -2,6 +2,10 @@ option('libraries',
-+ description: 'Compile Wayland libraries',
-+ type: 'boolean',
-+ value: 'true')
-++option('tests',
-++ description: 'Compile Wayland tests',
-++ type: 'boolean',
-++ value: 'true')
-+ option('documentation',
-+ description: 'Build the documentation (requires Doxygen, dot, xmlto, xsltproc)',
-+ type: 'boolean',
-+--
-+2.20.1
-+
-diff --git a/package/wayland/0001-configure-add-option-to-disable-tests.patch b/package/wayland/0001-configure-add-option-to-disable-tests.patch
-deleted file mode 100644
-index fdfbeb4bd1..0000000000
---- a/package/wayland/0001-configure-add-option-to-disable-tests.patch
-+++ /dev/null
-@@ -1,73 +0,0 @@
--From 55ae8e1103f4697bfa01a84301a6560b89de5248 Mon Sep 17 00:00:00 2001
--From: "Yann E. MORIN" <yan...@fr...>
--Date: Mon, 16 Apr 2018 19:52:34 +0300
--Subject: [PATCH] configure: add option to disable tests
--
--When building for a product, tests are not needed.
--
--Besides, one test requires a C++ compiler, which is not always
--available.
--
--So, add an option to configure to disable building tests altogether.
--
--Signed-off-by: "Yann E. MORIN" <yan...@fr...>
--Reviewed-by: Eric Engestrom <eri...@im...>
--Tested-by: Eric Engestrom <eri...@im...>
--
--Signed-off-by: "Yann E. MORIN" <yan...@fr...>
--Signed-off-by: Alexey Brodkin <abr...@sy...>
--
-----
--Changes v1 -> v2:
-- - fix typo in yes-check (Eric)
-----
-- Makefile.am | 2 ++
-- configure.ac | 8 ++++++++
-- 2 files changed, 10 insertions(+)
--
--diff --git a/Makefile.am b/Makefile.am
--index 741db5ebf9d9..4862d42959f0 100644
----- a/Makefile.am
--+++ b/Makefile.am
--@@ -160,6 +160,7 @@ pkgconfig_DATA += egl/wayland-egl.pc
-- include_HEADERS += egl/wayland-egl-backend.h
-- pkgconfig_DATA += egl/wayland-egl-backend.pc
--
--+if ENABLE_TESTS
-- built_test_programs = \
-- array-test \
-- client-test \
--@@ -287,6 +288,7 @@ os_wrappers_test_LDADD = libtest-runner.la
--
-- exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c
-- exec_fd_leak_checker_LDADD = libtest-helpers.la
--+endif
--
-- EXTRA_DIST += tests/scanner-test.sh \
-- protocol/tests.xml \
--diff --git a/configure.ac b/configure.ac
--index c74ee97b24a2..5c94b7b76b06 100644
----- a/configure.ac
--+++ b/configure.ac
--@@ -89,10 +89,18 @@ AC_ARG_ENABLE([dtd-validation],
-- [],
-- [enable_dtd_validation=yes])
--
--+AC_ARG_ENABLE([tests],
--+ [AC_HELP_STRING([--disable-tests],
--+ [Disable compilation of test programs])],
--+ [],
--+ [enable_tests=yes])
--+
-- AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
--
-- AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes)
--
--+AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = xyes)
--+
-- AC_ARG_WITH(icondir, [ --with-icondir=<dir> Look for cursor icons here],
-- [ ICONDIR=$withval],
-- [ ICONDIR=${datadir}/icons])
----
--2.14.3
--
-diff --git a/package/wayland/wayland.hash b/package/wayland/wayland.hash
-index 8774101884..abd8bcdf29 100644
---- a/package/wayland/wayland.hash
-+++ b/package/wayland/wayland.hash
-@@ -1,8 +1,8 @@
--# From https://lists.freedesktop.org/archives/wayland-devel/2019-March/040335.html
--md5 d91f970aea11fd549eae023d06f91af3 wayland-1.17.0.tar.xz
--sha1 4d9e08a7a4a07fa37a25d7aa3ef83f08edec0600 wayland-1.17.0.tar.xz
--sha256 72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4 wayland-1.17.0.tar.xz
--sha512 c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946 wayland-1.17.0.tar.xz
-+# From https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html
-+md5 23317697b6e3ff2e1ac8c5ba3ed57b65 wayland-1.18.0.tar.xz
-+sha1 33e5292b32a115e829458ea627201ed1e4ad4f45 wayland-1.18.0.tar.xz
-+sha256 4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d wayland-1.18.0.tar.xz
-+sha512 e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc wayland-1.18.0.tar.xz
-
- # Locally calculated
--sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING
-+sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING
-diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk
-index e325c6d752..a3031bafa8 100644
---- a/package/wayland/wayland.mk
-+++ b/package/wayland/wayland.mk
-@@ -4,7 +4,7 @@
- #
- ################################################################################
-
--WAYLAND_VERSION = 1.17.0
-+WAYLAND_VERSION = 1.18.0
- WAYLAND_SITE = http://wayland.freedesktop.org/releases
- WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
- WAYLAND_LICENSE = MIT
-@@ -13,12 +13,8 @@ WAYLAND_INSTALL_STAGING = YES
- WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2
- HOST_WAYLAND_DEPENDENCIES = host-pkgconf host-expat host-libffi host-libxml2
-
--# 0002-configure-add-option-to-disable-tests.patch
--WAYLAND_AUTORECONF = YES
--
--# wayland-scanner is only needed for building, not on the target
--WAYLAND_CONF_OPTS = --with-host-scanner --disable-tests
--HOST_WAYLAND_CONF_OPTS = --disable-tests
-+WAYLAND_CONF_OPTS = -Dtests=false -Ddocumentation=false
-+HOST_WAYLAND_CONF_OPTS = -Dtests=false -Ddocumentation=false
-
- # Remove the DTD from the target, it's not needed at runtime
- define WAYLAND_TARGET_CLEANUP
-@@ -26,5 +22,5 @@ define WAYLAND_TARGET_CLEANUP
- endef
- WAYLAND_POST_INSTALL_TARGET_HOOKS += WAYLAND_TARGET_CLEANUP
-
--$(eval $(autotools-package))
--$(eval $(host-autotools-package))
-+$(eval $(meson-package))
-+$(eval $(host-meson-package))
---
-2.26.2
-
diff --git a/patches/buildroot/2020.02/377-package-wayland-switch-to-https.patch b/patches/buildroot/2020.02/377-package-wayland-switch-to-https.patch
index c66c8800b..b96e5ae70 100644
--- a/patches/buildroot/2020.02/377-package-wayland-switch-to-https.patch
+++ b/patches/buildroot/2020.02/377-package-wayland-switch-to-https.patch
@@ -19,10 +19,10 @@ Signed-off-by: Thomas Petazzoni <tho...@bo...>
package/wayland/wayland.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/package/wayland/Config.in b/package/wayland/Config.in
-index 32718fc2b2..c22d9c7ef5 100644
---- a/package/wayland/Config.in
-+++ b/package/wayland/Config.in
+Index: buildroot/package/wayland/Config.in
+===================================================================
+--- buildroot.orig/package/wayland/Config.in
++++ buildroot/package/wayland/Config.in
@@ -10,7 +10,7 @@ config BR2_PACKAGE_WAYLAND
to talk to its clients as well as a library implementation
of the protocol.
@@ -32,19 +32,16 @@ index 32718fc2b2..c22d9c7ef5 100644
comment "wayland needs a toolchain w/ threads, dynamic library"
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk
-index a3031bafa8..1b19272715 100644
---- a/package/wayland/wayland.mk
-+++ b/package/wayland/wayland.mk
+Index: buildroot/package/wayland/wayland.mk
+===================================================================
+--- buildroot.orig/package/wayland/wayland.mk
++++ buildroot/package/wayland/wayland.mk
@@ -5,7 +5,7 @@
################################################################################
- WAYLAND_VERSION = 1.18.0
+ WAYLAND_VERSION = 1.17.0
-WAYLAND_SITE = http://wayland.freedesktop.org/releases
+WAYLAND_SITE = https://wayland.freedesktop.org/releases
WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
WAYLAND_LICENSE = MIT
WAYLAND_LICENSE_FILES = COPYING
---
-2.26.2
-
diff --git a/patches/buildroot/2020.02/378-package-wayland-fix-build-with-toolchains-without-c.patch b/patches/buildroot/2020.02/378-package-wayland-fix-build-with-toolchains-without-c.patch
deleted file mode 100644
index 83ff7488a..000000000
--- a/patches/buildroot/2020.02/378-package-wayland-fix-build-with-toolchains-without-c.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 654b5d934a7cdab7deca16b374322236de08d472 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <ber...@t-...>
-Date: Wed, 29 Jul 2020 20:16:50 +0200
-Subject: [PATCH 378/378] package/wayland: fix build with toolchains without
- c++
-
-Fixes
-http://autobuild.buildroot.net/results/fb2/fb205601cac2bbf8e70ec2bf4eaf22264d8edc96/
-
-Signed-off-by: Bernd Kuhls <ber...@t-...>
-Signed-off-by: Peter Korsgaard <pe...@ko...>
----
- .../0002-meson-do-not-check-for-c.patch | 29 +++++++++++++++++++
- 1 file changed, 29 insertions(+)
- create mode 100644 package/wayland/0002-meson-do-not-check-for-c.patch
-
-diff --git a/package/wayland/0002-meson-do-not-check-for-c.patch b/package/wayland/0002-meson-do-not-check-for-c.patch
-new file mode 100644
-index 0000000000..c5819bf477
---- /dev/null
-+++ b/package/wayland/0002-meson-do-not-check-for-c.patch
-@@ -0,0 +1,29 @@
-+From 1df9b73db6541cbc483c6ee1b21dbe0cb6e5cbfa Mon Sep 17 00:00:00 2001
-+From: Bernd Kuhls <ber...@t-...>
-+Date: Wed, 29 Jul 2020 08:20:41 +0200
-+Subject: [PATCH] meson: do not check for c++
-+
-+Wayland does not need c++, fixes building with toolchains lacking c++.
-+
-+Backported from upstream PR:
-+https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/88
-+
-+Signed-off-by: Bernd Kuhls <ber...@t-...>
-+---
-+ meson.build | 2 +-
-+ 1 file changed, 1 insertion(+), 1 deletion(-)
-+
-+diff --git a/meson.build b/meson.build
-+index b67b101..e47a52d 100644
-+--- a/meson.build
-++++ b/meson.build
-+@@ -1,5 +1,5 @@
-+ project(
-+- 'wayland', 'c', 'cpp',
-++ 'wayland', 'c',
-+ version: '1.18.0',
-+ license: 'MIT',
-+ meson_version: '>= 0.47.0',
-+--
-+2.27.0
-+
---
-2.26.2
-
diff --git a/patches/buildroot/2020.02/cleanup_buildroot.sh b/patches/buildroot/2020.02/cleanup_buildroot.sh
index da992b358..af8c91f86 100755
--- a/patches/buildroot/2020.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2020.02/cleanup_buildroot.sh
@@ -38,6 +38,10 @@ rm -rf buildroot/package/freescale-imx/Config.in
rm -rf buildroot/package/freescale-imx/firmware-imx/Config.in
rm -rf buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash
rm -rf buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk
+rm -rf buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash
+rm -rf buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
+rm -rf buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
+rm -rf buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
rm -rf buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash
rm -rf buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
rm -rf buildroot/package/freescale-imx/imx-seco/Config.in
@@ -136,6 +140,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/wayland/Config.in
+rm -rf buildroot/package/wayland/wayland.mk
rm -rf buildroot/package/wolf4sdl/Config.in
rm -rf buildroot/package/wolf4sdl/wolf4sdl.mk
rm -rf buildroot/package/wpa_supplicant/Config.in
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-02-10 12:09:23
|
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 01ccff6f379f41a2910e7ebf74c0dc49960d2b75 (commit)
from 1024c2f958591acfc8a44e70cd05c9529cdb4360 (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 01ccff6f379f41a2910e7ebf74c0dc49960d2b75
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Feb 10 13:09:03 2021 +0100
[BUILDROOT]: 2020.02: patches for wayland
-----------------------------------------------------------------------
Summary of changes:
...76-package-wayland-bump-to-version-1.18.0.patch | 268 +++++++++++++++++++++
.../377-package-wayland-switch-to-https.patch | 50 ++++
...yland-fix-build-with-toolchains-without-c.patch | 54 +++++
3 files changed, 372 insertions(+)
create mode 100644 patches/buildroot/2020.02/376-package-wayland-bump-to-version-1.18.0.patch
create mode 100644 patches/buildroot/2020.02/377-package-wayland-switch-to-https.patch
create mode 100644 patches/buildroot/2020.02/378-package-wayland-fix-build-with-toolchains-without-c.patch
diff --git a/patches/buildroot/2020.02/376-package-wayland-bump-to-version-1.18.0.patch b/patches/buildroot/2020.02/376-package-wayland-bump-to-version-1.18.0.patch
new file mode 100644
index 000000000..fd2aec2a9
--- /dev/null
+++ b/patches/buildroot/2020.02/376-package-wayland-bump-to-version-1.18.0.patch
@@ -0,0 +1,268 @@
+From 5b6dd9184ef35cb9c8a674f71e80a3df1aafe110 Mon Sep 17 00:00:00 2001
+From: James Hilliard <jam...@gm...>
+Date: Mon, 4 May 2020 02:13:41 -0600
+Subject: [PATCH 376/378] package/wayland: bump to version 1.18.0
+
+Rebase/update disable tests patch.
+
+Replace autotools build system with meson as autotools is deprecated
+and will be removed.
+
+Signed-off-by: James Hilliard <jam...@gm...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ ...01-build-add-option-to-disable-tests.patch | 104 ++++++++++++++++++
+ ...onfigure-add-option-to-disable-tests.patch | 73 ------------
+ package/wayland/wayland.hash | 12 +-
+ package/wayland/wayland.mk | 14 +--
+ 4 files changed, 115 insertions(+), 88 deletions(-)
+ create mode 100644 package/wayland/0001-build-add-option-to-disable-tests.patch
+ delete mode 100644 package/wayland/0001-configure-add-option-to-disable-tests.patch
+
+diff --git a/package/wayland/0001-build-add-option-to-disable-tests.patch b/package/wayland/0001-build-add-option-to-disable-tests.patch
+new file mode 100644
+index 0000000000..6ab695e909
+--- /dev/null
++++ b/package/wayland/0001-build-add-option-to-disable-tests.patch
+@@ -0,0 +1,104 @@
++From 283085496e06b5543771abe5cc746ff0b77cdd23 Mon Sep 17 00:00:00 2001
++From: James Hilliard <jam...@gm...>
++Date: Tue, 3 Mar 2020 15:27:51 -0700
++Subject: [PATCH] build: add option to disable tests
++
++When building for a product, tests are not needed.
++
++Besides, one test requires a C++ compiler, which is not always
++available.
++
++So, add an option to configure to disable building tests altogether.
++
++Signed-off-by: "Yann E. MORIN" <yan...@fr...>
++Signed-off-by: Alexey Brodkin <abr...@sy...>
++Signed-off-by: James Hilliard <jam...@gm...>
++[Upstream status:
++https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/66]
++---
++ Makefile.am | 2 ++
++ configure.ac | 9 +++++++++
++ meson.build | 4 +++-
++ meson_options.txt | 4 ++++
++ 4 files changed, 18 insertions(+), 1 deletion(-)
++
++diff --git a/Makefile.am b/Makefile.am
++index cc87392..d5d43e3 100644
++--- a/Makefile.am
+++++ b/Makefile.am
++@@ -162,6 +162,7 @@ pkgconfig_DATA += egl/wayland-egl.pc
++ include_HEADERS += egl/wayland-egl-backend.h
++ pkgconfig_DATA += egl/wayland-egl-backend.pc
++
+++if ENABLE_TESTS
++ built_test_programs = \
++ array-test \
++ client-test \
++@@ -295,6 +296,7 @@ os_wrappers_test_LDADD = libtest-runner.la
++
++ exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c
++ exec_fd_leak_checker_LDADD = libtest-helpers.la
+++endif
++
++ EXTRA_DIST += tests/scanner-test.sh \
++ protocol/tests.xml \
++diff --git a/configure.ac b/configure.ac
++index dda5e48..99b7c96 100644
++--- a/configure.ac
+++++ b/configure.ac
++@@ -77,6 +77,13 @@ AC_ARG_ENABLE([libraries],
++ [],
++ [enable_libraries=yes])
++
+++AC_ARG_ENABLE([tests],
+++ [AC_HELP_STRING([--disable-tests],
+++ [Disable compilation of test programs])],
+++ [],
+++ [enable_tests=yes])
+++
+++
++ AC_ARG_WITH([host-scanner],
++ [AC_HELP_STRING([--with-host-scanner],
++ [Use installed wayland-scanner from host PATH during build])],
++@@ -99,6 +106,8 @@ AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
++
++ AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes)
++
+++AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = xyes)
+++
++ AC_ARG_WITH(icondir, [ --with-icondir=<dir> Look for cursor icons here],
++ [ ICONDIR=$withval],
++ [ ICONDIR=${datadir}/icons])
++diff --git a/meson.build b/meson.build
++index 5632f4e..b37bb7a 100644
++--- a/meson.build
+++++ b/meson.build
++@@ -83,7 +83,9 @@ subdir('src')
++ if get_option('libraries')
++ subdir('cursor')
++ subdir('egl')
++- subdir('tests')
+++ if get_option('tests')
+++ subdir('tests')
+++ endif
++ endif
++
++ if get_option('documentation')
++diff --git a/meson_options.txt b/meson_options.txt
++index 76314f7..ab4be92 100644
++--- a/meson_options.txt
+++++ b/meson_options.txt
++@@ -2,6 +2,10 @@ option('libraries',
++ description: 'Compile Wayland libraries',
++ type: 'boolean',
++ value: 'true')
+++option('tests',
+++ description: 'Compile Wayland tests',
+++ type: 'boolean',
+++ value: 'true')
++ option('documentation',
++ description: 'Build the documentation (requires Doxygen, dot, xmlto, xsltproc)',
++ type: 'boolean',
++--
++2.20.1
++
+diff --git a/package/wayland/0001-configure-add-option-to-disable-tests.patch b/package/wayland/0001-configure-add-option-to-disable-tests.patch
+deleted file mode 100644
+index fdfbeb4bd1..0000000000
+--- a/package/wayland/0001-configure-add-option-to-disable-tests.patch
++++ /dev/null
+@@ -1,73 +0,0 @@
+-From 55ae8e1103f4697bfa01a84301a6560b89de5248 Mon Sep 17 00:00:00 2001
+-From: "Yann E. MORIN" <yan...@fr...>
+-Date: Mon, 16 Apr 2018 19:52:34 +0300
+-Subject: [PATCH] configure: add option to disable tests
+-
+-When building for a product, tests are not needed.
+-
+-Besides, one test requires a C++ compiler, which is not always
+-available.
+-
+-So, add an option to configure to disable building tests altogether.
+-
+-Signed-off-by: "Yann E. MORIN" <yan...@fr...>
+-Reviewed-by: Eric Engestrom <eri...@im...>
+-Tested-by: Eric Engestrom <eri...@im...>
+-
+-Signed-off-by: "Yann E. MORIN" <yan...@fr...>
+-Signed-off-by: Alexey Brodkin <abr...@sy...>
+-
+----
+-Changes v1 -> v2:
+- - fix typo in yes-check (Eric)
+----
+- Makefile.am | 2 ++
+- configure.ac | 8 ++++++++
+- 2 files changed, 10 insertions(+)
+-
+-diff --git a/Makefile.am b/Makefile.am
+-index 741db5ebf9d9..4862d42959f0 100644
+---- a/Makefile.am
+-+++ b/Makefile.am
+-@@ -160,6 +160,7 @@ pkgconfig_DATA += egl/wayland-egl.pc
+- include_HEADERS += egl/wayland-egl-backend.h
+- pkgconfig_DATA += egl/wayland-egl-backend.pc
+-
+-+if ENABLE_TESTS
+- built_test_programs = \
+- array-test \
+- client-test \
+-@@ -287,6 +288,7 @@ os_wrappers_test_LDADD = libtest-runner.la
+-
+- exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c
+- exec_fd_leak_checker_LDADD = libtest-helpers.la
+-+endif
+-
+- EXTRA_DIST += tests/scanner-test.sh \
+- protocol/tests.xml \
+-diff --git a/configure.ac b/configure.ac
+-index c74ee97b24a2..5c94b7b76b06 100644
+---- a/configure.ac
+-+++ b/configure.ac
+-@@ -89,10 +89,18 @@ AC_ARG_ENABLE([dtd-validation],
+- [],
+- [enable_dtd_validation=yes])
+-
+-+AC_ARG_ENABLE([tests],
+-+ [AC_HELP_STRING([--disable-tests],
+-+ [Disable compilation of test programs])],
+-+ [],
+-+ [enable_tests=yes])
+-+
+- AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
+-
+- AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes)
+-
+-+AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = xyes)
+-+
+- AC_ARG_WITH(icondir, [ --with-icondir=<dir> Look for cursor icons here],
+- [ ICONDIR=$withval],
+- [ ICONDIR=${datadir}/icons])
+---
+-2.14.3
+-
+diff --git a/package/wayland/wayland.hash b/package/wayland/wayland.hash
+index 8774101884..abd8bcdf29 100644
+--- a/package/wayland/wayland.hash
++++ b/package/wayland/wayland.hash
+@@ -1,8 +1,8 @@
+-# From https://lists.freedesktop.org/archives/wayland-devel/2019-March/040335.html
+-md5 d91f970aea11fd549eae023d06f91af3 wayland-1.17.0.tar.xz
+-sha1 4d9e08a7a4a07fa37a25d7aa3ef83f08edec0600 wayland-1.17.0.tar.xz
+-sha256 72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4 wayland-1.17.0.tar.xz
+-sha512 c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946 wayland-1.17.0.tar.xz
++# From https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html
++md5 23317697b6e3ff2e1ac8c5ba3ed57b65 wayland-1.18.0.tar.xz
++sha1 33e5292b32a115e829458ea627201ed1e4ad4f45 wayland-1.18.0.tar.xz
++sha256 4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d wayland-1.18.0.tar.xz
++sha512 e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc wayland-1.18.0.tar.xz
+
+ # Locally calculated
+-sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING
++sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING
+diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk
+index e325c6d752..a3031bafa8 100644
+--- a/package/wayland/wayland.mk
++++ b/package/wayland/wayland.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-WAYLAND_VERSION = 1.17.0
++WAYLAND_VERSION = 1.18.0
+ WAYLAND_SITE = http://wayland.freedesktop.org/releases
+ WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
+ WAYLAND_LICENSE = MIT
+@@ -13,12 +13,8 @@ WAYLAND_INSTALL_STAGING = YES
+ WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2
+ HOST_WAYLAND_DEPENDENCIES = host-pkgconf host-expat host-libffi host-libxml2
+
+-# 0002-configure-add-option-to-disable-tests.patch
+-WAYLAND_AUTORECONF = YES
+-
+-# wayland-scanner is only needed for building, not on the target
+-WAYLAND_CONF_OPTS = --with-host-scanner --disable-tests
+-HOST_WAYLAND_CONF_OPTS = --disable-tests
++WAYLAND_CONF_OPTS = -Dtests=false -Ddocumentation=false
++HOST_WAYLAND_CONF_OPTS = -Dtests=false -Ddocumentation=false
+
+ # Remove the DTD from the target, it's not needed at runtime
+ define WAYLAND_TARGET_CLEANUP
+@@ -26,5 +22,5 @@ define WAYLAND_TARGET_CLEANUP
+ endef
+ WAYLAND_POST_INSTALL_TARGET_HOOKS += WAYLAND_TARGET_CLEANUP
+
+-$(eval $(autotools-package))
+-$(eval $(host-autotools-package))
++$(eval $(meson-package))
++$(eval $(host-meson-package))
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/377-package-wayland-switch-to-https.patch b/patches/buildroot/2020.02/377-package-wayland-switch-to-https.patch
new file mode 100644
index 000000000..c66c8800b
--- /dev/null
+++ b/patches/buildroot/2020.02/377-package-wayland-switch-to-https.patch
@@ -0,0 +1,50 @@
+From 7ce6ebfad684d6b98dc87bbd67ccceef29b4db51 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fon...@gm...>
+Date: Sun, 7 Jun 2020 23:19:55 +0200
+Subject: [PATCH 377/378] package/wayland: switch to https
+
+--2020-06-07 20:39:28-- http://wayland.freedesktop.org/releases/wayland-1.18.0.tar.xz
+Resolving wayland.freedesktop.org (wayland.freedesktop.org)... 35.227.58.183
+Connecting to wayland.freedesktop.org (wayland.freedesktop.org)|35.227.58.183|:80... connected.
+HTTP request sent, awaiting response... 308 Permanent Redirect
+2020-06-07 20:39:29 ERROR 308: Permanent Redirect.
+
+Fixes:
+ - http://autobuild.buildroot.org/results/f3af97ad46830568ee3ad710fe45329f7626c27b
+
+Signed-off-by: Fabrice Fontaine <fon...@gm...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/wayland/Config.in | 2 +-
+ package/wayland/wayland.mk | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/wayland/Config.in b/package/wayland/Config.in
+index 32718fc2b2..c22d9c7ef5 100644
+--- a/package/wayland/Config.in
++++ b/package/wayland/Config.in
+@@ -10,7 +10,7 @@ config BR2_PACKAGE_WAYLAND
+ to talk to its clients as well as a library implementation
+ of the protocol.
+
+- http://wayland.freedesktop.org/
++ https://wayland.freedesktop.org/
+
+ comment "wayland needs a toolchain w/ threads, dynamic library"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk
+index a3031bafa8..1b19272715 100644
+--- a/package/wayland/wayland.mk
++++ b/package/wayland/wayland.mk
+@@ -5,7 +5,7 @@
+ ################################################################################
+
+ WAYLAND_VERSION = 1.18.0
+-WAYLAND_SITE = http://wayland.freedesktop.org/releases
++WAYLAND_SITE = https://wayland.freedesktop.org/releases
+ WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
+ WAYLAND_LICENSE = MIT
+ WAYLAND_LICENSE_FILES = COPYING
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/378-package-wayland-fix-build-with-toolchains-without-c.patch b/patches/buildroot/2020.02/378-package-wayland-fix-build-with-toolchains-without-c.patch
new file mode 100644
index 000000000..83ff7488a
--- /dev/null
+++ b/patches/buildroot/2020.02/378-package-wayland-fix-build-with-toolchains-without-c.patch
@@ -0,0 +1,54 @@
+From 654b5d934a7cdab7deca16b374322236de08d472 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <ber...@t-...>
+Date: Wed, 29 Jul 2020 20:16:50 +0200
+Subject: [PATCH 378/378] package/wayland: fix build with toolchains without
+ c++
+
+Fixes
+http://autobuild.buildroot.net/results/fb2/fb205601cac2bbf8e70ec2bf4eaf22264d8edc96/
+
+Signed-off-by: Bernd Kuhls <ber...@t-...>
+Signed-off-by: Peter Korsgaard <pe...@ko...>
+---
+ .../0002-meson-do-not-check-for-c.patch | 29 +++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+ create mode 100644 package/wayland/0002-meson-do-not-check-for-c.patch
+
+diff --git a/package/wayland/0002-meson-do-not-check-for-c.patch b/package/wayland/0002-meson-do-not-check-for-c.patch
+new file mode 100644
+index 0000000000..c5819bf477
+--- /dev/null
++++ b/package/wayland/0002-meson-do-not-check-for-c.patch
+@@ -0,0 +1,29 @@
++From 1df9b73db6541cbc483c6ee1b21dbe0cb6e5cbfa Mon Sep 17 00:00:00 2001
++From: Bernd Kuhls <ber...@t-...>
++Date: Wed, 29 Jul 2020 08:20:41 +0200
++Subject: [PATCH] meson: do not check for c++
++
++Wayland does not need c++, fixes building with toolchains lacking c++.
++
++Backported from upstream PR:
++https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/88
++
++Signed-off-by: Bernd Kuhls <ber...@t-...>
++---
++ meson.build | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/meson.build b/meson.build
++index b67b101..e47a52d 100644
++--- a/meson.build
+++++ b/meson.build
++@@ -1,5 +1,5 @@
++ project(
++- 'wayland', 'c', 'cpp',
+++ 'wayland', 'c',
++ version: '1.18.0',
++ license: 'MIT',
++ meson_version: '>= 0.47.0',
++--
++2.27.0
++
+--
+2.26.2
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-01-22 09:20:41
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 4b9532e55762a9de9a258292e6dc40b8919aa412 (commit)
from e10e2d19a158bb5e9b4970a01bd09c9dd698c94c (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 4b9532e55762a9de9a258292e6dc40b8919aa412
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Jan 22 10:20:09 2021 +0100
[PATCH] 5.4.imx_legacy: two more patches for tcan
-----------------------------------------------------------------------
Summary of changes:
.../0541-can-tcan4x5x-use-spi_sync_transfer.patch | 86 ++++++++++++++++++++++
..._can_do_rx_poll-don-t-waste-time-if-quota.patch | 51 +++++++++++++
2 files changed, 137 insertions(+)
create mode 100644 patches/linux/5.4.imx_legacy/0541-can-tcan4x5x-use-spi_sync_transfer.patch
create mode 100644 patches/linux/5.4.imx_legacy/0542-can-m_can-m_can_do_rx_poll-don-t-waste-time-if-quota.patch
diff --git a/patches/linux/5.4.imx_legacy/0541-can-tcan4x5x-use-spi_sync_transfer.patch b/patches/linux/5.4.imx_legacy/0541-can-tcan4x5x-use-spi_sync_transfer.patch
new file mode 100644
index 000000000..64dca4c14
--- /dev/null
+++ b/patches/linux/5.4.imx_legacy/0541-can-tcan4x5x-use-spi_sync_transfer.patch
@@ -0,0 +1,86 @@
+From c719c2f0991ed5cb894280c7ad53f8fc954de4c0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 22 Jan 2021 10:10:00 +0100
+Subject: [PATCH 541/542] can: tcan4x5x: use spi_sync_transfer
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ drivers/net/can/m_can/tcan4x5x.c | 45 +++++++++++++++++++++++---------
+ 1 file changed, 33 insertions(+), 12 deletions(-)
+
+diff --git a/drivers/net/can/m_can/tcan4x5x.c b/drivers/net/can/m_can/tcan4x5x.c
+index c1870c8bc4e5..914f0b42531c 100644
+--- a/drivers/net/can/m_can/tcan4x5x.c
++++ b/drivers/net/can/m_can/tcan4x5x.c
+@@ -195,20 +195,24 @@ static int regmap_spi_gather_write(void *context, const void *reg,
+ {
+ struct device *dev = context;
+ struct spi_device *spi = to_spi_device(dev);
+- struct spi_message m;
+- u32 addr;
+- struct spi_transfer t[2] = {
+- { .tx_buf = &addr, .len = reg_len, .cs_change = 0,},
+- { .tx_buf = val, .len = val_len, },
++ int ret;
++ u8 txbuf[8] = { };
++
++ struct spi_transfer xfers = {
++ .rx_buf = NULL,
++ .tx_buf = &txbuf,
++ .len = 8,
++ .cs_change = false,
+ };
+
+- addr = TCAN4X5X_WRITE_CMD | (*((u16 *)reg) << 8) | val_len >> 2;
++ (*(u32*)txbuf) = TCAN4X5X_WRITE_CMD | (*((u16 *)reg) << 8) | val_len >> 2;
++ memcpy(&txbuf[4], val, 4);
+
+- spi_message_init(&m);
+- spi_message_add_tail(&t[0], &m);
+- spi_message_add_tail(&t[1], &m);
++ ret = spi_sync_transfer(spi, &xfers, 1);
++ if (ret < 0)
++ return ret;
+
+- return spi_sync(spi, &m);
++ return 0;
+ }
+
+ static int tcan4x5x_regmap_write(void *context, const void *data, size_t count)
+@@ -238,10 +242,27 @@ static int tcan4x5x_regmap_read(void *context,
+ {
+ struct device *dev = context;
+ struct spi_device *spi = to_spi_device(dev);
++ int ret;
++
++ u8 rxbuf[8] = { };
++ u8 txbuf[8] = { };
+
+- u32 addr = TCAN4X5X_READ_CMD | (*((u16 *)reg) << 8) | val_size >> 2;
++ struct spi_transfer xfers = {
++ .rx_buf = &rxbuf,
++ .tx_buf = &txbuf,
++ .len = 8,
++ .cs_change = false,
++ };
++
++ (*(u32*)txbuf) = TCAN4X5X_READ_CMD | (*((u16 *)reg) << 8) | val_size >> 2;
++
++ ret = spi_sync_transfer(spi, &xfers, 1);
++ if (ret < 0)
++ return ret;
++
++ memcpy(val, &rxbuf[4], 4);
+
+- return spi_write_then_read(spi, &addr, reg_size, (u32 *)val, val_size);
++ return 0;
+ }
+
+ static struct regmap_bus tcan4x5x_bus = {
+--
+2.26.2
+
diff --git a/patches/linux/5.4.imx_legacy/0542-can-m_can-m_can_do_rx_poll-don-t-waste-time-if-quota.patch b/patches/linux/5.4.imx_legacy/0542-can-m_can-m_can_do_rx_poll-don-t-waste-time-if-quota.patch
new file mode 100644
index 000000000..efabbd832
--- /dev/null
+++ b/patches/linux/5.4.imx_legacy/0542-can-m_can-m_can_do_rx_poll-don-t-waste-time-if-quota.patch
@@ -0,0 +1,51 @@
+From 0fc8417adc1106eaef094b222c460a15bfb49f5b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 22 Jan 2021 10:17:36 +0100
+Subject: [PATCH 542/542] can: m_can: m_can_do_rx_poll: don't waste time if
+ quota == 0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ drivers/net/can/m_can/m_can.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
+index 02c5795b7393..b14a5b7a9868 100644
+--- a/drivers/net/can/m_can/m_can.c
++++ b/drivers/net/can/m_can/m_can.c
+@@ -499,13 +499,16 @@ static int m_can_do_rx_poll(struct net_device *dev, int quota)
+ u32 pkts = 0;
+ u32 rxfs;
+
++ if (quota <= 0)
++ return 0;
++
+ rxfs = m_can_read(cdev, M_CAN_RXF0S);
+ if (!(rxfs & RXFS_FFL_MASK)) {
+ netdev_dbg(dev, "no messages in fifo0\n");
+ return 0;
+ }
+
+- while ((rxfs & RXFS_FFL_MASK) && (quota > 0)) {
++ while ((rxfs & RXFS_FFL_MASK)) {
+ if (rxfs & RXFS_RFL)
+ netdev_warn(dev, "Rx FIFO 0 Message Lost\n");
+
+@@ -513,6 +516,10 @@ static int m_can_do_rx_poll(struct net_device *dev, int quota)
+
+ quota--;
+ pkts++;
++
++ if (quota <= 0)
++ break;
++
+ rxfs = m_can_read(cdev, M_CAN_RXF0S);
+ }
+
+--
+2.26.2
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-01-22 08:25:01
|
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 e10e2d19a158bb5e9b4970a01bd09c9dd698c94c (commit)
from 118116206eab319d3468ed78a1cf9c259e8ba343 (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 e10e2d19a158bb5e9b4970a01bd09c9dd698c94c
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Jan 22 09:24:46 2021 +0100
[PATCH] 5.4.imx_legacy: add patches for tcan
-----------------------------------------------------------------------
Summary of changes:
...rm64-dts-imx8mm-opos8mmdev-fixes-for-tcan.patch | 61 ++++++++++++++
...9-can-m_can-add-support-for-one-shot-mode.patch | 86 ++++++++++++++++++++
...dd-support-for-handling-arbitration-error.patch | 93 ++++++++++++++++++++++
3 files changed, 240 insertions(+)
create mode 100644 patches/linux/5.4.imx_legacy/0538-arm64-dts-imx8mm-opos8mmdev-fixes-for-tcan.patch
create mode 100644 patches/linux/5.4.imx_legacy/0539-can-m_can-add-support-for-one-shot-mode.patch
create mode 100644 patches/linux/5.4.imx_legacy/0540-can-m_can-add-support-for-handling-arbitration-error.patch
diff --git a/patches/linux/5.4.imx_legacy/0538-arm64-dts-imx8mm-opos8mmdev-fixes-for-tcan.patch b/patches/linux/5.4.imx_legacy/0538-arm64-dts-imx8mm-opos8mmdev-fixes-for-tcan.patch
new file mode 100644
index 000000000..c992aa061
--- /dev/null
+++ b/patches/linux/5.4.imx_legacy/0538-arm64-dts-imx8mm-opos8mmdev-fixes-for-tcan.patch
@@ -0,0 +1,61 @@
+From 4d06b018be04ce8cd0782508de328f3a4dac9edc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 22 Jan 2021 08:59:45 +0100
+Subject: [PATCH 538/540] arm64: dts: imx8mm-opos8mmdev: fixes for tcan
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Use controller's chip select
+* fix M_RAM configuration
+* add can-transceiver node
+* use IRQ_TYPE_LEVEL_LOW instead of GPIO_ACTIVE_LOW
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts b/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts
+index 309a582b124c..979032820561 100644
+--- a/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts
++++ b/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts
+@@ -155,7 +155,7 @@
+ &ecspi2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_ecspi2>;
+- cs-gpios = <&gpio5 13 GPIO_ACTIVE_LOW>;
++ cs-gpios = <0>;
+ status = "okay";
+
+ can@0 {
+@@ -164,10 +164,14 @@
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_can>;
+ spi-max-frequency = <18000000>;
+- bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>;
++ bosch,mram-cfg = <0x0 0 0 24 0 0 4 4>;
+ interrupt-parent = <&gpio1>;
+- interrupts = <9 GPIO_ACTIVE_LOW>;
++ interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
+ reset-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
++
++ can-transceiver {
++ max-bitrate = <8000000>;
++ };
+ };
+ };
+
+@@ -362,7 +366,7 @@
+ MX8MM_IOMUXC_ECSPI2_MOSI_ECSPI2_MOSI 0x10
+ MX8MM_IOMUXC_ECSPI2_MISO_ECSPI2_MISO 0x90
+ MX8MM_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK 0x90
+- MX8MM_IOMUXC_ECSPI2_SS0_GPIO5_IO13 0x90
++ MX8MM_IOMUXC_ECSPI2_SS0_ECSPI2_SS0 0x90
+ >;
+ };
+
+--
+2.26.2
+
diff --git a/patches/linux/5.4.imx_legacy/0539-can-m_can-add-support-for-one-shot-mode.patch b/patches/linux/5.4.imx_legacy/0539-can-m_can-add-support-for-one-shot-mode.patch
new file mode 100644
index 000000000..f114aea70
--- /dev/null
+++ b/patches/linux/5.4.imx_legacy/0539-can-m_can-add-support-for-one-shot-mode.patch
@@ -0,0 +1,86 @@
+From 07a67778417799981f5c8f102b94d9f35ed8b581 Mon Sep 17 00:00:00 2001
+From: Pankaj Sharma <pan...@sa...>
+Date: Mon, 21 Oct 2019 17:34:40 +0530
+Subject: [PATCH 539/540] can: m_can: add support for one shot mode
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+According to the CAN Specification (see ISO 11898-1:2015, 8.3.4
+Recovery Management), the M_CAN provides means for automatic
+retransmission of frames that have lost arbitration or that
+have been disturbed by errors during transmission. By default
+automatic retransmission is enabled.
+
+The Bosch MCAN controller has support for disabling automatic
+retransmission.
+
+To support time-triggered communication as described in ISO
+11898-1:2015, chapter 9.2, the automatic retransmission may be
+disabled via CCCR.DAR.
+
+CAN_CTRLMODE_ONE_SHOT is used for disabling automatic retransmission.
+
+Signed-off-by: Pankaj Sharma <pan...@sa...>
+Signed-off-by: Sriram Dash <sri...@sa...>
+Signed-off-by: Marc Kleine-Budde <mk...@pe...>
+(cherry picked from commit fb7d6a81c220178851badef9dd6eeba88264320a)
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ drivers/net/can/m_can/m_can.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
+index 562c8317e3aa..75e7490c4299 100644
+--- a/drivers/net/can/m_can/m_can.c
++++ b/drivers/net/can/m_can/m_can.c
+@@ -123,6 +123,7 @@ enum m_can_reg {
+ #define CCCR_CME_CANFD_BRS 0x2
+ #define CCCR_TXP BIT(14)
+ #define CCCR_TEST BIT(7)
++#define CCCR_DAR BIT(6)
+ #define CCCR_MON BIT(5)
+ #define CCCR_CSR BIT(4)
+ #define CCCR_CSA BIT(3)
+@@ -1135,7 +1136,7 @@ static void m_can_chip_config(struct net_device *dev)
+ if (cdev->version == 30) {
+ /* Version 3.0.x */
+
+- cccr &= ~(CCCR_TEST | CCCR_MON |
++ cccr &= ~(CCCR_TEST | CCCR_MON | CCCR_DAR |
+ (CCCR_CMR_MASK << CCCR_CMR_SHIFT) |
+ (CCCR_CME_MASK << CCCR_CME_SHIFT));
+
+@@ -1145,7 +1146,7 @@ static void m_can_chip_config(struct net_device *dev)
+ } else {
+ /* Version 3.1.x or 3.2.x */
+ cccr &= ~(CCCR_TEST | CCCR_MON | CCCR_BRSE | CCCR_FDOE |
+- CCCR_NISO);
++ CCCR_NISO | CCCR_DAR);
+
+ /* Only 3.2.x has NISO Bit implemented */
+ if (cdev->can.ctrlmode & CAN_CTRLMODE_FD_NON_ISO)
+@@ -1165,6 +1166,10 @@ static void m_can_chip_config(struct net_device *dev)
+ if (cdev->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)
+ cccr |= CCCR_MON;
+
++ /* Disable Auto Retransmission (all versions) */
++ if (cdev->can.ctrlmode & CAN_CTRLMODE_ONE_SHOT)
++ cccr |= CCCR_DAR;
++
+ /* Write config */
+ m_can_write(cdev, M_CAN_CCCR, cccr);
+ m_can_write(cdev, M_CAN_TEST, test);
+@@ -1310,7 +1315,8 @@ static int m_can_dev_setup(struct m_can_classdev *m_can_dev)
+ m_can_dev->can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |
+ CAN_CTRLMODE_LISTENONLY |
+ CAN_CTRLMODE_BERR_REPORTING |
+- CAN_CTRLMODE_FD;
++ CAN_CTRLMODE_FD |
++ CAN_CTRLMODE_ONE_SHOT;
+
+ /* Set properties depending on M_CAN version */
+ switch (m_can_dev->version) {
+--
+2.26.2
+
diff --git a/patches/linux/5.4.imx_legacy/0540-can-m_can-add-support-for-handling-arbitration-error.patch b/patches/linux/5.4.imx_legacy/0540-can-m_can-add-support-for-handling-arbitration-error.patch
new file mode 100644
index 000000000..d5f14561f
--- /dev/null
+++ b/patches/linux/5.4.imx_legacy/0540-can-m_can-add-support-for-handling-arbitration-error.patch
@@ -0,0 +1,93 @@
+From a1294304a7f1c326166ebfe3ad9165604430a40c Mon Sep 17 00:00:00 2001
+From: Pankaj Sharma <pan...@sa...>
+Date: Wed, 30 Oct 2019 17:08:59 +0530
+Subject: [PATCH 540/540] can: m_can: add support for handling arbitration
+ error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The Bosch MCAN hardware (3.1.0 and above) supports interrupt flag to
+detect Protocol error in arbitration phase.
+
+Transmit error statistics is currently not updated from the MCAN driver.
+Protocol error in arbitration phase is a TX error and the network
+statistics should be updated accordingly.
+
+The member "tx_error" of "struct net_device_stats" should be incremented
+as arbitration is a transmit protocol error. Also "arbitration_lost" of
+"struct can_device_stats" should be incremented to report arbitration
+lost.
+
+Signed-off-by: Pankaj Sharma <pan...@sa...>
+Signed-off-by: Sriram Dash <sri...@sa...>
+Signed-off-by: Marc Kleine-Budde <mk...@pe...>
+(cherry picked from commit 6b43a2650806ca59e9ac2554cfd1cf23ed491879)
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ drivers/net/can/m_can/m_can.c | 42 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
+index 75e7490c4299..02c5795b7393 100644
+--- a/drivers/net/can/m_can/m_can.c
++++ b/drivers/net/can/m_can/m_can.c
+@@ -778,6 +778,43 @@ static inline bool is_lec_err(u32 psr)
+ return psr && (psr != LEC_UNUSED);
+ }
+
++static inline bool m_can_is_protocol_err(u32 irqstatus)
++{
++ return irqstatus & IR_ERR_LEC_31X;
++}
++
++static int m_can_handle_protocol_error(struct net_device *dev, u32 irqstatus)
++{
++ struct net_device_stats *stats = &dev->stats;
++ struct m_can_classdev *cdev = netdev_priv(dev);
++ struct can_frame *cf;
++ struct sk_buff *skb;
++
++ /* propagate the error condition to the CAN stack */
++ skb = alloc_can_err_skb(dev, &cf);
++
++ /* update tx error stats since there is protocol error */
++ stats->tx_errors++;
++
++ /* update arbitration lost status */
++ if (cdev->version >= 31 && (irqstatus & IR_PEA)) {
++ netdev_dbg(dev, "Protocol error in Arbitration fail\n");
++ cdev->can.can_stats.arbitration_lost++;
++ if (skb) {
++ cf->can_id |= CAN_ERR_LOSTARB;
++ cf->data[0] |= CAN_ERR_LOSTARB_UNSPEC;
++ }
++ }
++
++ if (unlikely(!skb)) {
++ netdev_dbg(dev, "allocation of skb failed\n");
++ return 0;
++ }
++ netif_receive_skb(skb);
++
++ return 1;
++}
++
+ static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus,
+ u32 psr)
+ {
+@@ -792,6 +829,11 @@ static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus,
+ is_lec_err(psr))
+ work_done += m_can_handle_lec_err(dev, psr & LEC_UNUSED);
+
++ /* handle protocol errors in arbitration phase */
++ if ((cdev->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING) &&
++ m_can_is_protocol_err(irqstatus))
++ work_done += m_can_handle_protocol_error(dev, irqstatus);
++
+ /* other unproccessed error interrupts */
+ m_can_handle_other_err(dev, irqstatus);
+
+--
+2.26.2
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-01-21 09:39:56
|
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 "UNNAMED PROJECT".
The branch, opos6ul-2018.05 has been updated
via c2e3fc055aca24f259977a89de3a20625ad2b42a (commit)
via e176b552484ad65effa6cdb014548b7d003bc987 (commit)
from 525d5256f0d07d9862c8e0af395308c7e22793b1 (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 c2e3fc055aca24f259977a89de3a20625ad2b42a
Author: Masahiro Yamada <yam...@so...>
Date: Wed Sep 19 11:35:57 2018 +0900
kbuild: fix # escaping in appending U-Boot own DT
The escape sequence '\#' does not work for the latest GNU Make from
the git tree.
Replace it with $(pound) as Linux did.
Signed-off-by: Masahiro Yamada <yam...@so...>
(cherry picked from commit 0c544115379ed77c1843a194e26960e5b8f3d369)
commit e176b552484ad65effa6cdb014548b7d003bc987
Author: Rasmus Villemoes <li...@ra...>
Date: Wed Sep 19 11:35:56 2018 +0900
Kbuild: fix # escaping in .cmd files for future Make
[ commit 9564a8cf422d7b58f6e857e3546d346fa970191e in Linux ]
I tried building using a freshly built Make (4.2.1-69-g8a731d1), but
already the objtool build broke with
orc_dump.c: In function âorc_dumpâ:
orc_dump.c:106:2: error: âelf_getshnumâ is deprecated [-Werror=deprecated-declarations]
if (elf_getshdrnum(elf, &nr_sections)) {
Turns out that with that new Make, the backslash was not removed, so cpp
didn't see a #include directive, grep found nothing, and
-DLIBELF_USE_DEPRECATED was wrongly put in CFLAGS.
Now, that new Make behaviour is documented in their NEWS file:
* WARNING: Backward-incompatibility!
Number signs (#) appearing inside a macro reference or function invocation
no longer introduce comments and should not be escaped with backslashes:
thus a call such as:
foo := $(shell echo '#')
is legal. Previously the number sign needed to be escaped, for example:
foo := $(shell echo '\#')
Now this latter will resolve to "\#". If you want to write makefiles
portable to both versions, assign the number sign to a variable:
C := \#
foo := $(shell echo '$C')
This was claimed to be fixed in 3.81, but wasn't, for some reason.
To detect this change search for 'nocomment' in the .FEATURES variable.
This also fixes up the two make-cmd instances to replace # with $(pound)
rather than with \#. There might very well be other places that need
similar fixup in preparation for whatever future Make release contains
the above change, but at least this builds an x86_64 defconfig with the
new make.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=197847
Cc: Randy Dunlap <rd...@in...>
Signed-off-by: Rasmus Villemoes <li...@ra...>
Signed-off-by: Masahiro Yamada <yam...@so...>
(cherry picked from commit e5e701c2b8470de044c5c71d2a54ecfc72680d59)
-----------------------------------------------------------------------
Summary of changes:
scripts/Kbuild.include | 5 +++--
scripts/Makefile.lib | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 2c7918ad37..13ebddda65 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -7,6 +7,7 @@ quote := "
squote := '
empty :=
space := $(empty) $(empty)
+pound := \#
###
# Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o
@@ -242,11 +243,11 @@ endif
# Replace >$< with >$$< to preserve $ when reloading the .cmd file
# (needed for make)
-# Replace >#< with >\#< to avoid starting a comment in the .cmd file
+# Replace >#< with >$(pound)< to avoid starting a comment in the .cmd file
# (needed for make)
# Replace >'< with >'\''< to be able to enclose the whole string in '...'
# (needed for the shell)
-make-cmd = $(call escsq,$(subst \#,\\\#,$(subst $$,$$$$,$(cmd_$(1)))))
+make-cmd = $(call escsq,$(subst $(pound),$$(pound),$(subst $$,$$$$,$(cmd_$(1)))))
# Find any prerequisites that is newer than target or that does not exist.
# PHONY targets skipped in both cases.
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index f9809ce7ce..4bb768b2ce 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -316,7 +316,7 @@ quiet_cmd_dtc = DTC $@
# Modified for U-Boot
# Bring in any U-Boot-specific include at the end of the file
cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
- (cat $<; $(if $(u_boot_dtsi),echo '\#include "$(u_boot_dtsi)"')) > $(pre-tmp); \
+ (cat $<; $(if $(u_boot_dtsi),echo '$(pound)include "$(u_boot_dtsi)"')) > $(pre-tmp); \
$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $(pre-tmp) ; \
$(DTC) -O dtb -o $@ -b 0 \
-i $(dir $<) $(DTC_FLAGS) \
hooks/post-receive
--
UNNAMED PROJECT
|
|
From: Sébastien S. <ss...@us...> - 2021-01-21 09:38:43
|
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 "UNNAMED PROJECT".
The branch, c2e3fc055aca24f259977a89de3a20625ad2b42a has been deleted
was c3be4e54ee7e874c63d59c67106e33ea8eb5b161
-----------------------------------------------------------------------
c3be4e54ee7e874c63d59c67106e33ea8eb5b161 usb: ehci-mx6: Fix bus enumeration for DM case
-----------------------------------------------------------------------
hooks/post-receive
--
UNNAMED PROJECT
|
|
From: Sébastien S. <ss...@us...> - 2021-01-21 09:30:14
|
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 "UNNAMED PROJECT".
The branch, c2e3fc055aca24f259977a89de3a20625ad2b42a has been created
at c3be4e54ee7e874c63d59c67106e33ea8eb5b161 (commit)
- Log -----------------------------------------------------------------
commit c3be4e54ee7e874c63d59c67106e33ea8eb5b161
Author: Marek Vasut <ma...@de...>
Date: Mon Jun 24 19:05:47 2019 +0200
usb: ehci-mx6: Fix bus enumeration for DM case
The EHCI iMX6 driver is only partly converted to DT probing and
still uses a tremendous amount of hard-coded addresses. Worse,
the driver uses hard-coded SoC-model-specific base addresses, which
are derived from values protected by SoC-specific macros, hence the
driver is also compiled for a specific SoC model. Even worse, the
driver depends on specific sequential indexing of the controllers,
from which it derives offsets in the PHY and ANATOP register sets.
However, when the driver is probed from DT, the indexing is not
correct. In fact, each controller has index 0. This patch derives
the index for DT probing case from the controller base addresses,
which is not the way this should be done, however it is the least
intrusive approach, favorable this close to release.
The necessary steps to convert this driver fully to DT probing are
described inside the patch, however this should be done in the next
release and depends on iMX clock driver patches.
Signed-off-by: Marek Vasut <ma...@de...>
Cc: Abel Vesa <abe...@nx...>
Cc: Adam Ford <afo...@gm...>
Cc: Fabio Estevam <fes...@gm...>
Cc: Ludwig Zenz <lz...@dh...>
Cc: Lukasz Majewski <lu...@de...>
Cc: Peng Fan <pen...@nx...>
Cc: Stefano Babic <sb...@de...>
Cc: Vagrant Cascadian <va...@de...>
(cherry picked from commit 501547cec1f7f0438cae388a104ff60f18576c01)
commit c2e3fc055aca24f259977a89de3a20625ad2b42a
Author: Masahiro Yamada <yam...@so...>
Date: Wed Sep 19 11:35:57 2018 +0900
kbuild: fix # escaping in appending U-Boot own DT
The escape sequence '\#' does not work for the latest GNU Make from
the git tree.
Replace it with $(pound) as Linux did.
Signed-off-by: Masahiro Yamada <yam...@so...>
(cherry picked from commit 0c544115379ed77c1843a194e26960e5b8f3d369)
commit e176b552484ad65effa6cdb014548b7d003bc987
Author: Rasmus Villemoes <li...@ra...>
Date: Wed Sep 19 11:35:56 2018 +0900
Kbuild: fix # escaping in .cmd files for future Make
[ commit 9564a8cf422d7b58f6e857e3546d346fa970191e in Linux ]
I tried building using a freshly built Make (4.2.1-69-g8a731d1), but
already the objtool build broke with
orc_dump.c: In function âorc_dumpâ:
orc_dump.c:106:2: error: âelf_getshnumâ is deprecated [-Werror=deprecated-declarations]
if (elf_getshdrnum(elf, &nr_sections)) {
Turns out that with that new Make, the backslash was not removed, so cpp
didn't see a #include directive, grep found nothing, and
-DLIBELF_USE_DEPRECATED was wrongly put in CFLAGS.
Now, that new Make behaviour is documented in their NEWS file:
* WARNING: Backward-incompatibility!
Number signs (#) appearing inside a macro reference or function invocation
no longer introduce comments and should not be escaped with backslashes:
thus a call such as:
foo := $(shell echo '#')
is legal. Previously the number sign needed to be escaped, for example:
foo := $(shell echo '\#')
Now this latter will resolve to "\#". If you want to write makefiles
portable to both versions, assign the number sign to a variable:
C := \#
foo := $(shell echo '$C')
This was claimed to be fixed in 3.81, but wasn't, for some reason.
To detect this change search for 'nocomment' in the .FEATURES variable.
This also fixes up the two make-cmd instances to replace # with $(pound)
rather than with \#. There might very well be other places that need
similar fixup in preparation for whatever future Make release contains
the above change, but at least this builds an x86_64 defconfig with the
new make.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=197847
Cc: Randy Dunlap <rd...@in...>
Signed-off-by: Rasmus Villemoes <li...@ra...>
Signed-off-by: Masahiro Yamada <yam...@so...>
(cherry picked from commit e5e701c2b8470de044c5c71d2a54ecfc72680d59)
-----------------------------------------------------------------------
hooks/post-receive
--
UNNAMED PROJECT
|
|
From: Sébastien S. <ss...@us...> - 2021-01-20 14:18: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 118116206eab319d3468ed78a1cf9c259e8ba343 (commit)
via 81dff4818c488a9f74f77cafe73a09c9212c4fd4 (commit)
from 9cb193bf1262f93340c191a9c243bb4f01c34695 (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 118116206eab319d3468ed78a1cf9c259e8ba343
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Jan 20 15:17:57 2021 +0100
[BUILDROOT] opos6ul{,nano,sp} / apf6: bump kernel to 4.19.169
commit 81dff4818c488a9f74f77cafe73a09c9212c4fd4
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jan 19 20:49:39 2021 +0100
[BUILDROOT] Bump BR to 2020.02.9
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
buildroot/configs/apf6_defconfig | 2 +-
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index c8621744b..117af618a 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2020.02
-BUILDROOT_MINOR_VERSION ?= 7
+BUILDROOT_MINOR_VERSION ?= 9
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index e23b9d2fe..73f7125d3 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="4.19.150"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.169"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 49597cb55..be77dd937 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -22,7 +22,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="4.19.150"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.169"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index e58312c8b..b24726d0b 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -22,7 +22,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="4.19.150"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.169"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index 600cf7566..53af107b9 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -22,7 +22,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="4.19.150"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.169"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-01-07 10:57:04
|
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 e6d052fe73ba9983028bf1c21c915b194775e096 (commit)
from 59bac66db1731bdb7c2416b7579483d9726f3f6c (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 e6d052fe73ba9983028bf1c21c915b194775e096
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jan 7 11:56:15 2021 +0100
[PATCH] 5.4.imx_legacy: add patch 520 and 522
0520-drm-panel-ili9881c-increase-delay-to-120ms-before-in.patch
0522-clk-imx8mm-Add-CLKO2-support.patch
-----------------------------------------------------------------------
Summary of changes:
...li9881c-increase-delay-to-120ms-before-in.patch | 31 +++++++++++
.../0522-clk-imx8mm-Add-CLKO2-support.patch | 61 ++++++++++++++++++++++
2 files changed, 92 insertions(+)
create mode 100644 patches/linux/5.4.imx_legacy/0520-drm-panel-ili9881c-increase-delay-to-120ms-before-in.patch
create mode 100644 patches/linux/5.4.imx_legacy/0522-clk-imx8mm-Add-CLKO2-support.patch
diff --git a/patches/linux/5.4.imx_legacy/0520-drm-panel-ili9881c-increase-delay-to-120ms-before-in.patch b/patches/linux/5.4.imx_legacy/0520-drm-panel-ili9881c-increase-delay-to-120ms-before-in.patch
new file mode 100644
index 000000000..1b5a6ba8b
--- /dev/null
+++ b/patches/linux/5.4.imx_legacy/0520-drm-panel-ili9881c-increase-delay-to-120ms-before-in.patch
@@ -0,0 +1,31 @@
+From 6b918e0ce9f6ea01424a28e8a579ba283d0a4375 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Mon, 19 Oct 2020 11:54:47 +0200
+Subject: [PATCH 1/1] drm/panel: ili9881c: increase delay to 120ms before init
+ sequence
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
+index 762fb4bf9789..6d8318a74e22 100644
+--- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
++++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
+@@ -708,7 +708,7 @@ static int ili9881c_prepare(struct drm_panel *panel)
+ msleep(20);
+
+ gpiod_set_value(ctx->reset, 0);
+- msleep(20);
++ msleep(120);
+
+ for (i = 0; i < ctx->data->num_instr; i++) {
+ const struct ili9881c_instr *instr = &ili9881c_init[i];
+--
+2.26.2
+
diff --git a/patches/linux/5.4.imx_legacy/0522-clk-imx8mm-Add-CLKO2-support.patch b/patches/linux/5.4.imx_legacy/0522-clk-imx8mm-Add-CLKO2-support.patch
new file mode 100644
index 000000000..45778d53d
--- /dev/null
+++ b/patches/linux/5.4.imx_legacy/0522-clk-imx8mm-Add-CLKO2-support.patch
@@ -0,0 +1,61 @@
+From ca33d0c02a7c4d40a442ac135eadb0a58d294c8c Mon Sep 17 00:00:00 2001
+From: Fabio Estevam <fes...@gm...>
+Date: Mon, 17 Feb 2020 13:49:38 +0800
+Subject: [PATCH 1/1] clk: imx8mm: Add CLKO2 support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add CLKO2 support, which is useful for debugging purposes.
+
+Signed-off-by: Fabio Estevam <fes...@gm...>
+Reviewed-by: Abel Vesa <abe...@nx...>
+Signed-off-by: Shawn Guo <sha...@ke...>
+
+Upstream-commit: 9c07ae6983d434841bb19bea0a75bd0fd925a75c
+
+Signed-off-by: Laurent Pinchart <lau...@id...>
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ drivers/clk/imx/clk-imx8mm.c | 3 +++
+ include/dt-bindings/clock/imx8mm-clock.h | 4 +++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c
+index 7dee2f76cc37..5873e9441333 100644
+--- a/drivers/clk/imx/clk-imx8mm.c
++++ b/drivers/clk/imx/clk-imx8mm.c
+@@ -359,6 +359,8 @@ static const char *imx8mm_dram_core_sels[] = {"dram_pll_out", "dram_alt_root", }
+
+ static const char *imx8mm_clko1_sels[] = {"osc_24m", "sys_pll1_800m", "osc_27m", "sys_pll1_200m", "audio_pll2_out",
+ "vpu_pll", "sys_pll1_80m", };
++static const char *imx8mm_clko2_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll1_400m", "sys_pll2_166m",
++ "sys_pll3_out", "audio_pll1_out", "video_pll1_out", "osc_32k", };
+
+ static struct clk *clks[IMX8MM_CLK_END];
+ static struct clk_onecell_data clk_data;
+@@ -573,6 +575,7 @@ static int imx8mm_clocks_probe(struct platform_device *pdev)
+ clks[IMX8MM_CLK_WDOG] = imx8m_clk_composite("wdog", imx8mm_wdog_sels, base + 0xb900);
+ clks[IMX8MM_CLK_WRCLK] = imx8m_clk_composite("wrclk", imx8mm_wrclk_sels, base + 0xb980);
+ clks[IMX8MM_CLK_CLKO1] = imx8m_clk_composite("clko1", imx8mm_clko1_sels, base + 0xba00);
++ clks[IMX8MM_CLK_CLKO2] = imx8m_clk_composite("clko2", imx8mm_clko2_sels, base + 0xba80);
+ clks[IMX8MM_CLK_DSI_CORE] = imx8m_clk_composite("dsi_core", imx8mm_dsi_core_sels, base + 0xbb00);
+ clks[IMX8MM_CLK_DSI_PHY_REF] = imx8m_clk_composite("dsi_phy_ref", imx8mm_dsi_phy_sels, base + 0xbb80);
+ clks[IMX8MM_CLK_DSI_DBI] = imx8m_clk_composite("dsi_dbi", imx8mm_dsi_dbi_sels, base + 0xbc00);
+diff --git a/include/dt-bindings/clock/imx8mm-clock.h b/include/dt-bindings/clock/imx8mm-clock.h
+index 81a2436ef5a9..293f2140cef7 100644
+--- a/include/dt-bindings/clock/imx8mm-clock.h
++++ b/include/dt-bindings/clock/imx8mm-clock.h
+@@ -249,6 +249,8 @@
+ #define IMX8MM_CLK_GIC 229
+ #define IMX8MM_CLK_A53_CORE 230
+
+-#define IMX8MM_CLK_END 231
++#define IMX8MM_CLK_CLKO2 231
++
++#define IMX8MM_CLK_END 232
+
+ #endif
+--
+2.26.2
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-01-07 10:43:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 59bac66db1731bdb7c2416b7579483d9726f3f6c (commit)
from 13bd1dcd941b70b90198e6131b6591b722effb0a (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 59bac66db1731bdb7c2416b7579483d9726f3f6c
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jan 7 11:43:09 2021 +0100
[BUILDROOT] ops8mm: BR2_PACKAGE_IMX_GPU_G2D and BR2_PACKAGE_IMX_GPU_VIV
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos8mm-legacy-5.4_defconfig | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/buildroot/configs/opos8mm-legacy-5.4_defconfig b/buildroot/configs/opos8mm-legacy-5.4_defconfig
index 7d91e69e2..e5325ae45 100644
--- a/buildroot/configs/opos8mm-legacy-5.4_defconfig
+++ b/buildroot/configs/opos8mm-legacy-5.4_defconfig
@@ -69,6 +69,11 @@ BR2_PACKAGE_FREESCALE_IMX=y
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y
BR2_PACKAGE_IMX_VPUWRAP=y
BR2_PACKAGE_FIRMWARE_IMX=y
+BR2_PACKAGE_IMX_GPU_G2D=y
+BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES=y
+BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL=y
+BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES=y
+BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO=y
BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_HWDATA_IAB_OUI_TXT=y
BR2_PACKAGE_HWDATA_PNP_IDS=y
@@ -108,7 +113,7 @@ BR2_PACKAGE_UTIL_LINUX_FSCK=y
BR2_PACKAGE_UTIL_LINUX_RFKILL=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_TARGET_ROOTFS_EXT2_SIZE="128M"
+BR2_TARGET_ROOTFS_EXT2_SIZE="512M"
BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,^metadata_csum,uninit_bg"
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2021-01-04 11:05: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 13bd1dcd941b70b90198e6131b6591b722effb0a (commit)
via eedcbd021f1d6a574d091efaa0e9b600caef7652 (commit)
from b18b304402e553f2415b4e52cc137b6d5760848c (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 13bd1dcd941b70b90198e6131b6591b722effb0a
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jan 4 11:58:53 2021 +0100
[BUILDROOT] 2020.02: imx-gpu-{g2d,viv}: sync with NXP kernel 5.4.24-2.1.0
commit eedcbd021f1d6a574d091efaa0e9b600caef7652
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jan 4 12:02:10 2021 +0100
[PATCH] 5.4.imx_legacy: i.MX8MM: enable VPU and GPU
-----------------------------------------------------------------------
Summary of changes:
...escale-imx-imx-gpu-g2d-bump-to-version-6..patch | 50 ++++++++++++++++++++
...escale-imx-imx-gpu-viv-bump-to-version-6..patch | 53 ++++++++++++++++++++++
...escale-imx-imx-gpu-viv-remove-fb-headers-.patch | 48 ++++++++++++++++++++
...-dts-imx8mm-opos8mmdev-enable-VPU-and-GPU.patch | 51 +++++++++++++++++++++
4 files changed, 202 insertions(+)
create mode 100644 patches/buildroot/2020.02/372-package-freescale-imx-imx-gpu-g2d-bump-to-version-6..patch
create mode 100644 patches/buildroot/2020.02/373-package-freescale-imx-imx-gpu-viv-bump-to-version-6..patch
create mode 100644 patches/buildroot/2020.02/374-package-freescale-imx-imx-gpu-viv-remove-fb-headers-.patch
create mode 100644 patches/linux/5.4.imx_legacy/0519-arm64-dts-imx8mm-opos8mmdev-enable-VPU-and-GPU.patch
diff --git a/patches/buildroot/2020.02/372-package-freescale-imx-imx-gpu-g2d-bump-to-version-6..patch b/patches/buildroot/2020.02/372-package-freescale-imx-imx-gpu-g2d-bump-to-version-6..patch
new file mode 100644
index 000000000..fe76468b5
--- /dev/null
+++ b/patches/buildroot/2020.02/372-package-freescale-imx-imx-gpu-g2d-bump-to-version-6..patch
@@ -0,0 +1,50 @@
+From a7e94ce9915ddd257c64adc236dd280290624303 Mon Sep 17 00:00:00 2001
+From: Gary Bisson <gar...@bo...>
+Date: Thu, 16 Jul 2020 16:48:35 +0200
+Subject: [PATCH 1/1] package/freescale-imx/imx-gpu-g2d: bump to version
+ 6.4.0.p2.4
+
+- Same version as NXP release 5.4.24-2.1.0
+- No changelog provided by NXP
+- COPYING/EULA update: LA_OPT_NXP_Software_License v11 February 2020
+
+Signed-off-by: Gary Bisson <gar...@bo...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash | 8 ++++----
+ package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash
+index 98ca7fbe7e..4ff5926482 100644
+--- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash
++++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash
+@@ -1,5 +1,5 @@
+ # Locally calculated
+-sha256 6d6d02d035d988cbdb2014794f2efe970a3f5ac277202882bbf553bb7fd789d2 imx-gpu-g2d-6.4.0.p1.0-arm.bin
+-sha256 35885f435dbe951d2c0f439a376ed8a59a50b67a1b7e1e14fa2ab03995abb1ad imx-gpu-g2d-6.4.0.p1.0-aarch64.bin
+-sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING
+-sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA
++sha256 010bab5780476f26406e16b058514453dc235a0e7f4b995fa03c976d06e5cb96 imx-gpu-g2d-6.4.0.p2.4-arm.bin
++sha256 553bbe9ee1caa222fd14b835deb2afedf9ed936b7a13424328df75892286f666 imx-gpu-g2d-6.4.0.p2.4-aarch64.bin
++sha256 2ceab29de5ea533b86f570bcc4e9ddbfb5fe85a1da4978a8613ff3fd9bed781d COPYING
++sha256 7ffad92e72e5f6b23027e7cf93a770a4acef00a92dcf79f22701ed401c5478c0 EULA
+diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
+index 7700170970..15cfe66f0b 100644
+--- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
++++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
+@@ -5,9 +5,9 @@
+ ################################################################################
+
+ ifeq ($(BR2_aarch64),y)
+-IMX_GPU_G2D_VERSION = 6.4.0.p1.0-aarch64
++IMX_GPU_G2D_VERSION = 6.4.0.p2.4-aarch64
+ else
+-IMX_GPU_G2D_VERSION = 6.4.0.p1.0-arm
++IMX_GPU_G2D_VERSION = 6.4.0.p2.4-arm
+ endif
+ IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE)
+ IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION).bin
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/373-package-freescale-imx-imx-gpu-viv-bump-to-version-6..patch b/patches/buildroot/2020.02/373-package-freescale-imx-imx-gpu-viv-bump-to-version-6..patch
new file mode 100644
index 000000000..91b85f27c
--- /dev/null
+++ b/patches/buildroot/2020.02/373-package-freescale-imx-imx-gpu-viv-bump-to-version-6..patch
@@ -0,0 +1,53 @@
+From 4f0f5491147f10327bb4f71d67d027e8d1b03f88 Mon Sep 17 00:00:00 2001
+From: Gary Bisson <gar...@bo...>
+Date: Thu, 16 Jul 2020 16:48:36 +0200
+Subject: [PATCH 1/1] package/freescale-imx/imx-gpu-viv: bump to version
+ 6.4.0.p2.4
+
+- Same version as NXP release 5.4.24-2.1.0
+- No changelog provided by NXP
+- COPYING/EULA update: LA_OPT_NXP_Software_License v11 February 2020
+- Tested on Nitrogen8M device with Weston (DRM backend) as follows:
+ # cd /usr/share/examples/viv_samples/vdk/
+ # ./tutorial7
+
+Signed-off-by: Gary Bisson <gar...@bo...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash | 8 ++++----
+ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
+index 1a67b53ac5..6de74a9496 100644
+--- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
++++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
+@@ -1,5 +1,5 @@
+ # Locally calculated
+-sha256 b5c94b56a9f7c84aa084603a6ca21b5f3941b400e4f6ee8558b58c9b9f1aab36 imx-gpu-viv-6.4.0.p1.0-aarch32.bin
+-sha256 45852a5c3c61a9215a2ffb7387a6e1cce7ddac6f12513fc77459ad7e1f1b3a27 imx-gpu-viv-6.4.0.p1.0-aarch64.bin
+-sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING
+-sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA
++sha256 9cc4c6594083f5970bc394a698a0a8ed0c7f2a1a753dfbf25cb0be5ab8bdcbd5 imx-gpu-viv-6.4.0.p2.4-aarch32.bin
++sha256 a295f41a6346c507fc8a677c26ecf9b2f416735e32e6d0734516ef5363027720 imx-gpu-viv-6.4.0.p2.4-aarch64.bin
++sha256 2ceab29de5ea533b86f570bcc4e9ddbfb5fe85a1da4978a8613ff3fd9bed781d COPYING
++sha256 7ffad92e72e5f6b23027e7cf93a770a4acef00a92dcf79f22701ed401c5478c0 EULA
+diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+index 646d4e3673..b6b070e4f6 100644
+--- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
++++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+@@ -5,9 +5,9 @@
+ ################################################################################
+
+ ifeq ($(BR2_aarch64),y)
+-IMX_GPU_VIV_VERSION = 6.4.0.p1.0-aarch64
++IMX_GPU_VIV_VERSION = 6.4.0.p2.4-aarch64
+ else
+-IMX_GPU_VIV_VERSION = 6.4.0.p1.0-aarch32
++IMX_GPU_VIV_VERSION = 6.4.0.p2.4-aarch32
+ endif
+ IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE)
+ IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/374-package-freescale-imx-imx-gpu-viv-remove-fb-headers-.patch b/patches/buildroot/2020.02/374-package-freescale-imx-imx-gpu-viv-remove-fb-headers-.patch
new file mode 100644
index 000000000..03083cd81
--- /dev/null
+++ b/patches/buildroot/2020.02/374-package-freescale-imx-imx-gpu-viv-remove-fb-headers-.patch
@@ -0,0 +1,48 @@
+From 6d21635c36dbbc4c44ec9f83663858b9b46457a1 Mon Sep 17 00:00:00 2001
+From: Gary Bisson <gar...@bo...>
+Date: Tue, 27 Oct 2020 18:12:45 +0100
+Subject: [PATCH 1/1] package/freescale-imx/imx-gpu-viv: remove fb headers
+ fixup
+
+As it doesn't seem to be needed any longer. Also it was agreed to fix
+packages not using pkgconfig properly instead of doing this sed.
+
+Tested on i.MX6 platform with Qt5, no more issues.
+
+Signed-off-by: Gary Bisson <gar...@bo...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+index b6b070e4f6..fca8a4d447 100644
+--- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
++++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+@@ -58,15 +58,6 @@ define IMX_GPU_VIV_BUILD_CMDS
+ ln -sf libVDK-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVDK.so
+ endef
+
+-ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)
+-define IMX_GPU_VIV_FIXUP_FB_HEADERS
+- $(SED) '39i\
+- #if !defined(EGL_API_X11) && !defined(EGL_API_DFB) && !defined(EGL_API_FB) \n\
+- #define EGL_API_FB \n\
+- #endif' $(STAGING_DIR)/usr/include/EGL/eglplatform.h
+-endef
+-endif
+-
+ ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)
+ define IMX_GPU_VIV_FIXUP_PKGCONFIG
+ ln -sf egl_linuxfb.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc
+@@ -89,7 +80,6 @@ endif
+
+ define IMX_GPU_VIV_INSTALL_STAGING_CMDS
+ cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr
+- $(IMX_GPU_VIV_FIXUP_FB_HEADERS)
+ $(IMX_GPU_VIV_FIXUP_PKGCONFIG)
+ for lib in egl gbm glesv1_cm glesv2 vg; do \
+ $(INSTALL) -m 0644 -D \
+--
+2.26.2
+
diff --git a/patches/linux/5.4.imx_legacy/0519-arm64-dts-imx8mm-opos8mmdev-enable-VPU-and-GPU.patch b/patches/linux/5.4.imx_legacy/0519-arm64-dts-imx8mm-opos8mmdev-enable-VPU-and-GPU.patch
new file mode 100644
index 000000000..70af85ca5
--- /dev/null
+++ b/patches/linux/5.4.imx_legacy/0519-arm64-dts-imx8mm-opos8mmdev-enable-VPU-and-GPU.patch
@@ -0,0 +1,51 @@
+From 93f098843dc45a5a76557885c7307bd1cf885531 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 16 Oct 2020 11:07:01 +0200
+Subject: [PATCH 519/519] arm64: dts: imx8mm-opos8mmdev: enable VPU and GPU
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ .../boot/dts/freescale/imx8mm-opos8mmdev.dts | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts b/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts
+index daceb62cf1d9..791e3d3f384c 100644
+--- a/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts
++++ b/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts
+@@ -122,6 +122,10 @@
+ };
+ };
+
++&gpu {
++ status = "okay";
++};
++
+ &i2c3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c3>;
+@@ -231,6 +235,18 @@
+ status = "okay";
+ };
+
++&vpu_g1 {
++ status = "okay";
++};
++
++&vpu_g2 {
++ status = "okay";
++};
++
++&vpu_h1 {
++ status = "okay";
++};
++
+ &iomuxc {
+ pinctrl_backlight: backlightgrp {
+ fsl,pins = <
+--
+2.26.2
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2020-12-03 15:38:47
|
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 b18b304402e553f2415b4e52cc137b6d5760848c (commit)
from f3749715387fd4db8c308d71858f6a0e836bbe41 (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 b18b304402e553f2415b4e52cc137b6d5760848c
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Dec 3 16:37:47 2020 +0100
[BUILDROOT] opos8mm: install proper WiFi firmware
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos8mm-legacy-5.4_defconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/buildroot/configs/opos8mm-legacy-5.4_defconfig b/buildroot/configs/opos8mm-legacy-5.4_defconfig
index dfa75b987..7d91e69e2 100644
--- a/buildroot/configs/opos8mm-legacy-5.4_defconfig
+++ b/buildroot/configs/opos8mm-legacy-5.4_defconfig
@@ -62,7 +62,8 @@ BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FBV=y
BR2_PACKAGE_MURATA_CYW_FW=y
-BR2_PACKAGE_MURATA_CYW_FW_CYW43430=y
+BR2_PACKAGE_MURATA_CYW_FW_CYW43455=y
+BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1MW=y
BR2_PACKAGE_EVTEST=y
BR2_PACKAGE_FREESCALE_IMX=y
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y
hooks/post-receive
--
armadeus
|