diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-17 13:58:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-17 13:58:27 -0400 |
| commit | 4b6e1fda107e5244e80ebc41865650ac2873dc88 (patch) | |
| tree | f448089740af77c2987d12e2dd5b753b7659586f /board | |
| parent | 27bec5c12757c80f598b704477c1bc6c250bcb4c (diff) | |
| parent | 341392dd115f1385c31bb0b034ec15f542730e30 (diff) | |
| download | talos-obmc-uboot-4b6e1fda107e5244e80ebc41865650ac2873dc88.tar.gz talos-obmc-uboot-4b6e1fda107e5244e80ebc41865650ac2873dc88.zip | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'board')
| -rw-r--r-- | board/cm5200/fwupdate.c | 2 | ||||
| -rw-r--r-- | board/mpl/pip405/README | 6 | ||||
| -rw-r--r-- | board/sandbox/MAINTAINERS | 7 |
3 files changed, 11 insertions, 4 deletions
diff --git a/board/cm5200/fwupdate.c b/board/cm5200/fwupdate.c index 2ed90de9d5..4740c8394c 100644 --- a/board/cm5200/fwupdate.c +++ b/board/cm5200/fwupdate.c @@ -105,7 +105,7 @@ static int load_rescue_image(ulong addr) /* Detect storage device */ for (devno = 0; devno < USB_MAX_STOR_DEV; devno++) { - stor_dev = usb_stor_get_dev(devno); + stor_dev = blk_get_devnum_by_type(IF_TYPE_USB, devno); if (stor_dev->type != DEV_TYPE_UNKNOWN) break; } diff --git a/board/mpl/pip405/README b/board/mpl/pip405/README index e900c56f15..f039817b79 100644 --- a/board/mpl/pip405/README +++ b/board/mpl/pip405/README @@ -32,8 +32,8 @@ Changed files: - include/cmd_bsp.h added PIP405 commands definitions - include/cmd_condefs.h added Floppy and SCSI support - include/cmd_disk.h changed to work with block device description -- include/config_LANTEC.h excluded CONFIG_CMD_FDC and CONFIG_CMD_SCSI -- include/config_hymod.h excluded CONFIG_CMD_FDC and CONFIG_CMD_SCSI +- include/config_LANTEC.h excluded CONFIG_CMD_FDC and CONFIG_SCSI +- include/config_hymod.h excluded CONFIG_CMD_FDC and CONFIG_SCSI - include/flash.h added INTEL_ID_28F320C3T 0x88C488C4 - include/i2c.h added "defined(CONFIG_PIP405)" - include/image.h added IH_OS_U_BOOT, IH_TYPE_FIRMWARE @@ -86,7 +86,7 @@ section "Changes". New Commands: ------------- -CONFIG_CMD_SCSI SCSI Support +CONFIG_SCSI SCSI Support CONFIG_CMF_FDC Floppy disk support IDE additions: diff --git a/board/sandbox/MAINTAINERS b/board/sandbox/MAINTAINERS index 10d88a28a6..f5db773a47 100644 --- a/board/sandbox/MAINTAINERS +++ b/board/sandbox/MAINTAINERS @@ -4,3 +4,10 @@ S: Maintained F: board/sandbox/ F: include/configs/sandbox.h F: configs/sandbox_defconfig + +SANDBOX_NOBLK BOARD +M: Simon Glass <sjg@chromium.org> +S: Maintained +F: board/sandbox/ +F: include/configs/sandbox.h +F: configs/sandbox_noblk_defconfig |
