[PATCH] fix 2.4.8 compile errors

[PATCH] fix 2.4.8 compile errors

[Rich Baum]

This patch fixes two compile errors I get when compiling 2.4.8 on my K6-2.  
Both of these errors are caused by compiling drivers for other architectures. 
 I've changed the Config.in files to keep these options from being selected 
on the wrong architecture.

Let me know if you have any questions about this patch.

Rich

diff -urN -X dontdiff linux-2.4.8/drivers/net/Config.in 
rb/drivers/net/Config.in
--- linux-2.4.8/drivers/net/Config.in	Sat Aug 11 11:10:07 2001
+++ rb/drivers/net/Config.in	Mon Aug 13 20:43:41 2001
@@ -28,7 +28,8 @@
 
 bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET
 if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
-   dep_bool '  ARM EBSA110 AM79C961A support' CONFIG_ARM_AM79C961A 
$CONFIG_ARCH_EBSA110
+   if [ "$ARCH" = "arm" ]; then
+      dep_bool '  ARM EBSA110 AM79C961A support' CONFIG_ARM_AM79C961A 
$CONFIG_ARCH_EBSA110
    if [ "$CONFIG_ARCH_ACORN" = "y" ]; then
       source drivers/acorn/net/Config.in
    fi
diff -urN -X dontdiff linux-2.4.8/drivers/video/Config.in 
rb/drivers/video/Config.in
--- linux-2.4.8/drivers/video/Config.in	Sat Aug 11 11:10:30 2001
+++ rb/drivers/video/Config.in	Mon Aug 13 20:43:46 2001
@@ -103,7 +103,8 @@
    fi
    tristate '  NEC PowerVR 2 display support' CONFIG_FB_PVR2
    dep_bool '    Debug pvr2fb' CONFIG_FB_PVR2_DEBUG $CONFIG_FB_PVR2
-   bool '  Epson 1355 framebuffer support' CONFIG_FB_E1355
+   if [ "$ARCH" = "sh" ]; then
+      bool '  Epson 1355 framebuffer support' CONFIG_FB_E1355
    if [ "$CONFIG_FB_E1355" = "y" ]; then
       hex '    Register Base Address' CONFIG_E1355_REG_BASE a8000000
       hex '    Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000

Re: [PATCH] fix 2.4.8 compile errors

[Russell King]

On Mon, Aug 13, 2001 at 09:47:28PM -0500, Rich Baum wrote:
> This patch fixes two compile errors I get when compiling 2.4.8 on my K6-2.  
> Both of these errors are caused by compiling drivers for other architectures. 
>  I've changed the Config.in files to keep these options from being selected 
> on the wrong architecture.

Both of these look wrong from the if...fi point of view.  Please ensure
that all if's you add have a corresponding fi statement.

--
Russell King (rmk@arm.linux.org.uk)                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html

Re: [PATCH] fix 2.4.8 compile errors

[Nils Faerber]

