summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* kbuild: bug fixes and cleanups of Makefile.hostMasahiro Yamada2014-11-07-52/+9
| | | | | | | | | | | | | | | | | | | | | | | | This commit imports updates of scripts/Makefile.host from Linux 3.18-rc1. Imported commits are: [1] commit d8d9efe22709 by Masahiro Yamada kbuild: fix a typo in scripts/Makefile.host [2] commit edb950c17de0 by Masahiro Yamada kbuild: fix a bug of C++ host program handling [3] commit 62e2210798ed by Masahiro Yamada kbuild: drop shared library support from Makefile.host [4] commit 663935593915 by Masahiro Yamada kbuild: clean up scripts/Makefile.host [5] commit 1791ff7179f6 by Masahiro Yamada kbuild: clean-up and bug fix of scripts/Makefile.host Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* kbuild: remove "clobber" targetMasahiro Yamada2014-11-07-21/+7
| | | | | | | Now we stick to Linux Kernel's build system, so squash "clobber" to "clean" target. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* hush: make run_command() return an error on parsing failureRabin Vincent2014-11-07-1/+3
| | | | | | | | run_command() returns success even if the command had a syntax error; correct this behaviour. Signed-off-by: Rabin Vincent <rabin@rab.in> Acked-by: Simon Glass <sjg@chromium.org)
* hush: fix segfault on syntax errorRabin Vincent2014-11-07-1/+1
| | | | | | | | | | | | | | | | | | | Hush segfaults if it sees a syntax error while attempting to parse a command: $ ./u-boot -c "'" ... syntax error Segmentation fault (core dumped) This is due to a NULL pointer dereference of in_str->p in static_peek(). The problem is that the exit condition for the loop in parse_stream_outer() checks for rcode not being -1, but rcode is only ever 0 or 1. Signed-off-by: Rabin Vincent <rabin@rab.in> Acked-by: Simon Glass <sjg@chromium.org) Tested-by: Simon Glass <sjg@chromium.org)
* hush: return consistent codes from run_command()Rabin Vincent2014-11-07-1/+6
| | | | | | | | | | | | | Attempting to run: - an empty string - a string with just spaces returns different error codes, 1 for the empty string and 0 for the string with just spaces. Make both of them return 0 for consistency. Signed-off-by: Rabin Vincent <rabin@rab.in> Acked-by: Simon Glass <sjg@chromium.org)
* sandbox: init cli for -cRabin Vincent2014-11-07-0/+3
| | | | | | | | | | | | | | sandbox crashes if a variable is set in the -c command, because hush's top_vars is not allocated. Call cli_init() from sandbox to ensure this is done before we execute the -c command. $ ./u-boot -c 'a=1' ... Segmentation fault (core dumped) Signed-off-by: Rabin Vincent <rabin@rab.in> Acked-by: Simon Glass <sjg@chromium.org) Tested-by: Simon Glass <sjg@chromium.org)
* dlmalloc: ensure gd is set for early allocRabin Vincent2014-11-07-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempting to run the sandbox leads to a segfault, because some dynamic libraries (outside of u-boot) attempt to use malloc() to allocate memory before u-boot's gd variable is initialized. Check for gd not being NULL in the SYS_MALLOC_F_LEN handling, so that malloc() doesn't crash when called at this point. $ gdb -q --args ./u-boot (gdb) r Program received signal SIGSEGV, Segmentation fault. 0x0000000000412b9b in malloc (bytes=bytes@entry=37) at common/dlmalloc.c:2184 2184 if (!(gd->flags & GD_FLG_RELOC)) { (gdb) p gd $1 = (gd_t *) 0x0 (gdb) bt #0 0x0000000000412b9b in malloc (bytes=bytes@entry=37) at common/dlmalloc.c:2184 #1 0x00007ffff75bf8e1 in set_binding_values (domainname=0x7ffff11f4f12 "libgpg-error", dirnamep=0x7fffffffe168, codesetp=0x0) at bindtextdom.c:228 #2 0x00007ffff75bfb4c in set_binding_values (codesetp=0x0, dirnamep=0x7fffffffe168, domainname=<optimized out>) at bindtextdom.c:350 #3 __bindtextdomain (domainname=<optimized out>, dirname=0x7ffff11f4f00 "/usr/share/locale") at bindtextdom.c:348 #4 0x00007ffff11eca17 in ?? () from /lib/x86_64-linux-gnu/libgpg-error.so.0 #5 0x00007ffff7dea9fa in call_init (l=<optimized out>, argc=argc@entry=1, argv=argv@entry=0x7fffffffe208, env=env@entry=0x7fffffffe218) at dl-init.c:78 #6 0x00007ffff7deaae3 in call_init (env=0x7fffffffe218, argv=0x7fffffffe208, argc=1, l=<optimized out>) at dl-init.c:36 #7 _dl_init (main_map=0x7ffff7ffe1a8, argc=1, argv=0x7fffffffe208, env=0x7fffffffe218) at dl-init.c:126 #8 0x00007ffff7ddd1ca in _dl_start_user () from /lib64/ld-linux-x86-64.so.2 Signed-off-by: Rabin Vincent <rabin@rab.in> Acked-by: Simon Glass <sjg@chromium.org>
* power_spi.c: Rewrite pmic_reg functionTom Rini2014-11-07-23/+10
| | | | | | | | | | | | | The pmic_spi_free function isn't ever used, and as the frameworks stand today, cannot be, so remove it. Integrate the probe function into pmic_reg as it's not really a "probe" today. Finally, add an err label for the common failure cases. Cc: Lukasz Majewski <l.majewski@samsung.com> Cc: Przemyslaw Marczak <p.marczak@samsung.com> Cc: Stefano Babic <sbabic@denx.de> Signed-off-by: Tom Rini <trini@ti.com> Acked-by: Stefano Babic <sbabic@denx.de>
* image-fdt: boot_get_fdt() return value when no DTB existsNoam Camus2014-11-07-2/+2
| | | | | | | | I believe that when no DTB is around we should return 1. This why I fixed such scenarious to not return zero anymore. Else kernel might get NULL pointer to DTB which doesn't exists. Signed-off-by: Noam Camus <noamc@ezchip.com>
* powerpc: o2dnt: convert to generic boardAnatolij Gustschin2014-11-07-0/+2
| | | | Signed-off-by: Anatolij Gustschin <agust@denx.de>
* net: smc911x: Keep MAC programmedMarek Vasut2014-11-07-0/+1
| | | | | | | | | | Make sure to keep the MAC address programmed in the SMC911x ADDRH and ADDRL registers. Linux can read those registers to determine the MAC address on EEPROM-less configurations. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Joe Hershberger <joe.hershberger@ni.com> Cc: Tom Rini <trini@ti.com>
* sort drivers/mmc/MakefilePavel Machek2014-11-07-10/+12
| | | | | | | Sort drivers/mmc makefile, as requested by wd. Signed-off-by: Pavel Machek <pavel@denx.de> Acked-by: Chin Liang See <clsee@altera.com>
* generic-board: make compile-time noise for non-generic boardsMasahiro Yamada2014-11-07-0/+7
| | | | | | | | | | | | | | | | Commit 0f605c1501f6 (Start the deprecation process for generic board) added a run-time warning message. Let's be noisier for non-generic boards to inform the dead line of the conversion. This commit intentionally outputs a warning message to stdout. We still have many unconverted boards. If we print the message to stderr, MAKEALL and buildman will report tons of broken boards and really important information will be buried. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@ti.com>
* Merge git://git.denx.de/u-boot-tiTom Rini2014-11-07-243/+1336
|\
| * omap3: cm-t3517: add LCD/DVI and splash supportIgor Grinberg2014-11-06-0/+59
| | | | | | | | | | | | | | Add support for splash screen on both DVI and SCF0403 LCD. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Tom Rini <trini@ti.com>
| * omap3: cm-t3517: add Ethernet supportIgor Grinberg2014-11-06-0/+119
| | | | | | | | | | | | | | Add both EMAC and SMC911x support. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Tom Rini <trini@ti.com>
| * omap3: cm-t3517: add USB supportIgor Grinberg2014-11-06-0/+137
| | | | | | | | | | | | | | | | | | Add both host and mUSB support. Currently, the selection between host USB and mUSB is done through the config file. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Tom Rini <trini@ti.com>
| * omap3: cm-t3517: add basic board supportIgor Grinberg2014-11-06-0/+507
| | | | | | | | | | | | | | | | | | | | | | CompuLab cm-t3517 is Computer on Module (CoM) based on AM3517 SoC. Features: up to 256MB DDR2, up to 512MB NAND, USB hub, mUSB, WiFi, BT, Analog audio codec, touch screen controller, LED. Add basic support including: LED, Serial console, NAND, MMC, GPIO, I2C, 256MB DRAM. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
| * omap: hsmmc: assume cd gpio is active lowIgor Grinberg2014-11-06-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch the default CD GPIO polarity to active low. The current hsmmc driver assumption that the CD GPIO is active high, but in the real hardware, usually the opposite holds. The usual SD card socket has a mechanical switch which is grounded as soon as a card is inserted. Of course there might be some board logic which inverts the signal, but as far as current users are concerned, there is no such logic. Current U-Boot users either not using the CD functionality, or have a different way (e.g. external to SoC GPIO controller) for checking the card presence. This patch also brings the polarity assumption in line with the Linux kernel and adds appropriate comments. This patch also might spare issues once the TWL GPIO driver will be converted to the DM. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Cc: Pantelis Antoniou <panto@antoniou-consulting.com> Cc: Dmitry Lifshitz <lifshitz@compulab.co.il> Reviewed-by: Tom Rini <trini@ti.com>
| * omap3: cm-t35: move get_board_serial() fallbackIgor Grinberg2014-11-06-10/+12
| | | | | | | | | | | | | | | | | | | | The fallback is used for cases when CONFIG_SERIAL_TAG defined, but the eeprom is not used. The fallback is useful for more than one CompuLab board, so move it to a common location. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Tom Rini <trini@ti.com>
| * omap3: cm-t35: move the SMC911x codeIgor Grinberg2014-11-06-43/+112
| | | | | | | | | | | | | | | | Extract the SMC911x initialization code to a common location where it can be reused by other compulab omap3 based boards. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Tom Rini <trini@ti.com>
| * omap3: cm-t35: extract the splash code from boardIgor Grinberg2014-11-06-59/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The splash screen loading code can be reused by other compulab boards. For now extract it to a common location for further reuse. This also switches the splash code dependency from CONFIG_LCD to CONFIG_SPLASH_SCREEN as it should normally be. In addition this patch fixes the accidental dependency of the get_board_mem_timings() function on CONFIG_LCD, by just moving the splash code and leaving the above function intact. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Tom Rini <trini@ti.com>
| * omap3: cm-t35: move the USB hub reset codeIgor Grinberg2014-11-06-11/+38
| | | | | | | | | | | | | | | | Extract the USB hub reset code to a common location where it can be reused by other compulab boards. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Tom Rini <trini@ti.com>
| * compulab: refactor board revision handlingIgor Grinberg2014-11-06-25/+54
| | | | | | | | | | | | | | | | Move board revision handling code to a common location for further reuse. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Tom Rini <trini@ti.com>
| * am335x: make get_board_rev() function weakIgor Grinberg2014-11-06-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Current get_board_rev() function returns a hard coded value which is obviously incorrect for the majority of boards. Allow boards to provide a correct implementation by making this function weak. In addition open code the trivial and useless BOARD_REV_ID define and adjust the comment. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Cc: Tom Rini <trini@ti.com>
| * arm: am335x: net: pxm2: disable rgmii internal delay modeHeiko Schocher2014-11-06-1/+1
| | | | | | | | | | | | | | | | disable internal delay through gmii_sel register, as this is done in the ar8031 phy. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Tom Rini <trini@ti.com>
| * ks2_evm: board: remove sprintf for simple stringKhoronzhuk, Ivan2014-11-06-5/+2
| | | | | | | | | | | | There is no reason to sprintf simple string. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
| * ks2_evm: config: enable fatload commandKhoronzhuk, Ivan2014-11-06-0/+2
| | | | | | | | | | | | | | | | | | The keystone2 evm can boot from USB partition with FAT32 FS, so enable generic load command and fatload command usage. Acked-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
| * keystone2: config: align names of images with MCSDKKhoronzhuk, Ivan2014-11-06-8/+10
| | | | | | | | | | | | | | | | | | | | The Multicore Software Development Kit (MCSDK) provides foundational software for TI KeyStone II device platforms. It's supposed to be used with uboot, and it's convenient to have the same names for images, so correct environment image names according to the last MCSDK3. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
| * keystone2: config: restructure handling of default env settingsMurali Karicheri2014-11-06-30/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently to customize env for various ks2 boards, individual variables such as NAME_FS etc are defined and included in the common config.h to define CONFIG_EXTRA_ENV_SETTINGS. This doesn't scale well if a variable is not applicable on a specific board. Using this scheme, we have to define variables with empty value and it's ugly. Instead, to allow board specific customization of default env variable, define a common CONFIG_EXTRA_ENV_KS2_SETTINGS for all common variables and define board specific variables in individual board specific config.h using CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS. Use the common and board specific variables to define CONFIG_EXTRA_ENV_SETTINGS. This way more variables can be added in future for individual boards without affecting the other config.h files. Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
| * dma: keystone_nav: remove spurious qm_cfg verificationKhoronzhuk, Ivan2014-11-06-12/+0
| | | | | | | | | | | | | | | | The verification qm_cfg existence is done at ksnav_init(). So, there is no need to verify it after initialization. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
| * keystone2: change default boot mode to ubiMurali Karicheri2014-11-06-1/+1
| | | | | | | | | | | | | | | | | | To allow out of box demo, change default boot mode to ubi boot now that NAND is functional in latest EVMs. Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
| * ks2_evm: configs: fix UBI volume nameKhoronzhuk, Ivan2014-11-06-1/+1
| | | | | | | | | | | | | | The UBI volume name has to be prefixed with "ubi:". Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
| * ARM: TI: omap3: remove raw initrd support in omap3_igep00x0 config file ↵Guillaume GARDET2014-11-06-2/+0
| | | | | | | | | | | | | | | | since it is now in ti_armv7_common.h Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Cc: Tom Rini <trini@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
| * ARM: TI: Enable raw initrd supportGuillaume GARDET2014-11-06-0/+1
| | | | | | | | | | | | Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Cc: Tom Rini <trini@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
| * net: phy: marvell: add errata w/a for 88E151* chipsHao Zhang2014-11-06-1/+52
| | | | | | | | | | | | | | | | | | | | | | As per Marvell Release Notes - Alaska 88E1510/88E1518/88E1512/88E1514 Rev A0, Errata Section 3.1 Marvell PHY has an errata which requires that certain registers get written in order to restart autonegotiation. Signed-off-by: Hao Zhang <hzhang@ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Reviewed-by: Stefan Roese <sr@denx.de>
| * ks2_evm: readme: add k2l evm board informationKhoronzhuk, Ivan2014-11-05-5/+15
| | | | | | | | | | | | | | | | Currently Keystone2 Lamar evm (K2L) board is added, so update Keystone2 readme file to have such one. Acked-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
| * board: k2l_evm: add network supportHao Zhang2014-11-05-7/+47
| | | | | | | | | | | | | | | | | | This patch adds network support code and enables keystone_net driver usage for k2l_evm evaluation board. Acked-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Hao Zhang <hzhang@ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
| * net: keystone_net: add Keystone2 K2L SoC supportKhoronzhuk, Ivan2014-11-05-1/+7
| | | | | | | | | | | | | | | | The Keystone2 Lamar SoC uses the same keystone net driver. This patch adds opportunity to use it by K2L SoCs. Acked-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
| * net: keystone_serdes: add keystone K2L SoC supportKhoronzhuk, Ivan2014-11-05-7/+8
| | | | | | | | | | | | | | | | | | Keystone2 Lamar SoC uses the same keystone SerDes driver. All Keystone2 EVM boards currently use SerDes driver, so move CONFIG_TI_KEYSTONE_SERDES to common configuration file. Acked-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
| * ARM: keystone2: keysonte_nav: add support for K2L SoCKhoronzhuk, Ivan2014-11-05-4/+4
| | | | | | | | | | | | | | | | | | The Keystone2 Lamar SoC uses the same keystone navigator. Move queue numbers to common hardware file, as all Keystone2 SoCs have the same ones. Acked-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
| * Enable Android Fastboot support on am335x_evm boardDileep Katta2014-11-05-2/+14
| | | | | | | | | | | | Signed-off-by: Dileep Katta <dileep.katta@linaro.org> [trini: Rework so that am335x_evm_usbspl still builds] Signed-off-by: Tom Rini <trini@ti.com>
| * twl4030: More voltages on VAUX2 and VAUX3Paul Kocialkowski2014-11-05-0/+2
| | | | | | | | Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
| * am335x_evm: Convert NOR_BOOT to KconfigTom Rini2014-11-05-1/+9
| | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
| * am335x_evm: Add NOR to KconfigTom Rini2014-11-05-2/+11
| | | | | | | | | | | | | | Make enabling support for NOR (and describe where it's seen) be done via Kconfig. Signed-off-by: Tom Rini <trini@ti.com>
* | Merge branch 'rmobile' of git://www.denx.de/git/u-boot-shTom Rini2014-11-05-21/+78
|\ \
| * | arm: rmobile: alt: Add VFAT filesystem supportNobuhiro Iwamatsu2014-11-04-0/+6
| | | | | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | arm: rmobile: alt: Add support USB and USB commandsNobuhiro Iwamatsu2014-11-04-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | This adds support for USB commands and USB storage device. Signed-off-by: Yoshiyuki Ito <yoshiyuki.ito.ub@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | arm: rmobile: alt: Fix typo of SCIF idNobuhiro Iwamatsu2014-11-04-3/+3
| | | | | | | | | | | | | | | | | | | | | Alt board use SCIF2, not SCIF0. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | arm: rmobile: alt: Remove RAM address initializationNobuhiro Iwamatsu2014-11-04-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since board info structure is not still set up, the setting of RAM address causes illegal access. Therefore the setting of RAM address is removed. Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
generated by cgit v1.1 at 2024-11-09 14:52:56 +0000