apm821xx: shuffle helper scripts to the front
In a patch for the ath79, Mathias Kresin mentioned that helper scripts should be in front of the device targets. Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
This commit is contained in:
Christian Lamparter
John Crispin
parent
d82d84694e
commit
a2266a6d42
|
|
@ -7,37 +7,49 @@ include $(INCLUDE_DIR)/image.mk
|
|||
|
||||
DEVICE_VARS += IMAGE_SIZE DTB_SIZE
|
||||
|
||||
define Device/Default
|
||||
PROFILES := Default
|
||||
KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts)
|
||||
DEVICE_DTS :=
|
||||
KERNEL_ENTRY := 0x00000000
|
||||
KERNEL_LOADADDR := 0x00000000
|
||||
DEVICE_DTS_DIR := ../dts
|
||||
SUPPORTED_DEVICES = $(subst _,$(comma),$(1))
|
||||
define Build/boot-img
|
||||
$(RM) -rf $@.bootdir
|
||||
mkdir -p $@.bootdir/boot
|
||||
|
||||
$(CP) $@.scr $@.bootdir/boot/boot.scr
|
||||
$(CP) $(IMAGE_KERNEL).dtb $@.bootdir/boot/$(DEVICE_DTB)
|
||||
$(CP) $(IMAGE_KERNEL) $@.bootdir/boot/uImage
|
||||
|
||||
genext2fs --block-size $(BLOCKSIZE:%k=%Ki) --size-in-blocks $$((1024 * $(BOOT_SIZE))) --root $@.bootdir $@.boot
|
||||
|
||||
# convert it to revision 1 - needed for u-boot ext2load
|
||||
$(STAGING_DIR_HOST)/bin/tune2fs -O filetype $@.boot
|
||||
$(STAGING_DIR_HOST)/bin/e2fsck -pDf $@.boot > /dev/null
|
||||
endef
|
||||
|
||||
define Build/boot-script
|
||||
$(STAGING_DIR_HOST)/bin/mkimage -A powerpc -T script -C none -n "$(PROFILE) Boot Script" \
|
||||
-d mbl_boot.scr \
|
||||
$@.scr
|
||||
endef
|
||||
|
||||
define Build/copy-file
|
||||
cat "$(1)" > "$@"
|
||||
endef
|
||||
|
||||
define Build/create-uImage-dtb
|
||||
# flat_dt target expect FIT image - which WNDR4700's uboot doesn't support
|
||||
-$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) \
|
||||
-O linux -T kernel -C none \
|
||||
-n '$(call toupper,$(LINUX_KARCH)) $(VERSION_DIST) Linux-$(LINUX_VERSION)' \
|
||||
-d "$@.dtb" "$@.dtb.uimage"
|
||||
endef
|
||||
|
||||
define Build/dtb
|
||||
$(call Image/BuildDTB,../dts/$(DEVICE_DTS).dts,$@.dtb,,--space $(DTB_SIZE))
|
||||
endef
|
||||
|
||||
define Build/prepend-dtb
|
||||
cat "$@.dtb.uimage" "$@" > "$@.new"
|
||||
mv "$@.new" "$@"
|
||||
endef
|
||||
|
||||
define Build/export-dtb
|
||||
cp $(IMAGE_KERNEL).dtb $@
|
||||
endef
|
||||
|
||||
ifeq ($(SUBTARGET),nand)
|
||||
|
||||
define Image/cpiogz
|
||||
( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9n >$(KDIR_TMP)/$(IMG_PREFIX)-rootfs.cpio.gz )
|
||||
endef
|
||||
|
||||
define Build/copy-file
|
||||
cat "$(1)" > "$@"
|
||||
define Build/hdd-img
|
||||
./mbl_gen_hdd_img.sh $@ $@.boot $(IMAGE_ROOTFS) $(BOOT_SIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE)
|
||||
endef
|
||||
|
||||
define Build/MerakiAdd-dtb
|
||||
|
|
@ -72,6 +84,56 @@ define Build/MerakiNAND
|
|||
@cp $@.new $@
|
||||
endef
|
||||
|
||||
define Build/MuImage-initramfs
|
||||
rm -rf $@.fakerd $@.new
|
||||
|
||||
dd if=/dev/zero of=$@.fakerd bs=32 count=1 conv=sync
|
||||
|
||||
# Netgear used an old uboot that doesn't have FIT support.
|
||||
# So we are stuck with either a full ext2/4 fs in a initrd.
|
||||
# ... or we try to make the "multi" image approach to work
|
||||
# for us.
|
||||
#
|
||||
# Sadly, the "multi" image has to consists of three
|
||||
# "fixed" parts in the following "fixed" order:
|
||||
# 1. The kernel which is in $@
|
||||
# 2. The (fake) initrd which is in $@.fakerd
|
||||
# 3. The device tree binary which is in $@.dtb
|
||||
#
|
||||
# Now, given that we use the function for the kernel which
|
||||
# already has a initramfs image inside, we still have to
|
||||
# add a "fake" initrd (which a mkimage header) in the second
|
||||
# part of the legacy multi image. Since we need to put the
|
||||
# device tree stuff into part 3.
|
||||
|
||||
-$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) -O linux -T multi \
|
||||
-C $(1) -a $(KERNEL_LOADADDR) -e $(KERNEL_ENTRY) \
|
||||
-n '$(BOARD_NAME) initramfs' -d $@:$@.fakerd:$@.dtb $@.new
|
||||
mv $@.new $@
|
||||
rm -rf $@.fakerd
|
||||
endef
|
||||
|
||||
define Build/prepend-dtb
|
||||
cat "$@.dtb.uimage" "$@" > "$@.new"
|
||||
mv "$@.new" "$@"
|
||||
endef
|
||||
|
||||
define Image/cpiogz
|
||||
( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9n >$(KDIR_TMP)/$(IMG_PREFIX)-rootfs.cpio.gz )
|
||||
endef
|
||||
|
||||
define Device/Default
|
||||
PROFILES := Default
|
||||
KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts)
|
||||
DEVICE_DTS :=
|
||||
KERNEL_ENTRY := 0x00000000
|
||||
KERNEL_LOADADDR := 0x00000000
|
||||
DEVICE_DTS_DIR := ../dts
|
||||
SUPPORTED_DEVICES = $(subst _,$(comma),$(1))
|
||||
endef
|
||||
|
||||
ifeq ($(SUBTARGET),nand)
|
||||
|
||||
define Device/meraki_mr24
|
||||
DEVICE_TITLE := Cisco Meraki MR24
|
||||
DEVICE_PACKAGES := kmod-spi-gpio -swconfig
|
||||
|
|
@ -115,43 +177,6 @@ define Device/meraki_mx60
|
|||
endef
|
||||
TARGET_DEVICES += meraki_mx60
|
||||
|
||||
define Build/create-uImage-dtb
|
||||
# flat_dt target expect FIT image - which WNDR4700's uboot doesn't support
|
||||
-$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) \
|
||||
-O linux -T kernel -C none \
|
||||
-n '$(call toupper,$(LINUX_KARCH)) $(VERSION_DIST) Linux-$(LINUX_VERSION)' \
|
||||
-d "$@.dtb" "$@.dtb.uimage"
|
||||
endef
|
||||
|
||||
define Build/MuImage-initramfs
|
||||
rm -rf $@.fakerd $@.new
|
||||
|
||||
dd if=/dev/zero of=$@.fakerd bs=32 count=1 conv=sync
|
||||
|
||||
# Netgear used an old uboot that doesn't have FIT support.
|
||||
# So we are stuck with either a full ext2/4 fs in a initrd.
|
||||
# ... or we try to make the "multi" image approach to work
|
||||
# for us.
|
||||
#
|
||||
# Sadly, the "multi" image has to consists of three
|
||||
# "fixed" parts in the following "fixed" order:
|
||||
# 1. The kernel which is in $@
|
||||
# 2. The (fake) initrd which is in $@.fakerd
|
||||
# 3. The device tree binary which is in $@.dtb
|
||||
#
|
||||
# Now, given that we use the function for the kernel which
|
||||
# already has a initramfs image inside, we still have to
|
||||
# add a "fake" initrd (which a mkimage header) in the second
|
||||
# part of the legacy multi image. Since we need to put the
|
||||
# device tree stuff into part 3.
|
||||
|
||||
-$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) -O linux -T multi \
|
||||
-C $(1) -a $(KERNEL_LOADADDR) -e $(KERNEL_ENTRY) \
|
||||
-n '$(BOARD_NAME) initramfs' -d $@:$@.fakerd:$@.dtb $@.new
|
||||
mv $@.new $@
|
||||
rm -rf $@.fakerd
|
||||
endef
|
||||
|
||||
define Device/netgear_wndap6x0
|
||||
DEVICE_PACKAGES := kmod-eeprom-at24
|
||||
SUBPAGESIZE := 256
|
||||
|
|
@ -217,32 +242,6 @@ endif
|
|||
|
||||
ifeq ($(SUBTARGET),sata)
|
||||
|
||||
### Image scripts for the WD My Book Live Series ###
|
||||
define Build/boot-script
|
||||
$(STAGING_DIR_HOST)/bin/mkimage -A powerpc -T script -C none -n "$(PROFILE) Boot Script" \
|
||||
-d mbl_boot.scr \
|
||||
$@.scr
|
||||
endef
|
||||
|
||||
define Build/boot-img
|
||||
$(RM) -rf $@.bootdir
|
||||
mkdir -p $@.bootdir/boot
|
||||
|
||||
$(CP) $@.scr $@.bootdir/boot/boot.scr
|
||||
$(CP) $(IMAGE_KERNEL).dtb $@.bootdir/boot/$(DEVICE_DTB)
|
||||
$(CP) $(IMAGE_KERNEL) $@.bootdir/boot/uImage
|
||||
|
||||
genext2fs --block-size $(BLOCKSIZE:%k=%Ki) --size-in-blocks $$((1024 * $(BOOT_SIZE))) --root $@.bootdir $@.boot
|
||||
|
||||
# convert it to revision 1 - needed for u-boot ext2load
|
||||
$(STAGING_DIR_HOST)/bin/tune2fs -O filetype $@.boot
|
||||
$(STAGING_DIR_HOST)/bin/e2fsck -pDf $@.boot > /dev/null
|
||||
endef
|
||||
|
||||
define Build/hdd-img
|
||||
./mbl_gen_hdd_img.sh $@ $@.boot $(IMAGE_ROOTFS) $(BOOT_SIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE)
|
||||
endef
|
||||
|
||||
define Device/wd_mybooklive
|
||||
DEVICE_TITLE := Western Digital My Book Live Series (Single + Duo)
|
||||
DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-basic
|
||||
|
|
|
|||
Loading…
Reference in New Issue