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 tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm
[platform/kernel/u-boot.git]
/
include
/
configs
/
socfpga_common.h
diff --git
a/include/configs/socfpga_common.h
b/include/configs/socfpga_common.h
index
6453ab7
..
4a7da76
100644
(file)
--- a/
include/configs/socfpga_common.h
+++ b/
include/configs/socfpga_common.h
@@
-52,20
+52,6
@@
#define CONFIG_SYS_PL310_BASE SOCFPGA_MPUL2_ADDRESS
/*
#define CONFIG_SYS_PL310_BASE SOCFPGA_MPUL2_ADDRESS
/*
- * Ethernet on SoC (EMAC)
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_DW_ALTDESCRIPTOR
-#endif
-
-/*
- * FPGA Driver
- */
-#ifdef CONFIG_CMD_FPGA
-#define CONFIG_FPGA_COUNT 1
-#endif
-
-/*
* L4 OSC1 Timer 0
*/
#ifndef CONFIG_TIMER
* L4 OSC1 Timer 0
*/
#ifndef CONFIG_TIMER
@@
-80,7
+66,6
@@
/*
* L4 Watchdog
*/
/*
* L4 Watchdog
*/
-#define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS
#define CONFIG_DW_WDT_CLOCK_KHZ 25000
/*
#define CONFIG_DW_WDT_CLOCK_KHZ 25000
/*