Commit Graph

46862 Commits

Author SHA1 Message Date
Otavio Salvador
8a23070998
Merge pull request #23 from texierp/2017.11+fslc
pico-imx7d: configs: enable CONFIG_CMD_FS_GENERIC
2018-04-05 16:18:39 -03:00
Pierre-Jean TEXIER
d5a3595e13 pico-imx7d: configs: enable CONFIG_CMD_FS_GENERIC
This enable generic file system commands in
pico-imx7d_secure_defconfig.

Since commit 85cdf96, 'load' command is used instead of 'fatload'.

Signed-off-by: Pierre-Jean TEXIER <texier.pj2@gmail.com>
2018-04-05 18:53:52 +02:00
Otavio Salvador
a07698f0bf
Merge pull request #22 from texierp/warp7-load-command
warp7: update defconfig to support the generic loading interface
2018-03-19 18:01:59 -03:00
Pierre-Jean TEXIER
a6311829c1 warp7: update defconfig to support the generic loading interface
Added the 'load' command (loading from the ext4 partition, i.e '/boot')

Signed-off-by: Pierre-Jean TEXIER <texier.pj2@gmail.com>
2018-03-19 21:38:55 +01:00
Jagan Teki
ca0c3f3fac configs: icore-rqs: Enable falcon mode
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
(cherry picked from commit 5451ca4da9)
2017-11-27 10:25:35 -02:00
Jagan Teki
c39e5ad9ad engicam: imx6q: Return mmc dev 0 for icore
icorem6 has sd on usdhci1 which is devno 0 so return proper
devno from board_mmc_get_env_dev for icorem6 and icorem_6rqs

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
(cherry picked from commit b596df4567)
2017-11-27 10:25:35 -02:00
Jagan Teki
7953884755 i.MX6: engicam: Add imx6q/imx6ul boards for existing boards
Add new board names for existing board support
imx6q - icore and icore_rqs boards
imx6ul - geam6ul and isiot boards

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
(cherry picked from commit 52aaddd6f4)
2017-11-27 10:25:35 -02:00
Jagan Teki
924ac4a9ac board: icore-rqs: Fix mmc get env device
As per USDHC boot eFUSE descriptions:
USDHC3 => devno 2
USDHC4 => devno 3

Linux will detect mmc0, mmc1, mmc2 based on the status
"okay" on usdhc so imx6qdl-icore-rqs.dtsi has enabled
usdhc1, usdhc3 and usdhc4.But U-Boot can detect based
on the aliases so add mmc1, mmc2 for usdhc3 and usdhc4
respectively and return the board_mmc_get_env_dev
by subtracting -1

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
(cherry picked from commit 539b1e228f)
2017-11-27 10:25:35 -02:00
Jagan Teki
1caace2d74 i.MX6UL: icore: Add SPL_OF_CONTROL support
Add OF_CONTROL support for SPL code.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
(cherry picked from commit 152038ea18)
2017-11-27 10:25:35 -02:00
Jagan Teki
655f153b7c pinctrl: imx6ul: Fix pinctrl data overlapped with DT area
before relocation pinctrl data BSS is overlapping DT area,
when .data is using uninitialized global variable,
imx6_pinctrl_soc_info. So assign them flags ZERO_OFFSET_VALID
to prevent BSS overlap

Suggested-by: Lokesh Vutla <lokeshvutla@ti.com>
Reported-by: Jagan Teki <jagan@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
(cherry picked from commit bb0297ccbd)
2017-11-27 10:25:35 -02:00
Jagan Teki
735b8429cf i.MX6Q: icore: Add SPL_OF_CONTROL support
Add OF_CONTROL support for SPL code.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
(cherry picked from commit 1f6e9bd2a7)
2017-11-27 10:25:35 -02:00
Jagan Teki
e2aee01772 i.MX6Q: icorem6: Move spl load fit to common/spl
Move spl load fit code into common/spl

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
(cherry picked from commit a1797beed2)
2017-11-27 10:25:35 -02:00
Jagan Teki
7265424b4b i.MX6: engicam: Move set_fdt_file to common
setenv_fdt_file to common code and set dtb based on
CONFIG_DEFAULT_DEVICE_TREE and cpu_type.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
(cherry picked from commit 409b16d3e0)
2017-11-27 10:25:35 -02:00
Fabio Estevam
676484d0f5 mx6sxsabresd: Use PARTUUID to specify the rootfs location
mx6sxsabresd can run different kernel versions, such as NXP 4.1 or mainline.

Currently the rootfs location is passed via mmcblk number and the
problem with this approach is that the mmcblk number for the SD
card changes depending on the kernel version.

In order to avoid such issue, use the UUID method to specify the
rootfs location.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
(cherry picked from commit f086812acd)
2017-11-27 10:25:35 -02:00
Fabio Estevam
c685436fb6 imx: Remove boolean parameter from wdog powerdown function
imx_set_wdog_powerdown() is always used to disable the power down
enable bit, so remove the boolean parameter of the function.

It is also a bit strange to write a boolean value into registers,
so this new version makes explicit that we are writing 0.

While at it, rename it to imx_wdog_disable_powerdown().

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
(cherry picked from commit e2162d709f)
2017-11-27 10:25:34 -02:00
Fabio Estevam
dfd399d4b2 imx: Also clear powerdown enable bit for WDOG3 on i.MX6ULL
Clear powerdown enable bit for WDOG3 on i.MX6ULL to avoid unwanted
kernel reboots.

Suggested-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
(cherry picked from commit b42287f4c9)
2017-11-27 10:25:34 -02:00
Fabio Estevam
21e5b103ee mx6ull: Fix WDOG3 base address
i.MX6ULL has the same WDOG3 base address as i.MX6UL, so take this
into account in the base address definition.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
(cherry picked from commit 23ecca2cd8)
2017-11-27 10:25:34 -02:00
Stefan Agner
28a06c12ca envtools: make sure version/timestamp header file are available
With commit 84d46e7e89 ("tools: env: allow to print U-Boot version")
the fw_env utilities need the version.h header file. Building only
the envtools in a pristine build directory will fail due to missing
header files.

Make sure the header files are a dependency of the envtools target.

Fixes: 84d46e7e89 ("tools: env: allow to print U-Boot version")
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Tested-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
(cherry picked from commit ded84f90a1)
2017-11-21 16:52:56 -02:00
Fabio Estevam
5a3afcb579 mx6sabreauto: Remove unneeded SPL selection
SPL option is already selected via Kconfig, so remove it from the
CONFIG_SYS_EXTRA_OPTIONS line.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
(cherry picked from commit 4684aa7988)
2017-11-20 09:03:07 -02:00
Fabio Estevam
a80c8e3c7a mx6: Select MX6QDL option via Kconfig
Currently the MX6QDL option is selected via CONFIG_SYS_EXTRA_OPTIONS,
but it is better to select it directly via Kconfig.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
(cherry picked from commit 74da017a49)
2017-11-20 09:02:28 -02:00
Peter Senna Tschudin
7c9d795887 mx53: Add Board support for GE PPD
Create board support for GE PPD, based on mx53loco.

Use mx53ppd_defconfig make target to configure for this board.

Signed-off-by: Peter Senna Tschudin <peter.senna@collabora.com>
Signed-off-by: Ian Ray <ian.ray@ge.com>
Signed-off-by: Nandor Han <nandor.han@ge.com>
Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Stefano Babic <sbabic@denx.de>
(cherry picked from commit 6b0071c110)
2017-11-20 09:01:04 -02:00
Martyn Welch
a7dbf3c3a4 board: ge: make VPD code common
The VPD data is used on a number of GE products. Move the parsing code to
a common location so that we can share this code.

Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
Acked-by: Stefano Babic <sbabic@denx.de>
(cherry picked from commit b418dfe16e)
2017-11-20 09:01:04 -02:00
Nandor Han
fd7ab796b5 rtc: add support for s35392a
Add support for S35392A RTC. The driver supports both U-Boot driver
models.

Signed-off-by: Nandor Han <nandor.han@ge.com>
Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
Cc: Heiko Schocher <hs@denx.de>
(cherry picked from commit da5337a61c)
2017-11-20 09:01:04 -02:00
Ian Ray
efc51f73e3 bootcount: add support for bootcounter on EXT filesystem
Add support for bootcounter on an EXT filesystem.
Sync configuration whitelist.

Signed-off-by: Ian Ray <ian.ray@ge.com>
Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
(cherry picked from commit f31dac4e6e)
2017-11-20 09:01:04 -02:00
Martyn Welch
8b0c1c4d23 arm: mx5: Add more register definitions
Add register definitions require for video configuration.

Signed-off-by: Nandor Han <nandor.han@ge.com>
Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
Reviewed-by: Stefano Babic <sbabic@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Reviewed-by: Stefano Babic <sbabic@denx.de>
(cherry picked from commit 54d8d4942f)
2017-11-20 09:01:04 -02:00
Martyn Welch
29e5e9df46 pwm: imx: Enable PWM support on i.MX53
Add missing parts for i.MX53 PWM support

