Changeset bf1733d3 in mainline for boot/Makefile.common

Timestamp:

2015-04-27T20:24:41Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

2b5d966

Parents:

c1fd281 (diff), dcba819 (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:

Merge mainline changes

File:

• boot/Makefile.common (modified) (3 diffs)

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