topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

- rename kernel configs; reduce the usage of BOXFAMILY variable

master
vanhofen 5 years ago
parent
66908b1a1d
commit
e7096f5bd9
13 changed files with 48 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 0
      configs/kernel-apollo.config
  2. 0
      configs/kernel-hd51.config
  3. 0
      configs/kernel-kronos.config
  4. 0
      configs/kernel-nevis.config
  5. 0
      configs/kernel-vuduo.config
  6. 0
      configs/kernel-vuduo4k.config
  7. 0
      configs/kernel-vusolo4k.config
  8. 0
      configs/kernel-vuultimo4k.config
  9. 0
      configs/kernel-vuzero4k.config
  10. 42
      make/environment-build.mk
  11. 43
      make/environment-linux.mk
  12. 10
      make/images.mk
  13. 4
      make/linux-kernel.mk

0
configs/kernel-3.10.93-apollo.config → configs/kernel-apollo.config
View File

0
configs/kernel-4.10.12-bcm7251s.config → configs/kernel-hd51.config
View File

0
configs/kernel-3.10.93-kronos.config → configs/kernel-kronos.config
View File

0
configs/kernel-2.6.34.13-nevis.config → configs/kernel-nevis.config
View File

0
configs/kernel-3.9.6-bcm7335.config → configs/kernel-vuduo.config
View File

0
configs/kernel-4.1.45-1.17-bcm7278.config → configs/kernel-vuduo4k.config
View File

0
configs/kernel-3.14.28-1.8-bcm7376.config → configs/kernel-vusolo4k.config
View File

0
configs/kernel-3.14.28-1.12-bcm7444s.config → configs/kernel-vuultimo4k.config
View File

0
configs/kernel-4.1.20-1.9-bcm72604.config → configs/kernel-vuzero4k.config
View File

42
make/environment-build.mk
View File

@ -20,33 +20,33 @@ SHELL := /bin/bash
# - Coolstream ----------------------------------------------------------------
# BOXTYPE coolstream
# / \
# BOXSERIES hd1 hd2
# / / \
# BOXFAMILY nevis apollo kronos
# / / | | \
# BOXMODEL nevis apollo shiner kronos kronos_v2
# BOXTYPE coolstream
# / \
# BOXSERIES hd1 hd2
# / / \
# BOXFAMILY nevis apollo kronos
# / / | | \
# BOXMODEL nevis apollo shiner kronos kronos_v2
# - Armbox --------------------------------------------------------------------
# BOXTYPE armbox ------ + ----- + -------- +
# / \ \ \ \
# BOXSERIES hd51 vusolo4k vuduo4k vuultimo4k vuzero4k
# | | | | |
# BOXFAMILY bcm7251s bcm7376 bcm7278 bcm7444s bcm72604
# | | | | | |
# BOXMODEL hd51 bre2ze4k vusolo4k vuduo4k vuultimo4k vuzero4k
# BOXTYPE armbox ------ + ----- + -------- +
# / \ \ \ \
# BOXSERIES hd51 vusolo4k vuduo4k vuultimo4k vuzero4k
# | | | | |
# BOXFAMILY bcm7251s bcm7376 bcm7278 bcm7444s bcm72604
# | | | | | |
# BOXMODEL hd51 bre2ze4k vusolo4k vuduo4k vuultimo4k vuzero4k
# - Mipsbox --------------------------------------------------------------------
# BOXTYPE mipsbox
# |
# BOXSERIES vuduo
# |
# BOXFAMILY bcm7335
# |
# BOXMODEL vuduo
# BOXTYPE mipsbox
# /
# BOXSERIES vuduo
# |
# BOXFAMILY bcm7335
# |
# BOXMODEL vuduo
# -----------------------------------------------------------------------------

43
make/environment-linux.mk
View File

