summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* sandbox: eth-raw: Add a function to ask the host about localhostJoe Hershberger2018-07-263-6/+39
| | | | | | | | Instead of doing a simple string compare against "lo", look for the flag that indicates a localhost interface. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* net: sandbox-raw: Convert raw eth driver to livetreeJoe Hershberger2018-07-263-25/+39
| | | | | Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* net: sandbox: Convert sandbox mock eth driver to livetreeJoe Hershberger2018-07-261-4/+12
| | | | | | | Use the dev_ functions to access DT properties. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* net: Correct comment in KconfigJoe Hershberger2018-07-261-2/+2
| | | | | Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* sandbox: eth-raw: Make sure descriptors are always initializedJoe Hershberger2018-07-261-2/+3
| | | | | | | | If we let descriptors equal 0, we can end up closing STDIN. Make sure they start out as -1. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* net: Only call halt on a driver that has been init'edJoe Hershberger2018-07-261-1/+1
| | | | | | | | | | | | With driver model, we were not checking if the state of the device was marked as active before calling the halt function. Check that the device is probed and also marked as active. This avoids the case where we were calling halt on the first device in net_init() and the driver would operate on bogus data structures causing problems. In this case, the priv was all 0, so halt() would close STDIN. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* sandbox: Fix format of fake-host-hwaddr in test.dtsJoe Hershberger2018-07-261-4/+4
| | | | | | | | test.dts specified the fake MAC address as a u32 array. Instead it should be a u8 array. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* sandbox: eth-raw: Correct valid socket test in send/recvJoe Hershberger2018-07-261-2/+2
| | | | | | | | | | In open, the socket is correctly checked to be -1 in the error case. In send and recv, we checked for 0, but that is a valid socket number. Correct this by checking for -1 as a bad socket everywhere. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* sandbox: Don't disable ctrlc() on sandbox if in raw modeJoe Hershberger2018-07-262-2/+4
| | | | | | | | | | | | | | | In raw mode, handle ctrl-c as normal. This allows normal ctrl-c behavior such as aborting a command that is timing out without completely terminating the sandbox executable. In [1], Simon disabled this. His reason for it was that it interferes with piping test scripts. Piping should be done in cooked mode, so this change should still not interfere. [1] commit 8969ea3e9f2db04a6b3675 ("sandbox: Disable Ctrl-C") Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* console: Remember if ctrlc is disabled in console_tstc()Joe Hershberger2018-07-261-3/+4
| | | | | | | | We don't necessarily want to re-enable ctrl-c if it was already disabled when calling tstc(). Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* Makefile: Fix 'clean' targetTom Rini2018-07-261-2/+2
| | | | | | | | | | Now that we have removed the DocBook files we need to not try and clean that directory. Reported-by: ericywl <midnight2903@gmail.com> Reported-by: Jagan Teki <jagan@amarulasolutions.com> Fixes: 78a88f7930be ("doc: Replace DocBook with sphinx-based docs") Signed-off-by: Tom Rini <trini@konsulko.com>
* Merge branch 'master' of git://git.denx.de/u-boot-uniphierTom Rini2018-07-2424-107/+206
|\
| * ARM: uniphier: enable distro bootMasahiro Yamada2018-07-254-48/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to the distro boot for UniPhier platform. - Remove the environment vairalbes used to load images from raw block devices. - Keep the command to download images via tftp. This will be useful to boot the kernel when no valid kernel image is ready yet in the file system. - Use root.cpio.gz instead of root.cpio.uboot because we always know the file size of the init ramdisk; it is loaded via either a file system or network. - Rename fit_addr_r to kernel_addr_r, which the distro command checks to get the load address of FIT image. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * ARM: uniphier: enable MTD partition and UBIMasahiro Yamada2018-07-253-3/+14
| | | | | | | | | | | | | | | | | | | | | | Enable "mtdparts" and "ubi" commands for uniphier_v8_defconfig to use UBI on NAND devices. Enable only "mtdparts" for uniphier_{v7,ld4_sld8}_defconfig because enabling UBI would increase 170KB, which would be memory footprint problem. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * ARM: uniphier: support fdt_fixup_mtdpartsMasahiro Yamada2018-07-251-0/+8
| | | | | | | | | | | | | | Propagate the "mtdparts" environment variable to the DT passed in to OS. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * ARM: uniphier: split ft_board_setup() out to a separate fileMasahiro Yamada2018-07-255-36/+58
| | | | | | | | | | | | Prepare to add more fdt fixup code. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * ARM: uniphier: clean-up ft_board_setup()Masahiro Yamada2018-07-251-3/+3
| | | | | | | | | | | | | | The 'bd' is passed in ft_board_setup() as the second argument. Replace 'gd->bd' with 'bd'. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * board: constify struct node_info arrayMasahiro Yamada2018-07-259-9/+9
| | | | | | | | | | | | | | Add 'const' (also 'static' in some places) to struct node_info arrays to save memory footprint. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * fdt_support: make fdt_fixup_mtdparts() prototype more specificMasahiro Yamada2018-07-252-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The second argument of fdt_fixup_mtdparts() is an opaque pointer, 'void *node_info', hence callers can pass any pointer. Obviously, fdt_fixup_mtdparts() expects 'struct node_info *' otherwise, it crashes run-time. Change the prototype so that it is compile-time checked. Also, add 'const' qualifier to it so that callers can constify the struct node_info arrays. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * mtd: nand: denali: correct buffer alignment for DMA transferMasahiro Yamada2018-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NAND framework makes sure to pass in the buffer with at least chip->buf_align alignment. Currently, the Denali NAND driver only requests 16 byte alignment. This causes unaligned cache operations for the DMA transfer. [Error Example] => nand read 81000010 0 1000 NAND read: device 0 offset 0x0, size 0x1000 CACHE: Misaligned operation at range [81000010, 81001010] CACHE: Misaligned operation at range [81000010, 81001010] CACHE: Misaligned operation at range [81000010, 81001010] CACHE: Misaligned operation at range [81000010, 81001010] 4096 bytes read: OK Reported-by: Marek Vasut <marex@denx.de> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * kconfig: Avoid format overflow warning from GCC 8.1Luis Araneda2018-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-pick kernel commit 2ae89c7 (2018-06-05) to avoid warnings when compiling with GCC 8.1 In file included from scripts/kconfig/zconf.tab.c:2486: scripts/kconfig/confdata.c: In function ‘conf_write’: scripts/kconfig/confdata.c:771:22: warning: ‘%s’ directive writing likely 7 or more bytes into a region of size between 1 and 4097 [-Wformat-overflow=] sprintf(newname, "%s%s", dirname, basename); ^~ scripts/kconfig/confdata.c:771:19: note: assuming directive output of 7 bytes sprintf(newname, "%s%s", dirname, basename); ^~~~~~ scripts/kconfig/confdata.c:771:2: note: ‘sprintf’ output 1 or more bytes (assuming 4104) into a destination of size 4097 sprintf(newname, "%s%s", dirname, basename); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ scripts/kconfig/confdata.c:774:23: warning: ‘.tmpconfig.’ directive writing 11 bytes into a region of size between 1 and 4097 [-Wformat-overflow=] sprintf(tmpname, "%s.tmpconfig.%d", dirname, (int)getpid()); ^~~~~~~~~~~ scripts/kconfig/confdata.c:774:3: note: ‘sprintf’ output between 13 and 4119 bytes into a destination of size 4097 sprintf(tmpname, "%s.tmpconfig.%d", dirname, (int)getpid()); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Luis Araneda <luaraneda@gmail.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | mailmap: Fix broken email from fit_image.cMichal Simek2018-07-241-0/+1
| | | | | | | | | | | | | | | | | | The patch "tools/mkimage: Fix DTC run command to handle file names with space" (sha1: a6e9810495bc929b6beafb88f557cdaadf87fc83) contains comma in name which is confusing patman. Fix it by defining Mirza's email in mailmap. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | configs: am3517-evm: Setup NAND bootingAdam Ford2018-07-241-0/+5
| | | | | | | | | | | | | | | | The NAND offsets for the kernel and U-Boot were missing. This patch sets up the offsets so the AM3517-EVM can boot from NAND when DIP switches S7:1 and S7:4 are to the OFF position Signed-off-by: Adam Ford <aford173@gmail.com>
* | ARM: AM3517-EVM: Update MaintainerAdam Ford2018-07-241-1/+1
| | | | | | | | | | | | | | | | The previous e-mail pointing to Vaibhav Hiremath <hvaibhav@ti.com> is bouncing and has for some time. This updates it to myself and I work for Logic PD the manufacturer of the AM3517-SOM and EVM Signed-off-by: Adam Ford <aford173@gmail.com>
* | config: remove unused CONFIG_SPL_RELOC_STACK_SIZEHeinrich Schuchardt2018-07-2413-13/+0
| | | | | | | | | | | | Symbol CONFIG_SPL_RELOC_STACK_SIZE is not used anywhere. So remove it. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
* | doc: Move device tree bindings documentation to doc/device-tree-bindingsBreno Lima2018-07-243-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Currently the U-Boot project contains 2 documentation directories: - doc/ - Documentation/ The Documentation directory only contains device tree bindings related content, so move the 3 files to doc/device-tree-bindings/. Signed-off-by: Breno Lima <breno.lima@nxp.com>
* | mkimage: fit_image: Use macros from image.hMichal Simek2018-07-241-24/+29
| | | | | | | | | | | | | | | | There is no reason not to use macros which are already defined. It is also much easier for grepping. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | omap3: beagle: re-enable EFI support after the following commit removed it ↵Guillaume GARDET2018-07-241-3/+0
| | | | | | | | | | | | | | | | | | | | | | by mistake: commit d233ccb1d84b901f7e23e6d9b4f2c6a57198b23b ARM: omap3: beagle: Enable DM_SERIAL, update distro usage and NAND layout Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Cc: Derald D. Woods <woods.technical@gmail.com> Cc: Tom Rini <trini@konsulko.com>
* | spl: remove dependency to "asm/utils.h"Paulo Zaneti2018-07-241-1/+0
| | | | | | | | | | | | | | | | Header file "asm/utils.h" is not required to compile "spl_ymodem.c". So, removing this dependency allows other architectures to use this booting device as "asm/utils.h" is only present in "arm" architecture. Signed-off-by: Paulo Zaneti <paulo.zaneti@datacom.ind.br>
* | hashtable: Fix length calculation in hexport_rZubair Lutfullah Kakakhel2018-07-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The length returned by hexport_r has a few redundant characters. This appears as NULL characters at the end so seems harmless. Remove the surplus counts in two places totlen += strlen(ep->key) + 2; I'm guessing the +2 here is for = and sep char. But there is another totlen += 2; line that does that. size = totletn + 1; Doesn't make sense and isn't justified with any comment. Signed-off-by: Zubair Lutfullah Kakakhel <zubair@resin.io>
* | avb2.0: use block API in AVB opsIgor Opaniuk2018-07-241-4/+5
| | | | | | | | | | | | | | | | | | Use blk_dread()/blk_dwrite() in mmc_read()/mmc_write() AVB operation implementations. This fixes compilation issues when CONFIG_BLK is enabled. Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org> Tested-by: Eugeniu Rosca <rosca.eugeniu@gmail.com>
* | avb2.0: add proper dependenciesIgor Opaniuk2018-07-244-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Since libavb library alone is highly portable, introduce dedicated Kconfig symbol for AVB bootloader-dependent operations, so it's possible to build libavb separately. AVB bootloader-dependent operations include: * Helpers to process strings in order to build OS bootargs. * Helpers to access MMC, similar to drivers/fastboot/fb_mmc.c. * Helpers to alloc/init/free avb ops. 2. Add CONFIG_FASTBOOT dependency, as fastboot buffer is re-used in partition verification operations. Reported-by: Eugeniu Rosca <rosca.eugeniu@gmail.com> Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org> Reviewed-by: Eugeniu Rosca <rosca.eugeniu@gmail.com> Tested-by: Eugeniu Rosca <rosca.eugeniu@gmail.com>
* | mtdparts: fixed buffer overflow bugKay Potthoff2018-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | In the case that there was no name defined for a partition the code assumes that name_len is 22 and therefore allocates exactly that space for a dummy name. But the function sprintf() first resolves "0x%08llx@0x%08llx" to a string that is longer than 22 bytes. This leads to a buffer overflow. The replacement function snprintf() limits the copied bytes to name_len and therefore avoids the buffer overflow. Signed-off-by: Kay Potthoff <Kay.Potthoff@microsys.de>
* | board: STiH410-B2260: Set SYS_BOOTM_LEN to 16MPatrice Chotard2018-07-241-0/+3
| | | | | | | | | | | | | | | | | | With recent kernel v4.18-rcx, uImage becomes bigger than 8MB. Set SYS_BOOTM_LEN to 16MB, this fix the following error message: "Fix Loading Kernel Image ... Image too large: increase CONFIG_SYS_BOOTM_LEN" Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
* | mtd: remove stale comment in mtd_oob_ops structureMiquel Raynal2018-07-241-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | A comment in the kernel doc of the mtd_oob_ops structure tells that it is not possible to write more than one page with OOB. This was probably true at some time in the past but today it is entirely wrong. As one can see for instance in the nand_do_write_ops() helper available in the NAND core, this implementation called by mtd->_write_oob() simply loops over the pages until everything has been written. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
* | rtc: compile date.c if DM_RTCAKASHI Takahiro2018-07-241-1/+2
|/ | | | | | | | | rtc_to_tm() and rtc_mktime() are required for some RTC drivers, at least PL031. Without this patch, we also need to enable CONFIG_CMD_DATE even if we don't want or need this command. Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
* mtd: nand: add new enum for storing ECC algorithmRafał Miłecki2018-07-231-0/+8
| | | | | | | | | | | | | | | | | | Our nand_ecc_modes_t is already a bit abused by value NAND_ECC_SOFT_BCH. This enum should store ECC mode only and putting algorithm details there is a bad idea. It would result in too many values impossible to support in a sane way. To solve this problem let's add a new enum. We'll have to modify all drivers to set it properly but once it's done it'll be possible to drop NAND_ECC_SOFT_BCH. That will result in a cleaner design and more possibilities like setting ECC algorithm for hardware ECC mode. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> [Linux commit: b0fcd8ab7b3c89b5da7fff5224d06ed73e7a33cc] [Philippe Reynes: adapt code to u-boot] Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
* ARM: configs: omap3_logic: remove Legacy OMAP3 USB driverAdam Ford2018-07-231-1/+0
| | | | | | | | Only the MUSB driver is currently supported on the omap3_logic boards. The driver is using the new-musb and not the legacy version, so this patch removes the dead code references. Signed-off-by: Adam Ford <aford173@gmail.com>
* Convert CONFIG_DA8XX_GPIO to KconfigAdam Ford2018-07-2312-5/+11
| | | | | | | This converts the following to Kconfig: CONFIG_DA8XX_GPIO Signed-off-by: Adam Ford <aford173@gmail.com>
* ARM: DTS: am3517-evm-u-boot: Mark MMC1 with cd-invertedAdam Ford2018-07-231-0/+4
| | | | | | | | | In order to use the device tree for MMC, the card-detect pin needs to be inverted. This patch places this into the am3517-evm-u-boot.dtsi file to keep the main DTS and DTSI files clean and in-sync with Linux Signed-off-by: Adam Ford <aford173@gmail.com>
* ARM: dts: am3517-evm-uboot: Add reg-shift for UARTAdam Ford2018-07-231-0/+12
| | | | | | | | | With the resync of the omap3.dtsi file, the reg-shift was removed so it breaks the UART. Adding the reg-shift into the am3517-evm-u-boot.dtsi keeps the reg-shift for U-Boot, but keeps the dts/dtsi files clean from Linux. Signed-off-by: Adam Ford <aford173@gmail.com>
* doc: Replace DocBook with sphinx-based docsMario Six2018-07-2326-2404/+4375
| | | | | | | | | | | | | | | | | | The Linux kernel moved to sphinx-based documentation and got rid of the DocBook based documentation quite a while ago. Hence, the DocBook documentation for U-Boot should be converted as well. To achieve this, import the necessary files from Linux v4.17, and convert the current DocBook documentation (three files altogether) to sphinx/reStructuredText. For now, all old DocBook documentation was merged into a single handbook, tentatively named "U-Boot Hacker Manual". For some source files, the documentation style was changed to comply with kernel-doc; no functional changes were applied. Signed-off-by: Mario Six <mario.six@gdsys.cc>
* ARM: DTS: Resync Logic PD SOM-LV 37xx devkit with Linux 4.18-RC4Adam Ford2018-07-233-255/+323
| | | | | | | There have been some significant changes to the DM37 SOM-LV device tree. This patch re-syncs it with Linux. Signed-off-by: Adam Ford <aford173@gmail.com>
* ARM: DTS: Resync LogicPD-Torpedo-37xx-devkit with Linux 4.18-RC4Adam Ford2018-07-233-426/+475
| | | | | | | There have been some refactoring of the DTS files for the Logic PD DM37 Torpedo. This patch re-sync's the DTS files with Linux Signed-off-by: Adam Ford <aford173@gmail.com>
* ARM: dts: Resync OMAP3 and omap36xx with Linux 4.18-RC4Adam Ford2018-07-233-18/+71
| | | | | | | | There have been several minor changes to the OMAP3.dtsi, so this patch re-syncs it with Linux. An addition include/dt-binding was also brought with it. Signed-off-by: Adam Ford <aford173@gmail.com>
* ARM: DTS: Resync am3517-evm.dts with Linux 4.18-rc4Adam Ford2018-07-233-2/+377
| | | | | | | | Several changes have been made to the AM3517-evm and the underlying am3517.dtsi file. This patch re-sync's the DTS and DTSI files with Linux. Signed-off-by: Adam Ford <aford173@gmail.com>
* m68k: m5253evbe: Remove this boardTom Rini2018-07-238-441/+0
| | | | | | | The m5253evbe board has been marked as orphan since June of 2014 and should have been dropped a while ago. Do so now. Signed-off-by: Tom Rini <trini@konsulko.com>
* spi: stm32_qspi: rework mode managementChristophe Kerello2018-07-231-14/+14
| | | | | | | This patch solves quad read issue with Macronix/Micron spi nor. Signed-off-by: Christophe Kerello <christophe.kerello@st.com> Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
* spi: stm32_qspi: assign functional operation mode in _stm32_qspi_gen_ccrChristophe Kerello2018-07-231-9/+8
| | | | | | | | This patch assigns the functional operation mode in _stm32_qspi_gen_ccr function. Signed-off-by: Christophe Kerello <christophe.kerello@st.com> Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
* bios_emulator: remove assignment without effectHeinrich Schuchardt2018-07-231-1/+0
| | | | | | | Assigning a parameter which is not used afterwards has not effect. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Simon Glass <sjg@chromium.org>