[meta-arm] arm-bsp: Move to linux-linaro-arm for fvp-base and foundation-armv8

Submitted by luca fancellu on June 16, 2020, 8:06 a.m. | Patch ID: 173614

Details

Message ID 20200616080616.5509-1-luca.fancellu@arm.com
State New
Headers show

Commit Message

luca fancellu June 16, 2020, 8:06 a.m.
Change fvp-base and foundation-armv8 kernel from linux-yocto_5.4
to linux-linaro-arm_4.19 because some drivers are not available.
Furthermore, for fvp-base the linaro kernel comes with the dts
file removing the needs to support it on our side.

Change-Id: I844d92f173406542c2bad8d89793513f8bc28fd1
Signed-off-by: luca fancellu <luca.fancellu@arm.com>
---
 meta-arm-bsp/conf/machine/fvp-base.conf       |   2 +-
 meta-arm-bsp/conf/machine/fvp-common/fvp.inc  |   4 +-
 .../fvp-base-gicv3-psci-common-custom.dtsi    | 264 ----------------
 .../dts/arm/fvp-base-gicv3-psci-custom.dts    |   9 -
 .../dts/arm/rtsm_ve-motherboard-nomap.dtsi    | 282 ------------------
 .../linux/linux-yocto-arm-platforms.inc       |   6 -
 6 files changed, 3 insertions(+), 564 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi
 delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts
 delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi

Patch hide | download patch | download mbox

diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf
index 3039644..ae6b28c 100644
--- a/meta-arm-bsp/conf/machine/fvp-base.conf
+++ b/meta-arm-bsp/conf/machine/fvp-base.conf
@@ -6,7 +6,7 @@ 
 
 require conf/machine/fvp-common/fvp.inc
 
-KERNEL_DEVICETREE = "arm/fvp-base-gicv3-psci-custom.dtb"
+KERNEL_DEVICETREE = "arm/fvp-base-aemv8a-aemv8a.dtb"
 
 # Use haveged as a source of entropy instead of rng-tools (Needed for ssh).
 # rngd (Part of rng-tools) takes ~7 mins to init resulting in a slow boot time.
diff --git a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
index 08f8b15..f8a2584 100644
--- a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
+++ b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
@@ -34,8 +34,8 @@  DISK_IMG_PARTITION3_CONTENT = ""
 
 SERIAL_CONSOLES = "115200;ttyAMA0"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "5.4%"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-arm"
+PREFERRED_VERSION_linux-linaro-arm ?= "4.19%"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
 
diff --git a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi b/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi
deleted file mode 100644
index 1e056be..0000000
--- a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi
+++ /dev/null
@@ -1,264 +0,0 @@ 
-/*
- * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-/memreserve/ 0x80000000 0x00010000;
-
-/include/ "rtsm_ve-motherboard-nomap.dtsi"
-
-/ {
-	model = "FVP Base";
-	compatible = "arm,vfp-base", "arm,vexpress";
-	interrupt-parent = <&gic>;
-	#address-cells = <2>;
-	#size-cells = <2>;
-
-	aliases {
-		serial0 = &v2m_serial0;
-		serial1 = &v2m_serial1;
-		serial2 = &v2m_serial2;
-		serial3 = &v2m_serial3;
-	};
-
-	psci {
-		compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci";
-		method = "smc";
-		cpu_suspend = <0xc4000001>;
-		cpu_off = <0x84000002>;
-		cpu_on = <0xc4000003>;
-		sys_poweroff = <0x84000008>;
-		sys_reset = <0x84000009>;
-	};
-
-	cpus {
-		#address-cells = <2>;
-		#size-cells = <0>;
-
-		cpu-map {
-			cluster0 {
-				core0 {
-					cpu = <&CPU0>;
-				};
-				core1 {
-					cpu = <&CPU1>;
-				};
-				core2 {
-					cpu = <&CPU2>;
-				};
-				core3 {
-					cpu = <&CPU3>;
-				};
-			};
-
-			cluster1 {
-				core0 {
-					cpu = <&CPU4>;
-				};
-				core1 {
-					cpu = <&CPU5>;
-				};
-				core2 {
-					cpu = <&CPU6>;
-				};
-				core3 {
-					cpu = <&CPU7>;
-				};
-			};
-		};
-
-		idle-states {
-			entry-method = "arm,psci";
-
-			CPU_SLEEP_0: cpu-sleep-0 {
-				compatible = "arm,idle-state";
-				local-timer-stop;
-				arm,psci-suspend-param = <0x0010000>;
-				entry-latency-us = <40>;
-				exit-latency-us = <100>;
-				min-residency-us = <150>;
-			};
-
-			CLUSTER_SLEEP_0: cluster-sleep-0 {
-				compatible = "arm,idle-state";
-				local-timer-stop;
-				arm,psci-suspend-param = <0x1010000>;
-				entry-latency-us = <500>;
-				exit-latency-us = <1000>;
-				min-residency-us = <2500>;
-			};
-		};
-
-		CPU0:cpu@0 {
-			device_type = "cpu";
-			compatible = "arm,armv8";
-			reg = <0x0 0x0>;
-			enable-method = "psci";
-			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
-			next-level-cache = <&L2_0>;
-		};
-
-		CPU1:cpu@1 {
-			device_type = "cpu";
-			compatible = "arm,armv8";
-			reg = <0x0 0x1>;
-			enable-method = "psci";
-			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
-			next-level-cache = <&L2_0>;
-		};
-
-		CPU2:cpu@2 {
-			device_type = "cpu";
-			compatible = "arm,armv8";
-			reg = <0x0 0x2>;
-			enable-method = "psci";
-			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
-			next-level-cache = <&L2_0>;
-		};
-
-		CPU3:cpu@3 {
-			device_type = "cpu";
-			compatible = "arm,armv8";
-			reg = <0x0 0x3>;
-			enable-method = "psci";
-			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
-			next-level-cache = <&L2_0>;
-		};
-
-		CPU4:cpu@100 {
-			device_type = "cpu";
-			compatible = "arm,armv8";
-			reg = <0x0 0x100>;
-			enable-method = "psci";
-			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
-			next-level-cache = <&L2_0>;
-		};
-
-		CPU5:cpu@101 {
-			device_type = "cpu";
-			compatible = "arm,armv8";
-			reg = <0x0 0x101>;
-			enable-method = "psci";
-			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
-			next-level-cache = <&L2_0>;
-		};
-
-		CPU6:cpu@102 {
-			device_type = "cpu";
-			compatible = "arm,armv8";
-			reg = <0x0 0x102>;
-			enable-method = "psci";
-			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
-			next-level-cache = <&L2_0>;
-		};
-
-		CPU7:cpu@103 {
-			device_type = "cpu";
-			compatible = "arm,armv8";
-			reg = <0x0 0x103>;
-			enable-method = "psci";
-			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
-			next-level-cache = <&L2_0>;
-		};
-
-		L2_0: l2-cache0 {
-			compatible = "cache";
-		};
-	};
-
-	memory@80000000 {
-		device_type = "memory";
-		reg = <0x00000000 0x80000000 0 0x7F000000>,
-		      <0x00000008 0x80000000 0 0x80000000>;
-	};
-
-	gic: interrupt-controller@2f000000 {
-		compatible = "arm,gic-v3";
-		#interrupt-cells = <3>;
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-		interrupt-controller;
-		reg = <0x0 0x2f000000 0 0x10000>,	// GICD
-		      <0x0 0x2f100000 0 0x200000>,	// GICR
-		      <0x0 0x2c000000 0 0x2000>,	// GICC
-		      <0x0 0x2c010000 0 0x2000>,	// GICH
-		      <0x0 0x2c02f000 0 0x2000>;	// GICV
-		interrupts = <1 9 4>;
-
-		its: its@2f020000 {
-			compatible = "arm,gic-v3-its";
-			msi-controller;
-			reg = <0x0 0x2f020000 0x0 0x20000>; // GITS
-		};
-	};
-
-	timer {
-		compatible = "arm,armv8-timer";
-		interrupts = <1 13 0xff01>,
-			     <1 14 0xff01>,
-			     <1 11 0xff01>,
-			     <1 10 0xff01>;
-		clock-frequency = <100000000>;
-	};
-
-	timer@2a810000 {
-			compatible = "arm,armv7-timer-mem";
-			reg = <0x0 0x2a810000 0x0 0x10000>;
-			clock-frequency = <100000000>;
-			#address-cells = <2>;
-			#size-cells = <2>;
-			ranges;
-			frame@2a830000 {
-				frame-number = <1>;
-				interrupts = <0 26 4>;
-				reg = <0x0 0x2a830000 0x0 0x10000>;
-			};
-	};
-
-	pmu {
-		compatible = "arm,armv8-pmuv3";
-		interrupts = <0 60 4>,
-			     <0 61 4>,
-			     <0 62 4>,
-			     <0 63 4>;
-	};
-
-	smb@8000000 {
-		compatible = "simple-bus";
-
-		#address-cells = <2>;
-		#size-cells = <1>;
-		ranges = <0 0 0 0x08000000 0x04000000>,
-			 <1 0 0 0x14000000 0x04000000>,
-			 <2 0 0 0x18000000 0x04000000>,
-			 <3 0 0 0x1c000000 0x04000000>,
-			 <4 0 0 0x0c000000 0x04000000>,
-			 <5 0 0 0x10000000 0x04000000>;
-	};
-
-	panels {
-		panel {
-			compatible	= "panel";
-			mode		= "XVGA";
-			refresh		= <60>;
-			xres		= <1024>;
-			yres		= <768>;
-			pixclock	= <15748>;
-			left_margin	= <152>;
-			right_margin	= <48>;
-			upper_margin	= <23>;
-			lower_margin	= <3>;
-			hsync_len	= <104>;
-			vsync_len	= <4>;
-			sync		= <0>;
-			vmode		= "FB_VMODE_NONINTERLACED";
-			tim2		= "TIM2_BCD", "TIM2_IPC";
-			cntl		= "CNTL_LCDTFT", "CNTL_BGR", "CNTL_LCDVCOMP(1)";
-			caps		= "CLCD_CAP_5551", "CLCD_CAP_565", "CLCD_CAP_888";
-			bpp		= <16>;
-		};
-	};
-
-};
diff --git a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts b/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts
deleted file mode 100644
index 984dbca..0000000
--- a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts
+++ /dev/null
@@ -1,9 +0,0 @@ 
-/*
- * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-/dts-v1/;
-
-/include/ "fvp-base-gicv3-psci-common-custom.dtsi"
diff --git a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi b/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi
deleted file mode 100644
index 739af57..0000000
--- a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi
+++ /dev/null
@@ -1,282 +0,0 @@ 
-// SPDX-License-Identifier: GPL-2.0
-/*
- * ARM Ltd. Fast Models
- *
- * Versatile Express (VE) system model
- * Motherboard component
- *
- * VEMotherBoard.lisa
- *
- * This is a duplicate of rtsm_ve-motherboard.dtsi but not
- * using interrupt-map as this is not properly supported in
- * xen right now
- */
-/ {
-	smb@8000000 {
-		motherboard {
-			arm,v2m-memory-map = "rs1";
-			compatible = "arm,vexpress,v2m-p1", "simple-bus";
-			#address-cells = <2>; /* SMB chipselect number and offset */
-			#size-cells = <1>;
-			ranges;
-
-			flash@0,00000000 {
-				compatible = "arm,vexpress-flash", "cfi-flash";
-				reg = <0 0x00000000 0x04000000>,
-				      <4 0x00000000 0x04000000>;
-				bank-width = <4>;
-			};
-
-			v2m_video_ram: vram@2,00000000 {
-				compatible = "arm,vexpress-vram";
-				reg = <2 0x00000000 0x00800000>;
-			};
-
-			ethernet@2,02000000 {
-				compatible = "smsc,lan91c111";
-				reg = <2 0x02000000 0x10000>;
-				interrupts = <0 15 4>;
-			};
-
-			v2m_clk24mhz: clk24mhz {
-				compatible = "fixed-clock";
-				#clock-cells = <0>;
-				clock-frequency = <24000000>;
-				clock-output-names = "v2m:clk24mhz";
-			};
-
-			v2m_refclk1mhz: refclk1mhz {
-				compatible = "fixed-clock";
-				#clock-cells = <0>;
-				clock-frequency = <1000000>;
-				clock-output-names = "v2m:refclk1mhz";
-			};
-
-			v2m_refclk32khz: refclk32khz {
-				compatible = "fixed-clock";
-				#clock-cells = <0>;
-				clock-frequency = <32768>;
-				clock-output-names = "v2m:refclk32khz";
-			};
-
-			iofpga@3,00000000 {
-				compatible = "simple-bus";
-				#address-cells = <1>;
-				#size-cells = <1>;
-				ranges = <0 3 0 0x200000>;
-
-				v2m_sysreg: sysreg@10000 {
-					compatible = "arm,vexpress-sysreg";
-					reg = <0x010000 0x1000>;
-					gpio-controller;
-					#gpio-cells = <2>;
-				};
-
-				v2m_sysctl: sysctl@20000 {
-					compatible = "arm,sp810", "arm,primecell";
-					reg = <0x020000 0x1000>;
-					clocks = <&v2m_refclk32khz>, <&v2m_refclk1mhz>, <&v2m_clk24mhz>;
-					clock-names = "refclk", "timclk", "apb_pclk";
-					#clock-cells = <1>;
-					clock-output-names = "timerclken0", "timerclken1", "timerclken2", "timerclken3";
-					assigned-clocks = <&v2m_sysctl 0>, <&v2m_sysctl 1>, <&v2m_sysctl 3>, <&v2m_sysctl 3>;
-					assigned-clock-parents = <&v2m_refclk1mhz>, <&v2m_refclk1mhz>, <&v2m_refclk1mhz>, <&v2m_refclk1mhz>;
-				};
-
-				aaci@40000 {
-					compatible = "arm,pl041", "arm,primecell";
-					reg = <0x040000 0x1000>;
-					interrupts = <0 11 4>;
-					clocks = <&v2m_clk24mhz>;
-					clock-names = "apb_pclk";
-				};
-
-				mmci@50000 {
-					compatible = "arm,pl180", "arm,primecell";
-					reg = <0x050000 0x1000>;
-					interrupts = <0 9 4 0 10 4>;
-					cd-gpios = <&v2m_sysreg 0 0>;
-					wp-gpios = <&v2m_sysreg 1 0>;
-					max-frequency = <12000000>;
-					vmmc-supply = <&v2m_fixed_3v3>;
-					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
-					clock-names = "mclk", "apb_pclk";
-				};
-
-				kmi@60000 {
-					compatible = "arm,pl050", "arm,primecell";
-					reg = <0x060000 0x1000>;
-					interrupts = <0 12 4>;
-					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
-					clock-names = "KMIREFCLK", "apb_pclk";
-				};
-
-				kmi@70000 {
-					compatible = "arm,pl050", "arm,primecell";
-					reg = <0x070000 0x1000>;
-					interrupts = <0 13 4>;
-					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
-					clock-names = "KMIREFCLK", "apb_pclk";
-				};
-
-				v2m_serial0: uart@90000 {
-					compatible = "arm,pl011", "arm,primecell";
-					reg = <0x090000 0x1000>;
-					interrupts = <0 5 4>;
-					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
-					clock-names = "uartclk", "apb_pclk";
-				};
-
-				v2m_serial1: uart@a0000 {
-					compatible = "arm,pl011", "arm,primecell";
-					reg = <0x0a0000 0x1000>;
-					interrupts = <0 6 4>;
-					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
-					clock-names = "uartclk", "apb_pclk";
-				};
-
-				v2m_serial2: uart@b0000 {
-					compatible = "arm,pl011", "arm,primecell";
-					reg = <0x0b0000 0x1000>;
-					interrupts = <0 7 4>;
-					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
-					clock-names = "uartclk", "apb_pclk";
-				};
-
-				v2m_serial3: uart@c0000 {
-					compatible = "arm,pl011", "arm,primecell";
-					reg = <0x0c0000 0x1000>;
-					interrupts = <0 8 4>;
-					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
-					clock-names = "uartclk", "apb_pclk";
-				};
-
-				wdt@f0000 {
-					compatible = "arm,sp805", "arm,primecell";
-					reg = <0x0f0000 0x1000>;
-					interrupts = <0 0 4>;
-					clocks = <&v2m_refclk32khz>, <&v2m_clk24mhz>;
-					clock-names = "wdogclk", "apb_pclk";
-				};
-
-				v2m_timer01: timer@110000 {
-					compatible = "arm,sp804", "arm,primecell";
-					reg = <0x110000 0x1000>;
-					interrupts = <0 2 4>;
-					clocks = <&v2m_sysctl 0>, <&v2m_sysctl 1>, <&v2m_clk24mhz>;
-					clock-names = "timclken1", "timclken2", "apb_pclk";
-				};
-
-				v2m_timer23: timer@120000 {
-					compatible = "arm,sp804", "arm,primecell";
-					reg = <0x120000 0x1000>;
-					interrupts = <0 3 4>;
-					clocks = <&v2m_sysctl 2>, <&v2m_sysctl 3>, <&v2m_clk24mhz>;
-					clock-names = "timclken1", "timclken2", "apb_pclk";
-				};
-
-				rtc@170000 {
-					compatible = "arm,pl031", "arm,primecell";
-					reg = <0x170000 0x1000>;
-					interrupts = <0 4 4>;
-					clocks = <&v2m_clk24mhz>;
-					clock-names = "apb_pclk";
-				};
-
-				clcd@1f0000 {
-					compatible = "arm,pl111", "arm,primecell";
-					reg = <0x1f0000 0x1000>;
-					interrupt-names = "combined";
-					interrupts = <0 14 4>;
-					clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>;
-					clock-names = "clcdclk", "apb_pclk";
-					arm,pl11x,framebuffer = <0x18000000 0x00180000>;
-					memory-region = <&v2m_video_ram>;
-					max-memory-bandwidth = <130000000>; /* 16bpp @ 63.5MHz */
-
-					port {
-						v2m_clcd_pads: endpoint {
-							remote-endpoint = <&v2m_clcd_panel>;
-							arm,pl11x,tft-r0g0b0-pads = <0 8 16>;
-						};
-					};
-
-					panel {
-						compatible = "panel-dpi";
-
-						port {
-							v2m_clcd_panel: endpoint {
-								remote-endpoint = <&v2m_clcd_pads>;
-							};
-						};
-
-						panel-timing {
-							clock-frequency = <63500127>;
-							hactive = <1024>;
-							hback-porch = <152>;
-							hfront-porch = <48>;
-							hsync-len = <104>;
-							vactive = <768>;
-							vback-porch = <23>;
-							vfront-porch = <3>;
-							vsync-len = <4>;
-						};
-					};
-				};
-
-				virtio-block@130000 {
-					compatible = "virtio,mmio";
-					reg = <0x130000 0x200>;
-					interrupts = <0 42 4>;
-				};
-			};
-
-			v2m_fixed_3v3: v2m-3v3 {
-				compatible = "regulator-fixed";
-				regulator-name = "3V3";
-				regulator-min-microvolt = <3300000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-always-on;
-			};
-
-			mcc {
-				compatible = "arm,vexpress,config-bus";
-				arm,vexpress,config-bridge = <&v2m_sysreg>;
-
-				v2m_oscclk1: oscclk1 {
-					/* CLCD clock */
-					compatible = "arm,vexpress-osc";
-					arm,vexpress-sysreg,func = <1 1>;
-					freq-range = <23750000 63500000>;
-					#clock-cells = <0>;
-					clock-output-names = "v2m:oscclk1";
-				};
-
-				reset {
-					compatible = "arm,vexpress-reset";
-					arm,vexpress-sysreg,func = <5 0>;
-				};
-
-				muxfpga {
-					compatible = "arm,vexpress-muxfpga";
-					arm,vexpress-sysreg,func = <7 0>;
-				};
-
-				shutdown {
-					compatible = "arm,vexpress-shutdown";
-					arm,vexpress-sysreg,func = <8 0>;
-				};
-
-				reboot {
-					compatible = "arm,vexpress-reboot";
-					arm,vexpress-sysreg,func = <9 0>;
-				};
-
-				dvimode {
-					compatible = "arm,vexpress-dvimode";
-					arm,vexpress-sysreg,func = <11 0>;
-				};
-			};
-		};
-	};
-};
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
index eeb0571..5622ae7 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
@@ -21,12 +21,6 @@  KMACHINE_foundation-armv8 = "fvp"
 #
 COMPATIBLE_MACHINE_fvp-base = "fvp-base"
 KMACHINE_fvp-base = "fvp"
