From 7e1b35fc0f1734f7b90e729927bbabbddf818f10 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Wed, 17 May 2017 17:09:07 +0000
Subject: [PATCH] main/linux-vanilla: fix config file for ppc64le

vmlinuz 4.9.28 was not booting on ppc64le because some configurations
was missing in ppc64le config file.

The most important configurations that were missing are:
CONFIG_PPC_OF_BOOT_TRAMPOLINE and CONFIG_PPC_PSERIES.

Another configurations were consequently added because of these
two configurations.
---
 main/linux-vanilla/APKBUILD               |  4 +-
 main/linux-vanilla/config-vanilla.ppc64le | 74 ++++++++++++++++++++---
 2 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index d9b7bcda2fd1..4e372011a3b2 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux vanilla kernel"
 url="http://kernel.org"
 depends="mkinitfs linux-firmware"
@@ -177,6 +177,6 @@ sha512sums="bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a
 30c585d679b96571149ecf80c66a074059923c191cc9eebbca8cbcdff98e08b354cff954354723f2ff5db23166ce947bce5b0c4c47bd439b3e7840057cab08ac  config-vanilla.x86
 3f251c092ab5bfeb9d3cd013d6462196f0780c9b10dc0530f113d5573a8e379fe6761509b5970e7897e42a52dabd03c653b4060b478d641b13a2cca25d3b5a11  config-vanilla.x86_64
 ee565e219530bcfaf5cade2622432cfb83743bdbbfc388781901461f19ca553b7fdee3c81ce6b34225ef78a209eb60088630284fcbb0430947aad77a5d8a0865  config-vanilla.ppc
-cb6baaa4d081a802d09dd6a71c7ad008e6141fd220618cf629e3b16058cbe745b5c9a4307989b01c33537e7e6e22204487eaef0d77286d64727e0af0d9d6b8f8  config-vanilla.ppc64le
+05f2917b641eb9902831ea8c859cbf8d0267eb909d262ab2c796982ccf659c588fdef75e2177b09905cc9d87bc2ec2412c99b8e245b53ffa09c3964571fc4df6  config-vanilla.ppc64le
 040ded4603acd7d72227b8ea648876118f647d5750331c68419f057def3da4e751a13e8d73ae6d2f040e8a2eedd128415d9cf75420c1e3d5314910d11c705d95  config-vanilla.s390x
 ff1c42e7a1e686c4e3018a7c0f2d7af6cb98001cdb31c9cc375409e53efda8236fb4078c4c66993b75a73026e661ca58800aef14d12dd88ff94d24505be69149  patch-4.9.28.xz"
diff --git a/main/linux-vanilla/config-vanilla.ppc64le b/main/linux-vanilla/config-vanilla.ppc64le
index 16138dd379a8..afd3671b2357 100644
--- a/main/linux-vanilla/config-vanilla.ppc64le
+++ b/main/linux-vanilla/config-vanilla.ppc64le
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.9.26 Kernel Configuration
+# Linux/powerpc 4.9.28 Kernel Configuration
 #
 CONFIG_PPC64=y
 
@@ -58,6 +58,7 @@ CONFIG_GENERIC_BUG=y
 CONFIG_EPAPR_BOOT=y
 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
 # CONFIG_PPC_OF_PLATFORM_PCI is not set
@@ -120,6 +121,7 @@ CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ_COMMON=y
 # CONFIG_HZ_PERIODIC is not set
 CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 
@@ -129,6 +131,7 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
 # CONFIG_TICK_CPU_ACCOUNTING is not set
 CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
@@ -196,6 +199,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BPF=y
 # CONFIG_EXPERT is not set
 CONFIG_MULTIUSER=y
@@ -210,6 +214,7 @@ CONFIG_PRINTK=y
 CONFIG_PRINTK_NMI=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -272,6 +277,7 @@ CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
 # CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
@@ -363,8 +369,8 @@ CONFIG_FREEZER=y
 CONFIG_PPC_MSI_BITMAP=y
 CONFIG_PPC_XICS=y
 CONFIG_PPC_ICP_NATIVE=y
-# CONFIG_PPC_ICP_HV is not set
-# CONFIG_PPC_ICS_RTAS is not set
+CONFIG_PPC_ICP_HV=y
+CONFIG_PPC_ICS_RTAS=y
 CONFIG_PPC_SCOM=y
 # CONFIG_SCOM_DEBUGFS is not set
 # CONFIG_GE_FPGA is not set
@@ -374,24 +380,39 @@ CONFIG_PPC_SCOM=y
 #
 CONFIG_PPC_POWERNV=y
 CONFIG_OPAL_PRD=y
-# CONFIG_PPC_PSERIES is not set
+CONFIG_PPC_PSERIES=y
+# CONFIG_PPC_SPLPAR is not set
+CONFIG_PSERIES_ENERGY=y
+# CONFIG_SCANLOG is not set
+CONFIG_IO_EVENT_IRQ=y
+# CONFIG_LPARCFG is not set
+# CONFIG_PPC_SMLPAR is not set
+CONFIG_HV_PERF_CTRS=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PQ2ADS is not set
 # CONFIG_KVM_GUEST is not set
 # CONFIG_EPAPR_PARAVIRT is not set
 CONFIG_PPC_NATIVE=y
-# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
+CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
+# CONFIG_UDBG_RTAS_CONSOLE is not set
 CONFIG_PPC_SMP_MUXED_IPI=y
 # CONFIG_IPIC is not set
-# CONFIG_MPIC is not set
+CONFIG_MPIC=y
 # CONFIG_PPC_EPAPR_HV_PIC is not set
 # CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
