platform/kernel/u-boot.git
7 years agoarmv5te: make 'ret lr' produce iinterworking 'bx lr'
Albert ARIBAUD [Mon, 27 Feb 2017 19:19:07 +0000 (20:19 +0100)]
armv5te: make 'ret lr' produce iinterworking 'bx lr'

Current ARM assembler helper for the 'return to caller' pseudo-instruction
turns 'ret lr' into 'mov pc, lr' for ARMv5TE. This causes the core to remain
in its current ARM state even when the routine doing the 'ret' was called
from Thumb-1 state, triggering an undefined instruction exception.

This causes early run-time failures in all boards compiled using the Thumb-1
instruction set (for instance the Open-RD family).

ARMv5TE supports 'bx lr' which properly implements interworking and thus
correctly returns to Thumb-1 state from ARM state.

This change makes 'ret lr' turn into 'bx lr' for ARMv5TE.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
7 years agoPrepare v2017-rc3 v2017.03-rc3
Tom Rini [Mon, 27 Feb 2017 22:36:21 +0000 (17:36 -0500)]
Prepare v2017-rc3

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoarm: mach-omap2: Flush cache after FIT post-processing image
Andrew F. Davis [Wed, 22 Feb 2017 23:46:39 +0000 (17:46 -0600)]
arm: mach-omap2: Flush cache after FIT post-processing image

After we authenticate/decrypt an image we need to flush the caches
as they may still contain bits of the encrypted image. This will
cause failures if we attempt to jump to this image.

Reported-by: Yogesh Siraswar<yogeshs@ti.com>
Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agodrivers/net/Kconfig: Correct use of apostrophe
Tom Rini [Mon, 20 Feb 2017 14:38:03 +0000 (09:38 -0500)]
drivers/net/Kconfig: Correct use of apostrophe

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-imx
Tom Rini [Mon, 27 Feb 2017 17:10:05 +0000 (12:10 -0500)]
Merge branch 'master' of git://denx.de/git/u-boot-imx

7 years agorockchip: video: fix 83500000 clock mistake in rockchip HDMI
Nickey Yang Nickey Yang [Mon, 27 Feb 2017 09:04:21 +0000 (17:04 +0800)]
rockchip: video: fix 83500000 clock mistake in rockchip HDMI

There is one "0" too many in 83500000 mpixelclock in rockchip_mpll_cfg[].
fix it.

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
7 years agosplash: Prevent splash_load_fs from writing to 0x0
Jonathan Golder [Fri, 24 Feb 2017 16:46:10 +0000 (17:46 +0100)]
splash: Prevent splash_load_fs from writing to 0x0

Passing NULL to fs_read() for actread value results in hanging U-Boot
at least on our ARM plattform (TI AM335x). Since fs_read() and
following functions do not catch nullpointers, writing to 0x0 occurs.

Passing a local dummy var instead of NULL solves this issue.

Signed-off-by: Jonathan Golder <jonathan.golder@kurz-elektronik.de>
Cc: Anatolij Gustschin <agust@denx.de>
7 years agotravis-ci: Temporarily disable using a newer device tree compiler
Tom Rini [Sun, 26 Feb 2017 20:23:18 +0000 (15:23 -0500)]
travis-ci: Temporarily disable using a newer device tree compiler

