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://www.denx.de/git/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
pcm051.h
diff --git
a/include/configs/pcm051.h
b/include/configs/pcm051.h
index
ef081b2
..
9ce976c
100644
(file)
--- a/
include/configs/pcm051.h
+++ b/
include/configs/pcm051.h
@@
-22,7
+22,6
@@
#include <configs/ti_am335x_common.h>
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
#include <configs/ti_am335x_common.h>
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
-#define MACH_TYPE_PCM051 4144 /* Until the next sync */
#define CONFIG_MACH_TYPE MACH_TYPE_PCM051
/* set to negative value for no autoboot */
#define CONFIG_MACH_TYPE MACH_TYPE_PCM051
/* set to negative value for no autoboot */
@@
-120,7
+119,7
@@
/* CPU */
#define CONFIG_ENV_IS_NOWHERE
/* CPU */
#define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_SPL_LDSCRIPT "
$(CPUDIR)
/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT "
arch/arm/mach-omap2
/am33xx/u-boot-spl.lds"
#ifdef CONFIG_SPI_BOOT
#define CONFIG_SPL_SPI_LOAD
#ifdef CONFIG_SPI_BOOT
#define CONFIG_SPL_SPI_LOAD
@@
-132,7
+131,6
@@
* USB configuration
*/
#define CONFIG_USB_MUSB_DSPS
* USB configuration
*/
#define CONFIG_USB_MUSB_DSPS
-#define CONFIG_ARCH_MISC_INIT
#define CONFIG_USB_MUSB_PIO_ONLY
#define CONFIG_AM335X_USB0
#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
#define CONFIG_USB_MUSB_PIO_ONLY
#define CONFIG_AM335X_USB0
#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL