[meta-lsi] [PATCH 21/41] split device tree configuration
Daniel Dragomir
daniel.dragomir at windriver.com
Thu Jan 28 04:29:24 PST 2016
From: Cristian Bercaru <cristian.bercaru at windriver.com>
This patch splits the device tree configuration in 3 different files:
one for ARM, one for POWERPC, and one header including the yocto task
overrides. For each architecture a different set of device trees is
compiled.
Signed-off-by: Cristian Bercaru <cristian.bercaru at windriver.com>
---
recipes-kernel/linux/dt-arm.inc | 42 +++++++++++
recipes-kernel/linux/dt-axxia.inc | 37 ++++++++++
recipes-kernel/linux/dt-powerpc.inc | 16 +++++
recipes-kernel/linux/linux-yocto.inc | 133 -----------------------------------
4 files changed, 95 insertions(+), 133 deletions(-)
create mode 100644 recipes-kernel/linux/dt-arm.inc
create mode 100644 recipes-kernel/linux/dt-axxia.inc
create mode 100644 recipes-kernel/linux/dt-powerpc.inc
delete mode 100644 recipes-kernel/linux/linux-yocto.inc
diff --git a/recipes-kernel/linux/dt-arm.inc b/recipes-kernel/linux/dt-arm.inc
new file mode 100644
index 0000000..3343812
--- /dev/null
+++ b/recipes-kernel/linux/dt-arm.inc
@@ -0,0 +1,42 @@
+require dt-axxia.inc
+
+do_compile_append() {
+ addr=0x00408000
+ if [ "${KV}" = "3.4" ]; then
+ mk_fit_images "axm55xx" ${addr}
+ mk_fit_images "axm55xxemu7" ${addr}
+ mk_fit_images "axm55xxemu" ${addr}
+ mk_fit_images "axm55xxsim16" ${addr}
+ mk_fit_images "axm55xxsim" ${addr}
+ elif [ "${KV}" = "3.10" ]; then
+ mk_fit_images "axm5504-emu" ${addr}
+ mk_fit_images "axm5507-emu" ${addr}
+ mk_fit_images "axm5508-amarillo" ${addr}
+ mk_fit_images "axm5512-amarillo" ${addr}
+ mk_fit_images "axm5516-amarillo" ${addr}
+ mk_fit_images "axm5504-sim-mmc" ${addr}
+ mk_fit_images "axm5504-sim-virtio" ${addr}
+ mk_fit_images "axm5516-sim-mmc" ${addr}
+ mk_fit_images "axm5516-sim-virtio" ${addr}
+ fi
+}
+
+do_deploy_append() {
+ if [ "${KV}" = "3.4" ]; then
+ install_fit_images "axm55xx"
+ install_fit_images "axm55xxemu7"
+ install_fit_images "axm55xxemu"
+ install_fit_images "axm55xxsim16"
+ install_fit_images "axm55xxsim"
+ elif [ "${KV}" = "3.10" ]; then
+ install_fit_images "axm5504-emu"
+ install_fit_images "axm5507-emu"
+ install_fit_images "axm5508-amarillo"
+ install_fit_images "axm5512-amarillo"
+ install_fit_images "axm5516-amarillo"
+ install_fit_images "axm5504-sim-mmc"
+ install_fit_images "axm5504-sim-virtio"
+ install_fit_images "axm5516-sim-mmc"
+ install_fit_images "axm5516-sim-virtio"
+ fi
+}
diff --git a/recipes-kernel/linux/dt-axxia.inc b/recipes-kernel/linux/dt-axxia.inc
new file mode 100644
index 0000000..17cc002
--- /dev/null
+++ b/recipes-kernel/linux/dt-axxia.inc
@@ -0,0 +1,37 @@
+mk_fit_images() {
+ name=$1
+ addr=$2
+ oe_runmake ${name}.dtb
+ echo "pwd = `pwd`"
+ cd ../fit
+ if [ "${KARCH}" = "arm" ] && [ "${KV}" = "3.10" ]; then
+ oe_runmake "ARCH=${KARCH}" \
+ 'DESCRIPTION=LSI Axxia Linux' \
+ "ADDRESS=${addr}" \
+ 'VMLINUX=${B}/vmlinux' \
+ "DTB=${B}/arch/${KARCH}/boot/dts/${name}.dtb"
+ else
+ oe_runmake "ARCH=${KARCH}" \
+ 'DESCRIPTION=LSI Axxia Linux' \
+ "ADDRESS=${addr}" \
+ 'VMLINUX=${B}/vmlinux' \
+ "DTB=${B}/arch/${KARCH}/boot/${name}.dtb"
+ fi
+ mv linux.fit linux.fit-${name}
+ mv fdt.fit fdt.fit-${name}
+ mv multi.fit multi.fit-${name}
+ cd ${B}
+}
+
+install_fit_images() {
+ name=$1
+ if [ "${KARCH}" = "arm" ] && [ "${KV}" = "3.10" ]; then
+ install ${B}/arch/${KARCH}/boot/dts/${name}.dtb ${DEPLOYDIR}/${name}.dtb
+ else
+ install ${B}/arch/${KARCH}/boot/${name}.dtb ${DEPLOYDIR}/${name}.dtb
+ fi
+ install ${B}/../fit/linux.fit-${name} ${DEPLOYDIR}/linux.fit-${name}
+ install ${B}/../fit/fdt.fit-${name} ${DEPLOYDIR}/fdt.fit-${name}
+ install ${B}/../fit/multi.fit-${name} ${DEPLOYDIR}/multi.fit-${name}
+
+}
diff --git a/recipes-kernel/linux/dt-powerpc.inc b/recipes-kernel/linux/dt-powerpc.inc
new file mode 100644
index 0000000..1c2e46e
--- /dev/null
+++ b/recipes-kernel/linux/dt-powerpc.inc
@@ -0,0 +1,16 @@
+require dt-axxia.inc
+
+do_compile_append() {
+ addr=0x00400000
+ mk_fit_images "acp25xx" ${addr}
+ mk_fit_images "acp342x" ${addr}
+ mk_fit_images "acp344x" ${addr}
+ mk_fit_images "acp35xx" ${addr}
+}
+
+do_deploy_append() {
+ install_fit_images "acp25xx"
+ install_fit_images "acp342x"
+ install_fit_images "acp344x"
+ install_fit_images "acp35xx"
+}
diff --git a/recipes-kernel/linux/linux-yocto.inc b/recipes-kernel/linux/linux-yocto.inc
deleted file mode 100644
index d1dad8a..0000000
--- a/recipes-kernel/linux/linux-yocto.inc
+++ /dev/null
@@ -1,133 +0,0 @@
-
-LICENSE = "GPLv2"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-COMPATIBLE_MACHINE = "axxiaarm|axxiapowerpc"
-
-KMACHINE = "${MACHINE}"
-
-INSANE_SKIP_kernel-dev = "debug-files"
-
-PARALLEL_MAKE = ""
-
-mk_fit_images() {
- name=$1
- addr=$2
- oe_runmake ${name}.dtb
- echo "pwd = `pwd`"
- cd ../fit
- if [ "${KARCH}" = "arm" ] && [ "${KV}" = "3.10" ]
- then
- oe_runmake "ARCH=${KARCH}" \
- 'DESCRIPTION=LSI Axxia Linux' \
- "ADDRESS=${addr}" \
- 'VMLINUX=${B}/vmlinux' \
- "DTB=${B}/arch/${KARCH}/boot/dts/${name}.dtb"
- else
- oe_runmake "ARCH=${KARCH}" \
- 'DESCRIPTION=LSI Axxia Linux' \
- "ADDRESS=${addr}" \
- 'VMLINUX=${B}/vmlinux' \
- "DTB=${B}/arch/${KARCH}/boot/${name}.dtb"
- fi
- mv linux.fit linux.fit-${name}
- mv fdt.fit fdt.fit-${name}
- mv multi.fit multi.fit-${name}
- cd ${B}
-}
-
-do_compile_append() {
- if [ "${KARCH}" = "powerpc" ]
- then
- addr=0x00400000
- mk_fit_images "acp25xx" ${addr}
- mk_fit_images "acp342x" ${addr}
- mk_fit_images "acp344x" ${addr}
- mk_fit_images "acp35xx" ${addr}
- fi
- if [ "${KARCH}" = "arm" ]
- then
- addr=0x00408000
- if [ "${KV}" = "3.4" ]
- then
- mk_fit_images "axm55xx" ${addr}
- mk_fit_images "axm55xxemu7" ${addr}
- mk_fit_images "axm55xxemu" ${addr}
- mk_fit_images "axm55xxsim16" ${addr}
- mk_fit_images "axm55xxsim" ${addr}
- fi
- if [ "${KV}" = "3.10" ]
- then
- mk_fit_images "axm5504-emu" ${addr}
- mk_fit_images "axm5507-emu" ${addr}
- mk_fit_images "axm5508-amarillo" ${addr}
- mk_fit_images "axm5512-amarillo" ${addr}
- mk_fit_images "axm5516-amarillo" ${addr}
- mk_fit_images "axm5504-sim-mmc" ${addr}
- mk_fit_images "axm5504-sim-virtio" ${addr}
- mk_fit_images "axm5516-sim-mmc" ${addr}
- mk_fit_images "axm5516-sim-virtio" ${addr}
- fi
- fi
-}
-
-install_fit_images() {
- name=$1
- if [ "${KARCH}" = "arm" ] && [ "${KV}" = "3.10" ]
- then
- install ${B}/arch/${KARCH}/boot/dts/${name}.dtb ${DEPLOYDIR}/${name}.dtb
- else
- install ${B}/arch/${KARCH}/boot/${name}.dtb ${DEPLOYDIR}/${name}.dtb
- fi
- install ${B}/../fit/linux.fit-${name} ${DEPLOYDIR}/linux.fit-${name}
- install ${B}/../fit/fdt.fit-${name} ${DEPLOYDIR}/fdt.fit-${name}
- install ${B}/../fit/multi.fit-${name} ${DEPLOYDIR}/multi.fit-${name}
-
-}
-
-do_deploy_append() {
- if [ "${KARCH}" = "powerpc" ]
- then
- install_fit_images "acp25xx"
- install_fit_images "acp342x"
- install_fit_images "acp344x"
- install_fit_images "acp35xx"
- fi
- if [ "${KARCH}" = "arm" ]
- then
- if [ "${KV}" = "3.4" ]
- then
- install_fit_images "axm55xx"
- install_fit_images "axm55xxemu7"
- install_fit_images "axm55xxemu"
- install_fit_images "axm55xxsim16"
- install_fit_images "axm55xxsim"
- fi
- if [ "${KV}" = "3.10" ]
- then
- install_fit_images "axm5504-emu"
- install_fit_images "axm5507-emu"
- install_fit_images "axm5508-amarillo"
- install_fit_images "axm5512-amarillo"
- install_fit_images "axm5516-amarillo"
- install_fit_images "axm5504-sim-mmc"
- install_fit_images "axm5504-sim-virtio"
- install_fit_images "axm5516-sim-mmc"
- install_fit_images "axm5516-sim-virtio"
- fi
- fi
-}
-
-do_patch_append() {
- if [ "${LSI_SRC}" != "linux-yocto" ]
- then
- if [ "${PN}" = "linux-yocto" ]
- then
- cp ${WORKDIR}/linux/arch/${KARCH}/configs/lsi_defconfig ${WORKDIR}/defconfig
- elif [ "${PN}" = "linux-yocto-rt" ]
- then
- cp ${WORKDIR}/linux/arch/${KARCH}/configs/lsi_rt_defconfig ${WORKDIR}/defconfig
- fi
- fi
-}
--
1.9.1
More information about the meta-lsi
mailing list