Merge pull request #253 from stewart-ibm/fix-rebuild-initramfs-deps
Use linux-rebuild-with-initramfs rather than linux26
diff --git a/buildroot b/buildroot
index 80a2f83..19f7e28 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit 80a2f83e60f3fd21a38e2bc9aac149f2c3a9ffdd
+Subproject commit 19f7e285a6c50a490b842e7cfac91bb98659bf41
diff --git a/openpower/configs/hostboot/garrison.config b/openpower/configs/hostboot/garrison.config
index c78bc7a..530a0a1 100755
--- a/openpower/configs/hostboot/garrison.config
+++ b/openpower/configs/hostboot/garrison.config
@@ -42,9 +42,9 @@
set KINGSTON_1_35_VOLT
set NO_DMI_EREPAIR
-set DISABLE_HOSTBOOT_RUNTIME
-unset HTMGT
-unset START_OCC_DURING_BOOT
+unset DISABLE_HOSTBOOT_RUNTIME
+set HTMGT
+set START_OCC_DURING_BOOT
#PNOR flags
set PNOR_TWO_SIDE_SUPPORT
diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index 648de48..8aafe5a 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -1,5 +1,7 @@
CONFIG_PPC64=y
CONFIG_ALTIVEC=y
+CONFIG_PPC_POWERNV_RTAS=n
+CONFIG_PPC_PSERIES=n
CONFIG_VSX=y
CONFIG_SMP=y
CONFIG_NR_CPUS=2048
@@ -7,8 +9,8 @@
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT=n
+CONFIG_AUDITSYSCALL=n
CONFIG_IRQ_DOMAIN_DEBUG=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
@@ -62,6 +64,7 @@
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_IOSCHED_DEADLINE=n
CONFIG_ATA_OVER_ETH=y
CONFIG_VIRTIO_BLK=y
CONFIG_EEPROM_AT24=y
@@ -78,7 +81,6 @@
CONFIG_SCSI_BNX2_ISCSI=y
CONFIG_BE2ISCSI=y
CONFIG_SCSI_MPT2SAS=y
-CONFIG_SCSI_IBMVSCSI=y
CONFIG_SCSI_SYM53C8XX_2=y
CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
CONFIG_SCSI_IPR=y
@@ -120,7 +122,6 @@
CONFIG_CHELSIO_T1=y
CONFIG_BE2NET=y
CONFIG_S2IO=y
-CONFIG_IBMVETH=y
CONFIG_E100=y
CONFIG_E1000=y
CONFIG_E1000E=y
@@ -176,14 +177,8 @@
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_PCI=y
# CONFIG_IOMMU_SUPPORT is not set
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XIP=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT2_FS=n
+CONFIG_EXT3_FS=n
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
@@ -209,7 +204,18 @@
CONFIG_NLS_ASCII=y
CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_UTF8=y
-# CONFIG_XZ_DEC_POWERPC is not set
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_DECOMPRESS_LZO=n
+CONFIG_DECOMPRESS_LZ4=n
+CONFIG_DECOMPRESS_GZIP=n
+CONFIG_DECOMPRESS_BZIP2=n
+CONFIG_DECOMPRESS_LZMA=n
+CONFIG_RD_GZIP=n
+CONFIG_RD_BZIP2=n
+CONFIG_RD_LZMA=n
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=n
+CONFIG_RD_LZ4=n
CONFIG_PRINTK_TIME=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
@@ -222,3 +228,5 @@
CONFIG_XMON_DEFAULT=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
# CONFIG_CRYPTO_HW is not set
+CONFIG_CRYPTO_DES=n
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
diff --git a/openpower/package/garrison-xml/garrison.mk b/openpower/package/garrison-xml/garrison.mk
index 55d1d5f..4c07ca0 100644
--- a/openpower/package/garrison-xml/garrison.mk
+++ b/openpower/package/garrison-xml/garrison.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GARRISON_XML_VERSION ?= 4410e63e97a388e156082d5bcb0325c0bbf670ad
+GARRISON_XML_VERSION ?= ec525e1d5f869a94c278b4cf9b7a0ec1dfeb5abe
GARRISON_XML_SITE ?= $(call github,open-power,garrison-xml,$(GARRISON_XML_VERSION))
GARRISON_XML_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 431bd2e..a934119 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
#
################################################################################
-HOSTBOOT_VERSION ?= 6e0eea061a5b8463c593a56c09accf1824fd9818
+HOSTBOOT_VERSION ?= 6ff3e00062b894a880937ce41f748e26105b579a
HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
HOSTBOOT_LICENSE = Apache-2.0
diff --git a/openpower/package/occ/occ.mk b/openpower/package/occ/occ.mk
index 2dcc253..0dd5d48 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OCC_VERSION ?= 0726e692d4eea5465f0509bb9f12185745a77ca9
+OCC_VERSION ?= 94276061f084a3dcad0d6cb8877799706fdebed1
OCC_SITE ?= $(call github,open-power,occ,$(OCC_VERSION))
OCC_LICENSE = Apache-2.0
OCC_DEPENDENCIES = host-binutils host-p8-pore-binutils