platform/kernel/u-boot.git
4 years agodt-bindings: Sync include/dt-bindings/phy/phy.h from Linux
Michal Simek [Wed, 22 Jul 2020 11:58:54 +0000 (13:58 +0200)]
dt-bindings: Sync include/dt-bindings/phy/phy.h from Linux

Add 4 new phy types which are present in Linux kernel.
DP and SGMII types are used on Xilinx ZynqMP devices.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
4 years agofixdep: fix coding style in previous fix
Stephen Warren [Tue, 21 Jul 2020 20:38:51 +0000 (14:38 -0600)]
fixdep: fix coding style in previous fix

Remove a double space introduced by my previous fixdep fix.

Fixes: 76ae74d348a0 ("fixdep: fix CONFIG_IS_ENABLED etc. handling")
Signed-off-by: Stephen Warren <swarren@nvidia.com>
4 years agotest/py: Add test support for three stage boot
Yan Liu [Tue, 21 Jul 2020 15:12:05 +0000 (11:12 -0400)]
test/py: Add test support for three stage boot

Current pytest only support upto 2 stage boot;
Some boards like TI K3 am6/J7 boards use 3 stage
boot. This patch adds u_boot_spl2 to be able to
handle the 3-stage boot case. User needs to set
"env__spl2_skipped" in u_boot_boardenv config
file to use this support. By default it is set
to TRUE.

Signed-off-by: Yan Liu <yan-liu@ti.com>
Signed-off-by: Yan Liu <yan-liu@ti.com>
4 years agoarm: move CONFIG_PREBOOT="usb start" to KConfig
Jonas Smedegaard [Tue, 21 Jul 2020 07:32:20 +0000 (09:32 +0200)]
arm: move CONFIG_PREBOOT="usb start" to KConfig

This commit moves CONFIG_PREBOOT="usb start" to common/KConfig
for all boards also declaring USB_KEYBOARD.

