domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oxnas: reorganize image build code and nuke profiles

Browse Source 
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2016-05-15 04:31:25 +02:00
parent 449aba4fe8
commit 70eb03469f
7 changed files with 36 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
target/linux/oxnas/Makefile
View File

@@ -21,8 +21,9 @@ include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += \ DEFAULT_PACKAGES += \
kmod-ata-core kmod-ata-oxnas-sata kmod-button-hotplug \ kmod-ata-core kmod-ata-oxnas-sata kmod-button-hotplug \
kmod-input-gpio-keys-polled kmod-leds-gpio kmod-usb2-oxnas \ kmod-input-gpio-keys-polled kmod-ledtrig-usbdev kmod-leds-gpio \
uboot-envtools uboot-oxnas-ox820 kmod-usb2-oxnas kmod-usb-storage uboot-envtools \
uboot-oxnas-ox820
KERNELNAME:=zImage dtbs KERNELNAME:=zImage dtbs

66
target/linux/oxnas/image/Makefile
View File

@@ -14,23 +14,28 @@ KD20_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
POGOPLUG_PRO_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096 POGOPLUG_PRO_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
POGOPLUG_V3_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096 POGOPLUG_V3_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
DEVICE_VARS += DEVICE_DTS KERNEL_SIZE PAGESIZE BLOCKSIZE SUBPAGESIZE DEVICE_VARS += DTS KERNEL_SIZE PAGESIZE BLOCKSIZE SUBPAGESIZE
DEVICE_VARS += KERNEL_IN_UBI UBOOTENV_IN_UBI UBIFS_OPTS DEVICE_VARS += KERNEL_IN_UBI UBOOTENV_IN_UBI UBIFS_OPTS
KERNEL_LOADADDR := 0x60008000 KERNEL_LOADADDR := 0x60008000
TARGET_DEVICES = akitio kd20 pogoplug-pro pogoplug-v3 stg212
define Build/ubootable
(dd if="$(KDIR)/u-boot.bin" bs=128k conv=sync; \
dd if="$@" bs=128k conv=sync ) >> $@.new
@mv "$@.new" "$@"
endef
define Device/Default define Device/Default
KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) KERNEL_DEPENDS = $$(wildcard $$(DTS_DIR)/ox820-$$(DTS).dts)
KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/ox820-$$(DTS).dtb
KERNEL_NAME := zImage KERNEL_NAME := zImage
KERNEL_INITRAMFS = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | ubootable KERNEL_INITRAMFS = kernel-bin | lzma | fit lzma $$(DTS_DIR)/ox820-$$(DTS).dtb | ubootable
KERNEL_INITRAMFS_PREFIX = $$(IMAGE_PREFIX)-u-boot-initramfs KERNEL_INITRAMFS_PREFIX = $$(IMAGE_PREFIX)-u-boot-initramfs
BLOCKSIZE := 128KiB BLOCKSIZE := 128KiB
PAGESIZE := 2048 PAGESIZE := 2048
SUBPAGESIZE := 512 SUBPAGESIZE := 512
FILESYSTEMS := squashfs ubifs FILESYSTEMS := squashfs ubifs
PROFILES := Default PROFILES = Default $$(DTS)
IMAGES := ubinized.bin sysupgrade.tar IMAGES := ubinized.bin sysupgrade.tar
IMAGE/ubinized.bin := append-ubi IMAGE/ubinized.bin := append-ubi
IMAGE/sysupgrade.tar := sysupgrade-nand IMAGE/sysupgrade.tar := sysupgrade-nand
@@ -39,52 +44,39 @@ define Device/Default
endef endef
define Device/akitio define Device/akitio
PROFILES := Default AKITIO DTS := akitio
DEVICE_DTS := ox820-akitio DEVICE_TITLE := Akitio MyCloud mini / Silverstone DC01
DEVICE_PACKAGES := kmod-i2c-gpio kmod-rtc-ds1307
endef endef
TARGET_DEVICES += akitio
define Device/kd20 define Device/kd20
PROFILES := Default KD20 DTS := kd20
DEVICE_DTS := ox820-kd20 DEVICE_TITLE := Shuttle KD20
DEVICE_PACKAGES := kmod-usb3 kmod-i2c-gpio kmod-rtc-pcf8563 kmod-gpio-beeper \
kmod-hwmon-core kmod-hwmon-gpiofan
endef endef
TARGET_DEVICES += kd20
define Device/pogoplug-pro define Device/pogoplug-pro
PROFILES := Default POGOPLUG_PRO DTS := pogoplug-pro
DEVICE_DTS := ox820-pogoplug-pro DEVICE_TITLE := Cloud Engines Pogoplug Pro (with mPCIe)
endef endef
TARGET_DEVICES += pogoplug-pro
define Device/pogoplug-v3 define Device/pogoplug-v3
PROFILES := Default POGOPLUG_V3 DTS := pogoplug-v3
DEVICE_DTS := ox820-pogoplug-v3 DEVICE_TITLE := Cloud Engines Pogoplug V3 (no mPCIe)
endef endef
TARGET_DEVICES += pogoplug-v3
define Device/stg212 define Device/stg212
PROFILES := Default STG212 DTS := stg212
DEVICE_DTS := ox820-stg212 DEVICE_TITLE := MitraStar STG-212
endef endef
TARGET_DEVICES += stg212
VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux
UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
define Build/ubootable
(dd if="$(KDIR)/u-boot.bin" bs=128k conv=sync; \
dd if="$@" bs=128k conv=sync ) >> $@.new
@mv "$@.new" "$@"
endef
define Image/BuildKernel
$(call Image/BuildKernel/Template/$(PROFILE))
endef
define Image/InstallKernel
$(call Image/InstallKernel/Template/$(PROFILE))
endef
define Image/Build
$(if $(Image/Build/$(1)), \
$(call Image/Build/$(1),$(1)), \
$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-$(1).img \
)
endef
$(eval $(call BuildImage)) $(eval $(call BuildImage))

