Support for the MX31ADS evaluation board from Freescale
Subsystems (3)
PATCH v2 7/7 Support for the MX31ADS evaluation board from Freescale
This patch adds support for the MX31ADS evaluation board from Freescale, initialization code is copied from RedBoot sources, also provided by Freescale.
---
Changes since v1: removed C++ style comments, disabled CONFIG_FIT, fixed patch format damage
MAKEALL | 1 +
Makefile | 3 +
board/mx31ads/Makefile | 47 +++++
board/{imx31_litekit => mx31ads}/config.mk | 0
board/mx31ads/lowlevel_init.S | 281 +++++++++++++++++++++++++++
board/mx31ads/mx31ads.c | 95 +++++++++
board/{imx31_litekit => mx31ads}/u-boot.lds | 0
include/asm-arm/arch-mx31/mx31-regs.h | 14 ++
include/configs/mx31ads.h | 157 +++++++++++++++
9 files changed, 598 insertions(+), 0 deletions(-)
create mode 100644 board/mx31ads/Makefile
copy board/{imx31_litekit => mx31ads}/config.mk (100%)
create mode 100644 board/mx31ads/lowlevel_init.S
create mode 100644 board/mx31ads/mx31ads.c
copy board/{imx31_litekit => mx31ads}/u-boot.lds (100%)
create mode 100644 include/configs/mx31ads.hMAKEALL +1 -0
@@ -504,6 +504,7 @@ LIST_ARM11=" \ apollon \ imx31_litekit \ imx31_phycore \ + mx31ads \ " #########################################################################
Makefile +3 -0
@@ -2601,6 +2601,9 @@ imx31_litekit_config : unconfig imx31_phycore_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm1136 imx31_phycore NULL mx31 +mx31ads_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm1136 mx31ads NULL mx31 + #======================================================================== # i386 #========================================================================
board/mx31ads/Makefile new file +47 -0
47 lines not on this page · raw message
board/mx31ads/config.mk renamed from board/imx31_litekit/config.mk +0 -0
board/mx31ads/lowlevel_init.S new file +281 -0
281 lines not on this page · raw message
board/mx31ads/mx31ads.c new file +94 -0
94 lines not on this page · raw message
board/mx31ads/u-boot.lds renamed from board/imx31_litekit/u-boot.lds +0 -0
include/asm-arm/arch-mx31/mx31-regs.h +14 -0
@@ -133,6 +133,20 @@#define MUX_CSPI2_MOSI__I2C2_SCL ((MUX_CTL_ALT1 << 8) | MUX_CTL_CSPI2_MOSI)#define MUX_CSPI2_MISO__I2C2_SCL ((MUX_CTL_ALT1 << 8) | MUX_CTL_CSPI2_MISO) +/* +* Memory regions and CS +*/ +#define IPU_MEM_BASE 0x70000000 +#define CSD0_BASE 0x80000000 +#define CSD1_BASE 0x90000000 +#define CS0_BASE 0xA0000000 +#define CS1_BASE 0xA8000000 +#define CS2_BASE 0xB0000000 +#define CS3_BASE 0xB2000000 +#define CS4_BASE 0xB4000000 +#define CS4_PSRAM_BASE 0xB5000000 +#define CS5_BASE 0xB6000000 +#define PCMCIA_MEM_BASE 0xC0000000#endif /* __ASM_ARCH_MX31_REGS_H */
include/configs/mx31ads.h new file +166 -0
166 lines not on this page · raw message
Signature · 1 line
1.5.4
PATCH v2 7/7 Support for the MX31ADS evaluation board from Freescale
Quoted 5 lines · In message <[email protected]> you wrote:
This patch adds support for the MX31ADS evaluation board from Freescale, initialization code is copied from RedBoot sources, also provided by Freescale.
Signed-off-by Guennadi Liakhovetski <[email protected]>
Cannot apply this one:
Applying Support for the MX31ADS evaluation board from Freescale
error: patch failed: include/asm-arm/arch-mx31/mx31-regs.h:133
error: include/asm-arm/arch-mx31/mx31-regs.h: patch does not apply
fatal: mode change for board/imx31_litekit/config.mk, which is not in current HEAD
Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.
Patch failed at 0001.
Please fix and resubmit.
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de So we follow our wandering paths, and the very darkness acts as our guide and our doubts serve to reassure us. - Jean-Pierre de Caussade, eighteenth-century Jesuit priest
PATCH v3 7/7 Support for the MX31ADS evaluation board from Freescale
This patch adds support for the MX31ADS evaluation board from Freescale, initialization code is copied from RedBoot sources, also provided by Freescale.
---
Quoted 5 lines · Wolfgang Denk
Quoted 4 lines · In message <[email protected]> you wrote:
This patch adds support for the MX31ADS evaluation board from Freescale, initialization code is copied from RedBoot sources, also provided by Freescale.
Quoted 7 lines
Quoted 1 line
Signed-off-by Guennadi Liakhovetski <[email protected]>Cannot apply this one:
Applying Support for the MX31ADS evaluation board from Freescale
error: patch failed:include/asm-arm/arch-mx31/mx31-regs.h:133
error:include/asm-arm/arch-mx31/mx31-regs.h: patch does not apply
Ok, you probably applied previous patches, specifically the 2/7 with the --whitespace=fix option, then the last empty line had been removed, and now the patch doesn't apply cleanly any more. Below is a version without that empty line.
Quoted 2 lines
fatal: mode change for
board/imx31_litekit/config.mk, which is not in current HEAD
No idea where this could come from. You did try to apply this patch after the litekit, didn't you? Then the file should already be there. Anyway, I tried with your current tree and the patch below, and it seems to work now, please try.
Thanks
Guennadi
Changes since v2: merge with upstream
MAKEALL | 1 +
Makefile | 3 +
board/mx31ads/Makefile | 47 +++++
board/{imx31_litekit => mx31ads}/config.mk | 0
board/mx31ads/lowlevel_init.S | 281 +++++++++++++++++++++++++++
board/mx31ads/mx31ads.c | 95 +++++++++
board/{imx31_litekit => mx31ads}/u-boot.lds | 0
include/asm-arm/arch-mx31/mx31-regs.h | 14 ++
include/configs/mx31ads.h | 157 +++++++++++++++
9 files changed, 598 insertions(+), 0 deletions(-)
create mode 100644 board/mx31ads/Makefile
copy board/{imx31_litekit => mx31ads}/config.mk (100%)
create mode 100644 board/mx31ads/lowlevel_init.S
create mode 100644 board/mx31ads/mx31ads.c
copy board/{imx31_litekit => mx31ads}/u-boot.lds (100%)
create mode 100644 include/configs/mx31ads.hMAKEALL +1 -0
@@ -504,6 +504,7 @@ LIST_ARM11=" \ apollon \ imx31_litekit \ imx31_phycore \ + mx31ads \ " #########################################################################
Makefile +3 -0
@@ -2601,6 +2601,9 @@ imx31_litekit_config : unconfig imx31_phycore_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm1136 imx31_phycore NULL mx31 +mx31ads_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm1136 mx31ads NULL mx31 + #======================================================================== # i386 #========================================================================
board/mx31ads/Makefile new file +47 -0
47 lines not on this page · raw message
board/mx31ads/config.mk renamed from board/imx31_litekit/config.mk +0 -0
board/mx31ads/lowlevel_init.S new file +281 -0
281 lines not on this page · raw message
board/mx31ads/mx31ads.c new file +94 -0
94 lines not on this page · raw message
board/mx31ads/u-boot.lds renamed from board/imx31_litekit/u-boot.lds +0 -0
include/asm-arm/arch-mx31/mx31-regs.h +14 -0
@@ -133,5 +133,19 @@#define MUX_CSPI2_MOSI__I2C2_SCL ((MUX_CTL_ALT1 << 8) | MUX_CTL_CSPI2_MOSI)#define MUX_CSPI2_MISO__I2C2_SCL ((MUX_CTL_ALT1 << 8) | MUX_CTL_CSPI2_MISO) +/* +* Memory regions and CS +*/ +#define IPU_MEM_BASE 0x70000000 +#define CSD0_BASE 0x80000000 +#define CSD1_BASE 0x90000000 +#define CS0_BASE 0xA0000000 +#define CS1_BASE 0xA8000000 +#define CS2_BASE 0xB0000000 +#define CS3_BASE 0xB2000000 +#define CS4_BASE 0xB4000000 +#define CS4_PSRAM_BASE 0xB5000000 +#define CS5_BASE 0xB6000000 +#define PCMCIA_MEM_BASE 0xC0000000#endif /* __ASM_ARCH_MX31_REGS_H */
include/configs/mx31ads.h new file +166 -0
166 lines not on this page · raw message
Signature · 1 line
1.5.4
Wolfgang Denk
AppliedPATCH v3 7/7 Support for the MX31ADS evaluation board from Freescale
Quoted 5 lines · In message <[email protected]> you wrote:
This patch adds support for the MX31ADS evaluation board from Freescale, initialization code is copied from RedBoot sources, also provided by Freescale.
Signed-off-by Guennadi Liakhovetski <[email protected]>
...
Quoted 18 lines
Changes since v2: merge with upstream
MAKEALL | 1 + Makefile | 3 + board/mx31ads/Makefile | 47 +++++ board/{imx31_litekit => mx31ads}/config.mk | 0 board/mx31ads/lowlevel_init.S | 281 +++++++++++++++++++++++++++ board/mx31ads/mx31ads.c | 95 +++++++++ board/{imx31_litekit => mx31ads}/u-boot.lds | 0 include/asm-arm/arch-mx31/mx31-regs.h | 14 ++ include/configs/mx31ads.h | 157 +++++++++++++++ 9 files changed, 598 insertions(+), 0 deletions(-) create mode 100644 board/mx31ads/Makefile copy board/{imx31_litekit => mx31ads}/config.mk (100%) create mode 100644 board/mx31ads/lowlevel_init.S create mode 100644 board/mx31ads/mx31ads.c copy board/{imx31_litekit => mx31ads}/u-boot.lds (100%) create mode 100644 include/configs/mx31ads.h
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Parkinson's Law: Work expands to fill the time alloted it.