diff options
| author | Stewart Smith <stewart@linux.ibm.com> | 2019-03-20 14:06:39 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-20 14:06:39 +1100 |
| commit | c2640ea8297f66029b444dc2ce78a14c677c8130 (patch) | |
| tree | c24c922443f3b0f569e10bda4b9bbb87c96fb04c /openpower | |
| parent | 6b90a7f91efff919db6f9eba83b00e1b5faa6940 (diff) | |
| parent | 92f08be483820f905cbf50450af8798acd597124 (diff) | |
| download | blackbird-op-build-c2640ea8297f66029b444dc2ce78a14c677c8130.tar.gz blackbird-op-build-c2640ea8297f66029b444dc2ce78a14c677c8130.zip | |
Merge pull request #2642 from rarbab/devicetree
Add BR2_SKIBOOT_DEVICETREE
Diffstat (limited to 'openpower')
| -rw-r--r-- | openpower/configs/opal_defconfig (renamed from openpower/configs/openpower_mambo_defconfig) | 3 | ||||
| -rw-r--r-- | openpower/package/skiboot/Config.in | 3 | ||||
| -rw-r--r-- | openpower/package/skiboot/skiboot.mk | 11 |
3 files changed, 16 insertions, 1 deletions
diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/opal_defconfig index da413fae..a790aefe 100644 --- a/openpower/configs/openpower_mambo_defconfig +++ b/openpower/configs/opal_defconfig @@ -45,8 +45,9 @@ BR2_OPENPOWER_POWER8=y # BR2_PACKAGE_HOSTBOOT_BINARIES is not set # BR2_PACKAGE_MACHINE_XML is not set # BR2_PACKAGE_OPENPOWER_PNOR is not set -BR2_OPENPOWER_CONFIG_NAME="openpower-mambo" +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 3f8c037b..a59482a1 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)) |
