summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-emenlow/packages/linux/linux-wrs/defconfig68
-rw-r--r--meta-emenlow/packages/linux/linux-wrs/tools-profile.cfg48
-rw-r--r--meta-emenlow/packages/linux/linux-wrs_git.bbappend2
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
4 files changed, 1 insertions, 119 deletions
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 @@
1CONFIG_X86_32=y
2CONFIG_PRINTK=y
3
4# Basic hardware support for the box - network, USB, PCI, sound
5CONFIG_NETDEVICES=y
6CONFIG_NETDEV_1000=y
7CONFIG_ATA=y
8CONFIG_ATA_GENERIC=y
9CONFIG_ATA_SFF=y
10CONFIG_PCI=y
11CONFIG_MMC=y
12CONFIG_MMC_SDHCI=y
13CONFIG_USB_SUPPORT=y
14CONFIG_USB=y
15CONFIG_USB_ARCH_HAS_EHCI=y
16CONFIG_E1000E=y
17CONFIG_R8169=y
18CONFIG_PATA_SCH=y
19CONFIG_MMC_SDHCI_PCI=y
20CONFIG_USB_EHCI_HCD=y
21CONFIG_PCIEPORTBUS=y
22CONFIG_NET=y
23CONFIG_USB_UHCI_HCD=y
24CONFIG_BLK_DEV_SD=y
25CONFIG_CHR_DEV_SG=y
26CONFIG_SOUND=y
27CONFIG_SND=y
28CONFIG_SND_HDA_INTEL=y
29
30# Make sure these are on, otherwise the bootup won't be fun
31CONFIG_EXT3_FS=y
32CONFIG_UNIX=y
33CONFIG_INET=y
34CONFIG_MODULES=y
35CONFIG_SHMEM=y
36CONFIG_TMPFS=y
37CONFIG_PACKET=y
38
39# These are needed for the Poulsbo kernel modules
40CONFIG_I2C=y
41CONFIG_AGP=y
42CONFIG_VFAT_FS=y
43CONFIG_PM=y
44CONFIG_ACPI=y
45CONFIG_FB=y
46CONFIG_BACKLIGHT_LCD_SUPPORT=y
47CONFIG_BACKLIGHT_CLASS_DEVICE=y
48CONFIG_INPUT=y
49CONFIG_VIDEO_V4L2=y
50CONFIG_VIDEO_IVTV=y
51CONFIG_MEDIA_SUPPORT=y
52CONFIG_VIDEO_CAPTURE_DRIVERS=y
53CONFIG_VIDEO_DEV=y
54CONFIG_VIDEO_V4L2_COMMON=y
55CONFIG_I2C_ALGOBIT=y
56CONFIG_FB_CFB_COPYAREA=y
57CONFIG_FB_CFB_IMAGEBLIT=y
58CONFIG_FB_CFB_FILLRECT=y
59CONFIG_VIDEO_FB_IVTV=y
60
61# Needed for booting (and using) USB memory sticks
62CONFIG_USB_STORAGE=y
63CONFIG_BLK_DEV_RAM=y
64CONFIG_BLK_DEV_LOOP=y
65CONFIG_BLK_DEV_INITRD=y
66CONFIG_RD_GZIP=y
67CONFIG_NLS_CODEPAGE_437=y
68CONFIG_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 @@
1# LATENCYTOP
2CONFIG_LATENCYTOP=y
3
4# OPROFILE
5CONFIG_PROFILING=y
6CONFIG_OPROFILE=y
7CONFIG_FRAME_POINTER=y
8CONFIG_X86_UP_APIC=y
9CONFIG_X86_LOCAL_APIC=y
10
11# POWERTOP
12CONFIG_TIMER_STATS=y
13
14# LTTNG
15CONFIG_MARKERS=y
16CONFIG_LTT=y
17CONFIG_LTT_TRACER=y
18CONFIG_LTT_RELAY=y
19CONFIG_LTT_ALIGNMENT=y
20CONFIG_LTT_USERSPACE_GENERIC=y
21CONFIG_LTT_NETLINK_CONTROL=m
22CONFIG_LTT_STATEDUMP=m
23
24CONFIG_LTT_PROBE_FS=m
25CONFIG_LTT_PROBE_IPC=m
26CONFIG_LTT_PROBE_KERNEL=m
27CONFIG_LTT_PROBE_KERNEL_GENERIC=m
28CONFIG_LTT_PROBE_ARCH=m
29CONFIG_LTT_PROBE_MM=m
30CONFIG_LTT_PROBE_NET=m
31CONFIG_LTT_PROBE_LIST=m
32# CONFIG_LTT_PROBE_LOCKING is not set
33
34CONFIG_LTT_FACILITY_FS=m
35CONFIG_LTT_FACILITY_FS_DATA=m
36CONFIG_LTT_FACILITY_IPC=m
37CONFIG_LTT_FACILITY_KERNEL=m
38CONFIG_LTT_FACILITY_KERNEL_ARCH=m
39CONFIG_LTT_FACILITY_MEMORY=m
40CONFIG_LTT_FACILITY_NETWORK=m
41CONFIG_LTT_FACILITY_NETWORK_IP_INTERFACE=m
42CONFIG_LTT_FACILITY_PROCESS=m
43CONFIG_LTT_FACILITY_SOCKET=m
44CONFIG_LTT_FACILITY_STATEDUMP=m
45CONFIG_LTT_FACILITY_TIMER=m
46CONFIG_LTT_FACILITY_LOCKING=y
47# CONFIG_LTT_TEST_TSC is not set
48CONFIG_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 @@
1FILESEXTRAPATHS := "${THISDIR}/${PN}" 1FILESEXTRAPATHS := "${THISDIR}/${PN}"
2SRC_URI_append_emenlow = " file://defconfig"
3SRC_URI_append_emenlow = " file://tools-profile.cfg"
4COMPATIBLE_MACHINE_emenlow = "emenlow" 2COMPATIBLE_MACHINE_emenlow = "emenlow"
5WRMACHINE_emenlow = "emenlow" 3WRMACHINE_emenlow = "emenlow"
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 3a20747884..01fbe7ec02 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -92,7 +92,7 @@ SRCREV_machine_pn-linux-wrs_atom-pc ?= "0431115c9d720fee5bb105f6a7411efb4f851d26
92SRCREV_machine_pn-linux-wrs_routerstationpro ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" 92SRCREV_machine_pn-linux-wrs_routerstationpro ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
93SRCREV_machine_pn-linux-wrs_mpc8315e-rdb ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" 93SRCREV_machine_pn-linux-wrs_mpc8315e-rdb ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
94SRCREV_machine_pn-linux-wrs_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" 94SRCREV_machine_pn-linux-wrs_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
95SRCREV_meta_pn-linux-wrs ?= "9d46ade6a1c073f63d918ad6ceb1f5c268e2a91d" 95SRCREV_meta_pn-linux-wrs ?= "3eb1d750fe31c36a53364d3e39952511b1c6c817"
96SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0" 96SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0"
97SRCREV_pn-matchbox-config-gtk ??= "2081" 97SRCREV_pn-matchbox-config-gtk ??= "2081"
98SRCREV_pn-matchbox-desktop-sato ??= "76" 98SRCREV_pn-matchbox-desktop-sato ??= "76"