firmware: Update paths and delete main makefile

Change-Id: I7dff5c25ca870c9441cd8eada46dcf51d60c5776

diff --git a/firmware/bluetooth/bluetooth.mk b/firmware/bluetooth/bluetooth.mk
index ee32936a2eb09ba39944241e4005e40a5dd008c9..9d899b16ad822e565629181c94ac7df018633a14 100644 (file)
--- a/firmware/bluetooth/bluetooth.mk
+++ b/firmware/bluetooth/bluetooth.mk
@@ -1,20 +1,10 @@
 #
-# Copyright (C) 2021 The LineageOS Project
+# Copyright (C) 2021-2024 The LineageOS Project
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
 #
 
-BLUETOOTH_FIRMWARE_PATH := hardware/amlogic/kernel-modules/dhd-driver/firmware/bluetooth
+BLUETOOTH_FIRMWARE_PATH := kernel/amlogic/kernel-modules/dhd-driver/firmware/bluetooth
 
 # bcm2076b1
 PRODUCT_COPY_FILES += \

diff --git a/firmware/firmware.mk b/firmware/firmware.mk
deleted file mode 100644 (file)
index 59f9f70..0000000
--- a/firmware/firmware.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2021 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-FIRMWARE_PATH := hardware/amlogic/kernel-modules/dhd-driver/firmware
-
-include $(FIRMWARE_PATH)/wifi/wifi.mk
-include $(FIRMWARE_PATH)/bluetooth/bluetooth.mk

diff --git a/firmware/wifi/wifi.mk b/firmware/wifi/wifi.mk
index e83c5f44b01b3577e21f816bdefc1d022a79682a..0b993f693035f795a7c6b8f2a80f9b44d3cf104d 100644 (file)
--- a/firmware/wifi/wifi.mk
+++ b/firmware/wifi/wifi.mk
@@ -1,20 +1,10 @@
 #
 # Copyright (C) 2021-2024 The LineageOS Project
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
 #
 
-WIFI_FIRMWARE_PATH := hardware/amlogic/kernel-modules/dhd-driver/firmware/wifi
+WIFI_FIRMWARE_PATH := kernel/amlogic/kernel-modules/dhd-driver/firmware/wifi
 
 # bcm4339a0_ag ap6335
 PRODUCT_COPY_FILES += \