Merge pull request #2666 from shenki/buildroot-2019.02
Buildroot 2019.02
diff --git a/doc/release-notes/index.rst b/doc/release-notes/index.rst
index 3446e7f..a21fa48 100644
--- a/doc/release-notes/index.rst
+++ b/doc/release-notes/index.rst
@@ -46,6 +46,7 @@
v2.0.12
v2.0.13
v2.0.14
+ v2.0.15
v2.1
----
@@ -65,4 +66,3 @@
v2.2-rc1
v2.2-rc2
v2.2
-
diff --git a/doc/release-notes/v2.0.15.rst b/doc/release-notes/v2.0.15.rst
new file mode 100644
index 0000000..c4fa77b
--- /dev/null
+++ b/doc/release-notes/v2.0.15.rst
@@ -0,0 +1,136 @@
+Release Notes for OpenPower Firmware v2.0.15
+============================================
+
+Updated Packages
+----------------
+
++-------------------+------------------+---------------+-----------------------------------------+
+| Package | Old Version | New Version | Platforms |
++===================+==================+===============+=========================================+
+| hcode | hw022419a.op920 | hw031819a.op9 | witherspoon, p9dsu, zaius, romulus |
+| | | 20 | |
++-------------------+------------------+---------------+-----------------------------------------+
+| hostboot | 879d21d3cd70f | c00d44a9ad03 | witherspoon, p9dsu, zaius, romulus |
++-------------------+------------------+---------------+-----------------------------------------+
+| hostboot-binaries | hw022419a.op920 | hw031819a.op9 | witherspoon, p9dsu, zaius, habanero, |
+| | | 20 | garrison, barreleye, firestone, |
+| | | | palmetto, vesnin, romulus |
++-------------------+------------------+---------------+-----------------------------------------+
+| sbe | 9515af0355bc0 | b6ee17b168d8 | witherspoon, p9dsu, zaius, romulus |
++-------------------+------------------+---------------+-----------------------------------------+
+| skiboot | v6.0.18 | v6.0.19 | witherspoon, p9dsu, zaius, habanero, |
+| | | | firenze, garrison, barreleye, |
+| | | | openpower_mambo, witherspoon_dev, |
+| | | | pseries, firestone, palmetto, |
+| | | | openpower_p9_mambo, vesnin, zz, romulus |
++-------------------+------------------+---------------+-----------------------------------------+
+
+Package: hcode
+--------------
+
+`Repository <https://github.com/open-power/hcode>`__
+
+Patches
+~~~~~~~
+
+Commits
+~~~~~~~
+
+hostboot (10):
+
+- `8dda62b91c31 <https://github.com/open-power/hcode/commit/8dda62b91c31>`__ Release tag
+ information updated for hw030819a.op920
+- `efaccccbfa44 <https://github.com/open-power/hcode/commit/efaccccbfa44>`__ Release tag
+ information updated for hw030919a.op920
+- `1113169cfa3c <https://github.com/open-power/hcode/commit/1113169cfa3c>`__ Release tag
+ information updated for hw031019a.op920
+- `e6b6afd59e41 <https://github.com/open-power/hcode/commit/e6b6afd59e41>`__ Release tag
+ information updated for hw031119a.op920
+- `5efba036dd35 <https://github.com/open-power/hcode/commit/5efba036dd35>`__ Release tag
+ information updated for hw031219a.op920
+- `ebc36ceff4a7 <https://github.com/open-power/hcode/commit/ebc36ceff4a7>`__ Release tag
+ information updated for hw031319a.op920
+- `c4a91021e44f <https://github.com/open-power/hcode/commit/c4a91021e44f>`__ Release tag
+ information updated for hw031419a.op920
+- `68ae13f9635c <https://github.com/open-power/hcode/commit/68ae13f9635c>`__ Release tag
+ information updated for hw031619a.op920
+- `60cb47dae2ca <https://github.com/open-power/hcode/commit/60cb47dae2ca>`__ Release tag
+ information updated for hw031719a.op920
+- `478978b7819d <https://github.com/open-power/hcode/commit/478978b7819d>`__ Release tag
+ information updated for hw031819a.op920
+
+Package: hostboot
+-----------------
+
+`Repository <https://github.com/open-power/hostboot>`__
+
+.. _patches-1:
+
+Patches
+~~~~~~~
+
+- `0001-Fix-RC09-ODT-errors-on-Nimbus-dual-drop-configs.patch <https://github.com/open-power/op-build/tree/HEAD/openpower/package/hostboot/0001-Fix-RC09-ODT-errors-on-Nimbus-dual-drop-configs.patch>`__
+- `0007-Disable-warnings-that-crop-up-a-lot-with-GCC6.patch <https://github.com/open-power/op-build/tree/HEAD/openpower/package/hostboot/0007-Disable-warnings-that-crop-up-a-lot-with-GCC6.patch>`__
+- `hostboot-1020-Revert-jgr17071200-Removed-pdwn-settings.patch <https://github.com/open-power/op-build/tree/HEAD/openpower/package/hostboot/hostboot-1020-Revert-jgr17071200-Removed-pdwn-settings.patch>`__
+
+.. _commits-1:
+
+Commits
+~~~~~~~
+
+Christian Geddes (1):
+
+- `a40b4b4f688d <https://github.com/open-power/hostboot/commit/a40b4b4f688d>`__ Load HWAS module
+ earlier in ext init tasks
+
+Jenny Huynh (1):
+
+- `c00d44a9ad03 <https://github.com/open-power/hostboot/commit/c00d44a9ad03>`__ Mask NMMUFIR(7),
+ NMMUFIR(36:39)
+
+Package: sbe
+------------
+
+`Repository <https://github.com/open-power/sbe>`__
+
+.. _patches-2:
+
+Patches
+~~~~~~~
+
+.. _commits-2:
+
+Commits
+~~~~~~~
+
+Jenny Huynh (1):
+
+- `b6ee17b168d8 <https://github.com/open-power/sbe/commit/b6ee17b168d8>`__ Mask NMMUFIR(7),
+ NMMUFIR(36:39)
+
+Package: skiboot
+----------------
+
+`Repository <https://github.com/open-power/skiboot>`__
+
+.. _patches-3:
+
+Patches
+~~~~~~~
+
+.. _commits-3:
+
+Commits
+~~~~~~~
+
+Deb McLemore (2):
+
+- `6fda4bc333e4 <https://github.com/open-power/skiboot/commit/6fda4bc333e4>`__ p9dsu: Fix slot
+ labels for p9dsu2u
+- `af316fed0205 <https://github.com/open-power/skiboot/commit/af316fed0205>`__ p9dsu: Undo slot
+ label name changes
+
+Vasant Hegde (1):
+
+- `3d135fe39a6a <https://github.com/open-power/skiboot/commit/3d135fe39a6a>`__ skiboot v6.0.19
+ release notes
diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/opal_defconfig
similarity index 96%
rename from openpower/configs/openpower_mambo_defconfig
rename to openpower/configs/opal_defconfig
index da413fa..a790aef 100644
--- a/openpower/configs/openpower_mambo_defconfig
+++ b/openpower/configs/opal_defconfig
@@ -45,8 +45,9 @@
# 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/hcode/Config.in b/openpower/package/hcode/Config.in
index 7251bee..b55dfdf 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -31,7 +31,7 @@
config BR2_HCODE_VERSION
string
- default "hw031319a.940" if BR2_HCODE_LATEST_VERSION
+ default "hw032119a.940" if BR2_HCODE_LATEST_VERSION
default BR2_HCODE_CUSTOM_VERSION_VALUE \
if BR2_HCODE_CUSTOM_VERSION
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index 30017f3..3225058 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -25,7 +25,7 @@
config BR2_HOSTBOOT_VERSION
string
- default "10784ce5d02bd321ad576f11d48fa42972a3e468" if BR2_HOSTBOOT_LATEST_VERSION
+ default "086018c231e7f83f02988a587eeeae887e7f2e98" if BR2_HOSTBOOT_LATEST_VERSION
default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_CUSTOM_VERSION
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index d61f6e9..2634ac1 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENPOWER_PNOR_VERSION ?= 0aeae23bd0c68b0a8e2c04b259663867559bb2cb
+OPENPOWER_PNOR_VERSION ?= da0bf1fb24f42e098517ee09f5b29d90bc69c05a
OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
OPENPOWER_PNOR_LICENSE = Apache-2.0
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 3f8c037..b2d0a09 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
config BR2_SKIBOOT_VERSION
string
- default "v6.2-190-gc470806a2e5e" if BR2_SKIBOOT_LATEST_VERSION
+ default "v6.2-204-gb392d785eb49" if BR2_SKIBOOT_LATEST_VERSION
default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
if BR2_SKIBOOT_CUSTOM_VERSION
@@ -42,6 +42,9 @@
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 74c6623..5f3e258 100644
--- a/openpower/package/skiboot/skiboot.mk
+++ b/openpower/package/skiboot/skiboot.mk
@@ -18,6 +18,10 @@
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 @@
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))