diff options
-rw-r--r-- | arch/powerpc/Kconfig | 4 | ||||
-rw-r--r-- | arch/powerpc/lib/Makefile | 5 | ||||
-rw-r--r-- | arch/powerpc/platforms/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/Kconfig.cputype | 1 | ||||
-rw-r--r-- | arch/ppc/Kconfig | 6 |
5 files changed, 14 insertions, 4 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 037664d496d7..8300e6a3d52c 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -698,3 +698,7 @@ source "crypto/Kconfig" | |||
698 | config PPC_CLOCK | 698 | config PPC_CLOCK |
699 | bool | 699 | bool |
700 | default n | 700 | default n |
701 | |||
702 | config PPC_LIB_RHEAP | ||
703 | bool | ||
704 | |||
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 65d492e316a6..4bb023f4c869 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile | |||
@@ -14,7 +14,6 @@ endif | |||
14 | 14 | ||
15 | obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \ | 15 | obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \ |
16 | memcpy_64.o usercopy_64.o mem_64.o string.o | 16 | memcpy_64.o usercopy_64.o mem_64.o string.o |
17 | obj-$(CONFIG_QUICC_ENGINE) += rheap.o | ||
18 | obj-$(CONFIG_XMON) += sstep.o | 17 | obj-$(CONFIG_XMON) += sstep.o |
19 | obj-$(CONFIG_KPROBES) += sstep.o | 18 | obj-$(CONFIG_KPROBES) += sstep.o |
20 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o | 19 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o |
@@ -23,6 +22,4 @@ ifeq ($(CONFIG_PPC64),y) | |||
23 | obj-$(CONFIG_SMP) += locks.o | 22 | obj-$(CONFIG_SMP) += locks.o |
24 | endif | 23 | endif |
25 | 24 | ||
26 | # Temporary hack until we have migrated to asm-powerpc | 25 | obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o |
27 | obj-$(CONFIG_8xx) += rheap.o | ||
28 | obj-$(CONFIG_CPM2) += rheap.o | ||
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index cc6013ffc29a..3724cb43d8a5 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig | |||
@@ -264,6 +264,7 @@ config TAU_AVERAGE | |||
264 | 264 | ||
265 | config QUICC_ENGINE | 265 | config QUICC_ENGINE |
266 | bool | 266 | bool |
267 | select PPC_LIB_RHEAP | ||
267 | help | 268 | help |
268 | The QUICC Engine (QE) is a new generation of communications | 269 | The QUICC Engine (QE) is a new generation of communications |
269 | coprocessors on Freescale embedded CPUs (akin to CPM in older chips). | 270 | coprocessors on Freescale embedded CPUs (akin to CPM in older chips). |
@@ -274,6 +275,7 @@ config CPM2 | |||
274 | bool | 275 | bool |
275 | default n | 276 | default n |
276 | select CPM | 277 | select CPM |
278 | select PPC_LIB_RHEAP | ||
277 | help | 279 | help |
278 | The CPM2 (Communications Processor Module) is a coprocessor on | 280 | The CPM2 (Communications Processor Module) is a coprocessor on |
279 | embedded CPUs made by Freescale. Selecting this option means that | 281 | embedded CPUs made by Freescale. Selecting this option means that |
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 4c315be25015..3c7325ec36ec 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype | |||
@@ -37,6 +37,7 @@ config PPC_8xx | |||
37 | select FSL_SOC | 37 | select FSL_SOC |
38 | select 8xx | 38 | select 8xx |
39 | select WANT_DEVICE_TREE | 39 | select WANT_DEVICE_TREE |
40 | select PPC_LIB_RHEAP | ||
40 | 41 | ||
41 | config 40x | 42 | config 40x |
42 | bool "AMCC 40x" | 43 | bool "AMCC 40x" |
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 20dce4681259..607925c8a99e 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
@@ -102,6 +102,7 @@ config 44x | |||
102 | 102 | ||
103 | config 8xx | 103 | config 8xx |
104 | bool "8xx" | 104 | bool "8xx" |
105 | select PPC_LIB_RHEAP | ||
105 | 106 | ||
106 | config E200 | 107 | config E200 |
107 | bool "e200" | 108 | bool "e200" |
@@ -798,6 +799,7 @@ config CPM1 | |||
798 | config CPM2 | 799 | config CPM2 |
799 | bool | 800 | bool |
800 | depends on 8260 || MPC8560 || MPC8555 | 801 | depends on 8260 || MPC8560 || MPC8555 |
802 | select PPC_LIB_RHEAP | ||
801 | default y | 803 | default y |
802 | help | 804 | help |
803 | The CPM2 (Communications Processor Module) is a coprocessor on | 805 | The CPM2 (Communications Processor Module) is a coprocessor on |
@@ -1277,6 +1279,10 @@ config BOOT_LOAD | |||
1277 | config PIN_TLB | 1279 | config PIN_TLB |
1278 | bool "Pinned Kernel TLBs (860 ONLY)" | 1280 | bool "Pinned Kernel TLBs (860 ONLY)" |
1279 | depends on ADVANCED_OPTIONS && 8xx | 1281 | depends on ADVANCED_OPTIONS && 8xx |
1282 | |||
1283 | config PPC_LIB_RHEAP | ||
1284 | bool | ||
1285 | |||
1280 | endmenu | 1286 | endmenu |
1281 | 1287 | ||
1282 | source "net/Kconfig" | 1288 | source "net/Kconfig" |