Skip to contentSkip to conversation

arm: socfpga: Add support for the Terasic DE10-nano

PATCH New Dalon Westergreen 2 participants 6 messages Feb 18, 2017 – Feb 19, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: socfpga: Add support for the Terasic DE10-nano

Add support for the cyclone5 soc based Terasic DE10-nano. The board is a second generation version of the DE0-nano-soc but has the a larger FPGA and hdmi support.

---
 arch/arm/dts/Makefile                       |   1 +
 arch/arm/dts/socfpga_cyclone5_de10_nano.dts |  68 +++
 arch/arm/mach-socfpga/Kconfig               |   7 +
 board/terasic/de10-nano/MAINTAINERS         |   5 +
 board/terasic/de10-nano/Makefile            |   9 +
 board/terasic/de10-nano/qts/iocsr_config.h  | 660 ++++++++++++++++++++++++++++
 board/terasic/de10-nano/qts/pinmux_config.h | 219 +++++++++
 board/terasic/de10-nano/qts/pll_config.h    |  85 ++++
 board/terasic/de10-nano/qts/sdram_config.h  | 344 +++++++++++++++
 board/terasic/de10-nano/socfpga.c           |   6 +
 configs/socfpga_de10_nano_defconfig         |  61 +++
 include/configs/socfpga_de10_nano.h         |  36 ++
 12 files changed, 1501 insertions(+)
 create mode 100644 arch/arm/dts/socfpga_cyclone5_de10_nano.dts
 create mode 100644 board/terasic/de10-nano/MAINTAINERS
 create mode 100644 board/terasic/de10-nano/Makefile
 create mode 100644 board/terasic/de10-nano/qts/iocsr_config.h
 create mode 100644 board/terasic/de10-nano/qts/pinmux_config.h
 create mode 100644 board/terasic/de10-nano/qts/pll_config.h
 create mode 100644 board/terasic/de10-nano/qts/sdram_config.h
 create mode 100644 board/terasic/de10-nano/socfpga.c
 create mode 100644 configs/socfpga_de10_nano_defconfig
 create mode 100644 include/configs/socfpga_de10_nano.h
arch/arm/dts/Makefile +1 -0
index eb68c20..703ddc3 100644
@@ -145,6 +145,7 @@ dtb-$(CONFIG_ARCH_SOCFPGA) +=				\
 	socfpga_cyclone5_socdk.dtb			\
 	socfpga_cyclone5_de0_nano_soc.dtb			\
 	socfpga_cyclone5_de1_soc.dtb			\
+	socfpga_cyclone5_de10_nano.dtb			\
 	socfpga_cyclone5_sockit.dtb			\
 	socfpga_cyclone5_socrates.dtb			\
 	socfpga_cyclone5_sr1500.dtb			\
arch/arm/dts/socfpga_cyclone5_de10_nano.dts new file +68 -0

68 lines not on this page · raw message

arch/arm/mach-socfpga/Kconfig +7 -0
index e56b3db..6a776b5 100644
@@ -85,6 +85,10 @@ config TARGET_SOCFPGA_TERASIC_DE1_SOC
 	bool "Terasic DE1-SoC (Cyclone V)"
 	select TARGET_SOCFPGA_CYCLONE5
 
+config TARGET_SOCFPGA_TERASIC_DE10_NANO
+	bool "Terasic DE10-Nano (Cyclone V)"
+	select TARGET_SOCFPGA_CYCLONE5
+
 config TARGET_SOCFPGA_TERASIC_SOCKIT
 	bool "Terasic SoCkit (Cyclone V)"
 	select TARGET_SOCFPGA_CYCLONE5
@@ -96,6 +100,7 @@ config SYS_BOARD
 	default "cyclone5-socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK
 	default "de0-nano-soc" if TARGET_SOCFPGA_TERASIC_DE0_NANO
 	default "de1-soc" if TARGET_SOCFPGA_TERASIC_DE1_SOC
+	default "de10-nano" if TARGET_SOCFPGA_TERASIC_DE10_NANO
 	default "is1" if TARGET_SOCFPGA_IS1
 	default "mcvevk" if TARGET_SOCFPGA_DENX_MCVEVK
 	default "sockit" if TARGET_SOCFPGA_TERASIC_SOCKIT
@@ -112,6 +117,7 @@ config SYS_VENDOR
 	default "terasic" if TARGET_SOCFPGA_TERASIC_DE0_NANO
 	default "terasic" if TARGET_SOCFPGA_TERASIC_DE1_SOC
 	default "terasic" if TARGET_SOCFPGA_TERASIC_SOCKIT
+	default "terasic" if TARGET_SOCFPGA_TERASIC_DE10_NANO
 
 config SYS_SOC
 	default "socfpga"
@@ -121,6 +127,7 @@ config SYS_CONFIG_NAME
 	default "socfpga_cyclone5_socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK
 	default "socfpga_de0_nano_soc" if TARGET_SOCFPGA_TERASIC_DE0_NANO
 	default "socfpga_de1_soc" if TARGET_SOCFPGA_TERASIC_DE1_SOC
