]> git.dujemihanovic.xyz Git - u-boot.git/log
u-boot.git
7 years agogpt: Use cache aligned buffers for gpt_h and gpt_e
Lukasz Majewski [Fri, 27 Oct 2017 10:28:10 +0000 (12:28 +0200)]
gpt: Use cache aligned buffers for gpt_h and gpt_e

Before this patch one could receive following errors when executing
"gpt write" command on machine with cache enabled:

display5 factory > gpt write mmc ${mmcdev} ${partitions}
Writing GPT:
CACHE: Misaligned operation at range [4ef8f7f04ef8f9f0]
CACHE: Misaligned operation at range [4ef8f9f84ef939f8]
CACHE: Misaligned operation at range [4ef8f9f84ef939f8]
CACHE: Misaligned operation at range [4ef8f7f04ef8f9f0]
success!

To alleviate this problem - the calloc()s have been replaced with
malloc_cache_aligned() and memset().

After those changes the buffers are properly aligned (with both start
address and size) to SoC cache line.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
7 years agotools: image: fix message when fail to add verification data for config
Masahiro Yamada [Fri, 27 Oct 2017 06:04:21 +0000 (15:04 +0900)]
tools: image: fix message when fail to add verification data for config

This function is called when signing configuration nodes.  Adjust
the error message.

I do not know why we do not need to show the error message in case of
ENOSPC.  Remove the if-conditional that seems unnecessary.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agotools: image: allow to sign image nodes without -K option
Masahiro Yamada [Fri, 27 Oct 2017 06:04:20 +0000 (15:04 +0900)]
tools: image: allow to sign image nodes without -K option

If -K option is missing when you sign image nodes, it fails with
an unclear error message:

  tools/mkimage Can't add hashes to FIT blob: -1

It is hard to figure out the cause of the failure.

In contrast, when you sign configuration nodes, -K is optional because
fit_config_process_sig() returns successfully if keydest is unset.
Probably this is a preferred behavior when you want to update FIT with
the same key; you do not have to update the public key in this case.

So, this commit changes fit_image_process_sig() to continue signing
without keydest.  If ->add_verify_data() fails, show a clearer error
message, which has been borrowed from fit_config_process_sig().

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agotools: image: fix "algo" property of public key for verified boot
Masahiro Yamada [Fri, 27 Oct 2017 04:25:21 +0000 (13:25 +0900)]
tools: image: fix "algo" property of public key for verified boot

The "algo_name" points to a property in a blob being edited.  The
pointer becomes stale when fit_image_write_sig() inserts signatures.
Then crypto->add_verify_data() writes wrong data to the public key
destination.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agotest/py: regenerate persistent GPT image if code changes
Stephen Warren [Fri, 27 Oct 2017 00:23:35 +0000 (18:23 -0600)]
test/py: regenerate persistent GPT image if code changes

test_gpt generates a persistent disk image which can be re-used across
multiple test runs. Currently, if the Python code that generates the disk
image change, the image is not regenerated, which could cause test
failures e.g. if a test was updated to expect some new partition name or
size, yet the persistent disk image contained the old name or size. This
change introduces functionality to regenerate the disk image if the
instructions to generate the image have changed.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
7 years agotools: env: allow to print U-Boot version
Stefan Agner [Thu, 26 Oct 2017 12:57:53 +0000 (14:57 +0200)]
tools: env: allow to print U-Boot version

The fw_env utility family has a default environment compiled in
which ties it quite strongly to the U-Boot source/config it has
been built with. Allow to display the U-Boot version it has been
built with using the -v/--version argument.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
7 years agoimage-sig: use designated initializers for algorithm
Masahiro Yamada [Mon, 23 Oct 2017 01:03:40 +0000 (10:03 +0900)]
image-sig: use designated initializers for algorithm

Designated initializers are more readable because we do not
have to check the order in the struct definitions.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoMAINTAINERS: Add missing boards and config entries
Tom Rini [Sat, 21 Oct 2017 16:54:02 +0000 (12:54 -0400)]
MAINTAINERS: Add missing boards and config entries

As part of my usual round of build testing, output about missing
MAINTAINERS information was not logged, and thus often overlooked.
Correct that mistake by ensuring that I log the output of
genboardscfg.py every time.  As part of that, address a number of
missing MAINTAINERS entires.  In the case of a missing file, I have put
the original submitter down.  In the rest of the cases I have added the
config (and sometimes relevant header file) to the existing set of file
globs.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agotpm: st33zp24: fix STMicroelectronics copyright
Patrice Chotard [Mon, 23 Oct 2017 07:54:01 +0000 (09:54 +0200)]
tpm: st33zp24: fix STMicroelectronics copyright

Uniformize STMicroelectronics copyrights header

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
7 years agospear: fix STMicroelectronics copyright
Patrice Chotard [Mon, 23 Oct 2017 07:54:00 +0000 (09:54 +0200)]
spear: fix STMicroelectronics copyright

Uniformize STMicroelectronics copyrights headers for SPEAR
related code.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
7 years agostv0991: fix STMicroelectronics copyright
Patrice Chotard [Mon, 23 Oct 2017 07:53:59 +0000 (09:53 +0200)]
stv0991: fix STMicroelectronics copyright

Uniformize STMicroelectronics copyrights headers for STV0991
related code.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
7 years agostm32: fix STMicroelectronics copyright
Patrice Chotard [Mon, 23 Oct 2017 07:53:58 +0000 (09:53 +0200)]
stm32: fix STMicroelectronics copyright

Uniformize STMicroelectronics copyrights headers for STM32
related code.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
7 years agosti: fix STMicroelectronics copyright
Patrice Chotard [Mon, 23 Oct 2017 07:53:57 +0000 (09:53 +0200)]
sti: fix STMicroelectronics copyright

Uniformize all STMicroelectronics copyrights headers for STi
related code.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
7 years agoMerge git://git.denx.de/u-boot-samsung
Tom Rini [Mon, 6 Nov 2017 14:24:55 +0000 (09:24 -0500)]
Merge git://git.denx.de/u-boot-samsung

7 years agoARM: dts: exynos: fix property values of LDO15/17 for ODROID-XU3/4
Dongjin Kim [Sun, 29 Oct 2017 16:39:59 +0000 (12:39 -0400)]
ARM: dts: exynos: fix property values of LDO15/17 for ODROID-XU3/4

Looking at the schematic, LDO15 and LDO17 are tied as a power source of a
builtin network chipset. The voltage on LDO15 is corrected to 3.3V and the
name of LDO17 is corrected to "vdd_ldo17".

Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
7 years agoKconfig: Migrate MTDIDS_DEFAULT / MTDPARTS_DEFAULT
Tom Rini [Sun, 22 Oct 2017 21:55:07 +0000 (17:55 -0400)]
Kconfig: Migrate MTDIDS_DEFAULT / MTDPARTS_DEFAULT

We move all instances of CONFIG_MTDIDS_DEFAULT and
CONFIG_MTDPARTS_DEFAULT from the header files to the defconfig files.
There's a few cases here where we need to expand upon what was in the
header file.

Tested-by: Adam Ford <aford173@gmail.com> #omap3_logic
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoMerge tag 'xilinx-fixes-for-v2017.11' of git://www.denx.de/git/u-boot-microblaze
Tom Rini [Fri, 3 Nov 2017 14:02:29 +0000 (10:02 -0400)]
Merge tag 'xilinx-fixes-for-v2017.11' of git://www.denx.de/git/u-boot-microblaze

Xilinx fix for v2017.11

- Fix ceva sata initialization

7 years agoscsi: ceva: Start port in probe
Michal Simek [Thu, 2 Nov 2017 14:45:34 +0000 (15:45 +0100)]
scsi: ceva: Start port in probe

The patch:
"dm: ahci: Unwind the confusing init code"
(sha1: 7cf1afce7fa3fe64189020fe14b93f7326dd0758)
introduce bug for ceva sata because port didn't start.
On the other hand the dwc_ahci.c was fixed correctly.
Do the same change for ceva too.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
7 years agoMerge git://git.denx.de/u-boot-rockchip
Tom Rini [Wed, 1 Nov 2017 13:32:14 +0000 (09:32 -0400)]
Merge git://git.denx.de/u-boot-rockchip

7 years agorockchip: lion-rk3368: defconfig: select PHY_MICREL_KSZ90X1
Philipp Tomsich [Mon, 30 Oct 2017 13:44:54 +0000 (14:44 +0100)]
rockchip: lion-rk3368: defconfig: select PHY_MICREL_KSZ90X1

The RK3368-uQ7 uses a KSZ9031 PHY on-module.  Enable PHY_MICREL_KSZ90X1
in the associated defconfig.

References: da3b9e7f ("Move PHY_MICREL and PHY_MICREL_KSZ90X1 to Kconfig")
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: puma-rk3399: defconfig: select PHY_MICREL_KSZ90X1
Philipp Tomsich [Mon, 30 Oct 2017 13:44:55 +0000 (14:44 +0100)]
rockchip: puma-rk3399: defconfig: select PHY_MICREL_KSZ90X1

The RK3368-uQ7 uses a KSZ9031 PHY on-module.  Enable PHY_MICREL_KSZ90X1
in the associated defconfig (this somehow got lost with da3b9e7f).

References: da3b9e7f ("Move PHY_MICREL and PHY_MICREL_KSZ90X1 to Kconfig")
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: evb-rk3328: remove CONFIG_ENV_OFFSET
Kever Yang [Thu, 26 Oct 2017 06:45:02 +0000 (14:45 +0800)]
rockchip: evb-rk3328: remove CONFIG_ENV_OFFSET

Remove CONFIG_ENV_OFFSET for there already have one in rockchip_common.h

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: rk3328: fix rockchip_get_cru api
Kever Yang [Wed, 25 Oct 2017 08:24:48 +0000 (16:24 +0800)]
rockchip: rk3328: fix rockchip_get_cru api

The API for get priv pointer is wrong, fix it.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: rk3399: init CPU clock when rkclk_init()
Kever Yang [Thu, 12 Oct 2017 07:27:29 +0000 (15:27 +0800)]
rockchip: rk3399: init CPU clock when rkclk_init()

Init the CPU and its buses to speed up the boot time.
Move rkclk_init() to a place after rk3399_configure_cpu has defined
at the same time, or else there will be a warning.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: configs: only add available BOOT_TARGET_DEVICES
Klaus Goger [Fri, 6 Oct 2017 17:24:08 +0000 (19:24 +0200)]
rockchip: configs: only add available BOOT_TARGET_DEVICES

BOOT_TARGET_DEVICES should only be added if the corresponding u-boot
command is enabled.

Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: configs: use rockchip-common.h for rk3368
Klaus Goger [Fri, 6 Oct 2017 17:24:09 +0000 (19:24 +0200)]
rockchip: configs: use rockchip-common.h for rk3368

rockchip-common.h already defines values that are missing from
rk3368_common.h

