From 9d54a6395de0cd16de829644c54c13898577f63b Mon Sep 17 00:00:00 2001
From: Lucas Wei <lucaswei@google.com>
Date: Thu, 26 May 2022 11:20:40 +0800
Subject: [PATCH 1/2] Felix: add requirement for vendor_kernel_boot partition

Bug: 214409109
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: I11cde42c4b1cd1caa323e66b8b44cb598819a3ce
---
 board-info.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/board-info.txt b/board-info.txt
index 585d210..8bf5c66 100644
--- a/board-info.txt
+++ b/board-info.txt
@@ -1 +1,2 @@
 require board=felix
+require partition-exists=vendor_kernel_boot

From a3b7b91b7f46b76c11dc015faf944f9d4a643da6 Mon Sep 17 00:00:00 2001
From: George Chang <georgekgchang@google.com>
Date: Thu, 26 May 2022 17:18:59 +0800
Subject: [PATCH 2/2] Remove Nfc hidl settings

Nfc uses aidl now

Bug: 216290344
Test: manual
Change-Id: I47f377b5bc7d1154d07ab34613c8c2deb2a54c1e
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 73b4e42..aafe372 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -113,15 +113,6 @@
        <transport>hwbinder</transport>
        <fqname>@1.3::IDevice/google-edgetpu</fqname>
     </hal>
-    <hal format="hidl">
-       <name>android.hardware.nfc</name>
-       <transport>hwbinder</transport>
-       <version>1.2</version>
-       <interface>
-           <name>INfc</name>
-           <instance>default</instance>
-       </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.health</name>
         <transport>hwbinder</transport>