Merge pull request #4 from bofferdn/fix-config-and-occ
Update p10 Rainier config and OCC version handling
diff --git a/openpower/configs/hostboot/rainier.config b/openpower/configs/hostboot/rainier.config
index d89b3e5..c8c34e4 100755
--- a/openpower/configs/hostboot/rainier.config
+++ b/openpower/configs/hostboot/rainier.config
@@ -80,5 +80,4 @@
# (relies on BMC to not trigger reboot)
#unset HANG_ON_MFG_SRC_TERM
-# This is not working in P10 op-build
-unset ENABLE_HDAT_IN_HOSTBOOT
+set ENABLE_HDAT_IN_HOSTBOOT
diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index b99d3e5..61bb027 100644
--- a/openpower/configs/rainier_defconfig
+++ b/openpower/configs/rainier_defconfig
@@ -48,7 +48,7 @@
BR2_OPENPOWER_POWER10=y
BR2_HOSTBOOT_P10_CONFIG_FILE="rainier.config"
BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT=y
-BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT_VALUE="https://github.ibm.com/openbmc/rainier-xml.git"
+BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
BR2_OPENPOWER_MACHINE_XML_VERSION="fe847e5b43f721b8869100a160b423179b047751"
BR2_OPENPOWER_MACHINE_XML_FILENAME="Rainier-4U-MRW.xml"
BR2_OPENPOWER_SYSTEM_XML_FILENAME="RAINIER_hb.system.xml"
diff --git a/openpower/package/hcode-p10/hcode-p10.mk b/openpower/package/hcode-p10/hcode-p10.mk
index 8d2a43e..db59ad0 100644
--- a/openpower/package/hcode-p10/hcode-p10.mk
+++ b/openpower/package/hcode-p10/hcode-p10.mk
@@ -8,7 +8,7 @@
HCODE_P10_SITE = $(call github,open-power,hcode,$(HCODE_P10_VERSION))
# TODO: Need to comment out above line and enable next two lines
# once buildable P10 HCODE is available in GHE
-#HCODE_P10_SITE = https://github.ibm.com/open-power/hcode.git
+#HCODE_P10_SITE = git@github.ibm.com:open-power/hcode.git
#HCODE_P10_SITE_METHOD=git
HCODE_P10_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot-p10/Config.in b/openpower/package/hostboot-p10/Config.in
index d65776a..546012d 100644
--- a/openpower/package/hostboot-p10/Config.in
+++ b/openpower/package/hostboot-p10/Config.in
@@ -25,7 +25,7 @@
config BR2_HOSTBOOT_P10_VERSION
string
- default "1aed986c145918dfee4d60f433e69280fd718d72" if BR2_HOSTBOOT_P10_LATEST_VERSION
+ default "48dcad62ebaea1d1e139533ca21c3b65ef03c12d" if BR2_HOSTBOOT_P10_LATEST_VERSION
default BR2_HOSTBOOT_P10_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_P10_CUSTOM_VERSION
diff --git a/openpower/package/hostboot-p10/hostboot-p10.mk b/openpower/package/hostboot-p10/hostboot-p10.mk
index 20a6f32..cd8f09a 100644
--- a/openpower/package/hostboot-p10/hostboot-p10.mk
+++ b/openpower/package/hostboot-p10/hostboot-p10.mk
@@ -8,7 +8,7 @@
# TODO: WORKAROUND: Need to reenable next line and comment out the two lines
# after that, when code is propagated to a public repo
#HOSTBOOT_P10_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_P10_VERSION))
-HOSTBOOT_P10_SITE = https://github.ibm.com/open-power/hostboot.git
+HOSTBOOT_P10_SITE = git@github.ibm.com:open-power/hostboot.git
HOSTBOOT_P10_SITE_METHOD=git
HOSTBOOT_P10_LICENSE = Apache-2.0
diff --git a/openpower/package/occ-p10/occ-p10.mk b/openpower/package/occ-p10/occ-p10.mk
index e69ff2e..be927fd 100644
--- a/openpower/package/occ-p10/occ-p10.mk
+++ b/openpower/package/occ-p10/occ-p10.mk
@@ -8,7 +8,7 @@
# TODO: WORKAROUND: Need to reenable next line and comment out the two lines
# after that, when code is propagated to a public repo
#OCC_P10_SITE ?= $(call github,open-power,occ,$(OCC_P10_VERSION))
-OCC_P10_SITE = https://github.ibm.com/open-power/occ.git
+OCC_P10_SITE = git@github.ibm.com:open-power/occ.git
OCC_P10_SITE_METHOD=git
OCC_P10_LICENSE = Apache-2.0
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 71ca734..6aad67f 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -9,7 +9,7 @@
# TODO: WORKAROUND: Need to reenable next line and comment out the two lines
# after that, when code is propagated to a public repo
#OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
-OPENPOWER_PNOR_SITE = https://github.ibm.com/open-power/pnor.git
+OPENPOWER_PNOR_SITE = git@github.ibm.com:open-power/pnor.git
OPENPOWER_PNOR_SITE_METHOD=git
OPENPOWER_PNOR_LICENSE = Apache-2.0
diff --git a/openpower/package/sbe-p10/sbe-p10.mk b/openpower/package/sbe-p10/sbe-p10.mk
index 35af089..4c66358 100644
--- a/openpower/package/sbe-p10/sbe-p10.mk
+++ b/openpower/package/sbe-p10/sbe-p10.mk
@@ -8,7 +8,7 @@
# TODO: WORKAROUND: Need to reenable next line and comment out the two lines
# after that, when code is propagated to a public repo
#SBE_P10_SITE = $(call github,open-power,sbe,$(SBE_P10_VERSION))
-SBE_P10_SITE = https://github.ibm.com/open-power/sbe.git
+SBE_P10_SITE = git@github.ibm.com:open-power/sbe.git
SBE_P10_SITE_METHOD=git
SBE_P10_LICENSE = Apache-2.0