]> git.ipfire.org Git - thirdparty/u-boot.git/log
thirdparty/u-boot.git
8 years agoarm64: zynqmp: Check pmufw version
Michal Simek [Tue, 7 Feb 2017 13:32:26 +0000 (14:32 +0100)] 
arm64: zynqmp: Check pmufw version

If PMUFW version is not v0.3 then panic.
ZynqMP switch to CCF based clock driver which requires
PMUFW to be present at certain version.
This patch ensure that you use correct and tested PMUFW
binary.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agodts: zynqmp: Add dts for clock info
Siva Durga Prasad Paladugu [Fri, 3 Feb 2017 18:26:50 +0000 (23:56 +0530)] 
dts: zynqmp: Add dts for clock info

Add zynqmp-clk-ccf.dtsi to repo which provides
more info about clocks

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoclk: zynqmp: Add support for CCF driver
Siva Durga Prasad Paladugu [Fri, 3 Feb 2017 18:26:49 +0000 (23:56 +0530)] 
clk: zynqmp: Add support for CCF driver

Add support for CCF, this CCF reads the ref clocks
from dt and checks all the required clock control
registers for its source , divisors and calculates
the clock from them. This supports clock and set
functions.

Panic when read/write fails.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoARM64: zynqmp: dt: Add AMS node
Rajnikant Bhojani [Wed, 1 Feb 2017 06:47:32 +0000 (22:47 -0800)] 
ARM64: zynqmp: dt: Add AMS node

The AMS includes an ADC as well as on-chip sensors that can be used to
sample external voltages and monitor on-die operating conditions, such as
temperature and supply voltage levels.

Signed-off-by: Rajnikant Bhojani <rajnikant.bhojani@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoarm64: zynqmp: Add references to cpu nodes
Michal Simek [Mon, 6 Feb 2017 09:09:53 +0000 (10:09 +0100)] 
arm64: zynqmp: Add references to cpu nodes

Add missing references to all cpu nodes.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agodts: zynqmp: Add operating points
Shubhrajyoti Datta [Mon, 6 Feb 2017 06:21:00 +0000 (11:51 +0530)] 
dts: zynqmp: Add operating points

Adding opps for zynqmp.

Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoarm64: zynqmp: Do not call SMC from SPL
Michal Simek [Mon, 6 Feb 2017 13:43:01 +0000 (14:43 +0100)] 
arm64: zynqmp: Do not call SMC from SPL

SPL is running before ATF in EL3 that's why SMCs can't be called because
there is nothing to call. zynqmp_mmio*() are doing direct read/write
accesses and this patch does the same.
PMUFW is up and running at this time and there is a way to talk to pmufw
via IPI but there is no reason to implement IPI stuff in SPL if we need
just simple read for getting clock driver to work.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoarm64: zynqmp: Do not perform reset in case of panic
Michal Simek [Mon, 6 Feb 2017 13:34:01 +0000 (14:34 +0100)] 
arm64: zynqmp: Do not perform reset in case of panic

Do not perform reset when panic happens because in the next reset
panic happens again and logs are overflood by the same errors.
This can be enabled by default and reset can be performed via watchdog.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoarm64: zynqmp: Fix SPI layout for SPL
Michal Simek [Mon, 6 Feb 2017 14:35:38 +0000 (15:35 +0100)] 
arm64: zynqmp: Fix SPI layout for SPL

The patch:
"spi_flash: zynqmp: Dont use 4K sector erase by default"
(sha1: 246880b5ef7616c766a195d100b75f2443f9b02f)
breaks SPL code because increased erase sector size which were used
for writing SPL code to QSPI.

Fix u-boot.img position.

    mmcinfo
    sf probe
    load mmc 0 10000000 boot.bin
    sf erase 0 +$filesize
    sf write 10000000 0 $filesize
    load mmc 0 10000000 atf-spi.ub
    sf erase 0x80000 +$filesize
    sf write 10000000 0x80000 $filesize
    load mmc 0 10000000 u-boot.bin
    sf erase 0xa0000 +$filesize
    sf write 10000000 0xa0000 $filesize

    #Fixed location from 0x140000 to 0x170000
    load mmc 0 10000000 u-boot.img
    sf erase 0x170000 +$filesize
    sf write 10000000 0x170000 $filesize

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agomicroblaze: Fix endif macro command
Michal Simek [Mon, 30 Jan 2017 11:20:37 +0000 (12:20 +0100)] 
microblaze: Fix endif macro command

Use correct name in endif comment.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agommc: Change frequency while accessing to boot partition
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 19:40:54 +0000 (01:10 +0530)] 
mmc: Change frequency while accessing to boot partition

Boot partition is not supported in HS200 mode, hence change
clock to high speed while accessing boot partition and
revert back when partition is switching to other than boot
partition

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agommc: sdhci: zynqmp: Set tapdelays for eMMC HS200 mode
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 19:40:53 +0000 (01:10 +0530)] 
mmc: sdhci: zynqmp: Set tapdelays for eMMC HS200 mode

Sets the tapdelays for eMMC HS200 mode support for
ZynqMP as tapdelays needs to be programmed for it to
work

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agommc: sdhci: Update execute tuning and set clock for HS200
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 19:40:52 +0000 (01:10 +0530)] 
mmc: sdhci: Update execute tuning and set clock for HS200

