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