April 2016 - U-Boot

[U-Boot] [PATCH 0/4] ath79: fix some minor defects
by Wills Wang 07 May '16

07 May '16

These series of patch based on top of mips/next, it fix some defects on the previous patch series "add support for atheros ath79 based SOCs". Wills Wang (4): ath79: spi: Remove the explicit pinctrl setting ar933x: serial: Remove the explicit pinctrl setting ath79: ar933x: use BIT macro for bit shift operation ath79: add readonly attribute for ath79_soc_desc arch/mips/mach-ath79/ar933x/ddr.c | 14 +++++++------- arch/mips/mach-ath79/cpu.c | 8 ++++---- drivers/serial/serial_ar933x.c | 16 ++-------------- drivers/spi/ath79_spi.c | 12 ------------ 4 files changed, 13 insertions(+), 37 deletions(-) -- 1.9.1

3 6

[U-Boot] [PATCH v2 00/15] Support for boot image creation for TI secure devices
by Daniel Allred 06 May '16

06 May '16

Adds support for creating bootable images for AM43xx HS and DRA7xx/AM57xx HS devices. Daniel Allred (9): doc: Add info on using secure devices from TI ti: omap-common: Add commands for generating secure SPL images ti: AM43xx: config.mk: Add support for generating secure boot images ti_omap5_common: Update SPL start address on secure parts spl: build: ti: add support for secure boot images ARM: omap-common: Add device type to CPU string ARM: omap5: add hooks for cpu/SoC fdt fixups ARM: omap5: add ft_board_setup for dra7xx/am57xx defconfig: ti: Add configs for OMAP5-class secure parts Madan Srinivas (6): arm: am33xx: Kconfig: Add secure device definitions arm: Kconfig: Add support for AM43xx SoC specific Kconfig ti: omap-common: Add Kconfig file for secure device support ti: AM43xx: Use CONFIG options from SOC Kconfig ti: AM43xx: board: Detect AM43xx HS EVM defconfig: Add a config for AM43xx secure part arch/arm/Kconfig | 23 +-- arch/arm/cpu/armv7/am33xx/Kconfig | 40 ++++++ arch/arm/cpu/armv7/am33xx/config.mk | 20 +++ arch/arm/cpu/armv7/omap-common/Kconfig | 17 +++ arch/arm/cpu/armv7/omap-common/config_secure.mk | 66 +++++++++ arch/arm/cpu/armv7/omap-common/hwinit-common.c | 22 ++- arch/arm/cpu/armv7/omap5/Makefile | 1 + arch/arm/cpu/armv7/omap5/config.mk | 6 + arch/arm/cpu/armv7/omap5/fdt.c | 184 ++++++++++++++++++++++++ arch/arm/include/asm/arch-omap3/cpu.h | 7 +- arch/arm/include/asm/omap_common.h | 11 ++ board/ti/am43xx/board.c | 4 +- board/ti/am43xx/board.h | 14 +- board/ti/am43xx/mux.c | 2 +- board/ti/am57xx/board.c | 9 ++ board/ti/dra7xx/evm.c | 9 ++ configs/am437x_gp_evm_defconfig | 1 + configs/am437x_hs_evm_defconfig | 53 +++++++ configs/am437x_sk_evm_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_qspiboot_defconfig | 2 + configs/am43xx_evm_usbhost_boot_defconfig | 2 + configs/am57xx_evm_defconfig | 1 + configs/am57xx_hs_evm_defconfig | 36 +++++ configs/dra72_evm_defconfig | 1 + configs/dra72_hs_evm_defconfig | 55 +++++++ configs/dra74_evm_defconfig | 1 + configs/dra74_hs_evm_defconfig | 54 +++++++ doc/README.ti-secure | 91 ++++++++++++ include/configs/am43xx_evm.h | 23 ++- include/configs/ti_omap5_common.h | 32 ++++- 32 files changed, 747 insertions(+), 43 deletions(-) create mode 100644 arch/arm/cpu/armv7/am33xx/Kconfig create mode 100644 arch/arm/cpu/armv7/omap-common/Kconfig create mode 100644 arch/arm/cpu/armv7/omap-common/config_secure.mk create mode 100644 arch/arm/cpu/armv7/omap5/fdt.c create mode 100644 configs/am437x_hs_evm_defconfig create mode 100644 configs/am57xx_hs_evm_defconfig create mode 100644 configs/dra72_hs_evm_defconfig create mode 100644 configs/dra74_hs_evm_defconfig create mode 100644 doc/README.ti-secure -- 1.9.1

