r1930 - trunk/src/target/u-boot/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Wed May 9 09:41:45 CEST 2007
Author: laforge
Date: 2007-05-09 09:41:42 +0200 (Wed, 09 May 2007)
New Revision: 1930
Modified:
trunk/src/target/u-boot/patches/uboot-hxd8.patch
Log:
* HXD8: use correct rootfs partition size for 1GByte NAND flash
* HXD8: fix GPIO initialization for NAND chip select (fixes NAND write)
* HXD8: disable u-boot video driver since it currently crashes ;)
* HXD8: use dynamic partition and dynamic environment
Modified: trunk/src/target/u-boot/patches/uboot-hxd8.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-hxd8.patch 2007-05-08 15:25:51 UTC (rev 1929)
+++ trunk/src/target/u-boot/patches/uboot-hxd8.patch 2007-05-09 07:41:42 UTC (rev 1930)
@@ -4,7 +4,7 @@
===================================================================
--- u-boot.orig/Makefile
+++ u-boot/Makefile
-@@ -1995,6 +1995,9 @@
+@@ -1999,6 +1999,9 @@
qt2410_config : unconfig
@./mkconfig $(@:_config=) arm arm920t qt2410 NULL s3c24x0
@@ -88,7 +88,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/hxd8/hxd8.c
-@@ -0,0 +1,169 @@
+@@ -0,0 +1,170 @@
+/*
+ * (C) Copyright 2007 by OpenMoko, Inc.
+ * Author: Harald Welte <laforge at openmoko.org>
@@ -187,6 +187,7 @@
+
+ /* set up the I/O ports */
+ gpio->GPACON = 0x005E0FFE;
++ gpio->GPADAT = 0x0001C000;
+ gpio->GPBCON = 0x00045542;
+ gpio->GPBUP = 0x000007FF;
+ gpio->GPCCON = 0xAAAA55A9;
@@ -253,7 +254,7 @@
+ images: 640*480*2*2 = 1228800 < 1245184. */
+
+unsigned int dynpart_size[] = {
-+ CFG_UBOOT_SIZE, 0x20000, 0x200000, 0xa0000, 0x3d5c000-CFG_UBOOT_SIZE, 0 };
++ CFG_UBOOT_SIZE, 0x20000, 0x200000, 0xa0000, 0x3fd00000, 0 };
+char *dynpart_names[] = {
+ "u-boot", "u-boot_env", "kernel", "splash", "rootfs", NULL };
+
@@ -438,7 +439,7 @@
===================================================================
--- /dev/null
+++ u-boot/include/configs/hxd8.h
-@@ -0,0 +1,272 @@
+@@ -0,0 +1,275 @@
+/*
+ * (C) Copyright 2007 OpenMoko, Inc.
+ * Author: Harald Welte <laforge at openmoko.org>
@@ -479,8 +480,8 @@
+ * (easy to change)
+ */
+#define CONFIG_ARM920T 1 /* This is an ARM920T Core */
-+#define CONFIG_S3C2440 1 /* in a SAMSUNG S3C2410 SoC */
-+#define CONFIG_SMDK2440 1 /* on a SAMSUNG SMDK2410 Board */
++#define CONFIG_S3C2440 1 /* in a SAMSUNG S3C2440 SoC */
++#define CONFIG_SMDK2440 1 /* on a SAMSUNG SMDK2440 Board */
+
+/* input clock of PLL */
+#define CONFIG_SYS_CLK_FREQ 16934400/* the HXD8 has this input clock */
@@ -492,7 +493,7 @@
+/*
+ * Size of malloc() pool
+ */
-+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 400*1024)
++#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 2048*1024)
+ /* >> CFG_VIDEO_LOGO_MAX_SIZE */
+#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
+
@@ -529,7 +530,7 @@
+ /* CFG_CMD_IRQ | */ \
+ CFG_CMD_BOOTD | \
+ CFG_CMD_CONSOLE | \
-+ CFG_CMD_BMP | \
++ /* CFG_CMD_BMP | */ \
+ CFG_CMD_ASKENV | \
+ CFG_CMD_RUN | \
+ CFG_CMD_ECHO | \
@@ -596,7 +597,7 @@
+ *
+ * The stack sizes are set up in start.S using the settings below
+ */
-+#define CONFIG_STACKSIZE (128*1024) /* regular stack */
++#define CONFIG_STACKSIZE (512*1024) /* regular stack */
+#ifdef CONFIG_USE_IRQ
+#define CONFIG_STACKSIZE_IRQ (8*1024) /* IRQ stack */
+#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */
@@ -641,9 +642,9 @@
+/* No NOR flash in this device */
+#define CFG_NO_FLASH 1
+
++#define CFG_ENV_SIZE 0x20000 /* 128k Total Size of Environment Sector */
+#define CFG_ENV_IS_IN_NAND 1
-+#define CFG_ENV_SIZE 0x4000 /* 16k Total Size of Environment Sector */
-+#define CFG_ENV_OFFSET_OOB 1 /* Location of ENV stored in block 0 OOB */
++#define CFG_ENV_OFFSET_OOB 1 /* Location of ENV stored in block 0 OOB */
+#define CFG_PREBOOT_OVERRIDE 1 /* allow preboot from memory */
+
+#define NAND_MAX_CHIPS 1
@@ -685,6 +686,7 @@
+/* we have a board_late_init() function */
+#define BOARD_LATE_INIT 1
+
++#if 0
+#define CONFIG_VIDEO
+#define CONFIG_VIDEO_S3C2410
+#define CONFIG_CFB_CONSOLE
@@ -700,6 +702,7 @@
+#define VIDEO_GETC_FCT serial_getc
+
+#define LCD_VIDEO_ADDR 0x33d00000
++#endif
+
+#define CONFIG_S3C2410_NAND_BBT 1
+//#define CONFIG_S3C2410_NAND_HWECC 1
@@ -707,8 +710,9 @@
+#define CONFIG_DRIVER_PCF50606 1
+
+#define MTDIDS_DEFAULT "nand0=hxd8-nand"
-+#define MTPARTS_DEFAULT "hxd8-nand:256k(u-boot),16k(u-boot_env),2M(kernel),640k(splash),-(jffs2)"
++#define MTPARTS_DEFAULT "hxd8-nand:256k(u-boot),128k(u-boot_env),2M(kernel),640k(splash),0x3fd00000(jffs2)"
+#define CFG_NAND_DYNPART_MTD_KERNEL_NAME "hxd8-nand"
++#define CONFIG_NAND_DYNPART
+
+#endif /* __CONFIG_H */
Index: u-boot/board/hxd8/udc.c
More information about the commitlog
mailing list
