leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
Merge in v2022.07-rc5.
This commit is contained in:
Tom Rini
2022-06-20 14:40:59 -04:00
parent 78533a1ce8 568a226f87
commit 52af0101be
86 changed files with 2052 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/include/asm/armv8/mmu.h
View File

@@ -103,6 +103,8 @@
#define TCR_EL2_RSVD (1U << 31 | 1 << 23)
#define TCR_EL3_RSVD (1U << 31 | 1 << 23)
#define HCR_EL2_E2H_BIT 34
#ifndef __ASSEMBLY__
static inline void set_ttbr_tcr_mair(int el, u64 table, u64 tcr, u64 attr)
{
@@ -134,7 +136,7 @@ struct mm_region {
extern struct mm_region *mem_map;
void setup_pgtables(void);
u64 get_tcr(int el, u64 *pips, u64 *pva_bits);
u64 get_tcr(u64 *pips, u64 *pva_bits);
#endif
#endif /* _ASM_ARMV8_MMU_H_ */