[U-Boot] [PATCH 1/3] configs: Remove empty #ifdef/#ifndef blocks
Remove empty #ifdef/#ifndef..#endif blocks where the configuration they guarded has been completely removed.
Signed-off-by: Chris Packham judge.packham@gmail.com ---
include/configs/UCP1020.h | 2 -- include/configs/vme8349.h | 3 --- 2 files changed, 5 deletions(-)
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index fad1eabba336..f5c647870fc0 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -68,8 +68,6 @@ #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_ETHPRIME "eTSEC1"
-#ifndef CONFIG_SPI_FLASH -#endif #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
#define CONFIG_SYS_L2_SIZE (256 << 10) diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index 0d8ae0b099b6..2456475f27ca 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -257,9 +257,6 @@ #undef PCI_ONE_PCI1 #endif
-#ifndef VME_CADDY2 -#endif - #undef CONFIG_EEPRO100 #undef CONFIG_TULIP
Whatever code this was guarding has been removed so remove the guards too.
Signed-off-by: Chris Packham judge.packham@gmail.com ---
arch/m68k/include/asm/processor.h | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h index 3fafa6ff1a8d..4af69190b737 100644 --- a/arch/m68k/include/asm/processor.h +++ b/arch/m68k/include/asm/processor.h @@ -11,8 +11,4 @@ n: /* Macros for setting and retrieving special purpose registers */ #define setvbr(v) asm volatile("movec %0,%%VBR" : : "r" (v))
-#ifndef __ASSEMBLY__ - -#endif /* ifndef ASSEMBLY*/ - #endif /* __ASM_M68K_PROCESSOR_H */
On Mon, Jun 04, 2018 at 09:45:22PM +1200, Chris Packham wrote:
Whatever code this was guarding has been removed so remove the guards too.
Signed-off-by: Chris Packham judge.packham@gmail.com
Applied to u-boot/master, thanks!
Whatever code this was guarding has been removed so remove the guards too.
Signed-off-by: Chris Packham judge.packham@gmail.com ---
arch/arm/mach-sunxi/board.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 7ac8360c0117..58fef05bd737 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -207,9 +207,6 @@ void s_init(void) eth_init_board(); }
-#ifdef CONFIG_SPL_BUILD -#endif - /* The sunxi internal brom will try to loader external bootloader * from mmc0, nand flash, mmc2. */
On Mon, Jun 04, 2018 at 09:45:23PM +1200, Chris Packham wrote:
Whatever code this was guarding has been removed so remove the guards too.
Signed-off-by: Chris Packham judge.packham@gmail.com
Applied to u-boot/master, thanks!
On Mon, Jun 04, 2018 at 09:45:21PM +1200, Chris Packham wrote:
Remove empty #ifdef/#ifndef..#endif blocks where the configuration they guarded has been completely removed.
Signed-off-by: Chris Packham judge.packham@gmail.com
Applied to u-boot/master, thanks!
participants (2)
-
Chris Packham -
Tom Rini