diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-04-11 12:52:53 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-04-11 12:52:53 +0000 |
| commit | e349e3ccc669e9b15418335199ec2518316c6650 (patch) | |
| tree | 89b9a23b61b63e0565e2be4b3808991541ea87f0 /rules/other | |
| parent | 573e4c69e22840745bd71cb4e7964081a2cf6a0d (diff) | |
| download | ptxdist-e349e3ccc669e9b15418335199ec2518316c6650.tar.gz ptxdist-e349e3ccc669e9b15418335199ec2518316c6650.tar.xz | |
* pre/Rules.make, other/Toplevel.make, other/Namespace.make:
cleaned up platform stuff
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7934 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/other')
| -rw-r--r-- | rules/other/Namespace.make | 10 | ||||
| -rw-r--r-- | rules/other/Toplevel.make | 5 |
2 files changed, 3 insertions, 12 deletions
diff --git a/rules/other/Namespace.make b/rules/other/Namespace.make index c7b814fdf..68f2da8b2 100644 --- a/rules/other/Namespace.make +++ b/rules/other/Namespace.make @@ -1,10 +1,5 @@ -PLATFORMDIR := $(call remove_quotes, $(PLATFORMDIR)) +PTXCONF_PLATFORM := $(call remove_quotes, $(PTXCONF_PLATFORM)) -ifneq ($(PTXDIST_PLATFORM),) -PTXDIST_PLATFORM_PREFIX=platform- -endif - -PTXCONF_PLATFORM := $(call remove_quotes,$(PTXCONF_PLATFORM)) PTXCONF_SYSROOT_TARGET := $(call remove_quotes, $(PTXCONF_SYSROOT_TARGET)) PTXCONF_SYSROOT_HOST := $(call remove_quotes, $(PTXCONF_SYSROOT_HOST)) PTXCONF_SYSROOT_CROSS := $(call remove_quotes, $(PTXCONF_SYSROOT_CROSS)) @@ -13,6 +8,3 @@ PTX_COMPILER_PREFIX := $(call remove_quotes, $(PTXCONF_COMPILER_PREFIX)) PTX_COMPILER_PREFIX_KERNEL := $(call remove_quotes, $(PTXCONF_COMPILER_PREFIX_KERNEL)) PTX_COMPILER_PREFIX_UBOOT := $(call remove_quotes, $(PTXCONF_COMPILER_PREFIX_UBOOT)) -%.ptx-extract: - @mkdir -p `dirname $@` - @touch $@ diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make index 800adb104..2dd3c6fa0 100644 --- a/rules/other/Toplevel.make +++ b/rules/other/Toplevel.make @@ -30,7 +30,6 @@ HOME := $(shell echo $$HOME) PTXDIST_WORKSPACE := $(shell pwd) include $(PTXDIST_TOPDIR)/scripts/ptxdist_vars.sh - include $(RULESDIR)/other/Definitions.make ifeq ($(call remove_quotes,$(PTXCONF_SETUP_SRCDIR)),) @@ -41,10 +40,10 @@ SRCDIR = $(call remove_quotes,$(PTXCONF_SETUP_SRCDIR)) endif # first, include the ptxconfig with packet definitions --include $(PTXDIST_WORKSPACE)/ptxconfig +-include $(PTXCONFIG) # platformconfig comes after ptxconfig, so it is able to overwrite things --include $(PTXDIST_WORKSPACE)/.platformconfig +-include $(PLATFORMCONFIG) # ---------------------------------------------------------------------------- # Packets for host, cross and target |