@ -4,7 +4,7 @@
# -----------------------------------------------------------------------------
# cst-nevis
ifeq ($(BOXFAMILY), nevis)
ifeq ($(BOXMODEL), nevis)
KERNEL_VER = 2.6.34.13
KERNEL_TMP = linux-$(KERNEL_VER)
KERNEL_SOURCE = git
@ -14,21 +14,23 @@ ifeq ($(BOXFAMILY), nevis)
KERNEL_DTB = $(EMPTY)
# cst-apollo/cst-kronos
else ifeq ($(BOXFAMILY), $(filter $(BOXFAMILY), apollo kronos))
else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner kronos kronos_v2))
KERNEL_VER = 3.10.93
KERNEL_TMP = linux-$(KERNEL_VER)
KERNEL_SOURCE = git
KERNEL_URL = $(EMPTY)
KERNEL_BRANCH = ni/linux-3.10.108
ifeq ($(BOXFAMILY), apollo)
KERNEL_DTB = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/kernel-dtb/hd849x.dtb
else ifeq ($(BOXFAMILY), kronos)
KERNEL_DTB = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/kernel-dtb/en75x1.dtb
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner))
KERNEL_DTB = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/kernel-dtb/hd849x.dtb
KERNEL_CONFIG = $(CONFIGS)/kernel-apollo.config
else
KERNEL_DTB = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/kernel-dtb/en75x1.dtb
KERNEL_CONFIG = $(CONFIGS)/kernel-kronos.config
endif
# arm-hd51
else ifeq ($(BOXFAMILY), bcm7251s)
else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k))
KERNEL_VER = 4.10.12
KERNEL_TMP = linux-$(KERNEL_VER)
KERNEL_SOURCE = git
@ -36,9 +38,10 @@ else ifeq ($(BOXFAMILY), bcm7251s)
KERNEL_BRANCH = ni/linux-$(KERNEL_VER)
KERNEL_DTB = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/dts/bcm7445-bcm97445svmb.dtb
KERNEL_CONFIG = $(CONFIGS)/kernel-hd51.config
# arm-vusolo4k
else ifeq ($(BOXFAMILY), bcm7376)
else ifeq ($(BOXMODEL), vusolo4k)
KERNEL_VER = 3.14.28-1.8
KERNEL_TMP = linux
KERNEL_SOURCE = stblinux-3.14-1.8.tar.bz2
@ -57,7 +60,7 @@ else ifeq ($(BOXFAMILY), bcm7376)
BOOT_PARTITION = 1
# arm-vuduo4k
else ifeq ($(BOXFAMILY), bcm7278)
else ifeq ($(BOXMODEL), vuduo4k)
KERNEL_VER = 4.1.45-1.17
KERNEL_TMP = linux
KERNEL_SOURCE = stblinux-4.1-1.17.tar.bz2
@ -76,7 +79,7 @@ else ifeq ($(BOXFAMILY), bcm7278)
BOOT_PARTITION = 6
# arm-vuultimo4k
else ifeq ($(BOXFAMILY), bcm7444s)
else ifeq ($(BOXMODEL), vuultimo4k)
KERNEL_VER = 3.14.28-1.12
KERNEL_TMP = linux
KERNEL_SOURCE = stblinux-3.14-1.12.tar.bz2
@ -95,7 +98,7 @@ else ifeq ($(BOXFAMILY), bcm7444s)
BOOT_PARTITION = 1
# arm-vuzero4k
else ifeq ($(BOXFAMILY), bcm72604)
else ifeq ($(BOXMODEL), vuzero4k)
KERNEL_VER = 4.1.20-1.9
KERNEL_TMP = linux
KERNEL_SOURCE = stblinux-4.1-1.9.tar.bz2
@ -114,7 +117,7 @@ else ifeq ($(BOXFAMILY), bcm72604)
BOOT_PARTITION = 4
# mips-vuduo
else ifeq ($(BOXFAMILY), bcm7335)
else ifeq ($(BOXMODEL), vuduo)
KERNEL_VER = 3.9.6
KERNEL_TMP = linux
KERNEL_SOURCE = stblinux-$(KERNEL_VER).tar.bz2
@ -130,17 +133,17 @@ endif
KERNEL_OBJ = linux-$(KERNEL_VER)-obj
KERNEL_MODULES = linux-$(KERNEL_VER)-modules
KERNEL_CONFIG ?= $(CONFIGS)/kernel-$(BOXMODEL).config
KERNEL_NAME = NI $(shell echo $(BOXFAMILY) | sed 's/.*/\u&/') Kernel
# -----------------------------------------------------------------------------
KERNEL_MODULES_DIR = $(BUILD_TMP)/$(KERNEL_MODULES)/lib/modules/$(KERNEL_VER)
KERNEL_CONFIG = $(CONFIGS)/kernel-$(KERNEL_VER)-$(BOXFAMILY).config
KERNEL_MODULES_DIR = $(BUILD_TMP)/$(KERNEL_MODULES)/lib/modules/$(KERNEL_VER)
KERNEL_UIMAGE = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/Image
KERNEL_ZIMAGE = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/zImage
KERNEL_ZIMAGE_DTB = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/zImage_dtb
KERNEL_VMLINUX = $(BUILD_TMP)/$(KERNEL_OBJ)/vmlinux
KERNEL_UIMAGE = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/Image
KERNEL_ZIMAGE = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/zImage
KERNEL_ZIMAGE_DTB = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/zImage_dtb
KERNEL_VMLINUX = $(BUILD_TMP)/$(KERNEL_OBJ)/vmlinux
# -----------------------------------------------------------------------------
@ -156,7 +159,7 @@ KERNEL_MAKEVARS += \
KVER=$(KERNEL_VER) \
KSRC=$(BUILD_TMP)/$(KERNEL_TMP)
ifeq ($(BOXFAMILY), $(filter $(BOXFAMILY), bcm7335)) # mips-vuduo
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo))
KERNEL_IMAGE = vmlinux
else
KERNEL_IMAGE = zImage
@ -165,6 +168,6 @@ endif
KERNEL_MAKEOPTS = $(KERNEL_IMAGE) modules
# build also the kernel-dtb for arm-hd51
ifeq ($(BOXFAMILY), $(filter $(BOXFAMILY), bcm7251s))
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k))
KERNEL_MAKEOPTS += $(notdir $(KERNEL_DTB))
endif

