On Tue, Jun 18, 2019 at 3:50 AM wrote:
>
> From: He Zhe
>
> The original BSP qemuarm has been renamed to qemuarmv5. Update the machine
> overrides accordingly to avoid not generating dtb.
Acked-by: Bruce Ashfield
I had meant to do this myself, but kept forgetting :D
I can take this into my tree and send it with my next series.
Bruce
>
> Signed-off-by: He Zhe
> ---
> meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +-
> meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 2 +-
> meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb| 2 +-
> meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 2 +-
> meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 2 +-
> meta/recipes-kernel/linux/linux-yocto_4.19.bb | 2 +-
> meta/recipes-kernel/linux/linux-yocto_5.0.bb | 1 -
> 7 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb
> b/meta/recipes-kernel/linux/linux-yocto-dev.bb
> index 3a055c1..8c83620 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb
> @@ -41,7 +41,7 @@ DEPENDS += "openssl-native util-linux-native"
>
> COMPATIBLE_MACHINE =
> "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64)"
>
> -KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
> +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
>
> # Functionality flags
> KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc
> features/taskstats/taskstats.scc"
> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> index 0836dc7..a4facfe 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> @@ -33,7 +33,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
>
> COMPATIBLE_MACHINE =
> "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)"
>
> -KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
> +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
>
> # Functionality flags
> KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc
> features/taskstats/taskstats.scc"
> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
> b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
> index b5e415f..8bd9d74 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
> @@ -33,7 +33,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
>
> COMPATIBLE_MACHINE =
> "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)"
>
> -KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
> +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
>
> # Functionality flags
> KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc
> features/taskstats/taskstats.scc"
> diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
> b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
> index 4ca11d7..e668854 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
> @@ -29,4 +29,4 @@ COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5"
> # Functionality flags
> KERNEL_FEATURES = ""
>
> -KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
> +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
> diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
> b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
> index a9c463c..226a90c 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
> @@ -29,4 +29,4 @@ COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5"
> # Functionality flags
> KERNEL_FEATURES = ""
>
> -KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
> +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
> diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb
> b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
> index cda4ecf..014d689 100644
> --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
> @@ -36,7 +36,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
> KMETA = "kernel-meta"
> KCONF_BSP_AUDIT_LEVEL = "2"
>
> -KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
> +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
>
> COMPATIBLE_MACHINE =
> "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
>
> diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb
> b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
> index 8aec315..bb7ed56 100644
> --- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
> @@ -38,7 +38,6 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
> KMETA = "kernel-meta"
> KCONF_BSP_AUDIT_LEVEL = "2"
>
> -KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
> KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
>
> COMPATIBLE_MACHINE =
> "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
> --
> 2.7.4
>
--
- Thou shalt not follow the NULL pointer, for chaos an
