June 2018 - U-Boot

[U-Boot] [GIT PULL] u-boot-uniphier/master
by Masahiro Yamada 23 Jun '18

23 Jun '18

Hi Tom, Please pull a little more. Thanks! The following changes since commit dc7df68f21093039b3ab1a1702f5b7cd3e621431: Merge branch 'master' of git://git.denx.de/u-boot-sh (2018-06-21 09:02:35 -0400) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git master for you to fetch changes up to 9ef88391d049c04922aa4679eb17ee85f4ebc608: ARM: dts: uniphier: enable SD card for PXs3 reference board (2018-06-23 01:28:17 +0900) ---------------------------------------------------------------- Masahiro Yamada (6): ARM: uniphier: enable CONFIG_SNI_AVE and disable CONFIG_SMC911X reset: uniphier: sync reset data with Linux 4.18-rc1 serial: uniphier: rename struct uniphier_serial_private_data serial: uniphier: set clock rate without clock-frequency property ARM: dts: uniphier: sync DT with Linux 4.18-rc1 ARM: dts: uniphier: enable SD card for PXs3 reference board arch/arm/dts/uniphier-ld11.dtsi | 4 ---- arch/arm/dts/uniphier-ld20.dtsi | 4 ---- arch/arm/dts/uniphier-ld4.dtsi | 4 ---- arch/arm/dts/uniphier-pro4.dtsi | 6 +----- arch/arm/dts/uniphier-pro5.dtsi | 4 ---- arch/arm/dts/uniphier-pxs2.dtsi | 4 ---- arch/arm/dts/uniphier-pxs3-ref.dts | 4 ++++ arch/arm/dts/uniphier-pxs3.dtsi | 4 ---- arch/arm/dts/uniphier-sld8.dtsi | 4 ---- configs/uniphier_v7_defconfig | 6 ++---- configs/uniphier_v8_defconfig | 6 ++---- drivers/reset/reset-uniphier.c | 13 ++++++++----- drivers/serial/serial_uniphier.c | 51 ++++++++++++++++++++++++++++++++++++++++++-------- 13 files changed, 60 insertions(+), 54 deletions(-) -- Best Regards Masahiro Yamada

2 1

[U-Boot] [PULL] efi patch queue for 2018.07 2018-06-21
by Alexander Graf 23 Jun '18

23 Jun '18

Hi Tom, This is my current patch queue for efi on 2018.07. Please pull. Alex The following changes since commit a5742efa20384a27d51ee6c43d02c2025536c65d: Prepare v2018.07-rc2 (2018-06-19 19:39:44 -0400) are available in the git repository at: git://github.com/agraf/u-boot.git tags/signed-efi-2018.07 for you to fetch changes up to 6fc2c704d40255e418857b60e86cf8d76fbcda4b: efi_loader: Fix GOP 32bpp exposure (2018-06-21 17:18:18 +0200) ---------------------------------------------------------------- Patch queue for efi - 2018-06-21 A single urgent fix to make sure green and red are not swapped in OSs that make use of EFI GOP frame buffers to display pictures (such as efifb in Linux). ---------------------------------------------------------------- Alexander Graf (1): efi_loader: Fix GOP 32bpp exposure lib/efi_loader/efi_gop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[U-Boot] [PATCH 1/4] ARM: define MON_MODE
by Stephen Warren 22 Jun '18

22 Jun '18

From: Stephen Warren <swarren(a)nvidia.com> Add a MON_MODE define for ARM's monitor mode. This can be used later by a secure monitor to avoid hard-coding mode IDs. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- arch/arm/include/asm/proc-armv/ptrace.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/include/asm/proc-armv/ptrace.h b/arch/arm/include/asm/proc-armv/ptrace.h index 71df5a9e2538..183b00a08719 100644 --- a/arch/arm/include/asm/proc-armv/ptrace.h +++ b/arch/arm/include/asm/proc-armv/ptrace.h @@ -37,6 +37,7 @@ struct pt_regs { #define FIQ_MODE 0x11 #define IRQ_MODE 0x12 #define SVC_MODE 0x13 +#define MON_MODE 0x16 #define ABT_MODE 0x17 #define HYP_MODE 0x1a #define UND_MODE 0x1b -- 2.17.1

1 3

[U-Boot] [PATCH] imx: mx7: psci: Add support for version command
by Trent Piepho 22 Jun '18

22 Jun '18

