summaryrefslogtreecommitdiff
path: root/include/configs/nitrogen6x.h
Commit message (Collapse)AuthorAgeLines
* cmd: Convert CONFIG_CMD_ELF to KconfigBin Meng2015-10-21-1/+0
| | | | | | Convert CONFIG_CMD_ELF to Kconfig and tidy up affected boards. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
* I2C: mxc_i2c: make I2C1 and I2C2 optionalAlbert ARIBAUD \\(3ADEV\\)2015-10-02-0/+2
| | | | | | | | | | | | | | | | | | | The driver assumed that I2C1 and I2C2 were always enabled, and if they were not, then an asynchronous abort was (silently) raised, to be caught much later on in the Linux kernel. Fix this by making I2C1 and I2C2 optional just like I2C3 and I2C4 are. To make the change binary-invariant, declare I2C1 and I2C2 in every include/configs/ file which defines CONFIG_SYS_I2C_MXC. Also, while updating README about CONFIG_SYS_I2C_MXC_I2C1 and CONFIG_SYS_I2C_MXC_I2C2, add missing descriptions for I2C4 speed (CONFIG_SYS_MXC_I2C4_SPEED) and slave (CONFIG_SYS_MXC_I2C4_SLAVE) config options. Signed-off-by: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr>
* Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2015-08-02-5/+0
|\
| * imx6: standardise OCOTP and fuse config to mx6_commonPeter Robinson2015-07-10-5/+0
| | | | | | | | | | | | | | | | | | According to README.mxc_ocotp the OCOTP is a stanard i.MX6 SoC feature so centralise the config in mx6_common.h so functionality is standard across all boards Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Acked-by: Stefano Babic <sbabic@denx.de>
* | usb: CONFIG_USB_FASTBOOT prefix replacement for consistencyPaul Kocialkowski2015-07-22-2/+2
| | | | | | | | | | | | | | | | | | | | FASTBOOT is defined both by CONFIG_USB_FUNCTION_FASTBOOT AND CONFIG_CMD_FASTBOOT, so it doesn't make much sense to have a CONFIG_USB_FASTBOOT prefix for fastboot-specific options, especially given that other config options for fastboot use the CONFIG_FASTBOOT prefix. This replaces the CONFIG_USB_FASTBOOT prefix with CONFIG_FASTBOOT, for consistency. Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* | usb: Fastboot function config for better consistency with other functionsPaul Kocialkowski2015-07-22-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | USB download gadget functions such as thor and dfu have a separate config option for the USB gadget part of the code, independent from the command part. This switches the fastboot USB gadget to the same scheme, for better consistency. Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Tested-by: Lukasz Majewski <l.majewski@samsung.com> Test HW: Odroid_XU3 (Exynos5422), trats (Exynos4210)
* | usb: USB download gadget and functions config options coherent namingPaul Kocialkowski2015-07-22-2/+2
|/ | | | | | | | | | | | This introduces a coherent scheme for naming USB download gadget and functions config options. The download USB gadget config option is moved to CONFIG_USB_GADGET_DOWNLOAD for better consistency with other gadgets and each function's config option is moved to a CONFIG_USB_FUNCTION_ prefix. Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Tested-by: Lukasz Majewski <l.majewski@samsung.com> Test HW: Odroid_XU3 (Exynos5422), trats (Exynos4210)
* Move default y configs out of arch/board KconfigJoe Hershberger2015-06-25-1/+0
| | | | | | | | | | | | | | | | | | | Some archs/boards specify their own default by pre-defining the config which causes the Kconfig system to mix up the order of the configs in the defconfigs... This will cause merge pain if allowed to proliferate. Remove the configs that behave this way from the archs. A few configs still remain, but that is because they only exist as defaults and do not have a proper Kconfig entry. Those appear to be: SPIFLASH DISPLAY_BOARDINFO Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> [trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates, drop DM_USB from MSI_Primo81 as USB_MUSB_SUNXI isn't converted yet to DM] Signed-off-by: Tom Rini <trini@konsulko.com>
* net: Move the CMD_NET config to defconfigsJoe Hershberger2015-06-01-1/+0
| | | | | | | | | | | This also selects CONFIG_NET for any CONFIG_CMD_NET board. Remove the imx default for CONFIG_NET. This moves the config that was defined by 60296a8 (commands: add more command entries in Kconfig). Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
* Move setexpr to KconfigJoe Hershberger2015-06-01-1/+0
| | | | | | | | | | | Another shell scripting command that has not been moved. Moved using tools/moveconfig.py using these settings: CMD_SETEXPR bool n y Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
* mx6: standardise CONFIG_CMD_CACHEPeter Robinson2015-05-26-4/+0
| | | | | | | Move CONFIG_CMD_CACHE to mx6_common and standardise the way it's defined. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Tom Rini <trini at konsulko.com>
* imx6: generic MMC config options to mx6_commonPeter Robinson2015-05-26-7/+0
| | | | | | | Move all standard mx6 MMC configs to mx6_common. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Tom Rini <trini at konsulko.com>
* imx6: standardise filesystem and boot optionsPeter Robinson2015-05-26-13/+0
| | | | | | Move all standard filesystem, partition and fdt options to mx6_common. Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
* imx6: move generic miscellaneous and overwrite optionsPeter Robinson2015-05-26-17/+0
| | | | | | | Move generic miscellaneous options that are standard across most, if not all, mx6 boards to central mx6_common define to ensure consistent features. Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
* imx6: centralise common boot options in mx6_common.hPeter Robinson2015-05-26-7/+0
| | | | | | | Define common LOADADDR and BOOTDELAY to ensure a consistent experience across mx6 boards Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
* imx6: move MXC_GPIO define to mx6_common.hPeter Robinson2015-05-26-2/+0
| | | | | | Define CONFIG_MXC_GPIO and CONFIG_CMD_GPIO by default in mx6_common Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
* imx6: move standard ATAG configs to mx6_common.hPeter Robinson2015-05-26-5/+0
| | | | | | | Define the standard ATAG consfigs in mx6_common. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Tom Rini <trini at konsulko.com>
* imx6: move generic imx6 options to mx6_common.hPeter Robinson2015-05-26-4/+0
| | | | | | | | All boards define CONFIG_MX6, CONFIG_DISPLAY_BOARDINFO, CONFIG_DISPLAY_CPUINFO and CONFIG_SYS_GENERIC_BOARD so define them in mx6_common Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Tom Rini <trini at konsulko.com>
* imx6: move all standard includes to mx6_common.hPeter Robinson2015-05-26-9/+1
| | | | | | | | | | | The linux/sizes.h, asm/arch/imx-regs.h, asm/imx-common/gpio.h, config_cmd_default.h includes are used fairly universally across imx6 boards so include them in mx6_common.h by default. We define CONFIG_SYS_NO_FLASH before config_cmd_default.h so that we don't have to undef CONFIG_CMD_FLASH / CONFIG_CMD_IMLS everywhere. Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
* Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2015-04-28-0/+3
|\
| * nitrogen6x: allow gzipped bitmap displayEric Nelson2015-04-22-0/+3
| | | | | | | | Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
* | driver/i2c/mxc: Enable I2C bus 3 and 4York Sun2015-04-23-0/+1
|/ | | | | | | | | Some SoCs have more than two I2C busses. Instead of adding ifdef to the driver, macros are put into board header file where CONFIG_SYS_I2C_MXC is defined. Signed-off-by: York Sun <yorksun@freescale.com> CC: Heiko Schocher <hs@denx.de>
* nitrogen6x: Use the default CONFIG_SYS_PBSIZEFabio Estevam2015-03-13-3/+0
| | | | | | | | | | | | | | Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the extra characters of the error message: "Unknown command '' - try 'help'". Use the default CONFIG_SYS_PBSIZE definition from config_fallbacks.h to solve this problem. Cc: Eric Nelson <eric.nelson@boundarydevices.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
* Merge remote-tracking branch 'u-boot-imx/master'Albert ARIBAUD2014-10-08-29/+84
|\ | | | | | | | | | | | | The single file conflict below is actually trivial. Conflicts: board/boundary/nitrogen6x/nitrogen6x.c
| * nitrogen6x: config: enable EXT4 filesystemKevin Mihelich2014-10-06-0/+2
| | | | | | | | | | | | | | Support reading/writing ext4 partitions. Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| * nitrogen6x: config: enable Android fastbootEric Nelson2014-10-06-0/+5
| | | | | | | | | | | | | | | | | | | | Enable 'fastboot' command. This is currently enabled but not yet functional. Including it in the configuration will ease further testing and development as discussed on the mailing list. Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| * nitrogen6x: config: add gpio commandEric Nelson2014-10-06-0/+1
| | | | | | | | | | | | | | Enable the 'gpio' command to allow reading and toggling of GPIO pins. Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| * nitrogen6x: config: disable logoEric Nelson2014-10-06-1/+0
| | | | | | | | | | | | | | | | Some users (QNX and Windows CE users in particular) have asked to disable the Penguin shown on the display at boot time. Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> Acked-by: Stefano Babic <sbabic@denx.de>
| * nitrogen6x: config: allow more bootargs parametersTroy Kisky2014-10-06-1/+1
| | | | | | | | | | | | | | | | | | Increase the maximum number of arguments allowed by the Hush parser. This prevents errors when users or scripts aren't quoting parameters when setting the "bootargs" variable et al. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| * nitrogen6x: config: enable "i2c edid"Eric Nelson2014-10-06-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Enable the "i2c edid" command to query data from an attached HDMI monitor. Usage is typically this: U-Boot > i2c dev 1 U-Boot > i2c edid 0x50 ... Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| * nitrogen6x: config: add CONFIG_CMD_MEMTESTEric Nelson2014-10-06-0/+1
| | | | | | | | | | | | Enable the 'mtest' command on Nitrogen6x and SABRE Lite boards. Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| * nitrogen6x: config: enable USB keyboard supportEric Nelson2014-10-06-0/+2
| | | | | | | | | | | | Enable the use of USB keyboards on SABRE Lite and Nitrogen6x boards. Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| * nitrogen6x: config: expose SATA, then MMC over USBEric Nelson2014-10-06-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | If no boot script was found, expose internal storage over the USB mass storage gadget to allow easy programming. This is especially useful when SD cards are inaccessible or when loading SATA drives. More details are available in this blog post: http://boundarydevices.com/u-boot-usb-mass-storage-gadget/ Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| * nitrogen6x: config: add initrd_highEric Nelson2014-10-06-0/+1
| | | | | | | | | | | | Support RAM disks by setting initrd_high. See commit 7e9603e Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| * nitrogen6x: config: use FS_GENERIC load commandKevin Mihelich2014-10-06-12/+8
| | | | | | | | | | | | | | Remove the individual attempts to load using ext2 and fat, replace with the generic load command supporting available filesystem types. Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
| * nitrogen6x: config: allow boot to USB stickDiego Rondini2014-10-06-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables boot to USB storage devices by expanding on the list of boot devices. Because the USB startup currently takes a long time, it places USB at the end of the list of supported devices. You can over-ride the boot order using the bootdevs environment variable. For instance, this will make USB the first (highest priority) device: U-Boot > setenv bootdevs usb mmc sata U-Boot > saveenv Signed-off-by: Diego Rondini <diego.rondini@kynetics.it> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| * nitrogen6x: config: add USB Mass Storage (ums) supportEric Nelson2014-10-06-0/+13
| | | | | | | | | | | | | | | | | | | | Add support for the USB mass storage to enable access to on-board storage (especially eMMC and SATA). Details at: http://boundarydevices.com/u-boot-usb-mass-storage-gadget/ Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| * imx: nitrogen6x: Make use of both uSD and SD slots to load script or kernel ↵Guillaume GARDET2014-09-22-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on Sabrelite board Sabrelite board has two solts: 0 is SD3 (bottom) slot and 1 is uSD4 (top) slot. This patch makes use of both slots instead of only one. Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Cc: Stefano Babic <sbabic@denx.de> Cc: Eric Nelson <eric.nelson@boundarydevices.com> Reviewed-by: Eric Nelson <eric.nelson@boundarydevices.com> Acked-by: Eric Nelson <eric.nelson@boundarydevices.com> Reviewed-by: Eric Nelson <eric.nelson@boundarydevices.com> Acked-by: Eric Nelson <eric.nelson@boundarydevices.com>
* | spi: mxc: fix sf probe when using mxc_spiNikita Kiryanov2014-09-24-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MXC SPI driver has a feature whereas a GPIO line can be used to force CS high across multiple transactions. This is set up by embedding the GPIO information in the CS value: cs = (cs | gpio << 8) This merge of cs and gpio data into one value breaks the sf probe command: if the use of gpio is required, invoking "sf probe <cs>" will not work, because the CS argument doesn't have the GPIO information in it. Instead, the user must use "sf probe <cs | gpio << 8>". For example, if bank 2 gpio 30 is used to force cs high on cs 0, bus 0, then instead of typing "sf probe 0" the user now must type "sf probe 15872". This is inconsistent with the description of the sf probe command, and forces the user to be aware of implementaiton details. Fix this by introducing a new board function: board_spi_cs_gpio(), which will accept a naked CS value, and provide the driver with the relevant GPIO, if one is necessary. Cc: Eric Nelson <eric.nelson@boundarydevices.com> Cc: Eric Benard <eric@eukrea.com> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Tim Harvey <tharvey@gateworks.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Tom Rini <trini@ti.com> Cc: Marek Vasut <marex@denx.de> Reviewed-by: Marek Vasut <marex@denx.de> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Reviewed-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
* imx: nitrogen6x: Replace 'fatload' by 'load' command in env settings to be ↵Guillaume GARDET2014-09-09-3/+3
| | | | | | | | | | | | filesystem independent nitrogen6x.h file defines CONFIG_CMD_FS_GENERIC, so we are able to use generic 'load' command instead of 'fatload'. It allows to use ext filesystem and keep compatibilty with fat filesystem. Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Cc: Stefano Babic <sbabic@denx.de> Acked-By: Eric Nelson <eric.nelson@boundarydevices.com>
* ARM: imx6: nitrogen6x: Enable CONFIG_SYS_GENERIC_BOARDEric Nelson2014-04-28-0/+1
| | | | | | | | | | | Enable CONFIG_SYS_GENERIC_BOARD, so that we get rid of the following warning on boot: "Warning: Your board does not use generic board. Please read doc/README.generic-board and take action. Boards not upgraded by the late 2014 may break or be removed." Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
* nitrogen6x: use common board_video_skipEric Benard2014-04-15-0/+1
| | | | | Signed-off-by: Eric Bénard <eric@eukrea.com> Acked-by: Eric Nelson <eric.nelson@boundarydevices.com>
* 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>
generated by cgit v1.1 at 2024-11-15 15:21:54 +0000