diff options
| -rw-r--r-- | packages/linux/linux-rt_2.6.24.bb | 17 | ||||
| -rw-r--r-- | packages/linux/linux.inc | 20 | ||||
| -rw-r--r-- | packages/linux/linux_2.6.23+2.6.24-rc5.bb | 12 | ||||
| -rw-r--r-- | packages/linux/linux_2.6.23.bb | 17 | ||||
| -rw-r--r-- | packages/linux/linux_2.6.24.bb | 15 |
5 files changed, 21 insertions, 60 deletions
diff --git a/packages/linux/linux-rt_2.6.24.bb b/packages/linux/linux-rt_2.6.24.bb index 8081f44e93..bddb16fdf0 100644 --- a/packages/linux/linux-rt_2.6.24.bb +++ b/packages/linux/linux-rt_2.6.24.bb @@ -4,8 +4,6 @@ require linux.inc 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 - diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index f5049b1d26..1f6eeb5538 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -18,6 +18,15 @@ CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfs 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 diff --git a/packages/linux/linux_2.6.23+2.6.24-rc5.bb b/packages/linux/linux_2.6.23+2.6.24-rc5.bb index 20ee7d0508..648fe6b756 100644 --- a/packages/linux/linux_2.6.23+2.6.24-rc5.bb +++ b/packages/linux/linux_2.6.23+2.6.24-rc5.bb @@ -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} - - 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 + diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb index d3989a42ef..76ebbbe917 100644 --- a/packages/linux/linux_2.6.23.bb +++ b/packages/linux/linux_2.6.23.bb @@ -6,9 +6,6 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "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 @@ SRC_URI_append_mpc8323e-rdb = "\ 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 diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb index c0751634a5..fa255403e9 100644 --- a/packages/linux/linux_2.6.24.bb +++ b/packages/linux/linux_2.6.24.bb @@ -10,8 +10,6 @@ DEFAULT_PREFERENCE_atngw100 = "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 @@ CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M 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 |