r1084 - trunk/src/target/u-boot/patches
werner at sita.openmoko.org
werner at sita.openmoko.org
Fri Feb 23 19:28:25 CET 2007
Author: werner
Date: 2007-02-23 19:28:20 +0100 (Fri, 23 Feb 2007)
New Revision: 1084
Modified:
trunk/src/target/u-boot/patches/preboot-override.patch
trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
Log:
common/env_common.c (env_relocate): if preboot_override is set, always use the
default environment
board/neo1973/neo1973.c (board_late_init): activate the LCM before the
backlight, to avoid white flash
Modified: trunk/src/target/u-boot/patches/preboot-override.patch
===================================================================
--- trunk/src/target/u-boot/patches/preboot-override.patch 2007-02-23 15:54:01 UTC (rev 1083)
+++ trunk/src/target/u-boot/patches/preboot-override.patch 2007-02-23 18:28:20 UTC (rev 1084)
@@ -8,6 +8,8 @@
(_start+0x40)
common/main.c (main_loop): if preboot_override is set, execute the command
string found there
+common/env_common.c (env_relocate): if preboot_override is set, always use the
+ default environment
- Werner Almesberger <werner at openmoko.org>
@@ -102,3 +104,33 @@
#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
s = getenv ("bootdelay");
+Index: u-boot/common/env_common.c
+===================================================================
+--- u-boot.orig/common/env_common.c
++++ u-boot/common/env_common.c
+@@ -37,6 +37,10 @@
+ # define SHOW_BOOT_PROGRESS(arg)
+ #endif
+
++#ifdef CFG_PREBOOT_OVERRIDE
++extern char *preboot_override;
++#endif
++
+ DECLARE_GLOBAL_DATA_PTR;
+
+ #ifdef CONFIG_AMIGAONEG3SE
+@@ -234,7 +238,14 @@ void env_relocate (void)
+ puts ("*** Warning - bad CRC, using default environment\n\n");
+ SHOW_BOOT_PROGRESS (-1);
+ #endif
++ }
++
++#ifdef CFG_PREBOOT_OVERRIDE
++ if (preboot_override)
++ gd->env_valid = 0;
++#endif
+
++ if (gd->env_valid == 0) {
+ if (sizeof(default_environment) > ENV_SIZE)
+ {
+ puts ("*** Error - default environment is too large\n\n");
Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch 2007-02-23 15:54:01 UTC (rev 1083)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch 2007-02-23 18:28:20 UTC (rev 1084)
@@ -6,9 +6,9 @@
Index: u-boot/Makefile
===================================================================
---- u-boot.orig/Makefile 2007-02-16 23:34:01.000000000 +0100
-+++ u-boot/Makefile 2007-02-16 23:37:04.000000000 +0100
-@@ -1928,6 +1928,13 @@
+--- u-boot.orig/Makefile
++++ u-boot/Makefile
+@@ -1931,6 +1931,13 @@ omap730p2_cs3boot_config : unconfig
sbc2410x_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
@@ -24,8 +24,8 @@
Index: u-boot/board/neo1973/Makefile
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/Makefile 2007-02-16 23:40:48.000000000 +0100
+--- /dev/null
++++ u-boot/board/neo1973/Makefile
@@ -0,0 +1,47 @@
+#
+# (C) Copyright 2000, 2001, 2002
@@ -76,8 +76,8 @@
+#########################################################################
Index: u-boot/board/neo1973/config.mk
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/config.mk 2007-02-16 23:37:00.000000000 +0100
+--- /dev/null
++++ u-boot/board/neo1973/config.mk
@@ -0,0 +1,34 @@
+#
+# (C) Copyright 2002
@@ -115,8 +115,8 @@
+endif
Index: u-boot/board/neo1973/neo1973.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/neo1973.c 2007-02-16 23:40:48.000000000 +0100
+--- /dev/null
++++ u-boot/board/neo1973/neo1973.c
@@ -0,0 +1,317 @@
+/*
+ * (C) 2006 by OpenMoko, Inc.
@@ -365,6 +365,10 @@
+ neo1973_wakeup_cause = NEO1973_WAKEUP_RESET;
+
+continue_boot:
++ jbt6k74_init();
++ jbt6k74_enter_state(JBT_STATE_NORMAL);
++ jbt6k74_display_onoff(1);
++
+ /* issue a short pulse with the vibrator */
+ neo1973_vibrator(1);
+ udelay(50000);
@@ -373,10 +377,6 @@
+ /* switch on the backlight */
+ neo1973_backlight(1);
+
-+ jbt6k74_init();
-+ jbt6k74_enter_state(JBT_STATE_NORMAL);
-+ jbt6k74_display_onoff(1);
-+
+ return 0;
+}
+
@@ -437,8 +437,8 @@
+}
Index: u-boot/board/neo1973/lowlevel_init.S
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/lowlevel_init.S 2007-02-16 23:37:04.000000000 +0100
+--- /dev/null
++++ u-boot/board/neo1973/lowlevel_init.S
@@ -0,0 +1,188 @@
+/*
+ * Memory Setup stuff - taken from blob memsetup.S
@@ -630,8 +630,8 @@
+ .word 0x30
Index: u-boot/board/neo1973/u-boot.lds
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/u-boot.lds 2007-02-16 23:34:02.000000000 +0100
+--- /dev/null
++++ u-boot/board/neo1973/u-boot.lds
@@ -0,0 +1,58 @@
+/*
+ * (C) Copyright 2002
@@ -693,8 +693,8 @@
+}
Index: u-boot/include/configs/neo1973.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/include/configs/neo1973.h 2007-02-16 23:41:35.000000000 +0100
+--- /dev/null
++++ u-boot/include/configs/neo1973.h
@@ -0,0 +1,257 @@
+/*
+ * (C) Copyright 2006 OpenMoko, Inc.
@@ -955,8 +955,8 @@
+#endif /* __CONFIG_H */
Index: u-boot/board/neo1973/split_by_variant.sh
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/split_by_variant.sh 2007-02-16 23:37:04.000000000 +0100
+--- /dev/null
++++ u-boot/board/neo1973/split_by_variant.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+# ---------------------------------------------------------
@@ -1009,8 +1009,8 @@
+$MKCONFIG -a neo1973 arm arm920t neo1973 NULL s3c24x0
Index: u-boot/board/neo1973/cmd_neo1973.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/cmd_neo1973.c 2007-02-16 23:38:13.000000000 +0100
+--- /dev/null
++++ u-boot/board/neo1973/cmd_neo1973.c
@@ -0,0 +1,120 @@
+/*
+ * (C) Copyright 2006 by OpenMoko, Inc.
@@ -1134,8 +1134,8 @@
+#endif /* CFG_CMD_BDI */
Index: u-boot/board/neo1973/neo1973.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/neo1973.h 2007-02-16 23:38:13.000000000 +0100
+--- /dev/null
++++ u-boot/board/neo1973/neo1973.h
@@ -0,0 +1,18 @@
+#ifndef _NEO1973_H
+#define _NEO1973_H
@@ -1157,8 +1157,8 @@
+#endif
Index: u-boot/board/neo1973/pcf50606.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/pcf50606.c 2007-02-16 23:38:13.000000000 +0100
+--- /dev/null
++++ u-boot/board/neo1973/pcf50606.c
@@ -0,0 +1,168 @@
+
+#include <common.h>
@@ -1330,8 +1330,8 @@
+}
Index: u-boot/board/neo1973/pcf50606.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/pcf50606.h 2007-02-16 23:38:13.000000000 +0100
+--- /dev/null
++++ u-boot/board/neo1973/pcf50606.h
@@ -0,0 +1,267 @@
+#ifndef _PCF50606_H
+#define _PCF50606_H
@@ -1602,9 +1602,9 @@
+
Index: u-boot/common/main.c
===================================================================
---- u-boot.orig/common/main.c 2007-02-16 23:35:56.000000000 +0100
-+++ u-boot/common/main.c 2007-02-16 23:38:13.000000000 +0100
-@@ -61,6 +61,7 @@
+--- u-boot.orig/common/main.c
++++ u-boot/common/main.c
+@@ -61,6 +61,7 @@ static int abortboot(int);
#undef DEBUG_PARSER
char console_buffer[CFG_CBSIZE]; /* console I/O buffer */
@@ -1612,7 +1612,7 @@
#ifndef CONFIG_CMDLINE_EDITING
static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen);
-@@ -404,7 +405,7 @@
+@@ -404,7 +405,7 @@ void main_loop (void)
debug ("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>");
@@ -1623,8 +1623,8 @@
# endif
Index: u-boot/board/neo1973/jbt6k74.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/jbt6k74.c 2007-02-16 23:40:48.000000000 +0100
+--- /dev/null
++++ u-boot/board/neo1973/jbt6k74.c
@@ -0,0 +1,403 @@
+/* u-boot driver for the tpo JBT6K74-AS LCM ASIC
+ *
@@ -2031,8 +2031,8 @@
+}
Index: u-boot/board/neo1973/jbt6k74.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/jbt6k74.h 2007-02-16 23:40:48.000000000 +0100
+--- /dev/null
++++ u-boot/board/neo1973/jbt6k74.h
@@ -0,0 +1,14 @@
+#ifndef _JBT6K74_H
+#define _JBT6K74_H
More information about the commitlog
mailing list
