X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=include%2Fconfigs%2Funiphier-common.h;h=224c3354b8ac243beacbc1f3682ce02e7336655b;hb=3201455d6ad5b6e1f316e89d998c2c31c852b224;hp=2140fccc5a4ec27e38e5f472d17e80bae17be8eb;hpb=f4e7e2d12164c3235c3f5e19a68a503623029d35;p=karo-tx-uboot.git

diff --git a/include/configs/uniphier-common.h b/include/configs/uniphier-common.h
index 2140fccc5a..224c3354b8 100644
--- a/include/configs/uniphier-common.h
+++ b/include/configs/uniphier-common.h
@@ -10,12 +10,6 @@
 #ifndef __CONFIG_UNIPHIER_COMMON_H__
 #define __CONFIG_UNIPHIER_COMMON_H__
 
-#if defined(CONFIG_PFC_MICRO_SUPPORT_CARD) &&	\
-				defined(CONFIG_DCC_MICRO_SUPPORT_CARD)
-# error "Both CONFIG_PFC_MICRO_SUPPORT_CARD and CONFIG_DCC_MICRO_SUPPORT_CARD \
-are defined. Select only one of them."
-#endif
-
 /*
  * Support card address map
  */
@@ -205,7 +199,6 @@ are defined. Select only one of them."
 	"image_offset=0x00080000\0"		\
 	"image_size=0x00f00000\0"		\
 	"verify=n\0"				\
-	"autostart=yes\0"			\
 	"norboot=run add_default_bootargs;"				\
 		"bootm $image_offset\0"					\
 	"nandboot=run add_default_bootargs;"				\