| Line 1... |
Line 1... |
diff -NaurbBw --exclude-from=diff_exclude.txt u-boot-2009.03_orig/Makefile u-boot-2009.03/Makefile
|
diff -NaurbBw --exclude-from=diff_exclude.txt u-boot-2009.03_orig/Makefile u-boot-2009.03/Makefile
|
--- u-boot-2009.03_orig/Makefile 2009-03-21 14:04:41.000000000 -0700
|
--- u-boot-2009.03_orig/Makefile 2009-03-21 14:04:41.000000000 -0700
|
+++ u-boot-2009.03/Makefile 2009-03-25 15:43:49.455339700 -0700
|
+++ u-boot-2009.03/Makefile 2009-04-15 18:02:26.232734800 -0700
|
@@ -182,7 +182,10 @@
|
@@ -182,7 +182,10 @@
|
endif
|
endif
|
ifeq ($(ARCH),sparc)
|
ifeq ($(ARCH),sparc)
|
CROSS_COMPILE = sparc-elf-
|
CROSS_COMPILE = sparc-elf-
|
-endif # sparc
|
-endif # sparc
|
| Line 20... |
Line 20... |
- examples \
|
- examples \
|
+# examples \
|
+# examples \
|
api_examples
|
api_examples
|
|
|
.PHONY : $(SUBDIRS)
|
.PHONY : $(SUBDIRS)
|
|
@@ -336,7 +339,7 @@
|
|
$(obj)tools/ubsha1 $(obj)u-boot.bin
|
|
|
|
$(obj)u-boot.dis: $(obj)u-boot
|
|
- $(OBJDUMP) -d $< > $@
|
|
+ $(OBJDUMP) -D $< > $@
|
|
|
|
$(obj)u-boot: depend $(SUBDIRS) $(OBJS) $(LIBBOARD) $(LIBS) $(LDSCRIPT)
|
|
UNDEF_SYM=`$(OBJDUMP) -x $(LIBBOARD) $(LIBS) | \
|
@@ -3457,6 +3460,21 @@
|
@@ -3457,6 +3460,21 @@
|
grsim_leon2_config : unconfig
|
grsim_leon2_config : unconfig
|
@$(MKCONFIG) $(@:_config=) sparc leon2 grsim_leon2 gaisler
|
@$(MKCONFIG) $(@:_config=) sparc leon2 grsim_leon2 gaisler
|
|
|
+
|
+
|
| Line 327... |
Line 336... |
+sinclude $(obj).depend
|
+sinclude $(obj).depend
|
+
|
+
|
+#########################################################################
|
+#########################################################################
|
diff -NaurbBw --exclude-from=diff_exclude.txt u-boot-2009.03_orig/board/qaz/de1_or1k/de1_or1k.c u-boot-2009.03/board/qaz/de1_or1k/de1_or1k.c
|
diff -NaurbBw --exclude-from=diff_exclude.txt u-boot-2009.03_orig/board/qaz/de1_or1k/de1_or1k.c u-boot-2009.03/board/qaz/de1_or1k/de1_or1k.c
|
--- u-boot-2009.03_orig/board/qaz/de1_or1k/de1_or1k.c 1969-12-31 16:00:00.000000000 -0800
|
--- u-boot-2009.03_orig/board/qaz/de1_or1k/de1_or1k.c 1969-12-31 16:00:00.000000000 -0800
|
+++ u-boot-2009.03/board/qaz/de1_or1k/de1_or1k.c 2009-03-24 13:34:53.081288000 -0700
|
+++ u-boot-2009.03/board/qaz/de1_or1k/de1_or1k.c 2009-04-15 16:16:19.652035300 -0700
|
@@ -0,0 +1,100 @@
|
@@ -0,0 +1,100 @@
|
+/*
|
+/*
|
+ * (C) Copyright ????
|
+ * (C) Copyright ????
|
+ * XXX, XXX@XXX.org
|
+ * XXX, XXX@XXX.org
|
+ *
|
+ *
|
| Line 403... |
Line 412... |
+ */
|
+ */
|
+void set_de1_post( unsigned int post_code )
|
+void set_de1_post( unsigned int post_code )
|
+{
|
+{
|
+ gd->bd->post_code = post_code;
|
+ gd->bd->post_code = post_code;
|
+
|
+
|
+ *((volatile unsigned int *)(0x2ffffffc)) = gd->bd->post_code;
|
+ *((volatile unsigned int *)(0x5ffffffc)) = gd->bd->post_code;
|
+ *((volatile unsigned int *)(0x2ffffffc)) = 0xcea5e0ff;
|
+ *((volatile unsigned int *)(0x5ffffffc)) = 0xcea5e0ff;
|
+}
|
+}
|
+
|
+
|
+
|
+
|
+void init_de1_post( void )
|
+void init_de1_post( void )
|
+{
|
+{
|
+ gd->bd->post_code = 0;
|
+ gd->bd->post_code = 0;
|
+
|
+
|
+ *((volatile unsigned int *)(0x2ffffffc)) = gd->bd->post_code;
|
+ *((volatile unsigned int *)(0x5ffffffc)) = gd->bd->post_code;
|
+ *((volatile unsigned int *)(0x2ffffffc)) = 0xcea5e0ff;
|
+ *((volatile unsigned int *)(0x5ffffffc)) = 0xcea5e0ff;
|
+}
|
+}
|
+
|
+
|
+
|
+
|
+int de1_post_incr( void )
|
+int de1_post_incr( void )
|
+{
|
+{
|
+ gd->bd->post_code++;
|
+ gd->bd->post_code++;
|
+
|
+
|
+ *((volatile unsigned int *)(0x2ffffffc)) = gd->bd->post_code;
|
+ *((volatile unsigned int *)(0x5ffffffc)) = gd->bd->post_code;
|
+ *((volatile unsigned int *)(0x2ffffffc)) = 0xcea5e0ff;
|
+ *((volatile unsigned int *)(0x5ffffffc)) = 0xcea5e0ff;
|
+
|
+
|
+ return(0);
|
+ return(0);
|
+}
|
+}
|
+
|
+
|
+
|
+
|
| Line 770... |
Line 779... |
+void reset_cpu(unsigned long ignored)
|
+void reset_cpu(unsigned long ignored)
|
+{
|
+{
|
+ while (1)
|
+ while (1)
|
+ ;
|
+ ;
|
+}
|
+}
|
diff -NaurbBw --exclude-from=diff_exclude.txt u-boot-2009.03_orig/fs/yaffs2/Makefile u-boot-2009.03/fs/yaffs2/Makefile
|
|
--- u-boot-2009.03_orig/fs/yaffs2/Makefile 2009-03-21 14:04:41.000000000 -0700
|
|
+++ u-boot-2009.03/fs/yaffs2/Makefile 2009-03-31 14:56:33.220296000 -0700
|
|
@@ -14,7 +14,7 @@
|
|
#
|
|
# NB Warning this Makefile does not include header dependencies.
|
|
#
|
|
-# $Id: Makefile,v 1.15 2007/07/18 19:40:38 charles Exp $
|
|
+# $Id: Makefile,v 1.1.1.1 2009/03/25 22:22:12 kenagy Exp $
|
|
|
|
#EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
|
|
include $(TOPDIR)/config.mk
|
|
diff -NaurbBw --exclude-from=diff_exclude.txt u-boot-2009.03_orig/include/asm-or1200/bitops.h u-boot-2009.03/include/asm-or1200/bitops.h
|
diff -NaurbBw --exclude-from=diff_exclude.txt u-boot-2009.03_orig/include/asm-or1200/bitops.h u-boot-2009.03/include/asm-or1200/bitops.h
|
--- u-boot-2009.03_orig/include/asm-or1200/bitops.h 1969-12-31 16:00:00.000000000 -0800
|
--- u-boot-2009.03_orig/include/asm-or1200/bitops.h 1969-12-31 16:00:00.000000000 -0800
|
+++ u-boot-2009.03/include/asm-or1200/bitops.h 2008-08-26 18:13:42.783673400 -0700
|
+++ u-boot-2009.03/include/asm-or1200/bitops.h 2008-08-26 18:13:42.783673400 -0700
|
@@ -0,0 +1,554 @@
|
@@ -0,0 +1,554 @@
|
+/* asm/bitops.h for Linux/or32
|
+/* asm/bitops.h for Linux/or32
|
| Line 2707... |
Line 2704... |
+
|
+
|
+
|
+
|
+#endif /* _U_BOOT_H_ */
|
+#endif /* _U_BOOT_H_ */
|
+
|
+
|
+
|
+
|
|
diff -NaurbBw --exclude-from=diff_exclude.txt u-boot-2009.03_orig/include/configs/Dev_Kit_060804.h u-boot-2009.03/include/configs/Dev_Kit_060804.h
|
|
--- u-boot-2009.03_orig/include/configs/Dev_Kit_060804.h 1969-12-31 16:00:00.000000000 -0800
|
|
+++ u-boot-2009.03/include/configs/Dev_Kit_060804.h 2009-03-03 14:14:42.654084000 -0800
|
|
@@ -0,0 +1,152 @@
|
|
+/*
|
|
+ * (C) Copyright 2003
|
|
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
+ *
|
|
+ * 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
|
|
+ */
|
|
+
|
|
+/*
|
|
+ * This file contains the configuration parameters for the dbau1x00 board.
|
|
+ */
|
|
+
|
|
+#ifndef __CONFIG_H
|
|
+#define __CONFIG_H
|
|
+
|
|
+
|
|
+/*-----------------------------------------------------------------------
|
|
+ * misc configuration.
|
|
+ */
|
|
+
|
|
+#undef CONFIG_BZIP2
|
|
+
|
|
+#undef CONFIG_WATCHDOG
|
|
+
|
|
+#define CFG_MHZ 24
|
|
+#define CFG_HZ (CFG_MHZ * 1000000)
|
|
+
|
|
+
|
|
+/*-----------------------------------------------------------------------
|
|
+ * Command line configuration.
|
|
+ */
|
|
+#include
|
|
+
|
|
+#undef CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */
|
|
+#undef CONFIG_CMD_BDI /* bdinfo */
|
|
+#undef CONFIG_CMD_BOOTD /* bootd */
|
|
+// #undef CONFIG_CMD_CONSOLE /* coninfo */
|
|
+#undef CONFIG_CMD_ECHO /* echo arguments */
|
|
+#undef CONFIG_CMD_ENV /* saveenv */
|
|
+#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
|
|
+#undef CONFIG_CMD_FPGA /* FPGA configuration Support */
|
|
+#undef CONFIG_CMD_IMI /* iminfo */
|
|
+#undef CONFIG_CMD_IMLS /* List all found images */
|
|
+#undef CONFIG_CMD_ITEST /* Integer (and string) test */
|
|
+#undef CONFIG_CMD_LOADB /* loadb */
|
|
+#undef CONFIG_CMD_LOADS /* loads */
|
|
+// #undef CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */
|
|
+#undef CONFIG_CMD_MISC /* Misc functions like sleep etc*/
|
|
+#undef CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */
|
|
+#undef CONFIG_CMD_NFS /* NFS support */
|
|
+#undef CONFIG_CMD_RUN /* run command in env variable */
|
|
+#undef CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
|
|
+#undef CONFIG_CMD_XIMG /* Load part of Multi Image */
|
|
+
|
|
+
|
|
+/*-----------------------------------------------------------------------
|
|
+ * environment data configuration.
|
|
+ */
|
|
+#define CFG_ENV_IS_NOWHERE
|
|
+#define CFG_ENV_SIZE 1024
|
|
+#define CFG_NO_FLASH
|
|
+
|
|
+
|
|
+/*-----------------------------------------------------------------------
|
|
+ * boot configuration.
|
|
+ */
|
|
+#undef CONFIG_BOOTARGS
|
|
+
|
|
+#define CONFIG_BOOTDELAY 10 /* autoboot after 10 seconds */
|
|
+#define CONFIG_TIMESTAMP /* Print image info with timestamp */
|
|
+#define CFG_LOAD_ADDR 0x81000000 /* default load address */
|
|
+
|
|
+
|
|
+/*-----------------------------------------------------------------------
|
|
+ * Console configuration.
|
|
+ */
|
|
+#define CFG_PROMPT "Dev_Kit_060804 # " /* Monitor Command Prompt */
|
|
+
|
|
+#define CONFIG_AUTO_COMPLETE
|
|
+#define CONFIG_CMDLINE_EDITING
|
|
+
|
|
+// #define CFG_HUSH_PARSER
|
|
+// #define CFG_PROMPT_HUSH_PS2 "> "
|
|
+
|
|
+#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*/
|
|
+
|
|
+
|
|
+/*-----------------------------------------------------------------------
|
|
+ * Start addresses for the final memory configuration
|
|
+ * (Set up by the startup code)
|
|
+ * Please note that CFG_SDRAM_BASE _must_ start at 0
|
|
+ */
|
|
+#define CFG_SDRAM_BASE 0x30000000
|
|
+#define CFG_SDRAM_SIZE 0x00020000
|
|
+#define CFG_FLASH_BASE 0x20000000
|
|
+#define CFG_FLASH_SIZE 0x00400000
|
|
+
|
|
+#define CFG_MEMTEST_START CFG_SDRAM_BASE
|
|
+#define CFG_MEMTEST_END (CFG_SDRAM_BASE + CFG_SDRAM_SIZE)
|
|
+
|
|
+#define CFG_MALLOC_BASE 0x30010000
|
|
+#define CFG_MALLOC_LEN 32*1024
|
|
+
|
|
+
|
|
+/*-----------------------------------------------------------------------
|
|
+ * Definitions for initial stack pointer and data area
|
|
+ */
|
|
+
|
|
+#define CFG_INIT_RAM_ADDR 0x30000000 /* inside of SDRAM */
|
|
+#define CFG_INIT_RAM_END (CFG_INIT_RAM_ADDR + CFG_SDRAM_SIZE) /* End of used area in RAM */
|
|
+#define CFG_INIT_DATA_SIZE 128 /* size in bytes reserved for initial data */
|
|
+#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_INIT_DATA_SIZE)
|
|
+#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
|
|
+
|
|
+
|
|
+/*-----------------------------------------------------------------------
|
|
+ * serial port configuration.
|
|
+ */
|
|
+#define CFG_NS16550
|
|
+#define CFG_NS16550_SERIAL
|
|
+#define CFG_NS16550_REG_SIZE 1
|
|
+#define CFG_NS16550_CLK CFG_HZ
|
|
+#define CFG_NS16550_COM1 (0x50000000)
|
|
+#define CONFIG_CONS_INDEX 1
|
|
+
|
|
+#define CONFIG_BAUDRATE 57600
|
|
+#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
|
|
+
|
|
+
|
|
+/*-----------------------------------------------------------------------
|
|
+ * qaz debug
|
|
+ */
|
|
+
|
|
+
|
|
+#endif /* __CONFIG_H */
|
diff -NaurbBw --exclude-from=diff_exclude.txt u-boot-2009.03_orig/include/configs/de1_or1k.h u-boot-2009.03/include/configs/de1_or1k.h
|
diff -NaurbBw --exclude-from=diff_exclude.txt u-boot-2009.03_orig/include/configs/de1_or1k.h u-boot-2009.03/include/configs/de1_or1k.h
|
--- u-boot-2009.03_orig/include/configs/de1_or1k.h 1969-12-31 16:00:00.000000000 -0800
|
--- u-boot-2009.03_orig/include/configs/de1_or1k.h 1969-12-31 16:00:00.000000000 -0800
|
+++ u-boot-2009.03/include/configs/de1_or1k.h 2009-03-25 17:39:02.660456000 -0700
|
+++ u-boot-2009.03/include/configs/de1_or1k.h 2009-03-25 17:39:02.660456000 -0700
|
@@ -0,0 +1,154 @@
|
@@ -0,0 +1,154 @@
|
+/*
|
+/*
|
