summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
* | | x86: qemu: Add graphics supportBin Meng2015-06-041-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | It turns out that QEMU x86 emulated graphic card has a built-in option ROM which can be run perfectly with native mode by U-Boot. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
* | | x86: Move FRAMEBUFFER_SET_VESA_MODE etc to video KconfigBin Meng2015-06-041-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_FRAMEBUFFER_SET_VESA_MODE and CONFIG_FRAMEBUFFER_VESA_MODE are not x86-specific, so move them to drivers/video/Kconfig and make them depend on VIDEO_VESA driver. Some cosmetic fixes are applied to the Kconfig help text as well. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
* | | x86: Set CONFIG_NR_DRAM_BANKS to 8 and move it to x86-common.hBin Meng2015-06-046-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some x86 boards set CONFIG_NR_DRAM_BANKS to 1, which causes incorrect DRAM size printed when booting from coreboot, like this: CPU: x86, vendor Intel, device 663h DRAM: 636 KiB Using default environment Change it to 8 which should be enough for both coreboot and bare cases, and move it to x86-common.h. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
* | | x86: Support QEMU x86 targetsBin Meng2015-06-041-0/+57
|/ / | | | | | | | | | | | | | | | | | | | | This commit introduces the initial U-Boot support for QEMU x86 targets. U-Boot can boot from coreboot as a payload, or directly without coreboot. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org> Merged in patch 'x86: qemu: Add CMD_NET to qemu-x86_defconfig https://patchwork.ozlabs.org/patch/479745/
* | board/BuR/common: fix netconsoleHannes Schmelzer2015-06-021-11/+7
| | | | | | | | | | | | | | | | | | | | netconsole had become defective over time and cleanups. Because the feature is used very rarely nobody did take notice about this defect. With this patch the resulting syntax error on call will be fixed. Signed-off-by: Hannes Schmelzer <oe5hpm@oevsv.at>
* | configs: remove CONFIG_NET_MULTILars Poeschel2015-06-0245-49/+0
| | | | | | | | | | | | | | | | | | CONFIG_NET_MULTI is not used anywhere and thus can safely be removed from the configs. Acked-by: Marek Vasut <marex@denx.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Lars Poeschel <poeschel@lemonage.de>
* | ARM: phytec: pcm051: Remove unneeded CONFIG_USE_IRQLars Poeschel2015-06-021-3/+0
| | | | | | | | | | | | | | | | The config for pcm051 still undef'd CONFIG_USE_IRQ. This is not needed any more since it is not defined in the whole include path before. Signed-off-by: Lars Poeschel <poeschel@lemonage.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-netTom Rini2015-06-02267-328/+1
|\ \ | | | | | | | | | | | | | | | Fixup include/configs/unipher.h to not set CONFIG_LIB_RAND Signed-off-by: Tom Rini <trini@konsulko.com>
| * | net: Fix NET_RANDOM_ETHADDR dependenciesMichal Simek2015-06-0118-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NET_RANDOM_ETHADDR depends on lib/rand.c. This patch adds dependency to Kconfig to ensure that library is also compiled. Remove the definitions from Blackfin boards' include/configs. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | net: Move the CMD_NET config to defconfigsJoe Hershberger2015-06-01236-240/+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-0168-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-011-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>
* | | Merge branch 'master' of git://git.denx.de/u-boot-uniphierTom Rini2015-05-301-5/+3
|\ \ \
| * | | ARM: UniPhier: enable CONFIG_NET_RANDOM_ETHADDRMasahiro Yamada2015-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 92ac52082140 (net: Remove all references to CONFIG_ETHADDR and friends), the ethernet device on UniPhier boards is not working because of the incorrect (all-zero) MAC address. Enable CONFIG_NET_RANDOM_ETHADDR to generate the random one. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | ARM: UniPhier: move CONFIG_SYS_TEXT_BASE to KconfigMasahiro Yamada2015-05-311-5/+1
| |/ / | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | | Merge branch 'master' of http://git.denx.de/u-boot-sunxiTom Rini2015-05-307-27/+113
|\ \ \
| * | | ARM: sunxi: Enable PSCI for sun8iChen-Yu Tsai2015-05-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sun8i uses the same PSCI backend as sun6i, without power clamps. Since there is no secure SRAM, the backend is placed at the end of DRAM. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| * | | ARM: sunxi: Enable PSCI for sun6iChen-Yu Tsai2015-05-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we have a PSCI backend for sun6i, enable it. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| * | | sunxi/nand: Add support to the SPL for loading u-boot from internal NAND memoryDaniel Kochmański2015-05-296-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds support to the sunxi SPL to load u-boot from the internal NAND. Note this only adds support to access the boot partitions to load u-boot, full NAND support to load the kernel, etc. from the nand data partition will come later. Signed-off-by: Roy Spliet <r.spliet@ultimaker.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| * | | sun9i: Basic sun9i (A80) supportHans de Goede2015-05-291-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add initial sun9i (A80) support, only uart + mmc are supported for now. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
| * | | sunxi: Update sunxi-common.h to deal with different A1-SRAM base addr on sun9iHans de Goede2015-05-291-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The A1 SRAM Base differs between sun9i and the others, update sunxi-common.h to deal with this, so that we do not set the initial stack pointer to point to the BROM. This avoids the need for the weird undocumented register write I previously took from the allwiner u-boot sources and which needed #ifdef-ery in start.S as it needed to be done really early on. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
| * | | sunxi: Update sunxi-common.h to deal with different DRAM base addr on sun9iHans de Goede2015-05-291-18/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DRAM Base differs between sun9i and the others, update sunxi-common.h to deal with this. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
| * | | sunxi: Remove support for building "old-fashioned" fel binariesHans de Goede2015-05-291-9/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The latest versions of the fel tool support loading normal u-boot builds directly, and this is now the preferred way to use the fel boot method. This commit removes support for the old deprecated standalone fel builds. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
* | | cosmetic: change Author/MAINTAINER Name from Petermaier to SchmelzerHannes Schmelzer2015-05-283-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | Since i've been married, i also have a new surname. Mr. Petermaier moved to Mr. Schmelzer. In this patch i update all files in which my (old) name is present. Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com> Signed-off-by: Hannes Schmelzer <oe5hpm@oevsv.at>
* | ARMv7M: add STM32F1 supportMatt Porter2015-05-281-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-281-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-281-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-281-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-281-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-282-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-281-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-281-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-281-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-281-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-271-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-271-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-271-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-2629-1460/+480
|\
| * mx6: standardise CONFIG_CMD_CACHEPeter Robinson2015-05-2620-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-2622-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-2620-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-2622-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-2622-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-2621-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-2621-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-2624-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-2623-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-261-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-261-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-263-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>
OpenPOWER on IntegriCloud