#
b491d975 |
| 10-Apr-2015 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot/master'
|
#
692e5c4e |
| 03-Apr-2015 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://git.denx.de/u-boot-tegra Conflicts: board/armltd/vexpress64/vexpress64.c Signed-off-by: Tom Rini <trini@konsulko.com>
|
#
9da7e3da |
| 31-Mar-2015 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://git.denx.de/u-boot-imx
|
#
326a6823 |
| 19-Mar-2015 |
Masahiro Yamada <yamada.masahiro@socionext.com> |
malloc_f: enable SYS_MALLOC_F by default if DM is on This option has a bool type, not hex. Fix it and enable it if CONFIG_DM is on because Driver Model always requires malloc memory.
malloc_f: enable SYS_MALLOC_F by default if DM is on This option has a bool type, not hex. Fix it and enable it if CONFIG_DM is on because Driver Model always requires malloc memory. Devices are scanned twice, before/after relocation. CONFIG_SYS_MALLOC_F should be enabled to use malloc memory before relocation. As it is board-independent, handle it globally. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Stephen Warren <swarren@wwwdotorg.org> Reviewed-by: Simon Glass <sjg@chromium.org> Acked-by: Robert Baldyga <r.baldyga@samsung.com>
show more ...
|
#
91405b7f |
| 19-Mar-2015 |
Masahiro Yamada <yamada.masahiro@socionext.com> |
malloc_f: remove redundant defalut values of CONFIG_SYS_MALLOC_F_LEN The default value of CONFIG_SYS_MALLOC_F_LEN is defined by ./Kconfig as 0x400. Each defconfig or Kconfig need not re
malloc_f: remove redundant defalut values of CONFIG_SYS_MALLOC_F_LEN The default value of CONFIG_SYS_MALLOC_F_LEN is defined by ./Kconfig as 0x400. Each defconfig or Kconfig need not repeat the same value. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Stephen Warren <swarren@wwwdotorg.org> Reviewed-by: Simon Glass <sjg@chromium.org> Acked-by: Robert Baldyga <r.baldyga@samsung.com>
show more ...
|
#
a538ae99 |
| 18-Mar-2015 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
|
#
a74ef40a |
| 15-Mar-2015 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
|
#
252ed872 |
| 11-Mar-2015 |
Masahiro Yamada <yamada.masahiro@socionext.com> |
kconfig: remove meaningless prefixes in defconfig files Since commit e02ee2548afe (kconfig: switch to single .config configuration), the prefixes in defconfig files such as "+S:", "+
kconfig: remove meaningless prefixes in defconfig files Since commit e02ee2548afe (kconfig: switch to single .config configuration), the prefixes in defconfig files such as "+S:", "+ST:", etc., are meaningless. This commit was generated by the following command: find configs -name '*_defconfig' | xargs sed -i 's/^+*S*T*://' Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
show more ...
|
#
b9cb6482 |
| 02-Mar-2015 |
Stefano Babic <sbabic@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot
|
#
e1cc4d31 |
| 24-Feb-2015 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge remote-tracking branch 'u-boot/master' into 'u-boot-arm/master'
|
#
a851604c |
| 16-Feb-2015 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
|
#
5745f8c4 |
| 16-Feb-2015 |
Tom Rini <trini@ti.com> |
Merge git://git.denx.de/u-boot-marvell
|
#
95776391 |
| 16-Feb-2015 |
Tom Rini <trini@ti.com> |
Merge branch 'sandbox' of git://git.denx.de/u-boot-x86
|
#
eca99c02 |
| 13-Feb-2015 |
Tom Rini <trini@ti.com> |
Merge git://git.denx.de/u-boot-samsung
|
#
757566d1 |
| 13-Feb-2015 |
Tom Rini <trini@ti.com> |
Merge git://git.denx.de/u-boot-dm
|
#
b724bd7d |
| 11-Feb-2015 |
Simon Glass <sjg@chromium.org> |
dm: Kconfig: Move CONFIG_SYS_MALLOC_F_LEN to Kconfig Move this option to Kconfig and update all boards. Signed-off-by: Simon Glass <sjg@chromium.org>
|
#
70c45aeb |
| 05-Feb-2015 |
Simon Glass <sjg@chromium.org> |
dm: mx6: Move driver model CONFIGs to Kconfig Remove driver model CONFIGs from the board config headers and use Kconfig instead. Signed-off-by: Simon Glass <sjg@chromium.org>
|
#
bd5053ff |
| 14-Jan-2015 |
Tom Rini <trini@ti.com> |
Merge branch 'buildman' of git://git.denx.de/u-boot-x86 Conflicts: tools/buildman/control.py Signed-off-by: Tom Rini <trini@ti.com>
|
#
fc9b0b80 |
| 11-Dec-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-usb Conflicts: board/freescale/mx6sxsabresd/mx6sxsabresd.c Signed-off-by: Tom Rini <trini@ti.com>
|
#
85bafb6d |
| 25-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
|
#
21008ad6 |
| 26-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx Conflicts: drivers/mmc/fsl_esdhc.c Signed-off-by: Tom Rini <trini@ti.com>
|
#
878cd63e |
| 25-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of http://git.denx.de/u-boot-samsung
|
#
1fc4e6f4 |
| 25-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge git://git.denx.de/u-boot-fdt
|
#
fce0a90a |
| 24-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
|
#
dee332ff |
| 24-Nov-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
|