summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-24common: Move do_tftpb() to net.hSimon Glass
This function belongs in the network header file. Move it. Signed-off-by: Simon Glass <sjg@chromium.org>
2020-01-24common: Move embedded fdt location to fdtdec.hSimon Glass
These declarations are only used in fdtdec.c so move them to its header file. Signed-off-by: Simon Glass <sjg@chromium.org>
2020-01-24common: Drop checkflash() and checkdram()Simon Glass
These functions are not used in U-Boot. Drop them. Signed-off-by: Simon Glass <sjg@chromium.org>
2020-01-24common: Move flash_perror() to flash.hSimon Glass
This function belongs more in flash.h than common.h so move it. Also remove the space before the bracket in some calls. Signed-off-by: Simon Glass <sjg@chromium.org>
2020-01-24common: Move main_loop() to init.hSimon Glass
Move this function out of common.h and into a better place. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
2020-01-24common: Drop mdm_init()Simon Glass
This is not used in U-Boot. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
2020-01-24tools: ftdgrep: correct the find regions loop in do_fdtgrepPatrick Delaunay
Use realloc and update the loop executed in do_fdtgrep to find all the regions: only test count > max_region after the second pass. This patch solve an issue if the number of region found (count) is greater then the default value (max_region = count = 100): the second pass is never executed, because the loop stops after the first pass (i = 0, count > 100, max_regions = 100) with error -1 and the error message "Internal error with fdtgrep_find_region". I also update the error message. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
2020-01-24arm: Add arm handoff header fileMichael Trimarchi
Add an arch-specific handoff header so that we can use the HANDOFF feature on arm devices. Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2020-01-24serial: ns16550: Use old baud rate divisor for flushing if not givenPatrik Dahlström
If baud_divisor is not set (i.e. == -1), we should use the baud divisor already in use for flushing the xmit register. If we don't flush the xmit register, then SPL will hang. Signed-off-by: Patrik Dahlström <risca@dalakolonin.se>
2020-01-24cmd: mtd: solve bad block support in erase commandPatrick Delaunay
This patch modify the loop in mtd erase command to erase one by one the blocks in the requested area. It solves issue on "mtd erase" command on nand with existing bad block, the command is interrupted on the first bad block with the trace: "Skipping bad block at 0xffffffffffffffff" In MTD driver (nand/raw), when a bad block is present on the MTD device, the erase_op.fail_addr is not updated and we have the initial value MTD_FAIL_ADDR_UNKNOWN = (ULL)-1. This case seems normal in nand_base.c:nand_erase_nand(), we have the 2 exit cases during the loop: 1/ we have a bad block (nand_block_checkbad) instr->state = MTD_ERASE_FAILED loop interrupted (goto erase_exit) 2/ if block erase failed (status & NAND_STATUS_FAIL) instr->state = MTD_ERASE_FAILED; instr->fail_addr = ((loff_t)page << chip->page_shift); loop interrupted (goto erase_exit) So erase_op.fail_addr can't be used if bad blocks were present in the erased area; we need to use mtd_erase only one block to detect and skip these existing bad blocks (as it is done in nand_util.c). Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
2020-01-24remoteproc: elf_loader: fix program header parsingFabien Dessenne
Fix an issue where some sections are never loaded : if p_type is different from PT_LOAD the phdr pointer must be incremented. Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com> Acked-by: Suman Anna <s-anna@ti.com>
2020-01-24configs: ls1028aqds: enable mdio muxing by defaultAlex Marginean
LS1028A QDS boards have a MDIO MUX and they require the driver for it for PHYs to work. Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24configs: fsl-layerscape: secure_boot: Enable setexpr commandUdit Agarwal
setexpr command is used while running secure boot (chain of trust with confidentiality) feature. Enable CONFIG_CMD_SETEXPR to enable setexpr command. Signed-off-by: Udit Agarwal <udit.agarwal@nxp.com> Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24board: fsl: lx2160a: Fix the loop in board_fix_fdt functionPankaj Bansal
Fix loop in board_fix_fdt that erroneously increments the counter in all cases whereas the counter should be incremented only if a matching string has been found. Fixes: 5d535aa40b ("board: fsl: lx2160a: implement board_fix_fdt") Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com> Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24arch: armv8: fsl-layerscape: export serdes config to environmentAlex Marginean
Exports the serdes configuration as an environment variable for LS gen 3 SoCs, so it can be used in u-boot command line. It should particularly be useful for applying Linux DT overlays for the given serdes configuration. This code is called from arch_misc_init and not from the existing serdes_init function because it depends on U-Boot environment being set up. Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24board: fsl: ls1028a: free up arch_misc_initAlex Marginean
Currently LS1028A board code uses arch_misc_init to set up the board mux on QDS. Move this code to misc_init_r. This is consistent with LS gen 2 and T series SoCs/boards. Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24board: fsl: ls1088a: remove empty arch_misc_initAlex Marginean
The arch_misc_init function is empty on LS108x SoCs/boards, remove it. Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24board: fsl: ls2080a/ls2081a: remove empty arch_misc_initAlex Marginean
The arch_misc_init function is empty on LS2 SoCs/boards, remove it. Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24board: fsl: lx2160a: free up arch_misc_initAlex Marginean
Currently LX2 board code uses arch_misc_init to set up the board mux on RDB and QDS. Move this code to misc_init_r. This is consistent with LS gen 2 and T series SoCs/boards. Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24armv8: ls1028a_serdes: Add few missing serdes protocolsAlex Marginean
Add serdes protocol 0x7777, 0x9999, 0xb998, 0xbb56 to supported list. These protocols are supported and functional but they trigger a warning in U-Boot console at boot because they are not on this list. Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24drivers: net: fsl_enetc: fix SXGMII MAC configurationAlex Marginean
Separate MAC and serdes configuration, MAC configuration must be applied at each enetc_start() as FLR clears it. This restores traffic for ENETC interfaces in USXGMII mode. Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24lx2160: Correct default environment variableMeenakshi Aggarwal
Create separate "boot_scripts" and "boot_script_hdr" environment variable for LX2160A RDB and QDS board. Signed-off-by: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24include/configs: ls1012afrwy: adjust kernel_addr_rBiwen Li
The linux kernel Image is growing quite quickly, if kernel Image size grow beyond 36 MB then kernel Image at load address 0x81000000 overlaps with the reserved memory region at 0x83400000. Adjust kernel load address(kernel_addr_r) from 0x81000000 to 0x96000000 to avoid kernel Image overlapping with reserved memory region. This change fixes the below U-Boot error while booting uncompressed kernel Image through booti command, ERROR: reserving fdt memory region failed (addr=83400000 size=c00000) Signed-off-by: Biwen Li <biwen.li@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24include/configs: ls1012ardb: adjust kernel_addr_rBiwen Li
The linux kernel Image is growing quite quickly, if kernel Image size grow beyond 36 MB then kernel Image at load address 0x81000000 overlaps with the reserved memory region at 0x83400000. Adjust kernel load address(kernel_addr_r) from 0x81000000 to 0x96000000 to avoid kernel Image overlapping with reserved memory region. This change fixes the below U-Boot error while booting uncompressed kernel Image through booti command, ERROR: reserving fdt memory region failed (addr=83400000 size=c00000) Signed-off-by: Biwen Li <biwen.li@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24armv8: fsl-layerscape: LS1044A/1048A: enable Only 1x 10GE portPramod Kumar
LS1088A has four personalities, LS1088A, LS1084A, LS1048A and LS1044A. LS1044A, LS1048A are LS1088A personalities, which support only one 1x 10GE port. MAC1 and MAC2 are associated with 1G SGMII, 2.5G SGMII, and XFI. Disable MAC1 to have only one 1x 10GE port for LS1044A, LS1048A. Signed-off-by: Pramod Kumar <pramod.kumar_1@nxp.com> Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24ARM: LS1021A: remove redundant "depends on ARCH_LS1021A"Masahiro Yamada
These config entries are inside the menu block, which already depends on ARCH_LS1021A: menu "LS102xA architecture" depends on ARCH_LS1021A Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24board/lx2160aqds: Update the DSPI status fixupXiaowei Bao
The dts node of the DSPI controller in kernel is spi instead of dspi, it is not correct if use "/soc/dspi@" to fix up the status of the dts in kernel, so, modify it to "/soc/spi@". The DSPI2 and I2C5 are muxed, and the status of DSPI2 node in kernel dts default value is okay, So set the status of DSPI2 node in kernel dts to disabled if it is muxed as I2C5. Signed-off-by: Xiaowei Bao <xiaowei.bao@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24configs: lx2160a: enable CONFIG_OF_BOARD_FIXUP for SECURE_BOOT defconfigWasim Khan
lx2160a rev1 and rev2 SoC has different pcie controller. The pcie controller device tree node fields "compatible" and registers names needs to be updated accordingly. Enable CONFIG_OF_BOARD_FIXUP to apply board_fix_fdt which updates the "compatible" and registers names. Signed-off-by: Wasim Khan <wasim.khan@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24pci: layerscape: device tree fixup based on SoC andWasim Khan
lx2160a rev1 requires layerscape_gen4 device tree fixup and lx2160a rev2 requires layerscape device tree fixup. Add device tree fixup for lx2160a based on SoC and Version. Signed-off-by: Wasim Khan <wasim.khan@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24pci: layerscape: Move streamId allocation to common device tree fixupWasim Khan
Move streamId allocation to layerscape common device tree fixup. Calculate streamId based on SoC variant. Signed-off-by: Wasim Khan <wasim.khan@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24pci: layerscape: Common device tree fixup for NXP SoCsWasim Khan
Add Common device tree fixup for NXP SoCs. Based on SoC and revision call pcie_layerscape or pcie_layerscape_gen4 fixup. Signed-off-by: Wasim Khan <wasim.khan@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24armv8: ls1012a: Make USB masters snoopableRan Wang
Program register bit of SCFG_SNPCNFGCR_USBRDSNP and SCFG_SNPCNFGCR_USBWRSNP to drive USB read/write snoop signal on LS1012A. Signed-off-by: Ran Wang <ran.wang_1@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24drivers: net: fsl_enetc: add write_hwaddr() for LS1028AMichael Walle
The LS1028A SoC is special in the handling of the MAC addresses. We need to write to the IERB version of the PSIPMAR0/1 register. This value will be sampled into the corresponding port PSIPMAR0/1 register if the PCI memory access is enabled. Signed-off-by: Michael Walle <michael@walle.cc> Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24drivers: net: fsl_enetc: use write_hwaddr()Michael Walle
Intead of setting the MAC address in enetc_start() use the proper write_hwaddr(). U-Boot takes care of the random MAC address, too. Signed-off-by: Michael Walle <michael@walle.cc> Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24board: ls1046afwry: Disable sgmii supportPramod Kumar
LS1046A SoC serdes protocol 0x3040 supports both sgmi and qsgmii, however ls1046afrwy supports only qsgmii on board. So, disable unsupported sgmii on board. Signed-off-by: Pramod Kumar <pramod.kumar_1@nxp.com> Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24pci: layerscape: Fix the BARs disable functionHou Zhiqiang
There is not any difference for disabling BARs in RC mode between PCIe controllers with and without SRIOV. Fixes: 80afc63fc342 ("pci: layerscape: add pci driver based on DM") Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24pci: layerscape: Fix the disabling of Expansion ROM BARHou Zhiqiang
The software will still get non-zero Expansion ROM BAR size even when the BAR_EN bit is cleared. The BAR_EN bit of register EXP_ROM_BAR_MASK_RC is not working as expected, so this patch changes to mask all the bits. Fixes: 80afc63fc342 ("pci: layerscape: add pci driver based on DM") Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24configs: ls1012afwry: Enable usb network cards supportYinbo Zhu
Enable RTL8152, AX88179 and AX8817X USB network cards support for ls1012afwry Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24configs: ls1088ardb: Enable usb network cards supportYinbo Zhu
Enable RTL8152, AX88179 and AX8817X USB network cards support for ls1088ardb Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24configs: ls1046afwry: Enable usb network cards supportYinbo Zhu
Enable RTL8152, AX88179 and AX8817X USB network cards support for ls1046afrwy Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-24drivers: net: fsl_enetc: Pass on primary MAC address to LinuxAlex Marginean
Passes on the primary address used by u-boot to Linux. The code does a DT fix-up for ENETC PFs and sets the primary MAC address in IERB. The address in IERB is restored on ENETC PCI functions at FLR. Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
2020-01-23Merge branch '2020-01-22-master-imports'Tom Rini
- Re-add U8500 platform support - Add bcm968360bg support - Assorted Keymile fixes - Other assorted bugfixes
2020-01-23disk: part: rename parameter of lba512_muldiv()Heinrich Schuchardt
div_by is a misleading parameter name, when we are doing >> div_by. Rename it to right_shift. Reported-by: Simon Glass <sjg@chromium.org> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
2020-01-23qemu-arm: set CONFIG_SYS_BOOTM_LEN to SZ_64MDhananjay Phadke
FIT image contents can be larger than default bootm limit 8M with initrd. Raise limit to 64MB which is commonly used elsewhere. Signed-off-by: Dhananjay Phadke <dphadke@linux.microsoft.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2020-01-23arm/km: remove unmaintained board kmsuv31Holger Brunck
This target is out of maintenance and can be removed. Signed-off-by: Holger Brunck <holger.brunck@ch.abb.com> CC: Valentin Longchamp <valentin.longchamp@ch.abb.com> CC: Stefan Roese <sr@denx.de> Reviewed-by: Stefan Roese <sr@denx.de>
2020-01-23arm/km: remove unmaintained board SUGP1Holger Brunck
This target is out of maintenance and can be removed. Signed-off-by: Holger Brunck <holger.brunck@ch.abb.com> CC: Valentin Longchamp <valentin.longchamp@ch.abb.com> CC: Stefan Roese <sr@denx.de> Reviewed-by: Stefan Roese <sr@denx.de>
2020-01-23arm/km: add support for SUSE2Holger Brunck
This board is similar to SUV31, but the FPGA is reset concept is quite different. Signed-off-by: Holger Brunck <holger.brunck@ch.abb.com> CC: Valentin Longchamp <valentin.longchamp@ch.abb.com> CC: Stefan Roese <sr@denx.de> Reviewed-by: Stefan Roese <sr@denx.de>
2020-01-23zfs: remove unused buf variableJoel Johnson
Remove unused variable to silence compiler warning Signed-off-by: Joel Johnson <mrjoel@lixil.net>
2020-01-23km/scripts: product env and auto-reset for ramfsHolger Brunck
This patch adds the possibility in both debug and ramfs modes to optionally load an env file from /tftpboot/$tftppath (this is ignored if not present, so the change is backward compatible). This gives the debug and ramfs scripts the possibility to set uboot environment variables that were previously asked the users to manually set (nfs path in debug and rootfs size in ramfs). Signed-off-by: Holger Brunck <holger.brunck@ch.abb.com> CC: Tom Rini <trini@konsulko.com>
2020-01-23km/scripts: fix run ramfs and COGE5 tftppath problemHolger Brunck
The tftppath was not set in case of run ramfs. It worked only by chance if was already set before. Also check the boardname before setting the tftppath for COGE5. Signed-off-by: Holger Brunck <holger.brunck@ch.abb.com> CC: Tom Rini <trini@konsulko.com>