rockchip: use 'arch-rockchip' as header file path

[oweals/u-boot.git] / board / theobroma-systems / puma_rk3399 / fit_spl_atf.its

diff --git a/board/theobroma-systems/puma_rk3399/fit_spl_atf.its b/board/theobroma-systems/puma_rk3399/fit_spl_atf.its
index f93c2519272d4987784c256c1e6615cd4e7eff89..530f059f3da5a0b8d0c5a2a69899fbdc0b983693 100644 (file)
--- a/board/theobroma-systems/puma_rk3399/fit_spl_atf.its
+++ b/board/theobroma-systems/puma_rk3399/fit_spl_atf.its
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ OR X11 */
 /*
  * Copyright (C) 2017 Theobroma Systems Design und Consulting GmbH
  *
  * Minimal dts for a SPL FIT image payload.
- *
- * SPDX-License-Identifier: GPL-2.0+  X11
  */
 
 /dts-v1/;
@@ -13,31 +12,33 @@
        #address-cells = <1>;
 
        images {
-               uboot@1 {
+               uboot {
                        description = "U-Boot (64-bit)";
                        data = /incbin/("../../../u-boot-nodtb.bin");
                        type = "standalone";
+                       os = "U-Boot";
                        arch = "arm64";
                        compression = "none";
                        load = <0x00200000>;
                };
-               atf@1 {
+               atf {
                        description = "ARM Trusted Firmware";
-                       data = /incbin/("../../../bl31.bin");
+                       data = /incbin/("../../../bl31-rk3399.bin");
                        type = "firmware";
                        arch = "arm64";
+                       os = "arm-trusted-firmware";
                        compression = "none";
-                       load = <0x00001000>;
-                       entry = <0x00001000>;
+                       load = <0x1000>;
+                       entry = <0x1000>;
                };
-               pmu@1 {
+               pmu {
                        description = "Cortex-M0 firmware";
                        data = /incbin/("../../../rk3399m0.bin");
                        type = "pmu-firmware";
                        compression = "none";
-                       load = <0xff8c0000>;
+                       load = <0x180000>;
                 };
-               fdt@1 {
+               fdt {
                        description = "RK3399-Q7 (Puma) flat device-tree";
                        data = /incbin/("../../../u-boot.dtb");
                        type = "flat_dt";
@@ -46,12 +47,12 @@
        };
 
        configurations {
-               default = "conf@1";
-               conf@1 {
+               default = "conf";
+               conf {
                        description = "Theobroma Systems RK3399-Q7 (Puma) SoM";
-                       firmware = "uboot@1";
-                       loadables = "atf@1";
-                       fdt = "fdt@1";
+                       firmware = "atf";
+                       loadables = "uboot", "pmu";
+                       fdt = "fdt";
                };
        };
 };