From 2a57f3875ca2963a129f52b024a14c29f68875c4 Mon Sep 17 00:00:00 2001 From: Arne Coucheron Date: Mon, 25 Feb 2013 02:10:32 +0100 Subject: [PATCH] Fix makefiles and update .gitignore --- .gitignore | 100 ++++++++++++++++++ AndroidKernel.mk | 91 ---------------- Makefile | 6 +- .../os/linux/include/athendpack_linux.h | 0 .../os/linux/include/athstartpack_linux.h | 0 scripts/Makefile.modpost | 1 - 6 files changed, 101 insertions(+), 97 deletions(-) create mode 100644 .gitignore delete mode 100644 AndroidKernel.mk delete mode 100644 drivers/staging/ath6kl/os/linux/include/athendpack_linux.h delete mode 100644 drivers/staging/ath6kl/os/linux/include/athstartpack_linux.h diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..d328fb2ba --- /dev/null +++ b/.gitignore @@ -0,0 +1,100 @@ +# +# NOTE! Don't add files that are generated in specific +# subdirectories here. Add them in the ".gitignore" file +# in that subdirectory instead. +# +# NOTE! Please use 'git ls-files -i --exclude-standard' +# command after changing this file, to see if there are +# any tracked files which get ignored after the change. +# +# Normal rules +# +.* +*.o +*.o.* +*.a +*.s +*.ko +*.so +*.so.dbg +*.mod.c +*.i +*.lst +*.symtypes +*.order +modules.builtin +*.elf +*.bin +*.gz +*.bz2 +*.lzma +*.xz +*.lzo +*.patch +*.gcno + +# +# Top-level generic files +# +/tags +/TAGS +/linux +/vmlinux +/vmlinuz +/System.map +/Module.markers +/Module.symvers + +# +# Debian directory (make deb-pkg) +# +/debian/ + +# +# git files that we don't want to ignore even it they are dot-files +# +!.gitignore +!.mailmap + +# +# Generated include files +# +include/config +include/linux/version.h +include/generated +arch/*/include/generated + +# stgit generated dirs +patches-* + +# quilt's files +patches +series + +# cscope files +cscope.* +ncscope.* + +# gnu global files +GPATH +GRTAGS +GSYMS +GTAGS + +*.orig +*~ +\#*# + +# generated caf +arch/arm/mach-msm/smd_rpc_sym.c + +# compressed boot files +arch/arm/boot/compressed/ashldi3.S +arch/arm/boot/compressed/lib1funcs.S +arch/arm/boot/compressed/piggy.gzip +arch/arm/boot/compressed/piggy.xzkern +arch/arm/boot/compressed/vmlinux + +# ignore initramfs +initramfs +/*.sh diff --git a/AndroidKernel.mk b/AndroidKernel.mk deleted file mode 100644 index 36c139e5c..000000000 --- a/AndroidKernel.mk +++ /dev/null @@ -1,91 +0,0 @@ -#Android makefile to build kernel as a part of Android Build -PERL = perl - -ifeq ($(TARGET_PREBUILT_KERNEL),) - -KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ -KERNEL_CONFIG := $(KERNEL_OUT)/.config -TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/arm/boot/zImage -KERNEL_HEADERS_INSTALL := $(KERNEL_OUT)/usr -KERNEL_MODULES_INSTALL := system -KERNEL_MODULES_OUT := $(TARGET_OUT)/lib/modules -KERNEL_IMG=$(KERNEL_OUT)/arch/arm/boot/Image - -MSM_ARCH ?= $(shell $(PERL) -e 'while (<>) {$$a = $$1 if /CONFIG_ARCH_((?:MSM|QSD)[a-zA-Z0-9]+)=y/; $$r = $$1 if /CONFIG_MSM_SOC_REV_(?!NONE)(\w+)=y/;} print lc("$$a$$r\n");' $(KERNEL_CONFIG)) -KERNEL_USE_OF ?= $(shell $(PERL) -e '$$of = "n"; while (<>) { if (/CONFIG_USE_OF=y/) { $$of = "y"; break; } } print $$of;' kernel/arch/arm/configs/$(KERNEL_DEFCONFIG)) - -ifeq "$(KERNEL_USE_OF)" "y" -DTS_NAME ?= $(MSM_ARCH) -DTS_FILES = $(wildcard $(TOP)/kernel/arch/arm/boot/dts/$(DTS_NAME)*.dts) -DTS_FILE = $(lastword $(subst /, ,$(1))) -DTB_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%.dtb,$(call DTS_FILE,$(1)))) -ZIMG_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%-zImage,$(call DTS_FILE,$(1)))) -KERNEL_ZIMG = $(KERNEL_OUT)/arch/arm/boot/zImage -DTC = $(KERNEL_OUT)/scripts/dtc/dtc - -define append-dtb -mkdir -p $(KERNEL_OUT)/arch/arm/boot;\ -$(foreach d, $(DTS_FILES), \ - $(DTC) -p 1024 -O dtb -o $(call DTB_FILE,$(d)) $(d); \ - cat $(KERNEL_ZIMG) $(call DTB_FILE,$(d)) > $(call ZIMG_FILE,$(d));) -endef -else - -define append-dtb -endef -endif - -ifeq ($(TARGET_USES_UNCOMPRESSED_KERNEL),true) -$(info Using uncompressed kernel) -TARGET_PREBUILT_KERNEL := $(KERNEL_OUT)/piggy -else -TARGET_PREBUILT_KERNEL := $(TARGET_PREBUILT_INT_KERNEL) -endif - -define mv-modules -mdpath=`find $(KERNEL_MODULES_OUT) -type f -name modules.dep`;\ -if [ "$$mdpath" != "" ];then\ -mpath=`dirname $$mdpath`;\ -ko=`find $$mpath/kernel -type f -name *.ko`;\ -for i in $$ko; do mv $$i $(KERNEL_MODULES_OUT)/; done;\ -fi -endef - -define clean-module-folder -mdpath=`find $(KERNEL_MODULES_OUT) -type f -name modules.dep`;\ -if [ "$$mdpath" != "" ];then\ -mpath=`dirname $$mdpath`; rm -rf $$mpath;\ -fi -endef - -$(KERNEL_OUT): - mkdir -p $(KERNEL_OUT) - -$(KERNEL_CONFIG): $(KERNEL_OUT) - $(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- $(KERNEL_DEFCONFIG) - -$(KERNEL_OUT)/piggy : $(TARGET_PREBUILT_INT_KERNEL) - $(hide) gunzip -c $(KERNEL_OUT)/arch/arm/boot/compressed/piggy.gzip > $(KERNEL_OUT)/piggy - -$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL) - $(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- - $(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- modules - $(MAKE) -C kernel O=../$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) INSTALL_MOD_STRIP=1 ARCH=arm CROSS_COMPILE=arm-eabi- modules_install - $(mv-modules) - $(clean-module-folder) - $(append-dtb) - -$(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(KERNEL_CONFIG) - $(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- headers_install - -kerneltags: $(KERNEL_OUT) $(KERNEL_CONFIG) - $(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- tags - -kernelconfig: $(KERNEL_OUT) $(KERNEL_CONFIG) - env KCONFIG_NOTIMESTAMP=true \ - $(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- menuconfig - env KCONFIG_NOTIMESTAMP=true \ - $(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- savedefconfig - cp $(KERNEL_OUT)/defconfig kernel/arch/arm/configs/$(KERNEL_DEFCONFIG) - -endif diff --git a/Makefile b/Makefile index 75b36ae3c..a6879630a 100644 --- a/Makefile +++ b/Makefile @@ -330,7 +330,7 @@ include $(srctree)/scripts/Kbuild.include AS = $(CROSS_COMPILE)as LD = $(CROSS_COMPILE)ld -REAL_CC = $(CROSS_COMPILE)gcc +CC = $(CROSS_COMPILE)gcc CPP = $(CC) -E AR = $(CROSS_COMPILE)ar NM = $(CROSS_COMPILE)nm @@ -345,10 +345,6 @@ KALLSYMS = scripts/kallsyms PERL = perl CHECK = sparse -# Use the wrapper for the compiler. This wrapper scans for new -# warnings and causes the build to stop upon encountering them. -CC = $(srctree)/scripts/gcc-wrapper.py $(REAL_CC) - CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ -Wbitwise -Wno-return-void $(CF) CFLAGS_MODULE = diff --git a/drivers/staging/ath6kl/os/linux/include/athendpack_linux.h b/drivers/staging/ath6kl/os/linux/include/athendpack_linux.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/drivers/staging/ath6kl/os/linux/include/athstartpack_linux.h b/drivers/staging/ath6kl/os/linux/include/athstartpack_linux.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index c1bc45888..08dce14f2 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -80,7 +80,6 @@ modpost = scripts/mod/modpost \ $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \ $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \ $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S) \ - $(if $(CONFIG_NO_ERROR_ON_MISMATCH),,-E) \ $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) \ $(if $(cross_build),-c)