ramips: remove obsolete 'pcibios_fixups' from the rt288x pci code

[openwrt.git] / target / linux / atheros / image / Makefile

diff --git a/target/linux/atheros/image/Makefile b/target/linux/atheros/image/Makefile
index 343e2de..15cd995 100644 (file)
--- a/target/linux/atheros/image/Makefile
+++ b/target/linux/atheros/image/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -23,15 +23,40 @@ define Image/Build
        $(call Image/Build/$(1))
        dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-root.$(1) bs=128k conv=sync
 
        $(call Image/Build/$(1))
        dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-root.$(1) bs=128k conv=sync
 

-       -$(STAGING_DIR_HOST)/bin/mkfwimage -k $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma \
+       -$(STAGING_DIR_HOST)/bin/mkfwimage \
+               -B XS2 -v XS2.ar2316.OpenWrt.$(REVISION) \
+               -k $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma \

                -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
                -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \

-               -v XS2.ar2316.OpenWRT \

                -o $(BIN_DIR)/openwrt-$(BOARD)-ubnt2-$(1).bin
                -o $(BIN_DIR)/openwrt-$(BOARD)-ubnt2-$(1).bin

-       -$(STAGING_DIR_HOST)/bin/mkfwimage -k $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma \
+
+       -$(STAGING_DIR_HOST)/bin/mkfwimage \
+               -B XS5 -v XS5.ar2313.OpenWrt.$(REVISION) \
+               -k $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma \
+               -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
+               -o $(BIN_DIR)/openwrt-$(BOARD)-ubnt5-$(1).bin
+
+       -$(STAGING_DIR_HOST)/bin/mkfwimage \
+               -B XS2-8 -v XS2.ar2316.OpenWrt.$(REVISION) \
+               -k $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma \

                -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
                -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \

-               -v XS5.ar2313.OpenWRT \
-               -o $(BIN_DIR)/openwrt-$(BOARD)-ubnt5-$(1).bin \
-               -s 0xBE030000
+               -o $(BIN_DIR)/openwrt-$(BOARD)-ubnt2-pico2-$(1).bin
+
+       -$(STAGING_DIR_HOST)/bin/mkmylofw -B np25g \
+               -p0x020000:0x130000:ah:0x80041000:linux:$(KDIR)/vmlinux.bin.gz  \
+               -p0x150000:0x2a0000:::rootfs:$(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
+               $(BIN_DIR)/openwrt-$(BOARD)-np25g-$(1).bin
+
+       -$(STAGING_DIR_HOST)/bin/mkmylofw -B wpe53g \
+               -p0x020000:0x130000:ah:0x80041000:linux:$(KDIR)/vmlinux.bin.gz  \
+               -p0x150000:0x2a0000:::rootfs:$(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
+               $(BIN_DIR)/openwrt-$(BOARD)-wpe53g-$(1).bin
+
+  ifeq ($(BOARD),atheros)
+       -sh $(TOPDIR)/scripts/combined-image.sh \
+               "$(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma" \
+               "$(BIN_DIR)/openwrt-$(BOARD)-root.$(1)" \
+               "$(BIN_DIR)/openwrt-$(BOARD)-combined.img"
+  endif

 endef
 
 $(eval $(call BuildImage))
 endef
 
 $(eval $(call BuildImage))