This command should be supported for PSCI 1.0. Current code results in this message from the kernel: "PSCIv65535.65535 detected in firmware." This will mess up a kernel check of the PSCI version. Currently the kernel only cares if the version is at least 1.0 so it doesn't break anything, as the incorrect version and correct version are both >= 1.0, but as soon as a check for > 1.0 goes in it will fail. CC: Anson Huang <Anson.Huang(a)nxp.com> Cc: Fabio Estevam <fabio.estevam(a)nxp.com> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> Signed-off-by: Trent Piepho <tpiepho(a)impinj.com> --- arch/arm/mach-imx/mx7/psci.S | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/mach-imx/mx7/psci.S b/arch/arm/mach-imx/mx7/psci.S index 89dcf880e8..7035f6093b 100644 --- a/arch/arm/mach-imx/mx7/psci.S +++ b/arch/arm/mach-imx/mx7/psci.S @@ -57,4 +57,14 @@ psci_system_off: 3: wfi b 3b +.globl psci_version +psci_version: +#if defined(CONFIG_ARMV7_PSCI_1_0) + ldr r0, =ARM_PSCI_VER_1_0 +#else +#error "add support for your PSCI version" +#endif + + bx lr + .popsection -- 2.14.3

2 2

[U-Boot] [PATCH] mx7: Remove BMODE support
by Fabio Estevam 22 Jun '18

22 Jun '18

