diff mbox series

[U-Boot,67/93] arm: Remove socfpga_stratix10 board

Message ID 20181119155413.158098-68-sjg@chromium.org
State RFC
Delegated to: Tom Rini
Headers show
Series dm: Move towards completing CONFIG_BLK migration | expand

Commit Message

Simon Glass Nov. 19, 2018, 3:53 p.m. UTC
This board has not been converted to CONFIG_DM_BLK by the deadline.
Remove it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 board/altera/stratix10-socdk/MAINTAINERS  |   7 -
 board/altera/stratix10-socdk/Makefile     |   7 -
 board/altera/stratix10-socdk/socfpga.c    |   7 -
 configs/socfpga_stratix10_defconfig       |  59 ------
 include/configs/socfpga_stratix10_socdk.h | 221 ----------------------
 5 files changed, 301 deletions(-)
 delete mode 100644 board/altera/stratix10-socdk/MAINTAINERS
 delete mode 100644 board/altera/stratix10-socdk/Makefile
 delete mode 100644 board/altera/stratix10-socdk/socfpga.c
 delete mode 100644 configs/socfpga_stratix10_defconfig
 delete mode 100644 include/configs/socfpga_stratix10_socdk.h

Comments

Ley Foon Tan Nov. 21, 2018, 1:01 a.m. UTC | #1
On Tue, Nov 20, 2018 at 1:27 AM Simon Glass <sjg@chromium.org> wrote:
>
> This board has not been converted to CONFIG_DM_BLK by the deadline.
> Remove it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  board/altera/stratix10-socdk/MAINTAINERS  |   7 -
>  board/altera/stratix10-socdk/Makefile     |   7 -
>  board/altera/stratix10-socdk/socfpga.c    |   7 -
>  configs/socfpga_stratix10_defconfig       |  59 ------
>  include/configs/socfpga_stratix10_socdk.h | 221 ----------------------
>  5 files changed, 301 deletions(-)
>  delete mode 100644 board/altera/stratix10-socdk/MAINTAINERS
>  delete mode 100644 board/altera/stratix10-socdk/Makefile
>  delete mode 100644 board/altera/stratix10-socdk/socfpga.c
>  delete mode 100644 configs/socfpga_stratix10_defconfig
>  delete mode 100644 include/configs/socfpga_stratix10_socdk.h
>
NAK

Are you refer to CONFIG_BLK?

After "make socfpga_stratix10_defconfig", CONFIG_BLK and CONIF_DM are enabled.


$ make socfpga_stratix10_defconfig
#
# configuration written to .config
#

$ cat .config | grep CONFIG_BLK
CONFIG_BLK=y

$ cat .config | grep -w CONFIG_DM
CONFIG_DM=y

$ cat .config | grep -w CONFIG_DM_MMC
CONFIG_DM_MMC=y



CONFIG_BLK is not in socfpga_stratix10_defconfig because it is enabled
by default if CONFIG_DM_MMC is enabled.

In drivers/block/Kconfig:

config BLK
        bool "Support block devices"
        depends on DM
        default y if DM_MMC


Regards
Ley Foon
Simon Glass Nov. 22, 2018, 8:50 p.m. UTC | #2
Hi,

On Tue, 20 Nov 2018 at 18:01, Ley Foon Tan <lftan.linux@gmail.com> wrote:
>
> On Tue, Nov 20, 2018 at 1:27 AM Simon Glass <sjg@chromium.org> wrote:
> >
> > This board has not been converted to CONFIG_DM_BLK by the deadline.
> > Remove it.
> >
> > Signed-off-by: Simon Glass <sjg@chromium.org>
> > ---
> >
> >  board/altera/stratix10-socdk/MAINTAINERS  |   7 -
> >  board/altera/stratix10-socdk/Makefile     |   7 -
> >  board/altera/stratix10-socdk/socfpga.c    |   7 -
> >  configs/socfpga_stratix10_defconfig       |  59 ------
> >  include/configs/socfpga_stratix10_socdk.h | 221 ----------------------
> >  5 files changed, 301 deletions(-)
> >  delete mode 100644 board/altera/stratix10-socdk/MAINTAINERS
> >  delete mode 100644 board/altera/stratix10-socdk/Makefile
> >  delete mode 100644 board/altera/stratix10-socdk/socfpga.c
> >  delete mode 100644 configs/socfpga_stratix10_defconfig
> >  delete mode 100644 include/configs/socfpga_stratix10_socdk.h
> >
> NAK
>
> Are you refer to CONFIG_BLK?
>

