dev_tree: Match entire variant_id if board_hardware_id() > 0xff

Some Huawei devices seem to encode the entire qcom,board-id in there.
Right now matching would always fail if board_hardware_id() > 0xff.

app/aboot/lk2nd-device.c

@@ -39,6 +39,10 @@ static void update_board_id(struct board_id *board_id)
 	uint32_t hw_subtype = board_id->platform_subtype & 0xff;
 	uint32_t target_id = board_id->variant_id & 0xffff00;
 
+	/* Some Huawei devices seem to use hw_id > 0xff, match entire variant */
+	if (board_hardware_id() > 0xff)
+		hw_id = board_id->variant_id;
+
 	/* See platform_dt_absolute_match() for the checks made here */
 	if (board_hardware_id() != hw_id) {
 		dprintf(INFO, "Updating board hardware id: 0x%x -> 0x%x\n",

platform/msm_shared/dev_tree.c

@@ -600,6 +600,10 @@ static int platform_dt_absolute_match(struct dt_entry *cur_dt_entry, struct dt_e
 	/* Determine the bits 10:8 to check the DT with the DDR Size */
 	cur_dt_hlos_ddr = (cur_dt_entry->board_hw_subtype & 0x700);
 
+	/* Some Huawei devices seem to use hw_id > 0xff, match entire variant */
+	if (board_hardware_id() > 0xff)
+		cur_dt_hw_platform = cur_dt_entry->variant_id;
+
 	/* 1. must match the msm_id, platform_hw_id, platform_subtype and DDR size
 	*  soc, board major/minor, pmic major/minor must less than board info
 	*  2. find the matched DTB then return 1