Merge "app: aboot: Initialize devinfo"
diff --git a/platform/msm_shared/dev_tree.c b/platform/msm_shared/dev_tree.c
index 024b5c3..b1390b9 100755
--- a/platform/msm_shared/dev_tree.c
+++ b/platform/msm_shared/dev_tree.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2015,2017-2019 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2015,2017-2020 The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -1293,7 +1293,7 @@
} else if (table->version == DEV_TREE_VERSION_V2) {
dt_entry_size = sizeof(struct dt_entry_v2);
} else if (table->version == DEV_TREE_VERSION_V3) {
- dt_entry_size = sizeof(struct dt_entry);
+ dt_entry_size = DEV_TREE_DT_ENTRY_SIZE_V3;
} else {
dprintf(CRITICAL, "ERROR: Unsupported version (%d) in DT table \n",
table->version);
@@ -1766,7 +1766,7 @@
if (cur_dt_entry->board_hw_subtype == 0)
cur_dt_entry->board_hw_subtype = (cur_dt_entry->variant_id >> 0x18);
- table_ptr += sizeof(struct dt_entry);
+ table_ptr += DEV_TREE_DT_ENTRY_SIZE_V3;
break;
default:
dprintf(CRITICAL, "ERROR: Unsupported version (%d) in DT table \n",
diff --git a/platform/msm_shared/include/dev_tree.h b/platform/msm_shared/include/dev_tree.h
index 4449286..754e4af 100644
--- a/platform/msm_shared/include/dev_tree.h
+++ b/platform/msm_shared/include/dev_tree.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2014,2017-2019 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2014,2017-2020 The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -41,6 +41,7 @@
#define DEV_TREE_VERSION_V3 3
#define DEV_TREE_HEADER_SIZE 12
+#define DEV_TREE_DT_ENTRY_SIZE_V3 40
#define DTB_MAGIC 0xedfe0dd0
#define DTB_OFFSET 0x2C