projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
[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
f40e0b7
..
1a0f9ca
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.
/*
* (C) Copyright 2010
* Texas Instruments Incorporated.
@@
-5,9
+6,7
@@
* Steve Sakoman <steve@sakoman.com>
*
* Configuration settings for the TI SDP4430 board.
* Steve Sakoman <steve@sakoman.com>
*
* Configuration settings for the TI SDP4430 board.
- * See omap4_common.h for OMAP4 common part
- *
- * SPDX-License-Identifier: GPL-2.0+
+ * See ti_omap4_common.h for OMAP4 common part
*/
#ifndef __CONFIG_SDP4430_H
*/
#ifndef __CONFIG_SDP4430_H
@@
-16,22
+15,12
@@
/*
* High Level Configuration Options
*/
/*
* High Level Configuration Options
*/
-#define CONFIG_4430SDP 1 /* working with SDP */
#define CONFIG_MACH_TYPE MACH_TYPE_OMAP_4430SDP
#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 */
/* 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_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 */
#endif /* __CONFIG_SDP4430_H */