Convert CONFIG_SPLASH_SCREEN et al to Kconfig

[platform/kernel/u-boot.git] / include / configs / s5p4418_nanopi2.h

diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h
index da5b29a..8577729 100644 (file)
--- a/include/configs/s5p4418_nanopi2.h
+++ b/include/configs/s5p4418_nanopi2.h
@@ -102,11 +102,6 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
-/*-----------------------------------------------------------------------
- * allow to overwrite serial and ethaddr
- */
-#define CONFIG_ENV_OVERWRITE
-
 #ifdef CONFIG_HUSH_PARSER
 #define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #endif
@@ -152,33 +147,11 @@
 #endif
 
 /*-----------------------------------------------------------------------
- * SD/MMC
- */
-#if defined(CONFIG_MMC)
-/* eMMC = 0, SD-card = 2 */
-#define CONFIG_SYS_MMC_DEV             2
-#define CONFIG_SYS_MMC_ENV_DEV         CONFIG_SYS_MMC_DEV
-#endif
-
-/*-----------------------------------------------------------------------
- * Default environment organization
- */
-#if !defined(CONFIG_ENV_IS_IN_MMC) && !defined(CONFIG_ENV_IS_IN_NAND) && \
-       !defined(CONFIG_ENV_IS_IN_FLASH) && !defined(CONFIG_ENV_IS_IN_EEPROM)
-       /* default: CONFIG_ENV_IS_NOWHERE */
-       #define CONFIG_ENV_IS_NOWHERE
-       #define CONFIG_ENV_OFFSET       1024
-       #define CONFIG_ENV_SIZE         (4 * 1024)      /* env size */
-#endif
-
-/*-----------------------------------------------------------------------
  * VIDEO
  */
 
 #define CONFIG_VIDEO_LOGO
 
-#define CONFIG_SPLASH_SCREEN
-
 #ifdef CONFIG_VIDEO_LOGO
 
 #ifdef CONFIG_DM_VIDEO
@@ -186,8 +159,6 @@
 #endif
 
 #ifdef CONFIG_SPLASH_SCREEN
-#define CONFIG_SPLASH_SOURCE           1
-#define CONFIG_SPLASH_SCREEN_ALIGN     1
 #define SPLASH_FILE                    logo.bmp
 #endif