diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/linux.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/mk/linux.mk b/mk/linux.mk index a311637ac..bd014c20f 100644 --- a/mk/linux.mk +++ b/mk/linux.mk @@ -4,9 +4,9 @@ PKG_NAME:= linux PKG_VERSION:= $(KERNEL_VERSION) PKG_RELEASE:= $(KERNEL_RELEASE) -PKG_HASH:= $(KERNEL_HASH) ifeq ($(ADK_KERNEL_VERSION_GIT),y) PKG_SITES:= $(ADK_KERNEL_REPO) +PKG_VERSION:= $(ADK_KERNEL_HASH) else PKG_SITES:= ${MASTER_SITE_KERNEL:=kernel/v4.x/} \ ${MASTER_SITE_KERNEL:=kernel/v3.x/} \ diff --git a/mk/vars.mk b/mk/vars.mk index fd6ba65ce..c613a5cd0 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -88,14 +88,11 @@ endif # target tools TARGET_CC:= ${TARGET_COMPILER_PREFIX}gcc -# use a gcc wrapper for coldfire/arm uclinux support +# use a gcc wrapper for coldfire uclinux support ifeq ($(ADK_TARGET_UCLINUX),y) ifeq ($(ADK_TARGET_ARCH_M68K),y) TARGET_CC:= adk-uclinux-gcc endif -ifeq ($(ADK_TARGET_ARCH_ARM),y) -TARGET_CC:= adk-uclinux-gcc -endif endif TARGET_CXX:= ${TARGET_COMPILER_PREFIX}g++ @@ -293,8 +290,8 @@ TARGET_CFLAGS+= -funsafe-math-optimizations -ffast-math TARGET_CXXFLAGS+= -funsafe-math-optimizations -ffast-math endif ifeq ($(ADK_TARGET_ARCH_ARM_WITH_THUMB),y) -TARGET_CFLAGS+= -mthumb -Wa,-mimplicit-it=thumb -TARGET_CXXFLAGS+= -mthumb -Wa,-mimplicit-it=thumb +TARGET_CFLAGS+= -mthumb -Wa,-mimplicit-it=thumb -mno-thumb-interwork +TARGET_CXXFLAGS+= -mthumb -Wa,-mimplicit-it=thumb -mno-thumb-interwork else TARGET_CFLAGS+= -marm TARGET_CXXFLAGS+= -marm |