diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-01-17 01:14:08 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 02:15:27 -0500 |
commit | 0025835cf20e07056b8521b8c1d7d0bfe07e81f1 (patch) | |
tree | af60b66554b531fb93f591649014e3641427abf4 /arch/sh | |
parent | 5ebdce726baf17eb66c5a1bf402ae6f161a082ed (diff) |
[PATCH] sh: consolidate hp620/hp680/hp690 targets into hp6xx
Most of the reasons for keeping these separate before was due to hp690
discontig, and since we have a workaround for that now (abusing some shadow
space so everything is magically contiguous), there's no reason to keep the
targets separate.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/boards/hp6xx/Makefile | 6 | ||||
-rw-r--r-- | arch/sh/boards/hp6xx/hp620/Makefile | 6 | ||||
-rw-r--r-- | arch/sh/boards/hp6xx/hp620/mach.c | 52 | ||||
-rw-r--r-- | arch/sh/boards/hp6xx/hp620/setup.c | 45 | ||||
-rw-r--r-- | arch/sh/boards/hp6xx/hp680/Makefile | 6 | ||||
-rw-r--r-- | arch/sh/boards/hp6xx/hp690/Makefile | 6 | ||||
-rw-r--r-- | arch/sh/boards/hp6xx/hp690/mach.c | 48 | ||||
-rw-r--r-- | arch/sh/boards/hp6xx/mach.c (renamed from arch/sh/boards/hp6xx/hp680/mach.c) | 15 | ||||
-rw-r--r-- | arch/sh/boards/hp6xx/setup.c (renamed from arch/sh/boards/hp6xx/hp680/setup.c) | 18 | ||||
-rw-r--r-- | arch/sh/configs/hp6xx_defconfig (renamed from arch/sh/configs/hp680_defconfig) | 333 | ||||
-rw-r--r-- | arch/sh/tools/mach-types | 5 |
11 files changed, 288 insertions, 252 deletions
diff --git a/arch/sh/boards/hp6xx/Makefile b/arch/sh/boards/hp6xx/Makefile new file mode 100644 index 000000000000..927fe0aa5dfa --- /dev/null +++ b/arch/sh/boards/hp6xx/Makefile | |||
@@ -0,0 +1,6 @@ | |||
1 | # | ||
2 | # Makefile for the HP6xx specific parts of the kernel | ||
3 | # | ||
4 | |||
5 | obj-y := mach.o setup.o | ||
6 | |||
diff --git a/arch/sh/boards/hp6xx/hp620/Makefile b/arch/sh/boards/hp6xx/hp620/Makefile deleted file mode 100644 index 20691dbce347..000000000000 --- a/arch/sh/boards/hp6xx/hp620/Makefile +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for the HP620 specific parts of the kernel | ||
3 | # | ||
4 | |||
5 | obj-y := mach.o setup.o | ||
6 | |||
diff --git a/arch/sh/boards/hp6xx/hp620/mach.c b/arch/sh/boards/hp6xx/hp620/mach.c deleted file mode 100644 index 0392d82b4a7b..000000000000 --- a/arch/sh/boards/hp6xx/hp620/mach.c +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | /* | ||
2 | * linux/arch/sh/boards/hp6xx/hp620/mach.c | ||
3 | * | ||
4 | * Copyright (C) 2000 Stuart Menefy (stuart.menefy@st.com) | ||
5 | * | ||
6 | * May be copied or modified under the terms of the GNU General Public | ||
7 | * License. See linux/COPYING for more information. | ||
8 | * | ||
9 | * Machine vector for the HP620 | ||
10 | */ | ||
11 | |||
12 | #include <linux/init.h> | ||
13 | |||
14 | #include <asm/machvec.h> | ||
15 | #include <asm/rtc.h> | ||
16 | #include <asm/machvec_init.h> | ||
17 | |||
18 | #include <asm/io.h> | ||
19 | #include <asm/hd64461/hd64461.h> | ||
20 | #include <asm/irq.h> | ||
21 | |||
22 | /* | ||
23 | * The Machine Vector | ||
24 | */ | ||
25 | |||
26 | struct sh_machine_vector mv_hp620 __initmv = { | ||
27 | .mv_nr_irqs = HD64461_IRQBASE+HD64461_IRQ_NUM, | ||
28 | |||
29 | .mv_inb = hd64461_inb, | ||
30 | .mv_inw = hd64461_inw, | ||
31 | .mv_inl = hd64461_inl, | ||
32 | .mv_outb = hd64461_outb, | ||
33 | .mv_outw = hd64461_outw, | ||
34 | .mv_outl = hd64461_outl, | ||
35 | |||
36 | .mv_inb_p = hd64461_inb_p, | ||
37 | .mv_inw_p = hd64461_inw, | ||
38 | .mv_inl_p = hd64461_inl, | ||
39 | .mv_outb_p = hd64461_outb_p, | ||
40 | .mv_outw_p = hd64461_outw, | ||
41 | .mv_outl_p = hd64461_outl, | ||
42 | |||
43 | .mv_insb = hd64461_insb, | ||
44 | .mv_insw = hd64461_insw, | ||
45 | .mv_insl = hd64461_insl, | ||
46 | .mv_outsb = hd64461_outsb, | ||
47 | .mv_outsw = hd64461_outsw, | ||
48 | .mv_outsl = hd64461_outsl, | ||
49 | |||
50 | .mv_irq_demux = hd64461_irq_demux, | ||
51 | }; | ||
52 | ALIAS_MV(hp620) | ||
diff --git a/arch/sh/boards/hp6xx/hp620/setup.c b/arch/sh/boards/hp6xx/hp620/setup.c deleted file mode 100644 index 045fc5da7274..000000000000 --- a/arch/sh/boards/hp6xx/hp620/setup.c +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | /* | ||
2 | * linux/arch/sh/boards/hp6xx/hp620/setup.c | ||
3 | * | ||
4 | * Copyright (C) 2002 Andriy Skulysh, 2005 Kristoffer Ericson | ||
5 | * | ||
6 | * May be copied or modified under the terms of the GNU General Public | ||
7 | * License. See Linux/COPYING for more information. | ||
8 | * | ||
9 | * Setup code for an HP620. | ||
10 | * Due to similiarity with hp680/hp690 same inits are done (for now) | ||
11 | */ | ||
12 | |||
13 | #include <linux/config.h> | ||
14 | #include <linux/init.h> | ||
15 | #include <asm/hd64461/hd64461.h> | ||
16 | #include <asm/io.h> | ||
17 | #include <asm/hp6xx/hp6xx.h> | ||
18 | #include <asm/cpu/dac.h> | ||
19 | |||
20 | const char *get_system_type(void) | ||
21 | { | ||
22 | return "HP620"; | ||
23 | } | ||
24 | |||
25 | int __init platform_setup(void) | ||
26 | { | ||
27 | u16 v; | ||
28 | |||
29 | v = inw(HD64461_STBCR); | ||
30 | v |= HD64461_STBCR_SURTST | HD64461_STBCR_SIRST | | ||
31 | HD64461_STBCR_STM1ST | HD64461_STBCR_STM0ST | | ||
32 | HD64461_STBCR_SAFEST | HD64461_STBCR_SPC0ST | | ||
33 | HD64461_STBCR_SMIAST | HD64461_STBCR_SAFECKE_OST | | ||
34 | HD64461_STBCR_SAFECKE_IST; | ||
35 | outw(v, HD64461_STBCR); | ||
36 | |||
37 | v = inw(HD64461_GPADR); | ||
38 | v |= HD64461_GPADR_SPEAKER | HD64461_GPADR_PCMCIA0; | ||
39 | outw(v, HD64461_GPADR); | ||
40 | |||
41 | sh_dac_disable(DAC_SPEAKER_VOLUME); | ||
42 | |||
43 | return 0; | ||
44 | } | ||
45 | |||
diff --git a/arch/sh/boards/hp6xx/hp680/Makefile b/arch/sh/boards/hp6xx/hp680/Makefile deleted file mode 100644 index 0beef11d9b11..000000000000 --- a/arch/sh/boards/hp6xx/hp680/Makefile +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for the HP680 specific parts of the kernel | ||
3 | # | ||
4 | |||
5 | obj-y := mach.o setup.o | ||
6 | |||
diff --git a/arch/sh/boards/hp6xx/hp690/Makefile b/arch/sh/boards/hp6xx/hp690/Makefile deleted file mode 100644 index fbbe95e75f83..000000000000 --- a/arch/sh/boards/hp6xx/hp690/Makefile +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for the HP690 specific parts of the kernel | ||
3 | # | ||
4 | |||
5 | obj-y := mach.o | ||
6 | |||
diff --git a/arch/sh/boards/hp6xx/hp690/mach.c b/arch/sh/boards/hp6xx/hp690/mach.c deleted file mode 100644 index 2a4c68783cd6..000000000000 --- a/arch/sh/boards/hp6xx/hp690/mach.c +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | /* | ||
2 | * linux/arch/sh/boards/hp6xx/hp690/mach.c | ||
3 | * | ||
4 | * Copyright (C) 2000 Stuart Menefy (stuart.menefy@st.com) | ||
5 | * | ||
6 | * May be copied or modified under the terms of the GNU General Public | ||
7 | * License. See linux/COPYING for more information. | ||
8 | * | ||
9 | * Machine vector for the HP690 | ||
10 | */ | ||
11 | |||
12 | #include <linux/init.h> | ||
13 | |||
14 | #include <asm/machvec.h> | ||
15 | #include <asm/rtc.h> | ||
16 | #include <asm/machvec_init.h> | ||
17 | |||
18 | #include <asm/io.h> | ||
19 | #include <asm/hd64461/hd64461.h> | ||
20 | #include <asm/irq.h> | ||
21 | |||
22 | struct sh_machine_vector mv_hp690 __initmv = { | ||
23 | .mv_nr_irqs = HD64461_IRQBASE+HD64461_IRQ_NUM, | ||
24 | |||
25 | .mv_inb = hd64461_inb, | ||
26 | .mv_inw = hd64461_inw, | ||
27 | .mv_inl = hd64461_inl, | ||
28 | .mv_outb = hd64461_outb, | ||
29 | .mv_outw = hd64461_outw, | ||
30 | .mv_outl = hd64461_outl, | ||
31 | |||
32 | .mv_inb_p = hd64461_inb_p, | ||
33 | .mv_inw_p = hd64461_inw, | ||
34 | .mv_inl_p = hd64461_inl, | ||
35 | .mv_outb_p = hd64461_outb_p, | ||
36 | .mv_outw_p = hd64461_outw, | ||
37 | .mv_outl_p = hd64461_outl, | ||
38 | |||
39 | .mv_insb = hd64461_insb, | ||
40 | .mv_insw = hd64461_insw, | ||
41 | .mv_insl = hd64461_insl, | ||
42 | .mv_outsb = hd64461_outsb, | ||
43 | .mv_outsw = hd64461_outsw, | ||
44 | .mv_outsl = hd64461_outsl, | ||
45 | |||
46 | .mv_irq_demux = hd64461_irq_demux, | ||
47 | }; | ||
48 | ALIAS_MV(hp690) | ||
diff --git a/arch/sh/boards/hp6xx/hp680/mach.c b/arch/sh/boards/hp6xx/mach.c index d73486136045..08dbba910f74 100644 --- a/arch/sh/boards/hp6xx/hp680/mach.c +++ b/arch/sh/boards/hp6xx/mach.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/sh/boards/hp6xx/hp680/mach.c | 2 | * linux/arch/sh/boards/hp6xx/mach.c |
3 | * | 3 | * |
4 | * Copyright (C) 2000 Stuart Menefy (stuart.menefy@st.com) | 4 | * Copyright (C) 2000 Stuart Menefy (stuart.menefy@st.com) |
5 | * | 5 | * |
@@ -8,19 +8,12 @@ | |||
8 | * | 8 | * |
9 | * Machine vector for the HP680 | 9 | * Machine vector for the HP680 |
10 | */ | 10 | */ |
11 | |||
12 | #include <linux/init.h> | ||
13 | |||
14 | #include <asm/machvec.h> | 11 | #include <asm/machvec.h> |
15 | #include <asm/rtc.h> | 12 | #include <asm/hd64461.h> |
16 | #include <asm/machvec_init.h> | ||
17 | |||
18 | #include <asm/io.h> | 13 | #include <asm/io.h> |
19 | #include <asm/hd64461/hd64461.h> | ||
20 | #include <asm/hp6xx/io.h> | ||
21 | #include <asm/irq.h> | 14 | #include <asm/irq.h> |
22 | 15 | ||
23 | struct sh_machine_vector mv_hp680 __initmv = { | 16 | struct sh_machine_vector mv_hp6xx __initmv = { |
24 | .mv_nr_irqs = HD64461_IRQBASE + HD64461_IRQ_NUM, | 17 | .mv_nr_irqs = HD64461_IRQBASE + HD64461_IRQ_NUM, |
25 | 18 | ||
26 | .mv_inb = hd64461_inb, | 19 | .mv_inb = hd64461_inb, |
@@ -50,4 +43,4 @@ struct sh_machine_vector mv_hp680 __initmv = { | |||
50 | .mv_irq_demux = hd64461_irq_demux, | 43 | .mv_irq_demux = hd64461_irq_demux, |
51 | }; | 44 | }; |
52 | 45 | ||
53 | ALIAS_MV(hp680) | 46 | ALIAS_MV(hp6xx) |
diff --git a/arch/sh/boards/hp6xx/hp680/setup.c b/arch/sh/boards/hp6xx/setup.c index 4170190f2644..6d94a8e2e67a 100644 --- a/arch/sh/boards/hp6xx/hp680/setup.c +++ b/arch/sh/boards/hp6xx/setup.c | |||
@@ -11,18 +11,19 @@ | |||
11 | 11 | ||
12 | #include <linux/config.h> | 12 | #include <linux/config.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <asm/hd64461/hd64461.h> | ||
15 | #include <asm/io.h> | 14 | #include <asm/io.h> |
15 | #include <asm/hd64461.h> | ||
16 | #include <asm/hp6xx/hp6xx.h> | 16 | #include <asm/hp6xx/hp6xx.h> |
17 | #include <asm/cpu/dac.h> | 17 | #include <asm/cpu/dac.h> |
18 | 18 | ||
19 | const char *get_system_type(void) | 19 | const char *get_system_type(void) |
20 | { | 20 | { |
21 | return "HP680"; | 21 | return "HP6xx"; |
22 | } | 22 | } |
23 | 23 | ||
24 | int __init platform_setup(void) | 24 | int __init platform_setup(void) |
25 | { | 25 | { |
26 | u8 v8; | ||
26 | u16 v; | 27 | u16 v; |
27 | v = inw(HD64461_STBCR); | 28 | v = inw(HD64461_STBCR); |
28 | v |= HD64461_STBCR_SURTST | HD64461_STBCR_SIRST | | 29 | v |= HD64461_STBCR_SURTST | HD64461_STBCR_SIRST | |
@@ -30,12 +31,25 @@ int __init platform_setup(void) | |||
30 | HD64461_STBCR_SAFEST | HD64461_STBCR_SPC0ST | | 31 | HD64461_STBCR_SAFEST | HD64461_STBCR_SPC0ST | |
31 | HD64461_STBCR_SMIAST | HD64461_STBCR_SAFECKE_OST | | 32 | HD64461_STBCR_SMIAST | HD64461_STBCR_SAFECKE_OST | |
32 | HD64461_STBCR_SAFECKE_IST; | 33 | HD64461_STBCR_SAFECKE_IST; |
34 | #ifndef CONFIG_HD64461_ENABLER | ||
35 | v |= HD64461_STBCR_SPC1ST; | ||
36 | #endif | ||
33 | outw(v, HD64461_STBCR); | 37 | outw(v, HD64461_STBCR); |
34 | v = inw(HD64461_GPADR); | 38 | v = inw(HD64461_GPADR); |
35 | v |= HD64461_GPADR_SPEAKER | HD64461_GPADR_PCMCIA0; | 39 | v |= HD64461_GPADR_SPEAKER | HD64461_GPADR_PCMCIA0; |
36 | outw(v, HD64461_GPADR); | 40 | outw(v, HD64461_GPADR); |
37 | 41 | ||
42 | outw(HD64461_PCCGCR_VCC0 | HD64461_PCCSCR_VCC1, HD64461_PCC0GCR); | ||
43 | |||
44 | #ifndef CONFIG_HD64461_ENABLER | ||
45 | outw(HD64461_PCCGCR_VCC0 | HD64461_PCCSCR_VCC1, HD64461_PCC1GCR); | ||
46 | #endif | ||
47 | |||
48 | sh_dac_output(0, DAC_SPEAKER_VOLUME); | ||
38 | sh_dac_disable(DAC_SPEAKER_VOLUME); | 49 | sh_dac_disable(DAC_SPEAKER_VOLUME); |
50 | v8 = ctrl_inb(DACR); | ||
51 | v8 &= ~DACR_DAE; | ||
52 | ctrl_outb(v8,DACR); | ||
39 | 53 | ||
40 | return 0; | 54 | return 0; |
41 | } | 55 | } |
diff --git a/arch/sh/configs/hp680_defconfig b/arch/sh/configs/hp6xx_defconfig index c85d3655b53c..b36f102cec81 100644 --- a/arch/sh/configs/hp680_defconfig +++ b/arch/sh/configs/hp6xx_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.11-sh | 3 | # Linux kernel version: 2.6.15-sh |
4 | # Wed Mar 2 15:09:41 2005 | 4 | # Wed Jan 4 15:32:56 2006 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_UID16=y | 7 | CONFIG_UID16=y |
@@ -17,31 +17,36 @@ CONFIG_EXPERIMENTAL=y | |||
17 | # CONFIG_CLEAN_COMPILE is not set | 17 | # CONFIG_CLEAN_COMPILE is not set |
18 | CONFIG_BROKEN=y | 18 | CONFIG_BROKEN=y |
19 | CONFIG_BROKEN_ON_SMP=y | 19 | CONFIG_BROKEN_ON_SMP=y |
20 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
20 | 21 | ||
21 | # | 22 | # |
22 | # General setup | 23 | # General setup |
23 | # | 24 | # |
24 | CONFIG_LOCALVERSION="" | 25 | CONFIG_LOCALVERSION="" |
26 | CONFIG_LOCALVERSION_AUTO=y | ||
25 | CONFIG_SWAP=y | 27 | CONFIG_SWAP=y |
26 | # CONFIG_SYSVIPC is not set | 28 | # CONFIG_SYSVIPC is not set |
27 | # CONFIG_BSD_PROCESS_ACCT is not set | 29 | # CONFIG_BSD_PROCESS_ACCT is not set |
28 | # CONFIG_SYSCTL is not set | 30 | # CONFIG_SYSCTL is not set |
29 | # CONFIG_AUDIT is not set | 31 | CONFIG_HOTPLUG=y |
30 | CONFIG_LOG_BUF_SHIFT=14 | ||
31 | # CONFIG_HOTPLUG is not set | ||
32 | # CONFIG_IKCONFIG is not set | 32 | # CONFIG_IKCONFIG is not set |
33 | CONFIG_INITRAMFS_SOURCE="" | ||
34 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
33 | # CONFIG_EMBEDDED is not set | 35 | # CONFIG_EMBEDDED is not set |
34 | CONFIG_KALLSYMS=y | 36 | CONFIG_KALLSYMS=y |
35 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
38 | CONFIG_PRINTK=y | ||
39 | CONFIG_BUG=y | ||
40 | CONFIG_BASE_FULL=y | ||
36 | CONFIG_FUTEX=y | 41 | CONFIG_FUTEX=y |
37 | CONFIG_EPOLL=y | 42 | CONFIG_EPOLL=y |
38 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
39 | CONFIG_SHMEM=y | 43 | CONFIG_SHMEM=y |
40 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 44 | CONFIG_CC_ALIGN_FUNCTIONS=0 |
41 | CONFIG_CC_ALIGN_LABELS=0 | 45 | CONFIG_CC_ALIGN_LABELS=0 |
42 | CONFIG_CC_ALIGN_LOOPS=0 | 46 | CONFIG_CC_ALIGN_LOOPS=0 |
43 | CONFIG_CC_ALIGN_JUMPS=0 | 47 | CONFIG_CC_ALIGN_JUMPS=0 |
44 | # CONFIG_TINY_SHMEM is not set | 48 | # CONFIG_TINY_SHMEM is not set |
49 | CONFIG_BASE_SMALL=0 | ||
45 | 50 | ||
46 | # | 51 | # |
47 | # Loadable module support | 52 | # Loadable module support |
@@ -49,6 +54,24 @@ CONFIG_CC_ALIGN_JUMPS=0 | |||
49 | # CONFIG_MODULES is not set | 54 | # CONFIG_MODULES is not set |
50 | 55 | ||
51 | # | 56 | # |
57 | # Block layer | ||
58 | # | ||
59 | # CONFIG_LBD is not set | ||
60 | |||
61 | # | ||
62 | # IO Schedulers | ||
63 | # | ||
64 | CONFIG_IOSCHED_NOOP=y | ||
65 | CONFIG_IOSCHED_AS=y | ||
66 | CONFIG_IOSCHED_DEADLINE=y | ||
67 | CONFIG_IOSCHED_CFQ=y | ||
68 | CONFIG_DEFAULT_AS=y | ||
69 | # CONFIG_DEFAULT_DEADLINE is not set | ||
70 | # CONFIG_DEFAULT_CFQ is not set | ||
71 | # CONFIG_DEFAULT_NOOP is not set | ||
72 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
73 | |||
74 | # | ||
52 | # System type | 75 | # System type |
53 | # | 76 | # |
54 | # CONFIG_SH_SOLUTION_ENGINE is not set | 77 | # CONFIG_SH_SOLUTION_ENGINE is not set |
@@ -58,9 +81,7 @@ CONFIG_CC_ALIGN_JUMPS=0 | |||
58 | # CONFIG_SH_7751_SYSTEMH is not set | 81 | # CONFIG_SH_7751_SYSTEMH is not set |
59 | # CONFIG_SH_STB1_HARP is not set | 82 | # CONFIG_SH_STB1_HARP is not set |
60 | # CONFIG_SH_STB1_OVERDRIVE is not set | 83 | # CONFIG_SH_STB1_OVERDRIVE is not set |
61 | # CONFIG_SH_HP620 is not set | 84 | CONFIG_SH_HP6XX=y |
62 | CONFIG_SH_HP680=y | ||
63 | # CONFIG_SH_HP690 is not set | ||
64 | # CONFIG_SH_CQREEK is not set | 85 | # CONFIG_SH_CQREEK is not set |
65 | # CONFIG_SH_DMIDA is not set | 86 | # CONFIG_SH_DMIDA is not set |
66 | # CONFIG_SH_EC3104 is not set | 87 | # CONFIG_SH_EC3104 is not set |
@@ -77,43 +98,90 @@ CONFIG_SH_HP680=y | |||
77 | # CONFIG_SH_RTS7751R2D is not set | 98 | # CONFIG_SH_RTS7751R2D is not set |
78 | # CONFIG_SH_EDOSK7705 is not set | 99 | # CONFIG_SH_EDOSK7705 is not set |
79 | # CONFIG_SH_SH4202_MICRODEV is not set | 100 | # CONFIG_SH_SH4202_MICRODEV is not set |
101 | # CONFIG_SH_LANDISK is not set | ||
102 | # CONFIG_SH_TITAN is not set | ||
80 | # CONFIG_SH_UNKNOWN is not set | 103 | # CONFIG_SH_UNKNOWN is not set |
81 | # CONFIG_CPU_SH2 is not set | 104 | |
105 | # | ||
106 | # Processor selection | ||
107 | # | ||
82 | CONFIG_CPU_SH3=y | 108 | CONFIG_CPU_SH3=y |
83 | # CONFIG_CPU_SH4 is not set | 109 | |
110 | # | ||
111 | # SH-2 Processor Support | ||
112 | # | ||
84 | # CONFIG_CPU_SUBTYPE_SH7604 is not set | 113 | # CONFIG_CPU_SUBTYPE_SH7604 is not set |
114 | |||
115 | # | ||
116 | # SH-3 Processor Support | ||
117 | # | ||
85 | # CONFIG_CPU_SUBTYPE_SH7300 is not set | 118 | # CONFIG_CPU_SUBTYPE_SH7300 is not set |
86 | # CONFIG_CPU_SUBTYPE_SH7705 is not set | 119 | # CONFIG_CPU_SUBTYPE_SH7705 is not set |
87 | # CONFIG_CPU_SUBTYPE_SH7707 is not set | 120 | # CONFIG_CPU_SUBTYPE_SH7707 is not set |
88 | # CONFIG_CPU_SUBTYPE_SH7708 is not set | 121 | # CONFIG_CPU_SUBTYPE_SH7708 is not set |
89 | CONFIG_CPU_SUBTYPE_SH7709=y | 122 | CONFIG_CPU_SUBTYPE_SH7709=y |
123 | |||
124 | # | ||
125 | # SH-4 Processor Support | ||
126 | # | ||
90 | # CONFIG_CPU_SUBTYPE_SH7750 is not set | 127 | # CONFIG_CPU_SUBTYPE_SH7750 is not set |
128 | # CONFIG_CPU_SUBTYPE_SH7091 is not set | ||
129 | # CONFIG_CPU_SUBTYPE_SH7750R is not set | ||
130 | # CONFIG_CPU_SUBTYPE_SH7750S is not set | ||
91 | # CONFIG_CPU_SUBTYPE_SH7751 is not set | 131 | # CONFIG_CPU_SUBTYPE_SH7751 is not set |
132 | # CONFIG_CPU_SUBTYPE_SH7751R is not set | ||
92 | # CONFIG_CPU_SUBTYPE_SH7760 is not set | 133 | # CONFIG_CPU_SUBTYPE_SH7760 is not set |
93 | # CONFIG_CPU_SUBTYPE_SH73180 is not set | 134 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set |
135 | |||
136 | # | ||
137 | # ST40 Processor Support | ||
138 | # | ||
94 | # CONFIG_CPU_SUBTYPE_ST40STB1 is not set | 139 | # CONFIG_CPU_SUBTYPE_ST40STB1 is not set |
95 | # CONFIG_CPU_SUBTYPE_ST40GX1 is not set | 140 | # CONFIG_CPU_SUBTYPE_ST40GX1 is not set |
96 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set | 141 | |
142 | # | ||
143 | # SH-4A Processor Support | ||
144 | # | ||
145 | # CONFIG_CPU_SUBTYPE_SH73180 is not set | ||
146 | # CONFIG_CPU_SUBTYPE_SH7770 is not set | ||
147 | # CONFIG_CPU_SUBTYPE_SH7780 is not set | ||
148 | |||
149 | # | ||
150 | # Memory management options | ||
151 | # | ||
97 | CONFIG_MMU=y | 152 | CONFIG_MMU=y |
98 | # CONFIG_CMDLINE_BOOL is not set | 153 | CONFIG_SELECT_MEMORY_MODEL=y |
154 | CONFIG_FLATMEM_MANUAL=y | ||
155 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
156 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
157 | CONFIG_FLATMEM=y | ||
158 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
159 | # CONFIG_SPARSEMEM_STATIC is not set | ||
160 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
161 | |||
162 | # | ||
163 | # Cache configuration | ||
164 | # | ||
165 | # CONFIG_SH_DIRECT_MAPPED is not set | ||
166 | # CONFIG_SH_WRITETHROUGH is not set | ||
167 | # CONFIG_SH_OCRAM is not set | ||
99 | CONFIG_MEMORY_START=0x0c000000 | 168 | CONFIG_MEMORY_START=0x0c000000 |
100 | CONFIG_MEMORY_SIZE=0x00400000 | 169 | CONFIG_MEMORY_SIZE=0x00400000 |
101 | CONFIG_MEMORY_SET=y | 170 | |
102 | # CONFIG_MEMORY_OVERRIDE is not set | 171 | # |
172 | # Processor features | ||
173 | # | ||
174 | CONFIG_CPU_LITTLE_ENDIAN=y | ||
103 | CONFIG_SH_RTC=y | 175 | CONFIG_SH_RTC=y |
104 | # CONFIG_SH_DSP is not set | 176 | # CONFIG_SH_DSP is not set |
105 | CONFIG_SH_ADC=y | 177 | CONFIG_SH_ADC=y |
106 | CONFIG_SH_HP600=y | 178 | |
107 | CONFIG_ZERO_PAGE_OFFSET=0x00001000 | 179 | # |
108 | CONFIG_BOOT_LINK_OFFSET=0x00800000 | 180 | # Timer support |
109 | CONFIG_CPU_LITTLE_ENDIAN=y | 181 | # |
110 | # CONFIG_PREEMPT is not set | 182 | CONFIG_SH_TMU=y |
111 | # CONFIG_UBC_WAKEUP is not set | 183 | CONFIG_SH_PCLK_FREQ_BOOL=y |
112 | # CONFIG_SH_WRITETHROUGH is not set | 184 | CONFIG_SH_PCLK_FREQ=22110000 |
113 | # CONFIG_SH_OCRAM is not set | ||
114 | # CONFIG_SMP is not set | ||
115 | CONFIG_SH_PCLK_CALC=y | ||
116 | CONFIG_SH_PCLK_FREQ=1193182 | ||
117 | 185 | ||
118 | # | 186 | # |
119 | # CPU Frequency scaling | 187 | # CPU Frequency scaling |
@@ -123,7 +191,10 @@ CONFIG_SH_PCLK_FREQ=1193182 | |||
123 | # | 191 | # |
124 | # DMA support | 192 | # DMA support |
125 | # | 193 | # |
126 | # CONFIG_SH_DMA is not set | 194 | CONFIG_SH_DMA=y |
195 | CONFIG_NR_ONCHIP_DMA_CHANNELS=4 | ||
196 | # CONFIG_NR_DMA_CHANNELS_BOOL is not set | ||
197 | # CONFIG_DMA_PAGE_OPS is not set | ||
127 | 198 | ||
128 | # | 199 | # |
129 | # Companion Chips | 200 | # Companion Chips |
@@ -132,21 +203,47 @@ CONFIG_HD6446X_SERIES=y | |||
132 | CONFIG_HD64461=y | 203 | CONFIG_HD64461=y |
133 | # CONFIG_HD64465 is not set | 204 | # CONFIG_HD64465 is not set |
134 | CONFIG_HD64461_IRQ=36 | 205 | CONFIG_HD64461_IRQ=36 |
135 | # CONFIG_HD64461_ENABLER is not set | 206 | CONFIG_HD64461_IOBASE=0xb0000000 |
207 | CONFIG_HD64461_ENABLER=y | ||
208 | |||
209 | # | ||
210 | # Kernel features | ||
211 | # | ||
212 | # CONFIG_KEXEC is not set | ||
213 | # CONFIG_PREEMPT is not set | ||
214 | # CONFIG_SMP is not set | ||
136 | 215 | ||
137 | # | 216 | # |
138 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 217 | # Boot options |
139 | # | 218 | # |
219 | CONFIG_ZERO_PAGE_OFFSET=0x00001000 | ||
220 | CONFIG_BOOT_LINK_OFFSET=0x00800000 | ||
221 | # CONFIG_UBC_WAKEUP is not set | ||
222 | # CONFIG_CMDLINE_BOOL is not set | ||
223 | |||
224 | # | ||
225 | # Bus options | ||
226 | # | ||
227 | CONFIG_ISA=y | ||
140 | # CONFIG_PCI is not set | 228 | # CONFIG_PCI is not set |
141 | 229 | ||
142 | # | 230 | # |
143 | # PCCARD (PCMCIA/CardBus) support | 231 | # PCCARD (PCMCIA/CardBus) support |
144 | # | 232 | # |
145 | # CONFIG_PCCARD is not set | 233 | CONFIG_PCCARD=y |
234 | # CONFIG_PCMCIA_DEBUG is not set | ||
235 | CONFIG_PCMCIA=y | ||
236 | CONFIG_PCMCIA_LOAD_CIS=y | ||
237 | CONFIG_PCMCIA_IOCTL=y | ||
146 | 238 | ||
147 | # | 239 | # |
148 | # PC-card bridges | 240 | # PC-card bridges |
149 | # | 241 | # |
242 | # CONFIG_I82365 is not set | ||
243 | # CONFIG_TCIC is not set | ||
244 | CONFIG_HD64461_PCMCIA=y | ||
245 | CONFIG_HD64461_PCMCIA_SOCKETS=1 | ||
246 | CONFIG_PCMCIA_PROBE=y | ||
150 | 247 | ||
151 | # | 248 | # |
152 | # PCI Hotplug Support | 249 | # PCI Hotplug Support |
@@ -160,9 +257,9 @@ CONFIG_BINFMT_ELF=y | |||
160 | # CONFIG_BINFMT_MISC is not set | 257 | # CONFIG_BINFMT_MISC is not set |
161 | 258 | ||
162 | # | 259 | # |
163 | # SH initrd options | 260 | # Networking |
164 | # | 261 | # |
165 | # CONFIG_EMBEDDED_RAMDISK is not set | 262 | # CONFIG_NET is not set |
166 | 263 | ||
167 | # | 264 | # |
168 | # Device Drivers | 265 | # Device Drivers |
@@ -173,7 +270,11 @@ CONFIG_BINFMT_ELF=y | |||
173 | # | 270 | # |
174 | # CONFIG_STANDALONE is not set | 271 | # CONFIG_STANDALONE is not set |
175 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 272 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
176 | # CONFIG_FW_LOADER is not set | 273 | CONFIG_FW_LOADER=y |
274 | |||
275 | # | ||
276 | # Connector - unified userspace <-> kernelspace linker | ||
277 | # | ||
177 | 278 | ||
178 | # | 279 | # |
179 | # Memory Technology Devices (MTD) | 280 | # Memory Technology Devices (MTD) |
@@ -188,30 +289,20 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
188 | # | 289 | # |
189 | # Plug and Play support | 290 | # Plug and Play support |
190 | # | 291 | # |
292 | # CONFIG_PNP is not set | ||
191 | 293 | ||
192 | # | 294 | # |
193 | # Block devices | 295 | # Block devices |
194 | # | 296 | # |
195 | # CONFIG_BLK_DEV_FD is not set | ||
196 | # CONFIG_BLK_DEV_COW_COMMON is not set | 297 | # CONFIG_BLK_DEV_COW_COMMON is not set |
197 | # CONFIG_BLK_DEV_LOOP is not set | 298 | # CONFIG_BLK_DEV_LOOP is not set |
198 | CONFIG_BLK_DEV_RAM=y | 299 | CONFIG_BLK_DEV_RAM=y |
199 | CONFIG_BLK_DEV_RAM_COUNT=16 | 300 | CONFIG_BLK_DEV_RAM_COUNT=16 |
200 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 301 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
201 | CONFIG_BLK_DEV_INITRD=y | 302 | CONFIG_BLK_DEV_INITRD=y |
202 | CONFIG_INITRAMFS_SOURCE="" | ||
203 | # CONFIG_LBD is not set | ||
204 | # CONFIG_CDROM_PKTCDVD is not set | 303 | # CONFIG_CDROM_PKTCDVD is not set |
205 | 304 | ||
206 | # | 305 | # |
207 | # IO Schedulers | ||
208 | # | ||
209 | CONFIG_IOSCHED_NOOP=y | ||
210 | CONFIG_IOSCHED_AS=y | ||
211 | CONFIG_IOSCHED_DEADLINE=y | ||
212 | CONFIG_IOSCHED_CFQ=y | ||
213 | |||
214 | # | ||
215 | # ATA/ATAPI/MFM/RLL support | 306 | # ATA/ATAPI/MFM/RLL support |
216 | # | 307 | # |
217 | CONFIG_IDE=y | 308 | CONFIG_IDE=y |
@@ -224,6 +315,7 @@ CONFIG_BLK_DEV_IDE=y | |||
224 | # CONFIG_BLK_DEV_IDE_SATA is not set | 315 | # CONFIG_BLK_DEV_IDE_SATA is not set |
225 | CONFIG_BLK_DEV_IDEDISK=y | 316 | CONFIG_BLK_DEV_IDEDISK=y |
226 | # CONFIG_IDEDISK_MULTI_MODE is not set | 317 | # CONFIG_IDEDISK_MULTI_MODE is not set |
318 | # CONFIG_BLK_DEV_IDECS is not set | ||
227 | # CONFIG_BLK_DEV_IDECD is not set | 319 | # CONFIG_BLK_DEV_IDECD is not set |
228 | # CONFIG_BLK_DEV_IDETAPE is not set | 320 | # CONFIG_BLK_DEV_IDETAPE is not set |
229 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 321 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
@@ -235,6 +327,7 @@ CONFIG_BLK_DEV_IDEDISK=y | |||
235 | CONFIG_IDE_GENERIC=y | 327 | CONFIG_IDE_GENERIC=y |
236 | CONFIG_IDE_SH=y | 328 | CONFIG_IDE_SH=y |
237 | # CONFIG_IDE_ARM is not set | 329 | # CONFIG_IDE_ARM is not set |
330 | # CONFIG_IDE_CHIPSETS is not set | ||
238 | # CONFIG_BLK_DEV_IDEDMA is not set | 331 | # CONFIG_BLK_DEV_IDEDMA is not set |
239 | # CONFIG_IDEDMA_AUTO is not set | 332 | # CONFIG_IDEDMA_AUTO is not set |
240 | # CONFIG_BLK_DEV_HD is not set | 333 | # CONFIG_BLK_DEV_HD is not set |
@@ -242,9 +335,15 @@ CONFIG_IDE_SH=y | |||
242 | # | 335 | # |
243 | # SCSI device support | 336 | # SCSI device support |
244 | # | 337 | # |
338 | # CONFIG_RAID_ATTRS is not set | ||
245 | # CONFIG_SCSI is not set | 339 | # CONFIG_SCSI is not set |
246 | 340 | ||
247 | # | 341 | # |
342 | # Old CD-ROM drivers (not SCSI, not IDE) | ||
343 | # | ||
344 | # CONFIG_CD_NO_IDESCSI is not set | ||
345 | |||
346 | # | ||
248 | # Multi-device support (RAID and LVM) | 347 | # Multi-device support (RAID and LVM) |
249 | # | 348 | # |
250 | # CONFIG_MD is not set | 349 | # CONFIG_MD is not set |
@@ -252,6 +351,7 @@ CONFIG_IDE_SH=y | |||
252 | # | 351 | # |
253 | # Fusion MPT device support | 352 | # Fusion MPT device support |
254 | # | 353 | # |
354 | # CONFIG_FUSION is not set | ||
255 | 355 | ||
256 | # | 356 | # |
257 | # IEEE 1394 (FireWire) support | 357 | # IEEE 1394 (FireWire) support |
@@ -263,9 +363,8 @@ CONFIG_IDE_SH=y | |||
263 | # | 363 | # |
264 | 364 | ||
265 | # | 365 | # |
266 | # Networking support | 366 | # Network device support |
267 | # | 367 | # |
268 | # CONFIG_NET is not set | ||
269 | # CONFIG_NETPOLL is not set | 368 | # CONFIG_NETPOLL is not set |
270 | # CONFIG_NET_POLL_CONTROLLER is not set | 369 | # CONFIG_NET_POLL_CONTROLLER is not set |
271 | 370 | ||
@@ -296,17 +395,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
296 | # CONFIG_INPUT_EVBUG is not set | 395 | # CONFIG_INPUT_EVBUG is not set |
297 | 396 | ||
298 | # | 397 | # |
299 | # Input I/O drivers | ||
300 | # | ||
301 | # CONFIG_GAMEPORT is not set | ||
302 | CONFIG_SOUND_GAMEPORT=y | ||
303 | CONFIG_SERIO=y | ||
304 | # CONFIG_SERIO_I8042 is not set | ||
305 | # CONFIG_SERIO_SERPORT is not set | ||
306 | # CONFIG_SERIO_CT82C710 is not set | ||
307 | # CONFIG_SERIO_RAW is not set | ||
308 | |||
309 | # | ||
310 | # Input Device Drivers | 398 | # Input Device Drivers |
311 | # | 399 | # |
312 | # CONFIG_INPUT_KEYBOARD is not set | 400 | # CONFIG_INPUT_KEYBOARD is not set |
@@ -316,6 +404,15 @@ CONFIG_SERIO=y | |||
316 | # CONFIG_INPUT_MISC is not set | 404 | # CONFIG_INPUT_MISC is not set |
317 | 405 | ||
318 | # | 406 | # |
407 | # Hardware I/O ports | ||
408 | # | ||
409 | CONFIG_SERIO=y | ||
410 | # CONFIG_SERIO_I8042 is not set | ||
411 | # CONFIG_SERIO_SERPORT is not set | ||
412 | # CONFIG_SERIO_RAW is not set | ||
413 | # CONFIG_GAMEPORT is not set | ||
414 | |||
415 | # | ||
319 | # Character devices | 416 | # Character devices |
320 | # | 417 | # |
321 | CONFIG_VT=y | 418 | CONFIG_VT=y |
@@ -353,10 +450,22 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
353 | # | 450 | # |
354 | # Ftape, the floppy tape device driver | 451 | # Ftape, the floppy tape device driver |
355 | # | 452 | # |
356 | # CONFIG_DRM is not set | 453 | |
454 | # | ||
455 | # PCMCIA character devices | ||
456 | # | ||
457 | # CONFIG_SYNCLINK_CS is not set | ||
458 | # CONFIG_CARDMAN_4000 is not set | ||
459 | # CONFIG_CARDMAN_4040 is not set | ||
357 | # CONFIG_RAW_DRIVER is not set | 460 | # CONFIG_RAW_DRIVER is not set |
358 | 461 | ||
359 | # | 462 | # |
463 | # TPM devices | ||
464 | # | ||
465 | # CONFIG_TCG_TPM is not set | ||
466 | # CONFIG_TELCLOCK is not set | ||
467 | |||
468 | # | ||
360 | # I2C support | 469 | # I2C support |
361 | # | 470 | # |
362 | # CONFIG_I2C is not set | 471 | # CONFIG_I2C is not set |
@@ -367,10 +476,21 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
367 | # CONFIG_W1 is not set | 476 | # CONFIG_W1 is not set |
368 | 477 | ||
369 | # | 478 | # |
479 | # Hardware Monitoring support | ||
480 | # | ||
481 | CONFIG_HWMON=y | ||
482 | # CONFIG_HWMON_VID is not set | ||
483 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
484 | |||
485 | # | ||
370 | # Misc devices | 486 | # Misc devices |
371 | # | 487 | # |
372 | 488 | ||
373 | # | 489 | # |
490 | # Multimedia Capabilities Port drivers | ||
491 | # | ||
492 | |||
493 | # | ||
374 | # Multimedia devices | 494 | # Multimedia devices |
375 | # | 495 | # |
376 | # CONFIG_VIDEO_DEV is not set | 496 | # CONFIG_VIDEO_DEV is not set |
@@ -383,27 +503,35 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
383 | # Graphics support | 503 | # Graphics support |
384 | # | 504 | # |
385 | CONFIG_FB=y | 505 | CONFIG_FB=y |
506 | CONFIG_FB_CFB_FILLRECT=y | ||
507 | CONFIG_FB_CFB_COPYAREA=y | ||
508 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
509 | # CONFIG_FB_MACMODES is not set | ||
386 | # CONFIG_FB_MODE_HELPERS is not set | 510 | # CONFIG_FB_MODE_HELPERS is not set |
387 | # CONFIG_FB_TILEBLITTING is not set | 511 | # CONFIG_FB_TILEBLITTING is not set |
388 | # CONFIG_FB_EPSON1355 is not set | 512 | # CONFIG_FB_EPSON1355 is not set |
513 | # CONFIG_FB_S1D13XXX is not set | ||
389 | CONFIG_FB_HIT=y | 514 | CONFIG_FB_HIT=y |
390 | # CONFIG_FB_VIRTUAL is not set | 515 | # CONFIG_FB_VIRTUAL is not set |
391 | 516 | ||
392 | # | 517 | # |
393 | # Console display driver support | 518 | # Console display driver support |
394 | # | 519 | # |
395 | # CONFIG_VGA_CONSOLE is not set | 520 | # CONFIG_MDA_CONSOLE is not set |
396 | CONFIG_DUMMY_CONSOLE=y | 521 | CONFIG_DUMMY_CONSOLE=y |
397 | CONFIG_FRAMEBUFFER_CONSOLE=y | 522 | CONFIG_FRAMEBUFFER_CONSOLE=y |
523 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
398 | CONFIG_FONTS=y | 524 | CONFIG_FONTS=y |
399 | # CONFIG_FONT_8x8 is not set | 525 | # CONFIG_FONT_8x8 is not set |
400 | # CONFIG_FONT_8x16 is not set | 526 | # CONFIG_FONT_8x16 is not set |
401 | # CONFIG_FONT_6x11 is not set | 527 | # CONFIG_FONT_6x11 is not set |
528 | # CONFIG_FONT_7x14 is not set | ||
402 | CONFIG_FONT_PEARL_8x8=y | 529 | CONFIG_FONT_PEARL_8x8=y |
403 | # CONFIG_FONT_ACORN_8x8 is not set | 530 | # CONFIG_FONT_ACORN_8x8 is not set |
404 | # CONFIG_FONT_MINI_4x6 is not set | 531 | # CONFIG_FONT_MINI_4x6 is not set |
405 | # CONFIG_FONT_SUN8x16 is not set | 532 | # CONFIG_FONT_SUN8x16 is not set |
406 | # CONFIG_FONT_SUN12x22 is not set | 533 | # CONFIG_FONT_SUN12x22 is not set |
534 | # CONFIG_FONT_10x18 is not set | ||
407 | 535 | ||
408 | # | 536 | # |
409 | # Logo configuration | 537 | # Logo configuration |
@@ -414,7 +542,22 @@ CONFIG_FONT_PEARL_8x8=y | |||
414 | # | 542 | # |
415 | # Sound | 543 | # Sound |
416 | # | 544 | # |
417 | # CONFIG_SOUND is not set | 545 | CONFIG_SOUND=y |
546 | |||
547 | # | ||
548 | # Advanced Linux Sound Architecture | ||
549 | # | ||
550 | # CONFIG_SND is not set | ||
551 | |||
552 | # | ||
553 | # Open Sound System | ||
554 | # | ||
555 | CONFIG_SOUND_PRIME=y | ||
556 | # CONFIG_OBSOLETE_OSS_DRIVER is not set | ||
557 | # CONFIG_SOUND_MSNDCLAS is not set | ||
558 | # CONFIG_SOUND_MSNDPIN is not set | ||
559 | CONFIG_SOUND_SH_DAC_AUDIO=y | ||
560 | CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL=1 | ||
418 | 561 | ||
419 | # | 562 | # |
420 | # USB support | 563 | # USB support |
@@ -423,7 +566,7 @@ CONFIG_FONT_PEARL_8x8=y | |||
423 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 566 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
424 | 567 | ||
425 | # | 568 | # |
426 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information | 569 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
427 | # | 570 | # |
428 | 571 | ||
429 | # | 572 | # |
@@ -442,25 +585,29 @@ CONFIG_FONT_PEARL_8x8=y | |||
442 | # CONFIG_INFINIBAND is not set | 585 | # CONFIG_INFINIBAND is not set |
443 | 586 | ||
444 | # | 587 | # |
588 | # SN Devices | ||
589 | # | ||
590 | |||
591 | # | ||
445 | # File systems | 592 | # File systems |
446 | # | 593 | # |
447 | CONFIG_EXT2_FS=y | 594 | CONFIG_EXT2_FS=y |
448 | # CONFIG_EXT2_FS_XATTR is not set | 595 | # CONFIG_EXT2_FS_XATTR is not set |
596 | # CONFIG_EXT2_FS_XIP is not set | ||
449 | # CONFIG_EXT3_FS is not set | 597 | # CONFIG_EXT3_FS is not set |
450 | # CONFIG_JBD is not set | 598 | # CONFIG_JBD is not set |
451 | # CONFIG_REISERFS_FS is not set | 599 | # CONFIG_REISERFS_FS is not set |
452 | # CONFIG_JFS_FS is not set | 600 | # CONFIG_JFS_FS is not set |
453 | 601 | # CONFIG_FS_POSIX_ACL is not set | |
454 | # | ||
455 | # XFS support | ||
456 | # | ||
457 | # CONFIG_XFS_FS is not set | 602 | # CONFIG_XFS_FS is not set |
458 | # CONFIG_MINIX_FS is not set | 603 | # CONFIG_MINIX_FS is not set |
459 | # CONFIG_ROMFS_FS is not set | 604 | # CONFIG_ROMFS_FS is not set |
605 | CONFIG_INOTIFY=y | ||
460 | # CONFIG_QUOTA is not set | 606 | # CONFIG_QUOTA is not set |
461 | CONFIG_DNOTIFY=y | 607 | CONFIG_DNOTIFY=y |
462 | # CONFIG_AUTOFS_FS is not set | 608 | # CONFIG_AUTOFS_FS is not set |
463 | # CONFIG_AUTOFS4_FS is not set | 609 | # CONFIG_AUTOFS4_FS is not set |
610 | # CONFIG_FUSE_FS is not set | ||
464 | 611 | ||
465 | # | 612 | # |
466 | # CD-ROM/DVD Filesystems | 613 | # CD-ROM/DVD Filesystems |
@@ -471,8 +618,11 @@ CONFIG_DNOTIFY=y | |||
471 | # | 618 | # |
472 | # DOS/FAT/NT Filesystems | 619 | # DOS/FAT/NT Filesystems |
473 | # | 620 | # |
621 | CONFIG_FAT_FS=y | ||
474 | # CONFIG_MSDOS_FS is not set | 622 | # CONFIG_MSDOS_FS is not set |
475 | # CONFIG_VFAT_FS is not set | 623 | CONFIG_VFAT_FS=y |
624 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
625 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
476 | # CONFIG_NTFS_FS is not set | 626 | # CONFIG_NTFS_FS is not set |
477 | 627 | ||
478 | # | 628 | # |
@@ -481,14 +631,11 @@ CONFIG_DNOTIFY=y | |||
481 | CONFIG_PROC_FS=y | 631 | CONFIG_PROC_FS=y |
482 | CONFIG_PROC_KCORE=y | 632 | CONFIG_PROC_KCORE=y |
483 | CONFIG_SYSFS=y | 633 | CONFIG_SYSFS=y |
484 | CONFIG_DEVFS_FS=y | ||
485 | CONFIG_DEVFS_MOUNT=y | ||
486 | # CONFIG_DEVFS_DEBUG is not set | ||
487 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
488 | # CONFIG_TMPFS is not set | 634 | # CONFIG_TMPFS is not set |
489 | # CONFIG_HUGETLBFS is not set | 635 | # CONFIG_HUGETLBFS is not set |
490 | # CONFIG_HUGETLB_PAGE is not set | 636 | # CONFIG_HUGETLB_PAGE is not set |
491 | CONFIG_RAMFS=y | 637 | CONFIG_RAMFS=y |
638 | # CONFIG_RELAYFS_FS is not set | ||
492 | 639 | ||
493 | # | 640 | # |
494 | # Miscellaneous filesystems | 641 | # Miscellaneous filesystems |
@@ -516,7 +663,46 @@ CONFIG_MSDOS_PARTITION=y | |||
516 | # | 663 | # |
517 | # Native Language Support | 664 | # Native Language Support |
518 | # | 665 | # |
519 | # CONFIG_NLS is not set | 666 | CONFIG_NLS=y |
667 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
668 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
669 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
670 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
671 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
672 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
673 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
674 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
675 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
676 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
677 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
678 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
679 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
680 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
681 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
682 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
683 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
684 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
685 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
686 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
687 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
688 | # CONFIG_NLS_ISO8859_8 is not set | ||
689 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
690 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
691 | # CONFIG_NLS_ASCII is not set | ||
692 | # CONFIG_NLS_ISO8859_1 is not set | ||
693 | # CONFIG_NLS_ISO8859_2 is not set | ||
694 | # CONFIG_NLS_ISO8859_3 is not set | ||
695 | # CONFIG_NLS_ISO8859_4 is not set | ||
696 | # CONFIG_NLS_ISO8859_5 is not set | ||
697 | # CONFIG_NLS_ISO8859_6 is not set | ||
698 | # CONFIG_NLS_ISO8859_7 is not set | ||
699 | # CONFIG_NLS_ISO8859_9 is not set | ||
700 | # CONFIG_NLS_ISO8859_13 is not set | ||
701 | # CONFIG_NLS_ISO8859_14 is not set | ||
702 | # CONFIG_NLS_ISO8859_15 is not set | ||
703 | # CONFIG_NLS_KOI8_R is not set | ||
704 | # CONFIG_NLS_KOI8_U is not set | ||
705 | # CONFIG_NLS_UTF8 is not set | ||
520 | 706 | ||
521 | # | 707 | # |
522 | # Profiling support | 708 | # Profiling support |
@@ -526,7 +712,9 @@ CONFIG_MSDOS_PARTITION=y | |||
526 | # | 712 | # |
527 | # Kernel hacking | 713 | # Kernel hacking |
528 | # | 714 | # |
715 | # CONFIG_PRINTK_TIME is not set | ||
529 | # CONFIG_DEBUG_KERNEL is not set | 716 | # CONFIG_DEBUG_KERNEL is not set |
717 | CONFIG_LOG_BUF_SHIFT=14 | ||
530 | # CONFIG_FRAME_POINTER is not set | 718 | # CONFIG_FRAME_POINTER is not set |
531 | # CONFIG_SH_STANDARD_BIOS is not set | 719 | # CONFIG_SH_STANDARD_BIOS is not set |
532 | # CONFIG_KGDB is not set | 720 | # CONFIG_KGDB is not set |
@@ -550,5 +738,6 @@ CONFIG_MSDOS_PARTITION=y | |||
550 | # Library routines | 738 | # Library routines |
551 | # | 739 | # |
552 | # CONFIG_CRC_CCITT is not set | 740 | # CONFIG_CRC_CCITT is not set |
741 | # CONFIG_CRC16 is not set | ||
553 | CONFIG_CRC32=y | 742 | CONFIG_CRC32=y |
554 | # CONFIG_LIBCRC32C is not set | 743 | # CONFIG_LIBCRC32C is not set |
diff --git a/arch/sh/tools/mach-types b/arch/sh/tools/mach-types index 0693fbd1f956..182fe9092577 100644 --- a/arch/sh/tools/mach-types +++ b/arch/sh/tools/mach-types | |||
@@ -10,10 +10,7 @@ SE SH_SOLUTION_ENGINE | |||
10 | 7300SE SH_7300_SOLUTION_ENGINE | 10 | 7300SE SH_7300_SOLUTION_ENGINE |
11 | 73180SE SH_73180_SOLUTION_ENGINE | 11 | 73180SE SH_73180_SOLUTION_ENGINE |
12 | 7751SYSTEMH SH_7751_SYSTEMH | 12 | 7751SYSTEMH SH_7751_SYSTEMH |
13 | HP600 SH_HP600 | 13 | HP6XX SH_HP6XX |
14 | HP620 SH_HP620 | ||
15 | HP680 SH_HP680 | ||
16 | HP690 SH_HP690 | ||
17 | HD64461 HD64461 | 14 | HD64461 HD64461 |
18 | HD64465 HD64465 | 15 | HD64465 HD64465 |
19 | SH2000 SH_SH2000 | 16 | SH2000 SH_SH2000 |