[oe-commits] org.oe.dev linux.inc: move binary devicetree generation to linux.inc
jeremy_laine commit
oe at amethyst.openembedded.net
Mon Mar 31 09:37:50 UTC 2008
linux.inc: move binary devicetree generation to linux.inc
Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: e7e96408a59fab12da7980a4c105f51acf84541f
ViewMTN: http://monotone.openembedded.org/revision/info/e7e96408a59fab12da7980a4c105f51acf84541f
Files:
1
packages/linux/linux-rt_2.6.24.bb
packages/linux/linux.inc
packages/linux/linux_2.6.23+2.6.24-rc5.bb
packages/linux/linux_2.6.23.bb
packages/linux/linux_2.6.24.bb
Diffs:
#
# mt diff -r9698a2d90f7c7d5c2f153b730e5ddcc1e9b05395 -re7e96408a59fab12da7980a4c105f51acf84541f
#
#
#
# patch "packages/linux/linux-rt_2.6.24.bb"
# from [29d97acddf75b09d01099358d07240db5d4e2353]
# to [108bbff7661bc9d0a62d80e522cfb37313ce823c]
#
# patch "packages/linux/linux.inc"
# from [b47745bb07740dbcd2a179fcdac54a843d0dbf35]
# to [952cf195efc3aaef0f2de444ba49f09b27283de9]
#
# patch "packages/linux/linux_2.6.23+2.6.24-rc5.bb"
# from [8cef3230be1ba924b6e2c80492f1092a17566910]
# to [801134850169bd093cb2c9401f2e93bbd3acc903]
#
# patch "packages/linux/linux_2.6.23.bb"
# from [2440043a73616ef8837486eec4d51aa891d62868]
# to [6991c88082897d8ca8c8f3777423bdb092b34a0b]
#
# patch "packages/linux/linux_2.6.24.bb"
# from [4eabbe972f1ffeca4ea26e4d897079e1542a5624]
# to [1698797d4e832dd0ac53b480d89c620c02d4add1]
#
============================================================
--- packages/linux/linux-rt_2.6.24.bb 29d97acddf75b09d01099358d07240db5d4e2353
+++ packages/linux/linux-rt_2.6.24.bb 108bbff7661bc9d0a62d80e522cfb37313ce823c
@@ -4,8 +4,6 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-
PR = "r3"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.3.tar.bz2 \
@@ -24,18 +22,3 @@ SRC_URI_append_mpc8313e-rdb = "\
# file://mpc831x-nand.patch;patch=1 \
# file://mpc8313e-rdb-rtc.patch;patch=1 "
-DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
-
-do_devicetree_image() {
- if test -n "${DEVICETREE}" ; then
- dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
-
- cd ${DEPLOY_DIR_IMAGE}
- rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- fi
-}
-
-addtask devicetree_image after do_deploy before do_package
-
============================================================
--- packages/linux/linux.inc b47745bb07740dbcd2a179fcdac54a843d0dbf35
+++ packages/linux/linux.inc 952cf195efc3aaef0f2de444ba49f09b27283de9
@@ -18,6 +18,15 @@ CMDLINE_append = " ${CMDLINE_DEBUG} "
CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
CMDLINE_append = " ${CMDLINE_DEBUG} "
+# Support for binary device tree generation
+
+KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
+KERNEL_DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
+KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
+
+DEPENDS_append_mpc8313e-rdb = " dtc-native"
+DEPENDS_append_mpc8323e-rdb = " dtc-native"
+
do_configure_prepend() {
echo "" > ${S}/.config
@@ -106,3 +115,14 @@ do_compile_append() {
fi
}
+do_devicetree_image() {
+ if test -n "${KERNEL_DEVICETREE}" ; then
+ dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_DEVICETREE}
+
+ cd ${DEPLOY_DIR_IMAGE}
+ rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+ ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+ fi
+}
+
+addtask devicetree_image after do_deploy before do_package
============================================================
--- packages/linux/linux_2.6.23+2.6.24-rc5.bb 8cef3230be1ba924b6e2c80492f1092a17566910
+++ packages/linux/linux_2.6.23+2.6.24-rc5.bb 801134850169bd093cb2c9401f2e93bbd3acc903
@@ -64,15 +64,5 @@ python do_compulab_image() {
os.symlink(img_file, link_file)
}
-do_devicetree_image() {
- if test -n "${DEVICETREE}" ; then
- dtc -I dts -O dtb -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
+addtask compulab_image after do_deploy before do_package
- cd ${DEPLOY_DIR_IMAGE}
- rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- fi
-}
-
-addtask compulab_image after do_deploy before do_package
-addtask devicetree_image after do_deploy before do_package
============================================================
--- packages/linux/linux_2.6.23.bb 2440043a73616ef8837486eec4d51aa891d62868
+++ packages/linux/linux_2.6.23.bb 6991c88082897d8ca8c8f3777423bdb092b34a0b
@@ -6,9 +6,6 @@ DEFAULT_PREFERENCE_avr32 = "1"
DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
DEFAULT_PREFERENCE_avr32 = "1"
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-DEPENDS_append_mpc8323e-rdb = " dtc-native"
-
PR = "r12"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
@@ -52,10 +49,6 @@ CMDLINE_cm-x270 = "console=${CMX270_CONS
CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
-DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
-DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
-
FILES_kernel-image_cm-x270 = ""
python do_compulab_image() {
@@ -93,16 +86,6 @@ python do_compulab_image() {
os.symlink(img_file, link_file)
}
-do_devicetree_image() {
- if test -n "${DEVICETREE}" ; then
- dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
- cd ${DEPLOY_DIR_IMAGE}
- rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- fi
-}
-
addtask compulab_image after do_deploy before do_package
-addtask devicetree_image after do_deploy before do_package
============================================================
--- packages/linux/linux_2.6.24.bb 4eabbe972f1ffeca4ea26e4d897079e1542a5624
+++ packages/linux/linux_2.6.24.bb 1698797d4e832dd0ac53b480d89c620c02d4add1
@@ -10,8 +10,6 @@ DEFAULT_PREFERENCE_ts72xx = "1"
DEFAULT_PREFERENCE_at32stk1000 = "1"
DEFAULT_PREFERENCE_ts72xx = "1"
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-
PR = "r11"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
@@ -84,8 +82,6 @@ FILES_kernel-image_gesbc-9302 = ""
FILES_kernel-image_gesbc-9302 = ""
-DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
python do_compulab_image() {
import os
import os.path
@@ -122,16 +118,5 @@ python do_compulab_image() {
}
-do_devicetree_image() {
- if test -n "${DEVICETREE}" ; then
- dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
-
- cd ${DEPLOY_DIR_IMAGE}
- rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- fi
-}
-
addtask compulab_image after do_deploy before do_package
-addtask devicetree_image after do_deploy before do_package
More information about the Openembedded-commits
mailing list