+	default "socfpga_de10_nano" if TARGET_SOCFPGA_TERASIC_DE10_NANO
 	default "socfpga_is1" if TARGET_SOCFPGA_IS1
 	default "socfpga_mcvevk" if TARGET_SOCFPGA_DENX_MCVEVK
 	default "socfpga_sockit" if TARGET_SOCFPGA_TERASIC_SOCKIT
board/terasic/de10-nano/MAINTAINERS new file +5 -0
new file mode 100644
index 0000000..f4dd0df
@@ -0,0 +1,5 @@
+DE10-NANO BOARD
+M:	Dalon Westergreen <[email protected]>
+S:	Maintained
+F:	include/configs/socfpga_de10_nano.h
+F:	configs/socfpga_de10_nano_defconfig
board/terasic/de10-nano/Makefile new file +9 -0
new file mode 100644
index 0000000..86f9b78
@@ -0,0 +1,9 @@
+#
+# (C) Copyright 2001-2006
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+# (C) Copyright 2010, Thomas Chou <[email protected]>
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	:= socfpga.o
board/terasic/de10-nano/qts/iocsr_config.h new file +660 -0

660 lines not on this page · raw message

board/terasic/de10-nano/qts/pinmux_config.h new file +219 -0

219 lines not on this page · raw message

board/terasic/de10-nano/qts/pll_config.h new file +85 -0

85 lines not on this page · raw message

board/terasic/de10-nano/qts/sdram_config.h new file +344 -0

344 lines not on this page · raw message

board/terasic/de10-nano/socfpga.c new file +6 -0
new file mode 100644
index 0000000..c5852e7
@@ -0,0 +1,6 @@
+/*
+ * Copyright (C) 2017, Intel Corporation
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+#include <common.h>
configs/socfpga_de10_nano_defconfig new file +61 -0

61 lines not on this page · raw message

include/configs/socfpga_de10_nano.h new file +36 -0
new file mode 100644
index 0000000..61a5066
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017, Intel Corporation
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+#ifndef __CONFIG_TERASIC_DE10_H__
+#define __CONFIG_TERASIC_DE10_H__
+
+#include <asm/arch/base_addr_ac5.h>
+
+/* U-Boot Commands */
+#define CONFIG_FAT_WRITE
+#define CONFIG_HW_WATCHDOG
+
+/* Memory configurations */
+#define PHYS_SDRAM_1_SIZE		0x40000000	/* 1GiB */
+
+/* Booting Linux */
+#define CONFIG_BOOTFILE		"zImage"
+#define CONFIG_LOADADDR		0x01000000
+#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
+
+#define CONFIG_BOOTCOMMAND "run fpga_cfg; run distro_bootcmd"
+
+/* The rest of the configuration is shared */
+#include <configs/socfpga_common.h>
+
+#endif	/* __CONFIG_TERASIC_DE10_H__ */
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 arm: socfpga: Add support for the Terasic DE10-nano

Quoted 5 lines · Dalon Westergreen

Add support for the cyclone5 soc based Terasic DE10-nano. The board is a second generation version of the DE0-nano-soc but has the a larger FPGA and hdmi support.

Looks pretty nice, minor nits below

[...]

Quoted 24 lines
arch/arm/mach-socfpga/Kconfig +5 -0
index e56b3db..6a776b5 100644
@@ -85,6 +85,10 @@ config TARGET_SOCFPGA_TERASIC_DE1_SOC
 	bool "Terasic DE1-SoC (Cyclone V)"
 	select TARGET_SOCFPGA_CYCLONE5
 
+config TARGET_SOCFPGA_TERASIC_DE10_NANO
+	bool "Terasic DE10-Nano (Cyclone V)"
+	select TARGET_SOCFPGA_CYCLONE5
+
 config TARGET_SOCFPGA_TERASIC_SOCKIT
 	bool "Terasic SoCkit (Cyclone V)"
 	select TARGET_SOCFPGA_CYCLONE5
@@ -96,6 +100,7 @@ config SYS_BOARD
 	default "cyclone5-socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK
 	default "de0-nano-soc" if TARGET_SOCFPGA_TERASIC_DE0_NANO
 	default "de1-soc" if TARGET_SOCFPGA_TERASIC_DE1_SOC
+	default "de10-nano" if TARGET_SOCFPGA_TERASIC_DE10_NANO
 	default "is1" if TARGET_SOCFPGA_IS1
 	default "mcvevk" if TARGET_SOCFPGA_DENX_MCVEVK
 	default "sockit" if TARGET_SOCFPGA_TERASIC_SOCKIT

arch/arm/mach-socfpga/Kconfig config SYS_VENDOR · line 120