Update execute tuning and set clock to support for
HS200 mode.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agommc: sdhci: Add support for eMMC HS200 mode
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 19:40:51 +0000 (01:10 +0530)] 
mmc: sdhci: Add support for eMMC HS200 mode

Add support for eMMC HS200 mode by reading
card type from ext_csd and then by switching to
HS200 timing mode.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agommc: zynq_sdhci: Update quirk if 1.8v switching not supported
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 19:40:50 +0000 (01:10 +0530)] 
mmc: zynq_sdhci: Update quirk if 1.8v switching not supported

Update quirk if 1.8 voltage switching is not supported
on boards by reading the property "no-1-8-v" from device
tree.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agommc: sdhci: Add quirk for 1.8v switching not supported
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 19:40:49 +0000 (01:10 +0530)] 
mmc: sdhci: Add quirk for 1.8v switching not supported

Add quirk if voltage switching to 1.8v is broken, in this
case no UHS modes were supported

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agommc: sdhci: zynqmp: Add support of SD3.0
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 19:40:48 +0000 (01:10 +0530)] 
mmc: sdhci: zynqmp: Add support of SD3.0

Add SD3.0 support for ZynqMP, this support needs a
platform specific tuning and tap delays for UHS
modes of SD3.0 and this patch takes care of it.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agommc: sdhci: zynq: Define private structure arasan_sdhci_priv
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 19:40:47 +0000 (01:10 +0530)] 
mmc: sdhci: zynq: Define private structure arasan_sdhci_priv

Deine private structure arasan_sdhci_priv instead of sdhci_host
as private. This allows us in adding more private data  as required
for usage in driver.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agozynqmp: Define routines for mmio write and read
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 19:40:46 +0000 (01:10 +0530)] 
zynqmp: Define routines for mmio write and read

Define routines of mmio write and read functionalities
for zynqmp platform.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agommc: sdhci: Make sdhci_ops of host as modifiable
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 19:40:45 +0000 (01:10 +0530)] 
mmc: sdhci: Make sdhci_ops of host as modifiable

Make sdhci_ops of host modifiable as ops may contain
platform specific funtion pointers which may need
to be defined for some platforms(example: platform specific
tuning and delays)

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agommc: sdhci: Add support for platform specific delay
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 19:40:44 +0000 (01:10 +0530)] 
mmc: sdhci: Add support for platform specific delay

Add support for any platform/board specific delays
requirement while setting clocks. Some boards needs
to program tapdelay for setting certain high frequencies
and this patch adds hook for supporting the same.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agommc: sdhci: Add support for platform/board specific tuning
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 19:40:43 +0000 (01:10 +0530)] 
mmc: sdhci: Add support for platform/board specific tuning

Add support to execute platform/board specific tuning needed
for SDR104 and SDR50 UHS modes.This patch adds hook routine
to support specific tuning requirements.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agommc: sdhci: Add SD3.0 support
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 19:40:42 +0000 (01:10 +0530)] 
mmc: sdhci: Add SD3.0 support

Add support for all UHS modes of SD3.0.
This patch defines the routines to switch
volatge, setting uhs modes and execute tuning
as these are needed for SD3.0 support

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agommc: Add support for SD3.0
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 19:40:41 +0000 (01:10 +0530)] 
mmc: Add support for SD3.0

The SD3.0 needs voltage switching to 1.8V
based on host and cards capabilities and also
needs to switch to one of the uhs modes based
on cards capability. This supports frequencies
till 200MHz. This patch define hooks to perform
the same at sdhci driver level.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agommc: sdhci: Update host capabilities about host controller
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 19:40:40 +0000 (01:10 +0530)] 
mmc: sdhci: Update host capabilities about host controller

Update host capabilities for driver with host controller
information related to UHS modes incase of SD and HS200
mode incase of eMMC.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoxilinx: zynqmp: Add support for UBIFS on QSPI flash
Siva Durga Prasad Paladugu [Tue, 31 Jan 2017 09:52:42 +0000 (15:22 +0530)] 
xilinx: zynqmp: Add support for UBIFS on QSPI flash

This patch enables support for UBIFS on top of
QSPI flash.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoasm-generic: atomic: Remove unused functions
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 07:58:59 +0000 (13:28 +0530)] 
asm-generic: atomic: Remove unused functions

Remove unused inline function, they are just
causing lot of warnings and of no use.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agofs: usbifs: Fix warning in ubifs
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 07:58:58 +0000 (13:28 +0530)] 
fs: usbifs: Fix warning in ubifs

This patch fixes the below warning by typecasting it properly
fs/ubifs/ubifs.c: In function 'ubifs_load':
fs/ubifs/ubifs.c:942:29: warning: cast to pointer from integer
of different size [-Wint-to-pointer-cast]
  err = ubifs_read(filename, (void *)addr, 0, size, &actread);

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agospl: spl_spi: Fix warnings
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 04:49:06 +0000 (10:19 +0530)] 
spl: spl_spi: Fix warnings

Fixed the below warnings by typecasting it properly
w+../common/spl/spl_spi.c: In function 'spi_load_image_os':
w+../common/spl/spl_spi.c:41:27: warning: cast to pointer from integer
of different size [-Wint-to-pointer-cast]
w+../common/spl/spl_spi.c: In function 'spl_spi_load_image':
w+../common/spl/spl_spi.c:121:11: warning: cast to pointer from integer
of different size [-Wint-to-pointer-cast]

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agonet: zynq_gem: Dont enable SGMII and PCS selection
Siva Durga Prasad Paladugu [Tue, 31 Jan 2017 10:01:17 +0000 (15:31 +0530)] 
net: zynq_gem: Dont enable SGMII and PCS selection

Dont enable SGMII and PCS selection if internal PCS/PMA
is not used, by getting the info about internal/external
PCS/PMA usage from dt property "is-internal-phy".

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agospi: zynqmp_qspi: Remove older way of determining qspi modes
Siva Durga Prasad Paladugu [Mon, 30 Jan 2017 20:13:09 +0000 (01:43 +0530)] 
spi: zynqmp_qspi: Remove older way of determining qspi modes

Remove older way determining qspi flash connection modes as its
now moved to getting the same info from device tree.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agospi: zynqmp_qspi: Add support x1 and x2 qspi modes
Siva Durga Prasad Paladugu [Mon, 30 Jan 2017 20:13:08 +0000 (01:43 +0530)] 
spi: zynqmp_qspi: Add support x1 and x2 qspi modes

This patch adds support for x1 and x2 qspi modes which
means to support rx and tx on 2 lines and single line
respectively by reading tx and rx bus widths from
device tree. Read is-dual for determining dual
parallel/single mode.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agospi: zynq_qspi: Remove older way of determining qspi modes
Siva Durga Prasad Paladugu [Mon, 30 Jan 2017 21:21:42 +0000 (02:51 +0530)] 
spi: zynq_qspi: Remove older way of determining qspi modes

Remove older way determining qspi flash connection modes as its
now avaiable in dt and hence moved to getting the same info from
device tree.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agospi: zynq_qspi: Add support x1 and x2 qspi modes
Siva Durga Prasad Paladugu [Mon, 30 Jan 2017 21:21:41 +0000 (02:51 +0530)] 
spi: zynq_qspi: Add support x1 and x2 qspi modes

This patch adds support for x1 and x2 qspi modes which
means to support rx and tx on 2 lines and single line
respectively by reading tx and rx bus widths from
device tree. Read is-dual for determining dual
parallel/single mode.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agomtd: spi_flash: Add support for read if offset is odd
Siva Durga Prasad Paladugu [Tue, 31 Jan 2017 05:14:07 +0000 (10:44 +0530)] 
mtd: spi_flash: Add support for read if offset is odd

Add support ot read from flash if offset received is odd
incase of dual parallel. This fixes the issue of spi flash
read failures if received offset is odd

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agospi_flash: zynqmp: Dont use 4K sector erase by default
Siva Durga Prasad Paladugu [Tue, 31 Jan 2017 05:14:06 +0000 (10:44 +0530)] 
spi_flash: zynqmp: Dont use 4K sector erase by default

Dont use 4K sector erase by default, Disabling this
would use 64K sector erase and decreases erase time.
Also disabled by the fact that UBIFS and JFFS2 won't work
with 4K sector erase.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agocmd: jffs2: Rename command ls to fsls
Siva Durga Prasad Paladugu [Tue, 31 Jan 2017 05:14:05 +0000 (10:44 +0530)] 
cmd: jffs2: Rename command ls to fsls

Rename command ls to fsls as its conflicting with
generic file systesm command ls and this is causing
compilation failure as below, if both are enabled
and this patch fixes it.