Yes that's right

> After "make socfpga_stratix10_defconfig", CONFIG_BLK and CONIF_DM are enabled.
>
>
> $ make socfpga_stratix10_defconfig
> #
> # configuration written to .config
> #
>
> $ cat .config | grep CONFIG_BLK
> CONFIG_BLK=y
>
> $ cat .config | grep -w CONFIG_DM
> CONFIG_DM=y
>
> $ cat .config | grep -w CONFIG_DM_MMC
> CONFIG_DM_MMC=y
>
>
>
> CONFIG_BLK is not in socfpga_stratix10_defconfig because it is enabled
> by default if CONFIG_DM_MMC is enabled.
>
> In drivers/block/Kconfig:
>
> config BLK
>         bool "Support block devices"
>         depends on DM
>         default y if DM_MMC
>
The problem here is in SPL - I removed the 'default y' for SPL_BLK.
This was because it created a lot more breakages.

However, I think it is best that I put that back, and require boards
that doesn't support CONFIG_BLK in SPL to remove it themselves. It
will require more work now, but in the long run, defaulting to on in
SPL seems better.

So your board will be fine, sorry for the trouble.

Regards,
Simon
Tom Rini Nov. 22, 2018, 11:25 p.m. UTC | #3
On Thu, Nov 22, 2018 at 01:50:26PM -0700, Simon Glass wrote:
> Hi,
> 
> On Tue, 20 Nov 2018 at 18:01, Ley Foon Tan <lftan.linux@gmail.com> wrote:
> >
> > On Tue, Nov 20, 2018 at 1:27 AM Simon Glass <sjg@chromium.org> wrote:
> > >
> > > This board has not been converted to CONFIG_DM_BLK by the deadline.
> > > Remove it.
> > >
> > > Signed-off-by: Simon Glass <sjg@chromium.org>
> > > ---
> > >
> > >  board/altera/stratix10-socdk/MAINTAINERS  |   7 -
> > >  board/altera/stratix10-socdk/Makefile     |   7 -
> > >  board/altera/stratix10-socdk/socfpga.c    |   7 -
> > >  configs/socfpga_stratix10_defconfig       |  59 ------
> > >  include/configs/socfpga_stratix10_socdk.h | 221 ----------------------
> > >  5 files changed, 301 deletions(-)
> > >  delete mode 100644 board/altera/stratix10-socdk/MAINTAINERS
> > >  delete mode 100644 board/altera/stratix10-socdk/Makefile
> > >  delete mode 100644 board/altera/stratix10-socdk/socfpga.c
> > >  delete mode 100644 configs/socfpga_stratix10_defconfig
> > >  delete mode 100644 include/configs/socfpga_stratix10_socdk.h
> > >
> > NAK
> >
> > Are you refer to CONFIG_BLK?
> >
> 
> Yes that's right
> 
> > After "make socfpga_stratix10_defconfig", CONFIG_BLK and CONIF_DM are enabled.
> >
> >
> > $ make socfpga_stratix10_defconfig
> > #
> > # configuration written to .config
> > #
> >
> > $ cat .config | grep CONFIG_BLK
> > CONFIG_BLK=y
> >
> > $ cat .config | grep -w CONFIG_DM
> > CONFIG_DM=y
> >
> > $ cat .config | grep -w CONFIG_DM_MMC
> > CONFIG_DM_MMC=y
> >
> >
> >
> > CONFIG_BLK is not in socfpga_stratix10_defconfig because it is enabled
> > by default if CONFIG_DM_MMC is enabled.
> >
> > In drivers/block/Kconfig:
> >
> > config BLK
> >         bool "Support block devices"
> >         depends on DM
> >         default y if DM_MMC
> >
> The problem here is in SPL - I removed the 'default y' for SPL_BLK.
> This was because it created a lot more breakages.
> 
> However, I think it is best that I put that back, and require boards
> that doesn't support CONFIG_BLK in SPL to remove it themselves. It
> will require more work now, but in the long run, defaulting to on in
> SPL seems better.
> 
> So your board will be fine, sorry for the trouble.

