Always treat invalid images as nonexistant now.

firmware/lib/vboot_kernel.c

 /* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Functions for loading a kernel from disk.
  * (Firmware portion)
  */
 
 #include "vboot_kernel.h"
 
@@ skipping 411 matching lines @@
       /* Don't reboot to recovery mode if we're already there */
       if (!is_rec)
         return (status == TPM_E_MUST_REBOOT ?
                 LOAD_KERNEL_REBOOT : LOAD_KERNEL_RECOVERY);
     }
 
     /* Success! */
     return LOAD_KERNEL_SUCCESS;
   }
 
-  // Handle error cases
-  if (found_partitions)
-    return LOAD_KERNEL_INVALID;
-  else
-    return LOAD_KERNEL_NOT_FOUND;
+  /* The BIOS may attempt to display different screens depending on whether
+   * we find an invalid kernel partition (return LOAD_KERNEL_INVALID) or not.
+   * But the flow is changing, so for now treating both cases as invalid gives
+   * slightly less confusing user feedback. Sigh.
+   */
+  return LOAD_KERNEL_INVALID;
 }