* [U-Boot] [PATCH 1/3] configs: Remove empty #ifdef/#ifndef blocks
@ 2018-06-04 9:45 Chris Packham
2018-06-04 9:45 ` [U-Boot] [PATCH 2/3] m68k: Remove empty #ifdef/#ifndef block Chris Packham
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Chris Packham @ 2018-06-04 9:45 UTC (permalink / raw)
To: u-boot
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
--
2.17.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 2/3] m68k: Remove empty #ifdef/#ifndef block
2018-06-04 9:45 [U-Boot] [PATCH 1/3] configs: Remove empty #ifdef/#ifndef blocks Chris Packham
@ 2018-06-04 9:45 ` Chris Packham
2018-06-19 18:40 ` [U-Boot] [U-Boot,2/3] " Tom Rini
2018-06-04 9:45 ` [U-Boot] [PATCH 3/3] ARM: sunxi: remove empty #ifdef/endif block Chris Packham
2018-06-19 18:40 ` [U-Boot] [U-Boot, 1/3] configs: Remove empty #ifdef/#ifndef blocks Tom Rini
2 siblings, 1 reply; 6+ messages in thread
From: Chris Packham @ 2018-06-04 9:45 UTC (permalink / raw)
To: u-boot
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 */
--
2.17.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 3/3] ARM: sunxi: remove empty #ifdef/endif block
2018-06-04 9:45 [U-Boot] [PATCH 1/3] configs: Remove empty #ifdef/#ifndef blocks Chris Packham
2018-06-04 9:45 ` [U-Boot] [PATCH 2/3] m68k: Remove empty #ifdef/#ifndef block Chris Packham
@ 2018-06-04 9:45 ` Chris Packham
2018-06-19 18:41 ` [U-Boot] [U-Boot, " Tom Rini
2018-06-19 18:40 ` [U-Boot] [U-Boot, 1/3] configs: Remove empty #ifdef/#ifndef blocks Tom Rini
2 siblings, 1 reply; 6+ messages in thread
From: Chris Packham @ 2018-06-04 9:45 UTC (permalink / raw)
To: u-boot
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.
*/
--
2.17.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [U-Boot, 1/3] configs: Remove empty #ifdef/#ifndef blocks
2018-06-04 9:45 [U-Boot] [PATCH 1/3] configs: Remove empty #ifdef/#ifndef blocks Chris Packham
2018-06-04 9:45 ` [U-Boot] [PATCH 2/3] m68k: Remove empty #ifdef/#ifndef block Chris Packham
2018-06-04 9:45 ` [U-Boot] [PATCH 3/3] ARM: sunxi: remove empty #ifdef/endif block Chris Packham
@ 2018-06-19 18:40 ` Tom Rini
2 siblings, 0 replies; 6+ messages in thread
From: Tom Rini @ 2018-06-19 18:40 UTC (permalink / raw)
To: u-boot
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!
--
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>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-06-19 18:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-04 9:45 [U-Boot] [PATCH 1/3] configs: Remove empty #ifdef/#ifndef blocks Chris Packham
2018-06-04 9:45 ` [U-Boot] [PATCH 2/3] m68k: Remove empty #ifdef/#ifndef block Chris Packham
2018-06-19 18:40 ` [U-Boot] [U-Boot,2/3] " Tom Rini
2018-06-04 9:45 ` [U-Boot] [PATCH 3/3] ARM: sunxi: remove empty #ifdef/endif block Chris Packham
2018-06-19 18:41 ` [U-Boot] [U-Boot, " Tom Rini
2018-06-19 18:40 ` [U-Boot] [U-Boot, 1/3] configs: Remove empty #ifdef/#ifndef blocks Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox