Skip to contentSkip to conversation

configs: Remove empty #ifdef/#ifndef blocks

PATCH New Chris Packham 2 participants 6 messages Jun 4, 2018 – Jun 19, 2018

Subsystems (4)
Arm (32-bit) Arm sub-architectures Arm/Allwinner sunXi SoC support m68k architecture
lore
Share & tools
lore

Chris Packham

author
#0 lore raw

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 <[email protected]>

---

 include/configs/UCP1020.h | 2 --
 include/configs/vme8349.h | 3 ---
 2 files changed, 5 deletions(-)
include/configs/UCP1020.h +0 -2
index fad1eabba336..f5c647870fc0 100644
@@ -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)
include/configs/vme8349.h +0 -3
index 0d8ae0b099b6..2456475f27ca 100644
@@ -257,9 +257,6 @@
 #undef PCI_ONE_PCI1
 #endif
 
-#ifndef VME_CADDY2
-#endif
-
 #undef CONFIG_EEPRO100
 #undef CONFIG_TULIP
Signature · 1 line
2.17.0
author
#1 lore raw

PATCH 2/3 m68k: Remove empty #ifdef/#ifndef block

Whatever code this was guarding has been removed so remove the guards too.

Signed-off-by Chris Packham <[email protected]>

---

 arch/m68k/include/asm/processor.h | 4 ----
 1 file changed, 4 deletions(-)
arch/m68k/include/asm/processor.h +0 -4
index 3fafa6ff1a8d..4af69190b737 100644
@@ -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 */
Signature · 1 line
2.17.0
#2 lore raw

PATCH 2/3 m68k: Remove empty #ifdef/#ifndef block

Quoted 4 lines · Chris Packham

Whatever code this was guarding has been removed so remove the guards too.

Signed-off-by Chris Packham <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180619/b7666ae3/attachment.sig>
author
#3 lore raw

PATCH 3/3 ARM: sunxi: remove empty #ifdef/endif block

In reply to Chris Packham

Whatever code this was guarding has been removed so remove the guards too.

Signed-off-by Chris Packham <[email protected]>

---

 arch/arm/mach-sunxi/board.c | 3 ---
 1 file changed, 3 deletions(-)
arch/arm/mach-sunxi/board.c +0 -3
index 7ac8360c0117..58fef05bd737 100644
@@ -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.
  */
Signature · 1 line
2.17.0
#4 lore raw

PATCH 3/3 ARM: sunxi: remove empty #ifdef/endif block

Quoted 4 lines · Chris Packham

Whatever code this was guarding has been removed so remove the guards too.

Signed-off-by Chris Packham <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180619/3ea37bff/attachment.sig>
#5 lore raw

PATCH 1/3 configs: Remove empty #ifdef/#ifndef blocks

In reply to Chris Packham
Quoted 4 lines · Chris Packham

Remove empty #ifdef/#ifndef..#endif blocks where the configuration they guarded has been completely removed.

Signed-off-by Chris Packham <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180619/4f5538b2/attachment.sig>