mac80211: fix a crash in the tx path

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

diff --git a/target/linux/ppc40x/image/Makefile b/target/linux/ppc40x/image/Makefile
index 3afeeca..415539e 100644 (file)
--- a/target/linux/ppc40x/image/Makefile
+++ b/target/linux/ppc40x/image/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2010 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.


@@ -11,11 +11,12 @@ JFFS2_BLOCKSIZE=128k 64k
 
 define Image/Prepare
        cp $(LINUX_DIR)/arch/powerpc/boot/uImage $(KDIR)/uImage
 
 define Image/Prepare
        cp $(LINUX_DIR)/arch/powerpc/boot/uImage $(KDIR)/uImage

-       dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/kilauea.dts > $(KDIR)/openwrt-kilauea.dtb
+       $(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/kilauea.dts > $(KDIR)/openwrt-kilauea.dtb

 endef
 
 define Image/BuildKernel
 endef
 
 define Image/BuildKernel

-       cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage
+       cp $(KDIR)/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
+       $(call Image/Build/Initramfs)

 endef
 
 define Image/Build
 endef
 
 define Image/Build


@@ -23,7 +24,7 @@ define Image/Build
 endef
 
 define Image/Build/ext2
 endef
 
 define Image/Build/ext2

-       cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-ext2.img
+       cp $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-ext2.img

 endef
 
 define Image/Build/jffs2-128k
 endef
 
 define Image/Build/jffs2-128k


@@ -31,26 +32,18 @@ define Image/Build/jffs2-128k
                dd if=$(LINUX_DIR)/arch/powerpc/boot/uImage bs=1920k conv=sync; \
                dd if=$(KDIR)/openwrt-kilauea.dtb bs=128k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
                dd if=$(LINUX_DIR)/arch/powerpc/boot/uImage bs=1920k conv=sync; \
                dd if=$(KDIR)/openwrt-kilauea.dtb bs=128k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \

-       ) > $(BIN_DIR)/openwrt-$(BOARD)-kilauea-jffs2.img
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-kilauea-jffs2.img

 endef
 
 define Image/Build/jffs2-64k
        ( \
 endef
 
 define Image/Build/jffs2-64k
        ( \

-               dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv1 bs=1152k conv=sync; \
+               dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicbox bs=1280k conv=sync; \

                dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \

-       ) > $(BIN_DIR)/openwrt-$(BOARD)-magicboxv1-jffs2.img
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-magicbox-jffs2.img

        ( \
        ( \

-               dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv2 bs=1152k conv=sync; \
+               dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.openrb bs=1280k conv=sync; \

                dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \

-       ) > $(BIN_DIR)/openwrt-$(BOARD)-magicboxv2-jffs2.img
-       ( \
-               dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.openrb-light bs=1152k conv=sync; \
-               dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
-       ) > $(BIN_DIR)/openwrt-$(BOARD)-openrb-light-jffs2.img
-       ( \
-               dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.openrb-medium bs=1152k conv=sync; \
-               dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
-       ) > $(BIN_DIR)/openwrt-$(BOARD)-openrb-medium-jffs2.img
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-openrb-jffs2.img

 endef
 
 define Image/Build/squashfs
 endef
 
 define Image/Build/squashfs


@@ -59,23 +52,22 @@ define Image/Build/squashfs
                dd if=$(LINUX_DIR)/arch/powerpc/boot/uImage bs=1920k conv=sync; \
                dd if=$(KDIR)/openwrt-kilauea.dtb bs=128k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
                dd if=$(LINUX_DIR)/arch/powerpc/boot/uImage bs=1920k conv=sync; \
                dd if=$(KDIR)/openwrt-kilauea.dtb bs=128k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \

-       ) > $(BIN_DIR)/openwrt-$(BOARD)-kilauea-$(1).img
-       ( \
-               dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv1 bs=1152k conv=sync; \
-               dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
-       ) > $(BIN_DIR)/openwrt-$(BOARD)-magicboxv1-$(1).img
-       ( \
-               dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv2 bs=1152k conv=sync; \
-               dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
-       ) > $(BIN_DIR)/openwrt-$(BOARD)-magicboxv2-$(1).img
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-kilauea-$(1).img

        ( \
        ( \

-               dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.openrb-light bs=1152k conv=sync; \
+               dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicbox bs=1280k conv=sync; \

                dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \

-       ) > $(BIN_DIR)/openwrt-$(BOARD)-openrb-light-$(1).img
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-magicbox-$(1).img

        ( \
        ( \

-               dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.openrb-medium bs=1152k conv=sync; \
+               dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.openrb bs=1280k conv=sync; \

                dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \

-       ) > $(BIN_DIR)/openwrt-$(BOARD)-openrb-medium-$(1).img
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-openrb-$(1).img
+endef
+
+ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
+define Image/Build/Initramfs
+       cp $(LINUX_DIR)/arch/powerpc/boot/cuImage.magicbox $(BIN_DIR)/openwrt-$(BOARD)-magicbox-initramfs.bin
+       cp $(LINUX_DIR)/arch/powerpc/boot/cuImage.openrb $(BIN_DIR)/openwrt-$(BOARD)-openrb-initramfs.bin

 endef
 endef

+endif

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