For example BOOT_TARGET_DEVICES was defined empty and therefore
distroboot had no boot targets.

Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-imx
Tom Rini [Tue, 31 Oct 2017 12:14:53 +0000 (08:14 -0400)]
Merge branch 'master' of git://www.denx.de/git/u-boot-imx

7 years agomx6slevk: Call gpio_request()
Fabio Estevam [Tue, 10 Oct 2017 16:43:42 +0000 (13:43 -0300)]
mx6slevk: Call gpio_request()

We should call gpio_request() prior to reading the GPIO value.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agoudoo: Remove cpu type check prior to setup_sata()
Fabio Estevam [Sun, 15 Oct 2017 13:21:07 +0000 (11:21 -0200)]
udoo: Remove cpu type check prior to setup_sata()

Inside setup_sata() there is a cpu type check, so there is no need to
do this check in the board file.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
7 years agowandboard: Remove cpu type check prior to setup_sata()
Fabio Estevam [Sun, 15 Oct 2017 13:21:06 +0000 (11:21 -0200)]
wandboard: Remove cpu type check prior to setup_sata()

Inside setup_sata() there is a cpu type check, so there is no need to
do this check in the board file.

This also brings the benefit to allowing setup_sata() to be called for the
mx6qp wandboard variant.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
7 years agoARM: imx6: Enable UMS and DFU on DHCOM i.MX6 PDK
Marek Vasut [Sun, 22 Oct 2017 08:22:40 +0000 (10:22 +0200)]
ARM: imx6: Enable UMS and DFU on DHCOM i.MX6 PDK

Enable UMS and DFU, so that the eMMC can be accessed via the
USB gadget port on the board.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
7 years agoimx: mx6slevk: cleanup board usb code
Peng Fan [Thu, 19 Oct 2017 03:13:20 +0000 (11:13 +0800)]
imx: mx6slevk: cleanup board usb code

Since DM_USB enabled, no need the usb code in board file.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agomx6slevk: Fix MMC breakage for the SPL target
Fabio Estevam [Fri, 13 Oct 2017 13:27:26 +0000 (10:27 -0300)]
mx6slevk: Fix MMC breakage for the SPL target

Commit 001cdbbb32ef1f6 ("imx: mx6slevk: enable more DM drivers") breaks
MMC support in U-Boot proper on the mx6slevk_spl_defconfig target:

U-Boot SPL 2017.09-00396-g6ca43a5 (Oct 01 2017 - 16:20:18)
Trying to boot from MMC1

U-Boot 2017.09-00396-g6ca43a5 (Oct 01 2017 - 16:20:18 -0300)

CPU:   Freescale i.MX6SL rev1.0 792 MHz (running at 396 MHz)
CPU:   Commercial temperature grade (0C to 95C) at 33C
Reset cause: POR
Board: MX6SLEVK
I2C:   ready
DRAM:  1 GiB
MMC:   FSL_SDHC: 0
MMC Device 1 not found
*** Warning - No MMC card found, using default environment

As mx6slevk_spl_defconfig does not use CONFIG_DM_MMC and its
board file does not register the mmc controller for U-Boot proper,
let's fix this by adding CONFIG_DM_MMC=y and device tree support.

While at it, add more DM drivers, so that it becomes closer to
mx6slevk_defconfig.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agowandboard: Add support for the MX6QP variant
Fabio Estevam [Sat, 14 Oct 2017 12:17:54 +0000 (09:17 -0300)]
wandboard: Add support for the MX6QP variant

Add support for the latest MX6QP wandboard variant.

Based on Richard Hu's work from Technexion's U-Boot tree.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agoconfigs: vf610: increase maximum size and enforce correct limit
Stefan Agner [Tue, 17 Oct 2017 11:59:19 +0000 (13:59 +0200)]
configs: vf610: increase maximum size and enforce correct limit

On Vybrid SoCs U-Boot gets loaded into GFX SRAM which is 512KiB.
Currently 32KiB is reserved for the IMX header. However, this is
not reflected in the size limit. In v2017.11-rc2 the actual size
limit (512KiB-32KiB) has been reached for Colibri VF61, which
lead to a successful build of U-Boot but not a working binary.

The IMX header is much smaller than 32KiB, typically around 1KiB.
Decrease the reserved size to 4KiB and specify the correct U-Boot
size limit. Apply this new base address and limit for all Vybrid
based boards.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
7 years agoPrepare v2017.11-rc3
Tom Rini [Tue, 31 Oct 2017 01:28:51 +0000 (21:28 -0400)]
Prepare v2017.11-rc3

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agonet: fec_mxc: Change "error frame" message to debug level
Fabio Estevam [Sun, 15 Oct 2017 13:01:48 +0000 (11:01 -0200)]
net: fec_mxc: Change "error frame" message to debug level

As reported by Jonathan Gray:

"After the recent changes to add SimpleNetworkProtocol to efi_loader
when booting off mmc via an efi payload that doesn't use
SimpleNetworkProtocol U-Boot's fec_mxc driver will now display
various "error frame" messages.
....
MMC Device 1 not found
MMC Device 2 not found
MMC Device 3 not found
Scanning disks on sata...
Found 6 disks
reading efi/boot/bootarm.efi
67372 bytes read in 32 ms (2 MiB/s)
## Starting EFI application at 12000000 ...
>> OpenBSD/armv7 BOOTARM 1.0
error frame: 0x8f57ec40 0x00003d74
error frame: 0x8f57ec40 0x00007079
error frame: 0x8f57ec40 0x00006964
error frame: 0x8f57ec40 0x00006f6f
error frame: 0x8f57ec40 0x0000726f
error frame: 0x8f57ec40 0x00002074
error frame: 0x8f57ec40 0x00006f6f"

Heinrich Schuchardt explains:

"A receive FIFO overrun can be expected if network packages are not
processed.
With the network patches we check if a package is available quite often."

Move the "error frame" messages to debug level so that a clean output
log can be seen.

Reported-by: Jonathan Gray <jsg@jsg.id.au>
Suggested-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agoimx: Fix regression with CONFIG_DM_MMC=y
Fabio Estevam [Fri, 20 Oct 2017 14:17:03 +0000 (12:17 -0200)]
imx: Fix regression with CONFIG_DM_MMC=y

When CONFIG_DM_MMC=y, CONFIG_BLK should be selected, otherwise the
SD/eMMC card cannot be used.

Also, select CONFIG_DM_USB=y when CONFIG_USB=y to avoid build failure.

Tested on mx6slevk, mx7dsabresd and mx6ullevk.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
Tested-by: Adam Ford <aford173@gmail.com>
Tested-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
Tested-by: Jagan Teki <jagan@openedev.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
7 years agoconfigs: Resync with savedefconfig
Tom Rini [Mon, 30 Oct 2017 16:58:33 +0000 (12:58 -0400)]
configs: Resync with savedefconfig

Rsync all defconfig files using moveconfig.py

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoscripts/get_maintainer.pl: enable find_maintainer_files
Heinrich Schuchardt [Sat, 28 Oct 2017 05:34:15 +0000 (07:34 +0200)]
scripts/get_maintainer.pl: enable find_maintainer_files

Many MAINTAINERS files are in subdirectories.
We should enable searching these.

Reported-by: Walt Feasel <waltfeasel@gmail.com>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
7 years agocheckpatch: Support wide strings
Heinrich Schuchardt [Sun, 29 Oct 2017 07:28:52 +0000 (08:28 +0100)]
checkpatch: Support wide strings

Allow prefixing typical strings with L for wide strings

Patch originally by Joe Perches
https://lkml.org/lkml/2017/10/17/1117

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
7 years agoMerge git://git.denx.de/u-boot-video
Tom Rini [Sun, 29 Oct 2017 14:11:08 +0000 (10:11 -0400)]
Merge git://git.denx.de/u-boot-video

7 years agoexynos: video: fix typo in DisplayPort driver
Dongjin Kim [Sat, 28 Oct 2017 03:08:51 +0000 (23:08 -0400)]
exynos: video: fix typo in DisplayPort driver

Signed-off-by: Dongjin Kim <tobetter@gmail.com>
CC: Simon Glass <sjg@chromium.org>
CC: Minkyu Kang <mk7.kang@samsung.com>
7 years agovideo/da8xx-fb: Cache-align memory allocations
Niko Mauno [Fri, 27 Oct 2017 11:52:08 +0000 (14:52 +0300)]
video/da8xx-fb: Cache-align memory allocations

Resort to malloc_cache_aligned() rather than malloc() which also removes
'CACHE: Misaligned operation at range' warnings.

Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
7 years agoefi_loader: Disable env_save() call on boot
Alexander Graf [Thu, 19 Oct 2017 21:23:50 +0000 (23:23 +0200)]
efi_loader: Disable env_save() call on boot

With the introduction of EFI variable support, we also wanted to persist
these EFI variables. However, the way it was implemented we ended up
persisting all U-Boot environment variables on every EFI boot.

That could potentially lead to unexpected side effects because variables
that were not supposed to be written to persisted env get written. It also
means we may end up writing the environment more often than we should.

For this release, let's just disable EFI variable persistence and instead
implement it properly for the next one.

Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Fixes: ad644e7c182 ("efi_loader: efi variable support")
Signed-off-by: Alexander Graf <agraf@suse.de>
Acked-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
7 years agoMerge git://git.denx.de/u-boot-fsl-qoriq
Tom Rini [Sat, 28 Oct 2017 01:59:10 +0000 (21:59 -0400)]
Merge git://git.denx.de/u-boot-fsl-qoriq

7 years agoarmv8: sec_firmware: Add support for loadables in FIT
Sumit Garg [Fri, 1 Sep 2017 08:25:01 +0000 (13:55 +0530)]
armv8: sec_firmware: Add support for loadables in FIT

Enable support for loadables in SEC firmware FIT image. Currently
support is added for single loadable image.

Brief description of implementation:
  Add two more address pointers (loadable_h, loadable_l) as arguments to
  sec_firmware_init() api.
  Create new api: sec_firmware_checks_copy_loadable() to check if loadables
  node is present in SEC firmware FIT image. If present, verify loadable
  image and copies it to secure DDR memory.
  Populate address pointers with secure DDR memory addresses where loadable
  is copied.

Example use-case could be trusted OS (tee.bin) as loadables node in SEC
firmware FIT image.

Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarmv8: layerscape: Allocate 66 MB DDR for secure memory
Sumit Garg [Fri, 1 Sep 2017 08:25:00 +0000 (13:55 +0530)]
armv8: layerscape: Allocate 66 MB DDR for secure memory

Change DDR allocated for secure memory from 2 MB to 66 MB. This
additional 64 MB secure memory is required for trusted OS running
in Trusted Execution Environment using ARMv8 TrustZone.

Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarmv8: ls1088aqds: Enable USB command on QDS for qspi-boot
Ran Wang [Mon, 23 Oct 2017 02:09:25 +0000 (10:09 +0800)]
armv8: ls1088aqds: Enable USB command on QDS for qspi-boot

