Merge pull request #4 from brs332/master
Add instructions for building on various platforms
diff --git a/README b/README
index d400dc1..f07dfee 100644
--- a/README
+++ b/README
@@ -3,3 +3,48 @@
git clone --recursive git@github.com:open-power/op-build.git
. op-build-env
op-build palmetto_defconfig && op-build
+
+Building on *64-bit* Ubuntu/Debian systems
+==========================================
+
+1. Install Ubuntu 14.04 or Debian 7.5 64-bit.
+2. Install the packages necessary for the build:
+> sudo apt-get install cscope ctags libx-dev libexpat-dev linbc6-dev-i386 gcc g++ git bison flex gcc-multilib g++-multilib
+3. Install PERL modules necessary for the build:
+> cpan install XML::Simple
+4. Override the /bin/dash default shell configuration, you want to answer "no":
+> sudo dpks-reconfigure dash
+5. Continue with the clone, environment setup, and build as noted above.
+
+Building on *64-bit* Fedora systems
+==========================================
+
+1. Install Fedora 20 64-bit.
+2. Install the packages necessary for the build:
+> sudo yum install vim gcc-c++ flex bison git ctags cscope cpan expat-devel patch glibc-devel-i686 libgcc.i686 zlib-devel libstdc++.i686
+3. Install PERL modules necessary for the build:
+> cpan install XML::Simple YAML XML::SAX Fatal Thread/Queue.pm Env
+
+Troubleshooting
+===============
+
+* If git is complaining about permissions when you clone op-build, try:
+> git clone --recursive git@github.com:open-power/op-build.git
+> cd op-build
+> git clone --recursive git@github.com:open-power/buildroot.git
+
+** or
+
+> git clone --recursive https://github.com/open-power/op-build.git
+> cd op-build
+> git clone --recursive https://github.com/open-power/buildroot.git
+
+(thanks to Erich Hauptli at IBM)
+
+* If make is complaining during skiboot link phases, revert make to version 3.81
+-- On Fedora
+--> sudo rpm -del --nodeps make
+--> sudo wget ftp://fr2.rpmfind.net/linux/centos/6.5/os/x86_64/Packages/make-3.81-20.el6.x86_64.rpm
+--> sudo rpm --install make-3.81-20.el6.x86_64.rpm
+
+(instructions for make reversion from http://curiositydrivendevelopment.blogspot.com)
\ No newline at end of file
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index ee5146c..cf2f069 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -10,7 +10,7 @@
BR2_OPENPOWER_TARGETING_SYSTEM_XML_FILENAME="PALMETTO_hb.system.xml"
BR2_OPENPOWER_TARGETING_MRW_XML_FILENAME="PALMETTO_hb.mrw.xml"
-BR2_OPENPOWER_TARGETING_BIN_FILENAME="PALMETTO_HB.targeting.bin"
+BR2_OPENPOWER_TARGETING_BIN_FILENAME="PALMETTO_HB.targeting.bin.ecc"
BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="PalmettoPnorLayout.xml"
BR2_OPENPOWER_PNOR_FILENAME="palmetto.pnor"
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index c6941fa..88a34a6 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -4,7 +4,7 @@
#
################################################################################
-HOSTBOOT_BINARIES_VERSION = d4702ceb2b55bc9cba6b80b1088f61d9b65b3c1c
+HOSTBOOT_BINARIES_VERSION = ff413007856b29b351250d63cce8996489083d26
HOSTBOOT_BINARIES_SITE = $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION))
HOSTBOOT_BINARIES_LICENSE = Apache-2.0
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 62c9a69..aedf750 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -4,10 +4,10 @@
#
################################################################################
-OPENPOWER_PNOR_VERSION = a7f9b25eb1e7fac405bc1a54597cfc812a07fb3f
+OPENPOWER_PNOR_VERSION = cbbad9d46f77de6e9e845561ed6bea6d55cb862c
OPENPOWER_PNOR_SITE = $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
OPENPOWER_PNOR_LICENSE = Apache-2.0
-OPENPOWER_PNOR_DEPENDENCIES = hostboot hostboot-binaries openpower-targeting skiboot host-openpower-ffs
+OPENPOWER_PNOR_DEPENDENCIES = hostboot hostboot-binaries openpower-targeting skiboot host-openpower-ffs
OPENPOWER_PNOR_INSTALL_IMAGES = YES
OPENPOWER_PNOR_INSTALL_TARGET = NO