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/mach-octeon/cvmx-bootmem.c | |
| 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/mach-octeon/cvmx-bootmem.c')
| -rw-r--r-- | arch/mips/mach-octeon/cvmx-bootmem.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/mips/mach-octeon/cvmx-bootmem.c b/arch/mips/mach-octeon/cvmx-bootmem.c index 80bb7ac6c8c..12695df9bca 100644 --- a/arch/mips/mach-octeon/cvmx-bootmem.c +++ b/arch/mips/mach-octeon/cvmx-bootmem.c @@ -21,12 +21,6 @@ DECLARE_GLOBAL_DATA_PTR; -#define CVMX_MIPS32_SPACE_KSEG0 1L -#define CVMX_MIPS_SPACE_XKPHYS 2LL - -#define CVMX_ADD_SEG(seg, add) ((((u64)(seg)) << 62) | (add)) -#define CVMX_ADD_SEG32(seg, add) (((u32)(seg) << 31) | (u32)(add)) - /** * This is the physical location of a struct cvmx_bootmem_desc * structure in Octeon's memory. Note that dues to addressing @@ -289,8 +283,8 @@ static int __cvmx_bootmem_check_version(int exact_match) int major_version; major_version = CVMX_BOOTMEM_DESC_GET_FIELD(major_version); - if (major_version > 3 || - (exact_match && major_version) != exact_match) { + if ((major_version > 3) || + (exact_match && major_version != exact_match)) { debug("ERROR: Incompatible bootmem descriptor version: %d.%d at addr: 0x%llx\n", major_version, (int)CVMX_BOOTMEM_DESC_GET_FIELD(minor_version), |