August 2016 - U-Boot

[U-Boot] [PATCH] crypto/fsl: Update blob cmd to accept 64bit addresses
by Sumit Garg 03 Aug '16

03 Aug '16

Update blob cmd to accept 64bit source, key modifier and destination addresses. Also correct output result print format for fsl specific implementation of blob cmd. Signed-off-by: Sumit Garg <sumit.garg(a)nxp.com> --- cmd/blob.c | 2 +- drivers/crypto/fsl/fsl_blob.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cmd/blob.c b/cmd/blob.c index ac8b268..bdd4cfd 100644 --- a/cmd/blob.c +++ b/cmd/blob.c @@ -54,7 +54,7 @@ __weak int blob_encap(u8 *key_mod, u8 *src, u8 *dst, u32 len) */ static int do_blob(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { - uint32_t key_addr, src_addr, dst_addr, len; + ulong key_addr, src_addr, dst_addr, len; uint8_t *km_ptr, *src_ptr, *dst_ptr; int enc, ret = 0; diff --git a/drivers/crypto/fsl/fsl_blob.c b/drivers/crypto/fsl/fsl_blob.c index 8b25921..d24b8fc 100644 --- a/drivers/crypto/fsl/fsl_blob.c +++ b/drivers/crypto/fsl/fsl_blob.c @@ -18,7 +18,7 @@ int blob_decap(u8 *key_mod, u8 *src, u8 *dst, u32 len) int ret, i = 0; u32 *desc; - printf("\nDecapsulating data to form blob\n"); + printf("\nDecapsulating blob to get data\n"); desc = malloc(sizeof(int) * MAX_CAAM_DESCSIZE); if (!desc) { debug("Not enough memory for descriptor allocation\n"); @@ -27,12 +27,15 @@ int blob_decap(u8 *key_mod, u8 *src, u8 *dst, u32 len) inline_cnstr_jobdesc_blob_decap(desc, key_mod, src, dst, len); + debug("Descriptor dump:\n"); for (i = 0; i < 14; i++) - printf("%x\n", *(desc + i)); + debug("Word[%d]: %08x\n", i, *(desc + i)); ret = run_descriptor_jr(desc); if (ret) printf("Error in Decapsulation %d\n", ret); + else + printf("Decapsulation Success\n"); free(desc); return ret; @@ -51,12 +54,16 @@ int blob_encap(u8 *key_mod, u8 *src, u8 *dst, u32 len) } inline_cnstr_jobdesc_blob_encap(desc, key_mod, src, dst, len); + + debug("Descriptor dump:\n"); for (i = 0; i < 14; i++) - printf("%x\n", *(desc + i)); + debug("Word[%d]: %08x\n", i, *(desc + i)); ret = run_descriptor_jr(desc); if (ret) printf("Error in Encapsulation %d\n", ret); + else + printf("Encapsulation Success\n"); free(desc); return ret; -- 1.8.1.4

2 1

[U-Boot] [PATCH] powerpc/mpc85xx: Update erratum workaround for A006379
by York Sun 03 Aug '16

03 Aug '16

Update erratum workaround for A006379 to set register CPCHDBCR0 with value 0x001e0000, replacing the old value 0x003c0000. Signed-off-by: York Sun <york.sun(a)nxp.com> Reported-by: Dave Liu <dave.liu(a)nxp.com> --- arch/powerpc/include/asm/immap_85xx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index c045a24..7a878be 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -1579,7 +1579,7 @@ typedef struct cpc_corenet { #define CPC_HDBCR0_CDQ_SPEC_DIS 0x08000000 #define CPC_HDBCR0_TAG_ECC_SCRUB_DIS 0x01000000 #define CPC_HDBCR0_DATA_ECC_SCRUB_DIS 0x00400000 -#define CPC_HDBCR0_SPLRU_LEVEL_EN 0x003c0000 +#define CPC_HDBCR0_SPLRU_LEVEL_EN 0x001e0000 #endif /* CONFIG_SYS_FSL_CPC */ /* Global Utilities Block */ -- 2.7.4

2 1

[U-Boot] 2016.07 regression: kwboot does not work on Kirkwood
by Simon Baatz 02 Aug '16

02 Aug '16

Hi, I just tried to boot a freshly built u-boot.kwb using UART boot on a Kirkwood box (IB-NAS6210), but to no avail. An old backup image does not boot either. After scratching my head for quite some time, I found this change in commit f4db6c976cf ("arm: mvebu: Add runtime detection of UART (xmodem) boot-mode") to kwboot.c: @@ -652,6 +654,14 @@ kwboot_img_patch_hdr(void *img, size_t size) hdr->blockid = IBR_HDR_UART_ID; + /* + * Subtract mkimage header size from destination address + * as this header is not expected by the Marvell BootROM. + * This way, the execution address is identical to the + * one the image is compiled for (TEXT_BASE). + */ + hdr->destaddr = hdr->destaddr - sizeof(struct image_header); + if (image_ver == 0) { struct main_hdr_v0 *hdr_v0 = img; Reverting this change makes kwboot work again for me. I don't know what the correct fix is. Should we change hdr->destaddr only for header version 1? (Orion and Kirkwood use header version 0, right?) - Simon

1 0

[U-Boot] [GIT PULL] Xilinx changes
by Michal Simek 02 Aug '16

02 Aug '16

Hi Tom, please pull these patches to your tree. There are two critical patches. One dm-pre-reloc which get ZynqMP boards back to live. And the second about stack pointer init. Thanks, Michal The following changes since commit 26fb8db0f4d1e7c118b5e8f3a8849f359b91c166: Merge git://git.denx.de/u-boot-rockchip (2016-07-31 20:31:13 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-microblaze.git master for you to fetch changes up to 28559d4c93de5039f851eea6d1404305d3ad0825: ARM64: zynqmp: Do not enable DM_MMC by default (2016-08-02 07:19:09 +0200) ---------------------------------------------------------------- Michal Simek (5): ARM64: zynqmp: Add u-boot,dm-pre-reloc to clk nodes ARM64: zynqmp: Wire up PSCI reset xilinx: Sync defconfigs with the latest Kconfig layout ARM64: zynqmp: Define config USB_STORAGE through defconfig ARM64: zynqmp: Do not enable DM_MMC by default Soren Brinkmann (1): ARM64: zynqmp: Fix stack pointer initialization arch/arm/Kconfig | 3 --- arch/arm/dts/zynqmp-clk.dtsi | 1 + arch/arm/dts/zynqmp-ep108-clk.dtsi | 1 + board/xilinx/zynqmp/zynqmp.c | 5 +++++ configs/microblaze-generic_defconfig | 4 ++-- configs/xilinx_zynqmp_ep_defconfig | 11 +++++++---- configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 11 +++++++---- configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 11 +++++++---- configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 8 +++++--- configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 8 +++++--- configs/xilinx_zynqmp_zcu102_defconfig | 9 ++++++--- configs/xilinx_zynqmp_zcu102_revB_defconfig | 9 ++++++--- configs/zynq_microzed_defconfig | 6 ++---- configs/zynq_picozed_defconfig | 6 ++---- configs/zynq_zc702_defconfig | 5 ++--- configs/zynq_zc706_defconfig | 5 ++--- configs/zynq_zc770_xm010_defconfig | 3 +-- configs/zynq_zc770_xm011_defconfig | 3 +-- configs/zynq_zc770_xm012_defconfig | 1 - configs/zynq_zc770_xm013_defconfig | 3 +-- configs/zynq_zed_defconfig | 6 ++---- configs/zynq_zybo_defconfig | 5 ++--- include/configs/xilinx_zynqmp.h | 4 ++-- 23 files changed, 69 insertions(+), 59 deletions(-) -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP SoCs

2 1

[U-Boot] [PATCH] MAINTAINERS, git-mailrc: Update the mmc maintainer
by Jaehoon Chung 02 Aug '16

02 Aug '16

Update the mmc maintainer from Pantelis to me. Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> --- MAINTAINERS | 2 +- doc/git-mailrc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 1225ce2..8905f88 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -299,7 +299,7 @@ T: git git://git.denx.de/u-boot-mips.git F: arch/mips/ MMC -M: Pantelis Antoniou <panto(a)antoniou-consulting.com> +M: Jaehoon Chung <jh80.chung(a)samsung.com> S: Maintained T: git git://git.denx.de/u-boot-mmc.git F: drivers/mmc/ diff --git a/doc/git-mailrc b/doc/git-mailrc index 8f0724f..a14629c 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -23,6 +23,7 @@ alias galak Kumar Gala <galak(a)kernel.crashing.org> alias hs Heiko Schocher <hs(a)denx.de> alias ijc Ian Campbell <ijc+uboot(a)hellion.org.uk> alias iwamatsu Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> +alias jaehoon Jaehoon Chung <jh80.chung(a)samsung.com> alias jagan Jagan Teki <jteki(a)openedev.com> alias jasonjin Jason Jin <jason.jin(a)freescale.com> alias jhersh Joe Hershberger <joe.hershberger(a)ni.com> @@ -35,7 +36,6 @@ alias marex Marek Vasut <marex(a)denx.de> alias masahiro Masahiro Yamada <yamada.masahiro(a)socionext.com> alias mateusz Mateusz Kulikowski <mateusz.kulikowski(a)gmail.com> alias monstr Michal Simek <monstr(a)monstr.eu> -alias panto Pantelis Antoniou <panto(a)antoniou-consulting.com> alias prafulla Prafulla Wadaskar <prafulla(a)marvell.com> alias bobenstein Przemyslaw Marczak <p.marczak(a)samsung.com> alias prom Minkyu Kang <mk7.kang(a)samsung.com> @@ -124,7 +124,7 @@ alias kerneldoc uboot, marex alias fdt uboot, sjg alias i2c uboot, hs alias kconfig uboot, masahiro -alias mmc uboot, panto +alias mmc uboot, jaehoon alias nand uboot, scottwood alias net uboot, jhersh alias phy uboot, jhersh -- 1.9.1

5 4

[U-Boot] Please pull u-boot-dm
by Simon Glass 02 Aug '16

02 Aug '16

Hi Tom, Here's the buildman updates and an fdt patch. If you end up dropping the last two patches (MAKEALL removal) that's fine. But I've included them for now. The following changes since commit 26fb8db0f4d1e7c118b5e8f3a8849f359b91c166: Merge git://git.denx.de/u-boot-rockchip (2016-07-31 20:31:13 -0400) are available in the git repository at: git://git.denx.de/u-boot-dm.git for you to fetch changes up to 6de80f2196cb7b7a2c550a636404c54cf532fc17: Drop references to MAKEALL in the documentation (2016-07-31 19:37:08 -0600) ---------------------------------------------------------------- Michal Simek (1): libfdt: Introduce new ARCH_FIXUP_FDT option Simon Glass (11): buildman: Tidy up the README a little buildman: Automatically create a config file if needed buildman: Fix the 'help' test to use the correct path buildman: Allow the toolchain error to be suppressed buildman: Improve the toolchain progress/error output buildman: Fix a typo in TestSettingsHasPath() buildman: Drop the toolchain error when downloading toolchains buildman: Avoid overwriting existing toolchain entries buildman: Add a quick-start note Drop the MAKEALL tool Drop references to MAKEALL in the documentation Kconfig | 9 + MAKEALL | 850 -------------------------------------------------------------------------- README | 35 +--- arch/arm/lib/bootm-fdt.c | 2 + arch/arm/lib/bootm.c | 2 + arch/mips/lib/bootm.c | 2 + board/Barix/ipam390/README.ipam390 | 12 +- common/image-fdt.c | 7 +- doc/README.sha1 | 5 +- tools/buildman/README | 67 ++++-- tools/buildman/bsettings.py | 44 ++++ tools/buildman/control.py | 26 ++- tools/buildman/func_test.py | 2 +- tools/buildman/toolchain.py | 49 +++-- 14 files changed, 168 insertions(+), 944 deletions(-) delete mode 100755 MAKEALL Regards, Simon

2 1

[U-Boot] [PATCH v2 00/10] MIPS Boston Development Board Support
by Paul Burton 02 Aug '16

02 Aug '16

This series introduces initial support for the MIPS Boston, and FPGA based development board & successor to the older Malta board. Further peripheral work is needed but this introduces the basics. This can be tested in a currently out-of-tree QEMU port if desired, which can be found in the boston branch of: git://git.linux-mips.org/pub/scm/paul/qemu.git QEMU can be used to run U-Boot like this: ./configure --target-list=mips64el-softmmu make ./mips64el-softmmu/qemu-system-mips64el -M boston -m 2G \ -bios u-boot.bin -serial stdio Paul Burton (10): serial: ns16550: Support clocks via phandle dt-bindings: Add interrupt-controller/mips-gic.h header pci: xilinx: Add a driver for Xilinx AXI to PCIe bridge pci: Flip condition for detecting non-PCI parent devices net: pch_gbe: Use dm_pci_map_bar to discover MMIO base net: pch_gbe: Make 64 bit safe dm: regmap: Implement simple regmap_read & regmap_write dm: syscon: Provide a generic syscon driver clk: boston: Providea simple driver for Boston board clocks boston: Introduce support for the MIPS Boston development board arch/mips/Kconfig | 16 ++ arch/mips/dts/Makefile | 1 + arch/mips/dts/img,boston.dts | 216 ++++++++++++++++++++ board/imgtec/boston/Kconfig | 16 ++ board/imgtec/boston/MAINTAINERS | 6 + board/imgtec/boston/Makefile | 9 + board/imgtec/boston/boston-lcd.h | 21 ++ board/imgtec/boston/boston-regs.h | 47 +++++ board/imgtec/boston/checkboard.c | 29 +++ board/imgtec/boston/ddr.c | 30 +++ board/imgtec/boston/lowlevel_init.S | 56 ++++++ configs/boston_defconfig | 41 ++++ drivers/clk/Kconfig | 8 + drivers/clk/Makefile | 1 + drivers/clk/clk_boston.c | 96 +++++++++ drivers/core/regmap.c | 16 ++ drivers/core/syscon-uclass.c | 11 ++ drivers/net/pch_gbe.c | 28 ++- drivers/pci/Kconfig | 7 + drivers/pci/Makefile | 1 + drivers/pci/pci-uclass.c | 2 +- drivers/pci/pcie_xilinx.c | 219 +++++++++++++++++++++ drivers/serial/ns16550.c | 19 +- include/configs/boston.h | 68 +++++++ include/dt-bindings/clock/boston-clock.h | 13 ++ .../dt-bindings/interrupt-controller/mips-gic.h | 9 + 26 files changed, 967 insertions(+), 19 deletions(-) create mode 100644 arch/mips/dts/img,boston.dts create mode 100644 board/imgtec/boston/Kconfig create mode 100644 board/imgtec/boston/MAINTAINERS create mode 100644 board/imgtec/boston/Makefile create mode 100644 board/imgtec/boston/boston-lcd.h create mode 100644 board/imgtec/boston/boston-regs.h create mode 100644 board/imgtec/boston/checkboard.c create mode 100644 board/imgtec/boston/ddr.c create mode 100644 board/imgtec/boston/lowlevel_init.S create mode 100644 configs/boston_defconfig create mode 100644 drivers/clk/clk_boston.c create mode 100644 drivers/pci/pcie_xilinx.c create mode 100644 include/configs/boston.h create mode 100644 include/dt-bindings/clock/boston-clock.h create mode 100644 include/dt-bindings/interrupt-controller/mips-gic.h -- 2.9.0

5 29

[U-Boot] [PATCH] serial: Enable checking UART is ready for console based on device tree
by Tien Fong Chee 02 Aug '16

02 Aug '16

This patch would do checking on device tree to ensure the UART exist in the system and ready for console before setting have_console to true. This is required to avoid unexpected behavior such as hang during UART initialization. Signed-off-by: Tien Fong Chee <tfchee(a)altera.com> Cc: Dinh Nguyen <dinguyen(a)opensource.altera.com> Cc: Dinh Nguyen <dinh.linux(a)gmail.com> Cc: ChinLiang <clsee(a)altera.com> Cc: Thomas Chou <thomas(a)wytron.com.tw> Cc: Simon Glass <sjg(a)chromium.org> Cc: Marek Vasut <marex(a)denx.de> --- common/console.c | 11 ++++--- common/spl/spl.c | 3 +- drivers/serial/serial.c | 58 +++++++++++++++++++++++++++++++++++- include/asm-generic/global_data.h | 1 + include/serial.h | 1 + 5 files changed, 66 insertions(+), 8 deletions(-) diff --git a/common/console.c b/common/console.c index 12293f3..c37486c 100644 --- a/common/console.c +++ b/common/console.c @@ -690,14 +690,15 @@ int console_assign(int file, const char *devname) /* Called before relocation - use serial functions */ int console_init_f(void) { - gd->have_console = 1; - + if(gd->uart_ready_for_console) { + gd->have_console = 1; #ifdef CONFIG_SILENT_CONSOLE - if (getenv("silent") != NULL) - gd->flags |= GD_FLG_SILENT; + if (getenv("silent") != NULL) + gd->flags |= GD_FLG_SILENT; #endif - print_pre_console_buffer(PRE_CONSOLE_FLUSHPOINT1_SERIAL); + print_pre_console_buffer(PRE_CONSOLE_FLUSHPOINT1_SERIAL); + } return 0; } diff --git a/common/spl/spl.c b/common/spl/spl.c index b7ec333..c18827d 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -488,7 +488,8 @@ void preloader_console_init(void) serial_init(); /* serial communications setup */ - gd->have_console = 1; + if(gd->uart_ready_for_console) + gd->have_console = 1; puts("\nU-Boot SPL " PLAIN_VERSION " (" U_BOOT_DATE " - " \ U_BOOT_TIME ")\n"); diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index f1bd15b..95690e0 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -35,6 +35,51 @@ static void serial_null(void) } /** + * uart_console_null() - This empty function would be used if UART console checking + * function is not compiled into U-boot. + * + * This routine returns true to indicate UART is ready for console by default. + * The driver is aliased to this empty function in case + * the driver is not compiled into U-Boot. + */ +static int uart_console_null(void) +{ + return 1; +} + +/** + * uart_console_func() - Forward declare of driver checking UART is ready based + * on device tree. + * @name: Name of driver which checking UART is ready based on device tree . + * + * This macro expands onto forward declaration of a driver checking + * UART is ready based on device tree, which allows own assigned function name. + * The declaration is made weak and aliases to uart_console_null() so in case + * the driver is not compiled in, the function is still declared and can + * be used, but aliases to uart_console_null() and thus is optimized away. + */ +#define uart_console_func(name) \ + int name(const void *blob) \ + __attribute__((weak, alias("uart_console_null"))); + +uart_console_func(is_default_uart_console_true); + +/** + * is_uart_console_true() - Common function to abstract the specific UART + * console checking function. + * + * This is common interface for specific UART console checking function. + */ +int is_uart_console_true(const void *blob) +{ + int ret = 0; + + ret |= is_default_uart_console_true(blob); + + return ret; +} + +/** * on_baudrate() - Update the actual baudrate when the env var changes * * This will check for a valid baudrate and only apply it if valid. @@ -415,8 +460,17 @@ static struct serial_device *get_current(void) */ int serial_init(void) { - gd->flags |= GD_FLG_SERIAL_READY; - return get_current()->start(); + if(is_uart_console_true(gd->fdt_blob)) + gd->uart_ready_for_console = 1; + else + gd->uart_ready_for_console = 0; + + if(gd->uart_ready_for_console) { + gd->flags |= GD_FLG_SERIAL_READY; + return get_current()->start(); + } + + return 0; } /** diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index a6d1d2a..1cb7ef7 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -44,6 +44,7 @@ typedef struct global_data { #ifdef CONFIG_BOARD_TYPES unsigned long board_type; #endif + unsigned long uart_ready_for_console; /* UART ready to support console */ unsigned long have_console; /* serial_init() was called */ #ifdef CONFIG_PRE_CONSOLE_BUFFER unsigned long precon_buf_idx; /* Pre-Console buffer index */ diff --git a/include/serial.h b/include/serial.h index 47332c5..a95bf70 100644 --- a/include/serial.h +++ b/include/serial.h @@ -50,6 +50,7 @@ extern void serial_initialize(void); extern void serial_stdio_init(void); extern int serial_assign(const char *name); extern void serial_reinit_all(void); +extern int is_uart_console_true(const void *blob); /* For usbtty */ #ifdef CONFIG_USB_TTY -- 1.7.7.4

3 4

[U-Boot] [PATCH v2 0/3] Add USB EHCI support for ls1012aqds
by Rajesh Bhagat 02 Aug '16

02 Aug '16

Adds USB EHCI support for ls1012qds by adding the support for NXP ULPI PHY and adding the support it configuration files. Also enables, USB2 IP in ns access defines. Rajesh Bhagat (3): drivers: usb: fsl: add USB ULPI init code config: ls1012aqds: Add USB EHCI support for ls1012aqds armv8: ls1012a: Added CSU assignment for USB2 .../include/asm/arch-fsl-layerscape/immap_lsch2.h | 1 + .../include/asm/arch-fsl-layerscape/ns_access.h | 2 + drivers/usb/host/ehci-fsl.c | 21 ++++++++++++++++++++ include/configs/ls1012aqds.h | 5 ++++ include/usb/ehci-ci.h | 2 +- 5 files changed, 30 insertions(+), 1 deletions(-) -- 1.7.7.4

2 7

[U-Boot] [PATCH 0/5] usb: fsl: Add code to use CONFIG_DM_USB
by Rajesh Bhagat 02 Aug '16

02 Aug '16

Adds code to use driver model for USB EHCI and XHCI FSL driver Rajesh Bhagat (5): drivers: usb: fsl: Make function for initialization to use in CONFIG_DM_USB usb: ehci: fsl: Add code to use CONFIG_DM_USB usb: xhci: fsl: Add code to use CONFIG_DM_USB dm: ls1021a: dts: Update USB 3.0 node to support DM USB arm: ls1021a: Enable CONFIG_DM_USB in defconfigs arch/arm/dts/ls1021a.dtsi | 2 +- configs/ls1021aqds_ddr4_nor_defconfig | 1 + configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 + configs/ls1021aqds_nor_defconfig | 1 + configs/ls1021aqds_nor_lpuart_defconfig | 1 + drivers/usb/host/ehci-fsl.c | 194 +++++++++++++++++++++---- drivers/usb/host/xhci-fsl.c | 83 +++++++++++- 7 files changed, 250 insertions(+), 33 deletions(-) -- 1.7.7.4

3 11