Skip to content

Commit 901dd5b

Browse files
committed
remove explicit firmware import
1 parent a617413 commit 901dd5b

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

tools/build/Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@ RUN ln -sf /lib/firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn /lib/firmware/qcom/sd
7474
# Root filesystem overlay — all userspace files at their final paths
7575
COPY ./userspace/root/ /
7676

77-
# Ensure Bluetooth firmware is reachable via the kernel's standard search path.
78-
RUN if [ "$(readlink -f /lib/firmware)" != "$(readlink -f /usr/lib/firmware)" ]; then \
79-
mkdir -p /lib/firmware/qca && cp -a /usr/lib/firmware/qca/. /lib/firmware/qca/; \
80-
fi
81-
8277
# Fix ownership on home directory (overlay COPY runs as root)
8378
RUN chown -R comma:comma /home/comma
8479
# Void's default .bashrc doesn't source .bash_aliases

tools/build/build_kernel.sh

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,6 @@ apply_patches() {
5656
}
5757

5858
build_kernel() {
59-
local qca_firmware=(
60-
crbtfw11.tlv
61-
crbtfw20.tlv
62-
crbtfw21.tlv
63-
crnv11.bin
64-
crnv20.bin
65-
crnv21.bin
66-
)
6759
local extra_firmware=()
6860

6961
# Apply patches to kernel tree
@@ -101,15 +93,8 @@ build_kernel() {
10193
KCONFIG_CONFIG=out/.config \
10294
bash scripts/kconfig/merge_config.sh \
10395
-m -y out/.config "$CONFIG_FRAGMENT"
104-
# Embed the QCA Bluetooth firmware so the early boot probe succeeds
105-
# before the root filesystem is mounted.
106-
for fw in "${qca_firmware[@]}"; do
107-
extra_firmware+=("qca/${fw}")
108-
done
109-
# Point EXTRA_FIRMWARE_DIR to our firmware directory and list the QCA
110-
# blobs explicitly so they are built into the kernel image.
96+
# Point EXTRA_FIRMWARE_DIR to our firmware directory
11197
echo "CONFIG_EXTRA_FIRMWARE_DIR=\"$DIR/kernel/firmware\"" >> out/.config
112-
echo "CONFIG_EXTRA_FIRMWARE=\"${extra_firmware[*]}\"" >> out/.config
11398
make olddefconfig O=out
11499

115100
local dtb_targets=()

0 commit comments

Comments
 (0)