summaryrefslogtreecommitdiff
path: root/include/configs/mx6sabre_common.h
Commit message (Collapse)AuthorAgeLines
* MLK-12723 imx: Change the env offset on NAND to 60MYe Li2017-04-05-1/+1
| | | | | | | | | | | | | | | | Current environment offset on NAND is 37MB, this will cause a alignment issue when erasing if nand erase block is 2MB. The saveenv is failed. => saveenv Saving Environment to NAND... Erasing NAND... Attempt to erase non block-aligned data Since the max erase block we supported is 4MB, adjust the env offset to 60MB, where is the last 4MB in 64MB reserved area for boot. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 22f6c4b151fbdea1985403086715de841152c880)
* MLK-12493-1 Add support for various boot deviceYe Li2017-04-05-14/+142
| | | | | | | | | | Add support for various boot devices like NAND, QSPINOR, SPINOR, eMMC, EIMNOR, SATA. Modify board level files to support the feature and add corresponding defconfig files Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 72c35e80b86f7f75a52db45959793882bb730793)
* MLK-14261-2 mx6solo: Add nosmp kernel bootargsYe Li2017-04-05-2/+9
| | | | | | | For i.MX6 SOLO sabreauto and sabresd boards, add the "nosmp" kernel bootargs. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12444-1 mfgtool: Add mfgtool supportYe Li2017-04-05-0/+22
| | | | | | | | | | | | | If boot from usb, reset environment to default value. Auto apply mfgtools setting and boot mfgtools kernel. Porting this from fsl uboot to uboot 2016. The 7dsabresd has already added the environment and usb boot related functions. No need to add them more. Only need to add NAND parts environment for mfgtools. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit a352ed3c5184b95c4c9f7468f5fbb5f43de5e412)
* MLK-12434-3: mx6sabre: dynamic setting mmcdev and mmcrootPeng Fan2017-04-05-0/+1
| | | | | | | Dynamic setting mmcdev and mmcroot for mx6sabresd and mx6qsabreauto. Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 14040e07549a394500c11e815f31299e4fb0ac50)
* MLK-12425-4: mx6dlsabresd: support epdcPeng Fan2017-04-05-1/+2
| | | | | | | | | Support epdc for mx6dlsabresd board. Introduce a new configuration file mx6dlsabresd_epdc_defconfig. Add related settings. Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 467974ffda4b874e16f0c84974c3d65d85f84f6a)
* MLK-14420-3 mx6qsabresd: Update mx6qsabresd to enable OF_CONTROL and DM driversYe Li2017-03-14-1/+1
| | | | | | | | | Modify and remove configurations conflicts with DM drivers from head file. Enable DM drivers and OF_CONTROL in defconfig. Also update the GPIO usage to call gpio_request before any gpio using, and update power_init_board since the PMIC APIs are changed in Pfuze DM driver. Signed-off-by: Ye Li <ye.li@nxp.com>
* Convert CONFIG_BOARD_EARLY_INIT_F to KconfigSimon Glass2017-01-25-2/+0
| | | | | | | This converts the following to Kconfig: CONFIG_BOARD_EARLY_INIT_F Signed-off-by: Simon Glass <sjg@chromium.org>
* config: Move CONFIG_BOARD_LATE_INIT to defconfigsJagan Teki2017-01-21-1/+0
| | | | | Cc: Tom Rini <trini@konsulko.com> Signed-off-by: Jagan Teki <jagan@openedev.com>
* Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE to KconfigSimon Glass2016-10-23-1/+0
| | | | | | | | This converts the following to Kconfig: CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* Convert CONFIG_VGA_AS_SINGLE_DEVICE to KconfigSimon Glass2016-10-23-1/+0
| | | | | | | | | | This converts the following to Kconfig: CONFIG_VGA_AS_SINGLE_DEVICE Once we migrate to driver model for video, we should be able to drop this option. Signed-off-by: Simon Glass <sjg@chromium.org>
* Convert CONFIG_CFB_CONSOLE to KconfigSimon Glass2016-10-23-1/+0
| | | | | | | This converts the following to Kconfig: CONFIG_CFB_CONSOLE Signed-off-by: Simon Glass <sjg@chromium.org>
* config: Drop CONFIG_CONSOLE_DEVSimon Glass2016-10-23-1/+1
| | | | | | | | This is not really a config. Rename it to avoid confusion. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Jagan Teki <jteki@openedev.com>
* Convert CONFIG_SYS_CONSOLE_IS_IN_ENV and CONFIG_CONSOLE_MUX to KconfigSimon Glass2016-10-23-1/+0
| | | | | | | | | | This converts the following to Kconfig: CONFIG_SYS_CONSOLE_IS_IN_ENV CONFIG_CONSOLE_MUX Signed-off-by: Simon Glass <sjg@chromium.org> [trini: Re-order, re-migrate] Signed-off-by: Tom Rini <trini@konsulko.com>
* Convert CONFIG_VIDEO to KconfigSimon Glass2016-10-23-1/+0
| | | | | | | | | This converts the following to Kconfig: CONFIG_VIDEO Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Jagan Teki <jteki@openedev.com>
* dfu: Migrate to KconfigTom Rini2016-09-27-5/+0
| | | | | | | | | | | Introduce a hidden USB_FUNCTION_DFU Kconfig option and select it for CMD_DFU (as we must have the DFU command enabled to do anything DFU). Make all of the entries in drivers/dfu/Kconfig depend on CMD_DFU and add options for all of the back end choices that DFU can make use of. Cc: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Lukasz Majewski <l.majewski@samsung.com>
* configs: Re-sync with cmd/KconfigTom Rini2016-04-25-3/+0
| | | | | | | Update the config.h and defconfig files for the commands that 8e3c036 converted over to Kconfig Signed-off-by: Tom Rini <trini@konsulko.com>
* include/configs: Whitespace fixupTom Rini2016-04-25-1/+0
| | | | | | | A number of moveconfig.py runs have left a instances of multiple empty lines in a row. Correct this to a single empty line. Signed-off-by: Tom Rini <trini@konsulko.com>
* configs: Re-sync almost all of cmd/KconfigTom Rini2016-04-25-3/+0
| | | | | | | | This syncs up the current cmd/Kconfig and include/configs/ files with the only exception being CMD_NAND. Due to how we have used this historically we need to take further care here when converting. Signed-off-by: Tom Rini <trini@konsulko.com>
* usb: gadget Move: CONFIG_G_DNL_* to KconfigSam Protsenko2016-04-20-4/+0
| | | | | | And also reformat defconfigs using "make savedefconfig" rule. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
* usb: gadget: Move CONFIG_USB_GADGET_DOWNLOAD to KconfigSam Protsenko2016-04-20-1/+0
| | | | | | | While at it, remove obsolete CONFIG_USBDOWNLOAD_GADGET option from some config headers. This is also probably fixes am335x_baltos board. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
* usb: gadget: Move CONFIG_USB_GADGET_DUALSPEED to KconfigSam Protsenko2016-04-20-2/+0
| | | | | | | | | | | | | | | | | | | | | | Move CONFIG_USB_GADGET_DUALSPEED option to Kconfig and make all UDC controllers select USB_GADGET_DUALSPEED: - add next options to Kconfig selecting USB_GADGET_DUALSPEED: - USB_GADGET_ATMEL_USBA - USB_GADGET_DWC2_OTG - USB_DWC3 - CI_UDC - make USB_MUSB_GADGET select USB_GADGET_DUALSPEED While at it, make some related fixes: - remove DUALSPEED from configs that don't enable gadget support: - kwb.h - tseries.h - add missing USB_GADGET option to next configs: - novena_defconfig - pcm051_rev*_defconfig - xfi3_defconfig Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
* usb: gadget: Move CONFIG_USB_GADGET_VBUS_DRAW to KconfigSam Protsenko2016-04-20-1/+0
| | | | | | | | | | | The description was borrowed from kernel. Definitions were added to defconfig files in a way that "make savedefconfig" generates exactly the same file as used defconfig. Boards using 0 mA as CONFIG_USB_GADGET_VBUS_DRAW value were moved to use 2 mA (as minimal allowed by Kconfig). Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
* Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2016-04-13-1/+1
|\
| * mx6sabre_common: Fix U-Boot corruption after 'saveenv'Fabio Estevam2016-03-25-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Booting mx6qp sabreauto board and then doing: => saveenv => reset , causes a system hang. This happens because the size of the U-Boot binary is larger than CONFIG_ENV_OFFSET. Fix this problem by increasing CONFIG_ENV_OFFSET, so that the U-boot binary and the environment variables region do not overlap. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
* | usb: gadget: Move CONFIG_USB_GADGET to KconfigSam Protsenko2016-03-25-1/+0
|/ | | | | | | | | | | | | | The description was borrowed from kernel. "tristate" type was changed to "bool" (I believe we don't support modules for u-boot yet, right?). CONFIG_USB_GADGET requires CONFIG_USB to be defined too, so add it along as well. Definitions were added to defconfig files in a way that "make savedefconfig" generates exactly the same file as used defconfig. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> [trini: Add zynq_zc702 conversion] Signed-off-by: Tom Rini <trini@konsulko.com>
* imx: mx6: correct IPU clockPeng Fan2016-03-14-1/+5
| | | | | | | | | | | The CONFIG_IPUV3_CLK should be 264000000, to i.MX6DL, it should be 198000000. Signed-off-by: Peng Fan <van.freenix@gmail.com> Signed-off-by: Sandor Yu <sandor.yu@nxp.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Peter Robinson <pbrobinson@gmail.com>
* sf: Move SPI flash drivers to defconfigBin Meng2015-11-25-1/+0
| | | | | | | | There are already Kconfig options for SPI flash drivers, but we have not moved them from config.h to defconfig files. This commit does this in a batch. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
* imx: mx6sabresd: add i.MX6DQP Sabresd supportPeng Fan2015-10-30-0/+2
| | | | | | | | | | Add i.MX6DQP-Sabresd board support: 1. set fdt_file according to board_rev which is set at runtime. 2. Add mx6dqp_ddr_ioregs and calibration value for this board. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com>
* mx6sabre_common: Add DFU supportFabio Estevam2015-10-02-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add DFU support. Tested by flashing SPL and u-boot.img into SPI NOR flash with the following commands: => setenv dfu_alt_info ${dfu_alt_info_spl} => run dfuspi On the host PC: $ sudo dfu-util -D SPL -a spl On the target: CTRL+C => setenv dfu_alt_info ${dfu_alt_info_img} => run dfuspi On the host PC: $ sudo dfu-util -D u-boot.img -a u-boot Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
* mx6sabre_common: Add Fastboot supportFabio Estevam2015-09-20-0/+6
| | | | | | | | | | | | | | | | | | Tested basic fastboot commands, such as: On the mx6qsabresd U-boot prompt: => fastboot 0 On the host PC: $ fastboot getvar bootloader-version -i 0x0525 bootloader-version: U-Boot 2015.10-rc2-23960-g2462cce-dirty finished. total time: 0.000s $ fastboot reboot -i 0x0525 --> board reboots fine. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
* thermal: imx_thermal: rework driver to be reusedAdrian Alonso2015-09-13-1/+1
| | | | | | | | Rework imx_thermal driver to be used across i.MX processor that support thermal sensor Signed-off-by: Adrian Alonso <aalonso@freescale.com> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2015-08-02-7/+21
|\
| * imx: mx6qpsabreauto: Add MX6QP SABREAUTO CPU3 board supportPeng Fan2015-08-02-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add DDR script for mx6qpsabreauto board. 2. On CPU3 board, enet RGMII tx clock is from internal PLL. Set the GPR5[9] and init the enet pll output to 125Mhz. 3. On CPU3 board, SW1ABC=VDDSOC_IN, SW2=VDDARM_IN. Build target: mx6qpsabreauto_config Boot Log: U-Boot 2015.07-rc2-00071-gfd985ff (Jun 29 2015 - 22:10:55 +0800) CPU: Freescale i.MX6QP rev1.0 996 MHz (running at 792 MHz) CPU: Automotive temperature grade (-40C to 125C) at 34C Reset cause: POR Board: MX6Q-Sabreauto revA I2C: ready DRAM: 2 GiB PMIC: PFUZE100 ID=0x10 Flash: 32 MiB NAND: 0 MiB MMC: FSL_SDHC: 0 *** Warning - bad CRC, using default environment No panel detected: default to HDMI Display: HDMI (1024x768) In: serial Out: serial Err: serial Net: FEC [PRIME] Hit any key to stop autoboot: 0 Note: In this patch, we still add a new config mx6qpsabreauto_config, since SPL is not supported now, and IMX_CONFIG is needed at build time, so add this config. Future, when SPL is converted, this config can be removed. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Signed-off-by: Robin Gong <b38343@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
| * imx: mx6sabresd/sabreauto runtime setting fdt_filePeng Fan2015-08-02-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | Detect the SOC and board variant at runtime and change the dtb name, but not hardcoding the fdt_file env variable. Take the following patch as a reference. Íd58699b157df75f1aa0b363ea9c21add21a0c "mx6cuboxi: Load the correct 'fdtfile' variable" Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Stefano Babic <sbabic@denx.de>
| * 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: 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-8/+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-15/+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-1/+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-7/+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-10/+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>
* mx6sabre: Do not enable UMS with SPLFabio Estevam2015-03-13-0/+2
| | | | | | | | | | Since commit ad8aae82b20ac6a ("mx6sabre: Enable User Mass Storage") SPL target does not boot anymore due to the increased spl image size. Only enable USB Mass Storage for the non-SPL target. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Reviewed-by: Tom Rini <trini@konsulko.com>