Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h
index b352511..c7f7131 100644 (file)
--- a/include/configs/omap4_sdp4430.h
+++ b/include/configs/omap4_sdp4430.h
@@ -5,7 +5,7 @@
  * Steve Sakoman  <steve@sakoman.com>
  *
  * Configuration settings for the TI SDP4430 board.
- * See omap4_common.h for OMAP4 common part
+ * See ti_omap4_common.h for OMAP4 common part
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -16,20 +16,12 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_4430SDP         1       /* working with SDP */
 #define CONFIG_MACH_TYPE       MACH_TYPE_OMAP_4430SDP
 
-#include <configs/omap4_common.h>
-
-/* Battery Charger */
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_CMD_BAT                 1
-#endif
+#include <configs/ti_omap4_common.h>
 
 /* ENV related config options */
-#define CONFIG_ENV_IS_IN_MMC           1
 #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
 #define CONFIG_ENV_OFFSET              0xE0000
-#define CONFIG_CMD_SAVEENV
 
 #endif /* __CONFIG_SDP4430_H */