Merge "Simplify board-info for 4.0.4"
diff --git a/board-info.txt b/board-info.txt
index 5f44dd5..e56a9b6 100644
--- a/board-info.txt
+++ b/board-info.txt
@@ -1,3 +1,3 @@
 require board=herring
-require version-bootloader=I9020XXKA3|I9020XXKI1|I9020XXKL1
-require version-baseband=I9020XXKI1|I9020UCKB2|I9020UCKD1|I9020UCKF1|I9020UCKJ1|I9020KRKB3|M200KRKC1
+require version-bootloader=I9020XXKA3|I9020XXKL1
+require version-baseband=I9020XXKI1|I9020UCKJ1|M200KRKC1