From: Fabio Estevam <fabio.estevam(a)nxp.com> i.MX7 does not support BMODE due to the erratum e10574 ("Watchdog: A watchdog timeout or software trigger will not reset the SOC"), so remove its support. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- arch/arm/mach-imx/Kconfig | 2 +- arch/arm/mach-imx/mx7/Kconfig | 1 - arch/arm/mach-imx/mx7/soc.c | 25 ------------------------- board/toradex/colibri_imx7/colibri_imx7.c | 19 ------------------- 4 files changed, 1 insertion(+), 46 deletions(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 3aec89d..a1566cc 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -46,7 +46,7 @@ config SECURE_BOOT config CMD_BMODE bool "Support the 'bmode' command" default y - depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5 + depends on ARCH_MX6 || ARCH_MX5 help This enables the 'bmode' (bootmode) command for forcing a boot from specific media. diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig index 2a3db86..3d12874 100644 --- a/arch/arm/mach-imx/mx7/Kconfig +++ b/arch/arm/mach-imx/mx7/Kconfig @@ -50,7 +50,6 @@ config TARGET_WARP7 config TARGET_COLIBRI_IMX7 bool "Support Colibri iMX7S/iMX7D modules" - select BOARD_LATE_INIT select DM select DM_SERIAL select DM_THERMAL diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 2aca24b..7334ca9 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -8,7 +8,6 @@ #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> -#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/dma.h> #include <asm/mach-imx/hab.h> #include <asm/mach-imx/rdc-sema.h> @@ -254,30 +253,6 @@ void set_wdog_reset(struct wdog_regs *wdog) writew(reg, &wdog->wcr); } -/* - * cfg_val will be used for - * Boot_cfg4[7:0]:Boot_cfg3[7:0]:Boot_cfg2[7:0]:Boot_cfg1[7:0] - * After reset, if GPR10[28] is 1, ROM will copy GPR9[25:0] - * to SBMR1, which will determine the boot device. - */ -const struct boot_mode soc_boot_modes[] = { - {"ecspi1:0", MAKE_CFGVAL(0x00, 0x60, 0x00, 0x00)}, - {"ecspi1:1", MAKE_CFGVAL(0x40, 0x62, 0x00, 0x00)}, - {"ecspi1:2", MAKE_CFGVAL(0x80, 0x64, 0x00, 0x00)}, - {"ecspi1:3", MAKE_CFGVAL(0xc0, 0x66, 0x00, 0x00)}, - - {"weim", MAKE_CFGVAL(0x00, 0x50, 0x00, 0x00)}, - {"qspi1", MAKE_CFGVAL(0x10, 0x40, 0x00, 0x00)}, - /* 4 bit bus width */ - {"usdhc1", MAKE_CFGVAL(0x10, 0x10, 0x00, 0x00)}, - {"usdhc2", MAKE_CFGVAL(0x10, 0x14, 0x00, 0x00)}, - {"usdhc3", MAKE_CFGVAL(0x10, 0x18, 0x00, 0x00)}, - {"mmc1", MAKE_CFGVAL(0x10, 0x20, 0x00, 0x00)}, - {"mmc2", MAKE_CFGVAL(0x10, 0x24, 0x00, 0x00)}, - {"mmc3", MAKE_CFGVAL(0x10, 0x28, 0x00, 0x00)}, - {NULL, 0}, -}; - void s_init(void) { /* clock configuration. */ diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index cd98ec8..bf691a5 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -9,7 +9,6 @@ #include <asm/arch/mx7-pins.h> #include <asm/arch/sys_proto.h> #include <asm/gpio.h> -#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/iomux-v3.h> #include <asm/io.h> #include <common.h> @@ -322,24 +321,6 @@ int board_init(void) return 0; } -#ifdef CONFIG_CMD_BMODE -static const struct boot_mode board_boot_modes[] = { - /* 4 bit bus width */ - {"nand", MAKE_CFGVAL(0x40, 0x34, 0x00, 0x00)}, - {"sd1", MAKE_CFGVAL(0x10, 0x10, 0x00, 0x00)}, - {NULL, 0}, -}; -#endif - -int board_late_init(void) -{ -#ifdef CONFIG_CMD_BMODE - add_board_boot_modes(board_boot_modes); -#endif - - return 0; -} - #ifdef CONFIG_DM_PMIC int power_init_board(void) { -- 2.7.4

1 0

[U-Boot] [PATCH 0/6] ARM: uniphier: some more updates for v2018.07-rc2
by Masahiro Yamada 22 Jun '18

22 Jun '18

Masahiro Yamada (6): ARM: uniphier: enable CONFIG_SNI_AVE and disable CONFIG_SMC911X reset: uniphier: sync reset data with Linux 4.18-rc1 serial: uniphier: rename struct uniphier_serial_private_data serial: uniphier: set clock rate without clock-frequency property ARM: dts: uniphier: sync DT with Linux 4.18-rc1 ARM: dts: uniphier: enable SD card for PXs3 reference board arch/arm/dts/uniphier-ld11.dtsi | 4 --- arch/arm/dts/uniphier-ld20.dtsi | 4 --- arch/arm/dts/uniphier-ld4.dtsi | 4 --- arch/arm/dts/uniphier-pro4.dtsi | 6 +---- arch/arm/dts/uniphier-pro5.dtsi | 4 --- arch/arm/dts/uniphier-pxs2.dtsi | 4 --- arch/arm/dts/uniphier-pxs3-ref.dts | 4 +++ arch/arm/dts/uniphier-pxs3.dtsi | 4 --- arch/arm/dts/uniphier-sld8.dtsi | 4 --- configs/uniphier_v7_defconfig | 6 ++--- configs/uniphier_v8_defconfig | 6 ++--- drivers/reset/reset-uniphier.c | 13 ++++++---- drivers/serial/serial_uniphier.c | 51 ++++++++++++++++++++++++++++++++------ 13 files changed, 60 insertions(+), 54 deletions(-) -- 2.7.4

1 7

[U-Boot] [PATCH v2] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig variable
by Luca Ceresoli 22 Jun '18

22 Jun '18

U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on ZynqMP (PS init for short). The current logic to locate this file for both platforms is: 1. if a board-specific file exists in board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c then use it 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c In the latter case the file does not exist in the U-Boot sources and must be copied in the source tree from the outside before starting the build. This is typical when it is generated from Xilinx tools while developing a custom hardware. However making sure that a board-specific file is _not_ found (and used) requires some trickery such as removing or overwriting all PS init files (e.g.: the current meta-xilinx yocto layer). This generates a few problems: * if the source tree is shared among different out-of-tree builds, they will pollute (and potentially corrupt) each other * the source tree cannot be read-only * any buildsystem must add a command to copy the PS init file binary * overwriting or deleting files in the source tree is ugly as hell Simplify usage by allowing to pass the path to the desired PS init file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute path or relative to $(srctree). If the variable is set, the user-specified file will always be used without being copied around. If the the variable is left empty, for backward compatibility fall back to the old behaviour. Since the issue is the same for Zynq and ZynqMP, add one kconfig variable in a common place and use it for both. Also use the new kconfig help text to document all the ways to give U-Boot the PS init file. Build-tested with all combinations of: - platform: zynq or zynqmp - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - building in-tree, in subdir, in other directory Signed-off-by: Luca Ceresoli <luca(a)lucaceresoli.net> Cc: Albert Aribaud <albert.u.boot(a)aribaud.net> Cc: Michal Simek <michal.simek(a)xilinx.com> Cc: Nathan Rossi <nathan(a)nathanrossi.com> --- Changes v1 -> v2: - removed link to yocto layer code (Michal) - fixed location of SPDX line (Michal) --- arch/arm/Kconfig | 1 + board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ board/xilinx/zynq/Makefile | 10 +++++++++- board/xilinx/zynqmp/Makefile | 10 +++++++++- 4 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 board/xilinx/Kconfig diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 22234cde2ab6..e04979d0ef7e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1441,6 +1441,7 @@ source "board/toradex/colibri_pxa270/Kconfig" source "board/vscom/baltos/Kconfig" source "board/woodburn/Kconfig" source "board/work-microwave/work_92105/Kconfig" +source "board/xilinx/Kconfig" source "board/xilinx/zynqmp/Kconfig" source "board/zipitz2/Kconfig" diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig new file mode 100644 index 000000000000..37bec5fae29d --- /dev/null +++ b/board/xilinx/Kconfig @@ -0,0 +1,41 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (c) 2018, Luca Ceresoli <luca(a)lucaceresoli.net> + +if ARCH_ZYNQ || ARCH_ZYNQMP + +config XILINX_PS_INIT_FILE + string "Zynq/ZynqMP PS init file(s) location" + help + On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if + ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some + basic initializations, such as enabling peripherals and + configuring pinmuxes. The PS init file (called + psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) + contains the code for such initializations. + + U-Boot contains PS init files for some boards, but each of + them describes only one specific configuration. Users of a + different board, or needing a different configuration, can + generate custom files using the Xilinx development tools. + + There are three ways to give a PS init file to U-Boot: + + 1. Set this variable to the path, either relative to the + source tree or absolute, where the psu_init_gpl.c or + ps7_init_gpl.c file is located. U-Boot will build this + file. + + 2. If you leave an empty string here, U-Boot will use + board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c + for Zynq-7000, or + board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c + for ZynqMP. + + 3. If the above file does not exist, U-Boot will use + board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or + board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file + is not provided by U-Boot, you have to copy it there + before the build. + +endif diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile index 5a76a26720cd..03ad5f0532ee 100644 --- a/board/xilinx/zynq/Makefile +++ b/board/xilinx/zynq/Makefile @@ -5,10 +5,18 @@ obj-y := board.o -hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) +ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") +PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) +init-objs := ps_init_gpl.o +spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) + $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ +endif +ifeq ($(init-objs),) +hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ $(hw-platform-y)/ps7_init_gpl.o) +endif ifeq ($(init-objs),) ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile index 05ccd25dcef3..960b81fc5853 100644 --- a/board/xilinx/zynqmp/Makefile +++ b/board/xilinx/zynqmp/Makefile @@ -5,10 +5,18 @@ obj-y := zynqmp.o -hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) +ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") +PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) +init-objs := ps_init_gpl.o +spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) + $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ +endif +ifeq ($(init-objs),) +hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ $(hw-platform-y)/psu_init_gpl.o) +endif ifeq ($(init-objs),) ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) -- 2.7.4

