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 git://git.denx.de/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
socfpga_de0_nano_soc.h
diff --git
a/include/configs/socfpga_de0_nano_soc.h
b/include/configs/socfpga_de0_nano_soc.h
index
320c585
..
e5db00e
100644
(file)
--- a/
include/configs/socfpga_de0_nano_soc.h
+++ b/
include/configs/socfpga_de0_nano_soc.h
@@
-8,8
+8,6
@@
#include <asm/arch/base_addr_ac5.h>
#include <asm/arch/base_addr_ac5.h>
-#define CONFIG_HW_WATCHDOG
-
/* Memory configurations */
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */
/* Memory configurations */
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */
@@
-18,12
+16,6
@@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Ethernet on SoC (EMAC) */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Ethernet on SoC (EMAC) */
-#if defined(CONFIG_CMD_NET)
-#define CONFIG_PHY_MICREL
-#define CONFIG_PHY_MICREL_KSZ9031
-#endif
-
-#define CONFIG_ENV_IS_IN_MMC
/* The rest of the configuration is shared */
#include <configs/socfpga_common.h>
/* The rest of the configuration is shared */
#include <configs/socfpga_common.h>