hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ar71xx: remove obsolete jffs2 image building code 

Signed-off-by: Felix Fietkau <nbd@nbd.name>
owl
Felix Fietkau 2016-11-23 10:21:07 +01:00
parent e8fe83e1be
commit 88f6f0120d
2 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/linux/ar71xx/image/Makefile
View File

@ -5,8 +5,6 @@
# See /LICENSE for more information. # See /LICENSE for more information.
# #
JFFS2_BLOCKSIZE = 64k 128k 256k
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
@ -101,7 +99,6 @@ define Device/Default
PROFILES = Default Minimal $$(DEVICE_PROFILE) PROFILES = Default Minimal $$(DEVICE_PROFILE)
MTDPARTS := MTDPARTS :=
BLOCKSIZE := 64k BLOCKSIZE := 64k
FILESYSTEMS = $(filter-out jffs2-%,$(TARGET_FILESYSTEMS)) jffs2-$$(BLOCKSIZE)
CONSOLE = ttyS0,115200 CONSOLE = ttyS0,115200
CMDLINE = $$(if $$(BOARDNAME),board=$$(BOARDNAME)) $$(if $$(MTDPARTS),mtdparts=$$(MTDPARTS)) $$(if $$(CONSOLE),console=$$(CONSOLE)) CMDLINE = $$(if $$(BOARDNAME),board=$$(BOARDNAME)) $$(if $$(MTDPARTS),mtdparts=$$(MTDPARTS)) $$(if $$(CONSOLE),console=$$(CONSOLE))
KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma

31
target/linux/ar71xx/image/legacy.mk
View File

@ -1,4 +1,4 @@
rootfs_type=$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1))) rootfs_type=$(patsubst squashfs-%,squashfs,$(1))
# $(1): rootfs type. # $(1): rootfs type.
# $(2): board name. # $(2): board name.
@ -134,9 +134,6 @@ define CatFiles
if [ $(2) -eq 0 ]; then \ if [ $(2) -eq 0 ]; then \
filename="$(3)"; fstype=$${filename##*\.}; \ filename="$(3)"; fstype=$${filename##*\.}; \
case "$${fstype}" in \ case "$${fstype}" in \
"jffs2-64k") bs=65536;; \
"jffs2-128k") bs=131072;; \
"jffs2-256k") bs=262144;; \
*) bs=`stat -c%s $(1)`;; \ *) bs=`stat -c%s $(1)`;; \
esac; \ esac; \
( dd if=$(1) bs=$${bs} conv=sync; cat $(3) ) > $(5); \ ( dd if=$(1) bs=$${bs} conv=sync; cat $(3) ) > $(5); \
@ -872,17 +869,8 @@ define Image/Build/Zcomax
endef endef
# $(1): template name to be defined, etc. squashfs-only, 64k, 64kraw, etc.
# $(2): jffs2 blocksize.
define Jffs2Template
define Image/Build/Template/$(1)/jffs2-$(2)
$$(call Image/Build/$$(1),jffs2-$(2),$$(2),$$(3),$$(4),$$(5),$$(6),$$(7),$$(8),$$(9),$$(10))
endef
endef
# $(1): template name to be defined. # $(1): template name to be defined.
# $(2): squashfs suffix to be used. # $(2): squashfs suffix to be used.
# $(3): jffs2 suffix to be used.
define BuildTemplate define BuildTemplate
# $(1) : name of build method. # $(1) : name of build method.
# $(2) : board name. # $(2) : board name.
@ -900,17 +888,16 @@ define BuildTemplate
define Image/Build/Template/$(1)/squashfs define Image/Build/Template/$(1)/squashfs
$$(call Image/Build/$$(1),squashfs$(2),$$(2),$$(3),$$(4),$$(5),$$(6),$$(7),$$(8),$$(9),$$(10)) $$(call Image/Build/$$(1),squashfs$(2),$$(2),$$(3),$$(4),$$(5),$$(6),$$(7),$$(8),$$(9),$$(10))
endef endef
$(if $(3),$(foreach bs,$(3),$(eval $(call Jffs2Template,$(1),$(bs)))))
endef endef
$(eval $(call BuildTemplate,squashfs-only)) $(eval $(call BuildTemplate,squashfs-only))
$(eval $(call BuildTemplate,64k,-64k,64k)) $(eval $(call BuildTemplate,64k,-64k))
$(eval $(call BuildTemplate,64kraw,-raw,64k)) $(eval $(call BuildTemplate,64kraw,-raw))
$(eval $(call BuildTemplate,64kraw-nojffs,-raw)) $(eval $(call BuildTemplate,64kraw-nojffs,-raw))
$(eval $(call BuildTemplate,128k,,128k)) $(eval $(call BuildTemplate,128k))
$(eval $(call BuildTemplate,128kraw,-raw,128k)) $(eval $(call BuildTemplate,128kraw,-raw))
$(eval $(call BuildTemplate,256k,,256k)) $(eval $(call BuildTemplate,256k))
$(eval $(call BuildTemplate,all,,64k 128k 256k)) $(eval $(call BuildTemplate,all))
ifeq ($(SUBTARGET),generic) ifeq ($(SUBTARGET),generic)
$(eval $(call SingleProfile,ALFA,64k,ALFANX,alfa-nx,ALFA-NX,ttyS0,115200,$$(alfa_mtdlayout_8M),1638400,6291456,vmlinux.gz.uImage,pb9x-2.6.31-jffs2)) $(eval $(call SingleProfile,ALFA,64k,ALFANX,alfa-nx,ALFA-NX,ttyS0,115200,$$(alfa_mtdlayout_8M),1638400,6291456,vmlinux.gz.uImage,pb9x-2.6.31-jffs2))
@ -1084,10 +1071,6 @@ define Image/Build/squashfs
dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
endef endef
define Image/Build/jffs2
dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
endef
define Image/Prepare define Image/Prepare
gzip -9n -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz gzip -9n -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz
$(call CompressLzma,$(KDIR)/vmlinux,$(KDIR)/vmlinux.bin.lzma) $(call CompressLzma,$(KDIR)/vmlinux,$(KDIR)/vmlinux.bin.lzma)