Changeset 8a64320e in mainline for boot

Timestamp:

2015-04-23T23:40:14Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

dcba819

Parents:

09044cb

Message:

pre-merge coding style cleanup and code review

Location:

boot

Files:

• Makefile (modified) (1 diff)
• Makefile.common (modified) (3 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 \
+        for file in $(RD_DRVS_FW) ; do \
                 file_dir="`dirname "$$file"`" ; \
                 file_name="`basename "$$file"`" ; \

boot/Makefile.common

@@ -139 +139 @@
         nic/rtl8139 \
         nic/rtl8169 \
-        nic/ar9271 \
+        nic/ar9271 \
         block/ahci
 
 RD_DRV_CFG =
 
-RD_DRV_FW = \
-        nic/ar9271
+RD_DRVS_FW_NON_ESSENTIAL = \
+        nic/ar9271
 
 RD_LIBS =
@@ -228 +228 @@
         $(USPACE_PATH)/app/df/df \
         $(USPACE_PATH)/app/fontviewer/fontviewer \
-        $(USPACE_PATH)/app/wifi_supplicant/wifi_supplicant
+        $(USPACE_PATH)/app/wifi_supplicant/wifi_supplicant
 
 RD_TESTS = \
@@ -252 +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/amd64/Makefile.inc

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