Quoted 4 lines
arch/arm/mach-socfpga/Kconfig +1 -0
@@ -112,6 +117,7 @@ config SYS_VENDOR
 	default "terasic" if TARGET_SOCFPGA_TERASIC_DE0_NANO
 	default "terasic" if TARGET_SOCFPGA_TERASIC_DE1_SOC
 	default "terasic" if TARGET_SOCFPGA_TERASIC_SOCKIT
+	default "terasic" if TARGET_SOCFPGA_TERASIC_DE10_NANO

Keep the list sorted please.

Quoted 28 lines
arch/arm/mach-socfpga/Kconfig +1 -0
 config SYS_SOC
 	default "socfpga"
@@ -121,6 +127,7 @@ config SYS_CONFIG_NAME
 	default "socfpga_cyclone5_socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK
 	default "socfpga_de0_nano_soc" if TARGET_SOCFPGA_TERASIC_DE0_NANO
 	default "socfpga_de1_soc" if TARGET_SOCFPGA_TERASIC_DE1_SOC
+	default "socfpga_de10_nano" if TARGET_SOCFPGA_TERASIC_DE10_NANO
 	default "socfpga_is1" if TARGET_SOCFPGA_IS1
 	default "socfpga_mcvevk" if TARGET_SOCFPGA_DENX_MCVEVK
 	default "socfpga_sockit" if TARGET_SOCFPGA_TERASIC_SOCKIT
board/terasic/de10-nano/MAINTAINERS new file +5 -0
new file mode 100644
index 0000000..f4dd0df
@@ -0,0 +1,5 @@
+DE10-NANO BOARD
+M:	Dalon Westergreen <[email protected]>
+S:	Maintained
+F:	include/configs/socfpga_de10_nano.h
+F:	configs/socfpga_de10_nano_defconfig
board/terasic/de10-nano/Makefile new file +0 -0
new file mode 100644
index 0000000..86f9b78

board/terasic/de10-nano/Makefile line 4

Quoted 4 lines
board/terasic/de10-nano/Makefile new file +4 -0
@@ -0,0 +1,9 @@
+#
+# (C) Copyright 2001-2006
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+# (C) Copyright 2010, Thomas Chou <[email protected]>

Really ? Looks like a new file, so (C) you

Quoted 4 lines
board/terasic/de10-nano/Makefile new file +4 -0
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	:= socfpga.o

[...]

Quoted 27 lines
include/configs/socfpga_de10_nano.h new file +21 -0
new file mode 100644
index 0000000..61a5066
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017, Intel Corporation
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+#ifndef __CONFIG_TERASIC_DE10_H__
+#define __CONFIG_TERASIC_DE10_H__
+
+#include <asm/arch/base_addr_ac5.h>
+
+/* U-Boot Commands */
+#define CONFIG_FAT_WRITE
+#define CONFIG_HW_WATCHDOG
+
+/* Memory configurations */
+#define PHYS_SDRAM_1_SIZE		0x40000000	/* 1GiB */
+
+/* Booting Linux */
+#define CONFIG_BOOTFILE		"zImage"
+#define CONFIG_LOADADDR		0x01000000
+#define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR

include/configs/socfpga_de10_nano.h line 31

Quoted 10 lines
include/configs/socfpga_de10_nano.h new file +10 -0
+
+/* 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
+
+#define CONFIG_BOOTCOMMAND "run fpga_cfg; run distro_bootcmd"

What is "fpga_cfg" ?

Quoted 5 lines
include/configs/socfpga_de10_nano.h new file +4 -0
+/* The rest of the configuration is shared */
+#include <configs/socfpga_common.h>
+
+#endif	/* __CONFIG_TERASIC_DE10_H__ */
Signature · 2 lines
Best regards,
Marek Vasut
#2 lore raw

PATCH 1/1 arm: socfpga: Add support for the Terasic DE10-nano

Quoted 123 lines · Marek Vasut
Quoted 6 lines · Dalon Westergreen

Add support for the cyclone5 soc based Terasic DE10-nano.??The board is a second generation version of the DE0-nano-soc but has the a larger FPGA and hdmi support.

Looks pretty nice, minor nits below

[...]

Quoted 28 lines
arch/arm/mach-socfpga/Kconfig +0 -0
index e56b3db..6a776b5 100644
@@ -85,6 +85,10 @@ config TARGET_SOCFPGA_TERASIC_DE1_SOC

? bool "Terasic DE1-SoC (Cyclone V)"
? select TARGET_SOCFPGA_CYCLONE5
?

arch/arm/mach-socfpga/Kconfig +4 -0
+config TARGET_SOCFPGA_TERASIC_DE10_NANO
+	bool "Terasic DE10-Nano (Cyclone V)"
+	select TARGET_SOCFPGA_CYCLONE5
+

?config TARGET_SOCFPGA_TERASIC_SOCKIT
? bool "Terasic SoCkit (Cyclone V)"
? select TARGET_SOCFPGA_CYCLONE5

