r1070 - trunk/src/target/u-boot/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Wed Feb 21 15:56:18 CET 2007
Author: laforge
Date: 2007-02-21 15:56:17 +0100 (Wed, 21 Feb 2007)
New Revision: 1070
Modified:
trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch
Log:
* fix compilation due to missing last line in qt2410.c
* update config to become closer to what neo1973.h does these days
Modified: trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch 2007-02-21 13:21:09 UTC (rev 1069)
+++ trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch 2007-02-21 14:56:17 UTC (rev 1070)
@@ -5,8 +5,8 @@
Index: u-boot/Makefile
===================================================================
---- u-boot.orig/Makefile 2007-02-16 23:01:22.000000000 +0100
-+++ u-boot/Makefile 2007-02-16 23:02:54.000000000 +0100
+--- u-boot.orig/Makefile 2007-02-21 10:57:09.000000000 +0100
++++ u-boot/Makefile 2007-02-21 15:52:58.000000000 +0100
@@ -1928,6 +1928,9 @@
sbc2410x_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
@@ -20,7 +20,7 @@
Index: u-boot/board/qt2410/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/qt2410/Makefile 2007-02-16 23:02:55.000000000 +0100
++++ u-boot/board/qt2410/Makefile 2007-02-21 10:58:40.000000000 +0100
@@ -0,0 +1,47 @@
+#
+# (C) Copyright 2000, 2001, 2002
@@ -72,7 +72,7 @@
Index: u-boot/board/qt2410/config.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/qt2410/config.mk 2007-02-16 23:02:55.000000000 +0100
++++ u-boot/board/qt2410/config.mk 2007-02-21 10:58:40.000000000 +0100
@@ -0,0 +1,25 @@
+#
+# (C) Copyright 2002
@@ -102,7 +102,7 @@
Index: u-boot/board/qt2410/flash.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/qt2410/flash.c 2007-02-16 23:02:55.000000000 +0100
++++ u-boot/board/qt2410/flash.c 2007-02-21 10:58:40.000000000 +0100
@@ -0,0 +1,435 @@
+/*
+ * (C) Copyright 2002
@@ -542,7 +542,7 @@
Index: u-boot/board/qt2410/lowlevel_init.S
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/qt2410/lowlevel_init.S 2007-02-16 23:02:55.000000000 +0100
++++ u-boot/board/qt2410/lowlevel_init.S 2007-02-21 10:58:40.000000000 +0100
@@ -0,0 +1,173 @@
+/*
+ * Memory Setup stuff - taken from blob memsetup.S
@@ -720,8 +720,8 @@
Index: u-boot/board/qt2410/qt2410.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/qt2410/qt2410.c 2007-02-16 23:02:55.000000000 +0100
-@@ -0,0 +1,127 @@
++++ u-boot/board/qt2410/qt2410.c 2007-02-21 15:27:13.000000000 +0100
+@@ -0,0 +1,128 @@
+/*
+ * (C) 2006 by OpenMoko, Inc.
+ * Author: Harald Welte <laforge at openmoko.org>
@@ -849,10 +849,11 @@
+ gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
+
+ return 0;
++}
Index: u-boot/board/qt2410/u-boot.lds
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/qt2410/u-boot.lds 2007-02-16 23:02:55.000000000 +0100
++++ u-boot/board/qt2410/u-boot.lds 2007-02-21 10:58:40.000000000 +0100
@@ -0,0 +1,58 @@
+/*
+ * (C) Copyright 2002
@@ -915,8 +916,8 @@
Index: u-boot/include/configs/qt2410.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/include/configs/qt2410.h 2007-02-16 23:04:11.000000000 +0100
-@@ -0,0 +1,216 @@
++++ u-boot/include/configs/qt2410.h 2007-02-21 15:48:39.000000000 +0100
+@@ -0,0 +1,285 @@
+/*
+ * (C) Copyright 2002
+ * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
@@ -948,13 +949,14 @@
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
-+#if 1
++#if 0
+/* If we want to start u-boot from usb bootloader in NOR flash */
+#define CONFIG_SKIP_RELOCATE_UBOOT 1
+#define CONFIG_SKIP_LOWLEVEL_INIT 1
+#else
+/* If we want to start u-boot directly from within NAND flash */
+#define CONFIG_S3C2410_NAND_BOOT 1
++#define CONFIG_S3C2410_NAND_SKIP_BAD 1
+#endif
+
+/*
@@ -971,20 +973,21 @@
+
+#define USE_920T_MMU 1
+#define CONFIG_USE_IRQ 1
-+//#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
+
+/*
+ * Size of malloc() pool
+ */
-+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
++#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 400*1024)
+#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
+
+/*
+ * Hardware drivers
+ */
++#if 0
+#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
+#define CS8900_BASE 0x19000300
+#define CS8900_BUS16 1 /* the Linux driver does accesses as shorts */
++#endif
+
+/*
+ * select serial console configuration
@@ -1005,28 +1008,48 @@
+/***********************************************************
+ * Command definition
+ ***********************************************************/
-+#define CONFIG_COMMANDS \
-+ (CONFIG_CMD_DFL | \
-+ CFG_CMD_BSP | \
++#define CONFIG_COMMANDS (\
++ CFG_CMD_BDI | \
++ CFG_CMD_LOADS | \
++ CFG_CMD_LOADB | \
++ CFG_CMD_IMI | \
+ CFG_CMD_CACHE | \
++ CFG_CMD_MEMORY | \
++ CFG_CMD_ENV | \
++ /* CFG_CMD_IRQ | */ \
++ CFG_CMD_BOOTD | \
++ CFG_CMD_CONSOLE | \
++ CFG_CMD_BMP | \
++ CFG_CMD_ASKENV | \
++ CFG_CMD_RUN | \
++ CFG_CMD_ECHO | \
++ CFG_CMD_I2C | \
++ CFG_CMD_REGINFO | \
++ CFG_CMD_IMMAP | \
+ CFG_CMD_DATE | \
-+ CFG_CMD_DHCP | \
++ CFG_CMD_AUTOSCRIPT | \
++ CFG_CMD_BSP | \
++ CFG_CMD_ELF | \
++ CFG_CMD_MISC | \
++ /* CFG_CMD_USB | */ \
++ CFG_CMD_JFFS2 | \
+ CFG_CMD_DIAG | \
-+ CFG_CMD_ELF | \
-+ CFG_CMD_EXT2 | \
-+ CFG_CMD_FAT | \
+ CFG_CMD_HWFLOW | \
-+ /* CFG_CMD_IDE | */ \
-+ /* CFG_CMD_IRQ | */ \
-+ CFG_CMD_JFFS2 | \
-+ CFG_CMD_MMC | \
++ CFG_CMD_SAVES | \
+ CFG_CMD_NAND | \
-+ CFG_CMD_PING | \
+ CFG_CMD_PORTIO | \
-+ CFG_CMD_REGINFO | \
-+ CFG_CMD_SAVES | \
-+ CFG_CMD_USB)
++ CFG_CMD_MMC | \
++ CFG_CMD_FAT | \
++ CFG_CMD_EXT2 | \
++ 0)
+
++#if 0
++ CFG_CMD_DHCP | \
++ CFG_CMD_PING | \
++ CFG_CMD_NET | \
++
++#endif
++
+/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
+#include <cmd_confdefs.h>
+
@@ -1054,7 +1077,7 @@
+#define CFG_PROMPT "QT2410 # " /* Monitor Command Prompt */
+#define CFG_CBSIZE 256 /* Console I/O Buffer Size */
+#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
-+#define CFG_MAXARGS 16 /* max number of command args */
++#define CFG_MAXARGS 64 /* max number of command args */
+#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */
+
+#define CFG_MEMTEST_START 0x30000000 /* memtest works on */
@@ -1084,6 +1107,18 @@
+
+#define CONFIG_USB_OHCI 1
+
++#define CONFIG_USB_DEVICE 1
++#define CONFIG_USB_TTY 1
++#define CFG_CONSOLE_IS_IN_ENV 1
++#define CONFIG_USBD_VENDORID 0x1457 /* Linux/NetChip */
++#define CONFIG_USBD_PRODUCTID_GSERIAL 0x5120 /* gserial */
++#define CONFIG_USBD_PRODUCTID_CDCACM 0x5119 /* CDC ACM */
++#define CONFIG_USBD_MANUFACTURER "Armzone"
++#define CONFIG_USBD_PRODUCT_NAME "QT2410 Bootloader " U_BOOT_VERSION
++#define CONFIG_EXTRA_ENV_SETTINGS "usbtty=cdc_acm\0"
++#define CONFIG_USBD_DFU 1
++#define CONFIG_USBD_DFU_XFER_SIZE 0x4000
++
+/*-----------------------------------------------------------------------
+ * Physical Memory Map
+ */
@@ -1112,7 +1147,7 @@
+
+#define CFG_ENV_IS_IN_NAND 1
+#define CFG_ENV_SIZE 0x4000 /* 16k Total Size of Environment Sector */
-+#define CFG_ENV_OFFSET 0x30000 /* environment after bootloader */
++#define CFG_ENV_OFFSET_OOB 1 /* Location of ENV stored in block 0 OOB */
+
+#define NAND_MAX_CHIPS 1
+#define CFG_NAND_BASE 0x4e000000
@@ -1127,9 +1162,44 @@
+#define CONFIG_FAT 1
+#define CONFIG_SUPPORT_VFAT 1
+
++#if 1
++/* JFFS2 driver */
++#define CONFIG_JFFS2_CMDLINE 1
++#define CONFIG_JFFS2_NAND 1
++#define CONFIG_JFFS2_NAND_DEV 0
++//#define CONFIG_JFFS2_NAND_OFF 0x634000
++//#define CONFIG_JFFS2_NAND_SIZE 0x39cc000
++#endif
++
+/* ATAG configuration */
+#define CONFIG_INITRD_TAG 1
+#define CONFIG_SETUP_MEMORY_TAGS 1
+#define CONFIG_CMDLINE_TAG 1
+
++#define CONFIG_DRIVER_S3C24X0_I2C 1
++#define CONFIG_HARD_I2C 1
++#define CFG_I2C_SPEED 400000 /* 400kHz according to PCF50606 data sheet */
++#define CFG_I2C_SLAVE 0x7f
++
++#define CONFIG_VIDEO
++#define CONFIG_VIDEO_S3C2410
++#define CONFIG_CFB_CONSOLE
++#define CONFIG_VIDEO_LOGO
++#define CONFIG_SPLASH_SCREEN
++#define CFG_VIDEO_LOGO_MAX_SIZE (640*480+1024+100) /* 100 = slack */
++#define CONFIG_VIDEO_BMP_GZIP
++#define CONFIG_VGA_AS_SINGLE_DEVICE
++#define CONFIG_UNZIP
++
++#define VIDEO_KBD_INIT_FCT 0
++#define VIDEO_TSTC_FCT serial_tstc
++#define VIDEO_GETC_FCT serial_getc
++
++#define LCD_VIDEO_ADDR 0x33d00000
++
++#define CONFIG_S3C2410_NAND_BBT 1
++
++#define MTDIDS_DEFAULT "nand0=qt2410-nand"
++#define MTPARTS_DEFAULT "qt2410-nand:192k(u-boot),8k(u-boot_env),2M(kernel),2M(splash),-(jffs2)"
++
+#endif /* __CONFIG_H */
More information about the commitlog
mailing list
