[PATCH openbmc 1/2] linux-obmc: Remove unnecessary config patches

OpenBMC Patches patches at stwcx.xyz
Fri Oct 16 23:20:45 AEDT 2015


From: Jeremy Kerr <jk at ozlabs.org>

These are both present in the current linux tree.

Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
---
 .../recipes-kernel/linux/linux-obmc/initrd-source.patch       | 11 -----------
 .../common/recipes-kernel/linux/linux-obmc/systemd-reqs.patch |  8 --------
 meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.2.bb   |  1 -
 3 files changed, 20 deletions(-)
 delete mode 100644 meta-phosphor/common/recipes-kernel/linux/linux-obmc/initrd-source.patch
 delete mode 100644 meta-phosphor/common/recipes-kernel/linux/linux-obmc/systemd-reqs.patch

diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/initrd-source.patch b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/initrd-source.patch
deleted file mode 100644
index a685df5..0000000
--- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/initrd-source.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/arm/configs/aspeed_defconfig
-+++ b/arch/arm/configs/aspeed_defconfig
-@@ -6,7 +6,7 @@ CONFIG_SYSVIPC=y
- CONFIG_IRQ_DOMAIN_DEBUG=y
- CONFIG_LOG_BUF_SHIFT=14
- CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE="~/ibm/openbmc/buildroot-arm-rootfs.cpio.gz"
-+CONFIG_INITRAMFS_SOURCE=""
- CONFIG_CC_OPTIMIZE_FOR_SIZE=y
- CONFIG_KALLSYMS_ALL=y
- CONFIG_EMBEDDED=y
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/systemd-reqs.patch b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/systemd-reqs.patch
deleted file mode 100644
index f6530d7..0000000
--- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/systemd-reqs.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/arch/arm/configs/aspeed_defconfig
-+++ b/arch/arm/configs/aspeed_defconfig
-@@ -192,3 +192,5 @@ CONFIG_CRYPTO_GHASH=y
- # CONFIG_CRYPTO_HW is not set
- CONFIG_CRC_CCITT=y
- CONFIG_AVERAGE=y
-+CONFIG_CGROUPS=y
-+CONFIG_FHANDLE=y
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.2.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.2.bb
index b38d1a8..3e5bc94 100644
--- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.2.bb
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.2.bb
@@ -5,7 +5,6 @@ LICENSE = "GPLv2"
 KBRANCH ?= "dev"
 
 SRC_URI = "git://github.com/openbmc/linux;protocol=git;branch=${KBRANCH}"
-SRC_URI += "file://systemd-reqs.patch file://initrd-source.patch"
 SRC_URI += "file://obmc-bsp.scc \
             file://obmc-bsp.cfg \
             file://obmc-bsp-user-config.cfg \
-- 
2.6.0




More information about the openbmc mailing list