Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / configs / omap4_sdp4430.h

diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h
index 9e03291ce176c8d8340a218ee07aba2a5cb965a2..a83797454c9aead2d41cf425cc926b2941061791 100644 (file)
--- a/include/configs/omap4_sdp4430.h
+++ b/include/configs/omap4_sdp4430.h
@@ -5,25 +5,9 @@
  * 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
  *
- * 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
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_SDP4430_H
@@ -33,8 +17,9 @@
  * High Level Configuration Options
  */
 #define CONFIG_4430SDP         1       /* working with SDP */
+#define CONFIG_MACH_TYPE       MACH_TYPE_OMAP_4430SDP
 
-#include <configs/omap4_common.h>
+#include <configs/ti_omap4_common.h>
 
 /* Battery Charger */
 #ifndef CONFIG_SPL_BUILD
@@ -47,6 +32,4 @@
 #define CONFIG_ENV_OFFSET              0xE0000
 #define CONFIG_CMD_SAVEENV
 
-#define CONFIG_SYS_PROMPT              "OMAP4430 SDP # "
-
 #endif /* __CONFIG_SDP4430_H */