summaryrefslogtreecommitdiff
path: root/common/fb_mmc.c
diff options
context:
space:
mode:
authorPetr Kulhavy <brain@jikos.cz>2016-09-09 08:27:18 (GMT)
committerTom Rini <trini@konsulko.com>2016-10-02 00:04:59 (GMT)
commit6f6c8630942b6d60735c2c728d9f476de0290f9e (patch)
tree6ebca8b4b7aa51f785266a84a9f87f35d496f202 /common/fb_mmc.c
parentda2ee24d9150448e1816db790b4e11e2cf53df20 (diff)
downloadu-boot-6f6c8630942b6d60735c2c728d9f476de0290f9e.tar.xz
fastboot: move FASTBOOT_FLASH options into Kconfig
Move FASTBOOT_MBR_NAME and FASTBOOT_GPT_NAME into Kconfig. Add dependency on the FASTBOOT_FLASH setting (also for FASTBOOT_MBR_NAME). Remove the now redundant GPT_ENTRY_NAME. Signed-off-by: Petr Kulhavy <brain@jikos.cz> Reviewed-by: Tom Rini <trini@konsulko.com> Acked-by: Steve Rae <steve.rae@raedomain.com> Reviewed-by: Simon Glass <sjg@chromium.org> [trini: Add FIXME about xxx_PARTITION needing to be in Kconfig] Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/fb_mmc.c')
-rw-r--r--common/fb_mmc.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/common/fb_mmc.c b/common/fb_mmc.c
index 4bc68a7..81a3bd0 100644
--- 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