5 33

[U-Boot] [PATCH] ARM: fix ifdefs in ARMv8 lowlevel_init()
by Stephen Warren 06 May '16

06 May '16

From: Stephen Warren <swarren(a)nvidia.com> Commit 724219a65f55 "ARM: always perform per-CPU GIC init" removed some ifdefs to unify the MULTIENTRY-vs-non-MULTIENTRY paths. However, the wrong endif was removed. This patch adds back that missing endif, and adds a new ifdef to match the endif the now-correctly-terminated block used to match against. Use "git show -U25 724219a65f55" to see enough context to make the original issue clear. In practical terms, this makes no difference to runtime behaviour. The code that was incorrectly compiled into the binary when ifndef MULTIENTRY is a no-op for other cases, since branch_if_master evaluates to a hard- coded jump. The only issues were: - A few extra instructions were added to the binary. - The comment on the endif at the very end of the function, indicating which ifdef it matched, were wrong. An alternative might be to simply fix the comment on that trailing ifdef, but that only addresses the second point above, not the first. Fixes: 724219a65f55 ("ARM: always perform per-CPU GIC init") Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- arch/arm/cpu/armv8/start.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index deb44a895fda..c3cc8199caf9 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -214,7 +214,9 @@ WEAK(lowlevel_init) ldr x1, =GICC_BASE bl gic_init_secure_percpu #endif +#endif +#ifndef CONFIG_ARMV8_MULTIENTRY branch_if_master x0, x1, 2f /* -- 2.8.1

3 2

[U-Boot] [PATCH] spi: spi-uclass: fix typo in debug output
by Anatolij Gustschin 06 May '16

06 May '16

