Skip to content

Commit 67e7718

Browse files
williamspatrickwilliamspatrick
authored
Merge pull request #833 from open-power/master-next
Merge master-next to master for v1.14
2 parents 91bd19d + d97245d commit 67e7718

File tree

64 files changed

+609
-1953
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+609
-1953
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "buildroot"]
22
path = buildroot
3-
branch = 2016.08-op-build
3+
branch = 2016.11-op-build
44
url = https://github.com/open-power/buildroot

‎buildroot‎

Submodule buildroot updated 1872 files

‎openpower/Config.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
menu "OpenPower"
22

3-
source "$BR2_EXTERNAL/platform/Config.in"
3+
source "$BR2_EXTERNAL_OP_BUILD_PATH/platform/Config.in"
44

55
menu "OpenPower Packages"
66
if BR2_OPENPOWER_PLATFORM
7-
source "$BR2_EXTERNAL/package/Config.in"
7+
source "$BR2_EXTERNAL_OP_BUILD_PATH/package/Config.in"
88
endif
99
endmenu
1010

1111
menu "Custom Packages"
12-
source "$BR2_EXTERNAL/custom/Config.in"
12+
source "$BR2_EXTERNAL_OP_BUILD_PATH/custom/Config.in"
1313
endmenu
1414

1515
endmenu

‎openpower/configs/barreleye_defconfig‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
BR2_powerpc64le=y
22
BR2_powerpc_power8=y
33
BR2_KERNEL_HEADERS_4_4=y
4-
BR2_BINUTILS_VERSION_2_26_X=y
4+
BR2_GLIBC_VERSION_2_24=y
5+
BR2_BINUTILS_VERSION_2_27_X=y
56
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
67
BR2_GCC_VERSION_6_X=y
78
BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
@@ -16,11 +17,12 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
1617
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
1718
BR2_LINUX_KERNEL=y
1819
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
19-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.39"
20-
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
20+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.4"
21+
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
2122
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
22-
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
23+
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
2324
BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
25+
BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"
2426
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
2527
BR2_PACKAGE_LINUX_FIRMWARE=y
2628
BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y

‎openpower/configs/busybox.fragment‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CONFIG_FEATURE_TFTP_PROGRESS_BAR=y

‎openpower/configs/firenze_defconfig‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
BR2_powerpc64le=y
22
BR2_powerpc_power8=y
33
BR2_KERNEL_HEADERS_4_4=y
4-
BR2_BINUTILS_VERSION_2_26_X=y
4+
BR2_GLIBC_VERSION_2_24=y
5+
BR2_BINUTILS_VERSION_2_27_X=y
56
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
67
BR2_GCC_VERSION_6_X=y
78
BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
@@ -15,11 +16,12 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
1516
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
1617
BR2_LINUX_KERNEL=y
1718
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
18-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.39"
19-
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
19+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.4"
20+
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
2021
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
21-
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
22+
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
2223
BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
24+
BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"
2325
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
2426
BR2_PACKAGE_LINUX_FIRMWARE=y
2527
BR2_PACKAGE_LINUX_FIRMWARE_RADEON=y

‎openpower/configs/firestone_defconfig‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
BR2_powerpc64le=y
22
BR2_powerpc_power8=y
33
BR2_KERNEL_HEADERS_4_4=y
4-
BR2_BINUTILS_VERSION_2_26_X=y
4+
BR2_GLIBC_VERSION_2_24=y
5+
BR2_BINUTILS_VERSION_2_27_X=y
56
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
67
BR2_GCC_VERSION_6_X=y
78
BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
@@ -16,11 +17,12 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
1617
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
1718
BR2_LINUX_KERNEL=y
1819
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
19-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.39"
20-
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
20+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.4"
21+
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
2122
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
22-
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
23+
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
2324
BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
25+
BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"
2426
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
2527
BR2_PACKAGE_LINUX_FIRMWARE=y
2628
BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y

