| Message ID | 1320997034-10051-1-git-send-email-shawn.guo@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Fri, 2011-11-11 at 15:37 +0800, Shawn Guo wrote: > The config symbol ARCH_MX3 has been removed by commit 'a89cf59 > arm/imx: merge i.MX3 and i.MX6', and it should not be referenced > any more. > > The patch also change ARCH_MX* to SOC_IMX* for other platforms. > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > Cc: Sascha Hauer <s.hauer@pengutronix.de> > --- > Changes since v1: > * Drop changes on drivers/dma/Kconfig, as Sascha alreay has a patch > to fix it. This appears to be to the patch that ended up as commit 59198b6cb2 in the mainline tree. But in mainline there are still those two references to ARCH_MX3 in drivers/dma/Kconfig. Can I ask what happened to this patch of Sascha that Shawn mentions? Paul Bolle
On Mon, Nov 21, 2011 at 02:47:49PM +0100, Paul Bolle wrote: > On Fri, 2011-11-11 at 15:37 +0800, Shawn Guo wrote: > > The config symbol ARCH_MX3 has been removed by commit 'a89cf59 > > arm/imx: merge i.MX3 and i.MX6', and it should not be referenced > > any more. > > > > The patch also change ARCH_MX* to SOC_IMX* for other platforms. > > > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > > Cc: Sascha Hauer <s.hauer@pengutronix.de> > > --- > > Changes since v1: > > * Drop changes on drivers/dma/Kconfig, as Sascha alreay has a patch > > to fix it. > > This appears to be to the patch that ended up as commit 59198b6cb2 in > the mainline tree. But in mainline there are still those two references > to ARCH_MX3 in drivers/dma/Kconfig. Can I ask what happened to this > patch of Sascha that Shawn mentions? I just resent this. Sascha
(Canned message follows.) On Tue, 2011-11-22 at 11:43 +0100, Sascha Hauer wrote: > On Mon, Nov 21, 2011 at 02:47:49PM +0100, Paul Bolle wrote: > Can I ask what happened to this > > patch of Sascha that Shawn mentions? > > I just resent this. Thanks. I'll stop worrying about this invalid Kconfig dependency for now. It might pop up again if I ever decide to scan the mainline tree for invalid symbols again. We'll see. Paul Bolle
diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot index 22d8588..cfede57 100644 --- a/arch/arm/mach-imx/Makefile.boot +++ b/arch/arm/mach-imx/Makefile.boot @@ -1,22 +1,26 @@ -zreladdr-$(CONFIG_ARCH_MX1) += 0x08008000 -params_phys-$(CONFIG_ARCH_MX1) := 0x08000100 -initrd_phys-$(CONFIG_ARCH_MX1) := 0x08800000 +zreladdr-$(CONFIG_SOC_IMX1) += 0x08008000 +params_phys-$(CONFIG_SOC_IMX1) := 0x08000100 +initrd_phys-$(CONFIG_SOC_IMX1) := 0x08800000 -zreladdr-$(CONFIG_MACH_MX21) += 0xC0008000 -params_phys-$(CONFIG_MACH_MX21) := 0xC0000100 -initrd_phys-$(CONFIG_MACH_MX21) := 0xC0800000 +zreladdr-$(CONFIG_SOC_IMX21) += 0xC0008000 +params_phys-$(CONFIG_SOC_IMX21) := 0xC0000100 +initrd_phys-$(CONFIG_SOC_IMX21) := 0xC0800000 -zreladdr-$(CONFIG_ARCH_MX25) += 0x80008000 -params_phys-$(CONFIG_ARCH_MX25) := 0x80000100 -initrd_phys-$(CONFIG_ARCH_MX25) := 0x80800000 +zreladdr-$(CONFIG_SOC_IMX25) += 0x80008000 +params_phys-$(CONFIG_SOC_IMX25) := 0x80000100 +initrd_phys-$(CONFIG_SOC_IMX25) := 0x80800000 -zreladdr-$(CONFIG_MACH_MX27) += 0xA0008000 -params_phys-$(CONFIG_MACH_MX27) := 0xA0000100 -initrd_phys-$(CONFIG_MACH_MX27) := 0xA0800000 +zreladdr-$(CONFIG_SOC_IMX27) += 0xA0008000 +params_phys-$(CONFIG_SOC_IMX27) := 0xA0000100 +initrd_phys-$(CONFIG_SOC_IMX27) := 0xA0800000 -zreladdr-$(CONFIG_ARCH_MX3) += 0x80008000 -params_phys-$(CONFIG_ARCH_MX3) := 0x80000100 -initrd_phys-$(CONFIG_ARCH_MX3) := 0x80800000 +zreladdr-$(CONFIG_SOC_IMX31) += 0x80008000 +params_phys-$(CONFIG_SOC_IMX31) := 0x80000100 +initrd_phys-$(CONFIG_SOC_IMX31) := 0x80800000 + +zreladdr-$(CONFIG_SOC_IMX35) += 0x80008000 +params_phys-$(CONFIG_SOC_IMX35) := 0x80000100 +initrd_phys-$(CONFIG_SOC_IMX35) := 0x80800000 zreladdr-$(CONFIG_SOC_IMX6Q) += 0x10008000 params_phys-$(CONFIG_SOC_IMX6Q) := 0x10000100
The config symbol ARCH_MX3 has been removed by commit 'a89cf59 arm/imx: merge i.MX3 and i.MX6', and it should not be referenced any more. The patch also change ARCH_MX* to SOC_IMX* for other platforms. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> --- Changes since v1: * Drop changes on drivers/dma/Kconfig, as Sascha alreay has a patch to fix it. * Change ARCH_MX* to SOC_IMX* for other platforms as well. arch/arm/mach-imx/Makefile.boot | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-)