X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fuboot-lantiq%2Fpatches%2F300-arcadyan.patch;fp=package%2Fuboot-lantiq%2Fpatches%2F300-arcadyan.patch;h=0000000000000000000000000000000000000000;hb=a95775e4b2a9831decbc7f37a2e47985ea2ac222;hp=a91ac589f97eee99516c9160348b528ffb4d2425;hpb=06218a992e0ffa234d8c180f9a24415b2fb5fe62;p=openwrt%2Fstaging%2Fyousong.git

diff --git a/package/uboot-lantiq/patches/300-arcadyan.patch b/package/uboot-lantiq/patches/300-arcadyan.patch
deleted file mode 100644
index a91ac589f9..0000000000
--- a/package/uboot-lantiq/patches/300-arcadyan.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- a/common/Makefile
-+++ b/common/Makefile
-@@ -127,7 +127,9 @@
- ifdef CONFIG_PCI
- COBJS-$(CONFIG_CMD_PCI) += cmd_pci.o
- endif
-+ifdef CONFIG_CMD_PCMCIA
- COBJS-y += cmd_pcmcia.o
-+endif
- COBJS-$(CONFIG_CMD_PORTIO) += cmd_portio.o
- COBJS-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o
- COBJS-$(CONFIG_CMD_REISER) += cmd_reiser.o
---- a/drivers/pcmcia/Makefile
-+++ b/drivers/pcmcia/Makefile
-@@ -28,9 +28,11 @@
- COBJS-$(CONFIG_I82365) += i82365.o
- COBJS-$(CONFIG_8xx) += mpc8xx_pcmcia.o
- COBJS-$(CONFIG_PXA_PCMCIA) += pxa_pcmcia.o
--COBJS-y += rpx_pcmcia.o
-+#COBJS-y += rpx_pcmcia.o
-+COBJS-$(CONFIG_RPX_PCMCIA) += rpx_pcmcia.o
- COBJS-$(CONFIG_IDE_TI_CARDBUS) += ti_pci1410a.o
--COBJS-y += tqm8xx_pcmcia.o
-+#COBJS-y += tqm8xx_pcmcia.o
-+COBJS-$(CONFIG_TQM8XX_PCMCIA) += tqm8xx_pcmcia.o
- COBJS-$(CONFIG_MARUBUN_PCCARD) += marubun_pcmcia.o
- 
- COBJS	:= $(COBJS-y)
---- a/drivers/usb/phy/Makefile
-+++ b/drivers/usb/phy/Makefile
-@@ -23,7 +23,7 @@
- LIB	:= $(obj)libusb_phy.a
- 
- COBJS-$(CONFIG_TWL4030_USB) += twl4030.o
--COBJS-y := twl4030.o
-+#COBJS-y := twl4030.o
- 
- COBJS	:= $(COBJS-y)
- SRCS	:= $(COBJS:.o=.c)
---- a/Makefile
-+++ b/Makefile
-@@ -3414,6 +3414,42 @@
- ## MIPS32 ifxcpe
- #########################################################################
- 
-+define arcadyan
-+$(1)	: unconfig
-+	@mkdir -p $(obj)include
-+	@mkdir -p $(obj)board/arcadyan/
-+	@[ -z "$$(findstring brnboot,$$@)" ] || \
-+		{ echo "TEXT_BASE = 0x80002000" >$(obj)board/arcadyan/config.tmp ; \
-+			echo "#define CONFIG_SYS_RAMBOOT" >>$(obj)include/config.h ; \
-+			echo "#define CONFIG_SYS_BRNBOOT" >>$(obj)include/config.h ; \
-+			$(XECHO) "... with brnboot configuration" ; \
-+		}
-+	@[ -z "$$(findstring ramboot,$$@)" ] || \
-+		{ echo "TEXT_BASE = 0xA0400000" >$(obj)board/arcadyan/config.tmp ; \
-+			echo "#define CONFIG_SYS_RAMBOOT" >>$(obj)include/config.h ; \
-+			$(XECHO) "... with ramboot configuration" ; \
-+		}
-+	@if [ "$$(findstring flash,$$@)" ] ; then \
-+               echo "#TEXT_BASE = 0xB0050000" >$(obj)board/arcadyan/config.tmp ; \
-+		echo "#define CONFIG_BOOTSTRAP"  >>$(obj)include/config.h ; \
-+		echo "#define CONFIG_USE_DDR_RAM"  >>$(obj)include/config.h ; \
-+		echo "#define CONFIG_USE_DDR_RAM_CFG_psc166" >>$(obj)include/config.h ; \
-+	fi
-+	@$(MKCONFIG) -a $$(word 1,$$(subst _, ,$$@)) mips mips arcadyan "" danube
-+endef
-+
-+$(eval $(call arcadyan, arv3527P%config))
-+$(eval $(call arcadyan, arv4520PW%config))
-+$(eval $(call arcadyan, arv452CPW%config))
-+$(eval $(call arcadyan, arv4525PW%config))
-+$(eval $(call arcadyan, arv4510PW%config))
-+$(eval $(call arcadyan, arv4518PW%config))
-+$(eval $(call arcadyan, arv4519PW%config))
-+$(eval $(call arcadyan, arv7518PW%config))
-+$(eval $(call arcadyan, arv7525PW%config))
-+$(eval $(call arcadyan, arv752DPW%config))
-+$(eval $(call arcadyan, arv752DPW22%config))
-+
- easy50712%config	: unconfig
- 	@mkdir -p $(obj)include
- 	@mkdir -p $(obj)board/infineon/easy50712
---- a/net/tftp.c
-+++ b/net/tftp.c
-@@ -11,9 +11,9 @@
- #include "bootp.h"
- 
- #define WELL_KNOWN_PORT	69		/* Well known TFTP port #		*/
--#define TIMEOUT		5000UL		/* Millisecs to timeout for lost pkt */
-+#define TIMEOUT		10000UL		/* Millisecs to timeout for lost pkt */
- #ifndef	CONFIG_NET_RETRY_COUNT
--# define TIMEOUT_COUNT	10		/* # of timeouts before giving up  */
-+# define TIMEOUT_COUNT	200		/* # of timeouts before giving up  */
- #else
- # define TIMEOUT_COUNT  (CONFIG_NET_RETRY_COUNT * 2)
- #endif