diff options
| author | Tom Rini <trini@konsulko.com> | 2019-03-22 19:09:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-03-22 19:09:58 -0400 |
| commit | cfb3e102c4bdf96a41cbd3eeb1d3a9a56c69c46c (patch) | |
| tree | 5951f299b8b05cb6011deb8522a8b883a5d260e2 /include | |
| parent | 7b80644e271544848db90fb0407d67b3e3749a8e (diff) | |
| parent | 2e7365518acdb8fb6e9be332c8a6c57b457188d9 (diff) | |
| download | u-boot-cfb3e102c4bdf96a41cbd3eeb1d3a9a56c69c46c.tar.gz | |
Merge branch '2019-03-22-master-imports'
- Don't attempt to write to ext4 volumes with the metadata_csum feature
we don't support
- Correct how we build dtb files.
- Fix regression on SPL_FIT with FIT_IMAGE_TINY
- Minor TI platform fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/command.h | 2 | ||||
| -rw-r--r-- | include/ext4fs.h | 1 | ||||
| -rw-r--r-- | include/pci.h | 11 |
3 files changed, 13 insertions, 1 deletions
diff --git a/include/command.h b/include/command.h index 2e24e8ad3e..be74f6ac92 100644 --- a/include/command.h +++ b/include/command.h @@ -18,7 +18,7 @@ /* Default to a width of 8 characters for help message command width */ #ifndef CONFIG_SYS_HELP_CMD_WIDTH -#define CONFIG_SYS_HELP_CMD_WIDTH 8 +#define CONFIG_SYS_HELP_CMD_WIDTH 10 #endif #ifndef __ASSEMBLY__ diff --git a/include/ext4fs.h b/include/ext4fs.h index bb55639107..2421011341 100644 --- a/include/ext4fs.h +++ b/include/ext4fs.h @@ -32,6 +32,7 @@ #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EXT_MAGIC 0xf30a #define EXT4_FEATURE_RO_COMPAT_GDT_CSUM 0x0010 +#define EXT4_FEATURE_RO_COMPAT_METADATA_CSUM 0x0400 #define EXT4_FEATURE_INCOMPAT_EXTENTS 0x0040 #define EXT4_FEATURE_INCOMPAT_64BIT 0x0080 #define EXT4_INDIRECT_BLOCKS 12 diff --git a/include/pci.h b/include/pci.h index 936cfe975c..5fb212cab1 100644 --- a/include/pci.h +++ b/include/pci.h @@ -499,9 +499,20 @@ static inline void pci_set_region(struct pci_region *reg, typedef int pci_dev_t; #define PCI_BUS(d) (((d) >> 16) & 0xff) + +/* + * Please note the difference in DEVFN usage in U-Boot vs Linux. U-Boot + * uses DEVFN in bits 15-8 but Linux instead expects DEVFN in bits 7-0. + * Please see the Linux header include/uapi/linux/pci.h for more details. + * 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. + */ #define PCI_DEV(d) (((d) >> 11) & 0x1f) #define PCI_FUNC(d) (((d) >> 8) & 0x7) #define PCI_DEVFN(d, f) ((d) << 11 | (f) << 8) + #define PCI_MASK_BUS(bdf) ((bdf) & 0xffff) #define PCI_ADD_BUS(bus, devfn) (((bus) << 16) | (devfn)) #define PCI_BDF(b, d, f) ((b) << 16 | PCI_DEVFN(d, f)) |