* Install overlays in addition to base DTBs
* The DTBs and overlays may be in a subdirectory of .../boot/dts
* Fix more places where KERNEL_ARCH was not abstracted.

Signed-off-by: Jacob Stiffler <[email protected]>
---
 .../recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux    | 2 +-
 .../ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux-dtbs             | 2 +-
 .../recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb            | 1 +
 3 files changed, 3 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 100a225..faa905a 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
@@ -17,7 +17,7 @@ linux_install: __DTB_DEPEND_INSTALL__
                exit 1; \
        fi
        install -d $(DESTDIR)/boot
-       install $(LINUXKERNEL_INSTALL_DIR)/arch/arm/boot/__KERNEL_BUILD_CMDS__ 
$(DESTDIR)/boot
+       install 
$(LINUXKERNEL_INSTALL_DIR)/arch/__KERNEL_ARCH__/boot/__KERNEL_IMAGE_TYPE__ 
$(DESTDIR)/boot
        install $(LINUXKERNEL_INSTALL_DIR)/vmlinux $(DESTDIR)/boot
        install $(LINUXKERNEL_INSTALL_DIR)/System.map $(DESTDIR)/boot
        $(MAKE) -C $(LINUXKERNEL_INSTALL_DIR) ARCH=__KERNEL_ARCH__ 
CROSS_COMPILE=$(CROSS_COMPILE) INSTALL_MOD_PATH=$(DESTDIR) 
INSTALL_MOD_STRIP=$(INSTALL_MOD_STRIP) modules_install
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 1ecaf5e..2697772 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
@@ -18,7 +18,7 @@ linux-dtbs_install:
                exit 1; \
        fi
        install -d $(DESTDIR)/boot
-       @cp -f $(LINUXKERNEL_INSTALL_DIR)/arch/arm/boot/dts/*.dtb 
$(DESTDIR)/boot/
+       @cp -f `find $(LINUXKERNEL_INSTALL_DIR)/arch/__KERNEL_ARCH__/boot/dts/ 
-regex '.*\.dtbo?'` $(DESTDIR)/boot/
 
 linux-dtbs_clean:
        @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 6932616..aba71d9 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
@@ -249,6 +249,7 @@ do_install () {
     fi
 
     sed -i -e "s/__KERNEL_ARCH__/${ARCH}/" ${D}/Makefile
+    sed -i -e "s/__KERNEL_IMAGE_TYPE__/${KERNEL_IMAGE_TYPE}/" ${D}/Makefile
     sed -i -e "s/__KERNEL_BUILD_CMDS__/${KERNEL_BUILD_CMDS}/" ${D}/Makefile
     sed -i -e "s/__SDKMACHINE__/${SDKMACHINE}/g" ${D}/Makefile
 
-- 
2.7.4

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to