Changeset 94e46c9 in mainline for boot/Makefile.common


Ignore:
Timestamp:
2015-05-23T04:09:11Z (10 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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    ra25d893 r94e46c9  
    139139        nic/rtl8139 \
    140140        nic/rtl8169 \
     141        nic/ar9271 \
    141142        block/ahci
    142143
    143144RD_DRV_CFG =
     145
     146RD_DRVS_FW_NON_ESSENTIAL = \
     147        nic/ar9271
    144148
    145149RD_LIBS =
     
    223227        $(USPACE_PATH)/app/viewer/viewer \
    224228        $(USPACE_PATH)/app/df/df \
    225         $(USPACE_PATH)/app/fontviewer/fontviewer
     229        $(USPACE_PATH)/app/fontviewer/fontviewer \
     230        $(USPACE_PATH)/app/wifi_supplicant/wifi_supplicant
    226231
    227232RD_TESTS = \
     
    247252RD_APPS = $(RD_APPS_ESSENTIAL)
    248253RD_DRVS = $(RD_DRVS_ESSENTIAL)
     254RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL)
    249255else
    250256RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
    251257RD_APPS = $(RD_APPS_ESSENTIAL) $(RD_APPS_NON_ESSENTIAL)
    252258RD_DRVS = $(RD_DRVS_ESSENTIAL) $(RD_DRVS_NON_ESSENTIAL)
     259RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL) $(RD_DRVS_FW_NON_ESSENTIAL)
    253260endif
    254261
Note: See TracChangeset for help on using the changeset viewer.