From 77337c1c7a0d5e2bc15db4c6d237550c8af26942 Mon Sep 17 00:00:00 2001
From: "jk.kernel@gmail.com" <jk.kernel@gmail.com>
Date: Tue, 26 Jul 2016 18:28:25 +0800
Subject: [PATCH] rockchip: remove the duplicated macro config

CONFIG_DOS_PARTITION and CONFIG_EFI_PARTITION are already included in
config_distro_defaults.h, and we don't need them in SPL stage.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Acked-by: Simon Glass <sjg@chromium.org>
---
 include/configs/kylin_rk3036.h  | 1 -
 include/configs/rk3036_common.h | 1 -
 include/configs/rk3288_common.h | 2 --
 3 files changed, 4 deletions(-)

diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h
index b16c03fc0a..e8ca76dfcf 100644
--- a/include/configs/kylin_rk3036.h
+++ b/include/configs/kylin_rk3036.h
@@ -26,7 +26,6 @@
 /* Enable gpt partition table */
 #define CONFIG_CMD_GPT
 #define CONFIG_RANDOM_UUID
-#define CONFIG_EFI_PARTITION
 #define PARTS_DEFAULT \
 	"uuid_disk=${uuid_gpt_disk};" \
 	"name=loader,start=32K,size=4000K,uuid=${uuid_gpt_loader};" \
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index b003baac29..ffcaa6f0e5 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -46,7 +46,6 @@
 #define CONFIG_DWMMC
 #define CONFIG_BOUNCE_BUFFER
 
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 #define CONFIG_PARTITION_UUIDS
 #define CONFIG_CMD_PART
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index 9f2dd3fea3..0b7d7234ee 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -56,7 +56,6 @@
 #define CONFIG_DWMMC
 #define CONFIG_BOUNCE_BUFFER
 
-#define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 #define CONFIG_PARTITION_UUIDS
 #define CONFIG_CMD_PART
@@ -106,7 +105,6 @@
 
 /* Enable gpt partition table */
 #define CONFIG_CMD_GPT
-#define CONFIG_EFI_PARTITION
 
 #include <config_distro_defaults.h>
 
-- 
2.39.5