diff options
| -rw-r--r-- | arch/m68k/include/asm/system_no.h | 2 | ||||
| -rw-r--r-- | arch/m68knommu/Kconfig | 6 | ||||
| -rw-r--r-- | arch/m68knommu/Makefile | 1 | ||||
| -rw-r--r-- | arch/m68knommu/platform/5307/config.c | 2 |
4 files changed, 2 insertions, 9 deletions
diff --git a/arch/m68k/include/asm/system_no.h b/arch/m68k/include/asm/system_no.h index 40f49de69821..4496c0aa8379 100644 --- a/arch/m68k/include/asm/system_no.h +++ b/arch/m68k/include/asm/system_no.h | |||
| @@ -230,7 +230,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz | |||
| 230 | jmp 0xf0000400; \ | 230 | jmp 0xf0000400; \ |
| 231 | "); \ | 231 | "); \ |
| 232 | }) | 232 | }) |
| 233 | #elif defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \ | 233 | #elif defined(CONFIG_NETtel) || \ |
| 234 | defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA) | 234 | defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA) |
| 235 | #define HARD_RESET_NOW() ({ \ | 235 | #define HARD_RESET_NOW() ({ \ |
| 236 | asm(" \ | 236 | asm(" \ |
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index d53268744a41..2c70ca45aeab 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig | |||
| @@ -402,12 +402,6 @@ config M5307C3 | |||
| 402 | help | 402 | help |
| 403 | Support for the Motorola M5307C3 board. | 403 | Support for the Motorola M5307C3 board. |
| 404 | 404 | ||
| 405 | config eLIA | ||
| 406 | bool "Moreton Bay eLIA board support" | ||
| 407 | depends on M5307 | ||
| 408 | help | ||
| 409 | Support for the Moreton Bay eLIA board. | ||
| 410 | |||
| 411 | config SECUREEDGEMP3 | 405 | config SECUREEDGEMP3 |
| 412 | bool "SnapGear SecureEdge/MP3 platform support" | 406 | bool "SnapGear SecureEdge/MP3 platform support" |
| 413 | depends on M5307 | 407 | depends on M5307 |
diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile index b63bbcf874ff..fd0fb303d885 100644 --- a/arch/m68knommu/Makefile +++ b/arch/m68knommu/Makefile | |||
| @@ -41,7 +41,6 @@ board-$(CONFIG_M5271EVB) := M5271EVB | |||
| 41 | board-$(CONFIG_M5275EVB) := M5275EVB | 41 | board-$(CONFIG_M5275EVB) := M5275EVB |
| 42 | board-$(CONFIG_M5282EVB) := M5282EVB | 42 | board-$(CONFIG_M5282EVB) := M5282EVB |
| 43 | board-$(CONFIG_ELITE) := eLITE | 43 | board-$(CONFIG_ELITE) := eLITE |
| 44 | board-$(CONFIG_eLIA) := eLIA | ||
| 45 | board-$(CONFIG_NETtel) := NETtel | 44 | board-$(CONFIG_NETtel) := NETtel |
| 46 | board-$(CONFIG_SECUREEDGEMP3) := MP3 | 45 | board-$(CONFIG_SECUREEDGEMP3) := MP3 |
| 47 | board-$(CONFIG_CLEOPATRA) := CLEOPATRA | 46 | board-$(CONFIG_CLEOPATRA) := CLEOPATRA |
diff --git a/arch/m68knommu/platform/5307/config.c b/arch/m68knommu/platform/5307/config.c index 11cff6625dcc..724faf05852a 100644 --- a/arch/m68knommu/platform/5307/config.c +++ b/arch/m68knommu/platform/5307/config.c | |||
| @@ -123,7 +123,7 @@ void __init config_BSP(char *commandp, int size) | |||
| 123 | { | 123 | { |
| 124 | mcf_setimr(MCFSIM_IMR_MASKALL); | 124 | mcf_setimr(MCFSIM_IMR_MASKALL); |
| 125 | 125 | ||
| 126 | #if defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \ | 126 | #if defined(CONFIG_NETtel) || \ |
| 127 | defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA) | 127 | defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA) |
| 128 | /* Copy command line from FLASH to local buffer... */ | 128 | /* Copy command line from FLASH to local buffer... */ |
| 129 | memcpy(commandp, (char *) 0xf0004000, size); | 129 | memcpy(commandp, (char *) 0xf0004000, size); |
