dtc: Update to upstream 9ce35ff8
- Add "compatible with gpl dtc X.Y.Z" to version output so U-Boot doesn't complain - Fix cross reference node This fixes some Allwinner DTS (and probably others).
This commit is contained in:
parent
8f58c3f984
commit
847b0bcb57
@ -51,14 +51,17 @@ using std::string;
|
||||
* The current major version of the tool.
|
||||
*/
|
||||
int version_major = 0;
|
||||
int version_major_compatible = 1;
|
||||
/**
|
||||
* The current minor version of the tool.
|
||||
*/
|
||||
int version_minor = 5;
|
||||
int version_minor_compatible = 4;
|
||||
/**
|
||||
* The current patch level of the tool.
|
||||
*/
|
||||
int version_patch = 0;
|
||||
int version_patch_compatible = 0;
|
||||
|
||||
static void usage(const string &argv0)
|
||||
{
|
||||
@ -77,8 +80,10 @@ static void usage(const string &argv0)
|
||||
*/
|
||||
static void version(const char* progname)
|
||||
{
|
||||
fprintf(stderr, "Version: %s %d.%d.%d\n", progname, version_major,
|
||||
version_minor, version_patch);
|
||||
fprintf(stdout, "Version: %s %d.%d.%d compatible with gpl dtc %d.%d.%d\n", progname,
|
||||
version_major, version_minor, version_patch,
|
||||
version_major_compatible, version_minor_compatible,
|
||||
version_patch_compatible);
|
||||
}
|
||||
|
||||
using fdt::device_tree;
|
||||
|
@ -1224,11 +1224,11 @@ device_tree::resolve_cross_references()
|
||||
{
|
||||
pv->byte_data.push_back('@');
|
||||
push_string(pv->byte_data, p->second);
|
||||
}
|
||||
}
|
||||
pv->byte_data.push_back(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
std::unordered_map<property_value*, fixup&> phandle_set;
|
||||
for (auto &i : fixups)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user