diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-07-23 02:13:10 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-07-23 02:13:10 +0000 |
| commit | f98c69756b154cf87fd05cebe2facebbda221e8c (patch) | |
| tree | 9a4a6bf3fb39fe370c7d8944570b8633a2422734 | |
| parent | 82c9f81d631235878162d28e500eff1d477f450f (diff) | |
| download | master-187ad058-f98c69756b154cf87fd05cebe2facebbda221e8c.tar.gz master-187ad058-f98c69756b154cf87fd05cebe2facebbda221e8c.tar.bz2 master-187ad058-f98c69756b154cf87fd05cebe2facebbda221e8c.zip | |
simplify and fix adm5120 image building, fix broken FEATURES handling
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8113 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/adm5120-2.6/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/adm5120-2.6/image/Makefile | 15 | ||||
| -rw-r--r-- | target/linux/adm5120-2.6/profiles/RB1xx.mk | 1 |
3 files changed, 10 insertions, 8 deletions
diff --git a/target/linux/adm5120-2.6/Makefile b/target/linux/adm5120-2.6/Makefile index fb46f28312..8a4884c9ca 100644 --- a/target/linux/adm5120-2.6/Makefile +++ b/target/linux/adm5120-2.6/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=mipsel BOARD:=adm5120 BOARDNAME:=ADM5120 (Little Endian) -FEATURES:=squashfs jffs2 pci usb broken +FEATURES:=squashfs jffs2 tgz broken LINUX_VERSION:=2.6.22.1 diff --git a/target/linux/adm5120-2.6/image/Makefile b/target/linux/adm5120-2.6/image/Makefile index ee70b6b1aa..802fd956af 100644 --- a/target/linux/adm5120-2.6/image/Makefile +++ b/target/linux/adm5120-2.6/image/Makefile @@ -86,10 +86,7 @@ define Image/Build/RouterBoard $(STAGING_DIR)/bin/patch-cmdline $(KDIR)/vmlinux.elf '$(strip $(call Image/cmdline/yaffs2)) ' endef -define Image/Build -# this line is here intentionally -ifneq ($(1),jffs2-256k) -ifneq ($(1),jffs2-128k) +define Image/Build/jffs2-64k $(call Image/Build/Compex,$(1),wp54g-wrt,$(patsubst jffs2-%,jffs2,$(1)),WP54G-WRT) ifeq ($(CONFIG_DEVEL),y) $(call Image/Build/Edimax,$(1),br-6104k,$(patsubst jffs2-%,jffs2,$(1)),BR-6104K) @@ -117,8 +114,14 @@ ifeq ($(CONFIG_DEVEL),y) $(call Image/Build/MyLoader,$(1),wpp54g,$(patsubst jffs2-%,jffs2,$(1)),WPP54G) $(call Image/Build/MyLoader,$(1),wpp54ag,$(patsubst jffs2-%,jffs2,$(1)),WPP54AG) endif -endif -endif +endef + +define Image/Build/squashfs +$(call Image/Build/jffs2-64k,$(1)) +endef + +define Image/Build +$(call Image/Build/$(1),$(1)) endef ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) diff --git a/target/linux/adm5120-2.6/profiles/RB1xx.mk b/target/linux/adm5120-2.6/profiles/RB1xx.mk index 58622429e6..9dd3de0973 100644 --- a/target/linux/adm5120-2.6/profiles/RB1xx.mk +++ b/target/linux/adm5120-2.6/profiles/RB1xx.mk @@ -8,7 +8,6 @@ define Profile/RouterBoard NAME:=RouterBoard RB1xx PACKAGES:=kmod-madwifi - FEATURES:=tgz pci endef define Profile/RouterBoard/Description |