10
make/images.mk
View File

@ -50,19 +50,13 @@ devtable-remove:
# -----------------------------------------------------------------------------
flash-image:
ifeq ($(BOXMODEL), nevis)
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), nevis kronos kronos_v2))
make flash-image-coolstream ERASE_SIZE=0x20000
endif
ifeq ($(BOXFAMILY), apollo)
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner))
make flash-image-coolstream ERASE_SIZE=0x40000 IMAGE_SUFFIX=$(BOXTYPE_SC)-apollo
make flash-image-coolstream ERASE_SIZE=0x20000 IMAGE_SUFFIX=$(BOXTYPE_SC)-shiner
endif
ifeq ($(BOXMODEL), kronos)
make flash-image-coolstream ERASE_SIZE=0x20000
endif
ifeq ($(BOXMODEL), kronos_v2)
make flash-image-coolstream ERASE_SIZE=0x20000
endif
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k))
make flash-image-hd51
make flash-image-hd51-multi

4
make/linux-kernel.mk
View File

@ -149,7 +149,7 @@ kernel.do_prepare:
$(MKDIR)/$(KERNEL_OBJ)
$(MKDIR)/$(KERNEL_MODULES)
$(INSTALL_DATA) $(KERNEL_CONFIG) $(BUILD_TMP)/$(KERNEL_OBJ)/.config
ifeq ($(BOXFAMILY), bcm7251s)
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k))
$(INSTALL_DATA) $(PATCHES)/initramfs-subdirboot.cpio.gz $(BUILD_TMP)/$(KERNEL_OBJ)
endif
$(TOUCH)
@ -195,7 +195,7 @@ kernel-coolstream-hd1: kernel.do_compile | $(IMAGE_DIR)
kernel-coolstream-hd2: kernel.do_compile | $(IMAGE_DIR)
mkimage -A $(BOXARCH) -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz
ifeq ($(BOXFAMILY), apollo)
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner))
ifeq ($(BOXMODEL), apollo)
# create also shiner-kernel when building apollo
cp -a $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-shiner-vmlinux.ub.gz

Write Preview
Loading…
Cancel
Save