aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68knommu
diff options
context:
space:
mode:
Diffstat (limited to 'arch/m68knommu')
-rw-r--r--arch/m68knommu/Kconfig6
-rw-r--r--arch/m68knommu/Makefile1
-rw-r--r--arch/m68knommu/platform/5307/config.c2
3 files changed, 1 insertions, 8 deletions
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
405config eLIA
406 bool "Moreton Bay eLIA board support"
407 depends on M5307
408 help
409 Support for the Moreton Bay eLIA board.
410
411config SECUREEDGEMP3 405config 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
41board-$(CONFIG_M5275EVB) := M5275EVB 41board-$(CONFIG_M5275EVB) := M5275EVB
42board-$(CONFIG_M5282EVB) := M5282EVB 42board-$(CONFIG_M5282EVB) := M5282EVB
43board-$(CONFIG_ELITE) := eLITE 43board-$(CONFIG_ELITE) := eLITE
44board-$(CONFIG_eLIA) := eLIA
45board-$(CONFIG_NETtel) := NETtel 44board-$(CONFIG_NETtel) := NETtel
46board-$(CONFIG_SECUREEDGEMP3) := MP3 45board-$(CONFIG_SECUREEDGEMP3) := MP3
47board-$(CONFIG_CLEOPATRA) := CLEOPATRA 46board-$(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);