summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2017-02-272-16/+20
|\
| * tqma6: [cosmetic] sanitize environment definesMarkus Niebel2017-02-191-1/+1
| | | | | | | | Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * tqma6: fix rounding in envMarkus Niebel2017-02-191-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-191-1/+3
| | | | | | | | Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * mx6: tqma6: fix typo in envMarkus Niebel2017-02-191-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-191-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-191-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-191-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-191-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-231-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-171-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-174-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-171-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-131-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-101-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-12241-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>
* | Merge git://git.denx.de/u-boot-rockchipTom Rini2017-02-118-89/+14
|\ \ | |/ |/|
| * rockchip: rename miniarm to tinker boardEddie Cai2017-02-091-0/+0
| | | | | | | | | | | | | | | | Miniarm is the internal project code. Now it is officially named Tinker board. So rename it. Signed-off-by: Eddie Cai <eddie.cai@rock-chips.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * rockchip: firefly: configs: use spl back to bromJacob Chen2017-02-091-5/+0
| | | | | | | | | | | | | | Keep it same with other boards otherwise i have to write special script for it.. Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * rockchip: configs: move env offset to common headerJacob Chen2017-02-097-84/+14
| | | | | | | | | | | | | | To reduce redundant code. Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-netTom Rini2017-02-093-26/+38
|\ \ | |/ |/|
| * net: phy: MSCC Add Support for VSC8530-VSC8531-VSC8540-VSC8541John Haechten2017-02-081-0/+1
| | | | | | | | | | Signed-off-by: John Haechten <john.haechten@microsemi.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * tools: Allow crc8 to be usedoliver@schinagl.nl2017-02-071-0/+3
| | | | | | | | | | | | | | | | | | This patch enables crc8 to be used from within the tools directory using u-boot/crc.h. Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com> Reviewed-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
| * net: cosmetic: Define ethernet name lengtholiver@schinagl.nl2017-02-071-1/+2
| | | | | | | | | | | | | | | | There are various places where the ethernet device name is defined to several different sizes. Lets add a define and start using it. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * net: cosmetic: Make the MAC address string less magicaloliver@schinagl.nl2017-02-071-0/+5
| | | | | | | | | | | | | | | | | | | | In u-boot printf has been extended with the %pM formatter to allow printing of MAC addresses. However buffers that want to store a MAC address cannot safely get the size. Add a define for this case so the string of a MAC address can be reliably obtained. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * net: cosmetic: Do not use magic values for ARP_HLENoliver@schinagl.nl2017-02-071-25/+27
| | | | | | | | | | | | | | | | | | | | | | Commit 674bb249825a ("net: cosmetic: Replace magic numbers in arp.c with constants") introduced a nice define to replace the magic value 6 for the ethernet hardware address. Replace more hardcoded instances of 6 which really reference the ARP_HLEN (iow the MAC/Hardware/Ethernet address). Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
* | Merge git://git.denx.de/u-boot-dmTom Rini2017-02-081-0/+10
|\ \
| * | dm: core: Replace of_offset with accessorSimon Glass2017-02-081-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | At present devices use a simple integer offset to record the device tree node associated with the device. In preparation for supporting a live device tree, which uses a node pointer instead, refactor existing code to access this field through an inline function. Signed-off-by: Simon Glass <sjg@chromium.org>
* | | Remove unused symbol CONGIG_CMD_STORAGE from board configsLars Poeschel2017-02-084-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | Albeit it's a typo, neither CONGIG_CMD_STORAGE nor CONFIG_CMD_STORAGE are used anywhere, so remove the define from the board configs. Signed-off-by: Lars Poeschel <poeschel@lemonage.de> Reviewed-by: Tom Rini <trini@konsulko.com>
* | | cmd: move CONFIG_CMD_UNZIP and CONFIG_CMD_ZIP to KconfigMasahiro Yamada2017-02-088-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_CMD_ZIP is not defined by any board. I am moving CONFIG_CMD_UNZIP to defconfig files except UniPhier SoC family. I am the maintainer of UniPhier platform, so I know "select CMD_UNZIP" is better for this platform. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Michal Simek <michal.simek@xilinx.com> Acked-by: Stefan Roese <sr@denx.de> Acked-by: Ryan Harkin <ryan.harkin@linaro.org> Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
* | | keystone2: Rename local CONFIG_ symbolPhil Edworthy2017-02-081-2/+2
| | | | | | | | | | | | | | | | | | CONFIG_SPL_STACK_SIZE is not a config option, so rename it. Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
* | | api: Convert to KconfigEmmanuel Vadot2017-02-082-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we have a Kconfig for the API, convert the two boards that are using this to Kconfig and remove CONFIG_API from the whitelist. Signed-off-by: Emmanuel Vadot <manu@bidouilliste.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | | cmd: rework "license" commandMasahiro Yamada2017-02-081-1/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous commit ("add a new command to show .config contents") improves the basic infrastructure of "embed a compressed file into the U-Boot image, and print it by a command". The same pattern for the "license" command. This commit reworks the command to improve the following: [1] Improve log style Kbuild style log GZIP cmd/license_data.gz CHK cmd/license_data_gz.h UPD cmd/license_data_gz.h CHK cmd/license_data_size.h UPD cmd/license_data_size.h instead of the bare Make log: cat ./Licenses/gpl-2.0.txt | gzip -9 -c | \ tools/bin2header license_gzip > ./include/license.h [2] Collect related code into the "cmd" directory Prior to this commit, the license.h was created by tools/Makefile, placed under the "include" directory, included from cmd/license.c, and deleted by the top-level Makefile. It is not a good idea to scatter related code. [3] Drop the fixed-malloc size LICENSE_MAX Just allocate the minimum required size of buffer because we know the size of the original gpl-2.0.txt. [4] Fix more issues Terminate the buffer with zero to prevent puts() from over-running. Add "static" to do_license. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | x86: qemu: Add build options for SPLBin Meng2017-02-071-0/+9
| | | | | | | | | | | | | | | | | | If SPL is used we want to use the generic SPL framework and boot from SPI via a board-specific means. Add these options to the board config file. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | x86: link: Add build options for SPLSimon Glass2017-02-071-0/+9
| | | | | | | | | | | | | | | | If SPL is used we want to use the generic SPL framework and boot from SPI via a board-specific means. Add these options to the board config file. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* | x86: Use unsigned long for address in table generationSimon Glass2017-02-061-2/+2
|/ | | | | | | | We should use unsigned long rather than u32 for addresses. Update this so that the table-generation code builds correctly on 64-bit machines. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* Merge git://git.denx.de/u-boot-fsl-qoriqTom Rini2017-02-0330-29/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: configs/ls1046aqds_defconfig configs/ls1046aqds_nand_defconfig configs/ls1046aqds_qspi_defconfig configs/ls1046aqds_sdcard_ifc_defconfig configs/ls1046aqds_sdcard_qspi_defconfig configs/ls1046ardb_emmc_defconfig configs/ls1046ardb_qspi_defconfig configs/ls1046ardb_sdcard_defconfig
| * arch: powerpc: Move CONFIG_FSL_ELBC to KconfigPrabhakar Kushwaha2017-02-0315-16/+0
| | | | | | | | | | | | | | Enable ELBC from Kconfig. Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
| * arch: powerpc: Move CONFIG_FSL_IFC to KconfigPrabhakar Kushwaha2017-02-0313-13/+0
| | | | | | | | | | | | | | Enable IFC from Kconfig. Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
| * board: freescale: ls1012a: Enable secure DDR on LS1012A platformsPrabhakar Kushwaha2017-02-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | PPA binary needs to be relocated on secure DDR, hence marking out a portion of DDR as secure if CONFIG_SYS_MEM_RESERVE_SECURE flag is set Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> Signed-off-by: Abhimanyu Saini <abhimanyu.saini@nxp.com> Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
| * armv8: ls1046aqds: added usb feature supportTang Yuantian2017-01-271-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | The LS1046AQDS processor has three integrated USB 3.0 controllers (USB1, USB2, and USB3) that allow direct connection to the USB ports with appropriate protection circuitry and power supplies. USB1 and USB2 ports are powered by a NX5P2190UK device, which supplies 5v power at up to 1.2 A. The power enable and power-fault-detect pins are connected to the LS1046A processor via CPLD for individual port management. Signed-off-by: Tang Yuantian <yuantian.tang@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2017-02-016-9/+606
|\ \
| * | BOARD: MCCMON6: Provide support for iMX6q based mccmon6 boardLukasz Majewski2017-01-301-0/+321
| | | | | | | | | | | | | | | | | | | | | | | | This patch provides u-boot support for Liebherr (LWN) mccmon6 board. Signed-off-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Stefano Babic <sbabic@denx.de> Reviewed-by: Tom Rini <trini@konsulko.com>
| * | imx: mx6sxsabreauto: enable more dm driversPeng Fan2017-01-271-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable MMC/I2C/GPIO/PMIC/REGULATOR/PCA953X DM drivers for mx6sxsabreauto board. Drop non-DM code. Note: The i.MX DM drivers has such dependency. MXC GPIO -> MXC I2C -> PFUZE/REGULATOR MXC GPIO -> PCA953X MXC GPIO -> FSL_USDHC So the drivers needs to be enabled all to avoid compiling error. The uboot dm tree log: => dm tree Class Probed Name ---------------------------------------- root [ + ] root_driver thermal [ ] |-- imx_thermal simple_bus [ + ] |-- soc simple_bus [ + ] | |-- aips-bus@02000000 simple_bus [ ] | | |-- spba-bus@02000000 gpio [ + ] | | |-- gpio@0209c000 gpio [ + ] | | |-- gpio@020a0000 gpio [ + ] | | |-- gpio@020a4000 gpio [ + ] | | |-- gpio@020a8000 gpio [ + ] | | |-- gpio@020ac000 gpio [ + ] | | |-- gpio@020b0000 gpio [ + ] | | |-- gpio@020b4000 simple_bus [ ] | | |-- anatop@020c8000 simple_bus [ ] | | |-- snvs@020cc000 pinctrl [ + ] | | `-- iomuxc@020e0000 pinconfig [ + ] | | `-- imx6x-sabreauto pinconfig [ + ] | | |-- i2c2grp-1 pinconfig [ + ] | | |-- i2c3grp-2 pinconfig [ ] | | |-- uart1grp pinconfig [ + ] | | |-- usdhc3grp pinconfig [ ] | | |-- usdhc3grp-100mhz pinconfig [ ] | | |-- usdhc3grp-200mhz pinconfig [ + ] | | |-- usdhc4grp pinconfig [ + ] | | `-- vccsd3grp simple_bus [ + ] | |-- aips-bus@02100000 mmc [ + ] | | |-- usdhc@02198000 mmc [ + ] | | |-- usdhc@0219c000 i2c [ + ] | | |-- i2c@021a4000 i2c_generic [ + ] | | | |-- generic_8 i2c_generic [ + ] | | | `-- generic_4e i2c [ + ] | | `-- i2c@021a8000 gpio [ + ] | | |-- gpio@30 gpio [ + ] | | `-- gpio@32 simple_bus [ ] | `-- aips-bus@02200000 simple_bus [ ] | `-- spba-bus@02200000 simple_bus [ + ] `-- regulators regulator [ + ] `-- regulator@0 Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Stefano Babic <sbabic@denx.de>
| * | imx: mx6sx: add dts for mx6sxsabreauto boardPeng Fan2017-01-271-0/+280
| | | | | | | | | | | | | | | | | | | | | | | | Add dts for mx6sxsabreauto board. dts related files imported fro Linux (commit e5517c2a5a4). Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Stefano Babic <sbabic@denx.de>
| * | udoo_neo: Remove ramdiskaddr environment variableBreno Lima2017-01-271-1/+0
| | | | | | | | | | | | | | | | | | | | | Remove unused ramdiskaddr environment variable. Suggested-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Breno Lima <breno.lima@nxp.com>
| * | udoo_neo: Remove trailing semicolon and spaceBreno Lima2017-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove the trailing semicolon and space. It's not necessary to have it on the last condition. Suggested-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Breno Lima <breno.lima@nxp.com>
| * | udoo_neo: Add fdt_addr_r environment variableBreno Lima2017-01-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to doc/README.distro: "fdt_addr_r: Mandatory. The location in RAM where the DTB will be loaded or copied to when processing the fdtdir/devicetreedir or fdt/devicetree options in extlinux.conf." So add the fdt_addr_r environment variable. Suggested-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Breno Lima <breno.lima@nxp.com>
| * | imx: nitrogen6x: fix USB host initializationGary Bisson2017-01-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | USB Host scanning has been broken since v2016.05. This is due to all the USB changes that happened between v2016.03 and v2016.05, especially: 2ef117fe4f usb: Remove 200 ms delay in usb_hub_port_connect_change() a22a264ec3 usb: Change power-on / scanning timeout handling So we need to increase the init delay to 2s using the usb_pgood_delay environment variable. Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
| * | mx6qsabreauto: Pass the correct parallel NOR widthFabio Estevam2017-01-271-0/+1
| |/ | | | | | | | | | | | | | | On mx6qsabreauto the parallel NOR width is 16 bits, so pass configure CONFIG_SYS_FLASH_CFI_WIDTH correctly so that the CFI driver does not use 8 bits by default. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
View Lorry Controller Status