[meta-arm,v2] arm-bsp/recipes-kernel: Update fvp-base-arm32 BSP definition

Submitted by Anders Dellien on Sept. 28, 2020, 5:26 p.m. | Patch ID: 176868

Details

Message ID 20200928172610.19234-1-anders.dellien@arm.com
State New
Headers show

Commit Message

Anders Dellien Sept. 28, 2020, 5:26 p.m.
Update to use the yocto-kernel-cache 'standard' configuration
and edit 'fvp-features.cfg' to remove duplicate configs.

Change-Id: I49617bdac554571aa1242080797cb60327e527da
Signed-off-by: Anders Dellien <anders.dellien@arm.com>
---
 .../bsp/arm-platforms/fvp-arm32-standard.scc  |  3 ++-
 .../bsp/arm-platforms/fvp-arm32.scc           |  2 --
 .../arm-platforms/fvp-arm32/fvp-features.cfg  | 25 +++----------------
 .../0001-ARM-vexpress-enable-GICv3.patch      |  0
 .../fvp-base-arm32-dts.patch                  |  0
 .../linux/linux-arm-platforms.inc             |  3 ++-
 6 files changed, 8 insertions(+), 25 deletions(-)
 rename meta-arm-bsp/recipes-kernel/linux/{arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32 => files/fvp-base-arm32}/0001-ARM-vexpress-enable-GICv3.patch (100%)
 rename meta-arm-bsp/recipes-kernel/linux/files/{ => fvp-base-arm32}/fvp-base-arm32-dts.patch (100%)

Patch hide | download patch | download mbox

diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32-standard.scc b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32-standard.scc
index a92d945..6569027 100644
--- a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32-standard.scc
+++ b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32-standard.scc
@@ -1,7 +1,8 @@ 
 define KMACHINE fvp-arm32
 define KTYPE standard
 define KARCH arm
-define KMETA_EXTERNAL_BSP t
+
+include ktypes/standard/standard.scc
 
 include fvp-arm32.scc
 
diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32.scc b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32.scc
index f95b036..85659aa 100644
--- a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32.scc
+++ b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32.scc
@@ -1,8 +1,6 @@ 
 include features/input/input.scc
 include cfg/timer/no_hz.scc
 
-patch fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch
-
 kconf hardware fvp-arm32/fvp-board.cfg
 kconf hardware fvp-arm32/fvp-features.cfg
 kconf hardware fvp/fvp-net.cfg
diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32/fvp-features.cfg b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32/fvp-features.cfg
index 42cd476..12e7697 100644
--- a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32/fvp-features.cfg
+++ b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32/fvp-features.cfg
@@ -1,26 +1,9 @@ 
-CONFIG_MODULES=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXT4_FS=y
-CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=y
-CONFIG_PRINTK_TIME=y
+CONFIG_BOUNCE=y
 CONFIG_HIGHMEM=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_DEBUG_FS=y
-CONFIG_GENERIC_SCHED_CLOCK=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_UNIX=y
-CONFIG_ETHERNET=y
+CONFIG_HIGHPTE=y
+CONFIG_KERNEL_MODE_NEON=y
+CONFIG_NEON=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_KERNEL_MODE_NEON=y
 
diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch b/meta-arm-bsp/recipes-kernel/linux/files/fvp-base-arm32/0001-ARM-vexpress-enable-GICv3.patch
similarity index 100%
rename from meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32/0001-ARM-vexpress-enable-GICv3.patch
rename to meta-arm-bsp/recipes-kernel/linux/files/fvp-base-arm32/0001-ARM-vexpress-enable-GICv3.patch
diff --git a/meta-arm-bsp/recipes-kernel/linux/files/fvp-base-arm32-dts.patch b/meta-arm-bsp/recipes-kernel/linux/files/fvp-base-arm32/fvp-base-arm32-dts.patch
similarity index 100%
rename from meta-arm-bsp/recipes-kernel/linux/files/fvp-base-arm32-dts.patch
rename to meta-arm-bsp/recipes-kernel/linux/files/fvp-base-arm32/fvp-base-arm32-dts.patch
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
index 79ef26e..b76d68b 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
@@ -41,7 +41,8 @@  SRC_URI_append_fvp-base = " file://fvp-base-dts.patch"
 #
 COMPATIBLE_MACHINE_fvp-base-arm32 = "fvp-base-arm32"
 KMACHINE_fvp-base-arm32 = "fvp-arm32"
-SRC_URI_append_fvp-base-arm32 = " file://fvp-base-arm32-dts.patch"
+SRC_URI_append_fvp-base-arm32 = " file://fvp-base-arm32-dts.patch \
+                                  file://0001-ARM-vexpress-enable-GICv3.patch"
 
 #
 # Juno KMACHINE