summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* pepper: Implement Board Detection mechanismAdam YH Lee2015-06-084-20/+124
| | | | | | | | | | | | AM335x-based 'Gumstix Pepper' SBCs and variants use different types of RAM (DDR2 vs DDR3 with DDR3 being the default). Detect the board type by reading the factory-programmed EEPROM [1] and use this to select any runtime boot options such as RAM type. [1] http://elinux.org/BeagleBoardPinMux#List_of_Vendor_and_Device_IDs Signed-off-by: Adam YH Lee <adam.yh.lee@gmail.com> Signed-off-by: Ash Charles <ashcharles@gmail.com>
* autoboot.c: Add feature to stop autobooting via SHA256 encrypted passwordStefan Roese2015-06-084-31/+152
| | | | | | | | | | | | | This patch adds the feature to only stop the autobooting, and therefor boot into the U-Boot prompt, when the input string / password matches a values that is encypted via a SHA256 hash and saved in the environment. This feature is enabled by defined these config options: CONFIG_AUTOBOOT_KEYED CONFIG_AUTOBOOT_STOP_STR_SHA256 Signed-off-by: Stefan Roese <sr@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
* autoboot.c: Move config options to KconfigStefan Roese2015-06-0890-265/+267
| | | | | | | | | | | | | | | | | | | This patch moves the following config options to Kconfig: CONFIG_AUTOBOOT_KEYED CONFIG_AUTOBOOT_PROMPT CONFIG_AUTOBOOT_DELAY_STR CONFIG_AUTOBOOT_STOP_STR AUTOBOOT_KEYED_CTRLC Signed-off-by: Stefan Roese <sr@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org> [trini: Drop ip04 and pm9263 configs/ additions, those boards previously set CONFIG_AUTOBOOT_PROMPT but never used it, re-run savedefconfig over all boards that did change. Make digsy_mtc_* string include seconds to match others and not warn. ] Signed-off-by: Tom Rini <trini@konsulko.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
* autoboot.c: Remove CONFIG_AUTOBOOT_STOP_STR2 and CONFIG_AUTOBOOT_DELAY_STR2Stefan Roese2015-06-083-24/+2
| | | | | | | | | | | | | | | These defines for a 2nd autoboot stop and delay string are nearly unused. Only sc3 defines CONFIG_AUTOBOOT_DELAY_STR2. And a patch to remove this most likely unmaintained board is also posted to the list. By removing these defines the code will become cleaner and moving the remaining compile options to Kconfig will get easier. Signed-off-by: Stefan Roese <sr@denx.de> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org> Cc: Wolfgang Denk <wd@denx.de> Cc: Heiko Schocher <hs@denx.de>
* Kconfig: Enable usage of escape char '\' in string valuesStefan Roese2015-06-082-54/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I might have missed something, but I failed to use the escape char '\' in strings. To pass a printf format string like "foo %d bar\n" via Kconfig to the code. Right now its not possible to use the escape character '\' in Kconfig string values correctly to e.g. set this string value "test output\n". The '\n' will be converted to 'n'. The current implementation removes some of the '\' chars from the input string in conf_set_sym_val(). Examples: '\' -> '' '\\' -> '\' '\\\' -> '\' '\\\\' -> '\\' ... And then doubles the backslash chars in the output string in sym_escape_string_value(). Example: '\' -> '' -> '' '\\' -> '\' -> '\\' '\\\' -> '\' -> '\\' '\\\\' -> '\\' -> '\\\\' ... As you see in these examples, its impossible to generate a single '\' charater in the output string as its needed for something like '\n'. This patch now changes this behavior to not drop some backslashes in conf_set_sym_val() and to not add new backslashes in the resulting output string. Removing the function sym_escape_string_value() completely as its not needed anymore. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@konsulko.com>
* Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2015-06-0838-96/+776
|\
| * imx: drop warning: unused variable 'max_freq'Stefano Babic2015-06-081-1/+2
| | | | | | | | | | | | | | max_freq in print_cpuinfo is used only with imx6. Signed-off-by: Stefano Babic <sbabic@denx.de>
| * ot1200: setup i2c bus 1 in setup_iomux_i2c()Christian Gmeiner2015-06-081-0/+15
| | | | | | | | | | | | | | On this bus there is a EEPROM containing EDID and ddr3 calibration information. Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
| * ot1200: setup i2c bus in board_early_init_f(..)Christian Gmeiner2015-06-081-18/+22
| | | | | | | | | | | | Make it possible to use the i2c bus in SPL. Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
| * colibri_vf: Enable board specific USB initialisation for USB pen gpioSanchayan Maity2015-06-082-0/+26
| | | | | | | | | | | | | | | | | | | | Add IOMUX for the pad used as USB pen. This needs to be driven low for the Iris and Viola boards where it is pulled up high by default. This is required for the USB host functionality to work on these boards. Use the board specific weak initialisation function, to drive the pin low which would be called on "usb start". Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
| * usb: ehci-vf: Add weak function for board specific initialisationSanchayan Maity2015-06-081-0/+8
| | | | | | | | | | | | | | Add a weak function board_ehci_hcd_init which can be used by the board file for board specific initialisation. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
| * colibri_vf: Add separate defconfig for device tree supportBhuvanchandra DV2015-06-082-0/+12
| | | | | | | | | | | | | | | | | | | | | | Most of the drivers available for Vybrid are not yet converted to OF model to use device tree model, only few drivers like SPI and GPIO drivers use device trees. Add separate defconfig for who needs to use device tree model. Later this can be integrated to single defconfig. Acked-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
| * colibri-vf: Enable SPI supportBhuvanchandra DV2015-06-081-0/+7
| | | | | | | | | | Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com> Acked-by: Stefan Agner <stefan@agner.ch>
| * vf610: dts: Add device tree supportBhuvanchandra DV2015-06-085-0/+160
| | | | | | | | | | | | | | | | | | Add device tree files for Freescale Vybrid platform and Toradex Colibri VF50, VF61 modules. Device tree files are taken from upstream Kernel. Removed the stuff which are not used/supported yet in U-Boot. Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
| * arm: vf610: Add iomux support for DSPIBhuvanchandra DV2015-06-082-0/+30
| | | | | | | | | | | | Add iomux definitions for DSPI second instance. Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
| * arm: vf610: Add clock support for DSPIBhuvanchandra DV2015-06-083-0/+12
| | | | | | | | Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
| * colibri_vf: Enable GPIO supportBhuvanchandra DV2015-06-082-0/+6
| | | | | | | | | | Acked-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
| * colibri_vf: Add pinmux entries for GPIOsBhuvanchandra DV2015-06-082-0/+109
| | | | | | | | | | | | | | | | | | Inorder to use the pins as GPIO, apart from setting the alt-function, pinmuxing need to be done, this patch adds pinmux entries of few GPIOs. Acked-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
| * dm: gpio: vf610: Add GPIO driver supportBhuvanchandra DV2015-06-087-0/+243
| | | | | | | | | | | | Add GPIO driver support to Freescale VF610 Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
| * dm: gpio: uclass: Add flag to control sequence numberingBhuvanchandra DV2015-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Like SPI and I2C few GPIO controllers also have multiple chip instances. This patch adds the flag 'DM_UC_FLAG_SEQ_ALIAS' in gpio_uclass driver to control device sequence numbering. By defalut the dev->r_seq for gpio_uclass will alwalys returns -1, which leads the gpio driver probe failure when using the driver with device trees. Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
| * mx6_common: Fix LOADADDR and SYS_TEXT_BASE for MX6SL and MX6SXFabio Estevam2015-06-082-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 8183058188cd2d942 ("imx6: centralise common boot options in mx6_common.h") broke boot on mx6sl and mx6sx by assuming that all mx6 SoCs use the same LOADADDR/SYS_TEXT_BASE range, which is not correct. DDR on mx6sx/mx6sl starts at 0x80000000. Adjust LOADADDR/SYS_TEXT_BASE to the proper values for mx6sx/mx6sl, so that these SoCs can boot again. Also, TQMA6 requires a custom CONFIG_SYS_TEXT_BASE value, so move its setting prior to the inclusion of mx6_common.h. Signed-off-by: Fabio Estevam <fabio.estevam at freescale.com>
| * wandboard: Add board revision detection supportFabio Estevam2015-06-082-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | There are two revisions of wandboard: version B1 and C1. Add the revision detection support, so that the correct dtb file can be automatically loaded. Based on the patch from Richard Hu <hakahu@gmail.com>. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Reviewed-by: Stefano Babic <sbabic@denx.de> Tested-By: Vagrant Cascadian <vagrant@aikidev.net>
| * arm: mx6: tqma6: use default CONFIG_SYS_PBSIZEMarkus Niebel2015-06-011-4/+0
| | | | | | | | | | | | | | | | | | this removes a config entry and uses the default value defined in config_fallbacks.h. This implements the same behaviour as a patch series for other i.MX6 boards from Freescale Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * arm: mx6: tqma6: fix spelling error in conditionMarkus Niebel2015-06-011-2/+2
| | | | | | | | Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * imx: ventana: skip mtdparts fixup if no flashTim Harvey2015-06-011-3/+5
| | | | | | | | | | | | This avoids an error message on NAND-less boards. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * imx: ventana: hang if board model could not be determinedTim Harvey2015-06-011-4/+2
| | | | | | | | | | | | | | | | If the EEPROM could not be read or is corrupt we always want to hang. Note that an error message will have been displayed by read_eeprom in this case. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * imx: ventana: make fdt_file1 and fdt_file2 automatic and non-overridableTim Harvey2015-06-011-8/+4
| | | | | | | | | | | | | | | | | | The fdt_file1 and fdt_file2 vars provide fallbacks for the fdt file loading script. There is no need to allow the user to override these as if they want to specify the fdt, they should do so in the first attempt which is the fdt_file var. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * imx: ventana: make model env var automatic and non-overridableTim Harvey2015-06-011-6/+1
| | | | | | | | | | | | | | We want to model env var to always reflect what was in the EEPROM. There is no point in allowing a user to override this. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * imx: ventana: various board-specific GPIO config updatesTim Harvey2015-06-013-30/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added iomux for CAN_STBY and RS484_TEN (GW52xx/GW53xx/GW54xx/GW551x) - Moved iomux of USBHUB_RST# out of board_ehci_hcd_init so that it is done regardless of USB being initialized in bootloader - Added usb_sel iomux/hwconfig for GW552x - Fixed mezzanine DIO for GW54xx - Fixed PANLEDR# for GW54xx - Fixed dio iomux/hwconfig for GW552x - Fixed dio iomux for GW551x - removed redundant #define Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * mxs: Do not disable bo detection when DC-DC is already enabledStefan Wahren2015-06-011-5/+5
| | | | | | | | | | | | | | | | | | In case the DC-DC is already enabled mxs_enable_4p2_dcdc_input() returns without reenabling brown out detection. So fix this issue by moving the return before brown out deactivation. Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Reviewed-by: Marek Vasut <marex@denx.de>
| * warp: Fix the 'saveenv' commandFabio Estevam2015-05-281-1/+1
| | | | | | | | | | | | | | | | | | After the mx6 config consolidation, 'save' command is no longer recognized. Pass the full command name 'saveenv' instead. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * warp: Add fuse command supportFabio Estevam2015-05-281-0/+4
| | | | | | | | | | | | Select the fuse command support. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * warp: Enable CONFIG_SUPPORT_EMMC_BOOTFabio Estevam2015-05-281-0/+1
| | | | | | | | | | | | | | CONFIG_SUPPORT_EMMC_BOOT is important to enable the boot partition via 'mmc partconf 0 1 1 0' command, for example. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * warp: Fix CONFIG_SYS_FSL_ESDHC_ADDRFabio Estevam2015-05-281-1/+1
| | | | | | | | | | | | | | Warp uses eMMC connected to esdhc2 port, so fix CONFIG_SYS_FSL_ESDHC_ADDR to reflect that. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * warp: Adjust CONFIG_SYS_DFU_DATA_BUF_SIZEFabio Estevam2015-05-281-1/+1
| | | | | | | | | | | | | | | | | | Adjust CONFIG_SYS_DFU_DATA_BUF_SIZE in order to avoid the following error when running the dfu command: => dfu 0 mmc 0 dfu_get_buf: Could not memalign 0x2000000 bytes Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * pci: imx: display message if no pcie linkTim Harvey2015-05-281-1/+3
| | | | | | | | | | | | | | If CONFIG_PCI_SCAN_SHOW enabled then lets print a message of no link was detected. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * Revert "imx: drop warning: unused variable 'max_freq'"Stefano Babic2015-05-281-2/+1
| | | | | | | | | | | | This reverts commit a0117a5e416629932becf079589f5e1859eab90a. Signed-off-by: Stefano Babic <sbabic@denx.de>
| * imx: drop warning: unused variable 'max_freq'Stefano Babic2015-05-271-1/+2
| | | | | | | | | | | | | | max_freq in print_cpuinfo is used only with imx6. Signed-off-by: Stefano Babic <sbabic@denx.de>
* | image-fit: Fix compiler warning in fit_conf_print()Hans de Goede2015-06-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This fixes the following compiler warning: In file included from tools/common/image-fit.c:1:0: ./tools/../common/image-fit.c: In function ‘fit_conf_print’: ./tools/../common/image-fit.c:1470:27: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses] (const char **)&uname) > 0; Signed-off-by: Hans de Goede <hdegoede@redhat.com>
* | Merge git://git.denx.de/u-boot-sunxiTom Rini2015-06-06131-1229/+1837
|\ \
| * | sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by defaultHans de Goede2015-06-0559-116/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then needing to have this in every sunxi defconfig file. This also fixes the Merrii_A80_Optimus defconfig no longer building. Cc: Maxin B. John <maxin.john@enea.com> Reported-by: Maxin B. John <maxin.john@enea.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
| * | sunxi: Add a proper dts file for the ga10h a33 based tabletHans de Goede2015-06-053-1/+127
| | | | | | | | | | | | | | | | | | | | | | | | Add and use a proper dts for the ga10h a33 based tablet, as submitted upstream. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
| * | sunxi: Rename Astar_MID756 to Et_q8_v1_6 to match kernel dts nameHans de Goede2015-06-042-5/+5
| | | | | | | | | | | | | | | | | | | | | Rename the Astar_MID756 to Et_q8_v1_6 to match the kernel dts name. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
| * | sunxi: Sync dts files with the linux kernelHans de Goede2015-06-0466-1103/+1507
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy over all the latest dts changes from mripard/sunxi/dt-for-4.2 , this gives us a proper dtsi file for the A33 rather then abusing sun8i-a23.dtsi for this. And this replaces our minimal (dummy) sun7i-a20-mk808c and sun8i-a33-astar-mid756 dts files with proper ones. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
| * | sunxi: gpio: Add "allwinner,sun8i-a33-pinctrl"Hans de Goede2015-06-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add "allwinner,sun8i-a33-pinctrl", this is used by the latest upstream linux sunxi dts files. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
| * | sunxi: Add new Mele_A1000G_quad defconfigHans de Goede2015-06-045-0/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Mele A1000G-quad and the Mele M9 have the same PCB, sofar we've been using the same defconfig (and dts on the kernel side) for both models. Unfortunately this does not work for the otg controller, on the M9 this is routed to a micro-usb connector on the outside, while as on the A1000G-quad it is connected to an usb to sata bridge. This commit adds a new defconfig for the Mele-A1000G-quad to allow using different otg controller settings on the 2 boards. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
| * | sunxi: usb_phy: Swap check for disconnect thresholdHans de Goede2015-06-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit the code for determining the disconnect threshold was checking for sun4i or sun6i assuming that those where the exception and that newer SoCs use a disconnect threshold of 2 like sun7i does. But it turns out that newer SoCs actually use a disconnect threshold of 3 and sun5i and sun7i are the exceptions, so check for those instead. Here are the settings from the various Allwinner SDK sources: sun4i-a10: USBC_Phy_Write(usbc_no, 0x2a, 3, 2); sun5i-a13: USBC_Phy_Write(usbc_no, 0x2a, 2, 2); sun6i-a31: USBC_Phy_Write(usbc_no, 0x2a, 3, 2); sun7i-a20: USBC_Phy_Write(usbc_no, 0x2a, 2, 2); sun8i-a23: USBC_Phy_Write(usbc_no, 0x2a, 3, 2); sun8i-h3: USBC_Phy_Write(usbc_no, 0x2a, 3, 2); sun9i-a80: USBC_Phy_Write(usbc_no, 0x2a, 3, 2); Note this commit makes no functional changes for sun4i - sun7i, and changes the disconnect threshold for sun8i to match what Allwinner uses. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
| * | sunxi: mmc: Enable pull-up on card-detect gpio pinHans de Goede2015-06-041-1/+3
| | | | | | | | | | | | | | | | | | | | | On some boards we need to enable the internal pull-up te reliable detect that no card is inserted. Signed-off-by: Hans de Goede <hdegoede@redhat.com>
* | | Merge git://git.denx.de/u-boot-fdtTom Rini2015-06-054-0/+60
|\ \ \
| * | | fdt: Documentation for a few support functions aside their prototypesPaul Kocialkowski2015-06-051-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This instroduces comments that explain the purpose, parameters and return codes of a few fdt support functions, that are used to fill the fdt. Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Acked-by: Simon Glass <sjg@chromium.org>
OpenPOWER on IntegriCloud