Skip to content

Commit f130a1a

Browse files
williamspatrickwilliamspatrick
committed
Merge pull request #218 from open-power/master-next
Merge v1.5 content back to master.
2 parents aa3de96 + 3f7166c commit f130a1a

23 files changed

+496
-49
lines changed

‎openpower/configs/firestone_defconfig‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
BR2_powerpc64=y
1+
BR2_powerpc64le=y
22
BR2_powerpc_power8=y
33
BR2_OPENPOWER_PLATFORM=y
44

5+
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
6+
BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
7+
BR2_TOOLCHAIN_BUILDROOT_CXX=y
8+
# BR2_TOOLCHAIN_BUILDROOT_LIBSTDCPP is not set
9+
510
BR2_OPENPOWER_CONFIG_NAME="firestone"
611
BR2_OPENPOWER_XML_PACKAGE="firestone-xml"
712
BR2_HOSTBOOT_CONFIG_FILE="firestone.config"

‎openpower/configs/garrison_defconfig‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
BR2_powerpc64=y
1+
BR2_powerpc64le=y
22
BR2_powerpc_power8=y
33
BR2_OPENPOWER_PLATFORM=y
44

5+
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
6+
BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
7+
58
BR2_OPENPOWER_CONFIG_NAME="garrison"
69
BR2_OPENPOWER_XML_PACKAGE="garrison-xml"
710
BR2_HOSTBOOT_CONFIG_FILE="garrison.config"

‎openpower/configs/habanero_defconfig‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
BR2_powerpc64=y
1+
BR2_powerpc64le=y
22
BR2_powerpc_power8=y
33
BR2_OPENPOWER_PLATFORM=y
44

5+
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
6+
BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
7+
BR2_TOOLCHAIN_BUILDROOT_CXX=y
8+
# BR2_TOOLCHAIN_BUILDROOT_LIBSTDCPP is not set
9+
510
BR2_OPENPOWER_CONFIG_NAME="habanero"
611
BR2_OPENPOWER_XML_PACKAGE="habanero-xml"
712
BR2_HOSTBOOT_CONFIG_FILE="habanero.config"

‎openpower/configs/linux/skiroot_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ CONFIG_ALTIVEC=y
33
CONFIG_VSX=y
44
CONFIG_SMP=y
55
CONFIG_NR_CPUS=2048
6+
CONFIG_CPU_LITTLE_ENDIAN=y
67
# CONFIG_SWAP is not set
78
CONFIG_SYSVIPC=y
89
CONFIG_POSIX_MQUEUE=y

‎openpower/configs/openpower_mambo_defconfig‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
BR2_powerpc64=y
1+
BR2_powerpc64le=y
22
BR2_powerpc_power8=y
33
BR2_OPENPOWER_PLATFORM=y
44

5+
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
6+
BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
7+
58
# No HostBoot for Mambo
69
BR2_PACKAGE_HOSTBOOT=n
710
BR2_PACKAGE_HOSTBOOT_BINARIES=n
@@ -28,7 +31,7 @@ BR2_ROOTFS_OVERLAY="overlay"
2831
BR2_LINUX_KERNEL=y
2932
BR2_LINUX_KERNEL_CUSTOM_GIT=y
3033
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/open-power/linux.git"
31-
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="dc97a6e626eaf22c9bd4baec3954fa5501ce1c63"
34+
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="d0ff068a9962ba96d4e6ddfba2a4e9fd8bc9a763"
3235
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3336
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
3437
BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y

‎openpower/configs/palmetto_defconfig‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
BR2_powerpc64=y
1+
BR2_powerpc64le=y
22
BR2_powerpc_power8=y
33
BR2_OPENPOWER_PLATFORM=y
44

5+
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
6+
BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
7+
BR2_TOOLCHAIN_BUILDROOT_CXX=y
8+
# BR2_TOOLCHAIN_BUILDROOT_LIBSTDCPP is not set
9+
510
BR2_OPENPOWER_CONFIG_NAME="palmetto"
611
BR2_OPENPOWER_XML_PACKAGE="palmetto-xml"
712
BR2_HOSTBOOT_CONFIG_FILE="palmetto.config"

‎openpower/package/firestone-xml/firestone.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
FIRESTONE_XML_VERSION ?= 5123184b9f26bc1068afb9b57e796aecaf61b249
7+
FIRESTONE_XML_VERSION ?= 7ac1ae80d0f965d39bdee944f89ed5a118d2adc2
88
FIRESTONE_XML_SITE ?= $(call github,open-power,firestone-xml,$(FIRESTONE_XML_VERSION))
99

1010
FIRESTONE_XML_LICENSE = Apache-2.0

‎openpower/package/garrison-xml/garrison.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
GARRISON_XML_VERSION ?= 4f4b2373ff8ef35338c20ab3660a0e4d980aeddd
7+
GARRISON_XML_VERSION ?= 835c3467a37773205960d7b0150a3c360972e178
88
GARRISON_XML_SITE ?= $(call github,open-power,garrison-xml,$(GARRISON_XML_VERSION))
99

1010
GARRISON_XML_LICENSE = Apache-2.0

‎openpower/package/habanero-xml/habanero-xml.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
HABANERO_XML_VERSION ?= 03d911f12311ba884ec9e08a6c114daabfce545a
7+
HABANERO_XML_VERSION ?= b86989fce1e543a07706206f12ef00b0b6a170c7
88
HABANERO_XML_SITE ?= $(call github,open-power,habanero-xml,$(HABANERO_XML_VERSION))
99

1010
HABANERO_XML_LICENSE = Apache-2.0

‎openpower/package/hostboot/hostboot-0003-Fix-handling-of-ECC-protected-partitions-at-runtime.patch‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)