Commit Graph

49842 Commits

Author SHA1 Message Date
Michal Simek
df99e54c44 arm: zynq: Remove ZC770_ config option
This option is obsolete and it is no longer valid.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-31 13:15:43 +01:00
Michal Simek
8eb8398406 test: mmc: Do not run mmc/sd test if sd/mmc is not present
Skip tests if card is not present.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-31 13:15:43 +01:00
Michal Simek
9af1d0b9ea arm: zynq: Disable networking for zc770 xm011
Ethernet cable is not connected for xm011 that's why disable all
ethernet related configurations.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-31 13:15:43 +01:00
Vipul Kumar
aa0071c065 mtd: spi-nor: Added support for SPANSION 1Gb 1.8v flash part
JEDEC ID for s70fs01gs flash part is added.

Signed-off-by: Vipul Kumar <vipulk@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-31 13:15:43 +01:00
Vipul Kumar
5fae920250 mtd: spi-nor: Added flags for ISSI 256Mb 1.8v and 3.3v part
Added RD_QUAD flag and enabled quad_enable() func for is25lp256d and
is25wp256d flash parts.

Signed-off-by: Vipul Kumar <vipulk@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-31 13:15:42 +01:00
Michal Simek
3364069788 Revert "spl: spl_spi: Fix warnings"
This reverts commit 76e59ba9fc.
This issue is not there anymore.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-31 13:15:42 +01:00
Michal Simek
73429a2dbd arm64: zynqmp: Add support for zcu111 revA
zcu111 contains zu28drf chip. It is very similar to zcu106 with these
changes:
- uart1 is routed to PL instead of PS
- can is not wired
- additional 4GB memory connected to PL
- different i2c bus topology - addresses need to be validated

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-31 13:15:42 +01:00
Michal Simek
97688c70ad arm64: zynqmp: Add support for zcu104 revC
There is a change on i2c bus where u97 i2c gpio expander is directly
connected to i2c1 instead of via MUX.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-31 13:15:42 +01:00
Michal Simek
146be10950 arm64: zynqmp: Remove zynq_slcr_gem_clk_setup()
This function is not used anywhere.
Reference was removed by:
"zynq: Move zynq to clock framework"
(sha1: 781745bd87)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-31 13:15:42 +01:00
Michal Simek
08221eaf1e arm64: zynqmp: Setup bootcommand via defconfig
It will simplify our config files.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-31 13:15:42 +01:00
Michal Simek
d71b3ecb24 arm64: zynqmp: Enable SPL spi support for zcu102 revB/rev1.0
The same functionality was tested on zcu102 and this patch is keeping
configs align.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-31 13:15:42 +01:00
Siva Durga Prasad Paladugu
a49d355204 microblaze: Dont enable UBI support by default for microblaze
This patch removes UBI support from defconfig and it can
be enabled from menuconfig as per need

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-31 13:15:41 +01:00
Siva Durga Prasad Paladugu
18340a662a spi: zynq_qspi: Correct baud rate divisor calculation
This patch corrects the baud rate divisor calculation by
checking with max baud rate value and assigning default
baud rate value if it exceeds max value.
This fixes the issue of qspi flash detection as writing
the overflown value results in setting unintended bits
in the register.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-31 13:15:41 +01:00
Michal Simek
f5b37f303f Merge tag 'v2018.01' into master
Prepare v2018.01

- Move options to defconfig
- Fix sd3.0 support (by DP)
- Fix spi-nor support (by DP/Vipul)
- Add SPI_GENERIC Kconfig option (by DP/Vipul)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-31 13:14:09 +01:00
Tom Rini
f3dd87e0b9 Prepare v2018.01
Signed-off-by: Tom Rini <trini@konsulko.com>
v2018.01
2018-01-08 20:25:29 -05:00
Tom Rini
2f4c9de3d0 Merge git://git.denx.de/u-boot-imx 2018-01-08 12:51:47 -05:00
Jagan Teki
ca9d211e2c mtd: nand: mxs_nand_spl: Remove nand size print
It is not much needed to print nand size in SPL during nand boot,
and most of nand spl drivers doesn't print the same.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
2018-01-08 17:37:12 +01:00
Jagan Teki
ff8822998f board: engicam: Fix to remove legacy board/icorem6_rqs
board/icorem6_rqs/ is forgot to remove while moving
common board files together in
(sha1: 52aaddd6f4)
"i..MX6: engicam: Add imx6q/imx6ul boards for existing boards"

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
2018-01-08 17:36:54 +01:00
Stefan Agner
46718353b2 imx: initialize and use generic timer on i.MX 6UL/ULL
The i.MX 6UL/ULL feature a Cortex-A7 CPU which suppor the ARM
generic timer. This change makes use of the ARM generic timer in
U-Boot.

This is crucial to make the ARM generic timers usable in Linux since
timer_init() initalizes the system counter module, which is necessary
to use the generic timers CP15 registers.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
2018-01-08 17:33:06 +01:00
Stefan Agner
23b6a131fd imx: introduce CONFIG_GPT_TIMER
Introduce a new config symbol to select the i.MX
General Purpose Timer (GPT).

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
2018-01-08 17:33:06 +01:00
Stefan Agner
616aa55d17 imx: move CONFIG_SYSCOUNTER_TIMER to Kconfig
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
2018-01-08 17:33:06 +01:00
Tom Rini
5e2338079d Merge git://git.denx.de/u-boot-x86 2018-01-08 08:26:46 -05:00
Clemens Gruber
598e9dccc7 crypto/fsl: fix BLOB encapsulation and decapsulation
The blob_encap and blob_decap functions were not flushing the dcache
before passing data to CAAM/DMA and not invalidating the dcache when
getting data back.
Therefore, blob encapsulation and decapsulation failed with errors like
the following due to data cache incoherency:
"40000006: DECO: desc idx 0: Invalid KEY command"

To ensure coherency, we require the key_mod, src and dst buffers to be
aligned to the cache line size and flush/invalidate the memory regions.
The same requirements apply to the job descriptor.

Tested on an i.MX6Q board.

Reviewed-by: Sumit Garg <sumit.garg@nxp.com>
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
2018-01-08 08:26:03 -05:00
Andy Shevchenko
5d8c4ebd95 x86: tangier: Add Bluetooth to ACPI table
As defined on reference board followed by Intel Edison a Bluetooth
device is attached to HSU0, i.e. PCI 0000:04.1.

Describe it in ACPI accordingly.

Note, we use BCM2E95 ID here as one most suitable for such device based
on the description in commit message of commit 89ab37b489d1
	("Bluetooth: hci_bcm: Add support for BCM2E95 and BCM2E96")
in the Linux kernel source tree.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
2018-01-08 16:52:25 +08:00
Andy Shevchenko
d08953e045 x86: tangier: Use actual GPIO hardware numbers
The recent commit 03c4749dd6c7
  ("gpio / ACPI: Drop unnecessary ACPI GPIO to Linux GPIO translation")
in the Linux kernel reveals the issue we have in ACPI tables here,
i.e. we must use hardware numbers for GPIO resources and,
taking into consideration that GPIO and pin control are *different* IPs
on Intel Tangier, we need to supply numbers properly.

Besides that, it improves user experience since the official documentation
for Intel Edison board is referring to GPIO hardware numbering scheme.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
2018-01-08 16:52:25 +08:00
Tom Rini
8e18f34c28 x86: Move commands from under arch/x86 to cmd/x86/
We only need to compile and link these files when building for full
U-Boot.  Move them to under cmd/x86/ to make sure they aren't linked in
and undiscarded due to u_boot_list_2_cmd_* being included).

Cc: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2018-01-08 16:52:22 +08:00
Fabio Estevam
290e7cfdbf mx6ull: Handle the CONFIG_MX6ULL cases correctly
Since commit 051ba9e082 ("Kconfig: mx6ull: Deselect MX6UL from
CONFIG_MX6ULL") CONFIG_MX6ULL does not select CONFIG_MX6UL anymore, so
take this into consideration in all the checks for CONFIG_MX6UL.

This fixes a boot regression.

Reported-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Stefan Agner <stefan@agner.ch>
Tested-by: Breno Lima <breno.lima@nxp.com>
Tested-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
Tested-by: Jörg Krause <joerg.krause@embedded.rocks>
2018-01-04 16:29:04 +01:00
Michal Simek
e27888ba4f arm64: zynqmp: Remove interrupts property from mini DTS
This patch removes this warning:
arch/arm/dts/zynqmp-mini-emmc.dtb: Warning (interrupts_property):
Missing interrupt-parent for /amba/sdhci@ff160000
arch/arm/dts/zynqmp-mini-emmc.dtb: Warning (interrupts_property):
Missing interrupt-parent for /amba/sdhci@ff170000

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 16:19:13 +01:00
Michal Simek
e425903d17 spi: zynqmp: Do not print information about clock value
This information is useful only for debugging.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 16:19:13 +01:00
Michal Simek
ed69de1d3d py: test: Set device before running probe
Several zynq/zynqmp boards are reading mac address from eeprom that's
why device is already selected. For zc1751-dc1 this is not used that's
why i2c dev needs to be called.
In general setting the first controller is good thing to do.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 16:19:13 +01:00
Michal Simek
d755bd0048 py: test: Fix number of controller calculation
Array looks like this.
['sdhci@ff160000:', '0', '(SD)', 'sdhci@ff170000:', '1', '(SD)']
It means it is necessary to divide by 3 to get number of controllers.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 16:19:13 +01:00
Anders Hedlund
6d771350a2 armv8: zynqmp: Map PCIe High as device memory
Set the 8GB PCIe High area as device memory.
Also extend the DDR High area to cover the full 32GB range.

Signed-off-by: Anders Hedlund <anders.j.hedlund@gmail.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 16:19:13 +01:00
Michal Simek
d74863b89e arm: zynq: Add identification string to Xilinx boards
It is good to see this string to make sure that u-boot which runs on the
board is the same which should run there.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 16:19:13 +01:00
Michal Simek
0824689861 arm64: zynqmp: Remove compilation warning coming from psu_init_gpl.c
dpll_prog is not called that's why it is reported as unused function.
Label it not to caused warning.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 16:19:13 +01:00
Michal Simek
ed8704a622 arm64: zynqmp: Remove unused variable
Warning message:
board/xilinx/zynqmp/zynqmp-zcu100-revC/psu_init_gpl.c: In function
‘psu_ddr_phybringup_data’:
board/xilinx/zynqmp/zynqmp-zcu100-revC/psu_init_gpl.c:20497:15: warning:
unused variable ‘tmp_regval’ [-Wunused-variable]
  unsigned int tmp_regval = 0;
               ^~~~~~~~~~

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 16:19:13 +01:00
Siva Durga Prasad Paladugu
0ecd869fd6 zynqmp: Access timestamp_ref_ctrl register only if running in el3
Access the timestamp ref ctrl register only if runinng
at el3 level otherwise just return. This change fixes
the issue when CRL APB is marked as secure and accessing
when not in el3 causes exception.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 16:19:12 +01:00
Michal Simek
ef1056c1ba arm64: zynqmp: Sort dtbs by name in Makefile
Keep things sorted.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 16:19:12 +01:00
Michal Simek
d9cd75bb6c Revert "test: py: Disable sleep test for qemu targets"
This reverts commit e27574f9ae.
Based on discussion in mainline boardevn variables should be used for
skipping incorrect tests.

And also reverts commit "py: i2c: Do not run i2c eeprom test on qemu"
(sha1: 9fe2f228b9)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 16:19:12 +01:00
Michal Simek
fa503bc8ec test: py: Add option to skip i2c device tests
Missing/Incorrect QEMU models or broken boards/devices can enable this
new option to skip i2c device tests.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 16:19:12 +01:00
Michal Simek
3f888b06da test: py: Add an option to skip sleep test
Some QEMUs have a problem with time setup that's why
sleep test is failing. Introduce env__sleep_accurate
boardenv variable to have an option to skip sleep test.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 16:19:12 +01:00
Michal Simek
1d16e0fece arm: zynq: Enable debug uart on zc706
Enable debug uart by default.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 16:19:12 +01:00
Michal Simek
71ef5be734 arm64: zynqmp: Add support for zynqmp automotive silicons
Remove silicon prefix. Automotive grade devices are using xazu instead
of xczu prefix.

The patch "fpga: xilinx: Check for substring in device ID validation"
(sha1: f72132673a)
enables this functionality for zynq devices that only substrings are
checked.
Unfortunatelly there is no way how to detect device grade that's why
this change is reasonable.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 15:53:42 +01:00
Harini Katakam
c6cbff7850 arm64: zynqmp: devicetree: Add TSU clock
Add tsu_clk to GEM0/1/2/3 nodes.

Signed-off-by: Harini Katakam <harinik@xilinx.com>
Acked-by: Kedareswara rao Appana <appanad@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 15:53:42 +01:00
Harini Katakam
de0f07c6d9 arm64: zynqmp: devicetree: Update GEM0/1/2 clocks
- pclk should be lpd_lsbus; correct the same
- Add rx_clk
- Reorder for readability

Signed-off-by: Harini Katakam <harinik@xilinx.com>
Acked-by: Kedareswara rao Appana <appanad@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 15:53:42 +01:00
Javier Martinez Canillas
7560a9e97f arm64: zynqmp: Add generic compatible string for I2C EEPROM
The at24 driver allows to register I2C EEPROM chips using different vendor
and devices, but the I2C subsystem does not take the vendor into account
when matching using the I2C table since it only has device entries.

But when matching using an OF table, both the vendor and device has to be
taken into account so the driver defines only a set of compatible strings
using the "atmel" vendor as a generic fallback for compatible I2C devices.

So add this generic fallback to the device node compatible string to make
the device to match the driver using the OF device ID table.

Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 15:53:42 +01:00
Michal Simek
b9ffd17eb1 arm64: zynqmp: Remove undocumented dma properties
Remove overfetch, ratectrl, include-sg and src-issue dma properties.
Driver is not using them and they are also not documented in the binding
doc.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Kedareswara rao Appana <appanad@xilinx.com>
2018-01-04 15:53:42 +01:00
Michal Simek
b047ead188 arm64: zynqmp: Move pinctrl DT node to proper location
Nodes should be sorted for easier comparision with other boards.
Move pinctlr to the right location.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 15:53:42 +01:00
Michal Simek
5ba0f3d365 arm64: zynqmp: Update DT for gpio heartbeat led
Use defines rather than raw values for gpio configurations.
Similar change was done for zcu102.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 15:53:41 +01:00
Michal Simek
de1ecdcb76 arm64: zynqmp: Fix i2c address for fan controller
Fix incorrect i2c address for fan controller.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 15:53:41 +01:00
Michal Simek
a161374df0 net: xilinx_axi_emac: Remove in/out_be32 handling
There is no need to handle this because conversion to readl/writel
solved this issue.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-04 15:53:41 +01:00