diff options
| author | Erik Hovland <erik@hovland.org> | 2006-08-31 17:33:31 +0000 |
|---|---|---|
| committer | Erik Hovland <erik@hovland.org> | 2006-08-31 17:33:31 +0000 |
| commit | 960492673b26961cc6d11be4c4e8994a9bbdf593 (patch) | |
| tree | 68f7b12f5db7cfe3565fe435813a717b94b89983 | |
| parent | 4d36c0d6c6c4e6ed9f148d70588fdb16798e9b9c (diff) | |
| parent | 20dcec61dc2304f0500a52f93abca50abe8a970b (diff) | |
merge of 'c131d7e3d40b16059d9414cab4af635e5681c790'
and 'e16e6a228ba05836f11e6096da8531c66005dd42'
| -rw-r--r-- | conf/distro/openomap.conf | 3 | ||||
| -rw-r--r-- | conf/machine/omap5912osk.conf | 4 | ||||
| -rw-r--r-- | packages/angstrom/task-angstrom-x11.bb | 2 | ||||
| -rw-r--r-- | packages/gpe-bluetooth/files/include-sdp_lib.patch | 9 | ||||
| -rw-r--r-- | packages/gpe-bluetooth/gpe-bluetooth_0.54.bb | 3 | ||||
| -rw-r--r-- | packages/gpe-package/files/search.patch | 313 | ||||
| -rw-r--r-- | packages/gpe-package/gpe-package_0.3.bb | 10 | ||||
| -rw-r--r-- | packages/h2200-bootloader/h2200-bootloader.bb | 4 | ||||
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/populate-volatile.sh | 4 | ||||
| -rw-r--r-- | packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb | 5 | ||||
| -rw-r--r-- | packages/linux/linux-omap1-2.6.x+git/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/linux/linux-omap1-2.6.x+git/defconfig | 1113 | ||||
| -rw-r--r-- | packages/linux/linux-omap1_2.6.x+git.bb | 12 | ||||
| -rw-r--r-- | packages/ruby/ruby-native_1.8.5.bb | 3 | ||||
| -rw-r--r-- | packages/ruby/ruby_1.8.5.bb | 12 |
15 files changed, 1482 insertions, 15 deletions
diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf index fb06ca7f47..71690ac62f 100644 --- a/conf/distro/openomap.conf +++ b/conf/distro/openomap.conf @@ -8,10 +8,11 @@ TARGET_FPU ?= "soft" # 2.4 vs 2.6 is a distro decision. MODUTILS = "26" -BOOTSTRAP_EXTRA_RDEPENDS += "udev" PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" +PREFERRED_PROVIDER_hotplug = "udev" + PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index cf9e96ce19..fc17985233 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -5,6 +5,8 @@ TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv5te" +HOTPLUG = "udev" + PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" @@ -18,7 +20,7 @@ PREFERRED_VERSION_linux-omap1 = "2.6.x+git" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" -EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" # PCMCIA Modules #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia" diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index 55d644bc15..2e5d55d727 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -113,6 +113,6 @@ RDEPENDS_angstrom-task-sectest := "\ # tcpdump \ kismet \ hydra \ - thcrut \ +# thcrut \ # driftnet \ miniclipboard" diff --git a/packages/gpe-bluetooth/files/include-sdp_lib.patch b/packages/gpe-bluetooth/files/include-sdp_lib.patch new file mode 100644 index 0000000000..8ec1ab3af3 --- /dev/null +++ b/packages/gpe-bluetooth/files/include-sdp_lib.patch @@ -0,0 +1,9 @@ +--- gpe-bluetooth-0.54/main.h.orig 2006-08-31 09:49:46.000000000 +0200 ++++ gpe-bluetooth-0.54/main.h 2006-08-31 09:49:48.000000000 +0200 +@@ -1,5 +1,6 @@ + #include <gtk/gtk.h> + #include <bluetooth/sdp.h> ++#include <bluetooth/sdp_lib.h> + + struct bt_device + { diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb index b02be325e6..77cf675e21 100644 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb @@ -11,6 +11,7 @@ RDEPENDS = "bluez-utils-dbus blueprobe" GPE_TARBALL_SUFFIX= "bz2" inherit gpe autotools -SRC_URI += "file://hciattach-bts.patch;patch=1" +SRC_URI += "file://hciattach-bts.patch;patch=1 \ + file://include-sdp_lib.patch;patch=1" FILES_${PN} += '${datadir}/bluez-pin' diff --git a/packages/gpe-package/files/search.patch b/packages/gpe-package/files/search.patch new file mode 100644 index 0000000000..2a71c5339f --- /dev/null +++ b/packages/gpe-package/files/search.patch @@ -0,0 +1,313 @@ +--- /tmp/interface.c 2006-08-31 09:49:57.000000000 +0200 ++++ gpe-package-0.3/interface.c 2006-08-31 09:50:20.855780000 +0200 +@@ -27,6 +27,10 @@ + #include <locale.h> + #include <libintl.h> + ++#ifdef ENABLE_PCRE ++#include <pcre.h> ++#endif ++ + #define _(x) gettext(x) + #define N_(_x) (_x) + +@@ -55,11 +59,8 @@ + #define MI_PACKAGES_APPLY 7 + #define MI_FILTER_INST 8 + #define MI_FILTER_NOTINST 9 +-#define MI_PACKAGES_INFO 10 +- +-#define TREE_SHOW_ALL 0x00 +-#define TREE_SHOW_INST 0x01 +-#define TREE_SHOW_NOTINST 0x02 ++#define MI_FILTER_SEARCH 10 ++#define MI_PACKAGES_INFO 11 + + #define HELPMESSAGE "GPE-Package\nVersion " VERSION \ + "\nGPE frontend for ipkg\n\nflorian@handhelds.org" +@@ -79,7 +80,6 @@ + + static description_t *pkg_info = NULL; + static int pkg_count = 0; +-static int tree_filter = TREE_SHOW_ALL; + + int sock; + static pkcommand_t running_command = CMD_NONE; +@@ -91,10 +91,12 @@ + static GtkWidget *notebook; + static GtkWidget *txLog; + static GtkWidget *treeview; ++static GtkTreeModel *filter; ++static gchar *filter_term = NULL; + static GtkTreeStore *store = NULL; + static GtkToolItem *bApply; + static GtkWidget *miUpdate, *miSysUpgrade, *miSelectLocal, *miApply; +-static GtkWidget *miFilterInst, *miFilterNotInst; ++static GtkWidget *miFilterInst, *miFilterNotInst, *miFilterSearch; + static GtkWidget *sbar; + GtkWidget *fMain; + static GtkWidget *dlgAction = NULL; +@@ -102,10 +104,17 @@ + static GtkTextBuffer *infobuffer = NULL; + static GtkWidget *mMain; + ++#ifdef ENABLE_PCRE ++static gboolean is_regexp; ++#endif + + /* some forwards */ + gboolean get_pending_messages (); + void on_tree_filter_changed(GtkCheckMenuItem *menuitem, gpointer user_data); ++void on_tree_filter_search_changed (GtkCheckMenuItem *menuitem, gpointer user_data); ++gboolean filter_visible_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data); ++void set_filter_term (const gchar *text, gboolean regexp); ++void search_entry_activated (GtkEntry *entry, gpointer user_data); + void create_fMain (void); + void on_select_local(GtkButton *button, gpointer user_data); + void on_packages_update_clicked(GtkButton *button, gpointer user_data); +@@ -125,8 +134,10 @@ + { N_("/Packages/Show Insta_lled"), "", on_tree_filter_changed, MI_FILTER_INST , "<CheckItem>"}, + { N_("/Packages/Show _Not Installed"), "", on_tree_filter_changed, MI_FILTER_NOTINST, "<CheckItem>"}, + { N_("/_Packages/s2"), NULL , NULL, 0, "<Separator>"}, +- { N_("/Packages/Show _Info"), "<Control> I", on_package_info_clicked, MI_PACKAGES_INFO , "<Item>"}, ++ { N_("/Packages/_Search"), "<Control> I", on_tree_filter_search_changed, MI_FILTER_SEARCH , "<CheckItem>"}, + { N_("/_Packages/s3"), NULL , NULL, 0, "<Separator>"}, ++ { N_("/Packages/Show _Info"), "<Control> I", on_package_info_clicked, MI_PACKAGES_INFO , "<Item>"}, ++ { N_("/_Packages/s4"), NULL , NULL, 0, "<Separator>"}, + { N_("/Packages/_Update lists"), "<Control> U", on_packages_update_clicked, MI_PACKAGES_UPDATE , "<Item>"}, + { N_("/Packages/Upgrade _System"), "", on_system_update_clicked, MI_PACKAGES_UPGRADE, "<Item>"}, + { N_("/_Packages/s3"), NULL , NULL, 0, "<Separator>"}, +@@ -215,10 +226,10 @@ + GtkWidget * + progress_dialog (gchar * text, GdkPixbuf * pixbuf) + { +-GtkWidget *window; +-GtkWidget *label; +-GtkWidget *image; +-GtkWidget *hbox; ++ GtkWidget *window; ++ GtkWidget *label; ++ GtkWidget *image; ++ GtkWidget *hbox; + + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + hbox = gtk_hbox_new (FALSE, 0); +@@ -227,6 +238,7 @@ + + gtk_window_set_type_hint (GTK_WINDOW (window), + GDK_WINDOW_TYPE_HINT_DIALOG); ++ gtk_window_set_title (GTK_WINDOW (window), _("Working")); + + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); + +@@ -381,9 +393,9 @@ + + void update_tree(void) + { +-guint id; +-int i; +-GtkTreeIter iter; ++ guint id; ++ int i; ++ GtkTreeIter iter; + + id = gtk_statusbar_get_context_id(GTK_STATUSBAR(sbar),"upd"); + gtk_statusbar_push(GTK_STATUSBAR(sbar), +@@ -392,10 +404,6 @@ + gtk_tree_store_clear(GTK_TREE_STORE(store)); + + for (i=0; i<pkg_count; i++) { +- if (((tree_filter & TREE_SHOW_INST) && (pkg_info[i].status == SS_INSTALLED)) +- || ((tree_filter & TREE_SHOW_NOTINST) && (pkg_info[i].status != SS_INSTALLED))) +- continue; +- + gtk_tree_store_append (store, &iter, NULL); + + gtk_tree_store_set (store, &iter, +@@ -412,14 +420,137 @@ + + void on_tree_filter_changed(GtkCheckMenuItem *menuitem, gpointer user_data) + { +- tree_filter = +- !gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(miFilterInst)) * +- TREE_SHOW_INST + +- !gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(miFilterNotInst)) * +- TREE_SHOW_NOTINST; +- update_tree(); ++ if (filter) ++ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter)); + } + ++gboolean filter_visible_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) ++{ ++ gboolean installed; ++ gboolean not_installed; ++ GValue value_installed = { 0, }; ++ GValue value_name = { 0, }; ++ const gchar *pkgname; ++ ++ installed = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(miFilterInst)); ++ not_installed = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(miFilterNotInst)); ++ ++ gtk_tree_model_get_value (model, iter, COL_INSTALLED, &value_installed); ++ ++ if (g_value_get_boolean (&value_installed)) { ++ /* Package is installed */ ++ if (!installed) ++ return FALSE; ++ } else { ++ /* Package is not installed */ ++ if (!not_installed) ++ return FALSE; ++ } ++ ++ if (!filter_term) ++ return TRUE; ++ ++ gtk_tree_model_get_value (model, iter, COL_NAME, &value_name); ++ ++ pkgname = g_value_get_string (&value_name); ++ ++#ifdef ENABLE_PCRE ++ pcre *re; ++ gint ret; ++ const gchar *error; ++ gint error_offset; ++ ++ if (is_regexp) { ++ re = pcre_compile (filter_term, 0, &error, &error_offset, NULL); ++ ++ if (re) { ++ ret = pcre_exec (re, NULL, pkgname, strlen (pkgname), 0, 0, NULL, 0); ++ ++ g_free (re); ++ ++ if (ret >= 0) { ++ return TRUE; ++ } ++ } ++ ++ return FALSE; ++ } ++#endif ++ ++ if (strstr (pkgname, filter_term)) ++ return TRUE; ++ ++ return FALSE; ++} ++ ++void set_filter_term (const gchar *text, gboolean regexp) ++{ ++ if (filter_term) { ++ g_free (filter_term); ++ } ++ ++ filter_term = g_strdup (text); ++ ++#ifdef ENABLE_PCRE ++ is_regexp = regexp; ++#endif ++ ++ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter)); ++} ++ ++void search_entry_activated (GtkEntry *entry, gpointer user_data) ++{ ++ GtkDialog *dialog = user_data; ++ ++ gtk_dialog_response (dialog, GTK_RESPONSE_ACCEPT); ++} ++ ++void on_tree_filter_search_changed (GtkCheckMenuItem *menuitem, gpointer user_data) ++{ ++ GtkWidget *dialog; ++ GtkWidget *entry; ++ const gchar *text; ++#ifdef ENABLE_PCRE ++ GtkWidget *checkbutton; ++#endif ++ ++ if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (miFilterSearch))) { ++ dialog = gtk_dialog_new_with_buttons (_("Search term:"), ++ GTK_WINDOW (fMain), ++ GTK_DIALOG_DESTROY_WITH_PARENT, ++ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, ++ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, ++ NULL); ++ entry = gtk_entry_new (); ++ g_signal_connect (G_OBJECT (entry), "activate", G_CALLBACK (search_entry_activated), dialog); ++ gtk_widget_show (entry); ++ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), entry); ++#ifdef ENABLE_PCRE ++ checkbutton = gtk_check_button_new_with_label (_("Regular expression")); ++ gtk_widget_show (checkbutton); ++ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), checkbutton); ++#endif ++ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { ++ text = gtk_entry_get_text (GTK_ENTRY (entry)); ++ if (strlen (text)) { ++#ifdef ENABLE_PCRE ++ set_filter_term (text, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton))); ++#else ++ set_filter_term (text, FALSE); ++#endif ++ } else { ++ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (miFilterSearch), FALSE); ++ } ++ } else { ++ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (miFilterSearch), FALSE); ++ } ++ gtk_widget_destroy (dialog); ++ } else { ++ set_filter_term (NULL, FALSE); ++ } ++ ++ ++} + + void on_about_clicked (GtkWidget * w) + { +@@ -740,9 +871,9 @@ + + void on_package_info_clicked(GtkButton *button, gpointer user_data) + { +-GtkTreeIter iter; +-GtkTreeSelection *sel; +-char *name = NULL; ++ GtkTreeIter iter; ++ GtkTreeSelection *sel; ++ char *name = NULL; + + sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + +@@ -848,7 +979,7 @@ + selection = gtk_tree_view_get_selection (treeview); + if (gtk_tree_selection_get_selected (selection, NULL, &iter) == FALSE) + return FALSE; +- gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, COL_VERSION, &version, -1); ++ gtk_tree_model_get (GTK_TREE_MODEL (filter), &iter, COL_VERSION, &version, -1); + gtk_statusbar_push(GTK_STATUSBAR(sbar),0,version); + + return TRUE; +@@ -882,6 +1013,8 @@ + MI_FILTER_INST); + miFilterNotInst = gtk_item_factory_get_item_by_action(itemfactory, + MI_FILTER_NOTINST); ++ miFilterSearch = gtk_item_factory_get_item_by_action(itemfactory, ++ MI_FILTER_SEARCH); + + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(miFilterInst),TRUE); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(miFilterNotInst),TRUE); +@@ -984,7 +1117,9 @@ + gtk_box_pack_start(GTK_BOX(vbox), cur, TRUE, TRUE, 0); + + /* packages tree */ +- treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); ++ filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL); ++ gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter), filter_visible_func, NULL, NULL); ++ treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (filter)); + gtk_tree_view_set_reorderable(GTK_TREE_VIEW(treeview),FALSE); + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(treeview),TRUE); + gtk_container_add(GTK_CONTAINER(cur),treeview); + diff --git a/packages/gpe-package/gpe-package_0.3.bb b/packages/gpe-package/gpe-package_0.3.bb index 55cc4ef2a8..a6342f4e18 100644 --- a/packages/gpe-package/gpe-package_0.3.bb +++ b/packages/gpe-package/gpe-package_0.3.bb @@ -1,18 +1,22 @@ LICENSE = "GPL" -PR = "r2" +PR = "r3" inherit gpe pkgconfig DESCRIPTION = "A package manager GUI for GPE" -DEPENDS = "ipkg libgpewidget gpe-su" +DEPENDS = "ipkg pcre libgpewidget gpe-su" RDEPENDS = "gpe-icons" SECTION = "gpe" PRIORITY = "optional" SRC_URI += " file://sbin-and-no-suid-install.patch;patch=1 \ - file://gpe-package" + file://search.patch;patch=1 \ + file://gpe-package" FILES_${PN} += " /usr/bin/gpe-package" +CFLAGS += "-DENABLE_PCRE" +LDFLAGS += "-lpcre" + do_install_append() { install -d ${D}/usr/bin install -m 0755 ${WORKDIR}/gpe-package ${D}/usr/bin diff --git a/packages/h2200-bootloader/h2200-bootloader.bb b/packages/h2200-bootloader/h2200-bootloader.bb index eb36cd50d6..376e34d7cc 100644 --- a/packages/h2200-bootloader/h2200-bootloader.bb +++ b/packages/h2200-bootloader/h2200-bootloader.bb @@ -3,6 +3,10 @@ ALLOW_EMPTY = "1" MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" PR="r2" +COMPATIBLE_MACHINE = "h2200" +#it is a shell script, but lets protect the innocent some more +PACKAGE_ARCH = "h2200" + pkg_postinst() { #!/bin/sh mkdir -p /lib/firmware diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh index f22bf2fdfe..2c2132209f 100755 --- a/packages/initscripts/initscripts-1.0/populate-volatile.sh +++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh @@ -10,7 +10,7 @@ COREDEF="00_core" create_file() { EXEC=" - touch \"$1\" + touch \"$1\"; chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " @@ -21,7 +21,7 @@ create_file() { mk_dir() { EXEC=" - mkdir -p \"$1\" + mkdir -p \"$1\"; chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " diff --git a/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb b/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb index a5cc4073e4..9ddc30a916 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb @@ -8,7 +8,10 @@ COMPATIBLE_MACHINE = '(h3900|h2200|h4000|h5xxx|htcuniversal|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ - file://defconfig" + file://24-hostap_cs_id.diff;patch=1 \ + file://hrw-pcmcia-ids-r2.patch;patch=1 \ + file://hx-iwmmxt.patch;patch=1 \ + file://defconfig" S = "${WORKDIR}/kernel26" diff --git a/packages/linux/linux-omap1-2.6.x+git/.mtn2git_empty b/packages/linux/linux-omap1-2.6.x+git/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.x+git/.mtn2git_empty diff --git a/packages/linux/linux-omap1-2.6.x+git/defconfig b/packages/linux/linux-omap1-2.6.x+git/defconfig new file mode 100644 index 0000000000..ca2ac4ebd5 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.x+git/defconfig @@ -0,0 +1,1113 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.18-rc4-omap1 +# Wed Aug 30 10:58:22 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_EMBEDDED is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_RT_MUTEXES=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +# CONFIG_BLK_DEV_IO_TRACE is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +CONFIG_ARCH_OMAP=y + +# +# TI OMAP Implementations +# +CONFIG_ARCH_OMAP_OTG=y +CONFIG_ARCH_OMAP1=y +# CONFIG_ARCH_OMAP2 is not set + +# +# OMAP Feature Selections +# +CONFIG_OMAP_RESET_CLOCKS=y +# CONFIG_OMAP_BOOT_TAG is not set +# CONFIG_OMAP_GPIO_SWITCH is not set +CONFIG_OMAP_MUX=y +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=y +# CONFIG_OMAP_STI is not set +CONFIG_OMAP_MCBSP=y +# CONFIG_OMAP_MPU_TIMER is not set +CONFIG_OMAP_32K_TIMER=y +CONFIG_OMAP_32K_TIMER_HZ=128 +# CONFIG_OMAP_DM_TIMER is not set +CONFIG_OMAP_LL_DEBUG_UART1=y +# CONFIG_OMAP_LL_DEBUG_UART2 is not set +# CONFIG_OMAP_LL_DEBUG_UART3 is not set +CONFIG_OMAP_SERIAL_WAKE=y + +# +# OMAP Core Type +# +# CONFIG_ARCH_OMAP730 is not set +# CONFIG_ARCH_OMAP15XX is not set +CONFIG_ARCH_OMAP16XX=y + +# +# OMAP Board Type +# +# CONFIG_MACH_OMAP_INNOVATOR is not set +# CONFIG_MACH_OMAP_H2 is not set +# CONFIG_MACH_OMAP_H3 is not set +CONFIG_MACH_OMAP_OSK=y +# CONFIG_OMAP_OSK_MISTRAL is not set +# CONFIG_MACH_NOKIA770 is not set +# CONFIG_MACH_OMAP_GENERIC is not set + +# +# OMAP CPU Speed +# +# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set +# CONFIG_OMAP_ARM_216MHZ is not set +CONFIG_OMAP_ARM_192MHZ=y +# CONFIG_OMAP_ARM_168MHZ is not set +# CONFIG_OMAP_ARM_120MHZ is not set +# CONFIG_OMAP_ARM_60MHZ is not set +# CONFIG_OMAP_ARM_30MHZ is not set +# CONFIG_OMAP_DSP is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +# CONFIG_ARM_THUMB is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +CONFIG_OMAP_CF=y + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=128 +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw" +# CONFIG_XIP_KERNEL is not set + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +# CONFIG_APM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=m +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +CONFIG_MTD_OMAP_NOR=y +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set +# CONFIG_MTD_ONENAND_SYNC_READ is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=m +CONFIG_BLK_DEV_IDE=m + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_BLK_DEV_IDECS=m +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_IDE_GENERIC is not set +# CONFIG_IDE_ARM is not set +# CONFIG_BLK_DEV_IDEDMA is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + |
