Merge branch 'for-next/randfixes'

14 files changed, 27 insertions, 7 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a4a4e03a56..372257413d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -107,6 +107,8 @@ config ARCH_LAYERSCAPE
 	select CLKDEV_LOOKUP
 	select COMMON_CLK_OF_PROVIDER
 	select HW_HAS_PCI
+	select OFTREE
+	select OFDEVICE
 
 config ARCH_MVEBU
 	bool "Marvell EBU platforms"
@@ -434,6 +436,7 @@ config ARM_SMCCC
 	  This option enables barebox to invoke ARM secure monitor calls.
 
 config ARM_SECURE_MONITOR
+	depends on CPU_32v7 || CPU_64v8
 	select ARM_SMCCC
 	bool
 	help
@@ -453,6 +456,7 @@ config ARM_PSCI
 
 config ARM_PSCI_CLIENT
 	bool "Enable barebox PSCI client support"
+	depends on CPU_32v7 || CPU_64v8
 	select ARM_SMCCC
 	select ARM_PSCI_OF
 	help
diff --git a/arch/arm/boards/wago-pfc-am35xx/board-mlo.c b/arch/arm/boards/wago-pfc-am35xx/board-mlo.c
index 7925c71a4b..c940565b4a 100644
--- a/arch/arm/boards/wago-pfc-am35xx/board-mlo.c
+++ b/arch/arm/boards/wago-pfc-am35xx/board-mlo.c
@@ -48,7 +48,7 @@ static int pfc200_mem_init(void)
 }
 mem_initcall(pfc200_mem_init);
 