[-- Attachment #1: Type: text/plain, Size: 2435 bytes --]

Rich Baum wrote:
> This patch fixes two compile errors I get when compiling 2.4.8 on my K6-2.
> Both of these errors are caused by compiling drivers for other architectures.
>  I've changed the Config.in files to keep these options from being selected
> on the wrong architecture.

The first hunk seems OK to me but the second one is a little crude.
There are also other architectures that use the Epson 1355 framebuffer;
we had for example a MIPS reference design from Toshiba here that had
that one. Limiting this to just SH architecture goes a little too far.

> Let me know if you have any questions about this patch.
> Rich
CU
  nils

> diff -urN -X dontdiff linux-2.4.8/drivers/net/Config.in
> rb/drivers/net/Config.in
> --- linux-2.4.8/drivers/net/Config.in   Sat Aug 11 11:10:07 2001
> +++ rb/drivers/net/Config.in    Mon Aug 13 20:43:41 2001
> @@ -28,7 +28,8 @@
> 
>  bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET
>  if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
> -   dep_bool '  ARM EBSA110 AM79C961A support' CONFIG_ARM_AM79C961A
> $CONFIG_ARCH_EBSA110
> +   if [ "$ARCH" = "arm" ]; then
> +      dep_bool '  ARM EBSA110 AM79C961A support' CONFIG_ARM_AM79C961A
> $CONFIG_ARCH_EBSA110
>     if [ "$CONFIG_ARCH_ACORN" = "y" ]; then
>        source drivers/acorn/net/Config.in
>     fi
> diff -urN -X dontdiff linux-2.4.8/drivers/video/Config.in
> rb/drivers/video/Config.in
> --- linux-2.4.8/drivers/video/Config.in Sat Aug 11 11:10:30 2001
> +++ rb/drivers/video/Config.in  Mon Aug 13 20:43:46 2001
> @@ -103,7 +103,8 @@
>     fi
>     tristate '  NEC PowerVR 2 display support' CONFIG_FB_PVR2
>     dep_bool '    Debug pvr2fb' CONFIG_FB_PVR2_DEBUG $CONFIG_FB_PVR2
> -   bool '  Epson 1355 framebuffer support' CONFIG_FB_E1355
> +   if [ "$ARCH" = "sh" ]; then
> +      bool '  Epson 1355 framebuffer support' CONFIG_FB_E1355
>     if [ "$CONFIG_FB_E1355" = "y" ]; then
>        hex '    Register Base Address' CONFIG_E1355_REG_BASE a8000000
>        hex '    Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000
> 
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

-- 
kernel concepts          Tel: +49-271-771091-12
Dreisbachstr. 24         Fax: +49-271-771091-19
D-57250 Netphen          D1 : +49-170-2729106
--

[-- Attachment #2: Card for Nils Faerber --]
[-- Type: text/x-vcard, Size: 322 bytes --]

begin:vcard 
n:Faerber;Nils
tel;cell:+49-170-2729106
tel;fax:+49-271-771091-19
tel;work:+49-271-771091-12
x-mozilla-html:FALSE
url:http://www.kernelconcepts.de
org:kernel concepts
adr:;;Dreisbachstrasse 24;Netphen;;57250;Germany
version:2.1
email;internet:nils@kernelconcepts.de
x-mozilla-cpt:;0
fn:Nils Faerber
end:vcard

Re: [PATCH] fix 2.4.8 compile errors

[Keith Owens]

On Tue, 14 Aug 2001 10:51:59 +0200, 
Nils Faerber <nils@kernelconcepts.de> wrote:
>The first hunk seems OK to me but the second one is a little crude.
>There are also other architectures that use the Epson 1355 framebuffer;
>we had for example a MIPS reference design from Toshiba here that had
>that one. Limiting this to just SH architecture goes a little too far.

Not unless you change the code.  drivers/video/epson1355fb.c
#ifdef CONFIG_SUPERH
...
#else
#error unknown architecture
#endif

Re: [PATCH] fix 2.4.8 compile errors

[Rich Baum]

Thanks for the input.  I've fixed this patch to include the fis.

Rich

diff -urN -X dontdiff linux-2.4.8/drivers/net/Config.in 
rb/drivers/net/Config.in
--- linux-2.4.8/drivers/net/Config.in	Sat Aug 11 11:10:07 2001
+++ rb/drivers/net/Config.in	Tue Aug 14 05:21:47 2001
@@ -28,7 +28,9 @@
 
 bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET
 if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
-   dep_bool '  ARM EBSA110 AM79C961A support' CONFIG_ARM_AM79C961A 
$CONFIG_ARCH_EBSA110
+   if [ "$ARCH" = "arm" ]; then
+      dep_bool '  ARM EBSA110 AM79C961A support' CONFIG_ARM_AM79C961A 
$CONFIG_ARCH_EBSA110
+   fi
    if [ "$CONFIG_ARCH_ACORN" = "y" ]; then
       source drivers/acorn/net/Config.in
    fi
diff -urN -X dontdiff linux-2.4.8/drivers/video/Config.in 
rb/drivers/video/Config.in
--- linux-2.4.8/drivers/video/Config.in	Sat Aug 11 11:10:30 2001
+++ rb/drivers/video/Config.in	Mon Aug 13 20:43:46 2001
@@ -103,7 +103,8 @@
    fi
    tristate '  NEC PowerVR 2 display support' CONFIG_FB_PVR2
    dep_bool '    Debug pvr2fb' CONFIG_FB_PVR2_DEBUG $CONFIG_FB_PVR2
-   bool '  Epson 1355 framebuffer support' CONFIG_FB_E1355
+   if [ "$ARCH" = "sh" ]; then
+      bool '  Epson 1355 framebuffer support' CONFIG_FB_E1355
    if [ "$CONFIG_FB_E1355" = "y" ]; then
       hex '    Register Base Address' CONFIG_E1355_REG_BASE a8000000
       hex '    Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000

Re: [PATCH] fix 2.4.8 compile errors

[Russell King]

On Tue, Aug 14, 2001 at 05:32:16AM -0500, Rich Baum wrote:
> Thanks for the input.  I've fixed this patch to include the fis.

You missed the one below.

> diff -urN -X dontdiff linux-2.4.8/drivers/video/Config.in rb/drivers/video/Config.in
> --- linux-2.4.8/drivers/video/Config.in	Sat Aug 11 11:10:30 2001
> +++ rb/drivers/video/Config.in	Mon Aug 13 20:43:46 2001
> @@ -103,7 +103,8 @@
>     fi
>     tristate '  NEC PowerVR 2 display support' CONFIG_FB_PVR2
>     dep_bool '    Debug pvr2fb' CONFIG_FB_PVR2_DEBUG $CONFIG_FB_PVR2
> -   bool '  Epson 1355 framebuffer support' CONFIG_FB_E1355
> +   if [ "$ARCH" = "sh" ]; then
> +      bool '  Epson 1355 framebuffer support' CONFIG_FB_E1355
>     if [ "$CONFIG_FB_E1355" = "y" ]; then
>        hex '    Register Base Address' CONFIG_E1355_REG_BASE a8000000
>        hex '    Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000

--
Russell King (rmk@arm.linux.org.uk)                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html

Re: [PATCH] fixed fix 2.4.8 compile errors

[Rich Baum]

Fixed.  Sorry.

On Tuesday 14 August 2001 05:44 am, you wrote:
> On Tue, Aug 14, 2001 at 05:32:16AM -0500, Rich Baum wrote:
> > Thanks for the input.  I've fixed this patch to include the fis.
>
> You missed the one below.
>

diff -urN -X dontdiff linux-2.4.8/drivers/video/Config.in 
rb/drivers/video/Config.in
--- linux-2.4.8/drivers/video/Config.in	Sat Aug 11 11:10:30 2001
+++ rb/drivers/video/Config.in	Mon Aug 13 20:43:46 2001
@@ -103,7 +103,8 @@
    fi
    tristate '  NEC PowerVR 2 display support' CONFIG_FB_PVR2
    dep_bool '    Debug pvr2fb' CONFIG_FB_PVR2_DEBUG $CONFIG_FB_PVR2
-   bool '  Epson 1355 framebuffer support' CONFIG_FB_E1355
+   if [ "$ARCH" = "sh" ]; then
+      bool '  Epson 1355 framebuffer support' CONFIG_FB_E1355
+   fi
    if [ "$CONFIG_FB_E1355" = "y" ]; then
       hex '    Register Base Address' CONFIG_E1355_REG_BASE a8000000
       hex '    Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000

Re: [PATCH] fix 2.4.8 compile errors

[Andrzej Krzysztofowicz]

"Rich Baum wrote:"
> diff -urN -X dontdiff linux-2.4.8/drivers/net/Config.in 
...
> +   if [ "$ARCH" = "arm" ]; then
...
> +   if [ "$ARCH" = "sh" ]; then

I don't remember the reason the ARCH variable was almost removed from
configuration some time ago (probably for better build dependencies check),
but wouldn't it better to replace the above by:

if [ "$CONFIG_ARM" = "y" ]; then

if [ "$CONFIG_SUPERH" = "y" ]; then

?

Andrzej
-- 
=======================================================================
  Andrzej M. Krzysztofowicz               ankry@mif.pg.gda.pl
  phone (48)(58) 347 14 61
Faculty of Applied Phys. & Math.,   Technical University of Gdansk