Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

binman: Use unsigned long over typedef ulong

Browse source 
The header binman_sym.h depends on ulong typedef but does not include
types.h. This means the header must be included after including types.h
or a header that includes it.

We could include types.h but instead let's just switch from ulong
to directly using unsigned long. This removes the need for typedef'ing
it in some of the tests, so also remove those.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Andrew Davis 2023-04-04 13:45:41 -05:00 committed by Simon Glass
parent b52d6de207
commit c71ee7e163
4 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/binman_sym.h
View file

@ -71,7 +71,7 @@
* value #defined above. This is used to check at runtime if the * value #defined above. This is used to check at runtime if the
* symbol values were filled in and are OK to use. * symbol values were filled in and are OK to use.
*/ */
extern ulong _binman_sym_magic; extern unsigned long _binman_sym_magic;
/** /**
* DECLARE_BINMAN_MAGIC_SYM - Declare the internal magic symbol * DECLARE_BINMAN_MAGIC_SYM - Declare the internal magic symbol
@ -81,7 +81,7 @@ extern ulong _binman_sym_magic;
* definitions of the symbol. * definitions of the symbol.
*/ */
#define DECLARE_BINMAN_MAGIC_SYM \ #define DECLARE_BINMAN_MAGIC_SYM \
ulong _binman_sym_magic \ unsigned long _binman_sym_magic \
__attribute__((aligned(4), section(".binman_sym"))) __attribute__((aligned(4), section(".binman_sym")))
/** /**
@ -93,14 +93,14 @@ extern ulong _binman_sym_magic;
* Return: 1 if binman symbol values are usable, 0 if not * Return: 1 if binman symbol values are usable, 0 if not
*/ */
#define BINMAN_SYMS_OK \ #define BINMAN_SYMS_OK \
(*(ulong *)&_binman_sym_magic == BINMAN_SYM_MAGIC_VALUE) (*(unsigned long *)&_binman_sym_magic == BINMAN_SYM_MAGIC_VALUE)
/** /**
* binman_sym() - Access a previously declared symbol * binman_sym() - Access a previously declared symbol
* *
* This is used to get the value of a symbol. E.g.: * This is used to get the value of a symbol. E.g.:
* *
* ulong address = binman_sym(ulong, u_boot_spl, pos); * unsigned long address = binman_sym(unsigned long, u_boot_spl, pos);
* *
* @_type: Type f the symbol (e.g. unsigned long) * @_type: Type f the symbol (e.g. unsigned long)
* @entry_name: Name of the entry to look for (e.g. 'u_boot_spl') * @entry_name: Name of the entry to look for (e.g. 'u_boot_spl')

2
tools/binman/test/blob_syms.c
View file

@ -5,8 +5,6 @@
* Simple program to create some binman symbols. This is used by binman tests. * Simple program to create some binman symbols. This is used by binman tests.
*/ */
typedef unsigned long ulong;
#include <linux/kconfig.h> #include <linux/kconfig.h>
#include <binman_sym.h> #include <binman_sym.h>

2
tools/binman/test/u_boot_binman_syms.c
View file

@ -5,8 +5,6 @@
* Simple program to create some binman symbols. This is used by binman tests. * Simple program to create some binman symbols. This is used by binman tests.
*/ */
typedef unsigned long ulong;
#include <linux/kconfig.h> #include <linux/kconfig.h>
#include <binman_sym.h> #include <binman_sym.h>

2
tools/binman/test/u_boot_binman_syms_size.c
View file

@ -5,8 +5,6 @@
* Simple program to create some binman symbols. This is used by binman tests. * Simple program to create some binman symbols. This is used by binman tests.
*/ */
typedef unsigned long ulong;
#include <linux/kconfig.h> #include <linux/kconfig.h>
#include <binman_sym.h> #include <binman_sym.h>