summaryrefslogtreecommitdiff
path: root/include/configs/nitrogen6x.h
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-arm into masterStefano Babic2014-04-04-0/+1
|\ | | | | | | | | | | | | | | Conflicts: arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg Signed-off-by: Stefano Babic <sbabic@denx.de>
| * tegra: imx: omap: enable Moschip USB ethernet support for several boardsGerhard Sittig2014-03-12-0/+1
| | | | | | | | | | | | | | | | | | | | enable support for the Moschip USB ethernet adapter for those boards which previously had support for "all other" USB ethernet adapters (that's Asix _and_ SMSC) enabled -- which applies to harmony, m53evk, mx53loco, nitrogen6x, omap3_beagle Signed-off-by: Gerhard Sittig <gsi@denx.de> Acked-by: Marek Vasut <marex@denx.de>
* | ARM: mx6: Disable PCIe on SABRE Lite/Nitrogen6xEric Nelson2014-03-31-1/+0
|/ | | | | | | | | | | | Use of PCIe on SABRE Lite and Nitrogen6x boards is atypical and requires the use of custom daughter boards. Use in U-Boot is even rarer, so this patch removes it from the standard configuration. Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> Acked-by: Marek Vasut <marex@denx.de>
* Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD2014-02-19-0/+11
|\
| * ARM: mx6: Enable PCIe on SabreliteMarek Vasut2014-01-26-0/+11
| | | | | | | | | | | | | | | | | | | | Enable PCI express on MX6 Sabrelite. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Eric Nelson <eric.nelson@boundarydevices.com> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Stefano Babic <sbabic@denx.de>
* | usb: mv_udc: Rename to ci_udcMarek Vasut2014-02-06-1/+1
|/ | | | | | | | | | The mv_udc is not marvell-specific anymore. The mv_udc is used to drive generic ChipIdea CI13xxx series OTG cores, so rename the driver to ci_udc instead. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Eric Nelson <eric.nelson@boundarydevices.com> Cc: Stefano Babic <sbabic@denx.de>
* ARM: mx6: Change the FDT loading address to avoid overlapingOtavio Salvador2014-01-03-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes allow for the DeviceTree and initrd relocation fixing the boot of FSL 3.10.9-1.0.0-alpha kernel. This changes following boards: - mx6sabreauto - mx6sabresd - wandboard - udoo - nitrogen6x - cgtqmx6eval The reasoning, as explained by Hui Liu, is: ,---- | The FDT blob will be placed at DDR physical addr: 0x11000000. When Linux kernel | Boot up, it will decompress the compressed kernel image and place the decompressed | kernel image at the low end of the DDR memory and start running from it. If the | decompressed kernel image is bigger for example than 16M, it may over written the | fdt blob which u-boot loaded to the DDR memory @0x11000000 with fdt_addr=0x11000000 | | To expand the fdt_addr from 0x11000000 to 0x18000000, which can avoid the override | Since we will not likely have one kernel image larger than 128MB. `---- Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Stefano Babic <sbabic@denx.de>
* ARM: mx6: Update non-Freescale boards to include CPU errata.Eric Nelson2013-12-17-0/+1
| | | | | | | | | The CPU errata expressed in include/configs/mx6_common.h apply to all i.MX6DQ and i.MX6DLS parts. Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Stefan Roese <sr@denx.de>
* nitrogen6x: Remove unused OCOTP optionsFabio Estevam2013-11-27-10/+0
| | | | | | | | | OCOTP driver is currently selected via CONFIG_MXC_OCOTP option. Remove the old OCOTP related options, as they are not used anymore. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Eric Nelson <eric.nelson@boundarydevices.com>
* config: remove platform CONFIG_SYS_HZ definition part 2/2Rob Herring2013-11-04-1/+0
| | | | | | Remove platform CONFIG_SYS_HZ definition for configs a-z*. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
* Merge branch 'master' of git://git.denx.de/u-boot-usbTom Rini2013-10-21-1/+8
|\
| * usb: ehci-mx6: add support for otg portTroy Kisky2013-10-20-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * nitrogen6x: add CONFIG_MV_UDCTroy Kisky2013-10-20-0/+6
| | | | | | | | | | | | Also, add other USB related config items. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
* | i2c: update config using mxc driver to new subsystemtrem2013-10-17-2/+2
|/ | | | Signed-off-by: Philippe Reynes <tremyfr@yahoo.fr>
* Merge git://git.denx.de/u-boot-armStefano Babic2013-07-31-14/+1
|\ | | | | | | | | | | | | | | | | Conflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsabrelite.h Signed-off-by: Stefano Babic <sbabic@denx.de>
| * Add GPL-2.0+ SPDX-License-Identifier to source filesWolfgang Denk2013-07-24-14/+1
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> [trini: Fixup common/cmd_io.c] Signed-off-by: Tom Rini <trini@ti.com>
* | mx6: Factor out common HDMI setup codePardeep Kumar Singla2013-07-27-0/+1
| | | | | | | | | | | | | | 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>
* | mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6xFabio Estevam2013-07-26-1/+79
|/ | | | | | | | | | mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the code duplication and only use the nitrogen6x source code to make board code maintainance easier. Tested booting a mainline device tree kernel on a mx6qsabrelite board. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
* imx: nitrogen6x: Enable filesystem generic commandsRobert Winkler2013-06-26-0/+1
| | | | Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
* imx: nitrogen6x: Enable raw initrdRobert Winkler2013-06-26-0/+1
| | | | Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
* imx: nitrogen6x: Enable bootzRobert Winkler2013-06-26-0/+2
| | | | Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
* imx: nitrogen6x: Enabled data cacheRobert Winkler2013-06-26-2/+0
| | | | Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
* nitrogen6x: Enable support for ocotpBenoît Thébaudeau2013-04-28-0/+5
| | | | Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
* Add Boundary Devices Nitrogen6X boardsEric Nelson2013-03-13-0/+285
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>