Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (22 commits)
[POWERPC] Fix large hash table allocation on Cell blades
[POWERPC] Export empty_zero_page
[POWERPC] Fix viodasd driver with scatterlist debug
[POWERPC] Fix arch/powerpc/platforms/powermac/pic.c when !CONFIG_ADB_PMU
[POWERPC] Fix drivers/macintosh/mediabay.c when !CONFIG_ADB_PMU
[POWERPC] Fix undefined pmu_sys_suspended compilation error
[POWERPC] Fix build of modular drivers/macintosh/apm_emu.c
[POWERPC] Fix sleep on some powerbooks
[POWERPC] Fix bogus test for unassigned PCI resources
[POWERPC] Fix zImage-dtb.initrd build error
[POWERPC] Add __ucmpdi2 for 64-bit comparisons in 32-bit kernels
[POWERPC] spufs: fix rescheduling of non-runnable contexts
[POWERPC] spufs: don't (ab)use SCHED_IDLE
[POWERPC] QE: Make qe_get_firmware_info reentrant
[POWERPC] 83xx: Make 83xx perfmon support selectable
[PPC] 8xx: swap bug-fix
[POWERPC] 85xx: sbc8548 - Fix incorrect PCI-X and PCI interrupt map
[POWERPC] QE: Fix QE firmware uploading limit
[POWERPC] 8xx: Fix wrapper platform for adder875, and combine defconfigs.
[POWERPC] 8xx: fix swap
...
+1
-1
arch/powerpc/Makefile
+1
-1
arch/powerpc/Makefile
+10
-8
arch/powerpc/boot/Makefile
+10
-8
arch/powerpc/boot/Makefile
···
186
186
image-$(CONFIG_PPC_PSERIES) += zImage.pseries
187
187
image-$(CONFIG_PPC_MAPLE) += zImage.pseries
188
188
image-$(CONFIG_PPC_IBM_CELL_BLADE) += zImage.pseries
189
-
image-$(CONFIG_PPC_PS3) += zImage-dtb.ps3
189
+
image-$(CONFIG_PPC_PS3) += dtbImage.ps3
190
190
image-$(CONFIG_PPC_CELLEB) += zImage.pseries
191
191
image-$(CONFIG_PPC_CHRP) += zImage.chrp
192
192
image-$(CONFIG_PPC_EFIKA) += zImage.chrp
···
205
205
#
206
206
207
207
# Board ports in arch/powerpc/platform/40x/Kconfig
208
-
image-$(CONFIG_EP405) += zImage-dtb.ep405
208
+
image-$(CONFIG_EP405) += dtbImage.ep405
209
209
image-$(CONFIG_WALNUT) += treeImage.walnut
210
210
211
211
# Board ports in arch/powerpc/platform/44x/Kconfig
···
220
220
# Board ports in arch/powerpc/platform/8xx/Kconfig
221
221
image-$(CONFIG_PPC_MPC86XADS) += cuImage.mpc866ads
222
222
image-$(CONFIG_PPC_MPC885ADS) += cuImage.mpc885ads
223
-
image-$(CONFIG_PPC_EP88XC) += zImage-dtb.ep88xc
223
+
image-$(CONFIG_PPC_EP88XC) += dtbImage.ep88xc
224
224
image-$(CONFIG_PPC_ADDER875) += cuImage.adder875-uboot \
225
-
zImage-dtb.adder875-redboot
225
+
dtbImage.adder875-redboot
226
226
227
227
# Board ports in arch/powerpc/platform/52xx/Kconfig
228
228
image-$(CONFIG_PPC_LITE5200) += cuImage.lite5200 cuImage.lite5200b
···
230
230
# Board ports in arch/powerpc/platform/82xx/Kconfig
231
231
image-$(CONFIG_MPC8272_ADS) += cuImage.mpc8272ads
232
232
image-$(CONFIG_PQ2FADS) += cuImage.pq2fads
233
-
image-$(CONFIG_EP8248E) += zImage-dtb.ep8248e
233
+
image-$(CONFIG_EP8248E) += dtbImage.ep8248e
234
234
235
235
# Board ports in arch/powerpc/platform/83xx/Kconfig
236
236
image-$(CONFIG_MPC832x_MDS) += cuImage.mpc832x_mds
···
268
268
269
269
initrd- := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-))
270
270
initrd-y := $(patsubst zImage%, zImage.initrd%, \
271
-
$(patsubst treeImage%, treeImage.initrd%, $(image-y)))
271
+
$(patsubst dtbImage%, dtbImage.initrd%, \
272
+
$(patsubst treeImage%, treeImage.initrd%, $(image-y))))
272
273
initrd-y := $(filter-out $(image-y), $(initrd-y))
273
274
targets += $(image-y) $(initrd-y)
274
275
···
284
283
$(obj)/zImage.%: vmlinux $(wrapperbits)
285
284
$(call if_changed,wrap,$*)
286
285
287
-
$(obj)/zImage-dtb.initrd.%: vmlinux $(wrapperbits) $(dtstree)/%.dts
286
+
# dtbImage% - a dtbImage is a zImage with an embedded device tree blob
287
+
$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(dtstree)/%.dts
288
288
$(call if_changed,wrap,$*,$(dtstree)/$*.dts,,$(obj)/ramdisk.image.gz)
289
289
290
-
$(obj)/zImage-dtb.%: vmlinux $(wrapperbits) $(dtstree)/%.dts
290
+
$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(dtstree)/%.dts
291
291
$(call if_changed,wrap,$*,$(dtstree)/$*.dts)
292
292
293
293
# This cannot be in the root of $(src) as the zImage rule always adds a $(obj)
+68
-2
arch/powerpc/boot/dts/mpc8377_mds.dts
+68
-2
arch/powerpc/boot/dts/mpc8377_mds.dts
···
47
47
reg = <0x00000000 0x20000000>; // 512MB at 0
48
48
};
49
49
50
+
localbus@e0005000 {
51
+
#address-cells = <2>;
52
+
#size-cells = <1>;
53
+
compatible = "fsl,mpc8377-elbc", "fsl,elbc", "simple-bus";
54
+
reg = <0xe0005000 0x1000>;
55
+
interrupts = <77 0x8>;
56
+
interrupt-parent = <&ipic>;
57
+
58
+
// booting from NOR flash
59
+
ranges = <0 0x0 0xfe000000 0x02000000
60
+
1 0x0 0xf8000000 0x00008000
61
+
3 0x0 0xe0600000 0x00008000>;
62
+
63
+
flash@0,0 {
64
+
#address-cells = <1>;
65
+
#size-cells = <1>;
66
+
compatible = "cfi-flash";
67
+
reg = <0 0x0 0x2000000>;
68
+
bank-width = <2>;
69
+
device-width = <1>;
70
+
71
+
u-boot@0 {
72
+
reg = <0x0 0x100000>;
73
+
read-only;
74
+
};
75
+
76
+
fs@100000 {
77
+
reg = <0x100000 0x800000>;
78
+
};
79
+
80
+
kernel@1d00000 {
81
+
reg = <0x1d00000 0x200000>;
82
+
};
83
+
84
+
dtb@1f00000 {
85
+
reg = <0x1f00000 0x100000>;
86
+
};
87
+
};
88
+
89
+
bcsr@1,0 {
90
+
reg = <1 0x0 0x8000>;
91
+
compatible = "fsl,mpc837xmds-bcsr";
92
+
};
93
+
94
+
nand@3,0 {
95
+
#address-cells = <1>;
96
+
#size-cells = <1>;
97
+
compatible = "fsl,mpc8377-fcm-nand",
98
+
"fsl,elbc-fcm-nand";
99
+
reg = <3 0x0 0x8000>;
100
+
101
+
u-boot@0 {
102
+
reg = <0x0 0x100000>;
103
+
read-only;
104
+
};
105
+
106
+
kernel@100000 {
107
+
reg = <0x100000 0x300000>;
108
+
};
109
+
110
+
fs@400000 {
111
+
reg = <0x400000 0x1c00000>;
112
+
};
113
+
};
114
+
};
115
+
50
116
soc@e0000000 {
51
117
#address-cells = <1>;
52
118
#size-cells = <1>;
···
157
91
mode = "cpu";
158
92
};
159
93
160
-
/* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
161
94
usb@23000 {
162
95
compatible = "fsl-usb2-dr";
163
96
reg = <0x23000 0x1000>;
···
164
99
#size-cells = <0>;
165
100
interrupt-parent = <&ipic>;
166
101
interrupts = <38 0x8>;
167
-
phy_type = "utmi_wide";
102
+
dr_mode = "host";
103
+
phy_type = "ulpi";
168
104
};
169
105
170
106
mdio@24520 {
+68
-2
arch/powerpc/boot/dts/mpc8378_mds.dts
+68
-2
arch/powerpc/boot/dts/mpc8378_mds.dts
···
47
47
reg = <0x00000000 0x20000000>; // 512MB at 0
48
48
};
49
49
50
+
localbus@e0005000 {
51
+
#address-cells = <2>;
52
+
#size-cells = <1>;
53
+
compatible = "fsl,mpc8378-elbc", "fsl,elbc", "simple-bus";
54
+
reg = <0xe0005000 0x1000>;
55
+
interrupts = <77 0x8>;
56
+
interrupt-parent = <&ipic>;
57
+
58
+
// booting from NOR flash
59
+
ranges = <0 0x0 0xfe000000 0x02000000
60
+
1 0x0 0xf8000000 0x00008000
61
+
3 0x0 0xe0600000 0x00008000>;
62
+
63
+
flash@0,0 {
64
+
#address-cells = <1>;
65
+
#size-cells = <1>;
66
+
compatible = "cfi-flash";
67
+
reg = <0 0x0 0x2000000>;
68
+
bank-width = <2>;
69
+
device-width = <1>;
70
+
71
+
u-boot@0 {
72
+
reg = <0x0 0x100000>;
73
+
read-only;
74
+
};
75
+
76
+
fs@100000 {
77
+
reg = <0x100000 0x800000>;
78
+
};
79
+
80
+
kernel@1d00000 {
81
+
reg = <0x1d00000 0x200000>;
82
+
};
83
+
84
+
dtb@1f00000 {
85
+
reg = <0x1f00000 0x100000>;
86
+
};
87
+
};
88
+
89
+
bcsr@1,0 {
90
+
reg = <1 0x0 0x8000>;
91
+
compatible = "fsl,mpc837xmds-bcsr";
92
+
};
93
+
94
+
nand@3,0 {
95
+
#address-cells = <1>;
96
+
#size-cells = <1>;
97
+
compatible = "fsl,mpc8378-fcm-nand",
98
+
"fsl,elbc-fcm-nand";
99
+
reg = <3 0x0 0x8000>;
100
+
101
+
u-boot@0 {
102
+
reg = <0x0 0x100000>;
103
+
read-only;
104
+
};
105
+
106
+
kernel@100000 {
107
+
reg = <0x100000 0x300000>;
108
+
};
109
+
110
+
fs@400000 {
111
+
reg = <0x400000 0x1c00000>;
112
+
};
113
+
};
114
+
};
115
+
50
116
soc@e0000000 {
51
117
#address-cells = <1>;
52
118
#size-cells = <1>;
···
157
91
mode = "cpu";
158
92
};
159
93
160
-
/* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
161
94
usb@23000 {
162
95
compatible = "fsl-usb2-dr";
163
96
reg = <0x23000 0x1000>;
···
164
99
#size-cells = <0>;
165
100
interrupt-parent = <&ipic>;
166
101
interrupts = <38 0x8>;
167
-
phy_type = "utmi_wide";
102
+
dr_mode = "host";
103
+
phy_type = "ulpi";
168
104
};
169
105
170
106
mdio@24520 {
+68
-2
arch/powerpc/boot/dts/mpc8379_mds.dts
+68
-2
arch/powerpc/boot/dts/mpc8379_mds.dts
···
47
47
reg = <0x00000000 0x20000000>; // 512MB at 0
48
48
};
49
49
50
+
localbus@e0005000 {
51
+
#address-cells = <2>;
52
+
#size-cells = <1>;
53
+
compatible = "fsl,mpc8379-elbc", "fsl,elbc", "simple-bus";
54
+
reg = <0xe0005000 0x1000>;
55
+
interrupts = <77 0x8>;
56
+
interrupt-parent = <&ipic>;
57
+
58
+
// booting from NOR flash
59
+
ranges = <0 0x0 0xfe000000 0x02000000
60
+
1 0x0 0xf8000000 0x00008000
61
+
3 0x0 0xe0600000 0x00008000>;
62
+
63
+
flash@0,0 {
64
+
#address-cells = <1>;
65
+
#size-cells = <1>;
66
+
compatible = "cfi-flash";
67
+
reg = <0 0x0 0x2000000>;
68
+
bank-width = <2>;
69
+
device-width = <1>;
70
+
71
+
u-boot@0 {
72
+
reg = <0x0 0x100000>;
73
+
read-only;
74
+
};
75
+
76
+
fs@100000 {
77
+
reg = <0x100000 0x800000>;
78
+
};
79
+
80
+
kernel@1d00000 {
81
+
reg = <0x1d00000 0x200000>;
82
+
};
83
+
84
+
dtb@1f00000 {
85
+
reg = <0x1f00000 0x100000>;
86
+
};
87
+
};
88
+
89
+
bcsr@1,0 {
90
+
reg = <1 0x0 0x8000>;
91
+
compatible = "fsl,mpc837xmds-bcsr";
92
+
};
93
+
94
+
nand@3,0 {
95
+
#address-cells = <1>;
96
+
#size-cells = <1>;
97
+
compatible = "fsl,mpc8379-fcm-nand",
98
+
"fsl,elbc-fcm-nand";
99
+
reg = <3 0x0 0x8000>;
100
+
101
+
u-boot@0 {
102
+
reg = <0x0 0x100000>;
103
+
read-only;
104
+
};
105
+
106
+
kernel@100000 {
107
+
reg = <0x100000 0x300000>;
108
+
};
109
+
110
+
fs@400000 {
111
+
reg = <0x400000 0x1c00000>;
112
+
};
113
+
};
114
+
};
115
+
50
116
soc@e0000000 {
51
117
#address-cells = <1>;
52
118
#size-cells = <1>;
···
157
91
mode = "cpu";
158
92
};
159
93
160
-
/* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
161
94
usb@23000 {
162
95
compatible = "fsl-usb2-dr";
163
96
reg = <0x23000 0x1000>;
···
164
99
#size-cells = <0>;
165
100
interrupt-parent = <&ipic>;
166
101
interrupts = <38 0x8>;
167
-
phy_type = "utmi_wide";
102
+
dr_mode = "host";
103
+
phy_type = "ulpi";
168
104
};
169
105
170
106
mdio@24520 {
+11
-5
arch/powerpc/boot/dts/sbc8548.dts
+11
-5
arch/powerpc/boot/dts/sbc8548.dts
···
184
184
cell-index = <0>;
185
185
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
186
186
interrupt-map = <
187
-
/* IDSEL 0x01 (PCI-X slot) */
188
-
0x0800 0x0 0x0 0x1 &mpic 0x0 0x1
189
-
0x0800 0x0 0x0 0x2 &mpic 0x1 0x1
190
-
0x0800 0x0 0x0 0x3 &mpic 0x2 0x1
191
-
0x0800 0x0 0x0 0x4 &mpic 0x3 0x1>;
187
+
/* IDSEL 0x01 (PCI-X slot) @66MHz */
188
+
0x0800 0x0 0x0 0x1 &mpic 0x2 0x1
189
+
0x0800 0x0 0x0 0x2 &mpic 0x3 0x1
190
+
0x0800 0x0 0x0 0x3 &mpic 0x4 0x1
191
+
0x0800 0x0 0x0 0x4 &mpic 0x1 0x1
192
+
193
+
/* IDSEL 0x11 (PCI, 3.3V 32bit) @33MHz */
194
+
0x8800 0x0 0x0 0x1 &mpic 0x2 0x1
195
+
0x8800 0x0 0x0 0x2 &mpic 0x3 0x1
196
+
0x8800 0x0 0x0 0x3 &mpic 0x4 0x1
197
+
0x8800 0x0 0x0 0x4 &mpic 0x1 0x1>;
192
198
193
199
interrupt-parent = <&mpic>;
194
200
interrupts = <0x18 0x2>;
+5
-1
arch/powerpc/boot/wrapper
+5
-1
arch/powerpc/boot/wrapper
···
191
191
ksection=.kernel:vmlinux.bin
192
192
isection=.kernel:initrd
193
193
;;
194
-
ep88xc|ep405|redboot*|ep8248e)
194
+
ep88xc|ep405|ep8248e)
195
195
platformo="$object/fixed-head.o $object/$platform.o"
196
+
binary=y
197
+
;;
198
+
adder875-redboot)
199
+
platformo="$object/fixed-head.o $object/redboot-8xx.o"
196
200
binary=y
197
201
;;
198
202
esac
-798
arch/powerpc/configs/adder875-redboot_defconfig
-798
arch/powerpc/configs/adder875-redboot_defconfig
···
1
-
#
2
-
# Automatically generated make config: don't edit
3
-
# Linux kernel version: 2.6.24-rc6
4
-
# Thu Jan 17 16:17:38 2008
5
-
#
6
-
# CONFIG_PPC64 is not set
7
-
8
-
#
9
-
# Processor support
10
-
#
11
-
# CONFIG_6xx is not set
12
-
# CONFIG_PPC_85xx is not set
13
-
CONFIG_PPC_8xx=y
14
-
# CONFIG_40x is not set
15
-
# CONFIG_44x is not set
16
-
# CONFIG_E200 is not set
17
-
CONFIG_8xx=y
18
-
# CONFIG_PPC_MM_SLICES is not set
19
-
CONFIG_NOT_COHERENT_CACHE=y
20
-
CONFIG_PPC32=y
21
-
CONFIG_WORD_SIZE=32
22
-
CONFIG_PPC_MERGE=y
23
-
CONFIG_MMU=y
24
-
CONFIG_GENERIC_CMOS_UPDATE=y
25
-
CONFIG_GENERIC_TIME=y
26
-
CONFIG_GENERIC_TIME_VSYSCALL=y
27
-
CONFIG_GENERIC_CLOCKEVENTS=y
28
-
CONFIG_GENERIC_HARDIRQS=y
29
-
CONFIG_IRQ_PER_CPU=y
30
-
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
31
-
CONFIG_ARCH_HAS_ILOG2_U32=y
32
-
CONFIG_GENERIC_HWEIGHT=y
33
-
CONFIG_GENERIC_CALIBRATE_DELAY=y
34
-
CONFIG_GENERIC_FIND_NEXT_BIT=y
35
-
# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
36
-
CONFIG_PPC=y
37
-
CONFIG_EARLY_PRINTK=y
38
-
CONFIG_GENERIC_NVRAM=y
39
-
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
40
-
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
41
-
CONFIG_PPC_OF=y
42
-
CONFIG_OF=y
43
-
# CONFIG_PPC_UDBG_16550 is not set
44
-
# CONFIG_GENERIC_TBSYNC is not set
45
-
CONFIG_AUDIT_ARCH=y
46
-
CONFIG_GENERIC_BUG=y
47
-
# CONFIG_DEFAULT_UIMAGE is not set
48
-
CONFIG_REDBOOT=y
49
-
# CONFIG_PPC_DCR_NATIVE is not set
50
-
# CONFIG_PPC_DCR_MMIO is not set
51
-
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
52
-
53
-
#
54
-
# General setup
55
-
#
56
-
CONFIG_EXPERIMENTAL=y
57
-
CONFIG_BROKEN_ON_SMP=y
58
-
CONFIG_INIT_ENV_ARG_LIMIT=32
59
-
CONFIG_LOCALVERSION=""
60
-
CONFIG_LOCALVERSION_AUTO=y
61
-
# CONFIG_SWAP is not set
62
-
CONFIG_SYSVIPC=y
63
-
CONFIG_SYSVIPC_SYSCTL=y
64
-
# CONFIG_POSIX_MQUEUE is not set
65
-
# CONFIG_BSD_PROCESS_ACCT is not set
66
-
# CONFIG_TASKSTATS is not set
67
-
# CONFIG_USER_NS is not set
68
-
# CONFIG_PID_NS is not set
69
-
# CONFIG_AUDIT is not set
70
-
# CONFIG_IKCONFIG is not set
71
-
CONFIG_LOG_BUF_SHIFT=14
72
-
# CONFIG_CGROUPS is not set
73
-
CONFIG_FAIR_GROUP_SCHED=y
74
-
CONFIG_FAIR_USER_SCHED=y
75
-
# CONFIG_FAIR_CGROUP_SCHED is not set
76
-
CONFIG_SYSFS_DEPRECATED=y
77
-
# CONFIG_RELAY is not set
78
-
# CONFIG_BLK_DEV_INITRD is not set
79
-
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
80
-
CONFIG_SYSCTL=y
81
-
CONFIG_EMBEDDED=y
82
-
# CONFIG_SYSCTL_SYSCALL is not set
83
-
CONFIG_KALLSYMS=y
84
-
# CONFIG_KALLSYMS_ALL is not set
85
-
# CONFIG_KALLSYMS_EXTRA_PASS is not set
86
-
CONFIG_HOTPLUG=y
87
-
CONFIG_PRINTK=y
88
-
CONFIG_BUG=y
89
-
# CONFIG_ELF_CORE is not set
90
-
# CONFIG_BASE_FULL is not set
91
-
# CONFIG_FUTEX is not set
92
-
CONFIG_ANON_INODES=y
93
-
CONFIG_EPOLL=y
94
-
CONFIG_SIGNALFD=y
95
-
CONFIG_EVENTFD=y
96
-
CONFIG_SHMEM=y
97
-
# CONFIG_VM_EVENT_COUNTERS is not set
98
-
CONFIG_SLUB_DEBUG=y
99
-
# CONFIG_SLAB is not set
100
-
CONFIG_SLUB=y
101
-
# CONFIG_SLOB is not set
102
-
# CONFIG_TINY_SHMEM is not set
103
-
CONFIG_BASE_SMALL=1
104
-
# CONFIG_MODULES is not set
105
-
CONFIG_BLOCK=y
106
-
# CONFIG_LBD is not set
107
-
# CONFIG_BLK_DEV_IO_TRACE is not set
108
-
# CONFIG_LSF is not set
109
-
# CONFIG_BLK_DEV_BSG is not set
110
-
111
-
#
112
-
# IO Schedulers
113
-
#
114
-
CONFIG_IOSCHED_NOOP=y
115
-
# CONFIG_IOSCHED_AS is not set
116
-
CONFIG_IOSCHED_DEADLINE=y
117
-
# CONFIG_IOSCHED_CFQ is not set
118
-
# CONFIG_DEFAULT_AS is not set
119
-
CONFIG_DEFAULT_DEADLINE=y
120
-
# CONFIG_DEFAULT_CFQ is not set
121
-
# CONFIG_DEFAULT_NOOP is not set
122
-
CONFIG_DEFAULT_IOSCHED="deadline"
123
-
124
-
#
125
-
# Platform support
126
-
#
127
-
# CONFIG_PPC_MPC52xx is not set
128
-
# CONFIG_PPC_MPC5200 is not set
129
-
# CONFIG_PPC_CELL is not set
130
-
# CONFIG_PPC_CELL_NATIVE is not set
131
-
CONFIG_CPM1=y
132
-
# CONFIG_MPC8XXFADS is not set
133
-
# CONFIG_MPC86XADS is not set
134
-
# CONFIG_MPC885ADS is not set
135
-
# CONFIG_PPC_EP88XC is not set
136
-
CONFIG_PPC_ADDER875=y
137
-
138
-
#
139
-
# MPC8xx CPM Options
140
-
#
141
-
142
-
#
143
-
# Generic MPC8xx Options
144
-
#
145
-
CONFIG_8xx_COPYBACK=y
146
-
# CONFIG_8xx_CPU6 is not set
147
-
CONFIG_8xx_CPU15=y
148
-
CONFIG_NO_UCODE_PATCH=y
149
-
# CONFIG_USB_SOF_UCODE_PATCH is not set
150
-
# CONFIG_I2C_SPI_UCODE_PATCH is not set
151
-
# CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set
152
-
# CONFIG_PQ2ADS is not set
153
-
# CONFIG_MPIC is not set
154
-
# CONFIG_MPIC_WEIRD is not set
155
-
# CONFIG_PPC_I8259 is not set
156
-
# CONFIG_PPC_RTAS is not set
157
-
# CONFIG_MMIO_NVRAM is not set
158
-
# CONFIG_PPC_MPC106 is not set
159
-
# CONFIG_PPC_970_NAP is not set
160
-
# CONFIG_PPC_INDIRECT_IO is not set
161
-
# CONFIG_GENERIC_IOMAP is not set
162
-
# CONFIG_CPU_FREQ is not set
163
-
# CONFIG_CPM2 is not set
164
-
CONFIG_PPC_CPM_NEW_BINDING=y
165
-
# CONFIG_FSL_ULI1575 is not set
166
-
CONFIG_CPM=y
167
-
168
-
#
169
-
# Kernel options
170
-
#
171
-
# CONFIG_HIGHMEM is not set
172
-
# CONFIG_TICK_ONESHOT is not set
173
-
# CONFIG_NO_HZ is not set
174
-
# CONFIG_HIGH_RES_TIMERS is not set
175
-
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
176
-
# CONFIG_HZ_100 is not set
177
-
# CONFIG_HZ_250 is not set
178
-
# CONFIG_HZ_300 is not set
179
-
CONFIG_HZ_1000=y
180
-
CONFIG_HZ=1000
181
-
CONFIG_PREEMPT_NONE=y
182
-
# CONFIG_PREEMPT_VOLUNTARY is not set
183
-
# CONFIG_PREEMPT is not set
184
-
CONFIG_BINFMT_ELF=y
185
-
# CONFIG_BINFMT_MISC is not set
186
-
# CONFIG_MATH_EMULATION is not set
187
-
# CONFIG_8XX_MINIMAL_FPEMU is not set
188
-
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
189
-
CONFIG_ARCH_FLATMEM_ENABLE=y
190
-
CONFIG_ARCH_POPULATES_NODE_MAP=y
191
-
CONFIG_SELECT_MEMORY_MODEL=y
192
-
CONFIG_FLATMEM_MANUAL=y
193
-
# CONFIG_DISCONTIGMEM_MANUAL is not set
194
-
# CONFIG_SPARSEMEM_MANUAL is not set
195
-
CONFIG_FLATMEM=y
196
-
CONFIG_FLAT_NODE_MEM_MAP=y
197
-
# CONFIG_SPARSEMEM_STATIC is not set
198
-
# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
199
-
CONFIG_SPLIT_PTLOCK_CPUS=4
200
-
# CONFIG_RESOURCES_64BIT is not set
201
-
CONFIG_ZONE_DMA_FLAG=1
202
-
CONFIG_BOUNCE=y
203
-
CONFIG_VIRT_TO_BUS=y
204
-
# CONFIG_PROC_DEVICETREE is not set
205
-
# CONFIG_CMDLINE_BOOL is not set
206
-
# CONFIG_PM is not set
207
-
CONFIG_SUSPEND_UP_POSSIBLE=y
208
-
CONFIG_HIBERNATION_UP_POSSIBLE=y
209
-
# CONFIG_SECCOMP is not set
210
-
CONFIG_WANT_DEVICE_TREE=y
211
-
CONFIG_DEVICE_TREE="adder875-redboot.dts"
212
-
CONFIG_ISA_DMA_API=y
213
-
214
-
#
215
-
# Bus options
216
-
#
217
-
CONFIG_ZONE_DMA=y
218
-
CONFIG_FSL_SOC=y
219
-
# CONFIG_PCI is not set
220
-
# CONFIG_PCI_DOMAINS is not set
221
-
# CONFIG_PCI_SYSCALL is not set
222
-
# CONFIG_PCI_QSPAN is not set
223
-
# CONFIG_ARCH_SUPPORTS_MSI is not set
224
-
# CONFIG_PCCARD is not set
225
-
226
-
#
227
-
# Advanced setup
228
-
#
229
-
# CONFIG_ADVANCED_OPTIONS is not set
230
-
231
-
#
232
-
# Default settings for advanced configuration options are used
233
-
#
234
-
CONFIG_HIGHMEM_START=0xfe000000
235
-
CONFIG_LOWMEM_SIZE=0x30000000
236
-
CONFIG_KERNEL_START=0xc0000000
237
-
CONFIG_TASK_SIZE=0x80000000
238
-
CONFIG_CONSISTENT_START=0xfd000000
239
-
CONFIG_CONSISTENT_SIZE=0x00200000
240
-
CONFIG_BOOT_LOAD=0x00400000
241
-
242
-
#
243
-
# Networking
244
-
#
245
-
CONFIG_NET=y
246
-
247
-
#
248
-
# Networking options
249
-
#
250
-
CONFIG_PACKET=y
251
-
# CONFIG_PACKET_MMAP is not set
252
-
CONFIG_UNIX=y
253
-
# CONFIG_NET_KEY is not set
254
-
CONFIG_INET=y
255
-
CONFIG_IP_MULTICAST=y
256
-
# CONFIG_IP_ADVANCED_ROUTER is not set
257
-
CONFIG_IP_FIB_HASH=y
258
-
CONFIG_IP_PNP=y
259
-
# CONFIG_IP_PNP_DHCP is not set
260
-
# CONFIG_IP_PNP_BOOTP is not set
261
-
# CONFIG_IP_PNP_RARP is not set
262
-
# CONFIG_NET_IPIP is not set
263
-
# CONFIG_NET_IPGRE is not set
264
-
# CONFIG_IP_MROUTE is not set
265
-
# CONFIG_ARPD is not set
266
-
CONFIG_SYN_COOKIES=y
267
-
# CONFIG_INET_AH is not set
268
-
# CONFIG_INET_ESP is not set
269
-
# CONFIG_INET_IPCOMP is not set
270
-
# CONFIG_INET_XFRM_TUNNEL is not set
271
-
# CONFIG_INET_TUNNEL is not set
272
-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
273
-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
274
-
# CONFIG_INET_XFRM_MODE_BEET is not set
275
-
# CONFIG_INET_LRO is not set
276
-
CONFIG_INET_DIAG=y
277
-
CONFIG_INET_TCP_DIAG=y
278
-
# CONFIG_TCP_CONG_ADVANCED is not set
279
-
CONFIG_TCP_CONG_CUBIC=y
280
-
CONFIG_DEFAULT_TCP_CONG="cubic"
281
-
# CONFIG_TCP_MD5SIG is not set
282
-
# CONFIG_IPV6 is not set
283
-
# CONFIG_INET6_XFRM_TUNNEL is not set
284
-
# CONFIG_INET6_TUNNEL is not set
285
-
# CONFIG_NETWORK_SECMARK is not set
286
-
# CONFIG_NETFILTER is not set
287
-
# CONFIG_IP_DCCP is not set
288
-
# CONFIG_IP_SCTP is not set
289
-
# CONFIG_TIPC is not set
290
-
# CONFIG_ATM is not set
291
-
# CONFIG_BRIDGE is not set
292
-
# CONFIG_VLAN_8021Q is not set
293
-
# CONFIG_DECNET is not set
294
-
# CONFIG_LLC2 is not set
295
-
# CONFIG_IPX is not set
296
-
# CONFIG_ATALK is not set
297
-
# CONFIG_X25 is not set
298
-
# CONFIG_LAPB is not set
299
-
# CONFIG_ECONET is not set
300
-
# CONFIG_WAN_ROUTER is not set
301
-
# CONFIG_NET_SCHED is not set
302
-
303
-
#
304
-
# Network testing
305
-
#
306
-
# CONFIG_NET_PKTGEN is not set
307
-
# CONFIG_HAMRADIO is not set
308
-
# CONFIG_IRDA is not set
309
-
# CONFIG_BT is not set
310
-
# CONFIG_AF_RXRPC is not set
311
-
312
-
#
313
-
# Wireless
314
-
#
315
-
# CONFIG_CFG80211 is not set
316
-
# CONFIG_WIRELESS_EXT is not set
317
-
# CONFIG_MAC80211 is not set
318
-
# CONFIG_IEEE80211 is not set
319
-
# CONFIG_RFKILL is not set
320
-
# CONFIG_NET_9P is not set
321
-
322
-
#
323
-
# Device Drivers
324
-
#
325
-
326
-
#
327
-
# Generic Driver Options
328
-
#
329
-
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
330
-
CONFIG_STANDALONE=y
331
-
CONFIG_PREVENT_FIRMWARE_BUILD=y
332
-
# CONFIG_FW_LOADER is not set
333
-
# CONFIG_DEBUG_DRIVER is not set
334
-
# CONFIG_DEBUG_DEVRES is not set
335
-
# CONFIG_SYS_HYPERVISOR is not set
336
-
# CONFIG_CONNECTOR is not set
337
-
CONFIG_MTD=y
338
-
# CONFIG_MTD_DEBUG is not set
339
-
# CONFIG_MTD_CONCAT is not set
340
-
# CONFIG_MTD_PARTITIONS is not set
341
-
342
-
#
343
-
# User Modules And Translation Layers
344
-
#
345
-
CONFIG_MTD_CHAR=y
346
-
CONFIG_MTD_BLKDEVS=y
347
-
CONFIG_MTD_BLOCK=y
348
-
# CONFIG_FTL is not set
349
-
# CONFIG_NFTL is not set
350
-
# CONFIG_INFTL is not set
351
-
# CONFIG_RFD_FTL is not set
352
-
# CONFIG_SSFDC is not set
353
-
# CONFIG_MTD_OOPS is not set
354
-
355
-
#
356
-
# RAM/ROM/Flash chip drivers
357
-
#
358
-
CONFIG_MTD_CFI=y
359
-
# CONFIG_MTD_JEDECPROBE is not set
360
-
CONFIG_MTD_GEN_PROBE=y
361
-
# CONFIG_MTD_CFI_ADV_OPTIONS is not set
362
-
CONFIG_MTD_MAP_BANK_WIDTH_1=y
363
-
CONFIG_MTD_MAP_BANK_WIDTH_2=y
364
-
CONFIG_MTD_MAP_BANK_WIDTH_4=y
365
-
# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
366
-
# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
367
-
# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
368
-
CONFIG_MTD_CFI_I1=y
369
-
CONFIG_MTD_CFI_I2=y
370
-
# CONFIG_MTD_CFI_I4 is not set
371
-
# CONFIG_MTD_CFI_I8 is not set
372
-
# CONFIG_MTD_CFI_INTELEXT is not set
373
-
CONFIG_MTD_CFI_AMDSTD=y
374
-
# CONFIG_MTD_CFI_STAA is not set
375
-
CONFIG_MTD_CFI_UTIL=y
376
-
# CONFIG_MTD_RAM is not set
377
-
# CONFIG_MTD_ROM is not set
378
-
# CONFIG_MTD_ABSENT is not set
379
-
380
-
#
381
-
# Mapping drivers for chip access
382
-
#
383
-
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
384
-
# CONFIG_MTD_PHYSMAP is not set
385
-
CONFIG_MTD_PHYSMAP_OF=y
386
-
# CONFIG_MTD_CFI_FLAGADM is not set
387
-
# CONFIG_MTD_PLATRAM is not set
388
-
389
-
#
390
-
# Self-contained MTD device drivers
391
-
#
392
-
# CONFIG_MTD_SLRAM is not set
393
-
# CONFIG_MTD_PHRAM is not set
394
-
# CONFIG_MTD_MTDRAM is not set
395
-
# CONFIG_MTD_BLOCK2MTD is not set
396
-
397
-
#
398
-
# Disk-On-Chip Device Drivers
399
-
#
400
-
# CONFIG_MTD_DOC2000 is not set
401
-
# CONFIG_MTD_DOC2001 is not set
402
-
# CONFIG_MTD_DOC2001PLUS is not set
403
-
# CONFIG_MTD_NAND is not set
404
-
# CONFIG_MTD_ONENAND is not set
405
-
406
-
#
407
-
# UBI - Unsorted block images
408
-
#
409
-
# CONFIG_MTD_UBI is not set
410
-
CONFIG_OF_DEVICE=y
411
-
# CONFIG_PARPORT is not set
412
-
# CONFIG_BLK_DEV is not set
413
-
# CONFIG_MISC_DEVICES is not set
414
-
# CONFIG_IDE is not set
415
-
416
-
#
417
-
# SCSI device support
418
-
#
419
-
# CONFIG_RAID_ATTRS is not set
420
-
# CONFIG_SCSI is not set
421
-
# CONFIG_SCSI_DMA is not set
422
-
# CONFIG_SCSI_NETLINK is not set
423
-
# CONFIG_ATA is not set
424
-
# CONFIG_MD is not set
425
-
# CONFIG_MACINTOSH_DRIVERS is not set
426
-
CONFIG_NETDEVICES=y
427
-
# CONFIG_NETDEVICES_MULTIQUEUE is not set
428
-
# CONFIG_DUMMY is not set
429
-
# CONFIG_BONDING is not set
430
-
# CONFIG_MACVLAN is not set
431
-
# CONFIG_EQUALIZER is not set
432
-
# CONFIG_TUN is not set
433
-
# CONFIG_VETH is not set
434
-
CONFIG_PHYLIB=y
435
-
436
-
#
437
-
# MII PHY device drivers
438
-
#
439
-
# CONFIG_MARVELL_PHY is not set
440
-
CONFIG_DAVICOM_PHY=y
441
-
# CONFIG_QSEMI_PHY is not set
442
-
# CONFIG_LXT_PHY is not set
443
-
# CONFIG_CICADA_PHY is not set
444
-
# CONFIG_VITESSE_PHY is not set
445
-
# CONFIG_SMSC_PHY is not set
446
-
# CONFIG_BROADCOM_PHY is not set
447
-
# CONFIG_ICPLUS_PHY is not set
448
-
# CONFIG_FIXED_PHY is not set
449
-
# CONFIG_MDIO_BITBANG is not set
450
-
CONFIG_NET_ETHERNET=y
451
-
CONFIG_MII=y
452
-
# CONFIG_IBM_NEW_EMAC_ZMII is not set
453
-
# CONFIG_IBM_NEW_EMAC_RGMII is not set
454
-
# CONFIG_IBM_NEW_EMAC_TAH is not set
455
-
# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
456
-
# CONFIG_B44 is not set
457
-
CONFIG_FS_ENET=y
458
-
# CONFIG_FS_ENET_HAS_SCC is not set
459
-
CONFIG_FS_ENET_HAS_FEC=y
460
-
CONFIG_FS_ENET_MDIO_FEC=y
461
-
# CONFIG_NETDEV_1000 is not set
462
-
# CONFIG_NETDEV_10000 is not set
463
-
464
-
#
465
-
# Wireless LAN
466
-
#
467
-
# CONFIG_WLAN_PRE80211 is not set
468
-
# CONFIG_WLAN_80211 is not set
469
-
# CONFIG_WAN is not set
470
-
# CONFIG_PPP is not set
471
-
# CONFIG_SLIP is not set
472
-
# CONFIG_SHAPER is not set
473
-
# CONFIG_NETCONSOLE is not set
474
-
# CONFIG_NETPOLL is not set
475
-
# CONFIG_NET_POLL_CONTROLLER is not set
476
-
# CONFIG_ISDN is not set
477
-
# CONFIG_PHONE is not set
478
-
479
-
#
480
-
# Input device support
481
-
#
482
-
CONFIG_INPUT=y
483
-
# CONFIG_INPUT_FF_MEMLESS is not set
484
-
# CONFIG_INPUT_POLLDEV is not set
485
-
486
-
#
487
-
# Userland interfaces
488
-
#
489
-
CONFIG_INPUT_MOUSEDEV=y
490
-
CONFIG_INPUT_MOUSEDEV_PSAUX=y
491
-
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
492
-
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
493
-
# CONFIG_INPUT_JOYDEV is not set
494
-
# CONFIG_INPUT_EVDEV is not set
495
-
# CONFIG_INPUT_EVBUG is not set
496
-
497
-
#
498
-
# Input Device Drivers
499
-
#
500
-
CONFIG_INPUT_KEYBOARD=y
501
-
CONFIG_KEYBOARD_ATKBD=y
502
-
# CONFIG_KEYBOARD_SUNKBD is not set
503
-
# CONFIG_KEYBOARD_LKKBD is not set
504
-
# CONFIG_KEYBOARD_XTKBD is not set
505
-
# CONFIG_KEYBOARD_NEWTON is not set
506
-
# CONFIG_KEYBOARD_STOWAWAY is not set
507
-
CONFIG_INPUT_MOUSE=y
508
-
CONFIG_MOUSE_PS2=y
509
-
CONFIG_MOUSE_PS2_ALPS=y
510
-
CONFIG_MOUSE_PS2_LOGIPS2PP=y
511
-
CONFIG_MOUSE_PS2_SYNAPTICS=y
512
-
CONFIG_MOUSE_PS2_LIFEBOOK=y
513
-
CONFIG_MOUSE_PS2_TRACKPOINT=y
514
-
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
515
-
# CONFIG_MOUSE_SERIAL is not set
516
-
# CONFIG_MOUSE_VSXXXAA is not set
517
-
# CONFIG_INPUT_JOYSTICK is not set
518
-
# CONFIG_INPUT_TABLET is not set
519
-
# CONFIG_INPUT_TOUCHSCREEN is not set
520
-
# CONFIG_INPUT_MISC is not set
521
-
522
-
#
523
-
# Hardware I/O ports
524
-
#
525
-
CONFIG_SERIO=y
526
-
CONFIG_SERIO_I8042=y
527
-
CONFIG_SERIO_SERPORT=y
528
-
CONFIG_SERIO_LIBPS2=y
529
-
# CONFIG_SERIO_RAW is not set
530
-
# CONFIG_GAMEPORT is not set
531
-
532
-
#
533
-
# Character devices
534
-
#
535
-
# CONFIG_VT is not set
536
-
# CONFIG_SERIAL_NONSTANDARD is not set
537
-
538
-
#
539
-
# Serial drivers
540
-
#
541
-
# CONFIG_SERIAL_8250 is not set
542
-
543
-
#
544
-
# Non-8250 serial port support
545
-
#
546
-
# CONFIG_SERIAL_UARTLITE is not set
547
-
CONFIG_SERIAL_CORE=y
548
-
CONFIG_SERIAL_CORE_CONSOLE=y
549
-
CONFIG_SERIAL_CPM=y
550
-
CONFIG_SERIAL_CPM_CONSOLE=y
551
-
# CONFIG_SERIAL_CPM_SCC1 is not set
552
-
# CONFIG_SERIAL_CPM_SCC2 is not set
553
-
# CONFIG_SERIAL_CPM_SCC3 is not set
554
-
# CONFIG_SERIAL_CPM_SCC4 is not set
555
-
CONFIG_SERIAL_CPM_SMC1=y
556
-
CONFIG_SERIAL_CPM_SMC2=y
557
-
CONFIG_UNIX98_PTYS=y
558
-
# CONFIG_LEGACY_PTYS is not set
559
-
# CONFIG_IPMI_HANDLER is not set
560
-
CONFIG_HW_RANDOM=y
561
-
# CONFIG_NVRAM is not set
562
-
CONFIG_GEN_RTC=y
563
-
# CONFIG_GEN_RTC_X is not set
564
-
# CONFIG_R3964 is not set
565
-
# CONFIG_RAW_DRIVER is not set
566
-
# CONFIG_TCG_TPM is not set
567
-
# CONFIG_I2C is not set
568
-
569
-
#
570
-
# SPI support
571
-
#
572
-
# CONFIG_SPI is not set
573
-
# CONFIG_SPI_MASTER is not set
574
-
# CONFIG_W1 is not set
575
-
# CONFIG_POWER_SUPPLY is not set
576
-
# CONFIG_HWMON is not set
577
-
# CONFIG_WATCHDOG is not set
578
-
579
-
#
580
-
# Sonics Silicon Backplane
581
-
#
582
-
CONFIG_SSB_POSSIBLE=y
583
-
# CONFIG_SSB is not set
584
-
585
-
#
586
-
# Multifunction device drivers
587
-
#
588
-
# CONFIG_MFD_SM501 is not set
589
-
590
-
#
591
-
# Multimedia devices
592
-
#
593
-
# CONFIG_VIDEO_DEV is not set
594
-
# CONFIG_DVB_CORE is not set
595
-
CONFIG_DAB=y
596
-
597
-
#
598
-
# Graphics support
599
-
#
600
-
# CONFIG_VGASTATE is not set
601
-
CONFIG_VIDEO_OUTPUT_CONTROL=y
602
-
# CONFIG_FB is not set
603
-
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
604
-
605
-
#
606
-
# Display device support
607
-
#
608
-
# CONFIG_DISPLAY_SUPPORT is not set
609
-
610
-
#
611
-
# Sound
612
-
#
613
-
# CONFIG_SOUND is not set
614
-
# CONFIG_HID_SUPPORT is not set
615
-
# CONFIG_USB_SUPPORT is not set
616
-
# CONFIG_MMC is not set
617
-
# CONFIG_NEW_LEDS is not set
618
-
# CONFIG_EDAC is not set
619
-
# CONFIG_RTC_CLASS is not set
620
-
621
-
#
622
-
# Userspace I/O
623
-
#
624
-
# CONFIG_UIO is not set
625
-
626
-
#
627
-
# File systems
628
-
#
629
-
# CONFIG_EXT2_FS is not set
630
-
# CONFIG_EXT3_FS is not set
631
-
# CONFIG_EXT4DEV_FS is not set
632
-
# CONFIG_REISERFS_FS is not set
633
-
# CONFIG_JFS_FS is not set
634
-
# CONFIG_FS_POSIX_ACL is not set
635
-
# CONFIG_XFS_FS is not set
636
-
# CONFIG_GFS2_FS is not set
637
-
# CONFIG_OCFS2_FS is not set
638
-
# CONFIG_MINIX_FS is not set
639
-
# CONFIG_ROMFS_FS is not set
640
-
# CONFIG_INOTIFY is not set
641
-
# CONFIG_QUOTA is not set
642
-
# CONFIG_DNOTIFY is not set
643
-
# CONFIG_AUTOFS_FS is not set
644
-
# CONFIG_AUTOFS4_FS is not set
645
-
# CONFIG_FUSE_FS is not set
646
-
647
-
#
648
-
# CD-ROM/DVD Filesystems
649
-
#
650
-
# CONFIG_ISO9660_FS is not set
651
-
# CONFIG_UDF_FS is not set
652
-
653
-
#
654
-
# DOS/FAT/NT Filesystems
655
-
#
656
-
# CONFIG_MSDOS_FS is not set
657
-
# CONFIG_VFAT_FS is not set
658
-
# CONFIG_NTFS_FS is not set
659
-
660
-
#
661
-
# Pseudo filesystems
662
-
#
663
-
CONFIG_PROC_FS=y
664
-
# CONFIG_PROC_KCORE is not set
665
-
CONFIG_PROC_SYSCTL=y
666
-
CONFIG_SYSFS=y
667
-
CONFIG_TMPFS=y
668
-
# CONFIG_TMPFS_POSIX_ACL is not set
669
-
# CONFIG_HUGETLB_PAGE is not set
670
-
# CONFIG_CONFIGFS_FS is not set
671
-
672
-
#
673
-
# Miscellaneous filesystems
674
-
#
675
-
# CONFIG_ADFS_FS is not set
676
-
# CONFIG_AFFS_FS is not set
677
-
# CONFIG_HFS_FS is not set
678
-
# CONFIG_HFSPLUS_FS is not set
679
-
# CONFIG_BEFS_FS is not set
680
-
# CONFIG_BFS_FS is not set
681
-
# CONFIG_EFS_FS is not set
682
-
# CONFIG_JFFS2_FS is not set
683
-
CONFIG_CRAMFS=y
684
-
# CONFIG_VXFS_FS is not set
685
-
# CONFIG_HPFS_FS is not set
686
-
# CONFIG_QNX4FS_FS is not set
687
-
# CONFIG_SYSV_FS is not set
688
-
# CONFIG_UFS_FS is not set
689
-
CONFIG_NETWORK_FILESYSTEMS=y
690
-
CONFIG_NFS_FS=y
691
-
CONFIG_NFS_V3=y
692
-
# CONFIG_NFS_V3_ACL is not set
693
-
# CONFIG_NFS_V4 is not set
694
-
# CONFIG_NFS_DIRECTIO is not set
695
-
# CONFIG_NFSD is not set
696
-
CONFIG_ROOT_NFS=y
697
-
CONFIG_LOCKD=y
698
-
CONFIG_LOCKD_V4=y
699
-
CONFIG_NFS_COMMON=y
700
-
CONFIG_SUNRPC=y
701
-
# CONFIG_SUNRPC_BIND34 is not set
702
-
# CONFIG_RPCSEC_GSS_KRB5 is not set
703
-
# CONFIG_RPCSEC_GSS_SPKM3 is not set
704
-
# CONFIG_SMB_FS is not set
705
-
# CONFIG_CIFS is not set
706
-
# CONFIG_NCP_FS is not set
707
-
# CONFIG_CODA_FS is not set
708
-
# CONFIG_AFS_FS is not set
709
-
710
-
#
711
-
# Partition Types
712
-
#
713
-
CONFIG_PARTITION_ADVANCED=y
714
-
# CONFIG_ACORN_PARTITION is not set
715
-
# CONFIG_OSF_PARTITION is not set
716
-
# CONFIG_AMIGA_PARTITION is not set
717
-
# CONFIG_ATARI_PARTITION is not set
718
-
# CONFIG_MAC_PARTITION is not set
719
-
CONFIG_MSDOS_PARTITION=y
720
-
# CONFIG_BSD_DISKLABEL is not set
721
-
# CONFIG_MINIX_SUBPARTITION is not set
722
-
# CONFIG_SOLARIS_X86_PARTITION is not set
723
-
# CONFIG_UNIXWARE_DISKLABEL is not set
724
-
# CONFIG_LDM_PARTITION is not set
725
-
# CONFIG_SGI_PARTITION is not set
726
-
# CONFIG_ULTRIX_PARTITION is not set
727
-
# CONFIG_SUN_PARTITION is not set
728
-
# CONFIG_KARMA_PARTITION is not set
729
-
# CONFIG_EFI_PARTITION is not set
730
-
# CONFIG_SYSV68_PARTITION is not set
731
-
# CONFIG_NLS is not set
732
-
# CONFIG_DLM is not set
733
-
# CONFIG_UCC_SLOW is not set
734
-
735
-
#
736
-
# Library routines
737
-
#
738
-
# CONFIG_CRC_CCITT is not set
739
-
# CONFIG_CRC16 is not set
740
-
# CONFIG_CRC_ITU_T is not set
741
-
# CONFIG_CRC32 is not set
742
-
# CONFIG_CRC7 is not set
743
-
# CONFIG_LIBCRC32C is not set
744
-
CONFIG_ZLIB_INFLATE=y
745
-
CONFIG_HAS_IOMEM=y
746
-
CONFIG_HAS_IOPORT=y
747
-
CONFIG_HAS_DMA=y
748
-
CONFIG_INSTRUMENTATION=y
749
-
# CONFIG_PROFILING is not set
750
-
# CONFIG_MARKERS is not set
751
-
752
-
#
753
-
# Kernel hacking
754
-
#
755
-
# CONFIG_PRINTK_TIME is not set
756
-
CONFIG_ENABLE_WARN_DEPRECATED=y
757
-
CONFIG_ENABLE_MUST_CHECK=y
758
-
CONFIG_MAGIC_SYSRQ=y
759
-
# CONFIG_UNUSED_SYMBOLS is not set
760
-
# CONFIG_DEBUG_FS is not set
761
-
# CONFIG_HEADERS_CHECK is not set
762
-
CONFIG_DEBUG_KERNEL=y
763
-
# CONFIG_DEBUG_SHIRQ is not set
764
-
CONFIG_DETECT_SOFTLOCKUP=y
765
-
CONFIG_SCHED_DEBUG=y
766
-
# CONFIG_SCHEDSTATS is not set
767
-
# CONFIG_TIMER_STATS is not set
768
-
# CONFIG_SLUB_DEBUG_ON is not set
769
-
# CONFIG_DEBUG_SPINLOCK is not set
770
-
# CONFIG_DEBUG_MUTEXES is not set
771
-
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
772
-
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
773
-
# CONFIG_DEBUG_KOBJECT is not set
774
-
CONFIG_DEBUG_BUGVERBOSE=y
775
-
CONFIG_DEBUG_INFO=y
776
-
# CONFIG_DEBUG_VM is not set
777
-
# CONFIG_DEBUG_LIST is not set
778
-
# CONFIG_DEBUG_SG is not set
779
-
CONFIG_FORCED_INLINING=y
780
-
# CONFIG_BOOT_PRINTK_DELAY is not set
781
-
# CONFIG_FAULT_INJECTION is not set
782
-
# CONFIG_SAMPLES is not set
783
-
# CONFIG_DEBUG_STACKOVERFLOW is not set
784
-
# CONFIG_DEBUG_STACK_USAGE is not set
785
-
# CONFIG_DEBUG_PAGEALLOC is not set
786
-
# CONFIG_DEBUGGER is not set
787
-
# CONFIG_BDI_SWITCH is not set
788
-
# CONFIG_PPC_EARLY_DEBUG is not set
789
-
790
-
#
791
-
# Security options
792
-
#
793
-
# CONFIG_KEYS is not set
794
-
# CONFIG_SECURITY is not set
795
-
# CONFIG_SECURITY_FILE_CAPABILITIES is not set
796
-
# CONFIG_CRYPTO is not set
797
-
# CONFIG_PPC_CLOCK is not set
798
-
CONFIG_PPC_LIB_RHEAP=y
+38
-23
arch/powerpc/configs/adder875-uboot_defconfig
arch/powerpc/configs/adder875_defconfig
+38
-23
arch/powerpc/configs/adder875-uboot_defconfig
arch/powerpc/configs/adder875_defconfig
···
1
1
#
2
2
# Automatically generated make config: don't edit
3
-
# Linux kernel version: 2.6.24-rc6
4
-
# Thu Jan 17 16:17:18 2008
3
+
# Linux kernel version: 2.6.25-rc2
4
+
# Wed Feb 20 12:26:07 2008
5
5
#
6
6
# CONFIG_PPC64 is not set
7
7
···
26
26
CONFIG_GENERIC_TIME_VSYSCALL=y
27
27
CONFIG_GENERIC_CLOCKEVENTS=y
28
28
CONFIG_GENERIC_HARDIRQS=y
29
+
# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
29
30
CONFIG_IRQ_PER_CPU=y
30
31
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
31
32
CONFIG_ARCH_HAS_ILOG2_U32=y
···
65
64
# CONFIG_POSIX_MQUEUE is not set
66
65
# CONFIG_BSD_PROCESS_ACCT is not set
67
66
# CONFIG_TASKSTATS is not set
68
-
# CONFIG_USER_NS is not set
69
-
# CONFIG_PID_NS is not set
70
67
# CONFIG_AUDIT is not set
71
68
# CONFIG_IKCONFIG is not set
72
69
CONFIG_LOG_BUF_SHIFT=14
73
70
# CONFIG_CGROUPS is not set
71
+
CONFIG_GROUP_SCHED=y
74
72
CONFIG_FAIR_GROUP_SCHED=y
75
-
CONFIG_FAIR_USER_SCHED=y
76
-
# CONFIG_FAIR_CGROUP_SCHED is not set
73
+
# CONFIG_RT_GROUP_SCHED is not set
74
+
CONFIG_USER_SCHED=y
75
+
# CONFIG_CGROUP_SCHED is not set
77
76
CONFIG_SYSFS_DEPRECATED=y
78
77
# CONFIG_RELAY is not set
78
+
# CONFIG_NAMESPACES is not set
79
79
# CONFIG_BLK_DEV_INITRD is not set
80
80
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
81
81
CONFIG_SYSCTL=y
···
89
87
CONFIG_PRINTK=y
90
88
CONFIG_BUG=y
91
89
# CONFIG_ELF_CORE is not set
90
+
CONFIG_COMPAT_BRK=y
92
91
# CONFIG_BASE_FULL is not set
93
92
# CONFIG_FUTEX is not set
94
93
CONFIG_ANON_INODES=y
95
94
CONFIG_EPOLL=y
96
95
CONFIG_SIGNALFD=y
96
+
CONFIG_TIMERFD=y
97
97
CONFIG_EVENTFD=y
98
98
CONFIG_SHMEM=y
99
99
# CONFIG_VM_EVENT_COUNTERS is not set
···
103
99
# CONFIG_SLAB is not set
104
100
CONFIG_SLUB=y
105
101
# CONFIG_SLOB is not set
102
+
# CONFIG_PROFILING is not set
103
+
# CONFIG_MARKERS is not set
104
+
CONFIG_HAVE_OPROFILE=y
105
+
CONFIG_HAVE_KPROBES=y
106
+
CONFIG_PROC_PAGE_MONITOR=y
107
+
CONFIG_SLABINFO=y
106
108
# CONFIG_TINY_SHMEM is not set
107
109
CONFIG_BASE_SMALL=1
108
110
# CONFIG_MODULES is not set
···
130
120
# CONFIG_DEFAULT_CFQ is not set
131
121
# CONFIG_DEFAULT_NOOP is not set
132
122
CONFIG_DEFAULT_IOSCHED="deadline"
123
+
CONFIG_CLASSIC_RCU=y
124
+
# CONFIG_PREEMPT_RCU is not set
133
125
134
126
#
135
127
# Platform support
136
128
#
137
-
# CONFIG_PPC_MPC52xx is not set
138
-
# CONFIG_PPC_MPC5200 is not set
129
+
# CONFIG_PPC_MPC512x is not set
130
+
# CONFIG_PPC_MPC5121 is not set
139
131
# CONFIG_PPC_CELL is not set
140
132
# CONFIG_PPC_CELL_NATIVE is not set
141
133
CONFIG_CPM1=y
···
162
150
# CONFIG_I2C_SPI_UCODE_PATCH is not set
163
151
# CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set
164
152
# CONFIG_PQ2ADS is not set
153
+
# CONFIG_IPIC is not set
165
154
# CONFIG_MPIC is not set
166
155
# CONFIG_MPIC_WEIRD is not set
167
156
# CONFIG_PPC_I8259 is not set
···
173
160
# CONFIG_PPC_INDIRECT_IO is not set
174
161
# CONFIG_GENERIC_IOMAP is not set
175
162
# CONFIG_CPU_FREQ is not set
176
-
# CONFIG_CPM2 is not set
177
163
CONFIG_PPC_CPM_NEW_BINDING=y
178
164
# CONFIG_FSL_ULI1575 is not set
179
165
CONFIG_CPM=y
···
190
178
# CONFIG_HZ_300 is not set
191
179
CONFIG_HZ_1000=y
192
180
CONFIG_HZ=1000
181
+
# CONFIG_SCHED_HRTICK is not set
193
182
CONFIG_PREEMPT_NONE=y
194
183
# CONFIG_PREEMPT_VOLUNTARY is not set
195
184
# CONFIG_PREEMPT is not set
185
+
CONFIG_RCU_TRACE=y
196
186
CONFIG_BINFMT_ELF=y
197
187
# CONFIG_BINFMT_MISC is not set
198
188
# CONFIG_MATH_EMULATION is not set
199
189
# CONFIG_8XX_MINIMAL_FPEMU is not set
190
+
# CONFIG_IOMMU_HELPER is not set
200
191
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
192
+
CONFIG_ARCH_HAS_WALK_MEMORY=y
193
+
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
201
194
CONFIG_ARCH_FLATMEM_ENABLE=y
202
195
CONFIG_ARCH_POPULATES_NODE_MAP=y
203
196
CONFIG_SELECT_MEMORY_MODEL=y
···
221
204
# CONFIG_PROC_DEVICETREE is not set
222
205
# CONFIG_CMDLINE_BOOL is not set
223
206
# CONFIG_PM is not set
224
-
CONFIG_SUSPEND_UP_POSSIBLE=y
225
-
CONFIG_HIBERNATION_UP_POSSIBLE=y
226
207
# CONFIG_SECCOMP is not set
227
-
CONFIG_WANT_DEVICE_TREE=y
228
-
CONFIG_DEVICE_TREE="adder875-uboot.dts"
229
208
CONFIG_ISA_DMA_API=y
230
209
231
210
#
···
318
305
#
319
306
# CONFIG_NET_PKTGEN is not set
320
307
# CONFIG_HAMRADIO is not set
308
+
# CONFIG_CAN is not set
321
309
# CONFIG_IRDA is not set
322
310
# CONFIG_BT is not set
323
311
# CONFIG_AF_RXRPC is not set
···
425
411
# CONFIG_PARPORT is not set
426
412
# CONFIG_BLK_DEV is not set
427
413
# CONFIG_MISC_DEVICES is not set
414
+
CONFIG_HAVE_IDE=y
428
415
# CONFIG_IDE is not set
429
416
430
417
#
···
460
445
# CONFIG_SMSC_PHY is not set
461
446
# CONFIG_BROADCOM_PHY is not set
462
447
# CONFIG_ICPLUS_PHY is not set
448
+
# CONFIG_REALTEK_PHY is not set
463
449
# CONFIG_FIXED_PHY is not set
464
450
# CONFIG_MDIO_BITBANG is not set
465
451
CONFIG_NET_ETHERNET=y
···
485
469
# CONFIG_WAN is not set
486
470
# CONFIG_PPP is not set
487
471
# CONFIG_SLIP is not set
488
-
# CONFIG_SHAPER is not set
489
472
# CONFIG_NETCONSOLE is not set
490
473
# CONFIG_NETPOLL is not set
491
474
# CONFIG_NET_POLL_CONTROLLER is not set
···
589
574
# CONFIG_W1 is not set
590
575
# CONFIG_POWER_SUPPLY is not set
591
576
# CONFIG_HWMON is not set
577
+
CONFIG_THERMAL=y
592
578
# CONFIG_WATCHDOG is not set
593
579
594
580
#
···
630
614
# CONFIG_HID_SUPPORT is not set
631
615
# CONFIG_USB_SUPPORT is not set
632
616
# CONFIG_MMC is not set
617
+
# CONFIG_MEMSTICK is not set
633
618
# CONFIG_NEW_LEDS is not set
634
619
# CONFIG_EDAC is not set
635
620
# CONFIG_RTC_CLASS is not set
···
652
635
# CONFIG_XFS_FS is not set
653
636
# CONFIG_GFS2_FS is not set
654
637
# CONFIG_OCFS2_FS is not set
655
-
# CONFIG_MINIX_FS is not set
656
-
# CONFIG_ROMFS_FS is not set
638
+
# CONFIG_DNOTIFY is not set
657
639
# CONFIG_INOTIFY is not set
658
640
# CONFIG_QUOTA is not set
659
-
# CONFIG_DNOTIFY is not set
660
641
# CONFIG_AUTOFS_FS is not set
661
642
# CONFIG_AUTOFS4_FS is not set
662
643
# CONFIG_FUSE_FS is not set
···
697
682
# CONFIG_JFFS2_FS is not set
698
683
CONFIG_CRAMFS=y
699
684
# CONFIG_VXFS_FS is not set
685
+
# CONFIG_MINIX_FS is not set
700
686
# CONFIG_HPFS_FS is not set
701
687
# CONFIG_QNX4FS_FS is not set
688
+
# CONFIG_ROMFS_FS is not set
702
689
# CONFIG_SYSV_FS is not set
703
690
# CONFIG_UFS_FS is not set
704
691
CONFIG_NETWORK_FILESYSTEMS=y
···
747
730
# CONFIG_SYSV68_PARTITION is not set
748
731
# CONFIG_NLS is not set
749
732
# CONFIG_DLM is not set
750
-
# CONFIG_UCC_SLOW is not set
751
733
752
734
#
753
735
# Library routines
···
761
745
CONFIG_HAS_IOMEM=y
762
746
CONFIG_HAS_IOPORT=y
763
747
CONFIG_HAS_DMA=y
764
-
CONFIG_INSTRUMENTATION=y
765
-
# CONFIG_PROFILING is not set
766
-
# CONFIG_MARKERS is not set
767
748
768
749
#
769
750
# Kernel hacking
···
770
757
CONFIG_ENABLE_MUST_CHECK=y
771
758
CONFIG_MAGIC_SYSRQ=y
772
759
# CONFIG_UNUSED_SYMBOLS is not set
773
-
# CONFIG_DEBUG_FS is not set
760
+
CONFIG_DEBUG_FS=y
774
761
# CONFIG_HEADERS_CHECK is not set
775
762
CONFIG_DEBUG_KERNEL=y
776
763
# CONFIG_DEBUG_SHIRQ is not set
···
779
766
# CONFIG_SCHEDSTATS is not set
780
767
# CONFIG_TIMER_STATS is not set
781
768
# CONFIG_SLUB_DEBUG_ON is not set
769
+
# CONFIG_SLUB_STATS is not set
782
770
# CONFIG_DEBUG_SPINLOCK is not set
783
771
# CONFIG_DEBUG_MUTEXES is not set
784
772
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
···
790
776
# CONFIG_DEBUG_VM is not set
791
777
# CONFIG_DEBUG_LIST is not set
792
778
# CONFIG_DEBUG_SG is not set
793
-
CONFIG_FORCED_INLINING=y
794
779
# CONFIG_BOOT_PRINTK_DELAY is not set
780
+
# CONFIG_BACKTRACE_SELF_TEST is not set
795
781
# CONFIG_FAULT_INJECTION is not set
796
782
# CONFIG_SAMPLES is not set
797
783
# CONFIG_DEBUG_STACKOVERFLOW is not set
798
784
# CONFIG_DEBUG_STACK_USAGE is not set
799
785
# CONFIG_DEBUG_PAGEALLOC is not set
800
786
# CONFIG_DEBUGGER is not set
787
+
# CONFIG_VIRQ_DEBUG is not set
801
788
# CONFIG_BDI_SWITCH is not set
802
789
# CONFIG_PPC_EARLY_DEBUG is not set
803
790
+29
-1
arch/powerpc/kernel/head_8xx.S
+29
-1
arch/powerpc/kernel/head_8xx.S
···
332
332
mfspr r11, SPRN_MD_TWC /* ....and get the pte address */
333
333
lwz r10, 0(r11) /* Get the pte */
334
334
335
+
#ifdef CONFIG_SWAP
336
+
/* do not set the _PAGE_ACCESSED bit of a non-present page */
337
+
andi. r11, r10, _PAGE_PRESENT
338
+
beq 4f
339
+
ori r10, r10, _PAGE_ACCESSED
340
+
mfspr r11, SPRN_MD_TWC /* get the pte address again */
341
+
stw r10, 0(r11)
342
+
4:
343
+
#else
335
344
ori r10, r10, _PAGE_ACCESSED
336
345
stw r10, 0(r11)
346
+
#endif
337
347
338
348
/* The Linux PTE won't go exactly into the MMU TLB.
339
349
* Software indicator bits 21, 22 and 28 must be clear.
···
408
398
DO_8xx_CPU6(0x3b80, r3)
409
399
mtspr SPRN_MD_TWC, r11
410
400
411
-
mfspr r11, SPRN_MD_TWC /* get the pte address again */
401
+
#ifdef CONFIG_SWAP
402
+
/* do not set the _PAGE_ACCESSED bit of a non-present page */
403
+
andi. r11, r10, _PAGE_PRESENT
404
+
beq 4f
412
405
ori r10, r10, _PAGE_ACCESSED
406
+
4:
407
+
/* and update pte in table */
408
+
#else
409
+
ori r10, r10, _PAGE_ACCESSED
410
+
#endif
411
+
mfspr r11, SPRN_MD_TWC /* get the pte address again */
413
412
stw r10, 0(r11)
414
413
415
414
/* The Linux PTE won't go exactly into the MMU TLB.
···
526
507
527
508
/* Update 'changed', among others.
528
509
*/
510
+
#ifdef CONFIG_SWAP
511
+
ori r10, r10, _PAGE_DIRTY|_PAGE_HWWRITE
512
+
/* do not set the _PAGE_ACCESSED bit of a non-present page */
513
+
andi. r11, r10, _PAGE_PRESENT
514
+
beq 4f
515
+
ori r10, r10, _PAGE_ACCESSED
516
+
4:
517
+
#else
529
518
ori r10, r10, _PAGE_DIRTY|_PAGE_ACCESSED|_PAGE_HWWRITE
519
+
#endif
530
520
mfspr r11, SPRN_MD_TWC /* Get pte address again */
531
521
stw r10, 0(r11) /* and update pte in table */
532
522
+15
arch/powerpc/kernel/misc_32.S
+15
arch/powerpc/kernel/misc_32.S
···
785
785
or r4,r4,r7 # LSW |= t2
786
786
blr
787
787
788
+
/*
789
+
* 64-bit comparison: __ucmpdi2(u64 a, u64 b)
790
+
* Returns 0 if a < b, 1 if a == b, 2 if a > b.
791
+
*/
792
+
_GLOBAL(__ucmpdi2)
793
+
cmplw r3,r5
794
+
li r3,1
795
+
bne 1f
796
+
cmplw r4,r6
797
+
beqlr
798
+
1: li r3,0
799
+
bltlr
800
+
li r3,2
801
+
blr
802
+
788
803
_GLOBAL(abs)
789
804
srawi r4,r3,31
790
805
xor r3,r3,r4
+7
-1
arch/powerpc/kernel/pci-common.c
+7
-1
arch/powerpc/kernel/pci-common.c
···
748
748
struct resource *res = dev->resource + i;
749
749
if (!res->flags)
750
750
continue;
751
-
if (res->end == 0xffffffff) {
751
+
/* On platforms that have PPC_PCI_PROBE_ONLY set, we don't
752
+
* consider 0 as an unassigned BAR value. It's technically
753
+
* a valid value, but linux doesn't like it... so when we can
754
+
* re-assign things, we do so, but if we can't, we keep it
755
+
* around and hope for the best...
756
+
*/
757
+
if (res->start == 0 && !(ppc_pci_flags & PPC_PCI_PROBE_ONLY)) {
752
758
pr_debug("PCI:%s Resource %d %016llx-%016llx [%x] is unassigned\n",
753
759
pci_name(dev), i,
754
760
(unsigned long long)res->start,
+3
arch/powerpc/kernel/ppc_ksyms.c
+3
arch/powerpc/kernel/ppc_ksyms.c
···
58
58
extern void single_step_exception(struct pt_regs *regs);
59
59
extern int sys_sigreturn(struct pt_regs *regs);
60
60
61
+
EXPORT_SYMBOL(empty_zero_page);
61
62
EXPORT_SYMBOL(clear_pages);
62
63
EXPORT_SYMBOL(copy_page);
63
64
EXPORT_SYMBOL(ISA_DMA_THRESHOLD);
···
150
149
EXPORT_SYMBOL(__ashrdi3);
151
150
EXPORT_SYMBOL(__ashldi3);
152
151
EXPORT_SYMBOL(__lshrdi3);
152
+
int __ucmpdi2(unsigned long long, unsigned long long);
153
+
EXPORT_SYMBOL(__ucmpdi2);
153
154
#endif
154
155
155
156
EXPORT_SYMBOL(memcpy);
+2
-2
arch/powerpc/mm/hash_utils_64.c
+2
-2
arch/powerpc/mm/hash_utils_64.c
···
506
506
} else {
507
507
/* Find storage for the HPT. Must be contiguous in
508
508
* the absolute address space. On cell we want it to be
509
-
* in the first 1 Gig.
509
+
* in the first 2 Gig so we can use it for IOMMU hacks.
510
510
*/
511
511
if (machine_is(cell))
512
-
limit = 0x40000000;
512
+
limit = 0x80000000;
513
513
else
514
514
limit = 0;
515
515
+3
-5
arch/powerpc/platforms/83xx/mpc837x_mds.c
+3
-5
arch/powerpc/platforms/83xx/mpc837x_mds.c
···
39
39
if (ret)
40
40
return ret;
41
41
/* Map BCSR area */
42
-
np = of_find_node_by_name(NULL, "bcsr");
42
+
np = of_find_compatible_node(NULL, NULL, "fsl,mpc837xmds-bcsr");
43
43
if (np) {
44
-
struct resource res;
45
-
46
-
of_address_to_resource(np, 0, &res);
47
-
bcsr_regs = ioremap(res.start, res.end - res.start + 1);
44
+
bcsr_regs = of_iomap(np, 0);
48
45
of_node_put(np);
49
46
}
50
47
if (!bcsr_regs)
···
93
96
static struct of_device_id mpc837x_ids[] = {
94
97
{ .type = "soc", },
95
98
{ .compatible = "soc", },
99
+
{ .compatible = "simple-bus", },
96
100
{},
97
101
};
98
102
-1
arch/powerpc/platforms/Kconfig
-1
arch/powerpc/platforms/Kconfig
+6
-1
arch/powerpc/platforms/Kconfig.cputype
+6
-1
arch/powerpc/platforms/Kconfig.cputype
···
113
113
default y
114
114
115
115
config FSL_EMB_PERFMON
116
-
bool
116
+
bool "Freescale Embedded Perfmon"
117
+
depends on E500 || PPC_83xx
118
+
help
119
+
This is the Performance Monitor support found on the e500 core
120
+
and some e300 cores (c3 and c4). Select this only if your
121
+
core supports the Embedded Performance Monitor APU
117
122
118
123
config PTE_64BIT
119
124
bool
+2
-1
arch/powerpc/platforms/cell/spufs/context.c
+2
-1
arch/powerpc/platforms/cell/spufs/context.c
···
170
170
{
171
171
BUG_ON(ctx->state != SPU_STATE_SAVED);
172
172
173
-
if (test_and_clear_bit(SPU_SCHED_WAS_ACTIVE, &ctx->sched_flags))
173
+
if (test_and_clear_bit(SPU_SCHED_WAS_ACTIVE, &ctx->sched_flags) &&
174
+
test_bit(SPU_SCHED_SPU_RUN, &ctx->sched_flags))
174
175
spu_activate(ctx, 0);
175
176
176
177
spu_release(ctx);
+2
-1
arch/powerpc/platforms/cell/spufs/run.c
+2
-1
arch/powerpc/platforms/cell/spufs/run.c
···
220
220
}
221
221
}
222
222
223
+
set_bit(SPU_SCHED_SPU_RUN, &ctx->sched_flags);
223
224
return 0;
224
225
}
225
226
···
235
234
*npc = ctx->ops->npc_read(ctx);
236
235
237
236
spuctx_switch_state(ctx, SPU_UTIL_IDLE_LOADED);
238
-
ctx->policy = SCHED_IDLE;
237
+
clear_bit(SPU_SCHED_SPU_RUN, &ctx->sched_flags);
239
238
spu_release(ctx);
240
239
241
240
if (signal_pending(current))
+2
-2
arch/powerpc/platforms/cell/spufs/sched.c
+2
-2
arch/powerpc/platforms/cell/spufs/sched.c
···
867
867
if (ctx->policy == SCHED_FIFO)
868
868
goto out;
869
869
870
-
if (--ctx->time_slice && ctx->policy != SCHED_IDLE)
870
+
if (--ctx->time_slice && test_bit(SPU_SCHED_SPU_RUN, &ctx->sched_flags))
871
871
goto out;
872
872
873
873
spu = ctx->spu;
···
877
877
new = grab_runnable_context(ctx->prio + 1, spu->node);
878
878
if (new) {
879
879
spu_unschedule(spu, ctx);
880
-
if (ctx->policy != SCHED_IDLE)
880
+
if (test_bit(SPU_SCHED_SPU_RUN, &ctx->sched_flags))
881
881
spu_add_to_rq(ctx);
882
882
} else {
883
883
spu_context_nospu_trace(spusched_tick__newslice, ctx);
+1
arch/powerpc/platforms/cell/spufs/spufs.h
+1
arch/powerpc/platforms/cell/spufs/spufs.h
+1
-1
arch/powerpc/platforms/powermac/pic.c
+1
-1
arch/powerpc/platforms/powermac/pic.c
+5
-2
arch/powerpc/sysdev/qe_lib/qe.c
+5
-2
arch/powerpc/sysdev/qe_lib/qe.c
···
509
509
}
510
510
511
511
/* Validate some of the fields */
512
-
if ((firmware->count < 1) || (firmware->count >= MAX_QE_RISC)) {
512
+
if ((firmware->count < 1) || (firmware->count > MAX_QE_RISC)) {
513
513
printk(KERN_ERR "qe-firmware: invalid data\n");
514
514
return -EINVAL;
515
515
}
···
609
609
* If we haven't checked yet, and a driver hasn't uploaded a firmware
610
610
* yet, then check the device tree for information.
611
611
*/
612
-
if (initialized || qe_firmware_uploaded)
612
+
if (qe_firmware_uploaded)
613
+
return &qe_firmware_info;
614
+
615
+
if (initialized)
613
616
return NULL;
614
617
615
618
initialized = 1;
+29
-1
arch/ppc/kernel/head_8xx.S
+29
-1
arch/ppc/kernel/head_8xx.S
···
329
329
mfspr r11, SPRN_MD_TWC /* ....and get the pte address */
330
330
lwz r10, 0(r11) /* Get the pte */
331
331
332
+
#ifdef CONFIG_SWAP
333
+
/* do not set the _PAGE_ACCESSED bit of a non-present page */
334
+
andi. r11, r10, _PAGE_PRESENT
335
+
beq 4f
336
+
ori r10, r10, _PAGE_ACCESSED
337
+
mfspr r11, SPRN_MD_TWC /* get the pte address again */
338
+
stw r10, 0(r11)
339
+
4:
340
+
#else
332
341
ori r10, r10, _PAGE_ACCESSED
333
342
stw r10, 0(r11)
343
+
#endif
334
344
335
345
/* The Linux PTE won't go exactly into the MMU TLB.
336
346
* Software indicator bits 21, 22 and 28 must be clear.
···
405
395
DO_8xx_CPU6(0x3b80, r3)
406
396
mtspr SPRN_MD_TWC, r11
407
397
408
-
mfspr r11, SPRN_MD_TWC /* get the pte address again */
398
+
#ifdef CONFIG_SWAP
399
+
/* do not set the _PAGE_ACCESSED bit of a non-present page */
400
+
andi. r11, r10, _PAGE_PRESENT
401
+
beq 4f
409
402
ori r10, r10, _PAGE_ACCESSED
403
+
4:
404
+
/* and update pte in table */
405
+
#else
406
+
ori r10, r10, _PAGE_ACCESSED
407
+
#endif
408
+
mfspr r11, SPRN_MD_TWC /* get the pte address again */
410
409
stw r10, 0(r11)
411
410
412
411
/* The Linux PTE won't go exactly into the MMU TLB.
···
594
575
595
576
/* Update 'changed', among others.
596
577
*/
578
+
#ifdef CONFIG_SWAP
579
+
ori r10, r10, _PAGE_DIRTY|_PAGE_HWWRITE
580
+
/* do not set the _PAGE_ACCESSED bit of a non-present page */
581
+
andi. r11, r10, _PAGE_PRESENT
582
+
beq 4f
583
+
ori r10, r10, _PAGE_ACCESSED
584
+
4:
585
+
#else
597
586
ori r10, r10, _PAGE_DIRTY|_PAGE_ACCESSED|_PAGE_HWWRITE
587
+
#endif
598
588
mfspr r11, SPRN_MD_TWC /* Get pte address again */
599
589
stw r10, 0(r11) /* and update pte in table */
600
590
+1
-2
drivers/block/viodasd.c
+1
-2
drivers/block/viodasd.c
···
528
528
numsg = VIOMAXBLOCKDMA;
529
529
530
530
*total_len = 0;
531
-
memset(sg, 0, sizeof(sg[0]) * VIOMAXBLOCKDMA);
532
-
531
+
sg_init_table(sg, VIOMAXBLOCKDMA);
533
532
for (i = 0; (i < numsg) && (rw_data->dma_info[i].len > 0); ++i) {
534
533
sg_dma_address(&sg[i]) = rw_data->dma_info[i].token;
535
534
sg_dma_len(&sg[i]) = rw_data->dma_info[i].len;
+3
-2
drivers/macintosh/via-pmu-backlight.c
+3
-2
drivers/macintosh/via-pmu-backlight.c
···
17
17
18
18
static struct backlight_ops pmu_backlight_data;
19
19
static DEFINE_SPINLOCK(pmu_backlight_lock);
20
-
static int sleeping;
20
+
static int sleeping, uses_pmu_bl;
21
21
static u8 bl_curve[FB_BACKLIGHT_LEVELS];
22
22
23
23
static void pmu_backlight_init_curve(u8 off, u8 min, u8 max)
···
128
128
129
129
spin_lock_irqsave(&pmu_backlight_lock, flags);
130
130
sleeping = sleep;
131
-
if (pmac_backlight) {
131
+
if (pmac_backlight && uses_pmu_bl) {
132
132
if (sleep) {
133
133
struct adb_request req;
134
134
···
166
166
printk(KERN_ERR "PMU Backlight registration failed\n");
167
167
return;
168
168
}
169
+
uses_pmu_bl = 1;
169
170
bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
170
171
pmu_backlight_init_curve(0x7F, 0x46, 0x0E);
171
172
+1
-1
drivers/macintosh/via-pmu.c
+1
-1
drivers/macintosh/via-pmu.c
···
2528
2528
EXPORT_SYMBOL(pmu_suspend);
2529
2529
EXPORT_SYMBOL(pmu_resume);
2530
2530
EXPORT_SYMBOL(pmu_unlock);
2531
-
#if defined(CONFIG_SUSPEND) && defined(CONFIG_PPC32)
2531
+
#if defined(CONFIG_PPC32)
2532
2532
EXPORT_SYMBOL(pmu_enable_irled);
2533
2533
EXPORT_SYMBOL(pmu_battery_count);
2534
2534
EXPORT_SYMBOL(pmu_batteries);
-8
include/asm-powerpc/pgtable-ppc32.h
-8
include/asm-powerpc/pgtable-ppc32.h
···
339
339
#define _PMD_PAGE_MASK 0x000c
340
340
#define _PMD_PAGE_8M 0x000c
341
341
342
-
/*
343
-
* The 8xx TLB miss handler allegedly sets _PAGE_ACCESSED in the PTE
344
-
* for an address even if _PAGE_PRESENT is not set, as a performance
345
-
* optimization. This is a bug if you ever want to use swap unless
346
-
* _PAGE_ACCESSED is 2, which it isn't, or unless you have 8xx-specific
347
-
* definitions for __swp_entry etc. below, which would be gross.
348
-
* -- paulus
349
-
*/
350
342
#define _PTE_NONE_MASK _PAGE_ACCESSED
351
343
352
344
#else /* CONFIG_6xx */
-8
include/asm-ppc/pgtable.h
-8
include/asm-ppc/pgtable.h
···
299
299
#define _PMD_PAGE_MASK 0x000c
300
300
#define _PMD_PAGE_8M 0x000c
301
301
302
-
/*
303
-
* The 8xx TLB miss handler allegedly sets _PAGE_ACCESSED in the PTE
304
-
* for an address even if _PAGE_PRESENT is not set, as a performance
305
-
* optimization. This is a bug if you ever want to use swap unless
306
-
* _PAGE_ACCESSED is 2, which it isn't, or unless you have 8xx-specific
307
-
* definitions for __swp_entry etc. below, which would be gross.
308
-
* -- paulus
309
-
*/
310
302
#define _PTE_NONE_MASK _PAGE_ACCESSED
311
303
312
304
#else /* CONFIG_6xx */
+8
-1
include/linux/pmu.h
+8
-1
include/linux/pmu.h
···
147
147
/* For use before switching interrupts off for a long time;
148
148
* warning: not stackable
149
149
*/
150
+
#if defined(CONFIG_ADB_PMU)
150
151
extern void pmu_suspend(void);
151
152
extern void pmu_resume(void);
153
+
#else
154
+
static inline void pmu_suspend(void)
155
+
{}
156
+
static inline void pmu_resume(void)
157
+
{}
158
+
#endif
152
159
153
160
extern void pmu_enable_irled(int on);
154
161
···
199
192
extern void pmu_backlight_init(void);
200
193
201
194
/* some code needs to know if the PMU was suspended for hibernation */
202
-
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
195
+
#if defined(CONFIG_SUSPEND) && defined(CONFIG_PPC32)
203
196
extern int pmu_sys_suspended;
204
197
#else
205
198
/* if power management is not configured it can't be suspended */