From 48755c4bc6a71b206b054fc6fa349f0c97baef61 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Mon, 11 Oct 2010 22:41:07 -0400
Subject: emenlow/linux-wrs: merge emenlow configuration

Complete the merge of the emenlow BSP, by removing the external
configurations from the emelnow layer and merging them into
the wrs_meta branch of the kernel tree. This also allows the
emenlow to drop the tools config fragement and use the common
definitions shared by BSPs maintained in the kernel.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-emenlow/packages/linux/linux-wrs/defconfig    | 68 ----------------------
 .../packages/linux/linux-wrs/tools-profile.cfg     | 48 ---------------
 meta-emenlow/packages/linux/linux-wrs_git.bbappend |  2 -
 3 files changed, 118 deletions(-)
 delete mode 100644 meta-emenlow/packages/linux/linux-wrs/defconfig
 delete mode 100644 meta-emenlow/packages/linux/linux-wrs/tools-profile.cfg

(limited to 'meta-emenlow')

diff --git a/meta-emenlow/packages/linux/linux-wrs/defconfig b/meta-emenlow/packages/linux/linux-wrs/defconfig
deleted file mode 100644
index a516dc987e..0000000000
--- a/meta-emenlow/packages/linux/linux-wrs/defconfig
+++ /dev/null
@@ -1,68 +0,0 @@
-CONFIG_X86_32=y
-CONFIG_PRINTK=y
-
-# Basic hardware support for the box - network, USB, PCI, sound
-CONFIG_NETDEVICES=y
-CONFIG_NETDEV_1000=y
-CONFIG_ATA=y
-CONFIG_ATA_GENERIC=y
-CONFIG_ATA_SFF=y
-CONFIG_PCI=y
-CONFIG_MMC=y
-CONFIG_MMC_SDHCI=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_E1000E=y
-CONFIG_R8169=y
-CONFIG_PATA_SCH=y
-CONFIG_MMC_SDHCI_PCI=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_NET=y
-CONFIG_USB_UHCI_HCD=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_HDA_INTEL=y
-
-# Make sure these are on, otherwise the bootup won't be fun
-CONFIG_EXT3_FS=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_MODULES=y
-CONFIG_SHMEM=y
-CONFIG_TMPFS=y
-CONFIG_PACKET=y
-
-# These are needed for the Poulsbo kernel modules
-CONFIG_I2C=y
-CONFIG_AGP=y
-CONFIG_VFAT_FS=y
-CONFIG_PM=y
-CONFIG_ACPI=y
-CONFIG_FB=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_INPUT=y
-CONFIG_VIDEO_V4L2=y
-CONFIG_VIDEO_IVTV=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_I2C_ALGOBIT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_VIDEO_FB_IVTV=y
-
-# Needed for booting (and using) USB memory sticks
-CONFIG_USB_STORAGE=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_RD_GZIP=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
diff --git a/meta-emenlow/packages/linux/linux-wrs/tools-profile.cfg b/meta-emenlow/packages/linux/linux-wrs/tools-profile.cfg
deleted file mode 100644
index 60cb285c2a..0000000000
--- a/meta-emenlow/packages/linux/linux-wrs/tools-profile.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
-# LATENCYTOP
-CONFIG_LATENCYTOP=y
-
-# OPROFILE
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
-CONFIG_FRAME_POINTER=y
-CONFIG_X86_UP_APIC=y
-CONFIG_X86_LOCAL_APIC=y
-
-# POWERTOP
-CONFIG_TIMER_STATS=y
-
-# LTTNG
-CONFIG_MARKERS=y
-CONFIG_LTT=y
-CONFIG_LTT_TRACER=y
-CONFIG_LTT_RELAY=y
-CONFIG_LTT_ALIGNMENT=y
-CONFIG_LTT_USERSPACE_GENERIC=y
-CONFIG_LTT_NETLINK_CONTROL=m
-CONFIG_LTT_STATEDUMP=m
-
-CONFIG_LTT_PROBE_FS=m
-CONFIG_LTT_PROBE_IPC=m
-CONFIG_LTT_PROBE_KERNEL=m
-CONFIG_LTT_PROBE_KERNEL_GENERIC=m
-CONFIG_LTT_PROBE_ARCH=m
-CONFIG_LTT_PROBE_MM=m
-CONFIG_LTT_PROBE_NET=m
-CONFIG_LTT_PROBE_LIST=m
-# CONFIG_LTT_PROBE_LOCKING is not set
-
-CONFIG_LTT_FACILITY_FS=m
-CONFIG_LTT_FACILITY_FS_DATA=m
-CONFIG_LTT_FACILITY_IPC=m
-CONFIG_LTT_FACILITY_KERNEL=m
-CONFIG_LTT_FACILITY_KERNEL_ARCH=m
-CONFIG_LTT_FACILITY_MEMORY=m
-CONFIG_LTT_FACILITY_NETWORK=m
-CONFIG_LTT_FACILITY_NETWORK_IP_INTERFACE=m
-CONFIG_LTT_FACILITY_PROCESS=m
-CONFIG_LTT_FACILITY_SOCKET=m
-CONFIG_LTT_FACILITY_STATEDUMP=m
-CONFIG_LTT_FACILITY_TIMER=m
-CONFIG_LTT_FACILITY_LOCKING=y
-# CONFIG_LTT_TEST_TSC is not set
-CONFIG_MARKERS_DISABLE_OPTIMIZATION=y
diff --git a/meta-emenlow/packages/linux/linux-wrs_git.bbappend b/meta-emenlow/packages/linux/linux-wrs_git.bbappend
index 3f987b6f52..ed7e8509ee 100644
--- a/meta-emenlow/packages/linux/linux-wrs_git.bbappend
+++ b/meta-emenlow/packages/linux/linux-wrs_git.bbappend
@@ -1,5 +1,3 @@
 FILESEXTRAPATHS := "${THISDIR}/${PN}"
-SRC_URI_append_emenlow = " file://defconfig"
-SRC_URI_append_emenlow = " file://tools-profile.cfg"
 COMPATIBLE_MACHINE_emenlow = "emenlow"
 WRMACHINE_emenlow  = "emenlow"
-- 
cgit v1.2.3-54-g00ecf