diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-05 11:15:26 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-05 11:15:26 +0200 |
commit | 19d829fa60fc4e6df514a046142faaaf9fc8185d (patch) | |
tree | 295c75b0d9f3c7180f23ec131442286cf91db5b1 /arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg | |
parent | e62d5fb0da76ef168e90cae9bbbda80349aaf137 (diff) | |
parent | 8467faef7fce8c5faad7224b7737a58e16c52186 (diff) |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
drivers/serial/serial.c
The conflict above was a trivial case of adding one init
function in each branch, and manually resolved in merge.
Diffstat (limited to 'arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg')
-rw-r--r-- | arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg new file mode 100644 index 0000000000..811876736c --- /dev/null +++ b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg @@ -0,0 +1,6 @@ +SECTION 0x0 BOOTABLE + TAG LAST + LOAD 0x0 spl/u-boot-spl.bin + CALL 0x14 0x0 + LOAD 0x40000100 u-boot.bin + CALL 0x40000100 0x0 |