#
ebca902a |
| 15-Apr-2018 |
Tom Rini <trini@konsulko.com> |
Merge git://git.denx.de/u-boot-imx Signed-off-by: Tom Rini <trini@konsulko.com>
|
#
e294ba06 |
| 04-Apr-2018 |
Tom Rini <trini@konsulko.com> |
Merge git://git.denx.de/u-boot-sunxi Signed-off-by: Tom Rini <trini@konsulko.com>
|
#
81cf7c8d |
| 25-Mar-2018 |
Tom Rini <trini@konsulko.com> |
Merge git://git.denx.de/u-boot-ubi
|
#
afb6fda2 |
| 23-Mar-2018 |
Petr Vorel <petr.vorel@gmail.com> |
Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig Introduce another difference from upstream (kernel) source in fs/ubifs/super.c: adding preprocessor condition as y variable in mount_ubifs
Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig Introduce another difference from upstream (kernel) source in fs/ubifs/super.c: adding preprocessor condition as y variable in mount_ubifs() depends on CONFIG_UBIFS_SILENCE_MSG: fs/ubifs/super.c:1337:15: error: variable ?y? set but not used [-Werror=unused-but-set-variable] long long x, y; Not setting CONFIG_UBIFS_SILENCE_MSG in am335x_igep003x_defconfig and igep0032_defconfig. Although it was defined in their config headers, it depends on CMD_UBIFS which is not set for them. Signed-off-by: Petr Vorel <petr.vorel@gmail.com> Cc: Joe Hershberger <joe.hershberger@ni.com> Cc: Heiko Schocher <hs@denx.de>
show more ...
|
#
4b19b744 |
| 08-Oct-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge remote-tracking branch 'u-boot-imx/master' The single file conflict below is actually trivial. Conflicts: board/boundary/nitrogen6x/nitrogen6x.c
|
#
3cc83f9d |
| 07-Oct-2014 |
Minkyu Kang <mk7.kang@samsung.com> |
Merge branch 'uboot'
|
#
1454ba8e |
| 07-Oct-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'
|
#
2c2277f1 |
| 26-Sep-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
|
#
2c3dc792 |
| 26-Sep-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
|
#
ed36323f |
| 16-Sep-2014 |
Masahiro Yamada <yamada.m@jp.panasonic.com> |
kconfig: add blank Kconfig files This would be useful to start moving various config options. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Simon Glass <s
kconfig: add blank Kconfig files This would be useful to start moving various config options. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
show more ...
|