diff options
Diffstat (limited to 'package/uboot-ifxmips')
| -rw-r--r-- | package/uboot-ifxmips/patches/100-ifx.patch | 354 | ||||
| -rw-r--r-- | package/uboot-ifxmips/patches/120-eon_flash.patch | 20 | ||||
| -rw-r--r-- | package/uboot-ifxmips/patches/130-a800.patch | 10 |
3 files changed, 160 insertions, 224 deletions
diff --git a/package/uboot-ifxmips/patches/100-ifx.patch b/package/uboot-ifxmips/patches/100-ifx.patch index 5b0859c3be..5360099fb2 100644 --- a/package/uboot-ifxmips/patches/100-ifx.patch +++ b/package/uboot-ifxmips/patches/100-ifx.patch @@ -1,7 +1,5 @@ -Index: u-boot-1.1.5/Makefile -=================================================================== ---- u-boot-1.1.5.orig/Makefile 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/Makefile 2009-11-09 16:35:03.000000000 +0100 +--- a/Makefile ++++ b/Makefile @@ -24,7 +24,7 @@ VERSION = 1 PATCHLEVEL = 1 @@ -11,7 +9,7 @@ Index: u-boot-1.1.5/Makefile U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) VERSION_FILE = $(obj)include/version_autogenerated.h -@@ -44,6 +44,25 @@ +@@ -44,6 +44,25 @@ export HOSTARCH HOSTOS # Deal with colliding definitions from tcsh etc. VENDOR= @@ -37,7 +35,7 @@ Index: u-boot-1.1.5/Makefile ######################################################################### # # U-boot build supports producing a object files to the separate external -@@ -164,6 +183,11 @@ +@@ -164,6 +183,11 @@ include $(TOPDIR)/config.mk # U-Boot objects....order is important (i.e. start must be first) OBJS = cpu/$(CPU)/start.o @@ -49,7 +47,7 @@ Index: u-boot-1.1.5/Makefile ifeq ($(CPU),i386) OBJS += cpu/$(CPU)/start16.o OBJS += cpu/$(CPU)/reset.o -@@ -183,6 +207,7 @@ +@@ -183,6 +207,7 @@ OBJS += cpu/$(CPU)/cplbhdlr.o cpu/$(CPU) endif OBJS := $(addprefix $(obj),$(OBJS)) @@ -57,7 +55,7 @@ Index: u-boot-1.1.5/Makefile LIBS = lib_generic/libgeneric.a LIBS += board/$(BOARDDIR)/lib$(BOARD).a -@@ -206,15 +231,24 @@ +@@ -206,15 +231,24 @@ LIBS += common/libcommon.a LIBS += $(BOARDLIBS) LIBS := $(addprefix $(obj),$(LIBS)) @@ -83,7 +81,7 @@ Index: u-boot-1.1.5/Makefile post \ post/cpu .PHONY : $(SUBDIRS) -@@ -226,14 +260,75 @@ +@@ -226,14 +260,75 @@ endif __OBJS := $(subst $(obj),,$(OBJS)) __LIBS := $(subst $(obj),,$(LIBS)) @@ -159,7 +157,7 @@ Index: u-boot-1.1.5/Makefile $(obj)u-boot.hex: $(obj)u-boot $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ -@@ -243,28 +338,33 @@ +@@ -243,28 +338,33 @@ $(obj)u-boot.srec: $(obj)u-boot $(obj)u-boot.bin: $(obj)u-boot $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ @@ -201,7 +199,7 @@ Index: u-boot-1.1.5/Makefile $(SUBDIRS): $(MAKE) -C $@ all -@@ -310,7 +410,12 @@ +@@ -310,7 +410,12 @@ etags: $(obj)System.map: $(obj)u-boot @$(NM) $< | \ grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ @@ -215,7 +213,7 @@ Index: u-boot-1.1.5/Makefile ######################################################################### else -@@ -2032,7 +2137,20 @@ +@@ -2032,7 +2137,20 @@ sc520_spunk_rel_config : unconfig # MIPS #======================================================================== ######################################################################### @@ -237,7 +235,7 @@ Index: u-boot-1.1.5/Makefile ######################################################################### xtract_incaip = $(subst _100MHz,,$(subst _133MHz,,$(subst _150MHz,,$(subst _config,,$1)))) -@@ -2254,7 +2372,7 @@ +@@ -2254,7 +2372,7 @@ clobber: clean | xargs -0 rm -f rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS $(obj)include/version_autogenerated.h rm -fr $(obj)*.*~ @@ -246,10 +244,8 @@ Index: u-boot-1.1.5/Makefile rm -f $(obj)tools/crc32.c $(obj)tools/environment.c $(obj)tools/env/crc32.c rm -f $(obj)tools/inca-swap-bytes $(obj)cpu/mpc824x/bedbug_603e.c rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm -Index: u-boot-1.1.5/common/cmd_bootm.c -=================================================================== ---- u-boot-1.1.5.orig/common/cmd_bootm.c 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/common/cmd_bootm.c 2009-11-09 16:35:03.000000000 +0100 +--- a/common/cmd_bootm.c ++++ b/common/cmd_bootm.c @@ -31,6 +31,7 @@ #include <malloc.h> #include <zlib.h> @@ -258,7 +254,7 @@ Index: u-boot-1.1.5/common/cmd_bootm.c #include <environment.h> #include <asm/byteorder.h> -@@ -79,6 +80,8 @@ +@@ -79,6 +80,8 @@ DECLARE_GLOBAL_DATA_PTR; # define CHUNKSZ (64 * 1024) #endif @@ -267,7 +263,7 @@ Index: u-boot-1.1.5/common/cmd_bootm.c int gunzip (void *, int, unsigned char *, unsigned long *); static void *zalloc(void *, unsigned, unsigned); -@@ -341,6 +344,7 @@ +@@ -341,6 +344,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag #endif /* CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG */ } break; @@ -275,7 +271,7 @@ Index: u-boot-1.1.5/common/cmd_bootm.c case IH_COMP_GZIP: printf (" Uncompressing %s ... ", name); if (gunzip ((void *)ntohl(hdr->ih_load), unc_len, -@@ -350,6 +354,7 @@ +@@ -350,6 +354,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag do_reset (cmdtp, flag, argc, argv); } break; @@ -283,7 +279,7 @@ Index: u-boot-1.1.5/common/cmd_bootm.c #ifdef CONFIG_BZIP2 case IH_COMP_BZIP2: printf (" Uncompressing %s ... ", name); -@@ -369,6 +374,18 @@ +@@ -369,6 +374,18 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag } break; #endif /* CONFIG_BZIP2 */ @@ -302,7 +298,7 @@ Index: u-boot-1.1.5/common/cmd_bootm.c default: if (iflag) enable_interrupts(); -@@ -1176,6 +1193,8 @@ +@@ -1176,6 +1193,8 @@ U_BOOT_CMD( ); #endif /* CFG_CMD_IMLS */ @@ -311,7 +307,7 @@ Index: u-boot-1.1.5/common/cmd_bootm.c void print_image_hdr (image_header_t *hdr) { -@@ -1270,12 +1289,15 @@ +@@ -1270,12 +1289,15 @@ print_type (image_header_t *hdr) case IH_COMP_NONE: comp = "uncompressed"; break; case IH_COMP_GZIP: comp = "gzip compressed"; break; case IH_COMP_BZIP2: comp = "bzip2 compressed"; break; @@ -327,17 +323,15 @@ Index: u-boot-1.1.5/common/cmd_bootm.c #define ZALLOC_ALIGNMENT 16 static void *zalloc(void *x, unsigned items, unsigned size) -@@ -1427,3 +1449,5 @@ +@@ -1427,3 +1449,5 @@ do_bootm_lynxkdi (cmd_tbl_t *cmdtp, int } #endif /* CONFIG_LYNXKDI */ + +#endif /* ! CFG_HEAD_CODE */ -Index: u-boot-1.1.5/common/cmd_flash.c -=================================================================== ---- u-boot-1.1.5.orig/common/cmd_flash.c 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/common/cmd_flash.c 2009-11-09 16:35:03.000000000 +0100 -@@ -196,9 +196,17 @@ +--- a/common/cmd_flash.c ++++ b/common/cmd_flash.c +@@ -196,9 +196,17 @@ addr_spec(char *arg1, char *arg2, ulong } static int @@ -358,7 +352,7 @@ Index: u-boot-1.1.5/common/cmd_flash.c { flash_info_t *info; ulong bank; -@@ -211,9 +219,7 @@ +@@ -211,9 +219,7 @@ flash_fill_sect_ranges (ulong addr_first s_last [bank] = -1; /* last sector to erase */ } @@ -369,7 +363,7 @@ Index: u-boot-1.1.5/common/cmd_flash.c ulong b_end; int sect; short s_end; -@@ -225,7 +231,6 @@ +@@ -225,7 +231,6 @@ flash_fill_sect_ranges (ulong addr_first b_end = info->start[0] + info->size - 1; /* bank end addr */ s_end = info->sector_count - 1; /* last sector */ @@ -377,7 +371,7 @@ Index: u-boot-1.1.5/common/cmd_flash.c for (sect=0; sect < info->sector_count; ++sect) { ulong end; /* last address in current sect */ -@@ -238,11 +243,21 @@ +@@ -238,11 +243,21 @@ flash_fill_sect_ranges (ulong addr_first if (addr_first == info->start[sect]) { s_first[bank] = sect; @@ -399,7 +393,7 @@ Index: u-boot-1.1.5/common/cmd_flash.c if (s_first[bank] >= 0) { if (s_last[bank] < 0) { if (addr_last > b_end) { -@@ -316,6 +331,8 @@ +@@ -316,6 +331,8 @@ int do_flerase (cmd_tbl_t *cmdtp, int fl struct part_info *part; u8 dev_type, dev_num, pnum; #endif @@ -408,7 +402,7 @@ Index: u-boot-1.1.5/common/cmd_flash.c int rcode = 0; if (argc < 2) { -@@ -369,7 +386,7 @@ +@@ -369,7 +386,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int fl } #endif @@ -417,7 +411,7 @@ Index: u-boot-1.1.5/common/cmd_flash.c printf ("Usage:\n%s\n", cmdtp->usage); return 1; } -@@ -397,11 +414,117 @@ +@@ -397,11 +414,117 @@ int do_flerase (cmd_tbl_t *cmdtp, int fl return 1; } @@ -537,7 +531,7 @@ Index: u-boot-1.1.5/common/cmd_flash.c { flash_info_t *info; ulong bank; -@@ -413,27 +536,66 @@ +@@ -413,27 +536,66 @@ int flash_sect_erase (ulong addr_first, int erased = 0; int planned; int rcode = 0; @@ -620,7 +614,7 @@ Index: u-boot-1.1.5/common/cmd_flash.c } else if (rcode == 0) { puts ("Error: start and/or end address" " not on sector boundary\n"); -@@ -629,8 +791,22 @@ +@@ -629,8 +791,22 @@ int flash_sect_protect (int p, ulong add int protected, i; int planned; int rcode; @@ -645,7 +639,7 @@ Index: u-boot-1.1.5/common/cmd_flash.c protected = 0; -@@ -690,7 +866,7 @@ +@@ -690,7 +866,7 @@ U_BOOT_CMD( ); U_BOOT_CMD( @@ -654,11 +648,9 @@ Index: u-boot-1.1.5/common/cmd_flash.c "erase - erase FLASH memory\n", "start end\n" " - erase FLASH from addr 'start' to addr 'end'\n" -Index: u-boot-1.1.5/common/cmd_nvedit.c -=================================================================== ---- u-boot-1.1.5.orig/common/cmd_nvedit.c 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/common/cmd_nvedit.c 2009-11-09 16:35:03.000000000 +0100 -@@ -540,8 +540,19 @@ +--- a/common/cmd_nvedit.c ++++ b/common/cmd_nvedit.c +@@ -540,8 +540,19 @@ int do_saveenv (cmd_tbl_t *cmdtp, int fl extern char * env_name_spec; printf ("Saving Environment to %s...\n", env_name_spec); @@ -679,11 +671,9 @@ Index: u-boot-1.1.5/common/cmd_nvedit.c } -Index: u-boot-1.1.5/common/console.c -=================================================================== ---- u-boot-1.1.5.orig/common/console.c 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/common/console.c 2009-11-09 16:35:03.000000000 +0100 -@@ -324,7 +324,7 @@ +--- a/common/console.c ++++ b/common/console.c +@@ -324,7 +324,7 @@ inline void dbg(const char *fmt, ...) #endif /** U-Boot INIT FUNCTIONS *************************************************/ @@ -692,7 +682,7 @@ Index: u-boot-1.1.5/common/console.c int console_assign (int file, char *devname) { int flag, i; -@@ -357,7 +357,7 @@ +@@ -357,7 +357,7 @@ int console_assign (int file, char *devn return -1; } @@ -701,7 +691,7 @@ Index: u-boot-1.1.5/common/console.c /* Called before relocation - use serial functions */ int console_init_f (void) { -@@ -392,6 +392,7 @@ +@@ -392,6 +392,7 @@ device_t *search_device (int flags, char } #endif /* CFG_CONSOLE_IS_IN_ENV || CONFIG_SPLASH_SCREEN */ @@ -709,16 +699,14 @@ Index: u-boot-1.1.5/common/console.c #ifdef CFG_CONSOLE_IS_IN_ENV /* Called after the relocation - use desired console functions */ int console_init_r (void) -@@ -570,3 +571,4 @@ +@@ -570,3 +571,4 @@ int console_init_r (void) } #endif /* CFG_CONSOLE_IS_IN_ENV */ +#endif //CFG_HEAD_CODE -Index: u-boot-1.1.5/common/devices.c -=================================================================== ---- u-boot-1.1.5.orig/common/devices.c 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/common/devices.c 2009-11-09 16:35:03.000000000 +0100 -@@ -39,6 +39,7 @@ +--- a/common/devices.c ++++ b/common/devices.c +@@ -39,6 +39,7 @@ DECLARE_GLOBAL_DATA_PTR; list_t devlist = 0; device_t *stdio_devices[] = { NULL, NULL, NULL }; char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" }; @@ -726,17 +714,15 @@ Index: u-boot-1.1.5/common/devices.c #if defined(CONFIG_SPLASH_SCREEN) && !defined(CFG_DEVICE_NULLDEV) #define CFG_DEVICE_NULLDEV 1 -@@ -214,3 +215,5 @@ +@@ -214,3 +215,5 @@ int devices_done (void) return 0; } +#endif //CFG_HEAD_CODE + -Index: u-boot-1.1.5/common/env_common.c -=================================================================== ---- u-boot-1.1.5.orig/common/env_common.c 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/common/env_common.c 2009-11-09 16:35:03.000000000 +0100 -@@ -219,7 +219,9 @@ +--- a/common/env_common.c ++++ b/common/env_common.c +@@ -219,7 +219,9 @@ void env_relocate (void) * We must allocate a buffer for the environment */ env_ptr = (env_t *)malloc (CFG_ENV_SIZE); @@ -747,7 +733,7 @@ Index: u-boot-1.1.5/common/env_common.c #endif /* -@@ -227,6 +229,10 @@ +@@ -227,6 +229,10 @@ void env_relocate (void) */ env_get_char = env_get_char_memory; @@ -758,7 +744,7 @@ Index: u-boot-1.1.5/common/env_common.c if (gd->env_valid == 0) { #if defined(CONFIG_GTH) || defined(CFG_ENV_IS_NOWHERE) /* Environment not changable */ puts ("Using default environment\n\n"); -@@ -242,18 +248,17 @@ +@@ -242,18 +248,17 @@ void env_relocate (void) } memset (env_ptr, 0, sizeof(env_t)); @@ -781,11 +767,9 @@ Index: u-boot-1.1.5/common/env_common.c gd->env_addr = (ulong)&(env_ptr->data); #ifdef CONFIG_AMIGAONEG3SE -Index: u-boot-1.1.5/common/env_flash.c -=================================================================== ---- u-boot-1.1.5.orig/common/env_flash.c 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/common/env_flash.c 2009-11-09 16:35:03.000000000 +0100 -@@ -66,7 +66,6 @@ +--- a/common/env_flash.c ++++ b/common/env_flash.c +@@ -66,7 +66,6 @@ static env_t *flash_addr = (env_t *)CFG_ #endif #else /* ! ENV_IS_EMBEDDED */ @@ -793,7 +777,7 @@ Index: u-boot-1.1.5/common/env_flash.c env_t *env_ptr = (env_t *)CFG_ENV_ADDR; #ifdef CMD_SAVEENV static env_t *flash_addr = (env_t *)CFG_ENV_ADDR; -@@ -201,6 +200,7 @@ +@@ -201,6 +200,7 @@ int saveenv(void) debug (" %08lX ... %08lX ...", (ulong)&(flash_addr_new->data), sizeof(env_ptr->data)+(ulong)&(flash_addr_new->data)); @@ -801,7 +785,7 @@ Index: u-boot-1.1.5/common/env_flash.c if ((rc = flash_write((char *)env_ptr->data, (ulong)&(flash_addr_new->data), sizeof(env_ptr->data))) || -@@ -256,7 +256,6 @@ +@@ -256,7 +256,6 @@ Done: #endif /* CMD_SAVEENV */ #else /* ! CFG_ENV_ADDR_REDUND */ @@ -809,7 +793,7 @@ Index: u-boot-1.1.5/common/env_flash.c int env_init(void) { #ifdef CONFIG_OMAP2420H4 -@@ -280,6 +279,52 @@ +@@ -280,6 +279,52 @@ bad_flash: #ifdef CMD_SAVEENV @@ -862,7 +846,7 @@ Index: u-boot-1.1.5/common/env_flash.c int saveenv(void) { int len, rc; -@@ -331,7 +376,7 @@ +@@ -331,7 +376,7 @@ int saveenv(void) return 1; puts ("Erasing Flash..."); @@ -871,11 +855,9 @@ Index: u-boot-1.1.5/common/env_flash.c return 1; puts ("Writing to Flash... "); -Index: u-boot-1.1.5/config.mk -=================================================================== ---- u-boot-1.1.5.orig/config.mk 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/config.mk 2009-11-09 16:35:03.000000000 +0100 -@@ -127,10 +127,15 @@ +--- a/config.mk ++++ b/config.mk +@@ -127,10 +127,15 @@ OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump RANLIB = $(CROSS_COMPILE)RANLIB @@ -891,7 +873,7 @@ Index: u-boot-1.1.5/config.mk ifndef LDSCRIPT #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug ifeq ($(CONFIG_NAND_U_BOOT),y) -@@ -139,12 +144,15 @@ +@@ -139,12 +144,15 @@ else LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds endif endif @@ -909,7 +891,7 @@ Index: u-boot-1.1.5/config.mk ifneq ($(OBJTREE),$(SRCTREE)) CPPFLAGS += -I$(OBJTREE)/include2 -I$(OBJTREE)/include -@@ -180,7 +188,8 @@ +@@ -180,7 +188,8 @@ endif AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS) @@ -919,7 +901,7 @@ Index: u-boot-1.1.5/config.mk # Location of a usable BFD library, where we define "usable" as # "built for ${HOST}, supports ${TARGET}". Sensible values are -@@ -214,12 +223,19 @@ +@@ -214,12 +223,19 @@ endif export CONFIG_SHELL HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE \ AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP \ MAKE @@ -940,7 +922,7 @@ Index: u-boot-1.1.5/config.mk %.s: %.S $(CPP) $(AFLAGS) -o $@ $< %.o: %.S -@@ -229,12 +245,20 @@ +@@ -229,12 +245,20 @@ ifndef REMOTE_BUILD else @@ -961,11 +943,9 @@ Index: u-boot-1.1.5/config.mk endif ######################################################################### -Index: u-boot-1.1.5/drivers/Makefile -=================================================================== ---- u-boot-1.1.5.orig/drivers/Makefile 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/drivers/Makefile 2009-11-09 16:35:03.000000000 +0100 -@@ -50,7 +50,7 @@ +--- a/drivers/Makefile ++++ b/drivers/Makefile +@@ -50,7 +50,7 @@ COBJS = 3c589.o 5701rls.o ali512x.o \ videomodes.o w83c553f.o \ ks8695eth.o \ pxa_pcmcia.o mpc8xx_pcmcia.o tqm8xx_pcmcia.o \ @@ -974,10 +954,8 @@ Index: u-boot-1.1.5/drivers/Makefile SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) -Index: u-boot-1.1.5/include/asm-mips/mipsregs.h -=================================================================== ---- u-boot-1.1.5.orig/include/asm-mips/mipsregs.h 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/include/asm-mips/mipsregs.h 2009-11-09 16:35:03.000000000 +0100 +--- a/include/asm-mips/mipsregs.h ++++ b/include/asm-mips/mipsregs.h @@ -48,6 +48,7 @@ #define CP0_CAUSE $13 #define CP0_EPC $14 @@ -986,7 +964,7 @@ Index: u-boot-1.1.5/include/asm-mips/mipsregs.h #define CP0_CONFIG $16 #define CP0_LLADDR $17 #define CP0_WATCHLO $18 -@@ -330,11 +331,32 @@ +@@ -330,11 +331,32 @@ __BUILD_SET_CP0(config,CP0_CONFIG) # define KSU_USER 0x00000010 # define KSU_SUPERVISOR 0x00000008 # define KSU_KERNEL 0x00000000 @@ -1019,7 +997,7 @@ Index: u-boot-1.1.5/include/asm-mips/mipsregs.h /* * Bitfields in the R[23]000 cp0 status register. -@@ -471,6 +493,14 @@ +@@ -471,6 +493,14 @@ __BUILD_SET_CP0(config,CP0_CONFIG) #define CAUSEF_BD (1 << 31) /* @@ -1034,7 +1012,7 @@ Index: u-boot-1.1.5/include/asm-mips/mipsregs.h * Bits in the coprozessor 0 config register. */ #define CONF_CM_CACHABLE_NO_WA 0 -@@ -544,4 +574,10 @@ +@@ -544,4 +574,10 @@ __BUILD_SET_CP0(config,CP0_CONFIG) #define CEB_KERNEL 2 /* Count events in kernel mode EXL = ERL = 0 */ #define CEB_EXL 1 /* Count events with EXL = 1, ERL = 0 */ @@ -1045,10 +1023,8 @@ Index: u-boot-1.1.5/include/asm-mips/mipsregs.h +#define ECCF_WST (0x1 << ECCB_WST) + #endif /* _ASM_MIPSREGS_H */ -Index: u-boot-1.1.5/include/cmd_confdefs.h -=================================================================== ---- u-boot-1.1.5.orig/include/cmd_confdefs.h 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/include/cmd_confdefs.h 2009-11-09 16:35:03.000000000 +0100 +--- a/include/cmd_confdefs.h ++++ b/include/cmd_confdefs.h @@ -94,6 +94,7 @@ #define CFG_CMD_EXT2 0x1000000000000000ULL /* EXT2 Support */ #define CFG_CMD_SNTP 0x2000000000000000ULL /* SNTP support */ @@ -1065,28 +1041,22 @@ Index: u-boot-1.1.5/include/cmd_confdefs.h CFG_CMD_VFD ) /* Default configuration -Index: u-boot-1.1.5/include/config.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-1.1.5/include/config.h 2009-11-09 16:35:03.000000000 +0100 +--- /dev/null ++++ b/include/config.h @@ -0,0 +1,2 @@ +/* Automatically generated - do not edit */ +#include <configs/danube.h> -Index: u-boot-1.1.5/include/config.mk -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-1.1.5/include/config.mk 2009-11-09 16:35:03.000000000 +0100 +--- /dev/null ++++ b/include/config.mk @@ -0,0 +1,5 @@ +ARCH = mips +CPU = mips +BOARD = danube +VENDOR = ifx +SOC = danube -Index: u-boot-1.1.5/include/flash.h -=================================================================== ---- u-boot-1.1.5.orig/include/flash.h 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/include/flash.h 2009-11-09 16:36:11.000000000 +0100 -@@ -79,7 +79,7 @@ +--- a/include/flash.h ++++ b/include/flash.h +@@ -79,7 +79,7 @@ typedef struct { extern unsigned long flash_init (void); extern void flash_print_info (flash_info_t *); extern int flash_erase (flash_info_t *, int, int); @@ -1095,7 +1065,7 @@ Index: u-boot-1.1.5/include/flash.h extern int flash_sect_protect (int flag, ulong addr_first, ulong addr_last); /* common/flash.c */ -@@ -131,7 +131,9 @@ +@@ -131,7 +131,9 @@ extern void flash_read_factory_serial(fl #define MT2_MANUFACT 0x002C002C /* alternate MICRON manufacturer ID*/ #define EXCEL_MANUFACT 0x004A004A /* Excel Semiconductor */ @@ -1106,7 +1076,7 @@ Index: u-boot-1.1.5/include/flash.h #define MT_ID_28F400_T 0x44704470 /* 28F400B3 ID ( 4 M, top boot sector) */ #define MT_ID_28F400_B 0x44714471 /* 28F400B3 ID ( 4 M, bottom boot sect) */ -@@ -299,6 +301,10 @@ +@@ -299,6 +301,10 @@ extern void flash_read_factory_serial(fl #define TOSH_ID_FVT160 0xC2 /* TC58FVT160 ID (16 M, top ) */ #define TOSH_ID_FVB160 0x43 /* TC58FVT160 ID (16 M, bottom ) */ @@ -1117,7 +1087,7 @@ Index: u-boot-1.1.5/include/flash.h /*----------------------------------------------------------------------- * Internal FLASH identification codes * -@@ -422,6 +428,10 @@ +@@ -422,6 +428,10 @@ extern void flash_read_factory_serial(fl #define FLASH_S29GL064M 0x00F0 /* Spansion S29GL064M-R6 */ #define FLASH_S29GL128N 0x00F1 /* Spansion S29GL128N */ @@ -1128,10 +1098,8 @@ Index: u-boot-1.1.5/include/flash.h #define FLASH_UNKNOWN 0xFFFF /* unknown flash type */ -Index: u-boot-1.1.5/include/image.h -=================================================================== ---- u-boot-1.1.5.orig/include/image.h 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/include/image.h 2009-11-09 16:35:03.000000000 +0100 +--- a/include/image.h ++++ b/include/image.h @@ -132,6 +132,7 @@ #define IH_COMP_NONE 0 /* No Compression Used */ #define IH_COMP_GZIP 1 /* gzip Compression Used */ @@ -1140,10 +1108,8 @@ Index: u-boot-1.1.5/include/image.h #define IH_MAGIC 0x27051956 /* Image Magic Number */ #define IH_NMLEN 32 /* Image Name Length */ -Index: u-boot-1.1.5/include/syscall.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-1.1.5/include/syscall.h 2009-11-09 16:35:03.000000000 +0100 +--- /dev/null ++++ b/include/syscall.h @@ -0,0 +1,42 @@ +#ifndef __MON_SYS_CALL_H__ +#define __MON_SYS_CALL_H__ @@ -1187,10 +1153,8 @@ Index: u-boot-1.1.5/include/syscall.h +#define SYSCALL_GET_TIMER 10 + +#endif -Index: u-boot-1.1.5/ld_uboot.conf -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-1.1.5/ld_uboot.conf 2009-11-09 16:35:03.000000000 +0100 +--- /dev/null ++++ b/ld_uboot.conf @@ -0,0 +1,8 @@ +TAG_DWNLD() +{ @@ -1200,11 +1164,9 @@ Index: u-boot-1.1.5/ld_uboot.conf +{ + 0xA0B00000 +}; /* Start u-boot image */ -Index: u-boot-1.1.5/lib_generic/Makefile -=================================================================== ---- u-boot-1.1.5.orig/lib_generic/Makefile 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/lib_generic/Makefile 2009-11-09 16:35:03.000000000 +0100 -@@ -28,7 +28,7 @@ +--- a/lib_generic/Makefile ++++ b/lib_generic/Makefile +@@ -28,7 +28,7 @@ LIB = $(obj)libgeneric.a COBJS = bzlib.o bzlib_crctable.o bzlib_decompress.o \ bzlib_randtable.o bzlib_huffman.o \ crc32.o ctype.o display_options.o ldiv.o \ @@ -1213,10 +1175,8 @@ Index: u-boot-1.1.5/lib_generic/Makefile SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) -Index: u-boot-1.1.5/lib_mips/board.c -=================================================================== ---- u-boot-1.1.5.orig/lib_mips/board.c 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/lib_mips/board.c 2009-11-09 16:35:03.000000000 +0100 +--- a/lib_mips/board.c ++++ b/lib_mips/board.c @@ -29,9 +29,30 @@ #include <net.h> #include <environment.h> @@ -1249,7 +1209,7 @@ Index: u-boot-1.1.5/lib_mips/board.c (CFG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \ defined(CFG_ENV_IS_IN_NVRAM) #define TOTAL_MALLOC_LEN (CFG_MALLOC_LEN + CFG_ENV_SIZE) -@@ -39,21 +60,24 @@ +@@ -39,21 +60,24 @@ DECLARE_GLOBAL_DATA_PTR; #define TOTAL_MALLOC_LEN CFG_MALLOC_LEN #endif @@ -1279,7 +1239,7 @@ Index: u-boot-1.1.5/lib_mips/board.c /* * Begin and End of memory area for malloc(), and current "brk" -@@ -62,14 +86,15 @@ +@@ -62,14 +86,15 @@ static ulong mem_malloc_start; static ulong mem_malloc_end; static ulong mem_malloc_brk; @@ -1299,7 +1259,7 @@ Index: u-boot-1.1.5/lib_mips/board.c mem_malloc_end = dest_addr; mem_malloc_start = dest_addr - TOTAL_MALLOC_LEN; mem_malloc_brk = mem_malloc_start; -@@ -79,6 +104,25 @@ +@@ -79,6 +104,25 @@ static void mem_malloc_init (void) mem_malloc_end - mem_malloc_start); } @@ -1325,7 +1285,7 @@ Index: u-boot-1.1.5/lib_mips/board.c void *sbrk (ptrdiff_t increment) { ulong old = mem_malloc_brk; -@@ -99,42 +143,58 @@ +@@ -99,42 +143,58 @@ static int init_func_ram (void) #else int board_type = 0; /* use dummy arg */ #endif @@ -1389,7 +1349,7 @@ Index: u-boot-1.1.5/lib_mips/board.c /* * Breath some life into the board... -@@ -159,27 +219,49 @@ +@@ -159,27 +219,49 @@ static int init_baudrate (void) typedef int (init_fnc_t) (void); init_fnc_t *init_sequence[] = { @@ -1444,7 +1404,7 @@ Index: u-boot-1.1.5/lib_mips/board.c ulong *s; #ifdef CONFIG_PURPLE void copy_code (ulong); -@@ -219,13 +301,12 @@ +@@ -219,13 +301,12 @@ void board_init_f(ulong bootflag) addr -= len; addr &= ~(16 * 1024 - 1); @@ -1460,7 +1420,7 @@ Index: u-boot-1.1.5/lib_mips/board.c /* * (permanently) allocate a Board Info struct -@@ -234,20 +315,17 @@ +@@ -234,20 +315,17 @@ void board_init_f(ulong bootflag) addr_sp -= sizeof(bd_t); bd = (bd_t *)addr_sp; gd->bd = bd; @@ -1484,7 +1444,7 @@ Index: u-boot-1.1.5/lib_mips/board.c /* * Finally, we set up a new (bigger) stack. -@@ -279,7 +357,16 @@ +@@ -279,7 +357,16 @@ void board_init_f(ulong bootflag) copy_code(addr); #endif @@ -1501,7 +1461,7 @@ Index: u-boot-1.1.5/lib_mips/board.c /* NOTREACHED - relocate_code() does not return */ } -@@ -292,7 +379,110 @@ +@@ -292,7 +379,110 @@ void board_init_f(ulong bootflag) * ************************************************************************ */ @@ -1612,7 +1572,7 @@ Index: u-boot-1.1.5/lib_mips/board.c void board_init_r (gd_t *id, ulong dest_addr) { cmd_tbl_t *cmdtp; -@@ -305,6 +495,8 @@ +@@ -305,6 +495,8 @@ void board_init_r (gd_t *id, ulong dest_ bd_t *bd; int i; @@ -1621,7 +1581,7 @@ Index: u-boot-1.1.5/lib_mips/board.c gd = id; gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */ -@@ -321,12 +513,10 @@ +@@ -321,12 +513,10 @@ void board_init_r (gd_t *id, ulong dest_ ulong addr; addr = (ulong) (cmdtp->cmd) + gd->reloc_off; @@ -1638,7 +1598,7 @@ Index: u-boot-1.1.5/lib_mips/board.c addr = (ulong)(cmdtp->name) + gd->reloc_off; cmdtp->name = (char *)addr; -@@ -363,7 +553,13 @@ +@@ -363,7 +553,13 @@ void board_init_r (gd_t *id, ulong dest_ /* initialize malloc() area */ mem_malloc_init(); malloc_bin_reloc(); @@ -1652,7 +1612,7 @@ Index: u-boot-1.1.5/lib_mips/board.c /* relocate environment function pointers etc. */ env_relocate(); -@@ -424,9 +620,12 @@ +@@ -424,9 +620,12 @@ void board_init_r (gd_t *id, ulong dest_ /* NOTREACHED - no way out of command loop except booting */ } @@ -1665,11 +1625,9 @@ Index: u-boot-1.1.5/lib_mips/board.c +#endif //DEBUG_ENABLE_BOOTSTRAP_PRINTF for (;;); } -Index: u-boot-1.1.5/lib_mips/time.c -=================================================================== ---- u-boot-1.1.5.orig/lib_mips/time.c 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/lib_mips/time.c 2009-11-09 16:35:03.000000000 +0100 -@@ -80,6 +80,19 @@ +--- a/lib_mips/time.c ++++ b/lib_mips/time.c +@@ -80,6 +80,19 @@ void udelay (unsigned long usec) /*NOP*/; } @@ -1689,10 +1647,8 @@ Index: u-boot-1.1.5/lib_mips/time.c /* * This function is derived from PowerPC code (read timebase as long long). * On MIPS it just returns the timer value. -Index: u-boot-1.1.5/net/eth.c -=================================================================== ---- u-boot-1.1.5.orig/net/eth.c 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/net/eth.c 2009-11-09 16:35:03.000000000 +0100 +--- a/net/eth.c ++++ b/net/eth.c @@ -25,6 +25,9 @@ #include <command.h> #include <net.h> @@ -1703,7 +1659,7 @@ Index: u-boot-1.1.5/net/eth.c #if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) -@@ -54,6 +57,9 @@ +@@ -54,6 +57,9 @@ extern int scc_initialize(bd_t*); extern int skge_initialize(bd_t*); extern int tsec_initialize(bd_t*, int, char *); extern int npe_initialize(bd_t *); @@ -1713,7 +1669,7 @@ Index: u-boot-1.1.5/net/eth.c static struct eth_device *eth_devices, *eth_current; -@@ -235,7 +241,9 @@ +@@ -235,7 +241,9 @@ int eth_initialize(bd_t *bis) #if defined(CONFIG_RTL8169) rtl8169_initialize(bis); #endif @@ -1724,10 +1680,8 @@ Index: u-boot-1.1.5/net/eth.c if (!eth_devices) { puts ("No ethernet found.\n"); } else { -Index: u-boot-1.1.5/tools/mkimage.c -=================================================================== ---- u-boot-1.1.5.orig/tools/mkimage.c 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/tools/mkimage.c 2009-11-09 16:35:03.000000000 +0100 +--- a/tools/mkimage.c ++++ b/tools/mkimage.c @@ -28,6 +28,7 @@ #ifndef __WIN32__ #include <netinet/in.h> /* for host / network byte order conversions */ @@ -1736,7 +1690,7 @@ Index: u-boot-1.1.5/tools/mkimage.c #include <sys/mman.h> #include <sys/stat.h> #include <time.h> -@@ -138,6 +139,7 @@ +@@ -138,6 +139,7 @@ table_entry_t comp_name[] = { { IH_COMP_NONE, "none", "uncompressed", }, { IH_COMP_BZIP2, "bzip2", "bzip2 compressed", }, { IH_COMP_GZIP, "gzip", "gzip compressed", }, @@ -1744,7 +1698,7 @@ Index: u-boot-1.1.5/tools/mkimage.c { -1, "", "", }, }; -@@ -445,7 +447,7 @@ +@@ -445,7 +447,7 @@ NXTARG: ; } /* We're a bit of paranoid */ @@ -1753,7 +1707,7 @@ Index: u-boot-1.1.5/tools/mkimage.c (void) fdatasync (ifd); #else (void) fsync (ifd); -@@ -495,7 +497,7 @@ +@@ -495,7 +497,7 @@ NXTARG: ; (void) munmap((void *)ptr, sbuf.st_size); /* We're a bit of paranoid */ @@ -1762,10 +1716,8 @@ Index: u-boot-1.1.5/tools/mkimage.c (void) fdatasync (ifd); #else (void) fsync (ifd); -Index: u-boot-1.1.5/cpu/mips/cache.S -=================================================================== ---- u-boot-1.1.5.orig/cpu/mips/cache.S 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/cpu/mips/cache.S 2009-11-09 16:35:03.000000000 +0100 +--- a/cpu/mips/cache.S ++++ b/cpu/mips/cache.S @@ -29,7 +29,9 @@ #include <asm/mipsregs.h> #include <asm/addrspace.h> @@ -1777,7 +1729,7 @@ Index: u-boot-1.1.5/cpu/mips/cache.S /* 16KB is the maximum size of instruction and data caches on * MIPS 4K. -@@ -155,6 +157,9 @@ +@@ -155,6 +157,9 @@ mips_cache_reset: */ mtc0 zero, CP0_TAGLO @@ -1787,7 +1739,7 @@ Index: u-boot-1.1.5/cpu/mips/cache.S /* * The caches are probably in an indeterminate state, -@@ -171,6 +176,9 @@ +@@ -171,6 +176,9 @@ mips_cache_reset: move a1, a2 icacheopn(a0,a1,a2,a3,121,(Index_Store_Tag_I,Fill)) @@ -1797,7 +1749,7 @@ Index: u-boot-1.1.5/cpu/mips/cache.S /* To support Orion/R4600, we initialise the data cache in 3 passes. */ -@@ -200,6 +208,7 @@ +@@ -200,6 +208,7 @@ mips_cache_reset: move a3, t5 # dcacheLineSize move a1, a2 icacheop(a0,a1,a2,a3,Index_Store_Tag_D) @@ -1805,10 +1757,8 @@ Index: u-boot-1.1.5/cpu/mips/cache.S j ra .end mips_cache_reset -Index: u-boot-1.1.5/cpu/mips/config.mk -=================================================================== ---- u-boot-1.1.5.orig/cpu/mips/config.mk 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/cpu/mips/config.mk 2009-11-09 16:35:03.000000000 +0100 +--- a/cpu/mips/config.mk ++++ b/cpu/mips/config.mk @@ -20,20 +20,26 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA @@ -1844,10 +1794,8 @@ Index: u-boot-1.1.5/cpu/mips/config.mk MIPSFLAGS += $(ENDIANNESS) -mabicalls -Index: u-boot-1.1.5/cpu/mips/cpu.c -=================================================================== ---- u-boot-1.1.5.orig/cpu/mips/cpu.c 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/cpu/mips/cpu.c 2009-11-09 16:35:03.000000000 +0100 +--- a/cpu/mips/cpu.c ++++ b/cpu/mips/cpu.c @@ -23,7 +23,12 @@ #include <common.h> @@ -1862,7 +1810,7 @@ Index: u-boot-1.1.5/cpu/mips/cpu.c #include <asm/mipsregs.h> int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) -@@ -34,6 +39,8 @@ +@@ -34,6 +39,8 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, void (*f)(void) = (void *) 0xbfc00000; f(); @@ -1871,10 +1819,8 @@ Index: u-boot-1.1.5/cpu/mips/cpu.c #endif fprintf(stderr, "*** reset failed ***\n"); return 0; -Index: u-boot-1.1.5/cpu/mips/incaip_clock.c -=================================================================== ---- u-boot-1.1.5.orig/cpu/mips/incaip_clock.c 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/cpu/mips/incaip_clock.c 2009-11-09 16:35:03.000000000 +0100 +--- a/cpu/mips/incaip_clock.c ++++ b/cpu/mips/incaip_clock.c @@ -22,8 +22,9 @@ */ @@ -1886,16 +1832,14 @@ Index: u-boot-1.1.5/cpu/mips/incaip_clock.c /******************************************************************************* * -@@ -114,3 +115,5 @@ +@@ -114,3 +115,5 @@ int incaip_set_cpuclk (void) return 0; } + +#endif /* CONFIG_INCA_IP */ -Index: u-boot-1.1.5/cpu/mips/start.S -=================================================================== ---- u-boot-1.1.5.orig/cpu/mips/start.S 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/cpu/mips/start.S 2009-11-09 16:35:03.000000000 +0100 +--- a/cpu/mips/start.S ++++ b/cpu/mips/start.S @@ -27,7 +27,9 @@ #include <version.h> #include <asm/regdef.h> @@ -1934,7 +1878,7 @@ Index: u-boot-1.1.5/cpu/mips/start.S #elif defined(CONFIG_PURPLE) .word INFINEON_EBU_BOOTCFG /* EBU init code, fetched during booting */ .word INFINEON_EBU_BOOTCFG /* EBU init code, fetched during booting */ -@@ -181,6 +192,9 @@ +@@ -181,6 +192,9 @@ _start: * 128 * 8 == 1024 == 0x400 * so this is address R_VEC+0x400 == 0xbfc00400 */ @@ -1944,7 +1888,7 @@ Index: u-boot-1.1.5/cpu/mips/start.S #ifdef CONFIG_PURPLE /* 0xbfc00400 */ .word 0xdc870000 -@@ -205,8 +219,12 @@ +@@ -205,8 +219,12 @@ _start: .word 0x00000000 .word 0x00000000 #endif /* CONFIG_PURPLE */ @@ -1957,7 +1901,7 @@ Index: u-boot-1.1.5/cpu/mips/start.S /* Clear watch registers. */ -@@ -226,6 +244,10 @@ +@@ -226,6 +244,10 @@ reset: /* CAUSE register */ mtc0 zero, CP0_CAUSE @@ -1968,7 +1912,7 @@ Index: u-boot-1.1.5/cpu/mips/start.S /* Init Timer */ mtc0 zero, CP0_COUNT mtc0 zero, CP0_COMPARE -@@ -252,12 +274,26 @@ +@@ -252,12 +274,26 @@ reset: nop #endif @@ -1995,7 +1939,7 @@ Index: u-boot-1.1.5/cpu/mips/start.S /* Initialize caches... */ la t9, mips_cache_reset -@@ -266,7 +302,11 @@ +@@ -266,7 +302,11 @@ reset: /* ... and enable them. */ @@ -2007,7 +1951,7 @@ Index: u-boot-1.1.5/cpu/mips/start.S mtc0 t0, CP0_CONFIG -@@ -280,13 +320,38 @@ +@@ -280,13 +320,38 @@ reset: li t0, CFG_SDRAM_BASE + CFG_INIT_SP_OFFSET la sp, 0(t0) @@ -2046,7 +1990,7 @@ Index: u-boot-1.1.5/cpu/mips/start.S * * This "function" does not return, instead it continues in RAM * after relocating the monitor code. -@@ -295,12 +360,22 @@ +@@ -295,12 +360,22 @@ reset: * a1 = gd * a2 = destination address */ @@ -2069,7 +2013,7 @@ Index: u-boot-1.1.5/cpu/mips/start.S la t3, in_ram lw t2, -12(t3) /* t2 <-- uboot_end_data */ move t1, a2 -@@ -311,7 +386,11 @@ +@@ -311,7 +386,11 @@ relocate_code: * New GOT-PTR = (old GOT-PTR - CFG_MONITOR_BASE) + Destination Address */ move t6, gp @@ -2081,7 +2025,7 @@ Index: u-boot-1.1.5/cpu/mips/start.S add gp, a2 /* gp now adjusted */ sub t6, gp, t6 /* t6 <-- relocation offset */ -@@ -337,12 +416,21 @@ +@@ -337,12 +416,21 @@ relocate_code: /* Jump to where we've relocated ourselves. */ @@ -2103,7 +2047,7 @@ Index: u-boot-1.1.5/cpu/mips/start.S .word num_got_entries in_ram: -@@ -374,12 +462,19 @@ +@@ -374,12 +462,19 @@ in_ram: sw zero, 0(t1) /* delay slot */ move a0, a1 @@ -2124,7 +2068,7 @@ Index: u-boot-1.1.5/cpu/mips/start.S /* Exception handlers. */ -@@ -388,3 +483,20 @@ +@@ -388,3 +483,20 @@ romReserved: romExcHandle: b romExcHandle @@ -2145,10 +2089,8 @@ Index: u-boot-1.1.5/cpu/mips/start.S + IFX_MIPS_HANDLER_1 +#endif +#endif -Index: u-boot-1.1.5/tools/Makefile -=================================================================== ---- u-boot-1.1.5.orig/tools/Makefile 2006-10-20 17:54:33.000000000 +0200 -+++ u-boot-1.1.5/tools/Makefile 2009-11-09 16:35:03.000000000 +0100 +--- a/tools/Makefile ++++ b/tools/Makefile @@ -21,7 +21,7 @@ # MA 02111-1307 USA # diff --git a/package/uboot-ifxmips/patches/120-eon_flash.patch b/package/uboot-ifxmips/patches/120-eon_flash.patch index 0a2624c72b..0b0da3c69b 100644 --- a/package/uboot-ifxmips/patches/120-eon_flash.patch +++ b/package/uboot-ifxmips/patches/120-eon_flash.patch @@ -1,9 +1,7 @@ -Index: u-boot-1.1.5/board/ifx/danube/flash.c -=================================================================== ---- u-boot-1.1.5.orig/board/ifx/danube/flash.c 2010-03-19 12:12:27.000000000 +0100 -+++ u-boot-1.1.5/board/ifx/danube/flash.c 2010-03-19 12:12:30.000000000 +0100 -@@ -477,7 +477,10 @@ - printf("%s:%s[%d]\n", __FILE__, __func__, __LINE__); +--- a/board/ifx/danube/flash.c ++++ b/board/ifx/danube/flash.c +@@ -470,7 +470,10 @@ ulong flash_get_size (FPWV *addr, flash_ + case (uchar)MX_MANUFACT: // 0x00c2 info->flash_id = FLASH_MAN_MX ;//0x00030000 break; - @@ -12,13 +10,11 @@ Index: u-boot-1.1.5/board/ifx/danube/flash.c + info->flash_id = FLASH_MAN_AMD ; + break; default: - printf("%s:%s[%d]\n", __FILE__, __func__, __LINE__); info->flash_id = FLASH_UNKNOWN; -Index: u-boot-1.1.5/include/flash.h -=================================================================== ---- u-boot-1.1.5.orig/include/flash.h 2010-03-19 12:16:23.000000000 +0100 -+++ u-boot-1.1.5/include/flash.h 2010-03-19 12:16:48.000000000 +0100 -@@ -130,6 +130,7 @@ + info->sector_count = 0; +--- a/include/flash.h ++++ b/include/flash.h +@@ -130,6 +130,7 @@ extern void flash_read_factory_serial(fl #define TOSH_MANUFACT 0x00980098 /* TOSHIBA manuf. ID in D23..D16, D7..D0 */ #define MT2_MANUFACT 0x002C002C /* alternate MICRON manufacturer ID*/ #define EXCEL_MANUFACT 0x004A004A /* Excel Semiconductor */ diff --git a/package/uboot-ifxmips/patches/130-a800.patch b/package/uboot-ifxmips/patches/130-a800.patch index 3e19e6c27d..f358201d18 100644 --- a/package/uboot-ifxmips/patches/130-a800.patch +++ b/package/uboot-ifxmips/patches/130-a800.patch @@ -1,8 +1,6 @@ -Index: u-boot-1.1.5/drivers/ifx_sw.c -=================================================================== ---- u-boot-1.1.5.orig/drivers/ifx_sw.c 2010-03-24 19:21:19.000000000 +0100 -+++ u-boot-1.1.5/drivers/ifx_sw.c 2010-03-24 19:23:09.000000000 +0100 -@@ -118,7 +118,7 @@ +--- a/drivers/ifx_sw.c ++++ b/drivers/ifx_sw.c +@@ -118,7 +118,7 @@ int danube_switch_initialize(bd_t * bis) { struct eth_device *dev; unsigned short chipid; @@ -11,7 +9,7 @@ Index: u-boot-1.1.5/drivers/ifx_sw.c #if 0 printf("Entered danube_switch_initialize()\n"); #endif -@@ -130,6 +130,19 @@ +@@ -130,6 +130,19 @@ int danube_switch_initialize(bd_t * bis) } memset(dev, 0, sizeof(*dev)); |