move libfdt bindings to separate crate

Signed-off-by: Serban Iorga <[email protected]>

Author: Serban Iorga

Cargo.lock

@@ -18,3 +18,6 @@ utils = { path = "../utils" }
 
 [dev-dependencies]
 device_tree = ">=1.1.0"
+
+[target.'cfg(target_arch="aarch64")'.dependencies]
+libfdt-bindings = { path = "../libfdt-bindings" }

src/arch/Cargo.toml

@@ -5,13 +5,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the THIRD-PARTY file.
 
-use libc::{c_char, c_int, c_void};
+use libc::{c_int, c_void};
 use std::collections::HashMap;
 use std::ffi::{CStr, CString, NulError};
 use std::fmt::Debug;
 use std::ptr::null;
 use std::{io, result};
 
+use libfdt_bindings::*;
+
 use super::super::DeviceType;
 use super::super::InitrdConfig;
 use super::cache_info::{read_cache_config, CacheEntry};
@@ -45,21 +47,6 @@ const GIC_FDT_IRQ_TYPE_PPI: u32 = 1;
 const IRQ_TYPE_EDGE_RISING: u32 = 1;
 const IRQ_TYPE_LEVEL_HI: u32 = 4;
 
-// This links to libfdt which handles the creation of the binary blob
-// flattened device tree (fdt) that is passed to the kernel and indicates
-// the hardware configuration of the machine.
-extern "C" {
-    fn fdt_create(buf: *mut c_void, bufsize: c_int) -> c_int;
-    fn fdt_finish_reservemap(fdt: *mut c_void) -> c_int;
-    fn fdt_begin_node(fdt: *mut c_void, name: *const c_char) -> c_int;
-    fn fdt_property(fdt: *mut c_void, name: *const c_char, val: *const c_void, len: c_int)
-        -> c_int;
-    fn fdt_end_node(fdt: *mut c_void) -> c_int;
-    fn fdt_open_into(fdt: *const c_void, buf: *mut c_void, bufsize: c_int) -> c_int;
-    fn fdt_finish(fdt: *const c_void) -> c_int;
-    fn fdt_pack(fdt: *mut c_void) -> c_int;
-}
-
 /// Trait for devices to be added to the Flattened Device Tree.
 pub trait DeviceInfoForFDT {
     /// Returns the address where this device will be loaded.

src/arch/src/aarch64/fdt.rs

@@ -0,0 +1,8 @@
+[package]
+name = "libfdt-bindings"
+version = "0.1.0"
+authors = ["Amazon Firecracker team <[email protected]>"]
+edition = "2018"
+
+[target.'cfg(target_arch="aarch64")'.dependencies]
+libc = ">=0.2.39"

src/libfdt-bindings/Cargo.toml

@@ -0,0 +1,25 @@
+// Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(target_arch = "aarch64")]
+use libc::{c_char, c_int, c_void};
+
+// This links to libfdt which handles the creation of the binary blob
+// flattened device tree (fdt) that is passed to the kernel and indicates
+// the hardware configuration of the machine.
+#[cfg(target_arch = "aarch64")]
+extern "C" {
+    pub fn fdt_create(buf: *mut c_void, bufsize: c_int) -> c_int;
+    pub fn fdt_finish_reservemap(fdt: *mut c_void) -> c_int;
+    pub fn fdt_begin_node(fdt: *mut c_void, name: *const c_char) -> c_int;
+    pub fn fdt_property(
+        fdt: *mut c_void,
+        name: *const c_char,
+        val: *const c_void,
+        len: c_int,
+    ) -> c_int;
+    pub fn fdt_end_node(fdt: *mut c_void) -> c_int;
+    pub fn fdt_open_into(fdt: *const c_void, buf: *mut c_void, bufsize: c_int) -> c_int;
+    pub fn fdt_finish(fdt: *const c_void) -> c_int;
+    pub fn fdt_pack(fdt: *mut c_void) -> c_int;
+}