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 'efi-2019-07-rc5-3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
[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
275ed7f
..
21108e3
100644
(file)
--- a/
include/configs/socfpga_de0_nano_soc.h
+++ b/
include/configs/socfpga_de0_nano_soc.h
@@
-1,15
+1,12
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
/*
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_TERASIC_DE0_H__
#define __CONFIG_TERASIC_DE0_H__
#include <asm/arch/base_addr_ac5.h>
*/
#ifndef __CONFIG_TERASIC_DE0_H__
#define __CONFIG_TERASIC_DE0_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 */
@@
-17,8
+14,6
@@
#define CONFIG_LOADADDR 0x01000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_LOADADDR 0x01000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-/* Ethernet on SoC (EMAC) */
-
/* The rest of the configuration is shared */
#include <configs/socfpga_common.h>
/* The rest of the configuration is shared */
#include <configs/socfpga_common.h>