Re: [U-Boot] [PATCH v3 1/5] MIPS: drop asm/const.h
Am Do., 8. Nov. 2018 um 13:29 Uhr schrieb Baruch Siach : > > Commit 86f21c96f467368 (mips: Use common _AC macro now.) removed the _AC > definition from const.h. All other macros defined in const.h are not > used anywhere. Remove this header. > > Cc: Daniel Schwierzeck > Signed-off-by: Baruch Siach > --- > v3: New patch in this series > --- > arch/mips/include/asm/const.h | 27 - > arch/mips/include/asm/mach-generic/spaces.h | 2 -- > 2 files changed, 29 deletions(-) > delete mode 100644 arch/mips/include/asm/const.h > > diff --git a/arch/mips/include/asm/const.h b/arch/mips/include/asm/const.h > deleted file mode 100644 > index ed43b5d534ac.. > --- a/arch/mips/include/asm/const.h > +++ /dev/null > @@ -1,27 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > -/* > - * const.h: Macros for dealing with constants. > - */ > - > -#ifndef _LINUX_CONST_H > -#define _LINUX_CONST_H > - > -/* Some constant macros are used in both assembler and > - * C code. Therefore we cannot annotate them always with > - * 'UL' and other type specifiers unilaterally. We > - * use the following macros to deal with this. > - * > - * Similarly, _AT() will cast an expression with a type in C, but > - * leave it unchanged in asm. > - */ > - > -#ifdef __ASSEMBLY__ > -#define _AT(T,X) X > -#else > -#define _AT(T,X) ((T)(X)) > -#endif > - > -#define _BITUL(x) (_AC(1,UL) << (x)) > -#define _BITULL(x) (_AC(1,ULL) << (x)) > - > -#endif /* !(_LINUX_CONST_H) */ The removal of arch/mips/include/asm/const.h should be a standalone patch after patch 3/5 (after switching MIPS to generic linux/const.h, see comment below). > diff --git a/arch/mips/include/asm/mach-generic/spaces.h > b/arch/mips/include/asm/mach-generic/spaces.h > index b7eac323cd67..85f5849abfbe 100644 > --- a/arch/mips/include/asm/mach-generic/spaces.h > +++ b/arch/mips/include/asm/mach-generic/spaces.h > @@ -7,8 +7,6 @@ > #ifndef _ASM_MACH_GENERIC_SPACES_H > #define _ASM_MACH_GENERIC_SPACES_H > > -#include > - > /* > * This gives the physical RAM offset. > */ This hunk should be squashed into patch 3/5. > -- > 2.19.1 > -- - Daniel ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/5] MIPS: drop asm/const.h
On Thu, Nov 08, 2018 at 02:24:10PM +0200, Baruch Siach wrote: > Commit 86f21c96f467368 (mips: Use common _AC macro now.) removed the _AC > definition from const.h. All other macros defined in const.h are not > used anywhere. Remove this header. > > Cc: Daniel Schwierzeck > Signed-off-by: Baruch Siach > --- > v3: New patch in this series > --- This should be patch #2 and switch asm/mach/spaces.h to using I think. -- Tom signature.asc Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v3 1/5] MIPS: drop asm/const.h
Commit 86f21c96f467368 (mips: Use common _AC macro now.) removed the _AC definition from const.h. All other macros defined in const.h are not used anywhere. Remove this header. Cc: Daniel Schwierzeck Signed-off-by: Baruch Siach --- v3: New patch in this series --- arch/mips/include/asm/const.h | 27 - arch/mips/include/asm/mach-generic/spaces.h | 2 -- 2 files changed, 29 deletions(-) delete mode 100644 arch/mips/include/asm/const.h diff --git a/arch/mips/include/asm/const.h b/arch/mips/include/asm/const.h deleted file mode 100644 index ed43b5d534ac.. --- a/arch/mips/include/asm/const.h +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * const.h: Macros for dealing with constants. - */ - -#ifndef _LINUX_CONST_H -#define _LINUX_CONST_H - -/* Some constant macros are used in both assembler and - * C code. Therefore we cannot annotate them always with - * 'UL' and other type specifiers unilaterally. We - * use the following macros to deal with this. - * - * Similarly, _AT() will cast an expression with a type in C, but - * leave it unchanged in asm. - */ - -#ifdef __ASSEMBLY__ -#define _AT(T,X) X -#else -#define _AT(T,X) ((T)(X)) -#endif - -#define _BITUL(x) (_AC(1,UL) << (x)) -#define _BITULL(x) (_AC(1,ULL) << (x)) - -#endif /* !(_LINUX_CONST_H) */ diff --git a/arch/mips/include/asm/mach-generic/spaces.h b/arch/mips/include/asm/mach-generic/spaces.h index b7eac323cd67..85f5849abfbe 100644 --- a/arch/mips/include/asm/mach-generic/spaces.h +++ b/arch/mips/include/asm/mach-generic/spaces.h @@ -7,8 +7,6 @@ #ifndef _ASM_MACH_GENERIC_SPACES_H #define _ASM_MACH_GENERIC_SPACES_H -#include - /* * This gives the physical RAM offset. */ -- 2.19.1 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