Note that we're going to need to come up with some sort of compromise
for what we do in SPL as we do have serious size constraints to worry
about.
Simon Glass Nov. 23, 2018, 12:04 p.m. UTC | #4
Hi Tom,

On Thu, 22 Nov 2018 at 16:25, Tom Rini <trini@konsulko.com> wrote:
>
> On Thu, Nov 22, 2018 at 01:50:26PM -0700, Simon Glass wrote:
> > Hi,
> >
> > On Tue, 20 Nov 2018 at 18:01, Ley Foon Tan <lftan.linux@gmail.com> wrote:
> > >
> > > On Tue, Nov 20, 2018 at 1:27 AM Simon Glass <sjg@chromium.org> wrote:
> > > >
> > > > This board has not been converted to CONFIG_DM_BLK by the deadline.
> > > > Remove it.
> > > >
> > > > Signed-off-by: Simon Glass <sjg@chromium.org>
> > > > ---
> > > >
> > > >  board/altera/stratix10-socdk/MAINTAINERS  |   7 -
> > > >  board/altera/stratix10-socdk/Makefile     |   7 -
> > > >  board/altera/stratix10-socdk/socfpga.c    |   7 -
> > > >  configs/socfpga_stratix10_defconfig       |  59 ------
> > > >  include/configs/socfpga_stratix10_socdk.h | 221 ----------------------
> > > >  5 files changed, 301 deletions(-)
> > > >  delete mode 100644 board/altera/stratix10-socdk/MAINTAINERS
> > > >  delete mode 100644 board/altera/stratix10-socdk/Makefile
> > > >  delete mode 100644 board/altera/stratix10-socdk/socfpga.c
> > > >  delete mode 100644 configs/socfpga_stratix10_defconfig
> > > >  delete mode 100644 include/configs/socfpga_stratix10_socdk.h
> > > >
> > > NAK
> > >
> > > Are you refer to CONFIG_BLK?
> > >
> >
> > Yes that's right
> >
> > > After "make socfpga_stratix10_defconfig", CONFIG_BLK and CONIF_DM are enabled.
> > >
> > >
> > > $ make socfpga_stratix10_defconfig
> > > #
> > > # configuration written to .config
> > > #
> > >
> > > $ cat .config | grep CONFIG_BLK
> > > CONFIG_BLK=y
> > >
> > > $ cat .config | grep -w CONFIG_DM
> > > CONFIG_DM=y
> > >
> > > $ cat .config | grep -w CONFIG_DM_MMC
> > > CONFIG_DM_MMC=y
> > >
> > >
> > >
> > > CONFIG_BLK is not in socfpga_stratix10_defconfig because it is enabled
> > > by default if CONFIG_DM_MMC is enabled.
> > >
> > > In drivers/block/Kconfig:
> > >
> > > config BLK
> > >         bool "Support block devices"
> > >         depends on DM
> > >         default y if DM_MMC
> > >
> > The problem here is in SPL - I removed the 'default y' for SPL_BLK.
> > This was because it created a lot more breakages.
> >
> > However, I think it is best that I put that back, and require boards
> > that doesn't support CONFIG_BLK in SPL to remove it themselves. It
> > will require more work now, but in the long run, defaulting to on in
> > SPL seems better.
> >
> > So your board will be fine, sorry for the trouble.
>
> Note that we're going to need to come up with some sort of compromise
> for what we do in SPL as we do have serious size constraints to worry
> about.

Indeed. I think I might need to dig into this a bit. SPL_BLK itself is
about the same size as the legacy code (or was when I do the
conversion) as I was very concerned about size. However if we have
anything using the legacy block stuff, we cannot remove it. This might
need more thought.

Regards,
Simon
diff mbox series

Patch

