| #
7f673c99 |
| 10-Jan-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Bringing in the MMC tree means that CONFIG_BOUNCE_BUFFER needed to be added to include/configs/exynos5-dt.h now.
Conflicts: include/configs/ex
Merge branch 'master' of git://git.denx.de/u-boot-arm
Bringing in the MMC tree means that CONFIG_BOUNCE_BUFFER needed to be added to include/configs/exynos5-dt.h now.
Conflicts: include/configs/exynos5250-dt.h
Signed-off-by: Tom Rini <trini@ti.com>
show more ...
|
| #
a891601c |
| 06-Jan-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts: include/micrel.h
The conflict above was trivial, caused by four lines being added in both branches with different whitepace.
|
| #
01599958 |
| 20-Nov-2013 |
Fabio Estevam <fabio.estevam@freescale.com> |
configs: imx: Remove CONFIG_SYS_SPD_BUS_NUM option
According to the README:
"- CONFIG_SYS_SPD_BUS_NUM If SPD EEPROM is on an I2C bus other than the first one, specify here. Note that the value
configs: imx: Remove CONFIG_SYS_SPD_BUS_NUM option
According to the README:
"- CONFIG_SYS_SPD_BUS_NUM If SPD EEPROM is on an I2C bus other than the first one, specify here. Note that the value must resolve to something your driver can deal with."
There is no SPD EEPROM on the imx boards, so ged rid of this option.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Stefano Babic <sbabic@denx.de>
show more ...
|
| #
85164e0c |
| 01-Nov-2013 |
Fabio Estevam <fabio.estevam@freescale.com> |
configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards
There is no real benefit in adding the board name into U-boot's prompt, so remove the custom CONFIG_SYS_PROMPT definitions so that the
configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards
There is no real benefit in adding the board name into U-boot's prompt, so remove the custom CONFIG_SYS_PROMPT definitions so that the standard "=> " prompt is used across FSL boards.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
show more ...
|
| #
f232950f |
| 04-Oct-2013 |
Rob Herring <rob.herring@calxeda.com> |
config: remove platform CONFIG_SYS_HZ definition part 2/2
Remove platform CONFIG_SYS_HZ definition for configs a-z*.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
|
| #
195d130d |
| 01-Nov-2013 |
Stefano Babic <sbabic@denx.de> |
Revert "configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards"
This reverts commit 178b8e15ade96c7bd59b9704b91ca51d27c391cd.
Patch was merged too fast, without checking that another patch
Revert "configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards"
This reverts commit 178b8e15ade96c7bd59b9704b91ca51d27c391cd.
Patch was merged too fast, without checking that another patch is fixing the reported issue globally - reverted.
Signed-off--by: Stefano Babic <sbabic@denx.de>
show more ...
|
| #
178b8e15 |
| 31-Oct-2013 |
Fabio Estevam <fabio.estevam@freescale.com> |
configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards
There is no real benefit in adding the board name into U-boot's prompt.
Use the simple "=> " prompt across FSL boards.
Signed-off-by:
configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards
There is no real benefit in adding the board name into U-boot's prompt.
Use the simple "=> " prompt across FSL boards.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
show more ...
|
| #
9dff87a2 |
| 17-Oct-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
|
| #
b089d039 |
| 21-Sep-2013 |
trem <tremyfr@yahoo.fr> |
i2c: update config using mxc driver to new subsystem
Signed-off-by: Philippe Reynes <tremyfr@yahoo.fr>
|
| #
3765b3e7 |
| 07-Oct-2013 |
Wolfgang Denk <wd@denx.de> |
Coding Style cleanup: remove trailing white space
Signed-off-by: Wolfgang Denk <wd@denx.de>
|
| #
326ea986 |
| 31-Jul-2013 |
Stefano Babic <sbabic@denx.de> |
Merge git://git.denx.de/u-boot-arm
Conflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsabrelite.h
Signed-off-by: Stefano Babic <s
Merge git://git.denx.de/u-boot-arm
Conflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsabrelite.h
Signed-off-by: Stefano Babic <sbabic@denx.de>
show more ...
|
| #
8b485ba1 |
| 25-Jul-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot/master' into u-boot-arm/master
|
| #
1a459660 |
| 08-Jul-2013 |
Wolfgang Denk <wd@denx.de> |
Add GPL-2.0+ SPDX-License-Identifier to source files
Signed-off-by: Wolfgang Denk <wd@denx.de> [trini: Fixup common/cmd_io.c] Signed-off-by: Tom Rini <trini@ti.com>
|
| #
fbbbc86e |
| 12-Jul-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and serial.
Conflicts: arch/arm/dts/exynos5250.dtsi
Signed-off-by: Tom Rini
Merge branch 'master' of git://git.denx.de/u-boot-arm
Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and serial.
Conflicts: arch/arm/dts/exynos5250.dtsi
Signed-off-by: Tom Rini <trini@ti.com>
show more ...
|
| #
efc284e3 |
| 12-Jul-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
|
| #
254fd8da |
| 28-Jun-2013 |
Otavio Salvador <otavio@ossystems.com.br> |
mx53loco: Change default environment to cope with OE changes
OpenEmbedded has change partitioning layout of generated image so it does not raise warnings during the boot regarding unkown partition b
mx53loco: Change default environment to cope with OE changes
OpenEmbedded has change partitioning layout of generated image so it does not raise warnings during the boot regarding unkown partition being used for U-Boot.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Jason Liu <r64343@freescale.com>
show more ...
|
| #
a17617d6 |
| 14-Jan-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
|
| #
e0df5353 |
| 10-Jan-2013 |
Otavio Salvador <otavio@ossystems.com.br> |
mx53loco: Add support to dynamically choose between fdt use or not
The CONFIG_SYS_CBSIZE has been change to 512 to avoid runtime errors as:
,---[ Runtime error ] | Hit any key to stop autoboot: 0
mx53loco: Add support to dynamically choose between fdt use or not
The CONFIG_SYS_CBSIZE has been change to 512 to avoid runtime errors as:
,---[ Runtime error ] | Hit any key to stop autoboot: 0 | MX53LOCO U-Boot > pri netboot | netboot=echo Booting from net ...; run netargs; if test ... | prefetch abort | pc : [<20747368>] lr : [<20747365>] | sp : af566e20 ip : 00000000 fp : 00000000 | r10: 00000002 r9 : af6dfc28 r8 : af566f58 | r7 : af6dfc10 r6 : 00000001 r5 : 00000002 r4 : 74206669 | r3 : 00000000 r2 : 00000060 r1 : 00000020 r0 : 0000018e | Flags: nZCv IRQs off FIQs off Mode SVC_32 | Resetting CPU ... | | resetting ... `---
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
show more ...
|
| #
91c038f0 |
| 08-Jan-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
|
| #
7528cf5f |
| 08-Jan-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
|
| #
54bb8411 |
| 26-Dec-2012 |
Fabio Estevam <fabio.estevam@freescale.com> |
mx53loco: Call PMIC related functions from board_late_init()
Since commit c733681 (pmic: Extend PMIC framework to support multiple instances of PMIC devices) mx53loco fails to allocate the memory fo
mx53loco: Call PMIC related functions from board_late_init()
Since commit c733681 (pmic: Extend PMIC framework to support multiple instances of PMIC devices) mx53loco fails to allocate the memory for PMIC:
U-Boot 2013.01-rc2-dirty (Dec 20 2012 - 15:55:01)
Board: MX53 LOCO I2C: ready DRAM: 1 GiB pmic_alloc: No available memory for allocation! pmic_init: POWER allocation error! CPU: Freescale i.MX53 family rev2.0 at 800 MHz Reset cause: POR MMC: FSL_SDHC: 0, FSL_SDHC: 1
Calling the PMIC related functions at a later stage, ie, from board_late_init() fixes the issue.
Reported-by: Robert Nelson <robertcnelson@gmail.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Tested-by: Stefano Babic <sbabic@denx.de>
show more ...
|
| #
fe51f787 |
| 21-Dec-2012 |
Otavio Salvador <otavio@ossystems.com.br> |
mx53loco: Change default loadaddr to 0x72000000
This allow use of mainline and Freescale BSP Linux kernel with same environment.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
| #
aef8af6a |
| 21-Dec-2012 |
Otavio Salvador <otavio@ossystems.com.br> |
mx53loco: We shouldn't hardcode a rootfs filesystem type
For a generic environment, we shouldn't have a fixed rootfs filesystem so we drop it from env.
Signed-off-by: Otavio Salvador <otavio@ossyst
mx53loco: We shouldn't hardcode a rootfs filesystem type
For a generic environment, we shouldn't have a fixed rootfs filesystem so we drop it from env.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
show more ...
|
| #
da77a0e5 |
| 22-Dec-2012 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
|
| #
96764df1 |
| 22-Dec-2012 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge samsung, imx, tegra into u-boot-arm/master
This commit merges branches from samsung, imx and tegra meant to fix merge issues between u-boot/master and u-boot-arm/master, as well as a few manua
Merge samsung, imx, tegra into u-boot-arm/master
This commit merges branches from samsung, imx and tegra meant to fix merge issues between u-boot/master and u-boot-arm/master, as well as a few manual merge fixes.
show more ...
|