Acked-by: Nandor Han <nandor.han@ge.com>
Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Stefano Babic <sbabic@denx.de>
(cherry picked from commit 065a1ece7a)
2017-11-20 09:01:04 -02:00
Ian Ray
02cc3e8037 ext4: recover from filesystem corruption when reading
Some fixes when reading EXT files and directory entries were identified
after using e2fuzz to corrupt an EXT3 filesystem:

 - Stop reading directory entries if the offset becomes badly aligned.

 - Avoid overwriting memory by clamping the length used to zero the buffer
   in ext4fs_read_file.  Also sanity check blocksize.

Signed-off-by: Ian Ray <ian.ray@ge.com>
Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
Reviewed-by: Stefano Babic <sbabic@denx.de>
(cherry picked from commit ecdfb4195b)
2017-11-20 09:01:04 -02:00
Nandor Han
4c530ec27c imx: mxc_i2c: tweak the i2c transfer method
Tweak the i2c transfer to work for devices that want to read data
without addressing a register.

Signed-off-by: Nandor Han <nandor.han@ge.com>
Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
Acked-by: Heiko Schocher <hs@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
(cherry picked from commit 2feec4eafd)
2017-11-20 09:01:03 -02:00
Fabio Estevam
87d4563bbd Revert "wandboard: Remove unnecessary delay"
This reverts commit b8b9790e23.

Some wandboard variants no longer boot after this commit, so keep
the original delay to avoid the boot regression.

Reported-by: Varga Zsolt <vazso@vazso.hu>
Tested-by: Varga Zsolt <vazso@vazso.hu>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
(cherry picked from commit 401cabc287)
2017-11-20 09:01:03 -02:00
Fabio Berton
913c93d432 pico-imx6ul: Use FS_GENERIC load command
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit 2566c4f698)
2017-11-20 09:01:03 -02:00
Fabio Berton
bd7c72d0e2 pico-imx6ul: Add function to create gpt partitions
Command run setup_emmc will create gpt partitions for mmc 0 device
based on patitions variable.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit ebbdeb2a10)
2017-11-20 09:01:03 -02:00
Fabio Berton
1bd87551eb pico-imx6ul: Define partition layout in the environment
Create layout with a boot 16MiB partition and rootfs with remain
space.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
(cherry picked from commit db430cd479)
2017-11-20 09:01:03 -02:00
Fabio Berton
6d2499a223 pico-imx6ul: Add boot and rootfs dfu_alt_info
Change dfu_alt_info variable to use the following altsetting:

  uboot:                     To flash raw U-Boot
  /zImage: boot:             To copy kernel image
  /imx6ul-pico-hobbit.dtb:   To copy dtb file
  rootfs:                    To copy rootfs

List the currently attached DFU capable USB devices running:
  sudo dfu-util -l

Flash U-Boot:
  sudo dfu-util -D u-boot.imx -a uboot

Copy boot files:
  sudo dfu-util -D zImage -a /zImage
  sudo dfu-util -D imx6ul-pico-hobbit.dtb -a /imx6ul-pico-hobbit.dtb

Flash rootfs:
  sudo dfu-util -D rootfs.ext4 -a rootfs

To copy boot files you need to have a formated mmc 0:1 partition. To
format with ext4 filesystem you can use ums.

Run on target:
  ums 0 mmc 0

and on host:
  sudo mkfs.ext4 /dev/sdx1

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit d93ab9b166)
2017-11-20 09:01:03 -02:00
Fabio Berton
114501165b pico-imx6ul: Use PARTUUID to specify the rootfs location
Currently the rootfs location is passed via mmcblk number and using
the UUID method to specify the rootfs location is a better approach
working even if mmcblk number for the eMMC changes depending on the
kernel versions.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
(cherry picked from commit 65551e389a)
2017-11-20 09:01:03 -02:00
Fabio Berton
9a6f8019f6 pico-imx6ul: Move dfu_alt_info to CONFIG_DFU_ENV_SETTINGS variable
Create CONFIG_DFU_ENV_SETTINGS to set dfu environment settings to
improve human readable code.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
(cherry picked from commit 9cc71cfa11)
2017-11-20 09:01:03 -02:00
Otavio Salvador
0b20df36bc mx25pdk: Change root to use a single partition layout
This allow for use of wic images as generated by the wic tool inside
the OpenEmbedded.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2017-11-14 15:05:17 -02:00
Vanessa Maegima
2dcd3eeeff pico-imx7d: Enable booting from single partition
Update 'fdt_file' and 'image' location and change rootfs mmc partition
in 'finduuid' to support booting from a single partition.

