tpm: Add function to load keys via their parent's SHA1 hash

[u-boot] / common / fb_mmc.c

diff --git a/common/fb_mmc.c b/common/fb_mmc.c
index 4bc68a76570336785678d1eaf33085cb769c82e2..6cc113d825a4057f6126ad33083156ff3222ef43 100644 (file)
--- a/common/fb_mmc.c
+++ b/common/fb_mmc.c
@@ -14,12 +14,16 @@
 #include <mmc.h>
 #include <div64.h>
 
-#if defined(CONFIG_EFI_PARTITION) && !defined(CONFIG_FASTBOOT_GPT_NAME)
-#define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME
+/*
+ * FIXME: Ensure we always set these names via Kconfig once xxx_PARTITION is
+ * migrated
+ */
+#ifndef CONFIG_FASTBOOT_GPT_NAME
+#define CONFIG_FASTBOOT_GPT_NAME "gpt"
 #endif
 
 
-#if defined(CONFIG_DOS_PARTITION) && !defined(CONFIG_FASTBOOT_MBR_NAME)
+#ifndef CONFIG_FASTBOOT_MBR_NAME
 #define CONFIG_FASTBOOT_MBR_NAME "mbr"
 #endif
 
@@ -108,7 +112,7 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,
                return;
        }
 
-#ifdef CONFIG_EFI_PARTITION
+#if CONFIG_IS_ENABLED(EFI_PARTITION)
        if (strcmp(cmd, CONFIG_FASTBOOT_GPT_NAME) == 0) {
                printf("%s: updating MBR, Primary and Backup GPT(s)\n",
                       __func__);
@@ -129,7 +133,7 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,
        }
 #endif
 
-#ifdef CONFIG_DOS_PARTITION
+#if CONFIG_IS_ENABLED(DOS_PARTITION)
        if (strcmp(cmd, CONFIG_FASTBOOT_MBR_NAME) == 0) {
                printf("%s: updating MBR\n", __func__);
                if (is_valid_dos_buf(download_buffer)) {