mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-09 20:56:16 +09:00
06985289d4
This patch tries to implement a generic watchdog_reset() function that can be used by all boards that want to service the watchdog device in U-Boot. This watchdog servicing is enabled via CONFIG_WATCHDOG. Without this approach, new boards or platforms needed to implement a board specific version of this functionality, mostly copy'ing the same code over and over again into their board or platforms code base. With this new generic function, the scattered other functions are now removed to be replaced by the generic one. The new version also enables the configuration of the watchdog timeout via the DT "timeout-sec" property (if enabled via CONFIG_OF_CONTROL). This patch also adds a new flag to the GD flags, to flag that the watchdog is ready to use and adds the pointer to the watchdog device to the GD. This enables us to remove the global "watchdog_dev" variable, which was prone to cause problems because of its potentially very early use in watchdog_reset(), even before the BSS is cleared. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Heiko Schocher <hs@denx.de> Cc: Tom Rini <trini@konsulko.com> Cc: Michal Simek <michal.simek@xilinx.com> Cc: "Marek Behún" <marek.behun@nic.cz> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Cc: Maxim Sloyko <maxims@google.com> Cc: Erik van Luijk <evanluijk@interact.nl> Cc: Ryder Lee <ryder.lee@mediatek.com> Cc: Weijie Gao <weijie.gao@mediatek.com> Cc: Simon Glass <sjg@chromium.org> Cc: "Álvaro Fernández Rojas" <noltari@gmail.com> Cc: Philippe Reynes <philippe.reynes@softathome.com> Cc: Christophe Leroy <christophe.leroy@c-s.fr> Reviewed-by: Michal Simek <michal.simek@xilinx.com> Tested-by: Michal Simek <michal.simek@xilinx.com> (on zcu100)
149 lines
3.8 KiB
C
149 lines
3.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
/*
|
|
* Copyright (C) 2017 Marek Behun <marek.behun@nic.cz>
|
|
* Copyright (C) 2016 Tomas Hlavacek <tomas.hlavacek@nic.cz>
|
|
*/
|
|
|
|
#ifndef _CONFIG_TURRIS_OMNIA_H
|
|
#define _CONFIG_TURRIS_OMNIA_H
|
|
|
|
/*
|
|
* High Level Configuration Options (easy to change)
|
|
*/
|
|
|
|
/*
|
|
* TEXT_BASE needs to be below 16MiB, since this area is scrubbed
|
|
* for DDR ECC byte filling in the SPL before loading the main
|
|
* U-Boot into it.
|
|
*/
|
|
#define CONFIG_SYS_TCLK 250000000 /* 250MHz */
|
|
|
|
/*
|
|
* Commands configuration
|
|
*/
|
|
|
|
/* I2C support */
|
|
#define CONFIG_DM_I2C
|
|
#define CONFIG_I2C_MUX
|
|
#define CONFIG_I2C_MUX_PCA954x
|
|
#define CONFIG_SPL_I2C_MUX
|
|
#define CONFIG_SYS_I2C_MVTWSI
|
|
|
|
/*
|
|
* SDIO/MMC Card Configuration
|
|
*/
|
|
#define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE
|
|
|
|
/*
|
|
* SATA/SCSI/AHCI configuration
|
|
*/
|
|
#define CONFIG_SCSI_AHCI_PLAT
|
|
#define CONFIG_SYS_SCSI_MAX_SCSI_ID 2
|
|
#define CONFIG_SYS_SCSI_MAX_LUN 1
|
|
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
|
|
CONFIG_SYS_SCSI_MAX_LUN)
|
|
|
|
/* USB/EHCI configuration */
|
|
#define CONFIG_EHCI_IS_TDI
|
|
|
|
/* Environment in SPI NOR flash */
|
|
#define CONFIG_ENV_OFFSET (3*(1 << 18)) /* 768KiB in */
|
|
#define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */
|
|
#define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */
|
|
|
|
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
|
|
|
|
/* PCIe support */
|
|
#ifndef CONFIG_SPL_BUILD
|
|
#define CONFIG_PCI_SCAN_SHOW
|
|
#endif
|
|
|
|
/* Keep device tree and initrd in lower memory so the kernel can access them */
|
|
#define RELOCATION_LIMITS_ENV_SETTINGS \
|
|
"fdt_high=0x10000000\0" \
|
|
"initrd_high=0x10000000\0"
|
|
|
|
/* Defines for SPL */
|
|
#define CONFIG_SPL_SIZE (140 << 10)
|
|
#define CONFIG_SPL_TEXT_BASE 0x40000030
|
|
#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - 0x0030)
|
|
|
|
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
|
|
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
|
|
|
|
#ifdef CONFIG_SPL_BUILD
|
|
#define CONFIG_SYS_MALLOC_SIMPLE
|
|
#endif
|
|
|
|
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
|
|
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
|
|
#define CONFIG_SPL_DRIVERS_MISC_SUPPORT
|
|
|
|
#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI
|
|
/* SPL related SPI defines */
|
|
# define CONFIG_SYS_SPI_U_BOOT_OFFS 0x24000
|
|
# define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS
|
|
#endif
|
|
|
|
#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC
|
|
/* SPL related MMC defines */
|
|
# define CONFIG_SYS_MMC_U_BOOT_OFFS (160 << 10)
|
|
# define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_MMC_U_BOOT_OFFS
|
|
# ifdef CONFIG_SPL_BUILD
|
|
# define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */
|
|
# endif
|
|
#endif
|
|
|
|
/*
|
|
* mv-common.h should be defined after CMD configs since it used them
|
|
* to enable certain macros
|
|
*/
|
|
#include "mv-common.h"
|
|
|
|
/* Include the common distro boot environment */
|
|
#ifndef CONFIG_SPL_BUILD
|
|
|
|
#ifdef CONFIG_MMC
|
|
#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
|
|
#else
|
|
#define BOOT_TARGET_DEVICES_MMC(func)
|
|
#endif
|
|
|
|
#ifdef CONFIG_USB_STORAGE
|
|
#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0)
|
|
#else
|
|
#define BOOT_TARGET_DEVICES_USB(func)
|
|
#endif
|
|
|
|
#define BOOT_TARGET_DEVICES(func) \
|
|
BOOT_TARGET_DEVICES_MMC(func) \
|
|
BOOT_TARGET_DEVICES_USB(func) \
|
|
func(PXE, pxe, na) \
|
|
func(DHCP, dhcp, na)
|
|
|
|
#define KERNEL_ADDR_R __stringify(0x1000000)
|
|
#define FDT_ADDR_R __stringify(0x2000000)
|
|
#define RAMDISK_ADDR_R __stringify(0x2200000)
|
|
#define SCRIPT_ADDR_R __stringify(0x1800000)
|
|
#define PXEFILE_ADDR_R __stringify(0x1900000)
|
|
|
|
#define LOAD_ADDRESS_ENV_SETTINGS \
|
|
"kernel_addr_r=" KERNEL_ADDR_R "\0" \
|
|
"fdt_addr_r=" FDT_ADDR_R "\0" \
|
|
"ramdisk_addr_r=" RAMDISK_ADDR_R "\0" \
|
|
"scriptaddr=" SCRIPT_ADDR_R "\0" \
|
|
"pxefile_addr_r=" PXEFILE_ADDR_R "\0"
|
|
|
|
#include <config_distro_bootcmd.h>
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
RELOCATION_LIMITS_ENV_SETTINGS \
|
|
LOAD_ADDRESS_ENV_SETTINGS \
|
|
"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
|
|
"console=ttyS0,115200\0" \
|
|
BOOTENV
|
|
|
|
#endif /* CONFIG_SPL_BUILD */
|
|
|
|
#endif /* _CONFIG_TURRIS_OMNIA_H */
|