summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* exynos: spl: Add a custom spi copy functionRajeshwari Shinde2013-12-033-4/+121
| | | | | | | | | | | | | | This patch implements a custom spi_copy funtion to copy u-boot from SF to RAM. This is faster then iROM spi_copy funtion as this runs spi at 50Mhz and also in WORD mode of operation. Changed a printf in pinmux.c to debug just to avoid the compilation error in SPL. Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com> Signed-off-by: Tom Wai-Hong Tam <waihong@chromium.org> Signed-off-by: Rajeshwari S Shinde <rajeshwari.s@samsung.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
* arm: exynos: fix the align for exynos4_power structureMinkyu Kang2013-12-031-1/+1
| | | | | | | res3 should be 4bytes Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Cc: Dominik Klein <dominik.klein@gmx.com>
* arm: exynos: fix set_mmc_clk for exynos4x12Jaehoon Chung2013-12-031-1/+2
| | | | | | | | Fix the set_mmc_clk() for exnos4x12. If board is exynos4x12, mmc clock should be set to wrong value. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
* Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'Albert ARIBAUD2013-11-221-4/+5
|\
| * arm: zynq : Revert TZ_DDR_RAM to secure.Radhey Shyam Pandey2013-11-061-2/+0
| | | | | | | | | | | | | | | | | | | | TZ_DDR_RAM on reset is in secure mode. Since uboot and linux runs in full TZ privilege secure mode, no need to set DDR trustzone to non-secure. Signed-off-by: Radhey Shyam Pandey <radheys@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * arm: zynq: Do not remap OCM to high addressMichal Simek2013-11-061-2/+5
| | | | | | | | | | | | | | | | In case where ps-ddr is not used, do not remap OCM to high address and keep it from 0x0. Linux SMP requires to have memory at 0x0. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | arm, am33x: make RTC32K OSC enable configurableHeiko Schocher2013-11-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As http://www.denx.de/wiki/view/U-Boot/DesignPrinciples#2_Keep_it_Fast states: "Initialize devices only when they are needed within U-Boot" enable the RTC32K OSC only, if CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is enabled. Enable this in ti_am335x_common.h, so all boards in mainline should work as before. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Tom Rini <trini@ti.com>
* | Merge branch 'iu-boot/master' into 'u-boot-arm/master'Albert ARIBAUD2013-11-0920-93/+149
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/cpu/arm926ejs/mxs/Makefile board/compulab/cm_t35/Makefile board/corscience/tricorder/Makefile board/ppcag/bg0900/Makefile drivers/bootcount/Makefile include/configs/omap4_common.h include/configs/pdnb3.h Makefile conflicts are due to additions/removals of object files on the ARM branch vs KBuild introduction on the main branch. Resolution consists in adjusting the list of object files in the main branch version. This also applies to two files which are not listed as conflicting but had to be modified: board/compulab/common/Makefile board/udoo/Makefile include/configs/omap4_common.h conflicts are due to the OMAP4 conversion to ti_armv7_common.h on the ARM side, and CONFIG_SYS_HZ removal on the main side. Resolution is to convert as this icludes removal of CONFIG_SYS_HZ. include/configs/pdnb3.h is due to a removal on ARM side. Trivial resolution is to remove the file. Note: 'git show' will also list two files just because they are new: include/configs/am335x_igep0033.h include/configs/omap3_igep00x0.h
| * \ Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD2013-11-0710-41/+72
| |\ \ | | |/ | |/|
| | * ARM: mxs: Enable DCDC converter for battery bootMarek Vasut2013-10-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the board detected sufficient voltage for battery boot, make sure the DCDC converter is ON and the board is not running only from linregs, otherwise an instability will be observed. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com>
| | * mx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pinOtavio Salvador2013-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This removes the PAD_CTL_DSE_120ohm as done for i.MX6Q's IPU1_DI0_PIN4 pin definition and makes it aligned with 3.0.35-4.1.0 and 3.12 mainline kernel. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * mx5: lowlevel_init: Remove unused macroFabio Estevam2013-10-311-6/+0
| | | | | | | | | | | | | | | | | | | | | setup_wdog macro is not used anywhere, so just remove it. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Stefano Babic <sbabic@denx.de>
| | * ARM: mx5: Enable L2 cacheFabio Estevam2013-10-311-0/+6
| | | | | | | | | | | | | | | | | | Enable L2 cache for improving the system performance. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| | * ARM: mxs: Setup stack in JTAG modeMarek Vasut2013-10-172-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the MX23/MX28 is switched into JTAG mode via the BootMode select switches, the BootROM bypasses the CPU core registers initialization. This in turn means that the Stack Pointer (SP) register is not set as it is in every other mode of operation, but instead is only zeroed out. To prevent U-Boot SPL from crashing in this obscure JTAG mode, configure the SP to point at the CONFIG_SYS_INIT_SP_ADDR if the SP is zeroed out. Note that in case the SP is already configured, we must preserve that exact SP value and must not modify it. This is important since in every other mode but the JTAG mode, the SPL returns into the BootROM and BootROM in turn loads U-Boot itself. If the SP were to be corrupted, the BootROM won't be able to continue it's operation after returned from SPL and the system would crash. Finally, add the JTAG mode switch identifier, so it's not recognised as Unknown mode. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Otavio Salvador <otavio@ossystems.com.br>
| | * ARM: mxs: tools: Use mkimage for BootStream generationMarek Vasut2013-10-173-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that mkimage can generate an BootStream for i.MX23 and i.MX28, use the mkimage as a default tool to generate the BootStreams instead of the elftosb tool. This cuts out another obscure dependency. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Otavio Salvador <otavio@ossystems.com.br> Cc: Stefano Babic <sbabic@denx.de>
| | * mx6: compute PLL PFD frequencies rather than using definesPierre Aubert2013-10-172-25/+42
| | | | | | | | | | | | | | | Signed-off-by: Pierre Aubert <p.aubert@staubli.com> CC: Stefano Babic <sbabic@denx.de>
| * | Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'Albert ARIBAUD2013-11-052-0/+9
| |\ \
| | * | at91: add defines for reset typeRoger Meier2013-11-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Meier <r.meier@siemens.com> Acked-by: Bo Shen <voice.shen@atmel.com> Reviewed-by: Heiko Schocher <hs@denx.de> Cc: Andreas Bießmann <andreas.devel@googlemail.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| | * | arm: atmel: at91sam9n12ek: add usb host supportBo Shen2013-11-041-0/+2
| | |/ | | | | | | | | | | | | | | | | | | Add usb host support for at91sam9n12ek board. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | ARM: OMAP5: DDR3: Change io settingsSRICHARAN R2013-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change from 0x64656465 to 0x64646464 is to remove the weak pull enabled on DQS, nDQS lines. This pulls the differential signals in the same direction which is not intended. So disabling the weak pulls improves signal integrity. On the uEVM there are 4 DDR3 devices. The VREF for 2 of the devices is powered by the OMAP's VREF_CA_OUT pins. The VREF on the other 2 devices is powered by the OMAP's VREF_DQ_OUT pins. So the net effect here is that only half of the DDR3 devices were being supplied a VREF! This was clearly a mistake. The second change improves the robustness of the interface and was specifically seen to cure corruption observed at high temperatures on some boards. With the above two changes better memory stability was observed with extended temperature ranges around 100C. Signed-off-by: Sricharan R <r.sricharan@ti.com>
| * | dra7xx_evm: Enabled UART-boot mode and add dra7xx_evm_uart3 buildMinal Shah2013-11-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UART booting is supported on this SoC, but via UART3 rather than UART1. Because of this we must change the board to use UART3 for all console access (only one UART is exposed on this board and a slight HW mod is required to switch UARTs). Signed-off-by: Minal Shah <minal.shah@ti.com> [trini: Make apply to mainline, reword commit] Signed-off-by: Tom Rini <trini@ti.com>
| * | am335x: Enable CONFIG_OMAP_WATCHDOG supportTom Rini2013-11-011-0/+4
| | | | | | | | | | | | | | | | | | | | | There is a board-specific portion for calling watchdog enable itself, in main U-Boot. Signed-off-by: Tom Rini <trini@ti.com>
| * | am33xx, davinci: Create and use <asm/davinci_rtc.h>Tom Rini2013-11-014-50/+56
| |/ | | | | | | | | | | | | Create a common header file for the RTC IP block that is shared between davinci and am33xx. Signed-off-by: Tom Rini <trini@ti.com>
| * zynq: Use arch_cpu_init() instead of lowlevel_init()Michal Simek2013-10-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | Zynq lowlevel_init() was implemented in C but stack pointer is setup after function call in _main(). Move architecture setup to arch_cpu_init() which is call as the first function in board_init_f() which already have correct stack pointer. Reported-by: Sven Schwermer <sven.schwermer@tuhh.de> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | include: delete include/linux/config.hMasahiro Yamada2013-11-0823-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | Linux Kernel abolished include/linux/config.h long time ago. (around version v2.6.18..v2.6.19) We don't need to provide Linux copatibility any more. This commit deletes include/linux/config.h and fixes source files not to include this. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | cosmetic: remove empty lines at the top of fileMasahiro Yamada2013-11-0811-11/+0
| | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | sparc: include config.h to start.SMasahiro Yamada2013-11-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arch/sparc/cpu/leon3/start.S requires CONFIG_SYS_SPARC_NWINDOES to be defined: #ifndef CONFIG_SYS_SPARC_NWINDOWS #error Must define number of SPARC register windows, default is 8 #endif But it missed to include <config.h>, which always ended up in compile error. This commit fixes this problem. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Daniel Hellstrom <daniel@gaisler.com>
* | ARM: versatile: convert to common timer codeRob Herring2013-11-041-116/+0
| | | | | | | | | | | | Convert versatile to use the commmon timer code. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
* | ARM: tegra: convert to common timer codeRob Herring2013-11-042-96/+1
| | | | | | | | | | | | Convert tegra to use the commmon timer code. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
* | ARM: socfpga: convert to common timer codeRob Herring2013-11-041-72/+0
| | | | | | | | | | | | Convert socfpga to use the commmon timer code. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
* | ARM: mx25: convert to common timer codeRob Herring2013-11-041-117/+0
| | | | | | | | | | | | Convert mx25 to use the commmon timer code. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
* | ARM: highbank: convert to common timer codeRob Herring2013-11-041-83/+0
| | | | | | | | | | | | Convert highbank to use the commmon timer code. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
* | sh: convert to common timer codeRob Herring2013-11-041-60/+2
| | | | | | | | | | | | | | Convert sh to use the commmon timer code. Remove reset_timer and set_timer as they are unused on sh. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
* | config: remove platform CONFIG_SYS_HZ definition part 2/2Rob Herring2013-11-042-10/+0
| | | | | | | | | | | | Remove platform CONFIG_SYS_HZ definition for configs a-z*. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-blackfinTom Rini2013-11-044-1/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Easy to resolve conflict on the GPIO change. Conflicts: arch/blackfin/cpu/Makefile Signed-off-by: Tom Rini <trini@ti.com>
| * | blackfin: Move machine specific gpio_port_t structure back to blackfin arch ↵Steven Miao2013-11-043-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | folder. The gpio register mappings are different among blackfin processors. Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
| * | blackfin: fix a warning in arch/blackfin/cpu/cpu.cMasahiro Yamada2013-11-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | This commit fixes: cpu.c:107: warning: ‘noreturn’ function does return Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
* | | blackfin: convert makefiles to Kbuild styleMasahiro Yamada2013-11-012-74/+32
| | | | | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Sonic Zhang <sonic.zhang@analog.com>
* | | m68k: convert makefiles to Kbuild styleMasahiro Yamada2013-11-017-166/+18
| | | | | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Jason Jin <Jason.jin@freescale.com>
* | | x86: convert makefiles to Kbuild styleMasahiro Yamada2013-11-014-91/+30
| | | | | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Simon Glass <sjg@chromium.org>
* | | nios2: convert makefiles to Kbuild styleMasahiro Yamada2013-11-012-51/+9
| | | | | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Thomas Chou <thomas@wytron.com.tw>
* | | nds32: convert makefiles to Kbuild styleMasahiro Yamada2013-11-014-94/+11
| | | | | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Macpaul Lin <macpaul@gmail.com>
* | | mips: convert makefiles to Kbuild styleMasahiro Yamada2013-10-316-158/+16
| | | | | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
* | | microblaze: convert makefiles to Kbuild styleMasahiro Yamada2013-10-312-49/+6
| | | | | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Michal Simek <michal.simek@xilinx.com>
* | | openrisc: convert makefiles to Kbuild styleMasahiro Yamada2013-10-312-48/+5
| | | | | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
* | | avr32: convert makefiles to Kbuild styleMasahiro Yamada2013-10-313-76/+14
| | | | | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Andreas Bießmann <andreas.devel@googlemail.com>
* | | sh: convert makefiles to Kbuild styleMasahiro Yamada2013-10-314-116/+18
| | | | | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
* | | sparc: convert makefiles to Kbuild styleMasahiro Yamada2013-10-313-75/+6
| | | | | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Daniel Hellstrom <daniel@gaisler.com>
* | | sh: Do not include start.o in lib$(CPU).oMasahiro Yamada2013-10-313-3/+9
| | | | | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
* | | sparc: fix a link errorMasahiro Yamada2013-10-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit, arch/sparc/lib/Makefile used both COBJS and COBJS-y. And it missed to add COBJS-y into OBJS. This means bootm.o was never compiled even if CONFIG_CMD_BOOTM=y Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Daniel Hellstrom <daniel@gaisler.com>
OpenPOWER on IntegriCloud