[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-252-g3078ad350
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-252-g3078ad350
|
From: Sébastien S. <ss...@us...> - 2021-04-23 16:29: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 3078ad350dfc73a28ffcef8ec170eb31aa5be464 (commit)
via 0b22cf341fc69463c2e6d3596018383426c2b32b (commit)
from ce69447d6155f637edde6a4da41e3581c36d0ec3 (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 3078ad350dfc73a28ffcef8ec170eb31aa5be464
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Apr 23 18:28:01 2021 +0200
[BSP] opos6ulsp: drop BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX
There is no WiFi/BT chip on the OPOS6ULSP SoM.
commit 0b22cf341fc69463c2e6d3596018383426c2b32b
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Apr 23 18:19:21 2021 +0200
[BSP] opos6ul{,nano}: use firmwares from murata for WiFi/BT
We don't have to remove "uneeded" firmwares anymore. (Moreover, on
customers' BSP, that was annoying)
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul-preempt-rt_defconfig | 4 +-
buildroot/configs/opos6ul_defconfig | 4 +-
buildroot/configs/opos6ul_legacy_defconfig | 4 +-
buildroot/configs/opos6ul_recovery_defconfig | 4 +-
buildroot/configs/opos6ullegacy-4.14_defconfig | 4 +-
buildroot/configs/opos6ullegacy-4.1_defconfig | 4 +-
buildroot/configs/opos6ullegacy-4.9_defconfig | 4 +-
buildroot/configs/opos6ulnano-preempt-rt_defconfig | 5 +-
buildroot/configs/opos6ulnano_defconfig | 5 +-
buildroot/configs/opos6ulsp_defconfig | 2 -
buildroot/configs/opos6ultest_defconfig | 4 +-
.../target/device/armadeus/rootfs/post_build.sh | 11 ----
.../lib/firmware/brcm/brcmfmac43430-sdio.txt | 66 ----------------------
13 files changed, 20 insertions(+), 101 deletions(-)
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_overlay/lib/firmware/brcm/brcmfmac43430-sdio.txt
diff --git a/buildroot/configs/opos6ul-preempt-rt_defconfig b/buildroot/configs/opos6ul-preempt-rt_defconfig
index 2a40d924f..a104a16ba 100644
--- a/buildroot/configs/opos6ul-preempt-rt_defconfig
+++ b/buildroot/configs/opos6ul-preempt-rt_defconfig
@@ -61,8 +61,8 @@ BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_GIF is not set
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
+BR2_PACKAGE_MURATA_CYW_FW=y
+BR2_PACKAGE_MURATA_CYW_FW_CYW43430=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_DBUS_PYTHON=y
BR2_PACKAGE_EVTEST=y
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index dccb3bfc5..4b87352b8 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -63,8 +63,8 @@ BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_GIF is not set
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
+BR2_PACKAGE_MURATA_CYW_FW=y
+BR2_PACKAGE_MURATA_CYW_FW_CYW43430=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_DBUS_PYTHON=y
BR2_PACKAGE_EVTEST=y
diff --git a/buildroot/configs/opos6ul_legacy_defconfig b/buildroot/configs/opos6ul_legacy_defconfig
index d340c281a..300436135 100644
--- a/buildroot/configs/opos6ul_legacy_defconfig
+++ b/buildroot/configs/opos6ul_legacy_defconfig
@@ -58,8 +58,8 @@ BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_GIF is not set
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
+BR2_PACKAGE_MURATA_CYW_FW=y
+BR2_PACKAGE_MURATA_CYW_FW_CYW43430=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_DBUS_PYTHON=y
BR2_PACKAGE_EVTEST=y
diff --git a/buildroot/configs/opos6ul_recovery_defconfig b/buildroot/configs/opos6ul_recovery_defconfig
index 4d89d0a41..c5afc9488 100644
--- a/buildroot/configs/opos6ul_recovery_defconfig
+++ b/buildroot/configs/opos6ul_recovery_defconfig
@@ -37,8 +37,8 @@ BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_PV=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
+BR2_PACKAGE_MURATA_CYW_FW=y
+BR2_PACKAGE_MURATA_CYW_FW_CYW43430=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_DTC=y
diff --git a/buildroot/configs/opos6ullegacy-4.14_defconfig b/buildroot/configs/opos6ullegacy-4.14_defconfig
index 6c032803c..b45275ba5 100644
--- a/buildroot/configs/opos6ullegacy-4.14_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.14_defconfig
@@ -116,8 +116,8 @@ BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_GIF is not set
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
+BR2_PACKAGE_MURATA_CYW_FW=y
+BR2_PACKAGE_MURATA_CYW_FW_CYW43430=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_EVTEST=y
BR2_PACKAGE_FREESCALE_IMX=y
diff --git a/buildroot/configs/opos6ullegacy-4.1_defconfig b/buildroot/configs/opos6ullegacy-4.1_defconfig
index e2bb69328..d70afb31b 100644
--- a/buildroot/configs/opos6ullegacy-4.1_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.1_defconfig
@@ -110,8 +110,8 @@ BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_GIF is not set
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
+BR2_PACKAGE_MURATA_CYW_FW=y
+BR2_PACKAGE_MURATA_CYW_FW_CYW43430=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_DBUS_PYTHON=y
BR2_PACKAGE_EVTEST=y
diff --git a/buildroot/configs/opos6ullegacy-4.9_defconfig b/buildroot/configs/opos6ullegacy-4.9_defconfig
index 13d920d52..23b6f5eb3 100644
--- a/buildroot/configs/opos6ullegacy-4.9_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.9_defconfig
@@ -112,8 +112,8 @@ BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_GIF is not set
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
+BR2_PACKAGE_MURATA_CYW_FW=y
+BR2_PACKAGE_MURATA_CYW_FW_CYW43430=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_EVTEST=y
BR2_PACKAGE_FREESCALE_IMX=y
diff --git a/buildroot/configs/opos6ulnano-preempt-rt_defconfig b/buildroot/configs/opos6ulnano-preempt-rt_defconfig
index 4477b0c98..dd56845e8 100644
--- a/buildroot/configs/opos6ulnano-preempt-rt_defconfig
+++ b/buildroot/configs/opos6ulnano-preempt-rt_defconfig
@@ -60,9 +60,8 @@ BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_GIF is not set
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
-BR2_PACKAGE_RPI_BT_FIRMWARE=y
+BR2_PACKAGE_MURATA_CYW_FW=y
+BR2_PACKAGE_MURATA_CYW_FW_CYW43430=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_DBUS_PYTHON=y
BR2_PACKAGE_EVTEST=y
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 52ce4266b..489a49387 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -63,9 +63,8 @@ BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_GIF is not set
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
-BR2_PACKAGE_RPI_BT_FIRMWARE=y
+BR2_PACKAGE_MURATA_CYW_FW=y
+BR2_PACKAGE_MURATA_CYW_FW_CYW43430=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_DBUS_PYTHON=y
BR2_PACKAGE_EVTEST=y
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index 422a96b29..6df1b3e6d 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -63,8 +63,6 @@ BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_GIF is not set
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_DBUS_PYTHON=y
BR2_PACKAGE_EVTEST=y
diff --git a/buildroot/configs/opos6ultest_defconfig b/buildroot/configs/opos6ultest_defconfig
index e6a841cff..1d0c6401b 100644
--- a/buildroot/configs/opos6ultest_defconfig
+++ b/buildroot/configs/opos6ultest_defconfig
@@ -72,8 +72,8 @@ BR2_PACKAGE_SDL_IMAGE_JPEG=y
BR2_PACKAGE_SDL_IMAGE_PNG=y
BR2_PACKAGE_SDL_IMAGE_TIFF=y
BR2_PACKAGE_SDL_WATER=y
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
+BR2_PACKAGE_MURATA_CYW_FW=y
+BR2_PACKAGE_MURATA_CYW_FW_CYW43430=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_DBUS_PYTHON=y
BR2_PACKAGE_EVTEST=y
diff --git a/buildroot/target/device/armadeus/rootfs/post_build.sh b/buildroot/target/device/armadeus/rootfs/post_build.sh
index 48b244c87..e5b6697a4 100755
--- a/buildroot/target/device/armadeus/rootfs/post_build.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_build.sh
@@ -58,17 +58,6 @@ if [ "$3" != "imx6" ]; then
rm -rf $1/etc/init.d/S30wifi
fi
-# OPOS6UL specific tricks:
-if [ "$3" == "imx6ul" ]; then
- # Remove unneeded firmware:
- UNNEEDED_FIRM=`ls -ad $1/lib/firmware/brcm/* | grep -v brcmfmac43430`
- for firmware in $UNNEEDED_FIRM; do
- if [ -f "$firmware" ]; then
- rm -rf "$firmware"
- fi
- done
-fi
-
if [ "$3" == "imx6ul" ] || [ "$3" == "imx8mm" ] || [ "$3" == "imx8mn" ]; then
# Ask to mount HOME-DATA partition at each boot:
grep mmcblk0p3 $1/etc/fstab
diff --git a/buildroot/target/device/armadeus/rootfs/target_overlay/lib/firmware/brcm/brcmfmac43430-sdio.txt b/buildroot/target/device/armadeus/rootfs/target_overlay/lib/firmware/brcm/brcmfmac43430-sdio.txt
deleted file mode 100644
index ea4f648a1..000000000
--- a/buildroot/target/device/armadeus/rootfs/target_overlay/lib/firmware/brcm/brcmfmac43430-sdio.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-# NVRAM file for BCM943430WLPTH
-# 2.4 GHz, 20 MHz BW mode
-
-# The following parameter values are just placeholders, need to be updated.
-manfid=0x2d0
-prodid=0x0727
-vendid=0x14e4
-devid=0x43e2
-boardtype=0x0727
-boardrev=0x1101
-boardnum=22
-macaddr=00:90:4c:c5:12:38
-sromrev=11
-boardflags=0x00404201
-boardflags3=0x08000000
-xtalfreq=37400
-nocrc=1
-ag0=255
-aa2g=1
-ccode=ALL
-
-pa0itssit=0x20
-extpagain2g=0
-#PA parameters for 2.4GHz, measured at CHIP OUTPUT
-pa2ga0=-168,7161,-820
-AvVmid_c0=0x0,0xc8
-cckpwroffset0=5
-
-# PPR params
-maxp2ga0=84
-txpwrbckof=6
-cckbw202gpo=0
-legofdmbw202gpo=0x66111111
-mcsbw202gpo=0x77711111
-propbw202gpo=0xdd
-
-# OFDM IIR :
-ofdmdigfilttype=18
-ofdmdigfilttypebe=18
-# PAPD mode:
-papdmode=1
-papdvalidtest=1
-pacalidx2g=42
-papdepsoffset=-22
-papdendidx=58
-
-# LTECX flags
-ltecxmux=0
-ltecxpadnum=0x0102
-ltecxfnsel=0x44
-ltecxgcigpio=0x01
-
-il0macaddr=00:90:4c:c5:12:38
-wl0id=0x431b
-
-deadman_to=0xffffffff
-# muxenab: 0x1 for UART enable, 0x2 for GPIOs, 0x8 for JTAG
-muxenab=0x1
-# CLDO PWM voltage settings - 0x4 - 1.1 volt
-#cldo_pwm=0x4
-
-#VCO freq 326.4MHz
-spurconfig=0x3
-
-edonthd20l=-75
-edoffthd20ul=-80
hooks/post-receive
--
armadeus
|