arch/arm/mach-socfpga/Kconfig +0 -0
@@ -96,6 +100,7 @@ config SYS_BOARD

? default "cyclone5-socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK
? default "de0-nano-soc" if TARGET_SOCFPGA_TERASIC_DE0_NANO
? default "de1-soc" if TARGET_SOCFPGA_TERASIC_DE1_SOC

arch/arm/mach-socfpga/Kconfig +1 -0
+	default "de10-nano" if TARGET_SOCFPGA_TERASIC_DE10_NANO

? default "is1" if TARGET_SOCFPGA_IS1
? default "mcvevk" if TARGET_SOCFPGA_DENX_MCVEVK
? default "sockit" if TARGET_SOCFPGA_TERASIC_SOCKIT

arch/arm/mach-socfpga/Kconfig +0 -0
@@ -112,6 +117,7 @@ config SYS_VENDOR

? default "terasic" if TARGET_SOCFPGA_TERASIC_DE0_NANO
? default "terasic" if TARGET_SOCFPGA_TERASIC_DE1_SOC
? default "terasic" if TARGET_SOCFPGA_TERASIC_SOCKIT

arch/arm/mach-socfpga/Kconfig config SYS_VENDOR · line 120

Quoted 1 line
arch/arm/mach-socfpga/Kconfig +1 -0
+	default "terasic" if TARGET_SOCFPGA_TERASIC_DE10_NANO

Keep the list sorted please.

Quoted 31 lines

?
?config SYS_SOC
? default "socfpga"

arch/arm/mach-socfpga/Kconfig +0 -0
@@ -121,6 +127,7 @@ config SYS_CONFIG_NAME

? default "socfpga_cyclone5_socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK
? default "socfpga_de0_nano_soc" if TARGET_SOCFPGA_TERASIC_DE0_NANO
? default "socfpga_de1_soc" if TARGET_SOCFPGA_TERASIC_DE1_SOC

arch/arm/mach-socfpga/Kconfig +1 -0
+	default "socfpga_de10_nano" if TARGET_SOCFPGA_TERASIC_DE10_NANO

? default "socfpga_is1" if TARGET_SOCFPGA_IS1
? default "socfpga_mcvevk" if TARGET_SOCFPGA_DENX_MCVEVK
? default "socfpga_sockit" if TARGET_SOCFPGA_TERASIC_SOCKIT

board/terasic/de10- renamed from board/terasic/de10-nano/MAINTAINERS +0 -0

nano/MAINTAINERS
new file mode 100644
index 0000000..f4dd0df

board/terasic/de10-nano/MAINTAINERS new file +5 -0
@@ -0,0 +1,5 @@
+DE10-NANO BOARD
+M:	Dalon Westergreen <[email protected]>
+S:	Maintained
+F:	include/configs/socfpga_de10_nano.h
+F:	configs/socfpga_de10_nano_defconfig
board/terasic/de10- renamed from board/terasic/de10-nano/Makefile +0 -0

nano/Makefile
new file mode 100644
index 0000000..86f9b78

board/terasic/de10-nano/Makefile line 4

Quoted 4 lines
board/terasic/de10-nano/Makefile new file +4 -0
@@ -0,0 +1,9 @@
+#
+# (C) Copyright 2001-2006
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+# (C) Copyright 2010, Thomas Chou <[email protected]>

Really ? Looks like a new file, so (C) you

Quoted 5 lines
board/terasic/de10-nano/Makefile new file +4 -0
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	:= socfpga.o

[...]

Quoted 33 lines
include/configs/socfpga_de10_nano.h new file +25 -0
new file mode 100644
index 0000000..61a5066
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017, Intel Corporation
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+#ifndef __CONFIG_TERASIC_DE10_H__
+#define __CONFIG_TERASIC_DE10_H__
+
+#include <asm/arch/base_addr_ac5.h>
+
+/* U-Boot Commands */
+#define CONFIG_FAT_WRITE
+#define CONFIG_HW_WATCHDOG
+
+/* Memory configurations */
+#define PHYS_SDRAM_1_SIZE		0x40000000	/* 1GiB */
+
+/* Booting Linux */
+#define CONFIG_BOOTFILE		"zImage"
+#define CONFIG_LOADADDR		0x01000000
+#define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
+
+/* Ethernet on SoC (EMAC) */
+#if defined(CONFIG_CMD_NET)
+#define CONFIG_PHY_MICREL
Quoted 8 lines

include/configs/socfpga_de10_nano.h line 31

Quoted 6 lines
include/configs/socfpga_de10_nano.h new file +6 -0
+#define CONFIG_PHY_MICREL_KSZ9031
+#endif
+
+#define CONFIG_ENV_IS_IN_MMC
+
+#define CONFIG_BOOTCOMMAND "run fpga_cfg; run distro_bootcmd"

What is "fpga_cfg" ?

sorry, thanks for catching that. ?i am playing with something like the way distro boot searches for files, but for the fpga image.

