mirror of
https://github.com/u-boot/u-boot.git
synced 2025-05-08 10:39:08 +00:00
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
parent
9246f5ecfd
commit
f2302d4430
132 changed files with 1173 additions and 1771 deletions
|
@ -126,6 +126,7 @@ typedef unsigned long lbastart_t;
|
|||
#define DT_STOR_SCSI 0x0020
|
||||
#define DT_STOR_USB 0x0040
|
||||
#define DT_STOR_MMC 0x0080
|
||||
#define DT_STOR_SATA 0x0100
|
||||
|
||||
#define DEV_STA_CLOSED 0x0000 /* invalid, closed */
|
||||
#define DEV_STA_OPEN 0x0001 /* open i.e. active */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue