From 93ff9542462ba5074fb6b6cd9e27c4fb04d452ec Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Sun, 16 Jan 2011 19:54:14 +0100 Subject: m68k: Kconfig - Remove unneeded "default n" Reported-by: Phillip Lougher Signed-off-by: Geert Uytterhoeven --- arch/m68k/Kconfig | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch/m68k/Kconfig') diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index bc9271b85759..cbe8b18e808b 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -18,11 +18,9 @@ config RWSEM_XCHGADD_ALGORITHM config ARCH_HAS_ILOG2_U32 bool - default n config ARCH_HAS_ILOG2_U64 bool - default n config GENERIC_HWEIGHT bool -- cgit v1.2.2 From 65cd577d5e61043d1c1aec5812dea8a5c834652d Mon Sep 17 00:00:00 2001 From: Petr Stehlik Date: Tue, 18 Nov 2008 21:02:18 +0100 Subject: m68k/atari: Initial ARAnyM support Add improved support for running under the ARAnyM emulator (Atari Running on Any Machine - http://aranym.org/). [michael, geert: Cleanups and updates] Signed-off-by: Petr Stehlik Signed-off-by: Michael Schmitz Signed-off-by: Geert Uytterhoeven --- arch/m68k/Kconfig | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'arch/m68k/Kconfig') diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index cbe8b18e808b..f668a5802a4a 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -240,6 +240,13 @@ config SUN3 If you don't want to compile a kernel exclusively for a Sun 3, say N. +config NATFEAT + bool "ARAnyM emulator support" + depends on ATARI + help + This option enables support for ARAnyM native features, such as + access to a disk image as /dev/hda. + comment "Processor type" config M68020 -- cgit v1.2.2 From b2edd2fd9b10c0cfc5a305eaf91587e6142b08f9 Mon Sep 17 00:00:00 2001 From: Roman Zippel Date: Tue, 18 Nov 2008 21:02:19 +0100 Subject: m68k/atari: ARAnyM - Add support for block access [geert: Cleanups and updates] Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven Acked-by: Petr Stehlik --- arch/m68k/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'arch/m68k/Kconfig') diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index f668a5802a4a..2c890b56c96e 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -247,6 +247,14 @@ config NATFEAT This option enables support for ARAnyM native features, such as access to a disk image as /dev/hda. +config NFBLOCK + tristate "NatFeat block device support" + depends on BLOCK && NATFEAT + help + Say Y to include support for the ARAnyM NatFeat block device + which allows direct access to the hard drives without using + the hardware emulation. + comment "Processor type" config M68020 -- cgit v1.2.2 From 37b0b65f6362269a4cb86ed8be1c0ac8caa497f8 Mon Sep 17 00:00:00 2001 From: Roman Zippel Date: Tue, 18 Nov 2008 21:02:19 +0100 Subject: m68k/atari: ARAnyM - Add support for console access [geert: Cleanups and updates] Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven Acked-by: Petr Stehlik --- arch/m68k/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'arch/m68k/Kconfig') diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 2c890b56c96e..6719c5629c5d 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -255,6 +255,14 @@ config NFBLOCK which allows direct access to the hard drives without using the hardware emulation. +config NFCON + tristate "NatFeat console driver" + depends on NATFEAT + help + Say Y to include support for the ARAnyM NatFeat console driver + which allows the console output to be redirected to the stderr + output of ARAnyM. + comment "Processor type" config M68020 -- cgit v1.2.2 From 9cd7b148312f6971f37cfac6a490688286bd1522 Mon Sep 17 00:00:00 2001 From: Milan Jurik Date: Tue, 18 Nov 2008 21:02:18 +0100 Subject: m68k/atari: ARAnyM - Add support for network access [petr: Second author] [michael, geert: Cleanups and updates] Signed-off-by: Milan Jurik Signed-off-by: Petr Stehlik Signed-off-by: Michael Schmitz Signed-off-by: Geert Uytterhoeven Cc: netdev@vger.kernel.org --- arch/m68k/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'arch/m68k/Kconfig') diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 6719c5629c5d..80df6ee7cac8 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -263,6 +263,14 @@ config NFCON which allows the console output to be redirected to the stderr output of ARAnyM. +config NFETH + tristate "NatFeat Ethernet support" + depends on NET_ETHERNET && NATFEAT + help + Say Y to include support for the ARAnyM NatFeat network device + which will emulate a regular ethernet device while presenting an + ethertap device to the host system. + comment "Processor type" config M68020 -- cgit v1.2.2