aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-05-30 09:01:41 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-05-30 09:01:41 +0000
commit1e659c29ec2144ca8ffefad18c9ccb4c2f5879ac (patch)
tree081a8aca0eabbc787d7d052f89114c74e12266a5
parenta6df9f04727829f80b4475c4f05461e3dd2a719e (diff)
downloadupstream-1e659c29ec2144ca8ffefad18c9ccb4c2f5879ac.tar.gz
upstream-1e659c29ec2144ca8ffefad18c9ccb4c2f5879ac.tar.bz2
upstream-1e659c29ec2144ca8ffefad18c9ccb4c2f5879ac.zip
ramips: rename status led to wifi on WHR-300HP2, WHR-1166D, WHR-600D
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 45846
-rw-r--r--target/linux/ramips/dts/WHR-1166D.dts8
-rw-r--r--target/linux/ramips/dts/WHR-300HP2.dts8
-rw-r--r--target/linux/ramips/dts/WHR-600D.dts8
3 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/ramips/dts/WHR-1166D.dts b/target/linux/ramips/dts/WHR-1166D.dts
index 3e62ece9b0..cd2e71314a 100644
--- a/target/linux/ramips/dts/WHR-1166D.dts
+++ b/target/linux/ramips/dts/WHR-1166D.dts
@@ -104,16 +104,16 @@
label = "buffalo:red:power";
gpios = <&gpio0 7 1>;
};
- status {
- label = "buffalo:green:status";
+ wifi {
+ label = "buffalo:green:wifi";
gpios = <&gpio0 8 1>;
};
power2 {
label = "buffalo:green:power";
gpios = <&gpio0 9 1>;
};
- status2 {
- label = "buffalo:orange:status";
+ wifi2 {
+ label = "buffalo:orange:wifi";
gpios = <&gpio0 10 1>;
};
internet {
diff --git a/target/linux/ramips/dts/WHR-300HP2.dts b/target/linux/ramips/dts/WHR-300HP2.dts
index 1ccfa2bb4d..b3b3a8794e 100644
--- a/target/linux/ramips/dts/WHR-300HP2.dts
+++ b/target/linux/ramips/dts/WHR-300HP2.dts
@@ -82,16 +82,16 @@
label = "buffalo:red:power";
gpios = <&gpio0 7 1>;
};
- status {
- label = "buffalo:green:status";
+ wifi {
+ label = "buffalo:green:wifi";
gpios = <&gpio0 8 1>;
};
power2 {
label = "buffalo:green:power";
gpios = <&gpio0 9 1>;
};
- status2 {
- label = "buffalo:orange:status";
+ wifi2 {
+ label = "buffalo:orange:wifi";
gpios = <&gpio0 10 1>;
};
internet {
diff --git a/target/linux/ramips/dts/WHR-600D.dts b/target/linux/ramips/dts/WHR-600D.dts
index b6d4e42320..5775093f5d 100644
--- a/target/linux/ramips/dts/WHR-600D.dts
+++ b/target/linux/ramips/dts/WHR-600D.dts
@@ -83,16 +83,16 @@
label = "buffalo:red:power";
gpios = <&gpio0 7 1>;
};
- status {
- label = "buffalo:green:status";
+ wifi {
+ label = "buffalo:green:wifi";
gpios = <&gpio0 8 1>;
};
power2 {
label = "buffalo:green:power";
gpios = <&gpio0 9 1>;
};
- status2 {
- label = "buffalo:orange:status";
+ wifi2 {
+ label = "buffalo:orange:wifi";
gpios = <&gpio0 10 1>;
};
internet {
D_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,37 @@ ## 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 "#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, 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, arv7518PW%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