3 files changed, 22 insertions, 9 deletions

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index c0ae0a7ddb42..512c2f5c341d 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -89,6 +89,7 @@ void ConfigItem::okRename(int col)
 {
         Parent::okRename(col);
         sym_set_string_value(menu->sym, text(dataColIdx).latin1());
+        listView()->updateList(this);
 }
 #endif
 
@@ -605,6 +606,8 @@ void ConfigList::updateMenuList(P* parent, struct menu* menu)
 
                 visible = menu_is_visible(child);
                 if (showAll || visible) {
+                        if (!child->sym && !child->list && !child->prompt)
+                                continue;
                         if (!item || item->menu != child)
                                 item = new ConfigItem(parent, last, child, visible);
                         else
@@ -1247,6 +1250,7 @@ void ConfigSearchWindow::search(void)
 
         free(result);
         list->list->clear();
+        info->clear();
 
         result = sym_re_search(editField->text().latin1());
         if (!result)
@@ -1316,7 +1320,7 @@ ConfigMainWindow::ConfigMainWindow(void)
         conf_changed();
         QAction *saveAsAction = new QAction("Save As...", "Save &As...", 0, this);
           connect(saveAsAction, SIGNAL(activated()), SLOT(saveConfigAs()));
-        QAction *searchAction = new QAction("Search", "&Search", CTRL+Key_F, this);
+        QAction *searchAction = new QAction("Find", "&Find", CTRL+Key_F, this);
           connect(searchAction, SIGNAL(activated()), SLOT(searchConfig()));
         QAction *singleViewAction = new QAction("Single View", QPixmap(xpm_single_view), "Split View", 0, this);
           connect(singleViewAction, SIGNAL(activated()), SLOT(showSingleView()));
@@ -1373,10 +1377,13 @@ ConfigMainWindow::ConfigMainWindow(void)
         saveAction->addTo(config);
         saveAsAction->addTo(config);
         config->insertSeparator();
-        searchAction->addTo(config);
-        config->insertSeparator();
         quitAction->addTo(config);
 
+        // create edit menu
+        QPopupMenu* editMenu = new QPopupMenu(this);
+        menu->insertItem("&Edit", editMenu);
+        searchAction->addTo(editMenu);
+
         // create options menu
         QPopupMenu* optionMenu = new QPopupMenu(this);
         menu->insertItem("&Option", optionMenu);
@@ -1467,7 +1474,10 @@ void ConfigMainWindow::searchConfig(void)
 void ConfigMainWindow::changeMenu(struct menu *menu)
 {
         configList->setRootMenu(menu);
-        backAction->setEnabled(TRUE);
+        if (configList->rootEntry->parent == &rootmenu)
+                backAction->setEnabled(FALSE);
+        else
+                backAction->setEnabled(TRUE);
 }
 
 void ConfigMainWindow::setMenuLink(struct menu *menu)
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index d7b8a384b4a7..82d0af46f0ef 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -58,7 +58,7 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
     echo \#define LINUX_COMPILE_DOMAIN
   fi
 
-  echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"
+  echo \#define LINUX_COMPILER \"`LC_ALL=C LANG=C $CC -v 2>&1 | tail -n 1`\"
 ) > .tmpcompile
 
 # Only replace the real compile.h if the new one is different,
diff --git a/scripts/mkuboot.sh b/scripts/mkuboot.sh
index 52a17ab97eb0..4b06c5eea728 100755
--- a/scripts/mkuboot.sh
+++ b/scripts/mkuboot.sh
@@ -4,12 +4,15 @@
 # Build U-Boot image when `mkimage' tool is available.
 #
 
-MKIMAGE=$(type -path mkimage)
+MKIMAGE=$(type -path ${CROSS_COMPILE}mkimage)
 
 if [ -z "${MKIMAGE}" ]; then
-        # Doesn't exist
-        echo '"mkimage" command not found - U-Boot images will not be built' >&2
-        exit 0;
+        MKIMAGE=$(type -path mkimage)
+        if [ -z "${MKIMAGE}" ]; then
+                # Doesn't exist
+                echo '"mkimage" command not found - U-Boot images will not be built' >&2
+                exit 0;
+        fi
 fi
 
 # Call "mkimage" to create U-Boot image