-SRC_URI_append_fvp-base = " file://dts/arm;subdir=add-files"
-
-do_patch_append_fvp-base() {
-    tar -C ${WORKDIR}/add-files/dts -cf - arm | \
-        tar -C arch/arm64/boot/dts -xf -
-}
 
 #
 # Juno KMACHINE

Comments

Bertrand Marquis June 16, 2020, 8:09 a.m.
> On 16 Jun 2020, at 09:06, luca fancellu via lists.yoctoproject.org <luca.fancellu=arm.com@lists.yoctoproject.org> wrote:
> 
> Change fvp-base and foundation-armv8 kernel from linux-yocto_5.4
> to linux-linaro-arm_4.19 because some drivers are not available.
> Furthermore, for fvp-base the linaro kernel comes with the dts
> file removing the needs to support it on our side.
> 
> Change-Id: I844d92f173406542c2bad8d89793513f8bc28fd1
> Signed-off-by: luca fancellu <luca.fancellu@arm.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

> ---
> meta-arm-bsp/conf/machine/fvp-base.conf       |   2 +-
> meta-arm-bsp/conf/machine/fvp-common/fvp.inc  |   4 +-
> .../fvp-base-gicv3-psci-common-custom.dtsi    | 264 ----------------
> .../dts/arm/fvp-base-gicv3-psci-custom.dts    |   9 -
> .../dts/arm/rtsm_ve-motherboard-nomap.dtsi    | 282 ------------------
> .../linux/linux-yocto-arm-platforms.inc       |   6 -
> 6 files changed, 3 insertions(+), 564 deletions(-)
> delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi
> delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts
> delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi
> 
> diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf
> index 3039644..ae6b28c 100644
> --- a/meta-arm-bsp/conf/machine/fvp-base.conf
> +++ b/meta-arm-bsp/conf/machine/fvp-base.conf
> @@ -6,7 +6,7 @@
> 
> require conf/machine/fvp-common/fvp.inc
> 
> -KERNEL_DEVICETREE = "arm/fvp-base-gicv3-psci-custom.dtb"
> +KERNEL_DEVICETREE = "arm/fvp-base-aemv8a-aemv8a.dtb"
> 
> # Use haveged as a source of entropy instead of rng-tools (Needed for ssh).
> # rngd (Part of rng-tools) takes ~7 mins to init resulting in a slow boot time.
> diff --git a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
> index 08f8b15..f8a2584 100644
> --- a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
> +++ b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
> @@ -34,8 +34,8 @@ DISK_IMG_PARTITION3_CONTENT = ""
> 
> SERIAL_CONSOLES = "115200;ttyAMA0"
> 
> -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
> -PREFERRED_VERSION_linux-yocto ?= "5.4%"
> +PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-arm"
> +PREFERRED_VERSION_linux-linaro-arm ?= "4.19%"
> 
> EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
> 
> diff --git a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi b/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi
> deleted file mode 100644
> index 1e056be..0000000
> --- a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi
> +++ /dev/null
> @@ -1,264 +0,0 @@
> -/*
> - * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
> - *
> - * SPDX-License-Identifier: BSD-3-Clause
> - */
> -
> -/memreserve/ 0x80000000 0x00010000;
> -
> -/include/ "rtsm_ve-motherboard-nomap.dtsi"
> -
> -/ {
> -	model = "FVP Base";
> -	compatible = "arm,vfp-base", "arm,vexpress";
> -	interrupt-parent = <&gic>;
> -	#address-cells = <2>;
> -	#size-cells = <2>;
> -
> -	aliases {
> -		serial0 = &v2m_serial0;
> -		serial1 = &v2m_serial1;
> -		serial2 = &v2m_serial2;
> -		serial3 = &v2m_serial3;
> -	};
> -
> -	psci {
> -		compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci";
> -		method = "smc";
> -		cpu_suspend = <0xc4000001>;
> -		cpu_off = <0x84000002>;
> -		cpu_on = <0xc4000003>;
> -		sys_poweroff = <0x84000008>;
> -		sys_reset = <0x84000009>;
> -	};
> -
> -	cpus {
> -		#address-cells = <2>;
> -		#size-cells = <0>;
> -
> -		cpu-map {
> -			cluster0 {
> -				core0 {
> -					cpu = <&CPU0>;
> -				};
> -				core1 {
> -					cpu = <&CPU1>;
> -				};
> -				core2 {
> -					cpu = <&CPU2>;
> -				};
> -				core3 {
> -					cpu = <&CPU3>;
> -				};
> -			};
> -
> -			cluster1 {
> -				core0 {
> -					cpu = <&CPU4>;
> -				};
> -				core1 {
> -					cpu = <&CPU5>;
> -				};
> -				core2 {
> -					cpu = <&CPU6>;
> -				};
> -				core3 {
> -					cpu = <&CPU7>;
> -				};
> -			};
> -		};
> -
> -		idle-states {
> -			entry-method = "arm,psci";
> -
> -			CPU_SLEEP_0: cpu-sleep-0 {
> -				compatible = "arm,idle-state";
> -				local-timer-stop;
> -				arm,psci-suspend-param = <0x0010000>;
> -				entry-latency-us = <40>;
> -				exit-latency-us = <100>;
> -				min-residency-us = <150>;
> -			};
> -
> -			CLUSTER_SLEEP_0: cluster-sleep-0 {
> -				compatible = "arm,idle-state";
> -				local-timer-stop;
> -				arm,psci-suspend-param = <0x1010000>;
> -				entry-latency-us = <500>;
> -				exit-latency-us = <1000>;
> -				min-residency-us = <2500>;
> -			};
> -		};
> -
> -		CPU0:cpu@0 {
> -			device_type = "cpu";
> -			compatible = "arm,armv8";
> -			reg = <0x0 0x0>;
> -			enable-method = "psci";
> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> -			next-level-cache = <&L2_0>;
> -		};
> -
> -		CPU1:cpu@1 {
> -			device_type = "cpu";
> -			compatible = "arm,armv8";
> -			reg = <0x0 0x1>;
> -			enable-method = "psci";
> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> -			next-level-cache = <&L2_0>;
> -		};
> -
> -		CPU2:cpu@2 {
> -			device_type = "cpu";
> -			compatible = "arm,armv8";
> -			reg = <0x0 0x2>;
> -			enable-method = "psci";
> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> -			next-level-cache = <&L2_0>;
> -		};
> -
> -		CPU3:cpu@3 {
> -			device_type = "cpu";
> -			compatible = "arm,armv8";
> -			reg = <0x0 0x3>;
> -			enable-method = "psci";
> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> -			next-level-cache = <&L2_0>;
> -		};
> -
> -		CPU4:cpu@100 {
> -			device_type = "cpu";
> -			compatible = "arm,armv8";
> -			reg = <0x0 0x100>;
> -			enable-method = "psci";
> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> -			next-level-cache = <&L2_0>;
> -		};
> -
> -		CPU5:cpu@101 {
> -			device_type = "cpu";
> -			compatible = "arm,armv8";
> -			reg = <0x0 0x101>;
> -			enable-method = "psci";
> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> -			next-level-cache = <&L2_0>;
> -		};
> -
> -		CPU6:cpu@102 {
> -			device_type = "cpu";
> -			compatible = "arm,armv8";
> -			reg = <0x0 0x102>;
> -			enable-method = "psci";
> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> -			next-level-cache = <&L2_0>;
> -		};
> -
> -		CPU7:cpu@103 {
> -			device_type = "cpu";
> -			compatible = "arm,armv8";
> -			reg = <0x0 0x103>;
> -			enable-method = "psci";
> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> -			next-level-cache = <&L2_0>;
> -		};
> -
> -		L2_0: l2-cache0 {
> -			compatible = "cache";
> -		};
> -	};
> -
> -	memory@80000000 {
> -		device_type = "memory";
> -		reg = <0x00000000 0x80000000 0 0x7F000000>,
> -		      <0x00000008 0x80000000 0 0x80000000>;
> -	};
> -
> -	gic: interrupt-controller@2f000000 {
> -		compatible = "arm,gic-v3";
> -		#interrupt-cells = <3>;
> -		#address-cells = <2>;
> -		#size-cells = <2>;
> -		ranges;
> -		interrupt-controller;
> -		reg = <0x0 0x2f000000 0 0x10000>,	// GICD
> -		      <0x0 0x2f100000 0 0x200000>,	// GICR
> -		      <0x0 0x2c000000 0 0x2000>,	// GICC
> -		      <0x0 0x2c010000 0 0x2000>,	// GICH
> -		      <0x0 0x2c02f000 0 0x2000>;	// GICV
> -		interrupts = <1 9 4>;
> -
> -		its: its@2f020000 {
> -			compatible = "arm,gic-v3-its";
> -			msi-controller;
> -			reg = <0x0 0x2f020000 0x0 0x20000>; // GITS
> -		};
> -	};
> -
> -	timer {
> -		compatible = "arm,armv8-timer";
> -		interrupts = <1 13 0xff01>,
> -			     <1 14 0xff01>,
> -			     <1 11 0xff01>,
> -			     <1 10 0xff01>;
> -		clock-frequency = <100000000>;
> -	};
> -
> -	timer@2a810000 {
> -			compatible = "arm,armv7-timer-mem";
> -			reg = <0x0 0x2a810000 0x0 0x10000>;
> -			clock-frequency = <100000000>;
> -			#address-cells = <2>;
> -			#size-cells = <2>;
> -			ranges;
> -			frame@2a830000 {
> -				frame-number = <1>;
> -				interrupts = <0 26 4>;
> -				reg = <0x0 0x2a830000 0x0 0x10000>;
> -			};
> -	};
> -
> -	pmu {
> -		compatible = "arm,armv8-pmuv3";
> -		interrupts = <0 60 4>,
> -			     <0 61 4>,
> -			     <0 62 4>,
> -			     <0 63 4>;
> -	};
> -
> -	smb@8000000 {
> -		compatible = "simple-bus";
> -
> -		#address-cells = <2>;
> -		#size-cells = <1>;
> -		ranges = <0 0 0 0x08000000 0x04000000>,
> -			 <1 0 0 0x14000000 0x04000000>,
> -			 <2 0 0 0x18000000 0x04000000>,
> -			 <3 0 0 0x1c000000 0x04000000>,
> -			 <4 0 0 0x0c000000 0x04000000>,
> -			 <5 0 0 0x10000000 0x04000000>;
> -	};
> -
> -	panels {
> -		panel {
> -			compatible	= "panel";
> -			mode		= "XVGA";
> -			refresh		= <60>;
> -			xres		= <1024>;
> -			yres		= <768>;
> -			pixclock	= <15748>;
> -			left_margin	= <152>;
> -			right_margin	= <48>;
> -			upper_margin	= <23>;
> -			lower_margin	= <3>;
> -			hsync_len	= <104>;
> -			vsync_len	= <4>;
> -			sync		= <0>;
> -			vmode		= "FB_VMODE_NONINTERLACED";
> -			tim2		= "TIM2_BCD", "TIM2_IPC";
> -			cntl		= "CNTL_LCDTFT", "CNTL_BGR", "CNTL_LCDVCOMP(1)";
> -			caps		= "CLCD_CAP_5551", "CLCD_CAP_565", "CLCD_CAP_888";
> -			bpp		= <16>;
> -		};
> -	};
> -
> -};
> diff --git a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts b/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts
> deleted file mode 100644
> index 984dbca..0000000
> --- a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -/*
> - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
> - *
> - * SPDX-License-Identifier: BSD-3-Clause
> - */
> -
> -/dts-v1/;
> -
> -/include/ "fvp-base-gicv3-psci-common-custom.dtsi"
> diff --git a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi b/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi
> deleted file mode 100644
> index 739af57..0000000
> --- a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi
> +++ /dev/null
> @@ -1,282 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -/*
> - * ARM Ltd. Fast Models
> - *
> - * Versatile Express (VE) system model
> - * Motherboard component
> - *
> - * VEMotherBoard.lisa
> - *
> - * This is a duplicate of rtsm_ve-motherboard.dtsi but not
> - * using interrupt-map as this is not properly supported in
> - * xen right now
> - */
> -/ {
> -	smb@8000000 {
> -		motherboard {
> -			arm,v2m-memory-map = "rs1";
> -			compatible = "arm,vexpress,v2m-p1", "simple-bus";
> -			#address-cells = <2>; /* SMB chipselect number and offset */
> -			#size-cells = <1>;
> -			ranges;
> -
> -			flash@0,00000000 {
> -				compatible = "arm,vexpress-flash", "cfi-flash";
> -				reg = <0 0x00000000 0x04000000>,
> -				      <4 0x00000000 0x04000000>;
> -				bank-width = <4>;
> -			};
> -
> -			v2m_video_ram: vram@2,00000000 {
> -				compatible = "arm,vexpress-vram";
> -				reg = <2 0x00000000 0x00800000>;
> -			};
> -
> -			ethernet@2,02000000 {
> -				compatible = "smsc,lan91c111";
> -				reg = <2 0x02000000 0x10000>;
> -				interrupts = <0 15 4>;
> -			};
> -
> -			v2m_clk24mhz: clk24mhz {
> -				compatible = "fixed-clock";
> -				#clock-cells = <0>;
> -				clock-frequency = <24000000>;
> -				clock-output-names = "v2m:clk24mhz";
> -			};
> -
> -			v2m_refclk1mhz: refclk1mhz {
> -				compatible = "fixed-clock";
> -				#clock-cells = <0>;
> -				clock-frequency = <1000000>;
> -				clock-output-names = "v2m:refclk1mhz";
> -			};
> -
> -			v2m_refclk32khz: refclk32khz {
> -				compatible = "fixed-clock";
> -				#clock-cells = <0>;
> -				clock-frequency = <32768>;
> -				clock-output-names = "v2m:refclk32khz";
> -			};
> -
> -			iofpga@3,00000000 {
> -				compatible = "simple-bus";
> -				#address-cells = <1>;
> -				#size-cells = <1>;
> -				ranges = <0 3 0 0x200000>;
> -
> -				v2m_sysreg: sysreg@10000 {
> -					compatible = "arm,vexpress-sysreg";
> -					reg = <0x010000 0x1000>;
> -					gpio-controller;
> -					#gpio-cells = <2>;
> -				};
> -
> -				v2m_sysctl: sysctl@20000 {
> -					compatible = "arm,sp810", "arm,primecell";
> -					reg = <0x020000 0x1000>;
> -					clocks = <&v2m_refclk32khz>, <&v2m_refclk1mhz>, <&v2m_clk24mhz>;
> -					clock-names = "refclk", "timclk", "apb_pclk";
> -					#clock-cells = <1>;
> -					clock-output-names = "timerclken0", "timerclken1", "timerclken2", "timerclken3";
> -					assigned-clocks = <&v2m_sysctl 0>, <&v2m_sysctl 1>, <&v2m_sysctl 3>, <&v2m_sysctl 3>;
> -					assigned-clock-parents = <&v2m_refclk1mhz>, <&v2m_refclk1mhz>, <&v2m_refclk1mhz>, <&v2m_refclk1mhz>;
> -				};
> -
> -				aaci@40000 {
> -					compatible = "arm,pl041", "arm,primecell";
> -					reg = <0x040000 0x1000>;
> -					interrupts = <0 11 4>;
> -					clocks = <&v2m_clk24mhz>;
> -					clock-names = "apb_pclk";
> -				};
> -
> -				mmci@50000 {
> -					compatible = "arm,pl180", "arm,primecell";
> -					reg = <0x050000 0x1000>;
> -					interrupts = <0 9 4 0 10 4>;
> -					cd-gpios = <&v2m_sysreg 0 0>;
> -					wp-gpios = <&v2m_sysreg 1 0>;
> -					max-frequency = <12000000>;
> -					vmmc-supply = <&v2m_fixed_3v3>;
> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> -					clock-names = "mclk", "apb_pclk";
> -				};
> -
> -				kmi@60000 {
> -					compatible = "arm,pl050", "arm,primecell";
> -					reg = <0x060000 0x1000>;
> -					interrupts = <0 12 4>;
> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> -					clock-names = "KMIREFCLK", "apb_pclk";
> -				};
> -
> -				kmi@70000 {
> -					compatible = "arm,pl050", "arm,primecell";
> -					reg = <0x070000 0x1000>;
> -					interrupts = <0 13 4>;
> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> -					clock-names = "KMIREFCLK", "apb_pclk";
> -				};
> -
> -				v2m_serial0: uart@90000 {
> -					compatible = "arm,pl011", "arm,primecell";
> -					reg = <0x090000 0x1000>;
> -					interrupts = <0 5 4>;
> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> -					clock-names = "uartclk", "apb_pclk";
> -				};
> -
> -				v2m_serial1: uart@a0000 {
> -					compatible = "arm,pl011", "arm,primecell";
> -					reg = <0x0a0000 0x1000>;
> -					interrupts = <0 6 4>;
> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> -					clock-names = "uartclk", "apb_pclk";
> -				};
> -
> -				v2m_serial2: uart@b0000 {
> -					compatible = "arm,pl011", "arm,primecell";
> -					reg = <0x0b0000 0x1000>;
> -					interrupts = <0 7 4>;
> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> -					clock-names = "uartclk", "apb_pclk";
> -				};
> -
> -				v2m_serial3: uart@c0000 {
> -					compatible = "arm,pl011", "arm,primecell";
> -					reg = <0x0c0000 0x1000>;
> -					interrupts = <0 8 4>;
> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> -					clock-names = "uartclk", "apb_pclk";
> -				};
> -
> -				wdt@f0000 {
> -					compatible = "arm,sp805", "arm,primecell";
> -					reg = <0x0f0000 0x1000>;
> -					interrupts = <0 0 4>;
> -					clocks = <&v2m_refclk32khz>, <&v2m_clk24mhz>;
> -					clock-names = "wdogclk", "apb_pclk";
> -				};
> -
> -				v2m_timer01: timer@110000 {
> -					compatible = "arm,sp804", "arm,primecell";
> -					reg = <0x110000 0x1000>;
> -					interrupts = <0 2 4>;
> -					clocks = <&v2m_sysctl 0>, <&v2m_sysctl 1>, <&v2m_clk24mhz>;
> -					clock-names = "timclken1", "timclken2", "apb_pclk";
> -				};
> -
> -				v2m_timer23: timer@120000 {
> -					compatible = "arm,sp804", "arm,primecell";
> -					reg = <0x120000 0x1000>;
> -					interrupts = <0 3 4>;
> -					clocks = <&v2m_sysctl 2>, <&v2m_sysctl 3>, <&v2m_clk24mhz>;
> -					clock-names = "timclken1", "timclken2", "apb_pclk";
> -				};
> -
> -				rtc@170000 {
> -					compatible = "arm,pl031", "arm,primecell";
> -					reg = <0x170000 0x1000>;
> -					interrupts = <0 4 4>;
> -					clocks = <&v2m_clk24mhz>;
> -					clock-names = "apb_pclk";
> -				};
> -
> -				clcd@1f0000 {
> -					compatible = "arm,pl111", "arm,primecell";
> -					reg = <0x1f0000 0x1000>;
> -					interrupt-names = "combined";
> -					interrupts = <0 14 4>;
> -					clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>;
> -					clock-names = "clcdclk", "apb_pclk";
> -					arm,pl11x,framebuffer = <0x18000000 0x00180000>;
> -					memory-region = <&v2m_video_ram>;
> -					max-memory-bandwidth = <130000000>; /* 16bpp @ 63.5MHz */
> -
> -					port {
> -						v2m_clcd_pads: endpoint {
> -							remote-endpoint = <&v2m_clcd_panel>;
> -							arm,pl11x,tft-r0g0b0-pads = <0 8 16>;
> -						};
> -					};
> -
> -					panel {
> -						compatible = "panel-dpi";
> -
> -						port {
> -							v2m_clcd_panel: endpoint {
> -								remote-endpoint = <&v2m_clcd_pads>;
> -							};
> -						};
> -
> -						panel-timing {
> -							clock-frequency = <63500127>;
> -							hactive = <1024>;
> -							hback-porch = <152>;
> -							hfront-porch = <48>;
> -							hsync-len = <104>;
> -							vactive = <768>;
> -							vback-porch = <23>;
> -							vfront-porch = <3>;
> -							vsync-len = <4>;
> -						};
> -					};
> -				};
> -
> -				virtio-block@130000 {
> -					compatible = "virtio,mmio";
> -					reg = <0x130000 0x200>;
> -					interrupts = <0 42 4>;
> -				};
> -			};
> -
> -			v2m_fixed_3v3: v2m-3v3 {
> -				compatible = "regulator-fixed";
> -				regulator-name = "3V3";
> -				regulator-min-microvolt = <3300000>;
> -				regulator-max-microvolt = <3300000>;
> -				regulator-always-on;
> -			};
> -
> -			mcc {
> -				compatible = "arm,vexpress,config-bus";
> -				arm,vexpress,config-bridge = <&v2m_sysreg>;
> -
> -				v2m_oscclk1: oscclk1 {
> -					/* CLCD clock */
> -					compatible = "arm,vexpress-osc";
> -					arm,vexpress-sysreg,func = <1 1>;
> -					freq-range = <23750000 63500000>;
> -					#clock-cells = <0>;
> -					clock-output-names = "v2m:oscclk1";
> -				};
> -
> -				reset {
> -					compatible = "arm,vexpress-reset";
> -					arm,vexpress-sysreg,func = <5 0>;
> -				};
> -
> -				muxfpga {
> -					compatible = "arm,vexpress-muxfpga";
> -					arm,vexpress-sysreg,func = <7 0>;
> -				};
> -
> -				shutdown {
> -					compatible = "arm,vexpress-shutdown";
> -					arm,vexpress-sysreg,func = <8 0>;
> -				};
> -
> -				reboot {
> -					compatible = "arm,vexpress-reboot";
> -					arm,vexpress-sysreg,func = <9 0>;
> -				};
> -
> -				dvimode {
> -					compatible = "arm,vexpress-dvimode";
> -					arm,vexpress-sysreg,func = <11 0>;
> -				};
> -			};
> -		};
> -	};
> -};
> diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
> index eeb0571..5622ae7 100644
> --- a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
> +++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
> @@ -21,12 +21,6 @@ KMACHINE_foundation-armv8 = "fvp"
> #
> COMPATIBLE_MACHINE_fvp-base = "fvp-base"
> KMACHINE_fvp-base = "fvp"
> -SRC_URI_append_fvp-base = " file://dts/arm;subdir=add-files"
> -
> -do_patch_append_fvp-base() {
> -    tar -C ${WORKDIR}/add-files/dts -cf - arm | \
> -        tar -C arch/arm64/boot/dts -xf -
> -}
> 
> #
> # Juno KMACHINE
> -- 
> 2.17.1
> 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#672): https://lists.yoctoproject.org/g/meta-arm/message/672
Mute This Topic: https://lists.yoctoproject.org/mt/74911946/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Jon Mason June 17, 2020, 12:14 p.m.
On Tue, Jun 16, 2020 at 08:09:13AM +0000, Bertrand Marquis wrote:
> 
> 
> > On 16 Jun 2020, at 09:06, luca fancellu via lists.yoctoproject.org <luca.fancellu=arm.com@lists.yoctoproject.org> wrote:
> > 
> > Change fvp-base and foundation-armv8 kernel from linux-yocto_5.4
> > to linux-linaro-arm_4.19 because some drivers are not available.
> > Furthermore, for fvp-base the linaro kernel comes with the dts
> > file removing the needs to support it on our side.
> > 
> > Change-Id: I844d92f173406542c2bad8d89793513f8bc28fd1
> > Signed-off-by: luca fancellu <luca.fancellu@arm.com>
> Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

Applied to the master branch.

Thanks,
Jon

> 
> > ---
> > meta-arm-bsp/conf/machine/fvp-base.conf       |   2 +-
> > meta-arm-bsp/conf/machine/fvp-common/fvp.inc  |   4 +-
> > .../fvp-base-gicv3-psci-common-custom.dtsi    | 264 ----------------
> > .../dts/arm/fvp-base-gicv3-psci-custom.dts    |   9 -
> > .../dts/arm/rtsm_ve-motherboard-nomap.dtsi    | 282 ------------------
> > .../linux/linux-yocto-arm-platforms.inc       |   6 -
> > 6 files changed, 3 insertions(+), 564 deletions(-)
> > delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi
> > delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts
> > delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi
> > 
> > diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf
> > index 3039644..ae6b28c 100644
> > --- a/meta-arm-bsp/conf/machine/fvp-base.conf
> > +++ b/meta-arm-bsp/conf/machine/fvp-base.conf
> > @@ -6,7 +6,7 @@
> > 
> > require conf/machine/fvp-common/fvp.inc
> > 
> > -KERNEL_DEVICETREE = "arm/fvp-base-gicv3-psci-custom.dtb"
> > +KERNEL_DEVICETREE = "arm/fvp-base-aemv8a-aemv8a.dtb"
> > 
> > # Use haveged as a source of entropy instead of rng-tools (Needed for ssh).
> > # rngd (Part of rng-tools) takes ~7 mins to init resulting in a slow boot time.
> > diff --git a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
> > index 08f8b15..f8a2584 100644
> > --- a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
> > +++ b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
> > @@ -34,8 +34,8 @@ DISK_IMG_PARTITION3_CONTENT = ""
> > 
> > SERIAL_CONSOLES = "115200;ttyAMA0"
> > 
> > -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
> > -PREFERRED_VERSION_linux-yocto ?= "5.4%"
> > +PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-arm"
> > +PREFERRED_VERSION_linux-linaro-arm ?= "4.19%"
> > 
> > EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
> > 
> > diff --git a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi b/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi
> > deleted file mode 100644
> > index 1e056be..0000000
> > --- a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi
> > +++ /dev/null
> > @@ -1,264 +0,0 @@
> > -/*
> > - * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
> > - *
> > - * SPDX-License-Identifier: BSD-3-Clause
> > - */
> > -
> > -/memreserve/ 0x80000000 0x00010000;
> > -
> > -/include/ "rtsm_ve-motherboard-nomap.dtsi"
> > -
> > -/ {
> > -	model = "FVP Base";
> > -	compatible = "arm,vfp-base", "arm,vexpress";
> > -	interrupt-parent = <&gic>;
> > -	#address-cells = <2>;
> > -	#size-cells = <2>;
> > -
> > -	aliases {
> > -		serial0 = &v2m_serial0;
> > -		serial1 = &v2m_serial1;
> > -		serial2 = &v2m_serial2;
> > -		serial3 = &v2m_serial3;
> > -	};
> > -
> > -	psci {
> > -		compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci";
> > -		method = "smc";
> > -		cpu_suspend = <0xc4000001>;
> > -		cpu_off = <0x84000002>;
> > -		cpu_on = <0xc4000003>;
> > -		sys_poweroff = <0x84000008>;
> > -		sys_reset = <0x84000009>;
> > -	};
> > -
> > -	cpus {
> > -		#address-cells = <2>;
> > -		#size-cells = <0>;
> > -
> > -		cpu-map {
> > -			cluster0 {
> > -				core0 {
> > -					cpu = <&CPU0>;
> > -				};
> > -				core1 {
> > -					cpu = <&CPU1>;
> > -				};
> > -				core2 {
> > -					cpu = <&CPU2>;
> > -				};
> > -				core3 {
> > -					cpu = <&CPU3>;
> > -				};
> > -			};
> > -
> > -			cluster1 {
> > -				core0 {
> > -					cpu = <&CPU4>;
> > -				};
> > -				core1 {
> > -					cpu = <&CPU5>;
> > -				};
> > -				core2 {
> > -					cpu = <&CPU6>;
> > -				};
> > -				core3 {
> > -					cpu = <&CPU7>;
> > -				};
> > -			};
> > -		};
> > -
> > -		idle-states {
> > -			entry-method = "arm,psci";
> > -
> > -			CPU_SLEEP_0: cpu-sleep-0 {
> > -				compatible = "arm,idle-state";
> > -				local-timer-stop;
> > -				arm,psci-suspend-param = <0x0010000>;
> > -				entry-latency-us = <40>;
> > -				exit-latency-us = <100>;
> > -				min-residency-us = <150>;
> > -			};
> > -
> > -			CLUSTER_SLEEP_0: cluster-sleep-0 {
> > -				compatible = "arm,idle-state";
> > -				local-timer-stop;
> > -				arm,psci-suspend-param = <0x1010000>;
> > -				entry-latency-us = <500>;
> > -				exit-latency-us = <1000>;
> > -				min-residency-us = <2500>;
> > -			};
> > -		};
> > -
> > -		CPU0:cpu@0 {
> > -			device_type = "cpu";
> > -			compatible = "arm,armv8";
> > -			reg = <0x0 0x0>;
> > -			enable-method = "psci";
> > -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> > -			next-level-cache = <&L2_0>;
> > -		};
> > -
> > -		CPU1:cpu@1 {
> > -			device_type = "cpu";
> > -			compatible = "arm,armv8";
> > -			reg = <0x0 0x1>;
> > -			enable-method = "psci";
> > -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> > -			next-level-cache = <&L2_0>;
> > -		};
> > -
> > -		CPU2:cpu@2 {
> > -			device_type = "cpu";
> > -			compatible = "arm,armv8";
> > -			reg = <0x0 0x2>;
> > -			enable-method = "psci";
> > -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> > -			next-level-cache = <&L2_0>;
> > -		};
> > -
> > -		CPU3:cpu@3 {
> > -			device_type = "cpu";
> > -			compatible = "arm,armv8";
> > -			reg = <0x0 0x3>;
> > -			enable-method = "psci";
> > -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> > -			next-level-cache = <&L2_0>;
> > -		};
> > -
> > -		CPU4:cpu@100 {
> > -			device_type = "cpu";
> > -			compatible = "arm,armv8";
> > -			reg = <0x0 0x100>;
> > -			enable-method = "psci";
> > -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> > -			next-level-cache = <&L2_0>;
> > -		};
> > -
> > -		CPU5:cpu@101 {
> > -			device_type = "cpu";
> > -			compatible = "arm,armv8";
> > -			reg = <0x0 0x101>;
> > -			enable-method = "psci";
> > -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> > -			next-level-cache = <&L2_0>;
> > -		};
> > -
> > -		CPU6:cpu@102 {
> > -			device_type = "cpu";
> > -			compatible = "arm,armv8";
> > -			reg = <0x0 0x102>;
> > -			enable-method = "psci";
> > -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> > -			next-level-cache = <&L2_0>;
> > -		};
> > -
> > -		CPU7:cpu@103 {
> > -			device_type = "cpu";
> > -			compatible = "arm,armv8";
> > -			reg = <0x0 0x103>;
> > -			enable-method = "psci";
> > -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> > -			next-level-cache = <&L2_0>;
> > -		};
> > -
> > -		L2_0: l2-cache0 {
> > -			compatible = "cache";
> > -		};
> > -	};
> > -
> > -	memory@80000000 {
> > -		device_type = "memory";
> > -		reg = <0x00000000 0x80000000 0 0x7F000000>,
> > -		      <0x00000008 0x80000000 0 0x80000000>;
> > -	};
> > -
> > -	gic: interrupt-controller@2f000000 {
> > -		compatible = "arm,gic-v3";
> > -		#interrupt-cells = <3>;
> > -		#address-cells = <2>;
> > -		#size-cells = <2>;
> > -		ranges;
> > -		interrupt-controller;
> > -		reg = <0x0 0x2f000000 0 0x10000>,	// GICD
> > -		      <0x0 0x2f100000 0 0x200000>,	// GICR
> > -		      <0x0 0x2c000000 0 0x2000>,	// GICC
> > -		      <0x0 0x2c010000 0 0x2000>,	// GICH
> > -		      <0x0 0x2c02f000 0 0x2000>;	// GICV
> > -		interrupts = <1 9 4>;
> > -
> > -		its: its@2f020000 {
> > -			compatible = "arm,gic-v3-its";
> > -			msi-controller;
> > -			reg = <0x0 0x2f020000 0x0 0x20000>; // GITS
> > -		};
> > -	};
> > -
> > -	timer {
> > -		compatible = "arm,armv8-timer";
> > -		interrupts = <1 13 0xff01>,
> > -			     <1 14 0xff01>,
> > -			     <1 11 0xff01>,
> > -			     <1 10 0xff01>;
> > -		clock-frequency = <100000000>;
> > -	};
> > -
> > -	timer@2a810000 {
> > -			compatible = "arm,armv7-timer-mem";
> > -			reg = <0x0 0x2a810000 0x0 0x10000>;
> > -			clock-frequency = <100000000>;
> > -			#address-cells = <2>;
> > -			#size-cells = <2>;
> > -			ranges;
> > -			frame@2a830000 {
> > -				frame-number = <1>;
> > -				interrupts = <0 26 4>;
> > -				reg = <0x0 0x2a830000 0x0 0x10000>;
> > -			};
> > -	};
> > -
> > -	pmu {
> > -		compatible = "arm,armv8-pmuv3";
> > -		interrupts = <0 60 4>,
> > -			     <0 61 4>,
> > -			     <0 62 4>,
> > -			     <0 63 4>;
> > -	};
> > -
> > -	smb@8000000 {
> > -		compatible = "simple-bus";
> > -
> > -		#address-cells = <2>;
> > -		#size-cells = <1>;
> > -		ranges = <0 0 0 0x08000000 0x04000000>,
> > -			 <1 0 0 0x14000000 0x04000000>,
> > -			 <2 0 0 0x18000000 0x04000000>,
> > -			 <3 0 0 0x1c000000 0x04000000>,
> > -			 <4 0 0 0x0c000000 0x04000000>,
> > -			 <5 0 0 0x10000000 0x04000000>;
> > -	};
> > -
> > -	panels {
> > -		panel {
> > -			compatible	= "panel";
> > -			mode		= "XVGA";
> > -			refresh		= <60>;
> > -			xres		= <1024>;
> > -			yres		= <768>;
> > -			pixclock	= <15748>;
> > -			left_margin	= <152>;
> > -			right_margin	= <48>;
> > -			upper_margin	= <23>;
> > -			lower_margin	= <3>;
> > -			hsync_len	= <104>;
> > -			vsync_len	= <4>;
> > -			sync		= <0>;
> > -			vmode		= "FB_VMODE_NONINTERLACED";
> > -			tim2		= "TIM2_BCD", "TIM2_IPC";
> > -			cntl		= "CNTL_LCDTFT", "CNTL_BGR", "CNTL_LCDVCOMP(1)";
> > -			caps		= "CLCD_CAP_5551", "CLCD_CAP_565", "CLCD_CAP_888";
> > -			bpp		= <16>;
> > -		};
> > -	};
> > -
> > -};
> > diff --git a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts b/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts
> > deleted file mode 100644
> > index 984dbca..0000000
> > --- a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts
> > +++ /dev/null
> > @@ -1,9 +0,0 @@
> > -/*
> > - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
> > - *
> > - * SPDX-License-Identifier: BSD-3-Clause
> > - */
> > -
> > -/dts-v1/;
> > -
> > -/include/ "fvp-base-gicv3-psci-common-custom.dtsi"
> > diff --git a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi b/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi
> > deleted file mode 100644
> > index 739af57..0000000
> > --- a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi
> > +++ /dev/null
> > @@ -1,282 +0,0 @@
> > -// SPDX-License-Identifier: GPL-2.0
> > -/*
> > - * ARM Ltd. Fast Models
> > - *
> > - * Versatile Express (VE) system model
> > - * Motherboard component
> > - *
> > - * VEMotherBoard.lisa
> > - *
> > - * This is a duplicate of rtsm_ve-motherboard.dtsi but not
> > - * using interrupt-map as this is not properly supported in
> > - * xen right now
> > - */
> > -/ {
> > -	smb@8000000 {
> > -		motherboard {
> > -			arm,v2m-memory-map = "rs1";
> > -			compatible = "arm,vexpress,v2m-p1", "simple-bus";
> > -			#address-cells = <2>; /* SMB chipselect number and offset */
> > -			#size-cells = <1>;
> > -			ranges;
> > -
> > -			flash@0,00000000 {
> > -				compatible = "arm,vexpress-flash", "cfi-flash";
> > -				reg = <0 0x00000000 0x04000000>,
> > -				      <4 0x00000000 0x04000000>;
> > -				bank-width = <4>;
> > -			};
> > -
> > -			v2m_video_ram: vram@2,00000000 {
> > -				compatible = "arm,vexpress-vram";
> > -				reg = <2 0x00000000 0x00800000>;
> > -			};
> > -
> > -			ethernet@2,02000000 {
> > -				compatible = "smsc,lan91c111";
> > -				reg = <2 0x02000000 0x10000>;
> > -				interrupts = <0 15 4>;
> > -			};
> > -
> > -			v2m_clk24mhz: clk24mhz {
> > -				compatible = "fixed-clock";
> > -				#clock-cells = <0>;
> > -				clock-frequency = <24000000>;
> > -				clock-output-names = "v2m:clk24mhz";
> > -			};
> > -
> > -			v2m_refclk1mhz: refclk1mhz {
> > -				compatible = "fixed-clock";
> > -				#clock-cells = <0>;
> > -				clock-frequency = <1000000>;
> > -				clock-output-names = "v2m:refclk1mhz";
> > -			};
> > -
> > -			v2m_refclk32khz: refclk32khz {
> > -				compatible = "fixed-clock";
> > -				#clock-cells = <0>;
> > -				clock-frequency = <32768>;
> > -				clock-output-names = "v2m:refclk32khz";
> > -			};
> > -
> > -			iofpga@3,00000000 {
> > -				compatible = "simple-bus";
> > -				#address-cells = <1>;
> > -				#size-cells = <1>;
> > -				ranges = <0 3 0 0x200000>;
> > -
> > -				v2m_sysreg: sysreg@10000 {
> > -					compatible = "arm,vexpress-sysreg";
> > -					reg = <0x010000 0x1000>;
> > -					gpio-controller;
> > -					#gpio-cells = <2>;
> > -				};
> > -
> > -				v2m_sysctl: sysctl@20000 {
> > -					compatible = "arm,sp810", "arm,primecell";
> > -					reg = <0x020000 0x1000>;
> > -					clocks = <&v2m_refclk32khz>, <&v2m_refclk1mhz>, <&v2m_clk24mhz>;
> > -					clock-names = "refclk", "timclk", "apb_pclk";
> > -					#clock-cells = <1>;
> > -					clock-output-names = "timerclken0", "timerclken1", "timerclken2", "timerclken3";
> > -					assigned-clocks = <&v2m_sysctl 0>, <&v2m_sysctl 1>, <&v2m_sysctl 3>, <&v2m_sysctl 3>;
> > -					assigned-clock-parents = <&v2m_refclk1mhz>, <&v2m_refclk1mhz>, <&v2m_refclk1mhz>, <&v2m_refclk1mhz>;
> > -				};
> > -
> > -				aaci@40000 {
> > -					compatible = "arm,pl041", "arm,primecell";
> > -					reg = <0x040000 0x1000>;
> > -					interrupts = <0 11 4>;
> > -					clocks = <&v2m_clk24mhz>;
> > -					clock-names = "apb_pclk";
> > -				};
> > -
> > -				mmci@50000 {
> > -					compatible = "arm,pl180", "arm,primecell";
> > -					reg = <0x050000 0x1000>;
> > -					interrupts = <0 9 4 0 10 4>;
> > -					cd-gpios = <&v2m_sysreg 0 0>;
> > -					wp-gpios = <&v2m_sysreg 1 0>;
> > -					max-frequency = <12000000>;
> > -					vmmc-supply = <&v2m_fixed_3v3>;
> > -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> > -					clock-names = "mclk", "apb_pclk";
> > -				};
> > -
> > -				kmi@60000 {
> > -					compatible = "arm,pl050", "arm,primecell";
> > -					reg = <0x060000 0x1000>;
> > -					interrupts = <0 12 4>;
> > -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> > -					clock-names = "KMIREFCLK", "apb_pclk";
> > -				};
> > -
> > -				kmi@70000 {
> > -					compatible = "arm,pl050", "arm,primecell";
> > -					reg = <0x070000 0x1000>;
> > -					interrupts = <0 13 4>;
> > -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> > -					clock-names = "KMIREFCLK", "apb_pclk";
> > -				};
> > -
> > -				v2m_serial0: uart@90000 {
> > -					compatible = "arm,pl011", "arm,primecell";
> > -					reg = <0x090000 0x1000>;
> > -					interrupts = <0 5 4>;
> > -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> > -					clock-names = "uartclk", "apb_pclk";
> > -				};
> > -
> > -				v2m_serial1: uart@a0000 {
> > -					compatible = "arm,pl011", "arm,primecell";
> > -					reg = <0x0a0000 0x1000>;
> > -					interrupts = <0 6 4>;
> > -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> > -					clock-names = "uartclk", "apb_pclk";
> > -				};
> > -
> > -				v2m_serial2: uart@b0000 {
> > -					compatible = "arm,pl011", "arm,primecell";
> > -					reg = <0x0b0000 0x1000>;
> > -					interrupts = <0 7 4>;
> > -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> > -					clock-names = "uartclk", "apb_pclk";
> > -				};
> > -
> > -				v2m_serial3: uart@c0000 {
> > -					compatible = "arm,pl011", "arm,primecell";
> > -					reg = <0x0c0000 0x1000>;
> > -					interrupts = <0 8 4>;
> > -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> > -					clock-names = "uartclk", "apb_pclk";
> > -				};
> > -
> > -				wdt@f0000 {
> > -					compatible = "arm,sp805", "arm,primecell";
> > -					reg = <0x0f0000 0x1000>;
> > -					interrupts = <0 0 4>;
> > -					clocks = <&v2m_refclk32khz>, <&v2m_clk24mhz>;
> > -					clock-names = "wdogclk", "apb_pclk";
> > -				};
> > -
> > -				v2m_timer01: timer@110000 {
> > -					compatible = "arm,sp804", "arm,primecell";
> > -					reg = <0x110000 0x1000>;
> > -					interrupts = <0 2 4>;
> > -					clocks = <&v2m_sysctl 0>, <&v2m_sysctl 1>, <&v2m_clk24mhz>;
> > -					clock-names = "timclken1", "timclken2", "apb_pclk";
> > -				};
> > -
> > -				v2m_timer23: timer@120000 {
> > -					compatible = "arm,sp804", "arm,primecell";
> > -					reg = <0x120000 0x1000>;
> > -					interrupts = <0 3 4>;
> > -					clocks = <&v2m_sysctl 2>, <&v2m_sysctl 3>, <&v2m_clk24mhz>;
> > -					clock-names = "timclken1", "timclken2", "apb_pclk";
> > -				};
> > -
> > -				rtc@170000 {
> > -					compatible = "arm,pl031", "arm,primecell";
> > -					reg = <0x170000 0x1000>;
> > -					interrupts = <0 4 4>;
> > -					clocks = <&v2m_clk24mhz>;
> > -					clock-names = "apb_pclk";
> > -				};
> > -
> > -				clcd@1f0000 {
> > -					compatible = "arm,pl111", "arm,primecell";
> > -					reg = <0x1f0000 0x1000>;
> > -					interrupt-names = "combined";
> > -					interrupts = <0 14 4>;
> > -					clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>;
> > -					clock-names = "clcdclk", "apb_pclk";
> > -					arm,pl11x,framebuffer = <0x18000000 0x00180000>;
> > -					memory-region = <&v2m_video_ram>;
> > -					max-memory-bandwidth = <130000000>; /* 16bpp @ 63.5MHz */
> > -
> > -					port {
> > -						v2m_clcd_pads: endpoint {
> > -							remote-endpoint = <&v2m_clcd_panel>;
> > -							arm,pl11x,tft-r0g0b0-pads = <0 8 16>;
> > -						};
> > -					};
> > -
> > -					panel {
> > -						compatible = "panel-dpi";
> > -
> > -						port {
> > -							v2m_clcd_panel: endpoint {
> > -								remote-endpoint = <&v2m_clcd_pads>;
> > -							};
> > -						};
> > -
> > -						panel-timing {
> > -							clock-frequency = <63500127>;
> > -							hactive = <1024>;
> > -							hback-porch = <152>;
> > -							hfront-porch = <48>;
> > -							hsync-len = <104>;
> > -							vactive = <768>;
> > -							vback-porch = <23>;
> > -							vfront-porch = <3>;
> > -							vsync-len = <4>;
> > -						};
> > -					};
> > -				};
> > -
> > -				virtio-block@130000 {
> > -					compatible = "virtio,mmio";
> > -					reg = <0x130000 0x200>;
> > -					interrupts = <0 42 4>;
> > -				};
> > -			};
> > -
> > -			v2m_fixed_3v3: v2m-3v3 {
> > -				compatible = "regulator-fixed";
> > -				regulator-name = "3V3";
> > -				regulator-min-microvolt = <3300000>;
> > -				regulator-max-microvolt = <3300000>;
> > -				regulator-always-on;
> > -			};
> > -
> > -			mcc {
> > -				compatible = "arm,vexpress,config-bus";
> > -				arm,vexpress,config-bridge = <&v2m_sysreg>;
> > -
> > -				v2m_oscclk1: oscclk1 {
> > -					/* CLCD clock */
> > -					compatible = "arm,vexpress-osc";
> > -					arm,vexpress-sysreg,func = <1 1>;
> > -					freq-range = <23750000 63500000>;
> > -					#clock-cells = <0>;
> > -					clock-output-names = "v2m:oscclk1";
> > -				};
> > -
> > -				reset {
> > -					compatible = "arm,vexpress-reset";
> > -					arm,vexpress-sysreg,func = <5 0>;
> > -				};
> > -
> > -				muxfpga {
> > -					compatible = "arm,vexpress-muxfpga";
> > -					arm,vexpress-sysreg,func = <7 0>;
> > -				};
> > -
> > -				shutdown {
> > -					compatible = "arm,vexpress-shutdown";
> > -					arm,vexpress-sysreg,func = <8 0>;
> > -				};
> > -
> > -				reboot {
> > -					compatible = "arm,vexpress-reboot";
> > -					arm,vexpress-sysreg,func = <9 0>;
> > -				};
> > -
> > -				dvimode {
> > -					compatible = "arm,vexpress-dvimode";
> > -					arm,vexpress-sysreg,func = <11 0>;
> > -				};
> > -			};
> > -		};
> > -	};
> > -};
> > diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
> > index eeb0571..5622ae7 100644
> > --- a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
> > +++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
> > @@ -21,12 +21,6 @@ KMACHINE_foundation-armv8 = "fvp"
> > #
> > COMPATIBLE_MACHINE_fvp-base = "fvp-base"
> > KMACHINE_fvp-base = "fvp"
> > -SRC_URI_append_fvp-base = " file://dts/arm;subdir=add-files"
> > -
> > -do_patch_append_fvp-base() {
> > -    tar -C ${WORKDIR}/add-files/dts -cf - arm | \
> > -        tar -C arch/arm64/boot/dts -xf -
> > -}
> > 
> > #
> > # Juno KMACHINE
> > -- 
> > 2.17.1
> > 
> > 
> 

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#687): https://lists.yoctoproject.org/g/meta-arm/message/687
Mute This Topic: https://lists.yoctoproject.org/mt/74911946/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Bertrand Marquis June 18, 2020, 7:49 a.m.
> On 17 Jun 2020, at 13:14, Jon Mason <jdmason@kudzu.us> wrote:
> 
> On Tue, Jun 16, 2020 at 08:09:13AM +0000, Bertrand Marquis wrote:
>> 
>> 
>>> On 16 Jun 2020, at 09:06, luca fancellu via lists.yoctoproject.org <luca.fancellu=arm.com@lists.yoctoproject.org> wrote:
>>> 
>>> Change fvp-base and foundation-armv8 kernel from linux-yocto_5.4
>>> to linux-linaro-arm_4.19 because some drivers are not available.
>>> Furthermore, for fvp-base the linaro kernel comes with the dts
>>> file removing the needs to support it on our side.
>>> 
>>> Change-Id: I844d92f173406542c2bad8d89793513f8bc28fd1
>>> Signed-off-by: luca fancellu <luca.fancellu@arm.com>
>> Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
> 
> Applied to the master branch.