Signed-off-by: Amrita Kumari <amrita.kumari@nxp.com>
Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarmv8: ls1088ardb: Enable USB command RDB qspi-boot
Ran Wang [Mon, 23 Oct 2017 02:09:24 +0000 (10:09 +0800)]
armv8: ls1088ardb: Enable USB command RDB qspi-boot

Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Signed-off-by: Amrita Kumari <amrita.kumari@nxp.com>
Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarm: layerscape: Remove CONFIG_USB_MAX_CONTROLLER_COUNT
Ran Wang [Mon, 23 Oct 2017 02:09:23 +0000 (10:09 +0800)]
arm: layerscape: Remove CONFIG_USB_MAX_CONTROLLER_COUNT

Because COMFIG_DM_USB has been enabled and will not use it anymore.

Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agousb: host: Move CONFIG_XHCI_FSL to Kconfig
Ran Wang [Mon, 23 Oct 2017 02:09:22 +0000 (10:09 +0800)]
usb: host: Move CONFIG_XHCI_FSL to Kconfig

use Kconfig to select xhci accordingly.

Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarm64: layerscape: Move CONFIG_HAS_FSL_XHCI_USB to Kconfig
Ran Wang [Mon, 23 Oct 2017 02:09:21 +0000 (10:09 +0800)]
arm64: layerscape: Move CONFIG_HAS_FSL_XHCI_USB to Kconfig

Use Kconfig to select QE-HDLC and USB pin-mux.

Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarmv8: ls1088aqds: Change phy mode to PHY_INTERFACE_MODE_RGMII_ID
Ashish Kumar [Thu, 12 Oct 2017 09:51:54 +0000 (15:21 +0530)]
armv8: ls1088aqds: Change phy mode to PHY_INTERFACE_MODE_RGMII_ID

Since TX delay is now enabled only in PHY_INTERFACE_MODE_RGMII_ID
PHY_INTERFACE_MODE_RGMII_TXID.

These change where introduced in phy driver in commit 05b29aa0cb68
("net: phy: realtek: fix enabling of the TX-delay for RTL8211F").

Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarmv8: configs: ls1012a: correct the generic timer frequency
Yuantian Tang [Thu, 12 Oct 2017 06:29:26 +0000 (14:29 +0800)]
armv8: configs: ls1012a: correct the generic timer frequency

On ls1012a soc, core clock source frequency is fixed at 100Mhz.
Generic timer frequency is core clock source divided by 4, which
is 25Mhz.

Signed-off-by: Tang Yuantian <andy.tang@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarmv8: ls1088: Move CONFIG_ENV_IS_IN_SPI_FLASH to defconfig
Ashish Kumar [Wed, 11 Oct 2017 13:07:42 +0000 (18:37 +0530)]
armv8: ls1088: Move CONFIG_ENV_IS_IN_SPI_FLASH to defconfig

Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agodriver: fsl-mc: use calloc instead malloc
Prabhakar Kushwaha [Wed, 11 Oct 2017 03:21:18 +0000 (08:51 +0530)]
driver: fsl-mc: use calloc instead malloc

Memory allocated via malloc is not guaranteed to be zeroized.
So explicitly use calloc instead of malloc.

Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoAT91: remove CONFIG_PMECC_INDEX_TABLE_OFFSET
Masahiro Yamada [Thu, 26 Oct 2017 12:24:31 +0000 (21:24 +0900)]
AT91: remove CONFIG_PMECC_INDEX_TABLE_OFFSET

This macro is defined, but not referenced by anyone.

I did not touch config_whitelist.txt - the CONFIG will be dropped
by the next re-sync.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoexynos: remove CONFIG_LCD_MENU_BOARD
Masahiro Yamada [Thu, 26 Oct 2017 12:24:30 +0000 (21:24 +0900)]
exynos: remove CONFIG_LCD_MENU_BOARD

This macro is defined, but not referenced by anyone.

I did not touch config_whitelist.txt - the CONFIG will be dropped
by the next re-sync.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>
7 years agonet: remove CONFIG_NET_MULTI
Masahiro Yamada [Thu, 26 Oct 2017 12:24:29 +0000 (21:24 +0900)]
net: remove CONFIG_NET_MULTI

This macro is defined, but not referenced by anyone.

I did not touch config_whitelist.txt - the CONFIG will be dropped
by the next re-sync.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agompc85xx: xpedite550x: remove CONFIG_FDT_FIXUP_PCI_IRQ
Masahiro Yamada [Thu, 26 Oct 2017 12:24:28 +0000 (21:24 +0900)]
mpc85xx: xpedite550x: remove CONFIG_FDT_FIXUP_PCI_IRQ

This macro is defined, but not referenced by anyone.

I did not touch config_whitelist.txt - the CONFIG will be dropped
by the next re-sync.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoAM33XX: etamin: remove CONFIG_DFU_MTD
Masahiro Yamada [Thu, 26 Oct 2017 12:24:27 +0000 (21:24 +0900)]
AM33XX: etamin: remove CONFIG_DFU_MTD

This macro is defined, but not referenced by anyone.

I did not touch config_whitelist.txt - the CONFIG will be dropped
by the next re-sync.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoMX28: remove CONFIG_DEFAULT_SPI_CS
Masahiro Yamada [Thu, 26 Oct 2017 12:24:26 +0000 (21:24 +0900)]
MX28: remove CONFIG_DEFAULT_SPI_CS

This macro is defined, but not referenced by anyone.

I did not touch config_whitelist.txt - the CONFIG will be dropped
by the next re-sync.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoexynos: remove CONFIG_CORE_COUNT
Masahiro Yamada [Thu, 26 Oct 2017 12:24:25 +0000 (21:24 +0900)]
exynos: remove CONFIG_CORE_COUNT

