r3798 - trunk/src/target/u-boot/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Wed Jan 9 20:15:03 CET 2008
Author: laforge
Date: 2008-01-09 20:15:01 +0100 (Wed, 09 Jan 2008)
New Revision: 3798
Removed:
trunk/src/target/u-boot/patches/nand-read_write_oob.patch
trunk/src/target/u-boot/patches/uboot-cramfs_but_no_jffs2.patch
trunk/src/target/u-boot/patches/uboot-serial_terminal.patch
Modified:
trunk/src/target/u-boot/patches/series
Log:
remove three patches that have been merged mainline
Deleted: trunk/src/target/u-boot/patches/nand-read_write_oob.patch
===================================================================
--- trunk/src/target/u-boot/patches/nand-read_write_oob.patch 2008-01-09 16:16:51 UTC (rev 3797)
+++ trunk/src/target/u-boot/patches/nand-read_write_oob.patch 2008-01-09 19:15:01 UTC (rev 3798)
@@ -1,23 +0,0 @@
-Re-introduce the 'nand read.oob' and 'nand write.oob' commands
-that used to exist with the legacy NAND code
-
-Signed-off-by: Harald Welte <laforge at openmoko.org>
-Index: u-boot/common/cmd_nand.c
-===================================================================
---- u-boot.orig/common/cmd_nand.c
-+++ u-boot/common/cmd_nand.c
-@@ -343,6 +343,14 @@
- opts.quiet = quiet;
- ret = nand_write_opts(nand, &opts);
- }
-+ } else if (s != NULL && !strcmp(s, ".oob")) {
-+ /* read out-of-band data */
-+ if (read)
-+ ret = nand->read_oob(nand, off, size, &size,
-+ (u_char *) addr);
-+ else
-+ ret = nand->write_oob(nand, off, size, &size,
-+ (u_char *) addr);
- } else {
- if (read)
- ret = nand_read(nand, off, &size, (u_char *)addr);
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2008-01-09 16:16:51 UTC (rev 3797)
+++ trunk/src/target/u-boot/patches/series 2008-01-09 19:15:01 UTC (rev 3798)
@@ -4,9 +4,6 @@
# those we want to get mainline
uboot-strtoul.patch
-uboot-cramfs_but_no_jffs2.patch
-nand-read_write_oob.patch
-uboot-serial_terminal.patch
uboot-arm920t-gd_in_irq.patch
uboot-arm920_s3c2410_irq_demux.patch
uboot-s3c2410-nand.patch
Deleted: trunk/src/target/u-boot/patches/uboot-cramfs_but_no_jffs2.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-cramfs_but_no_jffs2.patch 2008-01-09 16:16:51 UTC (rev 3797)
+++ trunk/src/target/u-boot/patches/uboot-cramfs_but_no_jffs2.patch 2008-01-09 19:15:01 UTC (rev 3798)
@@ -1,41 +0,0 @@
-Fix building with CRAMFS but not JFFS2 support
-
-Signed-off-by: Harald Welte <laforge at openmoko.org>
-
-Index: u-boot/fs/cramfs/cramfs.c
-===================================================================
---- u-boot.orig/fs/cramfs/cramfs.c 2007-02-17 11:46:26.000000000 +0100
-+++ u-boot/fs/cramfs/cramfs.c 2007-02-17 11:54:36.000000000 +0100
-@@ -27,7 +27,7 @@
- #include <common.h>
- #include <malloc.h>
-
--#if defined(CONFIG_CMD_JFFS2)
-+#if defined(CONFIG_CMD_CRAMFS)
-
- #include <asm/byteorder.h>
- #include <linux/stat.h>
-Index: u-boot/common/cmd_jffs2.c
-===================================================================
---- u-boot.orig/common/cmd_jffs2.c 2007-02-17 11:47:51.000000000 +0100
-+++ u-boot/common/cmd_jffs2.c 2007-02-17 14:08:25.000000000 +0100
-@@ -170,10 +170,19 @@
- static struct mtd_device *current_dev = NULL;
- static u8 current_partnum = 0;
-
-+#if defined(CONFIG_CMD_CRAMFS)
- extern int cramfs_check (struct part_info *info);
- extern int cramfs_load (char *loadoffset, struct part_info *info, char *filename);
- extern int cramfs_ls (struct part_info *info, char *filename);
- extern int cramfs_info (struct part_info *info);
-+#else
-+/* defining empty macros for function names is ugly but avoids ifdef clutter
-+ * all over the code */
-+#define cramfs_check(x) (0)
-+#define cramfs_load(x,y,z) (-1)
-+#define cramfs_ls(x,y) (0)
-+#define cramfs_info(x) (0)
-+#endif
-
- static struct part_info* jffs2_part_info(struct mtd_device *dev, unsigned int part_num);
-
Deleted: trunk/src/target/u-boot/patches/uboot-serial_terminal.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-serial_terminal.patch 2008-01-09 16:16:51 UTC (rev 3797)
+++ trunk/src/target/u-boot/patches/uboot-serial_terminal.patch 2008-01-09 19:15:01 UTC (rev 3798)
@@ -1,134 +0,0 @@
-This patch adds a 'cu' like serial terminal command to u-boot
-using which you can access other serial ports from the system console.
-
-Index: u-boot/common/Makefile
-===================================================================
---- u-boot.orig/common/Makefile
-+++ u-boot/common/Makefile
-@@ -86,6 +86,7 @@
- COBJS-y += cmd_sata.o
- COBJS-$(CONFIG_CMD_SCSI) += cmd_scsi.o
- COBJS-$(CONFIG_CMD_SPI) += cmd_spi.o
-+COBJS-$(CONFIG_CMD_TERMINAL) += cmd_terminal.o
- COBJS-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o
- COBJS-$(CONFIG_CMD_USB) += cmd_usb.o
- COBJS-y += cmd_vfd.o
-Index: u-boot/common/cmd_terminal.c
-===================================================================
---- /dev/null
-+++ u-boot/common/cmd_terminal.c
-@@ -0,0 +1,102 @@
-+/*
-+ * (C) Copyright 2007 OpenMoko, Inc.
-+ * Written by Harald Welte <laforge at openmoko.org>
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+/*
-+ * Boot support
-+ */
-+#include <common.h>
-+#include <command.h>
-+#include <devices.h>
-+
-+#if defined(CONFIG_CMD_TERMINAL)
-+
-+int do_terminal(cmd_tbl_t * cmd, int flag, int argc, char *argv[])
-+{
-+ int i, l;
-+ int last_tilde = 0;
-+ device_t *dev = NULL;
-+
-+ if (argc < 1)
-+ return -1;
-+
-+ /* Scan for selected output/input device */
-+ for (i = 1; i <= ListNumItems (devlist); i++) {
-+ device_t *tmp = ListGetPtrToItem (devlist, i);
-+ if (!strcmp(tmp->name, argv[1])) {
-+ dev = tmp;
-+ break;
-+ }
-+ }
-+ if (!dev)
-+ return -1;
-+
-+ serial_reinit_all();
-+ printf("Entering terminal mode for port %s\n", dev->name);
-+ puts("Use '~.' to leave the terminal and get back to u-boot\n");
-+
-+ while (1) {
-+ int c;
-+
-+ /* read from console and display on serial port */
-+ if (stdio_devices[0]->tstc()) {
-+ c = stdio_devices[0]->getc();
-+ if (last_tilde == 1) {
-+ if (c == '.') {
-+ putc(c);
-+ putc('\n');
-+ break;
-+ } else {
-+ last_tilde = 0;
-+ /* write the delayed tilde */
-+ dev->putc('~');
-+ /* fall-through to print current
-+ * character */
-+ }
-+ }
-+ if (c == '~') {
-+ last_tilde = 1;
-+ puts("[u-boot]");
-+ putc(c);
-+ }
-+ dev->putc(c);
-+ }
-+
-+ /* read from serial port and display on console */
-+ if (dev->tstc()) {
-+ c = dev->getc();
-+ putc(c);
-+ }
-+ }
-+ return 0;
-+}
-+
-+
-+/***************************************************/
-+
-+U_BOOT_CMD(
-+ terminal, 3, 1, do_terminal,
-+ "terminal - start terminal emulator\n",
-+ ""
-+);
-+
-+#endif /* CONFIG_CMD_TERMINAL */
-Index: u-boot/include/config_cmd_all.h
-===================================================================
---- u-boot.orig/include/config_cmd_all.h
-+++ u-boot/include/config_cmd_all.h
-@@ -73,6 +73,7 @@
- #define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
- #define CONFIG_CMD_SNTP /* SNTP support */
- #define CONFIG_CMD_SPI /* SPI utility */
-+#define CONFIG_CMD_TERMINAL /* built-in Serial Terminal */
- #define CONFIG_CMD_UNIVERSE /* Tundra Universe Support */
- #define CONFIG_CMD_USB /* USB Support */
- #define CONFIG_CMD_VFD /* VFD support (TRAB) */
More information about the commitlog
mailing list
