dtoc: Rename dt-platdata.c to dt-plat.c
Use this new name to be consistent with the rest of U-Boot, which talks
about 'plat' for the platform data, which is what this file holds.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/include/dm/platdata.h b/include/dm/platdata.h
index df1f6ab..dc3cbfc 100644
--- a/include/dm/platdata.h
+++ b/include/dm/platdata.h
@@ -59,7 +59,7 @@
* When of-platdata is in use, U_BOOT_DRVINFO() cannot be used outside of the
* dt-plat.c file created by dtoc
*/
-#if CONFIG_IS_ENABLED(OF_PLATDATA) && !defined(DT_PLATDATA_C)
+#if CONFIG_IS_ENABLED(OF_PLATDATA) && !defined(DT_PLAT_C)
#define U_BOOT_DRVINFO(__name) _Static_assert(false, \
"Cannot use U_BOOT_DRVINFO with of-platdata. Please use devicetree instead")
#else
diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
index 363f274..4a8e19e 100644
--- a/include/linux/mtd/spi-nor.h
+++ b/include/linux/mtd/spi-nor.h
@@ -262,7 +262,7 @@
* Defined below (keep this text to enable searching for spi_flash decl)
* }
*/
-#ifndef DT_PLATDATA_C
+#ifndef DT_PLAT_C
#define spi_flash spi_nor
#endif
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index 3d60cf5..87021e2 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -120,7 +120,7 @@
u-boot-spl-init := $(head-y)
u-boot-spl-main := $(libs-y)
ifdef CONFIG_$(SPL_TPL_)OF_PLATDATA
-u-boot-spl-platdata := $(obj)/dts/dt-platdata.o
+u-boot-spl-platdata := $(obj)/dts/dt-plat.o
u-boot-spl-platdata_c := $(patsubst %.o,%.c,$(u-boot-spl-platdata))
endif
diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py
index b3d777e..e07a5d3 100644
--- a/tools/dtoc/dtb_platdata.py
+++ b/tools/dtoc/dtb_platdata.py
@@ -796,7 +796,7 @@
information.
"""
self.out('/* Allow use of U_BOOT_DRVINFO() in this file */\n')
- self.out('#define DT_PLATDATA_C\n')
+ self.out('#define DT_PLAT_C\n')
self.out('\n')
self.out('#include <common.h>\n')
self.out('#include <dm.h>\n')
@@ -832,7 +832,7 @@
OutputFile(Ftype.HEADER, 'dt-structs-gen.h',
'Defines the structs used to hold devicetree data'),
'platdata':
- OutputFile(Ftype.SOURCE, 'dt-platdata.c',
+ OutputFile(Ftype.SOURCE, 'dt-plat.c',
'Declares the U_BOOT_DRIVER() records and platform data'),
}
diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py
index 2e4dd2b..d56cd31 100755
--- a/tools/dtoc/test_dtoc.py
+++ b/tools/dtoc/test_dtoc.py
@@ -47,7 +47,7 @@
*/
/* Allow use of U_BOOT_DRVINFO() in this file */
-#define DT_PLATDATA_C
+#define DT_PLAT_C
#include <common.h>
#include <dm.h>
@@ -979,5 +979,5 @@
leafs = set(os.path.basename(fname) for fname in fnames)
self.assertEqual(
- {'dt-structs-gen.h', 'source.dts', 'dt-platdata.c', 'source.dtb'},
+ {'dt-structs-gen.h', 'source.dts', 'dt-plat.c', 'source.dtb'},
leafs)