diff options
Diffstat (limited to 'OvmfPkg/RiscVVirt/Sec/Memory.c')
| -rw-r--r-- | OvmfPkg/RiscVVirt/Sec/Memory.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/OvmfPkg/RiscVVirt/Sec/Memory.c b/OvmfPkg/RiscVVirt/Sec/Memory.c index 14c9569c78..4dee8d3cd3 100644 --- a/OvmfPkg/RiscVVirt/Sec/Memory.c +++ b/OvmfPkg/RiscVVirt/Sec/Memory.c @@ -22,6 +22,7 @@ Module Name: //
#include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h>
+#include <Library/FdtLib.h>
#include <Library/HobLib.h>
#include <Library/IoLib.h>
#include <Library/PcdLib.h>
@@ -29,7 +30,6 @@ Module Name: #include <Library/BaseRiscVSbiLib.h>
#include <Register/RiscV64/RiscVEncoding.h>
#include <Library/PrePiLib.h>
-#include <libfdt.h>
#include <Guid/FdtHob.h>
VOID
@@ -121,7 +121,7 @@ GetNumCells ( INT32 Len;
UINT32 Val;
- Prop = fdt_getprop (Fdt, Node, Name, &Len);
+ Prop = FdtGetProp (Fdt, Node, Name, &Len);
if (Prop == NULL) {
return Len;
}
@@ -130,7 +130,7 @@ GetNumCells ( return -FDT_ERR_BADNCELLS;
}
- Val = fdt32_to_cpu (*Prop);
+ Val = Fdt32ToCpu (*Prop);
if (Val > FDT_MAX_NCELLS) {
return -FDT_ERR_BADNCELLS;
}
@@ -163,11 +163,11 @@ AddReservedMemoryMap ( INTN NumRsv, i;
INT32 NumAddrCells, NumSizeCells;
- NumRsv = fdt_num_mem_rsv (FdtPointer);
+ NumRsv = FdtGetNumberOfReserveMapEntries (FdtPointer);
/* Look for an existing entry and add it to the efi mem map. */
for (i = 0; i < NumRsv; i++) {
- if (fdt_get_mem_rsv (FdtPointer, i, &Addr, &Size) != 0) {
+ if (FdtGetReserveMapEntry (FdtPointer, i, &Addr, &Size) != 0) {
continue;
}
@@ -179,7 +179,7 @@ AddReservedMemoryMap ( }
/* process reserved-memory */
- Node = fdt_subnode_offset (FdtPointer, 0, "reserved-memory");
+ Node = FdtSubnodeOffset (FdtPointer, 0, "reserved-memory");
if (Node >= 0) {
NumAddrCells = GetNumCells (FdtPointer, Node, "#address-cells");
if (NumAddrCells <= 0) {
@@ -191,21 +191,21 @@ AddReservedMemoryMap ( return;
}
- fdt_for_each_subnode (SubNode, FdtPointer, Node) {
- RegProp = fdt_getprop (FdtPointer, SubNode, "reg", &Len);
+ FdtForEachSubnode (SubNode, FdtPointer, Node) {
+ RegProp = FdtGetProp (FdtPointer, SubNode, "reg", &Len);
if ((RegProp != 0) && (Len == ((NumAddrCells + NumSizeCells) * sizeof (INT32)))) {
- Addr = fdt32_to_cpu (RegProp[0]);
+ Addr = Fdt32ToCpu (RegProp[0]);
if (NumAddrCells > 1) {
- Addr = (Addr << 32) | fdt32_to_cpu (RegProp[1]);
+ Addr = (Addr << 32) | Fdt32ToCpu (RegProp[1]);
}
RegProp += NumAddrCells;
- Size = fdt32_to_cpu (RegProp[0]);
+ Size = Fdt32ToCpu (RegProp[0]);
if (NumSizeCells > 1) {
- Size = (Size << 32) | fdt32_to_cpu (RegProp[1]);
+ Size = (Size << 32) | Fdt32ToCpu (RegProp[1]);
}
DEBUG ((
@@ -216,7 +216,7 @@ AddReservedMemoryMap ( Size
));
- if (fdt_getprop (FdtPointer, SubNode, "no-map", &Len)) {
+ if (FdtGetProp (FdtPointer, SubNode, "no-map", &Len)) {
BuildMemoryAllocationHob (
Addr,
Size,
@@ -269,20 +269,20 @@ MemoryPeimInitialization ( // Look for the lowest memory node
for (Prev = 0; ; Prev = Node) {
- Node = fdt_next_node (FdtPointer, Prev, NULL);
+ Node = FdtNextNode (FdtPointer, Prev, NULL);
if (Node < 0) {
break;
}
// Check for memory node
- Type = fdt_getprop (FdtPointer, Node, "device_type", &Len);
+ Type = FdtGetProp (FdtPointer, Node, "device_type", &Len);
if (Type && (AsciiStrnCmp (Type, "memory", Len) == 0)) {
// Get the 'reg' property of this node. For now, we will assume
// two 8 byte quantities for base and size, respectively.
- RegProp = fdt_getprop (FdtPointer, Node, "reg", &Len);
+ RegProp = FdtGetProp (FdtPointer, Node, "reg", &Len);
if ((RegProp != 0) && (Len == (2 * sizeof (UINT64)))) {
- CurBase = fdt64_to_cpu (ReadUnaligned64 (RegProp));
- CurSize = fdt64_to_cpu (ReadUnaligned64 (RegProp + 1));
+ CurBase = Fdt64ToCpu (ReadUnaligned64 (RegProp));
+ CurSize = Fdt64ToCpu (ReadUnaligned64 (RegProp + 1));
DEBUG ((
DEBUG_INFO,
|