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,46 @@
  43  ## MIPS32 ifxcpe
  44  #########################################################################
  45
  46 +arv752DWP22%config     : unconfig
  47 +       @mkdir -p $(obj)include
  48 +       @mkdir -p $(obj)board/arcadyan/arv752DWP22
  49 +       @[ -z "$(findstring brnboot,$@)" ] || \
  50 +               { echo "TEXT_BASE = 0x80002000" >$(obj)board/arcadyan/arv752DWP22/config.tmp ; \
  51 +                       echo "#define CONFIG_SYS_RAMBOOT" >>$(obj)include/config.h ; \
  52 +                       echo "#define CONFIG_SYS_BRNBOOT" >>$(obj)include/config.h ; \
  53 +                       $(XECHO) "... with brnboot configuration" ; \
  54 +               }
  55 +       @[ -z "$(findstring ramboot,$@)" ] || \
  56 +               { echo "TEXT_BASE = 0xA0400000" >$(obj)board/arcadyan/arv752DWP22/config.tmp ; \
  57 +                       echo "#define CONFIG_SYS_RAMBOOT" >>$(obj)include/config.h ; \
  58 +                       $(XECHO) "... with ramboot configuration" ; \
  59 +               }
  60 +       @if [ "$(findstring flash,$@)" ] ; then \
  61 +               echo "#define CONFIG_USE_DDR_RAM"  >>$(obj)include/config.h ; \
  62 +               echo "#define CONFIG_USE_DDR_RAM_CFG_DDR_psc166" >>$(obj)include/config.h ; \
  63 +       fi
  64 +       @$(MKCONFIG) -a $(word 1,$(subst _, ,$@)) mips mips arv752DWP22 arcadyan danube
  65 +
  66 +arv4518%config : unconfig
  67 +       @mkdir -p $(obj)include
  68 +       @mkdir -p $(obj)board/arcadyan/arv4518
  69 +       @[ -z "$(findstring brnboot,$@)" ] || \
  70 +               { echo "TEXT_BASE = 0x80002000" >$(obj)board/arcadyan/arv4518/config.tmp ; \
  71 +                       echo "#define CONFIG_SYS_RAMBOOT" >>$(obj)include/config.h ; \
  72 +                       echo "#define CONFIG_SYS_BRNBOOT" >>$(obj)include/config.h ; \
  73 +                       $(XECHO) "... with brnboot configuration" ; \
  74 +               }
  75 +       @[ -z "$(findstring ramboot,$@)" ] || \
  76 +               { echo "TEXT_BASE = 0xA0400000" >$(obj)board/arcadyan/arv4518/config.tmp ; \
  77 +                       echo "#define CONFIG_SYS_RAMBOOT" >>$(obj)include/config.h ; \
  78 +                       $(XECHO) "... with ramboot configuration" ; \
  79 +               }
  80 +       @if [ "$(findstring flash,$@)" ] ; then \
  81 +               echo "#define CONFIG_USE_DDR_RAM"  >>$(obj)include/config.h ; \
  82 +               echo "#define CONFIG_USE_DDR_RAM_CFG_DDR_psc166" >>$(obj)include/config.h ; \
  83 +       fi
  84 +       @$(MKCONFIG) -a $(word 1,$(subst _, ,$@)) mips mips arv4518 arcadyan danube
  85 +
  86  easy50712%config       : unconfig
  87         @mkdir -p $(obj)include
  88         @mkdir -p $(obj)board/infineon/easy50712
  89 --- a/net/tftp.c
  90 +++ b/net/tftp.c
  91 @@ -11,9 +11,9 @@
  92  #include "bootp.h"
  93
  94  #define WELL_KNOWN_PORT        69              /* Well known TFTP port #               */
  95 -#define TIMEOUT                5000UL          /* Millisecs to timeout for lost pkt */
  96 +#define TIMEOUT                10000UL         /* Millisecs to timeout for lost pkt */
  97  #ifndef        CONFIG_NET_RETRY_COUNT
  98 -# define TIMEOUT_COUNT 10              /* # of timeouts before giving up  */
  99 +# define TIMEOUT_COUNT 200             /* # of timeouts before giving up  */
 100  #else
 101  # define TIMEOUT_COUNT  (CONFIG_NET_RETRY_COUNT * 2)
 102  #endif