Menu
▾
▴
[LV-kern-commit] CVS: kernel-2.4/arch/sh Makefile,1.1.1.1,1.2 config.in,1.1.1.1,1.2 defconfig,1.1.1.1,1.2 vmlinux.lds.S,1.1.1.1,1.2
|
From: Andy P. <at...@us...> - 2002-04-09 17:07:28
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/sh
In directory usw-pr-cvs1:/tmp/cvs-serv15874/sh
Modified Files:
Makefile config.in defconfig vmlinux.lds.S
Log Message:
synch 2.4.15 commit 30
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sh/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 14 Jan 2001 19:48:19 -0000 1.1.1.1
+++ Makefile 9 Apr 2002 17:07:20 -0000 1.2
@@ -12,11 +12,6 @@
# this architecture
#
-#
-# Select the object file format to substitute into the linker script.
-#
-tool_prefix = sh-linux-gnu-
-
ifdef CONFIG_CPU_LITTLE_ENDIAN
CFLAGS += -ml
AFLAGS += -ml
@@ -29,10 +24,6 @@
LDFLAGS := -EB
endif
-# ifdef CONFIG_CROSSCOMPILE
-CROSS_COMPILE = $(tool_prefix)
-# endif
-
LD =$(CROSS_COMPILE)ld $(LDFLAGS)
OBJCOPY=$(CROSS_COMPILE)objcopy -O binary -R .note -R .comment -R .stab -R .stabstr -S
@@ -46,8 +37,8 @@
AFLAGS += -m3
endif
ifdef CONFIG_CPU_SH4
-CFLAGS += -m4-nofpu
-AFLAGS += -m4-nofpu
+CFLAGS += -m4 -mno-implicit-fp
+AFLAGS += -m4 -mno-implicit-fp
endif
#
@@ -75,6 +66,11 @@
MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
+ifneq ($(CONFIG_SH_GENERIC)$(CONFIG_SH_STB1_HARP)$(CONFIG_SH_STB1_OVERDRIVE),)
+SUBDIRS += arch/sh/stboards
+CORE_FILES += arch/sh/stboards/stboards.o
+endif
+
vmlinux: arch/sh/vmlinux.lds
arch/sh/vmlinux.lds: arch/sh/vmlinux.lds.S FORCE
@@ -93,6 +89,7 @@
archclean:
@$(MAKEBOOT) clean
$(MAKE) -C arch/$(ARCH)/kernel clean
+ $(MAKE) -C arch/$(ARCH)/stboards clean
# $(MAKE) -C arch/$(ARCH)/tools clean
archmrproper:
Index: config.in
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sh/config.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- config.in 14 Jan 2001 19:48:20 -0000 1.1.1.1
+++ config.in 9 Apr 2002 17:07:20 -0000 1.2
@@ -7,6 +7,8 @@
define_bool CONFIG_SUPERH y
define_bool CONFIG_UID16 y
+define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y
+define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n
mainmenu_option next_comment
comment 'Code maturity level options'
@@ -27,7 +29,9 @@
choice 'SuperH system type' \
"Generic CONFIG_SH_GENERIC \
SolutionEngine CONFIG_SH_SOLUTION_ENGINE \
- Overdrive CONFIG_SH_OVERDRIVE \
+ SolutionEngine7751 CONFIG_SH_7751_SOLUTION_ENGINE \
+ STB1_Harp CONFIG_SH_STB1_HARP \
+ STB1_Overdrive CONFIG_SH_STB1_OVERDRIVE \
HP620 CONFIG_SH_HP620 \
HP680 CONFIG_SH_HP680 \
HP690 CONFIG_SH_HP690 \
@@ -35,9 +39,18 @@
DMIDA CONFIG_SH_DMIDA \
EC3104 CONFIG_SH_EC3104 \
Dreamcast CONFIG_SH_DREAMCAST \
+ CAT68701 CONFIG_SH_CAT68701 \
+ BigSur CONFIG_SH_BIGSUR \
+ SH2000 CONFIG_SH_SH2000 \
+ ADX CONFIG_SH_ADX \
BareCPU CONFIG_SH_UNKNOWN" Generic
-define_bool CONFIG_SH_RTC y
+# The SH7750 RTC module is disabled in the Dreamcast
+if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then
+ define_bool CONFIG_SH_RTC n
+else
+ define_bool CONFIG_SH_RTC y
+fi
if [ "$CONFIG_SH_HP620" = "y" -o "$CONFIG_SH_HP680" = "y" -o \
"$CONFIG_SH_HP690" = "y" ]; then
@@ -48,7 +61,9 @@
"SH7707 CONFIG_CPU_SUBTYPE_SH7707 \
SH7708 CONFIG_CPU_SUBTYPE_SH7708 \
SH7709 CONFIG_CPU_SUBTYPE_SH7709 \
- SH7750 CONFIG_CPU_SUBTYPE_SH7750" SH7708
+ SH7750 CONFIG_CPU_SUBTYPE_SH7750 \
+ SH7751 CONFIG_CPU_SUBTYPE_SH7751 \
+ ST40STB1 CONFIG_CPU_SUBTYPE_ST40STB1" SH7708
if [ "$CONFIG_CPU_SUBTYPE_SH7707" = "y" ]; then
define_bool CONFIG_CPU_SH3 y
define_bool CONFIG_CPU_SH4 n
@@ -65,15 +80,58 @@
define_bool CONFIG_CPU_SH3 n
define_bool CONFIG_CPU_SH4 y
fi
+if [ "$CONFIG_CPU_SUBTYPE_SH7751" = "y" ]; then
+ define_bool CONFIG_CPU_SH3 n
+ define_bool CONFIG_CPU_SH4 y
+fi
+if [ "$CONFIG_CPU_SUBTYPE_ST40STB1" = "y" ]; then
+ define_bool CONFIG_CPU_SH3 n
+ define_bool CONFIG_CPU_SH4 y
+fi
bool 'Little Endian' CONFIG_CPU_LITTLE_ENDIAN
-if [ "$CONFIG_SH_SOLUTION_ENGINE" = "y" -o "$CONFIG_SH_HP600" = "y" -o \
- "$CONFIG_SH_OVERDRIVE" = "y" ]; then
- define_hex CONFIG_MEMORY_START 0c000000
-else
- hex 'Physical memory start address' CONFIG_MEMORY_START 08000000
+# Platform-specific memory start and size definitions
+if [ "$CONFIG_SH_SOLUTION_ENGINE" = "y" ]; then
+ define_hex CONFIG_MEMORY_START 0c000000
+ define_hex CONFIG_MEMORY_SIZE 02000000
+ define_bool CONFIG_MEMORY_SET y
+fi
+if [ "$CONFIG_SH_7751_SOLUTION_ENGINE" = "y" ]; then
+ define_hex CONFIG_MEMORY_START 0c000000
+ define_hex CONFIG_MEMORY_SIZE 04000000
+ define_bool CONFIG_MEMORY_SET y
+fi
+if [ "$CONFIG_SH_HP600" = "y" -o "$CONFIG_SH_BIGSUR" = "y" -o \
+ "$CONFIG_SH_DREAMCAST" = "y" -o "$CONFIG_SH_SH2000" = "y" ]; then
+ define_hex CONFIG_MEMORY_START 0c000000
+ define_hex CONFIG_MEMORY_SIZE 00400000
+ define_bool CONFIG_MEMORY_SET y
+fi
+if [ "$CONFIG_CPU_SUBTYPE_ST40STB1" = "y" ]; then
+ bool 'Memory on LMI' CONFIG_ST40_LMI_MEMORY
+ if [ "$CONFIG_ST40_LMI_MEMORY" = "y" ] ; then
+ define_hex CONFIG_MEMORY_START 08000000
+ define_hex CONFIG_MEMORY_SIZE 00400000
+ define_bool CONFIG_MEMORY_SET y
+ fi
+fi
+if [ "$CONFIG_SH_ADX" = "y" ]; then
+ define_hex CONFIG_MEMORY_START 08000000
+ define_hex CONFIG_MEMORY_SIZE 00400000
+ define_bool CONFIG_MEMORY_SET y
+fi
+# If none of the above have set memory start/size, ask the user.
+if [ "$CONFIG_MEMORY_SET" != "y" ]; then
+ hex 'Physical memory start address' CONFIG_MEMORY_START 08000000
+ hex 'Physical memory size' CONFIG_MEMORY_SIZE 00400000
fi
endmenu
+if [ "$CONFIG_SH_HP690" = "y" ]; then
+ define_bool CONFIG_DISCONTIGMEM y
+else
+ define_bool CONFIG_DISCONTIGMEM n
+fi
+
mainmenu_option next_comment
comment 'General setup'
@@ -87,10 +145,24 @@
bool 'Networking support' CONFIG_NET
-if [ "$CONFIG_SH_GENERIC" = "y" -o "$CONFIG_SH_SOLUTION_ENGINE" = "y" -o "$CONFIG_SH_UNKNOWN" = "y" ]; then
+if [ "$CONFIG_SH_GENERIC" = "y" -o "$CONFIG_SH_SOLUTION_ENGINE" = "y" -o \
+ "$CONFIG_SH_UNKNOWN" = "y" -o "$CONFIG_SH_CAT68701" = "y" -o \
+ "$CONFIG_SH_ADX" = "y" ]; then
bool 'Compact Flash Enabler support' CONFIG_CF_ENABLER
fi
+if [ "$CONFIG_CF_ENABLER" = "y" ]; then
+ choice 'Compact Flash Connection Area' \
+ "Area5 CONFIG_CF_AREA5 \
+ Area6 CONFIG_CF_AREA6" Area6
+ if [ "$CONFIG_CF_AREA5" = "y" ]; then
+ define_hex CONFIG_CF_BASE_ADDR b4000000
+ fi
+ if [ "$CONFIG_CF_AREA6" = "y" ]; then
+ define_hex CONFIG_CF_BASE_ADDR b8000000
+ fi
+fi
+
bool 'Hitachi HD64461 companion chip support' CONFIG_HD64461
if [ "$CONFIG_HD64461" = "y" ]; then
int 'HD64461 IRQ' CONFIG_HD64461_IRQ 36
@@ -99,9 +171,12 @@
bool 'Hitachi HD64465 companion chip support' CONFIG_HD64465
if [ "$CONFIG_HD64465" = "y" ]; then
+ hex 'HD64465 start address' CONFIG_HD64465_IOBASE b0000000
int 'HD64465 IRQ' CONFIG_HD64465_IRQ 5
fi
+bool 'DMA controller (DMAC) support' CONFIG_SH_DMA
+
bool 'PCI support' CONFIG_PCI
if [ "$CONFIG_PCI" = "y" ]; then
choice ' PCI access mode' \
@@ -114,6 +189,7 @@
if [ "$CONFIG_PCI_GODIRECT" = "y" -o "$CONFIG_PCI_GOANY" = "y" ]; then
define_bool CONFIG_PCI_DIRECT y
fi
+ define_bool CONFIG_SH_PCIDMA_NONCOHERENT n
fi
source drivers/pci/Config.in
@@ -190,11 +266,24 @@
endmenu
fi
+mainmenu_option next_comment
+comment 'Old CD-ROM drivers (not SCSI, not IDE)'
+
+bool 'Support non-SCSI/IDE/ATAPI CDROM drives' CONFIG_CD_NO_IDESCSI
+if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then
+ source drivers/cdrom/Config.in
+fi
+endmenu
+
#
# input before char - char/joystick depends on it. As does USB.
#
source drivers/input/Config.in
+if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then
+ source drivers/maple/Config.in
+fi
+
mainmenu_option next_comment
comment 'Character devices'
@@ -215,10 +304,29 @@
fi
if [ "$CONFIG_SH_GENERIC" = "y" -o \
- "$CONFIG_SH_OVERDRIVE" = "y" -o "$CONFIG_SH_SOLUTION_ENGINE" = "y" ]; then
- bool 'Heartbeat LED' CONFIG_HEARTBEAT
+ "$CONFIG_SH_CAT68701" = "y" -o \
+ "$CONFIG_SH_STB1_HARP" = "y" -o \
+ "$CONFIG_SH_STB1_OVERDRIVE" = "y" -o \
+ "$CONFIG_SH_BIGSUR" = "y" -o \
+ "$CONFIG_SH_7751_SOLUTION_ENGINE" = "y" -o \
+ "$CONFIG_SH_SOLUTION_ENGINE" = "y" ]; then
+ bool 'Heartbeat LED' CONFIG_HEARTBEAT
+fi
+
+if [ "$CONFIG_SH_DREAMCAST" = "y" -a "$CONFIG_MAPLE" != "n" ]; then
+ mainmenu_option next_comment
+ comment 'Maple Bus input peripherals'
+ if [ "$CONFIG_INPUT" != "n" ]; then
+ dep_tristate ' Maple Bus keyboard support' CONFIG_MAPLE_KEYBOARD $CONFIG_INPUT
+ dep_tristate ' Maple Bus mouse support' CONFIG_MAPLE_MOUSE $CONFIG_INPUT
+ else
+ comment 'Input core support is required for Maple input peripherals'
+ fi
+ endmenu
fi
+source drivers/char/joystick/Config.in
+
if [ "$CONFIG_PARPORT" != "n" ]; then
dep_tristate 'Parallel printer support' CONFIG_PRINTER $CONFIG_PARPORT
if [ "$CONFIG_PRINTER" != "n" ]; then
@@ -226,14 +334,27 @@
fi
dep_tristate 'Support for user-space parallel port device drivers' CONFIG_PPDEV $CONFIG_PARPORT
fi
+bool 'PS/2 mouse (aka "auxiliary device") support' CONFIG_PSMOUSE
+
+mainmenu_option next_comment
+comment 'Watchdog Cards'
+bool 'Watchdog Timer Support' CONFIG_WATCHDOG
+if [ "$CONFIG_WATCHDOG" != "n" ]; then
+ bool ' Disable watchdog shutdown on close' CONFIG_WATCHDOG_NOWAYOUT
+ dep_tristate ' SH 3/4 Watchdog' CONFIG_SH_WDT $CONFIG_SUPERH
+fi
endmenu
+tristate 'Enhanced Real Time Clock Support' CONFIG_RTC
if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
source drivers/char/pcmcia/Config.in
fi
+endmenu
source fs/Config.in
+source drivers/media/Config.in
+
if [ "$CONFIG_VT" = "y" ]; then
mainmenu_option next_comment
comment 'Console drivers'
@@ -262,7 +383,6 @@
bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ
bool 'Use LinuxSH standard BIOS' CONFIG_SH_STANDARD_BIOS
if [ "$CONFIG_SH_STANDARD_BIOS" = "y" ]; then
- bool 'GDB Stub kernel debug' CONFIG_DEBUG_KERNEL_WITH_GDB_STUB
bool 'Early printk support' CONFIG_SH_EARLY_PRINTK
fi
endmenu
Index: defconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sh/defconfig,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- defconfig 14 Jan 2001 19:48:21 -0000 1.1.1.1
+++ defconfig 9 Apr 2002 17:07:20 -0000 1.2
@@ -201,6 +201,4 @@
#
# CONFIG_MAGIC_SYSRQ is not set
CONFIG_SH_STANDARD_BIOS=y
-CONFIG_DEBUG_KERNEL_WITH_GDB_STUB=y
-CONFIG_GDB_STUB_VBR=a0000000
CONFIG_SH_EARLY_PRINTK=y
Index: vmlinux.lds.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sh/vmlinux.lds.S,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- vmlinux.lds.S 14 Jan 2001 19:48:21 -0000 1.1.1.1
+++ vmlinux.lds.S 9 Apr 2002 17:07:20 -0000 1.2
@@ -24,7 +24,7 @@
*(.gnu.warning)
} = 0x0009
.text.lock : { *(.text.lock) } /* out-of-line lock text */
- .rodata : { *(.rodata) }
+ .rodata : { *(.rodata) *(.rodata.*) }
.kstrtab : { *(.kstrtab) }
. = ALIGN(16); /* Exception table */
@@ -74,7 +74,11 @@
. = ALIGN(4096);
.data.page_aligned : { *(.data.idt) }
+#ifdef CONFIG_CPU_SH3
+ . = ALIGN(16);
+#else
. = ALIGN(32);
+#endif
.data.cacheline_aligned : { *(.data.cacheline_aligned) }
. = ALIGN(4);
|