cmd/jffs2.o:(.u_boot_list_2_cmd_2_ls+0x0):
multiple definition of `_u_boot_list_2_cmd_2_ls'
cmd/fs.o:(.u_boot_list_2_cmd_2_ls+0x0):first defined here
scripts/Makefile.build:359: recipe for target 'cmd/built-in.o'
failed
make[1]: *** [cmd/built-in.o] Error 1

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoarm64: zynqmp: Wire BT part of wl1831
Michal Simek [Fri, 27 Jan 2017 11:50:06 +0000 (12:50 +0100)] 
arm64: zynqmp: Wire BT part of wl1831

BT requires flow control wired via PL runs at 3M.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoarm64: zynqmp: Remove unused dp_clk_wiz
Michal Simek [Fri, 27 Jan 2017 11:47:45 +0000 (12:47 +0100)] 
arm64: zynqmp: Remove unused dp_clk_wiz

DP will use PS PLL to generate required clock.
Remove this dp_clk_hack.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoarm64: zynqmp: Fix i2c bus on zcu100-revB
Michal Simek [Fri, 27 Jan 2017 11:44:15 +0000 (12:44 +0100)] 
arm64: zynqmp: Fix i2c bus on zcu100-revB

zcu100-revB is wiring i2c on i2c1 not on i2c0.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agodefconfig: microblaze: Dont enable CMD_UBI
Siva Durga Prasad Paladugu [Mon, 23 Jan 2017 11:40:15 +0000 (17:10 +0530)] 
defconfig: microblaze: Dont enable CMD_UBI

Dont enable the config CMD_UBI for microblaze by default.
Just enabling this won't work. It needs to enable mtdparts
and other related configs.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agozynqmp: qspi: Enable Macronix and ISSI flash support
Siva Durga Prasad Paladugu [Fri, 20 Jan 2017 09:45:02 +0000 (15:15 +0530)] 
zynqmp: qspi: Enable Macronix and ISSI flash support

Enable macronix and ISSI QSPI flash support for all
ZynqMP boards as required.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agospi: zynqmp_qspi: Use default baudrate value instead of max value
Siva Durga Prasad Paladugu [Fri, 20 Jan 2017 09:45:01 +0000 (15:15 +0530)] 
spi: zynqmp_qspi: Use default baudrate value instead of max value

Use default baudrate value instead of max baudrate value as
using max baudrate value causing the issues on some QSPI parts
(Spansion, Macronix etc) as frequency goes down below 1MHz.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agospi: spi_flash: Set quad enable for macronix upper flash
Siva Durga Prasad Paladugu [Fri, 20 Jan 2017 09:45:00 +0000 (15:15 +0530)] 
spi: spi_flash: Set quad enable for macronix upper flash

Set quad enable bit for upper flash as well in case of
dual parallel when using generic qspi.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agospi: spi_flash: Store and use spi flags received
Siva Durga Prasad Paladugu [Fri, 20 Jan 2017 09:44:59 +0000 (15:14 +0530)] 
spi: spi_flash: Store and use spi flags received

Store and use spi flags as it will be cleared after
write enable command and it need to be available for
following write command.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agospi: spi_flash: Clear BP bits for upper flash as well
Siva Durga Prasad Paladugu [Fri, 20 Jan 2017 09:44:58 +0000 (15:14 +0530)] 
spi: spi_flash: Clear BP bits for upper flash as well

Clear BP bits for upper flash as well incase of
dual parallel if we are using genric spi.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agozynqmp: Support SPL_SPI_LOAD only if SPL spi flash support present
Siva Durga Prasad Paladugu [Wed, 18 Jan 2017 10:33:26 +0000 (16:03 +0530)] 
zynqmp: Support SPL_SPI_LOAD only if SPL spi flash support present

Support SPL_SPI_LOAD only if SPL spi flash support present
This fixes the issue of compilation failures on dc1 and dc2.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoarmv8: aarch64: Fix the warning about x1-x3 nonzero issue
Alison Wang [Tue, 17 Jan 2017 01:39:17 +0000 (09:39 +0800)] 
armv8: aarch64: Fix the warning about x1-x3 nonzero issue

For 64-bit kernel, there is a warning about x1-x3 nonzero in violation
of boot protocol. To fix this issue, input argument 4 is added for
armv8_switch_to_el2 and armv8_switch_to_el1. The input argument 4 will
be set to the right value, such as zero.

Signed-off-by: Alison Wang <alison.wang@nxp.com>
Reviewed-by: Alexander Graf <agraf@suse.de>
Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agofpga: zynqmp: Remove empty functions
Michal Simek [Fri, 16 Dec 2016 09:01:45 +0000 (10:01 +0100)] 
fpga: zynqmp: Remove empty functions

Xilinx core files will take care about it.
There is no need to have these functions because they do nothing.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agonet: gem: Use wait_for_bit() instead of private mdio_wait()
Michal Simek [Mon, 12 Dec 2016 08:47:26 +0000 (09:47 +0100)] 
net: gem: Use wait_for_bit() instead of private mdio_wait()

Using generic wait_for_bit() implementation instead of
using private wait function.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agolib: Add WATCHDOG_RESET to wait_bit.h
Michal Simek [Mon, 12 Dec 2016 08:46:09 +0000 (09:46 +0100)] 
lib: Add WATCHDOG_RESET to wait_bit.h

wait_for_bit() is missing reset watchdog in case watchdog
is configured.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
8 years agoARM64: zynqmp: Change clock conf for DP for zcu100
Hyun Kwon [Mon, 9 Jan 2017 23:01:49 +0000 (15:01 -0800)] 
ARM64: zynqmp: Change clock conf for DP for zcu100

- Dedicate VPLL for DP
- Enable VPLL frac mode

These changes are done by hand and PCW generation
needs to be checked and validated again.

Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoarm64: zynqmp: Add support for QSPI boot
Michal Simek [Mon, 16 Jan 2017 11:07:33 +0000 (12:07 +0100)] 
arm64: zynqmp: Add support for QSPI boot

This patch is enabling support for SPL QSPI boot.

First of all it is necessary to generate atf-spi.ub which is different
format than atf-uboot.ub (this can be made as legacy image too)

ADDR=`arm-xilinx-linux-gnueabi-readelf -a bl31.elf | grep "Entry point
address" | cut -d ':' -f 2 | sed -e 's/^[ \t]*//'`
aarch64-linux-gnu-objcopy -O binary bl31.elf bl31.bin
./tools/mkimage -f auto -A arm64 -T firmware -C none -O u-boot -a $ADDR
-e $ADDR -n "atf1" -E -b arch/arm/dts/zynqmp-zcu102.dtb -d bl31.bin
atf-uboot.ub
./tools/mkimage -A arm64 -T firmware -C none -O u-boot -a $ADDR -e $ADDR
-n "atf-for-qspi" -E -d bl31.bin atf-spi.ub

This patch is using this QSPI layout with offsets:
0 boot.bin
512k atf-ub
640k u-boot.bin
1280k u-boot.img

Which corresponding by writing these images(read from MMC)
mmcinfo
sf probe
load mmc 0 10000000 boot.bin
sf erase 0 +$filesize
sf write 10000000 0 $filesize
load mmc 0 10000000 atf-spi.ub
sf erase 0x80000 +$filesize
sf write 10000000 0x80000 $filesize
load mmc 0 10000000 u-boot.bin
sf erase 0xa0000 +$filesize
sf write 10000000 0xa0000 $filesize
load mmc 0 10000000 u-boot.img
sf erase 0x140000 +$filesize
sf write 10000000 0x140000 $filesize

For testing u-boot running in EL3 you can break atf-spi.ub like this:
sf probe
sf erase 0x80000 +4

Then u-boot.img is executed.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agospl: Add missing line ending to SPL print
Michal Simek [Mon, 16 Jan 2017 11:57:19 +0000 (12:57 +0100)] 
spl: Add missing line ending to SPL print

One print requires line ending to be aligned with SW running
after it. Prints look weird without it.

For example:
U-Boot SPL 2017.01-01801-g1fb1292c7b9d (Jan 16 2017 - 12:50:53)
EL Level: EL3
Trying to boot from SPINOTICE:  ATF running on XCZU15EG/silicon
v2/RTL5.1 at 0xfffe5000, with PMU firmware
NOTICE:  BL31: Secure code at 0x0

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoARM64: zynqmp: Remove pmufw.bin from source code
Michal Simek [Thu, 12 Jan 2017 07:27:33 +0000 (08:27 +0100)] 
ARM64: zynqmp: Remove pmufw.bin from source code

User should use official pmufw compatible with certain version.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoscsi: dm: Unbind all scsi based block devices before new scan
Michal Simek [Mon, 2 Jan 2017 08:40:09 +0000 (09:40 +0100)] 
scsi: dm: Unbind all scsi based block devices before new scan

New scan should unbind all block devices not to be listed again.
Without this patch if scsi reset or scan is called new block devices are
created which point to the same id and lun.

For example:
ZynqMP> scsi scan
scsi_scan: if_type=2, devnum=0: sdhci@ff170000.blk, 6, 0
scsi_scan: if_type=2, devnum=0: ahci@fd0c0000.id1lun0, 2, 0
scsi_scan: if_type=2, devnum=0: ahci@fd0c0000.id1lun0, 2, 1
scsi_scan: if_type=2, devnum=0: ahci@fd0c0000.id1lun0, 2, 2
scsi_scan: if_type=2, devnum=0: ahci@fd0c0000.id1lun0, 2, 3
scsi_scan: if_type=2, devnum=0: ahci@fd0c0000.id1lun0, 2, 4
scanning bus for devices...
  Device 0: (1:0) Vendor: ATA Prod.: KINGSTON SVP200S Rev: 501A
            Type: Hard Disk
            Capacity: 57241.8 MB = 55.9 GB (117231408 x 512)

Reported-by: Ken Ma <make@marvell.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agoARM64: zynqmp: Remove empty board file
Michal Simek [Wed, 11 Jan 2017 11:26:22 +0000 (12:26 +0100)] 
ARM64: zynqmp: Remove empty board file

Remove empty unused file.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoMerge tag 'v2017.01' into master
Michal Simek [Wed, 11 Jan 2017 13:14:04 +0000 (14:14 +0100)] 
Merge tag 'v2017.01' into master

Prepare v2017.01

- Fix defconfigs for v2017.01 -
  DISTRO_DEFAULTS (and remove CMD_PXE, MENU)
  !DISPLAY_BOARDINFO
- Remove CONFIG_CMD_NAND, CONFIG_SYS_NAND_SELF_INIT
  from board file
- Various SPI fixes

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoARM64: zynqmp: Generate handoff structure for ATF
Michal Simek [Mon, 9 Jan 2017 09:05:16 +0000 (10:05 +0100)] 
ARM64: zynqmp: Generate handoff structure for ATF

Xilinx ATF extending options for passing images from BL2(FSBL)
to BL31. U-Boot SPL is FSBL replacement that's why it should generate
handoff structure the same. Support only one entry which is U-Boot in
EL2 itself. When FIT image is adopted structure generate should be data
driven.

Currently ATF is placing this structure at the beggining of OCM which is
rewriting early parts of ATF which should be unused at that time.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoxilinx_phy: Pass correct pointer to fdtdec_get_int()
Kamensky Ivan [Tue, 27 Dec 2016 16:12:23 +0000 (19:12 +0300)] 
xilinx_phy: Pass correct pointer to fdtdec_get_int()

This patch fixes incorrect pointer on offset device in device tree blob.
When using with the component "Ethernet 1G/2.5G BASE-X PCS/PMA or SGMII"
it does not understand what type is XAE_PHY_TYPE_1000BASE_X and trying
to change frequency.

Signed-off-by: Kamensky Ivan <kamensky.ivan@mail.ru>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoconfigs: zynqmp: zcu102: Temporary hack to disable SATA
Siva Durga Prasad Paladugu [Fri, 6 Jan 2017 11:24:40 +0000 (16:54 +0530)] 
configs: zynqmp: zcu102: Temporary hack to disable SATA

