Merge tag 'u-boot-imx-20190129' of git://git.denx.de/u-boot-imx

For 2019.04
This commit is contained in:
Tom Rini
2019-01-30 07:22:12 -05:00
74 changed files with 3038 additions and 528 deletions

View File

@@ -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 {

View File

@@ -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;