January 2020 - U-Boot

[PATCH 1/3] mtd: rawnand: denali-spl: Add missing hardware init
by Marek Vasut 10 Jan '20

10 Jan '20

While the Denali NAND is initialized by the BootROM in SPL, there are still a couple of settings which are missing. These can trigger subtle corruption of the data read out of the NAND. Fill these settings in just like they are filled in by the full Denali NAND driver in denali_hw_init(). Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- drivers/mtd/nand/raw/denali_spl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/mtd/nand/raw/denali_spl.c b/drivers/mtd/nand/raw/denali_spl.c index dbaba3cab2..b8b29812aa 100644 --- a/drivers/mtd/nand/raw/denali_spl.c +++ b/drivers/mtd/nand/raw/denali_spl.c @@ -173,6 +173,13 @@ void nand_init(void) page_size = readl(denali_flash_reg + DEVICE_MAIN_AREA_SIZE); oob_size = readl(denali_flash_reg + DEVICE_SPARE_AREA_SIZE); pages_per_block = readl(denali_flash_reg + PAGES_PER_BLOCK); + + /* Do as denali_hw_init() does. */ + writel(CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES, + denali_flash_reg + SPARE_AREA_SKIP_BYTES); + writel(0x0F, denali_flash_reg + RB_PIN_ENABLED); + writel(CHIP_EN_DONT_CARE__FLAG, denali_flash_reg + CHIP_ENABLE_DONT_CARE); + writel(0xffff, denali_flash_reg + SPARE_AREA_MARKER); } int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst) -- 2.24.1

2 14

[PATCH 1/1] efi_loader: document functions in efi_rng.c
by Heinrich Schuchardt 09 Jan '20

09 Jan '20

Add the missing Sphinx documentation. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/api/efi.rst | 6 ++++++ lib/efi_loader/efi_rng.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/doc/api/efi.rst b/doc/api/efi.rst index 2ca344932e..bc59382608 100644 --- a/doc/api/efi.rst +++ b/doc/api/efi.rst @@ -131,6 +131,12 @@ Network protocols .. kernel-doc:: lib/efi_loader/efi_net.c :internal: +Random number generator protocol +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. kernel-doc:: lib/efi_loader/efi_rng.c + :internal: + Text IO protocols ~~~~~~~~~~~~~~~~~ diff --git a/lib/efi_loader/efi_rng.c b/lib/efi_loader/efi_rng.c index 432c986204..a1d0ec842c 100644 --- a/lib/efi_loader/efi_rng.c +++ b/lib/efi_loader/efi_rng.c @@ -13,6 +13,17 @@ DECLARE_GLOBAL_DATA_PTR; const efi_guid_t efi_guid_rng_protocol = EFI_RNG_PROTOCOL_GUID; +/** + * platform_get_rng_device() - retrieve random number generator + * + * This function retrieves the udevice implementing a hardware random + * number generator. + * + * This function may be overridden if special initialization is needed. + * + * @dev: udevice + * Return: status code + */ __weak efi_status_t platform_get_rng_device(struct udevice **dev) { int ret; @@ -29,6 +40,18 @@ __weak efi_status_t platform_get_rng_device(struct udevice **dev) return EFI_SUCCESS; } +/** + * rng_getinfo() - get information about random number generation + * + * This function implement the GetInfo() service of the EFI random number + * generator protocol. See the UEFI spec for details. + * + * @this: random number generator protocol instance + * @rng_algorithm_list_size: number of random number generation algorithms + * @rng_algorithm_list: descriptions of random number generation + * algorithms + * Return: status code + */ static efi_status_t EFIAPI rng_getinfo(struct efi_rng_protocol *this, efi_uintn_t *rng_algorithm_list_size, efi_guid_t *rng_algorithm_list) @@ -64,6 +87,18 @@ back: return EFI_EXIT(ret); } +/** + * rng_getrng() - get random value + * + * This function implement the GetRng() service of the EFI random number + * generator protocol. See the UEFI spec for details. + * + * @this: random number generator protocol instance + * @rng_algorithm: random number generation algorithm + * @rng_value_length: number of random bytes to generate, buffer length + * @rng_value: buffer to receive random bytes + * Return: status code + */ static efi_status_t EFIAPI getrng(struct efi_rng_protocol *this, efi_guid_t *rng_algorithm, efi_uintn_t rng_value_length, -- 2.24.1

1 0

[PULL] u-boot-mpc83xx/next
by Mario Six 09 Jan '20

09 Jan '20

Hi Tom, A small PR with MC8309 fixes from Rasmus. CI: https://travis-ci.com/si-gdsys/u-boot-mpc83xx/builds/143550229 The following changes since commit d8a3f5259a36e76d1de127f65714c40918e8ee4c: Merge tag 'u-boot-imx-20200107' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx (2020-01-07 08:45:43 -0500) are available in the Git repository at: git@gitlab.denx.de:u-boot/custodians/u-boot-mpc83xx.git next for you to fetch changes up to fddf876a8f56ff53d1354387ebf7fd3997189349: mpc83xx_clk: always treat MPC83XX_CLK_PCI as invalid (2020-01-08 08:14:36 +0100) ---------------------------------------------------------------- Rasmus Villemoes (5): mpc83xx: make ARCH_MPC8309 select SYS_FSL_ERRATUM_ESDHC111 powerpc: mpc83xx: convert CONFIG_FSL_ELBC to Kconfig mpc83xx: immap_83xx: add spi8xxx_t in immap for mpc8309 mpc83xx: set MPC83XX_GPIO_CTRLRS to 2 for MPC8309 mpc83xx_clk: always treat MPC83XX_CLK_PCI as invalid arch/powerpc/cpu/mpc83xx/Kconfig | 8 ++++++++ arch/powerpc/include/asm/arch-mpc83xx/gpio.h | 3 ++- arch/powerpc/include/asm/immap_83xx.h | 3 +-- arch/powerpc/include/asm/mpc8xxx_spi.h | 1 + drivers/clk/mpc83xx_clk.c | 5 ++++- include/configs/MPC8313ERDB_NAND.h | 1 - include/configs/MPC8313ERDB_NOR.h | 1 - include/configs/MPC8315ERDB.h | 2 -- include/configs/MPC837XEMDS.h | 2 -- include/configs/MPC837XERDB.h | 2 -- include/configs/ids8313.h | 2 -- include/configs/ve8313.h | 1 - 12 files changed, 16 insertions(+), 15 deletions(-) Best regards, Mario

2 1

Please pull u-boot-dm
by Simon Glass 09 Jan '20

09 Jan '20

Hi Tom, This series has the potential for breakage due to badly written drivers, so I'd like to get it in early in the merge window. Tests here: https://gitlab.denx.de/u-boot/custodians/u-boot-dm/pipelines/1790 The following changes since commit d8a3f5259a36e76d1de127f65714c40918e8ee4c: Merge tag 'u-boot-imx-20200107' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx (2020-01-07 08:45:43 -0500) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-8jan20 for you to fetch changes up to aaa05deb1283b6beb7334adfa4094fb6bd4ab750: log: Include missing header for log.h (2020-01-07 16:03:01 -0700) ---------------------------------------------------------------- dm: Increased separation of ofdata_to_platdata() and probe methods ---------------------------------------------------------------- Masahiro Yamada (1): binman: fix default filename of u-boot-with-ucode-ptr in documentation Sean Anderson (3): Include missing headers for fdt_support.h dm: Add a debug message when devices are skipped pre-reloc log: Include missing header for log.h Simon Glass (19): common: Add a noisy assert() dm: core: Use assert_noisy() in devres usb: Drop use of BUG_ON() and WARN_ON() x86: apl: Avoid accessing the PCI bus before it is probed pci: Print a warning if the bus is accessed before probing aspeed: ast2500: Read clock ofdata in the correct method dm: core: Don't clear active flag twice when probe() fails dm: core: Move ofdata_to_platdata() call earlier dm: core: Allocate parent data separate from probing parent dm: core: Add a comment for DM_FLAG_OF_PLATDATA dm: core: Export a new function to read platdata dm: core: Add a new flag to track platform data dm: devres: Create a new devres header file test: Add functions to find the amount of allocated memory dm: devres: Convert to use logging dm: test: Add a test driver for devres dm: devres: Add tests dm: devres: Use an enum for the allocation phase dm: devres: Add a new OFDATA phase arch/sandbox/dts/test.dts | 4 + arch/x86/cpu/apollolake/p2sb.c | 20 ++- arch/x86/cpu/apollolake/pmc.c | 20 ++- drivers/clk/aspeed/clk_ast2500.c | 4 +- drivers/core/device-remove.c | 1 + drivers/core/device.c | 56 +++++-- drivers/core/devres.c | 57 +++++-- drivers/core/lists.c | 4 +- drivers/pci/pci-uclass.c | 13 ++ drivers/usb/gadget/composite.c | 4 + drivers/usb/gadget/f_mass_storage.c | 4 + drivers/usb/musb-new/musb_core.c | 4 + drivers/usb/musb-new/musb_gadget_ep0.c | 2 +- include/dm/device-internal.h | 16 ++ include/dm/device.h | 259 +----------------------------- include/dm/devres.h | 289 ++++++++++++++++++++++++++++++++++ include/dm/uclass-id.h | 1 + include/fdt_support.h | 1 + include/log.h | 16 ++ include/test/test.h | 10 ++ include/test/ut.h | 16 ++ test/dm/Makefile | 1 + test/dm/devres.c | 186 ++++++++++++++++++++++ test/dm/test-fdt.c | 58 +++++++ test/ut.c | 14 ++ tools/binman/README.entries | 2 +- tools/binman/etype/u_boot_with_ucode_ptr.py | 2 +- 27 files changed, 767 insertions(+), 297 deletions(-) create mode 100644 include/dm/devres.h create mode 100644 test/dm/devres.c Regards, Simon

2 1

[PULL] u-boot-usb/master
by Marek Vasut 09 Jan '20

09 Jan '20

The following changes since commit 5a8fa095cb848c60c630a83edf30d4fc46101e90: Merge branch 'next' (2020-01-06 17:07:49 -0500) are available in the Git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to 3a117e721cc5b4a366dbd5fbbf8df0a80cbb0fa2: x86: edison: Enable DFU timeout (2020-01-07 14:37:50 +0100) ---------------------------------------------------------------- Andy Shevchenko (4): dfu: Drop unused prototype of dfu_trigger_reset() dfu: Refactor do_dfu() to handle optional argument dfu: Add optional timeout parameter x86: edison: Enable DFU timeout cmd/dfu.c | 28 +++++++++++++++++++++------- common/dfu.c | 17 +++++++++++++++++ configs/edison_defconfig | 1 + doc/README.dfu | 8 ++++++-- drivers/dfu/Kconfig | 6 ++++++ drivers/dfu/dfu.c | 15 +++++++++++++++ include/dfu.h | 6 +++++- 7 files changed, 71 insertions(+), 10 deletions(-)

2 1

[PATCH] MAINTAINERS: Add entry for rng drivers
by Sughosh Ganu 09 Jan '20

09 Jan '20

Take up maintainership of random number generator drivers with Heinrich Schuchardt as the reviewer. Signed-off-by: Sughosh Ganu <sughosh.ganu(a)linaro.org> --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 438fb22..a0f1eaf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -781,6 +781,13 @@ F: arch/riscv/ F: cmd/riscv/ F: tools/prelink-riscv.c +RNG +M: Sughosh Ganu <sughosh.ganu(a)linaro.org> +R: Heinrich Schuchardt <xypron.glpk(a)gmx.de> +S: Maintained +F: drivers/rng/ +F: drivers/virtio/virtio_rng.c + ROCKUSB M: Eddie Cai <eddie.cai.linux(a)gmail.com> S: Maintained -- 2.7.4

2 1

Enable SIL Image 3124/3132 PCI/SATA converter on IMX6SX for UBOOT
by Brenke, Maik 09 Jan '20

09 Jan '20

Dear ladys and gentleman, according the setup in [setup] I want to enable the SIL Image 3124/3132 PCI/SATA converter in UBOOT (u-boot-2018.03) on an IMX6SX CPU. I tested the implementation and the setup via the Linux Kernel (see Kernel config in [kernel config] in Linux (see lspci [kernel]). After I enabled PCI in UBOOT I got the working result according [UBOOT]. But the SATA implementation (see complete config [defconfig]) failed during compilation of UBOOT with "arch/arm/mach-imx/mx6/clock.c:1015:32: error: 'MXC_CCM_CCGR5_SATA_MASK' undeclared (first use in this function); did you mean 'MXC_CCM_CCGR5_SAI1_MASK'?". Is it possible to only read from an attached SSD on the SIL Image 31xx PCI/SATA converter via PCI in UBOOT? P.s.: There are different warnings and notes during compilation (see [warnings]). [setup]: | imx6sx (UBOOT) | <---PCI---> | Silicon Image 3124/3132 SATA | <--- SATA ---> | SSD | [kernel config]: # enable pci in kernel (PCI support) # enable express support (PCI Express Port Bus support) # PCI host controller drivers (Freescale i.MX6 PCIe controller) # enable sata driver in kernel (Serial ATA and Parallel ATA drivers) # enable PCI-SATA interface in kernel: AHCI SATA support Platform AHCI SATA support … Silicon Image 3124/3132 SATA support # enable pci in device-tree (#define CONFIG_EFUSA9X_PCIE) [kernel]: $ lspci 00:00.0 Class 0604: 16c3:abcd 01:00.0 Class 0106: 1b21:0612 [UBOOT]: PCI: 00:01.0 - 16c3:abcd - Bridge device 01:00.0 - 1b21:0612 - Mass storage controller efusA9X # pci Scanning PCI devices on bus 0 BusDevFun VendorId DeviceId Device Class Sub-Class _____________________________________________________________ 00.01.00 0x16c3 0xabcd Build before PCI Rev2.0 0x00 [defconfig]: $ diff -us configs/fsimx6sx_efus_defconfig .config | grep ^+ +++ .config 2020-01-09 16:30:41.073863186 +0100 +CONFIG_AHCI=y +CONFIG_CMD_PCI=y +CONFIG_CMD_SATA=y +CONFIG_SATA=y +CONFIG_LIBATA=y +CONFIG_AHCI_PCI=y +# CONFIG_SATA_CEVA is not set +# CONFIG_DWC_AHCI is not set +CONFIG_SATA_SIL=y +CONFIG_BLK=y +# CONFIG_NVME is not set +CONFIG_PCI=y +# CONFIG_DM_PCI is not set +# CONFIG_PCI_PNP is not set +CONFIG_DM_SCSI=y [warnings]: $ make clean all … include/generated/autoconf.h:99: note: this is the location of the previous definition #define CONFIG_PCI 1 CC arch/arm/mach-imx/i2c-mxv7.o In file included from include/config.h:6, from include/common.h:21, from arch/arm/mach-imx/i2c-mxv7.c:6: include/configs/fsimx6sx.h:296: warning: "CONFIG_PCI" redefined #define CONFIG_PCI … In file included from ././include/linux/kconfig.h:4, from <command-line>: include/generated/autoconf.h:99: note: this is the location of the previous definition #define CONFIG_PCI 1 In file included from arch/arm/mach-imx/mx6/clock.c:9: arch/arm/mach-imx/mx6/clock.c: In function 'ungate_sata_clock': arch/arm/mach-imx/mx6/clock.c:1001:32: error: 'MXC_CCM_CCGR5_SATA_MASK' undeclared (first use in this function); did you mean 'MXC_CCM_CCGR5_SAI1_MASK'? setbits_le32(&imx_ccm->CCGR5, MXC_CCM_CCGR5_SATA_MASK); ^~~~~~~~~~~~~~~~~~~~~~~ ./arch/arm/include/asm/io.h:49:61: note: in definition of macro '__arch_putl' #define __arch_putl(v,a) (*(volatile unsigned int *)(a) = (v)) ^ ./arch/arm/include/asm/io.h:146:35: note: in expansion of macro '__raw_writel' #define out_arch(type,endian,a,v) __raw_write##type(cpu_to_##endian(v),a) ^~~~~~~~~~~ include/linux/byteorder/generic.h:89:21: note: in expansion of macro '__cpu_to_le32' #define cpu_to_le32 __cpu_to_le32 ^~~~~~~~~~~~~ ./arch/arm/include/asm/io.h:150:23: note: in expansion of macro 'out_arch' #define out_le32(a,v) out_arch(l,le32,a,v) ^~~~~~~~ ./arch/arm/include/asm/io.h:170:2: note: in expansion of macro 'out_le32' out_##type((addr), in_##type(addr) | (set)) ^~~~ ./arch/arm/include/asm/io.h:180:33: note: in expansion of macro 'setbits' #define setbits_le32(addr, set) setbits(le32, addr, set) ^~~~~~~ arch/arm/mach-imx/mx6/clock.c:1001:2: note: in expansion of macro 'setbits_le32' setbits_le32(&imx_ccm->CCGR5, MXC_CCM_CCGR5_SATA_MASK); ^~~~~~~~~~~~ arch/arm/mach-imx/mx6/clock.c:1001:32: note: each undeclared identifier is reported only once for each function it appears in setbits_le32(&imx_ccm->CCGR5, MXC_CCM_CCGR5_SATA_MASK); ^~~~~~~~~~~~~~~~~~~~~~~ ./arch/arm/include/asm/io.h:49:61: note: in definition of macro '__arch_putl' #define __arch_putl(v,a) (*(volatile unsigned int *)(a) = (v)) ^ ./arch/arm/include/asm/io.h:146:35: note: in expansion of macro '__raw_writel' #define out_arch(type,endian,a,v) __raw_write##type(cpu_to_##endian(v),a) ^~~~~~~~~~~ include/linux/byteorder/generic.h:89:21: note: in expansion of macro '__cpu_to_le32' #define cpu_to_le32 __cpu_to_le32 ^~~~~~~~~~~~~ ./arch/arm/include/asm/io.h:150:23: note: in expansion of macro 'out_arch' #define out_le32(a,v) out_arch(l,le32,a,v) ^~~~~~~~ ./arch/arm/include/asm/io.h:170:2: note: in expansion of macro 'out_le32' out_##type((addr), in_##type(addr) | (set)) ^~~~ ./arch/arm/include/asm/io.h:180:33: note: in expansion of macro 'setbits' #define setbits_le32(addr, set) setbits(le32, addr, set) ^~~~~~~ arch/arm/mach-imx/mx6/clock.c:1001:2: note: in expansion of macro 'setbits_le32' setbits_le32(&imx_ccm->CCGR5, MXC_CCM_CCGR5_SATA_MASK); ^~~~~~~~~~~~ arch/arm/mach-imx/mx6/clock.c: In function 'disable_sata_clock': arch/arm/mach-imx/mx6/clock.c:1015:32: error: 'MXC_CCM_CCGR5_SATA_MASK' undeclared (first use in this function); did you mean 'MXC_CCM_CCGR5_SAI1_MASK'? clrbits_le32(&imx_ccm->CCGR5, MXC_CCM_CCGR5_SATA_MASK); ^~~~~~~~~~~~~~~~~~~~~~~ ./arch/arm/include/asm/io.h:49:61: note: in definition of macro '__arch_putl' #define __arch_putl(v,a) (*(volatile unsigned int *)(a) = (v)) ^ ./arch/arm/include/asm/io.h:146:35: note: in expansion of macro '__raw_writel' #define out_arch(type,endian,a,v) __raw_write##type(cpu_to_##endian(v),a) ^~~~~~~~~~~ include/linux/byteorder/generic.h:89:21: note: in expansion of macro '__cpu_to_le32' #define cpu_to_le32 __cpu_to_le32 ^~~~~~~~~~~~~ ./arch/arm/include/asm/io.h:150:23: note: in expansion of macro 'out_arch' #define out_le32(a,v) out_arch(l,le32,a,v) ^~~~~~~~ ./arch/arm/include/asm/io.h:167:2: note: in expansion of macro 'out_le32' out_##type((addr), in_##type(addr) & ~(clear)) ^~~~ ./arch/arm/include/asm/io.h:179:35: note: in expansion of macro 'clrbits' #define clrbits_le32(addr, clear) clrbits(le32, addr, clear) ^~~~~~~ arch/arm/mach-imx/mx6/clock.c:1015:2: note: in expansion of macro 'clrbits_le32' clrbits_le32(&imx_ccm->CCGR5, MXC_CCM_CCGR5_SATA_MASK); ^~~~~~~~~~~~ make[2]: *** [arch/arm/mach-imx/mx6/clock.o] Fehler 1 scripts/Makefile.build:280: die Regel für Ziel „arch/arm/mach-imx/mx6/clock.o“ scheiterte scripts/Makefile.build:425: die Regel für Ziel „arch/arm/mach-imx/mx6“ scheiterte make[1]: *** [arch/arm/mach-imx/mx6] Fehler 2 Makefile:1343: die Regel für Ziel „arch/arm/mach-imx“ scheiterte make: *** [arch/arm/mach-imx] Fehler 2 Mit freundlichen Grüßen / Best regards Maik Brenke Embedded Linux Developer

1 0

[PATCH] removing fdt_high from default set of variables for dragonboard410c config
by Matthias Schoepfer 09 Jan '20

09 Jan '20

When using fitImage in AARCH64, the fdt is only 4 byte aligned. According to linux kernel -> Documentation/arm64/booting.txt, the fdt *must* be 8 byte aligned. Therefore, it is somewhat random, if you build a kernel that the fdt is 4 or 8 byte aligned. Removing fdt_high (or changing it to a valid 8 byte aligned address) solves this issue. Signed-off-by: Matthias Schoepfer <matthias.schoepfer(a)ithinx.io> CC: Mateusz Kulikowski <mateusz.kulikowski(a)gmail.com> --- include/configs/dragonboard410c.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 65149ad441..9362e9322c 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -69,7 +69,6 @@ REFLASH(dragonboard/u-boot.img, 8)\ #define CONFIG_EXTRA_ENV_SETTINGS \ "reflash="CONFIG_ENV_REFLASH"\0"\ "loadaddr=0x81000000\0" \ - "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ "linux_image=Image\0" \ "kernel_addr_r=0x81000000\0"\ -- 2.24.1

1 0

[PATCH V3 1/3] watchdog: designware: Migrate CONFIG_DESIGNWARE_WATCHDOG to Kconfig
by Marek Vasut 09 Jan '20

09 Jan '20

Migrate CONFIG_DESIGNWARE_WATCHDOG to Kconfig and update the headers accordingly, no functional change. The S10 enables the WDT only in SPL, but does not enable it in U-Boot itself, hence disable it in the config again. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Chin Liang See <chin.liang.see(a)intel.com> Cc: Dalon Westergreen <dwesterg(a)gmail.com> Cc: Dinh Nguyen <dinguyen(a)kernel.org> Cc: Jagan Teki <jagan(a)amarulasolutions.com> Cc: Ley Foon Tan <ley.foon.tan(a)intel.com> Cc: Philipp Tomisch <philipp.tomisch(a)theobroma-systems.com> Cc: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> Cc: Tien Fong Chee <tien.fong.chee(a)intel.com> --- V2: Use non-DM watchdog in SPL on S10 V3: No changes --- configs/socfpga_stratix10_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 + drivers/watchdog/Kconfig | 7 +++++++ include/configs/socfpga_common.h | 4 +--- include/configs/socfpga_stratix10_socdk.h | 7 +++++-- scripts/config_whitelist.txt | 1 - 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index 0665b460de..82ffedf41a 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -59,3 +59,4 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y # CONFIG_SPL_USE_TINY_PRINTF is not set +CONFIG_DESIGNWARE_WATCHDOG=y diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig index 19bed6be27..0e31e4f165 100644 --- a/configs/socfpga_vining_fpga_defconfig +++ b/configs/socfpga_vining_fpga_defconfig @@ -97,3 +97,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y # CONFIG_SPL_WDT is not set +CONFIG_DESIGNWARE_WATCHDOG=y diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 8c16d69d33..5f8a070ef5 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -45,6 +45,13 @@ config ULP_WATCHDOG help Say Y here to enable i.MX7ULP watchdog driver. +config DESIGNWARE_WATCHDOG + bool "Designware watchdog timer support" + select HW_WATCHDOG + help + Enable this to support Designware Watchdog Timer IP, present e.g. + on Altera SoCFPGA SoCs. + config WDT bool "Enable driver model for watchdog timer drivers" depends on DM diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 05bfef75c0..d1a14d23aa 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -104,11 +104,9 @@ /* * L4 Watchdog */ -#ifdef CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS #define CONFIG_DW_WDT_CLOCK_KHZ 25000 -#endif +#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* * MMC Driver diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index a10cbec17f..f7a4a30f3a 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -152,13 +152,16 @@ unsigned int cm_get_qspi_controller_clk_hz(void); */ #ifdef CONFIG_SPL_BUILD #define CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG +#else +#undef CONFIG_HW_WATCHDOG +#undef CONFIG_DESIGNWARE_WATCHDOG +#endif #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 -#endif +#define CONFIG_WATCHDOG_TIMEOUT_MSECS 3000 /* * SPL memory layout diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index cf1808e051..5984e579da 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -312,7 +312,6 @@ CONFIG_DEFAULT_IMMR CONFIG_DEF_HWCONFIG CONFIG_DELAY_ENVIRONMENT CONFIG_DESIGNWARE_ETH -CONFIG_DESIGNWARE_WATCHDOG CONFIG_DEVELOP CONFIG_DEVICE_TREE_LIST CONFIG_DFU_ALT -- 2.24.1

2 6

[PATCH] imx: imx8qxp_mek: update README
by Peng Fan 09 Jan '20

09 Jan '20

Update README to use 4.19.35_1.1.0 released firmware images. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- board/freescale/imx8qxp_mek/README | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/board/freescale/imx8qxp_mek/README b/board/freescale/imx8qxp_mek/README index e676e88664..6e4eb5996b 100644 --- a/board/freescale/imx8qxp_mek/README +++ b/board/freescale/imx8qxp_mek/README @@ -14,28 +14,24 @@ Get and Build the ARM Trusted firmware $ git clone https://source.codeaurora.org/external/imx/imx-atf $ cd imx-atf/ -$ git checkout origin/imx_4.9.88_imx8qxp_beta2 -b imx_4.9.88_imx8qxp_beta2 -$ make PLAT=imx8qxp bl31 +$ git checkout origin/imx_4.19.35_1.1.0 -b imx_4.19.35_1.1.0 +$ make PLAT=imx8qx bl31 Get scfw_tcm.bin and ahab-container.img ============================== -$ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/imx-sc-firmware-0.7.bin -$ chmod +x imx-sc-firmware-0.7.bin -$ ./imx-sc-firmware-0.7.bin -$ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-7.6.bin -$ chmod +x firmware-imx-7.6.bin -$ ./firmware-imx-7.6.bin +$ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/imx-sc-firmware-1.2.7.1.bin +$ chmod +x imx-sc-firmware-1.2.7.1.bin +$ ./imx-sc-firmware-1.2.7.1.bin +$ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/imx-seco-2.3.1.bin +$ chmod +x imx-seco-2.3.1.bin +$ ./imx-seco-2.3.1.bin Copy the following binaries to U-Boot folder: -$ cp imx-atf/build/imx8qxp/release/bl31.bin . -$ cp u-boot/u-boot.bin . - -Copy the following firmwares U-Boot folder : - -$ cp firmware-imx-7.6/firmware/seco/ahab-container.img . -$ cp imx-sc-firmware-0.7/mx8qx-mek-scfw-tcm.bin . +$ cp imx-atf/build/imx8qx/release/bl31.bin . +$ cp imx-seco-2.3.1/firmware/seco/mx8qx-ahab-container.img ./ahab-container.img +$ cp imx-sc-firmware-1.2.7.1/mx8qx-mek-scfw-tcm.bin . Build U-Boot ============ -- 2.16.4

2 9