Add workaround to disable SATA for ZCU102
until SATA issue got fixed

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
8 years agonet: xilinx_axi_emac: Add support for non processor mode
Siva Durga Prasad Paladugu [Fri, 6 Jan 2017 10:57:15 +0000 (16:27 +0530)] 
net: xilinx_axi_emac: Add support for non processor mode

Add support for non processor mode, this mode doesnt have
access to some of the registers and hence this patch
bypasses it and also length has to be calculated from
status instead of app4 in this mode.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
8 years agonet: xilinx_axi_emac: Use wait_for_bit instead of while loop
Siva Durga Prasad Paladugu [Fri, 6 Jan 2017 10:48:50 +0000 (16:18 +0530)] 
net: xilinx_axi_emac: Use wait_for_bit instead of while loop

Use wait_for_bit instead while loop during init

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
8 years agodrivers: usb: Remove !DM_USB code from host driver
Michal Simek [Wed, 21 Dec 2016 10:28:17 +0000 (11:28 +0100)] 
drivers: usb: Remove !DM_USB code from host driver

Glue logic depends on DM_USB that's why remove !DM_USB
code because only this default case is tested.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agodrivers: usb: Add USB_XHCI_ZYNQMP to Kconfig
Michal Simek [Wed, 21 Dec 2016 10:10:24 +0000 (11:10 +0100)] 
drivers: usb: Add USB_XHCI_ZYNQMP to Kconfig

Move symbol to Kconfig to cleanup configuration file.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agousb: storage: Show number of storage devices detected for DM_USB
Michal Simek [Tue, 20 Dec 2016 15:26:25 +0000 (16:26 +0100)] 
usb: storage: Show number of storage devices detected for DM_USB

By enabling DM_USB information about number of storage devices
was lost.
Get this information back simply by printing number of devices detected
via BLK uclass.

For example:
scanning bus 0 for devices... 7 USB Device(s) found
       scanning usb for storage devices... 3 Storage Device(s) found
       scanning usb for ethernet devices... 0 Ethernet Device(s) found

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agodrivers: usb: Add DWC3 Xilinx ZynqMP glue logic
Michal Simek [Thu, 31 Mar 2016 11:53:58 +0000 (13:53 +0200)] 
drivers: usb: Add DWC3 Xilinx ZynqMP glue logic

By enabling BLK by default this is the next driver which needs to get
support for DM_USB. Adding generic DWC3 glue logic which only
parse nodes and read device mode. Based on it probe proper
host/peripheral DWC3 drivers for it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agodrivers: usb: dwc3: add ti dwc3 peripheral driver with driver model support
Michal Simek [Wed, 21 Dec 2016 12:18:40 +0000 (13:18 +0100)] 
drivers: usb: dwc3: add ti dwc3 peripheral driver with driver model support

Add a TI DWC3 peripheral driver with driver model support and the
driver will be bound by the DWC3 wrapper driver based on the
dr_mode device tree entry.

Xilinx: Remove dwc3-omap changes + limit zynqmp static init

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
8 years agoam43xx: Add USB device boot support to SPL
Tom Rini [Thu, 6 Aug 2015 17:05:08 +0000 (22:35 +0530)] 
am43xx: Add USB device boot support to SPL

Add in code to initialize the DWC3 gadget controller so that we can do
RNDIS in SPL on these platforms.

Xilinx: Remove am43xx changes and add usb/common to Makefile compilation

Signed-off-by: Tom Rini <trini@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
8 years agodrivers: usb: common: add support to get maximum speed from dt
Mugunthan V N [Tue, 15 Mar 2016 10:34:08 +0000 (16:04 +0530)] 
drivers: usb: common: add support to get maximum speed from dt

Add support to get maximum speed from dt so that usb drivers
makes use of it for DT parsing.

Xilinx: Fix error message.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
8 years agodrivers: usb: dwc3: add ti dwc3 misc driver for wrapper
Mugunthan V N [Mon, 14 Mar 2016 16:15:02 +0000 (21:45 +0530)] 
drivers: usb: dwc3: add ti dwc3 misc driver for wrapper

Add a misc driver for DWC3 wrapper, so that based on dr_mode the
USB devices can bind to USB host or USB device drivers.

Xilinx: Remove changes related to dwc3-omap.c

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
8 years agodrivers: usb: dwc3: remove devm_zalloc from linux_compact
Mugunthan V N [Mon, 11 Jan 2016 06:37:19 +0000 (12:07 +0530)] 
drivers: usb: dwc3: remove devm_zalloc from linux_compact

devm_zalloc() is already defined in dm/device.h header, so
devm_zalloc can be removed from linux_compact.h beader file.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
8 years agodrivers: usb: gadget: ether/rndis: convert driver to adopt device driver model
Mugunthan V N [Fri, 18 Nov 2016 05:39:15 +0000 (11:09 +0530)] 
drivers: usb: gadget: ether/rndis: convert driver to adopt device driver model

Adopt usb ether gadget and rndis driver to adopt driver model

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
8 years agodrivers: usb: gadget: ether: prepare driver for driver model migration
Mugunthan V N [Fri, 18 Nov 2016 05:38:27 +0000 (11:08 +0530)] 
drivers: usb: gadget: ether: prepare driver for driver model migration

