Skip to contentSkip to conversation

fix 2.4.8 compile errors

PATCH In review Rich Baum 5 participants 8 messages Aug 14, 2001

Subsystems (2)
Network drivers Framebuffer layer
lore
Share & tools
lore

Rich Baum

author
#0 lore raw

PATCH 1/1 fix 2.4.8 compile errors

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

drivers/net/Config.in +0 -1
@@ -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

drivers/video/Config.in +2 -1
@@ -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
#1 lore raw
Quoted 4 lines · 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.

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 ([email protected]) The developer of ARM Linux
http://www.arm.linux.org.uk/personal/aboutme.html

#2 lore raw
In reply to Rich Baum
Quoted 4 lines · 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.

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.

Quoted 2 lines

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

CU
nils

Quoted 36 lines

diff -urN -X dontdiff linux-2.4.8/drivers/net/Config.in rb/drivers/net/Config.in

drivers/net/Config.in Mon Aug 13 20:43:41 2001 renamed from drivers/net/Config.in Sat Aug 11 11:10:07 2001 +0 -1
@@ -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

drivers/net/Config.in Mon Aug 13 20:43:41 2001 renamed from drivers/net/Config.in Sat Aug 11 11:10:07 2001 +2 -0
+   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

drivers/video/Config.in Mon Aug 13 20:43:46 2001 renamed from drivers/video/Config.in Sat Aug 11 11:10:30 2001 +2 -2
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

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

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:[email protected]
x-mozilla-cpt:;0
fn:Nils Faerber
end:vcard

#3 lore raw
Quoted 4 lines · Nils Faerber

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

author
#4 lore raw
In reply to 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

drivers/net/Config.in +0 -1
@@ -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

drivers/video/Config.in +2 -1
@@ -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
#5 lore raw

"Rich Baum wrote:"

Quoted 1 line

diff -urN -X dontdiff linux-2.4.8/drivers/net/Config.in

...

Quoted 1 line

+ if [ "$ARCH" = "arm" ]; then

...

Quoted 1 line

+ 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

Signature · 4 lines
=======================================================================
  Andrzej M. Krzysztofowicz               [email protected]
  phone (48)(58) 347 14 61
Faculty of Applied Phys. & Math.,   Technical University of Gdansk
#6 lore raw
In reply to Rich Baum
Quoted 1 line · Rich Baum

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

You missed the one below.

drivers/video/Config.in line 110

Quoted 13 lines

diff -urN -X dontdiff linux-2.4.8/drivers/video/Config.in rb/drivers/video/Config.in

drivers/video/Config.in +2 -1
@@ -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 ([email protected]) The developer of ARM Linux
http://www.arm.linux.org.uk/personal/aboutme.html

author
#7 lore raw

Re: [PATCH] fixed fix 2.4.8 compile errors

In reply to Rich Baum

Fixed. Sorry.

Quoted 5 lines · you
Quoted 1 line · Rich Baum

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

drivers/video/Config.in +3 -1
@@ -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