[PATCH openbmc 5/7] Move Palmetto specific metadata to Palmetto layer
OpenBMC Patches
patches at stwcx.xyz
Tue Oct 13 01:16:38 AEDT 2015
From: Brad Bishop <bradleyb at us.ibm.com>
---
.../meta-aspeed/meta-ast2400/conf/layer.conf | 4 ----
.../meta-ast2400/conf/machine/include/ast2400.inc | 1 -
.../recipes-kernel/linux/linux-obmc.bbappend | 3 ---
.../recipes-kernel/linux/linux-obmc/0000-config.patch | 17 -----------------
meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes.txt | 1 -
5 files changed, 26 deletions(-)
delete mode 100644 meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc.bbappend
delete mode 100644 meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/0000-config.patch
delete mode 100644 meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes.txt
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf
index ce5a49b..a12e3f4 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf
@@ -1,9 +1,5 @@
# We have a conf and classes directory, add to BBPATH
BBPATH .= ":${LAYERDIR}"
-# We have a recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
- ${LAYERDIR}/recipes-*/*/*.bbappend"
-
BBFILE_COLLECTIONS += "ast2400"
BBFILE_PATTERN_ast2400 = ""
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
index 492b473..58af4bb 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
@@ -3,7 +3,6 @@
#@DESCRIPTION: Common machine configuration for the Aspeed AST2400 Chip
PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc"
-KERNEL_CONFIG_COMMAND ?= "oe_runmake aspeed_defconfig"
UBOOT_MACHINE ?= "versatileab_config"
UBOOT_ENTRYPOINT ?= "0x40001000"
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc.bbappend
deleted file mode 100644
index 065b1c4..0000000
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://0000-config.patch"
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/0000-config.patch b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/0000-config.patch
deleted file mode 100644
index 04611ee..0000000
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/0000-config.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/arch/arm/configs/aspeed_defconfig
-+++ b/arch/arm/configs/aspeed_defconfig
-@@ -1,12 +1,12 @@
- CONFIG_CROSS_COMPILE="arm-linux-"
--CONFIG_LOCALVERSION="-joel"
-+# CONFIG_LOCALVERSION is not set
- CONFIG_KERNEL_XZ=y
- # CONFIG_SWAP is not set
- 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 is not set
- CONFIG_CC_OPTIMIZE_FOR_SIZE=y
- CONFIG_KALLSYMS_ALL=y
- CONFIG_EMBEDDED=y
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes.txt b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes.txt
deleted file mode 100644
index db84c6f..0000000
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes.txt
+++ /dev/null
@@ -1 +0,0 @@
-recipes-kernel - The kernel and generic applications/libraries with strong kernel dependencies
--
2.6.0
More information about the openbmc
mailing list