8
target/linux/oxnas/profiles/00-default.mk
View File

@@ -7,11 +7,11 @@
define Profile/Default define Profile/Default
NAME:=Default Profile NAME:=Default Profile
PRIORITY:=1
PACKAGES:=\ PACKAGES:=\
kmod-usb-core kmod-usb3 kmod-ledtrig-usbdev \ kmod-i2c-gpio kmod-gpio-beeper kmod-hwmon-core \
kmod-usb-storage \ kmod-hwmon-gpiofan kmod-rtc-pcf8563 kmod-rtc-ds1307 \
kmod-i2c-gpio kmod-rtc-pcf8563 kmod-rtc-ds1307 \ kmod-usb3
kmod-gpio-beeper kmod-hwmon-core kmod-hwmon-gpiofan
endef endef
define Profile/Default/Description define Profile/Default/Description

17
target/linux/oxnas/profiles/akitio.mk
View File

@@ -1,17 +0,0 @@
# Copyright (C) 2016 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
define Profile/AKITIO
NAME:=Akitio MyCloud mini / Silverstone DC01
PACKAGES:= \
kmod-usb-storage kmod-i2c-gpio kmod-rtc-ds1307
endef
define Profile/AKITIO/Description
Profile for the Akitio MyCloud mini aka. Silverstone DC01
endef
$(eval $(call Profile,AKITIO))

26
target/linux/oxnas/profiles/cloudengines.mk
View File

@@ -1,26 +0,0 @@
# Copyright (C) 2016 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
define Profile/POGOPLUG_PRO
NAME:=Cloud Engines Pogoplug Pro
endef
define Profile/POGOPLUG_PRO/Description
Profile with built-in ox820 Pogoplug Pro device-tree
(board with miniPCIe slot)
endef
define Profile/POGOPLUG_V3
NAME:=Cloud Engines Pogoplug V3
endef
define Profile/POGOPLUG_V3/Description
Profile with built-in ox820 Pogoplug V3 device-tree
(board without miniPCIe slot)
endef
$(eval $(call Profile,POGOPLUG_PRO))
$(eval $(call Profile,POGOPLUG_V3))

15
target/linux/oxnas/profiles/mitrastar.mk
View File

@@ -1,15 +0,0 @@
# Copyright (C) 2016 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
define Profile/STG212
NAME:=MitraStar STG-212
endef
define Profile/STG212/Description
Profile with built-in ox820 STG-212 device-tree
endef
$(eval $(call Profile,STG212))

18
target/linux/oxnas/profiles/shuttle.mk
View File

@@ -1,18 +0,0 @@
# Copyright (C) 2016 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
define Profile/KD20
NAME:=Shuttle KD20
PACKAGES:= \
kmod-usb3 kmod-usb-storage kmod-i2c-gpio kmod-rtc-pcf8563 \
kmod-gpio-beeper kmod-hwmon-core kmod-hwmon-gpiofan
endef
define Profile/KD20/Description
Profile with built-in ox820 KD20 device-tree
endef
$(eval $(call Profile,KD20))