Merge branch 'tom' of git://git.denx.de/u-boot-x86

sandbox: move source files from board/ to arch/sandbox/

Prior to commit 33a02da0, all boards must have board/${BOARD}/
or board/${VENDOR}/${BOARD}/ directory.
Now this rule is obsolete.

It looks we

sandbox: move source files from board/ to arch/sandbox/

Prior to commit 33a02da0, all boards must have board/${BOARD}/
or board/${VENDOR}/${BOARD}/ directory.
Now this rule is obsolete.

It looks weird that sandbox defines "vendor" and "board" just for
meeting the old U-Boot directory structure.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>

show more ...

Merge branch 'u-boot/master'

Conflicts:
drivers/net/Makefile

(trivial merge)

usb/gadget: add the fastboot gadget

This patch contains an implementation of the fastboot protocol on the
device side and documentation. This is based on USB download gadget
infrastructure. The fast

usb/gadget: add the fastboot gadget

This patch contains an implementation of the fastboot protocol on the
device side and documentation. This is based on USB download gadget
infrastructure. The fastboot function implements the getvar, reboot,
download and reboot commands. What is missing is the flash handling i.e.
writting the image to media.

v3 (Rob Herring):
This is based on http://patchwork.ozlabs.org/patch/126798/ with the
following changes:
- Rebase to current mainline and updates for current gadget API
- Use SPDX identifiers for licenses
- Traced the history and added missing copyright to cmd_fastboot.c
- Use load_addr/load_size for transfer buffer
- Allow vendor strings to be optional
- Set vendor/product ID from config defines
- Allow Ctrl-C to exit fastboot mode
v4:
- Major re-write to use the USB download gadget. Consolidated function
code to a single file.
- Moved globals into single struct.
- Use puts and putc as appropriate.
- Added CONFIG_USB_FASTBOOT_BUF_ADDR and CONFIG_USB_FASTBOOT_BUF_SIZE to
set the fastboot transfer buffer.
v5:
- Add CONFIG option documentation to README
- Rebase using new downloader registration

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Rob Herring <robh@kernel.org>

show more ...

Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

powerpc/T4QDS: add two stage boot of nand/sd

Add support of 2 stage NAND/SD boot loader using SPL framework.
PBL initialise the internal SRAM and copy SPL, this further
initialise DDR using SPD and

powerpc/T4QDS: add two stage boot of nand/sd

Add support of 2 stage NAND/SD boot loader using SPL framework.
PBL initialise the internal SRAM and copy SPL, this further
initialise DDR using SPD and environment and copy u-boot from
NAND/SD to DDR, finally SPL transfer control to u-boot.
NOR uses CS1 instead of CS2 when NAND boot, fix it.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>

show more ...

board/b4qds:Add support of 2 stage NAND boot-loader

Add support of 2 stage NAND boot loader using SPL framework.
here, PBL initialise the internal SRAM and copy SPL(160KB). This further
initialise D

board/b4qds:Add support of 2 stage NAND boot-loader

Add support of 2 stage NAND boot loader using SPL framework.
here, PBL initialise the internal SRAM and copy SPL(160KB). This further
initialise DDR using SPD and environment and copy u-boot(768 KB) from NAND to DDR.
Finally SPL transer control to u-boot.

Initialise/create followings required for SPL framework
- Add spl.c which defines board_init_f, board_init_r
- update tlb and ddr accordingly

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>

show more ...

MIPS: drop incaip board

This is dead hardware and no one is interested in making the
necessary changes for upcoming features like generic board or
driver model.

Signed-off-by: Daniel Schwierzeck <d

MIPS: drop incaip board

This is dead hardware and no one is interested in making the
necessary changes for upcoming features like generic board or
driver model.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>

show more ...

kbuild: docbook: sync with Linux Kernel v3.15-rc1

This commit imports DocBook-related updates
from v3.14 to v3.15-rc1.