This macro is defined, but not referenced by anyone.

I did not touch config_whitelist.txt - the CONFIG will be dropped
by the next re-sync.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>
7 years agoomap4: sdp4430: match the #endif comment to #ifdef
Masahiro Yamada [Thu, 26 Oct 2017 12:24:24 +0000 (21:24 +0900)]
omap4: sdp4430: match the #endif comment to #ifdef

This comment creates a wrong entry in config_whitelist.txt.

I did not touch config_whitelist.txt - the CONFIG will be dropped
by the next re-sync.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoSOCFPGA: remove CONFIG_AUTONEG_TIMEOUT
Masahiro Yamada [Thu, 26 Oct 2017 12:24:23 +0000 (21:24 +0900)]
SOCFPGA: remove CONFIG_AUTONEG_TIMEOUT

This macro is defined, but not referenced by anyone.

I did not touch config_whitelist.txt - the CONFIG will be dropped
by the next re-sync.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARC: remove CONFIG_ARC_UART_BASE
Masahiro Yamada [Thu, 26 Oct 2017 12:24:22 +0000 (21:24 +0900)]
ARC: remove CONFIG_ARC_UART_BASE

This macro is defined, but not referenced by anyone.

I did not touch config_whitelist.txt - the CONFIG will be dropped
by the next re-sync.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agosh7734: remove CONFIG_553MHZ_MODE
Masahiro Yamada [Thu, 26 Oct 2017 12:24:21 +0000 (21:24 +0900)]
sh7734: remove CONFIG_553MHZ_MODE

This macro only appears in commented-out lines.  It is not referenced
by anyone.

I did not touch config_whitelist.txt - the CONFIG will be dropped
by the next re-sync.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agompc85xx: freescale: remove CONFIG_ADDR_STREAMING
Masahiro Yamada [Thu, 26 Oct 2017 12:24:20 +0000 (21:24 +0900)]
mpc85xx: freescale: remove CONFIG_ADDR_STREAMING

This macro is defined, but not referenced by anyone.

I did not touch config_whitelist.txt - the CONFIG will be dropped
by the next re-sync.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoomap4: sdp4430: remove CONFIG_4430SDP
Masahiro Yamada [Thu, 26 Oct 2017 12:24:19 +0000 (21:24 +0900)]
omap4: sdp4430: remove CONFIG_4430SDP

This macro is defined, but not referenced by anyone.

I did not touch config_whitelist.txt - the CONFIG will be dropped
by the next re-sync.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoIMX: novena: remove CONFIG_I2C_MXC
Masahiro Yamada [Thu, 26 Oct 2017 12:24:18 +0000 (21:24 +0900)]
IMX: novena: remove CONFIG_I2C_MXC

This macro is defined, but not referenced by anyone.

I did not touch config_whitelist.txt - the CONFIG will be dropped
by the next re-sync.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Heiko Schocher<hs@denx.de>
7 years agoi2c: fti2c010: remove unused/unmaintained driver
Masahiro Yamada [Thu, 26 Oct 2017 12:24:17 +0000 (21:24 +0900)]
i2c: fti2c010: remove unused/unmaintained driver

CONFIG_SYS_I2C_FTI2C010 is not enabled by anyone.

