Changeset d5a89a3 in mainline for boot/Makefile.common

Timestamp:

2019-02-11T22:31:04Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

aaf9789c

Parents:

e3272101 (diff), 4805495 (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:

merging with upstream/master

File:

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

boot/Makefile.common

@@ -94 +94 @@
         devman \
         fs/locfs \
-        hid/compositor \
         klog
+
+ifeq ($(CONFIG_FB), y)
+        RD_SRVS_ESSENTIAL += \
+                hid/compositor
+endif
 
 RD_SRVS_NON_ESSENTIAL = \
@@ -141 +145 @@
         nic/ar9271 \
         nic/virtio-net \
-        block/ahci
+        block/ahci \
+        block/virtio-blk
 
 RD_DRV_CFG =
@@ -162 +167 @@
 endif
 
-RD_APPS_ESSENTIAL = bdsh getterm kio vlaunch vterm
+RD_APPS_ESSENTIAL = \
+        bdsh \
+        getterm \
+        kio
+
+ifeq ($(CONFIG_FB), y)
+        RD_APPS_ESSENTIAL += \
+                vlaunch \
+                vterm
+endif
 
 RD_APPS_NON_ESSENTIAL = \
@@ -168 +182 @@
         bithenge \
         blkdump \
-        bnchmark \
         contacts \
         corecfg \
@@ -179 +192 @@
         fdisk \
         gunzip \
+        hbench \
         inet \
         kill \
@@ -192 +206 @@
         mkmfs \
         nic \
-        perf \
         sbi \
         sportdmp \