X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configs%2FT2080RDB_revD_SPIFLASH_defconfig;fp=configs%2FT2080RDB_revD_SPIFLASH_defconfig;h=9d8feac9ec277c142395f72dce899338b90aae5c;hb=ea92f95d630cba9c3a324d250258ad2e35d9c997;hp=04ef733621f308ce05f55088fe5a4c22603825c9;hpb=c45568cc4e51b7bbe2f3ce28d8f2566048aeebf3;p=platform%2Fkernel%2Fu-boot.git

diff --git a/configs/T2080RDB_revD_SPIFLASH_defconfig b/configs/T2080RDB_revD_SPIFLASH_defconfig
index 04ef733..9d8feac 100644
--- a/configs/T2080RDB_revD_SPIFLASH_defconfig
+++ b/configs/T2080RDB_revD_SPIFLASH_defconfig
@@ -7,10 +7,6 @@ CONFIG_ENV_OFFSET=0x100000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_DEFAULT_DEVICE_TREE="t2080rdb"
 CONFIG_SPL_TEXT_BASE=0xFFFD8000
-CONFIG_VID=y
-CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
-CONFIG_VOL_MONITOR_IR36021_READ=y
-CONFIG_VOL_MONITOR_IR36021_SET=y
 CONFIG_SPL_SERIAL=y
 CONFIG_SPL_DRIVERS_MISC=y
 CONFIG_SPL=y
@@ -23,8 +19,6 @@ CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_T2080RDB_REV_D=y
-<<<<<<< HEAD
-=======
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -33,7 +27,6 @@ CONFIG_VID=y
 CONFIG_VID_FLS_ENV="t208xrdb_vdd_mv"
 CONFIG_VOL_MONITOR_IR36021_READ=y
 CONFIG_VOL_MONITOR_IR36021_SET=y
->>>>>>> Convert CONFIG_PCIE1 et al to Kconfig
 CONFIG_SYS_MEMTEST_START=0x00200000
 CONFIG_SYS_MEMTEST_END=0x00400000
 CONFIG_MP=y