platform/kernel/u-boot.git
6 years agoARM: rmobile: Enable DTO support on Gen3
Marek Vasut [Thu, 15 Feb 2018 11:47:23 +0000 (12:47 +0100)]
ARM: rmobile: Enable DTO support on Gen3

Enable support for applying DT overlays on Gen3. This is convenient
for handling extra additional hardware, like ie. the Kingfisher.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agonet: ravb: Initialize PHY in probe() once
Marek Vasut [Tue, 13 Feb 2018 16:21:15 +0000 (17:21 +0100)]
net: ravb: Initialize PHY in probe() once

Reset and initialize the PHY once in the probe() function rather than
doing it over and over again is start() function. This requires us to
keep the clock enabled while the driver is in use. This significantly
reduces the time between transfers as the PHY doesn't have to restart
autonegotiation between transfers, which takes forever.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Joe Hershberger <joe.hershberger@ni.com>
6 years agoclk: rmobile: Assure SD-IF clock are configured correctly
Marek Vasut [Thu, 11 Jan 2018 15:28:31 +0000 (16:28 +0100)]
clk: rmobile: Assure SD-IF clock are configured correctly

The SD driver calls clk_set_rate() before clk_enable(), yet clk_set_rate()
implementation in the clock driver does not set the SD-IF divider. Fix it.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agoMerge git://git.denx.de/u-boot-arc
Tom Rini [Thu, 15 Feb 2018 19:07:04 +0000 (14:07 -0500)]
Merge git://git.denx.de/u-boot-arc

6 years agoRPi: Add myself as board maintainer
Alexander Graf [Thu, 15 Feb 2018 14:50:54 +0000 (15:50 +0100)]
RPi: Add myself as board maintainer

Commit 958d55f26ce ("MAINTAINERS: Take over BCM2835 maintainership") put
me in as maintainer for the RPi soc, but forgot to update the board
MAINTAINERS file.

Add me there too.

Signed-off-by: Alexander Graf <agraf@suse.de>
6 years agoarc: Fix final linkage with Elf32 tools
Alexey Brodkin [Thu, 15 Feb 2018 12:34:58 +0000 (15:34 +0300)]
arc: Fix final linkage with Elf32 tools

ARC Elf32 tools by default enable usage of so-called "small data"
section or in ARC PRM parlance "GP-relative addressing".

The idea is to put up to 2kB of frequently used data into a separate
location and use indirect addressing via dedicated core register (GP).
Where GP is used as a base for offset calculation.

