[U-Boot] [PATCH 1/3] mx5: Define a common get_board_rev()
From: Fabio Estevam fabio.estevam@freescale.com
When booting a FSL kernel based on 2.6.35 it is necessary to pass the revision tag to the kernel.
Place a common weak function into soc.c for such purpose.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com --- arch/arm/cpu/armv7/mx5/soc.c | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/arch/arm/cpu/armv7/mx5/soc.c b/arch/arm/cpu/armv7/mx5/soc.c index 263658a..3d50a5d 100644 --- a/arch/arm/cpu/armv7/mx5/soc.c +++ b/arch/arm/cpu/armv7/mx5/soc.c @@ -72,6 +72,13 @@ u32 get_cpu_rev(void) return system_rev; }
+#ifdef CONFIG_REVISION_TAG +u32 __weak get_board_rev(void) +{ + return get_cpu_rev(); +} +#endif + #ifndef CONFIG_SYS_DCACHE_OFF void enable_caches(void) {
From: Fabio Estevam fabio.estevam@freescale.com
FSL 2.6.35 kernel expects that revision tag is passed by the bootloader.
Select CONFIG_REVISION_TAG so that mx53 boards can work properly with 2.6.35.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com --- include/configs/mx53ard.h | 1 + include/configs/mx53evk.h | 1 + include/configs/mx53smd.h | 1 + 3 files changed, 3 insertions(+)
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 148f7a2..296cae3 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -34,6 +34,7 @@ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG +#define CONFIG_REVISION_TAG
/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index a0af3ee..822b926 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -34,6 +34,7 @@ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG +#define CONFIG_REVISION_TAG
#define CONFIG_OF_LIBFDT
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index 9e83319..942949d 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -34,6 +34,7 @@ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG +#define CONFIG_REVISION_TAG
/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
Dear Fabio Estevam,
From: Fabio Estevam fabio.estevam@freescale.com
FSL 2.6.35 kernel expects that revision tag is passed by the bootloader.
Select CONFIG_REVISION_TAG so that mx53 boards can work properly with 2.6.35.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com
Acked-by: Marek Vasut marex@denx.de
Best regards, Marek Vasut
On 25/04/2013 02:44, Fabio Estevam wrote:
From: Fabio Estevam fabio.estevam@freescale.com
FSL 2.6.35 kernel expects that revision tag is passed by the bootloader.
Select CONFIG_REVISION_TAG so that mx53 boards can work properly with 2.6.35.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com
Applied to u-boot-imx, thanks.
Best regards, Stefano Babic
From: Fabio Estevam fabio.estevam@freescale.com
imx-regs.h is more appropriate location for containing register masks.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com --- arch/arm/include/asm/arch-mx5/imx-regs.h | 2 ++ board/freescale/mx53ard/mx53ard.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h index a71cc13..6aff3be 100644 --- a/arch/arm/include/asm/arch-mx5/imx-regs.h +++ b/arch/arm/include/asm/arch-mx5/imx-regs.h @@ -267,6 +267,8 @@ /* M4IF */ #define M4IF_FBPM0 0x40 #define M4IF_FIDBP 0x48 +#define M4IF_GENP_WEIM_MM_MASK 0x00000001 +#define WEIM_GCR2_MUX16_BYP_GRANT_MASK 0x00001000
/* Assuming 24MHz input clock with doubler ON */ /* MFI PDF */ diff --git a/board/freescale/mx53ard/mx53ard.c b/board/freescale/mx53ard/mx53ard.c index 8d433a3..32c4d5f 100644 --- a/board/freescale/mx53ard/mx53ard.c +++ b/board/freescale/mx53ard/mx53ard.c @@ -62,8 +62,6 @@ void dram_init_banksize(void) static void setup_iomux_nand(void) { u32 i, reg; - #define M4IF_GENP_WEIM_MM_MASK 0x00000001 - #define WEIM_GCR2_MUX16_BYP_GRANT_MASK 0x00001000
reg = __raw_readl(M4IF_BASE_ADDR + 0xc); reg &= ~M4IF_GENP_WEIM_MM_MASK;
Dear Fabio Estevam,
From: Fabio Estevam fabio.estevam@freescale.com
imx-regs.h is more appropriate location for containing register masks.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com
Thanks,
Acked-by: Marek Vasut marex@denx.de
Best regards, Marek Vasut
On 25/04/2013 02:44, Fabio Estevam wrote:
From: Fabio Estevam fabio.estevam@freescale.com
imx-regs.h is more appropriate location for containing register masks.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com
Applied to u-boot-imx, thanks.
Best regards, Stefano Babic
Dear Fabio Estevam,
From: Fabio Estevam fabio.estevam@freescale.com
When booting a FSL kernel based on 2.6.35 it is necessary to pass the revision tag to the kernel.
Place a common weak function into soc.c for such purpose.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com
Acked-by: Marek Vasut marex@denx.de
Best regards, Marek Vasut
On 25/04/2013 02:44, Fabio Estevam wrote:
From: Fabio Estevam fabio.estevam@freescale.com
When booting a FSL kernel based on 2.6.35 it is necessary to pass the revision tag to the kernel.
Place a common weak function into soc.c for such purpose.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com
Applied to u-boot-imx, thanks.
Best regards, Stefano Babic
participants (3)
-
Fabio Estevam -
Marek Vasut -
Stefano Babic