summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* MLK-12444-2 mx6: Modify kernel and fdt load address to align with mfgtoolYe Li2017-04-05-4/+5
| | | | | | | | | Change the CONFIG_LOADADDR to 0x80800000 and environment variable "fdt_addr" to 0x83000000 for i.MX6SX, i.MX6SL and i.MX6UL to align the address used in mfgtool. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 41a6f612f6ae638ac6db61c60e19dcfebf052820)
* MLK-12444-1 mfgtool: Add mfgtool supportYe Li2017-04-05-1/+107
| | | | | | | | | | | | | 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-14259-3 mx6ulevk: Add support for NANDYe Li2017-04-05-1/+18
| | | | | | | Add NAND pinmux settings, clock setting and related configurations. Default not enabled, need hardware rework. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-14259-2 mx6ulevk: Add PHYS_SDRAM_SIZE and CMA macroYe Li2017-04-05-0/+10
| | | | | | | | Define PHYS_SDRAM_SIZE future usage. Define CMA for kernel usage, default is 320MB, but we do not have enough memory on 9x9 evk lpddr2 board, so swith to 96MB. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12483-5 mx6ul: Enable module fuse check EVK boardYe Li2017-04-05-0/+2
| | | | | | | | Enable the configurations CONFIG_MODULE_FUSE and CONFIG_OF_SYSTEM_SETUP for module fuse check. And modify board level codes for SD, FEC and EIM. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 9232e9f7637afa3b71b43ab2d1361582ec5a080a)
* ENGR00315894-55 iMX6SX: add debug monitor supportYe.Li2017-04-05-0/+2
| | | | | | | | | | | | | | 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> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit df6ac8531d498021ed379c74fc1847bd2cec7179) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit 4f4ecdbf6fe2673b8ad117df1a4974bdb7e6aa4a)
* MLK-10576 ARM: i.MX6: exclude the ARM errata from i.MX6 UP systemNitin Garg2017-04-05-0/+9
| | | | | | | | | | | | | | | | | The ARM errata 751472, 794072, 761320, 845369 only applied to the following configuration: This erratum affects configurations with either: - One processor if the ACP is present - Two or more processors i.MX6 family does not have the ACP and thus only the MPCore system will be impacted, which are the i.MX6DQ, i.MX6DL, and i.MX6QP. Signed-off-by: Nitin Garg <nitin.garg@freescale.com> Signed-off-by: Jason Liu <r64343@freescale.com> (cherry picked from commit 0db960784ba4f631ee5c0321b5d25f3b1ac55640) (cherry picked from commit 850f27d137a083a141c99fe9828d596807937d38)
* MLK-12557 mx6ul: Enable syscounter as default timerYe Li2017-04-05-0/+4
| | | | | | | | | Use syscounter for i.MX6UL platform as default timer, not use GPT. Add a CONFIG_GPT_TIMER for selecting GPT. Using CONFIG_SYSCOUNTER_TIMER for selecting system counter. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 1c27c9ecf80b3cc63a7c9751ebfd11755f847b1d)
* MLK-12452-4 mx6sxsabreauto: Add secondary enet supportYe Li2017-04-05-0/+7
| | | | | | | Add configurations and board codes for second enet. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 4dfd06dc649615f8dd3e1ac8018a0a7109fc4147)
* MLK-12452-3 mx6sxsabresd: Add secondary enet supportYe Li2017-04-05-0/+7
| | | | | | | Add configurations and board codes for second enet. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit b646262f1f201e11e08968ddf88aeb8ab41fcf21)
* MLK-12439 mx6sxsabreauto: Enable GIS for the AI boardYe Li2017-04-05-0/+6
| | | | | | | | | Enable the GIS feature for i.MX6SX sabreauto board. Need to define the "gis=vadc" environment variable for the gis input. At default this variable is not set. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 2271dcfee3500e96503a9fc59929e73167e3c4a2)
* ENGR00315894-81 gis: Add gis moduleYe.Li2017-04-05-0/+19
| | | | | | | | | | | Add gis module, current gis is support vadc input. Add power down function to lcdif driver. Signed-off-by: Sandor Yu <R01008@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit a007b00dd8ef9f773dfdebef0b1deb0990281793) (cherry picked from commit a31dcdafb0963381e7213c59f79a340ef27ec2e2) (cherry picked from commit 02dfe2e4af5f51d39a51542fb0e81f93faf505bc)
* MLK-14365-2 mx6ullevk: Add LCD splash screen supportYe Li2017-04-05-0/+12
| | | | | | | Add LCD configurations and TFT43AB display settings for mx6sllevk. Enable the CONFIG_VIDEO for this feature. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-14365-1 mx6sllevk: Add LCD splash screen supportYe Li2017-04-05-0/+12
| | | | | | | Add LCD configurations and MCIMX28LCD display settings for mx6sllevk. Enable the CONFIG_VIDEO for this feature. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12437-5 mx6ulevk: Update display to support panel selectionYe Li2017-04-05-2/+2
| | | | | | | | Change to panel environment for display at default. Align this feature to v2015.04 uboot. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit ea93a34a3348f80462ea5b61a4ca2e9a1d267f4c)
* MLK-12437-4 mx6sxsabreauto: Update display to support panel selectionYe Li2017-04-05-1/+21
| | | | | | | | Support two display panels, one for LVDS, another for parallel LCD. Align the feature to v2015.04 uboot. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit d5f7833adf6236357cf3c139e14e46d718e20524)
* MLK-12437-3 mx6sxsabresd: Update display to support panel selectionYe Li2017-04-05-3/+5
| | | | | | | | Support two display panels, one for LVDS, another for parallel LCD. Align the feature to the v2015.04 uboot. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit d7f54f22607ffcace6cda97984649a5ae4f65996)
* ENGR00315894-70 iMX6SX:Video Update MXS LCDIF driverYe.Li2017-04-05-0/+27
| | | | | | | | | | | | | | | Add a new interface "mxs_lcd_panel_setup" to setup fb parameters and specifies the LCDIF controller for multiple controllers of iMX6SX. Pass fb parameters via "videomode" env remains work if the new interface is not called before video initialization. Modify LCDIF clock interface "mxs_set_lcdclk" to support multiple LCDIF controllers on iMX6SX. Signed-off-by: Ye.Li <B37916@freescale.com> Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit d7f49b9378547c3a57b96bcdb907fc44616beb3d) (cherry picked from commit e1343191b9de227c582847e7eeb5ce9238be0754)
* MLK-12434-6: mx6slevk: dynamic setting mmcdev and mmcrootPeng Fan2017-04-05-0/+1
| | | | | | | Dynamic setting mmcdev and mmcroot for mx6slevk. Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 3308f3c48c644938c415ead23ed9acedc2fd7981)
* MLK-12434-5: mx6sxsabreauto: dynamic setting mmcdev and mmcrootPeng Fan2017-04-05-0/+1
| | | | | | | Dynamic setting mmcdev and mmcroot for mx6sxsabresd. Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit ebb43ae292d43817202b71b25368516887f4686b)
* MLK-12434-4: mx6sxsabresd: dynamic setting mmcdev and mmcrootPeng Fan2017-04-05-0/+1
| | | | | | | Dynamic setting mmcdev and mmcroot for mx6sxsabresd. Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit fb53c90269ead4f72028fd9bcc764e4924921a30)
* 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-12434-2: mx6qarm2: dynamic setting mmcdev and mmcrootPeng Fan2017-04-05-1/+2
| | | | | | | Dynamic setting mmcdev and mmcroot for mx6qarm2. Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 54ea563dbe1804e426afbbf0710ffa815551d92b)
* MLK-12425-4: mx6dlsabresd: support epdcPeng Fan2017-04-05-2/+22
| | | | | | | | | 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-12425-3: mx6slevk: support epdcPeng Fan2017-04-05-2/+24
| | | | | | | | | Support epdc for mx6slevk board. Introduce a new configuration file mx6slevk_epdc_defconfig. Add related settings. Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 8e4304c2ab95928fb6fbb24ba83115cf1cd1e6d2)
* MLK-12425-2: video: epdc: introduce epdc supportPeng Fan2017-04-05-1/+645
| | | | | | | | | | | | | | | | | | | | | | | | | Support EPDC. E-Ink feature is supported by i.MX6DL/SL and i.MX7D. For now this driver only supports i.MX6DL/SL, because the i.MX7D EPDC driver needs pxp support which is not included in U-Boot. Support user defined logo file, if there is no logo file, it will draw a black border around a white screen. If need to enable EPDC, a waveform file is required to let all work. Since we need LCD_MONOCHROME mode for EPDC, we introduce LCD_MONOCHROME support. Please refer to Linux Reference Manual for how to flash WAVEFORM file. Signed-off-by: Peng Fan <peng.fan@nxp.com> Signed-off-by: Robby Cai <R63905@freescale.com> Signed-off-by: Nitin Garg <nitin.garg@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit a7244f279cc3c3994bcd103f5e9a183b1075ae71)
* MLK-12416-10: mx6ul: Add comments for BEEPeng Fan2017-03-14-0/+3
| | | | | | | Add comments for enabling BEE. Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit e5cc58b71e28b2bb3c66fbe8af373cff31eb3017)
* MLK-13335 mx6sl: Fix build break for all i.MX6SL boardsYe Li2017-03-14-2/+2
| | | | | | | | | Since the UART1 register base name is changed from UART1_IPS_BASE_ADDR to UART1_BASE to align with other i.MX6 chips. Should update the board configuration header file with the new name. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 18019b8f4b65d3261db6488e416eae66a6500316)
* MLK-13440-4 warp: Replace CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT by using ↵Ye Li2017-03-14-1/+0
| | | | | | | | | | vs18_enable parameter Change to use the new way to set the vs18_enable field to 1 for fixed 1.8v I/O eMMC. Don't use CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT any longer. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit c1bf2d975be66597f8fc25c9eef0f02bda3c5050)
* MLK-13440-1: fsl_usdhc: Add configuration parameter for using fixed 1.8V I/OYe Li2017-03-14-0/+1
| | | | | | | | | | | | | | | | | | When using eMMC with 1.8V I/O, we have to set the VSELECT bit at this USDHC controller setup and init. The CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT has problem that it will apply to all USDHC controllers and it only set the 1.8V at init phase. So if user does not select to the eMMC device, the voltage on the I/O pins are not correct. This patch adds a parameter "vs18_enable" in fsl_esdhc_cfg structure and priv data, so each controller can have different settings. The default value is 0 for 3.3V, which is compatible with current codes. When setting this value to 1, at USDHC setup and init phase the driver will set the VSELECT bit. For DM driver, the vqmmc-supply property will be searched for current usdhc node. If the vqmmc-supply is set to 1800000 uV, the vs18_enable in priv data will be set to 1. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit ebd872f491af27c38a0698d226222ea5093c563c)
* MLK-14420-3 mx6qsabresd: Update mx6qsabresd to enable OF_CONTROL and DM driversYe Li2017-03-14-3/+8
| | | | | | | | | 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>
* MLK-14420-1 DTS: Update imx6qdl relevant dts and clock definitionsYe Li2017-03-14-60/+61
| | | | | | Get the latest dtsi files and clock.h for imx6qdl from kernel Signed-off-by: Ye Li <ye.li@nxp.com>
* ARM: Migrate errata to KconfigTom Rini2017-03-09-74/+0
| | | | | | | | | This moves all of the current ARM errata from various header files and in to Kconfig. This allows for a minor amount of cleanup as we had some instances where both a general common header file was enabling errata as well as the board config. We now just select these once at the higher level in Kconfig Signed-off-by: Tom Rini <trini@konsulko.com>
* Freescale/NXP: Migrate CONFIG_FSL_CAAM to defconfigsTom Rini2017-03-09-31/+0
| | | | | | | | | | | | | | | | | | | | | | In some cases this is absolutely required, so select this for some secure features. This also requires migration of RSA_FREESCALE_EXP Cc: Ruchika Gupta <ruchika.gupta@nxp.com> Cc: Poonam Aggrwal <poonam.aggrwal@freescale.com> Cc: Naveen Burmi <NaveenBurmi@freescale.com> Cc: Po Liu <po.liu@freescale.com> Cc: Shengzhou Liu <Shengzhou.Liu@freescale.com> Cc: Priyanka Jain <Priyanka.Jain@freescale.com> Cc: Sumit Garg <sumit.garg@nxp.com> Cc: Shaohui Xie <Shaohui.Xie@freescale.com> Cc: Chunhe Lan <Chunhe.Lan@freescale.com> Cc: Feng Li <feng.li_2@nxp.com> Cc: Alison Wang <alison.wang@freescale.com> Cc: Mingkai Hu <Mingkai.Hu@freescale.com> Cc: York Sun <york.sun@nxp.com> Cc: Saksham Jain <saksham.jain@nxp.freescale.com> Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> Signed-off-by: Tom Rini <trini@konsulko.com>
* Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2017-02-27-16/+20
|\
| * tqma6: [cosmetic] sanitize environment definesMarkus Niebel2017-02-19-1/+1
| | | | | | | | Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * tqma6: fix rounding in envMarkus Niebel2017-02-19-6/+6
| | | | | | | | | | | | | | need to add before div in mmc update scripts. Otherwise we could write one block more ba acident Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * mx6: tqma6: add rootfsmode environment for mmc / sdMarkus Niebel2017-02-19-1/+3
| | | | | | | | Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * mx6: tqma6: fix typo in envMarkus Niebel2017-02-19-1/+1
| | | | | | | | | | | | there was a double bracketed var ref. fix this. Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * imx6: tqma6: rely on default setting for tftp and nfsMarkus Niebel2017-02-19-4/+0
| | | | | | | | | | | | | | Playing with USB-to-Ethernet dongles it turns out, that these will not work with special settings Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * arm: imx6: tqma6: add configurable CMA sizeMarkus Niebel2017-02-19-2/+7
| | | | | | | | | | | | | | | | depending on the use case different CMA sizes are needed for linux. Add env var to enable passing CMA size via kernel command line Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * mx6sx: udoo_neo: use different load address for ramdiskPeter Robinson2017-02-19-1/+1
| | | | | | | | | | | | | | | | The fdt_addr and ramdisk_addr_r are currently both defined to 0x83000000 and that's not going to work well for anyone. Move the ramdisk_addr_r to 0x84000000. Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
| * mx6sx: udoo_neo: Define the default serial consolePeter Robinson2017-02-19-0/+1
| | | | | | | | | | | | | | | | Standard boot processes including distro boot generally expect the default console to be defined. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Tested-by: Breno Lima <breno.lima@nxp.com>
* | ARM: uniphier: rename second stage loader nameMasahiro Yamada2017-02-23-1/+1
| | | | | | | | | | | | | | | | | | For the memory footprint reason, the Boot ROM can not load the ARM Trusted Firmware BL1 directly when Trusted Board Boot is enabled. The second stage loader is Socionext's own firmware, so rename it for clarification. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | Drop CONFIG_ENABLE_VBOOTTom Rini2017-02-17-2/+0
|/ | | | | | This is no longer used anywhere. Signed-off-by: Tom Rini <trini@konsulko.com>
* SPL: Move SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION to KconfigDalon Westergreen2017-02-17-7/+0
| | | | | | | | | | | Added SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION and SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION to Kconfig. Due to SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION being moved to Kconfig the board defconfigs for db-88f6820-gp_defconfig kc1_defconfig and sniper_defconfig need to be updated. Signed-off-by: Dalon Westergreen <dwesterg@gmail.com>
* SPL: add support to boot from a partition typeDalon Westergreen2017-02-17-0/+3
| | | | | | | | | | | | | the socfpga bootrom supports mmc booting from either a raw image starting at 0x0, or from a partition of type 0xa2. This patch adds support for locating the boot image in the first type 0xa2 partition found. Assigned a partition number of -1 will cause a search for a partition of type CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE and use it to find the u-boot image Signed-off-by: Dalon Westergreen <dwesterg@gmail.com>
* Merge tag 'xilinx-fixes-for-v2017.03' of git://www.denx.de/git/u-boot-microblazeTom Rini2017-02-13-1/+1
|\ | | | | | | | | | | | | | | Xilinx fixes for v2017.03 - defconfig alignment - Topic.nl board updates - Minor microblaze comment fix
| * configs/topic_miami.h: Correct kernel_size in default environmentMike Looijmans2017-02-10-1/+1
| | | | | | | | | | | | | | | | | | The kernel partition in QSPI is 0x440000 large, not 0x400000. Fix this in the environment, otherwise the kernel will fail to boot if it occupies more space. Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | flash: complete CONFIG_SYS_NO_FLASH move with renamingMasahiro Yamada2017-02-12-494/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We repeated partial moves for CONFIG_SYS_NO_FLASH, but this is not completed. Finish this work by the tool. During this move, let's rename it to CONFIG_MTD_NOR_FLASH. Actually, we have more instances of "#ifndef CONFIG_SYS_NO_FLASH" than those of "#ifdef CONFIG_SYS_NO_FLASH". Flipping the logic will make the code more readable. Besides, negative meaning symbols do not fit in obj-$(CONFIG_...) style Makefiles. This commit was created as follows: [1] Edit "default n" to "default y" in the config entry in common/Kconfig. [2] Run "tools/moveconfig.py -y -r HEAD SYS_NO_FLASH" [3] Rename the instances in defconfigs by the following: find . -path './configs/*_defconfig' | xargs sed -i \ -e '/CONFIG_SYS_NO_FLASH=y/d' \ -e 's/# CONFIG_SYS_NO_FLASH is not set/CONFIG_MTD_NOR_FLASH=y/' [4] Change the conditionals by the following: find . -name '*.[ch]' | xargs sed -i \ -e 's/ifndef CONFIG_SYS_NO_FLASH/ifdef CONFIG_MTD_NOR_FLASH/' \ -e 's/ifdef CONFIG_SYS_NO_FLASH/ifndef CONFIG_MTD_NOR_FLASH/' \ -e 's/!defined(CONFIG_SYS_NO_FLASH)/defined(CONFIG_MTD_NOR_FLASH)/' \ -e 's/defined(CONFIG_SYS_NO_FLASH)/!defined(CONFIG_MTD_NOR_FLASH)/' [5] Modify the following manually - Rename the rest of instances - Remove the description from README - Create the new Kconfig entry in drivers/mtd/Kconfig - Remove the old Kconfig entry from common/Kconfig - Remove the garbage comments from include/configs/*.h Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>