Signed-off-by: Anatolij Gustschin <agust(a)denx.de> Cc: Jagan Teki <jteki(a)openedev.com> --- drivers/spi/spi-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index 5561f36..9ce5f9e 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -319,7 +319,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, return 0; err: - debug("%s: Error path, credted=%d, device '%s'\n", __func__, + debug("%s: Error path, created=%d, device '%s'\n", __func__, created, dev->name); if (created) { device_remove(dev); -- 1.7.9.5

2 1

[U-Boot] [PATCH 0/2] spl: Support loading a FIT from SPI
by Lokesh Vutla 06 May '16

06 May '16

This series makes sure that raw read of fit is dma aligned and supports loading a fit from SPI. Verified on DRA7-evm. Lokesh Vutla (2): spl: Make sure destination address is dma aligned when loading fit spl: Support loading a FIT from SPI common/spl/spl_fit.c | 11 +++++++---- drivers/mtd/spi/spi_spl_load.c | 32 +++++++++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 7 deletions(-) -- 2.1.4

2 7

[U-Boot] mkimage needs fitImage
by shr ch 05 May '16

05 May '16

Hi, For adding public keys to uboot dtb the mkimage step is mkimage -D "-I dts -O dtb -p 2000" -F -k keys -K u-boot.dtb -r fitImage It resigns fitImage and adds public key to uboot dtb but why do we need fitImage for adding public keys to uboot dtb ? can't this be two different steps ? there is already a step to just build fitImage. This creates unnecessary dependency of building fitImage before building uboot.

1 1

[U-Boot] [PATCH] ARM: zynq: load u-boot.img whether CONFIG_OF_SEPARATE is defined or not
by Masahiro Yamada 05 May '16

05 May '16

Since commit ad1ecd2063da ("fdt: Build a U-Boot binary without device tree"), u-boot-dtb.img is identical to u-boot.img, so SPL can always load u-boot.img whether CONFIG_OF_SEPARATE is defined or not. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- include/configs/zynq-common.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 49d9fd0..3b5cd5b 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -339,11 +339,7 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_FAT_SUPPORT -#ifdef CONFIG_OF_SEPARATE -# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" -#else -# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#endif +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #endif /* Disable dcache for SPL just for sure */ -- 1.9.1

2 2

[U-Boot] [PATCH] ARM: tegra: import latest Jetson TK1 spreadsheet
by Stephen Warren 04 May '16

04 May '16

From: Stephen Warren <swarren(a)nvidia.com> This imports v11 of "Jetson TK1 Development Platform Pin Mux" from https://developer.nvidia.com/embedded/downloads. The new version defines the mux option for the MIPI pad ctrl selection. The OWR pin no longer has an entry in the configuration table because the only mux option it support is OWR, that feature isn't supported, and hence can't conflict with any other pin. This pin can only usefully be used as a GPIO. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- Note that the cleanup series I sent on Tuesday accidentally depends on this being applied first. I'd expect this to have higher priority than the cleanup series and be applied earlier anyway. board/nvidia/jetson-tk1/jetson-tk1.c | 3 +++ board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c index 14f0ce54554e..a66b710cddab 100644 --- a/board/nvidia/jetson-tk1/jetson-tk1.c +++ b/board/nvidia/jetson-tk1/jetson-tk1.c @@ -31,6 +31,9 @@ void pinmux_init(void) pinmux_config_drvgrp_table(jetson_tk1_drvgrps, ARRAY_SIZE(jetson_tk1_drvgrps)); + + pinmux_config_mipipadctrlgrp_table(jetson_tk1_mipipadctrlgrps, + ARRAY_SIZE(jetson_tk1_mipipadctrlgrps)); } #ifdef CONFIG_PCI_TEGRA diff --git a/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h b/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h index b2b2057e3bd3..00e0cdc4b8c0 100644 --- a/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h +++ b/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h @@ -276,7 +276,6 @@ static const struct pmux_pingrp_config jetson_tk1_pingrps[] = { PINCFG(CPU_PWR_REQ, CPU, NORMAL, NORMAL, OUTPUT, DEFAULT, DEFAULT), PINCFG(PWR_INT_N, PMI, UP, TRISTATE, INPUT, DEFAULT, DEFAULT), PINCFG(RESET_OUT_N, RESET_OUT_N, NORMAL, NORMAL, INPUT, DEFAULT, DEFAULT), - PINCFG(OWR, RSVD2, DOWN, TRISTATE, OUTPUT, DEFAULT, NORMAL), PINCFG(CLK_32K_IN, CLK, NORMAL, TRISTATE, INPUT, DEFAULT, DEFAULT), PINCFG(JTAG_RTCK, RTCK, UP, NORMAL, OUTPUT, DEFAULT, DEFAULT), }; @@ -296,4 +295,15 @@ static const struct pmux_pingrp_config jetson_tk1_pingrps[] = { static const struct pmux_drvgrp_config jetson_tk1_drvgrps[] = { }; +#define MIPIPADCTRLCFG(_grp, _mux) \ + { \ + .grp = PMUX_MIPIPADCTRLGRP_##_grp, \ + .func = PMUX_FUNC_##_mux, \ + } + +static const struct pmux_mipipadctrlgrp_config jetson_tk1_mipipadctrlgrps[] = { + /* grp, mux */ + MIPIPADCTRLCFG(DSI_B, DSI_B), +}; + #endif /* PINMUX_CONFIG_JETSON_TK1_H */ -- 2.8.1

3 3

[U-Boot] [PATCH] pci: tegra: fix DM conversion issues on Tegra20
by Stephen Warren 04 May '16

04 May '16

From: Stephen Warren <swarren(a)nvidia.com> Tegra20's PCIe controller has a couple of quirks. There are workarounds in the driver for these, but they don't work after the DM conversion: 1) The PCI_CLASS value is wrong in HW. This is worked around in pci_tegra_read_config() by patching up the value read from that register. Pre-DM, the PCIe core always read this via a 16-bit access to the 16-bit offset 0xa. With DM, 32-bit accesses are used, so we need to check for offset 0x8 instead. Mask the offset value back to 32-bit alignment to make this work in all cases. 2) Accessing devices other than dev 1 causes a data abort. Pre-DM, this was worked around in pci_skip_dev(), which the PCIe core code called during enumeration while iterating over a bus. The DM PCIe core doesn't use this function. Instead, enhance tegra_pcie_conf_address() to validate the bdf being accessed, and refuse to access invalid devices. Since pci_skip_dev() isn't used, delete it. I've also validated that both these WARs are only needed for Tegra20, by testing on Tegra30/Cardhu and Tegra124/Jetson TKx. So, compile them in conditionally. Fixes: e81ca88451cf ("dm: tegra: pci: Convert tegra boards to driver model for PCI") Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- drivers/pci/pci_tegra.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c index 5dadf6fa62a7..c5b04daffa65 100644 --- a/drivers/pci/pci_tegra.c +++ b/drivers/pci/pci_tegra.c @@ -275,12 +275,17 @@ static int tegra_pcie_conf_address(struct tegra_pcie *pcie, pci_dev_t bdf, return 0; } } + return -EFAULT; } else { +#ifdef CONFIG_TEGRA20 + unsigned int dev = PCI_DEV(bdf); + if (dev != 0) + return -EFAULT; +#endif + *address = pcie->cs.start + tegra_pcie_conf_offset(bdf, where); return 0; } - - return -EFAULT; } static int pci_tegra_read_config(struct udevice *bus, pci_dev_t bdf, @@ -299,13 +304,15 @@ static int pci_tegra_read_config(struct udevice *bus, pci_dev_t bdf, value = readl(address); +#ifdef CONFIG_TEGRA20 /* fixup root port class */ if (PCI_BUS(bdf) == 0) { - if (offset == PCI_CLASS_REVISION) { + if ((offset & ~3) == PCI_CLASS_REVISION) { value &= ~0x00ff0000; value |= PCI_CLASS_BRIDGE_PCI << 16; } } +#endif done: *valuep = pci_conv_32_to_size(value, offset, size); @@ -1041,11 +1048,3 @@ U_BOOT_DRIVER(pci_tegra) = { .probe = pci_tegra_probe, .priv_auto_alloc_size = sizeof(struct tegra_pcie), }; - -int pci_skip_dev(struct pci_controller *hose, pci_dev_t dev) -{ - if (PCI_BUS(dev) != 0 && PCI_DEV(dev) > 0) - return 1; - - return 0; -} -- 2.8.1

