October 2019 - U-Boot

[U-Boot] [PATCH 0/5] ARM: zynq: Boot variables cleanup
by Michal Simek 08 Oct '19

08 Oct '19

Hi, for quite a long time Xilinx was using private boot method. Pretty long time ago we have enabled distribution boot method and provided time to do transition to it. Right now it is good time to remove old methods and move to distro boot fully. It is also the part of unification between Xilinx Zynq/ZynqMP and Versal SoCs to use the same boot methods. This series convert Zynq. Variable modeboot is still setup because Topic boards and Syzygy are using it. Thanks, Michal Michal Simek (5): ARM: zynq: Specify MMC controller number for boot sequence ARM: zynq: Enable USB1 as secondary boot device ARM: zynq: Fix NOR boot mode ARM: zynq: Use {} around variables for qspi and nand boot cmds ARM: zynq: Remove all Xilinx private commands board/xilinx/zynq/board.c | 2 +- include/configs/zynq-common.h | 66 +++++------------------------------ 2 files changed, 10 insertions(+), 58 deletions(-) -- 2.17.1

2 6

[U-Boot] [PATCH] net: phy: Define init routine and register generic phy driver
by Michal Simek 08 Oct '19

08 Oct '19

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> This patch define init routine for generic phy driver and registers it using phy_register as this generic phy driver also needs to be relocated incase of manual reloc. Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/net/phy/phy.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index ae37dd6c1e37..8c4043445e86 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -458,6 +458,11 @@ static struct phy_driver genphy_driver = { .shutdown = genphy_shutdown, }; +int genphy_init(void) +{ + return phy_register(&genphy_driver); +} + static LIST_HEAD(phy_drivers); int phy_init(void) @@ -540,6 +545,8 @@ int phy_init(void) #ifdef CONFIG_PHY_FIXED phy_fixed_init(); #endif + genphy_init(); + return 0; } -- 2.17.1

2 1

[U-Boot] [PATCH] ARM: zynq: dts: Added alias for usb node
by Michal Simek 08 Oct '19

08 Oct '19

From: Vipul Kumar <vipul.kumar(a)xilinx.com> This patch added alias for usb node in dts file. Signed-off-by: Vipul Kumar <vipul.kumar(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Vipul left Xilinx but he is origin author of this patch that's why I am keeping him here. --- arch/arm/dts/zynq-zc702.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/dts/zynq-zc702.dts b/arch/arm/dts/zynq-zc702.dts index 54231cd5801a..d10695740fa9 100644 --- a/arch/arm/dts/zynq-zc702.dts +++ b/arch/arm/dts/zynq-zc702.dts @@ -16,6 +16,7 @@ serial0 = &uart1; spi0 = &qspi; mmc0 = &sdhci0; + usb0 = &usb0; }; memory@0 { -- 2.17.1

2 1

[U-Boot] [PATCH] ARM: zynq: Align model name with DT
by Michal Simek 08 Oct '19

08 Oct '19

Use model property to distinguish different configurations. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/dts/zynq-cse-qspi-single.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/zynq-cse-qspi-single.dts b/arch/arm/dts/zynq-cse-qspi-single.dts index 0d680dfc0688..ac6982a74e25 100644 --- a/arch/arm/dts/zynq-cse-qspi-single.dts +++ b/arch/arm/dts/zynq-cse-qspi-single.dts @@ -7,6 +7,10 @@ #include "zynq-cse-qspi.dtsi" +/ { + model = "Zynq CSE QSPI SINGLE Board"; +}; + &flash0 { spi-rx-bus-width = <4>; }; -- 2.17.1

2 1

[U-Boot] [PATCH] arm64: zynqmp: Add idcodes for new RFSoC silicons ZU48DR and ZU49DR
by Michal Simek 08 Oct '19

08 Oct '19

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Add zu48dr and zu49dr to the list of zynqmp devices. The zu48dr and zu49dr are the new RFSoC silicons with id values of 0x7b and 0x7e. Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- board/xilinx/zynqmp/zynqmp.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index f36d49fded99..6524badf299c 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -174,6 +174,14 @@ static const struct { .id = 0x66, .name = "39dr", }, + { + .id = 0x7b, + .name = "48dr", + }, + { + .id = 0x7e, + .name = "49dr", + }, }; #endif -- 2.17.1

2 1

[U-Boot] [PATCH] arm64: versal: Fix for OCM overwriting issue
by Michal Simek 08 Oct '19

