summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-19SPDX-License-Identifier: convert PIBS licensed filesWolfgang Denk
This commit adapts the files that were derived from PIBS (PowerPC Initialization and Boot Software) codeto using SPDX License Identifiers. So far, SPDX has not assigned an official License ID for the PIBS license yet, so this should be considered preliminary. Note that the following files contained incorrect license information: arch/powerpc/cpu/ppc4xx/4xx_uart.c arch/powerpc/cpu/ppc4xx/start.S arch/powerpc/include/asm/ppc440.h These files included, in addition to the GPL-2.0 / ibm-pibs dual license as inherited from PIBS, a GPL-2.0+ license header which was obviously incorrect. This has been removed. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de> Conflicts: Licenses/README Acked-by: Stefan Roese <sr@denx.de>
2013-08-19SPDX-License-Identifier: fixing some problematic GPL-2.0 filesWolfgang Denk
Unlike the other patches in this series so far, this commit fixes a ambiguity in the license terms for some OMAP files: the code was originally derived from the Linux kernel sources, where it was clearly marked as GPL-2.0 (i. e. without the "or later" part), but the U-Boot version had a GPL-2.0+ file header added, apparently without permission / relicensing from the original authors of the code. Insert a GPL-2.0 SPDX-License-Identifier to fix this. Signed-off-by: Wolfgang Denk <wd@denx.de> cc: Tom Rix <Tom.Rix@windriver.com> Cc: Tom Rini <trini@ti.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Acked-by: Tom Rini <trini@ti.com>
2013-08-19SPDX-License-Identifier: convert GPL-2.0+ / BSD-2-Clause dual-licensed filesWolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2013-08-19net: ftmac110: Update tx/rx descriptor formatKuo-Jung Su
1. Reformat tx/rx descriptor as an uniform struct. 2. Replace uint32_t[2] with uint64_t for descriptor control. Signed-off-by: Kuo-Jung Su <dantesu@faraday-tech.com> CC: Joe Hershberger <joe.hershberger@gmail.com>
2013-08-19net: ftmac110: struct ftmac110_regs __iomem * -> struct ftmac110_regs *Kuo-Jung Su
Signed-off-by: Kuo-Jung Su <dantesu@faraday-tech.com> CC: Joe Hershberger <joe.hershberger@gmail.com>
2013-08-19net: ftmac110: Update license statementKuo-Jung Su
Signed-off-by: Kuo-Jung Su <dantesu@faraday-tech.com> CC: Joe Hershberger <joe.hershberger@gmail.com>
2013-08-19net.h: don't use the reserved name __unusedJeroen Hofstee
The __* keywords are reserved. On FreeBSD __unused evaluates to the attribute unused, causing a compilation failure. Just use unused instead. Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> cc: joe.hershberger@gmail.com
2013-08-19linkstation_HGLAN: Convert from unused CONFIG_BOOTP_MASK to specific listTom Rini
Signed-off-by: Tom Rini <trini@ti.com>
2013-08-19galaxy5200: Convert from unused CONFIG_BOOTP_MASK to specific listTom Rini
Signed-off-by: Tom Rini <trini@ti.com>
2013-08-19configs: Remove unused CONFIG_BOOTP_DEFAULTTom Rini
Signed-off-by: Tom Rini <trini@ti.com>
2013-08-19net: phy/realtek: Add support for RTL8211DN and RTL8211E phy modulesBhupesh Sharma
This patch adds support for Realtek PHY modules RTL8211DN and RTL8211E (variants: RTL8211E-VB-CG, RTL8211E-VL-CG, RTL8211EG-VB-CG), which can be found on Freescale's T1040RDB boards. To make the driver more generic across 8211 family, a generic name 8211x is added for macros and function names. Signed-off-by: Bhupesh Sharma <bhupesh.sharma@freescale.com> Acked-by: York Sun <yorksun@freescale.com>
2013-08-19net: smsc95xx: Add support for another SMSC95xx variantStefan Roese
This patch adds support for the SMSC9500 with product id 0x9900 which is equipped in the "EXSYS USB 2.0" etherner USB adapter. Tested on omap3_beagle. Signed-off-by: Stefan Roese <sr@denx.de>
2013-08-19net: Use ARRAY_SIZE at appropriate placesAxel Lin
Use ARRAY_SIZE instead of having similar implementation in each drivers. The NUMELEMS defined in drivers/net/npe/include/IxOsalTypes.h is not used at all, so this patch removes it instead of converting it to use ARRAY_SIZE. Signed-off-by: Axel Lin <axel.lin@ingics.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Ben Warren <biggerbadderben@gmail.com> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Joe Hershberger <joe.hershberger@ni.com> Cc: Marek Vasut <marex@denx.de> Cc: Mike Frysinger <vapier@gentoo.org> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Cc: TsiChungLiew <Tsi-Chung.Liew@freescale.com> Cc: Wolfgang Denk <wd@denx.de> Cc: York Sun <yorksun@freescale.com>
2013-08-19phy: smsc: LAN8710/8720 are not Gbit PHYsFabio Estevam
LAN8710/8720 are 10/100 Mbps PHYs, so fix the '.features' field. Cc: Joe Hershberger <joe.hershberger@ni.com> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
2013-08-19serial: arm_dcc: Convert to use default_serial_putsAxel Lin
Use default_serial_puts() instead of its own implementation. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Michal Simek <monstr@monstr.eu>
2013-08-19powerpc/ppc4xx: Fix dlvision-10g reset gpioDirk Eibach
Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> Signed-off-by: Stefan Roese <sr@denx.de>
2013-08-19powerpc/ppc4xx: Do full iocon PHY initialization in softwareDirk Eibach
Up to this point some PHY initialization was done from the FPGA and some from u-boot. From now all initialization is done from u-boot. To keep this maintainable a PHY setup machine was implemented that can execute commands from initialization arrays. Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> Signed-off-by: Stefan Roese <sr@denx.de>
2013-08-19powerpc/ppc4xx: Add support for iocon-2Dirk Eibach
Add a new iocon flavor with a second communiction port per channel. Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> Signed-off-by: Stefan Roese <sr@denx.de>
2013-08-19powerpc/ppc4xx: Add support for iocon fiberDirk Eibach
Add a new iocon flavor with fiber instead of copper connectivity. Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> Signed-off-by: Stefan Roese <sr@denx.de>
2013-08-18Merge branch 'master' of git://88.191.163.10/u-boot-armTom Rini
Fixup an easy conflict over adding the clk_get prototype and USB_OTG defines for am33xx having moved. Conflicts: arch/arm/include/asm/arch-am33xx/hardware.h Signed-off-by: Tom Rini <trini@ti.com>
2013-08-17Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD
2013-08-16gpio: pca953x: Use ARRAY_SIZE instead of reinventing itAxel Lin
Signed-off-by: Axel Lin <axel.lin@ingics.com> Reviewed-by: Thierry Reding <thierry.reding@gmail.com> Acked-by: Marek Vasut <marex@denx.de>
2013-08-16tools/Makefile: Move _GNU_SOURCE to MakefileYork Sun
Commit 669dfc2e adds libfdt_env.h to HOSTCPPFLAGS. It causes stdio.h to be included before _GNU_SOURCE is defined in C files. On some old hosts some prototypes are protected by #ifdef __USE_GNU, which is set when _GNU_SOURCE is defined. Signed-off-by: York Sun <yorksun@freescale.com> Acked-by: Simon Glass <sjg@chromium.org>
2013-08-16image: Display FIT timestamp when bootingSimon Glass
The timestamp is shown in fit_print_contents() but for some reason not in fit_image_print(). This seems to be an oversight, since it is the latter which is used by bootm. Add timestamp printing in this case. (There is code duplication in these two function, for looking at in a future patch). Signed-off-by: Simon Glass <sjg@chromium.org>
2013-08-16bootm: fix conditional controlling call to fixup_silent_linuxPaul B. Henson
This function is only defined if CONFIG_SILENT_CONSOLE is set and CONFIG_SILENT_U_BOOT_ONLY is not set, the call to it should be based on the same conditions. Signed-off-by: Paul B. Henson <henson@acm.org> Acked-by: Simon Glass <sjg@chromium.org>
2013-08-16RFC: bootm: Add silent_linux environment variableSimon Glass
At present the console for linux is silent if the U-Boot console is silent, unless CONFIG_SILENT_U_BOOT_ONLY is set. I wonder if a better way would be to have an environment variable to control this? Then we can control the verbosity from scripts, and set the variable to 'no' for those boards that want Linux to boot with console output. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-08-16SPL: Limit image name print lengthTaras Kondratiuk
If image name is longer than 32 bytes, then it will be truncated. This will remove '\0' at the end of the line, so printf will go out of string limit. Signed-off-by: Taras Kondratiuk <taras@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
2013-08-16Enable xmodem supportAngus Ainslie
This is a trivial patch that just enables xmodem downloads using the existing ymodem framework. Signed-off-by: Angus Ainslie <angus@akkea.ca>
2013-08-15Add TI816X evm board supportTENART Antoine
Signed-off-by: Antoine Tenart <atenart@adeneo-embedded.com> [trini: Change to SPDX, fix a few compiler warnings, adapt to CONFIG_OMAP_COMMON] Signed-off-by: Tom Rini <trini@ti.com>
2013-08-15Add TI816X supportTENART Antoine
Signed-off-by: Antoine Tenart <atenart@adeneo-embedded.com> [trini: Fix warnings about vtp things in emif4.c, adapt AM43XX] Signed-off-by: Tom Rini <trini@ti.com>
2013-08-15Prepare for TI816X : reuse existing code from TI814XTENART Antoine
Rename some CONFIG_TI814X to a more generic CONFIG_TI81XX Signed-off-by: Antoine Tenart <atenart@adeneo-embedded.com> [trini: Adapt for CONFIG_OMAP_COMMON changes, AM43XX] Signed-off-by: Tom Rini <trini@ti.com>
2013-08-15arm, da850: add ipam390 board supportHeiko Schocher
add the am1808 based ipam390 board from Barix. - 128MByte, DDR2, synchronous RAM 16bit databus to SDRAM interface - 128MByte, NAND Flash, 8bit databus to the NANDFlash Interface - Ethernet PHY Micrel KSZ8051R via RMII - Console on UART 0 - booting fron nand flash - spl falcon bootmode Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Tom Rini <trini@ti.com>
2013-08-15arm, da850: enable the correct uart in arch_cpu_init()Heiko Schocher
in arch_cpu_init() uart2 is fix enabled, without reference the setting from CONFIG_SYS_NS16550_COM1. Use the setting from CONFIG_SYS_NS16550_COM1 for enabling the console. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Tom Rini <tom.rini@gmail.com> Cc: Christian Riesch <christian.riesch@omicron.at>
2013-08-15bootstage: get more BOOTSTAGE_ID* in show_boot_progress()Heiko Schocher
In case CONFIG_BOOTSTAGE is not defined, call from bootstage_mark_name() show_boot_progress(), so get more BOOTSTAGE_ID* ids in show_boot_progress() if CONFIG_BOOTSTAGE is not defined. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@ti.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Acked-by: Simon Glass <sjg@chromium.org>
2013-08-15arm/davinci/da850: add uart0_pins_rtscts and RMII_MHz_50_CLK in ↵Heiko Schocher
emac_pins_rmii pinmux Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Tom Rini <trini@ti.com>
2013-08-15TI:armv7: Enable CONFIG_CMD_GPIOTom Rini
Add the generic "poke a GPIO" command, with the GPIO related defines. Acked-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Tom Rini <trini@ti.com>
2013-08-15TI:armv7: Enable CONFIG_CMD_SPITom Rini
Add the generic "poke the SPI bus" command, with the SPI related defines. Acked-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Tom Rini <trini@ti.com>
2013-08-15TI:omap5/dra7xx: Convert to ti_armv7_common.hTom Rini
Update omap5_common.h to use ti_armv7_common.h, and in turn update dra7xx_evm.h and omap5_uevm.h slightly. The biggest changes here are that IP blocks which exist on the platform, and had clocks enabled, now have the drivers being built as well. Signed-off-by: Tom Rini <trini@ti.com>
2013-08-15TI:am33xx: Create common config files for TI ARMv7 platforms, and AM33xxTom Rini
We create two new files, include/configs/ti_armv7_common.h for all of the common IP blocks and related features / commands we share in virtually all of our platforms. We then create include/configs/ti_am335x_common.h for everything common to the am335x SoC leaving just the board specific parts to include/configs/ti_am335x_common.h. Signed-off-by: Tom Rini <trini@ti.com>
2013-08-15am335x_evm: Bring in 'boot_fdt' logic from i.MXTom Rini
Bring in the 'boot_fdt' environment variable that i.MX boards use to try and load a device tree when booting. Signed-off-by: Tom Rini <trini@ti.com>
2013-08-15arm: spl: For Falcon Mode, set a default machid of ~0Tom Rini
With device trees, boards do not always set CONFIG_MACH_TYPE now, so we must not rely on this define being set. The kernel uses ~0 to see if we have a valid machine number or not, so set that as the default, invalid machine, id and only fix if CONFIG_MACH_TYPE is set. Acked-by: Dan Murphy <dmurphy@ti.com> Tested-by: Heiko Schocher <hs@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Signed-off-by: Tom Rini <trini@ti.com>
2013-08-15am335x_evm: Use default baud rate tableTom Rini
Signed-off-by: Tom Rini <trini@ti.com>
2013-08-15am33xx: Stop using PHYS_DRAM_1 defineTom Rini
We defined PHYS_DRAM_1 to 0x80000000 (start of DRAM) and then used this for CONFIG_SYS_SDRAM_BASE. But then we kept on referencing PHYS_DRAM_1 in other places. Change to directly setting CONFIG_SYS_DRAM_BASE and then using that name in code. Signed-off-by: Tom Rini <trini@ti.com>
2013-08-15am33xx: CONFIG_DMA_COHERENT defines are unused, removeTom Rini
Acked-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Tom Rini <trini@ti.com>
2013-08-15OMAP3: igep00x0: allow booting with a FDT from MMCJavier Martinez Canillas
IGEP boards now have Device Tree support in the mainline kernel. To boot an IGEP board using a DT, a uEnv.txt plain text file could be used to define a custom uenvcmd that will be run by the default boot command. It is more convenient to change the default boot command to allow loading a FDT if it is stored in the boot dir of the rootfs uSD/MMC partition. If no FDT is found then the defaul command tries to boot a zImage without a DT using legacy boot. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
2013-08-15ARM: igep00x0.h: Enable the use of CMD_EXT4, CMD_FS_GENERIC and zImage.Enric Balletbo i Serra
Able to load the kernel from some form of ext[234] or FAT. Also, with v3.9 and later of the Linux Kernel, uImage isn't builtable anymore by default, so we should switch to use the bootz command. Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
2013-08-15omap: emif: Set initial DDR PHY config firstTaras Kondratiuk
Commit "OMAP5: emif/ddr: Change emif settings as required for ES1.0 silicon" (f40107345cbcd6e0d1747eda45e76c4e2a6df0db) changed sequence to set final DDR PHY config register value at the beginning. Looks like it was made by mistake and should be reverted. Signed-off-by: Taras Kondratiuk <taras@ti.com>
2013-08-15ARM: omap24xx: remove remainders of dead boardMasahiro Yamada
Since Commit 7f5eef9 removed OMAP2420H4 support, arm1136/omap24xx has not been used at all. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2013-08-15ARM: omap3: Implement dpll5 (HSUSB clk) workaround for OMAP36xx/AM/DM37xx ↵Naumann Andreas
according to errata sprz318e. In chapter 'Advisory 2.1 USB Host Clock Drift Causes USB Spec Non-compliance in Certain Configurations' of the TI Errata it is recommended to use certain div/mult values for the DPLL5 clock setup. So far u-boot used the old 34xx values, so I added the errata recommended values specificly for 36xx init only. Also, the FSEL registers exist no longer, so removed them from init. Tested this on a AM3703 board with 19.2MHz oscillator, which previously couldnt lock the dpll5 (kernel complained). As a consequence the EHCI USB port wasnt usable in U-Boot and kernel. With this patch, kernel panics disappear and USB working fine in u-boot and kernel. Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> [trini: Add extern to <asm/arch-omap3/clock.h> Signed-off-by: Tom Rini <trini@ti.com>
2013-08-15omap: overo: Use 200MHz SDRC timings for revision 1, 2 & 3 boardsAsh Charles
Gumstix uses 200Mhz RAM on revision 1, 2 & 3 COMs, so use 200MHz timings rather than 165MHz. Based on 6cf8bf44b1f8550e12f7f2a16e01890e5de8443d Signed-off-by: Ash Charles <ashcharles@gmail.com>