Quoted 9 lines
Quoted 7 lines
include/configs/socfpga_de10_nano.h new file +4 -0
+/* The rest of the configuration is shared */
+#include <configs/socfpga_common.h>
+
+#endif	/* __CONFIG_TERASIC_DE10_H__ */
#3 lore raw

PATCH 1/1 arm: socfpga: Add support for the Terasic DE10-nano

Quoted 132 lines · Dalon Westergreen
Quoted 123 lines · Marek Vasut
Quoted 6 lines · Dalon Westergreen

Add support for the cyclone5 soc based Terasic DE10-nano. The board is a second generation version of the DE0-nano-soc but has the a larger FPGA and hdmi support.

Looks pretty nice, minor nits below

[...]

Quoted 25 lines
arch/arm/mach-socfpga/Kconfig +5 -0
index e56b3db..6a776b5 100644
@@ -85,6 +85,10 @@ config TARGET_SOCFPGA_TERASIC_DE1_SOC
 	bool "Terasic DE1-SoC (Cyclone V)"
 	select TARGET_SOCFPGA_CYCLONE5
 
+config TARGET_SOCFPGA_TERASIC_DE10_NANO
+	bool "Terasic DE10-Nano (Cyclone V)"
+	select TARGET_SOCFPGA_CYCLONE5
+
 config TARGET_SOCFPGA_TERASIC_SOCKIT
 	bool "Terasic SoCkit (Cyclone V)"
 	select TARGET_SOCFPGA_CYCLONE5
@@ -96,6 +100,7 @@ config SYS_BOARD
 	default "cyclone5-socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK
 	default "de0-nano-soc" if TARGET_SOCFPGA_TERASIC_DE0_NANO
 	default "de1-soc" if TARGET_SOCFPGA_TERASIC_DE1_SOC
+	default "de10-nano" if TARGET_SOCFPGA_TERASIC_DE10_NANO
 	default "is1" if TARGET_SOCFPGA_IS1
 	default "mcvevk" if TARGET_SOCFPGA_DENX_MCVEVK
 	default "sockit" if TARGET_SOCFPGA_TERASIC_SOCKIT

arch/arm/mach-socfpga/Kconfig config SYS_VENDOR · line 120

Quoted 4 lines
arch/arm/mach-socfpga/Kconfig +1 -0
@@ -112,6 +117,7 @@ config SYS_VENDOR
 	default "terasic" if TARGET_SOCFPGA_TERASIC_DE0_NANO
 	default "terasic" if TARGET_SOCFPGA_TERASIC_DE1_SOC
 	default "terasic" if TARGET_SOCFPGA_TERASIC_SOCKIT
+	default "terasic" if TARGET_SOCFPGA_TERASIC_DE10_NANO

Keep the list sorted please.

Quoted 31 lines
arch/arm/mach-socfpga/Kconfig +1 -0
 config SYS_SOC
 	default "socfpga"
@@ -121,6 +127,7 @@ config SYS_CONFIG_NAME
 	default "socfpga_cyclone5_socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK
 	default "socfpga_de0_nano_soc" if TARGET_SOCFPGA_TERASIC_DE0_NANO
 	default "socfpga_de1_soc" if TARGET_SOCFPGA_TERASIC_DE1_SOC
+	default "socfpga_de10_nano" if TARGET_SOCFPGA_TERASIC_DE10_NANO
 	default "socfpga_is1" if TARGET_SOCFPGA_IS1
 	default "socfpga_mcvevk" if TARGET_SOCFPGA_DENX_MCVEVK
 	default "socfpga_sockit" if TARGET_SOCFPGA_TERASIC_SOCKIT
board/terasic/de10- renamed from board/terasic/de10-nano/MAINTAINERS +0 -0

nano/MAINTAINERS
new file mode 100644
index 0000000..f4dd0df

board/terasic/de10-nano/MAINTAINERS new file +5 -0
@@ -0,0 +1,5 @@
+DE10-NANO BOARD
+M:	Dalon Westergreen <[email protected]>
+S:	Maintained
+F:	include/configs/socfpga_de10_nano.h
+F:	configs/socfpga_de10_nano_defconfig
board/terasic/de10- renamed from board/terasic/de10-nano/Makefile +0 -0

nano/Makefile
new file mode 100644
index 0000000..86f9b78

board/terasic/de10-nano/Makefile line 4

Quoted 4 lines
board/terasic/de10-nano/Makefile new file +4 -0
@@ -0,0 +1,9 @@
+#
+# (C) Copyright 2001-2006
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+# (C) Copyright 2010, Thomas Chou <[email protected]>

Really ? Looks like a new file, so (C) you

Quoted 5 lines
board/terasic/de10-nano/Makefile new file +4 -0
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	:= socfpga.o

[...]

