u-boot.git/include/configs/cpuat91.h, branch v2014.10

sizes.h - consolidate for all architectures

2014-03-04T17:15:01Z

Copied from Linux sources "include/linux/sizes.h" commit 413541dd66d51f791a0b169d9b9014e4f56be13c Signed-off-by: Alexey Brodkin Cc: Vineet Gupta Cc: Tom Rini Cc: Stefan Roese Cc: Albert Aribaud Acked-by: Tom Rini Acked-by: Stefan Roese [trini: Add bcm Kona platforms to the patch] Signed-off-by: Tom Rini

Merge branch 'iu-boot/master' into 'u-boot-arm/master'

2013-11-09T21:59:47Z

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

2013-11-04T19:32:37Z

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 Signed-off-by: Andreas Bießmann

config: remove platform CONFIG_SYS_HZ definition part 2/2

2013-11-04T16:06:16Z

Remove platform CONFIG_SYS_HZ definition for configs a-z*. Signed-off-by: Rob Herring

Coding Style cleanup: remove trailing white space

2013-10-14T20:06:53Z

Signed-off-by: Wolfgang Denk

Merge branch 'master' of git://git.denx.de/u-boot-i2c

2013-07-24T13:50:24Z

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

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24T13:44:38Z

Signed-off-by: Wolfgang Denk [trini: Fixup common/cmd_io.c] Signed-off-by: Tom Rini

i2c, soft-i2c: switch to new multibus/multiadapter support

2013-07-23T03:54:29Z

- added to soft_i2c driver new multibus/multiadpater support - adapted all config files, which uses this driver Signed-off-by: Heiko Schocher Cc: Simon Glass Cc: Stephen Warren

ARM: Remove unused stack and irq config defines

2012-09-01T12:58:22Z

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 Signed-off-by: Rob Herring

CONFIG_SYS_BAUDRATE_TABLE: Add , place there

2012-06-20T18:26:16Z

We provide a default table of { 9600, 19200, 38400, 57600, 115200 } in which mkconfig places after in the generated config file. This is used when a board has not set its own table. Signed-off-by: Tom Rini