r4068 - trunk/src/target/u-boot/patches
werner at sita.openmoko.org
werner at sita.openmoko.org
Fri Feb 15 13:38:54 CET 2008
Author: werner
Date: 2008-02-15 13:38:50 +0100 (Fri, 15 Feb 2008)
New Revision: 4068
Modified:
trunk/src/target/u-boot/patches/boot-menu.patch
Log:
We don't need to hard-code the "factory reset" option. Just having it in
the environment will work as well. (Unless the environment is too badly
messed up.)
board/neo1973/common/bootmenu.c (factory_reset, neo1973_bootmenu): removed
hard-coded "factory reset" default
Modified: trunk/src/target/u-boot/patches/boot-menu.patch
===================================================================
--- trunk/src/target/u-boot/patches/boot-menu.patch 2008-02-15 11:10:16 UTC (rev 4067)
+++ trunk/src/target/u-boot/patches/boot-menu.patch 2008-02-15 12:38:50 UTC (rev 4068)
@@ -24,7 +24,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/common/bootmenu.c
-@@ -0,0 +1,122 @@
+@@ -0,0 +1,113 @@
+/*
+ * bootmenu.c - Boot menu
+ *
@@ -95,14 +95,6 @@
+}
+
+
-+static void factory_reset(void *user)
-+{
-+ default_env();
-+ run_command("dynpart", 0);
-+ run_command("bootd", 0);
-+}
-+
-+
+static int seconds(void *user)
+{
+ return neo1973_new_second();
@@ -144,7 +136,6 @@
+{
+ bootmenu_add("Boot", NULL, "bootd");
+ bootmenu_init(&bootmenu_setup);
-+ bootmenu_add("Factory reset", factory_reset, NULL);
+ bootmenu();
+}
Index: u-boot/board/neo1973/gta01/gta01.c
@@ -361,7 +352,7 @@
+COBJS-y += bootmenu.o
COBJS-y += circbuf.o
COBJS-y += cmd_autoscript.o
- COBJS-y += cmd_bdinfo.o
+ COBJS-$(CONFIG_CMD_BDI) += cmd_bdinfo.o
Index: u-boot/common/bootmenu.c
===================================================================
--- /dev/null
More information about the commitlog
mailing list