2 1

[U-Boot] [PATCH v3 0/5] mtd: nand: mxs_nand: improve ECC support
by Stefan Agner 22 Jun '18

22 Jun '18

From: Stefan Agner <stefan.agner(a)toradex.com> This patchset reworks the drivers ECC calculation to align more with the Linux driver gpmi-nand.c. It aims to implements minimal ECC support as supported by the NAND chip. This is the rebased version after moving MXS NAND to Kconfig. -- Stefan Changes in v3: - Fix indentation - Rebased and removed already applied Kconfig change Changes in v2: - Extend the patchset with "report correct ECC parameters" patch Stefan Agner (5): mtd: nand: mxs_nand: use self init mtd: nand: mxs_nand: allow to enable BBT support mtd: nand: mxs_nand: use structure for BCH geometry mtd: nand: mxs_nand: report correct ECC parameters mtd: nand: mxs_nand: add minimal ECC support drivers/mtd/nand/Kconfig | 9 ++ drivers/mtd/nand/mxs_nand.c | 282 ++++++++++++++++++++++-------------- 2 files changed, 180 insertions(+), 111 deletions(-) -- 2.17.0

3 13

[U-Boot] [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig variable
by Luca Ceresoli 22 Jun '18

22 Jun '18

U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on ZynqMP (PS init for short). The current logic to locate this file for both platforms is: 1. if a board-specific file exists in board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c then use it 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c In the latter case the file does not exist in the U-Boot sources and must be copied in the source tree from the outside before starting the build. This is typical when it is generated from Xilinx tools while developing a custom hardware. However making sure that a board-specific file is _not_ found (and used) requires some trickery such as removing or overwriting all PS init files (e.g.: the current meta-xilinx yocto layer [0]). This generates a few problems: * if the source tree is shared among different out-of-tree builds, they will pollute (and potentially corrupt) each other * the source tree cannot be read-only * any buildsystem must add a command to copy the PS init file binary * overwriting or deleting files in the source tree is ugly as hell Simplify usage by allowing to pass the path to the desired PS init file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute path or relative to $(srctree). If the variable is set, the user-specified file will always be used without being copied around. If the the variable is left empty, for backward compatibility fall back to the old behaviour. Since the issue is the same for Zynq and ZynqMP, add one kconfig variable in a common place and use it for both. Also use the new kconfig help text to document all the ways to give U-Boot the PS init file. Build-tested with all combinations of: - platform: zynq or zynqmp - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path, non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/ - building in-tree, in subdir, in other directory [0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51… Signed-off-by: Luca Ceresoli <luca(a)lucaceresoli.net> Cc: Albert Aribaud <albert.u.boot(a)aribaud.net> Cc: Michal Simek <michal.simek(a)xilinx.com> Cc: Nathan Rossi <nathan(a)nathanrossi.com> --- arch/arm/Kconfig | 1 + board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ board/xilinx/zynq/Makefile | 10 +++++++++- board/xilinx/zynqmp/Makefile | 10 +++++++++- 4 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 board/xilinx/Kconfig diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 22234cde2ab6..e04979d0ef7e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1441,6 +1441,7 @@ source "board/toradex/colibri_pxa270/Kconfig" source "board/vscom/baltos/Kconfig" source "board/woodburn/Kconfig" source "board/work-microwave/work_92105/Kconfig" +source "board/xilinx/Kconfig" source "board/xilinx/zynqmp/Kconfig" source "board/zipitz2/Kconfig" diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig new file mode 100644 index 000000000000..aa3fa061edef --- /dev/null +++ b/board/xilinx/Kconfig @@ -0,0 +1,41 @@ +# Copyright (c) 2018, Luca Ceresoli <luca(a)lucaceresoli.net> +# +# SPDX-License-Identifier: GPL-2.0 + +if ARCH_ZYNQ || ARCH_ZYNQMP + +config XILINX_PS_INIT_FILE + string "Zynq/ZynqMP PS init file(s) location" + help + On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if + ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some + basic initializations, such as enabling peripherals and + configuring pinmuxes. The PS init file (called + psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000) + contains the code for such initializations. + + U-Boot contains PS init files for some boards, but each of + them describes only one specific configuration. Users of a + different board, or needing a different configuration, can + generate custom files using the Xilinx development tools. + + There are three ways to give a PS init file to U-Boot: + + 1. Set this variable to the path, either relative to the + source tree or absolute, where the psu_init_gpl.c or + ps7_init_gpl.c file is located. U-Boot will build this + file. + + 2. If you leave an empty string here, U-Boot will use + board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c + for Zynq-7000, or + board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c + for ZynqMP. + + 3. If the above file does not exist, U-Boot will use + board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or + board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file + is not provided by U-Boot, you have to copy it there + before the build. + +endif diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile index 5a76a26720cd..03ad5f0532ee 100644 --- a/board/xilinx/zynq/Makefile +++ b/board/xilinx/zynq/Makefile @@ -5,10 +5,18 @@ obj-y := board.o -hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) +ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") +PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) +init-objs := ps_init_gpl.o +spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE) + $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ +endif +ifeq ($(init-objs),) +hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ $(hw-platform-y)/ps7_init_gpl.o) +endif ifeq ($(init-objs),) ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile index 05ccd25dcef3..960b81fc5853 100644 --- a/board/xilinx/zynqmp/Makefile +++ b/board/xilinx/zynqmp/Makefile @@ -5,10 +5,18 @@ obj-y := zynqmp.o -hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) +ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") +PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE)) +init-objs := ps_init_gpl.o +spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE) + $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ +endif +ifeq ($(init-objs),) +hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ $(hw-platform-y)/psu_init_gpl.o) +endif ifeq ($(init-objs),) ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),) -- 2.7.4

2 3

[U-Boot] help: how get last command result using scripting
by Michael Nazzareno Trimarchi 22 Jun '18

22 Jun '18

Hi all Trying to understand how to get the last result. For example: sspi 1:0.3 24 700002; sspi 1:1.3 24 730000 Now I need to have the last output of the last command to compare in one script. Any idea? Michael

2 4