Signed-off-by: Vanessa Maegima <vanessa.maegima@nxp.com>
2017-11-14 15:05:17 -02:00
Vanessa Maegima
d6008b2e1a pico-imx7d: Replace fatload command
Replace fatload with the fs generic loading interface ('load' command).

Signed-off-by: Vanessa Maegima <vanessa.maegima@nxp.com>
2017-11-14 15:05:17 -02:00
Vanessa Maegima
7fe81082a3 pico-imx7d: Add support for secure boot
Add a new defconfig to enable secure boot on pico-imx7d.

Signed-off-by: Vanessa Maegima <vanessa.maegima@nxp.com>
2017-11-14 15:05:17 -02:00
Fabio Estevam
f960fe77df mx6sabre_common: Place video related settings in common code
Currently mx6sabreauto fails to find the environment variables like this:

## Error: "findfdt" not defined
switch to partitions #0, OK
mmc0 is current device
## Error: "loadbootscript" not defined
## Error: "loadimage" not defined
## Error: "netboot" not defined

Move VIDEO_ARGS/VIDEO_ARGS_SCRIPT so that they can be shared among sabresd
and sabreauto boards.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2017-11-14 15:05:17 -02:00
Fabio Estevam
f4998c99d4 mx6sabre_common: Dynamically change the video output
Use the 'hdmidetect' command in U-boot to load the appropriate
video arguments. If HDMI is connected during boot then make HDMI
as the primary framebuffer, otherwise let LVDS be the primary framebuffer.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2017-11-14 15:05:17 -02:00
Nikolay Dimitrov
c3e252e8ca mx6sabresd: Enable video interfaces in bootargs
Generate kernel video bootargs for sabresd, based on a list of needed video
interfaces ("video_interfaces" U-Boot env-var). The order of initialization
and video settings can be fully customized.

Signed-off-by: Nikolay Dimitrov <picmaster@mail.bg>
2017-11-14 15:05:17 -02:00
Otavio Salvador
c94a211847 mx6sabresd: Use LDO dtb file until LDO bypass support is added
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2017-11-14 15:05:17 -02:00
Otavio Salvador
3abd094faf mx6slevk: Use LDO dtb file until LDO bypass support is added
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2017-11-14 15:05:16 -02:00
Tom Rini
c253573f3e Prepare v2017.11
Signed-off-by: Tom Rini <trini@konsulko.com>
2017-11-13 20:08:06 -05:00
Soeren Moch
be135cc5eb Revert "console: simplify puts()"
This reverts commit c61d0009fe.

A tbs2910 board user reported a very slow console frambuffer as
regression in current u-boot. I could bisect this down to the
above mentioned commit.

This revert brings back the fast framebuffer console (one
cache flush per string in puts(), not after each char).

Reported-by: Uwe Scheffler <scheffler.u@web.de>
Signed-off-by: Soeren Moch <smoch@web.de>
Tested-by: Uwe Scheffler <scheffler.u@web.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
2017-11-12 16:18:16 -05:00
Angelo Dureghello
ae147ab4a8 board: sysam: stmark2: add missing environment location
Signed-off-by: Angelo Dureghello <angelo@sysam.it>
2017-11-12 16:18:16 -05:00
Marek Vasut
2bfd43e550 ARM: rmobile: Fix eMMC signal voltage on Salvator-X/XS
The eMMC is 1V8 device only and the signaling is always 1V8,
fix the DT for Salvator-X/XS to describe the hardware correctly.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2017-11-12 16:17:31 -05:00
Tom Rini
66bd5a3ebb Merge git://git.denx.de/u-boot-sunxi 2017-11-10 10:04:21 -05:00
Werner Böllmann
8e2c2d413c sunxi: SATA link timeout fix
After updating u-boot from v2016.01 to 2017.09, issue with
"SATA link 0 timeout." on my Cubietruck board.

mdelay milled after moving satapwr code to board.
"sunxi: Turn satapwr on from board_init"
(sha1: 9fbb0c3aa4)

After adding the "mdelay(500);"
line that was lost in the path the error is gone.

Signed-off-by: Werner Böllmann <Werner.Boellmann@fh-dortmund.de>
[Rebased and updated change and commit message]
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
2017-11-10 19:21:24 +05:30