* Add support to build DTB files for AM43x and AM335x * Add a target dependency to force dtb files to be built and installed when make linux/linux_install are ran.
Signed-off-by: Franklin S. Cooper Jr <[email protected]> --- .../ti-tisdk-makefile/Makefile_linux | 4 +- .../ti-tisdk-makefile/Makefile_linux-dtbs | 2 +- .../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb | 23 +++++++++++++++++++- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux index c53ee29..f4dc75f 100644 --- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux +++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux @@ -1,5 +1,5 @@ # Kernel build targets -linux: +linux: __DTB_DEPEND__ @echo ================================= @echo Building the Linux Kernel @echo ================================= @@ -7,7 +7,7 @@ linux: $(MAKE) -j $(MAKE_JOBS) -C $(LINUXKERNEL_INSTALL_DIR) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) __KERNEL_BUILD_CMDS__ $(MAKE) -j $(MAKE_JOBS) -C $(LINUXKERNEL_INSTALL_DIR) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) modules -linux_install: +linux_install: __DTB_DEPEND_INSTALL__ @echo =================================== @echo Installing the Linux Kernel @echo =================================== diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux-dtbs b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux-dtbs index 5093649..168d1ad 100644 --- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux-dtbs +++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux-dtbs @@ -3,7 +3,7 @@ linux-dtbs: @echo ===================================== @echo Building the Linux Kernel DTBs @echo ===================================== - $(MAKE) -j $(MAKE_JOBS) -C $(LINUXKERNEL_INSTALL_DIR) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) dtbs + $(MAKE) -j $(MAKE_JOBS) -C $(LINUXKERNEL_INSTALL_DIR) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) __KERNEL_DEVICETREE__ linux-dtbs_install: @echo ======================================= diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb index 13d3f38..16f7662 100644 --- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb +++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb @@ -33,7 +33,7 @@ SRC_URI = "\ file://Makefile_oprofile-example \ " -PR = "r17" +PR = "r18" MAKEFILES_COMMON = "linux \ matrix-gui \ @@ -65,10 +65,12 @@ MAKEFILES_append_ti33x = " u-boot-spl \ ${QUICK_PLAYGROUND} \ wireless \ ti-crypto-examples \ + linux-dtbs \ " MAKEFILES_append_ti43x = " u-boot-spl \ ${QUICK_PLAYGROUND} \ ti-crypto-examples \ + linux-dtbs \ " MAKEFILES_append_omap-a15 = " u-boot-spl \ ${QUICK_PLAYGROUND} \ @@ -86,6 +88,12 @@ PLATFORM_ARCH_omapl138 = "armv5te" KERNEL_BUILD_CMDS = "${@base_contains('KERNEL_IMAGETYPE','uImage','LOADADDR=${UBOOT_LOADADDRESS} uImage','zImage',d)}" +KERNEL_DEVICETREE_ti33x = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb" +KERNEL_DEVICETREE_ti43x = "am43x-epos-evm.dtb am437x-gp-evm.dtb" +KERNEL_DEVICETREE_beaglebone = "am335x-bone.dtb am335x-boneblack.dtb" +KERNEL_DEVICETREE_omap5-evm = "omap5-uevm.dtb" +KERNEL_DEVICETREE_dra7xx-evm = "dra7-evm.dtb" + # This step will stitch together the final Makefile based on the supported # make targets. do_install () { @@ -127,6 +135,19 @@ do_install () { sed -i -e "s/__KERNEL_BUILD_CMDS__/${KERNEL_BUILD_CMDS}/" ${D}/Makefile + cat ${D}/Makefile | grep "__DTB_DEPEND__" > /dev/null + + if [ "$?" == "0" ] + then + sed -i -e "s/__KERNEL_DEVICETREE__/${KERNEL_DEVICETREE}/" ${D}/Makefile + sed -i -e "s/__DTB_DEPEND__/linux-dtbs/" ${D}/Makefile + sed -i -e "s/__DTB_DEPEND_INSTALL__/linux-dtbs_install/" ${D}/Makefile + else + sed -i -e "s/__DTB_DEPEND__//" ${D}/Makefile + sed -i -e "s/__DTB_DEPEND_INSTALL__//" ${D}/Makefile + fi + + install ${WORKDIR}/Rules.make ${D}/Rules.make # fixup Rules.make values -- 1.7.0.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