For a long while dtc has warned about various constructs.  This is now
leading to log file size being exceeded in travis, and as the majority
of these errors need to be fixed in the kernel, switch to using the
stock device-tree-compiler package.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Tom Rini [Sun, 26 Feb 2017 16:56:54 +0000 (11:56 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

7 years agousb: gadget: f_dfu: set serial number if serial# is valid
Felipe Balbi [Wed, 22 Feb 2017 09:22:38 +0000 (11:22 +0200)]
usb: gadget: f_dfu: set serial number if serial# is valid

With this patch, USB Command Verifier is happy with our DFU
implementation on Chapter 9 tests.

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
7 years agousb: gadget: g_dnl: fix g_dnl_set_serialnumber()
Felipe Balbi [Wed, 22 Feb 2017 09:22:37 +0000 (11:22 +0200)]
usb: gadget: g_dnl: fix g_dnl_set_serialnumber()

instead of only copying if strlen(s) is less than 32 characters, let's
just copy at most 31 characters regardless of the size of
serial#. This will guarantee that we always have a serial number if
serial# environment variable is set to anything.

Note that without a proper serial number, USB Command Verifier fails
our test of Device Descriptor since we will claim to have a serial
number without really providing one when requested.

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
7 years agousb: gadget: f_dfu: write req->actual bytes
Felipe Balbi [Fri, 10 Feb 2017 16:32:31 +0000 (19:32 +0300)]
usb: gadget: f_dfu: write req->actual bytes

If last packet is short, we shouldn't write req->length bytes to
non-volatile media, we should write only what's available to us, which
is held in req->actual.

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
7 years agousb: gadget: dfu: add result for handle_getstatus()
Patrick Delaunay [Fri, 16 Dec 2016 17:41:32 +0000 (18:41 +0100)]
usb: gadget: dfu: add result for handle_getstatus()

harmonize result with other handle_XXX() functions: return int for size
remove the define RET_STAT_LEN : no more necessary

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
7 years agousb: gadget: dfu: correct size for USB_REQ_DFU_GETSTATE result
Patrick Delaunay [Fri, 16 Dec 2016 17:41:31 +0000 (18:41 +0100)]
usb: gadget: dfu: correct size for USB_REQ_DFU_GETSTATE result

return the correct size for DFU_GETSTATE result (1 byte in DFU 1.1 spec)
to avoid issue in USB protocol and the variable "value" is propagated
to req->lenght as all the in the other request with answer
- DFU_GETSTATUS
- DFU_DNLOAD
- DFU_UPLOAD
Then the buffer is correctly treated in USB driver

NB: it was the only request witch directly change "req->actual"

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
7 years agousb: gadget: dfu: add functional descriptor in descriptor set
Patrick Delaunay [Thu, 8 Dec 2016 17:10:49 +0000 (18:10 +0100)]
usb: gadget: dfu: add functional descriptor in descriptor set

The "DFU descriptor set" must contain the "DFU functional descriptor"
but it is missing today in U-Boot code
(cf: DFU spec 1.1, chapter 4.2 DFU Mode Descriptor Set)
This patch only allocate buffer and copy DFU functional descriptor
after interfaces.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
7 years agousb: dwc3: gadget: Remove unused header inclusion
Vincent Tinelli [Tue, 14 Feb 2017 14:16:25 +0000 (17:16 +0300)]
usb: dwc3: gadget: Remove unused header inclusion

Remove sys_proto.h inclusion which is not used by the driver.

Signed-off-by: Vincent Tinelli <vincent.tinelli@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
7 years agoMerge branch 'master' of git://git.denx.de/u-boot-uniphier
Tom Rini [Thu, 23 Feb 2017 15:12:41 +0000 (10:12 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-uniphier

  - Fix regressions caused by the previous reworks
  - Add pin configuration support
  - Re-work SPL code
  - Update DRAM and PLL setup code
  - Enable needed configs, disable unneeded configs

7 years agoARM: uniphier: set up charge pump current for MPLL of LD11 SoC
Masahiro Yamada [Tue, 21 Feb 2017 14:00:35 +0000 (23:00 +0900)]
ARM: uniphier: set up charge pump current for MPLL of LD11 SoC

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: add simple eMMC load APIs instead of ROM API
Masahiro Yamada [Mon, 20 Feb 2017 09:34:20 +0000 (18:34 +0900)]
ARM: uniphier: add simple eMMC load APIs instead of ROM API

Re-use of routines embedded in the Boot ROM requires a function
pointer table for each SoC.  This is not nice in terms of the
maintainability in a long run.

Implement simple eMMC load APIs that are commonly used for LD11,
LD20, and hopefully future SoCs.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: enable CONFIG_CMD_CONFIG
Masahiro Yamada [Tue, 21 Feb 2017 06:09:11 +0000 (15:09 +0900)]
ARM: uniphier: enable CONFIG_CMD_CONFIG

This command is useful to see which config options are enabled on
the running U-Boot image.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: enable CONFIG_CMD_GPT
Masahiro Yamada [Fri, 17 Feb 2017 07:17:55 +0000 (16:17 +0900)]
ARM: uniphier: enable CONFIG_CMD_GPT

Enable CONFIG_CMD_GPT, keeping CONFIG_SPL_EFI_PARTITION because the
SPL for UniPhier platform does not recognize any partitions.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: disable CONFIG_SPL_DOS_PARTITION
Masahiro Yamada [Fri, 17 Feb 2017 07:17:39 +0000 (16:17 +0900)]
ARM: uniphier: disable CONFIG_SPL_DOS_PARTITION

The SPL for UniPhier platform does not recognize any partitions.
Do not compile unneeded features.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: deassert RST_n of eMMC device for LD11/LD20
Masahiro Yamada [Fri, 17 Feb 2017 07:17:22 +0000 (16:17 +0900)]
ARM: uniphier: deassert RST_n of eMMC device for LD11/LD20

For LD11 and LD20 SoCs, the RST_n pin is asserted by default.  If
the EXT_CSD[162], bit[1:0] (RST_n_ENABLE) is fused, the eMMC device
would stay in the reset state until its RST_n pin is deasserted by
software.

Currently, this is cared by an ad-hoc way because the eMMC hardware
reset provider is not supported in U-Boot for now.  This code should
be re-written once the "mmc-pwrseq-emmc" binding is supported.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: add DRAM PHY clock duty adjustment for LD20 SoC
Kotaro Hayashi [Tue, 14 Feb 2017 02:39:14 +0000 (11:39 +0900)]
ARM: uniphier: add DRAM PHY clock duty adjustment for LD20 SoC

If the DRAM clock duty does not meet the allowable tolerance,
it is marked in an efuse register.  If the register is fused,
the boot code should compensate for the DRAM clock duty error.

Signed-off-by: Kotaro Hayashi <hayashi.kotaro@socionext.com>
[masahiro: simplify code, add git-log]
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: remove dram_nr_ch from board parameters
Masahiro Yamada [Thu, 16 Feb 2017 06:59:32 +0000 (15:59 +0900)]
ARM: uniphier: remove dram_nr_ch from board parameters

This parameter is redundant because we can know the number of
channels by checking if dram_ch[2].size is zero.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: rework spl_boot_device() and related code
Masahiro Yamada [Mon, 13 Feb 2017 16:24:26 +0000 (01:24 +0900)]
ARM: uniphier: rework spl_boot_device() and related code

The current implementation has ugly switch statements here and there,
and duplicates similar code.  Rework it using table lookups for SoC
data and reduce code duplication.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: move spl_boot_mode() to a separate file
Masahiro Yamada [Mon, 13 Feb 2017 16:24:25 +0000 (01:24 +0900)]
ARM: uniphier: move spl_boot_mode() to a separate file

The spl_boot_mode() is unrelated to the other code in this file.
Besides, this function is only called from common/spl/spl_mmc.c,
so it is reasonable to guard with CONFIG_SPL_MMC_SUPPORT.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: move MMC code to a separate file
Masahiro Yamada [Mon, 13 Feb 2017 16:24:24 +0000 (01:24 +0900)]
ARM: uniphier: move MMC code to a separate file

Currently, arch/arm/mach-uniphier/boot-mode/boot-mode.c is messed up
with unrelated code; there is no reason why the "mmcsetn" command
must be placed in this file.

Split out the MMC code into arch/arm/mach-uniphier/mmc-first-dev.c.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: disable CONFIG_MTD_NOR_FLASH
Masahiro Yamada [Mon, 13 Feb 2017 01:29:55 +0000 (10:29 +0900)]
ARM: uniphier: disable CONFIG_MTD_NOR_FLASH

This feature is seldom used these days on UniPhier boards.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: dts: uniphier: drop u-boot, dm-pre-reloc from system-bus pinctrl node
Masahiro Yamada [Sun, 12 Feb 2017 14:44:57 +0000 (23:44 +0900)]
ARM: dts: uniphier: drop u-boot, dm-pre-reloc from system-bus pinctrl node

Since commit 26b09c022ab6 ("ARM: uniphier: move SBC and Support Card
init code to U-Boot proper"), SPL does not need pin-mux settings for
the System Bus.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: rename second stage loader name
Masahiro Yamada [Sun, 12 Feb 2017 09:21:16 +0000 (18:21 +0900)]
ARM: uniphier: rename second stage loader name

For the memory footprint reason, the Boot ROM can not load the ARM
Trusted Firmware BL1 directly when Trusted Board Boot is enabled.
The second stage loader is Socionext's own firmware, so rename it
for clarification.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agopinctrl: uniphier: support pin configuration
Masahiro Yamada [Sun, 12 Feb 2017 09:21:15 +0000 (18:21 +0900)]
pinctrl: uniphier: support pin configuration

Support the following DT properties:
  "bias-disable"
  "bias-pull-up"
  "bias-pull-down"
  "bias-pull-pin-default"
  "input-enable"
  "input-disable"

My main motivation is to support pull up/down biasing.  For Pro5 and
later SoCs, the pupdctrl register number is the same as the pinmux
number, so this feature can be supported without having big pin
tables.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: enable generic EHCI driver for uniphier_v8_defconfig
Masahiro Yamada [Tue, 7 Feb 2017 12:25:13 +0000 (21:25 +0900)]
ARM: uniphier: enable generic EHCI driver for uniphier_v8_defconfig

The LD11 SoC is equipped with USB EHCI controllers.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: remove DRAM base address from board parameters
Masahiro Yamada [Sun, 5 Feb 2017 01:52:12 +0000 (10:52 +0900)]
ARM: uniphier: remove DRAM base address from board parameters

The base address of each DRAM channel can be calculated from other
parameters, so does not need hard-coding.  What we need is the size
of each DRAM channel and DRAM_SPARSE flag to decide the start address
of DRAM channel 1.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: update README.uniphier for latest build instruction
Masahiro Yamada [Mon, 30 Jan 2017 04:12:28 +0000 (13:12 +0900)]
ARM: uniphier: update README.uniphier for latest build instruction

Since commit c0efc3140e75 ("ARM: uniphier: change CONFIG_SPL_PAD_TO
to 128KB"), the u-boot.bin should be burned at the offset 0x20000.
I missed to update README.uniphier in that commit.  Now updating.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: print Support Card info very late
Masahiro Yamada [Mon, 20 Feb 2017 08:32:19 +0000 (17:32 +0900)]
ARM: uniphier: print Support Card info very late

Since commit 26b09c022ab6 ("ARM: uniphier: move SBC and Support Card
init code to U-Boot proper"), the System Bus is initialized by
board_init().  The show_board_info() is called from board_init_f()
by default, so the revision register of the Micro Support Card may
not be accessed at this point.  Show its revision after the System
Bus is initialized.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: skip memreserve of unused DRAM bank of LD20
Masahiro Yamada [Mon, 20 Feb 2017 08:13:32 +0000 (17:13 +0900)]
ARM: uniphier: skip memreserve of unused DRAM bank of LD20

Now the "for" loop here iterates on the detected memory banks.
It must skip unused DRAM banks.

Fixes: c995f3a3c526 ("ARM: uniphier: use gd->bd->bi_dram for memory reserve on LD20 SoC")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: correct spelling of "invalid"
Masahiro Yamada [Mon, 20 Feb 2017 03:09:00 +0000 (12:09 +0900)]
ARM: uniphier: correct spelling of "invalid"

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: skip MEMCONF ch2 parsing if CH2_DISABLE bit is set
Masahiro Yamada [Mon, 20 Feb 2017 03:10:05 +0000 (12:10 +0900)]
ARM: uniphier: skip MEMCONF ch2 parsing if CH2_DISABLE bit is set

If SG_MEMCONF_CH2_DISABLE bit is set, the DRAM channel 2 is unused.
The register settings for the ch2 should be ignored.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: revive accidentally removed dcache_disable()
Masahiro Yamada [Mon, 20 Feb 2017 05:23:37 +0000 (14:23 +0900)]
ARM: uniphier: revive accidentally removed dcache_disable()

Commit a8e6300d483d ("ARM: uniphier: refactor spl_init_board()")
accidentally dropped dcache_disable() call.  Since then, the SPL of
LD11 and LD20 failed to load U-Boot proper.

Fixes: a8e6300d483d ("ARM: uniphier: refactor spl_init_board()")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agovideo: mxsfb: Fix reset hang when videomode variable is not present
Fabio Estevam [Wed, 22 Feb 2017 13:40:22 +0000 (10:40 -0300)]
video: mxsfb: Fix reset hang when videomode variable is not present

Currently the system hangs when the 'videomode' variable is not present
and a reset command is issued:

=> setenv videomode
=> saveenv
=> reset

(Board hangs)

lcdif_power_down() assumes that the LCDIF controller has been properly
configured and enabled, which may not be true.

To fix this issue check whether panel.frameAdrs has been initialized and
in case it has not been initialized, do not continue with the LCDIF
powerdown sequence.

Tested on a imx7dsabresd board.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Anatolij Gustschin <agust@denx.de>
7 years agoMerge git://git.denx.de/u-boot-x86
Tom Rini [Wed, 22 Feb 2017 15:27:37 +0000 (10:27 -0500)]
Merge git://git.denx.de/u-boot-x86

7 years agox86: Intel MID platforms has no microcode update
Andy Shevchenko [Fri, 17 Feb 2017 13:49:00 +0000 (16:49 +0300)]
x86: Intel MID platforms has no microcode update

There is no microcode update available for SoCs used on Intel MID
platforms.

Use conditional to bypass it.

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
7 years agox86: zImage: add Intel MID platforms support
Vincent Tinelli [Fri, 17 Feb 2017 13:48:59 +0000 (16:48 +0300)]
x86: zImage: add Intel MID platforms support

Intel MID platform boards have special treatment, such as boot parameter
setting.

Assign hardware_subarch accordingly if CONFIG_INTEL_MID is set.

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Vincent Tinelli <vincent.tinelli@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
7 years agox86: Introduce INTEL_MID quirk option
Andy Shevchenko [Fri, 17 Feb 2017 13:48:58 +0000 (16:48 +0300)]
x86: Introduce INTEL_MID quirk option

Intel Mobile Internet Device (MID) platforms have special treatment in
some cases, such as CPU enumeration or boot parameters configuration.

Besides that several drivers are specifically developed for the IP
blocks found on Intel MID platforms. Those drivers will be dependent to
this option.

Here we introduce specific quirk option for such cases.

It is supposed to be selected by Intel MID platform boards, for example,
Intel Edison.

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
7 years agox86: Force 32-bit jumps in interrupt handlers
J. Tang [Fri, 10 Feb 2017 02:54:13 +0000 (21:54 -0500)]
x86: Force 32-bit jumps in interrupt handlers

Depending upon the compiler used, IRQ entries could vary in sizes. With
GCC 5.x, the code generator will use short jumps for some IRQ entries
but near jumps for others. For example, GCC 5.4.0 generates the
following:

$ objdump -d interrupt.o
<snip>
00000207 <irq_18>:
207:   6a 12                   push   $0x12
209:   eb 85                   jmp    190 <irq_common_entry>

0000020b <irq_19>:
20b:   6a 13                   push   $0x13
20d:   eb 81                   jmp    190 <irq_common_entry>

0000020f <irq_20>:
20f:   6a 14                   push   $0x14
211:   e9 7a ff ff ff          jmp    190 <irq_common_entry>

00000216 <irq_21>:
216:   6a 15                   push   $0x15
218:   e9 73 ff ff ff          jmp    190 <irq_common_entry>

This causes a problem in cpu_init_interrupts(), because the IDT setup
assumed same sizes for all IRQ entries. GCC 4.x always generated 32-bit
jumps, so this previously was not a problem.

The fix is to force 32-bit near jumps for all entries within the
inline assembly. This works for GCC 5.x, and 4.x was already using
that form of jumping.

Signed-off-by: Jason Tang <tang@jtang.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
7 years agotqma6: [cosmetic] sanitize environment defines
Markus Niebel [Fri, 3 Feb 2017 15:14:03 +0000 (16:14 +0100)]
tqma6: [cosmetic] sanitize environment defines

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
7 years agotqma6: fix rounding in env
Markus Niebel [Fri, 3 Feb 2017 15:14:02 +0000 (16:14 +0100)]
tqma6: fix rounding in env

need to add before div in mmc update scripts. Otherwise we could
write one block more ba acident

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
7 years agomx6: tqma6: add rootfsmode environment for mmc / sd
Markus Niebel [Fri, 3 Feb 2017 15:14:01 +0000 (16:14 +0100)]
mx6: tqma6: add rootfsmode environment for mmc / sd

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
7 years agomx6: tqma6: fix typo in env
Markus Niebel [Fri, 3 Feb 2017 15:14:00 +0000 (16:14 +0100)]
mx6: tqma6: fix typo in env

there was a double bracketed var ref. fix this.

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
7 years agoimx6: tqma6: rely on default setting for tftp and nfs
Markus Niebel [Fri, 3 Feb 2017 15:13:59 +0000 (16:13 +0100)]
imx6: tqma6: rely on default setting for tftp and nfs

Playing with USB-to-Ethernet dongles it turns out,
that these will not work with special settings

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
7 years agoarm: imx6: tqma6: add configurable CMA size
Markus Niebel [Fri, 3 Feb 2017 15:13:58 +0000 (16:13 +0100)]
arm: imx6: tqma6: add configurable CMA size

depending on the use case different CMA sizes are
needed for linux. Add env var to enable passing CMA size
via kernel command line

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
7 years agomtd: nand: build MXS driver for MX7 as well
Andrey Yurovsky [Fri, 10 Feb 2017 18:33:34 +0000 (10:33 -0800)]
mtd: nand: build MXS driver for MX7 as well

The i.MX7 has the same GPMI controller as i.MX6 and is covered by the MXS
driver. Tell Kconfig that we can use this driver on the MX7 platform (the MXS
driver already has the few i.MX7-specific changes needed for basic operation
and the board itself sets the pinmux correctly).

Tested on i.MX7D with the Sabre board and a NAND Flash soldered to U12.

Signed-off-by: Andrey Yurovsky <yurovsky@gmail.com>
7 years agomx6sx: udoo_neo: Enable distro boot options in config
Peter Robinson [Tue, 14 Feb 2017 13:10:12 +0000 (13:10 +0000)]
mx6sx: udoo_neo: Enable distro boot options in config

The include/configs/udoo_neo.h already includes the distro defaults
include files so it seems the board was missed in the move to the
config file, whether that in initial commit or conversion, so
enable the option now and remove duplicated settings.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
7 years agomx6sx: udoo_neo: use different load address for ramdisk
Peter Robinson [Tue, 14 Feb 2017 13:10:11 +0000 (13:10 +0000)]
mx6sx: udoo_neo: use different load address for ramdisk

The fdt_addr and ramdisk_addr_r are currently both defined to
0x83000000 and that's not going to work well for anyone. Move
the ramdisk_addr_r to 0x84000000.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
7 years agomx6sx: udoo_neo: Define the default serial console
Peter Robinson [Tue, 14 Feb 2017 13:10:10 +0000 (13:10 +0000)]
mx6sx: udoo_neo: Define the default serial console

Standard boot processes including distro boot generally expect the
default console to be defined.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Tested-by: Breno Lima <breno.lima@nxp.com>
7 years agoDrop CONFIG_ENABLE_VBOOT
Tom Rini [Sat, 18 Feb 2017 00:47:53 +0000 (19:47 -0500)]
Drop CONFIG_ENABLE_VBOOT

This is no longer used anywhere.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoARM: DRA7xx: Fix memory allocation overflow
Andrew F. Davis [Wed, 15 Feb 2017 15:16:53 +0000 (09:16 -0600)]
ARM: DRA7xx: Fix memory allocation overflow

When using early malloc the allocated memory can overflow into the SRAM
scratch space, move NON_SECURE_SRAM_IMG_END down a bit to allow more
dynamic allocation at the expense of a slightly smaller maximum image
size.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
7 years agoda850: Add instructions to copy AIS image to an MMC card
ahaslam@baylibre.com [Mon, 13 Feb 2017 17:49:40 +0000 (18:49 +0100)]
da850: Add instructions to copy AIS image to an MMC card

The da850 soc's can boot from a external mmc card, but
the AIS image should be written to the correct sector.

Add instructions to copy the AIS image to a MMC card.

Signed-off-by: Axel Haslam <ahaslam@baylibre.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoarm: am57xx: Set serial# variable
Semen Protsenko [Mon, 13 Feb 2017 17:09:37 +0000 (19:09 +0200)]
arm: am57xx: Set serial# variable

serial# variable is used to correctly display device ID in
"fastboot devices". It also can be used further for displaying device ID
in "adb devices" (should be passed as "androidboot.serialno" to kernel
cmdline, via "bootargs" variable).

Serial number generating algorithm is described at [1].

[1] http://lists.denx.de/pipermail/u-boot/2015-March/207462.html

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
7 years agoSPL: Move SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION to Kconfig
Dalon Westergreen [Sat, 11 Feb 2017 01:15:35 +0000 (17:15 -0800)]
SPL: Move SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION to Kconfig

Added SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION and
SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION to Kconfig.

Due to SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION being moved to
Kconfig the board defconfigs for db-88f6820-gp_defconfig
kc1_defconfig and sniper_defconfig need to be updated.

Signed-off-by: Dalon Westergreen <dwesterg@gmail.com>
7 years agoSPL: add support to boot from a partition type
Dalon Westergreen [Sat, 11 Feb 2017 01:15:34 +0000 (17:15 -0800)]
SPL: add support to boot from a partition type

the socfpga bootrom supports mmc booting from either a raw image
starting at 0x0, or from a partition of type 0xa2.  This patch
adds support for locating the boot image in the first type 0xa2
partition found.

Assigned a partition number of -1 will cause a search for a
partition of type CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE
and use it to find the u-boot image

Signed-off-by: Dalon Westergreen <dwesterg@gmail.com>
7 years agoarm: omap5: Fix generation of reserved-memory DT node
Andrew F. Davis [Fri, 10 Feb 2017 14:23:23 +0000 (08:23 -0600)]
arm: omap5: Fix generation of reserved-memory DT node

When the node 'reserved-memory' is not defined in the DT we fail
to add needed properties. We also fail to move 'offs' to point to
the new node. Fix these here.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agofsl_i2c.c: Fix warning on gcc-6.x
Tom Rini [Thu, 9 Feb 2017 20:40:16 +0000 (15:40 -0500)]
fsl_i2c.c: Fix warning on gcc-6.x

With gcc-6.x we see:
drivers/i2c/fsl_i2c.c:86:3: warning: ‘fsl_i2c_speed_map’ defined but not
used [-Wunused-const-variable=]

The easy way to fix this is that since we only use fsl_i2c_speed_map at
all on __M68K__ move the existing guards around slightly.

Reported-by: Thomas Schaefer <Thomas.Schaefer@kontron.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Heiko Schocher <hs@denx.de>
7 years agotools: kwboot: don't adjust destaddr when patching the image
Chris Packham [Wed, 15 Feb 2017 02:34:55 +0000 (15:34 +1300)]
tools: kwboot: don't adjust destaddr when patching the image

Commit 94084eea3bd3 ("tools: kwbimage: Fix dest addr") changed kwbimage
to do this adjustment. So now the adjustment in kwboot is not needed
(and would prevent UART booting for images generated by the new
kwbimage). Remove the destaddr adjustment in kwboot.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agotools: kwbimage: Fix unchecked return value and fd leak
Mario Six [Mon, 13 Feb 2017 09:11:55 +0000 (10:11 +0100)]
tools: kwbimage: Fix unchecked return value and fd leak

The return value of fstat was not checked in kwbimage, and in the case
of an error, the already open file was not closed. Fix both errors.

Reported-by: Coverity (CID: 155971)
Reported-by: Coverity (CID: 155969)
Signed-off-by: Mario Six <mario.six@gdsys.cc>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agoPrepare v2017.03-rc2 v2017.03-rc2
Tom Rini [Mon, 13 Feb 2017 16:47:45 +0000 (11:47 -0500)]
Prepare v2017.03-rc2

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoMerge tag 'xilinx-fixes-for-v2017.03' of git://www.denx.de/git/u-boot-microblaze
Tom Rini [Mon, 13 Feb 2017 14:35:40 +0000 (09:35 -0500)]
Merge tag 'xilinx-fixes-for-v2017.03' of git://denx.de/git/u-boot-microblaze

Xilinx fixes for v2017.03

- defconfig alignment
- Topic.nl board updates
- Minor microblaze comment fix

7 years agoi2c: sandbox: remove code snippet from Kconfig help
Masahiro Yamada [Sat, 11 Feb 2017 03:39:55 +0000 (12:39 +0900)]
i2c: sandbox: remove code snippet from Kconfig help

With the Kconfig re-sync with Linux 4.10, characters such as
'}', ';' in Kconfig help message cause warnings:

$ make defconfig
*** Default configuration is based on 'sandbox_defconfig'
drivers/i2c/Kconfig:132:warning: ignoring unsupported character '}'
drivers/i2c/Kconfig:132:warning: ignoring unsupported character ';'

Drop the Device Tree fragment from the help.

Acked-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agokconfig: re-sync with Linux 4.10
Masahiro Yamada [Sat, 11 Feb 2017 03:39:54 +0000 (12:39 +0900)]
kconfig: re-sync with Linux 4.10

Re-sync all files under the scripts/kconfig directory with
Linux 4.10.

Some parts include U-Boot own modification.  I made sure to not
revert the following commits:

 5b8031ccb4ed ("Add more SPDX-License-Identifier tags")
 192bc6948b02 ("Fix GCC format-security errors and convert sprintfs.")
 da58dec86616 ("Various Makefiles: Add SPDX-License-Identifier tags")
 20c20826efab ("Kconfig: Enable usage of escape char '\' in string values")

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoflash: compile common/flash.c iif CONFIG_MTD_NO_FLASH is enabled
Masahiro Yamada [Sat, 11 Feb 2017 13:43:55 +0000 (22:43 +0900)]
flash: compile common/flash.c iif CONFIG_MTD_NO_FLASH is enabled

The whole of common/flash.c is guarded by #if defined() ... #endif.
Move the conditional to common/Makefile.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoflash: complete CONFIG_SYS_NO_FLASH move with renaming
Masahiro Yamada [Sat, 11 Feb 2017 13:43:54 +0000 (22:43 +0900)]
flash: complete CONFIG_SYS_NO_FLASH move with renaming

We repeated partial moves for CONFIG_SYS_NO_FLASH, but this is
not completed. Finish this work by the tool.

During this move, let's rename it to CONFIG_MTD_NOR_FLASH.
Actually, we have more instances of "#ifndef CONFIG_SYS_NO_FLASH"
than those of "#ifdef CONFIG_SYS_NO_FLASH".  Flipping the logic will
make the code more readable.  Besides, negative meaning symbols do
not fit in obj-$(CONFIG_...) style Makefiles.

This commit was created as follows:

[1] Edit "default n" to "default y" in the config entry in
    common/Kconfig.

[2] Run "tools/moveconfig.py -y -r HEAD SYS_NO_FLASH"

[3] Rename the instances in defconfigs by the following:
  find . -path './configs/*_defconfig' | xargs sed -i \
  -e '/CONFIG_SYS_NO_FLASH=y/d' \
  -e 's/# CONFIG_SYS_NO_FLASH is not set/CONFIG_MTD_NOR_FLASH=y/'

[4] Change the conditionals by the following:
  find . -name '*.[ch]' | xargs sed -i \
  -e 's/ifndef CONFIG_SYS_NO_FLASH/ifdef CONFIG_MTD_NOR_FLASH/' \
  -e 's/ifdef CONFIG_SYS_NO_FLASH/ifndef CONFIG_MTD_NOR_FLASH/' \
  -e 's/!defined(CONFIG_SYS_NO_FLASH)/defined(CONFIG_MTD_NOR_FLASH)/' \
  -e 's/defined(CONFIG_SYS_NO_FLASH)/!defined(CONFIG_MTD_NOR_FLASH)/'

[5] Modify the following manually
  - Rename the rest of instances
  - Remove the description from README
  - Create the new Kconfig entry in drivers/mtd/Kconfig
  - Remove the old Kconfig entry from common/Kconfig
  - Remove the garbage comments from include/configs/*.h

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoMerge git://git.denx.de/u-boot-samsung
Tom Rini [Sat, 11 Feb 2017 15:38:40 +0000 (10:38 -0500)]
Merge git://git.denx.de/u-boot-samsung

7 years agoMerge git://git.denx.de/u-boot-rockchip
Tom Rini [Sat, 11 Feb 2017 15:38:21 +0000 (10:38 -0500)]
Merge git://git.denx.de/u-boot-rockchip

7 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>
7 years agoconfigs/topic_miami.h: Correct kernel_size in default environment
Mike Looijmans [Tue, 17 Jan 2017 14:28:24 +0000 (15:28 +0100)]
configs/topic_miami.h: Correct kernel_size in default environment

The kernel partition in QSPI is 0x440000 large, not 0x400000. Fix this
in the environment, otherwise the kernel will fail to boot if it occupies
more space.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agotopic_miami(plus) defconfig: Enable DFU RAM support
Mike Looijmans [Tue, 17 Jan 2017 14:28:23 +0000 (15:28 +0100)]
topic_miami(plus) defconfig: Enable DFU RAM support

Allow sending firmware to RAM. Without this, the DFU support was not
of much use.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agotopic_miami_defconfig: Remove NFS and NET support
Mike Looijmans [Wed, 18 Jan 2017 08:27:46 +0000 (09:27 +0100)]
topic_miami_defconfig: Remove NFS and NET support

On the miami board, ethernet is accessed via logic. To use it, one
would have to program logic first and then set up the rgmii conversion
block as well. Not likely to ever be used, so disable network support
by default to save some space.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoxilinx: Align defconfig with current Kconfig order
Michal Simek [Fri, 10 Feb 2017 12:57:35 +0000 (13:57 +0100)]
xilinx: Align defconfig with current Kconfig order

Keep all defconfig sorted to ensure the smallest diff.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoexynos: Drop large alignment for SDRAM parameters
Simon Glass [Wed, 8 Feb 2017 12:43:46 +0000 (05:43 -0700)]
exynos: Drop large alignment for SDRAM parameters

We don't ever search for these so there is no need for a 4KB alignment.
It just wastes space.

Drop this and use the standard 4-byte alignment.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
7 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Tom Rini [Thu, 9 Feb 2017 19:54:09 +0000 (14:54 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-video

7 years agorockchip: rename miniarm to tinker board
Eddie Cai [Wed, 18 Jan 2017 03:03:54 +0000 (11:03 +0800)]
rockchip: rename miniarm to tinker board

Miniarm is the internal project code. Now it is officially named Tinker board.
So rename it.

Signed-off-by: Eddie Cai <eddie.cai@rock-chips.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agorockchip: Enable ETH address randomization for the firefly-rk3288
Romain Perier [Tue, 17 Jan 2017 09:32:25 +0000 (10:32 +0100)]
rockchip: Enable ETH address randomization for the firefly-rk3288

This commit enables ethernet MAC address randomization on the
firefly-rk3288. It removes the error at startup 'ethernet@ff290000
address not set'.

Signed-off-by: Romain Perier <romain.perier@collabora.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agorockchip: firefly: configs: use spl back to brom
Jacob Chen [Tue, 17 Jan 2017 04:19:39 +0000 (12:19 +0800)]
rockchip: firefly: configs: use spl back to brom

Keep it same with other boards otherwise i have to write special script for it..

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agorockchip: configs: move env offset to common header
Jacob Chen [Tue, 17 Jan 2017 04:19:38 +0000 (12:19 +0800)]
rockchip: configs: move env offset to common header

To reduce redundant code.

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agorockchip: Correct MAINTAINER entry for chromebook_minnie
Simon Glass [Sat, 14 Jan 2017 17:26:08 +0000 (10:26 -0700)]
rockchip: Correct MAINTAINER entry for chromebook_minnie

This is wrong at present, so genboardscfg.py gives the following warnings:

WARNING: no status info for 'chromebook_minnie'
WARNING: no maintainers for 'chromebook_minnie'

Fix it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agorockchip: dts: rk3288: correct sdram setting for miniarm
Jacob Chen [Tue, 15 Nov 2016 04:01:47 +0000 (12:01 +0800)]
rockchip: dts: rk3288: correct sdram setting for miniarm

miniarm board use lpddr3

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Acked-by: Simon Glass <sjg@chromium.org>
Added 'rockchip:' prefix to subject:
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: I84c3679dab2dbd8d01c1ebfd22220946d07c03cd

7 years agoomap_hsmmc.c: Fix build warning on non-omap3
Tom Rini [Thu, 9 Feb 2017 18:41:28 +0000 (13:41 -0500)]
omap_hsmmc.c: Fix build warning on non-omap3

It was incorrect to always include "asm/arch-omap3/mux.h" constantly.
This introduced warnings on non-omap3 where certain values will conflict
between the various families.  Conditionally guard the inclusion in
order to correct the problem.

Fixes: 6aca17c9b7e8 ("drivers: mmc: omap_hsmmc: Fix IO Buffer on OMAP36xx")
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Tom Rini [Thu, 9 Feb 2017 16:56:35 +0000 (11:56 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-net

7 years agoMerge branch 'master' of git://git.denx.de/u-boot-mmc
Tom Rini [Thu, 9 Feb 2017 16:56:19 +0000 (11:56 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-mmc

7 years agoomap3_logic: Switch to simple malloco in SPL
Tom Rini [Thu, 9 Feb 2017 16:55:57 +0000 (11:55 -0500)]
omap3_logic: Switch to simple malloco in SPL

To save more space, switch to simple malloc here.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoqemu-x86_64_defconfig: Disable CONFIG_BOARD_EARLY_INIT_F
Tom Rini [Thu, 9 Feb 2017 13:52:18 +0000 (08:52 -0500)]
qemu-x86_64_defconfig: Disable CONFIG_BOARD_EARLY_INIT_F

The qemu-x86* targets do not want to enable this.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agommc: init mmc block devices on probe
Fiach Antaw [Wed, 25 Jan 2017 09:00:24 +0000 (19:00 +1000)]
mmc: init mmc block devices on probe

MMC devices accessed exclusively via the driver model were not
being initialized before being exposed as block devices, causing
issues in scenarios where the MMC device is first accessed via the
uclass block interface.

Signed-off-by: Fiach Antaw <fiach.antaw@uqconnect.edu.au>
7 years agodrivers: mmc: omap_hsmmc: Fix IO Buffer on OMAP36xx
Adam Ford [Mon, 6 Feb 2017 17:31:43 +0000 (11:31 -0600)]
drivers: mmc: omap_hsmmc: Fix IO Buffer on OMAP36xx

On the OMAP36xx/37xx the CONTROL_WKUP_CTRL register has
a field (bit 6) named GPIO_IO_PWRDNZ.  If 0, the IO buffers which
are related to GPIO_126, 127 and 129 are disabled. Some boards may
need this for MMC. After the PBIAS is configured, this bit should
be set high to enable these GPIO pins.

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agommc: ftsdc021_sdhci: remove the ftsdc021_sdhci.c
Jaehoon Chung [Thu, 2 Feb 2017 10:33:36 +0000 (19:33 +0900)]
mmc: ftsdc021_sdhci: remove the ftsdc021_sdhci.c

ftsdc021_sdhci.c is dead file.
There is no reason to maintain this host controller.
Removes the entire ftsdc021_sdhci.c.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agommc: mmc-uclass: use the fixed devnum with alias node
Jaehoon Chung [Thu, 2 Feb 2017 04:41:14 +0000 (13:41 +0900)]
mmc: mmc-uclass: use the fixed devnum with alias node

If there are alias nodes as "mmc", use the devnum as alias index
number.
This patch is for fixing a problem of Exynos4 series.
Problem is the below thing.

Current legacy mode:
EXYNOS DWMMC: 0, SAMSUNG SDHCI: 1

After using DM:
SAMSUNG SDHCI: 0, EXYNOS DWMMC: 1

Dev index is swapped.
Then u-boot can't find the kernel image..because it is already set to 0 as mmcdev.
If change from legacy to DM, also needs to touch all exynos4 config file.
For using simply, just supporting the fixed devnum with alias node is better than it.

Usage:
alaise {
....
mmc0 = &sdhci2; /* eMMC */
mmc1 = &sdhci1; /* SD */
...
}

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoarm: dts: trats: add the pmic node for using DM
Jaehoon Chung [Thu, 2 Feb 2017 08:04:10 +0000 (17:04 +0900)]
arm: dts: trats: add the pmic node for using DM

To use driver-model adds the pmic node for max8997.
This is used as kernel device-tree in Linux.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agopower: pmic: add the max8997 controller for DM
Jaehoon Chung [Thu, 2 Feb 2017 08:04:09 +0000 (17:04 +0900)]
power: pmic: add the max8997 controller for DM

Add the max8997 controller for Driver model.
Exynos4210 is using max8997 pmic controller.
(pmic_max8997.c should be deprecated.)

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoMerge branch 'master' of git://git.denx.de/u-boot-socfpga
Tom Rini [Thu, 9 Feb 2017 03:04:32 +0000 (22:04 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-socfpga

7 years agonet: phy: MSCC Add Support for VSC8530-VSC8531-VSC8540-VSC8541
John Haechten [Fri, 9 Dec 2016 22:15:17 +0000 (22:15 +0000)]
net: phy: MSCC Add Support for VSC8530-VSC8531-VSC8540-VSC8541

Signed-off-by: John Haechten <john.haechten@microsemi.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>