Quoted 33 lines
include/configs/socfpga_de10_nano.h new file +25 -0
new file mode 100644
index 0000000..61a5066
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017, Intel Corporation
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+#ifndef __CONFIG_TERASIC_DE10_H__
+#define __CONFIG_TERASIC_DE10_H__
+
+#include <asm/arch/base_addr_ac5.h>
+
+/* U-Boot Commands */
+#define CONFIG_FAT_WRITE
+#define CONFIG_HW_WATCHDOG
+
+/* Memory configurations */
+#define PHYS_SDRAM_1_SIZE		0x40000000	/* 1GiB */
+
+/* Booting Linux */
+#define CONFIG_BOOTFILE		"zImage"
+#define CONFIG_LOADADDR		0x01000000
+#define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
+
+/* Ethernet on SoC (EMAC) */
+#if defined(CONFIG_CMD_NET)
+#define CONFIG_PHY_MICREL
Quoted 8 lines

include/configs/socfpga_de10_nano.h line 31

Quoted 6 lines
include/configs/socfpga_de10_nano.h new file +6 -0
+#define CONFIG_PHY_MICREL_KSZ9031
+#endif
+
+#define CONFIG_ENV_IS_IN_MMC
+
+#define CONFIG_BOOTCOMMAND "run fpga_cfg; run distro_bootcmd"

What is "fpga_cfg" ?

Quoted 2 lines

sorry, thanks for catching that. i am playing with something like the way distro boot searches for files, but for the fpga image.

Like the FPGA manager which is being upstreamed into Linux and which is the only sensible way to manage reprogramable hardware ? :) Also, if you used fitImage instead of that stupid zImage, you would be able to bundle all the components needed to boot system into a single consistent image ;-)

Signature · 2 lines
Best regards,
Marek Vasut
#4 lore raw

PATCH 1/1 arm: socfpga: Add support for the Terasic DE10-nano

Quoted 143 lines · Marek Vasut
Quoted 142 lines · Dalon Westergreen
Quoted 140 lines · Marek Vasut
Quoted 7 lines · Dalon Westergreen

Add support for the cyclone5 soc based Terasic DE10-nano.??The board is a second generation version of the DE0-nano-soc but has the a larger FPGA and hdmi support.

Looks pretty nice, minor nits below

[...]

Quoted 30 lines
arch/arm/mach- renamed from arch/arm/mach-socfpga/Kconfig +0 -0

socfpga/Kconfig
index e56b3db..6a776b5 100644

arch/arm/mach-socfpga/Kconfig +0 -0
@@ -85,6 +85,10 @@ config TARGET_SOCFPGA_TERASIC_DE1_SOC

? bool "Terasic DE1-SoC (Cyclone V)"
? select TARGET_SOCFPGA_CYCLONE5
?

arch/arm/mach-socfpga/Kconfig +4 -0
+config TARGET_SOCFPGA_TERASIC_DE10_NANO
+	bool "Terasic DE10-Nano (Cyclone V)"
+	select TARGET_SOCFPGA_CYCLONE5
+

?config TARGET_SOCFPGA_TERASIC_SOCKIT
? bool "Terasic SoCkit (Cyclone V)"
? select TARGET_SOCFPGA_CYCLONE5

arch/arm/mach-socfpga/Kconfig +0 -0
@@ -96,6 +100,7 @@ config SYS_BOARD

? default "cyclone5-socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK
? default "de0-nano-soc" if TARGET_SOCFPGA_TERASIC_DE0_NANO
? default "de1-soc" if TARGET_SOCFPGA_TERASIC_DE1_SOC

arch/arm/mach-socfpga/Kconfig +1 -0
+	default "de10-nano" if TARGET_SOCFPGA_TERASIC_DE10_NANO

? default "is1" if TARGET_SOCFPGA_IS1
? default "mcvevk" if TARGET_SOCFPGA_DENX_MCVEVK
? default "sockit" if TARGET_SOCFPGA_TERASIC_SOCKIT

arch/arm/mach-socfpga/Kconfig +0 -0
@@ -112,6 +117,7 @@ config SYS_VENDOR

? default "terasic" if TARGET_SOCFPGA_TERASIC_DE0_NANO
? default "terasic" if TARGET_SOCFPGA_TERASIC_DE1_SOC
? default "terasic" if TARGET_SOCFPGA_TERASIC_SOCKIT

arch/arm/mach-socfpga/Kconfig config SYS_VENDOR · line 120

Quoted 1 line
arch/arm/mach-socfpga/Kconfig +1 -0
+	default "terasic" if TARGET_SOCFPGA_TERASIC_DE10_NANO

Keep the list sorted please.

Quoted 34 lines

?
?config SYS_SOC
? default "socfpga"

arch/arm/mach-socfpga/Kconfig +0 -0
@@ -121,6 +127,7 @@ config SYS_CONFIG_NAME

? default "socfpga_cyclone5_socdk" if
TARGET_SOCFPGA_CYCLONE5_SOCDK
? default "socfpga_de0_nano_soc" if
TARGET_SOCFPGA_TERASIC_DE0_NANO
? default "socfpga_de1_soc" if TARGET_SOCFPGA_TERASIC_DE1_SOC

