| Commit message (Collapse) | Author | Age | Lines |
|
|
|
|
|
| |
change the qspi u-boot to set the mmcdev args in default setting.
Signed-off-by: Allen Xu <b45815@freescale.com>
|
|
|
|
|
|
|
| |
Disable RDC in u-boot till kernel implements it. Otherwise, crash
may happen in kernel.
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
| |
Since the M4 image position is changed to 0x78000000 the QSPI2_B1 flash.
The "sf probe" command used in M4 updating and booting script should be changed
to "sf probe 1:0".
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Support M4 boot in 50 ms, kick start M4 at "board_early_init_f" stage
where u-boot passes ARM and architecture initialization.
Add a configuration "CONFIG_SYS_AUXCORE_FASTUP" for this feature
enablement. And a build config "mx6sxsabresd_m4fastup".
Adjust the default M4 image address to 0x78000000 represented by
"CONFIG_SYS_AUXCORE_BOOTDATA".
When M4 fast boot is enabled, RDC must be enabled together and
the QSPI driver must turn off. Because M4 is running on QSPI flash
in XIP. Setup this relationship by configurations.
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add the board configurations and BSP support for boot devices NAND,
SPI-NOR or EIMNOR.
Since the pins conflicts of the devices on ARM2, only support boot
features on limited reworked boards as below:
NAND Boot: mx6sx_17x17_arm2_nand
SPI-NOR Boot: mx6sx_19x19_ddr3_arm2_spinor and
mx6sx_17x17_arm2_spinor
EIM-NOR Boot: mx6sx_19x19_ddr3_arm2_eimnor
The conflicts:
QSPI --- NAND pin conflict
QSPI --- SPI-NOR u-boot driver conflict
SPI-NOR --- SD2 pin conflict
WEIM-NOR --- NAND and QSPI pin conflict
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
| |
Since MX6 is Cortex-A9 r2p10, enable software workaround
for errata 794072 and 761320.
Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
|
|
|
|
|
|
|
|
|
|
| |
Use "bootaux 0x70000000" to boot the M4 from QSPI 0x70000000.
The first two word at 0x70000000 must be the stack and pc for the iMX6SX.
Add two scripts in environment to boot M4 "m4boot" and update M4 image
from SD card "update_m4_from_sd"
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
| |
Add imximage_lpddr2.cfg for DDR controller settings of LPDDR2.
Change the folder and files name of "mx6sx_19x19_ddr3_arm2" to
"mx6sx_19x19_arm2" to be shared by LPDDR2 ARM2 board and DDR3 ARM2
board.
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
|
| |
Debug monitor will print out last failed AXI access info when
system reboot is caused by AXI access failure, only works when
debug monitor is enabled.
Enable this module on i.MX6SX.
Signed-off-by: Anson Huang <b20788@freescale.com>
|
|
|
|
|
|
|
| |
Add BSP codes to mx6sxsabresd to support android uboot features:
fastboot, booti and recovery
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add two configurations "CONFIG_QSPI_BASE" and "CONFIG_QSPI_MEMMAP_BASE"
for QSPI registers base and AHB memory base. So the driver is independent
from QSPI2. Use "bus" and "cs" parameters to denote 4 flash chip connected
on one QuadSPI:
SFA1: bus 0, cs 0
SFA2: bus 0, cs 1
SFB1: bus 1, cs 0
SFB2: bus 1, cs 1
Currently in uboot, the SPI flash framework does not have way to notify the
flash size to the driver. It brings a problem for QSPI driver to set the memory
map space of each chip. In this patch, we fix the mem map space of each chip
to 64MB(total is 256MB). So for flash larger than 64MB, driver only support
low 64MB.
Because u-boot SPI flash framework only supports 24bits address (16MB), the 64MB
limitation in driver is ok to work in u-boot.
Clean up the spi_xfer and spi read. Divide read to "IP read" and "AHB read".
In current implementation, the IPCR is still filled even reading from AHB
memory. This causes QSPI to read from flash twice, one to IP buffer, the
other to the AHB buffer.
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
| |
Adding BSP for iMX6SoloX SDB board, enable I2C1, I2C2, ENET,
USB OTG1 & OTG2, SD2, SD3, SD4, Serial, QSPI2 and PMIC.
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
| |
mfgtools download dt file to 83000000
mfgtools download initramfs file to 83800000
because initramfs size is big and variable,
dt file may overwrited by initramfs if use 84000000
Signed-off-by: Frank Li <Frank.Li@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change to check READY bit in BD, not check the TDAR. On iMX6SX, FEC will
clear the TDAR prior than the READY bit of last BD. Since fec driver only
prepare two BD for transmit, this cause the BD send failed at the third
packet.
On iMX6SX, we disabled DCACHE to workaround for this issue. Now change to
enable the DCACHE.
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
|
| |
1. Enable FEC ENET
2. Add USB Host support for OTG1. OTG2 has pin conflicts with PWM and WDOG
So disable it.
3. Add Read/write support for USDHC2(SDA) and USDHC4(eMMC) ports on 17x17.
4. Put Env variables to QSPI flash when boots from QSPI
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
iMX6SX has different enet system clocks with iMX6SL, and has two ENET
controllers. So update clocks and soc APIs accordingly to support this
features.
1. Modify the clock API "enable_fec_clock" to enable enet system clock
for each enet controller.
2. Enet RGMII TX clock source may come from external or internal PLL.
By default, use the external phy CLK_25M output as TX clock source.
Add a configuration "CONFIG_FEC_CLOCK_FROM_ANATOP" for using internal
PLL
3. Add clock API "fec_set_rate" to set the RGMII clocks from internal PLL.
4. Modify the MAC address function "imx_get_mac_from_fuse" to get either
ENET MAC address.
5. Add clock API "enable_fec_25m_clock" to enable ENET 25Mhz reference clock.
6. Modify 17x17 arm2 BSP and imx6slevk BSP to fit the new APIs.
Signed-off-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
| |
Add support for the MX6SX:19x19 ARM2 board.
Created a common config file for imx6sx 17x17 and 19x19 boards.
Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
Signed-off-by: Ranjani Vaidyanathan <Ranjani.Vaidyanathan@freescale.com>
|
|
|
|
|
|
|
|
| |
Also enable the SPI and SPI FLASH macros, as well as SF test
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Allen Xu <b45815@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
imx6 boards (sabresd, sabreauto, arm2 and slevk) have multiple SD/MMC ports to boot.
But current uboot hard code the SD/MMC port for environment variables storage. So
if customer changes a port without modifying the configuration "CONFIG_SYS_MMC_ENV_DEV",
error will issue at saving and loading environment.
Implement a mechanism to detect SD/MMC port from SRC SMBR register, and override the
default "mmc_get_env_devno". The "board_late_mmc_env_init" is used to set "mmcdev"
when booting from SD/MMC port. Finally after booting from SD/MMC, the environment storage
device and "mmcdev" are both set to current SD/MMC port. Customers don't need to re-build
the image if booting from different SD/MMC port.
This patch also adds SD1 and SD3 support to imx6slevk BSP, and adds support for sabreauto
SD1 slot on base board.
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Adding support for i.MX6SoloX 17x17 DDR3 validation
board support.
Signed-off-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Jason Liu <r64343@freescale.com>
Signed-off-by: Frank Li <Frank.Li@freescale.com>
Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
|
|
|
|
|
|
|
|
|
|
| |
Add BSP codes to support SPI NOR flash read, write and erase by using
"sf" command.
In addition, add a new configuration "mx6slevk_spinor" for building
the uboot that can be booted from SPI NOR flash and stored the
environments variables in it.
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Sabreauto board has pin conflict (pin EIM_D18) between NOR flash
and i2c3. To enable the USB host, the i2c3 must be used to operate
the max7310 IO expander to output the VBUS power.
As SPINOR is enabled at default, it is impossible to use USB host
at same time. Thus, remove the SYS_USE_SPINOR from sabreauto
configurations to disable SPINOR.
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
| |
Enable the USB EHCI for the imx6slevk board. Add VBUS control
pin settings and related BSP codes.
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
| |
Enable the USB EHCI on sabresd and arm2 boards to support USB mass
storage device.
Pins are configured in board_ehci_hcd_init for VBUS control.
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Update the ehci-mx6 driver from mainline. Drop the changes
related with usb_init_type because we don't upgrade the whole
driver framework.
The OTG controller is forced to host mode in ehci_hcd_init.
The signal on OTG ID is ignored.
Set Power polarity in CTRL register to active-high to control
the off-chip power switch.
Update USB base address to support imx6sl.
Original:
usb: ehci-mx6: add support for otg port
Previously, only host1 was supported using an index of 0.
Now, otg has index 0, host1 is 1, host2 is 2, host3 is 3.
Since OTG requires usbmode to be set after reset, I added
CONFIG_EHCI_HCD_INIT_AFTER_RESET to nitrogen6x.h and
mx6qsabreauto.h.
I also added a weak function board_ehci_power to handle
turning power on/off for otg.
Type is type of device connected (USB stick vs Host.)
Init is type of device desired.
Only power up port if type == init == USB_INIT_HOST.
Only return error if type != init.
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
(cherry picked from commit d1a5286099a1ccb43fa8599e2c806ca039783e2f)
Conflicts:
drivers/usb/host/ehci-mx6.c
|
|
|
|
|
|
|
|
|
|
|
| |
Implement simple functionalities for MAX7310 GPIO input and output.
Because MAX7310 is a off-chip device and need to co-exist with
on-chip GPIO, new APIs are added specifically for expander device.
CONFIG_MAX7310_IOEXP is used to enable the MAX7310 driver. The I2C
related configurations also need to set together.
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since the "mkbootimg" tool can't use the "unused" fields of
bootimg header, Android will set the FDT info at the "second_addr"
and "second_size" fields.
To support this change, booti command was changed to use new fields.
The memory management(lmb) is added in booti, and the relocation of
DTB and ramdisk is disabled at default, to prevent relocating to
a high address which overlaps kernel's vmalloc area.
The kernel image which needs FDT accompanied is larger than old. So in
making boot.img, suggest to set "--base" parameter enough offset from
kernel entry "0x10008000" to keep ramdisk and DTB not be overwritten by
zImage decompression. For example "--base 0x14000000"
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Enable the fuse command config "CONFIG_CMD_FUSE" and OCOTP driver
"CONFIG_MXC_OCOTP" for imx6.
Users can use "sense" and "prog" to access the fuse directly,
or use "read" and "override" to access shadow registers.
Supported boards:
mx6qdlsabresd, mx6qdlsabreauto, mx6qdlarm2, mx6slevk
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
| |
This can be useful for fuse-like hardware, OTP SoC options, etc.
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
(cherry picked from commit ccca7dfd0273af41e5b4bdec7f8731b177a20fde)
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
| |
The imx6slevk has keyboards on the board, so add mxc_keyb driver to
support the recovery keys pressing checking. The key mapping table
is defined in "mx6slevkandroid.h" with CONFIG_MXC_KPD enabled.
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Support android features:
fastboot, booti command and recovery for sabresd SD, sabresd eMMC,
sabreauto SD, sabreauto NAND.
For all booting media (SD, eMMC, NAND), inherits the partitions layout
from v2009.08. Fastboot will detect the booting media to replace
hardcoding fastboot device. SATA is not supported.
FDT is supported to use the "unused" fields in bootimg header which
requires the FDT to be combined into the boot.img.
For non-FDT boot.img, the "unused" fields should left to NULL and is
compatible to boot.
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Android fastboot leans on the USB gadget driver to communicate with host. Porting
the imx_udc driver from v2009.08 with two changes: adding resource/memory release
APIs and replacing the uncached memory with cache flush&invalidate operations.
Pins and Clocks initialization are added to support boards:
mx6qdlsabresd, mx6qdlsabreauto, mx6slevk
Signed-off-by: Ye.Li <B37916@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch adds the i.MX6DL arm2 board support. The i.MX6DL ARM2
shared the same board with i.MX6Q ARM2 board since the i.MX6DL is
pin-pin compatible with i.MX6Q.
The patch also support the DDR 32-BIT mode option. Please define
CONFIG_DDR_32BIT in the board configure file to enable DDR 32-BIT
mode.But due to the board design, it's 64bit DDR buswidth physically,
so, if you CONFIG_DDR_32BIT, the DDR memory size will be half of it.
The patch has been tested on the i.MX6Q and i.MX6DL arm2 board.
Signed-off-by: Jason Liu <r64343@freescale.com>
|
|
|
|
|
|
|
|
|
| |
This patch increases Uboot environmental variable offset
from 384KiB to 512KiB to align with MX6 Sabre platforms
so that we may simplify mfgtool implementation.
Tested-by: Robby Cai <R63905@freescale.com>
Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
|
|
|
|
|
|
|
|
|
|
| |
i.MX6dl ipu hsp clock rate is 270MHz in kernel.
In uboot, i.MX6dq ipu hsp clock rate is 264MHz,
and i.MX6dl ipu hsp clock rate is 198MHz.
Correct i.MX6dl ipu hsp clock rate,
display will get correct pixel clock now.
Signed-off-by: Sandor Yu <R01008@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch adds IPUv3 splash screen support for the MX6Q/SDL
Sabreauto platforms. The default display is the Hannstar-XGA
LVDS panel. Users may set the uboot variable 'panel' to be
'HDMI' to switch to use HDMI splash screen. To avoid duplicate
configures on different sabre platforms, this patch moves
the IPUv3 splash screen relevant configures to the head file
'mx6qsabre_common.h'. Also, this patch modifies the condition
to build in EPDC splash screen feature in order to avoid the
build break due to the migration of the IPUv3 splash screen
relevant configures.
Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
|
|
|
|
|
|
|
|
|
|
| |
Uboot image size will be larger than 400KiB, when we
add the splash screen with IPUv3 at this stage.
So, the patch increases CONFIG_ENV_OFFSET from 384KiB
to 512KiB for MMC to avoid overlapping bewteen the
Uboot image and the environmental data.
Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
| |
-Change HDMI video mode to VGA.
-Add pixel clock fraction part setting in IPU driver,
fix video mode timing issue.
-Add overflow state clear workaround,
fix kernel hang in HDMI driver issue.
-Correct IPU clock to 264MHz.
Signed-off-by: Sandor Yu <R01008@freescale.com>
|
|
|
|
|
|
| |
Signed-off-by: Pardeep Kumar Singla <b45784@freescale.com>
(cherry picked from commit 58cc97877713f46d2e7dfd515844c29c70c56d82)
Signed-off-by: Jason Liu <r64343@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Instead of duplicating HDMI setup code for every mx6 board, factor out the common code
Signed-off-by: Pardeep Kumar Singla <b45784@freescale.com>
Acked-By: Eric Nelson <eric.nelson@boundarydevices.com>
(cherry picked from commit 5ea7f0e328c19542ce96d8242125b51b3dbca86b)
Conflicts:
arch/arm/cpu/armv7/mx6/soc.c
arch/arm/include/asm/arch-mx6/clock.h
Signed-off-by: Jason Liu <r64343@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Code for checking "splashpos" environment variable is
duplicated in drivers, move it to the common function.
Call this function also in the bmp display command to
consider "splashpos" settings.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit ff8fb56b6f7edafc1bcba8ef008b3f368cabe60d)
Signed-off-by: Jason Liu <r64343@freescale.com>
|
|
|
|
|
|
|
|
|
|
| |
Create splash.c/h to put the function and any future common splash
screen code in.
Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
(cherry picked from commit dd4425e85260c2e750676e2dc9c225cfff1b4bcd)
Signed-off-by: Jason Liu <r64343@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
simple-framebuffer is a new device tree binding that describes a pre-
configured frame-buffer memory region and its format. The Linux kernel
contains a driver that supports this binding. Implement functions to
create a DT node (or fill in an existing node) with parameters that
describe the framebuffer format that U-Boot is using.
This will be immediately used by the Raspberry Pi board in U-Boot, and
likely will be used by the Samsung ARM ChromeBook support soon too. It
could well be used by many other boards (e.g. Tegra boards with built-in
LCD panels, which aren't yet supported by the Linux kernel).
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Simon Glass <sjg@chromium.org>
(cherry picked from commit 6a195d2d8a9c321817e1f034afcdc8c8642664bc)
Signed-off-by: Jason Liu <r64343@freescale.com>
|
|
|
|
|
|
| |
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
(cherry picked from commit 7bcb983feb8296f58a651c2b2a48683fc27174cd)
Signed-off-by: Jason Liu <r64343@freescale.com>
|
|
|
|
|
|
|
|
|
|
| |
Adds support for 'bmode' command which let user to choose where to
boot from; this allows U-Boot to load system from another storage
without messing with jumpers.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit eaffaa2d25ce6e94a965460467352bd12513bf09)
Signed-off-by: Jason Liu <r64343@freescale.com>
|
|
|
|
|
|
|
|
|
| |
This allow for easy update of firmware in the SD card from a running
U-Boot.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit 0798d5785d3fe71f1e2b30dab908fc9a9b40e016)
Signed-off-by: Jason Liu <r64343@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add EPDC splash screen feature for MX6SL EVK, and MX6DL SABRESD board.
- Currently, splash screen consists of a simple black border
around a white screen. Done this way to save in memory footprint.
- EPDC splash screen is disabled by default in the config file for MX6DL_SABRESD
and MX6SL_EVK. If left enabled, the U-Boot image will not boot correctly
(hang), since some additional content on the boot device (waveform file) is
required for EPDC splash to work correctly.
Please refer to Linux Reference Manual for how to flash WAVEFORM file.
Signed-off-by: Robby Cai <R63905@freescale.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
When booting in eMMC fast boot, the uboot v2013.04 always hangs.
The root cause is that MMC host does not exit from boot mode after
bootrom loading image. So the first command 'CMD0' sent
in uboot will pull down the CMD line to low and cause errors.
This patch cleans the MMC boot register in "mmc_init" to put the
MMC host back to normal mode.
Signed-off-by: Ye Li <b37916@freescale.com>
|
|
|
|
|
|
|
| |
Since the imx6q{dl}-sabreauto-gpmi-weim.dts also enables the WEIN NOR
which is mtd0. So the rootfs's mtd number becomes mtd4 now.
Signed-off-by: Huang Shijie <b32955@freescale.com>
|
|
|
|
|
|
|
|
|
|
| |
For the SPI/WEIM NOR, it can't store all the images into it due to it's
capacity, we need one default mmc device to load the left image or rootfs.
The end user need change the default setting according to their needs.
For NAND/SATA boot, the storage is big enough to hold all the stuff.
For SD/MMC boot, mmcdev is dynamiclly created due to the boot SD/MMC slot.
Signed-off-by: Jason Liu <r64343@freescale.com>
|