diff --git a/board/altera/stratix10-socdk/MAINTAINERS b/board/altera/stratix10-socdk/MAINTAINERS
deleted file mode 100644
index 6192bc91746..00000000000
--- a/board/altera/stratix10-socdk/MAINTAINERS
+++ /dev/null
@@ -1,7 +0,0 @@ 
-SOCFPGA BOARD
-M:	Chin-Liang See <chin.liang.see@intel.com>
-M:	Dinh Nguyen <dinh.nguyen@intel.com>
-S:	Maintained
-F:	board/altera/stratix10-socdk/
-F:	include/configs/socfpga_stratix10_socdk.h
-F:	configs/socfpga_stratix10_defconfig
diff --git a/board/altera/stratix10-socdk/Makefile b/board/altera/stratix10-socdk/Makefile
deleted file mode 100644
index 02a9cadf769..00000000000
--- a/board/altera/stratix10-socdk/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@ 
-#
-# Copyright (C) 2016-2017 Intel Corporation <www.intel.com>
-#
-# SPDX-License-Identifier:	GPL-2.0
-#
-
-obj-y	:= socfpga.o
diff --git a/board/altera/stratix10-socdk/socfpga.c b/board/altera/stratix10-socdk/socfpga.c
deleted file mode 100644
index 043fc543f1d..00000000000
--- a/board/altera/stratix10-socdk/socfpga.c
+++ /dev/null
@@ -1,7 +0,0 @@ 
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2016-2018 Intel Corporation <www.intel.com>
- *
- */
-
-#include <common.h>
diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig
deleted file mode 100644
index 5f3d733a8bc..00000000000
--- a/configs/socfpga_stratix10_defconfig
+++ /dev/null
@@ -1,59 +0,0 @@ 
-CONFIG_ARM=y
-CONFIG_ARCH_SOCFPGA=y
-CONFIG_SYS_TEXT_BASE=0x1000
-CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_TARGET_SOCFPGA_STRATIX10_SOCDK=y
-CONFIG_SPL=y
-CONFIG_IDENT_STRING="socfpga_stratix10"
-CONFIG_SPL_FAT_SUPPORT=y
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_BOOTDELAY=5
-CONFIG_SPL_SPI_LOAD=y
-CONFIG_HUSH_PARSER=y
-CONFIG_SYS_PROMPT="SOCFPGA_STRATIX10 # "
-CONFIG_CMD_MEMTEST=y
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_SF=y
-CONFIG_CMD_SPI=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
-CONFIG_OF_EMBED=y
-CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk"
-CONFIG_ENV_IS_IN_MMC=y
-CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_SPL_DM=y
-CONFIG_SPL_DM_SEQ_ALIAS=y
-CONFIG_DM_GPIO=y
-CONFIG_DWAPB_GPIO=y
-CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_DW=y
-CONFIG_DM_MMC=y
-CONFIG_MMC_DW=y
-CONFIG_SPI_FLASH=y
-CONFIG_SPI_FLASH_BAR=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
-CONFIG_PHY_MICREL=y
-CONFIG_PHY_MICREL_KSZ90X1=y
-CONFIG_DM_ETH=y
-CONFIG_ETH_DESIGNWARE=y
-CONFIG_MII=y
-CONFIG_DM_RESET=y
-CONFIG_SPI=y
-CONFIG_CADENCE_QSPI=y
-CONFIG_DESIGNWARE_SPI=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
-CONFIG_USB_DWC2=y
-CONFIG_USB_STORAGE=y
-CONFIG_USE_TINY_PRINTF=y
diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h
deleted file mode 100644
index e190b3d9889..00000000000
--- a/include/configs/socfpga_stratix10_socdk.h
+++ /dev/null
@@ -1,221 +0,0 @@ 
-/* SPDX-License-Identifier: GPL-2.0
- *
- * Copyright (C) 2017-2018 Intel Corporation <www.intel.com>
- *
- */
-
-#ifndef __CONFIG_SOCFGPA_STRATIX10_H__
-#define __CONFIG_SOCFGPA_STRATIX10_H__
-
-#include <asm/arch/base_addr_s10.h>
-#include <asm/arch/handoff_s10.h>
-
-/*
- * U-Boot general configurations
- */
-#define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_TEXT_BASE
-#define CONFIG_LOADADDR			0x2000000
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
-#define CONFIG_REMAKE_ELF
-/* sysmgr.boot_scratch_cold4 & 5 (64bit) will be used for PSCI_CPU_ON call */
-#define CPU_RELEASE_ADDR		0xFFD12210
-#define CONFIG_SYS_CACHELINE_SIZE	64
-#define CONFIG_SYS_MEM_RESERVE_SECURE	0	/* using OCRAM, not DDR */
-
-/*
- * U-Boot console configurations
- */
-#define CONFIG_SYS_MAXARGS		64
-#define CONFIG_SYS_CBSIZE		2048
-#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
-					sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
-/* Extend size of kernel image for uncompression */
-#define CONFIG_SYS_BOOTM_LEN		(32 * 1024 * 1024)
-
-/*
- * U-Boot run time memory configurations
- */
-#define CONFIG_SYS_INIT_RAM_ADDR	0xFFE00000
-#define CONFIG_SYS_INIT_RAM_SIZE	0x40000
-#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR  \
-					+ CONFIG_SYS_INIT_RAM_SIZE \
-					- S10_HANDOFF_SIZE)
-#define CONFIG_SYS_INIT_SP_OFFSET	(CONFIG_SYS_INIT_SP_ADDR)
-#define CONFIG_SYS_MALLOC_LEN		(5 * 1024 * 1024)
-
-/*
- * U-Boot environment configurations
- */
-#define CONFIG_ENV_SIZE			0x1000
-#define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
-#define CONFIG_ENV_OFFSET		512	/* just after the MBR */
-
-/*
- * QSPI support
- */
- #ifdef CONFIG_CADENCE_QSPI
-/* Enable it if you want to use dual-stacked mode */
-#undef CONFIG_SF_DUAL_FLASH
-/*#define CONFIG_QSPI_RBF_ADDR		0x720000*/
-
-/* Flash device info */
-#define CONFIG_SF_DEFAULT_SPEED		(50000000)
-#define CONFIG_SF_DEFAULT_MODE		(SPI_MODE_3 | SPI_RX_QUAD)
-#define CONFIG_SF_DEFAULT_BUS		0
-#define CONFIG_SF_DEFAULT_CS		0
-
-/*#define CONFIG_ENV_IS_IN_SPI_FLASH*/
-#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
-#undef CONFIG_ENV_OFFSET
-#undef CONFIG_ENV_SIZE
-#define CONFIG_ENV_OFFSET		0x710000
-#define CONFIG_ENV_SIZE			(4 * 1024)
-#define CONFIG_ENV_SECT_SIZE		(4 * 1024)
-#endif /* CONFIG_ENV_IS_IN_SPI_FLASH */
-
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT			"nor0=ff705000.spi.0"
-#endif /* CONFIG_SPL_BUILD */
-
-#ifndef __ASSEMBLY__
-unsigned int cm_get_qspi_controller_clk_hz(void);
-#define CONFIG_CQSPI_REF_CLK		cm_get_qspi_controller_clk_hz()
-#endif
-
-#endif /* CONFIG_CADENCE_QSPI */
-
-/*
- * Boot arguments passed to the boot command. The value of
- * CONFIG_BOOTARGS goes into the environment value "bootargs".
- * Do note the value will override also the chosen node in FDT blob.
- */
-#define CONFIG_BOOTARGS "earlycon"
-#define CONFIG_BOOTCOMMAND "run fatscript; run mmcload;run linux_qspi_enable;" \
-			   "run mmcboot"
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
-	"bootfile=Image\0" \
-	"fdt_addr=8000000\0" \
-	"fdtimage=socfpga_stratix10_socdk.dtb\0" \
-	"mmcroot=/dev/mmcblk0p2\0" \
-	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
-		" root=${mmcroot} rw rootwait;" \
-		"booti ${loadaddr} - ${fdt_addr}\0" \
-	"mmcload=mmc rescan;" \
-		"load mmc 0:1 ${loadaddr} ${bootfile};" \
-		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
-	"linux_qspi_enable=if sf probe; then " \
-		"echo Enabling QSPI at Linux DTB...;" \
-		"fdt addr ${fdt_addr}; fdt resize;" \
-		"fdt set /soc/spi@ff8d2000 status okay;" \
-		"fdt set /soc/clkmgr/clocks/qspi_clk clock-frequency " \
-		" ${qspi_clock}; fi; \0" \
-	"scriptaddr=0x02100000\0" \
-	"scriptfile=u-boot.scr\0" \
-	"fatscript=if fatload mmc 0:1 ${scriptaddr} ${scriptfile};" \
-		   "then source ${scriptaddr}; fi\0"
-
-/*
- * Generic Interrupt Controller Definitions
- */
-#define CONFIG_GICV2
-
-/*
- * External memory configurations
- */
-#define PHYS_SDRAM_1			0x0
-#define PHYS_SDRAM_1_SIZE		(1 * 1024 * 1024 * 1024)
-#define CONFIG_SYS_SDRAM_BASE		0
-#define CONFIG_SYS_MEMTEST_START	0
-#define CONFIG_SYS_MEMTEST_END		PHYS_SDRAM_1_SIZE - 0x200000
-
-/*
- * SDRAM controller
- */
-#define CONFIG_ALTERA_SDRAM
-
-/*
- * Serial / UART configurations
- */
-#define CONFIG_SYS_NS16550_CLK		100000000
-#define CONFIG_SYS_NS16550_MEM32
-
-/*
- * Timer & watchdog configurations
- */
-#define COUNTER_FREQUENCY		400000000
-
-/*
- * SDMMC configurations
- */
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_BOUNCE_BUFFER
-#define CONFIG_SYS_MMC_MAX_BLK_COUNT	256
-#endif
-/*
- * Flash configurations
- */
-#define CONFIG_SYS_MAX_FLASH_BANKS	1
-
-/* Ethernet on SoC (EMAC) */
-#if defined(CONFIG_CMD_NET)
-#define CONFIG_DW_ALTDESCRIPTOR
-#endif /* CONFIG_CMD_NET */
-
-/*
- * L4 Watchdog
- */
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_DESIGNWARE_WATCHDOG
-#define CONFIG_DW_WDT_BASE		SOCFPGA_L4WD0_ADDRESS
-#ifndef __ASSEMBLY__
-unsigned int cm_get_l4_sys_free_clk_hz(void);
-#define CONFIG_DW_WDT_CLOCK_KHZ		(cm_get_l4_sys_free_clk_hz() / 1000)
-#endif
-#define CONFIG_WATCHDOG_TIMEOUT_MSECS	3000
-#endif
-
-/*
- * SPL memory layout
- *
- * On chip RAM
- * 0xFFE0_0000 ...... Start of OCRAM
- * SPL code, rwdata
- * empty space
- * 0xFFEx_xxxx ...... Top of stack (grows down)
- * 0xFFEy_yyyy ...... Global Data
- * 0xFFEz_zzzz ...... Malloc prior relocation (size CONFIG_SYS_MALLOC_F_LEN)
- * 0xFFE3_F000 ...... Hardware handdoff blob (size 4KB)
- * 0xFFE3_FFFF ...... End of OCRAM
- *
- * SDRAM
- * 0x0000_0000 ...... Start of SDRAM_1
- * unused / empty space for image loading
- * Size 64MB   ...... MALLOC (size CONFIG_SYS_SPL_MALLOC_SIZE)
- * Size 1MB    ...... BSS (size CONFIG_SPL_BSS_MAX_SIZE)
- * 0x8000_0000 ...... End of SDRAM_1 (assume 2GB)
- *
- */
-#define CONFIG_SPL_TARGET		"spl/u-boot-spl.hex"
-#define CONFIG_SPL_TEXT_BASE		CONFIG_SYS_INIT_RAM_ADDR
-#define CONFIG_SPL_MAX_SIZE		CONFIG_SYS_INIT_RAM_SIZE
-#define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
-#define CONFIG_SPL_BSS_MAX_SIZE		0x100000	/* 1 MB */
-#define CONFIG_SPL_BSS_START_ADDR	(PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE \
-					- CONFIG_SPL_BSS_MAX_SIZE)
-#define CONFIG_SYS_SPL_MALLOC_SIZE	(CONFIG_SYS_MALLOC_LEN)
-#define CONFIG_SYS_SPL_MALLOC_START	(CONFIG_SPL_BSS_START_ADDR \
-					- CONFIG_SYS_SPL_MALLOC_SIZE)
-#define CONFIG_SYS_SPI_U_BOOT_OFFS      0x3C00000
-
-/* SPL SDMMC boot support */
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION	1
-#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME		"u-boot.img"
-
-#endif	/* __CONFIG_H */