diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-15 16:42:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-15 16:42:06 -0400 |
| commit | 506159549df76034dfbdee562304ce4c102d3a06 (patch) | |
| tree | 85c116fc3267a1ce16d6771f0a08675788d48ccd /include | |
| parent | 5f09f9af3cc335fe6a74c031cfa0b1d8bdf4b9db (diff) | |
| parent | 24bf6e84ce22cd1b53cb79e4f89a4036af7e9c6b (diff) | |
| download | u-boot-506159549df76034dfbdee562304ce4c102d3a06.tar.gz u-boot-506159549df76034dfbdee562304ce4c102d3a06.tar.xz u-boot-506159549df76034dfbdee562304ce4c102d3a06.zip | |
Merge branch '2020-05-15-misc-bugfixes'
- A number of symbol name consistency updates
- JFFS2 bugfix
- Use /* fallthrough */ for now to help at least gcc know when we're
intentionally not 'break;'ing in a switch statement, we'll adopt
fallthrough; later on.
- Assorted other fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/pci.h | 2 | ||||
| -rw-r--r-- | include/serial.h | 2 | ||||
| -rw-r--r-- | include/usb.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/pci.h b/include/pci.h index aff56b24f9..19c9244b94 100644 --- a/include/pci.h +++ b/include/pci.h @@ -531,7 +531,7 @@ typedef int pci_dev_t; * This is relevant for the following macros: * PCI_DEV, PCI_FUNC, PCI_DEVFN * The U-Boot macro PCI_DEV is equivalent to the Linux PCI_SLOT version with - * the remark from above (input d in bits 15-8 instead of 7-0. + * the remark from above (input is in bits 15-8 instead of 7-0. */ #define PCI_DEV(d) (((d) >> 11) & 0x1f) #define PCI_FUNC(d) (((d) >> 8) & 0x7) diff --git a/include/serial.h b/include/serial.h index 54b21a0470..c590637b1f 100644 --- a/include/serial.h +++ b/include/serial.h @@ -28,7 +28,7 @@ extern struct serial_device *default_serial_console(void); #if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \ defined(CONFIG_MPC86xx) || \ - defined(CONFIG_TEGRA) || defined(CONFIG_SYS_COREBOOT) || \ + defined(CONFIG_ARCH_TEGRA) || defined(CONFIG_SYS_COREBOOT) || \ defined(CONFIG_MICROBLAZE) extern struct serial_device serial0_device; extern struct serial_device serial1_device; diff --git a/include/usb.h b/include/usb.h index 22f6088fe6..fa9e09607e 100644 --- a/include/usb.h +++ b/include/usb.h @@ -103,7 +103,7 @@ enum { */ struct usb_device { int devnum; /* Device number on USB bus */ - int speed; /* full/low/high */ + enum usb_device_speed speed; /* full/low/high */ char mf[32]; /* manufacturer */ char prod[32]; /* product */ char serial[32]; /* serial number */ |