[lib][boot] Wrap all device tree actions around the dtre api

Author: b-man

Makefile

@@ -1,7 +1,7 @@
 # Project name and version
 export RC_ProjectName := xBoot
 export RC_ProjectSourceVersion := 57
-export RC_ProjectBuildVersion := 1
+export RC_ProjectBuildVersion := 2
 
 export SRCROOT := $(CURDIR)
 export OBJROOT := $(SRCROOT)

arch/arm/init/start.S

@@ -1,6 +1,7 @@
 /* Start of xBoot
  *
  * Copyright 2013, winocm. <[email protected]>
+ * Copyright 2017, Brian McKenzie. <[email protected]>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,

include/boot/device_tree.h

@@ -69,6 +69,8 @@ void DT__Initialize(void);
  */
 extern void DT__Finalize(void);
 
+void DT__GetDeviceTreeSize(uint32_t *size);
+
 void DT__FlattenDeviceTree(void **result, uint32_t * length);
 
 void DTInit(void *base);

include/boot/dtre.h

@@ -33,7 +33,11 @@
 #include <boot/device_tree.h>
 
 extern void dtre_init(void);
+extern uint32_t dtre_get_size(void);
+extern Node *dtre_root_node(void);
+extern Node *dtre_find_node(const char *path, bool create);
 extern int dtre_create_node(Node *node, char *name, void* datap, int size);
 extern int dtre_allocate_memory_range(char *name, long start, long length, long type);
+extern void dtre_flatten(void *data, uint32_t length);
 
 #endif /* !DTRE_H */

lib/boot/boot.c

@@ -59,9 +59,9 @@ void publish_device_tree(void)
     uint32_t dtre_length;
     Node *root, *chosen, *options;
 
-    root = DT__RootNode();
-    chosen = DT__FindNode("/chosen", 1);
-    options = DT__FindNode("/options", 1);
+    root = dtre_root_node();
+    chosen = dtre_find_node("/chosen", 1);
+    options = dtre_find_node("/options", 1);
 
     assert(root != NULL);
     assert(chosen != NULL);
@@ -101,9 +101,9 @@ void publish_device_tree(void)
     dtre_create_node(root, firmware_version, &firmware_version, sizeof(firmware_version));
 
     /* Flatten the device tree. */
-    DT__FlattenDeviceTree(NULL, &dtre_length);
+    dtre_length = dtre_get_size();
     dtre_data = memory_region_reserve(&kernel_region, dtre_length, 0);
-    DT__FlattenDeviceTree(dtre_data, &dtre_length);
+    dtre_flatten(dtre_data, dtre_length);
 
     /* Add boot-args entry. */
     gBootArgs.deviceTreeLength = dtre_length;

lib/boot/device_tree.c

@@ -304,14 +304,24 @@ static void *FlattenNodes(Node * node, void *buffer)
     return buffer;
 }
 
+void DT__GetDeviceTreeSize(uint32_t *size)
+{
+    uint32_t totalSize;
+
+    totalSize = DTInfo.numNodes * sizeof(DeviceTreeNode) +
+        DTInfo.numProperties * sizeof(DeviceTreeNodeProperty) +
+        DTInfo.totalPropertySize;
+
+    *size = totalSize;
+}
+
 /*
  * Flatten the in-memory representation of the device tree
  * into a binary DT block.
  * To get the buffer size needed, call with result = 0.
  * To have a buffer allocated for you, call with *result = 0.
  * To use your own buffer, call with *result = &buffer.
  */
-
 void DT__FlattenDeviceTree(void **buffer_p, uint32_t * length)
 {
     uint32_t totalSize;
@@ -323,9 +333,7 @@ void DT__FlattenDeviceTree(void **buffer_p, uint32_t * length)
         DT__PrintTree(rootNode);
 #endif
 
-    totalSize = DTInfo.numNodes * sizeof(DeviceTreeNode) +
-        DTInfo.numProperties * sizeof(DeviceTreeNodeProperty) +
-        DTInfo.totalPropertySize;
+    DT__GetDeviceTreeSize(&totalSize);
 
     DPRINTF("Total size 0x%x\n", totalSize);
     if (buffer_p != 0) {

lib/boot/dtre.c

@@ -93,6 +93,50 @@ int dtre_create_node(Node *node, char *name, void* datap, int size)
     return 0;
 }
 
+/**
+ * dtre_root_node
+ *
+ * Returns a pointer to the root node of the device tree.
+ */
+Node *dtre_root_node(void)
+{
+    return DT__RootNode();
+}
+
+/**
+ * dtre_find_node
+ *
+ * Searches the device tree for the requested node.
+ */
+Node *dtre_find_node(const char *path, bool create)
+{
+    return DT__FindNode(path, create);
+}
+
+/**
+ * dtre_get_size
+ *
+ * Returns the size of the device tree in bytes.
+ */
+uint32_t dtre_get_size(void)
+{
+    uint32_t size;
+
+    DT__GetDeviceTreeSize(&size);
+
+    return size;
+}
+
+/**
+ * dtre_flatten
+ *
+ * Flatten the device tree.
+ */
+void dtre_flatten(void *data, uint32_t length)
+{
+    return DT__FlattenDeviceTree(data, &length);
+}
+
 /**
  * dtre_init
  *