And so if "-msdata" toggle is passed to the compiler either explicitly
or implicitly (that's Elf32 tools case) it will try to put some data
in that "small data" area and then to calculate real offset from GP
to be encoded in instructions we need to know the base value which
liker gets from __SDATA_BEGIN__ symbol in hte linker script.

In U-Boot we don't use that feature and linker script doesn't define
__SDATA_BEGIN__ which gives us the following linkage error if we use
Elf32 tools:
------------------------->8-------------------
  LD      u-boot
.../bin/arc-elf32-ld.bfd: Error: Linker symbol __SDATA_BEGIN__ not found
.../bin/arc-elf32-ld.bfd: final link failed: Bad value
------------------------->8-------------------

Note if uClibc or glibc tools are used that problem doesn't happen
because usage of "small data section" is disabled by default as not very
useful for bigger executables. Moreover GP is just another name of r26
so we're loosing 1 core register which is not used by the compiler as a
generic register with "-msdata".

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
6 years agoConvert CONFIG_SYS_BOOTCOUNT_SINGLEWORD to Kconfig
Lukasz Majewski [Fri, 9 Feb 2018 22:53:29 +0000 (23:53 +0100)]
Convert CONFIG_SYS_BOOTCOUNT_SINGLEWORD to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_BOOTCOUNT_SINGLEWORD

Signed-off-by: Lukasz Majewski <lukma@denx.de>
Tested-by: Alex Kiernan <alex.kiernan@gmail.com>
Reviewed-by: Ian Ray <ian.ray@ge.com>
6 years agoConvert CONFIG_BOOTCOUNT_LIMIT to Kconfig
Lukasz Majewski [Fri, 9 Feb 2018 22:50:57 +0000 (23:50 +0100)]
Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig

This converts the following to Kconfig:
   CONFIG_BOOTCOUNT_LIMIT

Signed-off-by: Lukasz Majewski <lukma@denx.de>
Tested-by: Alex Kiernan <alex.kiernan@gmail.com>
Reviewed-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Acked-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
6 years agoconfigs: Resync with savedefconfig
Tom Rini [Wed, 14 Feb 2018 20:46:14 +0000 (15:46 -0500)]
configs: Resync with savedefconfig

Rsync all defconfig files using moveconfig.py

Signed-off-by: Tom Rini <trini@konsulko.com>
6 years agoRevert "drivers/ddr/fsl: Dual-license DDR driver"
Tom Rini [Thu, 15 Feb 2018 02:34:05 +0000 (21:34 -0500)]
Revert "drivers/ddr/fsl: Dual-license DDR driver"

Upon further review, not all code authors are in favour of this change.
This reverts commit ee3556bcafbb05e59aabdc31368984e76acaabc4.

Signed-off-by: Tom Rini <trini@konsulko.com>
6 years agospl: unbreak CONFIG_SPL_MULTI_DTB_FIT after fixing CONFIG_OF_EMBED
Simon Goldschmidt [Wed, 14 Feb 2018 05:44:36 +0000 (06:44 +0100)]
spl: unbreak CONFIG_SPL_MULTI_DTB_FIT after fixing CONFIG_OF_EMBED

With commit 9bd76b807636 ("spl: make CONFIG_OF_EMBED pass dts through
fdtgrep"), CONFIG_SPL_MULTI_DTB_FIT has been broken because
cmd_fdtgrep was now unknown in scripts/Makefile.spl after moving
it to dts/Makefile. This bug has been introduced with v2018.01.

This patch moves cmd_fdtgrep from dts/Makefile to scripts/Makefile.lib
and includes scripts/Makefile.lib in scripts/Makefile.spl.

Fixes: 9bd76b807636 ("spl: make CONFIG_OF_EMBED pass dts through fdtgrep")
Reported-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Simon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
6 years agocmd: scsi: move CMD_SCSI to device access commands
Heinrich Schuchardt [Wed, 14 Feb 2018 07:05:44 +0000 (08:05 +0100)]
cmd: scsi: move CMD_SCSI to device access commands

Configuration option CMD_SCSI should be placed in the same submenu as
CMD_SATA and CMD_MMC.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
6 years agoarm/PSCI: support PSCI versions greater than 1.0
Andre Heider [Fri, 9 Feb 2018 07:10:22 +0000 (08:10 +0100)]
arm/PSCI: support PSCI versions greater than 1.0

ATF recently began announcing PSCI v1.1. Since that version is unknown
to u-boot, the PSCI device nodes were not updated.

Switch from the case statement to a greater/less-than comparison so that
v1.1, as well as future versions, get at least the compatible nodes of
known versions.

PSCI v1.1 doesn't seem to have introduced a new corresponding compatible.

Signed-off-by: Andre Heider <a.heider@gmail.com>
6 years agoFix --noheader on fw_printenv
Alex Kiernan [Sun, 11 Feb 2018 17:16:46 +0000 (17:16 +0000)]
Fix --noheader on fw_printenv

The single argument `--noheader' is expecting isn't taken from getopt
parsing, but instead from the remaining argv arguments.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
6 years agoam335x_evm: Consolidate eMMC partitions with DFU info
Sam Protsenko [Wed, 7 Feb 2018 18:41:32 +0000 (20:41 +0200)]
am335x_evm: Consolidate eMMC partitions with DFU info

>From DFU_ALT_INFO_EMMC (include/environment/ti/dfu.h) we can see that
rootfs will be flashed to second partition on eMMC. But at the moment we
have only one partition in $partitions environment variable. Let's add
"bootloader" partition prior to "rootfs", so that DFU works correctly.
This also fixes eMMC boot, which looks for rootfs on second partition.

"bootloader" partition start corresponds to "u-boot.img.raw" in DFU
eMMC info, which is 0x300 sector (384 KiB offset from eMMC start).

rootfs start address can be also found from DFU eMMC info.
bootloader-related area is finished at 0x1500 sector (2688 KiB offset
from eMMC start). This should be the start address for rootfs in
$partitions environment variable.

While at it, fix U-Boot environment address to be the same as for
AM57x EVM, so that it doesn't clash with other partitions.

So now eMMC layout looks like this:

    ===============================================================

    0       +------------------------+
            | MBR/GPT header         |   128           -
    128     +------------------------+
            | MLO                    |   256           -
    384     +------------------------+
            | u-boot.img             |   1792          bootloader
    2176    +------------------------+
            | //////// hole //////// |   256           -
    2432    +------------------------+
            | U-Boot environment     |   128           -
    2560    +------------------------+
            | U-Boot environment     |   128           -
            | (redundant)            |
    2688    +------------------------+
            | rootfs                 |   remaining     rootfs
    end     +------------------------+

    ===============================================================

"hole" area can be used further for storing U-Boot environment (like
it's done in AM57x EVM config file) or for increasing u-boot.img area
(in case u-boot.img size increased, e.g. if new dtbs were added).

This commit conforms with Linux partition table from f6d245b8c56c
("arm: am57xx: Fix Linux boot from eMMC") commit, making things in
uniform way.

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
6 years agoconfigs: Migrate CONFIG_SPL_FRAMEWORK
Tom Rini [Tue, 6 Feb 2018 17:15:38 +0000 (12:15 -0500)]
configs: Migrate CONFIG_SPL_FRAMEWORK

Migrate the option CONFIG_SPL_FRAMEWORK and make this gate most of the
current set of options we have in Kconfig.  We will need to have some
options available for SPL and !SPL_FRAMEWORK so this is important.  In a
few cases we re-order existing options so that we have less escapes from
the SPL_FRAMEWORK guard.

Signed-off-by: Tom Rini <trini@konsulko.com>
6 years agoconfigs: Drop unused CONFIG_SPL_MMC_MINIMAL
Tom Rini [Tue, 6 Feb 2018 17:15:37 +0000 (12:15 -0500)]
configs: Drop unused CONFIG_SPL_MMC_MINIMAL

The option CONFIG_SPL_MMC_MINIMAL is unused in code, drop it.

Signed-off-by: Tom Rini <trini@konsulko.com>
6 years agoconfigs: am335x_evm: Add DYNAMIC_CRC_TABLE
Faiz Abbas [Tue, 6 Feb 2018 13:45:59 +0000 (19:15 +0530)]
configs: am335x_evm: Add DYNAMIC_CRC_TABLE

Add CONFIG_DYNAMIC_CRC_TABLE to am335x_evm_defconfig to reduce the
size of the image.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
6 years agolib: Kconfig: Move DYNAMIC_CRC_TABLE to Kconfig
Faiz Abbas [Tue, 6 Feb 2018 13:45:58 +0000 (19:15 +0530)]
lib: Kconfig: Move DYNAMIC_CRC_TABLE to Kconfig

Add CONFIG prefix to DYNAMIC_CRC_TABLE and implement it in
Kconfig.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
6 years agoconfigs: am335x_evm: Disable ISO and EFI partitions in SPL
Faiz Abbas [Mon, 5 Feb 2018 13:52:29 +0000 (19:22 +0530)]
configs: am335x_evm: Disable ISO and EFI partitions in SPL

ISO and EFI partition configs in SPL are selected by default.
However, they are not being used.

Therefore, remove ISO and EFI partition support in SPL.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
6 years agoarm: update Kconfig help for ENABLE_ARM_SOC_BOOT0_HOOK
Simon Goldschmidt [Tue, 13 Feb 2018 12:18:00 +0000 (13:18 +0100)]
arm: update Kconfig help for ENABLE_ARM_SOC_BOOT0_HOOK

When this config is enabled, <asm/arch/boot0.h> is included,
but the Kconfig help says this should be a define
(ARM_SOC_BOOT0_HOOK).

The code for this in arch/arm/lib/vectors.s was changed on
01/02/2017 with commit ce62e57fc571 ("ARM: boot0 hook: remove macro,
include whole header file").

Signed-off-by: Simon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com>
6 years agoARM: image: indent with tab instead of 4 spaces
Masahiro Yamada [Tue, 13 Feb 2018 02:32:15 +0000 (11:32 +0900)]
ARM: image: indent with tab instead of 4 spaces

Commit 6808ef9ac2a6 ("move booti_setup to arch/arm/lig/image.c")
not only moved the code, but also replaced a tab with 4 spaces
to break the Linux coding style.

Restore tab indentation.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Bin Chen <bin.chen@linaro.org>
6 years agocmd: booti: fix invalid image address in debug message
Masahiro Yamada [Tue, 13 Feb 2018 03:10:02 +0000 (12:10 +0900)]
cmd: booti: fix invalid image address in debug message

With commit 6808ef9ac2a6 ("move booti_setup to arch/arm/lig/image.c"),
images->ep has not been set at this point.

Fixes: 6808ef9ac2a6 ("move booti_setup to arch/arm/lig/image.c")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Bin Chen <bin.chen@linaro.org>
6 years agoefi_driver: comment struct efi_driver_ops
Heinrich Schuchardt [Mon, 12 Feb 2018 11:55:28 +0000 (12:55 +0100)]
efi_driver: comment struct efi_driver_ops

Provide description for struct efi_driver_ops.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
6 years agodm: core: fix typo in comment (device.h)
Heinrich Schuchardt [Mon, 12 Feb 2018 11:38:36 +0000 (12:38 +0100)]
dm: core: fix typo in comment (device.h)

%s/Indentiies/Identifies/g

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
6 years agofix spelling of 'functions' in 2 places (was 'funtcions')
Simon Goldschmidt [Tue, 13 Feb 2018 12:18:27 +0000 (13:18 +0100)]
fix spelling of 'functions' in 2 places (was 'funtcions')

Signed-off-by: Simon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com>
6 years agoSystemACE: Remove
Tom Rini [Mon, 12 Feb 2018 14:51:33 +0000 (09:51 -0500)]
SystemACE: Remove

This driver is no longer used on any supported platform in U-Boot and
there is no interest in maintaining it further from people that have
used it historically.

Cc: Simon Glass <sjg@chromium.org>
Cc: Michal Simek <michal.simek@xilinx.com>
c: Alexey Brodkin <alexey.brodkin@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
6 years agospi: Migrate CONFIG_CF_SPI to Kconfig
Tuomas Tynkkynen [Wed, 7 Feb 2018 00:42:23 +0000 (02:42 +0200)]
spi: Migrate CONFIG_CF_SPI to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
6 years agospi: Migrate CONFIG_KIRKWOOD_SPI to Kconfig
Tuomas Tynkkynen [Wed, 7 Feb 2018 00:42:22 +0000 (02:42 +0200)]
spi: Migrate CONFIG_KIRKWOOD_SPI to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
6 years agospi: Migrate CONFIG_LPC32XX_SSP to Kconfig
Tuomas Tynkkynen [Wed, 7 Feb 2018 00:42:21 +0000 (02:42 +0200)]
spi: Migrate CONFIG_LPC32XX_SSP to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
6 years agospi: Migrate CONFIG_MPC8XXX_SPI to Kconfig
Tuomas Tynkkynen [Wed, 7 Feb 2018 00:42:20 +0000 (02:42 +0200)]
spi: Migrate CONFIG_MPC8XXX_SPI to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
6 years agospi: Migrate CONFIG_MXC_SPI to Kconfig
Tuomas Tynkkynen [Wed, 7 Feb 2018 00:42:19 +0000 (02:42 +0200)]
spi: Migrate CONFIG_MXC_SPI to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
6 years agospi: Migrate CONFIG_MXS_SPI to Kconfig
Tuomas Tynkkynen [Wed, 7 Feb 2018 00:42:18 +0000 (02:42 +0200)]
spi: Migrate CONFIG_MXS_SPI to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
6 years agospi: Migrate CONFIG_SH_QSPI to Kconfig
Tuomas Tynkkynen [Wed, 7 Feb 2018 00:42:17 +0000 (02:42 +0200)]
spi: Migrate CONFIG_SH_QSPI to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
6 years agospi: Migrate CONFIG_SH_SPI to Kconfig
Tuomas Tynkkynen [Wed, 7 Feb 2018 00:42:16 +0000 (02:42 +0200)]
spi: Migrate CONFIG_SH_SPI to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
6 years ago.travis.yml: test xtensa xtfpga board in QEMU
Max Filippov [Wed, 7 Feb 2018 23:30:03 +0000 (15:30 -0800)]
.travis.yml: test xtensa xtfpga board in QEMU

This allows running tests on emulated KC705 board with DC233C xtensa
core. It expects to find conf.xtfpga_qemu in the uboot-test-hooks.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
6 years agoxtfpga: enable hush parser
Max Filippov [Wed, 7 Feb 2018 23:30:02 +0000 (15:30 -0800)]
xtfpga: enable hush parser

Remove CONFIG_BOOT_RETRY_TIME as it doesn't do much good and enable
CONFIG_HUSH_PARSER in xtfpga_defconfig.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
6 years ago.travis.yml: download xtensa prebuilt toolchain
Max Filippov [Wed, 7 Feb 2018 23:30:01 +0000 (15:30 -0800)]
.travis.yml: download xtensa prebuilt toolchain

xtensa toolchains are core-specific, so give full toolchain name and
download corresponding prebuilt toolchain from the github release.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
6 years agomicroblaze: bootm: Fix compiler warning
Bin Meng [Mon, 12 Feb 2018 09:54:37 +0000 (17:54 +0800)]
microblaze: bootm: Fix compiler warning

Fix build warning in arch/microblaze/lib/bootm.c with gcc 7.3.0:

  warning: this 'if' clause does not guard... [-Wmisleading-indentation]

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
6 years agoarm: omap2: Fix compiler warning
Bin Meng [Mon, 12 Feb 2018 09:54:36 +0000 (17:54 +0800)]
arm: omap2: Fix compiler warning

Fix build warning in arch/arm/mach-omap2/emif-common.c and
arch/arm/mach-omap2/omap4/emif.c with gcc 7.3.0:

  warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
6 years agovideo: ivybridge_igd: Fix compiler warning
Bin Meng [Mon, 12 Feb 2018 09:54:35 +0000 (17:54 +0800)]
video: ivybridge_igd: Fix compiler warning

Fix build warning in drivers/video/ivybridge_igd.c with gcc 7.3.0:

  warning: 'ivb_pm_gt2' defined but not used [-Wunused-const-variable=]

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
6 years agotftp: update: Include missing cfi_flash.h header
Marek Vasut [Sat, 10 Feb 2018 15:22:07 +0000 (16:22 +0100)]
tftp: update: Include missing cfi_flash.h header

Add the missing header, otherwise CONFIG_SYS_MAX_FLASH_BANKS
may be undeclared.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Tom Rini <trini@konsulko.com>
6 years agocmd: fitupd: Convert CONFIG_UPDATE_TFTP and co.
Marek Vasut [Sat, 10 Feb 2018 15:22:06 +0000 (16:22 +0100)]
cmd: fitupd: Convert CONFIG_UPDATE_TFTP and co.

Convert the CONFIG_UPDATE_TFTP and related symbols to Kconfig.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Tom Rini <trini@konsulko.com>
6 years agocmd: fitupd: Convert CONFIG_CMD_FITUPD
Marek Vasut [Sat, 10 Feb 2018 15:22:05 +0000 (16:22 +0100)]
cmd: fitupd: Convert CONFIG_CMD_FITUPD

Convert the CONFIG_CMD_FITUPD symbol to Kconfig.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Tom Rini <trini@konsulko.com>
6 years agoMerge git://git.denx.de/u-boot-rockchip
Tom Rini [Tue, 13 Feb 2018 15:51:00 +0000 (10:51 -0500)]
Merge git://git.denx.de/u-boot-rockchip

6 years agospl: fit: move fdt_record_loadable out of ARCH_FIXUP_FDT_MEMORY guard
Philipp Tomsich [Fri, 2 Feb 2018 11:01:44 +0000 (12:01 +0100)]
spl: fit: move fdt_record_loadable out of ARCH_FIXUP_FDT_MEMORY guard

The fdt_record_loadable()-function was wedged between other functions
that were guarded by ARCH_FIXUP_FDT_MEMORY.  This could lead to linker
errors on some configurations.

With this change, fdt_record_loadable() is moved out of the
ARCH_FIXUP_FDT_MEMORY guard (plus I tried to retain alphabetical
ordering for functions by placing it appropriately).

References: 9f45aeb ("spl: fit: implement fdt_record_loadable")
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reported-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Michal Simek <michal.simek@xilinx.com>
6 years agorockchip: gpio: remove dead code
Heinrich Schuchardt [Tue, 30 Jan 2018 23:45:51 +0000 (00:45 +0100)]
rockchip: gpio: remove dead code

In the following statements
if (a) return a; if (a) return c;
the second return can never be executed.

Identified by cppcheck.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
6 years agoPrepare v2018.03-rc2 v2018.03-rc2
Tom Rini [Mon, 12 Feb 2018 23:52:31 +0000 (18:52 -0500)]
Prepare v2018.03-rc2

Signed-off-by: Tom Rini <trini@konsulko.com>
6 years agoFix misaligned buffer in env_fat_save
Alex Kiernan [Wed, 7 Feb 2018 20:01:54 +0000 (20:01 +0000)]
Fix misaligned buffer in env_fat_save

When saving the environment on a platform which has DMA alignment
larger than the natural alignment, env_fat_save triggers a debug
message in file_fat_write:

  Saving Environment to FAT... writing uboot.env
  FAT: Misaligned buffer address (9df1c8e0)
  OK

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
6 years agoMerge git://git.denx.de/u-boot-fsl-qoriq
Tom Rini [Mon, 12 Feb 2018 17:08:32 +0000 (12:08 -0500)]
Merge git://git.denx.de/u-boot-fsl-qoriq

6 years agoconfigs: Migrate CONFIG_SYS_TEXT_BASE
Tom Rini [Sat, 3 Feb 2018 17:10:38 +0000 (12:10 -0500)]
configs: Migrate CONFIG_SYS_TEXT_BASE

On the NIOS2 and Xtensa architectures, we do not have
CONFIG_SYS_TEXT_BASE set.  This is a strict migration of the current
values into the defconfig and removing them from the headers.

I did not attempt to add more default values in and for now will leave
that to maintainers.

Signed-off-by: Tom Rini <trini@konsulko.com>
6 years agoconfigs: Resync with savedefconfig
Tom Rini [Sun, 11 Feb 2018 01:27:45 +0000 (20:27 -0500)]
configs: Resync with savedefconfig

Rsync all defconfig files using moveconfig.py

Signed-off-by: Tom Rini <trini@konsulko.com>
6 years agoMerge tag 'signed-efi-v2018.03' of git://github.com/agraf/u-boot
Tom Rini [Sat, 10 Feb 2018 22:04:13 +0000 (17:04 -0500)]
Merge tag 'signed-efi-v2018.03' of git://github.com/agraf/u-boot

Patch queue for efi in 2018.03 - 2018-02-10

This time we have a few important bug fixes. Most noticable are:

  - Fix OpenBSD loader with CONFIG_BLK=n
  - Fix builds on various circumstances
  - Add missing stubs so callers don't call NULL
  - Bump UEFI revision to 2.7

6 years agoefi_loader: correct efi_disk_register
Heinrich Schuchardt [Fri, 9 Feb 2018 19:55:47 +0000 (20:55 +0100)]
efi_loader: correct efi_disk_register

efi_disk_register should return as status code (efi_status_t).

Disks with zero blocks should be reported as 'not ready' without throwing
an error.

This patch solves a problem running OpenBSD on system configured with
CONFIG_BLK=n (e.g. i.MX6).

Reported-by: Jonathan Gray <jsg@jsg.id.au>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Tested-by: Jonathan Gray <jsg@jsg.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
6 years agoefi_loader: add missing runtime services stubs
Heinrich Schuchardt [Fri, 9 Feb 2018 19:41:21 +0000 (20:41 +0100)]
efi_loader: add missing runtime services stubs

Add stubs for UpdateCapsule, QueryCapsuleCapabilities, and
QueryVariableInfo.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
6 years agoefi_loader: split README.efi into two separate documents
Heinrich Schuchardt [Tue, 30 Jan 2018 19:03:02 +0000 (20:03 +0100)]
efi_loader: split README.efi into two separate documents

README.efi describes two different concepts:
* U-Boot exposing the UEFI API
* U-Boot running on top of UEFI.

This patch splits the document in two.
Religious references are removed.

The separation of the concepts makes sense before detailing the internals
of U-Boot exposing the UEFI API in a future patch.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
6 years agoefi_driver: return type of efi_driver_init()
Heinrich Schuchardt [Thu, 1 Feb 2018 11:53:32 +0000 (12:53 +0100)]
efi_driver: return type of efi_driver_init()

Change the return type of efi_driver_init() to efi_status_t.

efi_driver_init() calls efi_add_driver() which returns an efi_status_t
value. efi_driver_init() should not subject this value to a conversion to
int losing high bits on 64bit systems.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
6 years agoefi_loader: do not use 2.0.5 as UEFI revision number
Heinrich Schuchardt [Mon, 5 Feb 2018 17:04:21 +0000 (18:04 +0100)]
efi_loader: do not use 2.0.5 as UEFI revision number

Currently the UEFI revision number in the system table header is set to
2.0.5. This version number does not refer to any existing version of the
UEFI standard.

Set the revision number to 2.7.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
6 years agoefi_loader: create stub for CreateEventEx
Heinrich Schuchardt [Sun, 4 Feb 2018 22:05:13 +0000 (23:05 +0100)]
efi_loader: create stub for CreateEventEx

Currently we set the function pointer for the CreateEventEx boot service
to NULL. When called this would lead to an immediate failure.

A function stub is provided which handles the case that the boot service
is called without an event group and returns EFI_UNSUPPORTED otherwise.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
6 years agoefi_selftest: use correct compiler flags for miniapps
Heinrich Schuchardt [Fri, 2 Feb 2018 00:05:47 +0000 (01:05 +0100)]
efi_selftest: use correct compiler flags for miniapps

For EFI binaries we need special CFLAGS.

They were specified for an object file that since has been replaced.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
6 years agoefi_loader: fix the online help for bootefi bootmgr
Heinrich Schuchardt [Tue, 30 Jan 2018 18:47:43 +0000 (19:47 +0100)]
efi_loader: fix the online help for bootefi bootmgr

The bootefi command is missing in the online help for
bootefi bootmgr.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
6 years agoefi_loader: fix building crt0 on arm
Heinrich Schuchardt [Wed, 31 Jan 2018 18:45:35 +0000 (18:45 +0000)]
efi_loader: fix building crt0 on arm

Before the patch an undefined constant EFI_SUBSYSTEM was used in the
crt0 code. The current version of binutils does not swallow the error.

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888403

The necessary constant IMAGE_SUBSYSTEM_EFI_APPLICATION is already
defined in pe.h. So let's factor out asm-generic/pe.h for the
image subsystem constants and use it in our assembler code.

IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER does not exist in the specification
let's use IMAGE_SUBSYSTEM_EFI_ROM instead.

The include pe.h is only used in code maintained by Alex so let him be the
maintainer here too.

Reported-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Tested-by: Vagrant Cascadian <vagrant@debian.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
6 years agodrivers/ddr/fsl: Dual-license DDR driver
York Sun [Wed, 7 Feb 2018 19:47:22 +0000 (11:47 -0800)]
drivers/ddr/fsl: Dual-license DDR driver

To make this driver easier to be reused, dual-license DDR driver.

Signed-off-by: York Sun <york.sun@nxp.com>
CC: Simon Glass <sjg@chromium.org>
CC: Tom Rini <trini@konsulko.com>
CC: Heinrich Schuchardt <xypron.glpk@gmx.de>
CC: Thomas Schaefer <thomas.schaefer@kontron.com>
CC: Masahiro Yamada <yamada.masahiro@socionext.com>
CC: Robert P. J. Day <rpjday@crashcourse.ca>
CC: Alexander Merkle <alexander.merkle@lauterbach.com>
CC: Joakim Tjernlund <joakim.tjernlund@transmode.se>
CC: Curt Brune <curt@cumulusnetworks.com>
CC: Valentin Longchamp <valentin.longchamp@keymile.com>
CC: Wolfgang Denk <wd@denx.de>
CC: Anatolij Gustschin <agust@denx.de>
CC: Ira W. Snyder <iws@ovro.caltech.edu>
CC: Marek Vasut <marek.vasut@gmail.com>
CC: Kyle Moffett <Kyle.D.Moffett@boeing.com>
CC: Sebastien Carlier <sebastien.carlier@gmail.com>
CC: Stefan Roese <sr@denx.de>
CC: Peter Tyser <ptyser@xes-inc.com>
CC: Paul Gortmaker <paul.gortmaker@windriver.com>
CC: Peter Tyser <ptyser@xes-inc.com>
CC: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
6 years agoPowerPC: phy: enable all phylib drivers when use phylib and tsec enet
Zhao Qiang [Wed, 7 Feb 2018 02:01:56 +0000 (10:01 +0800)]
PowerPC: phy: enable all phylib drivers when use phylib and tsec enet

config_phylib_all_drivers.h should be included when CONFIG_PHYLIB and
CONFIG_TSEC_ENET are defined.

Fixes: 3146f0c017 ("Move PHYLIB to Kconfig")
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
6 years agocrypto/fsl: instantiate all rng state handles
Lukas Auer [Thu, 25 Jan 2018 13:11:17 +0000 (14:11 +0100)]
crypto/fsl: instantiate all rng state handles

Extend the instantiate_rng() function and the corresponding CAAM job
descriptor to instantiate all RNG state handles. This moves the RNG
instantiation code in line with the CAAM kernel driver.

Previously, only the first state handle was instantiated. The second
one was instantiated by the CAAM kernel driver. This works if the
kernel runs in secure mode, but fails in non-secure mode since the
kernel driver uses DEC0 directly instead of over the job ring
interface. Instantiating all RNG state handles in u-boot removes the
need for using DEC0 in the kernel driver, making it possible to use
the CAAM in non-secure mode.

Signed-off-by: Lukas Auer <lukas.auer@aisec.fraunhofer.de>
Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: York Sun <york.sun@nxp.com>
6 years agoarmv8: ls1012ardb: Add distro secure boot support
Vinitha Pillai-B57223 [Tue, 9 Jan 2018 17:33:42 +0000 (23:03 +0530)]
armv8: ls1012ardb: Add distro secure boot support

Enable validation of boot.scr script prior to its execution dependent
on "secureboot" flag in environment. Enable fall back option to
qspi boot in case of secure boot.

Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
Signed-off-by: Vinitha Pillai <vinitha.pillai@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
6 years agoarmv8: Remove dependency of SERDES for LSCH2 and LSCH3
Sriram Dash [Tue, 30 Jan 2018 10:28:44 +0000 (15:58 +0530)]
armv8: Remove dependency of SERDES for LSCH2 and LSCH3

Remove dependency of SYS_HAS_SERDES for Layerscape Chasis 2 and
Layerscape Chasis 3.

Signed-off-by: Sriram Dash <sriram.dash@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
6 years agoarmv8: ls1088a: qspi: Enable XIP mode above 16 MB addresses
Rajat Srivastava [Fri, 2 Feb 2018 12:22:07 +0000 (17:52 +0530)]
armv8: ls1088a: qspi: Enable XIP mode above 16 MB addresses

Currently in LS1088A, XIP mode in QSPI works up to 16 MB
addresses. This patch enables QSPI support in XIP mode for
addresses above 16 MB as well.

Signed-off-by: Rajat Srivastava <rajat.srivastava@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
6 years agoARMv8: ls1046a: Enable PCIe and E1000 in lpuart defconfig
Hou Zhiqiang [Mon, 5 Feb 2018 05:46:47 +0000 (13:46 +0800)]
ARMv8: ls1046a: Enable PCIe and E1000 in lpuart defconfig

Enable PCIe and E1000 in ls1046aqds lpuart defconfig.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
6 years agoMove most CONFIG_HAVE_BLOCK_DEVICE to Kconfig
Adam Ford [Tue, 6 Feb 2018 18:43:56 +0000 (12:43 -0600)]
Move most CONFIG_HAVE_BLOCK_DEVICE to Kconfig

config_fallbacks.h has some logic that sets HAVE_BLOCK_DEVICE
based on a list of enabled options.  Moving HAVE_BLOCK_DEVICE to
Kconfig allows us to drastically shrink the logic in
config_fallbacks.h

Signed-off-by: Adam Ford <aford173@gmail.com>
[trini: Rename HAVE_BLOCK_DEVICE to CONFIG_BLOCK_DEVICE]
Signed-off-by: Tom Rini <trini@konsulko.com>
6 years agoblock: Migrate SystemACE chip to Kconfig
Tom Rini [Thu, 8 Feb 2018 18:49:48 +0000 (13:49 -0500)]
block: Migrate SystemACE chip to Kconfig

Migrate the base and sub-options to Kconfig.  Note that we only enable
this in the base sandbox config now.

Cc: Alexey Brodkin <alexey.brodkin@gmail.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Is this driver still used anywhere?  It's fishy that it's only enabled
in sandbox anymore.

6 years agoConvert LIB_UUID to Kconfig
Adam Ford [Tue, 6 Feb 2018 18:14:28 +0000 (12:14 -0600)]
Convert LIB_UUID to Kconfig

config_fallback.h has some logic that checks a variety of options
and selects LIB_UUID if it hasn't already been selected.  This
will all LIB_UUID in Kconfig and select this option for the list
of options to allow us to remove the logic from fallbacks

Signed-off-by: Adam Ford <aford173@gmail.com>
6 years agoConvert CONFIG LIB_HW_RAND to Kconfig
Adam Ford [Tue, 6 Feb 2018 16:18:18 +0000 (10:18 -0600)]
Convert CONFIG LIB_HW_RAND to Kconfig

config_fallbacks.h had some logic to automatically select
LIB_RAND if RANDOM_UUID or CMD_UUID were set if LIB_HW_RAND wasn't
already selected.  By migrating LIB_HW_RAND to Kconfig, we can
remove this check from config_fallbacks.h and put it into Kconfig

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
[trini: Turn into a choice, add NET_RANDOM_ETHADDR]
Signed-off-by: Tom Rini <trini@konsulko.com>
6 years agoConvert CONFIG_APBH_DMA et al to Kconfig
Adam Ford [Tue, 6 Feb 2018 14:34:45 +0000 (08:34 -0600)]
Convert CONFIG_APBH_DMA et al to Kconfig

This converts the following to Kconfig:
   CONFIG_APBH_DMA
   CONFIG_APBH_DMA_BURST
   CONFIG_APBH_DMA_BURST8

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Stefan Agner <stefan.agner@toradex.com>
[trini: Add in MMC as well]
Signed-off-by: Tom Rini <trini@konsulko.com>
6 years agoKconfig: Select networking commands only when NET is enabled
Michal Simek [Tue, 6 Feb 2018 12:28:36 +0000 (13:28 +0100)]
Kconfig: Select networking commands only when NET is enabled

There is no reason to unconditially select network commands as distro
defaults without networking enable.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
6 years agoKconfig: net: phylib: Phylib should depends on NET
Michal Simek [Tue, 6 Feb 2018 12:23:52 +0000 (13:23 +0100)]
Kconfig: net: phylib: Phylib should depends on NET

There is no value to enable phylib without networking support.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
6 years agoomap4: sdp4430: Enable CONFIG_NET for this platform
Michal Simek [Thu, 8 Feb 2018 07:58:59 +0000 (08:58 +0100)]
omap4: sdp4430: Enable CONFIG_NET for this platform

Distro default configuration contains also dhcp and pxe setting which
can't working without enabling CONFIG_NET.
EFI is not required that's why it is not enabled.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
6 years agoconfigs: stm32: Enable CONFIG_ENV_VARS_UBOOT_CONFIG
Patrice Chotard [Tue, 6 Feb 2018 09:47:59 +0000 (10:47 +0100)]
configs: stm32: Enable CONFIG_ENV_VARS_UBOOT_CONFIG

Enable CONFIG_ENV_VARS_UBOOT_CONFIG for all STM32 boards
It allows to retrieve the SoC name into the "soc" environment
variable.

Signed-off-by: Christophe Priouzeau <christophe.priouzeau@st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Vikas Manocha <vikas.manocha@st.com>
6 years agoConvert CONFIG_NAND_MXS to Kconfig
Stefan Agner [Tue, 6 Feb 2018 08:44:37 +0000 (09:44 +0100)]
Convert CONFIG_NAND_MXS to Kconfig

This converts CONFIG_NAND_MXS to Kconfig.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
6 years agospl: use ARCH_MX23/28 to specify SPL_LDSCRIPT
Stefan Agner [Tue, 6 Feb 2018 08:44:36 +0000 (09:44 +0100)]
spl: use ARCH_MX23/28 to specify SPL_LDSCRIPT

Simplify SPL_LDSCRIPT config by using the new arch Kconfig
configurations ARCH_MX23 and ARCH_MX28.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
6 years agoarm: imx: mx28: Move MX28 selection to Kconfig
Stefan Agner [Tue, 6 Feb 2018 08:44:35 +0000 (09:44 +0100)]
arm: imx: mx28: Move MX28 selection to Kconfig

The motivation for moving MX28 selection to Kconfig is to be able
to better handle NAND MXS selection through Kconfig.

This selection method also aligns with the way other i.MX SoCs are
selected in U-Boot.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
6 years agoarm: imx: mx23: Move MX23 selection to Kconfig
Stefan Agner [Tue, 6 Feb 2018 08:44:34 +0000 (09:44 +0100)]
arm: imx: mx23: Move MX23 selection to Kconfig

The motivation for moving MX23 selection to Kconfig is to be able
to better handle NAND MXS selection through Kconfig.

This selection method also aligns with the way other i.MX SoCs are
selected in U-Boot.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
6 years agoConvert CONFIG_MXC_GPIO to Kconfig
Adam Ford [Sun, 4 Feb 2018 15:32:43 +0000 (09:32 -0600)]
Convert CONFIG_MXC_GPIO to Kconfig

This converts the following to Kconfig:
   CONFIG_MXC_GPIO

Signed-off-by: Adam Ford <aford173@gmail.com>
6 years agoconfigs: imx6q_logic: Move CONFIG_PHY_SMSC to defconfig
Adam Ford [Sun, 4 Feb 2018 15:07:01 +0000 (09:07 -0600)]
configs: imx6q_logic: Move CONFIG_PHY_SMSC to defconfig

Since CONFIG_PHY_SMSC was already in Kconfig, move this from
header file to defconfig

Signed-off-by: Adam Ford <aford173@gmail.com>
6 years agoconfigs: imx6q_logic: Move CONFIG_MXC_UART to Kconfig
Adam Ford [Sun, 4 Feb 2018 14:54:13 +0000 (08:54 -0600)]
configs: imx6q_logic: Move CONFIG_MXC_UART to Kconfig

Since CONFIG_MXC_UART is already in Kconfig, move this from
the header to imx6q_logic_defconfig

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
6 years agodoc: watchdog: Remove Blackfin related documentation entry
Lukasz Majewski [Mon, 5 Feb 2018 22:42:57 +0000 (23:42 +0100)]
doc: watchdog: Remove Blackfin related documentation entry

This commit cleans up the README.watchdog by removing the reminescent of
ADI's Blackfin architecture removed some time ago.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
6 years agoARM: omap3: evm: Remove CONFIG_SYS_NS16550_REG_SIZE undefine
Derald D. Woods [Mon, 5 Feb 2018 01:04:50 +0000 (19:04 -0600)]
ARM: omap3: evm: Remove CONFIG_SYS_NS16550_REG_SIZE undefine

This commit removes an attempt to workaround a previous compilation
warning that is is now fixed in "include/configs/ti_omap3_common.h".

Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
6 years agoARM: omap3: ti_omap3_common: Fix CONFIG_SYS_NS16550_REG_SIZE compiler warning
Derald D. Woods [Mon, 5 Feb 2018 01:04:49 +0000 (19:04 -0600)]
ARM: omap3: ti_omap3_common: Fix CONFIG_SYS_NS16550_REG_SIZE compiler warning

This commit fixes the following compiler warnings when DM_SERIAL is
enabled.

---8<-------------------------------------------------------------------
...

  CC      spl/board/ti/evm/evm.o
In file included from /solution/scm/u-boot-master/board/ti/evm/evm.c:16:0:
/solution/scm/u-boot-master/include/ns16550.h:31:0: warning: "CONFIG_SYS_NS16550_REG_SIZE" redefined
 #define CONFIG_SYS_NS16550_REG_SIZE (-1)

In file included from /solution/scm/u-boot-master/include/configs/omap3_evm.h:22:0,
                 from include/config.h:5,
                 from /solution/scm/u-boot-master/include/common.h:21,
                 from /solution/scm/u-boot-master/board/ti/evm/evm.c:14:
/solution/scm/u-boot-master/include/configs/ti_omap3_common.h:33:0: note: this is the location of the previous definition
 # define CONFIG_SYS_NS16550_REG_SIZE (-4)

  LD      spl/board/ti/evm/built-in.o

...

  CC      spl/drivers/serial/ns16550.o
In file included from /solution/scm/u-boot-master/drivers/serial/ns16550.c:11:0:
/solution/scm/u-boot-master/include/ns16550.h:31:0: warning: "CONFIG_SYS_NS16550_REG_SIZE" redefined
 #define CONFIG_SYS_NS16550_REG_SIZE (-1)

In file included from /solution/scm/u-boot-master/include/configs/omap3_evm.h:22:0,
                 from include/config.h:5,
                 from /solution/scm/u-boot-master/include/common.h:21,
                 from /solution/scm/u-boot-master/drivers/serial/ns16550.c:7:
/solution/scm/u-boot-master/include/configs/ti_omap3_common.h:33:0: note: this is the location of the previous definition
 # define CONFIG_SYS_NS16550_REG_SIZE (-4)

  LD      spl/drivers/serial/built-in.o

...
---8<-------------------------------------------------------------------

Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
6 years agospl: eMMC/SD: Provide one __weak spl_boot_mode() function
Lukasz Majewski [Sat, 3 Feb 2018 07:29:52 +0000 (08:29 +0100)]
spl: eMMC/SD: Provide one __weak spl_boot_mode() function

The goal of this patch is to clean up the code related to choosing SPL
MMC boot mode.

The spl_boot_mode() now is called only in spl_mmc_load_image() function,
which is only compiled in if CONFIG_SPL_MMC_SUPPORT is enabled.

To achieve the goal, all per mach/arch implementations eligible for
unification has been replaced with one __weak implementation.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Stefano Babic <sbabic@denx.de>
Acked-by: Michal Simek <michal.simek@xilinx.com> (For ZynqMP)
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
6 years agoARM: dts: keystone-k2g-ice: Add support for QSPI
Vignesh R [Wed, 31 Jan 2018 15:38:27 +0000 (21:08 +0530)]
ARM: dts: keystone-k2g-ice: Add support for QSPI

K2G ICE has a s25fl256s1 QSPI NOR flash connected to QSPI at CS0. Add DT
entries for the same.

Signed-off-by: Vignesh R <vigneshr@ti.com>
6 years agoARM: k2g: Add pinmux data for QSPI on K2G ICE
Vignesh R [Wed, 31 Jan 2018 15:38:26 +0000 (21:08 +0530)]
ARM: k2g: Add pinmux data for QSPI on K2G ICE

Add pinmux for QSPI pins on K2G ICE board.

Signed-off-by: Vignesh R <vigneshr@ti.com>
6 years agoatcspi200: avoid possible NULL dereference
Heinrich Schuchardt [Wed, 31 Jan 2018 00:05:54 +0000 (01:05 +0100)]
atcspi200: avoid possible NULL dereference

Check if ns before and not after dereferencing it.

Indicated by cppcheck.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
6 years agopart: Allocate only one legacy_mbr buffer
Alexey Brodkin [Mon, 29 Jan 2018 19:58:24 +0000 (22:58 +0300)]
part: Allocate only one legacy_mbr buffer

Commit ff98cb90514d ("part: extract MBR signature from partitions")
blindly switched allocated by ALLOC_CACHE_ALIGN_BUFFER buffer type from
"unsigned char" to "legacy_mbr" which caused allocation of size =
(typeof(legacy_mbr) * dev_desc->blksize) instead of just space enough
for "legacy_mbr" structure.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Peter Jones <pjones@redhat.com>
Cc: Alexander Graf <agraf@suse.de>
Cc: Tom Rini <trini@konsulko.com>
6 years agomove booti_setup to arch/arm/lig/image.c
Bin Chen [Sat, 27 Jan 2018 05:59:09 +0000 (16:59 +1100)]
move booti_setup to arch/arm/lig/image.c

Follow bootz's pattern by moving the booti_setup to arch/arm/lib.
This allows to use booti_setup in other paths, e.g booting
an Android image containing Image format.

Note that kernel relocation is move out of booti_setup and it is the
caller's responsibility to do it and allows them do it differently. say,
cmd/booti.c just do a manually, while in the bootm path, we can use
bootm_load_os(with some changes).

Signed-off-by: Bin Chen <bin.chen@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
6 years agoparse the second area of android image
Bin Chen [Sat, 27 Jan 2018 05:59:08 +0000 (16:59 +1100)]
parse the second area of android image

The second area of android image was intended to put a 2nd stage
bootloader but in practice were rarely used (in my knowledge).

An proposal was made to the AOSP to (re)use the second area as the dtb[1],
This patch itself doesn't depend on that proposal being accepted but it won't
be that helpful as well if that proposal won't be accepted. But don't do
any harm as well.

[1] https://android-review.googlesource.com/#/c/417447/
Signed-off-by: Bin Chen <bin.chen@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
6 years agoMerge git://git.denx.de/u-boot-ubi
Tom Rini [Tue, 6 Feb 2018 17:17:00 +0000 (12:17 -0500)]
Merge git://git.denx.de/u-boot-ubi

6 years agoMerge git://git.denx.de/u-boot-i2c
Tom Rini [Tue, 6 Feb 2018 17:16:46 +0000 (12:16 -0500)]
Merge git://git.denx.de/u-boot-i2c

6 years agoubi: Ensure no fastmap flush after uif_close
Martin Townsend [Thu, 18 Jan 2018 08:07:33 +0000 (08:07 +0000)]
ubi: Ensure no fastmap flush after uif_close

On detach UBI attempts to update fastmap after closing user interfaces
but at this point UBI volumes have already been free()'ed and fastmap
can no longer access these data structures.

Signed-off-by: Martin Townsend <mtownsend1973@gmail.com>
Cc: hs@denx.de
Cc: kmpark@infradead.org
Cc: richard@sigma-star.at
6 years agoi2c: mvtwsi.c: Avoid NULL dereference
Heinrich Schuchardt [Tue, 30 Jan 2018 23:57:17 +0000 (00:57 +0100)]
i2c: mvtwsi.c: Avoid NULL dereference

For '#ifndef CONFIG_DM_I2C' twsi_i2c_init() passes NULL as
4th parameter to __twsi_i2c_init().

Identified with cppcheck.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
6 years agoi2c: ihs_i2c: Factor out send_buffer method
Mario Six [Mon, 15 Jan 2018 10:08:12 +0000 (11:08 +0100)]
i2c: ihs_i2c: Factor out send_buffer method

Simplify the driver logic by extracting a common send_buffer method.

Signed-off-by: Mario Six <mario.six@gdsys.cc>