diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2011-12-13 20:41:24 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2011-12-13 20:41:24 +0000 |
| commit | 74dbf6c823cae0a6643aa8fdfe079198adf20161 (patch) | |
| tree | 828fa3fa37e8a6b0fba7086695051601d06cef58 /target/linux | |
| parent | a4e54ee1c8acd16814e9d0c23f1533558ffbc7d8 (diff) | |
| download | upstream-74dbf6c823cae0a6643aa8fdfe079198adf20161.tar.gz upstream-74dbf6c823cae0a6643aa8fdfe079198adf20161.tar.bz2 upstream-74dbf6c823cae0a6643aa8fdfe079198adf20161.zip | |
ar71xx: get rid of squashfs-4k images
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29522 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/ar71xx/image/Makefile | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index bbfb5387ff..b2dec96db2 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -25,13 +25,11 @@ VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage fs_squash:=squashfs-only fs_all:=all -fs_4k:=4k fs_64k:=64k fs_128k:=128k ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) fs_squash:=initramfs fs_all:=initramfs - fs_4k:=initramfs fs_64k:=initramfs fs_128k:=initramfs VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux-initramfs @@ -532,10 +530,6 @@ define Image/Build/Template/squashfs-only/squashfs $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) endef -define Image/Build/Template/4k/squashfs - $(call Image/Build/$(1),squashfs-4k,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) -endef - define Image/Build/Template/64k/squashfs $(call Image/Build/$(1),squashfs-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) endef @@ -558,7 +552,7 @@ ap121_mtdlayout_4M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,2752k(rootfs ap121_cmdline=board=AP121 console=ttyATH0,115200 define Image/Build/Profile/AP121 - $(call Image/Build/Template/$(fs_4k)/$(1),AthLzma,ap121-2M,$(ap121_cmdline),ap121_mtdlayout_2M,720896,1245184,RK) + $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-2M,$(ap121_cmdline),ap121_mtdlayout_2M,720896,1245184,RK) $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-4M,$(ap121_cmdline),ap121_mtdlayout_4M,917504,2818048,RK) endef @@ -925,11 +919,8 @@ define Image/Build/Profile/Madwifi endef define Image/Build/squashfs - cp $(KDIR)/root.squashfs $(KDIR)/root.squashfs-4k - $(STAGING_DIR_HOST)/bin/padjffs2 $(KDIR)/root.squashfs-4k 4 - cp $(KDIR)/root.squashfs-4k $(BIN_DIR)/$(IMG_PREFIX)-root.squashfs-4k cp $(KDIR)/root.squashfs $(KDIR)/root.squashfs-64k - $(STAGING_DIR_HOST)/bin/padjffs2 $(KDIR)/root.squashfs-64k 4 8 64 + $(STAGING_DIR_HOST)/bin/padjffs2 $(KDIR)/root.squashfs-64k 64 cp $(KDIR)/root.squashfs-64k $(BIN_DIR)/$(IMG_PREFIX)-root.squashfs-64k $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) endef |