diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-24 19:39:14 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-24 19:39:14 -0400 |
| commit | 4dda435131251a94b29afd52f010cf1ec5a7ceb2 (patch) | |
| tree | 16bda495e53e1e5d6afc58077f2ec8e6ca670d1c /arch/mips/include/asm/global_data.h | |
| parent | e1333435afbf0c6290b1d16bb446b57807f75502 (diff) | |
| parent | b1d9554e058e5e8510a9d22183ae8321290ee87b (diff) | |
Merge tag 'mips-pull-2021-04-24' of https://source.denx.de/u-boot/custodians/u-boot-mips
- MIPS: octeon: fix minor bugs of initial merge
- MIPS: octeon: add support for QLM and PCI-E controller
- MIPS: octeon: add support for AHCI and SATA
- MIPS: octeon: add E1000 ethernet support
- MIPS: octeon: add Octeon III NIC23 board
- ata/scsi: add support for Big Endian platforms
Diffstat (limited to 'arch/mips/include/asm/global_data.h')
| -rw-r--r-- | arch/mips/include/asm/global_data.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h index 4c30fab8717..f0d3b07bf1e 100644 --- a/arch/mips/include/asm/global_data.h +++ b/arch/mips/include/asm/global_data.h @@ -8,6 +8,12 @@ #define __ASM_GBL_DATA_H #include <asm/regdef.h> +#include <asm/types.h> + +struct octeon_eeprom_mac_addr { + u8 mac_addr_base[6]; + u8 count; +}; /* Architecture-specific global data */ struct arch_global_data { @@ -30,6 +36,9 @@ struct arch_global_data { #ifdef CONFIG_ARCH_MTMIPS unsigned long timer_freq; #endif +#ifdef CONFIG_ARCH_OCTEON + struct octeon_eeprom_mac_addr mac_desc; +#endif }; #include <asm-generic/global_data.h> |