prepare driver for driver model migration

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
8 years agodrivers: usb: gadget: ether: use net device priv to pass usb ether priv
Mugunthan V N [Fri, 18 Nov 2016 05:37:18 +0000 (11:07 +0530)] 
drivers: usb: gadget: ether: use net device priv to pass usb ether priv

Use net device priv to pass usb ether priv and use it in
net device ops callback.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
8 years agodrivers: usb: gadget: ether: consolidate global devices to single struct
Mugunthan V N [Fri, 18 Nov 2016 05:36:13 +0000 (11:06 +0530)] 
drivers: usb: gadget: ether: consolidate global devices to single struct

Consolidate the net device, usb eth device and gadget device
struct to single struct and a single global variable so that the
same can be passed as priv of ethernet driver.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
8 years agodrivers: usb: gadget: ether: adopt to usb driver model
Mugunthan V N [Fri, 18 Nov 2016 05:19:12 +0000 (10:49 +0530)] 
drivers: usb: gadget: ether: adopt to usb driver model

Convert usb ether gadget to adopt usb driver model

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
8 years agodrivers: usb: gadget: ether: access network_started using local variable
Mugunthan V N [Fri, 18 Nov 2016 05:19:13 +0000 (10:49 +0530)] 
drivers: usb: gadget: ether: access network_started using local variable

network_started of struct eth_dev can be accessed using local
variable dev and no reason to access it with the global struct.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
8 years agotools: mkimage: Call fclose in error path
Michal Simek [Tue, 20 Dec 2016 08:54:18 +0000 (09:54 +0100)] 
tools: mkimage: Call fclose in error path

This patch is fixing missing fclose() calls
in error patch introduced by:
"tools: mkimage: Use fstat instead of stat to avoid malicious hacks"
(sha1: ebe0f53f48e8f9ecc823e533a85b05c13638c350)

Reported-by: Coverity (CID: 155064, 155065)
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoARM64: zynqmp: Simplify filesystem command disabling for mini
Michal Simek [Fri, 16 Dec 2016 13:07:49 +0000 (14:07 +0100)] 
ARM64: zynqmp: Simplify filesystem command disabling for mini

Move config options to Kconfig.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoARM: zynq: Move BOOTZ enabling to defconfig
Michal Simek [Fri, 16 Dec 2016 13:02:50 +0000 (14:02 +0100)] 
ARM: zynq: Move BOOTZ enabling to defconfig

Simplify config file.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoARM64: zynqmp: Remove already disabled commands in mini configuration
Michal Simek [Fri, 16 Dec 2016 13:00:51 +0000 (14:00 +0100)] 
ARM64: zynqmp: Remove already disabled commands in mini configuration

This patch removes these configuration parameters.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoARM64: zynqmp: Simplify BOOTI disabling for mini configuration
Michal Simek [Fri, 16 Dec 2016 12:58:56 +0000 (13:58 +0100)] 
ARM64: zynqmp: Simplify BOOTI disabling for mini configuration

Disable BOOTI via defconfig.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoARM64: zynqmp: Remove configs which go against each other
Michal Simek [Fri, 16 Dec 2016 12:56:08 +0000 (13:56 +0100)] 
ARM64: zynqmp: Remove configs which go against each other

Simplify configuration.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoARM64: zynqmp: Remove BOOTDELAY setup from board file
Michal Simek [Fri, 16 Dec 2016 12:55:15 +0000 (13:55 +0100)] 
ARM64: zynqmp: Remove BOOTDELAY setup from board file

Simplify configuration.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoARM: zynq: Remove ZYNQ_M29EW_WB_HACK macro
Michal Simek [Fri, 16 Dec 2016 12:46:20 +0000 (13:46 +0100)] 
ARM: zynq: Remove ZYNQ_M29EW_WB_HACK macro

This functionality should be covered by:
"mtd: cfi_flash: Write buffer size adjustment for M29EW Numonyx devices"
(sha1: 6f13889eb03fd3ce7b643aa6134856b3a2bf8d88)

That's why remove this macro and hack.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoARM: zynq: Remove unused cc108 config file
Michal Simek [Fri, 16 Dec 2016 11:40:16 +0000 (12:40 +0100)] 
ARM: zynq: Remove unused cc108 config file

cc108 is handled via zynq-common.h config. The only missing
piece is different ENV_OFFSET setting for qspi boot mode
but this depends on user configuration. This board is tested via jtag
boot mode only that's why if qspi mode is required we can fix it later.
Comment was added to zynq-common.h not to be lost.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoARM: zynq: Remove ocm configuration file
Michal Simek [Fri, 16 Dec 2016 11:28:55 +0000 (12:28 +0100)] 
ARM: zynq: Remove ocm configuration file

There is no reference to this file to build.
Remove this unused file.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoARM: zynq: Add RSA dependency directly to Kconfig
Michal Simek [Fri, 16 Dec 2016 11:19:02 +0000 (12:19 +0100)] 
ARM: zynq: Add RSA dependency directly to Kconfig