-static struct gpmc_nand_platform_data nand_plat = {
+__maybe_unused static struct gpmc_nand_platform_data nand_plat = {
 	.cs = 0,
 	.device_width = 8,
 	.ecc_mode = OMAP_ECC_BCH8_CODE_HW_ROMCODE,
@@ -62,8 +62,8 @@ static int pfc200_init_devices(void)
 	 * WP is made high and WAIT1 active Low
 	 */
 	gpmc_generic_init(0x10);
-#endif
 	omap_add_gpmc_nand_device(&nand_plat);
+#endif
 	omap_set_barebox_part(&pfc200_mlo_part);
 
 	omap3_add_mmc1(NULL);
diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile
index 75cd42a5e2..63cf35c299 100644
--- a/arch/arm/cpu/Makefile
+++ b/arch/arm/cpu/Makefile
@@ -15,7 +15,6 @@ pbl-$(CONFIG_BOARD_ARM_GENERIC_DT_AARCH64) += board-dt-2nd-aarch64.o
 
 obj-pbl-y += setupc$(S64).o cache$(S64).o
 
-obj-$(CONFIG_BOOTM_OPTEE) += start-kernel-optee.o
 obj-$(CONFIG_ARM_PSCI_CLIENT) += psci-client.o
 
 #
diff --git a/arch/arm/cpu/common.c b/arch/arm/cpu/common.c
index c81b2b3791..c7d1709b8b 100644
--- a/arch/arm/cpu/common.c
+++ b/arch/arm/cpu/common.c
@@ -51,7 +51,11 @@ void pbl_barebox_break(void)
 {
 	__asm__ __volatile__ (
 #ifdef CONFIG_PBL_BREAK
+#ifdef CONFIG_CPU_V8
+		"brk #17\n"
+#else
 		"bkpt #17\n"
+#endif
 		"nop\n"
 #else
 		"nop\n"
diff --git a/arch/arm/cpu/psci.c b/arch/arm/cpu/psci.c
index 713ab2396c..5a69aaa810 100644
--- a/arch/arm/cpu/psci.c
+++ b/arch/arm/cpu/psci.c
@@ -227,3 +227,4 @@ static int armv7_psci_init(void)
 	return of_register_fixup(of_psci_do_fixup, NULL);
 }
 device_initcall(armv7_psci_init);
+
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 294a0bfa55..9566e97555 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -33,7 +33,8 @@ lwl-dtb-$(CONFIG_MACH_GW_VENTANA) += imx6q-gw54xx.dtb.o
 lwl-dtb-$(CONFIG_MACH_KONTRON_SAMX6I) += imx6q-samx6i.dtb.o \
 					imx6dl-samx6i.dtb.o
 lwl-dtb-$(CONFIG_MACH_LENOVO_IX4_300D) += armada-xp-lenovo-ix4-300d-bb.dtb.o
-lwl-dtb-$(CONFIG_MACH_MARVELL_ARMADA_XP_GP) += armada-xp-gp-bb.dtb.o armada-xp-db-bb.dtb.o
+lwl-dtb-$(CONFIG_MACH_MARVELL_ARMADA_XP_GP) += armada-xp-gp-bb.dtb.o
+lwl-dtb-$(CONFIG_MACH_MARVELL_ARMADA_XP_DB) += armada-xp-db-bb.dtb.o
 lwl-dtb-$(CONFIG_MACH_MB7707) += module-mb7707.dtb.o
 lwl-dtb-$(CONFIG_MACH_MX28EVK) += imx28-evk.dtb.o
 lwl-dtb-$(CONFIG_MACH_NETGEAR_RN104) += armada-370-rn104-bb.dtb.o
diff --git a/arch/arm/include/asm/barebox-arm-head.h b/arch/arm/include/asm/barebox-arm-head.h
index 83a22c4d94..8409a77d2e 100644
--- a/arch/arm/include/asm/barebox-arm-head.h
+++ b/arch/arm/include/asm/barebox-arm-head.h
@@ -65,7 +65,11 @@ static inline void __barebox_arm_head(void)
 		".endr\n"
 		"2:\n"
 #ifdef CONFIG_PBL_BREAK
+#ifdef CONFIG_CPU_V8
+		"brk #17\n"
+#else
 		"bkpt #17\n"
+#endif
 		"nop\n"
 #else
 		"nop\n"
diff --git a/arch/arm/lib32/Makefile b/arch/arm/lib32/Makefile
index 3c02a0bf96..cd43147e66 100644
--- a/arch/arm/lib32/Makefile
+++ b/arch/arm/lib32/Makefile
@@ -1,6 +1,7 @@
 obj-$(CONFIG_ARM_LINUX)	+= armlinux.o
 obj-$(CONFIG_CMD_BOOTZ)	+= bootz.o
 obj-$(CONFIG_BOOTM)     += bootm.o
+obj-$(CONFIG_BOOTM_OPTEE) += start-kernel-optee.o
 obj-$(CONFIG_CMD_BOOTU) += bootu.o
 obj-y	+= div0.o
 obj-y	+= findbit.o
diff --git a/arch/arm/cpu/start-kernel-optee.S b/arch/arm/lib32/start-kernel-optee.S
index 92da4b63c9..92da4b63c9 100644
--- a/arch/arm/cpu/start-kernel-optee.S
+++ b/arch/arm/lib32/start-kernel-optee.S
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 5ad1f62c8d..5267102bf9 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -65,6 +65,7 @@ config SOC_SAMA5D2
 	select HAVE_AT91_UTMI
 	select HAVE_AT91_USB_CLK
 	select HAVE_AT91_GENERATED_CLK
+	select PINCTRL
 	select PINCTRL_AT91PIO4
 	select HAS_MACB
 	select HAVE_MACH_ARM_HEAD
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index 66d3d7a5f7..c6d4fce603 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -9,6 +9,8 @@ choice
 
 config MACH_VIRT2REAL
 	bool "Virt2Real"
+	select OFTREE
+	select OFDEVICE
 
 endchoice
 
diff --git a/arch/arm/mach-layerscape/Kconfig b/arch/arm/mach-layerscape/Kconfig
index 139c63f66d..c15d5873a5 100644
--- a/arch/arm/mach-layerscape/Kconfig
+++ b/arch/arm/mach-layerscape/Kconfig
@@ -30,5 +30,8 @@ config MACH_LS1046ARDB
 config MACH_TQMLS1046A
 	bool "TQ TQMLS1046A Board"
 	select ARCH_LS1046
+	select MCI_IMX_ESDHC_PBL
+	select DDR_FSL
+	select DDR_FSL_DDR4
 
 endif
diff --git a/arch/arm/mach-layerscape/ppa.c b/arch/arm/mach-layerscape/ppa.c
index c5eba35b33..477e894781 100644
--- a/arch/arm/mach-layerscape/ppa.c
+++ b/arch/arm/mach-layerscape/ppa.c
@@ -14,9 +14,9 @@
 #include <image-fit.h>
 #include <asm/psci.h>
 #include <mach/layerscape.h>
+#include <asm/cache.h>
 
 int ppa_entry(const void *, u32 *, u32 *);
-void dma_flush_range(void *ptr, size_t size);
 
 #define SEC_JR3_OFFSET                     0x40000
 
@@ -92,7 +92,7 @@ static int ppa_init(void *ppa, size_t ppa_size, void *sec_firmware_addr)
 
 	/* Copy the secure firmware to secure memory */
 	memcpy(sec_firmware_addr, buf, firmware_size);
-	dma_flush_range(sec_firmware_addr, ppa_size);
+	sync_caches_for_execution();
 
 	ret = ppa_entry(sec_firmware_addr, boot_loc_ptr_l, boot_loc_ptr_h);
 	if (ret) {
diff --git a/arch/arm/mach-mxs/bcb.c b/arch/arm/mach-mxs/bcb.c
index fce607f634..860508bde7 100644
--- a/arch/arm/mach-mxs/bcb.c
+++ b/arch/arm/mach-mxs/bcb.c
@@ -314,7 +314,7 @@ static int write_fcb(struct mtd_info *mtd, void *buf, int block)
 	return ret;
 }
 
-int update_bcb(int argc, char *argv[])
+static int update_bcb(int argc, char *argv[])
 {
 	int ret;
 	int block;