4 4

[U-Boot] [PATCH] fdt: fix setting MAC addresses for multiple interfaces
by Lev Iserovich 04 May '16

04 May '16

For multiple ethernet interfaces the FDT offset of '/aliases' will change as we are adding MAC addresses to the FDT. Therefore only the first interface ('ethernet0') will get properly updated in the FDT, with the rest getting FDT errors when we try to set their MAC address. Switch to using fdt_get_alias() which is the proper way to get the FDT path. Signed-off-by: Lev Iserovich <iserovil(a)deshawresearch.com> --- common/fdt_support.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index 66464db..20e0e1c 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -481,16 +481,12 @@ int fdt_fixup_memory(void *blob, u64 start, u64 size) void fdt_fixup_ethernet(void *fdt) { - int node, i, j; + int i, j; char enet[16], *tmp, *end; char mac[16]; const char *path; unsigned char mac_addr[6]; - node = fdt_path_offset(fdt, "/aliases"); - if (node < 0) - return; - if (!getenv("ethaddr")) { if (getenv("usbethaddr")) { strcpy(mac, "usbethaddr"); @@ -505,7 +501,7 @@ void fdt_fixup_ethernet(void *fdt) i = 0; while ((tmp = getenv(mac)) != NULL) { sprintf(enet, "ethernet%d", i); - path = fdt_getprop(fdt, node, enet, NULL); + path = fdt_get_alias(fdt, enet); if (!path) { debug("No alias for %s\n", enet); sprintf(mac, "eth%daddr", ++i); -- 2.1.0

5 11