build: remove profile kernel/build system config override support

[openwrt/openwrt.git] / include / target.mk

diff --git a/include/target.mk b/include/target.mk
index 817901f0b9cdff8124931279c251b2ebd4363404..92edaec96b0e8b40a4cdcc3bee02912c30232ff9 100644 (file)
--- a/include/target.mk
+++ b/include/target.mk
@@ -59,6 +59,7 @@ extra_packages = $(if $(filter wpad-mini wpad nas,$(1)),iwinfo)
 
 define ProfileDefault
   NAME:=
 
 define ProfileDefault
   NAME:=

+  PRIORITY:=

   PACKAGES:=
 endef
 
   PACKAGES:=
 endef
 


@@ -66,25 +67,16 @@ ifndef Profile
 define Profile
   $(eval $(call ProfileDefault))
   $(eval $(call Profile/$(1)))
 define Profile
   $(eval $(call ProfileDefault))
   $(eval $(call Profile/$(1)))

-  dumpinfo : $(call shexport,Profile/$(1)/Config)

   dumpinfo : $(call shexport,Profile/$(1)/Description)
   DUMPINFO += \
        echo "Target-Profile: $(1)"; \
   dumpinfo : $(call shexport,Profile/$(1)/Description)
   DUMPINFO += \
        echo "Target-Profile: $(1)"; \

+       $(if $(PRIORITY), echo "Target-Profile-Priority: $(PRIORITY)"; ) \

        echo "Target-Profile-Name: $(NAME)"; \
        echo "Target-Profile-Packages: $(PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES) $(PACKAGES))"; \
        echo "Target-Profile-Name: $(NAME)"; \
        echo "Target-Profile-Packages: $(PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES) $(PACKAGES))"; \

-       if [ -f ./config/profile-$(1) ]; then \
-               echo "Target-Profile-Kconfig: yes"; \
-       fi; \
-       echo "Target-Profile-Config: "; \
-       echo "$$$$$$$$$(call shvar,Profile/$(1)/Config)"; \
-       echo "@@"; \

        echo "Target-Profile-Description:"; \
        echo "$$$$$$$$$(call shvar,Profile/$(1)/Description)"; \
        echo "@@"; \
        echo;
        echo "Target-Profile-Description:"; \
        echo "$$$$$$$$$(call shvar,Profile/$(1)/Description)"; \
        echo "@@"; \
        echo;

-  ifeq ($(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(if $(SUBTARGET),$(SUBTARGET)_))$(1)),y)
-    PROFILE=$(1)
-  endif

 endef
 endif
 
 endef
 endif
 


@@ -99,10 +91,10 @@ else
   endef
 endif
 
   endef
 endif
 

+PROFILE:=$(call qstrip,$(CONFIG_TARGET_PROFILE))
+

 ifeq ($(TARGET_BUILD),1)
 ifeq ($(TARGET_BUILD),1)

-  $(eval $(call IncludeProfiles))
-else
-  ifeq ($(DUMP),)
+  ifneq ($(DUMP),)

     $(eval $(call IncludeProfiles))
   endif
 endif
     $(eval $(call IncludeProfiles))
   endif
 endif


@@ -217,6 +209,7 @@ ifeq ($(DUMP),1)
     CPU_CFLAGS_24kec = -mips32r2 -mtune=24kec
     CPU_CFLAGS_34kc = -mips32r2 -mtune=34kc
     CPU_CFLAGS_74kc = -mips32r2 -mtune=74kc
     CPU_CFLAGS_24kec = -mips32r2 -mtune=24kec
     CPU_CFLAGS_34kc = -mips32r2 -mtune=34kc
     CPU_CFLAGS_74kc = -mips32r2 -mtune=74kc

+    CPU_CFLAGS_1004kc = -mips32r2 -mtune=1004kc

     CPU_CFLAGS_octeon = -march=octeon -mabi=64
     CPU_CFLAGS_dsp = -mdsp
     CPU_CFLAGS_dsp2 = -mdspr2
     CPU_CFLAGS_octeon = -march=octeon -mabi=64
     CPU_CFLAGS_dsp = -mdsp
     CPU_CFLAGS_dsp2 = -mdspr2


@@ -274,7 +267,7 @@ endif
 
 CUR_SUBTARGET:=$(SUBTARGET)
 ifeq ($(SUBTARGETS),)
 
 CUR_SUBTARGET:=$(SUBTARGET)
 ifeq ($(SUBTARGETS),)

-  CUR_SUBTARGET ?= default
+  CUR_SUBTARGET := default

 endif
 
 define BuildTargets/DumpCurrent
 endif
 
 define BuildTargets/DumpCurrent