Can this also be applied in Dunfell ?

Thanks
Bertrand

> 
> Thanks,
> Jon
> 
>> 
>>> ---
>>> meta-arm-bsp/conf/machine/fvp-base.conf       |   2 +-
>>> meta-arm-bsp/conf/machine/fvp-common/fvp.inc  |   4 +-
>>> .../fvp-base-gicv3-psci-common-custom.dtsi    | 264 ----------------
>>> .../dts/arm/fvp-base-gicv3-psci-custom.dts    |   9 -
>>> .../dts/arm/rtsm_ve-motherboard-nomap.dtsi    | 282 ------------------
>>> .../linux/linux-yocto-arm-platforms.inc       |   6 -
>>> 6 files changed, 3 insertions(+), 564 deletions(-)
>>> delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi
>>> delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts
>>> delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi
>>> 
>>> diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf
>>> index 3039644..ae6b28c 100644
>>> --- a/meta-arm-bsp/conf/machine/fvp-base.conf
>>> +++ b/meta-arm-bsp/conf/machine/fvp-base.conf
>>> @@ -6,7 +6,7 @@
>>> 
>>> require conf/machine/fvp-common/fvp.inc
>>> 
>>> -KERNEL_DEVICETREE = "arm/fvp-base-gicv3-psci-custom.dtb"
>>> +KERNEL_DEVICETREE = "arm/fvp-base-aemv8a-aemv8a.dtb"
>>> 
>>> # Use haveged as a source of entropy instead of rng-tools (Needed for ssh).
>>> # rngd (Part of rng-tools) takes ~7 mins to init resulting in a slow boot time.
>>> diff --git a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
>>> index 08f8b15..f8a2584 100644
>>> --- a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
>>> +++ b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
>>> @@ -34,8 +34,8 @@ DISK_IMG_PARTITION3_CONTENT = ""
>>> 
>>> SERIAL_CONSOLES = "115200;ttyAMA0"
>>> 
>>> -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
>>> -PREFERRED_VERSION_linux-yocto ?= "5.4%"
>>> +PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-arm"
>>> +PREFERRED_VERSION_linux-linaro-arm ?= "4.19%"
>>> 
>>> EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
>>> 
>>> diff --git a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi b/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi
>>> deleted file mode 100644
>>> index 1e056be..0000000
>>> --- a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi
>>> +++ /dev/null
>>> @@ -1,264 +0,0 @@
>>> -/*
>>> - * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
>>> - *
>>> - * SPDX-License-Identifier: BSD-3-Clause
>>> - */
>>> -
>>> -/memreserve/ 0x80000000 0x00010000;
>>> -
>>> -/include/ "rtsm_ve-motherboard-nomap.dtsi"
>>> -
>>> -/ {
>>> -	model = "FVP Base";
>>> -	compatible = "arm,vfp-base", "arm,vexpress";
>>> -	interrupt-parent = <&gic>;
>>> -	#address-cells = <2>;
>>> -	#size-cells = <2>;
>>> -
>>> -	aliases {
>>> -		serial0 = &v2m_serial0;
>>> -		serial1 = &v2m_serial1;
>>> -		serial2 = &v2m_serial2;
>>> -		serial3 = &v2m_serial3;
>>> -	};
>>> -
>>> -	psci {
>>> -		compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci";
>>> -		method = "smc";
>>> -		cpu_suspend = <0xc4000001>;
>>> -		cpu_off = <0x84000002>;
>>> -		cpu_on = <0xc4000003>;
>>> -		sys_poweroff = <0x84000008>;
>>> -		sys_reset = <0x84000009>;
>>> -	};
>>> -
>>> -	cpus {
>>> -		#address-cells = <2>;
>>> -		#size-cells = <0>;
>>> -
>>> -		cpu-map {
>>> -			cluster0 {
>>> -				core0 {
>>> -					cpu = <&CPU0>;
>>> -				};
>>> -				core1 {
>>> -					cpu = <&CPU1>;
>>> -				};
>>> -				core2 {
>>> -					cpu = <&CPU2>;
>>> -				};
>>> -				core3 {
>>> -					cpu = <&CPU3>;
>>> -				};
>>> -			};
>>> -
>>> -			cluster1 {
>>> -				core0 {
>>> -					cpu = <&CPU4>;
>>> -				};
>>> -				core1 {
>>> -					cpu = <&CPU5>;
>>> -				};
>>> -				core2 {
>>> -					cpu = <&CPU6>;
>>> -				};
>>> -				core3 {
>>> -					cpu = <&CPU7>;
>>> -				};
>>> -			};
>>> -		};
>>> -
>>> -		idle-states {
>>> -			entry-method = "arm,psci";
>>> -
>>> -			CPU_SLEEP_0: cpu-sleep-0 {
>>> -				compatible = "arm,idle-state";
>>> -				local-timer-stop;
>>> -				arm,psci-suspend-param = <0x0010000>;
>>> -				entry-latency-us = <40>;
>>> -				exit-latency-us = <100>;
>>> -				min-residency-us = <150>;
>>> -			};
>>> -
>>> -			CLUSTER_SLEEP_0: cluster-sleep-0 {
>>> -				compatible = "arm,idle-state";
>>> -				local-timer-stop;
>>> -				arm,psci-suspend-param = <0x1010000>;
>>> -				entry-latency-us = <500>;
>>> -				exit-latency-us = <1000>;
>>> -				min-residency-us = <2500>;
>>> -			};
>>> -		};
>>> -
>>> -		CPU0:cpu@0 {
>>> -			device_type = "cpu";
>>> -			compatible = "arm,armv8";
>>> -			reg = <0x0 0x0>;
>>> -			enable-method = "psci";
>>> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
>>> -			next-level-cache = <&L2_0>;
>>> -		};
>>> -
>>> -		CPU1:cpu@1 {
>>> -			device_type = "cpu";
>>> -			compatible = "arm,armv8";
>>> -			reg = <0x0 0x1>;
>>> -			enable-method = "psci";
>>> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
>>> -			next-level-cache = <&L2_0>;
>>> -		};
>>> -
>>> -		CPU2:cpu@2 {
>>> -			device_type = "cpu";
>>> -			compatible = "arm,armv8";
>>> -			reg = <0x0 0x2>;
>>> -			enable-method = "psci";
>>> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
>>> -			next-level-cache = <&L2_0>;
>>> -		};
>>> -
>>> -		CPU3:cpu@3 {
>>> -			device_type = "cpu";
>>> -			compatible = "arm,armv8";
>>> -			reg = <0x0 0x3>;
>>> -			enable-method = "psci";
>>> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
>>> -			next-level-cache = <&L2_0>;
>>> -		};
>>> -
>>> -		CPU4:cpu@100 {
>>> -			device_type = "cpu";
>>> -			compatible = "arm,armv8";
>>> -			reg = <0x0 0x100>;
>>> -			enable-method = "psci";
>>> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
>>> -			next-level-cache = <&L2_0>;
>>> -		};
>>> -
>>> -		CPU5:cpu@101 {
>>> -			device_type = "cpu";
>>> -			compatible = "arm,armv8";
>>> -			reg = <0x0 0x101>;
>>> -			enable-method = "psci";
>>> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
>>> -			next-level-cache = <&L2_0>;
>>> -		};
>>> -
>>> -		CPU6:cpu@102 {
>>> -			device_type = "cpu";
>>> -			compatible = "arm,armv8";
>>> -			reg = <0x0 0x102>;
>>> -			enable-method = "psci";
>>> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
>>> -			next-level-cache = <&L2_0>;
>>> -		};
>>> -
>>> -		CPU7:cpu@103 {
>>> -			device_type = "cpu";
>>> -			compatible = "arm,armv8";
>>> -			reg = <0x0 0x103>;
>>> -			enable-method = "psci";
>>> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
>>> -			next-level-cache = <&L2_0>;
>>> -		};
>>> -
>>> -		L2_0: l2-cache0 {
>>> -			compatible = "cache";
>>> -		};
>>> -	};
>>> -
>>> -	memory@80000000 {
>>> -		device_type = "memory";
>>> -		reg = <0x00000000 0x80000000 0 0x7F000000>,
>>> -		      <0x00000008 0x80000000 0 0x80000000>;
>>> -	};
>>> -
>>> -	gic: interrupt-controller@2f000000 {
>>> -		compatible = "arm,gic-v3";
>>> -		#interrupt-cells = <3>;
>>> -		#address-cells = <2>;
>>> -		#size-cells = <2>;
>>> -		ranges;
>>> -		interrupt-controller;
>>> -		reg = <0x0 0x2f000000 0 0x10000>,	// GICD
>>> -		      <0x0 0x2f100000 0 0x200000>,	// GICR
>>> -		      <0x0 0x2c000000 0 0x2000>,	// GICC
>>> -		      <0x0 0x2c010000 0 0x2000>,	// GICH
>>> -		      <0x0 0x2c02f000 0 0x2000>;	// GICV
>>> -		interrupts = <1 9 4>;
>>> -
>>> -		its: its@2f020000 {
>>> -			compatible = "arm,gic-v3-its";
>>> -			msi-controller;
>>> -			reg = <0x0 0x2f020000 0x0 0x20000>; // GITS
>>> -		};
>>> -	};
>>> -
>>> -	timer {
>>> -		compatible = "arm,armv8-timer";
>>> -		interrupts = <1 13 0xff01>,
>>> -			     <1 14 0xff01>,
>>> -			     <1 11 0xff01>,
>>> -			     <1 10 0xff01>;
>>> -		clock-frequency = <100000000>;
>>> -	};
>>> -
>>> -	timer@2a810000 {
>>> -			compatible = "arm,armv7-timer-mem";
>>> -			reg = <0x0 0x2a810000 0x0 0x10000>;
>>> -			clock-frequency = <100000000>;
>>> -			#address-cells = <2>;
>>> -			#size-cells = <2>;
>>> -			ranges;
>>> -			frame@2a830000 {
>>> -				frame-number = <1>;
>>> -				interrupts = <0 26 4>;
>>> -				reg = <0x0 0x2a830000 0x0 0x10000>;
>>> -			};
>>> -	};
>>> -
>>> -	pmu {
>>> -		compatible = "arm,armv8-pmuv3";
>>> -		interrupts = <0 60 4>,
>>> -			     <0 61 4>,
>>> -			     <0 62 4>,
>>> -			     <0 63 4>;
>>> -	};
>>> -
>>> -	smb@8000000 {
>>> -		compatible = "simple-bus";
>>> -
>>> -		#address-cells = <2>;
>>> -		#size-cells = <1>;
>>> -		ranges = <0 0 0 0x08000000 0x04000000>,
>>> -			 <1 0 0 0x14000000 0x04000000>,
>>> -			 <2 0 0 0x18000000 0x04000000>,
>>> -			 <3 0 0 0x1c000000 0x04000000>,
>>> -			 <4 0 0 0x0c000000 0x04000000>,
>>> -			 <5 0 0 0x10000000 0x04000000>;
>>> -	};
>>> -
>>> -	panels {
>>> -		panel {
>>> -			compatible	= "panel";
>>> -			mode		= "XVGA";
>>> -			refresh		= <60>;
>>> -			xres		= <1024>;
>>> -			yres		= <768>;
>>> -			pixclock	= <15748>;
>>> -			left_margin	= <152>;
>>> -			right_margin	= <48>;
>>> -			upper_margin	= <23>;
>>> -			lower_margin	= <3>;
>>> -			hsync_len	= <104>;
>>> -			vsync_len	= <4>;
>>> -			sync		= <0>;
>>> -			vmode		= "FB_VMODE_NONINTERLACED";
>>> -			tim2		= "TIM2_BCD", "TIM2_IPC";
>>> -			cntl		= "CNTL_LCDTFT", "CNTL_BGR", "CNTL_LCDVCOMP(1)";
>>> -			caps		= "CLCD_CAP_5551", "CLCD_CAP_565", "CLCD_CAP_888";
>>> -			bpp		= <16>;
>>> -		};
>>> -	};
>>> -
>>> -};
>>> diff --git a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts b/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts
>>> deleted file mode 100644
>>> index 984dbca..0000000
>>> --- a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts
>>> +++ /dev/null
>>> @@ -1,9 +0,0 @@
>>> -/*
>>> - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
>>> - *
>>> - * SPDX-License-Identifier: BSD-3-Clause
>>> - */
>>> -
>>> -/dts-v1/;
>>> -
>>> -/include/ "fvp-base-gicv3-psci-common-custom.dtsi"
>>> diff --git a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi b/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi
>>> deleted file mode 100644
>>> index 739af57..0000000
>>> --- a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi
>>> +++ /dev/null
>>> @@ -1,282 +0,0 @@
>>> -// SPDX-License-Identifier: GPL-2.0
>>> -/*
>>> - * ARM Ltd. Fast Models
>>> - *
>>> - * Versatile Express (VE) system model
>>> - * Motherboard component
>>> - *
>>> - * VEMotherBoard.lisa
>>> - *
>>> - * This is a duplicate of rtsm_ve-motherboard.dtsi but not
>>> - * using interrupt-map as this is not properly supported in
>>> - * xen right now
>>> - */
>>> -/ {
>>> -	smb@8000000 {
>>> -		motherboard {
>>> -			arm,v2m-memory-map = "rs1";
>>> -			compatible = "arm,vexpress,v2m-p1", "simple-bus";
>>> -			#address-cells = <2>; /* SMB chipselect number and offset */
>>> -			#size-cells = <1>;
>>> -			ranges;
>>> -
>>> -			flash@0,00000000 {
>>> -				compatible = "arm,vexpress-flash", "cfi-flash";
>>> -				reg = <0 0x00000000 0x04000000>,
>>> -				      <4 0x00000000 0x04000000>;
>>> -				bank-width = <4>;
>>> -			};
>>> -
>>> -			v2m_video_ram: vram@2,00000000 {
>>> -				compatible = "arm,vexpress-vram";
>>> -				reg = <2 0x00000000 0x00800000>;
>>> -			};
>>> -
>>> -			ethernet@2,02000000 {
>>> -				compatible = "smsc,lan91c111";
>>> -				reg = <2 0x02000000 0x10000>;
>>> -				interrupts = <0 15 4>;
>>> -			};
>>> -
>>> -			v2m_clk24mhz: clk24mhz {
>>> -				compatible = "fixed-clock";
>>> -				#clock-cells = <0>;
>>> -				clock-frequency = <24000000>;
>>> -				clock-output-names = "v2m:clk24mhz";
>>> -			};
>>> -
>>> -			v2m_refclk1mhz: refclk1mhz {
>>> -				compatible = "fixed-clock";
>>> -				#clock-cells = <0>;
>>> -				clock-frequency = <1000000>;
>>> -				clock-output-names = "v2m:refclk1mhz";
>>> -			};
>>> -
>>> -			v2m_refclk32khz: refclk32khz {
>>> -				compatible = "fixed-clock";
>>> -				#clock-cells = <0>;
>>> -				clock-frequency = <32768>;
>>> -				clock-output-names = "v2m:refclk32khz";
>>> -			};
>>> -
>>> -			iofpga@3,00000000 {
>>> -				compatible = "simple-bus";
>>> -				#address-cells = <1>;
>>> -				#size-cells = <1>;
>>> -				ranges = <0 3 0 0x200000>;
>>> -
>>> -				v2m_sysreg: sysreg@10000 {
>>> -					compatible = "arm,vexpress-sysreg";
>>> -					reg = <0x010000 0x1000>;
>>> -					gpio-controller;
>>> -					#gpio-cells = <2>;
>>> -				};
>>> -
>>> -				v2m_sysctl: sysctl@20000 {
>>> -					compatible = "arm,sp810", "arm,primecell";
>>> -					reg = <0x020000 0x1000>;
>>> -					clocks = <&v2m_refclk32khz>, <&v2m_refclk1mhz>, <&v2m_clk24mhz>;
>>> -					clock-names = "refclk", "timclk", "apb_pclk";
>>> -					#clock-cells = <1>;
>>> -					clock-output-names = "timerclken0", "timerclken1", "timerclken2", "timerclken3";
>>> -					assigned-clocks = <&v2m_sysctl 0>, <&v2m_sysctl 1>, <&v2m_sysctl 3>, <&v2m_sysctl 3>;
>>> -					assigned-clock-parents = <&v2m_refclk1mhz>, <&v2m_refclk1mhz>, <&v2m_refclk1mhz>, <&v2m_refclk1mhz>;
>>> -				};
>>> -
>>> -				aaci@40000 {
>>> -					compatible = "arm,pl041", "arm,primecell";
>>> -					reg = <0x040000 0x1000>;
>>> -					interrupts = <0 11 4>;
>>> -					clocks = <&v2m_clk24mhz>;
>>> -					clock-names = "apb_pclk";
>>> -				};
>>> -
>>> -				mmci@50000 {
>>> -					compatible = "arm,pl180", "arm,primecell";
>>> -					reg = <0x050000 0x1000>;
>>> -					interrupts = <0 9 4 0 10 4>;
>>> -					cd-gpios = <&v2m_sysreg 0 0>;
>>> -					wp-gpios = <&v2m_sysreg 1 0>;
>>> -					max-frequency = <12000000>;
>>> -					vmmc-supply = <&v2m_fixed_3v3>;
>>> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
>>> -					clock-names = "mclk", "apb_pclk";
>>> -				};
>>> -
>>> -				kmi@60000 {
>>> -					compatible = "arm,pl050", "arm,primecell";
>>> -					reg = <0x060000 0x1000>;
>>> -					interrupts = <0 12 4>;
>>> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
>>> -					clock-names = "KMIREFCLK", "apb_pclk";
>>> -				};
>>> -
>>> -				kmi@70000 {
>>> -					compatible = "arm,pl050", "arm,primecell";
>>> -					reg = <0x070000 0x1000>;
>>> -					interrupts = <0 13 4>;
>>> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
>>> -					clock-names = "KMIREFCLK", "apb_pclk";
>>> -				};
>>> -
>>> -				v2m_serial0: uart@90000 {
>>> -					compatible = "arm,pl011", "arm,primecell";
>>> -					reg = <0x090000 0x1000>;
>>> -					interrupts = <0 5 4>;
>>> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
>>> -					clock-names = "uartclk", "apb_pclk";
>>> -				};
>>> -
>>> -				v2m_serial1: uart@a0000 {
>>> -					compatible = "arm,pl011", "arm,primecell";
>>> -					reg = <0x0a0000 0x1000>;
>>> -					interrupts = <0 6 4>;
>>> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
>>> -					clock-names = "uartclk", "apb_pclk";
>>> -				};
>>> -
>>> -				v2m_serial2: uart@b0000 {
>>> -					compatible = "arm,pl011", "arm,primecell";
>>> -					reg = <0x0b0000 0x1000>;
>>> -					interrupts = <0 7 4>;
>>> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
>>> -					clock-names = "uartclk", "apb_pclk";
>>> -				};
>>> -
>>> -				v2m_serial3: uart@c0000 {
>>> -					compatible = "arm,pl011", "arm,primecell";
>>> -					reg = <0x0c0000 0x1000>;
>>> -					interrupts = <0 8 4>;
>>> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
>>> -					clock-names = "uartclk", "apb_pclk";
>>> -				};
>>> -
>>> -				wdt@f0000 {
>>> -					compatible = "arm,sp805", "arm,primecell";
>>> -					reg = <0x0f0000 0x1000>;
>>> -					interrupts = <0 0 4>;
>>> -					clocks = <&v2m_refclk32khz>, <&v2m_clk24mhz>;
>>> -					clock-names = "wdogclk", "apb_pclk";
>>> -				};
>>> -
>>> -				v2m_timer01: timer@110000 {
>>> -					compatible = "arm,sp804", "arm,primecell";
>>> -					reg = <0x110000 0x1000>;
>>> -					interrupts = <0 2 4>;
>>> -					clocks = <&v2m_sysctl 0>, <&v2m_sysctl 1>, <&v2m_clk24mhz>;
>>> -					clock-names = "timclken1", "timclken2", "apb_pclk";
>>> -				};
>>> -
>>> -				v2m_timer23: timer@120000 {
>>> -					compatible = "arm,sp804", "arm,primecell";
>>> -					reg = <0x120000 0x1000>;
>>> -					interrupts = <0 3 4>;
>>> -					clocks = <&v2m_sysctl 2>, <&v2m_sysctl 3>, <&v2m_clk24mhz>;
>>> -					clock-names = "timclken1", "timclken2", "apb_pclk";
>>> -				};
>>> -
>>> -				rtc@170000 {
>>> -					compatible = "arm,pl031", "arm,primecell";
>>> -					reg = <0x170000 0x1000>;
>>> -					interrupts = <0 4 4>;
>>> -					clocks = <&v2m_clk24mhz>;
>>> -					clock-names = "apb_pclk";
>>> -				};
>>> -
>>> -				clcd@1f0000 {
>>> -					compatible = "arm,pl111", "arm,primecell";
>>> -					reg = <0x1f0000 0x1000>;
>>> -					interrupt-names = "combined";
>>> -					interrupts = <0 14 4>;
>>> -					clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>;
>>> -					clock-names = "clcdclk", "apb_pclk";
>>> -					arm,pl11x,framebuffer = <0x18000000 0x00180000>;
>>> -					memory-region = <&v2m_video_ram>;
>>> -					max-memory-bandwidth = <130000000>; /* 16bpp @ 63.5MHz */
>>> -
>>> -					port {
>>> -						v2m_clcd_pads: endpoint {
>>> -							remote-endpoint = <&v2m_clcd_panel>;
>>> -							arm,pl11x,tft-r0g0b0-pads = <0 8 16>;
>>> -						};
>>> -					};
>>> -
>>> -					panel {
>>> -						compatible = "panel-dpi";
>>> -
>>> -						port {
>>> -							v2m_clcd_panel: endpoint {
>>> -								remote-endpoint = <&v2m_clcd_pads>;
>>> -							};
>>> -						};
>>> -
>>> -						panel-timing {
>>> -							clock-frequency = <63500127>;
>>> -							hactive = <1024>;
>>> -							hback-porch = <152>;
>>> -							hfront-porch = <48>;
>>> -							hsync-len = <104>;
>>> -							vactive = <768>;
>>> -							vback-porch = <23>;
>>> -							vfront-porch = <3>;
>>> -							vsync-len = <4>;
>>> -						};
>>> -					};
>>> -				};
>>> -
>>> -				virtio-block@130000 {
>>> -					compatible = "virtio,mmio";
>>> -					reg = <0x130000 0x200>;
>>> -					interrupts = <0 42 4>;
>>> -				};
>>> -			};
>>> -
>>> -			v2m_fixed_3v3: v2m-3v3 {
>>> -				compatible = "regulator-fixed";
>>> -				regulator-name = "3V3";
>>> -				regulator-min-microvolt = <3300000>;
>>> -				regulator-max-microvolt = <3300000>;
>>> -				regulator-always-on;
>>> -			};
>>> -
>>> -			mcc {
>>> -				compatible = "arm,vexpress,config-bus";
>>> -				arm,vexpress,config-bridge = <&v2m_sysreg>;
>>> -
>>> -				v2m_oscclk1: oscclk1 {
>>> -					/* CLCD clock */
>>> -					compatible = "arm,vexpress-osc";
>>> -					arm,vexpress-sysreg,func = <1 1>;
>>> -					freq-range = <23750000 63500000>;
>>> -					#clock-cells = <0>;
>>> -					clock-output-names = "v2m:oscclk1";
>>> -				};
>>> -
>>> -				reset {
>>> -					compatible = "arm,vexpress-reset";
>>> -					arm,vexpress-sysreg,func = <5 0>;
>>> -				};
>>> -
>>> -				muxfpga {
>>> -					compatible = "arm,vexpress-muxfpga";
>>> -					arm,vexpress-sysreg,func = <7 0>;
>>> -				};
>>> -
>>> -				shutdown {
>>> -					compatible = "arm,vexpress-shutdown";
>>> -					arm,vexpress-sysreg,func = <8 0>;
>>> -				};
>>> -
>>> -				reboot {
>>> -					compatible = "arm,vexpress-reboot";
>>> -					arm,vexpress-sysreg,func = <9 0>;
>>> -				};
>>> -
>>> -				dvimode {
>>> -					compatible = "arm,vexpress-dvimode";
>>> -					arm,vexpress-sysreg,func = <11 0>;
>>> -				};
>>> -			};
>>> -		};
>>> -	};
>>> -};
>>> diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
>>> index eeb0571..5622ae7 100644
>>> --- a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
>>> +++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
>>> @@ -21,12 +21,6 @@ KMACHINE_foundation-armv8 = "fvp"
>>> #
>>> COMPATIBLE_MACHINE_fvp-base = "fvp-base"
>>> KMACHINE_fvp-base = "fvp"
>>> -SRC_URI_append_fvp-base = " file://dts/arm;subdir=add-files"
>>> -
>>> -do_patch_append_fvp-base() {
>>> -    tar -C ${WORKDIR}/add-files/dts -cf - arm | \
>>> -        tar -C arch/arm64/boot/dts -xf -
>>> -}
>>> 
>>> #
>>> # Juno KMACHINE
>>> -- 
>>> 2.17.1
>>> 
>>> 
>> 
> 
>>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#702): https://lists.yoctoproject.org/g/meta-arm/message/702
Mute This Topic: https://lists.yoctoproject.org/mt/74911946/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Jon Mason June 18, 2020, 10:32 p.m.
On Thu, Jun 18, 2020 at 07:49:19AM +0000, Bertrand Marquis wrote:
> 
> 
> > On 17 Jun 2020, at 13:14, Jon Mason <jdmason@kudzu.us> wrote:
> > 
> > On Tue, Jun 16, 2020 at 08:09:13AM +0000, Bertrand Marquis wrote:
> >> 
> >> 
> >>> On 16 Jun 2020, at 09:06, luca fancellu via lists.yoctoproject.org <luca.fancellu=arm.com@lists.yoctoproject.org> wrote:
> >>> 
> >>> Change fvp-base and foundation-armv8 kernel from linux-yocto_5.4
> >>> to linux-linaro-arm_4.19 because some drivers are not available.
> >>> Furthermore, for fvp-base the linaro kernel comes with the dts
> >>> file removing the needs to support it on our side.
> >>> 
> >>> Change-Id: I844d92f173406542c2bad8d89793513f8bc28fd1
> >>> Signed-off-by: luca fancellu <luca.fancellu@arm.com>
> >> Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
> > 
> > Applied to the master branch.
> 
> Can this also be applied in Dunfell ?

