Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dtoc: Rename dt-platdata.c to dt-plat.c

Browse source 
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>
This commit is contained in:
Simon Glass 2020-12-28 20:35:01 -07:00
parent d1055d681a
commit f31fa99a9e
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/dm/platdata.h
View file

@ -59,7 +59,7 @@ struct driver_rt {
* When of-platdata is in use, U_BOOT_DRVINFO() cannot be used outside of the * When of-platdata is in use, U_BOOT_DRVINFO() cannot be used outside of the
* dt-plat.c file created by dtoc * 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, \ #define U_BOOT_DRVINFO(__name) _Static_assert(false, \
"Cannot use U_BOOT_DRVINFO with of-platdata. Please use devicetree instead") "Cannot use U_BOOT_DRVINFO with of-platdata. Please use devicetree instead")
#else #else

2
include/linux/mtd/spi-nor.h
View file

@ -262,7 +262,7 @@ struct spi_flash {
* Defined below (keep this text to enable searching for spi_flash decl) * 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 #define spi_flash spi_nor
#endif #endif

2
scripts/Makefile.spl
View file

@ -120,7 +120,7 @@ endif
u-boot-spl-init := $(head-y) u-boot-spl-init := $(head-y)
u-boot-spl-main := $(libs-y) u-boot-spl-main := $(libs-y)
ifdef CONFIG_$(SPL_TPL_)OF_PLATDATA 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)) u-boot-spl-platdata_c := $(patsubst %.o,%.c,$(u-boot-spl-platdata))
endif endif

4
tools/dtoc/dtb_platdata.py
View file

@ -796,7 +796,7 @@ class DtbPlatdata():
information. information.
""" """
self.out('/* Allow use of U_BOOT_DRVINFO() in this file */\n') 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('\n')
self.out('#include <common.h>\n') self.out('#include <common.h>\n')
self.out('#include <dm.h>\n') self.out('#include <dm.h>\n')
@ -832,7 +832,7 @@ OUTPUT_FILES = {
OutputFile(Ftype.HEADER, 'dt-structs-gen.h', OutputFile(Ftype.HEADER, 'dt-structs-gen.h',
'Defines the structs used to hold devicetree data'), 'Defines the structs used to hold devicetree data'),
'platdata': 'platdata':
OutputFile(Ftype.SOURCE, 'dt-platdata.c', OutputFile(Ftype.SOURCE, 'dt-plat.c',
'Declares the U_BOOT_DRIVER() records and platform data'), 'Declares the U_BOOT_DRIVER() records and platform data'),
} }

4
tools/dtoc/test_dtoc.py
View file

@ -47,7 +47,7 @@ C_HEADER = '''/*
*/ */
/* Allow use of U_BOOT_DRVINFO() in this file */ /* Allow use of U_BOOT_DRVINFO() in this file */
#define DT_PLATDATA_C #define DT_PLAT_C
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
@ -979,5 +979,5 @@ U_BOOT_DRVINFO(spl_test2) = {
leafs = set(os.path.basename(fname) for fname in fnames) leafs = set(os.path.basename(fname) for fname in fnames)
self.assertEqual( 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) leafs)