diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-30 07:22:12 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-30 07:22:12 -0500 |
| commit | 748ad078eefea2ee5a3c8e53ca46e9e93c2fc7f1 (patch) | |
| tree | 0067011f4422174e2834136f83ebe417dfa260d7 /arch/arm/include | |
| parent | 1b35c90836e5660a37ed33581f06ebb0b36b01ad (diff) | |
| parent | 6d69e535116ba9d6d3b8e4dc57cf3543301b59df (diff) | |
| download | u-boot-748ad078eefea2ee5a3c8e53ca46e9e93c2fc7f1.tar.gz | |
Merge tag 'u-boot-imx-20190129' of git://git.denx.de/u-boot-imx
For 2019.04
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/mach-imx/sys_proto.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/pl310.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index 8d6832a331..d0f866b630 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -67,8 +67,8 @@ enum imx6_bmode_serial_rom { }; enum imx6_bmode_emi { - IMX6_BMODE_ONENAND, IMX6_BMODE_NOR, + IMX6_BMODE_ONENAND, }; enum imx6_bmode { diff --git a/arch/arm/include/asm/pl310.h b/arch/arm/include/asm/pl310.h index 3624362bf1..b83978b1cc 100644 --- a/arch/arm/include/asm/pl310.h +++ b/arch/arm/include/asm/pl310.h @@ -19,6 +19,11 @@ #define L310_AUX_CTRL_DATA_PREFETCH_MASK (1 << 28) #define L310_AUX_CTRL_INST_PREFETCH_MASK (1 << 29) +#define L2X0_CACHE_ID_PART_MASK (0xf << 6) +#define L2X0_CACHE_ID_PART_L310 (3 << 6) +#define L2X0_CACHE_ID_RTL_MASK 0x3f +#define L2X0_CACHE_ID_RTL_R3P2 0x8 + struct pl310_regs { u32 pl310_cache_id; u32 pl310_cache_type; |