diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv8/zynqmp/Kconfig | 7 | ||||
| -rw-r--r-- | arch/arm/cpu/armv8/zynqmp/cpu.c | 5 | ||||
| -rw-r--r-- | arch/arm/dts/zynq-zc770-xm010.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/zynq-zc770-xm011.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/zynq-zc770-xm012.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/zynq-zc770-xm013.dts | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-zynqmp/hardware.h | 7 | ||||
| -rw-r--r-- | arch/arm/mach-zynq/Kconfig | 2 |
8 files changed, 24 insertions, 5 deletions
diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig index c8fcfb6abb..e5a4fdd0fd 100644 --- a/arch/arm/cpu/armv8/zynqmp/Kconfig +++ b/arch/arm/cpu/armv8/zynqmp/Kconfig @@ -20,4 +20,11 @@ config SYS_SOC config SYS_CONFIG_NAME default "xilinx_zynqmp_ep" if TARGET_ZYNQMP_EP +config SECURE_IOU + bool "Configure ZynqMP secure IOU" + default n + +config ZYNQMP_USB + bool "Configure ZynqMP USB" + endif diff --git a/arch/arm/cpu/armv8/zynqmp/cpu.c b/arch/arm/cpu/armv8/zynqmp/cpu.c index 60d7d20e17..f90cca36aa 100644 --- a/arch/arm/cpu/armv8/zynqmp/cpu.c +++ b/arch/arm/cpu/armv8/zynqmp/cpu.c @@ -191,4 +191,9 @@ void enable_caches(void) set_sctlr(get_sctlr() | CR_C); } + +u64 *arch_get_page_table(void) +{ + return (u64 *)(gd->arch.tlb_addr + 0x3000); +} #endif diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts index da3a182ea1..680f24c9c4 100644 --- a/arch/arm/dts/zynq-zc770-xm010.dts +++ b/arch/arm/dts/zynq-zc770-xm010.dts @@ -25,7 +25,7 @@ stdout-path = &uart1; }; - memory@0 { + memory { device_type = "memory"; reg = <0x0 0x40000000>; }; diff --git a/arch/arm/dts/zynq-zc770-xm011.dts b/arch/arm/dts/zynq-zc770-xm011.dts index d38c820135..f73c0ddcb8 100644 --- a/arch/arm/dts/zynq-zc770-xm011.dts +++ b/arch/arm/dts/zynq-zc770-xm011.dts @@ -23,7 +23,7 @@ stdout-path = &uart1; }; - memory@0 { + memory { device_type = "memory"; reg = <0x0 0x40000000>; }; diff --git a/arch/arm/dts/zynq-zc770-xm012.dts b/arch/arm/dts/zynq-zc770-xm012.dts index f8cc5039d6..4289e31f46 100644 --- a/arch/arm/dts/zynq-zc770-xm012.dts +++ b/arch/arm/dts/zynq-zc770-xm012.dts @@ -25,7 +25,7 @@ stdout-path = &uart1; }; - memory@0 { + memory { device_type = "memory"; reg = <0x0 0x40000000>; }; diff --git a/arch/arm/dts/zynq-zc770-xm013.dts b/arch/arm/dts/zynq-zc770-xm013.dts index 436a8cd1b9..5124cdc5cd 100644 --- a/arch/arm/dts/zynq-zc770-xm013.dts +++ b/arch/arm/dts/zynq-zc770-xm013.dts @@ -25,7 +25,7 @@ stdout-path = &uart0; }; - memory@0 { + memory { device_type = "memory"; reg = <0x0 0x40000000>; }; diff --git a/arch/arm/include/asm/arch-zynqmp/hardware.h b/arch/arm/include/asm/arch-zynqmp/hardware.h index 7640eabad1..0f03c246d7 100644 --- a/arch/arm/include/asm/arch-zynqmp/hardware.h +++ b/arch/arm/include/asm/arch-zynqmp/hardware.h @@ -27,6 +27,9 @@ #define ZYNQMP_SATA_BASEADDR 0xFD0C0000 +#define ZYNQMP_USB0_XHCI_BASEADDR 0xFE200000 +#define ZYNQMP_USB1_XHCI_BASEADDR 0xFE300000 + #define ZYNQMP_CRL_APB_BASEADDR 0xFF5E0000 #define ZYNQMP_CRL_APB_TIMESTAMP_REF_CTRL_CLKACT 0x1000000 @@ -44,7 +47,11 @@ struct crlapb_regs { #define crlapb_base ((struct crlapb_regs *)ZYNQMP_CRL_APB_BASEADDR) +#if defined(CONFIG_SECURE_IOU) +#define ZYNQMP_IOU_SCNTR 0xFF260000 +#else #define ZYNQMP_IOU_SCNTR 0xFF250000 +#endif #define ZYNQMP_IOU_SCNTR_COUNTER_CONTROL_REGISTER_EN 0x1 #define ZYNQMP_IOU_SCNTR_COUNTER_CONTROL_REGISTER_HDBG 0x2 diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index 1de5b0710a..7a1aec45e7 100644 --- a/arch/arm/mach-zynq/Kconfig +++ b/arch/arm/mach-zynq/Kconfig @@ -10,7 +10,7 @@ config ZYNQ_CUSTOM_INIT choice prompt "Xilinx Zynq board select" - optional + default TARGET_ZYNQ_ZC702 config TARGET_ZYNQ_ZED bool "Zynq ZedBoard" |