aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-11-23 00:17:42 -0500
committerPaul Mundt <lethal@linux-sh.org>2008-01-27 23:18:56 -0500
commit3e0137f6c7852aff12db0da7bb45f8b3a0a704c8 (patch)
tree13cc7b1fd88a61f36e86994a479c362f43a8ec0d /arch
parentb000659b1c07f91f0c73bf94bb8922fa740c0ef0 (diff)
sh: Kill off the mach-harp and mach-sim machtypes.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/Kconfig8
-rw-r--r--arch/sh/Makefile2
-rw-r--r--arch/sh/configs/cayman_defconfig351
-rw-r--r--arch/sh/configs/harp_defconfig745
-rw-r--r--arch/sh/configs/r7785rp_defconfig13
-rw-r--r--arch/sh/configs/sim_defconfig558
-rw-r--r--arch/sh/kernel/time_64.c8
-rw-r--r--arch/sh/mach-harp/Makefile1
-rw-r--r--arch/sh/mach-harp/setup.c129
-rw-r--r--arch/sh/mach-sim/Makefile1
-rw-r--r--arch/sh/mach-sim/setup.c126
11 files changed, 294 insertions, 1648 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 1ad3ce540021..d99ba375cc87 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -505,19 +505,11 @@ config SH_MAGIC_PANEL_R2
505 help 505 help
506 Select Magic Panel R2 if configuring for Magic Panel R2. 506 Select Magic Panel R2 if configuring for Magic Panel R2.
507 507
508config SH_SIMULATOR
509 bool "Simulator"
510 depends on SUPERH64
511
512config SH_CAYMAN 508config SH_CAYMAN
513 bool "Hitachi Cayman" 509 bool "Hitachi Cayman"
514 depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103 510 depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103
515 select SYS_SUPPORTS_PCI 511 select SYS_SUPPORTS_PCI
516 512
517config SH_HARP
518 bool "ST50 Harp"
519 depends on CPU_SH5
520
521endmenu 513endmenu
522 514
523source "arch/sh/boards/renesas/hs7751rvoip/Kconfig" 515source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 8da11c0cc6d6..6eb3ee2f3fd9 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -141,9 +141,7 @@ endif
141 141
142# SH-5 mach types 142# SH-5 mach types
143# XXX.. to be reconciled with machdir-y later. 143# XXX.. to be reconciled with machdir-y later.
144core-$(CONFIG_SH_SIMULATOR) += arch/sh/mach-sim/
145core-$(CONFIG_SH_CAYMAN) += arch/sh/mach-cayman/ 144core-$(CONFIG_SH_CAYMAN) += arch/sh/mach-cayman/
146core-$(CONFIG_SH_HARP) += arch/sh/mach-harp/
147 145
148# Companion chips 146# Companion chips
149core-$(CONFIG_HD6446X_SERIES) += arch/sh/cchips/hd6446x/ 147core-$(CONFIG_HD6446X_SERIES) += arch/sh/cchips/hd6446x/
diff --git a/arch/sh/configs/cayman_defconfig b/arch/sh/configs/cayman_defconfig
index 1815c682efdc..a05b278d72f5 100644
--- a/arch/sh/configs/cayman_defconfig
+++ b/arch/sh/configs/cayman_defconfig
@@ -1,18 +1,22 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc2 3# Linux kernel version: 2.6.24-rc3
4# Tue Nov 20 14:50:00 2007 4# Fri Nov 23 14:15:55 2007
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7# CONFIG_SUPERH32 is not set
7CONFIG_SUPERH64=y 8CONFIG_SUPERH64=y
8CONFIG_MMU=y
9CONFIG_QUICKLIST=y
10CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
11CONFIG_GENERIC_FIND_NEXT_BIT=y 10CONFIG_GENERIC_FIND_NEXT_BIT=y
12CONFIG_GENERIC_HWEIGHT=y 11CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_CALIBRATE_DELAY=y
14CONFIG_GENERIC_HARDIRQS=y 12CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_IRQ_PROBE=y 13CONFIG_GENERIC_IRQ_PROBE=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y
15# CONFIG_GENERIC_TIME is not set
16# CONFIG_GENERIC_CLOCKEVENTS is not set
17CONFIG_SYS_SUPPORTS_PCI=y
18CONFIG_STACKTRACE_SUPPORT=y
19CONFIG_LOCKDEP_SUPPORT=y
16# CONFIG_ARCH_HAS_ILOG2_U32 is not set 20# CONFIG_ARCH_HAS_ILOG2_U32 is not set
17# CONFIG_ARCH_HAS_ILOG2_U64 is not set 21# CONFIG_ARCH_HAS_ILOG2_U64 is not set
18CONFIG_ARCH_NO_VIRT_TO_BUS=y 22CONFIG_ARCH_NO_VIRT_TO_BUS=y
@@ -33,6 +37,7 @@ CONFIG_POSIX_MQUEUE=y
33# CONFIG_BSD_PROCESS_ACCT is not set 37# CONFIG_BSD_PROCESS_ACCT is not set
34# CONFIG_TASKSTATS is not set 38# CONFIG_TASKSTATS is not set
35# CONFIG_USER_NS is not set 39# CONFIG_USER_NS is not set
40# CONFIG_PID_NS is not set
36# CONFIG_AUDIT is not set 41# CONFIG_AUDIT is not set
37# CONFIG_IKCONFIG is not set 42# CONFIG_IKCONFIG is not set
38CONFIG_LOG_BUF_SHIFT=14 43CONFIG_LOG_BUF_SHIFT=14
@@ -45,7 +50,7 @@ CONFIG_SYSFS_DEPRECATED=y
45# CONFIG_BLK_DEV_INITRD is not set 50# CONFIG_BLK_DEV_INITRD is not set
46# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 51# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
47CONFIG_SYSCTL=y 52CONFIG_SYSCTL=y
48# CONFIG_EMBEDDED is not set 53CONFIG_EMBEDDED=y
49CONFIG_UID16=y 54CONFIG_UID16=y
50CONFIG_SYSCTL_SYSCALL=y 55CONFIG_SYSCTL_SYSCALL=y
51CONFIG_KALLSYMS=y 56CONFIG_KALLSYMS=y
@@ -97,67 +102,41 @@ CONFIG_DEFAULT_IOSCHED="cfq"
97# 102#
98# System type 103# System type
99# 104#
100# CONFIG_SH_SIMULATOR is not set
101CONFIG_SH_CAYMAN=y
102# CONFIG_SH_HARP is not set
103CONFIG_CPU_SH5=y 105CONFIG_CPU_SH5=y
106# CONFIG_CPU_SUBTYPE_SH7619 is not set
107# CONFIG_CPU_SUBTYPE_SH7206 is not set
108# CONFIG_CPU_SUBTYPE_SH7705 is not set
109# CONFIG_CPU_SUBTYPE_SH7706 is not set
110# CONFIG_CPU_SUBTYPE_SH7707 is not set
111# CONFIG_CPU_SUBTYPE_SH7708 is not set
112# CONFIG_CPU_SUBTYPE_SH7709 is not set
113# CONFIG_CPU_SUBTYPE_SH7710 is not set
114# CONFIG_CPU_SUBTYPE_SH7712 is not set
115# CONFIG_CPU_SUBTYPE_SH7720 is not set
116# CONFIG_CPU_SUBTYPE_SH7750 is not set
117# CONFIG_CPU_SUBTYPE_SH7091 is not set
118# CONFIG_CPU_SUBTYPE_SH7750R is not set
119# CONFIG_CPU_SUBTYPE_SH7750S is not set
120# CONFIG_CPU_SUBTYPE_SH7751 is not set
121# CONFIG_CPU_SUBTYPE_SH7751R is not set
122# CONFIG_CPU_SUBTYPE_SH7760 is not set
123# CONFIG_CPU_SUBTYPE_SH4_202 is not set
124# CONFIG_CPU_SUBTYPE_SH7770 is not set
125# CONFIG_CPU_SUBTYPE_SH7780 is not set
126# CONFIG_CPU_SUBTYPE_SH7785 is not set
127# CONFIG_CPU_SUBTYPE_SHX3 is not set
128# CONFIG_CPU_SUBTYPE_SH7343 is not set
129# CONFIG_CPU_SUBTYPE_SH7722 is not set
104CONFIG_CPU_SUBTYPE_SH5_101=y 130CONFIG_CPU_SUBTYPE_SH5_101=y
105# CONFIG_CPU_SUBTYPE_SH5_103 is not set 131# CONFIG_CPU_SUBTYPE_SH5_103 is not set
106 132
107# 133#
108# Processor features
109#
110CONFIG_CPU_LITTLE_ENDIAN=y
111# CONFIG_CPU_BIG_ENDIAN is not set
112# CONFIG_SH_FPU is not set
113# CONFIG_SH_FPU_EMU is not set
114CONFIG_CPU_HAS_FPU=y
115CONFIG_SH64_PGTABLE_2_LEVEL=y
116# CONFIG_SH64_PGTABLE_3_LEVEL is not set
117CONFIG_SH64_USER_MISALIGNED_FIXUP=y
118
119#
120# Memory options
121#
122CONFIG_CACHED_MEMORY_OFFSET=0x20000000
123CONFIG_MEMORY_START=0x80000000
124CONFIG_MEMORY_SIZE_IN_MB=128
125
126#
127# Cache options
128#
129# CONFIG_DCACHE_WRITE_BACK is not set
130# CONFIG_DCACHE_WRITE_THROUGH is not set
131CONFIG_DCACHE_DISABLED=y
132# CONFIG_ICACHE_DISABLED is not set
133CONFIG_PCIDEVICE_MEMORY_START=C0000000
134CONFIG_DEVICE_MEMORY_START=E0000000
135CONFIG_FLASH_MEMORY_START=0x00000000
136CONFIG_PCI_BLOCK_START=0x40000000
137
138#
139# CPU Subtype specific options
140#
141CONFIG_SH64_ID2815_WORKAROUND=y
142
143#
144# Misc options
145#
146CONFIG_HEARTBEAT=y
147CONFIG_HDSP253_LED=y
148# CONFIG_SH_DMA is not set
149CONFIG_PREEMPT=y
150CONFIG_SH_PCLK_FREQ=50000000
151# CONFIG_HZ_100 is not set
152CONFIG_HZ_250=y
153# CONFIG_HZ_300 is not set
154# CONFIG_HZ_1000 is not set
155CONFIG_HZ=250
156
157#
158# Memory management options 134# Memory management options
159# 135#
160CONFIG_PAGE_OFFSET=0x80000000 136CONFIG_QUICKLIST=y
137CONFIG_MMU=y
138CONFIG_PAGE_OFFSET=0x20000000
139CONFIG_MEMORY_START=0x80000000
161CONFIG_MEMORY_SIZE=0x00400000 140CONFIG_MEMORY_SIZE=0x00400000
162CONFIG_32BIT=y 141CONFIG_32BIT=y
163CONFIG_ARCH_FLATMEM_ENABLE=y 142CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -186,7 +165,7 @@ CONFIG_SPARSEMEM_STATIC=y
186CONFIG_SPLIT_PTLOCK_CPUS=4 165CONFIG_SPLIT_PTLOCK_CPUS=4
187CONFIG_RESOURCES_64BIT=y 166CONFIG_RESOURCES_64BIT=y
188CONFIG_ZONE_DMA_FLAG=0 167CONFIG_ZONE_DMA_FLAG=0
189CONFIG_NR_QUICK=1 168CONFIG_NR_QUICK=2
190 169
191# 170#
192# Cache configuration 171# Cache configuration
@@ -197,11 +176,82 @@ CONFIG_NR_QUICK=1
197CONFIG_CACHE_OFF=y 176CONFIG_CACHE_OFF=y
198 177
199# 178#
200# Bus options (PCI, PCMCIA, EISA, MCA, ISA) 179# Processor features
180#
181CONFIG_CPU_LITTLE_ENDIAN=y
182# CONFIG_CPU_BIG_ENDIAN is not set
183CONFIG_SH_FPU=y
184# CONFIG_SH64_FPU_DENORM_FLUSH is not set
185CONFIG_SH64_USER_MISALIGNED_FIXUP=y
186CONFIG_SH64_ID2815_WORKAROUND=y
187CONFIG_CPU_HAS_FPU=y
188
189#
190# Board support
191#
192CONFIG_SH_CAYMAN=y
193
194#
195# Timer and clock configuration
201# 196#
202# CONFIG_PCI is not set 197CONFIG_SH_TIMER_IRQ=16
198CONFIG_SH_PCLK_FREQ=50000000
199# CONFIG_TICK_ONESHOT is not set
200
201#
202# CPU Frequency scaling
203#
204# CONFIG_CPU_FREQ is not set
205
206#
207# DMA support
208#
209
210#
211# Companion Chips
212#
213
214#
215# Additional SuperH Device Drivers
216#
217CONFIG_HEARTBEAT=y
218# CONFIG_PUSH_SWITCH is not set
219
220#
221# Kernel features
222#
223# CONFIG_HZ_100 is not set
224CONFIG_HZ_250=y
225# CONFIG_HZ_300 is not set
226# CONFIG_HZ_1000 is not set
227CONFIG_HZ=250
228# CONFIG_KEXEC is not set
229# CONFIG_CRASH_DUMP is not set
230# CONFIG_PREEMPT_NONE is not set
231# CONFIG_PREEMPT_VOLUNTARY is not set
232CONFIG_PREEMPT=y
233CONFIG_PREEMPT_BKL=y
234CONFIG_GUSA=y
235
236#
237# Boot options
238#
239CONFIG_ZERO_PAGE_OFFSET=0x00001000
240CONFIG_BOOT_LINK_OFFSET=0x00800000
241# CONFIG_CMDLINE_BOOL is not set
242
243#
244# Bus options
245#
246CONFIG_PCI=y
247CONFIG_SH_PCIDMA_NONCOHERENT=y
248CONFIG_PCI_AUTO=y
249CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
203# CONFIG_ARCH_SUPPORTS_MSI is not set 250# CONFIG_ARCH_SUPPORTS_MSI is not set
251CONFIG_PCI_LEGACY=y
252# CONFIG_PCI_DEBUG is not set
204# CONFIG_PCCARD is not set 253# CONFIG_PCCARD is not set
254# CONFIG_HOTPLUG_PCI is not set
205 255
206# 256#
207# Executable file formats 257# Executable file formats
@@ -310,10 +360,14 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
310# CONFIG_MTD is not set 360# CONFIG_MTD is not set
311# CONFIG_PARPORT is not set 361# CONFIG_PARPORT is not set
312CONFIG_BLK_DEV=y 362CONFIG_BLK_DEV=y
363# CONFIG_BLK_CPQ_CISS_DA is not set
364# CONFIG_BLK_DEV_DAC960 is not set
365# CONFIG_BLK_DEV_UMEM is not set
313# CONFIG_BLK_DEV_COW_COMMON is not set 366# CONFIG_BLK_DEV_COW_COMMON is not set
314CONFIG_BLK_DEV_LOOP=y 367CONFIG_BLK_DEV_LOOP=y
315# CONFIG_BLK_DEV_CRYPTOLOOP is not set 368# CONFIG_BLK_DEV_CRYPTOLOOP is not set
316# CONFIG_BLK_DEV_NBD is not set 369# CONFIG_BLK_DEV_NBD is not set
370# CONFIG_BLK_DEV_SX8 is not set
317CONFIG_BLK_DEV_RAM=y 371CONFIG_BLK_DEV_RAM=y
318CONFIG_BLK_DEV_RAM_COUNT=16 372CONFIG_BLK_DEV_RAM_COUNT=16
319CONFIG_BLK_DEV_RAM_SIZE=4096 373CONFIG_BLK_DEV_RAM_SIZE=4096
@@ -321,7 +375,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
321# CONFIG_CDROM_PKTCDVD is not set 375# CONFIG_CDROM_PKTCDVD is not set
322# CONFIG_ATA_OVER_ETH is not set 376# CONFIG_ATA_OVER_ETH is not set
323CONFIG_MISC_DEVICES=y 377CONFIG_MISC_DEVICES=y
378# CONFIG_PHANTOM is not set
324# CONFIG_EEPROM_93CX6 is not set 379# CONFIG_EEPROM_93CX6 is not set
380# CONFIG_SGI_IOC4 is not set
381# CONFIG_TIFM_CORE is not set
325# CONFIG_IDE is not set 382# CONFIG_IDE is not set
326 383
327# 384#
@@ -363,9 +420,45 @@ CONFIG_SCSI_SPI_ATTRS=y
363# CONFIG_SCSI_SRP_ATTRS is not set 420# CONFIG_SCSI_SRP_ATTRS is not set
364CONFIG_SCSI_LOWLEVEL=y 421CONFIG_SCSI_LOWLEVEL=y
365# CONFIG_ISCSI_TCP is not set 422# CONFIG_ISCSI_TCP is not set
423# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
424# CONFIG_SCSI_3W_9XXX is not set
425# CONFIG_SCSI_ACARD is not set
426# CONFIG_SCSI_AACRAID is not set
427# CONFIG_SCSI_AIC7XXX is not set
428# CONFIG_SCSI_AIC7XXX_OLD is not set
429# CONFIG_SCSI_AIC79XX is not set
430# CONFIG_SCSI_AIC94XX is not set
431# CONFIG_SCSI_ARCMSR is not set
432# CONFIG_MEGARAID_NEWGEN is not set
433# CONFIG_MEGARAID_LEGACY is not set
434# CONFIG_MEGARAID_SAS is not set
435# CONFIG_SCSI_HPTIOP is not set
436# CONFIG_SCSI_DMX3191D is not set
437# CONFIG_SCSI_FUTURE_DOMAIN is not set
438# CONFIG_SCSI_IPS is not set
439# CONFIG_SCSI_INITIO is not set
440# CONFIG_SCSI_INIA100 is not set
441# CONFIG_SCSI_STEX is not set
442# CONFIG_SCSI_SYM53C8XX_2 is not set
443# CONFIG_SCSI_QLOGIC_1280 is not set
444# CONFIG_SCSI_QLA_FC is not set
445# CONFIG_SCSI_QLA_ISCSI is not set
446# CONFIG_SCSI_LPFC is not set
447# CONFIG_SCSI_DC395x is not set
448# CONFIG_SCSI_DC390T is not set
449# CONFIG_SCSI_NSP32 is not set
366# CONFIG_SCSI_DEBUG is not set 450# CONFIG_SCSI_DEBUG is not set
451# CONFIG_SCSI_SRP is not set
367# CONFIG_ATA is not set 452# CONFIG_ATA is not set
368# CONFIG_MD is not set 453# CONFIG_MD is not set
454# CONFIG_FUSION is not set
455
456#
457# IEEE 1394 (FireWire) support
458#
459# CONFIG_FIREWIRE is not set
460# CONFIG_IEEE1394 is not set
461# CONFIG_I2O is not set
369CONFIG_NETDEVICES=y 462CONFIG_NETDEVICES=y
370# CONFIG_NETDEVICES_MULTIQUEUE is not set 463# CONFIG_NETDEVICES_MULTIQUEUE is not set
371# CONFIG_DUMMY is not set 464# CONFIG_DUMMY is not set
@@ -374,19 +467,57 @@ CONFIG_NETDEVICES=y
374# CONFIG_EQUALIZER is not set 467# CONFIG_EQUALIZER is not set
375# CONFIG_TUN is not set 468# CONFIG_TUN is not set
376# CONFIG_VETH is not set 469# CONFIG_VETH is not set
470# CONFIG_IP1000 is not set
471# CONFIG_ARCNET is not set
377# CONFIG_PHYLIB is not set 472# CONFIG_PHYLIB is not set
378CONFIG_NET_ETHERNET=y 473CONFIG_NET_ETHERNET=y
379# CONFIG_MII is not set 474# CONFIG_MII is not set
475# CONFIG_AX88796 is not set
380# CONFIG_STNIC is not set 476# CONFIG_STNIC is not set
477# CONFIG_HAPPYMEAL is not set
478# CONFIG_SUNGEM is not set
479# CONFIG_CASSINI is not set
480# CONFIG_NET_VENDOR_3COM is not set
381# CONFIG_SMC91X is not set 481# CONFIG_SMC91X is not set
382# CONFIG_SMC911X is not set 482# CONFIG_SMC911X is not set
483# CONFIG_NET_TULIP is not set
484# CONFIG_HP100 is not set
383# CONFIG_IBM_NEW_EMAC_ZMII is not set 485# CONFIG_IBM_NEW_EMAC_ZMII is not set
384# CONFIG_IBM_NEW_EMAC_RGMII is not set 486# CONFIG_IBM_NEW_EMAC_RGMII is not set
385# CONFIG_IBM_NEW_EMAC_TAH is not set 487# CONFIG_IBM_NEW_EMAC_TAH is not set
386# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 488# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
489# CONFIG_NET_PCI is not set
387# CONFIG_B44 is not set 490# CONFIG_B44 is not set
388CONFIG_NETDEV_1000=y 491CONFIG_NETDEV_1000=y
492# CONFIG_ACENIC is not set
493# CONFIG_DL2K is not set
494# CONFIG_E1000 is not set
495# CONFIG_E1000E is not set
496# CONFIG_NS83820 is not set
497# CONFIG_HAMACHI is not set
498# CONFIG_YELLOWFIN is not set
499# CONFIG_R8169 is not set
500# CONFIG_SIS190 is not set
501# CONFIG_SKGE is not set
502# CONFIG_SKY2 is not set
503# CONFIG_SK98LIN is not set
504# CONFIG_VIA_VELOCITY is not set
505# CONFIG_TIGON3 is not set
506# CONFIG_BNX2 is not set
507# CONFIG_QLA3XXX is not set
508# CONFIG_ATL1 is not set
389CONFIG_NETDEV_10000=y 509CONFIG_NETDEV_10000=y
510# CONFIG_CHELSIO_T1 is not set
511# CONFIG_CHELSIO_T3 is not set
512# CONFIG_IXGBE is not set
513# CONFIG_IXGB is not set
514# CONFIG_S2IO is not set
515# CONFIG_MYRI10GE is not set
516# CONFIG_NETXEN_NIC is not set
517# CONFIG_NIU is not set
518# CONFIG_MLX4_CORE is not set
519# CONFIG_TEHUTI is not set
520# CONFIG_TR is not set
390 521
391# 522#
392# Wireless LAN 523# Wireless LAN
@@ -394,8 +525,11 @@ CONFIG_NETDEV_10000=y
394# CONFIG_WLAN_PRE80211 is not set 525# CONFIG_WLAN_PRE80211 is not set
395# CONFIG_WLAN_80211 is not set 526# CONFIG_WLAN_80211 is not set
396# CONFIG_WAN is not set 527# CONFIG_WAN is not set
528# CONFIG_FDDI is not set
529# CONFIG_HIPPI is not set
397# CONFIG_PPP is not set 530# CONFIG_PPP is not set
398# CONFIG_SLIP is not set 531# CONFIG_SLIP is not set
532# CONFIG_NET_FC is not set
399# CONFIG_SHAPER is not set 533# CONFIG_SHAPER is not set
400# CONFIG_NETCONSOLE is not set 534# CONFIG_NETCONSOLE is not set
401# CONFIG_NETPOLL is not set 535# CONFIG_NETPOLL is not set
@@ -455,14 +589,17 @@ CONFIG_HW_CONSOLE=y
455# Non-8250 serial port support 589# Non-8250 serial port support
456# 590#
457# CONFIG_SERIAL_SH_SCI is not set 591# CONFIG_SERIAL_SH_SCI is not set
592# CONFIG_SERIAL_JSM is not set
458CONFIG_UNIX98_PTYS=y 593CONFIG_UNIX98_PTYS=y
459CONFIG_LEGACY_PTYS=y 594CONFIG_LEGACY_PTYS=y
460CONFIG_LEGACY_PTY_COUNT=256 595CONFIG_LEGACY_PTY_COUNT=256
461# CONFIG_IPMI_HANDLER is not set 596# CONFIG_IPMI_HANDLER is not set
462CONFIG_HW_RANDOM=y 597CONFIG_HW_RANDOM=y
463# CONFIG_R3964 is not set 598# CONFIG_R3964 is not set
599# CONFIG_APPLICOM is not set
464# CONFIG_RAW_DRIVER is not set 600# CONFIG_RAW_DRIVER is not set
465# CONFIG_TCG_TPM is not set 601# CONFIG_TCG_TPM is not set
602CONFIG_DEVPORT=y
466CONFIG_I2C=m 603CONFIG_I2C=m
467CONFIG_I2C_BOARDINFO=y 604CONFIG_I2C_BOARDINFO=y
468# CONFIG_I2C_CHARDEV is not set 605# CONFIG_I2C_CHARDEV is not set
@@ -477,11 +614,28 @@ CONFIG_I2C_BOARDINFO=y
477# 614#
478# I2C Hardware Bus support 615# I2C Hardware Bus support
479# 616#
617# CONFIG_I2C_ALI1535 is not set
618# CONFIG_I2C_ALI1563 is not set
619# CONFIG_I2C_ALI15X3 is not set
620# CONFIG_I2C_AMD756 is not set
621# CONFIG_I2C_AMD8111 is not set
622# CONFIG_I2C_I801 is not set
623# CONFIG_I2C_I810 is not set
624# CONFIG_I2C_PIIX4 is not set
625# CONFIG_I2C_NFORCE2 is not set
480# CONFIG_I2C_OCORES is not set 626# CONFIG_I2C_OCORES is not set
481# CONFIG_I2C_PARPORT_LIGHT is not set 627# CONFIG_I2C_PARPORT_LIGHT is not set
628# CONFIG_I2C_PROSAVAGE is not set
629# CONFIG_I2C_SAVAGE4 is not set
482# CONFIG_I2C_SIMTEC is not set 630# CONFIG_I2C_SIMTEC is not set
631# CONFIG_I2C_SIS5595 is not set
632# CONFIG_I2C_SIS630 is not set
633# CONFIG_I2C_SIS96X is not set
483# CONFIG_I2C_TAOS_EVM is not set 634# CONFIG_I2C_TAOS_EVM is not set
484# CONFIG_I2C_STUB is not set 635# CONFIG_I2C_STUB is not set
636# CONFIG_I2C_VIA is not set
637# CONFIG_I2C_VIAPRO is not set
638# CONFIG_I2C_VOODOO3 is not set
485 639
486# 640#
487# Miscellaneous I2C Chip support 641# Miscellaneous I2C Chip support
@@ -519,6 +673,7 @@ CONFIG_HWMON=y
519# CONFIG_SENSORS_ADT7470 is not set 673# CONFIG_SENSORS_ADT7470 is not set
520# CONFIG_SENSORS_ATXP1 is not set 674# CONFIG_SENSORS_ATXP1 is not set
521# CONFIG_SENSORS_DS1621 is not set 675# CONFIG_SENSORS_DS1621 is not set
676# CONFIG_SENSORS_I5K_AMB is not set
522# CONFIG_SENSORS_F71805F is not set 677# CONFIG_SENSORS_F71805F is not set
523# CONFIG_SENSORS_F71882FG is not set 678# CONFIG_SENSORS_F71882FG is not set
524# CONFIG_SENSORS_F75375S is not set 679# CONFIG_SENSORS_F75375S is not set
@@ -540,12 +695,15 @@ CONFIG_HWMON=y
540# CONFIG_SENSORS_MAX6650 is not set 695# CONFIG_SENSORS_MAX6650 is not set
541# CONFIG_SENSORS_PC87360 is not set 696# CONFIG_SENSORS_PC87360 is not set
542# CONFIG_SENSORS_PC87427 is not set 697# CONFIG_SENSORS_PC87427 is not set
698# CONFIG_SENSORS_SIS5595 is not set
543# CONFIG_SENSORS_DME1737 is not set 699# CONFIG_SENSORS_DME1737 is not set
544# CONFIG_SENSORS_SMSC47M1 is not set 700# CONFIG_SENSORS_SMSC47M1 is not set
545# CONFIG_SENSORS_SMSC47M192 is not set 701# CONFIG_SENSORS_SMSC47M192 is not set
546# CONFIG_SENSORS_SMSC47B397 is not set 702# CONFIG_SENSORS_SMSC47B397 is not set
547# CONFIG_SENSORS_THMC50 is not set 703# CONFIG_SENSORS_THMC50 is not set
704# CONFIG_SENSORS_VIA686A is not set
548# CONFIG_SENSORS_VT1211 is not set 705# CONFIG_SENSORS_VT1211 is not set
706# CONFIG_SENSORS_VT8231 is not set
549# CONFIG_SENSORS_W83781D is not set 707# CONFIG_SENSORS_W83781D is not set
550# CONFIG_SENSORS_W83791D is not set 708# CONFIG_SENSORS_W83791D is not set
551# CONFIG_SENSORS_W83792D is not set 709# CONFIG_SENSORS_W83792D is not set
@@ -563,6 +721,12 @@ CONFIG_WATCHDOG=y
563# CONFIG_SOFT_WATCHDOG is not set 721# CONFIG_SOFT_WATCHDOG is not set
564 722
565# 723#
724# PCI-based Watchdog Cards
725#
726# CONFIG_PCIPCWATCHDOG is not set
727# CONFIG_WDTPCI is not set
728
729#
566# Sonics Silicon Backplane 730# Sonics Silicon Backplane
567# 731#
568CONFIG_SSB_POSSIBLE=y 732CONFIG_SSB_POSSIBLE=y
@@ -586,13 +750,36 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
586# CONFIG_VIDEO_VIVI is not set 750# CONFIG_VIDEO_VIVI is not set
587# CONFIG_VIDEO_SAA5246A is not set 751# CONFIG_VIDEO_SAA5246A is not set
588# CONFIG_VIDEO_SAA5249 is not set 752# CONFIG_VIDEO_SAA5249 is not set
753# CONFIG_VIDEO_SAA7134 is not set
754# CONFIG_VIDEO_HEXIUM_ORION is not set
755# CONFIG_VIDEO_HEXIUM_GEMINI is not set
756# CONFIG_VIDEO_CX88 is not set
757# CONFIG_VIDEO_CX23885 is not set
758# CONFIG_VIDEO_CAFE_CCIC is not set
589# CONFIG_RADIO_ADAPTERS is not set 759# CONFIG_RADIO_ADAPTERS is not set
590CONFIG_DVB_CORE=y 760CONFIG_DVB_CORE=y
591# CONFIG_DVB_CORE_ATTACH is not set 761# CONFIG_DVB_CORE_ATTACH is not set
592CONFIG_DVB_CAPTURE_DRIVERS=y 762CONFIG_DVB_CAPTURE_DRIVERS=y
763
764#
765# Supported SAA7146 based PCI Adapters
766#
767
768#
769# Supported FlexCopII (B2C2) Adapters
770#
593# CONFIG_DVB_B2C2_FLEXCOP is not set 771# CONFIG_DVB_B2C2_FLEXCOP is not set
594 772
595# 773#
774# Supported BT878 Adapters
775#
776
777#
778# Supported Pluto2 Adapters
779#
780# CONFIG_DVB_PLUTO2 is not set
781
782#
596# Supported DVB Frontends 783# Supported DVB Frontends
597# 784#
598 785
@@ -671,6 +858,7 @@ CONFIG_DAB=y
671# 858#
672# Graphics support 859# Graphics support
673# 860#
861# CONFIG_DRM is not set
674# CONFIG_VGASTATE is not set 862# CONFIG_VGASTATE is not set
675CONFIG_VIDEO_OUTPUT_CONTROL=y 863CONFIG_VIDEO_OUTPUT_CONTROL=y
676CONFIG_FB=y 864CONFIG_FB=y
@@ -694,7 +882,29 @@ CONFIG_FB_MODE_HELPERS=y
694# 882#
695# Frame buffer hardware drivers 883# Frame buffer hardware drivers
696# 884#
885# CONFIG_FB_CIRRUS is not set
886# CONFIG_FB_PM2 is not set
887# CONFIG_FB_CYBER2000 is not set
888# CONFIG_FB_ASILIANT is not set
889# CONFIG_FB_IMSTT is not set
697# CONFIG_FB_S1D13XXX is not set 890# CONFIG_FB_S1D13XXX is not set
891# CONFIG_FB_NVIDIA is not set
892# CONFIG_FB_RIVA is not set
893# CONFIG_FB_MATROX is not set
894# CONFIG_FB_RADEON is not set
895# CONFIG_FB_ATY128 is not set
896# CONFIG_FB_ATY is not set
897# CONFIG_FB_S3 is not set
898# CONFIG_FB_SAVAGE is not set
899# CONFIG_FB_SIS is not set
900# CONFIG_FB_NEOMAGIC is not set
901# CONFIG_FB_KYRO is not set
902# CONFIG_FB_3DFX is not set
903# CONFIG_FB_VOODOO1 is not set
904# CONFIG_FB_VT8623 is not set
905# CONFIG_FB_TRIDENT is not set
906# CONFIG_FB_ARK is not set
907# CONFIG_FB_PM3 is not set
698# CONFIG_FB_VIRTUAL is not set 908# CONFIG_FB_VIRTUAL is not set
699# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 909# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
700 910
@@ -739,8 +949,8 @@ CONFIG_HID=y
739# CONFIG_HIDRAW is not set 949# CONFIG_HIDRAW is not set
740CONFIG_USB_SUPPORT=y 950CONFIG_USB_SUPPORT=y
741CONFIG_USB_ARCH_HAS_HCD=y 951CONFIG_USB_ARCH_HAS_HCD=y
742# CONFIG_USB_ARCH_HAS_OHCI is not set 952CONFIG_USB_ARCH_HAS_OHCI=y
743# CONFIG_USB_ARCH_HAS_EHCI is not set 953CONFIG_USB_ARCH_HAS_EHCI=y
744# CONFIG_USB is not set 954# CONFIG_USB is not set
745 955
746# 956#
@@ -753,6 +963,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
753# CONFIG_USB_GADGET is not set 963# CONFIG_USB_GADGET is not set
754# CONFIG_MMC is not set 964# CONFIG_MMC is not set
755# CONFIG_NEW_LEDS is not set 965# CONFIG_NEW_LEDS is not set
966# CONFIG_INFINIBAND is not set
756# CONFIG_RTC_CLASS is not set 967# CONFIG_RTC_CLASS is not set
757 968
758# 969#
@@ -903,6 +1114,9 @@ CONFIG_DEBUG_PREEMPT=y
903# CONFIG_RT_MUTEX_TESTER is not set 1114# CONFIG_RT_MUTEX_TESTER is not set
904# CONFIG_DEBUG_SPINLOCK is not set 1115# CONFIG_DEBUG_SPINLOCK is not set
905# CONFIG_DEBUG_MUTEXES is not set 1116# CONFIG_DEBUG_MUTEXES is not set
1117# CONFIG_DEBUG_LOCK_ALLOC is not set
1118# CONFIG_PROVE_LOCKING is not set
1119# CONFIG_LOCK_STAT is not set
906# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1120# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
907# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1121# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
908# CONFIG_DEBUG_KOBJECT is not set 1122# CONFIG_DEBUG_KOBJECT is not set
@@ -920,10 +1134,13 @@ CONFIG_FORCED_INLINING=y
920# CONFIG_SH_STANDARD_BIOS is not set 1134# CONFIG_SH_STANDARD_BIOS is not set
921# CONFIG_EARLY_SCIF_CONSOLE is not set 1135# CONFIG_EARLY_SCIF_CONSOLE is not set
922# CONFIG_DEBUG_BOOTMEM is not set 1136# CONFIG_DEBUG_BOOTMEM is not set
923# CONFIG_DEBUG_STACKOVERFLOW is not set
924# CONFIG_DEBUG_STACK_USAGE is not set 1137# CONFIG_DEBUG_STACK_USAGE is not set
925# CONFIG_4KSTACKS is not set 1138# CONFIG_4KSTACKS is not set
926# CONFIG_IRQSTACKS is not set 1139CONFIG_SH64_PROC_ASIDS=y
1140CONFIG_SH64_SR_WATCH=y
1141# CONFIG_POOR_MANS_STRACE is not set
1142# CONFIG_SH_ALPHANUMERIC is not set
1143# CONFIG_SH_NO_BSS_INIT is not set
927 1144
928# 1145#
929# Security options 1146# Security options
diff --git a/arch/sh/configs/harp_defconfig b/arch/sh/configs/harp_defconfig
deleted file mode 100644
index ba302cd0c285..000000000000
--- a/arch/sh/configs/harp_defconfig
+++ /dev/null
@@ -1,745 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc1
4# Fri Nov 2 14:35:57 2007
5#
6CONFIG_SUPERH=y
7CONFIG_SUPERH64=y
8CONFIG_MMU=y
9CONFIG_QUICKLIST=y
10CONFIG_RWSEM_GENERIC_SPINLOCK=y
11CONFIG_GENERIC_FIND_NEXT_BIT=y
12CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_CALIBRATE_DELAY=y
14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_IRQ_PROBE=y
16# CONFIG_ARCH_HAS_ILOG2_U32 is not set
17# CONFIG_ARCH_HAS_ILOG2_U64 is not set
18CONFIG_ARCH_NO_VIRT_TO_BUS=y
19CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
20
21#
22# General setup
23#
24CONFIG_EXPERIMENTAL=y
25CONFIG_BROKEN_ON_SMP=y
26CONFIG_LOCK_KERNEL=y
27CONFIG_INIT_ENV_ARG_LIMIT=32
28CONFIG_LOCALVERSION=""
29CONFIG_LOCALVERSION_AUTO=y
30CONFIG_SWAP=y
31# CONFIG_SYSVIPC is not set
32CONFIG_POSIX_MQUEUE=y
33# CONFIG_BSD_PROCESS_ACCT is not set
34# CONFIG_TASKSTATS is not set
35# CONFIG_USER_NS is not set
36# CONFIG_AUDIT is not set
37# CONFIG_IKCONFIG is not set
38CONFIG_LOG_BUF_SHIFT=14
39# CONFIG_CGROUPS is not set
40CONFIG_FAIR_GROUP_SCHED=y
41CONFIG_FAIR_USER_SCHED=y
42# CONFIG_FAIR_CGROUP_SCHED is not set
43CONFIG_SYSFS_DEPRECATED=y
44# CONFIG_RELAY is not set
45# CONFIG_BLK_DEV_INITRD is not set
46# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
47CONFIG_SYSCTL=y
48# CONFIG_EMBEDDED is not set
49CONFIG_UID16=y
50CONFIG_SYSCTL_SYSCALL=y
51CONFIG_KALLSYMS=y
52# CONFIG_KALLSYMS_ALL is not set
53# CONFIG_KALLSYMS_EXTRA_PASS is not set
54CONFIG_HOTPLUG=y
55CONFIG_PRINTK=y
56CONFIG_BUG=y
57CONFIG_ELF_CORE=y
58CONFIG_BASE_FULL=y
59CONFIG_FUTEX=y
60CONFIG_ANON_INODES=y
61CONFIG_EPOLL=y
62CONFIG_SIGNALFD=y
63CONFIG_EVENTFD=y
64CONFIG_SHMEM=y
65CONFIG_VM_EVENT_COUNTERS=y
66CONFIG_SLAB=y
67# CONFIG_SLUB is not set
68# CONFIG_SLOB is not set
69CONFIG_RT_MUTEXES=y
70# CONFIG_TINY_SHMEM is not set
71CONFIG_BASE_SMALL=0
72# CONFIG_MODULES is not set
73CONFIG_BLOCK=y
74# CONFIG_LBD is not set
75# CONFIG_BLK_DEV_IO_TRACE is not set
76# CONFIG_LSF is not set
77# CONFIG_BLK_DEV_BSG is not set
78
79#
80# IO Schedulers
81#
82CONFIG_IOSCHED_NOOP=y
83CONFIG_IOSCHED_AS=y
84CONFIG_IOSCHED_DEADLINE=y
85CONFIG_IOSCHED_CFQ=y
86# CONFIG_DEFAULT_AS is not set
87# CONFIG_DEFAULT_DEADLINE is not set
88CONFIG_DEFAULT_CFQ=y
89# CONFIG_DEFAULT_NOOP is not set
90CONFIG_DEFAULT_IOSCHED="cfq"
91
92#
93# System type
94#
95# CONFIG_SH_SIMULATOR is not set
96# CONFIG_SH_CAYMAN is not set
97CONFIG_SH_HARP=y
98CONFIG_CPU_SH5=y
99CONFIG_CPU_SUBTYPE_SH5_101=y
100# CONFIG_CPU_SUBTYPE_SH5_103 is not set
101CONFIG_LITTLE_ENDIAN=y
102# CONFIG_BIG_ENDIAN is not set
103CONFIG_SH_FPU=y
104# CONFIG_SH64_FPU_DENORM_FLUSH is not set
105CONFIG_SH64_PGTABLE_2_LEVEL=y
106# CONFIG_SH64_PGTABLE_3_LEVEL is not set
107CONFIG_HUGETLB_PAGE_SIZE_64K=y
108# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
109# CONFIG_HUGETLB_PAGE_SIZE_512MB is not set
110CONFIG_SH64_USER_MISALIGNED_FIXUP=y
111
112#
113# Memory options
114#
115CONFIG_CACHED_MEMORY_OFFSET=0x20000000
116CONFIG_MEMORY_START=0x80000000
117CONFIG_MEMORY_SIZE_IN_MB=128
118
119#
120# Cache options
121#
122CONFIG_DCACHE_WRITE_BACK=y
123# CONFIG_DCACHE_WRITE_THROUGH is not set
124# CONFIG_DCACHE_DISABLED is not set
125# CONFIG_ICACHE_DISABLED is not set
126CONFIG_PCIDEVICE_MEMORY_START=C0000000
127CONFIG_DEVICE_MEMORY_START=E0000000
128CONFIG_FLASH_MEMORY_START=0x00000000
129CONFIG_PCI_BLOCK_START=0x40000000
130
131#
132# CPU Subtype specific options
133#
134CONFIG_SH64_ID2815_WORKAROUND=y
135
136#
137# Misc options
138#
139# CONFIG_SH_DMA is not set
140CONFIG_PREEMPT=y
141CONFIG_SELECT_MEMORY_MODEL=y
142CONFIG_FLATMEM_MANUAL=y
143# CONFIG_DISCONTIGMEM_MANUAL is not set
144# CONFIG_SPARSEMEM_MANUAL is not set
145CONFIG_FLATMEM=y
146CONFIG_FLAT_NODE_MEM_MAP=y
147# CONFIG_SPARSEMEM_STATIC is not set
148# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
149CONFIG_SPLIT_PTLOCK_CPUS=4
150# CONFIG_RESOURCES_64BIT is not set
151CONFIG_ZONE_DMA_FLAG=0
152CONFIG_NR_QUICK=1
153
154#
155# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
156#
157# CONFIG_ARCH_SUPPORTS_MSI is not set
158# CONFIG_PCCARD is not set
159
160#
161# Executable file formats
162#
163CONFIG_BINFMT_ELF=y
164# CONFIG_BINFMT_MISC is not set
165
166#
167# Networking
168#
169CONFIG_NET=y
170
171#
172# Networking options
173#
174CONFIG_PACKET=y
175# CONFIG_PACKET_MMAP is not set
176CONFIG_UNIX=y
177CONFIG_XFRM=y
178# CONFIG_XFRM_USER is not set
179# CONFIG_XFRM_SUB_POLICY is not set
180# CONFIG_XFRM_MIGRATE is not set
181# CONFIG_NET_KEY is not set
182CONFIG_INET=y
183# CONFIG_IP_MULTICAST is not set
184# CONFIG_IP_ADVANCED_ROUTER is not set
185CONFIG_IP_FIB_HASH=y
186CONFIG_IP_PNP=y
187# CONFIG_IP_PNP_DHCP is not set
188# CONFIG_IP_PNP_BOOTP is not set
189# CONFIG_IP_PNP_RARP is not set
190# CONFIG_NET_IPIP is not set
191# CONFIG_NET_IPGRE is not set
192# CONFIG_ARPD is not set
193# CONFIG_SYN_COOKIES is not set
194# CONFIG_INET_AH is not set
195# CONFIG_INET_ESP is not set
196# CONFIG_INET_IPCOMP is not set
197# CONFIG_INET_XFRM_TUNNEL is not set
198# CONFIG_INET_TUNNEL is not set
199CONFIG_INET_XFRM_MODE_TRANSPORT=y
200CONFIG_INET_XFRM_MODE_TUNNEL=y
201CONFIG_INET_XFRM_MODE_BEET=y
202# CONFIG_INET_LRO is not set
203CONFIG_INET_DIAG=y
204CONFIG_INET_TCP_DIAG=y
205# CONFIG_TCP_CONG_ADVANCED is not set
206CONFIG_TCP_CONG_CUBIC=y
207CONFIG_DEFAULT_TCP_CONG="cubic"
208# CONFIG_TCP_MD5SIG is not set
209# CONFIG_IPV6 is not set
210# CONFIG_INET6_XFRM_TUNNEL is not set
211# CONFIG_INET6_TUNNEL is not set
212# CONFIG_NETWORK_SECMARK is not set
213# CONFIG_NETFILTER is not set
214# CONFIG_IP_DCCP is not set
215# CONFIG_IP_SCTP is not set
216# CONFIG_TIPC is not set
217# CONFIG_ATM is not set
218# CONFIG_BRIDGE is not set
219# CONFIG_VLAN_8021Q is not set
220# CONFIG_DECNET is not set
221# CONFIG_LLC2 is not set
222# CONFIG_IPX is not set
223# CONFIG_ATALK is not set
224# CONFIG_X25 is not set
225# CONFIG_LAPB is not set
226# CONFIG_ECONET is not set
227# CONFIG_WAN_ROUTER is not set
228# CONFIG_NET_SCHED is not set
229
230#
231# Network testing
232#
233# CONFIG_NET_PKTGEN is not set
234# CONFIG_HAMRADIO is not set
235# CONFIG_IRDA is not set
236# CONFIG_BT is not set
237# CONFIG_AF_RXRPC is not set
238
239#
240# Wireless
241#
242# CONFIG_CFG80211 is not set
243# CONFIG_WIRELESS_EXT is not set
244# CONFIG_MAC80211 is not set
245# CONFIG_IEEE80211 is not set
246# CONFIG_RFKILL is not set
247# CONFIG_NET_9P is not set
248
249#
250# Device Drivers
251#
252
253#
254# Generic Driver Options
255#
256CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
257CONFIG_STANDALONE=y
258CONFIG_PREVENT_FIRMWARE_BUILD=y
259# CONFIG_FW_LOADER is not set
260# CONFIG_DEBUG_DRIVER is not set
261# CONFIG_DEBUG_DEVRES is not set
262# CONFIG_SYS_HYPERVISOR is not set
263# CONFIG_CONNECTOR is not set
264# CONFIG_MTD is not set
265# CONFIG_PARPORT is not set
266CONFIG_BLK_DEV=y
267# CONFIG_BLK_DEV_COW_COMMON is not set
268CONFIG_BLK_DEV_LOOP=y
269# CONFIG_BLK_DEV_CRYPTOLOOP is not set
270# CONFIG_BLK_DEV_NBD is not set
271CONFIG_BLK_DEV_RAM=y
272CONFIG_BLK_DEV_RAM_COUNT=16
273CONFIG_BLK_DEV_RAM_SIZE=4096
274CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
275# CONFIG_CDROM_PKTCDVD is not set
276# CONFIG_ATA_OVER_ETH is not set
277CONFIG_MISC_DEVICES=y
278# CONFIG_EEPROM_93CX6 is not set
279# CONFIG_IDE is not set
280
281#
282# SCSI device support
283#
284# CONFIG_RAID_ATTRS is not set
285CONFIG_SCSI=y
286CONFIG_SCSI_DMA=y
287# CONFIG_SCSI_TGT is not set
288# CONFIG_SCSI_NETLINK is not set
289CONFIG_SCSI_PROC_FS=y
290
291#
292# SCSI support type (disk, tape, CD-ROM)
293#
294CONFIG_BLK_DEV_SD=y
295# CONFIG_CHR_DEV_ST is not set
296# CONFIG_CHR_DEV_OSST is not set
297# CONFIG_BLK_DEV_SR is not set
298# CONFIG_CHR_DEV_SG is not set
299# CONFIG_CHR_DEV_SCH is not set
300
301#
302# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
303#
304CONFIG_SCSI_MULTI_LUN=y
305# CONFIG_SCSI_CONSTANTS is not set
306# CONFIG_SCSI_LOGGING is not set
307# CONFIG_SCSI_SCAN_ASYNC is not set
308
309#
310# SCSI Transports
311#
312CONFIG_SCSI_SPI_ATTRS=y
313# CONFIG_SCSI_FC_ATTRS is not set
314# CONFIG_SCSI_ISCSI_ATTRS is not set
315# CONFIG_SCSI_SAS_LIBSAS is not set
316# CONFIG_SCSI_SRP_ATTRS is not set
317CONFIG_SCSI_LOWLEVEL=y
318# CONFIG_ISCSI_TCP is not set
319# CONFIG_SCSI_DEBUG is not set
320# CONFIG_ATA is not set
321# CONFIG_MD is not set
322CONFIG_NETDEVICES=y
323# CONFIG_NETDEVICES_MULTIQUEUE is not set
324# CONFIG_DUMMY is not set
325# CONFIG_BONDING is not set
326# CONFIG_MACVLAN is not set
327# CONFIG_EQUALIZER is not set
328# CONFIG_TUN is not set
329# CONFIG_VETH is not set
330# CONFIG_PHYLIB is not set
331CONFIG_NET_ETHERNET=y
332# CONFIG_MII is not set
333# CONFIG_STNIC is not set
334# CONFIG_SMC91X is not set
335# CONFIG_SMC911X is not set
336# CONFIG_IBM_NEW_EMAC_ZMII is not set
337# CONFIG_IBM_NEW_EMAC_RGMII is not set
338# CONFIG_IBM_NEW_EMAC_TAH is not set
339# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
340# CONFIG_B44 is not set
341CONFIG_NETDEV_1000=y
342CONFIG_NETDEV_10000=y
343
344#
345# Wireless LAN
346#
347# CONFIG_WLAN_PRE80211 is not set
348# CONFIG_WLAN_80211 is not set
349# CONFIG_WAN is not set
350# CONFIG_PPP is not set
351# CONFIG_SLIP is not set
352# CONFIG_SHAPER is not set
353# CONFIG_NETCONSOLE is not set
354# CONFIG_NETPOLL is not set
355# CONFIG_NET_POLL_CONTROLLER is not set
356# CONFIG_ISDN is not set
357# CONFIG_PHONE is not set
358
359#
360# Input device support
361#
362CONFIG_INPUT=y
363# CONFIG_INPUT_FF_MEMLESS is not set
364# CONFIG_INPUT_POLLDEV is not set
365
366#
367# Userland interfaces
368#
369CONFIG_INPUT_MOUSEDEV=y
370# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
371CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
372CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
373# CONFIG_INPUT_JOYDEV is not set
374# CONFIG_INPUT_EVDEV is not set
375# CONFIG_INPUT_EVBUG is not set
376
377#
378# Input Device Drivers
379#
380# CONFIG_INPUT_KEYBOARD is not set
381# CONFIG_INPUT_MOUSE is not set
382# CONFIG_INPUT_JOYSTICK is not set
383# CONFIG_INPUT_TABLET is not set
384# CONFIG_INPUT_TOUCHSCREEN is not set
385# CONFIG_INPUT_MISC is not set
386
387#
388# Hardware I/O ports
389#
390# CONFIG_SERIO is not set
391# CONFIG_GAMEPORT is not set
392
393#
394# Character devices
395#
396CONFIG_VT=y
397CONFIG_VT_CONSOLE=y
398CONFIG_HW_CONSOLE=y
399# CONFIG_VT_HW_CONSOLE_BINDING is not set
400# CONFIG_SERIAL_NONSTANDARD is not set
401
402#
403# Serial drivers
404#
405# CONFIG_SERIAL_8250 is not set
406
407#
408# Non-8250 serial port support
409#
410CONFIG_SERIAL_SH_SCI=y
411CONFIG_SERIAL_SH_SCI_NR_UARTS=2
412CONFIG_SERIAL_SH_SCI_CONSOLE=y
413CONFIG_SERIAL_CORE=y
414CONFIG_SERIAL_CORE_CONSOLE=y
415CONFIG_UNIX98_PTYS=y
416CONFIG_LEGACY_PTYS=y
417CONFIG_LEGACY_PTY_COUNT=256
418# CONFIG_IPMI_HANDLER is not set
419CONFIG_HW_RANDOM=y
420# CONFIG_R3964 is not set
421# CONFIG_RAW_DRIVER is not set
422# CONFIG_TCG_TPM is not set
423# CONFIG_I2C is not set
424
425#
426# SPI support
427#
428# CONFIG_SPI is not set
429# CONFIG_SPI_MASTER is not set
430# CONFIG_W1 is not set
431# CONFIG_POWER_SUPPLY is not set
432CONFIG_HWMON=y
433# CONFIG_HWMON_VID is not set
434# CONFIG_SENSORS_F71805F is not set
435# CONFIG_SENSORS_F71882FG is not set
436# CONFIG_SENSORS_IT87 is not set
437# CONFIG_SENSORS_PC87360 is not set
438# CONFIG_SENSORS_PC87427 is not set
439# CONFIG_SENSORS_SMSC47M1 is not set
440# CONFIG_SENSORS_SMSC47B397 is not set
441# CONFIG_SENSORS_VT1211 is not set
442# CONFIG_SENSORS_W83627HF is not set
443# CONFIG_SENSORS_W83627EHF is not set
444# CONFIG_HWMON_DEBUG_CHIP is not set
445CONFIG_WATCHDOG=y
446# CONFIG_WATCHDOG_NOWAYOUT is not set
447
448#
449# Watchdog Device Drivers
450#
451# CONFIG_SOFT_WATCHDOG is not set
452
453#
454# Sonics Silicon Backplane
455#
456CONFIG_SSB_POSSIBLE=y
457# CONFIG_SSB is not set
458
459#
460# Multifunction device drivers
461#
462# CONFIG_MFD_SM501 is not set
463
464#
465# Multimedia devices
466#
467# CONFIG_VIDEO_DEV is not set
468# CONFIG_DVB_CORE is not set
469CONFIG_DAB=y
470
471#
472# Graphics support
473#
474# CONFIG_VGASTATE is not set
475CONFIG_VIDEO_OUTPUT_CONTROL=y
476CONFIG_FB=y
477CONFIG_FIRMWARE_EDID=y
478# CONFIG_FB_DDC is not set
479# CONFIG_FB_CFB_FILLRECT is not set
480# CONFIG_FB_CFB_COPYAREA is not set
481# CONFIG_FB_CFB_IMAGEBLIT is not set
482# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
483# CONFIG_FB_SYS_FILLRECT is not set
484# CONFIG_FB_SYS_COPYAREA is not set
485# CONFIG_FB_SYS_IMAGEBLIT is not set
486# CONFIG_FB_SYS_FOPS is not set
487CONFIG_FB_DEFERRED_IO=y
488# CONFIG_FB_SVGALIB is not set
489# CONFIG_FB_MACMODES is not set
490# CONFIG_FB_BACKLIGHT is not set
491CONFIG_FB_MODE_HELPERS=y
492# CONFIG_FB_TILEBLITTING is not set
493
494#
495# Frame buffer hardware drivers
496#
497# CONFIG_FB_S1D13XXX is not set
498# CONFIG_FB_VIRTUAL is not set
499# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
500
501#
502# Display device support
503#
504# CONFIG_DISPLAY_SUPPORT is not set
505
506#
507# Console display driver support
508#
509CONFIG_DUMMY_CONSOLE=y
510CONFIG_FRAMEBUFFER_CONSOLE=y
511# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
512# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
513CONFIG_FONTS=y
514# CONFIG_FONT_8x8 is not set
515CONFIG_FONT_8x16=y
516# CONFIG_FONT_6x11 is not set
517# CONFIG_FONT_7x14 is not set
518# CONFIG_FONT_PEARL_8x8 is not set
519# CONFIG_FONT_ACORN_8x8 is not set
520# CONFIG_FONT_MINI_4x6 is not set
521# CONFIG_FONT_SUN8x16 is not set
522# CONFIG_FONT_SUN12x22 is not set
523# CONFIG_FONT_10x18 is not set
524CONFIG_LOGO=y
525# CONFIG_LOGO_LINUX_MONO is not set
526# CONFIG_LOGO_LINUX_VGA16 is not set
527# CONFIG_LOGO_LINUX_CLUT224 is not set
528# CONFIG_LOGO_SUPERH_MONO is not set
529# CONFIG_LOGO_SUPERH_VGA16 is not set
530CONFIG_LOGO_SUPERH_CLUT224=y
531
532#
533# Sound
534#
535# CONFIG_SOUND is not set
536CONFIG_HID_SUPPORT=y
537CONFIG_HID=y
538# CONFIG_HID_DEBUG is not set
539# CONFIG_HIDRAW is not set
540CONFIG_USB_SUPPORT=y
541CONFIG_USB_ARCH_HAS_HCD=y
542# CONFIG_USB_ARCH_HAS_OHCI is not set
543# CONFIG_USB_ARCH_HAS_EHCI is not set
544# CONFIG_USB is not set
545
546#
547# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
548#
549
550#
551# USB Gadget Support
552#
553# CONFIG_USB_GADGET is not set
554# CONFIG_MMC is not set
555# CONFIG_NEW_LEDS is not set
556# CONFIG_RTC_CLASS is not set
557
558#
559# Userspace I/O
560#
561# CONFIG_UIO is not set
562
563#
564# File systems
565#
566CONFIG_EXT2_FS=y
567# CONFIG_EXT2_FS_XATTR is not set
568# CONFIG_EXT2_FS_XIP is not set
569CONFIG_EXT3_FS=y
570CONFIG_EXT3_FS_XATTR=y
571# CONFIG_EXT3_FS_POSIX_ACL is not set
572# CONFIG_EXT3_FS_SECURITY is not set
573# CONFIG_EXT4DEV_FS is not set
574CONFIG_JBD=y
575# CONFIG_JBD_DEBUG is not set
576CONFIG_FS_MBCACHE=y
577# CONFIG_REISERFS_FS is not set
578# CONFIG_JFS_FS is not set
579# CONFIG_FS_POSIX_ACL is not set
580# CONFIG_XFS_FS is not set
581# CONFIG_GFS2_FS is not set
582# CONFIG_OCFS2_FS is not set
583CONFIG_MINIX_FS=y
584CONFIG_ROMFS_FS=y
585CONFIG_INOTIFY=y
586CONFIG_INOTIFY_USER=y
587# CONFIG_QUOTA is not set
588CONFIG_DNOTIFY=y
589# CONFIG_AUTOFS_FS is not set
590# CONFIG_AUTOFS4_FS is not set
591# CONFIG_FUSE_FS is not set
592
593#
594# CD-ROM/DVD Filesystems
595#
596# CONFIG_ISO9660_FS is not set
597# CONFIG_UDF_FS is not set
598
599#
600# DOS/FAT/NT Filesystems
601#
602# CONFIG_MSDOS_FS is not set
603# CONFIG_VFAT_FS is not set
604# CONFIG_NTFS_FS is not set
605
606#
607# Pseudo filesystems
608#
609CONFIG_PROC_FS=y
610CONFIG_PROC_KCORE=y
611CONFIG_PROC_SYSCTL=y
612CONFIG_SYSFS=y
613CONFIG_TMPFS=y
614# CONFIG_TMPFS_POSIX_ACL is not set
615CONFIG_HUGETLBFS=y
616CONFIG_HUGETLB_PAGE=y
617# CONFIG_CONFIGFS_FS is not set
618
619#
620# Miscellaneous filesystems
621#
622# CONFIG_ADFS_FS is not set
623# CONFIG_AFFS_FS is not set
624# CONFIG_HFS_FS is not set
625# CONFIG_HFSPLUS_FS is not set
626# CONFIG_BEFS_FS is not set
627# CONFIG_BFS_FS is not set
628# CONFIG_EFS_FS is not set
629# CONFIG_CRAMFS is not set
630# CONFIG_VXFS_FS is not set
631# CONFIG_HPFS_FS is not set
632# CONFIG_QNX4FS_FS is not set
633# CONFIG_SYSV_FS is not set
634# CONFIG_UFS_FS is not set
635CONFIG_NETWORK_FILESYSTEMS=y
636CONFIG_NFS_FS=y
637CONFIG_NFS_V3=y
638# CONFIG_NFS_V3_ACL is not set
639# CONFIG_NFS_V4 is not set
640# CONFIG_NFS_DIRECTIO is not set
641# CONFIG_NFSD is not set
642CONFIG_ROOT_NFS=y
643CONFIG_LOCKD=y
644CONFIG_LOCKD_V4=y
645CONFIG_NFS_COMMON=y
646CONFIG_SUNRPC=y
647# CONFIG_SUNRPC_BIND34 is not set
648# CONFIG_RPCSEC_GSS_KRB5 is not set
649# CONFIG_RPCSEC_GSS_SPKM3 is not set
650# CONFIG_SMB_FS is not set
651# CONFIG_CIFS is not set
652# CONFIG_NCP_FS is not set
653# CONFIG_CODA_FS is not set
654# CONFIG_AFS_FS is not set
655
656#
657# Partition Types
658#
659CONFIG_PARTITION_ADVANCED=y
660# CONFIG_ACORN_PARTITION is not set
661# CONFIG_OSF_PARTITION is not set
662# CONFIG_AMIGA_PARTITION is not set
663# CONFIG_ATARI_PARTITION is not set
664# CONFIG_MAC_PARTITION is not set
665CONFIG_MSDOS_PARTITION=y
666# CONFIG_BSD_DISKLABEL is not set
667# CONFIG_MINIX_SUBPARTITION is not set
668# CONFIG_SOLARIS_X86_PARTITION is not set
669# CONFIG_UNIXWARE_DISKLABEL is not set
670# CONFIG_LDM_PARTITION is not set
671# CONFIG_SGI_PARTITION is not set
672# CONFIG_ULTRIX_PARTITION is not set
673# CONFIG_SUN_PARTITION is not set
674# CONFIG_KARMA_PARTITION is not set
675# CONFIG_EFI_PARTITION is not set
676# CONFIG_SYSV68_PARTITION is not set
677# CONFIG_NLS is not set
678# CONFIG_DLM is not set
679CONFIG_INSTRUMENTATION=y
680# CONFIG_PROFILING is not set
681# CONFIG_MARKERS is not set
682
683#
684# Kernel hacking
685#
686# CONFIG_PRINTK_TIME is not set
687CONFIG_ENABLE_WARN_DEPRECATED=y
688CONFIG_ENABLE_MUST_CHECK=y
689CONFIG_MAGIC_SYSRQ=y
690# CONFIG_UNUSED_SYMBOLS is not set
691CONFIG_DEBUG_FS=y
692# CONFIG_HEADERS_CHECK is not set
693CONFIG_DEBUG_KERNEL=y
694# CONFIG_DEBUG_SHIRQ is not set
695CONFIG_DETECT_SOFTLOCKUP=y
696CONFIG_SCHED_DEBUG=y
697CONFIG_SCHEDSTATS=y
698# CONFIG_TIMER_STATS is not set
699# CONFIG_DEBUG_SLAB is not set
700# CONFIG_DEBUG_RT_MUTEXES is not set
701# CONFIG_RT_MUTEX_TESTER is not set
702# CONFIG_DEBUG_SPINLOCK is not set
703# CONFIG_DEBUG_MUTEXES is not set
704# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
705# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
706# CONFIG_DEBUG_KOBJECT is not set
707CONFIG_DEBUG_BUGVERBOSE=y
708# CONFIG_DEBUG_INFO is not set
709# CONFIG_DEBUG_VM is not set
710# CONFIG_DEBUG_LIST is not set
711# CONFIG_DEBUG_SG is not set
712CONFIG_FRAME_POINTER=y
713CONFIG_FORCED_INLINING=y
714# CONFIG_BOOT_PRINTK_DELAY is not set
715# CONFIG_FAULT_INJECTION is not set
716# CONFIG_SAMPLES is not set
717# CONFIG_EARLY_PRINTK is not set
718CONFIG_SH64_PROC_TLB=y
719CONFIG_SH64_PROC_ASIDS=y
720CONFIG_SH64_SR_WATCH=y
721# CONFIG_POOR_MANS_STRACE is not set
722# CONFIG_SH_NO_BSS_INIT is not set
723
724#
725# Security options
726#
727# CONFIG_KEYS is not set
728# CONFIG_SECURITY is not set
729# CONFIG_SECURITY_FILE_CAPABILITIES is not set
730# CONFIG_CRYPTO is not set
731
732#
733# Library routines
734#
735CONFIG_BITREVERSE=y
736# CONFIG_CRC_CCITT is not set
737# CONFIG_CRC16 is not set
738# CONFIG_CRC_ITU_T is not set
739CONFIG_CRC32=y
740# CONFIG_CRC7 is not set
741# CONFIG_LIBCRC32C is not set
742CONFIG_PLIST=y
743CONFIG_HAS_IOMEM=y
744CONFIG_HAS_IOPORT=y
745CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/r7785rp_defconfig b/arch/sh/configs/r7785rp_defconfig
index 2e43a2a971a9..0dc1ce7b9349 100644
--- a/arch/sh/configs/r7785rp_defconfig
+++ b/arch/sh/configs/r7785rp_defconfig
@@ -1,9 +1,10 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc2 3# Linux kernel version: 2.6.24-rc3
4# Tue Nov 13 20:34:57 2007 4# Fri Nov 23 14:03:57 2007
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y
7CONFIG_RWSEM_GENERIC_SPINLOCK=y 8CONFIG_RWSEM_GENERIC_SPINLOCK=y
8CONFIG_GENERIC_BUG=y 9CONFIG_GENERIC_BUG=y
9CONFIG_GENERIC_FIND_NEXT_BIT=y 10CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -39,6 +40,7 @@ CONFIG_BSD_PROCESS_ACCT=y
39# CONFIG_BSD_PROCESS_ACCT_V3 is not set 40# CONFIG_BSD_PROCESS_ACCT_V3 is not set
40# CONFIG_TASKSTATS is not set 41# CONFIG_TASKSTATS is not set
41# CONFIG_USER_NS is not set 42# CONFIG_USER_NS is not set
43# CONFIG_PID_NS is not set
42# CONFIG_AUDIT is not set 44# CONFIG_AUDIT is not set
43CONFIG_IKCONFIG=y 45CONFIG_IKCONFIG=y
44CONFIG_IKCONFIG_PROC=y 46CONFIG_IKCONFIG_PROC=y
@@ -130,6 +132,8 @@ CONFIG_CPU_SUBTYPE_SH7785=y
130# CONFIG_CPU_SUBTYPE_SHX3 is not set 132# CONFIG_CPU_SUBTYPE_SHX3 is not set
131# CONFIG_CPU_SUBTYPE_SH7343 is not set 133# CONFIG_CPU_SUBTYPE_SH7343 is not set
132# CONFIG_CPU_SUBTYPE_SH7722 is not set 134# CONFIG_CPU_SUBTYPE_SH7722 is not set
135# CONFIG_CPU_SUBTYPE_SH5_101 is not set
136# CONFIG_CPU_SUBTYPE_SH5_103 is not set
133 137
134# 138#
135# Memory management options 139# Memory management options
@@ -139,7 +143,8 @@ CONFIG_MMU=y
139CONFIG_PAGE_OFFSET=0x80000000 143CONFIG_PAGE_OFFSET=0x80000000
140CONFIG_MEMORY_START=0x08000000 144CONFIG_MEMORY_START=0x08000000
141CONFIG_MEMORY_SIZE=0x08000000 145CONFIG_MEMORY_SIZE=0x08000000
142# CONFIG_32BIT is not set 146CONFIG_29BIT=y
147# CONFIG_PMB is not set
143# CONFIG_X2TLB is not set 148# CONFIG_X2TLB is not set
144CONFIG_VSYSCALL=y 149CONFIG_VSYSCALL=y
145# CONFIG_NUMA is not set 150# CONFIG_NUMA is not set
@@ -158,6 +163,7 @@ CONFIG_PAGE_SIZE_4KB=y
158CONFIG_HUGETLB_PAGE_SIZE_1MB=y 163CONFIG_HUGETLB_PAGE_SIZE_1MB=y
159# CONFIG_HUGETLB_PAGE_SIZE_4MB is not set 164# CONFIG_HUGETLB_PAGE_SIZE_4MB is not set
160# CONFIG_HUGETLB_PAGE_SIZE_64MB is not set 165# CONFIG_HUGETLB_PAGE_SIZE_64MB is not set
166# CONFIG_HUGETLB_PAGE_SIZE_512MB is not set
161CONFIG_SELECT_MEMORY_MODEL=y 167CONFIG_SELECT_MEMORY_MODEL=y
162# CONFIG_FLATMEM_MANUAL is not set 168# CONFIG_FLATMEM_MANUAL is not set
163# CONFIG_DISCONTIGMEM_MANUAL is not set 169# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -701,6 +707,7 @@ CONFIG_DEVPORT=y
701# CONFIG_POWER_SUPPLY is not set 707# CONFIG_POWER_SUPPLY is not set
702CONFIG_HWMON=y 708CONFIG_HWMON=y
703# CONFIG_HWMON_VID is not set 709# CONFIG_HWMON_VID is not set
710# CONFIG_SENSORS_I5K_AMB is not set
704# CONFIG_SENSORS_F71805F is not set 711# CONFIG_SENSORS_F71805F is not set
705# CONFIG_SENSORS_F71882FG is not set 712# CONFIG_SENSORS_F71882FG is not set
706# CONFIG_SENSORS_IT87 is not set 713# CONFIG_SENSORS_IT87 is not set
diff --git a/arch/sh/configs/sim_defconfig b/arch/sh/configs/sim_defconfig
deleted file mode 100644
index 18476cc522c3..000000000000
--- a/arch/sh/configs/sim_defconfig
+++ /dev/null
@@ -1,558 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc1
4# Fri Nov 2 14:36:08 2007
5#
6CONFIG_SUPERH=y
7CONFIG_SUPERH64=y
8CONFIG_MMU=y
9CONFIG_QUICKLIST=y
10CONFIG_RWSEM_GENERIC_SPINLOCK=y
11CONFIG_GENERIC_FIND_NEXT_BIT=y
12CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_CALIBRATE_DELAY=y
14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_IRQ_PROBE=y
16# CONFIG_ARCH_HAS_ILOG2_U32 is not set
17# CONFIG_ARCH_HAS_ILOG2_U64 is not set
18CONFIG_ARCH_NO_VIRT_TO_BUS=y
19CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
20
21#
22# General setup
23#
24CONFIG_EXPERIMENTAL=y
25CONFIG_BROKEN_ON_SMP=y
26CONFIG_LOCK_KERNEL=y
27CONFIG_INIT_ENV_ARG_LIMIT=32
28CONFIG_LOCALVERSION=""
29CONFIG_LOCALVERSION_AUTO=y
30CONFIG_SWAP=y
31# CONFIG_SYSVIPC is not set
32# CONFIG_BSD_PROCESS_ACCT is not set
33# CONFIG_USER_NS is not set
34# CONFIG_IKCONFIG is not set
35CONFIG_LOG_BUF_SHIFT=14
36# CONFIG_CGROUPS is not set
37CONFIG_FAIR_GROUP_SCHED=y
38CONFIG_FAIR_USER_SCHED=y
39# CONFIG_FAIR_CGROUP_SCHED is not set
40CONFIG_SYSFS_DEPRECATED=y
41# CONFIG_RELAY is not set
42# CONFIG_BLK_DEV_INITRD is not set
43# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
44CONFIG_SYSCTL=y
45# CONFIG_EMBEDDED is not set
46CONFIG_UID16=y
47CONFIG_SYSCTL_SYSCALL=y
48CONFIG_KALLSYMS=y
49# CONFIG_KALLSYMS_ALL is not set
50# CONFIG_KALLSYMS_EXTRA_PASS is not set
51CONFIG_HOTPLUG=y
52CONFIG_PRINTK=y
53CONFIG_BUG=y
54CONFIG_ELF_CORE=y
55CONFIG_BASE_FULL=y
56CONFIG_FUTEX=y
57CONFIG_ANON_INODES=y
58CONFIG_EPOLL=y
59CONFIG_SIGNALFD=y
60CONFIG_EVENTFD=y
61CONFIG_SHMEM=y
62CONFIG_VM_EVENT_COUNTERS=y
63CONFIG_SLAB=y
64# CONFIG_SLUB is not set
65# CONFIG_SLOB is not set
66CONFIG_RT_MUTEXES=y
67# CONFIG_TINY_SHMEM is not set
68CONFIG_BASE_SMALL=0
69# CONFIG_MODULES is not set
70CONFIG_BLOCK=y
71# CONFIG_LBD is not set
72# CONFIG_BLK_DEV_IO_TRACE is not set
73# CONFIG_LSF is not set
74# CONFIG_BLK_DEV_BSG is not set
75
76#
77# IO Schedulers
78#
79CONFIG_IOSCHED_NOOP=y
80CONFIG_IOSCHED_AS=y
81CONFIG_IOSCHED_DEADLINE=y
82CONFIG_IOSCHED_CFQ=y
83# CONFIG_DEFAULT_AS is not set
84# CONFIG_DEFAULT_DEADLINE is not set
85CONFIG_DEFAULT_CFQ=y
86# CONFIG_DEFAULT_NOOP is not set
87CONFIG_DEFAULT_IOSCHED="cfq"
88
89#
90# System type
91#
92CONFIG_SH_SIMULATOR=y
93# CONFIG_SH_CAYMAN is not set
94# CONFIG_SH_HARP is not set
95CONFIG_CPU_SH5=y
96CONFIG_CPU_SUBTYPE_SH5_101=y
97# CONFIG_CPU_SUBTYPE_SH5_103 is not set
98CONFIG_LITTLE_ENDIAN=y
99# CONFIG_BIG_ENDIAN is not set
100CONFIG_SH_FPU=y
101# CONFIG_SH64_FPU_DENORM_FLUSH is not set
102CONFIG_SH64_PGTABLE_2_LEVEL=y
103# CONFIG_SH64_PGTABLE_3_LEVEL is not set
104CONFIG_HUGETLB_PAGE_SIZE_64K=y
105# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
106# CONFIG_HUGETLB_PAGE_SIZE_512MB is not set
107CONFIG_SH64_USER_MISALIGNED_FIXUP=y
108
109#
110# Memory options
111#
112CONFIG_CACHED_MEMORY_OFFSET=0x20000000
113CONFIG_MEMORY_START=0x80000000
114CONFIG_MEMORY_SIZE_IN_MB=128
115
116#
117# Cache options
118#
119# CONFIG_DCACHE_WRITE_BACK is not set
120# CONFIG_DCACHE_WRITE_THROUGH is not set
121CONFIG_DCACHE_DISABLED=y
122# CONFIG_ICACHE_DISABLED is not set
123CONFIG_PCIDEVICE_MEMORY_START=C0000000
124CONFIG_DEVICE_MEMORY_START=E0000000
125CONFIG_FLASH_MEMORY_START=0x00000000
126CONFIG_PCI_BLOCK_START=0x40000000
127
128#
129# CPU Subtype specific options
130#
131CONFIG_SH64_ID2815_WORKAROUND=y
132
133#
134# Misc options
135#
136# CONFIG_SH_DMA is not set
137CONFIG_PREEMPT=y
138CONFIG_SELECT_MEMORY_MODEL=y
139CONFIG_FLATMEM_MANUAL=y
140# CONFIG_DISCONTIGMEM_MANUAL is not set
141# CONFIG_SPARSEMEM_MANUAL is not set
142CONFIG_FLATMEM=y
143CONFIG_FLAT_NODE_MEM_MAP=y
144# CONFIG_SPARSEMEM_STATIC is not set
145# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
146CONFIG_SPLIT_PTLOCK_CPUS=4
147# CONFIG_RESOURCES_64BIT is not set
148CONFIG_ZONE_DMA_FLAG=0
149CONFIG_NR_QUICK=1
150
151#
152# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
153#
154# CONFIG_ARCH_SUPPORTS_MSI is not set
155# CONFIG_PCCARD is not set
156
157#
158# Executable file formats
159#
160CONFIG_BINFMT_ELF=y
161# CONFIG_BINFMT_MISC is not set
162
163#
164# Networking
165#
166# CONFIG_NET is not set
167
168#
169# Device Drivers
170#
171
172#
173# Generic Driver Options
174#
175CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
176CONFIG_STANDALONE=y
177CONFIG_PREVENT_FIRMWARE_BUILD=y
178# CONFIG_FW_LOADER is not set
179# CONFIG_DEBUG_DRIVER is not set
180# CONFIG_DEBUG_DEVRES is not set
181# CONFIG_SYS_HYPERVISOR is not set
182# CONFIG_MTD is not set
183# CONFIG_PARPORT is not set
184# CONFIG_BLK_DEV is not set
185# CONFIG_MISC_DEVICES is not set
186# CONFIG_IDE is not set
187
188#
189# SCSI device support
190#
191# CONFIG_RAID_ATTRS is not set
192CONFIG_SCSI=y
193CONFIG_SCSI_DMA=y
194# CONFIG_SCSI_TGT is not set
195# CONFIG_SCSI_NETLINK is not set
196CONFIG_SCSI_PROC_FS=y
197
198#
199# SCSI support type (disk, tape, CD-ROM)
200#
201CONFIG_BLK_DEV_SD=y
202# CONFIG_CHR_DEV_ST is not set
203# CONFIG_CHR_DEV_OSST is not set
204# CONFIG_BLK_DEV_SR is not set
205# CONFIG_CHR_DEV_SG is not set
206# CONFIG_CHR_DEV_SCH is not set
207
208#
209# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
210#
211CONFIG_SCSI_MULTI_LUN=y
212# CONFIG_SCSI_CONSTANTS is not set
213# CONFIG_SCSI_LOGGING is not set
214# CONFIG_SCSI_SCAN_ASYNC is not set
215
216#
217# SCSI Transports
218#
219CONFIG_SCSI_SPI_ATTRS=y
220# CONFIG_SCSI_FC_ATTRS is not set
221# CONFIG_SCSI_SAS_LIBSAS is not set
222# CONFIG_SCSI_SRP_ATTRS is not set
223CONFIG_SCSI_LOWLEVEL=y
224# CONFIG_SCSI_DEBUG is not set
225# CONFIG_ATA is not set
226# CONFIG_MD is not set
227# CONFIG_PHONE is not set
228
229#
230# Input device support
231#
232CONFIG_INPUT=y
233# CONFIG_INPUT_FF_MEMLESS is not set
234# CONFIG_INPUT_POLLDEV is not set
235
236#
237# Userland interfaces
238#
239CONFIG_INPUT_MOUSEDEV=y
240# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
241CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
242CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
243# CONFIG_INPUT_JOYDEV is not set
244# CONFIG_INPUT_EVDEV is not set
245# CONFIG_INPUT_EVBUG is not set
246
247#
248# Input Device Drivers
249#
250# CONFIG_INPUT_KEYBOARD is not set
251# CONFIG_INPUT_MOUSE is not set
252# CONFIG_INPUT_JOYSTICK is not set
253# CONFIG_INPUT_TABLET is not set
254# CONFIG_INPUT_TOUCHSCREEN is not set
255# CONFIG_INPUT_MISC is not set
256
257#
258# Hardware I/O ports
259#
260# CONFIG_SERIO is not set
261# CONFIG_GAMEPORT is not set
262
263#
264# Character devices
265#
266CONFIG_VT=y
267CONFIG_VT_CONSOLE=y
268CONFIG_HW_CONSOLE=y
269# CONFIG_VT_HW_CONSOLE_BINDING is not set
270# CONFIG_SERIAL_NONSTANDARD is not set
271
272#
273# Serial drivers
274#
275# CONFIG_SERIAL_8250 is not set
276
277#
278# Non-8250 serial port support
279#
280CONFIG_SERIAL_SH_SCI=y
281CONFIG_SERIAL_SH_SCI_NR_UARTS=2
282CONFIG_SERIAL_SH_SCI_CONSOLE=y
283CONFIG_SERIAL_CORE=y
284CONFIG_SERIAL_CORE_CONSOLE=y
285CONFIG_UNIX98_PTYS=y
286# CONFIG_LEGACY_PTYS is not set
287# CONFIG_IPMI_HANDLER is not set
288# CONFIG_HW_RANDOM is not set
289# CONFIG_R3964 is not set
290# CONFIG_RAW_DRIVER is not set
291# CONFIG_TCG_TPM is not set
292# CONFIG_I2C is not set
293
294#
295# SPI support
296#
297# CONFIG_SPI is not set
298# CONFIG_SPI_MASTER is not set
299# CONFIG_W1 is not set
300# CONFIG_POWER_SUPPLY is not set
301# CONFIG_HWMON is not set
302# CONFIG_WATCHDOG is not set
303
304#
305# Sonics Silicon Backplane
306#
307CONFIG_SSB_POSSIBLE=y
308# CONFIG_SSB is not set
309
310#
311# Multifunction device drivers
312#
313# CONFIG_MFD_SM501 is not set
314
315#
316# Multimedia devices
317#
318# CONFIG_VIDEO_DEV is not set
319CONFIG_DAB=y
320
321#
322# Graphics support
323#
324# CONFIG_VGASTATE is not set
325CONFIG_VIDEO_OUTPUT_CONTROL=y
326CONFIG_FB=y
327CONFIG_FIRMWARE_EDID=y
328# CONFIG_FB_DDC is not set
329# CONFIG_FB_CFB_FILLRECT is not set
330# CONFIG_FB_CFB_COPYAREA is not set
331# CONFIG_FB_CFB_IMAGEBLIT is not set
332# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
333# CONFIG_FB_SYS_FILLRECT is not set
334# CONFIG_FB_SYS_COPYAREA is not set
335# CONFIG_FB_SYS_IMAGEBLIT is not set
336# CONFIG_FB_SYS_FOPS is not set
337CONFIG_FB_DEFERRED_IO=y
338# CONFIG_FB_SVGALIB is not set
339# CONFIG_FB_MACMODES is not set
340# CONFIG_FB_BACKLIGHT is not set
341CONFIG_FB_MODE_HELPERS=y
342# CONFIG_FB_TILEBLITTING is not set
343
344#
345# Frame buffer hardware drivers
346#
347# CONFIG_FB_S1D13XXX is not set
348# CONFIG_FB_VIRTUAL is not set
349# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
350
351#
352# Display device support
353#
354# CONFIG_DISPLAY_SUPPORT is not set
355
356#
357# Console display driver support
358#
359CONFIG_DUMMY_CONSOLE=y
360CONFIG_FRAMEBUFFER_CONSOLE=y
361# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
362# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
363CONFIG_FONTS=y
364# CONFIG_FONT_8x8 is not set
365CONFIG_FONT_8x16=y
366# CONFIG_FONT_6x11 is not set
367# CONFIG_FONT_7x14 is not set
368# CONFIG_FONT_PEARL_8x8 is not set
369# CONFIG_FONT_ACORN_8x8 is not set
370# CONFIG_FONT_MINI_4x6 is not set
371# CONFIG_FONT_SUN8x16 is not set
372# CONFIG_FONT_SUN12x22 is not set
373# CONFIG_FONT_10x18 is not set
374CONFIG_LOGO=y
375# CONFIG_LOGO_LINUX_MONO is not set
376# CONFIG_LOGO_LINUX_VGA16 is not set
377# CONFIG_LOGO_LINUX_CLUT224 is not set
378# CONFIG_LOGO_SUPERH_MONO is not set
379# CONFIG_LOGO_SUPERH_VGA16 is not set
380CONFIG_LOGO_SUPERH_CLUT224=y
381
382#
383# Sound
384#
385# CONFIG_SOUND is not set
386# CONFIG_HID_SUPPORT is not set
387# CONFIG_USB_SUPPORT is not set
388# CONFIG_MMC is not set
389# CONFIG_NEW_LEDS is not set
390# CONFIG_RTC_CLASS is not set
391
392#
393# Userspace I/O
394#
395# CONFIG_UIO is not set
396
397#
398# File systems
399#
400CONFIG_EXT2_FS=y
401# CONFIG_EXT2_FS_XATTR is not set
402# CONFIG_EXT2_FS_XIP is not set
403CONFIG_EXT3_FS=y
404CONFIG_EXT3_FS_XATTR=y
405# CONFIG_EXT3_FS_POSIX_ACL is not set
406# CONFIG_EXT3_FS_SECURITY is not set
407# CONFIG_EXT4DEV_FS is not set
408CONFIG_JBD=y
409# CONFIG_JBD_DEBUG is not set
410CONFIG_FS_MBCACHE=y
411# CONFIG_REISERFS_FS is not set
412# CONFIG_JFS_FS is not set
413# CONFIG_FS_POSIX_ACL is not set
414# CONFIG_XFS_FS is not set
415# CONFIG_GFS2_FS is not set
416CONFIG_MINIX_FS=y
417CONFIG_ROMFS_FS=y
418CONFIG_INOTIFY=y
419CONFIG_INOTIFY_USER=y
420# CONFIG_QUOTA is not set
421CONFIG_DNOTIFY=y
422# CONFIG_AUTOFS_FS is not set
423# CONFIG_AUTOFS4_FS is not set
424# CONFIG_FUSE_FS is not set
425
426#
427# CD-ROM/DVD Filesystems
428#
429# CONFIG_ISO9660_FS is not set
430# CONFIG_UDF_FS is not set
431
432#
433# DOS/FAT/NT Filesystems
434#
435# CONFIG_MSDOS_FS is not set
436# CONFIG_VFAT_FS is not set
437# CONFIG_NTFS_FS is not set
438
439#
440# Pseudo filesystems
441#
442CONFIG_PROC_FS=y
443CONFIG_PROC_KCORE=y
444CONFIG_PROC_SYSCTL=y
445CONFIG_SYSFS=y
446CONFIG_TMPFS=y
447# CONFIG_TMPFS_POSIX_ACL is not set
448CONFIG_HUGETLBFS=y
449CONFIG_HUGETLB_PAGE=y
450# CONFIG_CONFIGFS_FS is not set
451
452#
453# Miscellaneous filesystems
454#
455# CONFIG_ADFS_FS is not set
456# CONFIG_AFFS_FS is not set
457# CONFIG_HFS_FS is not set
458# CONFIG_HFSPLUS_FS is not set
459# CONFIG_BEFS_FS is not set
460# CONFIG_BFS_FS is not set
461# CONFIG_EFS_FS is not set
462# CONFIG_CRAMFS is not set
463# CONFIG_VXFS_FS is not set
464# CONFIG_HPFS_FS is not set
465# CONFIG_QNX4FS_FS is not set
466# CONFIG_SYSV_FS is not set
467# CONFIG_UFS_FS is not set
468
469#
470# Partition Types
471#
472CONFIG_PARTITION_ADVANCED=y
473# CONFIG_ACORN_PARTITION is not set
474# CONFIG_OSF_PARTITION is not set
475# CONFIG_AMIGA_PARTITION is not set
476# CONFIG_ATARI_PARTITION is not set
477# CONFIG_MAC_PARTITION is not set
478CONFIG_MSDOS_PARTITION=y
479# CONFIG_BSD_DISKLABEL is not set
480# CONFIG_MINIX_SUBPARTITION is not set
481# CONFIG_SOLARIS_X86_PARTITION is not set
482# CONFIG_UNIXWARE_DISKLABEL is not set
483# CONFIG_LDM_PARTITION is not set
484# CONFIG_SGI_PARTITION is not set
485# CONFIG_ULTRIX_PARTITION is not set
486# CONFIG_SUN_PARTITION is not set
487# CONFIG_KARMA_PARTITION is not set
488# CONFIG_EFI_PARTITION is not set
489# CONFIG_SYSV68_PARTITION is not set
490# CONFIG_NLS is not set
491CONFIG_INSTRUMENTATION=y
492CONFIG_PROFILING=y
493# CONFIG_OPROFILE is not set
494# CONFIG_MARKERS is not set
495
496#
497# Kernel hacking
498#
499# CONFIG_PRINTK_TIME is not set
500CONFIG_ENABLE_WARN_DEPRECATED=y
501CONFIG_ENABLE_MUST_CHECK=y
502CONFIG_MAGIC_SYSRQ=y
503# CONFIG_UNUSED_SYMBOLS is not set
504CONFIG_DEBUG_FS=y
505# CONFIG_HEADERS_CHECK is not set
506CONFIG_DEBUG_KERNEL=y
507# CONFIG_DEBUG_SHIRQ is not set
508CONFIG_DETECT_SOFTLOCKUP=y
509CONFIG_SCHED_DEBUG=y
510CONFIG_SCHEDSTATS=y
511# CONFIG_TIMER_STATS is not set
512# CONFIG_DEBUG_SLAB is not set
513# CONFIG_DEBUG_RT_MUTEXES is not set
514# CONFIG_RT_MUTEX_TESTER is not set
515# CONFIG_DEBUG_SPINLOCK is not set
516# CONFIG_DEBUG_MUTEXES is not set
517# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
518# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
519# CONFIG_DEBUG_KOBJECT is not set
520CONFIG_DEBUG_BUGVERBOSE=y
521# CONFIG_DEBUG_INFO is not set
522# CONFIG_DEBUG_VM is not set
523# CONFIG_DEBUG_LIST is not set
524# CONFIG_DEBUG_SG is not set
525CONFIG_FRAME_POINTER=y
526CONFIG_FORCED_INLINING=y
527# CONFIG_BOOT_PRINTK_DELAY is not set
528# CONFIG_FAULT_INJECTION is not set
529# CONFIG_SAMPLES is not set
530# CONFIG_EARLY_PRINTK is not set
531CONFIG_SH64_PROC_TLB=y
532CONFIG_SH64_PROC_ASIDS=y
533CONFIG_SH64_SR_WATCH=y
534# CONFIG_POOR_MANS_STRACE is not set
535CONFIG_SH_NO_BSS_INIT=y
536
537#
538# Security options
539#
540# CONFIG_KEYS is not set
541# CONFIG_SECURITY is not set
542# CONFIG_SECURITY_FILE_CAPABILITIES is not set
543# CONFIG_CRYPTO is not set
544
545#
546# Library routines
547#
548CONFIG_BITREVERSE=y
549# CONFIG_CRC_CCITT is not set
550# CONFIG_CRC16 is not set
551# CONFIG_CRC_ITU_T is not set
552CONFIG_CRC32=y
553# CONFIG_CRC7 is not set
554# CONFIG_LIBCRC32C is not set
555CONFIG_PLIST=y
556CONFIG_HAS_IOMEM=y
557CONFIG_HAS_IOPORT=y
558CONFIG_HAS_DMA=y
diff --git a/arch/sh/kernel/time_64.c b/arch/sh/kernel/time_64.c
index 4c52feead115..e6f54572cd96 100644
--- a/arch/sh/kernel/time_64.c
+++ b/arch/sh/kernel/time_64.c
@@ -347,14 +347,6 @@ static __init unsigned int get_cpu_hz(void)
347 347
348 count = ctc_val_init - ctc_val; /* CTC counts down */ 348 count = ctc_val_init - ctc_val; /* CTC counts down */
349 349
350#if defined (CONFIG_SH_SIMULATOR)
351 /*
352 * Let's pretend we are a 5MHz SH-5 to avoid a too
353 * little timer interval. Also to keep delay
354 * calibration within a reasonable time.
355 */
356 return 5000000;
357#else
358 /* 350 /*
359 * This really is count by the number of clock cycles 351 * This really is count by the number of clock cycles
360 * by the ratio between a complete R64CNT 352 * by the ratio between a complete R64CNT
diff --git a/arch/sh/mach-harp/Makefile b/arch/sh/mach-harp/Makefile
deleted file mode 100644
index 2f2963fa2131..000000000000
--- a/arch/sh/mach-harp/Makefile
+++ /dev/null
@@ -1 +0,0 @@
1obj-y := setup.o
diff --git a/arch/sh/mach-harp/setup.c b/arch/sh/mach-harp/setup.c
deleted file mode 100644
index 05011cb369bb..000000000000
--- a/arch/sh/mach-harp/setup.c
+++ /dev/null
@@ -1,129 +0,0 @@
1/*
2 * This file is subject to the terms and conditions of the GNU General Public
3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details.
5 *
6 * arch/sh64/mach-harp/setup.c
7 *
8 * SH-5 Simulator Platform Support
9 *
10 * This file handles the architecture-dependent parts of initialization
11 *
12 * Copyright (C) 2000, 2001 Paolo Alberelli
13 *
14 * benedict.gaster@superh.com: 3rd May 2002
15 * Added support for ramdisk, removing statically linked romfs at the same time. *
16 *
17 * lethal@linux-sh.org: 15th May 2003
18 * Use the generic procfs cpuinfo interface, just return a valid board name.
19 */
20#include <linux/init.h>
21#include <linux/kernel.h>
22#include <asm/platform.h>
23#include <asm/irq.h>
24
25/*
26 * Platform Dependent Interrupt Priorities.
27 */
28
29/* Using defaults defined in irq.h */
30#define RES NO_PRIORITY /* Disabled */
31#define IR0 IRL0_PRIORITY /* IRLs */
32#define IR1 IRL1_PRIORITY
33#define IR2 IRL2_PRIORITY
34#define IR3 IRL3_PRIORITY
35#define PCA INTA_PRIORITY /* PCI Ints */
36#define PCB INTB_PRIORITY
37#define PCC INTC_PRIORITY
38#define PCD INTD_PRIORITY
39#define SER TOP_PRIORITY
40#define ERR TOP_PRIORITY
41#define PW0 TOP_PRIORITY
42#define PW1 TOP_PRIORITY
43#define PW2 TOP_PRIORITY
44#define PW3 TOP_PRIORITY
45#define DM0 NO_PRIORITY /* DMA Ints */
46#define DM1 NO_PRIORITY
47#define DM2 NO_PRIORITY
48#define DM3 NO_PRIORITY
49#define DAE NO_PRIORITY
50#define TU0 TIMER_PRIORITY /* TMU Ints */
51#define TU1 NO_PRIORITY
52#define TU2 NO_PRIORITY
53#define TI2 NO_PRIORITY
54#define ATI NO_PRIORITY /* RTC Ints */
55#define PRI NO_PRIORITY
56#define CUI RTC_PRIORITY
57#define ERI SCIF_PRIORITY /* SCIF Ints */
58#define RXI SCIF_PRIORITY
59#define BRI SCIF_PRIORITY
60#define TXI SCIF_PRIORITY
61#define ITI TOP_PRIORITY /* WDT Ints */
62
63/*
64 * Platform dependent structures: maps and parms block.
65 */
66struct resource io_resources[] = {
67 /* To be updated with external devices */
68};
69
70struct resource kram_resources[] = {
71 /* These must be last in the array */
72 { .name = "Kernel code", .start = 0, .end = 0 },
73 /* These must be last in the array */
74 { .name = "Kernel data", .start = 0, .end = 0 }
75};
76
77struct resource xram_resources[] = {
78 /* To be updated with external devices */
79};
80
81struct resource rom_resources[] = {
82 /* To be updated with external devices */
83};
84
85struct sh64_platform platform_parms = {
86 .readonly_rootfs = 1,
87 .initial_root_dev = 0x0100,
88 .loader_type = 1,
89 .io_res_p = io_resources,
90 .io_res_count = ARRAY_SIZE(io_resources),
91 .kram_res_p = kram_resources,
92 .kram_res_count = ARRAY_SIZE(kram_resources),
93 .xram_res_p = xram_resources,
94 .xram_res_count = ARRAY_SIZE(xram_resources),
95 .rom_res_p = rom_resources,
96 .rom_res_count = ARRAY_SIZE(rom_resources),
97};
98
99int platform_int_priority[NR_INTC_IRQS] = {
100 IR0, IR1, IR2, IR3, PCA, PCB, PCC, PCD, /* IRQ 0- 7 */
101 RES, RES, RES, RES, SER, ERR, PW3, PW2, /* IRQ 8-15 */
102 PW1, PW0, DM0, DM1, DM2, DM3, DAE, RES, /* IRQ 16-23 */
103 RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 24-31 */
104 TU0, TU1, TU2, TI2, ATI, PRI, CUI, ERI, /* IRQ 32-39 */
105 RXI, BRI, TXI, RES, RES, RES, RES, RES, /* IRQ 40-47 */
106 RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 48-55 */
107 RES, RES, RES, RES, RES, RES, RES, ITI, /* IRQ 56-63 */
108};
109
110void __init platform_setup(void)
111{
112 /* Harp platform leaves the decision to head.S, for now */
113 platform_parms.fpu_flags = fpu_in_use;
114}
115
116void __init platform_monitor(void)
117{
118 /* Nothing yet .. */
119}
120
121void __init platform_reserve(void)
122{
123 /* Nothing yet .. */
124}
125
126const char *get_system_type(void)
127{
128 return "ST50 Harp";
129}
diff --git a/arch/sh/mach-sim/Makefile b/arch/sh/mach-sim/Makefile
deleted file mode 100644
index 2f2963fa2131..000000000000
--- a/arch/sh/mach-sim/Makefile
+++ /dev/null
@@ -1 +0,0 @@
1obj-y := setup.o
diff --git a/arch/sh/mach-sim/setup.c b/arch/sh/mach-sim/setup.c
deleted file mode 100644
index e3386ec1ce1f..000000000000
--- a/arch/sh/mach-sim/setup.c
+++ /dev/null
@@ -1,126 +0,0 @@
1/*
2 * This file is subject to the terms and conditions of the GNU General Public
3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details.
5 *
6 * arch/sh64/mach-sim/setup.c
7 *
8 * ST50 Simulator Platform Support
9 *
10 * This file handles the architecture-dependent parts of initialization
11 *
12 * Copyright (C) 2000, 2001 Paolo Alberelli
13 *
14 * lethal@linux-sh.org: 15th May 2003
15 * Use the generic procfs cpuinfo interface, just return a valid board name.
16 */
17#include <linux/init.h>
18#include <linux/kernel.h>
19#include <asm/platform.h>
20#include <asm/irq.h>
21
22/*
23 * Platform Dependent Interrupt Priorities.
24 */
25
26/* Using defaults defined in irq.h */
27#define RES NO_PRIORITY /* Disabled */
28#define IR0 IRL0_PRIORITY /* IRLs */
29#define IR1 IRL1_PRIORITY
30#define IR2 IRL2_PRIORITY
31#define IR3 IRL3_PRIORITY
32#define PCA INTA_PRIORITY /* PCI Ints */
33#define PCB INTB_PRIORITY
34#define PCC INTC_PRIORITY
35#define PCD INTD_PRIORITY
36#define SER TOP_PRIORITY
37#define ERR TOP_PRIORITY
38#define PW0 TOP_PRIORITY
39#define PW1 TOP_PRIORITY
40#define PW2 TOP_PRIORITY
41#define PW3 TOP_PRIORITY
42#define DM0 NO_PRIORITY /* DMA Ints */
43#define DM1 NO_PRIORITY
44#define DM2 NO_PRIORITY
45#define DM3 NO_PRIORITY
46#define DAE NO_PRIORITY
47#define TU0 TIMER_PRIORITY /* TMU Ints */
48#define TU1 NO_PRIORITY
49#define TU2 NO_PRIORITY
50#define TI2 NO_PRIORITY
51#define ATI NO_PRIORITY /* RTC Ints */
52#define PRI NO_PRIORITY
53#define CUI RTC_PRIORITY
54#define ERI SCIF_PRIORITY /* SCIF Ints */
55#define RXI SCIF_PRIORITY
56#define BRI SCIF_PRIORITY
57#define TXI SCIF_PRIORITY
58#define ITI TOP_PRIORITY /* WDT Ints */
59
60/*
61 * Platform dependent structures: maps and parms block.
62 */
63struct resource io_resources[] = {
64 /* Nothing yet .. */
65};
66
67struct resource kram_resources[] = {
68 /* These must be last in the array */
69 { .name = "Kernel code", .start = 0, .end = 0 },
70 /* These must be last in the array */
71 { .name = "Kernel data", .start = 0, .end = 0 }
72};
73
74struct resource xram_resources[] = {
75 /* Nothing yet .. */
76};
77
78struct resource rom_resources[] = {
79 /* Nothing yet .. */
80};
81
82struct sh64_platform platform_parms = {
83 .readonly_rootfs = 1,
84 .initial_root_dev = 0x0100,
85 .loader_type = 1,
86 .io_res_p = io_resources,
87 .io_res_count = ARRAY_SIZE(io_resources),
88 .kram_res_p = kram_resources,
89 .kram_res_count = ARRAY_SIZE(kram_resources),
90 .xram_res_p = xram_resources,
91 .xram_res_count = ARRAY_SIZE(xram_resources),
92 .rom_res_p = rom_resources,
93 .rom_res_count = ARRAY_SIZE(rom_resources),
94};
95
96int platform_int_priority[NR_IRQS] = {
97 IR0, IR1, IR2, IR3, PCA, PCB, PCC, PCD, /* IRQ 0- 7 */
98 RES, RES, RES, RES, SER, ERR, PW3, PW2, /* IRQ 8-15 */
99 PW1, PW0, DM0, DM1, DM2, DM3, DAE, RES, /* IRQ 16-23 */
100 RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 24-31 */
101 TU0, TU1, TU2, TI2, ATI, PRI, CUI, ERI, /* IRQ 32-39 */
102 RXI, BRI, TXI, RES, RES, RES, RES, RES, /* IRQ 40-47 */
103 RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 48-55 */
104 RES, RES, RES, RES, RES, RES, RES, ITI, /* IRQ 56-63 */
105};
106
107void __init platform_setup(void)
108{
109 /* Simulator platform leaves the decision to head.S */
110 platform_parms.fpu_flags = fpu_in_use;
111}
112
113void __init platform_monitor(void)
114{
115 /* Nothing yet .. */
116}
117
118void __init platform_reserve(void)
119{
120 /* Nothing yet .. */
121}
122
123const char *get_system_type(void)
124{
125 return "SH-5 Simulator";
126}
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-16 21:43:45 -0500