diff options
author | Eric Miao <eric.miao@canonical.com> | 2011-07-05 10:40:05 +0800 |
---|---|---|
committer | Eric Miao <eric.miao@linaro.org> | 2011-10-14 09:57:03 +0800 |
commit | 5c50084b17900a86a1dd51e1c2456859ab5eb572 (patch) | |
tree | 0219a68c551f48e872ba7ef03ff08e84713d8888 | |
parent | 6d4c4af683c9ae90bd17e9400ee454c3c54bed34 (diff) |
SAUCE: support building of imx51 and imx53 in a single zImage
Signed-off-by: Eric Miao <eric.miao@linaro.org>
-rw-r--r-- | arch/arm/mach-mx5/Kconfig | 29 | ||||
-rw-r--r-- | arch/arm/mach-mx5/Makefile.boot | 18 | ||||
-rw-r--r-- | arch/arm/plat-mxc/Kconfig | 20 | ||||
-rw-r--r-- | arch/arm/plat-mxc/devices/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/memory.h | 6 | ||||
-rw-r--r-- | drivers/mxc/amd-gpu/Kconfig | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/Kconfig | 2 |
7 files changed, 20 insertions, 59 deletions
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig index d5df5393fbd..91063b9b4e7 100644 --- a/arch/arm/mach-mx5/Kconfig +++ b/arch/arm/mach-mx5/Kconfig @@ -1,15 +1,4 @@ -if ARCH_MX503 || ARCH_MX51 -# ARCH_MX5/50/53 are left to mark places where prevent multi-soc in single -# image. So for most time, SOC_IMX50/51/53 should be used. - -config ARCH_MX5 - bool - -config ARCH_MX50 - bool - -config ARCH_MX53 - bool +if ARCH_MX5 config SOC_IMX50 bool @@ -19,8 +8,6 @@ config SOC_IMX50 select ARCH_MXC_IOMUX_V3 select ARCH_MXC_AUDMUX_V2 select ARCH_HAS_CPUFREQ - select ARCH_MX5 - select ARCH_MX50 config SOC_IMX51 bool @@ -30,7 +17,6 @@ config SOC_IMX51 select ARCH_MXC_IOMUX_V3 select ARCH_MXC_AUDMUX_V2 select ARCH_HAS_CPUFREQ - select ARCH_MX5 select IMX_HAVE_PLATFORM_IMX_IIM select IMX_HAVE_PLATFORM_IMX_IPUV3 select IMX_HAVE_PLATFORM_IMX_TVE @@ -44,16 +30,13 @@ config SOC_IMX53 select ARCH_MXC_IOMUX_V3 select ARCH_MXC_AUDMUX_V2 select ARCH_HAS_CPUFREQ - select ARCH_MX5 - select ARCH_MX53 select IMX_HAVE_PLATFORM_IMX_IIM select IMX_HAVE_PLATFORM_IMX_IPUV3 select IMX_HAVE_PLATFORM_IMX_TVE select IMX_HAVE_PLATFORM_LDB select IMX_HAVE_PLATFORM_IMX_VPU -if ARCH_MX50_SUPPORTED -#comment "i.MX50 machines:" +comment "i.MX50 machines:" config MACH_MX50_RDP bool "Support MX50 reference design platform" @@ -68,9 +51,6 @@ config MACH_MX50_RDP Include support for MX50 reference design platform (RDP) board. This includes specific configurations for the board and its peripherals. -endif # ARCH_MX50_SUPPORTED - -if ARCH_MX51 comment "i.MX51 machines:" config MACH_MX51_BABBAGE @@ -178,9 +158,6 @@ config MACH_MX51_EFIKASB Include support for Genesi Efika Smartbook. This includes specific configurations for the board and its peripherals. -endif # ARCH_MX51 - -if ARCH_MX53_SUPPORTED comment "i.MX53 machines:" config MACH_MX53_EVK @@ -236,6 +213,4 @@ config MACH_MX53_ARD Include support for MX53 ARD platform. This includes specific configurations for the board and its peripherals. -endif # ARCH_MX53_SUPPORTED - endif diff --git a/arch/arm/mach-mx5/Makefile.boot b/arch/arm/mach-mx5/Makefile.boot index e928be1b675..bcbccbc429e 100644 --- a/arch/arm/mach-mx5/Makefile.boot +++ b/arch/arm/mach-mx5/Makefile.boot @@ -1,9 +1,9 @@ - zreladdr-$(CONFIG_ARCH_MX50) := 0x70008000 -params_phys-$(CONFIG_ARCH_MX50) := 0x70000100 -initrd_phys-$(CONFIG_ARCH_MX50) := 0x70800000 - zreladdr-$(CONFIG_ARCH_MX51) := 0x90008000 -params_phys-$(CONFIG_ARCH_MX51) := 0x90000100 -initrd_phys-$(CONFIG_ARCH_MX51) := 0x90800000 - zreladdr-$(CONFIG_ARCH_MX53) := 0x70008000 -params_phys-$(CONFIG_ARCH_MX53) := 0x70000100 -initrd_phys-$(CONFIG_ARCH_MX53) := 0x70800000 + zreladdr-$(CONFIG_SOC_IMX50) := 0x70008000 +params_phys-$(CONFIG_SOC_IMX50) := 0x70000100 +initrd_phys-$(CONFIG_SOC_IMX50) := 0x70800000 + zreladdr-$(CONFIG_SOC_IMX51) := 0x90008000 +params_phys-$(CONFIG_SOC_IMX51) := 0x90000100 +initrd_phys-$(CONFIG_SOC_IMX51) := 0x90800000 + zreladdr-$(CONFIG_SOC_IMX53) := 0x70008000 +params_phys-$(CONFIG_SOC_IMX53) := 0x70000100 +initrd_phys-$(CONFIG_SOC_IMX53) := 0x70800000 diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index a7044c07668..81c8bddd7ae 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig @@ -4,12 +4,6 @@ source "arch/arm/plat-mxc/devices/Kconfig" menu "Freescale MXC Implementations" -config ARCH_MX50_SUPPORTED - bool - -config ARCH_MX53_SUPPORTED - bool - choice prompt "Freescale CPU family:" default ARCH_MX3 @@ -34,20 +28,12 @@ config ARCH_MX3 help This enables support for systems based on the Freescale i.MX3 family -config ARCH_MX503 - bool "i.MX50 + i.MX53" - select ARCH_MX50_SUPPORTED - select ARCH_MX53_SUPPORTED +config ARCH_MX5 + bool "i.MX5x-based" help This enables support for machines using Freescale's i.MX50 and i.MX51 processors. -config ARCH_MX51 - bool "i.MX51" - select ARCH_MX51_SUPPORTED - help - This enables support for systems based on the Freescale i.MX51 family - endchoice source "arch/arm/mach-imx/Kconfig" @@ -59,7 +45,7 @@ endmenu config UTMI_MXC bool default y - depends on ARCH_MX25 || ARCH_MX35 || ARCH_MX37 || ARCH_MX503 + depends on ARCH_MX25 || ARCH_MX35 || ARCH_MX37 || SOC_IMX53 config MXC_IRQ_PRIOR bool "Use IRQ priority" diff --git a/arch/arm/plat-mxc/devices/Kconfig b/arch/arm/plat-mxc/devices/Kconfig index 7d769560e3b..76e4d4c6b9d 100644 --- a/arch/arm/plat-mxc/devices/Kconfig +++ b/arch/arm/plat-mxc/devices/Kconfig @@ -97,7 +97,7 @@ config IMX_HAVE_PLATFORM_IMX_IIM config IMX_HAVE_PLATFORM_AHCI bool - default y if ARCH_MX53 + default y if SOC_IMX53 config IMX_HAVE_PLATFORM_IMX_VPU bool diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h index 107d7b47e3d..a624886c6a2 100644 --- a/arch/arm/plat-mxc/include/mach/memory.h +++ b/arch/arm/plat-mxc/include/mach/memory.h @@ -31,11 +31,11 @@ # define PLAT_PHYS_OFFSET MX27_PHYS_OFFSET # elif defined CONFIG_ARCH_MX3 # define PLAT_PHYS_OFFSET MX3x_PHYS_OFFSET -# elif defined CONFIG_ARCH_MX50 +# elif defined CONFIG_SOC_IMX50 # define PLAT_PHYS_OFFSET MX50_PHYS_OFFSET -# elif defined CONFIG_ARCH_MX51 +# elif defined CONFIG_SOC_IMX51 # define PLAT_PHYS_OFFSET MX51_PHYS_OFFSET -# elif defined CONFIG_ARCH_MX53 +# elif defined CONFIG_SOC_IMX53 # define PLAT_PHYS_OFFSET MX53_PHYS_OFFSET # endif #endif diff --git a/drivers/mxc/amd-gpu/Kconfig b/drivers/mxc/amd-gpu/Kconfig index 629d8cbbc98..86509aaf0b1 100644 --- a/drivers/mxc/amd-gpu/Kconfig +++ b/drivers/mxc/amd-gpu/Kconfig @@ -6,7 +6,7 @@ menu "MXC GPU support" config MXC_AMD_GPU tristate "MXC GPU support" - depends on ARCH_MX35 || ARCH_MX51 || ARCH_MX53 || ARCH_MX50 + depends on ARCH_MX35 || ARCH_MX5 ---help--- Say Y to get the GPU driver support. diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 07c09f2fa16..eb42dc59754 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -440,7 +440,7 @@ config USB_GADGET_ARC config USB_STATIC_IRAM_PPH bool "Apply static IRAM patch" - depends on USB_GADGET_ARC && (ARCH_MX37 || ARCH_MX3 || ARCH_MX25 || ARCH_MX51) + depends on USB_GADGET_ARC && (ARCH_MX37 || ARCH_MX3 || ARCH_MX25 || SOC_MX51) help Apply static IRAM patch to peripheral driver. |