Changeset cc575ef9 in mainline for boot

Timestamp:

2015-04-21T21:07:18Z (10 years ago)

Author:

Jan Kolarik <kolarik@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

09044cb

Parents:

749fe15b (diff), a931b7b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Appending Michael MIC footer in TKIP communication, tested MIC algorithm itself, but needs testing on real data transmission

Location:

boot

Files:

• Makefile (modified) (1 diff)
• Makefile.common (modified) (2 diffs)
• arch/amd64/Makefile.inc (modified) (1 diff)

boot/Makefile

@@ -115 +115 @@
                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.dev" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
         done
+        for file in $(RD_DRV_FW) ; do \
+                file_dir="`dirname "$$file"`" ; \
+                file_name="`basename "$$file"`" ; \
+                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.fw" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
+        done
         if ls $(DIST_OVERLAY_PATH)/* >/dev/null; then \
                 cp -r -L $(DIST_OVERLAY_PATH)/* "$(DIST_PATH)"; \

boot/Makefile.common

@@ -139 +139 @@
         nic/rtl8139 \
         nic/rtl8169 \
+        nic/ar9271 \
         block/ahci
 
 RD_DRV_CFG =
+
+RD_DRV_FW = \
+        nic/ar9271
 
 RD_LIBS =
@@ -223 +227 @@
         $(USPACE_PATH)/app/viewer/viewer \
         $(USPACE_PATH)/app/df/df \
-        $(USPACE_PATH)/app/fontviewer/fontviewer
+        $(USPACE_PATH)/app/fontviewer/fontviewer \
+        $(USPACE_PATH)/app/wifi_supplicant/wifi_supplicant
 
 RD_TESTS = \

boot/arch/amd64/Makefile.inc

@@ -61 +61 @@
 RD_DRV_CFG += \
         bus/isa
-
+        
 RD_APPS_ESSENTIAL += \
         $(USPACE_PATH)/app/edit/edit \