[olpc] make the kernel also output on ttyS0 and ask openfirmware to unfreeze the...

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

diff --git a/target/linux/etrax/image/Makefile b/target/linux/etrax/image/Makefile
index ab15130..43ab5bf 100644 (file)
--- a/target/linux/etrax/image/Makefile
+++ b/target/linux/etrax/image/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2009 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.


@@ -8,44 +8,32 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 

-FOXBOARD:=custom MCM 416 816 832
-FOXBOARD_4MB:=MCM 416 
-FOXBOARD_8MB:=custom 816 832
-

 define Image/BuildKernel
 define Image/BuildKernel

-       for f in $(FOXBOARD); do \
-               cp $(KDIR)/vmlinuz_$$$$f $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-zImage_$$$$f; \
-       done
+       cp $(KDIR)/vmlinuz $(BIN_DIR)/openwrt-$(BOARD)-zImage

 endef
 
 define Image/Prepare
 endef
 
 define Image/Prepare

-       for f in $(FOXBOARD); do \
-               cp $(LINUX_DIR)/arch/cris/boot/zImage_$$$$f $(KDIR)/vmlinuz_$$$$f; \
-       done
+       cp $(LINUX_DIR)/arch/cris/boot/zImage $(KDIR)/vmlinuz

        $(MAKE) -C e100boot compile
        $(MAKE) -C mkfimage compile
        $(INSTALL_BIN) ./boot_linux $(BIN_DIR)
 endef
 
 define Image/Build/generic
        $(MAKE) -C e100boot compile
        $(MAKE) -C mkfimage compile
        $(INSTALL_BIN) ./boot_linux $(BIN_DIR)
 endef
 
 define Image/Build/generic

-       for f in $(2); do \
-               mkfimage $(KDIR)/vmlinuz_$$$$f $(KDIR)/vmlinuz_$$$$f.tmp ; \
-               cat $(KDIR)/vmlinuz_$$$$f.tmp $(KDIR)/root.$(1) > $(KDIR)/fimage.$(1)_$$$$f.tmp; \
-               dd if=$(KDIR)/fimage.$(1)_$$$$f.tmp of=$(KDIR)/fimage.$(1)_$$$$f bs=$(3) conv=sync; \
-               cp $(KDIR)/fimage.$(1)_$$$$f $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-fimage_$$$$f; \
-       done    
+       mkfimage $(KDIR)/vmlinuz $(KDIR)/vmlinuz.tmp
+       cat $(KDIR)/vmlinuz.tmp $(KDIR)/root.$(1) > $(KDIR)/fimage.$(1).tmp
+       dd if=$(KDIR)/fimage.$(1).tmp of=$(KDIR)/fimage.$(1) bs=$(2) conv=sync
+       cp $(KDIR)/fimage.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1)-fimage

 endef
 
 define Image/Build/jffs2-64k
        $(call prepare_generic_jffs-64k,$(KDIR)/root.jff2-64k)
 endef
 
 define Image/Build/jffs2-64k
        $(call prepare_generic_jffs-64k,$(KDIR)/root.jff2-64k)

-       $(call Image/Build/generic,$(1),$(FOXBOARD_4MB),4194304)
-       $(call Image/Build/generic,$(1),$(FOXBOARD_8MB),8388608)        
+       $(call Image/Build/generic,$(1),4194304)

 endef
 
 define Image/Build/squashfs
        $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
 endef
 
 define Image/Build/squashfs
        $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)

-       $(call Image/Build/generic,$(1),$(FOXBOARD_4MB),4194304)
-       $(call Image/Build/generic,$(1),$(FOXBOARD_8MB),8388608)        
+       $(call Image/Build/generic,$(1),4194304)

 endef
 
 define Image/Build
 endef
 
 define Image/Build