Merge branch 'master' of git://git.denx.de/u-boot-socfpga

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

diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h
index 39d715480efd334700cb9ea1edec6568e6195850..884f45df22566d49a5b2c73ce94d6db92c695f32 100644 (file)
--- a/include/configs/omap4_sdp4430.h
+++ b/include/configs/omap4_sdp4430.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2010
  * Texas Instruments Incorporated.
@@ -5,25 +6,7 @@
  * Steve Sakoman  <steve@sakoman.com>
  *
  * Configuration settings for the TI SDP4430 board.
- * See omap4_common.h for OMAP4 common part
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * See ti_omap4_common.h for OMAP4 common part
  */
 
 #ifndef __CONFIG_SDP4430_H
@@ -32,19 +15,11 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_4430SDP         1       /* working with SDP */
-
-#include <configs/omap4_common.h>
+#define CONFIG_MACH_TYPE       MACH_TYPE_OMAP_4430SDP
 
-/* Battery Charger */
-#define CONFIG_CMD_BAT                 1
+#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
-
-#define CONFIG_SYS_PROMPT              "OMAP4430 SDP # "
 
 #endif /* __CONFIG_SDP4430_H */