From: "Franklin S. Cooper Jr" <[email protected]> * Sitara-linux-ti-staging_3.14 used with the AMSDK branding doesn't use the tisdk defconfig. * Therefore, change the tisdk-makefiles to use the "right" defconfig. * For other brandings the same tisdk_${MACHINE}_defconfig will be used.
Signed-off-by: Franklin S. Cooper Jr <[email protected]> --- .../ti-tisdk-makefile/Makefile_linux | 2 +- .../ti-tisdk-makefile/ti-tisdk-makefile/Rules.make | 3 +++ .../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb | 9 ++++++++- 3 files changed, 12 insertions(+), 2 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 07d56b1..145e27c 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 @@ -3,7 +3,7 @@ linux: __DTB_DEPEND__ @echo ================================= @echo Building the Linux Kernel @echo ================================= - $(MAKE) -C $(LINUXKERNEL_INSTALL_DIR) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) tisdk_$(PLATFORM)_defconfig + $(MAKE) -C $(LINUXKERNEL_INSTALL_DIR) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) $(DEFCONFIG) $(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 diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Rules.make b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Rules.make index b2dbf64..9070781 100644 --- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Rules.make +++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Rules.make @@ -1,6 +1,9 @@ #platform PLATFORM=__PLATFORM__ +#defconfig +DEFCONFIG=__DEFCONFIG__ + #Architecture ARCH=__ARCH__ 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 e371307..ce6e557 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 @@ -36,7 +36,7 @@ SRC_URI = "\ file://Makefile_cryptodev \ " -PR = "r36" +PR = "r37" MAKEFILES_COMMON = "linux \ matrix-gui \ @@ -101,6 +101,12 @@ KERNEL_DEVICETREE_beaglebone = "am335x-bone.dtb am335x-boneblack.dtb" KERNEL_DEVICETREE_omap5-evm = "omap5-uevm.dtb" KERNEL_DEVICETREE_dra7xx = "dra7-evm.dtb dra72-evm.dtb am57xx-beagle-x15.dtb" +DEFCONFIG = "tisdk_${MACHINE}_defconfig" + +AMSDK_DEFCONFIG = "singlecore-omap2plus_defconfig" + +DEFCONFIG := "${@base_conditional('ARAGO_BRAND','core','${DEFCONFIG}','${AMSDK_DEFCONFIG}',d)}" + # This step will stitch together the final Makefile based on the supported # make targets. do_install () { @@ -159,6 +165,7 @@ do_install () { # fixup Rules.make values sed -i -e "s/__PLATFORM__/${MACHINE}/" ${D}/Rules.make + sed -i -e "s/__DEFCONFIG__/${DEFCONFIG}/" ${D}/Rules.make sed -i -e "s/__ARCH__/${PLATFORM_ARCH}/" ${D}/Rules.make sed -i -e "s/__TOOLCHAIN_PREFIX__/${TOOLCHAIN_SYS}-/" ${D}/Rules.make sed -i -e "s/__UBOOT_MACHINE__/${UBOOT_MACHINE}/" ${D}/Rules.make -- 1.7.9.5 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
