summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* Move setexpr to KconfigJoe Hershberger2015-06-01-68/+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>
* sparc: fix build error on gr_ep2s60 boardMasahiro Yamada2015-06-01-0/+1
| | | | | | | | | | | | | | | | | | | Commit 92ac52082140 (net: Remove all references to CONFIG_ETHADDR and friends) accidentally dropped #endif. Since then, gr_ep2s60 could not build. scripts/kconfig/conf --silentoldconfig Kconfig CHK include/config.h GEN include/autoconf.mk In file included from include/config.h:5:0, from ./include/common.h:18: include/configs/gr_ep2s60.h:15:0: error: unterminated #ifndef #ifndef __CONFIG_H__ ^ make[1]: *** [include/autoconf.mk] Error 1 Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
* ARMv7M: add STM32F1 supportMatt Porter2015-05-28-0/+1
| | | | | | Add ARMv7M STM32F1 support including clocks, timer, gpio, and flash. Signed-off-by: Matt Porter <mporter@konsulko.com>
* ARM: bcm283x: Switch to generic timerMarek Vasut2015-05-28-0/+6
| | | | | | | | | | | Switch to generic timer implementation from lib/time.c . This also fixes a signed overflow which was in __udelay() implementation. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: Tyler Baker <tyler.baker@linaro.org> Acked-by: Stephen Warren <swarren@wwwdotorg.org>
* vexpress64: use uncompressed kernel by defaultLinus Walleij2015-05-28-6/+6
| | | | | | | | The foundation model (FVP) emulator nominally boots using a clean, uncompressed kernel and the "booti" command. Augment the default U-Boot script to do this. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
* meminfo cmd: Enable printing >=4GiB SDRAM sizesAndrew Bradford2015-05-28-1/+1
| | | | | | | | | gd->ram_size is stored as phys_size_t type which can be bigger than an unsigned long on some architectures. When using unsigned long type, SDRAM of 4GiB or larger will not print the correct size, but using phys_size_t will. Signed-off-by: Andrew Bradford <andrew.bradford@kodakalaris.com>
* Combine bootm_find_<thing> functions togetherKarl Apsite2015-05-28-1/+1
| | | | | | | | | | | | | bootm_find_ramdisk_fdt() renamed to bootm_find_images() for readability. The function bootm_find_ramdisk_fdt() appears to be a simple wrapper for bootm_find_ramdisk(), bootm_find_fdt(), and now bootm_find_loadables(). I didn't see any other callers entering a bootm_find<thing>, so removing the wrapper, and condensing these together hopefully makes the code a little simpler. Signed-off-by: Karl Apsite <Karl.Apsite@dornerworks.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* add boot_get_loadables() to load listed imagesKarl Apsite2015-05-28-1/+27
| | | | | | | | | | | | | | Added a trimmed down instance of boot_get_<thing>() to satisfy the minimum requierments of the added feature. The function follows the normal patterns set by other boot_get<thing>'s, which should make it a bit easier to combine them all together into one boot_get_image() function in a later refactor. Documentation for the new function can be found in source: include/image.h Signed-off-by: Karl Apsite <Karl.Apsite@dornerworks.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* mkimage will now report information about loadableKarl Apsite2015-05-28-0/+1
| | | | | | | | | | | | Added FIT_LOADABLE_PROP, so the user can identify an optional entry named "loadables" in their .its configuration. "loadables" is a comma separated list in the .its Documentation can be found in doc/uImage.FIT/source_file_format.txt and doc/uImage.Fit/multi-with-loadables.its Signed-off-by: Karl Apsite <Karl.Apsite@dornerworks.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* include: introduce include/linux/io.h as a wrapper of asm/io.hMasahiro Yamada2015-05-28-0/+10
| | | | | | | | In the latest Linux coding style, <linux/io.h> should be included rather than <asm/io.h>. To follow this standard also in U-Boot, add include/linux/io.h. Currently, it just includes <asm/io.h>. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* vexpress64: let Juno wait for root deviceLinus Walleij2015-05-28-0/+1
| | | | | | | | The Juno reference design typically plugs the root FS on a USB stick. We need to wait a bit for the root to appear so tell this on the default command line. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
* ppc: xilinx-ppc: Move to generic board supportRicardo Ribalda2015-05-28-0/+3
| | | | | | | | Generic board support seems to work just fine. Tested on ml507 with bitstream generated on the latest ISE software. Tested-by: Georg Schardt <schardt@team-ctech.de> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
* vexpress64: fix various memory issuesLinus Walleij2015-05-27-5/+9
| | | | | | | | | | | | | | | | | | | | The ARM Trusted Firmware or other security solutions are eating memory from the top of the physical SDRAM1 space, moving backward from 0xffffffff, currently occupying e.g. 0xfe000000-0xffffffff with Trusted Firmware. This solution to reserving memory for secure world is not optimal, so we need to think of how the secure world and earlier boot stages should communicate to U-Boot what memory they are eating up. For now let's just put 16MB aside. Also enable the memory test command and define start and end of the test range so we can check that we actually have all that memory available and working. Suggested-by: Axel Haslam <ahaslam@baylibre.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
* Makefile: Add U_BOOT_TZ and include in versionChris Packham2015-05-27-1/+1
| | | | | | | | Define U_BOOT_TZ alongside U_BOOT_TIME and U_BOOT_DATE and use it to include the timezone in the version output. Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Chris Packham <judge.packham@gmail.com>
* vexpress64: specify CONFIG_SYS_FLASH_CFI_WIDTHRyan Harkin2015-05-27-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Testing on the ARM Versatile Express Juno board showed intermittent CFI flash detection problems. Debug output in exception cases showed that the NOR flash was returning incorrect values to a query command: fwc addr 0000000008000000 cmd f0 f0f0f0f0 32bit x 8 bit fwc addr 0000000008000000 cmd ff ffffffff 32bit x 8 bit fwc addr 0000000008000154 cmd 98 98989898 32bit x 8 bit is= cmd 51(Q) addr 0000000008000040 is= 00800051 51515151 fwc addr 0000000008001554 cmd 98 98989898 32bit x 8 bit is= cmd 51(Q) addr 0000000008000040 is= 00800051 51515151 fwc addr 0000000008000000 cmd f0 00f000f0 32bit x 16 bit fwc addr 0000000008000000 cmd ff 00ff00ff 32bit x 16 bit fwc addr 0000000008000154 cmd 98 00980098 32bit x 16 bit is= cmd 51(Q) addr 0000000008000040 is= 00800051 00510051 fwc addr 0000000008001554 cmd 98 00980098 32bit x 16 bit is= cmd 51(Q) addr 0000000008000040 is= 00800051 00510051 Debugging showed that the problem could be solved by preventing u-boot from scanning different flash widths by specifying CONFIG_SYS_FLASH_CFI_WIDTH so that only using the 'correct' width was used. Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
* Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2015-05-26-1460/+480
|\
| * mx6: standardise CONFIG_CMD_CACHEPeter Robinson2015-05-26-69/+4
| | | | | | | | | | | | | | 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-144/+9
| | | | | | | | | | | | | | 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-142/+13
| | | | | | | | | | | | 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-286/+16
| | | | | | | | | | | | | | 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-124/+10
| | | | | | | | | | | | | | 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-33/+4
| | | | | | | | | | | | 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-96/+7
| | | | | | | | | | | | | | 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-116/+8
| | | | | | | | | | | | | | | | 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-177/+19
| | | | | | | | | | | | | | | | | | | | | | 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>
| * novena: standardise mx6_common.h includePeter Robinson2015-05-26-1/+1
| | | | | | | | | | | | | | Standardise mx6_common.h to the same as other mx6 boards Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Tom Rini <trini at konsulko.com>
| * imx: ventana: update MMC env configurationTim Harvey2015-05-26-2/+3
| | | | | | | | | | | | We will use the same env size and redundancy used for NAND env for MMC. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * arm, imx6: add support for aristainetos2 boardHeiko Schocher2015-05-26-308/+395
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add support for imx6dl based aristainetos2 board U-Boot 2015.04-rc5-00066-g60f6ed4 (Apr 10 2015 - 08:46:27) CPU: Freescale i.MX6DL rev1.1 at 792 MHz Reset cause: WDOG Board: aristaitenos2 Watchdog enabled I2C: ready DRAM: 1 GiB NAND: 1024 MiB MMC: FSL_SDHC: 0 SF: Detected N25Q128A with page size 256 Bytes, erase size 64 KiB, total 16 MiB Display: lg4573 (480x800) In: serial Out: serial Err: serial Net: FEC [PRIME] Hit any key to stop autoboot: 0 => Signed-off-by: Heiko Schocher <hs@denx.de>
| * imx: ventana: config: enable Falcon modeTim Harvey2015-05-21-0/+16
| | | | | | | | | | | | Falcon mode entails the SPL booting the OS directly instead of U-Boot. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * wandboard: Switch to SPL supportFabio Estevam2015-05-21-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we need to build one U-boot image for each of the wandboard variants: quad, dual-lite and solo. By switching to SPL we can support all these variants with a single binary, which is very convenient. Based on the work from Richard Hu. Tested kernel booting on the three boards. Signed-off-by: Richard Hu <hakahu@gmail.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Tested-by: Vagrant Cascadian <vagrant@aikidev.net> Reviewed-by: Stefano Babic <sbabic@denx.de>
| * imx: mx6: add get_cpu_temp_grade to obtain cpu temperature grade from OTPTim Harvey2015-05-19-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MX6 has a temperature grade defined by OCOTP_MEM0[7:6] which is at 0x480 in the Fusemap Description Table in the reference manual. Return this value as well as min/max temperature based on the value. Note that the IMX6SDLRM and the IMX6SXRM do not indicate this in the their Fusemap Description Table however Freescale has confirmed that these eFUSE bits match the description within the IMX6DQRM and that they will be added to the next revision of the respective reference manuals. This has been tested with IMX6 Automative and Industrial parts. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * pmic: pfuze100 fix typoPeng Fan2015-05-19-1/+1
| | | | | | | | | | | | Change PUZE_100_SW1ABCONF to PFUZE100_SW1ABCONF Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
| * imx: riotboard, marsboard: Enable thermal supportNikolay Dimitrov2015-05-19-0/+1
| | | | | | | | Signed-off-by: Nikolay Dimitrov <picmaster@mail.bg>
| * imx: ventana: add pmic_setup to SPLTim Harvey2015-05-19-0/+1
| | | | | | | | | | | | | | We need to do any PMIC setup in the SPL if we are to bypass U-Boot for falcon mode. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * imx: ventana: (cosmetic) clean up size defines for improved readabilityTim Harvey2015-05-19-10/+12
| | | | | | | | | | | | Use the SZ_1M and SZ_1K macros from linuz/sizes.h for improved readability Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * imx: ventana: config: use MMC SPL RAW supportTim Harvey2015-05-19-4/+0
| | | | | | | | | | | | Switch to MMC RAW support for SPL. We will place the uboot.img at 69KB. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
* | Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblazeTom Rini2015-05-26-0/+5
|\ \
| * | zynq: Use system timer implementation instead of ourMichal Simek2015-05-25-0/+5
| | | | | | | | | | | | | | | | | | | | | Don't use error-prone arch timer code and instead use system timer implementation to simplify our code. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | | Merge git://git.denx.de/u-boot-nand-flashTom Rini2015-05-24-5/+2
|\ \ \ | |/ / |/| |
| * | mtd: vf610_nfc: enable ONFI detectionStefan Agner2015-05-24-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes enable ONFI detection. The Read ID command now allows one address byte which is needed for ONFI detection. To read the ONFI parameter page, the NAND_CMD_PARAM need to be supported. The CMD code enables one command and one address byte along with reading data from flash using R/B#, as specified by ONFI. Signed-off-by: Stefan Agner <stefan@agner.ch>
| * | mtd: vf610_nfc: add Freescale NFC controller configs to KconfigStefan Agner2015-05-24-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit allows users to enable/disable the Freescale NFC controller found in systems like Vybrid (VF610), MPC5125, MCF54418 or Kinetis K70 via Kconfig with more detailed help docs. Signed-off-by: Stefan Agner <stefan@agner.ch> Acked-by: Stefano Babic <sbabic@denx.de> [scottwood: updated vf610twr_nand_defconfig] Signed-off-by: Scott Wood <scottwood@freescale.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriqTom Rini2015-05-22-5/+26
|\ \ \
| * | | arm/ls1021a: Remove ccsr_ddr from immap_ls102xa.hYork Sun2015-05-20-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ccsr_ddr structure is already defined in fsl_immap.h. Remove this duplicated define. Move fixed timing into ls1021atwr.h. Signed-off-by: York Sun <yorksun@freescale.com> CC: Alison Wang <alison.wang@freescale.com> Acked-by: Alison Wang <alison.wang@freescale.com>
| * | | driver/ddr/fsl: Remove deskew_cntrl registerYork Sun2015-05-20-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This register is reserved and shouldn't have been exposed. Accessing it may have unexpected result on different SoCs. Signed-off-by: York Sun <yorksun@freescale.com>
| * | | arm: ls102xa: Adjust the load address of U-Boot for NOR bootAlison Wang2015-05-20-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original load address of U-Boot is 0x67f80000. The address space of NOR flash is 0x60000000 to 0x67ffffff. It will cause the size of u-boot couldn't be larger than 512K. As more features are supported in u-boot, the size of u-boot is larger than 512K. To fix this issue, the load address of U-Boot for NOR boot is adjusted to 0x60100000. In RCW, the PBI command needs to change as follows: .pbi -write 0xee0200, 0x67f80000 +write 0xee0200, 0x60100000 .end Signed-off-by: Alison Wang <alison.wang@freescale.com> Reviewed-by: York Sun <yorksun@freescale.com>
* | | test: env: Add test framework for envJoe Hershberger2015-05-21-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new "env" subcommand to the ut command. This will run unit tests on the env code. This should be targetable to any device that supports the env features needed for the tests. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | | test: Return values from the asserts compatible with cmdsJoe Hershberger2015-05-21-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The asserts are sometimes called from the context of the test command itself so make sure that a return that happens as a result of a failure is compatible with that command return. When called within a test, the return value is ignored. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | | test: dm: Move the time test over to the ut commandJoe Hershberger2015-05-21-0/+1
| | | | | | | | | | | | | | | | | | | | | Unify the command for running unit tests further by moving the "ut_time" command over to "ut time". Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
* | | test: dm: Move the dm tests over to the ut commandJoe Hershberger2015-05-21-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | Unify the command for running unit tests further by moving the "dm test" command over to "ut dm". Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org>
* | | test: Add a common unit test commandJoe Hershberger2015-05-21-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Add a command that all other unit tests should be a sub-command of. Also include a command that will run all tests. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org>