Besides simplifying defconfig files, this also enables support for
board-specific CONFIG_PREBOOT for sunxi boards:
commit 37304aaf60bf ("Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to
Kconfig") intended to support CONFIG_PREBOOT, but
include/configs/sunxi-common.h hardcodes preboot as part of internally
defined CONSOLE_STDIN_SETTINGS, silently ignoring any board-specific
CONFIG_PREBOOT.

Signed-off-by: Jonas Smedegaard <dr@jones.dk>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Series-Cc: Jagan Teki <jagan@amarulasolutions.com>
Series-Cc: Lukasz Majewski <lukma@denx.de>
Series-Cc: Andre Przywara <andre.przywara@arm.com>

4 years agonet: ping: reset stored IP address
Marek Szyprowski [Mon, 15 Jun 2020 09:15:57 +0000 (11:15 +0200)]
net: ping: reset stored IP address

Reset the stored ping IP address before entering a netloop with different
protocol to ensure that it won't be interrupted by the received
correct ICMP_ECHO_REPLY packet.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
4 years agonet: dwc_eth_qos: add Kconfig option to select supported configuration
Patrick Delaunay [Mon, 8 Jun 2020 09:27:19 +0000 (11:27 +0200)]
net: dwc_eth_qos: add Kconfig option to select supported configuration

Add configuration flag to select the supported dwc driver configuration:
- CONFIG_DWC_ETH_QOS_TEGRA186
- CONFIG_DWC_ETH_QOS_IMX
- CONFIG_DWC_ETH_QOS_STM32

See Linux driver ethernet/stmicro/stmmac and associated glue layers
for other configuration examples.

This patch removes the not-selected compatibles and lets the linker remove
the unused functions to reduce the size of the driver.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
4 years agolmb/bdinfo: dump lmb info via bdinfo
Tero Kristo [Mon, 20 Jul 2020 08:10:45 +0000 (11:10 +0300)]
lmb/bdinfo: dump lmb info via bdinfo

Dump lmb status from the bdinfo command. This is useful for seeing the
reserved memory regions from the u-boot cmdline.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
4 years agonet: tftp: Add client support for RFC 7440
Ramon Fried [Sat, 18 Jul 2020 20:31:46 +0000 (23:31 +0300)]
net: tftp: Add client support for RFC 7440

Add support for RFC 7440: "TFTP Windowsize Option".

This optional feature allows the client and server
to negotiate a window size of consecutive blocks to send as an
alternative for replacing the single-block lockstep schema.

windowsize can be defined statically during compilation by
setting CONFIG_TFTP_WINDOWSIZE, or defined in runtime by
setting an environment variable: "tftpwindowsize"
If not defined, the windowsize is set to 1, meaning that it
behaves as it was never defined.

Choosing the appropriate windowsize depends on the specific
network topology, underlying NIC.
You should test various windowsize scenarios and see which
best work for you.

Setting a windowsize too big can actually decreases performance.

Signed-off-by: Ramon Fried <rfried.dev@gmail.com>
Reviewed-by: Marek Vasut <marex@denx.de>
4 years agopsci: put psci_method in .data section if EFI_LOADER is not enabled
Yann Gautier [Fri, 17 Jul 2020 12:20:15 +0000 (14:20 +0200)]
psci: put psci_method in .data section if EFI_LOADER is not enabled

Move the variable psci_method in .data section when EFI is not
activated and the psci driver safely access it before relocation.

Without this patch the variable is located in .bss section
and the psci probe requested before relocation corrupts the device
tree (probe is requested by board_f.c::print_resetinfo()).

When EFI_LOADER is activated, this variable in already located in the
.data.efi_runtime section by __efi_runtime_data.

Signed-off-by: Yann Gautier <yann.gautier@st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
4 years agoFix corner case in bad block table handling.
Doyle, Patrick [Wed, 15 Jul 2020 14:46:34 +0000 (14:46 +0000)]
Fix corner case in bad block table handling.

In the unlikely event that both blocks 10 and 11 are marked as bad (on a
32 bit machine), then the process of marking block 10 as bad stomps on
cached entry for block 11.  There are (of course) other examples.

Signed-off-by: Patrick Doyle <pdoyle@irobot.com>
Reviewed-by: Richard Weinberger <richard@nod.at>
4 years agocmd: add clone command
John Chau [Thu, 2 Jul 2020 04:01:21 +0000 (12:01 +0800)]
cmd: add clone command

This patch adds a feature for block device cloning similar to dd
command, this should be useful for boot-strapping a device where
usb gadget or networking is not available. For instance one can
clone a factory image into a blank emmc from an external sd card.

Signed-off-by: John Chau <john@harmon.hk>
4 years agofs/fat/fat.c: Do not perform zero block reads if there are no blocks left
Jason Wessel [Tue, 23 Jun 2020 21:36:54 +0000 (14:36 -0700)]
fs/fat/fat.c: Do not perform zero block reads if there are no blocks left

While using u-boot with qemu's virtio driver I stumbled across a
problem reading files less than sector size.  On the real hardware the
block reader seems ok with reading zero blocks, and while we could fix
the virtio host side of qemu to deal with a zero block read instead of
crashing, the u-boot fat driver should not be doing zero block reads
in the first place.  If you ask hardware to read zero blocks you are
just going to get zero data.  There may also be other hardware that
responds similarly to the virtio interface so this is worth fixing.

Without the patch I get the following and have to restart qemu because
it dies.
---------------------------------
=> fatls virtio 0:1
       30   cmdline.txt
=> fatload virtio 0:1 ${loadaddr} cmdline.txt
qemu-system-aarch64: virtio: zero sized buffers are not allowed
---------------------------------

With the patch I get the expected results.
---------------------------------
=> fatls virtio 0:1
       30   cmdline.txt
=> fatload virtio 0:1 ${loadaddr} cmdline.txt
30 bytes read in 11 ms (2 KiB/s)
=> md.b ${loadaddr} 0x1E
40080000: 64 77 63 5f 6f 74 67 2e 6c 70 6d 5f 65 6e 61 62    dwc_otg.lpm_enab
40080010: 6c 65 3d 30 20 72 6f 6f 74 77 61 69 74 0a          le=0 rootwait.

---------------------------------

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
4 years agoMerge tag 'u-boot-imx-20200804' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Tom Rini [Tue, 4 Aug 2020 15:11:02 +0000 (11:11 -0400)]
Merge tag 'u-boot-imx-20200804' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

For 2020.10
-----------

- fixes for Toradex board
- fix warnings from previous PR
- HAB: reset instead of panic after failure
- new board:  MYiR Tech MYS-6ULX
- mx6cuboxi: use OF_PLATDATA
- further changes for DM

Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/714513163

4 years agoMerge tag 'fixes-for-2020.10-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot...
Tom Rini [Tue, 4 Aug 2020 15:07:55 +0000 (11:07 -0400)]
Merge tag 'fixes-for-2020.10-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-video

- Fix tbs2910 vidconsole environment
- Fix ipuv3 framebuffer output on i.MX6Q/D

4 years agoMerge https://gitlab.denx.de/u-boot/custodians/u-boot-riscv
Tom Rini [Tue, 4 Aug 2020 15:07:38 +0000 (11:07 -0400)]
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-riscv

- add DM based reset driver for SiFive SoC's.

4 years agoMerge tag 'mips-pull-2020-08-03' of https://gitlab.denx.de/u-boot/custodians/u-boot...
Tom Rini [Tue, 4 Aug 2020 15:07:16 +0000 (11:07 -0400)]
Merge tag 'mips-pull-2020-08-03' of https://gitlab.denx.de/u-boot/custodians/u-boot-mips

- doc: fix qemu-mips build instructions
- MIPS: add GPIO, CLK and SPI drivers for Octeon MIPS64

4 years agoMerge branch '2020-08-01-misc-cleanups'
Tom Rini [Tue, 4 Aug 2020 02:20:22 +0000 (22:20 -0400)]
Merge branch '2020-08-01-misc-cleanups'

- Further cleanup of common.h and dm.h usage in headers

4 years agocheckpatch: Don't allow common.h and dm.h in headers
Simon Glass [Sun, 19 Jul 2020 16:16:01 +0000 (10:16 -0600)]
checkpatch: Don't allow common.h and dm.h in headers

These headers should not be included in other header files. Add a
checkpatch rule and test for this.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agopatman: Fix up the test comments
Simon Glass [Sun, 19 Jul 2020 16:16:00 +0000 (10:16 -0600)]
patman: Fix up the test comments

Many of the tests have the same comment and two have the same name. Fix
this.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agodm: core: Guard against including dm.h in header files
Simon Glass [Sun, 19 Jul 2020 16:15:59 +0000 (10:15 -0600)]
dm: core: Guard against including dm.h in header files

Header files generally should not include header files just for a struct,
since forward declarations work just as well and reduce overhead.

Add a warning for dm.h being included, since this has crept into U-Boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agonet: Drop duplicate include of dm.h in pcnet.c
Simon Glass [Sun, 19 Jul 2020 16:15:58 +0000 (10:15 -0600)]
net: Drop duplicate include of dm.h in pcnet.c

This file includes the header twice. Drop the second one.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agonet: Drop dm.h header file in eth_phy.h
Simon Glass [Sun, 19 Jul 2020 16:15:57 +0000 (10:15 -0600)]
net: Drop dm.h header file in eth_phy.h

This header file should not be included in other header files. Remove it
and use a forward declaration instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agoclk: Drop dm.h header file in clk-provider.h
Simon Glass [Sun, 19 Jul 2020 16:15:56 +0000 (10:15 -0600)]
clk: Drop dm.h header file in clk-provider.h

This header file should not be included in other header files. Remove it
and use a forward declaration and un-inlining of dev_get_clk_ptr()
instead.

Fix up the kendryte header files to avoid build errors.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Sean Anderson <seanga2@gmail.com>
4 years agousb: Drop dm.h header file
Simon Glass [Sun, 19 Jul 2020 16:15:55 +0000 (10:15 -0600)]
usb: Drop dm.h header file

This header file should not be included in other header files. Remove it
and use a forward declaration instead.

Also move the inline function out into a C file. We should not include C
code in headers.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agoufs: Drop dm.h header file
Simon Glass [Sun, 19 Jul 2020 16:15:54 +0000 (10:15 -0600)]
ufs: Drop dm.h header file

This header file should not be included in other header files. Remove it
and use a forward declaration instead.

Also drop asm/io.h

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agonand: Drop dm.h header file
Simon Glass [Sun, 19 Jul 2020 16:15:53 +0000 (10:15 -0600)]
nand: Drop dm.h header file

This header file should not be included in other header files. Remove it
and use a forward declaration instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agoadc: Drop dm.h header file
Simon Glass [Sun, 19 Jul 2020 16:15:52 +0000 (10:15 -0600)]
adc: Drop dm.h header file

This header file should not be included in other header files. Remove it
and use a forward declaration instead.

Drop the common.h inclusion also.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agomscc: Drop dm.h header file
Simon Glass [Sun, 19 Jul 2020 16:15:51 +0000 (10:15 -0600)]
mscc: Drop dm.h header file

This header file should not be included in other header files. Remove it
from each one and use a forward declaration instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agomediatek: Drop dm.h header file
Simon Glass [Sun, 19 Jul 2020 16:15:50 +0000 (10:15 -0600)]
mediatek: Drop dm.h header file

This header file should not be included in other header files. Remove it
and use a forward declaration instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agopci: Drop dm.h inclusion from header file
Simon Glass [Sun, 19 Jul 2020 16:15:49 +0000 (10:15 -0600)]
pci: Drop dm.h inclusion from header file

The layerscape header should not include dm.h so remove it.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agoliebherr: Drop duplicate dm.h inclusion
Simon Glass [Sun, 19 Jul 2020 16:15:48 +0000 (10:15 -0600)]
liebherr: Drop duplicate dm.h inclusion

We only need to include this header once. Drop the duplicate.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agoti: am654: Drop duplicate dm.h inclusion
Simon Glass [Sun, 19 Jul 2020 16:15:47 +0000 (10:15 -0600)]
ti: am654: Drop duplicate dm.h inclusion

We only need to include this header once. Drop the duplicate.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agospi: Drop duplicate dm.h inclusion
Simon Glass [Sun, 19 Jul 2020 16:15:46 +0000 (10:15 -0600)]
spi: Drop duplicate dm.h inclusion

We only need to include this header once. Drop the duplicate.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agommc: Drop duplicate dm.h inclusion
Simon Glass [Sun, 19 Jul 2020 16:15:45 +0000 (10:15 -0600)]
mmc: Drop duplicate dm.h inclusion

We only need to include this header once. Drop the duplicate.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agopower: Tidy up inclusion of regulator_common.h
Simon Glass [Sun, 19 Jul 2020 16:15:44 +0000 (10:15 -0600)]
power: Tidy up inclusion of regulator_common.h

This file should not include common.h and dm.h so remove them. Also move
the inclusion of this file to after the normal includes.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
4 years agoefi: Tidy up header includes
Simon Glass [Sun, 19 Jul 2020 16:15:43 +0000 (10:15 -0600)]
efi: Tidy up header includes

Two files relies on efi_driver.h to include common.h and dm.h which is
incorrect. The former should always be included in a non-host C file and
the latter should be included if driver model is used.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agow1: Drop dm.h header file
Simon Glass [Sun, 19 Jul 2020 16:15:42 +0000 (10:15 -0600)]
w1: Drop dm.h header file

This header file should not be included in other header files. Remove it
and use a forward declaration instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agothermal: Drop dm.h header file
Simon Glass [Sun, 19 Jul 2020 16:15:41 +0000 (10:15 -0600)]
thermal: Drop dm.h header file

This header file should not be included in other header files. Remove it
and use a forward declaration instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agosf: Drop dm.h header file from spi_flash.h
Simon Glass [Sun, 19 Jul 2020 16:15:40 +0000 (10:15 -0600)]
sf: Drop dm.h header file from spi_flash.h

This header file should not be included in other header files. Remove it
and use a forward declaration instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agonet: Drop dm.h header file from phy.h
Simon Glass [Sun, 19 Jul 2020 16:15:39 +0000 (10:15 -0600)]
net: Drop dm.h header file from phy.h

This header file should not be included in other header files. Remove it
and use other headers and C inclusions instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agofs: fs-loader: Drop dm.h header file
Simon Glass [Sun, 19 Jul 2020 16:15:38 +0000 (10:15 -0600)]
fs: fs-loader: Drop dm.h header file

This header file should not be included in other header files. Remove it
and use a forward declaration instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agodm: core: Drop header files from dm/test.h
Simon Glass [Sun, 19 Jul 2020 16:15:37 +0000 (10:15 -0600)]
dm: core: Drop header files from dm/test.h

These header file should not be included in other header files. Remove
them and add to each individual file. Add test/test.h to test/ui.h since
that is a reasonable place.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agodm: core: Drop dm.h header file from dm-demo.h
Simon Glass [Sun, 19 Jul 2020 16:15:36 +0000 (10:15 -0600)]
dm: core: Drop dm.h header file from dm-demo.h

This header file should not be included in other header files. Remove it
and add it to the cmd file instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agomtd: spi: Drop SPI_XFER_MMAP*
Simon Glass [Sun, 19 Jul 2020 16:15:35 +0000 (10:15 -0600)]
mtd: spi: Drop SPI_XFER_MMAP*

These two defines are no-longer supported. Drop them.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agomtd: spi-mem: Drop dm.h header file
Simon Glass [Sun, 19 Jul 2020 16:15:34 +0000 (10:15 -0600)]
mtd: spi-mem: Drop dm.h header file

This header file should not be included in other header files. Remove it
and use a forward declaration instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agowdt: Drop dm.h header file
Simon Glass [Sun, 19 Jul 2020 16:15:33 +0000 (10:15 -0600)]
wdt: Drop dm.h header file

This header file should not be included in other header files. Remove it
and use a forward declaration instead.

Also remove the other headers that are not needed, since the inline code
was removed in a recent commit:

   b4d9452c4 ("watchdog: move initr_watchdog() to wdt-uclass.c")

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agomtd: spi-nor: Tidy up error handling / debug code
Simon Glass [Sun, 19 Jul 2020 16:15:32 +0000 (10:15 -0600)]
mtd: spi-nor: Tidy up error handling / debug code

The -ENODEV error value in spi_nor_read_id() is incorrect since there
clearly is a device - it just cannot be supported. Use -ENOMEDIUM instead
which has the virtue of being less common.

Fix the return value in spi_nor_scan().

Also there are a few printf() statements which should be debug() since
they bloat the code with unused strings at present. Fix those while here.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agospi: Allow separate control of SPI_FLASH_TINY for SPL/TPL
Simon Glass [Sun, 19 Jul 2020 16:15:31 +0000 (10:15 -0600)]
spi: Allow separate control of SPI_FLASH_TINY for SPL/TPL

In some cases SPL needs to be able to erase but TPL just needs to read.
Allow these to have separate settings for SPI_FLASH_TINY.

Signed-off-by: Simon Glass <sjg@chromium.org>
4 years agoconfigs: reset: fu540: enable dm reset framework for SiFive
Sagar Shrikant Kadam [Wed, 29 Jul 2020 09:36:14 +0000 (02:36 -0700)]
configs: reset: fu540: enable dm reset framework for SiFive

Add necessary defconfig and Kconfig entries to enable SiFive SoC's
reset driver so as to utilise U-Boot's reset framework.

Signed-off-by: Sagar Shrikant Kadam <sagar.kadam@sifive.com>
Reviewed-by: Pragnesh Patel <Pragnesh.patel@sifive.com>
Reviewed-by: Bin Meng <bin.meng@windriver.com>
Tested-by: Bin Meng <bin.meng@windriver.com>
4 years agosifive: reset: add DM based reset driver for SiFive SoC's
Sagar Shrikant Kadam [Wed, 29 Jul 2020 09:36:13 +0000 (02:36 -0700)]
sifive: reset: add DM based reset driver for SiFive SoC's

PRCI module within SiFive SoC's has register with which we can
reset the sub-systems within the SoC. The resets to DDR and ethernet
sub systems within FU540-C000 SoC are active low, and are hold low
by default on power-up. Currently these are directly asserted within
prci driver via register read/write.
With the DM based reset driver support here, we bind the reset
driver with clock (prci) driver and assert the reset signals of
both sub-system's appropriately.

Signed-off-by: Sagar Shrikant Kadam <sagar.kadam@sifive.com>
Reviewed-by: Pragnesh Patel <Pragnesh.patel@sifive.com>
Reviewed-by: Bin Meng <bin.meng@windriver.com>
Tested-by: Bin Meng <bin.meng@windriver.com>
4 years agofu540: dtsi: add reset producer and consumer entries
Sagar Shrikant Kadam [Wed, 29 Jul 2020 09:36:12 +0000 (02:36 -0700)]
fu540: dtsi: add reset producer and consumer entries

The resets to DDR and ethernet sub-system are connected to
PRCI device reset control register, these reset signals
are active low and are held low at power-up. Add these reset
producer and consumer details needed by the reset driver.

Signed-off-by: Sagar Shrikant Kadam <sagar.kadam@sifive.com>
Reviewed-by: Pragnesh Patel <pragnesh.patel@sifive.com>
Reviewed-by: Bin Meng <bin.meng@windriver.com>
4 years agofu540: prci: use common reset indexes defined in binding header
Sagar Shrikant Kadam [Wed, 29 Jul 2020 09:36:11 +0000 (02:36 -0700)]
fu540: prci: use common reset indexes defined in binding header

Indexes of reset signals available in PRCI driver are also
defined in include/dt-bindings/reset/sifive-fu540-prci.h.
So use those instead of defining new ones again within the
fu540-prci driver.

Signed-off-by: Sagar Shrikant Kadam <sagar.kadam@sifive.com>
Reviewed-by: Pragnesh Patel <pragnesh.patel@sifive.com>
Reviewed-by: Bin Meng <bin.meng@windriver.com>
4 years agodt-bindings: prci: add indexes for reset signals available in prci
Sagar Shrikant Kadam [Wed, 29 Jul 2020 09:36:10 +0000 (02:36 -0700)]
dt-bindings: prci: add indexes for reset signals available in prci

Add bit indexes for reset signals within the PRCI module
on FU540-C000 SoC.
The DDR and ethernet sub-system's have reset signals
indicated by these reset indexes.

Signed-off-by: Sagar Shrikant Kadam <sagar.kadam@sifive.com>
Reviewed-by: Pragnesh Patel <pragnesh.patel@sifive.com>
Reviewed-by: Bin Meng <bin.meng@windriver.com>
4 years agovideo: ipuv3: fix framebuffer base address init with multiple IPUs
Anatolij Gustschin [Mon, 3 Aug 2020 13:45:33 +0000 (15:45 +0200)]
video: ipuv3: fix framebuffer base address init with multiple IPUs

Since commit 7812bbdc3732 ("video: Correctly handle multiple
framebuffers") the vidconsole output is missing on the primary
display on boards with two IPU units (all i.MX6Q/D based boards).
The base address of the allocated framebuffer is not correctly
programmed in the display controller. Fix it.

Reported-by: Soeren Moch <smoch@web.de>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Tested-by: Soeren Moch <smoch@web.de>
4 years agoboard: tbs2910: Fix video output with existing environments
Soeren Moch [Thu, 30 Jul 2020 12:11:57 +0000 (14:11 +0200)]
board: tbs2910: Fix video output with existing environments

Migration to DM_VIDEO changed the output device name (in stout, stderr)
from 'vga' to 'vidconsole'. This also was adapted in the default environment.
However, existing user defined environments still use 'vga'. Enable this
workaround to map the 'vga' name to 'vidconsole'. So we get HDMI video
output also with existing legacy environments.

Signed-off-by: Soeren Moch <smoch@web.de>
4 years agomips: octeon: Update EBB7304 defconfig
Stefan Roese [Thu, 30 Jul 2020 11:56:22 +0000 (13:56 +0200)]
mips: octeon: Update EBB7304 defconfig

This patch enables the following options for the Octeon EBB7304 EVB:

- PCI & DM_PCI
- DM_SPI_FLASH & SPI flash device support
- SPI & Octeon SPI driver
- GPIO cmd support
- I2C cmd support

Signed-off-by: Stefan Roese <sr@denx.de>
4 years agomips: octeon: Update Octeon Kconfig
Stefan Roese [Thu, 30 Jul 2020 11:56:21 +0000 (13:56 +0200)]
mips: octeon: Update Octeon Kconfig

This patch selects DM_SPI & DM_I2C for MIPS Octeon. DM_GPIO, DM_SERIAL
and DM_ETH are already selected.

Additionally the selections are now alphabetically sorted.

Signed-off-by: Stefan Roese <sr@denx.de>
4 years agomips: octeon: mrvl, octeon-ebb7304.dts: Add SPI flash DT node
Stefan Roese [Thu, 30 Jul 2020 11:56:20 +0000 (13:56 +0200)]
mips: octeon: mrvl, octeon-ebb7304.dts: Add SPI flash DT node

Add the SPI flash DT node for the EBB7304.

Signed-off-by: Stefan Roese <sr@denx.de>
4 years agomips: octeon: mrvl,cn73xx.dtsi: Add SPI DT node
Stefan Roese [Thu, 30 Jul 2020 11:56:19 +0000 (13:56 +0200)]
mips: octeon: mrvl,cn73xx.dtsi: Add SPI DT node

Add the Octeon SPI DT node to the dtsi file.

Signed-off-by: Stefan Roese <sr@denx.de>
4 years agodrivers: spi: Add SPI controller driver for Octeon
Suneel Garapati [Thu, 30 Jul 2020 11:56:18 +0000 (13:56 +0200)]
drivers: spi: Add SPI controller driver for Octeon

Adds support for SPI controllers found on Octeon II/III and Octeon TX
TX2 SoC platforms.

Signed-off-by: Aaron Williams <awilliams@marvell.com>
Signed-off-by: Suneel Garapati <sgarapati@marvell.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Aaron Williams <awilliams@marvell.com>
Cc: Chandrakala Chavva <cchavva@marvell.com>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
4 years agomips: octeon: dts: Add Octeon clock driver DT nodes
Stefan Roese [Thu, 30 Jul 2020 11:56:17 +0000 (13:56 +0200)]
mips: octeon: dts: Add Octeon clock driver DT nodes

This patch adds the DT nodes for the Octeon clock support via the
common clk_ API.

Signed-off-by: Stefan Roese <sr@denx.de>
4 years agoclk: clk_octeon: Add simple MIPS Octeon clock driver
Stefan Roese [Thu, 30 Jul 2020 11:56:16 +0000 (13:56 +0200)]
clk: clk_octeon: Add simple MIPS Octeon clock driver

This patch adds a simple clock driver for the Marvell Octeon MIPS SoC
family. Its for IO clock rate passing via DT in some of the Octeon
driver, like I2C. So that we don't need to use the non-mainline API
octeon_get_io_clock().

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Lukasz Majewski <lukma@denx.de>
4 years agomips: octeon: dts: Add I2C DT nodes
Stefan Roese [Thu, 30 Jul 2020 11:56:15 +0000 (13:56 +0200)]
mips: octeon: dts: Add I2C DT nodes

Add I2C DT nodes to the Octeon dts / dtsi files.

Signed-off-by: Stefan Roese <sr@denx.de>
4 years agomips: octeon: mrvl,cn73xx.dtsi: Add GPIO DT nodes
Stefan Roese [Thu, 30 Jul 2020 11:56:14 +0000 (13:56 +0200)]
mips: octeon: mrvl,cn73xx.dtsi: Add GPIO DT nodes

Add the Octeon GPIO DT node to the dtsi file.

Signed-off-by: Stefan Roese <sr@denx.de>
4 years agogpio: octeon_gpio: Add GPIO controller driver for Octeon
Suneel Garapati [Thu, 30 Jul 2020 11:56:13 +0000 (13:56 +0200)]
gpio: octeon_gpio: Add GPIO controller driver for Octeon

Add support for GPIO controllers found on Octeon II/III and Octeon TX
TX2 SoC platforms.

Signed-off-by: Aaron Williams <awilliams@marvell.com>
Signed-off-by: Suneel Garapati <sgarapati@marvell.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
4 years agodoc: qemu-mips build instructions
Heinrich Schuchardt [Mon, 27 Jul 2020 16:46:09 +0000 (18:46 +0200)]
doc: qemu-mips build instructions

Correct the make commands for the defconfigs.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
4 years agoconfigs: pico-imx6: convert ethernet function to DM_ETH
Wig Cheng [Tue, 28 Jul 2020 08:15:19 +0000 (16:15 +0800)]
configs: pico-imx6: convert ethernet function to DM_ETH

Before enable _DM_ETH:
    Net:   FEC [PRIME]

After enable DM_ETH:
    Net:   eth0: ethernet@2188000

Here is the test commands:
    => dhcp
    BOOTP broadcast 1
    DHCP client bound to address 10.88.88.152 (146 ms)
    *** ERROR: `serverip' not set
    Cannot autoload with TFTPGET
    => ping 8.8.8.8
    Using ethernet@2188000 device
    host 8.8.8.8 is alive

Signed-off-by: Wig Cheng <wig.cheng@technexion.com>
4 years agoimx8m: enlarge CONFIG_SYS_BOOTM_LEN
Peng Fan [Tue, 28 Jul 2020 09:28:57 +0000 (17:28 +0800)]
imx8m: enlarge CONFIG_SYS_BOOTM_LEN

Enlarge CONFIG_SYS_BOOTM_LEN when booting FIT image with AArch32 mode
Linux kernel.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
4 years agoarm: imx6q: pcm058: Rework SPI NOR configuration
Niel Fourie [Fri, 24 Jul 2020 14:33:27 +0000 (16:33 +0200)]
arm: imx6q: pcm058: Rework SPI NOR configuration

Enable CONFIG_SPL_DM_SPI_FLASH to be able to boot from SPI NOR,
modify the offset of U-boot proper in the SPI NOR, so the
difference in offset matches between SPL and U-boot matches that of
the SD Card, allowing u-boot-with-spl.imx to also be copied to SPI
NOR at an offset of 0x400. Update the README to reflect this
change.

Signed-off-by: Niel Fourie <lusus@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
4 years agoARM: imx: hab: panic on authentication failure
Marek Vasut [Sat, 30 May 2020 18:29:00 +0000 (20:29 +0200)]
ARM: imx: hab: panic on authentication failure

Instead of hang()ing the system and thus disallowing any automated
recovery possibility from a HAB authentication failure, panic() .
The panic() function can be configured to hang() the system after
printing an error message, however the default is to reset the
system instead.

This allows redundant boot to work correctly. In case the primary
or secondary image cannot be authenticated, the system reboots and
bootrom can try to start the other one.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: NXP i.MX U-Boot Team <uboot-imx@nxp.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
4 years agoimx: Add MYiR Tech MYS-6ULX support
Parthiban Nallathambi [Mon, 27 Jul 2020 14:48:41 +0000 (16:48 +0200)]
imx: Add MYiR Tech MYS-6ULX support

MYS-6ULX is single board computer (SBC) comes with eMMC or NAND based
on imx6ULL SoC from NXP and provision for expansion board. This
commit adds support only for SBC with NAND.

CPU:   Freescale i.MX6ULL rev1.1 528 MHz (running at 396 MHz)
CPU:   Commercial temperature grade (0C to 95C) at 45C
Reset cause: WDOG
Model: MYiR i.MX6ULL MYS-6ULX Single Board Computer with NAND
Board: MYiR MYS-6ULX 6ULL Single Board Computer
DRAM:  256 MiB
NAND:  256 MiB
MMC:   FSL_SDHC: 0
In:    serial@2020000
Out:   serial@2020000
Err:   serial@2020000
Net:   FEC0

Working:
 - Eth0
 - MMC/SD
 - NAND
 - UART 1
 - USB host

Signed-off-by: Parthiban Nallathambi <parthiban@linumiz.com>
4 years agoMerge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
Tom Rini [Mon, 3 Aug 2020 14:25:47 +0000 (10:25 -0400)]
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86

- ApolloLake: add u64 parameters support for FSP2 bindings
- ApolloLake: add missing parameters to support full configuration of
  the latest FSP MR6 release
- Append appropriate suffixes in various assembly codes

4 years agoMerge tag 'efi-2020-10-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Tom Rini [Mon, 3 Aug 2020 12:01:08 +0000 (08:01 -0400)]
Merge tag 'efi-2020-10-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

Pull request for UEFI sub-system for efi-2020-10-rc2

This series comprises error corrections for the UEFI subsystem:

* make the memory size reserved for the U-Boot stack customizable
  and reduce it for the MAIX board
* correct build dependencies for UEFI unit test
* enable read-only UEFI variable are enabled with the TEE backend
* add 10 ms wait to sysreset to fix a problem with unit testing

4 years agox86: call32: Append appropriate suffixes
Andy Shevchenko [Tue, 28 Jul 2020 09:56:26 +0000 (12:56 +0300)]
x86: call32: Append appropriate suffixes

Assembler is not happy:

arch/x86/cpu/call32.S: Assembler messages:
arch/x86/cpu/call32.S:36: Warning: no instruction mnemonic suffix given and no register operands; using default for `retf'

Fix this by adding appropriate suffixes to the assembler commands.

Fixes: 6f92ed8f1abf ("x86: Add a way to call 32-bit code from 64-bit mode")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
4 years agox86: sipi_vector: Append appropriate suffixes
Andy Shevchenko [Tue, 28 Jul 2020 09:56:25 +0000 (12:56 +0300)]
x86: sipi_vector: Append appropriate suffixes

Assembler is not happy:

arch/x86/cpu/sipi_vector.S: Assembler messages:
arch/x86/cpu/sipi_vector.S:134: Warning: no instruction mnemonic suffix given and no register operands; using default for `cmp'
arch/x86/cpu/sipi_vector.S:139: Warning: no instruction mnemonic suffix given and no register operands; using default for `bts'
arch/x86/cpu/sipi_vector.S:157: Warning: no instruction mnemonic suffix given and no register operands; using default for `cmp'

Fix this by adding appropriate suffixes to the assembler commands.

Fixes: 45b5a37836d5 ("x86: Add multi-processor init")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
4 years agoarch: x86: apl: Update FSP parameters
Bernhard Messerklinger [Wed, 22 Jul 2020 07:29:39 +0000 (09:29 +0200)]
arch: x86: apl: Update FSP parameters

Add missing parameters to support full configuration of the latest FSP
MR6 release.

Signed-off-by: Bernhard Messerklinger <bernhard.messerklinger@br-automation.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
4 years agox86: apl: fsp_bindings: Add support for u64 parameters
Bernhard Messerklinger [Wed, 22 Jul 2020 07:29:38 +0000 (09:29 +0200)]
x86: apl: fsp_bindings: Add support for u64 parameters

Add FSP_UINT64 read support as preparation for FSP-M and FSP-S parameter
update.

Signed-off-by: Bernhard Messerklinger <bernhard.messerklinger@br-automation.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
4 years agox86: irq: Fix some typos
Wolfgang Wallner [Tue, 21 Jul 2020 11:01:45 +0000 (13:01 +0200)]
x86: irq: Fix some typos

Fix some typos in arch/x86/include/asm/irq.h.

Signed-off-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
4 years agomx6cuboxi: enable OF_PLATDATA
Walter Lozano [Wed, 29 Jul 2020 15:31:21 +0000 (12:31 -0300)]
mx6cuboxi: enable OF_PLATDATA

As both MMC and GPIO driver now supports OF_PLATDATA, enable it in
defconfig in order to reduce the SPL footprint. After applying this
setting the SPL reduction is 5 KB, which partially compensates the
increment due to DM.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
4 years agodrivers: rename more drivers to match compatible string
Walter Lozano [Wed, 29 Jul 2020 15:31:20 +0000 (12:31 -0300)]
drivers: rename more drivers to match compatible string

Continuing with the approach in commit <addf358bac1d2bd0> rename
additional drivers to allow the OF_PLATDATA support.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
4 years agommc: fsl_esdhc_imx: add CD support when OF_PLATDATA is enabled
Walter Lozano [Wed, 29 Jul 2020 15:31:19 +0000 (12:31 -0300)]
mmc: fsl_esdhc_imx: add CD support when OF_PLATDATA is enabled

After enabling OF_PLATDATA support to both MMC and GPIO drivers add the
support for card detection.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
4 years agogpio: mxc_gpio: add OF_PLATDATA support
Walter Lozano [Wed, 29 Jul 2020 15:31:18 +0000 (12:31 -0300)]
gpio: mxc_gpio: add OF_PLATDATA support

Continuing with the OF_PLATADATA support for iMX6 to reduce SPL
footprint, add it to mxc_gpio. Thanks to this, it will be possible to
enable card detection on MMC driver.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
4 years agommc: fsl_esdhc_imx: add OF_PLATDATA support
Walter Lozano [Wed, 29 Jul 2020 15:31:17 +0000 (12:31 -0300)]
mmc: fsl_esdhc_imx: add OF_PLATDATA support

In order to reduce the footprint of SPL by removing dtb and library
overhead, add OF_PLATDATA support to fsl_esdhc_imx. This initial
approach does not support card detection, which will be enabled after
adding OF_PLATDATA support to GPIO.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
4 years agommc: fsl_esdhc_imx: rename driver name to match ll_entry
Walter Lozano [Wed, 29 Jul 2020 15:31:16 +0000 (12:31 -0300)]
mmc: fsl_esdhc_imx: rename driver name to match ll_entry

As discussed in commit <addf358bac1d2bd0> rename fsl_esdhc_imx
driver to allow the OF_PLATDATA support.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
4 years agoefi_selftest: block device test requires CONFIG_DOS_PARTITION
Heinrich Schuchardt [Wed, 29 Jul 2020 10:43:41 +0000 (12:43 +0200)]
efi_selftest: block device test requires CONFIG_DOS_PARTITION

Do not execute the block device test if CONFIG_DOS_PARTITION=n.

Imply CONFIG_DOS_PARTITION in Kconfig.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
4 years agoefi_selftest: SNP test depends on network
Heinrich Schuchardt [Wed, 29 Jul 2020 10:32:49 +0000 (12:32 +0200)]
efi_selftest: SNP test depends on network

If CONFIG_NET=n, testing the simple network protocol makes no sense.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
4 years agodm: sysreset: wait after reset message
Heinrich Schuchardt [Wed, 29 Jul 2020 10:13:41 +0000 (12:13 +0200)]
dm: sysreset: wait after reset message

In our Python tests we expect to see the word "resetting". It may be
truncated if we reset before the serial console buffer is transferred.

Wait for 100 ms between the "resetting ..." message and the actual reset
like we do when powering off.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
4 years agoconfigs: reduce stack size of Sipeed MAIX
Heinrich Schuchardt [Wed, 29 Jul 2020 10:53:05 +0000 (12:53 +0200)]
configs: reduce stack size of Sipeed MAIX

The K210 has only 8 MiB RAM thereof 2 MiB reserved for AI.

Allow only 1 MiB for the stack.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
4 years agoefi_loader: use CONFIG_STACK_SIZE in the UEFI sub-system
Heinrich Schuchardt [Wed, 29 Jul 2020 10:37:35 +0000 (12:37 +0200)]
efi_loader: use CONFIG_STACK_SIZE in the UEFI sub-system

The Kconfig symbol CONFIG_STACK_SIZE is used both by ARM and Microblaze
with the same meaning. Move it to menu 'General setup' so that we can use
it for all architectures.

Use the value of CONFIG_STACK_SIZE instead of a hard coded 16 MiB value for
reserving memory in the UEFI sub-system.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
4 years agox86: rename CONFIG_STACK_SIZE
Heinrich Schuchardt [Wed, 29 Jul 2020 10:31:17 +0000 (12:31 +0200)]
x86: rename CONFIG_STACK_SIZE

Configuration variables should have the same meaning independent of the
architecture. x86 and ARM both use CONFIG_STACK_SIZE:

* x86: U-Boot's runtime stack size during reboot
* ARM: max stack size that can be used by U-Boot

Rename the x86 configuration variable to CONFIG_STACK_SIZE_REBOOT

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
4 years agoefi_loader: Enable run-time variable support for tee based variables
Ilias Apalodimas [Thu, 23 Jul 2020 12:49:49 +0000 (15:49 +0300)]
efi_loader: Enable run-time variable support for tee based variables

We recently added functions for storing/restoring variables
from a file to a memory backed buffer marked as __efi_runtime_data
commit f1f990a8c958 ("efi_loader: memory buffer for variables")
commit 5f7dcf079de8 ("efi_loader: UEFI variable persistence")

Using the same idea we now can support GetVariable() and GetNextVariable()
on the OP-TEE based variables as well.

So let's re-arrange the code a bit and move the commmon code for
accessing variables out of efi_variable.c. Create common functions for
reading variables from memory that both implementations can use on
run-time. Then just use those functions in the run-time variants of the
OP-TEE based EFI variable implementation and initialize the memory
buffer on ExitBootServices()

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
4 years agoefi_loader: Trim output buffer size correctly for tee variables
Ilias Apalodimas [Tue, 21 Jul 2020 22:50:37 +0000 (01:50 +0300)]
efi_loader: Trim output buffer size correctly for tee variables

The current code does not trim the output buffer correctly.
In fact it doesn't trim the buffer at all, since it calculates a wrong
value for it, which isn't even applied.
So let's remove the unused temporary size variable and trim the buffer
correctly.
Since we are editing efi_get_next_variable_name_int(), fix an indentation
error along the way.

Fixes: f042e47e8fb43 ("efi_loader: Implement EFI variable handling via OP-TEE")
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Remove superfluous conversion to (u8 *) for memcpy argument.
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
4 years agoMerge branch '2020-07-31-more-env-updates'
Tom Rini [Fri, 31 Jul 2020 14:13:07 +0000 (10:13 -0400)]
Merge branch '2020-07-31-more-env-updates'

- Fix EFI selftest to not force setting serial# environment (and also
  get the U-Boot prompt dynamically).
- Support for append only environment and other related features.
- Improved ext4 environment support
- Fix the case of fw_setenv being used on flash devices that were not
  already locked.

4 years agofw_setenv: lock the flash only if it was locked before
Ivan Mikhaylov [Fri, 10 Jul 2020 16:54:18 +0000 (19:54 +0300)]
fw_setenv: lock the flash only if it was locked before

With current implementation of fw_setenv, it is always locks u-boot-env
region if lock interface is implemented for such mtd device. You can
not control lock of this region with fw_setenv, there is no option for
it in config or in application itself. Because of this situation may
happen problems like in this thread on xilinx forum:
https://forums.xilinx.com/t5/Embedded-Linux/Flash-be-locked-after-use-fw-setenv-from-user-space
/td-p/1027851

A short summary of that link is: some person has issue with some spi
chip which has lock interface but doesn't locks properly which leads to
lock of whole flash memory on lock of u-boot-env region. As resulted
solution hack was added into spi-nor.c driver for this chip with lock
disablement.

Instead fix this problem by adding logic to fw_setenv only lock the
flash if it was already locked when we attempted to use it.

Signed-off-by: Ivan Mikhaylov <fr0st61te@gmail.com>
4 years agoenv: Add support for explicit write access list
Marek Vasut [Tue, 7 Jul 2020 18:51:39 +0000 (20:51 +0200)]
env: Add support for explicit write access list

This option marks any U-Boot variable which does not have explicit 'w'
writeable flag set as read-only. This way the environment can be locked
down and only variables explicitly configured to be writeable can ever
be changed by either 'env import', 'env set' or loading user environment
from environment storage.

Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
4 years agoenv: Add option to only ever append environment
Marek Vasut [Tue, 7 Jul 2020 18:51:38 +0000 (20:51 +0200)]
env: Add option to only ever append environment

Add configuration option which prevents the environment hash table to be
ever cleared and reloaded with different content. This is useful in case
the first environment loaded into the hash table contains e.g. sensitive
content which must not be dropped or reloaded.

Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
4 years agoenv: Discern environment coming from external storage
Marek Vasut [Tue, 7 Jul 2020 18:51:35 +0000 (20:51 +0200)]
env: Discern environment coming from external storage

Add another custom environment flag which discerns environment coming
from external storage from environment set by U-Boot itself.

Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
4 years agoenv: Add H_DEFAULT flag
Marek Vasut [Tue, 7 Jul 2020 18:51:34 +0000 (20:51 +0200)]
env: Add H_DEFAULT flag

Add another internal environment flag which indicates that the operation
is resetting the environment to the default one. This allows the env code
to discern between import of external environment and reset to default.

Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
4 years agoenv: Warn on force access if ENV_ACCESS_IGNORE_FORCE set
Marek Vasut [Tue, 7 Jul 2020 18:51:33 +0000 (20:51 +0200)]
env: Warn on force access if ENV_ACCESS_IGNORE_FORCE set

If the ENV_ACCESS_IGNORE_FORCE is set, inform user that the variable
cannot be force-set if such attempt happens.

Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
4 years agotest: sandbox: add test for erase command
Patrick Delaunay [Tue, 28 Jul 2020 09:51:27 +0000 (11:51 +0200)]
test: sandbox: add test for erase command

Add test for the erase command tested on ENV in EXT4.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>