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

- kernel-*.mk: use BOXARCH variable

master
vanhofen 6 years ago
parent
2667f98c0f
commit
5161bebc72
5 changed files with 28 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 0
      archive-configs/kernel-2.6.34-nevis.config
  2. 2
      make/crosstool.mk
  3. 3
      make/environment-build.mk
  4. 18
      make/kernel-armbox.mk
  5. 30
      make/kernel-coolstream.mk

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

2
make/crosstool.mk
View File

@ -7,7 +7,7 @@ crosstool: crosstool-$(BOXARCH)-$(BOXSERIES)
crosstools: crosstools:
for boxseries in hd1 hd2 hd51; do \ for boxseries in hd1 hd2 hd51; do \
make BOXSERIES=$${boxseries} crosstool-arm-$${boxseries} || exit; \ make BOXSERIES=$${boxseries} crosstool-$(BOXARCH)-$${boxseries} || exit; \
done; done;
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

3
make/environment-build.mk
View File

@ -173,6 +173,7 @@ KERNEL_NAME = NI $(shell echo $(BOXMODEL) | sed 's/.*/\u&/') Kernel
ifeq ($(BOXSERIES), hd1) ifeq ($(BOXSERIES), hd1)
KERNEL_VERSION = 2.6.34.13 KERNEL_VERSION = 2.6.34.13
KERNEL_VERSION_MAJOR = 2.6.34
KERNEL_VERSION_FULL = $(KERNEL_VERSION)-$(BOXMODEL) KERNEL_VERSION_FULL = $(KERNEL_VERSION)-$(BOXMODEL)
KERNEL_BRANCH = ni/2.6.34.x KERNEL_BRANCH = ni/2.6.34.x
KERNEL_DTB = KERNEL_DTB =
@ -188,6 +189,7 @@ endif
ifeq ($(BOXSERIES), hd2) ifeq ($(BOXSERIES), hd2)
KERNEL_VERSION = 3.10.93 KERNEL_VERSION = 3.10.93
KERNEL_VERSION_MAJOR = 3.10
KERNEL_VERSION_FULL = $(KERNEL_VERSION) KERNEL_VERSION_FULL = $(KERNEL_VERSION)
KERNEL_BRANCH = ni/3.10.x KERNEL_BRANCH = ni/3.10.x
ifeq ($(BOXFAMILY), apollo) ifeq ($(BOXFAMILY), apollo)
@ -213,6 +215,7 @@ ifeq ($(BOXSERIES), hd2)
endif endif
ifeq ($(BOXSERIES), hd51) ifeq ($(BOXSERIES), hd51)
KERNEL_VERSION_MAJOR = 4.10
KERNEL_VERSION = 4.10.12 KERNEL_VERSION = 4.10.12
KERNEL_VERSION_FULL = $(KERNEL_VERSION) KERNEL_VERSION_FULL = $(KERNEL_VERSION)
KERNEL_BRANCH = ni/4.10.x KERNEL_BRANCH = ni/4.10.x

18
make/kernel-armbox.mk
View File

@ -3,9 +3,9 @@
# #
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
DTB = $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/dts/$(KERNEL_DTB).dtb DTB = $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/$(BOXARCH)/boot/dts/$(KERNEL_DTB).dtb
ZIMAGE = $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/zImage ZIMAGE = $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/$(BOXARCH)/boot/zImage
ZIMAGE_DTB = $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/zImage_DTB ZIMAGE_DTB = $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/$(BOXARCH)/boot/zImage_DTB
MODULES_DIR = $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules/lib/modules/$(KERNEL_VERSION_FULL) MODULES_DIR = $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules/lib/modules/$(KERNEL_VERSION_FULL)
TARGET_MODULES_DIR = $(TARGET_LIB_DIR)/modules/$(KERNEL_VERSION_FULL) TARGET_MODULES_DIR = $(TARGET_LIB_DIR)/modules/$(KERNEL_VERSION_FULL)
@ -19,14 +19,14 @@ $(D)/kernel-armbox: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR)
mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION) mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION)
$(CHDIR)/linux-$(KERNEL_VERSION); \ $(CHDIR)/linux-$(KERNEL_VERSION); \
touch .scmversion; \ touch .scmversion; \
cp $(CONFIGS)/kernel-4.10-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config; \ cp $(CONFIGS)/kernel-$(KERNEL_VERSION_MAJOR)-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config; \
$(MKDIR)/linux-$(KERNEL_VERSION)-modules; \ $(MKDIR)/linux-$(KERNEL_VERSION)-modules; \
$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig; \ $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig; \
$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules $(DTB_VER); \ $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules $(DTB_VER); \
$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage; \ $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage; \
cat $(ZIMAGE) $(DTB) > $(ZIMAGE_DTB); \ cat $(ZIMAGE) $(DTB) > $(ZIMAGE_DTB); \
$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules; \ $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules; \
$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install
$(TOUCH) $(TOUCH)
kernel-armbox-modules: $(D)/kernel-armbox kernel-armbox-modules: $(D)/kernel-armbox

30
make/kernel-coolstream.mk
View File

@ -4,8 +4,8 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
DTB = $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(DRIVERS_DIR)/device-tree-overlay/$(KERNEL_DTB).dtb DTB = $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(DRIVERS_DIR)/device-tree-overlay/$(KERNEL_DTB).dtb
IMAGE = $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/Image IMAGE = $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/$(BOXARCH)/boot/Image
ZIMAGE = $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/zImage ZIMAGE = $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/$(BOXARCH)/boot/zImage
MODULES_DIR = $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules/lib/modules/$(KERNEL_VERSION_FULL) MODULES_DIR = $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules/lib/modules/$(KERNEL_VERSION_FULL)
TARGET_MODULES_DIR = $(TARGET_LIB_DIR)/modules/$(KERNEL_VERSION_FULL) TARGET_MODULES_DIR = $(TARGET_LIB_DIR)/modules/$(KERNEL_VERSION_FULL)
@ -52,15 +52,15 @@ $(D)/kernel-coolstream-hd2: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) $(SOURCE_DIR)/$(NI_
mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION) mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION)
$(CHDIR)/linux-$(KERNEL_VERSION); \ $(CHDIR)/linux-$(KERNEL_VERSION); \
touch .scmversion; \ touch .scmversion; \
cp $(CONFIGS)/kernel-3.10-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config; \ cp $(CONFIGS)/kernel-$(KERNEL_VERSION_MAJOR)-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config; \
sed -i -e 's/SUBLEVEL = 108/SUBLEVEL = 93/g' Makefile; \ sed -i -e 's/SUBLEVEL = 108/SUBLEVEL = 93/g' Makefile; \
$(MKDIR)/linux-$(KERNEL_VERSION)-modules; \ $(MKDIR)/linux-$(KERNEL_VERSION)-modules; \
$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig; \ $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig; \
$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage; \ $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage; \
$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules; \ $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules; \
$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install; \ $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install; \
cat $(ZIMAGE) $(DTB) > zImage_DTB; \ cat $(ZIMAGE) $(DTB) > zImage_DTB; \
mkimage -A ARM -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "$(KERNEL_NAME)" -d zImage_DTB $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz mkimage -A $(BOXARCH) -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "$(KERNEL_NAME)" -d zImage_DTB $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz
ifeq ($(BOXFAMILY), apollo) ifeq ($(BOXFAMILY), apollo)
ifeq ($(BOXMODEL), apollo) ifeq ($(BOXMODEL), apollo)
cp -a $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-shiner-vmlinux.ub.gz cp -a $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-shiner-vmlinux.ub.gz
@ -82,15 +82,15 @@ $(D)/kernel-coolstream-hd1: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR)
mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION) mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION)
$(CHDIR)/linux-$(KERNEL_VERSION); \ $(CHDIR)/linux-$(KERNEL_VERSION); \
touch .scmversion; \ touch .scmversion; \
cp $(CONFIGS)/kernel-$(KERNEL_VERSION).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config; \ cp $(CONFIGS)/kernel-$(KERNEL_VERSION_MAJOR)-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config; \
sed -i -e 's/EXTRAVERSION = .15/EXTRAVERSION = .13/g' Makefile; \ sed -i -e 's/EXTRAVERSION = .15/EXTRAVERSION = .13/g' Makefile; \
$(MKDIR)/linux-$(KERNEL_VERSION)-modules; \ $(MKDIR)/linux-$(KERNEL_VERSION)-modules; \
$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig; \ $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig; \
$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage; \ $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage; \
$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules; \ $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules; \
$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install; \ $(MAKE) ARCH=$(BOXARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install; \
mkimage -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(IMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-uImage.img; \ mkimage -A $(BOXARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(IMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-uImage.img; \
mkimage -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img mkimage -A $(BOXARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img
$(TOUCH) $(TOUCH)
kernel-coolstream-install-hd1: $(D)/kernel-coolstream-hd1 kernel-coolstream-install-hd1: $(D)/kernel-coolstream-hd1

Write Preview
Loading…
Cancel
Save