arch/arm/mach-socfpga/Kconfig +1 -0
+	default "socfpga_de10_nano" if TARGET_SOCFPGA_TERASIC_DE10_NANO

? default "socfpga_is1" if TARGET_SOCFPGA_IS1
? default "socfpga_mcvevk" if TARGET_SOCFPGA_DENX_MCVEVK
? default "socfpga_sockit" if TARGET_SOCFPGA_TERASIC_SOCKIT

board/terasic/de10- renamed from board/terasic/de10-nano/MAINTAINERS +0 -0

nano/MAINTAINERS
new file mode 100644
index 0000000..f4dd0df

board/terasic/de10-nano/MAINTAINERS new file +5 -0
@@ -0,0 +1,5 @@
+DE10-NANO BOARD
+M:	Dalon Westergreen <[email protected]>
+S:	Maintained
+F:	include/configs/socfpga_de10_nano.h
+F:	configs/socfpga_de10_nano_defconfig
board/terasic/de10- renamed from board/terasic/de10-nano/Makefile +0 -0

nano/Makefile
new file mode 100644
index 0000000..86f9b78

board/terasic/de10-nano/Makefile line 4

Quoted 4 lines
board/terasic/de10-nano/Makefile new file +4 -0
@@ -0,0 +1,9 @@
+#
+# (C) Copyright 2001-2006
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+# (C) Copyright 2010, Thomas Chou <[email protected]>

Really ? Looks like a new file, so (C) you

Quoted 6 lines
board/terasic/de10-nano/Makefile new file +4 -0
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	:= socfpga.o

[...]

Quoted 30 lines
include/configs/socfpga_de10_nano.h new file +21 -0
new file mode 100644
index 0000000..61a5066
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017, Intel Corporation
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+#ifndef __CONFIG_TERASIC_DE10_H__
+#define __CONFIG_TERASIC_DE10_H__
+
+#include <asm/arch/base_addr_ac5.h>
+
+/* U-Boot Commands */
+#define CONFIG_FAT_WRITE
+#define CONFIG_HW_WATCHDOG
+
+/* Memory configurations */
+#define PHYS_SDRAM_1_SIZE		0x40000000	/* 1GiB */
+
+/* Booting Linux */
+#define CONFIG_BOOTFILE		"zImage"
+#define CONFIG_LOADADDR		0x01000000
+#define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR

include/configs/socfpga_de10_nano.h line 31

