diff options
| author | Timur Tabi <timur@freescale.com> | 2012-02-21 20:53:15 +0100 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2012-03-16 20:57:03 +0100 |
| commit | 0c350a9a5cf01db3875ceb8b01121d8ce6a7f287 (patch) | |
| tree | 9cba46218f5507eb03f35e607ac55b872a4f8b19 /arch/powerpc | |
| parent | powerpc/85xx: l2sram - Add compatible entry for mpc8548 L2 controller (diff) | |
| download | linux-0c350a9a5cf01db3875ceb8b01121d8ce6a7f287.tar.xz linux-0c350a9a5cf01db3875ceb8b01121d8ce6a7f287.zip | |
powerpc/85xx: allow CONFIG_PHYS_64BIT to be selectable
Remove the "select PHYS_64BIT" from the Kconfig entry for the P1022DS,
so that large physical address support is a selectable option for non-CoreNet
reference boards.
The option is enabled in mpc85xx_[smp_]defconfig so that the default is
unchanged. However, now it can be deselected.
The P1022DS had this option defined because the default device tree for
this board uses 36-bit addresses. This had the side-effect of forcing
this option on for all boards that use mpc85xx_[smp_]defconfig. Some
users may want to disable this feature to create an optimized configuration
for boards with <= 2GB of RAM.
Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_smp_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/85xx/Kconfig | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index f37a2ab48881..5fb0c8a94811 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC_85xx=y +CONFIG_PHYS_64BIT=y CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index abdcd317cda7..fb51bc90edd2 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC_85xx=y +CONFIG_PHYS_64BIT=y CONFIG_SMP=y CONFIG_NR_CPUS=8 CONFIG_EXPERIMENTAL=y diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index fd6f3c06a0dc..ce6142cd04a1 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig @@ -90,7 +90,6 @@ config P1010_RDB config P1022_DS bool "Freescale P1022 DS" select DEFAULT_UIMAGE - select PHYS_64BIT # The DTS has 36-bit addresses select SWIOTLB help This option enables support for the Freescale P1022DS reference board. |