Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e8b0416 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] integrator,realview,versatile: remove FLASH_* and EPROM_* constants 



FLASH_* and EPROM_* constants are unused, and clash with drivers:

drivers/atm/ambassador.h:257:1: warning: "FLASH_BASE" redefined
drivers/atm/ambassador.h:258:1: warning: "FLASH_SIZE" redefined
drivers/atm/iphase.h:332:1: warning: "EPROM_SIZE" redefined

so remove them.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9fa76792

arch/arm/mach-integrator/include/mach/platform.h

+1 −18
Original line number Diff line number Diff line
@@ -407,28 +407,11 @@ 
 */

#define uHAL_MEMORY_SIZE                INTEGRATOR_SSRAM_SIZE



/*

 *  Application Flash

 *

 */

#define FLASH_BASE                      INTEGRATOR_FLASH_BASE

#define FLASH_SIZE                      INTEGRATOR_FLASH_SIZE

#define FLASH_END                       (FLASH_BASE + FLASH_SIZE - 1)

#define FLASH_BLOCK_SIZE                SZ_128K



/*

 *  Boot Flash

 *

 */

#define EPROM_BASE                      INTEGRATOR_BOOT_ROM_HI

#define EPROM_SIZE                      INTEGRATOR_BOOT_ROM_SIZE

#define EPROM_END                       (EPROM_BASE + EPROM_SIZE - 1)



/*

 *  Clean base - dummy

 *

 */

#define CLEAN_BASE                      EPROM_BASE

#define CLEAN_BASE                      INTEGRATOR_BOOT_ROM_HI



/*

 *  Timer definitions

arch/arm/mach-realview/include/mach/platform.h

+1 −18
Original line number Diff line number Diff line
@@ -238,28 +238,11 @@ 
#define REALVIEW_INTREG_OFFSET		0x8	/* Interrupt control */

#define REALVIEW_DECODE_OFFSET		0xC	/* Fitted logic modules */



/* 

 *  Application Flash

 * 

 */

#define FLASH_BASE                      REALVIEW_FLASH_BASE

#define FLASH_SIZE                      REALVIEW_FLASH_SIZE

#define FLASH_END                       (FLASH_BASE + FLASH_SIZE - 1)

#define FLASH_BLOCK_SIZE                SZ_128K



/* 

 *  Boot Flash

 * 

 */

#define EPROM_BASE                      REALVIEW_BOOT_ROM_HI

#define EPROM_SIZE                      REALVIEW_BOOT_ROM_SIZE

#define EPROM_END                       (EPROM_BASE + EPROM_SIZE - 1)



/* 

 *  Clean base - dummy

 * 

 */

#define CLEAN_BASE                      EPROM_BASE

#define CLEAN_BASE                      REALVIEW_BOOT_ROM_HI



/*

 * System controller bit assignment

arch/arm/mach-versatile/include/mach/platform.h

+1 −17
Original line number Diff line number Diff line
@@ -436,28 +436,12 @@ 
#define SIC_INTMASK_PCI1                (1 << SIC_INT_PCI1)

#define SIC_INTMASK_PCI2                (1 << SIC_INT_PCI2)

#define SIC_INTMASK_PCI3                (1 << SIC_INT_PCI3)

/* 

 *  Application Flash

 * 

 */

#define FLASH_BASE                      VERSATILE_FLASH_BASE

#define FLASH_SIZE                      VERSATILE_FLASH_SIZE

#define FLASH_END                       (FLASH_BASE + FLASH_SIZE - 1)

#define FLASH_BLOCK_SIZE                SZ_128K



/* 

 *  Boot Flash

 * 

 */

#define EPROM_BASE                      VERSATILE_BOOT_ROM_HI

#define EPROM_SIZE                      VERSATILE_BOOT_ROM_SIZE

#define EPROM_END                       (EPROM_BASE + EPROM_SIZE - 1)



/* 

 *  Clean base - dummy

 * 

 */

#define CLEAN_BASE                      EPROM_BASE

#define CLEAN_BASE                      VERSATILE_BOOT_ROM_HI



/*

 * System controller bit assignment