Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

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

diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h
index 0a9b707c5385c548f472be5818a3ff6d78736a89..f40e0b718fc843d2a82a35e64e2829e35f1fbb22 100644 (file)
--- a/include/configs/omap4_sdp4430.h
+++ b/include/configs/omap4_sdp4430.h
@@ -7,23 +7,7 @@
  * 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
+ * SPDX-License-Identifier:    GPL-2.0+ 
  */
 
 #ifndef __CONFIG_SDP4430_H
@@ -33,11 +17,14 @@
  * 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
 
 /* ENV related config options */
 #define CONFIG_ENV_IS_IN_MMC           1
@@ -48,4 +35,3 @@
 #define CONFIG_SYS_PROMPT              "OMAP4430 SDP # "
 
 #endif /* __CONFIG_SDP4430_H */
-