Merge branch 'arm_pcie' into 'master'

Run pcid on aarch64

See merge request redox-os/cookbook!358

recipes/core/drivers-initfs/recipe.toml

@@ -5,42 +5,48 @@ git = "https://gitlab.redox-os.org/redox-os/drivers.git"
 template = "custom"
 script = """
 BINS=(
-    ahcid
     fbcond
     inputd
     nvmed
     pcid
     vesad
-    virtio-blkd
-    virtio-gpud
     lived
 )
 
-aarch64_redefine_bin()
+virt_bins()
+{
+    BINS+=(virtio-blkd virtio-gpud)
+}
+
+x86_common_bins()
+{
+    BINS+=(ahcid ided ps2d vesad)
+    virt_bins
+}
+
+aarch64_bins()
 {
-    BINS=(inputd lived)
     case "${BOARD}" in
-        raspi3bp)
-            BINS+=(bcm2835-sdhcid)
-        ;;
-        raspi3b)
+        raspi3b | raspi3bp)
             BINS+=(bcm2835-sdhcid)
         ;;
         *)
         #qemu-virt
+            virt_bins
         ;;
     esac
 }
 
 case "${TARGET}" in
     i686-unknown-redox)
-        BINS+=(ided ps2d)
+        x86_common_bins
         ;;
     x86_64-unknown-redox)
-        BINS+=(acpid ided ps2d)
+        x86_common_bins
+        BINS+=(acpid)
         ;;
     aarch64-unknown-redox)
-        aarch64_redefine_bin
+        aarch64_bins
         ;;
     *)
         ;;

recipes/core/drivers/recipe.toml

@@ -10,6 +10,7 @@ BINS=(
     e1000d
     ihdad
     ixgbed
+    pcid
     rtl8139d
     rtl8168d
     usbctl
@@ -24,7 +25,7 @@ BINS=(
 # depending on the target architecture
 case "${TARGET}" in
     i686-unknown-redox | x86_64-unknown-redox)
-        BINS+=(ac97d bgad pcid pcspkrd sb16d vboxd)
+        BINS+=(ac97d bgad pcspkrd sb16d vboxd)
         ;;
     *)
         ;;

recipes/core/initfs/aarch64-unknown-redox/init.rc

@@ -1,5 +1,6 @@
 export PATH /scheme/initfs/bin
 export TMPDIR /tmp
+export RUST_BACKTRACE 1
 nulld
 zerod
 randd
@@ -11,6 +12,7 @@ fbcond 1 2
 logd /scheme/debug /scheme/fbcon/1
 stdio /scheme/log
 ramfs logging
+pcid /scheme/initfs/etc/pcid/initfs.toml
 lived
 unset DISK_LIVE_ADDR DISK_LIVE_SIZE
 redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK