r500 - in trunk/oe/packages/uboot: . files
Thu Jan 4 15:07:47 CET 2007
Author:
Date: 2007-01-04 15:07:47 +0100 (Thu, 04 Jan 2007)
New Revision: 500
Modified:
trunk/oe/packages/uboot/files/u-boot-20061030-gta01bv2.patch
trunk/oe/packages/uboot/files/u-boot-20061030-gta01v4.patch
trunk/oe/packages/uboot/files/u-boot-20061030-qt2410-gta01.patch
trunk/oe/packages/uboot/uboot-gta01_0.0+cvs20061030.bb
Log:
fix uboot build
Modified: trunk/oe/packages/uboot/files/u-boot-20061030-gta01bv2.patch
===================================================================
--- trunk/oe/packages/uboot/files/u-boot-20061030-gta01bv2.patch 2007-01-04 14:06:29 UTC (rev 499)
+++ trunk/oe/packages/uboot/files/u-boot-20061030-gta01bv2.patch 2007-01-04 14:07:47 UTC (rev 500)
@@ -1,10 +1,10 @@
This patch adds support for the GTA01Bv2 variant of the FIC GTA01 (Neo1973) phone
-Index: u-boot.git/Makefile
+Index: git/Makefile
===================================================================
---- u-boot.git.orig/Makefile 2007-01-03 21:06:36.000000000 +0100
-+++ u-boot.git/Makefile 2007-01-03 21:06:38.000000000 +0100
-@@ -1912,6 +1912,7 @@
+--- git.orig/Makefile 2007-01-04 12:22:12.000000000 +0100
++++ git/Makefile 2007-01-04 12:22:16.000000000 +0100
+@@ -1918,6 +1918,7 @@
gta01_config \
gta01v3_config \
@@ -12,10 +12,10 @@
gta01v4_config : unconfig
@board/gta01/split_by_variant.sh $@
-Index: u-boot.git/board/gta01/gta01.c
+Index: git/board/gta01/gta01.c
===================================================================
---- u-boot.git.orig/board/gta01/gta01.c 2007-01-03 21:06:36.000000000 +0100
-+++ u-boot.git/board/gta01/gta01.c 2007-01-03 21:06:38.000000000 +0100
+--- git.orig/board/gta01/gta01.c 2007-01-04 12:22:12.000000000 +0100
++++ git/board/gta01/gta01.c 2007-01-04 12:22:16.000000000 +0100
@@ -35,28 +35,29 @@
DECLARE_GLOBAL_DATA_PTR;
@@ -62,14 +62,14 @@
gpio->GPHUP = 0x000007FF;
+#elif defined(CONFIG_ARCH_GTA01B_v2)
+ gpio->GPACON = 0x005E47FF;
-+
+
+ gpio->GPBCON = 0x00145416;
+ gpio->GPBUP = 0x000007FF;
+ gpio->GPBDAT |= 0x4; /* Set GBP2 to high (Flash power-up) */
+
+ gpio->GPCCON = 0xAAAA12A9;
+ gpio->GPCUP = 0x0000FFFF;
-
++
+ gpio->GPDCON = 0xAAAAAAAA;
+ gpio->GPDUP = 0x0000FFFF;
+
@@ -109,10 +109,10 @@
+ return 0x00000220;
#endif
}
-Index: u-boot.git/board/gta01/split_by_variant.sh
+Index: git/board/gta01/split_by_variant.sh
===================================================================
---- u-boot.git.orig/board/gta01/split_by_variant.sh 2007-01-03 21:06:36.000000000 +0100
-+++ u-boot.git/board/gta01/split_by_variant.sh 2007-01-03 21:11:28.000000000 +0100
+--- git.orig/board/gta01/split_by_variant.sh 2007-01-04 12:22:12.000000000 +0100
++++ git/board/gta01/split_by_variant.sh 2007-01-04 12:22:16.000000000 +0100
@@ -15,16 +15,23 @@
case "$1" in
gta01v4_config)
@@ -137,10 +137,10 @@
;;
esac
-Index: u-boot.git/include/configs/gta01.h
+Index: git/include/configs/gta01.h
===================================================================
---- u-boot.git.orig/include/configs/gta01.h 2007-01-03 21:06:36.000000000 +0100
-+++ u-boot.git/include/configs/gta01.h 2007-01-03 21:06:38.000000000 +0100
+--- git.orig/include/configs/gta01.h 2007-01-04 12:22:12.000000000 +0100
++++ git/include/configs/gta01.h 2007-01-04 12:22:16.000000000 +0100
@@ -128,6 +128,8 @@
#define CFG_PROMPT "GTA01v3 # " /* Monitor Command Prompt */
#elif defined(CONFIG_ARCH_GTA01_v4)
@@ -164,10 +164,10 @@
#define PHYS_SDRAM_RES_SIZE 0x00200000 /* 2 MB for frame buffer */
/*-----------------------------------------------------------------------
-Index: u-boot.git/board/gta01/lowlevel_init.S
+Index: git/board/gta01/lowlevel_init.S
===================================================================
---- u-boot.git.orig/board/gta01/lowlevel_init.S 2007-01-03 21:06:36.000000000 +0100
-+++ u-boot.git/board/gta01/lowlevel_init.S 2007-01-03 21:06:38.000000000 +0100
+--- git.orig/board/gta01/lowlevel_init.S 2007-01-04 12:22:07.000000000 +0100
++++ git/board/gta01/lowlevel_init.S 2007-01-04 12:22:16.000000000 +0100
@@ -108,12 +108,16 @@
#define B5_PMC 0x0 /* normal */
@@ -207,10 +207,10 @@
/* everything is fine now */
mov pc, lr
-Index: u-boot.git/board/gta01/config.mk
+Index: git/board/gta01/config.mk
===================================================================
---- u-boot.git.orig/board/gta01/config.mk 2007-01-03 21:06:50.000000000 +0100
-+++ u-boot.git/board/gta01/config.mk 2007-01-03 21:13:37.000000000 +0100
+--- git.orig/board/gta01/config.mk 2007-01-04 12:22:07.000000000 +0100
++++ git/board/gta01/config.mk 2007-01-04 12:22:16.000000000 +0100
@@ -8,18 +8,26 @@
# see http://www.samsung.com/ for more information on SAMSUNG
#
Modified: trunk/oe/packages/uboot/files/u-boot-20061030-gta01v4.patch
===================================================================
--- trunk/oe/packages/uboot/files/u-boot-20061030-gta01v4.patch 2007-01-04 14:06:29 UTC (rev 499)
+++ trunk/oe/packages/uboot/files/u-boot-20061030-gta01v4.patch 2007-01-04 14:07:47 UTC (rev 500)
@@ -1,8 +1,8 @@
-Index: u-boot.git/Makefile
+Index: git/Makefile
===================================================================
---- u-boot.git.orig/Makefile 2007-01-03 20:28:41.000000000 +0100
-+++ u-boot.git/Makefile 2007-01-03 20:30:55.000000000 +0100
-@@ -1910,8 +1910,10 @@
+--- git.orig/Makefile 2007-01-04 12:22:08.000000000 +0100
++++ git/Makefile 2007-01-04 12:22:12.000000000 +0100
+@@ -1916,8 +1916,10 @@
qt2410_config : unconfig
@./mkconfig $(@:_config=) arm arm920t qt2410 NULL s3c24x0
@@ -15,10 +15,10 @@
scb9328_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t scb9328 NULL imx
-Index: u-boot.git/board/gta01/gta01.c
+Index: git/board/gta01/gta01.c
===================================================================
---- u-boot.git.orig/board/gta01/gta01.c 2007-01-03 20:28:41.000000000 +0100
-+++ u-boot.git/board/gta01/gta01.c 2007-01-03 20:30:55.000000000 +0100
+--- git.orig/board/gta01/gta01.c 2007-01-04 12:22:08.000000000 +0100
++++ git/board/gta01/gta01.c 2007-01-04 12:22:12.000000000 +0100
@@ -90,6 +90,7 @@
delay (8000);
@@ -32,11 +32,11 @@
gpio->GPHCON = 0x0008FAAA;
gpio->GPHUP = 0x000007FF;
+#elif defined(CONFIG_ARCH_GTA01_v4)
-+ gpio->GPACON = 0x005E47FF;
++ gpio->GPACON = 0x007FFFFF; //0x005E47FF;
+
-+ gpio->GPBCON = 0x00045016;
++ gpio->GPBDAT |= 0x4; /* Set GBP2 to high (Flash power-up) */
++ gpio->GPBCON = 0x00005056; //0x00045016;
+ gpio->GPBUP = 0x000007FF;
-+ gpio->GPBDAT |= 0x4; /* Set GBP2 to high (Flash power-up) */
+
+ gpio->GPCCON = 0xAAAA12A9;
+ gpio->GPCUP = 0x0000FFFF;
@@ -51,7 +51,7 @@
+ gpio->GPFUP = 0x000000FF;
+
+ gpio->GPGCON = 0xFF40F0C1;
-+ gpio->GPGUP = 0x0000AFEF;
++ gpio->GPGUP = 0x0000FFFF;
+
+ gpio->GPHCON = 0x0000FAAA;
+ gpio->GPHUP = 0x000007FF;
@@ -72,10 +72,10 @@
+ return 0x00000140;
+#endif
}
-Index: u-boot.git/board/gta01/split_by_variant.sh
+Index: git/board/gta01/split_by_variant.sh
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/board/gta01/split_by_variant.sh 2007-01-03 20:30:55.000000000 +0100
++++ git/board/gta01/split_by_variant.sh 2007-01-04 12:22:12.000000000 +0100
@@ -0,0 +1,36 @@
+#!/bin/sh
+# ---------------------------------------------------------
@@ -113,10 +113,10 @@
+# Complete the configuration
+# ---------------------------------------------------------
+$MKCONFIG -a gta01 arm arm920t gta01 NULL s3c24x0
-Index: u-boot.git/include/configs/gta01.h
+Index: git/include/configs/gta01.h
===================================================================
---- u-boot.git.orig/include/configs/gta01.h 2007-01-03 20:30:46.000000000 +0100
-+++ u-boot.git/include/configs/gta01.h 2007-01-03 20:30:55.000000000 +0100
+--- git.orig/include/configs/gta01.h 2007-01-04 12:22:08.000000000 +0100
++++ git/include/configs/gta01.h 2007-01-04 12:22:12.000000000 +0100
@@ -124,7 +124,11 @@
* Miscellaneous configurable options
*/
Modified: trunk/oe/packages/uboot/files/u-boot-20061030-qt2410-gta01.patch
===================================================================
--- trunk/oe/packages/uboot/files/u-boot-20061030-qt2410-gta01.patch 2007-01-04 14:06:29 UTC (rev 499)
+++ trunk/oe/packages/uboot/files/u-boot-20061030-qt2410-gta01.patch 2007-01-04 14:07:47 UTC (rev 500)
@@ -1,8 +1,8 @@
-Index: u-boot.git/Makefile
+Index: git/Makefile
===================================================================
---- u-boot.git.orig/Makefile 2007-01-01 17:32:23.000000000 +0100
-+++ u-boot.git/Makefile 2007-01-03 20:31:35.000000000 +0100
-@@ -1907,6 +1907,12 @@
+--- git.orig/Makefile 2007-01-04 12:21:15.000000000 +0100
++++ git/Makefile 2007-01-04 12:21:18.000000000 +0100
+@@ -1913,6 +1913,12 @@
sbc2410x_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
@@ -15,10 +15,10 @@
scb9328_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t scb9328 NULL imx
-Index: u-boot.git/board/gta01/Makefile
+Index: git/board/gta01/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/board/gta01/Makefile 2007-01-01 17:32:26.000000000 +0100
++++ git/board/gta01/Makefile 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,47 @@
+#
+# (C) Copyright 2000, 2001, 2002
@@ -67,10 +67,10 @@
+-include .depend
+
+#########################################################################
-Index: u-boot.git/board/gta01/config.mk
+Index: git/board/gta01/config.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/board/gta01/config.mk 2007-01-01 17:32:26.000000000 +0100
++++ git/board/gta01/config.mk 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,25 @@
+#
+# (C) Copyright 2002
@@ -97,10 +97,10 @@
+
+
+TEXT_BASE = 0x33F80000
-Index: u-boot.git/board/gta01/gta01.c
+Index: git/board/gta01/gta01.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/board/gta01/gta01.c 2007-01-03 20:31:35.000000000 +0100
++++ git/board/gta01/gta01.c 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,147 @@
+/*
+ * (C) 2006 by Harald Welte <hwelte at hmw-consulting.de>
@@ -249,10 +249,10 @@
+{
+ return 0x00000130;
+}
-Index: u-boot.git/board/gta01/lowlevel_init.S
+Index: git/board/gta01/lowlevel_init.S
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/board/gta01/lowlevel_init.S 2007-01-03 20:31:34.000000000 +0100
++++ git/board/gta01/lowlevel_init.S 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,171 @@
+/*
+ * Memory Setup stuff - taken from blob memsetup.S
@@ -425,10 +425,10 @@
+ .word 0xb2
+ .word 0x30
+ .word 0x30
-Index: u-boot.git/board/gta01/u-boot.lds
+Index: git/board/gta01/u-boot.lds
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/board/gta01/u-boot.lds 2007-01-01 17:32:26.000000000 +0100
++++ git/board/gta01/u-boot.lds 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,57 @@
+/*
+ * (C) Copyright 2002
@@ -487,10 +487,10 @@
+ .bss : { *(.bss) }
+ _end = .;
+}
-Index: u-boot.git/board/qt2410/Makefile
+Index: git/board/qt2410/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/board/qt2410/Makefile 2007-01-01 17:32:26.000000000 +0100
++++ git/board/qt2410/Makefile 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,47 @@
+#
+# (C) Copyright 2000, 2001, 2002
@@ -539,10 +539,10 @@
+-include .depend
+
+#########################################################################
-Index: u-boot.git/board/qt2410/config.mk
+Index: git/board/qt2410/config.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/board/qt2410/config.mk 2007-01-01 17:32:26.000000000 +0100
++++ git/board/qt2410/config.mk 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,25 @@
+#
+# (C) Copyright 2002
@@ -569,10 +569,10 @@
+
+
+TEXT_BASE = 0x33F80000
-Index: u-boot.git/board/qt2410/flash.c
+Index: git/board/qt2410/flash.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/board/qt2410/flash.c 2007-01-01 17:32:26.000000000 +0100
++++ git/board/qt2410/flash.c 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,435 @@
+/*
+ * (C) Copyright 2002
@@ -1009,10 +1009,10 @@
+
+ return write_hword (info, wp, data);
+}
-Index: u-boot.git/board/qt2410/lowlevel_init.S
+Index: git/board/qt2410/lowlevel_init.S
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/board/qt2410/lowlevel_init.S 2007-01-01 17:32:26.000000000 +0100
++++ git/board/qt2410/lowlevel_init.S 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,173 @@
+/*
+ * Memory Setup stuff - taken from blob memsetup.S
@@ -1187,10 +1187,10 @@
+ .word 0xb2
+ .word 0x30
+ .word 0x30
-Index: u-boot.git/board/qt2410/qt2410.c
+Index: git/board/qt2410/qt2410.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/board/qt2410/qt2410.c 2007-01-01 17:32:26.000000000 +0100
++++ git/board/qt2410/qt2410.c 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,127 @@
+/*
+ * (C) 2006 by Harald Welte <hwelte at hmw-consulting.de>
@@ -1319,10 +1319,10 @@
+
+ return 0;
+}
-Index: u-boot.git/board/qt2410/u-boot.lds
+Index: git/board/qt2410/u-boot.lds
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/board/qt2410/u-boot.lds 2007-01-01 17:32:26.000000000 +0100
++++ git/board/qt2410/u-boot.lds 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,57 @@
+/*
+ * (C) Copyright 2002
@@ -1381,10 +1381,10 @@
+ .bss : { *(.bss) }
+ _end = .;
+}
-Index: u-boot.git/common/Makefile
+Index: git/common/Makefile
===================================================================
---- u-boot.git.orig/common/Makefile 2007-01-01 17:32:23.000000000 +0100
-+++ u-boot.git/common/Makefile 2007-01-01 17:32:26.000000000 +0100
+--- git.orig/common/Makefile 2007-01-04 12:21:15.000000000 +0100
++++ git/common/Makefile 2007-01-04 12:21:18.000000000 +0100
@@ -28,7 +28,7 @@
AOBJS =
@@ -1394,10 +1394,10 @@
cmd_bdinfo.o cmd_bedbug.o cmd_bmp.o cmd_boot.o cmd_bootm.o \
cmd_cache.o cmd_console.o \
cmd_date.o cmd_dcr.o cmd_diag.o cmd_display.o cmd_doc.o cmd_dtt.o \
-Index: u-boot.git/common/cmd_arm920.c
+Index: git/common/cmd_arm920.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/common/cmd_arm920.c 2007-01-01 17:32:26.000000000 +0100
++++ git/common/cmd_arm920.c 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,64 @@
+/*
+ * (C) Copyright 2003
@@ -1463,10 +1463,10 @@
+ NULL
+);
+#endif /* CFG_CMD_BDI */
-Index: u-boot.git/cpu/arm920t/cpu.c
+Index: git/cpu/arm920t/cpu.c
===================================================================
---- u-boot.git.orig/cpu/arm920t/cpu.c 2007-01-01 17:32:23.000000000 +0100
-+++ u-boot.git/cpu/arm920t/cpu.c 2007-01-01 17:32:26.000000000 +0100
+--- git.orig/cpu/arm920t/cpu.c 2007-01-04 12:21:15.000000000 +0100
++++ git/cpu/arm920t/cpu.c 2007-01-04 12:21:18.000000000 +0100
@@ -38,7 +38,7 @@
#endif
@@ -1485,10 +1485,10 @@
{
#ifdef MMU_DEBUG
printf ("write %08lx to p15/c1\n", value);
-Index: u-boot.git/cpu/arm920t/s3c24x0/Makefile
+Index: git/cpu/arm920t/s3c24x0/Makefile
===================================================================
---- u-boot.git.orig/cpu/arm920t/s3c24x0/Makefile 2007-01-01 17:32:23.000000000 +0100
-+++ u-boot.git/cpu/arm920t/s3c24x0/Makefile 2007-01-01 17:32:26.000000000 +0100
+--- git.orig/cpu/arm920t/s3c24x0/Makefile 2007-01-04 12:21:15.000000000 +0100
++++ git/cpu/arm920t/s3c24x0/Makefile 2007-01-04 12:21:18.000000000 +0100
@@ -26,7 +26,7 @@
LIB = $(obj)lib$(SOC).a
@@ -1498,10 +1498,10 @@
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
-Index: u-boot.git/cpu/arm920t/s3c24x0/mmc.c
+Index: git/cpu/arm920t/s3c24x0/mmc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/cpu/arm920t/s3c24x0/mmc.c 2007-01-01 17:32:26.000000000 +0100
++++ git/cpu/arm920t/s3c24x0/mmc.c 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,568 @@
+/*
+ * u-boot S3C2410 MMC/SD card driver
@@ -2071,11 +2071,11 @@
+}
+
+#endif /* CONFIG_MMC */
-Index: u-boot.git/cpu/arm920t/s3c24x0/nand.c
+Index: git/cpu/arm920t/s3c24x0/nand.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/cpu/arm920t/s3c24x0/nand.c 2007-01-01 17:32:26.000000000 +0100
-@@ -0,0 +1,212 @@
++++ git/cpu/arm920t/s3c24x0/nand.c 2007-01-04 12:21:45.000000000 +0100
+@@ -0,0 +1,213 @@
+/*
+ * (C) Copyright 2006 Harald Welte <hwelte at hmw-consulting.de>
+ *
@@ -2225,7 +2225,7 @@
+ while (!s3c2410_dev_ready(mtd));
+}
+
-+void board_nand_init(struct nand_chip *nand)
++int board_nand_init(struct nand_chip *nand)
+{
+ u_int32_t cfg;
+ u_int8_t tacls, twrph0, twrph1;
@@ -2282,16 +2282,17 @@
+#endif
+
+ DEBUGN("end of nand_init\n");
++ return 0;
+}
+
+#else
+ #error "U-Boot legacy NAND support not available for S3C2410"
+#endif
+#endif
-Index: u-boot.git/cpu/arm920t/s3c24x0/nand_read.c
+Index: git/cpu/arm920t/s3c24x0/nand_read.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/cpu/arm920t/s3c24x0/nand_read.c 2007-01-01 17:32:26.000000000 +0100
++++ git/cpu/arm920t/s3c24x0/nand_read.c 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,75 @@
+/*
+ * nand_read.c: Simple NAND read functions for booting from NAND
@@ -2368,10 +2369,10 @@
+}
+
+#endif /* CONFIG_S3C2410_NAND_BOOT */
-Index: u-boot.git/cpu/arm920t/start.S
+Index: git/cpu/arm920t/start.S
===================================================================
---- u-boot.git.orig/cpu/arm920t/start.S 2007-01-01 17:32:23.000000000 +0100
-+++ u-boot.git/cpu/arm920t/start.S 2007-01-01 17:32:26.000000000 +0100
+--- git.orig/cpu/arm920t/start.S 2007-01-04 12:21:15.000000000 +0100
++++ git/cpu/arm920t/start.S 2007-01-04 12:21:18.000000000 +0100
@@ -5,6 +5,10 @@
* Copyright (c) 2002 Alex Züpke <azu at sysgo.de>
* Copyright (c) 2002 Gary Jennejohn <gj at denx.de>
@@ -2503,10 +2504,10 @@
#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
/* Set up the stack */
-Index: u-boot.git/drivers/Makefile
+Index: git/drivers/Makefile
===================================================================
---- u-boot.git.orig/drivers/Makefile 2007-01-01 17:32:23.000000000 +0100
-+++ u-boot.git/drivers/Makefile 2007-01-01 17:32:26.000000000 +0100
+--- git.orig/drivers/Makefile 2007-01-04 12:21:15.000000000 +0100
++++ git/drivers/Makefile 2007-01-04 12:21:18.000000000 +0100
@@ -51,7 +51,7 @@
ks8695eth.o \
pxa_pcmcia.o mpc8xx_pcmcia.o tqm8xx_pcmcia.o \
@@ -2516,10 +2517,10 @@
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
-Index: u-boot.git/drivers/cs8900.c
+Index: git/drivers/cs8900.c
===================================================================
---- u-boot.git.orig/drivers/cs8900.c 2007-01-01 17:32:23.000000000 +0100
-+++ u-boot.git/drivers/cs8900.c 2007-01-01 17:32:26.000000000 +0100
+--- git.orig/drivers/cs8900.c 2007-01-04 12:21:15.000000000 +0100
++++ git/drivers/cs8900.c 2007-01-04 12:21:18.000000000 +0100
@@ -120,6 +120,7 @@
unsigned char env_enetaddr[6];
char *tmp = getenv ("ethaddr");
@@ -2539,10 +2540,10 @@
return;
eth_reset ();
if ((get_reg (PP_SelfST) & (PP_SelfSTAT_EEPROM | PP_SelfSTAT_EEPROM_OK)) ==
-Index: u-boot.git/drivers/s3c2410_fb.c
+Index: git/drivers/s3c2410_fb.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/drivers/s3c2410_fb.c 2007-01-01 17:32:26.000000000 +0100
++++ git/drivers/s3c2410_fb.c 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,182 @@
+/*
+ * (C) Copyright 2006 Harald Welte <hwelte at hmw-consulting.de>
@@ -2726,10 +2727,10 @@
+}
+
+#endif /* CONFIG_VIDEO_S3C2410 */
-Index: u-boot.git/drivers/usbdcore_s3c2410.c
+Index: git/drivers/usbdcore_s3c2410.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/drivers/usbdcore_s3c2410.c 2007-01-01 17:32:26.000000000 +0100
++++ git/drivers/usbdcore_s3c2410.c 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,1609 @@
+/*
+ * (C) Copyright 2003
@@ -4340,10 +4341,10 @@
+}
+
+#endif
-Index: u-boot.git/fs/cramfs/cramfs.c
+Index: git/fs/cramfs/cramfs.c
===================================================================
---- u-boot.git.orig/fs/cramfs/cramfs.c 2007-01-01 17:32:23.000000000 +0100
-+++ u-boot.git/fs/cramfs/cramfs.c 2007-01-01 17:32:26.000000000 +0100
+--- git.orig/fs/cramfs/cramfs.c 2007-01-04 12:21:15.000000000 +0100
++++ git/fs/cramfs/cramfs.c 2007-01-04 12:21:18.000000000 +0100
@@ -27,7 +27,7 @@
#include <common.h>
#include <malloc.h>
@@ -4377,10 +4378,10 @@
+}
#endif /* CFG_FS_CRAMFS */
+
-Index: u-boot.git/include/asm-arm/arch-s3c24x0/mmc.h
+Index: git/include/asm-arm/arch-s3c24x0/mmc.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/include/asm-arm/arch-s3c24x0/mmc.h 2007-01-01 17:32:26.000000000 +0100
++++ git/include/asm-arm/arch-s3c24x0/mmc.h 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,112 @@
+/*
+ * linux/drivers/mmc/mmc_pxa.h
@@ -4494,10 +4495,10 @@
+
+
+#endif /* __MMC_PXA_P_H__ */
-Index: u-boot.git/include/asm-arm/arch-s3c24x0/regs-sdi.h
+Index: git/include/asm-arm/arch-s3c24x0/regs-sdi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/include/asm-arm/arch-s3c24x0/regs-sdi.h 2007-01-01 17:32:26.000000000 +0100
++++ git/include/asm-arm/arch-s3c24x0/regs-sdi.h 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,110 @@
+/* linux/include/asm/arch-s3c2410/regs-sdi.h
+ *
@@ -4609,10 +4610,10 @@
+#define S3C2410_SDIIMSK_RXFIFOHALF (1<<0)
+
+#endif /* __ASM_ARM_REGS_SDI */
-Index: u-boot.git/include/asm-arm/mach-types.h
+Index: git/include/asm-arm/mach-types.h
===================================================================
---- u-boot.git.orig/include/asm-arm/mach-types.h 2007-01-01 17:32:23.000000000 +0100
-+++ u-boot.git/include/asm-arm/mach-types.h 2007-01-01 17:32:26.000000000 +0100
+--- git.orig/include/asm-arm/mach-types.h 2007-01-04 12:21:15.000000000 +0100
++++ git/include/asm-arm/mach-types.h 2007-01-04 12:21:18.000000000 +0100
@@ -424,7 +424,7 @@
#define MACH_TYPE_MPORT3S 411
#define MACH_TYPE_RA_ALPHA 412
@@ -8700,10 +8701,10 @@
/*
* These have not yet been registered
*/
-Index: u-boot.git/include/configs/gta01.h
+Index: git/include/configs/gta01.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/include/configs/gta01.h 2007-01-03 20:31:43.000000000 +0100
++++ git/include/configs/gta01.h 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,233 @@
+/*
+ * (C) Copyright 2006 Harald Welte <hwelte at hmw-consulting.de>
@@ -8938,10 +8939,10 @@
+#endif
+
+#endif /* __CONFIG_H */
-Index: u-boot.git/include/configs/qt2410.h
+Index: git/include/configs/qt2410.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/include/configs/qt2410.h 2007-01-01 17:32:26.000000000 +0100
++++ git/include/configs/qt2410.h 2007-01-04 12:21:18.000000000 +0100
@@ -0,0 +1,245 @@
+/*
+ * (C) Copyright 2002
@@ -9188,10 +9189,10 @@
+#endif
+
+#endif /* __CONFIG_H */
-Index: u-boot.git/include/s3c2410.h
+Index: git/include/s3c2410.h
===================================================================
---- u-boot.git.orig/include/s3c2410.h 2007-01-01 17:32:23.000000000 +0100
-+++ u-boot.git/include/s3c2410.h 2007-01-01 17:32:26.000000000 +0100
+--- git.orig/include/s3c2410.h 2007-01-04 12:21:15.000000000 +0100
++++ git/include/s3c2410.h 2007-01-04 12:21:18.000000000 +0100
@@ -38,12 +38,6 @@
#define S3C2410_ECCSIZE 512
#define S3C2410_ECCBYTES 3
@@ -9237,10 +9238,10 @@
/* ISR */
#define pISR_RESET (*(unsigned *)(_ISR_STARTADDRESS+0x0))
-Index: u-boot.git/include/s3c24x0.h
+Index: git/include/s3c24x0.h
===================================================================
---- u-boot.git.orig/include/s3c24x0.h 2007-01-01 17:32:24.000000000 +0100
-+++ u-boot.git/include/s3c24x0.h 2007-01-01 17:32:26.000000000 +0100
+--- git.orig/include/s3c24x0.h 2007-01-04 12:21:15.000000000 +0100
++++ git/include/s3c24x0.h 2007-01-04 12:21:18.000000000 +0100
@@ -637,13 +637,7 @@
S3C24X0_REG32 SDIDCNT;
S3C24X0_REG32 SDIDSTA;
Modified: trunk/oe/packages/uboot/uboot-gta01_0.0+cvs20061030.bb
===================================================================
--- trunk/oe/packages/uboot/uboot-gta01_0.0+cvs20061030.bb 2007-01-04 14:06:29 UTC (rev 499)
+++ trunk/oe/packages/uboot/uboot-gta01_0.0+cvs20061030.bb 2007-01-04 14:07:47 UTC (rev 500)
@@ -27,6 +27,7 @@
for machine in ${UBOOT_MACHINES}
do
#install -m 0644 ${WORKDIR}/${machine}_${type}.h include/configs/gta01.h
+ chmod +x board/gta01/split_by_variant.sh
oe_runmake ${machine}_config
oe_runmake all
mv u-boot.bin u-boot_${machine}_${type}.bin
More information about the commitlog
mailing list