| #
63a7578e |
| 06-Sep-2016 |
Masahiro Yamada <yamada.masahiro@socionext.com> |
arch, board: squash lines for immediate return
Remove unneeded variables and assignments.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Minkyu Kang <mk7.kang@samsung.c
arch, board: squash lines for immediate return
Remove unneeded variables and assignments.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Minkyu Kang <mk7.kang@samsung.com> Reviewed-by: Angelo Dureghello <angelo@sysam.it>
show more ...
|
| #
8961dac9 |
| 10-Nov-2015 |
Andreas Bießmann <andreas.devel@googlemail.com> |
tricorder: rewrite tricordereeprom command
This rewrite uses lately promoted eeprom_init(int) function to choose the right I2C bus when writing data to the EEPROM.
Signed-off-by: Andreas Bießmann <
tricorder: rewrite tricordereeprom command
This rewrite uses lately promoted eeprom_init(int) function to choose the right I2C bus when writing data to the EEPROM.
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> Cc: Marek Vasut <marex@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@konsulko.com> Cc: Heiko Schocher <hs@denx.de> Reviewed-by: Heiko Schocher <hs@denx.de>
show more ...
|
| #
85b8c5c4 |
| 09-Nov-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'iu-boot/master' into 'u-boot-arm/master'
Conflicts: arch/arm/cpu/arm926ejs/mxs/Makefile board/compulab/cm_t35/Makefile board/corscience/tricorder/Makefile board/ppcag/bg0900/Makefi
Merge branch 'iu-boot/master' into 'u-boot-arm/master'
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
show more ...
|
| #
459f1da8 |
| 06-Sep-2013 |
Andreas Bießmann <andreas.biessmann@corscience.de> |
tricorder: add tricordereeprom command
The new tricordereeprom command can read and write the eeprom for hardware detection on tricorder devices.
Signed-off-by: Andreas Bießmann <andreas.biessmann@
tricorder: add tricordereeprom command
The new tricordereeprom command can read and write the eeprom for hardware detection on tricorder devices.
Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
show more ...
|