Linux is made common

Reviewed-by: Joakim Bech <[email protected]> Reviewed-by: Jerome Forissier <[email protected]> Tested-by: Jerome Forissier <[email protected]> (HiKey) Tested-by: SY Chiu <[email protected]> (MT8173 EVB) Tested-by: Pascal Brand <[email protected]> (QEMU) Tested-by: Pascal Brand <[email protected]> (FVP) Signed-off-by: Pascal Brand <[email protected]>
pm215 · Sep 16, 2015 · e3d8598 · e3d8598
1 parent 440ef9c
commit e3d8598
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 50 deletions.
diff --git a/common.mk b/common.mk
@@ -56,6 +56,30 @@ busybox-clean-common:
 busybox-cleaner-common:
 	rm -rf $(GEN_ROOTFS_PATH)/build
 	rm -rf $(GEN_ROOTFS_PATH)/filelist-final.txt
+
+################################################################################
+# Linux
+################################################################################
+LINUX_COMMON_FLAGS ?= LOCALVERSION= CROSS_COMPILE=$(CROSS_COMPILE_NS_KERNEL)
+
+linux-common: linux-defconfig
+	$(MAKE) -C $(LINUX_PATH) $(LINUX_COMMON_FLAGS)
+
+linux-defconfig-clean-common:
+	@if [ -f "$(LINUX_PATH)/.config" ]; then \
+		rm -f $(LINUX_PATH)/.config; \
+	fi
+
+LINUX_CLEAN_COMMON_FLAGS ?= $(LINUX_COMMON_FLAGS)
+
+linux-clean-common: linux-defconfig-clean
+	$(MAKE) -C $(LINUX_PATH) $(LINUX_CLEAN_COMMON_FLAGS) clean
+
+LINUX_CLEANER_COMMON_FLAGS ?= $(LINUX_COMMON_FLAGS)
+
+linux-cleaner-common: linux-defconfig-clean
+	$(MAKE) -C $(LINUX_PATH) $(LINUX_CLEAN_COMMON_FLAGS) distclean
+
 
 ################################################################################
 # EDK2 / Tianocore

diff --git a/fvp.mk b/fvp.mk
@@ -94,12 +94,19 @@ $(LINUX_PATH)/.config:
 
 linux-defconfig: $(LINUX_PATH)/.config
 
-linux: linux-defconfig
-	make -C $(LINUX_PATH) \
-		CROSS_COMPILE="$(CCACHE)$(AARCH64_NONE_CROSS_COMPILE)" \
-		LOCALVERSION= \
-		ARCH=arm64 \
-		-j`getconf _NPROCESSORS_ONLN`
+LINUX_COMMON_FLAGS += ARCH=arm64
+
+linux: linux-common
+
+linux-defconfig-clean: linux-defconfig-clean-common
+
+LINUX_CLEAN_COMMON_FLAGS += ARCH=arm64
+
+linux-clean: linux-clean-common
+
+LINUX_CLEANER_COMMON_FLAGS += ARCH=arm64
+
+linux-cleaner: linux-cleaner-common
 
 ################################################################################
 # OP-TEE

diff --git a/hikey.mk b/hikey.mk
@@ -153,42 +153,27 @@ linux-defconfig: $(LINUX_PATH)/.config
 
 linux-gen_init_cpio: linux-defconfig
 	make -C $(LINUX_PATH)/usr \
-		CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
+		CROSS_COMPILE=$(CROSS_COMPILE_NS_KERNEL) \
 		ARCH=arm64 \
 		LOCALVERSION= \
 		gen_init_cpio
 
-linux: linux-defconfig
-	make -C $(LINUX_PATH) \
-		CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
-		ARCH=arm64 \
-		LOCALVERSION= \
-		-j`getconf _NPROCESSORS_ONLN` \
-		Image modules dtbs
+LINUX_COMMON_FLAGS += ARCH=arm64 Image modules dtbs
 
-linux-defconfig-clean:
-	@if [ -f "$(LINUX_PATH)/.config" ]; then \
-		rm $(LINUX_PATH)/.config; \
-	fi
+linux: linux-common
+
+linux-defconfig-clean: linux-defconfig-clean-common
 	@if [ -f "$(LINUX_CONFIG_ADDLIST)" ]; then \
 		rm $(LINUX_CONFIG_ADDLIST); \
 	fi
 
-linux-clean: linux-defconfig-clean
-	make -C $(LINUX_PATH) \
-		CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
-		ARCH=arm64 \
-		LOCALVERSION= \
-		-j`getconf _NPROCESSORS_ONLN` \
-		clean
+LINUX_CLEAN_COMMON_FLAGS += ARCH=arm64
 
-linux-cleaner: linux-defconfig-clean
-	make -C $(LINUX_PATH) \
-		CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
-		ARCH=arm64 \
-		LOCALVERSION= \
-		-j`getconf _NPROCESSORS_ONLN` \
-		distclean
+linux-clean: linux-clean-common
+
+LINUX_CLEANER_COMMON_FLAGS += ARCH=arm64
+
+linux-cleaner: linux-cleaner-common
 
 ################################################################################
 # OP-TEE

diff --git a/mediatek.mk b/mediatek.mk
@@ -54,14 +54,20 @@ $(LINUX_PATH)/.config: $(LINUX_PATCH_PATH)/.patched
 	make -C $(LINUX_PATH) ARCH=arm64 defconfig
 
 linux-defconfig: $(LINUX_PATH)/.config
-linux-patched: $(LINUX_PATCH_PATH)/.patched
-
-linux: linux-patched linux-defconfig
-	make -C $(LINUX_PATH) \
-		CROSS_COMPILE="$(CCACHE)$(AARCH64_NONE_CROSS_COMPILE)" \
-		LOCALVERSION= \
-		ARCH=arm64 \
-		-j`getconf _NPROCESSORS_ONLN`
+
+LINUX_COMMON_FLAGS += ARCH=arm64
+
+linux: linux-common
+
+linux-defconfig-clean: linux-defconfig-clean-common
+
+LINUX_CLEAN_COMMON_FLAGS += ARCH=arm64
+
+linux-clean: linux-clean-common
+
+LINUX_CLEANER_COMMON_FLAGS += ARCH=arm64
+
+linux-cleaner: linux-cleaner-common
 
 ################################################################################
 # OP-TEE

diff --git a/qemu.mk b/qemu.mk
@@ -86,16 +86,19 @@ $(LINUX_PATH)/.config:
 
 linux-defconfig: $(LINUX_PATH)/.config
 
-linux: linux-defconfig
-	$(MAKE) -C $(LINUX_PATH) \
-		CROSS_COMPILE=$(CROSS_COMPILE_NS_KERNEL) \
-		LOCALVERSION= \
-		ARCH=arm
-
-linux-clean:
-	$(MAKE) -C $(LINUX_PATH) \
-		CROSS_COMPILE=$(CROSS_COMPILE_NS_KERNEL) \
-		mrproper
+LINUX_COMMON_FLAGS += ARCH=arm
+
+linux: linux-common
+
+linux-defconfig-clean: linux-defconfig-clean-common
+
+LINUX_CLEAN_COMMON_FLAGS += ARCH=arm
+
+linux-clean: linux-clean-common
+
+LINUX_CLEANER_COMMON_FLAGS += ARCH=arm
+
+linux-cleaner: linux-cleaner-common
 
 ################################################################################
 # OP-TEE