Преглед на файлове

ARM: dts: vf500: Remove skeleton.dtsi inclusion

Since commit 9c0da3cc61f1 ("ARM: dts: explicitly mark skeleton.dtsi as
deprecated") the inclusion of skeleton.dtsi is deprecated, so
remove it as this file will eventually go away someday.

Move its content to the SoC dtsi file, so that the resultant dtb
is the same.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Fabio Estevam преди 7 години
родител
ревизия
c06f616d35
променени са 1 файла, в които са добавени 6 реда и са изтрити 1 реда
  1. 6 1
      arch/arm/boot/dts/vf500.dtsi

+ 6 - 1
arch/arm/boot/dts/vf500.dtsi

@@ -39,11 +39,16 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
  */
 
 
-#include "skeleton.dtsi"
 #include "vfxxx.dtsi"
 #include "vfxxx.dtsi"
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 
 / {
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+	chosen { };
+	aliases { };
+	memory { device_type = "memory"; reg = <0 0>; };
+
 	cpus {
 	cpus {
 		#address-cells = <1>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 		#size-cells = <0>;