| Message ID | 1441051025-2287-1-git-send-email-dinguyen@opensource.altera.com |
|---|---|
| State | Superseded |
| Delegated to: | Marek Vasut |
| Headers | show |
On Monday, August 31, 2015 at 09:57:05 PM, dinguyen@opensource.altera.com wrote: > From: Dinh Nguyen <dinguyen@opensource.altera.com> > > Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is a CycloneV > based board. The board can boot from SD/MMC. Ethernet is a bit different > because it has a KSZ9031 PHY, so for now, ethernet doesn't quite work yet, > as a few patches are needed to support the PHY. I thought we did support the KSZ9031 PHY. What's the problem ? > Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> > --- > Hi Marek, > > This patch is based on your u-boot-socfpga/wip/boards branch. OK, that makes sense. > Thanks, > Dinh > --- > arch/arm/dts/Makefile | 1 + > arch/arm/dts/socfpga_cyclone5_de0_sockit.dts | 61 +++ > arch/arm/mach-socfpga/Kconfig | 7 + > board/terasic/de0/MAINTAINERS | 5 + > board/terasic/de0/Makefile | 9 + I think it might be clearer to rename it to de0-nano-soc, what do you think ? What's the difference between de0-nano-soc and atlas btw ? [...] > diff --git a/configs/socfpga_de0_defconfig b/configs/socfpga_de0_defconfig > new file mode 100644 > index 0000000..000f322 > --- /dev/null > +++ b/configs/socfpga_de0_defconfig > @@ -0,0 +1,21 @@ > +CONFIG_ARM=y > +CONFIG_ARCH_SOCFPGA=y > +CONFIG_TARGET_SOCFPGA_CYCLONE5=y > +CONFIG_TARGET_SOCFPGA_TERASIC_DE0=y > +CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_sockit" > +CONFIG_SPL=y > +# CONFIG_CMD_IMLS is not set > +# CONFIG_CMD_FLASH is not set > +CONFIG_OF_CONTROL=y > +CONFIG_DM_ETH=y > +CONFIG_NETDEVICES=y > +CONFIG_ETH_DESIGNWARE=y > +CONFIG_DM_GPIO=y > +CONFIG_DWAPB_GPIO=y > +CONFIG_SPL_DM=y > +CONFIG_SPL_MMC_SUPPORT=y > +CONFIG_DM_SEQ_ALIAS=y I think you don't need the DM_SEQ_ALIAS, it's needed only for QSPI to enforce the SPI NOR ordering. > +CONFIG_SPL_SIMPLE_BUS=y > +CONFIG_SPL_STACK_R=y > +CONFIG_SPL_STACK_R_ADDR=0x00800000 > +CONFIG_SYS_MALLOC_F_LEN=0x2000 > diff --git a/include/configs/socfpga_de0.h b/include/configs/socfpga_de0.h > new file mode 100644 > index 0000000..47e18ba > --- /dev/null > +++ b/include/configs/socfpga_de0.h > @@ -0,0 +1,88 @@ > +/* > + * 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/socfpga_base_addrs.h> > + > +/* U-Boot Commands */ > +#define CONFIG_SYS_NO_FLASH > +#define CONFIG_DOS_PARTITION > +#define CONFIG_FAT_WRITE > +#define CONFIG_HW_WATCHDOG > + > +#define CONFIG_CMD_ASKENV > +#define CONFIG_CMD_BOOTZ > +#define CONFIG_CMD_CACHE > +#define CONFIG_CMD_DFU > +#define CONFIG_CMD_DHCP > +#define CONFIG_CMD_EXT4 > +#define CONFIG_CMD_EXT4_WRITE > +#define CONFIG_CMD_FAT > +#define CONFIG_CMD_FS_GENERIC > +#define CONFIG_CMD_GPIO > +#define CONFIG_CMD_GREPENV > +#define CONFIG_CMD_MII > +#define CONFIG_CMD_MMC > +#define CONFIG_CMD_PING > +#define CONFIG_CMD_USB > +#define CONFIG_CMD_USB_MASS_STORAGE > + > +/* Memory configurations */ > +#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ > + > +/* Booting Linux */ > +#define CONFIG_BOOTDELAY 3 > +#define CONFIG_BOOTFILE "fitImage" > +#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) > +#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET > +#define CONFIG_BOOTCOMMAND "run ramboot" > +#else > +#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" > +#endif > +#define CONFIG_LOADADDR 0x01000000 > +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR > + > +/* Ethernet on SoC (EMAC) */ > +#if defined(CONFIG_CMD_NET) > + > +/* PHY */ > +#define CONFIG_PHY_MICREL > +#define CONFIG_PHY_MICREL_KSZ9031 > + > +#endif > + > +/* USB */ > +#ifdef CONFIG_CMD_USB > +#define CONFIG_USB_DWC2_REG_ADDR SOCFPGA_USB1_ADDRESS > +#endif > +#define CONFIG_G_DNL_MANUFACTURER "Terasic" > + > +/* Extra Environment */ > +#define CONFIG_HOSTNAME socfpga_cyclone5 socfpga_d0_nano_soc might be better ;-) > + > +#define CONFIG_EXTRA_ENV_SETTINGS \ > + "verify=n\0" \ What's this "verify" variable for ? > + "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ > + "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ > + "bootm ${loadaddr} - ${fdt_addr}\0" \ > + "bootimage=zImage\0" \ > + "fdt_addr=100\0" \ > + "fdtimage=socfpga.dtb\0" \ > + "fsloadcmd=ext2load\0" \ > + "bootm ${loadaddr} - ${fdt_addr}\0" \ > + "mmcroot=/dev/mmcblk0p2\0" \ > + "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ > + " root=${mmcroot} rw rootwait;" \ > + "bootz ${loadaddr} - ${fdt_addr}\0" \ > + "mmcload=mmc rescan;" \ > + "load mmc 0:1 ${loadaddr} ${bootimage};" \ > + "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ > + > +/* The rest of the configuration is shared */ > +#include <configs/socfpga_common.h> > + > +#endif /* __CONFIG_TERASIC_DE0_H__ */
On Mon, 2015-08-31 at 14:57 -0500, dinguyen@opensource.altera.com wrote: > From: Dinh Nguyen <dinguyen@opensource.altera.com> > > Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is a CycloneV > based board. The board can boot from SD/MMC. Ethernet is a bit different > because it has a KSZ9031 PHY, so for now, ethernet doesn't quite work yet, > as a few patches are needed to support the PHY. > > Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> > --- > Hi Marek, > > This patch is based on your u-boot-socfpga/wip/boards branch. > > Thanks, > Dinh > --- > arch/arm/dts/Makefile | 1 + > arch/arm/dts/socfpga_cyclone5_de0_sockit.dts | 61 +++ > arch/arm/mach-socfpga/Kconfig | 7 + > board/terasic/de0/MAINTAINERS | 5 + > board/terasic/de0/Makefile | 9 + > board/terasic/de0/qts/iocsr_config.h | 658 +++++++++++++++++++++++++++ > board/terasic/de0/qts/pinmux_config.h | 220 +++++++++ > board/terasic/de0/qts/pll_config.h | 85 ++++ > board/terasic/de0/qts/sdram_config.h | 342 ++++++++++++++ > board/terasic/de0/socfpga.c | 22 + > configs/socfpga_de0_defconfig | 21 + > include/configs/socfpga_de0.h | 88 ++++ > 12 files changed, 1519 insertions(+) > create mode 100644 arch/arm/dts/socfpga_cyclone5_de0_sockit.dts > create mode 100644 board/terasic/de0/MAINTAINERS > create mode 100644 board/terasic/de0/Makefile > create mode 100644 board/terasic/de0/qts/iocsr_config.h > create mode 100644 board/terasic/de0/qts/pinmux_config.h > create mode 100644 board/terasic/de0/qts/pll_config.h > create mode 100644 board/terasic/de0/qts/sdram_config.h > create mode 100644 board/terasic/de0/socfpga.c > create mode 100644 configs/socfpga_de0_defconfig > create mode 100644 include/configs/socfpga_de0.h > > diff --git a/include/configs/socfpga_de0.h b/include/configs/socfpga_de0.h > new file mode 100644 > index 0000000..47e18ba > --- /dev/null > +++ b/include/configs/socfpga_de0.h > @@ -0,0 +1,88 @@ > +/* > + * 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/socfpga_base_addrs.h> > + > +/* U-Boot Commands */ > +#define CONFIG_SYS_NO_FLASH > +#define CONFIG_DOS_PARTITION > +#define CONFIG_FAT_WRITE > +#define CONFIG_HW_WATCHDOG > + > +#define CONFIG_CMD_ASKENV > +#define CONFIG_CMD_BOOTZ > +#define CONFIG_CMD_CACHE > +#define CONFIG_CMD_DFU > +#define CONFIG_CMD_DHCP > +#define CONFIG_CMD_EXT4 > +#define CONFIG_CMD_EXT4_WRITE > +#define CONFIG_CMD_FAT > +#define CONFIG_CMD_FS_GENERIC > +#define CONFIG_CMD_GPIO > +#define CONFIG_CMD_GREPENV > +#define CONFIG_CMD_MII > +#define CONFIG_CMD_MMC > +#define CONFIG_CMD_PING > +#define CONFIG_CMD_USB > +#define CONFIG_CMD_USB_MASS_STORAGE > + > +/* Memory configurations */ > +#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ > + > +/* Booting Linux */ > +#define CONFIG_BOOTDELAY 3 > +#define CONFIG_BOOTFILE "fitImage" Wonder this should be zImage as the mmcload still using zImage? Thanks Chin Liang > +#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) > +#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET > +#define CONFIG_BOOTCOMMAND "run ramboot" > +#else > +#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" > +#endif > +#define CONFIG_LOADADDR 0x01000000 > +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR > + > +/* Ethernet on SoC (EMAC) */ > +#if defined(CONFIG_CMD_NET) > + > +/* PHY */ > +#define CONFIG_PHY_MICREL > +#define CONFIG_PHY_MICREL_KSZ9031 > + > +#endif > + > +/* USB */ > +#ifdef CONFIG_CMD_USB > +#define CONFIG_USB_DWC2_REG_ADDR SOCFPGA_USB1_ADDRESS > +#endif > +#define CONFIG_G_DNL_MANUFACTURER "Terasic" > + > +/* Extra Environment */ > +#define CONFIG_HOSTNAME socfpga_cyclone5 > + > +#define CONFIG_EXTRA_ENV_SETTINGS \ > + "verify=n\0" \ > + "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ > + "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ > + "bootm ${loadaddr} - ${fdt_addr}\0" \ > + "bootimage=zImage\0" \ > + "fdt_addr=100\0" \ > + "fdtimage=socfpga.dtb\0" \ > + "fsloadcmd=ext2load\0" \ > + "bootm ${loadaddr} - ${fdt_addr}\0" \ > + "mmcroot=/dev/mmcblk0p2\0" \ > + "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ > + " root=${mmcroot} rw rootwait;" \ > + "bootz ${loadaddr} - ${fdt_addr}\0" \ > + "mmcload=mmc rescan;" \ > + "load mmc 0:1 ${loadaddr} ${bootimage};" \ > + "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ > + > +/* The rest of the configuration is shared */ > +#include <configs/socfpga_common.h> > + > +#endif /* __CONFIG_TERASIC_DE0_H__ */
On Mon, 2015-08-31 at 17:27 +0000, marex@denx.de wrote: > On Monday, August 31, 2015 at 09:57:05 PM, dinguyen@opensource.altera.com wrote: > > From: Dinh Nguyen <dinguyen@opensource.altera.com> > > > > Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is a CycloneV > > based board. The board can boot from SD/MMC. Ethernet is a bit different > > because it has a KSZ9031 PHY, so for now, ethernet doesn't quite work yet, > > as a few patches are needed to support the PHY. > > I thought we did support the KSZ9031 PHY. What's the problem ? > > > Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> > > --- > > Hi Marek, > > > > This patch is based on your u-boot-socfpga/wip/boards branch. > > OK, that makes sense. > > > Thanks, > > Dinh > > --- > > arch/arm/dts/Makefile | 1 + > > arch/arm/dts/socfpga_cyclone5_de0_sockit.dts | 61 +++ > > arch/arm/mach-socfpga/Kconfig | 7 + > > board/terasic/de0/MAINTAINERS | 5 + > > board/terasic/de0/Makefile | 9 + > > I think it might be clearer to rename it to de0-nano-soc, what do you think ? > What's the difference between de0-nano-soc and atlas btw ? > > [...] > > > diff --git a/configs/socfpga_de0_defconfig b/configs/socfpga_de0_defconfig > > new file mode 100644 > > index 0000000..000f322 > > --- /dev/null > > +++ b/configs/socfpga_de0_defconfig > > @@ -0,0 +1,21 @@ > > +CONFIG_ARM=y > > +CONFIG_ARCH_SOCFPGA=y > > +CONFIG_TARGET_SOCFPGA_CYCLONE5=y > > +CONFIG_TARGET_SOCFPGA_TERASIC_DE0=y > > +CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_sockit" > > +CONFIG_SPL=y > > +# CONFIG_CMD_IMLS is not set > > +# CONFIG_CMD_FLASH is not set > > +CONFIG_OF_CONTROL=y > > +CONFIG_DM_ETH=y > > +CONFIG_NETDEVICES=y > > +CONFIG_ETH_DESIGNWARE=y > > +CONFIG_DM_GPIO=y > > +CONFIG_DWAPB_GPIO=y > > +CONFIG_SPL_DM=y > > +CONFIG_SPL_MMC_SUPPORT=y > > +CONFIG_DM_SEQ_ALIAS=y > > I think you don't need the DM_SEQ_ALIAS, it's needed only for QSPI > to enforce the SPI NOR ordering. > > > +CONFIG_SPL_SIMPLE_BUS=y > > +CONFIG_SPL_STACK_R=y > > +CONFIG_SPL_STACK_R_ADDR=0x00800000 > > +CONFIG_SYS_MALLOC_F_LEN=0x2000 > > diff --git a/include/configs/socfpga_de0.h b/include/configs/socfpga_de0.h > > new file mode 100644 > > index 0000000..47e18ba > > --- /dev/null > > +++ b/include/configs/socfpga_de0.h > > @@ -0,0 +1,88 @@ > > +/* > > + * 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/socfpga_base_addrs.h> > > + > > +/* U-Boot Commands */ > > +#define CONFIG_SYS_NO_FLASH > > +#define CONFIG_DOS_PARTITION > > +#define CONFIG_FAT_WRITE > > +#define CONFIG_HW_WATCHDOG > > + > > +#define CONFIG_CMD_ASKENV > > +#define CONFIG_CMD_BOOTZ > > +#define CONFIG_CMD_CACHE > > +#define CONFIG_CMD_DFU > > +#define CONFIG_CMD_DHCP > > +#define CONFIG_CMD_EXT4 > > +#define CONFIG_CMD_EXT4_WRITE > > +#define CONFIG_CMD_FAT > > +#define CONFIG_CMD_FS_GENERIC > > +#define CONFIG_CMD_GPIO > > +#define CONFIG_CMD_GREPENV > > +#define CONFIG_CMD_MII > > +#define CONFIG_CMD_MMC > > +#define CONFIG_CMD_PING > > +#define CONFIG_CMD_USB > > +#define CONFIG_CMD_USB_MASS_STORAGE > > + > > +/* Memory configurations */ > > +#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ > > + > > +/* Booting Linux */ > > +#define CONFIG_BOOTDELAY 3 > > +#define CONFIG_BOOTFILE "fitImage" > > +#define CONFIG_BOOTARGS "console=ttyS0," > __stringify(CONFIG_BAUDRATE) > > +#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET > > +#define CONFIG_BOOTCOMMAND "run ramboot" > > +#else > > +#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" > > +#endif > > +#define CONFIG_LOADADDR 0x01000000 > > +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR > > + > > +/* Ethernet on SoC (EMAC) */ > > +#if defined(CONFIG_CMD_NET) > > + > > +/* PHY */ > > +#define CONFIG_PHY_MICREL > > +#define CONFIG_PHY_MICREL_KSZ9031 > > + > > +#endif > > + > > +/* USB */ > > +#ifdef CONFIG_CMD_USB > > +#define CONFIG_USB_DWC2_REG_ADDR SOCFPGA_USB1_ADDRESS > > +#endif > > +#define CONFIG_G_DNL_MANUFACTURER "Terasic" > > + > > +/* Extra Environment */ > > +#define CONFIG_HOSTNAME socfpga_cyclone5 > > socfpga_d0_nano_soc might be better ;-) > > > + > > +#define CONFIG_EXTRA_ENV_SETTINGS \ > > + "verify=n\0" \ > > What's this "verify" variable for ? This is to enable the checksum of next boot image. But I suspect it should be no for zImage as decompression engine will check that? Thanks Chin Liang > > > + "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ > > + "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ > > + "bootm ${loadaddr} - ${fdt_addr}\0" \ > > + "bootimage=zImage\0" \ > > + "fdt_addr=100\0" \ > > + "fdtimage=socfpga.dtb\0" \ > > + "fsloadcmd=ext2load\0" \ > > + "bootm ${loadaddr} - ${fdt_addr}\0" \ > > + "mmcroot=/dev/mmcblk0p2\0" \ > > + "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ > > + " root=${mmcroot} rw rootwait;" \ > > + "bootz ${loadaddr} - ${fdt_addr}\0" \ > > + "mmcload=mmc rescan;" \ > > + "load mmc 0:1 ${loadaddr} ${bootimage};" \ > > + "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ > > + > > +/* The rest of the configuration is shared */ > > +#include <configs/socfpga_common.h> > > + > > +#endif /* __CONFIG_TERASIC_DE0_H__ */
On Tue 2015-09-01 00:23:49, Marek Vasut wrote: > On Monday, August 31, 2015 at 09:57:05 PM, dinguyen@opensource.altera.com wrote: > > From: Dinh Nguyen <dinguyen@opensource.altera.com> > > > > Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is a CycloneV > > based board. The board can boot from SD/MMC. Ethernet is a bit different > > because it has a KSZ9031 PHY, so for now, ethernet doesn't quite work yet, > > as a few patches are needed to support the PHY. > > I thought we did support the KSZ9031 PHY. What's the problem ? > > > Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> > > --- > > Hi Marek, > > > > This patch is based on your u-boot-socfpga/wip/boards branch. > > OK, that makes sense. > > > Thanks, > > Dinh > > --- > > arch/arm/dts/Makefile | 1 + > > arch/arm/dts/socfpga_cyclone5_de0_sockit.dts | 61 +++ > > arch/arm/mach-socfpga/Kconfig | 7 + > > board/terasic/de0/MAINTAINERS | 5 + > > board/terasic/de0/Makefile | 9 + > > I think it might be clearer to rename it to de0-nano-soc, what do you think ? > What's the difference between de0-nano-soc and atlas btw ? Unless they are going to make "de0-mega".. I'd say "de0" is clean enough. > > diff --git a/configs/socfpga_de0_defconfig b/configs/socfpga_de0_defconfig ...and matches defconfig name > > +++ b/include/configs/socfpga_de0.h ...and header file, etc. > > +/* Extra Environment */ > > +#define CONFIG_HOSTNAME socfpga_cyclone5 > > socfpga_d0_nano_soc might be better ;-) socfpga_de0 might be better. No need to have kilometer long hostnames :-). Pavel
On Tuesday, September 01, 2015 at 06:54:14 AM, Chin Liang See wrote: > On Mon, 2015-08-31 at 14:57 -0500, dinguyen@opensource.altera.com wrote: > > From: Dinh Nguyen <dinguyen@opensource.altera.com> > > > > Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is a CycloneV > > based board. The board can boot from SD/MMC. Ethernet is a bit different > > because it has a KSZ9031 PHY, so for now, ethernet doesn't quite work > > yet, as a few patches are needed to support the PHY. > > > > Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> > > --- > > Hi Marek, > > > > This patch is based on your u-boot-socfpga/wip/boards branch. > > > > Thanks, > > Dinh > > --- > > > > arch/arm/dts/Makefile | 1 + > > arch/arm/dts/socfpga_cyclone5_de0_sockit.dts | 61 +++ > > arch/arm/mach-socfpga/Kconfig | 7 + > > board/terasic/de0/MAINTAINERS | 5 + > > board/terasic/de0/Makefile | 9 + > > board/terasic/de0/qts/iocsr_config.h | 658 > > +++++++++++++++++++++++++++ board/terasic/de0/qts/pinmux_config.h > > | 220 +++++++++ > > board/terasic/de0/qts/pll_config.h | 85 ++++ > > board/terasic/de0/qts/sdram_config.h | 342 ++++++++++++++ > > board/terasic/de0/socfpga.c | 22 + > > configs/socfpga_de0_defconfig | 21 + > > include/configs/socfpga_de0.h | 88 ++++ > > 12 files changed, 1519 insertions(+) > > create mode 100644 arch/arm/dts/socfpga_cyclone5_de0_sockit.dts > > create mode 100644 board/terasic/de0/MAINTAINERS > > create mode 100644 board/terasic/de0/Makefile > > create mode 100644 board/terasic/de0/qts/iocsr_config.h > > create mode 100644 board/terasic/de0/qts/pinmux_config.h > > create mode 100644 board/terasic/de0/qts/pll_config.h > > create mode 100644 board/terasic/de0/qts/sdram_config.h > > create mode 100644 board/terasic/de0/socfpga.c > > create mode 100644 configs/socfpga_de0_defconfig > > create mode 100644 include/configs/socfpga_de0.h > > > > diff --git a/include/configs/socfpga_de0.h > > b/include/configs/socfpga_de0.h new file mode 100644 > > index 0000000..47e18ba > > --- /dev/null > > +++ b/include/configs/socfpga_de0.h > > @@ -0,0 +1,88 @@ > > +/* > > + * 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/socfpga_base_addrs.h> > > + > > +/* U-Boot Commands */ > > +#define CONFIG_SYS_NO_FLASH > > +#define CONFIG_DOS_PARTITION > > +#define CONFIG_FAT_WRITE > > +#define CONFIG_HW_WATCHDOG > > + > > +#define CONFIG_CMD_ASKENV > > +#define CONFIG_CMD_BOOTZ > > +#define CONFIG_CMD_CACHE > > +#define CONFIG_CMD_DFU > > +#define CONFIG_CMD_DHCP > > +#define CONFIG_CMD_EXT4 > > +#define CONFIG_CMD_EXT4_WRITE > > +#define CONFIG_CMD_FAT > > +#define CONFIG_CMD_FS_GENERIC > > +#define CONFIG_CMD_GPIO > > +#define CONFIG_CMD_GREPENV > > +#define CONFIG_CMD_MII > > +#define CONFIG_CMD_MMC > > +#define CONFIG_CMD_PING > > +#define CONFIG_CMD_USB > > +#define CONFIG_CMD_USB_MASS_STORAGE > > + > > +/* Memory configurations */ > > +#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ > > + > > +/* Booting Linux */ > > +#define CONFIG_BOOTDELAY 3 > > +#define CONFIG_BOOTFILE "fitImage" > > Wonder this should be zImage as the mmcload still using zImage? Or maybe the mmcload should be fixed instead ; fitImage is preferred.
On Tuesday, September 01, 2015 at 06:56:30 AM, Chin Liang See wrote: > On Mon, 2015-08-31 at 17:27 +0000, marex@denx.de wrote: > > On Monday, August 31, 2015 at 09:57:05 PM, dinguyen@opensource.altera.com wrote: > > > From: Dinh Nguyen <dinguyen@opensource.altera.com> > > > > > > Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is a CycloneV > > > based board. The board can boot from SD/MMC. Ethernet is a bit > > > different because it has a KSZ9031 PHY, so for now, ethernet doesn't > > > quite work yet, as a few patches are needed to support the PHY. > > > > I thought we did support the KSZ9031 PHY. What's the problem ? > > > > > Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> > > > --- > > > Hi Marek, > > > > > > This patch is based on your u-boot-socfpga/wip/boards branch. > > > > OK, that makes sense. > > > > > Thanks, > > > Dinh > > > --- > > > > > > arch/arm/dts/Makefile | 1 + > > > arch/arm/dts/socfpga_cyclone5_de0_sockit.dts | 61 +++ > > > arch/arm/mach-socfpga/Kconfig | 7 + > > > board/terasic/de0/MAINTAINERS | 5 + > > > board/terasic/de0/Makefile | 9 + > > > > I think it might be clearer to rename it to de0-nano-soc, what do you > > think ? What's the difference between de0-nano-soc and atlas btw ? > > > > [...] > > > > > diff --git a/configs/socfpga_de0_defconfig > > > b/configs/socfpga_de0_defconfig new file mode 100644 > > > index 0000000..000f322 > > > --- /dev/null > > > +++ b/configs/socfpga_de0_defconfig > > > @@ -0,0 +1,21 @@ > > > +CONFIG_ARM=y > > > +CONFIG_ARCH_SOCFPGA=y > > > +CONFIG_TARGET_SOCFPGA_CYCLONE5=y > > > +CONFIG_TARGET_SOCFPGA_TERASIC_DE0=y > > > +CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_sockit" > > > +CONFIG_SPL=y > > > +# CONFIG_CMD_IMLS is not set > > > +# CONFIG_CMD_FLASH is not set > > > +CONFIG_OF_CONTROL=y > > > +CONFIG_DM_ETH=y > > > +CONFIG_NETDEVICES=y > > > +CONFIG_ETH_DESIGNWARE=y > > > +CONFIG_DM_GPIO=y > > > +CONFIG_DWAPB_GPIO=y > > > +CONFIG_SPL_DM=y > > > +CONFIG_SPL_MMC_SUPPORT=y > > > +CONFIG_DM_SEQ_ALIAS=y > > > > I think you don't need the DM_SEQ_ALIAS, it's needed only for QSPI > > to enforce the SPI NOR ordering. > > > > > +CONFIG_SPL_SIMPLE_BUS=y > > > +CONFIG_SPL_STACK_R=y > > > +CONFIG_SPL_STACK_R_ADDR=0x00800000 > > > +CONFIG_SYS_MALLOC_F_LEN=0x2000 > > > diff --git a/include/configs/socfpga_de0.h > > > b/include/configs/socfpga_de0.h new file mode 100644 > > > index 0000000..47e18ba > > > --- /dev/null > > > +++ b/include/configs/socfpga_de0.h > > > @@ -0,0 +1,88 @@ > > > +/* > > > + * 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/socfpga_base_addrs.h> > > > + > > > +/* U-Boot Commands */ > > > +#define CONFIG_SYS_NO_FLASH > > > +#define CONFIG_DOS_PARTITION > > > +#define CONFIG_FAT_WRITE > > > +#define CONFIG_HW_WATCHDOG > > > + > > > +#define CONFIG_CMD_ASKENV > > > +#define CONFIG_CMD_BOOTZ > > > +#define CONFIG_CMD_CACHE > > > +#define CONFIG_CMD_DFU > > > +#define CONFIG_CMD_DHCP > > > +#define CONFIG_CMD_EXT4 > > > +#define CONFIG_CMD_EXT4_WRITE > > > +#define CONFIG_CMD_FAT > > > +#define CONFIG_CMD_FS_GENERIC > > > +#define CONFIG_CMD_GPIO > > > +#define CONFIG_CMD_GREPENV > > > +#define CONFIG_CMD_MII > > > +#define CONFIG_CMD_MMC > > > +#define CONFIG_CMD_PING > > > +#define CONFIG_CMD_USB > > > +#define CONFIG_CMD_USB_MASS_STORAGE > > > + > > > +/* Memory configurations */ > > > +#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ > > > + > > > +/* Booting Linux */ > > > +#define CONFIG_BOOTDELAY 3 > > > +#define CONFIG_BOOTFILE "fitImage" > > > +#define CONFIG_BOOTARGS "console=ttyS0," > > > > __stringify(CONFIG_BAUDRATE) > > > > > +#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET > > > +#define CONFIG_BOOTCOMMAND "run ramboot" > > > +#else > > > +#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" > > > +#endif > > > +#define CONFIG_LOADADDR 0x01000000 > > > +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR > > > + > > > +/* Ethernet on SoC (EMAC) */ > > > +#if defined(CONFIG_CMD_NET) > > > + > > > +/* PHY */ > > > +#define CONFIG_PHY_MICREL > > > +#define CONFIG_PHY_MICREL_KSZ9031 > > > + > > > +#endif > > > + > > > +/* USB */ > > > +#ifdef CONFIG_CMD_USB > > > +#define CONFIG_USB_DWC2_REG_ADDR SOCFPGA_USB1_ADDRESS > > > +#endif > > > +#define CONFIG_G_DNL_MANUFACTURER "Terasic" > > > + > > > +/* Extra Environment */ > > > +#define CONFIG_HOSTNAME socfpga_cyclone5 > > > > socfpga_d0_nano_soc might be better ;-) > > > > > + > > > +#define CONFIG_EXTRA_ENV_SETTINGS \ > > > + "verify=n\0" \ > > > > What's this "verify" variable for ? > > This is to enable the checksum of next boot image. But I suspect it > should be no for zImage as decompression engine will check that? There is no checksum involved when booting zImage (which is the reason zImage is not the preferred image format).
On Tuesday, September 01, 2015 at 09:38:23 AM, Pavel Machek wrote: > On Tue 2015-09-01 00:23:49, Marek Vasut wrote: > > On Monday, August 31, 2015 at 09:57:05 PM, dinguyen@opensource.altera.com wrote: > > > From: Dinh Nguyen <dinguyen@opensource.altera.com> > > > > > > Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is a CycloneV > > > based board. The board can boot from SD/MMC. Ethernet is a bit > > > different because it has a KSZ9031 PHY, so for now, ethernet doesn't > > > quite work yet, as a few patches are needed to support the PHY. > > > > I thought we did support the KSZ9031 PHY. What's the problem ? > > > > > Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> > > > --- > > > Hi Marek, > > > > > > This patch is based on your u-boot-socfpga/wip/boards branch. > > > > OK, that makes sense. > > > > > Thanks, > > > Dinh > > > --- > > > > > > arch/arm/dts/Makefile | 1 + > > > arch/arm/dts/socfpga_cyclone5_de0_sockit.dts | 61 +++ > > > arch/arm/mach-socfpga/Kconfig | 7 + > > > board/terasic/de0/MAINTAINERS | 5 + > > > board/terasic/de0/Makefile | 9 + > > > > I think it might be clearer to rename it to de0-nano-soc, what do you > > think ? What's the difference between de0-nano-soc and atlas btw ? > > Unless they are going to make "de0-mega".. I'd say "de0" is clean > enough. They already make de0-cv , which is cycloneV SoC based, so de0 is not clear enough, no way. They also make de0-nano , which is cycloneIV based (without soc). > > > diff --git a/configs/socfpga_de0_defconfig > > > b/configs/socfpga_de0_defconfig > > ...and matches defconfig name So rename the defconfig. > > > +++ b/include/configs/socfpga_de0.h > > ...and header file, etc. And header file. > > > +/* Extra Environment */ > > > +#define CONFIG_HOSTNAME socfpga_cyclone5 > > > > socfpga_d0_nano_soc might be better ;-) > > socfpga_de0 might be better. No need to have kilometer long hostnames See above ;-) Best regards, Marek Vasut
On Tue, 2015-09-01 at 10:30 +0200, marex@denx.de wrote: > On Tuesday, September 01, 2015 at 06:54:14 AM, Chin Liang See wrote: > > On Mon, 2015-08-31 at 14:57 -0500, dinguyen@opensource.altera.com wrote: > > > From: Dinh Nguyen <dinguyen@opensource.altera.com> > > > > > > Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is a CycloneV > > > based board. The board can boot from SD/MMC. Ethernet is a bit different > > > because it has a KSZ9031 PHY, so for now, ethernet doesn't quite work > > > yet, as a few patches are needed to support the PHY. > > > > > > Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> > > > --- > > > Hi Marek, > > > > > > This patch is based on your u-boot-socfpga/wip/boards branch. > > > > > > Thanks, > > > Dinh > > > --- > > > > > > arch/arm/dts/Makefile | 1 + > > > arch/arm/dts/socfpga_cyclone5_de0_sockit.dts | 61 +++ > > > arch/arm/mach-socfpga/Kconfig | 7 + > > > board/terasic/de0/MAINTAINERS | 5 + > > > board/terasic/de0/Makefile | 9 + > > > board/terasic/de0/qts/iocsr_config.h | 658 > > > +++++++++++++++++++++++++++ board/terasic/de0/qts/pinmux_config.h > > > | 220 +++++++++ > > > board/terasic/de0/qts/pll_config.h | 85 ++++ > > > board/terasic/de0/qts/sdram_config.h | 342 ++++++++++++++ > > > board/terasic/de0/socfpga.c | 22 + > > > configs/socfpga_de0_defconfig | 21 + > > > include/configs/socfpga_de0.h | 88 ++++ > > > 12 files changed, 1519 insertions(+) > > > create mode 100644 arch/arm/dts/socfpga_cyclone5_de0_sockit.dts > > > create mode 100644 board/terasic/de0/MAINTAINERS > > > create mode 100644 board/terasic/de0/Makefile > > > create mode 100644 board/terasic/de0/qts/iocsr_config.h > > > create mode 100644 board/terasic/de0/qts/pinmux_config.h > > > create mode 100644 board/terasic/de0/qts/pll_config.h > > > create mode 100644 board/terasic/de0/qts/sdram_config.h > > > create mode 100644 board/terasic/de0/socfpga.c > > > create mode 100644 configs/socfpga_de0_defconfig > > > create mode 100644 include/configs/socfpga_de0.h > > > > > > diff --git a/include/configs/socfpga_de0.h > > > b/include/configs/socfpga_de0.h new file mode 100644 > > > index 0000000..47e18ba > > > --- /dev/null > > > +++ b/include/configs/socfpga_de0.h > > > @@ -0,0 +1,88 @@ > > > +/* > > > + * 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/socfpga_base_addrs.h> > > > + > > > +/* U-Boot Commands */ > > > +#define CONFIG_SYS_NO_FLASH > > > +#define CONFIG_DOS_PARTITION > > > +#define CONFIG_FAT_WRITE > > > +#define CONFIG_HW_WATCHDOG > > > + > > > +#define CONFIG_CMD_ASKENV > > > +#define CONFIG_CMD_BOOTZ > > > +#define CONFIG_CMD_CACHE > > > +#define CONFIG_CMD_DFU > > > +#define CONFIG_CMD_DHCP > > > +#define CONFIG_CMD_EXT4 > > > +#define CONFIG_CMD_EXT4_WRITE > > > +#define CONFIG_CMD_FAT > > > +#define CONFIG_CMD_FS_GENERIC > > > +#define CONFIG_CMD_GPIO > > > +#define CONFIG_CMD_GREPENV > > > +#define CONFIG_CMD_MII > > > +#define CONFIG_CMD_MMC > > > +#define CONFIG_CMD_PING > > > +#define CONFIG_CMD_USB > > > +#define CONFIG_CMD_USB_MASS_STORAGE > > > + > > > +/* Memory configurations */ > > > +#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ > > > + > > > +/* Booting Linux */ > > > +#define CONFIG_BOOTDELAY 3 > > > +#define CONFIG_BOOTFILE "fitImage" > > > > Wonder this should be zImage as the mmcload still using zImage? > > Or maybe the mmcload should be fixed instead ; fitImage is preferred. Yup, I agreed that as we can enable checksum even its zimage. Thanks Chin Liang
On 08/31/2015 05:23 PM, Marek Vasut wrote: > On Monday, August 31, 2015 at 09:57:05 PM, dinguyen@opensource.altera.com wrote: >> From: Dinh Nguyen <dinguyen@opensource.altera.com> >> >> Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is a CycloneV >> based board. The board can boot from SD/MMC. Ethernet is a bit different >> because it has a KSZ9031 PHY, so for now, ethernet doesn't quite work yet, >> as a few patches are needed to support the PHY. > > I thought we did support the KSZ9031 PHY. What's the problem ? > Yeah, I just realized that. That's the problem when I've been working with v2013.10 U-Boot! I'll have ethernet in V2. >> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> >> --- >> Hi Marek, >> >> This patch is based on your u-boot-socfpga/wip/boards branch. > > OK, that makes sense. > >> Thanks, >> Dinh >> --- >> arch/arm/dts/Makefile | 1 + >> arch/arm/dts/socfpga_cyclone5_de0_sockit.dts | 61 +++ >> arch/arm/mach-socfpga/Kconfig | 7 + >> board/terasic/de0/MAINTAINERS | 5 + >> board/terasic/de0/Makefile | 9 + > > I think it might be clearer to rename it to de0-nano-soc, what do you think ? > What's the difference between de0-nano-soc and atlas btw ? > I don't know. From the website, DE0-Nano-SoC Kit/Atlas-SoC Kit, so DE0_Nano_SoCKit is synonymous with Atlas Sockit? > [...] > >> diff --git a/configs/socfpga_de0_defconfig b/configs/socfpga_de0_defconfig >> new file mode 100644 >> index 0000000..000f322 >> --- /dev/null >> +++ b/configs/socfpga_de0_defconfig >> @@ -0,0 +1,21 @@ >> +CONFIG_ARM=y >> +CONFIG_ARCH_SOCFPGA=y >> +CONFIG_TARGET_SOCFPGA_CYCLONE5=y >> +CONFIG_TARGET_SOCFPGA_TERASIC_DE0=y >> +CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_sockit" >> +CONFIG_SPL=y >> +# CONFIG_CMD_IMLS is not set >> +# CONFIG_CMD_FLASH is not set >> +CONFIG_OF_CONTROL=y >> +CONFIG_DM_ETH=y >> +CONFIG_NETDEVICES=y >> +CONFIG_ETH_DESIGNWARE=y >> +CONFIG_DM_GPIO=y >> +CONFIG_DWAPB_GPIO=y >> +CONFIG_SPL_DM=y >> +CONFIG_SPL_MMC_SUPPORT=y >> +CONFIG_DM_SEQ_ALIAS=y > > I think you don't need the DM_SEQ_ALIAS, it's needed only for QSPI > to enforce the SPI NOR ordering. > Right, I missed this one. <snip> >> + >> +/* USB */ >> +#ifdef CONFIG_CMD_USB >> +#define CONFIG_USB_DWC2_REG_ADDR SOCFPGA_USB1_ADDRESS >> +#endif >> +#define CONFIG_G_DNL_MANUFACTURER "Terasic" >> + >> +/* Extra Environment */ >> +#define CONFIG_HOSTNAME socfpga_cyclone5 > > socfpga_d0_nano_soc might be better ;-) > Yeah..missed this one too. >> + >> +#define CONFIG_EXTRA_ENV_SETTINGS \ >> + "verify=n\0" \ > > What's this "verify" variable for ? > Copied from your SoCKit patch. Thanks for reviewing. Dinh
On 09/01/2015 03:33 AM, Marek Vasut wrote: > On Tuesday, September 01, 2015 at 09:38:23 AM, Pavel Machek wrote: >> On Tue 2015-09-01 00:23:49, Marek Vasut wrote: >>> On Monday, August 31, 2015 at 09:57:05 PM, dinguyen@opensource.altera.com > wrote: >>>> From: Dinh Nguyen <dinguyen@opensource.altera.com> >>>> >>>> Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is a CycloneV >>>> based board. The board can boot from SD/MMC. Ethernet is a bit >>>> different because it has a KSZ9031 PHY, so for now, ethernet doesn't >>>> quite work yet, as a few patches are needed to support the PHY. >>> >>> I thought we did support the KSZ9031 PHY. What's the problem ? >>> >>>> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> >>>> --- >>>> Hi Marek, >>>> >>>> This patch is based on your u-boot-socfpga/wip/boards branch. >>> >>> OK, that makes sense. >>> >>>> Thanks, >>>> Dinh >>>> --- >>>> >>>> arch/arm/dts/Makefile | 1 + >>>> arch/arm/dts/socfpga_cyclone5_de0_sockit.dts | 61 +++ >>>> arch/arm/mach-socfpga/Kconfig | 7 + >>>> board/terasic/de0/MAINTAINERS | 5 + >>>> board/terasic/de0/Makefile | 9 + >>> >>> I think it might be clearer to rename it to de0-nano-soc, what do you >>> think ? What's the difference between de0-nano-soc and atlas btw ? >> >> Unless they are going to make "de0-mega".. I'd say "de0" is clean >> enough. > > They already make de0-cv , which is cycloneV SoC based, so de0 is not clear > enough, no way. They also make de0-nano , which is cycloneIV based (without > soc). > After looking around the site a bit more, I think "de0_nano_sockit" is more appropriate? Dinh
On Tuesday, September 01, 2015 at 05:12:40 PM, Dinh Nguyen wrote: > On 09/01/2015 03:33 AM, Marek Vasut wrote: > > On Tuesday, September 01, 2015 at 09:38:23 AM, Pavel Machek wrote: > >> On Tue 2015-09-01 00:23:49, Marek Vasut wrote: > >>> On Monday, August 31, 2015 at 09:57:05 PM, > >>> dinguyen@opensource.altera.com > > > > wrote: > >>>> From: Dinh Nguyen <dinguyen@opensource.altera.com> > >>>> > >>>> Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is a > >>>> CycloneV based board. The board can boot from SD/MMC. Ethernet is a > >>>> bit different because it has a KSZ9031 PHY, so for now, ethernet > >>>> doesn't quite work yet, as a few patches are needed to support the > >>>> PHY. > >>> > >>> I thought we did support the KSZ9031 PHY. What's the problem ? > >>> > >>>> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> > >>>> --- > >>>> Hi Marek, > >>>> > >>>> This patch is based on your u-boot-socfpga/wip/boards branch. > >>> > >>> OK, that makes sense. > >>> > >>>> Thanks, > >>>> Dinh > >>>> --- > >>>> > >>>> arch/arm/dts/Makefile | 1 + > >>>> arch/arm/dts/socfpga_cyclone5_de0_sockit.dts | 61 +++ > >>>> arch/arm/mach-socfpga/Kconfig | 7 + > >>>> board/terasic/de0/MAINTAINERS | 5 + > >>>> board/terasic/de0/Makefile | 9 + > >>> > >>> I think it might be clearer to rename it to de0-nano-soc, what do you > >>> think ? What's the difference between de0-nano-soc and atlas btw ? > >> > >> Unless they are going to make "de0-mega".. I'd say "de0" is clean > >> enough. > > > > They already make de0-cv , which is cycloneV SoC based, so de0 is not > > clear enough, no way. They also make de0-nano , which is cycloneIV based > > (without soc). > > After looking around the site a bit more, I think "de0_nano_sockit" is > more appropriate? It's de0-nano-soc, that's what they call it on that website, right ? SoCkit is a separate board. Best regards, Marek Vasut
On Tuesday, September 01, 2015 at 05:09:09 PM, Dinh Nguyen wrote: > On 08/31/2015 05:23 PM, Marek Vasut wrote: > > On Monday, August 31, 2015 at 09:57:05 PM, dinguyen@opensource.altera.com wrote: > >> From: Dinh Nguyen <dinguyen@opensource.altera.com> > >> > >> Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is a CycloneV > >> based board. The board can boot from SD/MMC. Ethernet is a bit different > >> because it has a KSZ9031 PHY, so for now, ethernet doesn't quite work > >> yet, as a few patches are needed to support the PHY. > > > > I thought we did support the KSZ9031 PHY. What's the problem ? > > Yeah, I just realized that. That's the problem when I've been working > with v2013.10 U-Boot! I'll have ethernet in V2. Cool :-) > >> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> > >> --- > >> Hi Marek, > >> > >> This patch is based on your u-boot-socfpga/wip/boards branch. > > > > OK, that makes sense. > > > >> Thanks, > >> Dinh > >> --- > >> > >> arch/arm/dts/Makefile | 1 + > >> arch/arm/dts/socfpga_cyclone5_de0_sockit.dts | 61 +++ > >> arch/arm/mach-socfpga/Kconfig | 7 + > >> board/terasic/de0/MAINTAINERS | 5 + > >> board/terasic/de0/Makefile | 9 + > > > > I think it might be clearer to rename it to de0-nano-soc, what do you > > think ? What's the difference between de0-nano-soc and atlas btw ? > > I don't know. From the website, DE0-Nano-SoC Kit/Atlas-SoC Kit, so > DE0_Nano_SoCKit is synonymous with Atlas Sockit? See the other email I guess. > > [...] > > > >> diff --git a/configs/socfpga_de0_defconfig > >> b/configs/socfpga_de0_defconfig new file mode 100644 > >> index 0000000..000f322 > >> --- /dev/null > >> +++ b/configs/socfpga_de0_defconfig > >> @@ -0,0 +1,21 @@ > >> +CONFIG_ARM=y > >> +CONFIG_ARCH_SOCFPGA=y > >> +CONFIG_TARGET_SOCFPGA_CYCLONE5=y > >> +CONFIG_TARGET_SOCFPGA_TERASIC_DE0=y > >> +CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_sockit" > >> +CONFIG_SPL=y > >> +# CONFIG_CMD_IMLS is not set > >> +# CONFIG_CMD_FLASH is not set > >> +CONFIG_OF_CONTROL=y > >> +CONFIG_DM_ETH=y > >> +CONFIG_NETDEVICES=y > >> +CONFIG_ETH_DESIGNWARE=y > >> +CONFIG_DM_GPIO=y > >> +CONFIG_DWAPB_GPIO=y > >> +CONFIG_SPL_DM=y > >> +CONFIG_SPL_MMC_SUPPORT=y > >> +CONFIG_DM_SEQ_ALIAS=y > > > > I think you don't need the DM_SEQ_ALIAS, it's needed only for QSPI > > to enforce the SPI NOR ordering. > > Right, I missed this one. :) > <snip> > > >> + > >> +/* USB */ > >> +#ifdef CONFIG_CMD_USB > >> +#define CONFIG_USB_DWC2_REG_ADDR SOCFPGA_USB1_ADDRESS > >> +#endif > >> +#define CONFIG_G_DNL_MANUFACTURER "Terasic" > >> + > >> +/* Extra Environment */ > >> +#define CONFIG_HOSTNAME socfpga_cyclone5 > > > > socfpga_d0_nano_soc might be better ;-) > > Yeah..missed this one too. Thanks!
On Tue, Sep 1, 2015 at 10:36 AM, Marek Vasut <marex@denx.de> wrote: > On Tuesday, September 01, 2015 at 05:12:40 PM, Dinh Nguyen wrote: >> On 09/01/2015 03:33 AM, Marek Vasut wrote: >> > On Tuesday, September 01, 2015 at 09:38:23 AM, Pavel Machek wrote: >> >> On Tue 2015-09-01 00:23:49, Marek Vasut wrote: >> >>> On Monday, August 31, 2015 at 09:57:05 PM, >> >>> dinguyen@opensource.altera.com >> > >> > wrote: >> >>>> From: Dinh Nguyen <dinguyen@opensource.altera.com> >> >>>> >> >>>> Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is a >> >>>> CycloneV based board. The board can boot from SD/MMC. Ethernet is a >> >>>> bit different because it has a KSZ9031 PHY, so for now, ethernet >> >>>> doesn't quite work yet, as a few patches are needed to support the >> >>>> PHY. >> >>> >> >>> I thought we did support the KSZ9031 PHY. What's the problem ? >> >>> >> >>>> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> >> >>>> --- >> >>>> Hi Marek, >> >>>> >> >>>> This patch is based on your u-boot-socfpga/wip/boards branch. >> >>> >> >>> OK, that makes sense. >> >>> >> >>>> Thanks, >> >>>> Dinh >> >>>> --- >> >>>> >> >>>> arch/arm/dts/Makefile | 1 + >> >>>> arch/arm/dts/socfpga_cyclone5_de0_sockit.dts | 61 +++ >> >>>> arch/arm/mach-socfpga/Kconfig | 7 + >> >>>> board/terasic/de0/MAINTAINERS | 5 + >> >>>> board/terasic/de0/Makefile | 9 + >> >>> >> >>> I think it might be clearer to rename it to de0-nano-soc, what do you >> >>> think ? What's the difference between de0-nano-soc and atlas btw ? >> >> >> >> Unless they are going to make "de0-mega".. I'd say "de0" is clean >> >> enough. >> > >> > They already make de0-cv , which is cycloneV SoC based, so de0 is not >> > clear enough, no way. They also make de0-nano , which is cycloneIV based >> > (without soc). >> >> After looking around the site a bit more, I think "de0_nano_sockit" is >> more appropriate? > > It's de0-nano-soc, that's what they call it on that website, right ? > SoCkit is a separate board. > Ah yes, it's de0-nano-soc<space>kit. So "de0-nano-soc" ? Dinh
On Tuesday, September 01, 2015 at 11:37:20 PM, Dinh Nguyen wrote: > On Tue, Sep 1, 2015 at 10:36 AM, Marek Vasut <marex@denx.de> wrote: > > On Tuesday, September 01, 2015 at 05:12:40 PM, Dinh Nguyen wrote: > >> On 09/01/2015 03:33 AM, Marek Vasut wrote: > >> > On Tuesday, September 01, 2015 at 09:38:23 AM, Pavel Machek wrote: > >> >> On Tue 2015-09-01 00:23:49, Marek Vasut wrote: > >> >>> On Monday, August 31, 2015 at 09:57:05 PM, > >> >>> dinguyen@opensource.altera.com > >> > > >> > wrote: > >> >>>> From: Dinh Nguyen <dinguyen@opensource.altera.com> > >> >>>> > >> >>>> Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is a > >> >>>> CycloneV based board. The board can boot from SD/MMC. Ethernet is a > >> >>>> bit different because it has a KSZ9031 PHY, so for now, ethernet > >> >>>> doesn't quite work yet, as a few patches are needed to support the > >> >>>> PHY. > >> >>> > >> >>> I thought we did support the KSZ9031 PHY. What's the problem ? > >> >>> > >> >>>> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> > >> >>>> --- > >> >>>> Hi Marek, > >> >>>> > >> >>>> This patch is based on your u-boot-socfpga/wip/boards branch. > >> >>> > >> >>> OK, that makes sense. > >> >>> > >> >>>> Thanks, > >> >>>> Dinh > >> >>>> --- > >> >>>> > >> >>>> arch/arm/dts/Makefile | 1 + > >> >>>> arch/arm/dts/socfpga_cyclone5_de0_sockit.dts | 61 +++ > >> >>>> arch/arm/mach-socfpga/Kconfig | 7 + > >> >>>> board/terasic/de0/MAINTAINERS | 5 + > >> >>>> board/terasic/de0/Makefile | 9 + > >> >>> > >> >>> I think it might be clearer to rename it to de0-nano-soc, what do > >> >>> you think ? What's the difference between de0-nano-soc and atlas > >> >>> btw ? > >> >> > >> >> Unless they are going to make "de0-mega".. I'd say "de0" is clean > >> >> enough. > >> > > >> > They already make de0-cv , which is cycloneV SoC based, so de0 is not > >> > clear enough, no way. They also make de0-nano , which is cycloneIV > >> > based (without soc). > >> > >> After looking around the site a bit more, I think "de0_nano_sockit" is > >> more appropriate? > > > > It's de0-nano-soc, that's what they call it on that website, right ? > > SoCkit is a separate board. > > Ah yes, it's de0-nano-soc<space>kit. So "de0-nano-soc" ? Yeah, exactly :) Best regards, Marek Vasut
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index c53f5fd..b9778db 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -58,6 +58,7 @@ dtb-$(CONFIG_ARCH_SOCFPGA) += \ socfpga_arria5_socdk.dtb \ socfpga_cyclone5_mcvevk.dtb \ socfpga_cyclone5_socdk.dtb \ + socfpga_cyclone5_de0_sockit.dtb \ socfpga_cyclone5_sockit.dtb \ socfpga_cyclone5_socrates.dtb dtb-$(CONFIG_TARGET_DRA7XX_EVM) += dra72-evm.dtb diff --git a/arch/arm/dts/socfpga_cyclone5_de0_sockit.dts b/arch/arm/dts/socfpga_cyclone5_de0_sockit.dts new file mode 100644 index 0000000..b649c9a --- /dev/null +++ b/arch/arm/dts/socfpga_cyclone5_de0_sockit.dts @@ -0,0 +1,61 @@ +/* + * Copyright Altera Corporation (C) 2015 + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include "socfpga_cyclone5.dtsi" + +/ { + model = "Terasic DE0-Nano(Atlas)"; + compatible = "altr,socfpga-cyclone5", "altr,socfpga"; + + chosen { + bootargs = "console=ttyS0,115200"; + }; + + aliases { + ethernet0 = &gmac1; + }; + + memory { + name = "memory"; + device_type = "memory"; + reg = <0x0 0x40000000>; /* 1GB */ + }; + + soc { + u-boot,dm-pre-reloc; + }; +}; + +&gmac1 { + status = "okay"; + phy-mode = "rgmii"; + + rxd0-skew-ps = <420>; + rxd1-skew-ps = <420>; + rxd2-skew-ps = <420>; + rxd3-skew-ps = <420>; + txen-skew-ps = <0>; + txc-skew-ps = <1860>; + rxdv-skew-ps = <420>; + rxc-skew-ps = <1680>; +}; + +&gpio0 { + status = "okay"; +}; + +&gpio1 { + status = "okay"; +}; + +&gpio2 { + status = "okay"; +}; + +&mmc0 { + status = "okay"; + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index 420f66a..6b2bba8 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig @@ -18,6 +18,10 @@ config TARGET_SOCFPGA_CYCLONE5_SOCDK bool "Altera SOCFPGA SoCDK (Cyclone V)" select TARGET_SOCFPGA_CYCLONE5 +config TARGET_SOCFPGA_TERASIC_DE0 + bool "Terasic DE0-Nano-Atlas (Cyclone V)" + select TARGET_SOCFPGA_CYCLONE5 + config TARGET_SOCFPGA_TERASIC_SOCKIT bool "Terasic SoCkit (Cyclone V)" select TARGET_SOCFPGA_CYCLONE5 @@ -31,12 +35,14 @@ endchoice config SYS_BOARD default "arria5-socdk" if TARGET_SOCFPGA_ARRIA5_SOCDK default "cyclone5-socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK + default "de0" if TARGET_SOCFPGA_TERASIC_DE0 default "sockit" if TARGET_SOCFPGA_TERASIC_SOCKIT default "mcvevk" if TARGET_SOCFPGA_DENX_MCVEVK config SYS_VENDOR default "altera" if TARGET_SOCFPGA_ARRIA5_SOCDK default "altera" if TARGET_SOCFPGA_CYCLONE5_SOCDK + default "terasic" if TARGET_SOCFPGA_TERASIC_DE0 default "terasic" if TARGET_SOCFPGA_TERASIC_SOCKIT default "denx" if TARGET_SOCFPGA_DENX_MCVEVK @@ -46,6 +52,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "socfpga_arria5" if TARGET_SOCFPGA_ARRIA5_SOCDK default "socfpga_cyclone5" if TARGET_SOCFPGA_CYCLONE5_SOCDK + default "socfpga_de0" if TARGET_SOCFPGA_TERASIC_DE0 default "socfpga_sockit" if TARGET_SOCFPGA_TERASIC_SOCKIT default "socfpga_mcvevk" if TARGET_SOCFPGA_DENX_MCVEVK diff --git a/board/terasic/de0/MAINTAINERS b/board/terasic/de0/MAINTAINERS new file mode 100644 index 0000000..9875046 --- /dev/null +++ b/board/terasic/de0/MAINTAINERS @@ -0,0 +1,5 @@ +SOCFPGA ATLAS BOARD +M: Dinh Nguyen <dinguyen@opensource.altera.com> +S: Maintained +F: include/configs/socfpga_cyclone5.h +F: configs/socfpga_cyclone5_defconfig diff --git a/board/terasic/de0/Makefile b/board/terasic/de0/Makefile new file mode 100644 index 0000000..86f9b78 --- /dev/null +++ b/board/terasic/de0/Makefile @@ -0,0 +1,9 @@ +# +# (C) Copyright 2001-2006 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# (C) Copyright 2010, Thomas Chou <thomas@wytron.com.tw> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y := socfpga.o diff --git a/board/terasic/de0/qts/iocsr_config.h b/board/terasic/de0/qts/iocsr_config.h new file mode 100644 index 0000000..9b4d709 --- /dev/null +++ b/board/terasic/de0/qts/iocsr_config.h @@ -0,0 +1,658 @@ +/* + * Altera SoCFPGA IOCSR configuration + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef __SOCFPGA_IOCSR_CONFIG_H__ +#define __SOCFPGA_IOCSR_CONFIG_H__ + +#define CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH 764 +#define CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH 1719 +#define CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH 955 +#define CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH 16766 + +const unsigned long iocsr_scan_chain0_table[] = { + 0x00000000, + 0x00000000, + 0x0FF00000, + 0xC0000000, + 0x0000003F, + 0x00008000, + 0x00020080, + 0x18060000, + 0x08000000, + 0x00018020, + 0x00000000, + 0x00004000, + 0x00010040, + 0x04010000, + 0x04000000, + 0x00000010, + 0x00004010, + 0x00002000, + 0x00020000, + 0x02008000, + 0x02000000, + 0x00000008, + 0x00002008, + 0x00001000, +}; + +const unsigned long iocsr_scan_chain1_table[] = { + 0x00100000, + 0x10040000, + 0x100000C0, + 0x00000040, + 0x00010040, + 0x00008000, + 0x00060180, + 0x20000000, + 0x00000000, + 0x00000080, + 0x00020000, + 0x00004000, + 0x00010040, + 0x10000000, + 0x04000000, + 0x00000010, + 0x00004010, + 0x00002000, + 0x00020000, + 0x06018000, + 0x01FE0000, + 0xF8000000, + 0x00000007, + 0x00001000, + 0x00010000, + 0x04000000, + 0x00000000, + 0x00000010, + 0x00004000, + 0x00000800, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000008, + 0x00002000, + 0x00000400, + 0x00000000, + 0x00401000, + 0x00000003, + 0x00000000, + 0x00000000, + 0x00000200, + 0x00600802, + 0x00000000, + 0x80200000, + 0x80000600, + 0x00000200, + 0x00000100, + 0x00300401, + 0xC0100400, + 0x40100000, + 0x40000300, + 0x000C0100, + 0x00000080, +}; + +const unsigned long iocsr_scan_chain2_table[] = { + 0x300C0300, + 0x00000000, + 0x0FF00000, + 0x00000000, + 0x0C0300C0, + 0x00008000, + 0x00080000, + 0x18060000, + 0x18000000, + 0x00018060, + 0x00020000, + 0x00004000, + 0x200300C0, + 0x10000000, + 0x00000000, + 0x00000040, + 0x00010000, + 0x00002000, + 0x10018060, + 0x06018000, + 0x06000000, + 0x00010018, + 0x00006018, + 0x00001000, + 0x00010000, + 0x00000000, + 0x03000000, + 0x0000800C, + 0x00C01004, + 0x00000800, +}; + +const unsigned long iocsr_scan_chain3_table[] = { + 0x0C420D80, + 0x082000FF, + 0x0A804001, + 0x07900000, + 0x08020000, + 0x00100000, + 0x0A800000, + 0x07900000, + 0x08020000, + 0x00100000, + 0xC8800000, + 0x00003001, + 0x00C00722, + 0x00000000, + 0x00000021, + 0x82000004, + 0x05400000, + 0x03C80000, + 0x04010000, + 0x00080000, + 0x05400000, + 0x03C80000, + 0x05400000, + 0x03C80000, + 0xE4400000, + 0x00001800, + 0x00600391, + 0x800E4400, + 0x00000001, + 0x40000002, + 0x02A00000, + 0x01E40000, + 0x02A00000, + 0x01E40000, + 0x02A00000, + 0x01E40000, + 0x02A00000, + 0x01E40000, + 0x72200000, + 0x80000C00, + 0x003001C8, + 0xC0072200, + 0x1C880000, + 0x20000300, + 0x00040000, + 0x50670000, + 0x00000010, + 0x24590000, + 0x00001000, + 0xA0000034, + 0x0D000001, + 0xC0680618, + 0x4D034071, + 0x1A681A03, + 0x806180D0, + 0x34071C06, + 0x01A034D0, + 0x380D0000, + 0x0820680E, + 0x034D0340, + 0xD000001A, + 0x0680E380, + 0x10040000, + 0x00200000, + 0x10040000, + 0x00200000, + 0x15000000, + 0x0F200000, + 0x15000000, + 0x0F200000, + 0x01FE0000, + 0x00000000, + 0x01800E44, + 0x00391000, + 0x007F8006, + 0x00000000, + 0x0A800001, + 0x07900000, + 0x0A800000, + 0x07900000, + 0x0A800000, + 0x07900000, + 0x08020000, + 0x00100000, + 0xC8800000, + 0x00003001, + 0x00C00722, + 0x00000FF0, + 0x72200000, + 0x80000C00, + 0x05400000, + 0x02480000, + 0x04000000, + 0x00080000, + 0x05400000, + 0x03C80000, + 0x05400000, + 0x03C80000, + 0x6A1C0000, + 0x00001800, + 0x00600391, + 0x800E4400, + 0x1A870001, + 0x40000600, + 0x02A00040, + 0x01E40000, + 0x02A00000, + 0x01E40000, + 0x02A00000, + 0x01E40000, + 0x02A00000, + 0x01E40000, + 0x72200000, + 0x80000C00, + 0x003001C8, + 0xC0072200, + 0x1C880000, + 0x20000300, + 0x00040000, + 0x50670000, + 0x00000010, + 0x24590000, + 0x00001000, + 0xA0000034, + 0x0D000001, + 0xC0680618, + 0x4D034071, + 0x1A681A03, + 0x806180D0, + 0x34071C06, + 0x01A00040, + 0x180D0002, + 0x71C06806, + 0x034D0340, + 0xD01A681A, + 0x06806180, + 0x10040000, + 0x00200000, + 0x10040000, + 0x00200000, + 0x15000000, + 0x0F200000, + 0x15000000, + 0x0F200000, + 0x01FE0000, + 0x00000000, + 0x01800E44, + 0x00391000, + 0x007F8006, + 0x00000000, + 0x99300001, + 0x34343400, + 0xAA0D4000, + 0x01C3A800, + 0xAA0D4000, + 0x01C3A800, + 0xAA0D4000, + 0x01C3A800, + 0x00040100, + 0x00000800, + 0x00000000, + 0x00001208, + 0x00482000, + 0x01000000, + 0x00000000, + 0x00410482, + 0x0006A000, + 0x0001B400, + 0x00020000, + 0x00000400, + 0x0002A000, + 0x0001E400, + 0x5506A000, + 0x00E1D400, + 0x00000000, + 0xC880090C, + 0x00003001, + 0x90400000, + 0x00000000, + 0x2020C243, + 0x2A835000, + 0x0070EA00, + 0x2A835000, + 0x0070EA00, + 0x2A835000, + 0x0070EA00, + 0x00010040, + 0x00000200, + 0x00000000, + 0x00000482, + 0x00120800, + 0x00002000, + 0x80000000, + 0x00104120, + 0x00000200, + 0xAC0D5F80, + 0xFFFFFFFF, + 0x14F3690D, + 0x1A041414, + 0x00D00000, + 0x14864000, + 0x59647A05, + 0xD32CA3D6, + 0xF551451E, + 0x034CD348, + 0x821A0000, + 0x0000D000, + 0x030C0680, + 0xD659647A, + 0x1ED32CA3, + 0x48F55145, + 0x00034CD3, + 0x00080200, + 0x00001000, + 0x00080200, + 0x00001000, + 0x000A8000, + 0x00075000, + 0x541A8000, + 0x03875001, + 0x10000000, + 0x00000000, + 0x0080C000, + 0x41000000, + 0x00003FC2, + 0x00820000, + 0xAA0D4000, + 0x01C3A800, + 0xAA0D4000, + 0x01C3A800, + 0xAA0D4000, + 0x01C3A800, + 0x00040100, + 0x00000800, + 0x00000000, + 0x00001208, + 0x00482000, + 0x00008000, + 0x00000000, + 0x00410482, + 0x0006A000, + 0x0001B400, + 0x00020000, + 0x00000400, + 0x00020080, + 0x00000400, + 0x5506A000, + 0x00E1D400, + 0x00000000, + 0x0000090C, + 0x00000010, + 0x90400000, + 0x00000000, + 0x2020C243, + 0x2A835000, + 0x0070EA00, + 0x2A835000, + 0x0070EA00, + 0x2A835000, + 0x0070EA00, + 0x00015000, + 0x0000F200, + 0x00000000, + 0x00000482, + 0x00120800, + 0x00600391, + 0x80000000, + 0x00104120, + 0x00000200, + 0xAC0D5F80, + 0xFFFFFFFF, + 0x14F3690D, + 0x1A041414, + 0x00D00000, + 0x0C864000, + 0x59647A03, + 0x932CA3DE, + 0xF651451E, + 0x035CD348, + 0x821A0041, + 0x0000D000, + 0x00000680, + 0xDE59647A, + 0x1ED32CA3, + 0x48F55145, + 0x00035492, + 0x00080200, + 0x00001000, + 0x00080200, + 0x00001000, + 0x000A8000, + 0x00075000, + 0x541A8000, + 0x03875001, + 0x10000000, + 0x00000000, + 0x0080C000, + 0x41000000, + 0x04000002, + 0x00820000, + 0xAA0D4000, + 0x01C3A800, + 0xAA0D4000, + 0x01C3A800, + 0xAA0D4000, + 0x01C3A800, + 0x00040100, + 0x00000800, + 0x00000000, + 0x00001208, + 0x00482000, + 0x00008000, + 0x00000000, + 0x00410482, + 0x0006A000, + 0x0001B400, + 0x00020000, + 0x00000400, + 0x0002A000, + 0x0001E400, + 0x5506A000, + 0x00E1D400, + 0x00000000, + 0xC880090C, + 0x00003001, + 0x90400000, + 0x00000000, + 0x2020C243, + 0x2A835000, + 0x0070EA00, + 0x2A835000, + 0x0070EA00, + 0x2A835000, + 0x0070EA00, + 0x00010040, + 0x00000200, + 0x00000000, + 0x00000482, + 0x00120800, + 0x00002000, + 0x80000000, + 0x00104120, + 0x00000200, + 0xAC0D5F80, + 0xFFFFFFFF, + 0x14F3690D, + 0x1A041414, + 0x00D00000, + 0x0C864000, + 0x59647A03, + 0xD32CA3DE, + 0xF551451E, + 0x035CB2C8, + 0x821A0000, + 0x0000D000, + 0x00000680, + 0xDE59647A, + 0x1ED2AAA3, + 0xC8F55965, + 0x00035CB2, + 0x00080200, + 0x00001000, + 0x00080200, + 0x00001000, + 0x000A8000, + 0x00075000, + 0x541A8000, + 0x03875001, + 0x10000000, + 0x00000000, + 0x0080C000, + 0x41000000, + 0x04000002, + 0x00820000, + 0xAA0D4000, + 0x01C3A800, + 0xAA0D4000, + 0x01C3A800, + 0xAA0D4000, + 0x01C3A800, + 0x00040100, + 0x00000800, + 0x00000000, + 0x00001208, + 0x00482000, + 0x00008000, + 0x00000000, + 0x00410482, + 0x0006A000, + 0x0001B400, + 0x00020000, + 0x00000400, + 0x00020080, + 0x00000400, + 0x5506A000, + 0x00E1D400, + 0x00000000, + 0x0000090C, + 0x00000010, + 0x90400000, + 0x00000000, + 0x2020C243, + 0x2A835000, + 0x0070EA00, + 0x2A835000, + 0x0070EA00, + 0x2A835000, + 0x0070EA00, + 0x00010040, + 0x00000200, + 0x00000000, + 0x00000482, + 0x00120800, + 0x00400000, + 0x80000000, + 0x00104120, + 0x00000200, + 0xAC0D5F80, + 0xFFFFFFFF, + 0x14F1690D, + 0x1A041414, + 0x00D00000, + 0x14864000, + 0x59647A05, + 0xD32CA3DE, + 0xF551451E, + 0x035CD348, + 0x821A0000, + 0x0000D000, + 0x00000680, + 0xDE59647A, + 0x1ED32CA3, + 0x48F55145, + 0x00035CD3, + 0x00080200, + 0x00001000, + 0x00080200, + 0x00001000, + 0x000A8000, + 0x00075000, + 0x541A8000, + 0x03875001, + 0x10000000, + 0x00000000, + 0x0080C000, + 0x41000000, + 0x04000002, + 0x00820000, + 0x00489800, + 0x801A1A1A, + 0x00000200, + 0x80000004, + 0x00000200, + 0x80000004, + 0x00000200, + 0x80000004, + 0x00000200, + 0x00000004, + 0x00040000, + 0x10000000, + 0x00000000, + 0x00000040, + 0x00010000, + 0x40002000, + 0x00000100, + 0x40000002, + 0x00000100, + 0x40000002, + 0x00000100, + 0x40000002, + 0x00000100, + 0x00000002, + 0x00020000, + 0x08000000, + 0x00000000, + 0x00000020, + 0x00008000, + 0x20001000, + 0x00000080, + 0x20000001, + 0x00000080, + 0x20000001, + 0x00000080, + 0x20000001, + 0x00000080, + 0x00000001, + 0x00010000, + 0x04000000, + 0x00FF0000, + 0x00000000, + 0x00004000, + 0x00000800, + 0xC0000001, + 0x00041419, + 0x40000000, + 0x04000816, + 0x000D0000, + 0x00006800, + 0x00000340, + 0xD000001A, + 0x06800000, + 0x00340000, + 0x0001A000, + 0x00000D00, + 0x40000068, + 0x1A000003, + 0x00D00000, + 0x00068000, + 0x00003400, + 0x000001A0, + 0x00000401, + 0x00000008, + 0x00000401, + 0x00000008, + 0x00000401, + 0x00000008, + 0x00000401, + 0x80000008, + 0x0000007F, + 0x20000000, + 0x00000000, + 0xE0000080, + 0x0000001F, + 0x00004000, +}; +#endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/terasic/de0/qts/pinmux_config.h b/board/terasic/de0/qts/pinmux_config.h new file mode 100644 index 0000000..3854110 --- /dev/null +++ b/board/terasic/de0/qts/pinmux_config.h @@ -0,0 +1,220 @@ +/* + * Altera SoCFPGA PinMux configuration + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef __SOCFPGA_PINMUX_CONFIG_H__ +#define __SOCFPGA_PINMUX_CONFIG_H__ + +/* pin MUX configuration data */ +const u8 sys_mgr_init_table[] = { + 0, /* EMACIO0 */ + 2, /* EMACIO1 */ + 2, /* EMACIO2 */ + 2, /* EMACIO3 */ + 2, /* EMACIO4 */ + 2, /* EMACIO5 */ + 2, /* EMACIO6 */ + 2, /* EMACIO7 */ + 2, /* EMACIO8 */ + 0, /* EMACIO9 */ + 2, /* EMACIO10 */ + 2, /* EMACIO11 */ + 2, /* EMACIO12 */ + 2, /* EMACIO13 */ + 0, /* EMACIO14 */ + 0, /* EMACIO15 */ + 0, /* EMACIO16 */ + 0, /* EMACIO17 */ + 0, /* EMACIO18 */ + 0, /* EMACIO19 */ + 3, /* FLASHIO0 */ + 0, /* FLASHIO1 */ + 3, /* FLASHIO2 */ + 3, /* FLASHIO3 */ + 0, /* FLASHIO4 */ + 0, /* FLASHIO5 */ + 0, /* FLASHIO6 */ + 0, /* FLASHIO7 */ + 0, /* FLASHIO8 */ + 3, /* FLASHIO9 */ + 3, /* FLASHIO10 */ + 3, /* FLASHIO11 */ + 0, /* GENERALIO0 */ + 1, /* GENERALIO1 */ + 1, /* GENERALIO2 */ + 1, /* GENERALIO3 */ + 1, /* GENERALIO4 */ + 0, /* GENERALIO5 */ + 0, /* GENERALIO6 */ + 1, /* GENERALIO7 */ + 1, /* GENERALIO8 */ + 0, /* GENERALIO9 */ + 0, /* GENERALIO10 */ + 0, /* GENERALIO11 */ + 0, /* GENERALIO12 */ + 0, /* GENERALIO13 */ + 0, /* GENERALIO14 */ + 1, /* GENERALIO15 */ + 1, /* GENERALIO16 */ + 1, /* GENERALIO17 */ + 1, /* GENERALIO18 */ + 0, /* GENERALIO19 */ + 0, /* GENERALIO20 */ + 0, /* GENERALIO21 */ + 0, /* GENERALIO22 */ + 0, /* GENERALIO23 */ + 0, /* GENERALIO24 */ + 0, /* GENERALIO25 */ + 0, /* GENERALIO26 */ + 0, /* GENERALIO27 */ + 0, /* GENERALIO28 */ + 0, /* GENERALIO29 */ + 0, /* GENERALIO30 */ + 0, /* GENERALIO31 */ + 2, /* MIXED1IO0 */ + 2, /* MIXED1IO1 */ + 2, /* MIXED1IO2 */ + 2, /* MIXED1IO3 */ + 2, /* MIXED1IO4 */ + 2, /* MIXED1IO5 */ + 2, /* MIXED1IO6 */ + 2, /* MIXED1IO7 */ + 2, /* MIXED1IO8 */ + 2, /* MIXED1IO9 */ + 2, /* MIXED1IO10 */ + 2, /* MIXED1IO11 */ + 2, /* MIXED1IO12 */ + 2, /* MIXED1IO13 */ + 0, /* MIXED1IO14 */ + 0, /* MIXED1IO15 */ + 0, /* MIXED1IO16 */ + 0, /* MIXED1IO17 */ + 0, /* MIXED1IO18 */ + 0, /* MIXED1IO19 */ + 0, /* MIXED1IO20 */ + 0, /* MIXED1IO21 */ + 0, /* MIXED2IO0 */ + 0, /* MIXED2IO1 */ + 0, /* MIXED2IO2 */ + 0, /* MIXED2IO3 */ + 0, /* MIXED2IO4 */ + 0, /* MIXED2IO5 */ + 0, /* MIXED2IO6 */ + 0, /* MIXED2IO7 */ + 0, /* GPLINMUX48 */ + 0, /* GPLINMUX49 */ + 0, /* GPLINMUX50 */ + 0, /* GPLINMUX51 */ + 0, /* GPLINMUX52 */ + 0, /* GPLINMUX53 */ + 0, /* GPLINMUX54 */ + 0, /* GPLINMUX55 */ + 0, /* GPLINMUX56 */ + 0, /* GPLINMUX57 */ + 0, /* GPLINMUX58 */ + 0, /* GPLINMUX59 */ + 0, /* GPLINMUX60 */ + 0, /* GPLINMUX61 */ + 0, /* GPLINMUX62 */ + 0, /* GPLINMUX63 */ + 0, /* GPLINMUX64 */ + 0, /* GPLINMUX65 */ + 0, /* GPLINMUX66 */ + 0, /* GPLINMUX67 */ + 0, /* GPLINMUX68 */ + 0, /* GPLINMUX69 */ + 0, /* GPLINMUX70 */ + 1, /* GPLMUX0 */ + 1, /* GPLMUX1 */ + 1, /* GPLMUX2 */ + 1, /* GPLMUX3 */ + 1, /* GPLMUX4 */ + 1, /* GPLMUX5 */ + 1, /* GPLMUX6 */ + 1, /* GPLMUX7 */ + 1, /* GPLMUX8 */ + 1, /* GPLMUX9 */ + 1, /* GPLMUX10 */ + 1, /* GPLMUX11 */ + 1, /* GPLMUX12 */ + 1, /* GPLMUX13 */ + 1, /* GPLMUX14 */ + 1, /* GPLMUX15 */ + 1, /* GPLMUX16 */ + 1, /* GPLMUX17 */ + 1, /* GPLMUX18 */ + 1, /* GPLMUX19 */ + 1, /* GPLMUX20 */ + 1, /* GPLMUX21 */ + 1, /* GPLMUX22 */ + 1, /* GPLMUX23 */ + 1, /* GPLMUX24 */ + 1, /* GPLMUX25 */ + 1, /* GPLMUX26 */ + 1, /* GPLMUX27 */ + 1, /* GPLMUX28 */ + 1, /* GPLMUX29 */ + 1, /* GPLMUX30 */ + 1, /* GPLMUX31 */ + 1, /* GPLMUX32 */ + 1, /* GPLMUX33 */ + 1, /* GPLMUX34 */ + 1, /* GPLMUX35 */ + 1, /* GPLMUX36 */ + 1, /* GPLMUX37 */ + 1, /* GPLMUX38 */ + 1, /* GPLMUX39 */ + 1, /* GPLMUX40 */ + 1, /* GPLMUX41 */ + 1, /* GPLMUX42 */ + 1, /* GPLMUX43 */ + 1, /* GPLMUX44 */ + 1, /* GPLMUX45 */ + 1, /* GPLMUX46 */ + 1, /* GPLMUX47 */ + 1, /* GPLMUX48 */ + 1, /* GPLMUX49 */ + 1, /* GPLMUX50 */ + 1, /* GPLMUX51 */ + 1, /* GPLMUX52 */ + 1, /* GPLMUX53 */ + 1, /* GPLMUX54 */ + 1, /* GPLMUX55 */ + 1, /* GPLMUX56 */ + 1, /* GPLMUX57 */ + 1, /* GPLMUX58 */ + 1, /* GPLMUX59 */ + 1, /* GPLMUX60 */ + 1, /* GPLMUX61 */ + 1, /* GPLMUX62 */ + 1, /* GPLMUX63 */ + 1, /* GPLMUX64 */ + 1, /* GPLMUX65 */ + 1, /* GPLMUX66 */ + 1, /* GPLMUX67 */ + 1, /* GPLMUX68 */ + 1, /* GPLMUX69 */ + 1, /* GPLMUX70 */ + 0, /* NANDUSEFPGA */ + 0, /* UART0USEFPGA */ + 0, /* RGMII1USEFPGA */ + 0, /* SPIS0USEFPGA */ + 0, /* CAN0USEFPGA */ + 0, /* I2C0USEFPGA */ + 0, /* SDMMCUSEFPGA */ + 0, /* QSPIUSEFPGA */ + 0, /* SPIS1USEFPGA */ + 0, /* RGMII0USEFPGA */ + 0, /* UART1USEFPGA */ + 0, /* CAN1USEFPGA */ + 0, /* USB1USEFPGA */ + 0, /* I2C3USEFPGA */ + 0, /* I2C2USEFPGA */ + 0, /* I2C1USEFPGA */ + 0, /* SPIM1USEFPGA */ + 0, /* USB0USEFPGA */ + 0 /* SPIM0USEFPGA */ +}; +#endif /* __SOCFPGA_PINMUX_CONFIG_H__ */ diff --git a/board/terasic/de0/qts/pll_config.h b/board/terasic/de0/qts/pll_config.h new file mode 100644 index 0000000..6e5b998 --- /dev/null +++ b/board/terasic/de0/qts/pll_config.h @@ -0,0 +1,85 @@ +/* + * Altera SoCFPGA Clock and PLL configuration + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef _PRELOADER_PLL_CONFIG_H_ +#define _PRELOADER_PLL_CONFIG_H_ + +#define CONFIG_HPS_DBCTRL_STAYOSC1 1 + +#define CONFIG_HPS_MAINPLLGRP_VCO_DENOM 0 +#define CONFIG_HPS_MAINPLLGRP_VCO_NUMER 73 +#define CONFIG_HPS_MAINPLLGRP_MPUCLK_CNT 0 +#define CONFIG_HPS_MAINPLLGRP_MAINCLK_CNT 0 +#define CONFIG_HPS_MAINPLLGRP_DBGATCLK_CNT 0 +#define CONFIG_HPS_MAINPLLGRP_MAINQSPICLK_CNT 511 +#define CONFIG_HPS_MAINPLLGRP_MAINNANDSDMMCCLK_CNT 511 +#define CONFIG_HPS_MAINPLLGRP_CFGS2FUSER0CLK_CNT 18 +#define CONFIG_HPS_MAINPLLGRP_MAINDIV_L3MPCLK 1 +#define CONFIG_HPS_MAINPLLGRP_MAINDIV_L3SPCLK 1 +#define CONFIG_HPS_MAINPLLGRP_MAINDIV_L4MPCLK 1 +#define CONFIG_HPS_MAINPLLGRP_MAINDIV_L4SPCLK 1 +#define CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGATCLK 0 +#define CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGCLK 1 +#define CONFIG_HPS_MAINPLLGRP_TRACEDIV_TRACECLK 0 +#define CONFIG_HPS_MAINPLLGRP_L4SRC_L4MP 1 +#define CONFIG_HPS_MAINPLLGRP_L4SRC_L4SP 1 + +#define CONFIG_HPS_PERPLLGRP_VCO_DENOM 0 +#define CONFIG_HPS_PERPLLGRP_VCO_NUMER 39 +#define CONFIG_HPS_PERPLLGRP_VCO_PSRC 0 +#define CONFIG_HPS_PERPLLGRP_EMAC0CLK_CNT 511 +#define CONFIG_HPS_PERPLLGRP_EMAC1CLK_CNT 3 +#define CONFIG_HPS_PERPLLGRP_PERQSPICLK_CNT 511 +#define CONFIG_HPS_PERPLLGRP_PERNANDSDMMCCLK_CNT 4 +#define CONFIG_HPS_PERPLLGRP_PERBASECLK_CNT 4 +#define CONFIG_HPS_PERPLLGRP_S2FUSER1CLK_CNT 19 +#define CONFIG_HPS_PERPLLGRP_DIV_USBCLK 0 +#define CONFIG_HPS_PERPLLGRP_DIV_SPIMCLK 0 +#define CONFIG_HPS_PERPLLGRP_DIV_CAN0CLK 4 +#define CONFIG_HPS_PERPLLGRP_DIV_CAN1CLK 4 +#define CONFIG_HPS_PERPLLGRP_GPIODIV_GPIODBCLK 6249 +#define CONFIG_HPS_PERPLLGRP_SRC_SDMMC 2 +#define CONFIG_HPS_PERPLLGRP_SRC_NAND 2 +#define CONFIG_HPS_PERPLLGRP_SRC_QSPI 1 + +#define CONFIG_HPS_SDRPLLGRP_VCO_DENOM 0 +#define CONFIG_HPS_SDRPLLGRP_VCO_NUMER 31 +#define CONFIG_HPS_SDRPLLGRP_VCO_SSRC 0 +#define CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_CNT 1 +#define CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_PHASE 0 +#define CONFIG_HPS_SDRPLLGRP_DDR2XDQSCLK_CNT 0 +#define CONFIG_HPS_SDRPLLGRP_DDR2XDQSCLK_PHASE 0 +#define CONFIG_HPS_SDRPLLGRP_DDRDQCLK_CNT 1 +#define CONFIG_HPS_SDRPLLGRP_DDRDQCLK_PHASE 4 +#define CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_CNT 5 +#define CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_PHASE 0 + +#define CONFIG_HPS_CLK_OSC1_HZ 25000000 +#define CONFIG_HPS_CLK_OSC2_HZ 25000000 +#define CONFIG_HPS_CLK_F2S_SDR_REF_HZ 0 +#define CONFIG_HPS_CLK_F2S_PER_REF_HZ 0 +#define CONFIG_HPS_CLK_MAINVCO_HZ 1850000000 +#define CONFIG_HPS_CLK_PERVCO_HZ 1000000000 +#define CONFIG_HPS_CLK_SDRVCO_HZ 800000000 +#define CONFIG_HPS_CLK_EMAC0_HZ 1953125 +#define CONFIG_HPS_CLK_EMAC1_HZ 250000000 +#define CONFIG_HPS_CLK_USBCLK_HZ 200000000 +#define CONFIG_HPS_CLK_NAND_HZ 50000000 +#define CONFIG_HPS_CLK_SDMMC_HZ 200000000 +#define CONFIG_HPS_CLK_QSPI_HZ 3613281 +#define CONFIG_HPS_CLK_SPIM_HZ 200000000 +#define CONFIG_HPS_CLK_CAN0_HZ 12500000 +#define CONFIG_HPS_CLK_CAN1_HZ 12500000 +#define CONFIG_HPS_CLK_GPIODB_HZ 32000 +#define CONFIG_HPS_CLK_L4_MP_HZ 100000000 +#define CONFIG_HPS_CLK_L4_SP_HZ 100000000 + +#define CONFIG_HPS_ALTERAGRP_MPUCLK 1 +#define CONFIG_HPS_ALTERAGRP_MAINCLK 4 +#define CONFIG_HPS_ALTERAGRP_DBGATCLK 4 + +#endif /* _PRELOADER_PLL_CONFIG_H_ */ + diff --git a/board/terasic/de0/qts/sdram_config.h b/board/terasic/de0/qts/sdram_config.h new file mode 100644 index 0000000..7084797 --- /dev/null +++ b/board/terasic/de0/qts/sdram_config.h @@ -0,0 +1,342 @@ +/* + * Altera SoCFPGA SDRAM configuration + * + * SPDX-License-Identifier: BSD-3-Clause + */ +#ifndef __SDRAM_CONFIG_H +#define __SDRAM_CONFIG_H + +#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE 2 +#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL 8 +#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER 0 +#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN 0 +#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCCORREN 0 +#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_REORDEREN 1 +#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_STARVELIMIT 10 +#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_DQSTRKEN 0 +#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_NODMPINS 0 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCWL 7 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_AL 0 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCL 7 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRRD 3 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TFAW 15 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRFC 120 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TREFI 3120 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRCD 6 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRP 6 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWR 6 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWTR 4 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRTP 3 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRAS 14 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRC 20 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TMRD 4 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TCCD 4 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_SELFRFSHEXIT 512 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_PWRDOWNEXIT 3 +#define CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_AUTOPDCYCLES 0 +#define CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_CLKDISABLECYCLES 8 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_COLBITS 10 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_ROWBITS 15 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_BANKBITS 3 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_CSBITS 1 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMIFWIDTH_IFWIDTH 32 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMDEVWIDTH_DEVWIDTH 8 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMINTR_INTREN 0 +#define CONFIG_HPS_SDR_CTRLCFG_LOWPWREQ_SELFRFSHMASK 3 +#define CONFIG_HPS_SDR_CTRLCFG_STATICCFG_MEMBL 2 +#define CONFIG_HPS_SDR_CTRLCFG_STATICCFG_USEECCASDATA 0 +#define CONFIG_HPS_SDR_CTRLCFG_CTRLWIDTH_CTRLWIDTH 2 +#define CONFIG_HPS_SDR_CTRLCFG_PORTCFG_AUTOPCHEN 0 +#define CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_SYNCMODE 0 +#define CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_INCSYNC 0 +#define CONFIG_HPS_SDR_CTRLCFG_MPPRIORITY_USERPRIORITY 0x3FFD1088 +#define CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_0_STATICWEIGHT_31_0 0x21084210 +#define CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_STATICWEIGHT_49_32 0x1EF84 +#define CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_SUMOFWEIGHT_13_0 0x2020 +#define CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_2_SUMOFWEIGHT_45_14 0x0 +#define CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_3_SUMOFWEIGHT_63_46 0xF800 +#define CONFIG_HPS_SDR_CTRLCFG_PHYCTRL_PHYCTRL_0 0x200 + +#define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH 0x44555 +#define CONFIG_HPS_SDR_CTRLCFG_CPORTWMAP_CPORTWMAP 0x2C011000 +#define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP 0xB00088 +#define CONFIG_HPS_SDR_CTRLCFG_RFIFOCMAP_RFIFOCMAP 0x760210 +#define CONFIG_HPS_SDR_CTRLCFG_WFIFOCMAP_WFIFOCMAP 0x980543 +#define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR 0x5A56A +#define CONFIG_HPS_SDR_CTRLCFG_MPPACING_0_THRESHOLD1_31_0 0x20820820 +#define CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD1_59_32 0x8208208 +#define CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD2_3_0 0 +#define CONFIG_HPS_SDR_CTRLCFG_MPPACING_2_THRESHOLD2_35_4 0x41041041 +#define CONFIG_HPS_SDR_CTRLCFG_MPPACING_3_THRESHOLD2_59_36 0x410410 +#define CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0 0x01010101 +#define CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32 0x01010101 +#define CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64 0x0101 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMODT_READ 0 +#define CONFIG_HPS_SDR_CTRLCFG_DRAMODT_WRITE 1 +#define CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST_READ_PORT_USED 0x1 +#define CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST_WRITE_PORT_USED 0x1 +#define CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST_COMMAND_PORT_USED 0x3 +#define CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST 0x311 + +/* Sequencer auto configuration */ +#define RW_MGR_ACTIVATE_0_AND_1 0x0D +#define RW_MGR_ACTIVATE_0_AND_1_WAIT1 0x0E +#define RW_MGR_ACTIVATE_0_AND_1_WAIT2 0x10 +#define RW_MGR_ACTIVATE_1 0x0F +#define RW_MGR_CLEAR_DQS_ENABLE 0x49 +#define RW_MGR_GUARANTEED_READ 0x4C +#define RW_MGR_GUARANTEED_READ_CONT 0x54 +#define RW_MGR_GUARANTEED_WRITE 0x18 +#define RW_MGR_GUARANTEED_WRITE_WAIT0 0x1B +#define RW_MGR_GUARANTEED_WRITE_WAIT1 0x1F +#define RW_MGR_GUARANTEED_WRITE_WAIT2 0x19 +#define RW_MGR_GUARANTEED_WRITE_WAIT3 0x1D +#define RW_MGR_IDLE 0x00 +#define RW_MGR_IDLE_LOOP1 0x7B +#define RW_MGR_IDLE_LOOP2 0x7A +#define RW_MGR_INIT_RESET_0_CKE_0 0x6F +#define RW_MGR_INIT_RESET_1_CKE_0 0x74 +#define RW_MGR_LFSR_WR_RD_BANK_0 0x22 +#define RW_MGR_LFSR_WR_RD_BANK_0_DATA 0x25 +#define RW_MGR_LFSR_WR_RD_BANK_0_DQS 0x24 +#define RW_MGR_LFSR_WR_RD_BANK_0_NOP 0x23 +#define RW_MGR_LFSR_WR_RD_BANK_0_WAIT 0x32 +#define RW_MGR_LFSR_WR_RD_BANK_0_WL_1 0x21 +#define RW_MGR_LFSR_WR_RD_DM_BANK_0 0x36 +#define RW_MGR_LFSR_WR_RD_DM_BANK_0_DATA 0x39 +#define RW_MGR_LFSR_WR_RD_DM_BANK_0_DQS 0x38 +#define RW_MGR_LFSR_WR_RD_DM_BANK_0_NOP 0x37 +#define RW_MGR_LFSR_WR_RD_DM_BANK_0_WAIT 0x46 +#define RW_MGR_LFSR_WR_RD_DM_BANK_0_WL_1 0x35 +#define RW_MGR_MRS0_DLL_RESET 0x02 +#define RW_MGR_MRS0_DLL_RESET_MIRR 0x08 +#define RW_MGR_MRS0_USER 0x07 +#define RW_MGR_MRS0_USER_MIRR 0x0C +#define RW_MGR_MRS1 0x03 +#define RW_MGR_MRS1_MIRR 0x09 +#define RW_MGR_MRS2 0x04 +#define RW_MGR_MRS2_MIRR 0x0A +#define RW_MGR_MRS3 0x05 +#define RW_MGR_MRS3_MIRR 0x0B +#define RW_MGR_PRECHARGE_ALL 0x12 +#define RW_MGR_READ_B2B 0x59 +#define RW_MGR_READ_B2B_WAIT1 0x61 +#define RW_MGR_READ_B2B_WAIT2 0x6B +#define RW_MGR_REFRESH_ALL 0x14 +#define RW_MGR_RETURN 0x01 +#define RW_MGR_SGLE_READ 0x7D +#define RW_MGR_ZQCL 0x06 + +/* Sequencer defines configuration */ +#define AFI_RATE_RATIO 1 +#define CALIB_LFIFO_OFFSET 8 +#define CALIB_VFIFO_OFFSET 6 +#define ENABLE_SUPER_QUICK_CALIBRATION 0 +#define IO_DELAY_PER_DCHAIN_TAP 25 +#define IO_DELAY_PER_DQS_EN_DCHAIN_TAP 25 +#define IO_DELAY_PER_OPA_TAP 312 +#define IO_DLL_CHAIN_LENGTH 8 +#define IO_DQDQS_OUT_PHASE_MAX 0 +#define IO_DQS_EN_DELAY_MAX 31 +#define IO_DQS_EN_DELAY_OFFSET 0 +#define IO_DQS_EN_PHASE_MAX 7 +#define IO_DQS_IN_DELAY_MAX 31 +#define IO_DQS_IN_RESERVE 4 +#define IO_DQS_OUT_RESERVE 4 +#define IO_IO_IN_DELAY_MAX 31 +#define IO_IO_OUT1_DELAY_MAX 31 +#define IO_IO_OUT2_DELAY_MAX 0 +#define IO_SHIFT_DQS_EN_WHEN_SHIFT_DQS 0 +#define MAX_LATENCY_COUNT_WIDTH 5 +#define READ_VALID_FIFO_SIZE 16 +#define REG_FILE_INIT_SEQ_SIGNATURE 0x5555048d +#define RW_MGR_MEM_ADDRESS_MIRRORING 0 +#define RW_MGR_MEM_DATA_MASK_WIDTH 4 +#define RW_MGR_MEM_DATA_WIDTH 32 +#define RW_MGR_MEM_DQ_PER_READ_DQS 8 +#define RW_MGR_MEM_DQ_PER_WRITE_DQS 8 +#define RW_MGR_MEM_IF_READ_DQS_WIDTH 4 +#define RW_MGR_MEM_IF_WRITE_DQS_WIDTH 4 +#define RW_MGR_MEM_NUMBER_OF_CS_PER_DIMM 1 +#define RW_MGR_MEM_NUMBER_OF_RANKS 1 +#define RW_MGR_MEM_VIRTUAL_GROUPS_PER_READ_DQS 1 +#define RW_MGR_MEM_VIRTUAL_GROUPS_PER_WRITE_DQS 1 +#define RW_MGR_TRUE_MEM_DATA_MASK_WIDTH 4 +#define TINIT_CNTR0_VAL 99 +#define TINIT_CNTR1_VAL 32 +#define TINIT_CNTR2_VAL 32 +#define TRESET_CNTR0_VAL 99 +#define TRESET_CNTR1_VAL 99 +#define TRESET_CNTR2_VAL 10 + +/* Sequencer ac_rom_init configuration */ +const u32 ac_rom_init[] = { + 0x20700000, + 0x20780000, + 0x10080431, + 0x10080530, + 0x10090044, + 0x100a0010, + 0x100b0000, + 0x10380400, + 0x10080449, + 0x100804c8, + 0x100a0024, + 0x10090008, + 0x100b0000, + 0x30780000, + 0x38780000, + 0x30780000, + 0x10680000, + 0x106b0000, + 0x10280400, + 0x10480000, + 0x1c980000, + 0x1c9b0000, + 0x1c980008, + 0x1c9b0008, + 0x38f80000, + 0x3cf80000, + 0x38780000, + 0x18180000, + 0x18980000, + 0x13580000, + 0x135b0000, + 0x13580008, + 0x135b0008, + 0x33780000, + 0x10580008, + 0x10780000 +}; + +/* Sequencer inst_rom_init configuration */ +const u32 inst_rom_init[] = { + 0x80000, + 0x80680, + 0x8180, + 0x8200, + 0x8280, + 0x8300, + 0x8380, + 0x8100, + 0x8480, + 0x8500, + 0x8580, + 0x8600, + 0x8400, + 0x800, + 0x8680, + 0x880, + 0xa680, + 0x80680, + 0x900, + 0x80680, + 0x980, + 0xa680, + 0x8680, + 0x80680, + 0xb68, + 0xcce8, + 0xae8, + 0x8ce8, + 0xb88, + 0xec88, + 0xa08, + 0xac88, + 0x80680, + 0xce00, + 0xcd80, + 0xe700, + 0xc00, + 0x20ce0, + 0x20ce0, + 0x20ce0, + 0x20ce0, + 0xd00, + 0x680, + 0x680, + 0x680, + 0x680, + 0x60e80, + 0x61080, + 0x61080, + 0x61080, + 0xa680, + 0x8680, + 0x80680, + 0xce00, + 0xcd80, + 0xe700, + 0xc00, + 0x30ce0, + 0x30ce0, + 0x30ce0, + 0x30ce0, + 0xd00, + 0x680, + 0x680, + 0x680, + 0x680, + 0x70e80, + 0x71080, + 0x71080, + 0x71080, + 0xa680, + 0x8680, + 0x80680, + 0x1158, + 0x6d8, + 0x80680, + 0x1168, + 0x7e8, + 0x7e8, + 0x87e8, + 0x40fe8, + 0x410e8, + 0x410e8, + 0x410e8, + 0x1168, + 0x7e8, + 0x7e8, + 0xa7e8, + 0x80680, + 0x40e88, + 0x41088, + 0x41088, + 0x41088, + 0x40f68, + 0x410e8, + 0x410e8, + 0x410e8, + 0xa680, + 0x40fe8, + 0x410e8, + 0x410e8, + 0x410e8, + 0x41008, + 0x41088, + 0x41088, + 0x41088, + 0x1100, + 0xc680, + 0x8680, + 0xe680, + 0x80680, + 0x0, + 0x8000, + 0xa000, + 0xc000, + 0x80000, + 0x80, + 0x8080, + 0xa080, + 0xc080, + 0x80080, + 0x9180, + 0x8680, + 0xa680, + 0x80680, + 0x40f08, + 0x80680 +}; +#endif /*#ifndef__SDRAM_CONFIG_H */ diff --git a/board/terasic/de0/socfpga.c b/board/terasic/de0/socfpga.c new file mode 100644 index 0000000..3ccc2a7 --- /dev/null +++ b/board/terasic/de0/socfpga.c @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2012 Altera Corporation <www.altera.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> + +DECLARE_GLOBAL_DATA_PTR; + +void s_init(void) {} + +/* + * Miscellaneous platform dependent initialisations + */ +int board_init(void) +{ + /* Address of boot parameters for ATAG (if ATAG is used) */ + gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; + + return 0; +} diff --git a/configs/socfpga_de0_defconfig b/configs/socfpga_de0_defconfig new file mode 100644 index 0000000..000f322 --- /dev/null +++ b/configs/socfpga_de0_defconfig @@ -0,0 +1,21 @@ +CONFIG_ARM=y +CONFIG_ARCH_SOCFPGA=y +CONFIG_TARGET_SOCFPGA_CYCLONE5=y +CONFIG_TARGET_SOCFPGA_TERASIC_DE0=y +CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_sockit" +CONFIG_SPL=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +CONFIG_OF_CONTROL=y +CONFIG_DM_ETH=y +CONFIG_NETDEVICES=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_DM_GPIO=y +CONFIG_DWAPB_GPIO=y +CONFIG_SPL_DM=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_DM_SEQ_ALIAS=y +CONFIG_SPL_SIMPLE_BUS=y +CONFIG_SPL_STACK_R=y +CONFIG_SPL_STACK_R_ADDR=0x00800000 +CONFIG_SYS_MALLOC_F_LEN=0x2000 diff --git a/include/configs/socfpga_de0.h b/include/configs/socfpga_de0.h new file mode 100644 index 0000000..47e18ba --- /dev/null +++ b/include/configs/socfpga_de0.h @@ -0,0 +1,88 @@ +/* + * 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/socfpga_base_addrs.h> + +/* U-Boot Commands */ +#define CONFIG_SYS_NO_FLASH +#define CONFIG_DOS_PARTITION +#define CONFIG_FAT_WRITE +#define CONFIG_HW_WATCHDOG + +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_BOOTZ +#define CONFIG_CMD_CACHE +#define CONFIG_CMD_DFU +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_EXT4 +#define CONFIG_CMD_EXT4_WRITE +#define CONFIG_CMD_FAT +#define CONFIG_CMD_FS_GENERIC +#define CONFIG_CMD_GPIO +#define CONFIG_CMD_GREPENV +#define CONFIG_CMD_MII +#define CONFIG_CMD_MMC +#define CONFIG_CMD_PING +#define CONFIG_CMD_USB +#define CONFIG_CMD_USB_MASS_STORAGE + +/* Memory configurations */ +#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ + +/* Booting Linux */ +#define CONFIG_BOOTDELAY 3 +#define CONFIG_BOOTFILE "fitImage" +#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) +#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET +#define CONFIG_BOOTCOMMAND "run ramboot" +#else +#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" +#endif +#define CONFIG_LOADADDR 0x01000000 +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR + +/* Ethernet on SoC (EMAC) */ +#if defined(CONFIG_CMD_NET) + +/* PHY */ +#define CONFIG_PHY_MICREL +#define CONFIG_PHY_MICREL_KSZ9031 + +#endif + +/* USB */ +#ifdef CONFIG_CMD_USB +#define CONFIG_USB_DWC2_REG_ADDR SOCFPGA_USB1_ADDRESS +#endif +#define CONFIG_G_DNL_MANUFACTURER "Terasic" + +/* Extra Environment */ +#define CONFIG_HOSTNAME socfpga_cyclone5 + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "verify=n\0" \ + "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ + "bootm ${loadaddr} - ${fdt_addr}\0" \ + "bootimage=zImage\0" \ + "fdt_addr=100\0" \ + "fdtimage=socfpga.dtb\0" \ + "fsloadcmd=ext2load\0" \ + "bootm ${loadaddr} - ${fdt_addr}\0" \ + "mmcroot=/dev/mmcblk0p2\0" \ + "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ + " root=${mmcroot} rw rootwait;" \ + "bootz ${loadaddr} - ${fdt_addr}\0" \ + "mmcload=mmc rescan;" \ + "load mmc 0:1 ${loadaddr} ${bootimage};" \ + "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ + +/* The rest of the configuration is shared */ +#include <configs/socfpga_common.h> + +#endif /* __CONFIG_TERASIC_DE0_H__ */