arm-boot/u-boot-imx.git - U-boot NXP imx6

	Commit message (Collapse)	Author	Age	Lines
*	at91: nand: switch atmel_nand to generic GPIO API	Andreas Bießmann	2013-12-09	-1/+1
\| \| \| \| \| \| \|	Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> Acked-by: Jens Scharsig (BuS Elektronik)<esw@bus-elektronik.de> Tested-by: Jens Scharsig (BuS Elektronik)<esw@bus-elektronik.de> Acked-by: Scott Wood <scottwood@freescale.com>
*	Merge branch 'iu-boot/master' into 'u-boot-arm/master'	Albert ARIBAUD	2013-11-09	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	arm: atmel: get rid of too many ifdeffery	Bo Shen	2013-11-04	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get rid of too many ifdeffery in usb ohci driver Add following two configuration for USB clock selecting - CONFIG_USB_ATMEL_CLK_SEL_PLLB: using PLLB as usb ohci input clock - CONFIG_USB_ATMEL_CLK_SEL_UPLL: using UPLL as usb ohci input clock Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
* \|	config: remove platform CONFIG_SYS_HZ definition part 2/2	Rob Herring	2013-11-04	-1/+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-i2c	Tom Rini	2013-07-24	-3/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The sandburst-specific i2c drivers have been deleted, conflict was just over the SPDX conversion. Conflicts: board/sandburst/common/ppc440gx_i2c.c board/sandburst/common/ppc440gx_i2c.h Signed-off-by: Tom Rini <trini@ti.com>
\| *	i2c, soft-i2c: switch to new multibus/multiadapter support	Heiko Schocher	2013-07-23	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- added to soft_i2c driver new multibus/multiadpater support - adapted all config files, which uses this driver Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Stephen Warren <swarren@wwwdotorg.org>
* \|	Add GPL-2.0+ SPDX-License-Identifier to source files	Wolfgang Denk	2013-07-24	-17/+1
\|/ \| \| \| \| \|	Signed-off-by: Wolfgang Denk <wd@denx.de> [trini: Fixup common/cmd_io.c] Signed-off-by: Tom Rini <trini@ti.com>
*	ARM: Remove unused stack and irq config defines	Rob Herring	2012-09-01	-3/+2
\| \| \| \| \| \| \| \| \| \| \|	CONFIG_STACKSIZE is not referenced anywhere except on AVR32, but present in most ARM board config files. IRQs are only enabled for 1 config, so remove the unused config options for IRQ and FIQ stack size as well. Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
*	hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c	Tom Rini	2012-06-20	-1/+0
\| \| \| \| \| \| \| \| \| \|	Exactly one board has defined CONFIG_SYS_PROMPT_HUSH_PS2 to a value different than "> " which is vision2. I have Cc'd the maintainer here as I strongly suspect this is a bug rather than intentional behavior. Cc: Stefano Babic <sbabic@denx.de> Signed-off-by: Tom Rini <trini@ti.com> Acked-by: Stefano Babic <sbabic@denx.de>
*	CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place there	Tom Rini	2012-06-20	-1/+0
\| \| \| \| \| \| \| \| \|	We provide a default table of { 9600, 19200, 38400, 57600, 115200 } in <config_fallbacks.h> which mkconfig places after <configs/...h> in the generated config file. This is used when a board has not set its own table. Signed-off-by: Tom Rini <trini@ti.com>
*	configs: Remove CONFIG_NET_MULTI from board files	Fabio Estevam	2012-02-12	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CONFIG_NET_MULTI is not used anymore, so remove it from board files. Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Kumar Gala <kumar.gala@freescale.com> Cc: Sandeep Paulraj <s-paulraj@ti.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Tom Rini <trini@ti.com> Acked-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Heiko Schocher <hs@denx.de> Acked-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Stefano Babic <sbabic@denx.de> Tested-by: Marek Vasut <marek.vasut@gmail.com> Tested-by: Heiko Schocher <hs@denx.de>
*	Ethernut 5 board support	Tim Schendekehl	2011-12-06	-0/+287
	Add support for the Ethernut 5 open hardware design, based on Atmel's AT91SAM9XE512 SoC. V4 - Fix several coding style issues. - Move machine type to config file. - Remove use of CONFIG_ATMEL_LEGACY. Signed-off-by: Tim Schendekehl <tim.schendekehl@egnite.de>