Simplify zynq config file.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoMerge tag 'v2016.11' into master
Michal Simek [Fri, 16 Dec 2016 10:08:33 +0000 (11:08 +0100)] 
Merge tag 'v2016.11' into master

Prepare v2016.11

- Add missing CONFIG_ macros to Kconfig. It should be fixed in future
- Fix spl_mmc fpga code
- Add missing defconfig macros
- Remove FPGA macros because it was moved to Kconfig in mainline

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years agoPrepare v2017.01 v2017.01
Tom Rini [Mon, 9 Jan 2017 16:57:05 +0000 (11:57 -0500)] 
Prepare v2017.01

Signed-off-by: Tom Rini <trini@konsulko.com>
8 years agolib: gitignore *.elf and *.so generated by efi_loader
Ladislav Michl [Mon, 9 Jan 2017 10:33:28 +0000 (11:33 +0100)] 
lib: gitignore *.elf and *.so generated by efi_loader

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
8 years agoscripts/config_whitelist.txt: Resync
Tom Rini [Mon, 9 Jan 2017 01:16:00 +0000 (20:16 -0500)] 
scripts/config_whitelist.txt: Resync

Signed-off-by: Tom Rini <trini@konsulko.com>
8 years agomx6ullevk: Add missing MAINTAINERS for mx6ull_14x14_evk_plugin_defconfig
Jagan Teki [Thu, 5 Jan 2017 14:32:50 +0000 (15:32 +0100)] 
mx6ullevk: Add missing MAINTAINERS for mx6ull_14x14_evk_plugin_defconfig

Add 'Peng Fan' as MAINTAINERS of configs/mx6ull_14x14_evk_plugin_defconfig
which is missing in below commit
"imx: mx6ull_14x14_evk: add plugin defconfig"
(sha1: b90ebf49bb8f74afe68f696f59a0e24cc79f2031)

Cc: Stefano Babic <sbabic@denx.de>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Jagan Teki <jagan@openedev.com>
8 years agoam335x: configs: Use ISW_ENTRY_ADDR to set SPL_TEXT_BASE
Andrew F. Davis [Fri, 6 Jan 2017 22:32:12 +0000 (16:32 -0600)] 
am335x: configs: Use ISW_ENTRY_ADDR to set SPL_TEXT_BASE

The SPL load address changes based on boot type in HS devices,
ISW_ENTRY_ADDR is used to set this address for AM43xx based SoCs
for similar reasons. Add this same logic for AM33xx devices.

Also make the default value for ISW_ENTRY_ADDR correct for GP
devices based on SoC, HS devices already pick the correct
value in their defconfig.

Signed-off-by: Andrew F. Davis <afd@ti.com>
8 years agoarm: mach-omap2: Fix secure file generation
Andrew F. Davis [Fri, 6 Jan 2017 22:20:02 +0000 (16:20 -0600)] 
arm: mach-omap2: Fix secure file generation

When TI_SECURE_DEV_PKG is not defined we warn that the file '*_HS' was
not generated but generate an unsigned one anyway, first fix this
warning to say that it was generated but not secured.

When the user then exports TI_SECURE_DEV_PKG after getting this warning,
and tries to re-build, 'make' will detect the build artifacts as
unchanged and so assume they do not need to be re-generated. This causes
it to fail to sign the files and it will pack unsigned files into the
final image, even though TI_SECURE_DEV_PKG is now correctly defined and
working.

Fix this by using FORCE on the targets causes them to be re-run even if
the dependent files have not changed.

This then causes another issue. We currently rename the signed dtb files
to overwrite the non-signed ones. We do this so the 'mkimage' tool gives
the packaged dtb sections the correct name. If we do not rename the files
then SPL will not find them during boot.

Fix this by renaming the dtb files by appending _HS to the end of the
filename, after the ".dtb", this causes them to still be named correctly
in the FIT blob.

Signed-off-by: Andrew F. Davis <afd@ti.com>
8 years agoMerge branch 'master' of git://git.denx.de/u-boot-tegra
Tom Rini [Thu, 5 Jan 2017 00:41:50 +0000 (19:41 -0500)] 
Merge branch 'master' of git://git.denx.de/u-boot-tegra

8 years agoMerge branch 'master' of git://git.denx.de/u-boot-spi
Tom Rini [Thu, 5 Jan 2017 00:41:23 +0000 (19:41 -0500)] 
Merge branch 'master' of git://git.denx.de/u-boot-spi

8 years agopowerpc: mpc85xx: Move macro CONFIG_SYS_PPC64 to Kconfig
York Sun [Wed, 28 Dec 2016 16:43:50 +0000 (08:43 -0800)] 
powerpc: mpc85xx: Move macro CONFIG_SYS_PPC64 to Kconfig

Use Kconfig option SYS_PPC64 instead.

Signed-off-by: York Sun <york.sun@nxp.com>
8 years agopowerpc: mpc85xx: Move CONFIG_SYS_FSL_QORIQ_CHASSIS* to Kconfig
York Sun [Wed, 28 Dec 2016 16:43:49 +0000 (08:43 -0800)] 
powerpc: mpc85xx: Move CONFIG_SYS_FSL_QORIQ_CHASSIS* to Kconfig

Use Kconfig option to select chassis version.

Signed-off-by: York Sun <york.sun@nxp.com>