--- zzzz-none-000/linux-4.9.279/arch/arm/Makefile 2021-08-08 06:38:54.000000000 +0000 +++ puma7-arm-6591-750/linux-4.9.279/arch/arm/Makefile 2023-02-08 10:58:12.000000000 +0000 @@ -10,6 +10,9 @@ # # Copyright (C) 1995-2001 by Russell King +# Includes Intel Corporation's changes/modifications dated: 2017. +# Changed/modified portions - Copyright © 2017, Intel Corporation. + # Ensure linker flags are correct LDFLAGS := @@ -97,8 +100,8 @@ tune-$(CONFIG_CPU_XSCALE) =$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale tune-$(CONFIG_CPU_XSC3) =$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale tune-$(CONFIG_CPU_FEROCEON) =$(call cc-option,-mtune=marvell-f,-mtune=xscale) -tune-$(CONFIG_CPU_V6) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) -tune-$(CONFIG_CPU_V6K) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) +tune-$(CONFIG_CPU_V6) =$(call cc-option,-mtune=arm1136j-s,-mtune=arm1136jfs) +tune-$(CONFIG_CPU_V6K) =$(call cc-option,-mtune=arm1176jz-s,-mtune=arm1176jz-s) # Evaluate tune cc-option calls now tune-y := $(tune-y) @@ -133,6 +136,11 @@ KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float +# Puma ARM core do not suppots unaligned access +ifeq ($(CONFIG_ARCH_AVALANCHE),y) +KBUILD_CFLAGS +=$(call cc-option,-mno-unaligned-access) +endif + CHECKFLAGS += -D__arm__ #Default value @@ -150,12 +158,15 @@ textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000 textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000 +textofs-$(CONFIG_ARCH_AVALANCHE) := 0x00018000 + # Machine directory name. This list is sorted alphanumerically # by CONFIG_* macro name. machine-$(CONFIG_ARCH_ALPINE) += alpine machine-$(CONFIG_ARCH_ARTPEC) += artpec machine-$(CONFIG_ARCH_AT91) += at91 +machine-$(CONFIG_ARCH_AVALANCHE) += avalanche machine-$(CONFIG_ARCH_AXXIA) += axxia machine-$(CONFIG_ARCH_BCM) += bcm machine-$(CONFIG_ARCH_BERLIN) += berlin @@ -247,6 +258,12 @@ # The byte offset of the kernel image in RAM from the start of RAM. TEXT_OFFSET := $(textofs-y) +ifeq ($(incdir-y),) +incdir-y := $(machine-y) +endif +INCDIR := arch-$(incdir-y) + + # The first directory contains additional information for the boot setup code ifneq ($(machine-y),) MACHINE := arch/arm/mach-$(word 1,$(machine-y))/ @@ -292,6 +309,7 @@ core-y += arch/arm/crypto/ core-y += arch/arm/firmware/ core-y += $(machdirs) $(platdirs) +core-$(CONFIG_AVM_ENHANCED) += arch/arm/avm_enh/ drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/