summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-12-11spl: Use u-boot.img instead of u-boot.binAlison Wang
In SD boot, the magic number of u-boot image will be checked. For LS102xA, u-boot.bin doesn't have the magic number. So use u-boot.img which includes the magic number instead of u-boot.bin when producing u-boot-with-spl-pbl.bin. Signed-off-by: Alison Wang <alison.wang@freescale.com> Reviewed-by: York Sun <yorksun@freescale.com>
2014-12-11ls102xa: pblimage: Add pblimage tool support for LS102xAAlison Wang
For LS102xA, the size of spl/u-boot-spl.bin is variable. This patch adds the support to deal with the variable u-boot size in pblimage tool. It will be padded to 64 byte boundary. Use pblimage_check_params() to add the specific operations for ARM, such as PBI CRC and END command and the calculation of pbl_cmd_initaddr. Signed-off-by: Alison Wang <alison.wang@freescale.com> Reviewed-by: York Sun <yorksun@freescale.com>
2014-12-11ls1021aqds: set the default I2C channel before DDR initChenhui Zhao
When resuming from deep sleep, the I2C channel may not be in the default channel. So, switch to the default channel before accessing DDR SPD. Signed-off-by: Chenhui Zhao <chenhui.zhao@freescale.com> Reviewed-by: York Sun <yorksun@freescale.com>
2014-12-11arm: ls102xa: Update PCIe dts node statusMinghuan Lian
The patch changes PCIe dts node status to 'disabled' if the corresponding controller is disabled according to serdes protocol. Signed-off-by: Minghuan Lian <Minghuan.Lian@freescale.com> Reviewed-by: York Sun <yorksun@freescale.com>
2014-12-11arm: ls102xa: clear EPU registers for deep sleepchenhui zhao
After wakeup from deep sleep, Clear EPU registers as early as possible to prevent from possible issue. It's also safe to clear at normal boot. Signed-off-by: Chenhui Zhao <chenhui.zhao@freescale.com> Reviewed-by: York Sun <yorksun@freescale.com>
2014-12-11arm: ls102xa: fixed a bus frequency setting errorTang Yuantian
The bus frequency in SOC node should be clock frequency of platform. That is not true if it is devided by 2. Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com> Reviewed-by: York Sun <yorksun@freescale.com>
2014-12-10Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini
2014-12-10Merge branch 'rmobile' of git://git.denx.de/u-boot-shTom Rini
2014-12-10arm: rmobile: alt: Add support MMC and MMC commandNobuhiro Iwamatsu
Alt board has been connected to eMMC of 8GB to MMC port. This enables MMC port and MMC command. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-12-10arm: rmobile: lager: Add support MMC and MMC commandNobuhiro Iwamatsu
Lager board has been connected to eMMC of 8GB to MMC1 port. This enables MMC1 port and MMC command. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-12-10arm: rmobile: rcar: Add support ext2 and ext4 file systemNobuhiro Iwamatsu
Board with R-Car SoC has USB and MMC. They might use the EXT2 or EXT4 file system. This adds support ext2 and ext4 file system Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-12-10arm: rmobile: Add mmc.h for sh_mmcif of rmobileNobuhiro Iwamatsu
R-Mobile and R-Car ARM SoCs use sh_mmcif as MMC host driver. This adds arch-rmobile/mmc.h that defines mmcif_mmc_init(). Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-12-09dm: stv0991: Move serial to driver modelVikas Manocha
Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
2014-12-09stv0991: increase the initial ram size configVikas Manocha
It is done to make space available for driver model memory. Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
2014-12-09stv0991: enable default and misc command configsVikas Manocha
Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
2014-12-09stv0991: enable ethernet supportVikas Manocha
Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
2014-12-09stv0991: Add basic stv0991 architecture supportVikas Manocha
stv0991 architecture support added. It contains the support for following blocks - Timer - uart Signed-off-by: Vikas Manocha <vikas.manocha@st.com> [trini: Add arch/arm/cpu/armv7/Makefile hunk] Signed-off-by: Tom Rini <trini@ti.com>
2014-12-08Prepare v2015.01-rc3Tom Rini
Signed-off-by: Tom Rini <trini@ti.com>
2014-12-08Merge git://git.denx.de/u-boot-mpc85xxTom Rini
2014-12-08Merge branch 'master' of git://git.denx.de/u-boot-tiTom Rini
2014-12-08Merge git://git.denx.de/u-boot-i2cTom Rini
2014-12-08Merge branch 'master' of git://git.denx.de/u-boot-uniphierTom Rini
2014-12-09ARM: UniPhier: detect the number of flash banks at run-timeMasahiro Yamada
Some UniPhier boards are equipped with an expansion slot that some optional SRAM/NOR-flash cards can be attached to. So, run-time detection of the number of flash banks would be more user-friendly. Until this commit, UniPhier boards have achieved this by (ab)using board_flash_wp_on() because the boot failed if flash_size got zero. Fortunately, this problem was solved by commit 70879a92561a (flash: do not fail even if flash_size is zero). Now it is possible to throw away such a tricky workaround. This commit also enables CONFIG_SYS_MAX_FLASH_BANKS_DETECT for further refactoring. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-12-09ARM: UniPhier: extend register area of init page table for PH1-sLD3Masahiro Yamada
0x20000000-0x2fffffff: assigned to ARM mpcore (sLD3 only) 0xf0000000-0xffffffff: assigned to Denali NAND controller (sLD3 only) Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-12-09ARM: UniPhier: add device tree sources for PH1-sLD3Masahiro Yamada
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-12-09ARM: UniPhier: add more device nodes to device treeMasahiro Yamada
Add I2C controller and NAND controller devices. Fix indentation too. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-12-08Merge branch 'master' of git://git.denx.de/u-boot-shTom Rini
2014-12-08doc/gitmail-rc: Update m68k aliasTom Rini
Signed-off-by: Tom Rini <trini@ti.com>
2014-12-08kconfig: Fix warning "‘jump’ may be used uninitialized"Peter Kümmel
Warning: In file included from scripts/kconfig/zconf.tab.c:2537:0: scripts/kconfig/menu.c: In function ‘get_symbol_str’: scripts/kconfig/menu.c:590:18: warning: ‘jump’ may be used uninitialized in this function [-Wmaybe-uninitialized] jump->offset = strlen(r->s); Simplifies the test logic because (head && local) means (jump != 0) and makes GCC happy when checking if the jump pointer was initialized. Signed-off-by: Peter Kümmel <syntheticpp@gmx.net> Signed-off-by: Michal Marek <mmarek@suse.cz> [ imported from Linux Kernel, commit 2d5603060967 ] Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-12-08libfdt: move CONFIG_OF_LIBFDT and CONFIG_FIT to lib/MakefileMasahiro Yamada
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-12-08libfdt: descend from lib/ to lib/libfdt/Masahiro Yamada
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-12-08lib: bzip2: move bzip2 files to lib/bzip2/ directoryMasahiro Yamada
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-12-08fdt: Allow non-FDT kernels to boot when CONFIG_OF_LIBFDT is definedSuriyan Ramasami
The boot commands - bootz/bootm mandate a third argument which is the address to the FDT blob. In cases where this argument is not specified, boot fails with a message indicating a missing FDT. This causes non-FDT kernels to fail to boot. This patch allows both FDT and non-FDT kernels to boot by making the third parameter to the bootm/bootz optional. Signed-off-by: Suriyan Ramasami <suriyan.r@gmail.com> Acked-by: Simon Glass <sjg@chromium.org> [trini: Update again for covering appended DTB case after last revert in this area] Signed-off-by: Tom Rini <trini@ti.com>
2014-12-08blackfin: include <linux/compiler.h> rather than define __iomemMasahiro Yamada
The macro __iomem is defined in include/linux/compiler.h. Let's include it rather than double __iomem defines. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Sonic Zhang <sonic.adi@gmail.com>
2014-12-08linux/compat.h: remove redundant macro definesMasahiro Yamada
__user and __iomem are defined in include/linux/compiler.h. MAX_ERRNO is defined in include/linux/err.h. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-12-08Replace <compiler.h> with <linux/compiler.h>Masahiro Yamada
Including <linux/compiler.h> is enough for general use. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-12-08git-mailrc: fix mips aliasDaniel Schwierzeck
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
2014-12-08Add Alison Wang m68k custodian email/aliasangelo@sysam.it
Signed-off-by: Angelo Dureghello <angelo@sysam.it>
2014-12-08Add custodians to the m68k subsystem.angelo@sysam.it
2014-12-08Kbuild: introduce Makefile in arch/$ARCH/Daniel Schwierzeck
Introduce a Makefile under arch/$ARCH/ and include it in the top Makefile (similar to Linux kernel). This allows further refactoringi like moving architecture-specific code out of global makefiles, deprecating config variables (CPU, CPUDIR, SOC) or deprecating arch/$ARCH/config.mk. In contrary to Linux kernel, U-Boot defines the ARCH variable by Kconfig, thus the arch Makefile can only included conditionally after the top config.mk. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Acked-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-12-08serial: pl01x: avoid pl01x type check two timesVikas Manocha
Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Acked-by: Simon Glass <sjg@chromium.org>
2014-12-08serial: pl01x: disable as per type of pl01xVikas Manocha
pl010 & pl011 have different control register offsets, setting it as per the pl01x type. Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Acked-by: Simon Glass <sjg@chromium.org>
2014-12-08serial: pl01x: move all line control at same placeVikas Manocha
Receive line control uses same setting as transmit line control, also one lcrh write is effective for both baud rate & receive line control internal update. Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Acked-by: Simon Glass <sjg@chromium.org>
2014-12-08serial: pl01x: fix pl011 baud rate configurationVikas Manocha
UART_IBRD, UART_FBRD, and UART_LCR_H form a single 30-bit wide register which is updated on a single write strobe generated by a UART_LCR_H write. So, to internally update the content of UART_IBRD or UART_FBRD, a write to UART_LCR_H must always be performed at the end. Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Acked-by: Simon Glass <sjg@chromium.org>
2014-12-08serial: pl01x: pass pl01x_type to set baudrateVikas Manocha
Although we were checking the pl01x type, seems like PL010 type was being passed by mistake. Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Acked-by: Simon Glass <sjg@chromium.org>
2014-12-08imx6: remove redudant CONFIG_SPL_START_S_PATH defineMasahiro Yamada
The CPU directory of IMX6 is arch/arm/cpu/armv7, so setting CONFIG_SPL_START_S_PATH to arch/arm/cpu/armv7 is totally redundant. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Stefano Babic <sbabic@denx.de>
2014-12-08powerpc: a3m071: remove redundant CONFIG_SPL_* definesMasahiro Yamada
The CPU directory of this board is arch/powerpc/cpu/mpc5xxx. Without the CONFIG_SPL_START_S_PATH and CONFIG_SPL_LDSCRIPT defines, the same start.o and u-boot-spl.lds are selected by default. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Stefan Roese <sr@denx.de> Acked-by: Stefan Roese <sr@denx.de>
2014-12-08powerpc: lwmon5: remove redundant CONFIG_SPL_* definesMasahiro Yamada
The CPU directory of this board is arch/powerpc/cpu/ppc4xx. Without the CONFIG_SPL_START_S_PATH and CONFIG_SPL_LDSCRIPT defines, the same start.o and u-boot-spl.lds are selected by default. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Wolfgang Denk <wd@denx.de> Acked-by: Stefan Roese <sr@denx.de>
2014-12-08powerpc: mpc8xx: remove hermes board supportMasahiro Yamada
This board sprinkles #ifdef(CONFIG_HERMES) over various global files such as include/common.h, common/board_r.c, common/cmd_bdinfo.c. Let's zap such an ill-behaved board. It has not been converted to generic board yet and mpc8xx is old enough. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Wolfgang Denk <wd@denx.de> Acked-by: Wolfgang Denk <wd@denx.de>
2014-12-08cmd_fuse: return CMD_RET_FAILURE on errorHector Palacios
Fuse drivers, like the mxs_ocotp.c, may return negative error codes but the commands are only allowed to return CMD_RET_* enum values to the shell, otherwise the following error appears: "exit not allowed from main input shell." Signed-off-by: Hector Palacios <hector.palacios@digi.com> Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>