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-mmc
[platform/kernel/u-boot.git]
/
include
/
configs
/
sama5d2_ptc.h
diff --git
a/include/configs/sama5d2_ptc.h
b/include/configs/sama5d2_ptc.h
index
7a049d4
..
7d20d65
100644
(file)
--- a/
include/configs/sama5d2_ptc.h
+++ b/
include/configs/sama5d2_ptc.h
@@
-10,9
+10,6
@@
#ifndef __CONFIG_H
#define __CONFIG_H
#ifndef __CONFIG_H
#define __CONFIG_H
-/* No NOR flash, this definition should put before common header */
-#define CONFIG_SYS_NO_FLASH
-
#include "at91-sama5_common.h"
/* serial console */
#include "at91-sama5_common.h"
/* serial console */
@@
-69,8
+66,6
@@
#define CONFIG_CMD_USB
#ifdef CONFIG_CMD_USB
#define CONFIG_CMD_USB
#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_ATMEL
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#endif
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#endif
@@
-84,7
+79,6
@@
#if defined(CONFIG_CMD_USB)
#define CONFIG_CMD_FAT
#if defined(CONFIG_CMD_USB)
#define CONFIG_CMD_FAT
-#define CONFIG_DOS_PARTITION
#endif
/* Ethernet Hardware */
#endif
/* Ethernet Hardware */