diff options
| author | Reza Arbab <arbab@linux.ibm.com> | 2019-02-20 16:42:09 -0600 |
|---|---|---|
| committer | Reza Arbab <arbab@linux.ibm.com> | 2019-03-11 09:38:37 -0500 |
| commit | 92f08be483820f905cbf50450af8798acd597124 (patch) | |
| tree | 9ff774b4b25fb0900758895402c3f88998a5952c | |
| parent | ca50b1e83aaf1e6d179128ca212c339ef5f0391e (diff) | |
| download | talos-op-build-92f08be483820f905cbf50450af8798acd597124.tar.gz talos-op-build-92f08be483820f905cbf50450af8798acd597124.zip | |
skiboot: Add BR2_SKIBOOT_DEVICETREE
Introduce a buildroot option to build skiboot's external/devicetree
directory and deliver the binaries as op-build output images.
Signed-off-by: Reza Arbab <arbab@linux.ibm.com>
| -rw-r--r-- | openpower/configs/opal_defconfig | 1 | ||||
| -rw-r--r-- | openpower/package/skiboot/Config.in | 3 | ||||
| -rw-r--r-- | openpower/package/skiboot/skiboot.mk | 11 |
3 files changed, 15 insertions, 0 deletions
diff --git a/openpower/configs/opal_defconfig b/openpower/configs/opal_defconfig index 89f9a8ff..a790aefe 100644 --- a/openpower/configs/opal_defconfig +++ b/openpower/configs/opal_defconfig @@ -49,4 +49,5 @@ BR2_OPENPOWER_CONFIG_NAME="opal" BR2_PACKAGE_PETITBOOT=y # BR2_PACKAGE_HOST_P8_PORE_BINUTILS is not set # BR2_PACKAGE_CAPP_UCODE is not set +BR2_SKIBOOT_DEVICETREE=y # BR2_PACKAGE_IMA_CATALOG is not set diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in index 01f9374f..c55cf340 100644 --- a/openpower/package/skiboot/Config.in +++ b/openpower/package/skiboot/Config.in @@ -42,6 +42,9 @@ config BR2_SKIBOOT_CUSTOM_REPO_URL string "URL of custom repository" depends on BR2_SKIBOOT_CUSTOM_GIT +config BR2_SKIBOOT_DEVICETREE + bool "Build device trees" + endif endmenu diff --git a/openpower/package/skiboot/skiboot.mk b/openpower/package/skiboot/skiboot.mk index 74c66233..5f3e258d 100644 --- a/openpower/package/skiboot/skiboot.mk +++ b/openpower/package/skiboot/skiboot.mk @@ -18,6 +18,10 @@ SKIBOOT_LICENSE_FILES = LICENCE SKIBOOT_INSTALL_IMAGES = YES SKIBOOT_INSTALL_TARGET = NO +ifeq ($(BR2_SKIBOOT_DEVICETREE),y) +SKIBOOT_DEPENDENCIES += host-dtc +endif + SKIBOOT_MAKE_OPTS += CC="$(TARGET_CC)" LD="$(TARGET_LD)" \ AS="$(TARGET_AS)" AR="$(TARGET_AR)" NM="$(TARGET_NM)" \ OBJCOPY="$(TARGET_OBJCOPY)" OBJDUMP="$(TARGET_OBJDUMP)" \ @@ -37,10 +41,17 @@ endif define SKIBOOT_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) SKIBOOT_VERSION=`cat $(SKIBOOT_VERSION_FILE)` \ $(MAKE) $(SKIBOOT_MAKE_OPTS) -C $(@D) all + + $(if $(BR2_SKIBOOT_DEVICETREE), \ + $(MAKE) -C $(@D)/external/devicetree) endef define SKIBOOT_INSTALL_IMAGES_CMDS $(INSTALL) -D -m 755 $(@D)/skiboot.lid $(BINARIES_DIR) + + $(if $(BR2_SKIBOOT_DEVICETREE), \ + $(INSTALL) -D -m 644 \ + $(@D)/external/devicetree/*.dtb $(BINARIES_DIR)) endef $(eval $(generic-package)) |