08 Oct '19

From: Ashok Reddy Soma <ashok.reddy.soma(a)xilinx.com> This patch reduces the console buffer size from 2048 to 1024, thus fixes OCM overwriting issue. Differences are in bss section as is shown from output: xilinx_versal_mini: all -2056 bss -2048 text -8 u-boot: add: 0/0, grow: 0/-3 bytes: 0/-2056 (-2056) function old new delta cli_simple_run_command 340 332 -8 static.lastcommand 2049 1025 -1024 console_buffer 2049 1025 -1024 Better would be to use PPU RAM but this change is also aligned with changes done in ZynqMP mini configurations. Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- include/configs/xilinx_versal_mini.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/configs/xilinx_versal_mini.h b/include/configs/xilinx_versal_mini.h index 4b3691b40733..2195bf0e1064 100644 --- a/include/configs/xilinx_versal_mini.h +++ b/include/configs/xilinx_versal_mini.h @@ -29,4 +29,7 @@ #undef CONFIG_BOOTP_BOOTFILESIZE #undef CONFIG_BOOTP_MAY_FAIL +#undef CONFIG_SYS_CBSIZE +#define CONFIG_SYS_CBSIZE 1024 + #endif /* __CONFIG_VERSAL_MINI_H */ -- 2.17.1

2 1

[U-Boot] [PATCH] ARM: zynq: Increase input buffer console size to 2k
by Michal Simek 08 Oct '19

08 Oct '19

ZynqMP and Versal is using 2k that's why aligned all platform together to be able to use the same scripts. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- include/configs/zynq-common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index a6a553d852ed..95ea7f5c7662 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -257,6 +257,7 @@ #define CONFIG_CLOCKS #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ +#define CONFIG_SYS_CBSIZE 2048 /* Console I/O Buffer Size */ #define CONFIG_SYS_MEMTEST_START 0 #define CONFIG_SYS_MEMTEST_END 0x1000 -- 2.17.1

2 1

[U-Boot] [PATCH] ARM: zynq: Increase init ram size by 4K
by Michal Simek 08 Oct '19

08 Oct '19

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Increase init ram size by 4K such that more stack space will be available during initialization as the present stackspace is not sufficient if DEBUG option is enabled and causes system hang. Increasing init ram size provides sufficient stack space during init even if DEBUG enabled and solves the hang issue. Signed-off-by: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- include/configs/zynq-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 90a4a77b2c07..a6a553d852ed 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -262,7 +262,7 @@ #define CONFIG_SYS_MEMTEST_END 0x1000 #define CONFIG_SYS_INIT_RAM_ADDR 0xFFFF0000 -#define CONFIG_SYS_INIT_RAM_SIZE 0x1000 +#define CONFIG_SYS_INIT_RAM_SIZE 0x2000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE) -- 2.17.1

2 1

[U-Boot] [PATCH] ARM: zynq: Do not enable NETBSD support by default
by Michal Simek 08 Oct '19

08 Oct '19

This option is disable in Xilinx tree for quite a long time that's why let's disable it in mainline. If there is anybody who requires this options then it should be moved to Kconfig first and should be removed from this config. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- include/configs/zynq-common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index c765875ca85d..90a4a77b2c07 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -274,6 +274,8 @@ /* Boot FreeBSD/vxWorks from an ELF image */ #define CONFIG_SYS_MMC_MAX_DEVICE 1 +#undef CONFIG_BOOTM_NETBSD + /* MMC support */ #ifdef CONFIG_MMC_SDHCI_ZYNQ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 -- 2.17.1

2 1

[U-Boot] [PATCH] fpga: zynqmp: Fix second local variable declaration
by Michal Simek 08 Oct '19

08 Oct '19

No reason to define new_buf again. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/fpga/zynqmppl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c index 22bfdd8dce61..f6d9d50ef15f 100644 --- a/drivers/fpga/zynqmppl.c +++ b/drivers/fpga/zynqmppl.c @@ -153,7 +153,7 @@ static ulong zynqmp_align_dma_buffer(u32 *buf, u32 len, u32 swap) } else if ((swap != SWAP_DONE) && (zynqmp_pmufw_version() <= PMUFW_V1_0)) { /* For bitstream which are aligned */ - u32 *new_buf = (u32 *)buf; + new_buf = buf; printf("%s: Bitstream is not swapped(%d) - swap it\n", __func__, swap); -- 2.17.1

2 1