Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5a0d497 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx: enable multi-platform build 



It enables multi-platform build for imx.  With ARCH_MULTI_* options
coming to play, ARCH_MXC becomes an user invisible option, while
ARCH_IMX_V4_V5 and ARCH_IMX_V6_V7 get removed.  Both imx_v4_v5_defconfig
and imx_v6_v7_defconfig get updated to adopt the changes.

AUTO_ZRELADDR and ARM_PATCH_PHYS_VIRT are selected by ARCH_MXC now to
save the duplication.

Headers timex.h and uncompress.h are not needed for multi-platform
build.  Remove them.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 69ac71d3

arch/arm/Kconfig

+0 −13
Original line number Diff line number Diff line
@@ -433,19 +433,6 @@ config ARCH_FOOTBRIDGE 
	  Support for systems based on the DC21285 companion chip

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.



config ARCH_MXC

	bool "Freescale MXC/iMX-based"

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

	select USE_OF

	help

	  Support for Freescale MXC/iMX-based family of processors



config ARCH_MXS

	bool "Freescale MXS-based"

	select ARCH_REQUIRE_GPIOLIB

arch/arm/configs/imx_v4_v5_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -17,8 +17,9 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_MXC=y

CONFIG_ARCH_IMX_V4_V5=y

CONFIG_ARCH_MULTI_V4T=y

CONFIG_ARCH_MULTI_V5=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_MX1ADS=y

CONFIG_MACH_SCB9328=y

CONFIG_MACH_APF9328=y

arch/arm/configs/imx_v6_v7_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_MXC=y

CONFIG_ARCH_MULTI_V6=y

CONFIG_ARCH_MULTI_V7=y

CONFIG_MACH_MX31LILLY=y

CONFIG_MACH_MX31LITE=y

CONFIG_MACH_PCM037=y

arch/arm/mach-imx/Kconfig

+28 −31
Original line number Diff line number Diff line 
if ARCH_MXC

config ARCH_MXC

	def_bool y if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7

	select ARCH_REQUIRE_GPIOLIB

	select ARM_PATCH_PHYS_VIRT

	select AUTO_ZRELADDR if !ZBOOT_ROM

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

	select USE_OF

	help

	  Support for Freescale MXC/iMX-based family of processors



menu "Freescale i.MX support"

	depends on ARCH_MXC



config MXC_IRQ_PRIOR

	bool "Use IRQ priority"
@@ -161,21 +177,7 @@ config SOC_IMX51 
	select PINCTRL_IMX51

	select SOC_IMX5



menu "Freescale MXC Implementations"



choice

	prompt "Freescale CPU family:"

	default ARCH_IMX_V6_V7



config ARCH_IMX_V4_V5

	bool "i.MX1, i.MX21, i.MX25, i.MX27"

	select ARM_PATCH_PHYS_VIRT

	select AUTO_ZRELADDR if !ZBOOT_ROM

	help

	  This enables support for systems based on the Freescale i.MX ARMv4

	  and ARMv5 SoCs



if ARCH_IMX_V4_V5

if ARCH_MULTI_V4T



comment "MX1 platforms:"

config MACH_MXLADS
@@ -204,6 +206,10 @@ config MACH_APF9328 
	help

	  Say Yes here if you are using the Armadeus APF9328 development board



endif



if ARCH_MULTI_V5



comment "MX21 platforms:"



config MACH_MX21ADS
@@ -455,16 +461,7 @@ config MACH_IMX27_DT 


endif



config ARCH_IMX_V6_V7

	bool "i.MX3, i.MX5, i.MX6"

	select ARM_PATCH_PHYS_VIRT

	select AUTO_ZRELADDR if !ZBOOT_ROM

	select MIGHT_HAVE_CACHE_L2X0

	help

	  This enables support for systems based on the Freescale i.MX3, i.MX5

	  and i.MX6 family.



if ARCH_IMX_V6_V7

if ARCH_MULTI_V6



comment "MX31 platforms:"
@@ -729,6 +726,10 @@ config MACH_VPR200 
	  Include support for VPR200 platform. This includes specific

	  configurations for the board and its peripherals.



endif



if ARCH_MULTI_V7



comment "i.MX5 platforms:"



config MACH_MX50_RDP
@@ -847,10 +848,6 @@ config SOC_IMX6Q 


endif



endchoice



endmenu



source "arch/arm/mach-imx/devices/Kconfig"



endif
 
endmenu

arch/arm/mach-imx/include/mach/timex.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/*

 *  Copyright (C) 1999 ARM Limited

 * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef __ASM_ARCH_MXC_TIMEX_H__

#define __ASM_ARCH_MXC_TIMEX_H__



/* Bogus value */

#define CLOCK_TICK_RATE	12345678



#endif				/* __ASM_ARCH_MXC_TIMEX_H__ */