- commit ec3fadd64b9940baa2a369bf978e8561837db3f5
kbuild: docbook: use $(

kbuild: docbook: sync with Linux Kernel v3.15-rc1

This commit imports DocBook-related updates
from v3.14 to v3.15-rc1.

- commit ec3fadd64b9940baa2a369bf978e8561837db3f5
kbuild: docbook: use $(obj) and $(src) rather than specific path
- commit 100da4c0150c97ce34d4d3b38bf2f5449b05ae4f
kbuild: docbook: specify KERNELDOC dependency correctly
- commit 6f89b9c1d6b29eaa600ac4a8ac1314b0d06f15e3
kbuild: docbook: include cmd files more simply
- commit ac6d662a95a6989d83b259ccf8ec01dd7903af73
doc: Add "*.svg" to DocBook/.gitignore
- commit 832919bfcf0cfd75767c68b0c61f7cf48be860a8
DocBook: Make mandocs parallel-safe
- commit c4d79a4799719f2b0cd354ee498aad605730c97e
work around xmlto bug in htmldocs

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

show more ...

doc:power:pmic: Add doc entry for PMIC(v2) framework

Well written documentation for PMIC framework was missing and hence
it has been probably difficult and time consuming for other developers
to und

doc:power:pmic: Add doc entry for PMIC(v2) framework

Well written documentation for PMIC framework was missing and hence
it has been probably difficult and time consuming for other developers
to understand rationale for key design decisions and overall design
structure.
This commit provides proper documentation entry.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>

show more ...

arm: remove lubbock board support

Enough time has passed since this board was moved to Orphan. Remove.

- Remove board/lubbock/*
- Remove include/configs/lubbock.h
- Cleanup defined(CONFIG_LUBBOC

arm: remove lubbock board support

Enough time has passed since this board was moved to Orphan. Remove.

- Remove board/lubbock/*
- Remove include/configs/lubbock.h
- Cleanup defined(CONFIG_LUBBOCK)
- Move the entry from boards.cfg to doc/README.scrapyard

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

show more ...

powerpc: remove MOUSSE board support

Enough time has passed since this board was moved to Orphan. Remove.

- Remove board/mousse/*
- Remove include/configs/MOUSSE.h
- Clean-up defined(CONFIG_MOUS

powerpc: remove MOUSSE board support

Enough time has passed since this board was moved to Orphan. Remove.

- Remove board/mousse/*
- Remove include/configs/MOUSSE.h
- Clean-up defined(CONFIG_MOUSSE)
- Move the entry from boards.cfg to doc/README.scrapyard

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

show more ...

powerpc: remove rsdproto board support

Enough time has passed since this board was moved to Orphan. Remove.

- Remove board/rsdproto/*
- Remove include/configs/rsdproto.h
- Move the entry from bo

powerpc: remove rsdproto board support

Enough time has passed since this board was moved to Orphan. Remove.

- Remove board/rsdproto/*
- Remove include/configs/rsdproto.h
- Move the entry from boards.cfg to doc/README.scrapyard

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

show more ...

powerpc: remove RPXsuper board support

Enough time has passed since this board was moved to Orphan. Remove.

- Remove board/rpxsuper/*
- Remove include/configs/RPXsuper.h
- Move the entry from bo

powerpc: remove RPXsuper board support

Enough time has passed since this board was moved to Orphan. Remove.

- Remove board/rpxsuper/*
- Remove include/configs/RPXsuper.h
- Move the entry from boards.cfg to doc/README.scrapyard

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

show more ...

powerpc: remove RPXClassic, RPXlite boards support

Enough time has passed since these boards were moved to Orphan. Remove.

- Remove board/RPXlite/*
- Remove board/RPXClassic/*
- Remove include/c

powerpc: remove RPXClassic, RPXlite boards support

Enough time has passed since these boards were moved to Orphan. Remove.

- Remove board/RPXlite/*
- Remove board/RPXClassic/*
- Remove include/configs/RPXlite.h
- Remove include/configs/RPXClassic.h
- Clean-up defined(CONFIG_RPXCLASSIC)
- Move the entry from boards.cfg to doc/README.scrapyard

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

show more ...

powerpc: remove genietv board support

Enough time has passed since this board was moved to Orphan. Remove.

- Remove board/genietv/*
- Remove include/configs/GENIETV.h
- Clean-up if defined(CONFI

powerpc: remove genietv board support

Enough time has passed since this board was moved to Orphan. Remove.

- Remove board/genietv/*
- Remove include/configs/GENIETV.h
- Clean-up if defined(CONFIG_GENIETV)
- Move the entry from boards.cfg to doc/README.scrapyard

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

show more ...

powerpc: remove MBX and MBX860T boards support

Enough time has passed since these boards were moved to Orphan. Remove.

- Remove board/mbx8xx/*
- Remove include/configs/{MBX.h,MBX860T.h}
- Clean-

powerpc: remove MBX and MBX860T boards support

Enough time has passed since these boards were moved to Orphan. Remove.

- Remove board/mbx8xx/*
- Remove include/configs/{MBX.h,MBX860T.h}
- Clean-up if defined(CONFIG_MBX)
- Move the entries from boards.cfg to doc/README.scrapyard

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

show more ...

powerpc: remove NX823 board support

Enough time has passed since this board was moved to Orphan. Remove.

- Remove board/nx823/*
- Remove include/configs/NX823.h
- Clean-up ifdef(CONFIG_NX823)
-

powerpc: remove NX823 board support

Enough time has passed since this board was moved to Orphan. Remove.

- Remove board/nx823/*
- Remove include/configs/NX823.h
- Clean-up ifdef(CONFIG_NX823)
- Move the entry from boards.cfg to doc/README.scrapyard

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

show more ...

powerpc: mpc8xx: delete an unused source file

References to the wireless keyboard should also be removed
from README.console.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Wolfgang

powerpc: mpc8xx: delete an unused source file

References to the wireless keyboard should also be removed
from README.console.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Wolfgang Denk <wd@denx.de>

show more ...

spl_mmc/CONFIG_SPL_OS_BOOT: Allow environment to determine what to boot

We add two new environment variables, falcon_args_file and
falcon_image_file, which when set will override the compiled in def

spl_mmc/CONFIG_SPL_OS_BOOT: Allow environment to determine what to boot

We add two new environment variables, falcon_args_file and
falcon_image_file, which when set will override the compiled in default
values for falcon mode.

Signed-off-by: Tom Rini <trini@ti.com>

show more ...

README.falcon: Document environment variables for falcon mode

Signed-off-by: Tom Rini <trini@ti.com>

board: esd: remove remainders of dead boards

Commit 99bcad18 deleted ADCIOP and DASA_SIM board support
but missed to delete board/esd/adciop and board/esd/dasa_sim.
It also missed to add entries to

board: esd: remove remainders of dead boards

Commit 99bcad18 deleted ADCIOP and DASA_SIM board support
but missed to delete board/esd/adciop and board/esd/dasa_sim.
It also missed to add entries to doc/README.scrapyard.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Stefan Roese <sr@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>

show more ...

cosmetic: README.scrapyard: fix false removed date and commit

Describe removed date in the form of YYYY-MM-DD, not YYYY-DD-MM.
And wrong commit hash also should be fixed.

Signed-off-by: Masahiro Ya

cosmetic: README.scrapyard: fix false removed date and commit

Describe removed date in the form of YYYY-MM-DD, not YYYY-DD-MM.
And wrong commit hash also should be fixed.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Marek Vasut <marex@denx.de>
Acked-by: Marek Vasut <marex@denx.de>

show more ...

cosmetic: README.scrapyard: sort in reverse chronological order

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

Merge branch 'next'