Done

> 
> Thanks
> Bertrand
> 
> > 
> > Thanks,
> > Jon
> > 
> >> 
> >>> ---
> >>> meta-arm-bsp/conf/machine/fvp-base.conf       |   2 +-
> >>> meta-arm-bsp/conf/machine/fvp-common/fvp.inc  |   4 +-
> >>> .../fvp-base-gicv3-psci-common-custom.dtsi    | 264 ----------------
> >>> .../dts/arm/fvp-base-gicv3-psci-custom.dts    |   9 -
> >>> .../dts/arm/rtsm_ve-motherboard-nomap.dtsi    | 282 ------------------
> >>> .../linux/linux-yocto-arm-platforms.inc       |   6 -
> >>> 6 files changed, 3 insertions(+), 564 deletions(-)
> >>> delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi
> >>> delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts
> >>> delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi
> >>> 
> >>> diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf
> >>> index 3039644..ae6b28c 100644
> >>> --- a/meta-arm-bsp/conf/machine/fvp-base.conf
> >>> +++ b/meta-arm-bsp/conf/machine/fvp-base.conf
> >>> @@ -6,7 +6,7 @@
> >>> 
> >>> require conf/machine/fvp-common/fvp.inc
> >>> 
> >>> -KERNEL_DEVICETREE = "arm/fvp-base-gicv3-psci-custom.dtb"
> >>> +KERNEL_DEVICETREE = "arm/fvp-base-aemv8a-aemv8a.dtb"
> >>> 
> >>> # Use haveged as a source of entropy instead of rng-tools (Needed for ssh).
> >>> # rngd (Part of rng-tools) takes ~7 mins to init resulting in a slow boot time.
> >>> diff --git a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
> >>> index 08f8b15..f8a2584 100644
> >>> --- a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
> >>> +++ b/meta-arm-bsp/conf/machine/fvp-common/fvp.inc
> >>> @@ -34,8 +34,8 @@ DISK_IMG_PARTITION3_CONTENT = ""
> >>> 
> >>> SERIAL_CONSOLES = "115200;ttyAMA0"
> >>> 
> >>> -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
> >>> -PREFERRED_VERSION_linux-yocto ?= "5.4%"
> >>> +PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-arm"
> >>> +PREFERRED_VERSION_linux-linaro-arm ?= "4.19%"
> >>> 
> >>> EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
> >>> 
> >>> diff --git a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi b/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi
> >>> deleted file mode 100644
> >>> index 1e056be..0000000
> >>> --- a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-common-custom.dtsi
> >>> +++ /dev/null
> >>> @@ -1,264 +0,0 @@
> >>> -/*
> >>> - * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
> >>> - *
> >>> - * SPDX-License-Identifier: BSD-3-Clause
> >>> - */
> >>> -
> >>> -/memreserve/ 0x80000000 0x00010000;
> >>> -
> >>> -/include/ "rtsm_ve-motherboard-nomap.dtsi"
> >>> -
> >>> -/ {
> >>> -	model = "FVP Base";
> >>> -	compatible = "arm,vfp-base", "arm,vexpress";
> >>> -	interrupt-parent = <&gic>;
> >>> -	#address-cells = <2>;
> >>> -	#size-cells = <2>;
> >>> -
> >>> -	aliases {
> >>> -		serial0 = &v2m_serial0;
> >>> -		serial1 = &v2m_serial1;
> >>> -		serial2 = &v2m_serial2;
> >>> -		serial3 = &v2m_serial3;
> >>> -	};
> >>> -
> >>> -	psci {
> >>> -		compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci";
> >>> -		method = "smc";
> >>> -		cpu_suspend = <0xc4000001>;
> >>> -		cpu_off = <0x84000002>;
> >>> -		cpu_on = <0xc4000003>;
> >>> -		sys_poweroff = <0x84000008>;
> >>> -		sys_reset = <0x84000009>;
> >>> -	};
> >>> -
> >>> -	cpus {
> >>> -		#address-cells = <2>;
> >>> -		#size-cells = <0>;
> >>> -
> >>> -		cpu-map {
> >>> -			cluster0 {
> >>> -				core0 {
> >>> -					cpu = <&CPU0>;
> >>> -				};
> >>> -				core1 {
> >>> -					cpu = <&CPU1>;
> >>> -				};
> >>> -				core2 {
> >>> -					cpu = <&CPU2>;
> >>> -				};
> >>> -				core3 {
> >>> -					cpu = <&CPU3>;
> >>> -				};
> >>> -			};
> >>> -
> >>> -			cluster1 {
> >>> -				core0 {
> >>> -					cpu = <&CPU4>;
> >>> -				};
> >>> -				core1 {
> >>> -					cpu = <&CPU5>;
> >>> -				};
> >>> -				core2 {
> >>> -					cpu = <&CPU6>;
> >>> -				};
> >>> -				core3 {
> >>> -					cpu = <&CPU7>;
> >>> -				};
> >>> -			};
> >>> -		};
> >>> -
> >>> -		idle-states {
> >>> -			entry-method = "arm,psci";
> >>> -
> >>> -			CPU_SLEEP_0: cpu-sleep-0 {
> >>> -				compatible = "arm,idle-state";
> >>> -				local-timer-stop;
> >>> -				arm,psci-suspend-param = <0x0010000>;
> >>> -				entry-latency-us = <40>;
> >>> -				exit-latency-us = <100>;
> >>> -				min-residency-us = <150>;
> >>> -			};
> >>> -
> >>> -			CLUSTER_SLEEP_0: cluster-sleep-0 {
> >>> -				compatible = "arm,idle-state";
> >>> -				local-timer-stop;
> >>> -				arm,psci-suspend-param = <0x1010000>;
> >>> -				entry-latency-us = <500>;
> >>> -				exit-latency-us = <1000>;
> >>> -				min-residency-us = <2500>;
> >>> -			};
> >>> -		};
> >>> -
> >>> -		CPU0:cpu@0 {
> >>> -			device_type = "cpu";
> >>> -			compatible = "arm,armv8";
> >>> -			reg = <0x0 0x0>;
> >>> -			enable-method = "psci";
> >>> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> >>> -			next-level-cache = <&L2_0>;
> >>> -		};
> >>> -
> >>> -		CPU1:cpu@1 {
> >>> -			device_type = "cpu";
> >>> -			compatible = "arm,armv8";
> >>> -			reg = <0x0 0x1>;
> >>> -			enable-method = "psci";
> >>> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> >>> -			next-level-cache = <&L2_0>;
> >>> -		};
> >>> -
> >>> -		CPU2:cpu@2 {
> >>> -			device_type = "cpu";
> >>> -			compatible = "arm,armv8";
> >>> -			reg = <0x0 0x2>;
> >>> -			enable-method = "psci";
> >>> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> >>> -			next-level-cache = <&L2_0>;
> >>> -		};
> >>> -
> >>> -		CPU3:cpu@3 {
> >>> -			device_type = "cpu";
> >>> -			compatible = "arm,armv8";
> >>> -			reg = <0x0 0x3>;
> >>> -			enable-method = "psci";
> >>> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> >>> -			next-level-cache = <&L2_0>;
> >>> -		};
> >>> -
> >>> -		CPU4:cpu@100 {
> >>> -			device_type = "cpu";
> >>> -			compatible = "arm,armv8";
> >>> -			reg = <0x0 0x100>;
> >>> -			enable-method = "psci";
> >>> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> >>> -			next-level-cache = <&L2_0>;
> >>> -		};
> >>> -
> >>> -		CPU5:cpu@101 {
> >>> -			device_type = "cpu";
> >>> -			compatible = "arm,armv8";
> >>> -			reg = <0x0 0x101>;
> >>> -			enable-method = "psci";
> >>> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> >>> -			next-level-cache = <&L2_0>;
> >>> -		};
> >>> -
> >>> -		CPU6:cpu@102 {
> >>> -			device_type = "cpu";
> >>> -			compatible = "arm,armv8";
> >>> -			reg = <0x0 0x102>;
> >>> -			enable-method = "psci";
> >>> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> >>> -			next-level-cache = <&L2_0>;
> >>> -		};
> >>> -
> >>> -		CPU7:cpu@103 {
> >>> -			device_type = "cpu";
> >>> -			compatible = "arm,armv8";
> >>> -			reg = <0x0 0x103>;
> >>> -			enable-method = "psci";
> >>> -			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
> >>> -			next-level-cache = <&L2_0>;
> >>> -		};
> >>> -
> >>> -		L2_0: l2-cache0 {
> >>> -			compatible = "cache";
> >>> -		};
> >>> -	};
> >>> -
> >>> -	memory@80000000 {
> >>> -		device_type = "memory";
> >>> -		reg = <0x00000000 0x80000000 0 0x7F000000>,
> >>> -		      <0x00000008 0x80000000 0 0x80000000>;
> >>> -	};
> >>> -
> >>> -	gic: interrupt-controller@2f000000 {
> >>> -		compatible = "arm,gic-v3";
> >>> -		#interrupt-cells = <3>;
> >>> -		#address-cells = <2>;
> >>> -		#size-cells = <2>;
> >>> -		ranges;
> >>> -		interrupt-controller;
> >>> -		reg = <0x0 0x2f000000 0 0x10000>,	// GICD
> >>> -		      <0x0 0x2f100000 0 0x200000>,	// GICR
> >>> -		      <0x0 0x2c000000 0 0x2000>,	// GICC
> >>> -		      <0x0 0x2c010000 0 0x2000>,	// GICH
> >>> -		      <0x0 0x2c02f000 0 0x2000>;	// GICV
> >>> -		interrupts = <1 9 4>;
> >>> -
> >>> -		its: its@2f020000 {
> >>> -			compatible = "arm,gic-v3-its";
> >>> -			msi-controller;
> >>> -			reg = <0x0 0x2f020000 0x0 0x20000>; // GITS
> >>> -		};
> >>> -	};
> >>> -
> >>> -	timer {
> >>> -		compatible = "arm,armv8-timer";
> >>> -		interrupts = <1 13 0xff01>,
> >>> -			     <1 14 0xff01>,
> >>> -			     <1 11 0xff01>,
> >>> -			     <1 10 0xff01>;
> >>> -		clock-frequency = <100000000>;
> >>> -	};
> >>> -
> >>> -	timer@2a810000 {
> >>> -			compatible = "arm,armv7-timer-mem";
> >>> -			reg = <0x0 0x2a810000 0x0 0x10000>;
> >>> -			clock-frequency = <100000000>;
> >>> -			#address-cells = <2>;
> >>> -			#size-cells = <2>;
> >>> -			ranges;
> >>> -			frame@2a830000 {
> >>> -				frame-number = <1>;
> >>> -				interrupts = <0 26 4>;
> >>> -				reg = <0x0 0x2a830000 0x0 0x10000>;
> >>> -			};
> >>> -	};
> >>> -
> >>> -	pmu {
> >>> -		compatible = "arm,armv8-pmuv3";
> >>> -		interrupts = <0 60 4>,
> >>> -			     <0 61 4>,
> >>> -			     <0 62 4>,
> >>> -			     <0 63 4>;
> >>> -	};
> >>> -
> >>> -	smb@8000000 {
> >>> -		compatible = "simple-bus";
> >>> -
> >>> -		#address-cells = <2>;
> >>> -		#size-cells = <1>;
> >>> -		ranges = <0 0 0 0x08000000 0x04000000>,
> >>> -			 <1 0 0 0x14000000 0x04000000>,
> >>> -			 <2 0 0 0x18000000 0x04000000>,
> >>> -			 <3 0 0 0x1c000000 0x04000000>,
> >>> -			 <4 0 0 0x0c000000 0x04000000>,
> >>> -			 <5 0 0 0x10000000 0x04000000>;
> >>> -	};
> >>> -
> >>> -	panels {
> >>> -		panel {
> >>> -			compatible	= "panel";
> >>> -			mode		= "XVGA";
> >>> -			refresh		= <60>;
> >>> -			xres		= <1024>;
> >>> -			yres		= <768>;
> >>> -			pixclock	= <15748>;
> >>> -			left_margin	= <152>;
> >>> -			right_margin	= <48>;
> >>> -			upper_margin	= <23>;
> >>> -			lower_margin	= <3>;
> >>> -			hsync_len	= <104>;
> >>> -			vsync_len	= <4>;
> >>> -			sync		= <0>;
> >>> -			vmode		= "FB_VMODE_NONINTERLACED";
> >>> -			tim2		= "TIM2_BCD", "TIM2_IPC";
> >>> -			cntl		= "CNTL_LCDTFT", "CNTL_BGR", "CNTL_LCDVCOMP(1)";
> >>> -			caps		= "CLCD_CAP_5551", "CLCD_CAP_565", "CLCD_CAP_888";
> >>> -			bpp		= <16>;
> >>> -		};
> >>> -	};
> >>> -
> >>> -};
> >>> diff --git a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts b/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts
> >>> deleted file mode 100644
> >>> index 984dbca..0000000
> >>> --- a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/fvp-base-gicv3-psci-custom.dts
> >>> +++ /dev/null
> >>> @@ -1,9 +0,0 @@
> >>> -/*
> >>> - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
> >>> - *
> >>> - * SPDX-License-Identifier: BSD-3-Clause
> >>> - */
> >>> -
> >>> -/dts-v1/;
> >>> -
> >>> -/include/ "fvp-base-gicv3-psci-common-custom.dtsi"
> >>> diff --git a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi b/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi
> >>> deleted file mode 100644
> >>> index 739af57..0000000
> >>> --- a/meta-arm-bsp/recipes-kernel/linux/files/dts/arm/rtsm_ve-motherboard-nomap.dtsi
> >>> +++ /dev/null
> >>> @@ -1,282 +0,0 @@
> >>> -// SPDX-License-Identifier: GPL-2.0
> >>> -/*
> >>> - * ARM Ltd. Fast Models
> >>> - *
> >>> - * Versatile Express (VE) system model
> >>> - * Motherboard component
> >>> - *
> >>> - * VEMotherBoard.lisa
> >>> - *
> >>> - * This is a duplicate of rtsm_ve-motherboard.dtsi but not
> >>> - * using interrupt-map as this is not properly supported in
> >>> - * xen right now
> >>> - */
> >>> -/ {
> >>> -	smb@8000000 {
> >>> -		motherboard {
> >>> -			arm,v2m-memory-map = "rs1";
> >>> -			compatible = "arm,vexpress,v2m-p1", "simple-bus";
> >>> -			#address-cells = <2>; /* SMB chipselect number and offset */
> >>> -			#size-cells = <1>;
> >>> -			ranges;
> >>> -
> >>> -			flash@0,00000000 {
> >>> -				compatible = "arm,vexpress-flash", "cfi-flash";
> >>> -				reg = <0 0x00000000 0x04000000>,
> >>> -				      <4 0x00000000 0x04000000>;
> >>> -				bank-width = <4>;
> >>> -			};
> >>> -
> >>> -			v2m_video_ram: vram@2,00000000 {
> >>> -				compatible = "arm,vexpress-vram";
> >>> -				reg = <2 0x00000000 0x00800000>;
> >>> -			};
> >>> -
> >>> -			ethernet@2,02000000 {
> >>> -				compatible = "smsc,lan91c111";
> >>> -				reg = <2 0x02000000 0x10000>;
> >>> -				interrupts = <0 15 4>;
> >>> -			};
> >>> -
> >>> -			v2m_clk24mhz: clk24mhz {
> >>> -				compatible = "fixed-clock";
> >>> -				#clock-cells = <0>;
> >>> -				clock-frequency = <24000000>;
> >>> -				clock-output-names = "v2m:clk24mhz";
> >>> -			};
> >>> -
> >>> -			v2m_refclk1mhz: refclk1mhz {
> >>> -				compatible = "fixed-clock";
> >>> -				#clock-cells = <0>;
> >>> -				clock-frequency = <1000000>;
> >>> -				clock-output-names = "v2m:refclk1mhz";
> >>> -			};
> >>> -
> >>> -			v2m_refclk32khz: refclk32khz {
> >>> -				compatible = "fixed-clock";
> >>> -				#clock-cells = <0>;
> >>> -				clock-frequency = <32768>;
> >>> -				clock-output-names = "v2m:refclk32khz";
> >>> -			};
> >>> -
> >>> -			iofpga@3,00000000 {
> >>> -				compatible = "simple-bus";
> >>> -				#address-cells = <1>;
> >>> -				#size-cells = <1>;
> >>> -				ranges = <0 3 0 0x200000>;
> >>> -
> >>> -				v2m_sysreg: sysreg@10000 {
> >>> -					compatible = "arm,vexpress-sysreg";
> >>> -					reg = <0x010000 0x1000>;
> >>> -					gpio-controller;
> >>> -					#gpio-cells = <2>;
> >>> -				};
> >>> -
> >>> -				v2m_sysctl: sysctl@20000 {
> >>> -					compatible = "arm,sp810", "arm,primecell";
> >>> -					reg = <0x020000 0x1000>;
> >>> -					clocks = <&v2m_refclk32khz>, <&v2m_refclk1mhz>, <&v2m_clk24mhz>;
> >>> -					clock-names = "refclk", "timclk", "apb_pclk";
> >>> -					#clock-cells = <1>;
> >>> -					clock-output-names = "timerclken0", "timerclken1", "timerclken2", "timerclken3";
> >>> -					assigned-clocks = <&v2m_sysctl 0>, <&v2m_sysctl 1>, <&v2m_sysctl 3>, <&v2m_sysctl 3>;
> >>> -					assigned-clock-parents = <&v2m_refclk1mhz>, <&v2m_refclk1mhz>, <&v2m_refclk1mhz>, <&v2m_refclk1mhz>;
> >>> -				};
> >>> -
> >>> -				aaci@40000 {
> >>> -					compatible = "arm,pl041", "arm,primecell";
> >>> -					reg = <0x040000 0x1000>;
> >>> -					interrupts = <0 11 4>;
> >>> -					clocks = <&v2m_clk24mhz>;
> >>> -					clock-names = "apb_pclk";
> >>> -				};
> >>> -
> >>> -				mmci@50000 {
> >>> -					compatible = "arm,pl180", "arm,primecell";
> >>> -					reg = <0x050000 0x1000>;
> >>> -					interrupts = <0 9 4 0 10 4>;
> >>> -					cd-gpios = <&v2m_sysreg 0 0>;
> >>> -					wp-gpios = <&v2m_sysreg 1 0>;
> >>> -					max-frequency = <12000000>;
> >>> -					vmmc-supply = <&v2m_fixed_3v3>;
> >>> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> >>> -					clock-names = "mclk", "apb_pclk";
> >>> -				};
> >>> -
> >>> -				kmi@60000 {
> >>> -					compatible = "arm,pl050", "arm,primecell";
> >>> -					reg = <0x060000 0x1000>;
> >>> -					interrupts = <0 12 4>;
> >>> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> >>> -					clock-names = "KMIREFCLK", "apb_pclk";
> >>> -				};
> >>> -
> >>> -				kmi@70000 {
> >>> -					compatible = "arm,pl050", "arm,primecell";
> >>> -					reg = <0x070000 0x1000>;
> >>> -					interrupts = <0 13 4>;
> >>> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> >>> -					clock-names = "KMIREFCLK", "apb_pclk";
> >>> -				};
> >>> -
> >>> -				v2m_serial0: uart@90000 {
> >>> -					compatible = "arm,pl011", "arm,primecell";
> >>> -					reg = <0x090000 0x1000>;
> >>> -					interrupts = <0 5 4>;
> >>> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> >>> -					clock-names = "uartclk", "apb_pclk";
> >>> -				};
> >>> -
> >>> -				v2m_serial1: uart@a0000 {
> >>> -					compatible = "arm,pl011", "arm,primecell";
> >>> -					reg = <0x0a0000 0x1000>;
> >>> -					interrupts = <0 6 4>;
> >>> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> >>> -					clock-names = "uartclk", "apb_pclk";
> >>> -				};
> >>> -
> >>> -				v2m_serial2: uart@b0000 {
> >>> -					compatible = "arm,pl011", "arm,primecell";
> >>> -					reg = <0x0b0000 0x1000>;
> >>> -					interrupts = <0 7 4>;
> >>> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> >>> -					clock-names = "uartclk", "apb_pclk";
> >>> -				};
> >>> -
> >>> -				v2m_serial3: uart@c0000 {
> >>> -					compatible = "arm,pl011", "arm,primecell";
> >>> -					reg = <0x0c0000 0x1000>;
> >>> -					interrupts = <0 8 4>;
> >>> -					clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> >>> -					clock-names = "uartclk", "apb_pclk";
> >>> -				};
> >>> -
> >>> -				wdt@f0000 {
> >>> -					compatible = "arm,sp805", "arm,primecell";
> >>> -					reg = <0x0f0000 0x1000>;
> >>> -					interrupts = <0 0 4>;
> >>> -					clocks = <&v2m_refclk32khz>, <&v2m_clk24mhz>;
> >>> -					clock-names = "wdogclk", "apb_pclk";
> >>> -				};
> >>> -
> >>> -				v2m_timer01: timer@110000 {
> >>> -					compatible = "arm,sp804", "arm,primecell";
> >>> -					reg = <0x110000 0x1000>;
> >>> -					interrupts = <0 2 4>;
> >>> -					clocks = <&v2m_sysctl 0>, <&v2m_sysctl 1>, <&v2m_clk24mhz>;
> >>> -					clock-names = "timclken1", "timclken2", "apb_pclk";
> >>> -				};
> >>> -
> >>> -				v2m_timer23: timer@120000 {
> >>> -					compatible = "arm,sp804", "arm,primecell";
> >>> -					reg = <0x120000 0x1000>;
> >>> -					interrupts = <0 3 4>;
> >>> -					clocks = <&v2m_sysctl 2>, <&v2m_sysctl 3>, <&v2m_clk24mhz>;
> >>> -					clock-names = "timclken1", "timclken2", "apb_pclk";
> >>> -				};
> >>> -
> >>> -				rtc@170000 {
> >>> -					compatible = "arm,pl031", "arm,primecell";
> >>> -					reg = <0x170000 0x1000>;
> >>> -					interrupts = <0 4 4>;
> >>> -					clocks = <&v2m_clk24mhz>;
> >>> -					clock-names = "apb_pclk";
> >>> -				};
> >>> -
> >>> -				clcd@1f0000 {
> >>> -					compatible = "arm,pl111", "arm,primecell";
> >>> -					reg = <0x1f0000 0x1000>;
> >>> -					interrupt-names = "combined";
> >>> -					interrupts = <0 14 4>;
> >>> -					clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>;
> >>> -					clock-names = "clcdclk", "apb_pclk";
> >>> -					arm,pl11x,framebuffer = <0x18000000 0x00180000>;
> >>> -					memory-region = <&v2m_video_ram>;
> >>> -					max-memory-bandwidth = <130000000>; /* 16bpp @ 63.5MHz */
> >>> -
> >>> -					port {
> >>> -						v2m_clcd_pads: endpoint {
> >>> -							remote-endpoint = <&v2m_clcd_panel>;
> >>> -							arm,pl11x,tft-r0g0b0-pads = <0 8 16>;
> >>> -						};
> >>> -					};
> >>> -
> >>> -					panel {
> >>> -						compatible = "panel-dpi";
> >>> -
> >>> -						port {
> >>> -							v2m_clcd_panel: endpoint {
> >>> -								remote-endpoint = <&v2m_clcd_pads>;
> >>> -							};
> >>> -						};
> >>> -
> >>> -						panel-timing {
> >>> -							clock-frequency = <63500127>;
> >>> -							hactive = <1024>;
> >>> -							hback-porch = <152>;
> >>> -							hfront-porch = <48>;
> >>> -							hsync-len = <104>;
> >>> -							vactive = <768>;
> >>> -							vback-porch = <23>;
> >>> -							vfront-porch = <3>;
> >>> -							vsync-len = <4>;
> >>> -						};
> >>> -					};
> >>> -				};
> >>> -
> >>> -				virtio-block@130000 {
> >>> -					compatible = "virtio,mmio";
> >>> -					reg = <0x130000 0x200>;
> >>> -					interrupts = <0 42 4>;
> >>> -				};
> >>> -			};
> >>> -
> >>> -			v2m_fixed_3v3: v2m-3v3 {
> >>> -				compatible = "regulator-fixed";
> >>> -				regulator-name = "3V3";
> >>> -				regulator-min-microvolt = <3300000>;
> >>> -				regulator-max-microvolt = <3300000>;
> >>> -				regulator-always-on;
> >>> -			};
> >>> -
> >>> -			mcc {
> >>> -				compatible = "arm,vexpress,config-bus";
> >>> -				arm,vexpress,config-bridge = <&v2m_sysreg>;
> >>> -
> >>> -				v2m_oscclk1: oscclk1 {
> >>> -					/* CLCD clock */
> >>> -					compatible = "arm,vexpress-osc";
> >>> -					arm,vexpress-sysreg,func = <1 1>;
> >>> -					freq-range = <23750000 63500000>;
> >>> -					#clock-cells = <0>;
> >>> -					clock-output-names = "v2m:oscclk1";
> >>> -				};
> >>> -
> >>> -				reset {
> >>> -					compatible = "arm,vexpress-reset";
> >>> -					arm,vexpress-sysreg,func = <5 0>;
> >>> -				};
> >>> -
> >>> -				muxfpga {
> >>> -					compatible = "arm,vexpress-muxfpga";
> >>> -					arm,vexpress-sysreg,func = <7 0>;
> >>> -				};
> >>> -
> >>> -				shutdown {
> >>> -					compatible = "arm,vexpress-shutdown";
> >>> -					arm,vexpress-sysreg,func = <8 0>;
> >>> -				};
> >>> -
> >>> -				reboot {
> >>> -					compatible = "arm,vexpress-reboot";
> >>> -					arm,vexpress-sysreg,func = <9 0>;
> >>> -				};
> >>> -
> >>> -				dvimode {
> >>> -					compatible = "arm,vexpress-dvimode";
> >>> -					arm,vexpress-sysreg,func = <11 0>;
> >>> -				};
> >>> -			};
> >>> -		};
> >>> -	};
> >>> -};
> >>> diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
> >>> index eeb0571..5622ae7 100644
> >>> --- a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
> >>> +++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
> >>> @@ -21,12 +21,6 @@ KMACHINE_foundation-armv8 = "fvp"
> >>> #
> >>> COMPATIBLE_MACHINE_fvp-base = "fvp-base"
> >>> KMACHINE_fvp-base = "fvp"
> >>> -SRC_URI_append_fvp-base = " file://dts/arm;subdir=add-files"
> >>> -
> >>> -do_patch_append_fvp-base() {
> >>> -    tar -C ${WORKDIR}/add-files/dts -cf - arm | \
> >>> -        tar -C arch/arm64/boot/dts -xf -
> >>> -}
> >>> 
> >>> #
> >>> # Juno KMACHINE
> >>> -- 
> >>> 2.17.1
> >>> 
> >>> 
> >> 
> > 
> >> 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#711): https://lists.yoctoproject.org/g/meta-arm/message/711
Mute This Topic: https://lists.yoctoproject.org/mt/74911946/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-