‎openpower/configs/garrison_defconfig‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
BR2_powerpc64le=y
22
BR2_powerpc_power8=y
33
BR2_KERNEL_HEADERS_4_4=y
4-
BR2_BINUTILS_VERSION_2_26_X=y
4+
BR2_GLIBC_VERSION_2_24=y
5+
BR2_BINUTILS_VERSION_2_27_X=y
56
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
67
BR2_GCC_VERSION_6_X=y
78
BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
@@ -16,11 +17,12 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
1617
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
1718
BR2_LINUX_KERNEL=y
1819
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
19-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.39"
20-
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
20+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.4"
21+
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
2122
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
22-
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
23+
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
2324
BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
25+
BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"
2426
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
2527
BR2_PACKAGE_LINUX_FIRMWARE=y
2628
BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y

‎openpower/configs/habanero_defconfig‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
BR2_powerpc64le=y
22
BR2_powerpc_power8=y
33
BR2_KERNEL_HEADERS_4_4=y
4-
BR2_BINUTILS_VERSION_2_26_X=y
4+
BR2_GLIBC_VERSION_2_24=y
5+
BR2_BINUTILS_VERSION_2_27_X=y
56
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
67
BR2_GCC_VERSION_6_X=y
78
BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
@@ -16,11 +17,12 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
1617
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
1718
BR2_LINUX_KERNEL=y
1819
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
19-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.39"
20-
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
20+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.4"
21+
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
2122
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
22-
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
23+
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
2324
BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
25+
BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"
2426
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
2527
BR2_PACKAGE_LINUX_FIRMWARE=y
2628
BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y

‎openpower/configs/hostboot/zaius.config‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# The Serial Flash Controller is the AST2500 BMC.
2+
set SFC_IS_AST2500
3+
unset SFC_IS_AST2400
4+
unset BMC_DOES_SFC_INIT
5+
unset SFC_IS_IBM_DPSS
6+
set ALLOW_MICRON_PNOR
7+
set ALLOW_MACRONIX_PNOR
8+
9+
# VPD options.
10+
set MVPD_READ_FROM_HW
11+
set MVPD_WRITE_TO_HW
12+
set MVPD_READ_FROM_PNOR
13+
set MVPD_WRITE_TO_PNOR
14+
set DJVPD_READ_FROM_HW
15+
set DJVPD_WRITE_TO_HW
16+
set DJVPD_READ_FROM_PNOR
17+
set DJVPD_WRITE_TO_PNOR
18+
unset MEMVPD_READ_FROM_HW
19+
unset MEMVPD_WRITE_TO_HW
20+
set MEMVPD_READ_FROM_PNOR
21+
set MEMVPD_WRITE_TO_PNOR
22+
unset PVPD_READ_FROM_HW
23+
unset PVPD_WRITE_TO_HW
24+
set PVPD_READ_FROM_PNOR
25+
set PVPD_WRITE_TO_PNOR
26+
unset CDIMM_FORMAT_FOR_CVPD
27+
28+
# gpio config
29+
set GPIODD
30+
unset PALMETTO_VDDR
31+
32+
# Disable SBE updates
33+
unset SBE_UPDATE_INDEPENDENT
34+
unset SBE_UPDATE_SEQUENTIAL
35+
set NO_SBE_UPDATES
36+
37+
unset PCIE_HOTPLUG_CONTROLLER
38+
39+
# turn on console output
40+
set CONSOLE
41+
set BMC_AST2500
42+
43+
set DISABLE_HOSTBOOT_RUNTIME
44+
45+
# Compile in hostboot runtime PRD
46+
set HBRT_PRD
47+
unset HTMGT
48+
unset START_OCC_DURING_BOOT
49+
50+
#PNOR flags
51+
unset PNOR_TWO_SIDE_SUPPORT
52+
53+
unset BMC_BT_LPC_IPMI
54+
55+
# Disable Checktop Analysis
56+
unset ENABLE_CHECKSTOP_ANALYSIS
57+
unset IPLTIME_CHECKSTOP_ANALYSIS
58+
59+
# Hostboot will not detect hardware changes
60+
unset HOST_HCDB_SUPPORT
61+
62+
# set for trace debug to console
63+
set CONSOLE_OUTPUT_TRACE
64+
65+
unset CONFIG_SECUREBOOT
66+
unset CONFIG_TPMDD
67+
unset CONFIG_TPM_NUVOTON

0 commit comments

Comments
 (0)