Quoted 10 lines
include/configs/socfpga_de10_nano.h new file +10 -0
+
+/* 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
+
+#define CONFIG_BOOTCOMMAND "run fpga_cfg; run distro_bootcmd"

What is "fpga_cfg" ?

Quoted 8 lines
Quoted 2 lines

sorry, thanks for catching that.??i am playing with something like the way distro boot searches for files, but for the fpga image.

Like the FPGA manager which is being upstreamed into Linux and which is the only sensible way to manage reprogramable hardware ? :) Also, if you used fitImage instead of that stupid zImage, you would be able to bundle all the components needed to boot system into a single consistent image ;-)

I know, that is my next step... :)

#5 lore raw

PATCH 1/1 arm: socfpga: Add support for the Terasic DE10-nano

Quoted 147 lines · Dalon Westergreen
Quoted 146 lines · Marek Vasut
Quoted 144 lines · Dalon Westergreen
Quoted 132 lines · Marek Vasut
Quoted 7 lines · Dalon Westergreen

Add support for the cyclone5 soc based Terasic DE10-nano. The board is a second generation version of the DE0-nano-soc but has the a larger FPGA and hdmi support.

Looks pretty nice, minor nits below

[...]

Quoted 27 lines
arch/arm/mach- renamed from arch/arm/mach-socfpga/Kconfig +0 -0

socfpga/Kconfig
index e56b3db..6a776b5 100644

arch/arm/mach-socfpga/Kconfig +5 -0
@@ -85,6 +85,10 @@ config TARGET_SOCFPGA_TERASIC_DE1_SOC
 	bool "Terasic DE1-SoC (Cyclone V)"
 	select TARGET_SOCFPGA_CYCLONE5
 
+config TARGET_SOCFPGA_TERASIC_DE10_NANO
+	bool "Terasic DE10-Nano (Cyclone V)"
+	select TARGET_SOCFPGA_CYCLONE5
+
 config TARGET_SOCFPGA_TERASIC_SOCKIT
 	bool "Terasic SoCkit (Cyclone V)"
 	select TARGET_SOCFPGA_CYCLONE5
@@ -96,6 +100,7 @@ config SYS_BOARD
 	default "cyclone5-socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK
 	default "de0-nano-soc" if TARGET_SOCFPGA_TERASIC_DE0_NANO
 	default "de1-soc" if TARGET_SOCFPGA_TERASIC_DE1_SOC
+	default "de10-nano" if TARGET_SOCFPGA_TERASIC_DE10_NANO
 	default "is1" if TARGET_SOCFPGA_IS1
 	default "mcvevk" if TARGET_SOCFPGA_DENX_MCVEVK
 	default "sockit" if TARGET_SOCFPGA_TERASIC_SOCKIT

arch/arm/mach-socfpga/Kconfig config SYS_VENDOR · line 120

Quoted 4 lines
arch/arm/mach-socfpga/Kconfig +1 -0
@@ -112,6 +117,7 @@ config SYS_VENDOR
 	default "terasic" if TARGET_SOCFPGA_TERASIC_DE0_NANO
 	default "terasic" if TARGET_SOCFPGA_TERASIC_DE1_SOC
 	default "terasic" if TARGET_SOCFPGA_TERASIC_SOCKIT
+	default "terasic" if TARGET_SOCFPGA_TERASIC_DE10_NANO

Keep the list sorted please.

Quoted 34 lines
arch/arm/mach-socfpga/Kconfig +0 -0
 config SYS_SOC
 	default "socfpga"
@@ -121,6 +127,7 @@ config SYS_CONFIG_NAME
 	default "socfpga_cyclone5_socdk" if

TARGET_SOCFPGA_CYCLONE5_SOCDK
default "socfpga_de0_nano_soc" if
TARGET_SOCFPGA_TERASIC_DE0_NANO

arch/arm/mach-socfpga/Kconfig +1 -0
 	default "socfpga_de1_soc" if TARGET_SOCFPGA_TERASIC_DE1_SOC
+	default "socfpga_de10_nano" if TARGET_SOCFPGA_TERASIC_DE10_NANO
 	default "socfpga_is1" if TARGET_SOCFPGA_IS1
 	default "socfpga_mcvevk" if TARGET_SOCFPGA_DENX_MCVEVK
 	default "socfpga_sockit" if TARGET_SOCFPGA_TERASIC_SOCKIT
board/terasic/de10- renamed from board/terasic/de10-nano/MAINTAINERS +0 -0

nano/MAINTAINERS
new file mode 100644
index 0000000..f4dd0df

board/terasic/de10-nano/MAINTAINERS new file +5 -0
@@ -0,0 +1,5 @@
+DE10-NANO BOARD
+M:	Dalon Westergreen <[email protected]>
+S:	Maintained
+F:	include/configs/socfpga_de10_nano.h
+F:	configs/socfpga_de10_nano_defconfig
board/terasic/de10- renamed from board/terasic/de10-nano/Makefile +0 -0

nano/Makefile
new file mode 100644
index 0000000..86f9b78

board/terasic/de10-nano/Makefile line 4

Quoted 4 lines
board/terasic/de10-nano/Makefile new file +4 -0
@@ -0,0 +1,9 @@
+#
+# (C) Copyright 2001-2006
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+# (C) Copyright 2010, Thomas Chou <[email protected]>

Really ? Looks like a new file, so (C) you

Quoted 6 lines
board/terasic/de10-nano/Makefile new file +4 -0
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	:= socfpga.o

[...]

Quoted 34 lines
include/configs/socfpga_de10_nano.h new file +25 -0
new file mode 100644
index 0000000..61a5066
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017, Intel Corporation
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+#ifndef __CONFIG_TERASIC_DE10_H__
+#define __CONFIG_TERASIC_DE10_H__
+
+#include <asm/arch/base_addr_ac5.h>
+
+/* U-Boot Commands */
+#define CONFIG_FAT_WRITE
+#define CONFIG_HW_WATCHDOG
+
+/* Memory configurations */
+#define PHYS_SDRAM_1_SIZE		0x40000000	/* 1GiB */
+
+/* Booting Linux */
+#define CONFIG_BOOTFILE		"zImage"
+#define CONFIG_LOADADDR		0x01000000
+#define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
+
+/* Ethernet on SoC (EMAC) */
+#if defined(CONFIG_CMD_NET)
+#define CONFIG_PHY_MICREL
Quoted 8 lines

include/configs/socfpga_de10_nano.h line 31

Quoted 6 lines
include/configs/socfpga_de10_nano.h new file +6 -0
+#define CONFIG_PHY_MICREL_KSZ9031
+#endif
+
+#define CONFIG_ENV_IS_IN_MMC
+
+#define CONFIG_BOOTCOMMAND "run fpga_cfg; run distro_bootcmd"

What is "fpga_cfg" ?

sorry, thanks for catching that. i am playing with something like the way distro boot searches for files, but for the fpga image.

Quoted 7 lines
Quoted 5 lines

Like the FPGA manager which is being upstreamed into Linux and which is the only sensible way to manage reprogramable hardware ? :) Also, if you used fitImage instead of that stupid zImage, you would be able to bundle all the components needed to boot system into a single consistent image ;-)

I know, that is my next step... :)

Cool :)

Signature · 2 lines
Best regards,
Marek Vasut