From 5e53bbf405ca6d6ff13e295d9a18f0013f3715e3 Mon Sep 17 00:00:00 2001 From: Michael Zhao Date: Fri, 28 May 2021 15:20:28 +0800 Subject: [PATCH] arch: Bump vm-fdt from 13ab882 to 956b5a5 Interface of vm-fdt changed. Updated aarch64 code to adapt. Signed-off-by: Michael Zhao --- Cargo.lock | 2 +- arch/src/aarch64/fdt.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a46f7a993..8c5f4256b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1223,7 +1223,7 @@ dependencies = [ [[package]] name = "vm-fdt" version = "0.1.0" -source = "git+https://github.com/rust-vmm/vm-fdt?branch=master#13ab882e2f8387753064351c69fbe35c422b448b" +source = "git+https://github.com/rust-vmm/vm-fdt?branch=master#956b5a5ea1d7b92026e82bef2aa6a85b0c2200b5" [[package]] name = "vm-memory" diff --git a/arch/src/aarch64/fdt.rs b/arch/src/aarch64/fdt.rs index a14b63867..08fb04221 100644 --- a/arch/src/aarch64/fdt.rs +++ b/arch/src/aarch64/fdt.rs @@ -16,7 +16,7 @@ use super::super::InitramfsConfig; use super::get_fdt_addr; use super::gic::GicDevice; use super::layout::{ - FDT_MAX_SIZE, IRQ_BASE, MEM_32BIT_DEVICES_SIZE, MEM_32BIT_DEVICES_START, PCI_MMCONFIG_SIZE, + IRQ_BASE, MEM_32BIT_DEVICES_SIZE, MEM_32BIT_DEVICES_START, PCI_MMCONFIG_SIZE, PCI_MMCONFIG_START, }; use vm_fdt::{FdtWriter, FdtWriterResult}; @@ -107,7 +107,7 @@ pub fn create_fdt