Hi Waldemar,
please review and test the attached diff, your linksys model
simplification was not complete (changeset 1841). This braked image
generation when choosing any linksys model as target (except GSv4).
Commit it yourself or tell me to commit it, whatever you prefer.
Bye,
Lothar
Index: target/image/brcm/Makefile
===================================================================
--- target/image/brcm/Makefile (revision 1934)
+++ target/image/brcm/Makefile (working copy)
@@ -117,7 +117,7 @@
install: $(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin
endif
-ifeq ($(FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G_1_0),y)
+ifeq ($(FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G),y)
ifeq ($(FS),jffs2)
MTD_ERASESIZE:=-64k
endif
@@ -125,69 +125,6 @@
$(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g
install: $(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin
endif
-
-ifeq ($(FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G_1_1),y)
-ifeq ($(FS),jffs2)
-MTD_ERASESIZE:=-64k
-endif
-$(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin: $(STAGING_DIR)/$(FWRT_PREFIX)-$(BOARD)-$(KERNEL)-$(FS)$(MTD_ERASESIZE).trx
- $(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g
-install: $(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin
-endif
-
-ifeq ($(FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G_2_0),y)
-ifeq ($(FS),jffs2)
-MTD_ERASESIZE:=-64k
-endif
-$(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin: $(STAGING_DIR)/$(FWRT_PREFIX)-$(BOARD)-$(KERNEL)-$(FS)$(MTD_ERASESIZE).trx
- $(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g
-install: $(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin
-endif
-
-ifeq ($(FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G_2_2),y)
-ifeq ($(FS),jffs2)
-MTD_ERASESIZE:=-64k
-endif
-$(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin: $(STAGING_DIR)/$(FWRT_PREFIX)-$(BOARD)-$(KERNEL)-$(FS)$(MTD_ERASESIZE).trx
- $(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g
-install: $(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin
-endif
-
-ifeq ($(FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G_3_0),y)
-ifeq ($(FS),jffs2)
-MTD_ERASESIZE:=-64k
-endif
-$(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin: $(STAGING_DIR)/$(FWRT_PREFIX)-$(BOARD)-$(KERNEL)-$(FS)$(MTD_ERASESIZE).trx
- $(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g
-install: $(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin
-endif
-
-ifeq ($(FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G_3_1),y)
-ifeq ($(FS),jffs2)
-MTD_ERASESIZE:=-64k
-endif
-$(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin: $(STAGING_DIR)/$(FWRT_PREFIX)-$(BOARD)-$(KERNEL)-$(FS)$(MTD_ERASESIZE).trx
- $(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g
-install: $(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin
-endif
-
-ifeq ($(FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G_4),y)
-ifeq ($(FS),jffs2)
-MTD_ERASESIZE:=-64k
-endif
-$(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin: $(STAGING_DIR)/$(FWRT_PREFIX)-$(BOARD)-$(KERNEL)-$(FS)$(MTD_ERASESIZE).trx
- $(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g
-install: $(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin
-endif
-
-ifeq ($(FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GL),y)
-ifeq ($(FS),jffs2)
-MTD_ERASESIZE:=-64k
-endif
-$(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin: $(STAGING_DIR)/$(FWRT_PREFIX)-$(BOARD)-$(KERNEL)-$(FS)$(MTD_ERASESIZE).trx
- $(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g
-install: $(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin
-endif
ifeq ($(FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G3G),y)
ifeq ($(FS),jffs2)
MTD_ERASESIZE:=-64k
@@ -205,7 +142,7 @@
install: $(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin
endif
-ifeq ($(FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GS_1_0),y)
+ifeq ($(FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GS),y)
ifeq ($(FS),jffs2)
MTD_ERASESIZE:=-128k
endif
@@ -214,15 +151,6 @@
install: $(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin
endif
-ifeq ($(FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GS_1_1),y)
-ifeq ($(FS),jffs2)
-MTD_ERASESIZE:=-128k
-endif
-$(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin: $(STAGING_DIR)/$(FWRT_PREFIX)-$(BOARD)-$(KERNEL)-$(FS)$(MTD_ERASESIZE).trx
- $(STAGING_DIR)/bin/addpattern -4 -p W54S -v v4.70.6 -i $< -o $@ -g
-install: $(BIN_DIR)/$(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).bin
-endif
-
ifeq ($(FWRT_LINUX_2_4_BRCM_NETGEAR_WGT634U),y)
ifeq ($(FS),jffs2)
MTD_ERASESIZE:=-128k
_______________________________________________
freewrt-developers mailing list
[email protected]
https://www.freewrt.org/lists/listinfo/freewrt-developers
