[uboot-lantiq]
[openwrt/svn-archive/archive.git] / package / uboot-lantiq / patches / 500-arcadyan.patch
1 --- a/common/Makefile
2 +++ b/common/Makefile
3 @@ -127,7 +127,9 @@
4 ifdef CONFIG_PCI
5 COBJS-$(CONFIG_CMD_PCI) += cmd_pci.o
6 endif
7 +ifdef CONFIG_CMD_PCMCIA
8 COBJS-y += cmd_pcmcia.o
9 +endif
10 COBJS-$(CONFIG_CMD_PORTIO) += cmd_portio.o
11 COBJS-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o
12 COBJS-$(CONFIG_CMD_REISER) += cmd_reiser.o
13 --- a/drivers/pcmcia/Makefile
14 +++ b/drivers/pcmcia/Makefile
15 @@ -28,9 +28,11 @@
16 COBJS-$(CONFIG_I82365) += i82365.o
17 COBJS-$(CONFIG_8xx) += mpc8xx_pcmcia.o
18 COBJS-$(CONFIG_PXA_PCMCIA) += pxa_pcmcia.o
19 -COBJS-y += rpx_pcmcia.o
20 +#COBJS-y += rpx_pcmcia.o
21 +COBJS-$(CONFIG_RPX_PCMCIA) += rpx_pcmcia.o
22 COBJS-$(CONFIG_IDE_TI_CARDBUS) += ti_pci1410a.o
23 -COBJS-y += tqm8xx_pcmcia.o
24 +#COBJS-y += tqm8xx_pcmcia.o
25 +COBJS-$(CONFIG_TQM8XX_PCMCIA) += tqm8xx_pcmcia.o
26 COBJS-$(CONFIG_MARUBUN_PCCARD) += marubun_pcmcia.o
27
28 COBJS := $(COBJS-y)
29 --- a/drivers/usb/phy/Makefile
30 +++ b/drivers/usb/phy/Makefile
31 @@ -23,7 +23,7 @@
32 LIB := $(obj)libusb_phy.a
33
34 COBJS-$(CONFIG_TWL4030_USB) += twl4030.o
35 -COBJS-y := twl4030.o
36 +#COBJS-y := twl4030.o
37
38 COBJS := $(COBJS-y)
39 SRCS := $(COBJS:.o=.c)
40 --- a/Makefile
41 +++ b/Makefile
42 @@ -3414,6 +3414,37 @@
43 ## MIPS32 ifxcpe
44 #########################################################################
45
46 +define arcadyan
47 +$(1) : unconfig
48 + @mkdir -p $(obj)include
49 + @mkdir -p $(obj)board/arcadyan/
50 + @[ -z "$$(findstring brnboot,$$@)" ] || \
51 + { echo "TEXT_BASE = 0x80002000" >$(obj)board/arcadyan/config.tmp ; \
52 + echo "#define CONFIG_SYS_RAMBOOT" >>$(obj)include/config.h ; \
53 + echo "#define CONFIG_SYS_BRNBOOT" >>$(obj)include/config.h ; \
54 + $(XECHO) "... with brnboot configuration" ; \
55 + }
56 + @[ -z "$$(findstring ramboot,$$@)" ] || \
57 + { echo "TEXT_BASE = 0xA0400000" >$(obj)board/arcadyan/config.tmp ; \
58 + echo "#define CONFIG_SYS_RAMBOOT" >>$(obj)include/config.h ; \
59 + $(XECHO) "... with ramboot configuration" ; \
60 + }
61 + @if [ "$$(findstring flash,$$@)" ] ; then \
62 + echo "#define CONFIG_USE_DDR_RAM" >>$(obj)include/config.h ; \
63 + echo "#define CONFIG_USE_DDR_RAM_CFG_psc166" >>$(obj)include/config.h ; \
64 + fi
65 + @$(MKCONFIG) -a $$(word 1,$$(subst _, ,$$@)) mips mips arcadyan "" danube
66 +endef
67 +
68 +$(eval $(call arcadyan, arv4520PW%config))
69 +$(eval $(call arcadyan, arv452CPW%config))
70 +$(eval $(call arcadyan, arv4525PW%config))
71 +$(eval $(call arcadyan, arv4510PW%config))
72 +$(eval $(call arcadyan, arv4518PW%config))
73 +$(eval $(call arcadyan, arv7518PW%config))
74 +$(eval $(call arcadyan, arv752DPW%config))
75 +$(eval $(call arcadyan, arv752DPW22%config))
76 +
77 easy50712%config : unconfig
78 @mkdir -p $(obj)include
79 @mkdir -p $(obj)board/infineon/easy50712
80 --- a/net/tftp.c
81 +++ b/net/tftp.c
82 @@ -11,9 +11,9 @@
83 #include "bootp.h"
84
85 #define WELL_KNOWN_PORT 69 /* Well known TFTP port # */
86 -#define TIMEOUT 5000UL /* Millisecs to timeout for lost pkt */
87 +#define TIMEOUT 10000UL /* Millisecs to timeout for lost pkt */
88 #ifndef CONFIG_NET_RETRY_COUNT
89 -# define TIMEOUT_COUNT 10 /* # of timeouts before giving up */
90 +# define TIMEOUT_COUNT 200 /* # of timeouts before giving up */
91 #else
92 # define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT * 2)
93 #endif