Skip to content

GitLab

Commit e5eaf885 authored by Manish Pandey's avatar Manish Pandey Committed by TrustedFirmware Code Review
Browse files

Merge "Replace dts includes with C preprocessor syntax" into integration

parents 22eaa870 2d51b55e
Show whitespace changes
Inline Side-by-side
Makefile
View file @ e5eaf885
#
# Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
# Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
......@@ -344,7 +344,7 @@ TF_LDFLAGS += $(TF_LDFLAGS_$(ARCH))
endif
DTC_FLAGS += -I dts -O dtb
DTC_CPPFLAGS += -nostdinc -Iinclude -undef -x assembler-with-cpp
DTC_CPPFLAGS += -P -nostdinc -Iinclude -Ifdts -undef -x assembler-with-cpp
################################################################################
# Common sources and include directories
......
fdts/fvp-base-gicv2-psci-aarch32.dts
View file @ e5eaf885
/*
* Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
......@@ -279,7 +279,7 @@
<0 0 41 &gic 0 41 4>,
<0 0 42 &gic 0 42 4>;
/include/ "rtsm_ve-motherboard-aarch32.dtsi"
#include "rtsm_ve-motherboard-aarch32.dtsi"
};
panels {
......
fdts/fvp-base-gicv2-psci.dts
View file @ e5eaf885
/*
* Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
......@@ -233,7 +233,7 @@
<4 0 0 0x0c000000 0x04000000>,
<5 0 0 0x10000000 0x04000000>;
/include/ "rtsm_ve-motherboard.dtsi"
#include "rtsm_ve-motherboard.dtsi"
};
panels {
......
fdts/fvp-base-gicv3-psci-1t.dts
View file @ e5eaf885
/*
* Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
/dts-v1/;
/include/ "fvp-base-gicv3-psci-common.dtsi"
#include "fvp-base-gicv3-psci-common.dtsi"
&CPU0 {
reg = <0x0 0x0>;
......
fdts/fvp-base-gicv3-psci-aarch32-1t.dts
View file @ e5eaf885
/*
* Copyright (c) 2019, Arm Limited. All rights reserved.
* Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
/dts-v1/;
/include/ "fvp-base-gicv3-psci-aarch32-common.dtsi"
#include "fvp-base-gicv3-psci-aarch32-common.dtsi"
&CPU0 {
reg = <0x0>;
......
fdts/fvp-base-gicv3-psci-aarch32-common.dtsi
View file @ e5eaf885
/*
* Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
......@@ -286,7 +286,7 @@
<0 0 41 &gic 0 0 0 41 4>,
<0 0 42 &gic 0 0 0 42 4>;
/include/ "rtsm_ve-motherboard-aarch32.dtsi"
#include "rtsm_ve-motherboard-aarch32.dtsi"
};
panels {
......
fdts/fvp-base-gicv3-psci-aarch32.dts
View file @ e5eaf885
/*
* Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
/dts-v1/;
/include/ "fvp-base-gicv3-psci-aarch32-common.dtsi"
#include "fvp-base-gicv3-psci-aarch32-common.dtsi"
fdts/fvp-base-gicv3-psci-common.dtsi
View file @ e5eaf885
/*
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
......@@ -240,7 +240,7 @@
<4 0 0 0x0c000000 0x04000000>,
<5 0 0 0x10000000 0x04000000>;
/include/ "rtsm_ve-motherboard.dtsi"
#include "rtsm_ve-motherboard.dtsi"
};
panels {
......
fdts/fvp-base-gicv3-psci-dynamiq-2t.dts
View file @ e5eaf885
/*
* Copyright (c) 2019, Arm Limited. All rights reserved.
* Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
/dts-v1/;
/include/ "fvp-base-gicv3-psci-common.dtsi"
#include "fvp-base-gicv3-psci-common.dtsi"
&CPU0 {
reg = <0x0 0x0>;
......
fdts/fvp-base-gicv3-psci-dynamiq.dts
View file @ e5eaf885
/*
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
/dts-v1/;
/include/ "fvp-base-gicv3-psci-common.dtsi"
#include "fvp-base-gicv3-psci-common.dtsi"
&CPU0 {
reg = <0x0 0x0>;
......
fdts/fvp-base-gicv3-psci.dts
View file @ e5eaf885
/*
* Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
/dts-v1/;
/include/ "fvp-base-gicv3-psci-common.dtsi"
#include "fvp-base-gicv3-psci-common.dtsi"
fdts/fvp-foundation-gicv2-psci.dts
View file @ e5eaf885
/*
* Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
......@@ -182,6 +182,6 @@
<4 0 0 0x0c000000 0x04000000>,
<5 0 0 0x10000000 0x04000000>;
/include/ "fvp-foundation-motherboard.dtsi"
#include "fvp-foundation-motherboard.dtsi"
};
};
fdts/fvp-foundation-gicv3-psci.dts
View file @ e5eaf885
/*
* Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
......@@ -191,6 +191,6 @@
<4 0 0 0x0c000000 0x04000000>,
<5 0 0 0x10000000 0x04000000>;
/include/ "fvp-foundation-motherboard.dtsi"
#include "fvp-foundation-motherboard.dtsi"
};
};
fdts/fvp-ve-Cortex-A5x1.dts
View file @ e5eaf885
/*
* Copyright (c) 2019, Arm Limited. All rights reserved.
* Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
......@@ -139,6 +139,6 @@
<0 0 5 &gic 0 5 4>,
<0 0 42 &gic 0 42 4>;
/include/ "rtsm_ve-motherboard-aarch32.dtsi"
#include "rtsm_ve-motherboard-aarch32.dtsi"
};
};
fdts/fvp-ve-Cortex-A7x1.dts
View file @ e5eaf885
/*
* Copyright (c) 2019, Arm Limited. All rights reserved.
* Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
......@@ -71,6 +71,6 @@
<0 0 5 &gic 0 5 4>,
<0 0 42 &gic 0 42 4>;
/include/ "rtsm_ve-motherboard-aarch32.dtsi"
#include "rtsm_ve-motherboard-aarch32.dtsi"
};
};
make_helpers/build_macros.mk
View file @ e5eaf885
#
# Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
# Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
......@@ -513,7 +513,7 @@ $(DOBJ): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | fdt_dirs
$(eval DTBS := $(addprefix $(1)/,$(call SOURCES_TO_DTBS,$(2))))
$$(Q)$$(PP) $$(DTC_CPPFLAGS) -MT $(DTBS) -MMD -MF $(DTSDEP) -o $(DPRE) $$<
$${ECHO} " DTC $$<"
$$(Q)$$(DTC) $$(DTC_FLAGS) -i fdts -d $(DTBDEP) -o $$@ $(DPRE)
$$(Q)$$(DTC) $$(DTC_FLAGS) -d $(DTBDEP) -o $$@ $(DPRE)
-include $(DTBDEP)
-include $(DTSDEP)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment