Changeset 94e46c9 in mainline for boot

Timestamp:

2015-05-23T04:09:11Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b5143bd

Parents:

a25d893 (diff), 0683992 (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:

Mainline changes

Location:

boot

Files:

• Makefile (modified) (1 diff)
• Makefile.common (modified) (3 diffs)
• arch/mips32/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_DRVS_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_DRVS_FW_NON_ESSENTIAL = \
+        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 = \
@@ -247 +252 @@
 RD_APPS = $(RD_APPS_ESSENTIAL)
 RD_DRVS = $(RD_DRVS_ESSENTIAL)
+RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL)
 else
 RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
 RD_APPS = $(RD_APPS_ESSENTIAL) $(RD_APPS_NON_ESSENTIAL)
 RD_DRVS = $(RD_DRVS_ESSENTIAL) $(RD_DRVS_NON_ESSENTIAL)
+RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL) $(RD_DRVS_FW_NON_ESSENTIAL)
 endif
 

boot/arch/mips32/Makefile.inc

@@ -64 +64 @@
 endif
 
+ifeq ($(MACHINE),msim)
+        RD_DRVS_ESSENTIAL += \
+                platform/msim \
+                block/ddisk
+endif
+
 SOURCES = \
         arch/$(BARCH)/src/asm.S \