Commit 2852709676c8 ("dm: i2c: Add a note to I2C drivers which need
conversion") prompted to convert this driver to DM before June 2017,
but not converted yet.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Heiko Schocher <hs@denx.de>
7 years agoi2c: adi_i2c: remove left-over Blackfin I2C driver
Masahiro Yamada [Thu, 26 Oct 2017 12:24:16 +0000 (21:24 +0900)]
i2c: adi_i2c: remove left-over Blackfin I2C driver

This driver was used by Blackfin boards, but Blackfin support is
gone.  There is no user of this driver.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Heiko Schocher <hs@denx.de>
7 years agoMerge git://git.denx.de/u-boot-x86
Tom Rini [Fri, 27 Oct 2017 12:50:16 +0000 (08:50 -0400)]
Merge git://git.denx.de/u-boot-x86

7 years agosunxi: video: add LCD support to DE2 driver
Vasily Khoruzhick [Fri, 27 Oct 2017 04:51:52 +0000 (21:51 -0700)]
sunxi: video: add LCD support to DE2 driver

Extend DE2 driver with LCD support. Tested on Pinebook which is based
on A64 and has ANX6345 eDP bridge with eDP panel connected to it.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
[agust: rebased v5 on u-boot-video/master]
Signed-off-by: Anatolij Gustschin <agust@denx.de>
7 years agosunxi: video: split out PLL configuration code
Vasily Khoruzhick [Fri, 27 Oct 2017 04:51:51 +0000 (21:51 -0700)]
sunxi: video: split out PLL configuration code

It will be reused in new DM LCD driver.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
7 years agox86: acpi: Put sleepstates.asl to the common place
Bin Meng [Thu, 19 Oct 2017 01:21:00 +0000 (18:21 -0700)]
x86: acpi: Put sleepstates.asl to the common place

The supported sleep states are generic on Intel processors. Move the
ASL definition to the common place.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agox86: fsp: graphics: Add some notes about the graphics info hob
Bin Meng [Thu, 19 Oct 2017 01:20:59 +0000 (18:20 -0700)]
x86: fsp: graphics: Add some notes about the graphics info hob

On some platforms (eg: Braswell), the FSP will not produce the
graphics info HOB unless you plug some cables to the display
interface (eg: HDMI) on the board. Add such notes in the FSP
video driver.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agox86: braswell: cherryhill: Update dts for SPI lock down
Bin Meng [Thu, 19 Oct 2017 01:20:58 +0000 (18:20 -0700)]
x86: braswell: cherryhill: Update dts for SPI lock down

Intel Braswell FSP requires SPI controller settings to be locked down,
let's do this in the chrryhill.dts and remove previous Kconfig option.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agospi: ich: Lock down controller settings if required
Bin Meng [Thu, 19 Oct 2017 01:20:57 +0000 (18:20 -0700)]
spi: ich: Lock down controller settings if required

Some Intel FSP (like Braswell) does SPI lock-down during the call
to fsp_notify(INIT_PHASE_BOOT). But before SPI lock-down is done,
it's bootloader's responsibility to configure the SPI controller's
opcode registers properly otherwise SPI controller driver doesn't
know how to communicate with the SPI flash device.

Rather than passively doing the opcode configuration, let's add a
simple DTS property "intel,spi-lock-down" and let the driver call
the opcode configuration function if required by such FSP.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoRevert "x86: fsp: Configure SPI opcode registers before SPI is locked down"
Bin Meng [Thu, 19 Oct 2017 01:20:56 +0000 (18:20 -0700)]
Revert "x86: fsp: Configure SPI opcode registers before SPI is locked down"

This reverts commit 1e6ebee667da47fd3a87839a239a7574c66f5659.

It's not appropriate to call the Intel SPI driver specific stuff in
the FSP codes. We may add a simple DTS property "intel,spi-lock-down"
and let the Intel SPI driver call these stuff instead.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
7 years agox86: Fix ACPI resume dependency to MRC cache
Bin Meng [Thu, 19 Oct 2017 01:20:55 +0000 (18:20 -0700)]
x86: Fix ACPI resume dependency to MRC cache

In an S3 resume path, MRC cache is mandatory. Enforce the dependency
in the Kconfig.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoenv: x86: braswell: Set ENV_IS_IN_SPI_FLASH as default
Bin Meng [Thu, 19 Oct 2017 01:20:54 +0000 (18:20 -0700)]
env: x86: braswell: Set ENV_IS_IN_SPI_FLASH as default

Imply does not work for a Kconfig choice. Update ENV_IS_IN_SPI_FLASH
to be the default one for Intel Braswell.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agox86: braswell: Fix unexpected crash during Linux kernel boot
Bin Meng [Thu, 19 Oct 2017 01:20:53 +0000 (18:20 -0700)]
x86: braswell: Fix unexpected crash during Linux kernel boot

It was observed that when booting Linux kernel on Intel Cherry Hill
board, unexpected crash happens quite randomly. Sometimes kernel
just oops, while sometimes kernel throws MCE errors and hangs:

  mce: [Hardware Error]: Machine check events logged
  mce: [Hardware Error]: CPU 0: Machine Check: 0 Bank 4: c400000000010151
  mce: [Hardware Error]: TSC 0 ADDR 130f3f2c0
  mce: [Hardware Error]: PROCESSOR 0:406c3 TIME 1508160686 SOCKET 0 APIC 0 microcode 363

This looks like a hardware error per mcelog. After debugging, it
seems turning off turbo mode on the processor does not expose this
behavior, although U-Boot runs OK with turbo mode on. Suspect it is
related to an errata of Braswell processor.

To fix this, remove the Braswell cpu driver which does the turbo
mode configuration, and switch to use the generic cpu-x86 driver.
Also there is a configuration option in the FSP that turns on the
turbo mode and that has been turned off too.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agox86: galileo: Fix boot failure
Bin Meng [Thu, 19 Oct 2017 01:20:52 +0000 (18:20 -0700)]
x86: galileo: Fix boot failure

With latest codes on mainstream master, Intel Galileo board does not
boot unfortunately. Git biset leads to b383d6c0 "bootstage: Convert
to use malloc()".

Disable bootstage support to make it boot again. The root cause needs
to be investigated however.

Fixes: b383d6c0 ("bootstage: Convert to use malloc()")
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
7 years agoMerge branch 'master' of git://git.denx.de/u-boot-sunxi
Tom Rini [Thu, 26 Oct 2017 15:50:33 +0000 (11:50 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-sunxi

7 years agovideo: add anx6345 DM driver
Vasily Khoruzhick [Thu, 21 Sep 2017 06:29:09 +0000 (23:29 -0700)]
video: add anx6345 DM driver

This is a eDP bridge similar to ANX9804, it allows to connect eDP panels
to the chips that can output only parallel signal

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
[agust: fixed most checkpatch errors/warnings]
Signed-off-by: Anatolij Gustschin <agust@denx.de>
7 years agovideo: anx9804: split out registers definitions into a separate header
Vasily Khoruzhick [Thu, 21 Sep 2017 06:29:08 +0000 (23:29 -0700)]
video: anx9804: split out registers definitions into a separate header

This header will be used in anx6345 driver

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
[agust: moved header to drivers/video]
Signed-off-by: Anatolij Gustschin <agust@denx.de>
7 years agodm: video: bridge: add operation to read EDID
Vasily Khoruzhick [Thu, 21 Sep 2017 06:29:07 +0000 (23:29 -0700)]
dm: video: bridge: add operation to read EDID

Add an operation to read EDID, since bridge may have ability to read
EDID from the panel that is connected to it, for example LCD<->eDP bridge.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
7 years agosunxi: setup simplefb for Allwinner DE2
Icenowy Zheng [Thu, 26 Oct 2017 03:14:47 +0000 (11:14 +0800)]
sunxi: setup simplefb for Allwinner DE2

As the support of EFI boot on Allwinner H3 is broken, we still need to
use simplefb to pass the framebuffer to Linux.

Add code to setup simplefb for Allwinner DE2 driver.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
7 years agovideo: add an option for video simplefb via DT
Icenowy Zheng [Thu, 26 Oct 2017 03:14:46 +0000 (11:14 +0800)]
video: add an option for video simplefb via DT

Add an option to indicate that the video driver should setup a SimpleFB
node that passes the video framebuffer initialized by U-Boot to the
operating system kernel.

Currently only the Allwinner DE driver uses this option, and the
definition of this option in the sunxi-common.h config header is
converted to an imply of this option from CONFIG_VIDEO_SUNXI.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
7 years agovideo: sunxi: extract simplefb match code to a new file
Icenowy Zheng [Thu, 26 Oct 2017 03:14:45 +0000 (11:14 +0800)]
video: sunxi: extract simplefb match code to a new file

As the DE2 simplefb setup code can also benefit from the simplefb match
code, extract it to a new source file.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
7 years agosunxi: change the DE1 video option to CONFIG_VIDEO_SUNXI
Icenowy Zheng [Thu, 26 Oct 2017 03:14:44 +0000 (11:14 +0800)]
sunxi: change the DE1 video option to CONFIG_VIDEO_SUNXI

The sunxi DE1 video option used to be CONFIG_VIDEO, which has the same
name as the "Enable legacy video support" option in
drivers/video/Kconfig.

Change the option name to CONFIG_VIDEO_SUNXI, which is really used by
Makefile under drivers/video/sunxi/, and defined in sunxi-common.h
when CONFIG_VIDEO is selected before this change. Now CONFIG_VIDEO_SUNXI
selects CONFIG_VIDEO and the usages of CONFIG_VIDEO in sunxi Kconfig and
config headers are all converted to use CONFIG_VIDEO_SUNXI.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
7 years agosunxi: binman: Add U-Boot binary size check
Maxime Ripard [Thu, 19 Oct 2017 09:36:35 +0000 (11:36 +0200)]
sunxi: binman: Add U-Boot binary size check

The U-Boot binary may trip over its actual allocated size in the storage.
In such a case, the environment will not be readable anymore (because
corrupted when the new image was flashed), and any attempt at using saveenv
to reconstruct the environment will result in a corrupted U-Boot binary.

Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
7 years agosunxi: Enable THUMB build for the U-Boot binary
Maxime Ripard [Thu, 19 Oct 2017 09:49:29 +0000 (11:49 +0200)]
sunxi: Enable THUMB build for the U-Boot binary

We start to get to the limit of our main U-Boot binary size (with some
boards even crossing it). Enable its build using thumb2 to get some extra
room.

Suggested-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Tested-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
7 years agosunxi: Add support for the Banana Pi M2-Magic
Maxime Ripard [Thu, 20 Apr 2017 11:16:18 +0000 (13:16 +0200)]
sunxi: Add support for the Banana Pi M2-Magic

The Banana Pi M2-Magic is a small board with an Allwinner A33, an eMMC, a
wifi chip and some pin headers. Enable support for it.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
7 years agocmd: fastboot: Enable FASTBOOT_FLASH_NAND for SUNXI_NAND devices
Benjamin Young [Fri, 13 Oct 2017 21:29:20 +0000 (14:29 -0700)]
cmd: fastboot: Enable FASTBOOT_FLASH_NAND for SUNXI_NAND devices

Encountered an issue where fastboot can't write to NAND on a CHIP_pro,
the symbol was neither present in the board's config header, nor the
Kconfig, this patch puts it in the Kconfig and defaults on when
SUNXI_NAND is selected.

Signed-off-by: Ben Young <computermouth@crunchbangplusplus.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
7 years agosunxi: clk: fix N formula for CPUX clocks
Quentin Schulz [Tue, 26 Sep 2017 14:02:47 +0000 (16:02 +0200)]
sunxi: clk: fix N formula for CPUX clocks

As explained in arch/arm/mach-sunxi/clock_sun8i_a83t.c, clk for CPU
clusters is computed as clk = 24*n. However, the current formula is clk
= 24*(n-1).

This results in a clock set to a frequency that isn't specified as
possible for CPUs.

Let's use the correct formula.

Fixes: f542948b1e8c ("sunxi: clk: add basic clocks for A83T")
Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
7 years agoSPL: SPI: select SPL_SPI_FLASH_SUPPORT on SPL_SPI_SUNXI
Andre Przywara [Wed, 4 Oct 2017 23:27:21 +0000 (00:27 +0100)]
SPL: SPI: select SPL_SPI_FLASH_SUPPORT on SPL_SPI_SUNXI

The Allwinner SPI flash SPL boot support is guarded by the SPL_SPI_SUNXI
symbol. But despite its generic name, the actual only use case for this
is to provide SPI flash support to the SPL, which requires
CONFIG_SPL_SPI_FLASH_SUPPORT to be defined.
Select this symbol from the SPL_SPI_SUNXI Kconfig definition. This
avoids doing this explicitly in the defconfig, and fixes SPI booting on
the Pine64 SoPine (and -LTS version) and the OrangePi Win board (both with
SPI flash).

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
7 years agoKconfig: add CONFIG_BROKEN
Heinrich Schuchardt [Thu, 19 Oct 2017 21:49:19 +0000 (23:49 +0200)]
Kconfig: add CONFIG_BROKEN

Provide a Kconfig option that we can use as dependency for
features that are broken. This allows to easily disable them
without removing the code.

As no short text is supplied the option will not appear in
menuconfig.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>