summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* gpio: stm32: add stm32f1 supportMatt Porter2015-05-28-1/+109
| | | | | | Add support for the STM32F1 family to the STM32 gpio driver. Signed-off-by: Matt Porter <mporter@konsulko.com>
* ARMv7M: add STM32F1 supportMatt Porter2015-05-28-0/+783
| | | | | | Add ARMv7M STM32F1 support including clocks, timer, gpio, and flash. Signed-off-by: Matt Porter <mporter@konsulko.com>
* common/cmd_boot: keep ARM v7M in thumb mode during do_go_exec()Matt Porter2015-05-28-0/+45
| | | | | | | | On ARM v7M, the processor will return to ARM mode when executing a blx instruction with bit 0 of the address == 0. Always set it to 1 to stay in thumb mode. Signed-off-by: Matt Porter <mporter@konsulko.com>
* image: fix build when CONFIG_NR_DRAM_BANKS is disabled on ARMMatt Porter2015-05-28-1/+1
| | | | | | | common/image.c currently implicitly depends on CONFIG_NR_DRAM_BANKS when CONFIG_ARM is enabled. Make this requirement explicit. Signed-off-by: Matt Porter <mporter@konsulko.com>
* ARM: bcm283x: Switch to generic timerMarek Vasut2015-05-28-59/+7
| | | | | | | | | | | 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>
* ARM: bcm283x: Reorder timer.hMarek Vasut2015-05-28-5/+10
| | | | | | | | Reorder the timer.h file so it can be included from board config file. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: Tyler Baker <tyler.baker@linaro.org>
* ARM: bcm283x: Repair wdog.hMarek Vasut2015-05-28-2/+2
| | | | | | | | Trivially fix the include check in wdog.h. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: Tyler Baker <tyler.baker@linaro.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>
* kbuild: define DO_DEPS_ONLY for u-boot.cfg to fix build errorMasahiro Yamada2015-05-28-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 741e58e0fc8e (Create a .cfg file containing the CONFIG options used to build), all the Blackfin boards fail to build if the parallel (-j) option is passed. $ make -s bf506f-ezkit_defconfig # # configuration written to .config # $ make -j8 CROSS_COMPILE=bfin-elf- scripts/kconfig/conf --silentoldconfig Kconfig CHK include/config.h UPD include/config.h GEN include/autoconf.mk GEN include/autoconf.mk.dep CHK include/config/uboot.release CHK include/generated/timestamp_autogenerated.h UPD include/generated/timestamp_autogenerated.h CFG u-boot.cfg include/asm-offsets.h:3:43: fatal error: generated/generic-asm-offsets.h: No such file or directory compilation terminated. make: *** [u-boot.cfg] Error 1 When parsing header files for defined CONFIG options, DO_DEPS_ONLY must be defined to exclude generated headers that might not have been available yet. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* meminfo cmd: Enable printing >=4GiB SDRAM sizesAndrew Bradford2015-05-28-2/+2
| | | | | | | | | 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>
* spl: spl_mmc: Error and count distinctionPaul Kocialkowski2015-05-28-14/+19
| | | | | | | | | This introduces a distinction between return codes that are read bytes counts and errors. Read bytes counts are erroneous when null (no data was read) while errors are erroneous when non-null. Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Tested-by: Tim Harvey <tharvey@gateworks.com>
* add test for two 'loadables'Karl Apsite2015-05-28-9/+63
| | | | | | | Nothing too fancy. A simple test that attmpts to load two loadables and verify that they are properly unpacked in the u-boot sandbox. Signed-off-by: Karl Apsite <Karl.Apsite@dornerworks.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* Combine bootm_find_<thing> functions togetherKarl Apsite2015-05-28-38/+21
| | | | | | | | | | | | | 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-2/+129
| | | | | | | | | | | | | | 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/+111
| | | | | | | | | | | | 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>
* powerpc: gitignore: ignore PowerPC DTBsMasahiro Yamada2015-05-28-0/+1
| | | | Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* tools: use pkg-config when available to get SSL flagsThomas Petazzoni2015-05-28-1/+2
| | | | | | | | | | | | | Instead of hardcoding -lssl -lcrypto as the flags needed to build mkimage with FIT signature enabled, use pkg-config when available. This allows to properly support cases where static linking is used, which requires linking with -lz, since OpenSSL uses zlib internally. We gracefully fallback on the previous behavior of hardcoding -lssl -lcrypto if pkg-config is not available or fails with an error. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* 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>
* beagle-xm: gpio_63 fix wrong pin initializationEvgeniy Dushistov2015-05-28-1/+1
| | | | | | | | | | DM3730 CPU used on beagleboard-xm doesn't have any gpio multiplexed with wait0 pin, but gpio_63 multiplexed with wait1, so it looks like typo. At current form it has no sense, because of wait0 have no function "4". Signed-off-by: Evgneiy A. Dushistov <dushistov@mail.ru>
* 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>
* doc/README.generic-board: Trivial spell checkRicardo Ribalda2015-05-27-4/+4
| | | | 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-2/+3
| | | | | | | | 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>
* pci: display header for bus scanTim Harvey2015-05-27-0/+4
| | | | | | | If we are displaying detected PCI devices (CONFIG_PCI_SCAN_SHOW) display a 'PCI:' header prior to scan. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
* env_mmc: add error message to pass to set_default_envTim Harvey2015-05-27-16/+24
| | | | | | | | Add an error message that gets passed to set_default_env() like env_nand implements. This message is displayed to the user as the reason for falling back to the default environment. Signed-off-by: Tim Harvey <tharvey@gateworks.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>
* ARM: BeagleBoard-x15: Rev A2x5: Change UART3 muxLokesh Vutla2015-05-27-2/+2
| | | | | | | | | | | UART3 RX and TX pins are now moved to support uart download capability on the platform. Old pins are now GPIOs routed to expansion ports. All original boards should either have been returned for modifications or already modified for the required change and maintaining compatibility for older boards are no longer needed. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Nishanth Menon <nm@ti.com>
* menu: Return an error code if Ctrl-C is pressedTuomas Tynkkynen2015-05-27-0/+3
| | | | | | | | | | Previously, if the menu activated by the 'sysboot' command gets interrupted by a Ctrl-C, the behaviour is as if the menu timeout was reached - i.e. boot the default menu entry. This patch fixes that so a Ctrl-C now terminates the command as the user would expect. Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> Reviewed-by: Simon Glass <sjg@chromium.org>
* pxe: Fix crash if 'sysboot' is run without argsTuomas Tynkkynen2015-05-27-1/+1
| | | | | | | | Previously, a NULL pointer dereference would occur if the 'sysboot' command is executed without any arguments. Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> Reviewed-by: Simon Glass <sjg@chromium.org>
* Revert "Revert "stm32f4: fix serial output""Tom Rini2015-05-27-0/+3
| | | | | | | | | | Due to a misunderstanding, in 698a12b we reverted changes that we in fact wanted to keep. So lets fix that mistake and bring the code back to how it should have been. This reverts commit 698a12bef9e782dcd99c555a739c16eec8669f14. Signed-off-by: Tom Rini <trini@konsulko.com>
* moveconfig: Print status about the processed defconfigsJoe Hershberger2015-05-27-5/+11
| | | | | | | This gives a basic idea about progress. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* moveconfig: Add a switch to enable printing errorsJoe Hershberger2015-05-27-0/+8
| | | | | | | | | In some cases the build for the autoconf breaks. This outputs the errors following the status so that action can be taken without building again manually. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* moveconfig: Print a message for missing compilerJoe Hershberger2015-05-27-8/+20
| | | | | | | | | | | | A common case for failed builds is a missing compiler. Print a message for that case to tell the user concisely which compiler was expected that was not found. This patch also has the effect of not printing build errors any longer. The next patch will add a switch to optionally bring that back. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* moveconfig: Output a list of failed boardsJoe Hershberger2015-05-27-0/+4
| | | | | | | | If boards fail, output that list to a file so that it can easily be passed back into moveconfig.py using the -d option. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* moveconfig: Cleanup headers in arch and boardJoe Hershberger2015-05-27-5/+6
| | | | | | | | Some config.h files live in arch and board directories. They will need to be cleaned up as well, so run the same filters there. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* moveconfig: Add a switch to only cleanup headersJoe Hershberger2015-05-27-5/+12
| | | | | | | | In some case you may want to only cleanup the headers. Make it possible without waiting for all boards to compile. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* moveconfig: Add a parameter to accept a list to buildJoe Hershberger2015-05-27-6/+20
| | | | | | | | This is helpful to re-attempt to move failed boards from a previous run without starting over. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* moveconfig: Ignore duplicate configs when movingJoe Hershberger2015-05-27-1/+3
| | | | | | | | | | | | | | | | | When moving configs, it is important to know what was defined in the config header even if it duplicates the configs coming from Kconfig. This is specifically needed for the case where a config is set to default 'y' in the Kconfig. This would previously cause the actual value from the include config to be filtered out, and moveconfig.py would think that it was 'n'... This means that the value that should be 'y' is now (in every defconfig) set to 'not set'. tools/moveconfig.py now defines KCONFIG_IGNORE_DUPLICATES to prevent the filtering from happening and selecting wrong values for the defconfig. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* moveconfig: Always run savedefconfig on the moved configJoe Hershberger2015-05-27-9/+21
| | | | | | | | | | | | | | | This will ensure that the order of the defconfig entries will always match that of the Kconfig files. After one slightly painful (but still early in the process) pass over all boards, this should keep the defconfigs clean from here on. Users must edit the Kconfig first to add the menu entries and then run moveconfig.py to update the defconfig files and the include configs. As such, moveconfig.py cannot compare against the '.config' contents. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* tools: moveconfig: a tool to move CONFIGs from headers to defconfigsMasahiro Yamada2015-05-27-0/+853
| | | | | | | | | | | | | | | | | | | | | | | | | This tool was originally written for my local use to ease the task of tons of CONFIG moves, but there have been some requests for mainlining it. So, I have tidied up the code with nicer comments, and here it is. See the comment block of the script for usage. The first draft was http://patchwork.ozlabs.org/patch/430422/ Main updates are: - Adapted to the single .config configuration - Support colored log - Support moving multiple options at once (and take configs via input file only) - Continue even if some boards fail (Idea provided by Joe Hershberger) - Add more options - More comments and code cleanups Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
* Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2015-05-26-2099/+2635
|\
| * 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>
generated by cgit v1.1 at 2024-12-24 03:44:36 +0000