From 6c856be237093fe366cddd3c51e04233d7ede4f2 Mon Sep 17 00:00:00 2001 From: Daiane Angolini Date: Thu, 22 Mar 2012 14:44:32 -0500 Subject: [PATCH] u-boot: add mx6qsabrelite support Add patches needed for loading a kernel without Device Tree support Signed-off-by: Daiane Angolini Signed-off-by: Otavio Salvador --- ...x6qsabrelite_add_CONFIG_REVISION_TAG.patch | 48 +++++++++++++++++++ ...brelite_add_MACH_TYPE_MX6Q_SABRELITE.patch | 25 ++++++++++ meta-fsl-arm/recipes-bsp/u-boot/u-boot_git.bb | 6 ++- 3 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 meta-fsl-arm/recipes-bsp/u-boot/u-boot/mx6qsabrelite_add_CONFIG_REVISION_TAG.patch create mode 100644 meta-fsl-arm/recipes-bsp/u-boot/u-boot/mx6qsabrelite_add_MACH_TYPE_MX6Q_SABRELITE.patch diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot/mx6qsabrelite_add_CONFIG_REVISION_TAG.patch b/meta-fsl-arm/recipes-bsp/u-boot/u-boot/mx6qsabrelite_add_CONFIG_REVISION_TAG.patch new file mode 100644 index 00000000..f9614fe3 --- /dev/null +++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot/mx6qsabrelite_add_CONFIG_REVISION_TAG.patch @@ -0,0 +1,48 @@ +From: Eric Nelson +Date: Mon, 12 Mar 2012 15:04:12 +0000 (+0000) +Subject: i.MX6: mx6q_sabrelite: add CONFIG_REVISION_TAG +X-Git-Url: http://git.denx.de/?p=u-boot%2Fu-boot-imx.git;a=commitdiff_plain;h=044cd2a7318a6480346c4e0824956d0dd25e9ec3;hp=b0634306b222cca35ad4754091c718a59f912bc0 + +i.MX6: mx6q_sabrelite: add CONFIG_REVISION_TAG + +This is needed to support Freescale-supplied userspaces. + +At the moment, both the IPU and VPU libraries provided by Freescale +in the "imx-lib" package contain routines which scrape the system +revision from /proc/cpuinfo. In the VPU library, this information is +used to load the proper firmware, allowing a single binary to be used +across various i.MX processors. + +Signed-off-by: Eric Nelson +Acked-by: Marek Vasut +Acked-by: Stefano Babic +--- + +diff --git a/board/freescale/mx6qsabrelite/mx6qsabrelite.c b/board/freescale/mx6qsabrelite/mx6qsabrelite.c +index 7fe2dc9..1d09a72 100644 +--- a/board/freescale/mx6qsabrelite/mx6qsabrelite.c ++++ b/board/freescale/mx6qsabrelite/mx6qsabrelite.c +@@ -215,6 +215,11 @@ int board_mmc_init(bd_t *bis) + } + #endif + ++u32 get_board_rev(void) ++{ ++ return 0x63000 ; ++} ++ + #ifdef CONFIG_MXC_SPI + iomux_v3_cfg_t ecspi1_pads[] = { + /* SS1 */ +diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h +index bb3a46b..a1a2267 100644 +--- a/include/configs/mx6qsabrelite.h ++++ b/include/configs/mx6qsabrelite.h +@@ -33,6 +33,7 @@ + #define CONFIG_CMDLINE_TAG + #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/meta-fsl-arm/recipes-bsp/u-boot/u-boot/mx6qsabrelite_add_MACH_TYPE_MX6Q_SABRELITE.patch b/meta-fsl-arm/recipes-bsp/u-boot/u-boot/mx6qsabrelite_add_MACH_TYPE_MX6Q_SABRELITE.patch new file mode 100644 index 00000000..09c74af4 --- /dev/null +++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot/mx6qsabrelite_add_MACH_TYPE_MX6Q_SABRELITE.patch @@ -0,0 +1,25 @@ +From: Eric Nelson +Date: Sun, 4 Mar 2012 10:51:36 +0000 (+0000) +Subject: i.MX6: mx6qsabrelite: add MACH_TYPE_MX6Q_SABRELITE +X-Git-Url: http://git.denx.de/?p=u-boot%2Fu-boot-imx.git;a=commitdiff_plain;h=5152d09fe89768a119b016b21fc763bc0231d1e8;hp=044cd2a7318a6480346c4e0824956d0dd25e9ec3 + +i.MX6: mx6qsabrelite: add MACH_TYPE_MX6Q_SABRELITE + +Allow non-dt kernels to boot + +Signed-off-by: Troy Kisky +--- + +diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h +index a1a2267..8bc8a83 100644 +--- a/include/configs/mx6qsabrelite.h ++++ b/include/configs/mx6qsabrelite.h +@@ -28,6 +28,8 @@ + #define CONFIG_DISPLAY_CPUINFO + #define CONFIG_DISPLAY_BOARDINFO + ++#define CONFIG_MACH_TYPE 3769 ++ + #include + + #define CONFIG_CMDLINE_TAG diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot_git.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot_git.bb index 85f8a0e7..2d94670f 100644 --- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot_git.bb +++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot_git.bb @@ -6,14 +6,16 @@ COMPATIBLE_MACHINE = "(imx53qsb|imx53ard|imx51evk|imx28evk|imx6qsabrelite)" DEPENDS_mxs += "elftosb-native" -PR = "r1" +PR = "r2" SRCREV = "6751b05f855bbe56005d5b88d4eb58bcd52170d2" PV = "v2011.12+git" SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git \ - file://mx53-fix-uart-clock.patch" + file://mx53-fix-uart-clock.patch \ + file://mx6qsabrelite_add_CONFIG_REVISION_TAG.patch \ + file://mx6qsabrelite_add_MACH_TYPE_MX6Q_SABRELITE.patch " S = "${WORKDIR}/git" -- 2.40.1