diff mbox series

[U-Boot] ARM: pxa: Remove unused ifdefs

Message ID 20171209015148.20088-1-tuomas.tynkkynen@iki.fi
State Accepted
Delegated to: Tom Rini
Headers show
Series [U-Boot] ARM: pxa: Remove unused ifdefs | expand

Commit Message

Tuomas Tynkkynen Dec. 9, 2017, 1:51 a.m. UTC
These ifdefs are protecting #include statements for files that have
never existed. AFAICT this hardware.h has been copied from the kernel
and the ifdefs have never served a role in U-Boot, so delete them.

Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
---
 arch/arm/include/asm/arch-pxa/hardware.h | 29 -----------------------------
 scripts/config_whitelist.txt             |  6 ------
 2 files changed, 35 deletions(-)

Comments

Tom Rini Dec. 13, 2017, 10:57 p.m. UTC | #1
On Sat, Dec 09, 2017 at 03:51:48AM +0200, Tuomas Tynkkynen wrote:

> These ifdefs are protecting #include statements for files that have
> never existed. AFAICT this hardware.h has been copied from the kernel
> and the ifdefs have never served a role in U-Boot, so delete them.
> 
> Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git arch/arm/include/asm/arch-pxa/hardware.h arch/arm/include/asm/arch-pxa/hardware.h
index e671c143ac..6d0023d7b8 100644
--- arch/arm/include/asm/arch-pxa/hardware.h
+++ arch/arm/include/asm/arch-pxa/hardware.h
@@ -79,33 +79,4 @@ 
 
 #endif
 
-
-/*
- * Implementation specifics
- */
-
-#ifdef CONFIG_ARCH_LUBBOCK
-#include "lubbock.h"
-#endif
-
-#ifdef CONFIG_ARCH_PXA_IDP
-#include "idp.h"
-#endif
-
-#ifdef CONFIG_ARCH_PXA_CERF
-#include "cerf.h"
-#endif
-
-#ifdef CONFIG_ARCH_CSB226
-#include "csb226.h"
-#endif
-
-#ifdef CONFIG_ARCH_INNOKOM
-#include "innokom.h"
-#endif
-
-#ifdef CONFIG_ARCH_PLEB
-#include "pleb.h"
-#endif
-
 #endif	/* _ASM_ARCH_HARDWARE_H */
diff --git scripts/config_whitelist.txt scripts/config_whitelist.txt
index d8d43756b4..b6a1233e82 100644
--- scripts/config_whitelist.txt
+++ scripts/config_whitelist.txt
@@ -45,18 +45,12 @@  CONFIG_APUS_FAST_EXCEPT
 CONFIG_AP_SH4A_4A
 CONFIG_ARCH_ADPAG101P
 CONFIG_ARCH_CPU_INIT
-CONFIG_ARCH_CSB226
 CONFIG_ARCH_HAS_ILOG2_U32
 CONFIG_ARCH_HAS_ILOG2_U64
-CONFIG_ARCH_INNOKOM
 CONFIG_ARCH_KIRKWOOD
-CONFIG_ARCH_LUBBOCK
 CONFIG_ARCH_MAP_SYSMEM
 CONFIG_ARCH_OMAP4
 CONFIG_ARCH_ORION5X
-CONFIG_ARCH_PLEB
-CONFIG_ARCH_PXA_CERF
-CONFIG_ARCH_PXA_IDP
 CONFIG_ARCH_RMOBILE_BOARD_STRING
 CONFIG_ARCH_RMOBILE_EXTRAM_BOOT
 CONFIG_ARCH_TEGRA