Changeset 37079


Ignore:
Timestamp:
2013-06-29T00:56:34+02:00 (5 years ago)
Author:
florian
Message:

targets: fix remaining targets for initramfs builds

Fix some bugs that slipped through while making initramfs non exclusive.

Signed-off-by: Florian Fainelli <florian@…>

Location:
trunk/target/linux
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/adm5120/image/rb1xx.mk

    r31513 r37079  
    1212 
    1313define Image/BuildKernel/RouterBoard 
    14         $(CP) $(KDIR)/vmlinux.elf $(call imgname,kernel,rb1xx) 
    15         $(STAGING_DIR_HOST)/bin/patch-cmdline $(call imgname,kernel,rb1xx) \ 
     14        $(CP) $(KDIR)/vmlinux-initramfs.elf $(call imgname,kernel-initramfs,rb1xx) 
     15        $(STAGING_DIR_HOST)/bin/patch-cmdline $(call imgname,kernel-initramfs,rb1xx) \ 
    1616                '$(strip $(call Image/cmdline/yaffs2))' 
    1717endef 
  • trunk/target/linux/malta/image/Makefile

    r35117 r37079  
    2828define Image/BuildKernel 
    2929        cp $(KDIR)/vmlinux.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.elf 
     30ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) 
     31        cp $(KDIR)/vmlinux-initramfs.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux-initramfs.elf 
     32endif 
    3033        $(call CompressLzma,$(KDIR)/vmlinux,$(KDIR)/vmlinux.bin.lzma) 
    3134        $(call MkuImage,lzma,,$(KDIR)/vmlinux.bin.lzma,$(BIN_DIR)/$(IMG_PREFIX)-uImage-lzma) 
  • trunk/target/linux/orion/Makefile

    r36832 r37079  
    1818include $(INCLUDE_DIR)/target.mk 
    1919 
    20 KERNELNAME:="uImage" 
     20KERNELNAME:="zImage uImage" 
    2121 
    2222DEFAULT_PACKAGES += kmod-ath9k kmod-crypto-mv-cesa wpad-mini kmod-i2c-core kmod-i2c-mv64xxx kmod-rtc-isl1208 
  • trunk/target/linux/orion/image/generic.mk

    r36852 r37079  
    3737$(call Image/BuildKernel/ARM/zImage,wn802t,"\x0c\x1c\xa0\xe3\xea\x10\x81\xe3") 
    3838$(call Image/BuildKernel/ARM/uImage,wn802t) 
     39ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) 
     40$(call Image/BuildKernel/ARM/zImage,wn802t,"\x0c\x1c\xa0\xe3\xea\x10\x81\xe3",-initramfs) 
     41$(call Image/BuildKernel/ARM/uImage,wn802t,-initramfs) 
     42endif 
    3943 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)  # nothing more to do for a ramdisk build 
    4044$(call Image/BuildKernel/JFFS2uImage,wn802t,$(ERASE_SIZE_64K),uImage) 
     
    4549$(call Image/BuildKernel/ARM/zImage,wnr854t,"\x07\x1c\xa0\xe3\x09\x10\x81\xe3") 
    4650$(call Image/BuildKernel/ARM/uImage,wnr854t) 
     51ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) 
     52$(call Image/BuildKernel/ARM/zImage,wnr854t,"\x07\x1c\xa0\xe3\x09\x10\x81\xe3",-initramfs) 
     53$(call Image/BuildKernel/ARM/uImage,wnr854t,-initramfs) 
     54endif 
    4755 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)  # nothing more to do for a ramdisk build 
    4856$(call Image/BuildKernel/JFFS2uImage,wnr854t,$(ERASE_SIZE_128K),uImage) 
     
    5361$(call Image/BuildKernel/ARM/zImage,wrt350nv2,"\x06\x1c\xa0\xe3\x61\x10\x81\xe3") 
    5462$(call Image/BuildKernel/ARM/uImage,wrt350nv2) 
     63ifeq ($($CONFIG_TARGET_ROOTFS_INITRAMFS),y) 
     64$(call Image/BuildKernel/ARM/zImage,wrt350nv2,"\x06\x1c\xa0\xe3\x61\x10\x81\xe3",-initramfs) 
     65$(call Image/BuildKernel/ARM/uImage,wrt350nv2-initramfs) 
     66endif 
    5567 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)  # nothing more to do for a ramdisk build 
    5668$(call Image/Default/FileSizeCheck,$(KDIR)/wrt350nv2-uImage,$(shell expr $(KERNEL_MTD_SIZE) \* 1024)) 
     
    6274 # parameters: 1 = machine name, 2 = machine id as string in quotes 
    6375        # $(BOARD) kernel zImage for $(1) 
    64         echo -en $(2) > '$(KDIR)/$(1)-zImage' 
    65         cat '$(LINUX_DIR)/arch/arm/boot/zImage' >> '$(KDIR)/$(1)-zImage' 
     76        echo -en $(2) > '$(KDIR)/$(1)-zImage$(3)' 
     77        cat '$(KDIR)/zImage$(3)' >> '$(KDIR)/$(1)-zImage$(3)' 
    6678endef 
    6779 
     
    7385        -C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \ 
    7486        -d '$(KDIR)/$(1)-zImage' '$(KDIR)/$(1)-uImage' 
    75  ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) # only copy uImage for ramdisk build 
    76         cp '$(KDIR)/$(1)-uImage' '$(BIN_DIR)/openwrt-$(1)-uImage' 
     87 ifeq ($(2),-initramfs) # only copy uImage for ramdisk build 
     88        cp '$(KDIR)/$(1)-uImage-initramfs' '$(BIN_DIR)/openwrt-$(1)-uImage-initramfs' 
    7789 endif 
    7890endef 
  • trunk/target/linux/orion/image/harddisk.mk

    r37059 r37079  
    55# See /LICENSE for more information. 
    66# 
    7  
    8 define Image/Prepare 
    9         cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage 
    10 endef 
    117 
    128define Image/BuildKernel 
Note: See TracChangeset for help on using the changeset viewer.