+# CONFIG_MPIC_MSGR is not set
+CONFIG_PPC_I8259=y
 # CONFIG_U3_DART is not set
-# CONFIG_PPC_RTAS is not set
+CONFIG_PPC_RTAS=y
+CONFIG_RTAS_ERROR_LOGGING=y
+CONFIG_PPC_RTAS_DAEMON=y
+CONFIG_RTAS_PROC=y
+CONFIG_RTAS_FLASH=m
 # CONFIG_MMIO_NVRAM is not set
 # CONFIG_MPIC_U3_HT_IRQS is not set
+CONFIG_IBMVIO=y
+CONFIG_IBMEBUS=y
 CONFIG_EEH=y
 # CONFIG_PPC_MPC106 is not set
 # CONFIG_PPC_970_NAP is not set
@@ -437,6 +458,7 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 #
 # POWERPC CPU Idle Drivers
 #
+CONFIG_PSERIES_CPUIDLE=y
 CONFIG_POWERNV_CPUIDLE=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 # CONFIG_FSL_ULI1575 is not set
@@ -485,6 +507,7 @@ CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 CONFIG_HAVE_MEMORYLESS_NODES=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_SPARSEMEM_MANUAL=y
@@ -542,7 +565,13 @@ CONFIG_SCHED_SMT=y
 CONFIG_PPC_DENORMALISATION=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_EXTRA_TARGETS=""
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
 # CONFIG_HIBERNATION is not set
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
@@ -575,6 +604,8 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
 CONFIG_HOTPLUG_PCI_POWERNV=y
+CONFIG_HOTPLUG_PCI_RPA=m
+CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
 
 #
 # PCI host controller drivers
@@ -1261,6 +1292,9 @@ CONFIG_SCSI_SMARTPQI=m
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_GDTH is not set
 # CONFIG_SCSI_IPS is not set
+CONFIG_SCSI_IBMVSCSI=m
+CONFIG_SCSI_IBMVFC=m
+CONFIG_SCSI_IBMVFC_TRACE=y
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set
 # CONFIG_SCSI_PPA is not set
@@ -1457,6 +1491,17 @@ CONFIG_S2IO=m
 # CONFIG_VXGE is not set
 CONFIG_NET_VENDOR_HP=y
 # CONFIG_HP100 is not set
+CONFIG_NET_VENDOR_IBM=y
+CONFIG_IBMVETH=m
+# CONFIG_IBM_EMAC_ZMII is not set
+# CONFIG_IBM_EMAC_RGMII is not set
+# CONFIG_IBM_EMAC_TAH is not set
+# CONFIG_IBM_EMAC_EMAC4 is not set
+# CONFIG_IBM_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_EHEA is not set
+CONFIG_IBMVNIC=m
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E100=y
 CONFIG_E1000=y
@@ -1692,6 +1737,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
 # CONFIG_INPUT_BMA150 is not set
 # CONFIG_INPUT_E3X0_BUTTON is not set
+# CONFIG_INPUT_PCSPKR is not set
 # CONFIG_INPUT_MMA8450 is not set
 # CONFIG_INPUT_MPU3050 is not set
 # CONFIG_INPUT_ATI_REMOTE2 is not set
@@ -1736,6 +1782,7 @@ CONFIG_TTY=y
 CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
@@ -1773,6 +1820,7 @@ CONFIG_SERIAL_8250_FSL=y
 # CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_ICOM is not set
 CONFIG_SERIAL_JSM=m
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
@@ -1787,9 +1835,14 @@ CONFIG_SERIAL_JSM=m
 # CONFIG_PPDEV is not set
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
+CONFIG_HVC_CONSOLE=y
+CONFIG_HVC_OLD_HVSI=y
 CONFIG_HVC_OPAL=y
+CONFIG_HVC_RTAS=y
 # CONFIG_HVC_UDBG is not set
+CONFIG_HVCS=y
 CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IBM_BSR=m
 CONFIG_POWERNV_OP_PANEL=m
 CONFIG_IPMI_HANDLER=y
 # CONFIG_IPMI_PANIC_EVENT is not set
@@ -1802,6 +1855,7 @@ CONFIG_IPMI_POWERNV=y
 CONFIG_HW_RANDOM=m
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_HW_RANDOM_VIRTIO is not set
+CONFIG_HW_RANDOM_PSERIES=m
 CONFIG_HW_RANDOM_POWERNV=m
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
@@ -2695,6 +2749,8 @@ CONFIG_VIRTIO_BALLOON=m
 #
 # Clock Source drivers
 #
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
 # CONFIG_ATMEL_PIT is not set
 # CONFIG_SH_TIMER_CMT is not set
 # CONFIG_SH_TIMER_MTU2 is not set
@@ -3280,6 +3336,7 @@ CONFIG_IO_STRICT_DEVMEM=y
 # CONFIG_PPC_DISABLE_WERROR is not set
 CONFIG_PPC_WERROR=y
 CONFIG_PRINT_STACK_DEPTH=64
+# CONFIG_HCALL_STATS is not set
 # CONFIG_PPC_EMULATED_STATS is not set
 CONFIG_CODE_PATCHING_SELFTEST=y
 CONFIG_JUMP_LABEL_FEATURE_CHECKS=y
@@ -3462,6 +3519,7 @@ CONFIG_CRYPTO_JITTERENTROPY=m
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_NX_COMPRESS=y
+CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=y
 CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=y
 # CONFIG_CRYPTO_DEV_VMX is not set
 # CONFIG_CRYPTO_DEV_CHELSIO is not set
-- 
GitLab