patch-2.1.132 linux/arch/arm/Makefile

Next file: linux/arch/arm/config.in
Previous file: linux/arch/alpha/kernel/sys_sio.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.131/linux/arch/arm/Makefile linux/arch/arm/Makefile
@@ -120,6 +120,7 @@
 endif
 
 ifeq ($(CONFIG_ARCH_VNC),y)
+TEXTADDR	 = 0xC000C000
 MACHINE		 = vnc
 ARCHDIR		 = vnc
 endif
@@ -141,7 +142,7 @@
 OBJDUMP		 = $(CROSS_COMPILE)objdump
 CPP		 = $(CC) -E
 ARCHCC		:= $(word 1,$(CC))
-GCCLIB		:= `$(ARCHCC) $(CFLAGS_PROC) --print-libgcc-file-name`
+GCCLIB		:= `$(CC) $(CFLAGS_PROC) --print-libgcc-file-name`
 #GCCARCH		:= -B/usr/bin/arm-linuxelf- 
 HOSTCFLAGS	:= $(CFLAGS:-fomit-frame-pointer=)
 ifeq ($(CONFIG_FRAME_POINTER),y)
@@ -160,10 +161,10 @@
 BLOCK_DRIVERS	:= drivers/block/block.a
 CDROM_DRIVERS	:= drivers/cdrom/cdrom.a
 ifeq ($(CONFIG_FB),y)
-CHAR_DRIVERS	:= arch/arm/drivers/char1/char.a
+CHAR_DRIVERS	:= arch/arm/drivers/char1/char1.a drivers/char/char.a arch/arm/drivers/char1/char1.a
 else
 ifeq ($(CONFIG_VGA_CONSOLE),y)
-CHAR_DRIVERS	:= arch/arm/drivers/char1/char.a
+CHAR_DRIVERS	:= arch/arm/drivers/char1/char1.a drivers/char/char.a arch/arm/drivers/char1/char1.a
 else
 CHAR_DRIVERS	:= arch/arm/drivers/char/char.a
 endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov