diff options
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-imx/mx6q_sabreauto-Fix-the-patch-for-the-default-environ.patch | 66 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-imx_2009.08.bb | 19 |
2 files changed, 80 insertions, 5 deletions
diff --git a/recipes-bsp/u-boot/u-boot-imx/mx6q_sabreauto-Fix-the-patch-for-the-default-environ.patch b/recipes-bsp/u-boot/u-boot-imx/mx6q_sabreauto-Fix-the-patch-for-the-default-environ.patch new file mode 100644 index 0000000..f485364 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-imx/mx6q_sabreauto-Fix-the-patch-for-the-default-environ.patch @@ -0,0 +1,66 @@ +From a81c7686f8c0c4fc6e88228f215092c00d4714c1 Mon Sep 17 00:00:00 2001 +From: Daiane Angolini <daiane.angolini@freescale.com> +Date: Tue, 30 Oct 2012 07:47:59 -0500 +Subject: [PATCH] mx6q_sabreauto: Fix the patch for the default environment + variable + +Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com> +--- + include/configs/mx6q_sabreauto.h | 41 ++++++++++++++++++++++--------------- + 1 files changed, 24 insertions(+), 17 deletions(-) + +diff --git a/include/configs/mx6q_sabreauto.h b/include/configs/mx6q_sabreauto.h +index 5f8f02c..5910eca 100644 +--- a/include/configs/mx6q_sabreauto.h ++++ b/include/configs/mx6q_sabreauto.h +@@ -121,23 +121,30 @@ + #define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000) + + #define CONFIG_EXTRA_ENV_SETTINGS \ +- "netdev=eth0\0" \ +- "ethprime=FEC0\0" \ +- "uboot=u-boot.bin\0" \ +- "kernel=uImage\0" \ +- "nfsroot=/opt/eldk/arm\0" \ +- "bootargs_base=setenv bootargs console=ttymxc3,115200\0"\ +- "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\ +- "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ +- "bootcmd_net=run bootargs_base bootargs_nfs; " \ +- "tftpboot ${loadaddr} ${kernel}; bootm\0" \ +- "bootargs_mmc=setenv bootargs ${bootargs} " \ +- "root=/dev/mmcblk0p1 rootwait\0" \ +- "bootcmd_mmc=run bootargs_base bootargs_mmc; " \ +- "mmc dev 2; " \ +- "mmc read ${loadaddr} 0x800 0x2000; bootm\0" \ +- "bootcmd=run bootcmd_mmc\0" \ +- ++ "script=boot.scr\0" \ ++ "uimage=uImage\0" \ ++ "mmcdev=2\0" \ ++ "mmcpart=1\0" \ ++ "mmcroot=/dev/mmcblk1p2 rw\0" \ ++ "mmcrootfstype=ext3 rootwait\0" \ ++ "mmcargs=setenv bootargs console=ttymxc3,${baudrate} " \ ++ "root=${mmcroot} " \ ++ "rootfstype=${mmcrootfstype}\0" \ ++ "loadbootscript=" \ ++ "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ ++ "bootscript=echo Running bootscript from mmc ...; " \ ++ "source\0" \ ++ "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ ++ "mmcboot=echo Booting from mmc ...; " \ ++ "run mmcargs; " \ ++ "bootm\0" \ ++ "netargs=setenv bootargs console=ttymxc3,${baudrate} " \ ++ "root=/dev/nfs " \ ++ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ ++ "netboot=echo Booting from net ...; " \ ++ "run netargs; " \ ++ "dhcp ${uimage}; bootm\0" \ ++ "bootcmd=run loaduimage; run mmcboot;\0" \ + + #define CONFIG_ARP_TIMEOUT 200UL + +-- +1.7.5.4 + diff --git a/recipes-bsp/u-boot/u-boot-imx_2009.08.bb b/recipes-bsp/u-boot/u-boot-imx_2009.08.bb index b1f172b..3e55b29 100644 --- a/recipes-bsp/u-boot/u-boot-imx_2009.08.bb +++ b/recipes-bsp/u-boot/u-boot-imx_2009.08.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b" DEPENDS_mxs += "elftosb-native" -PR = "r8" +PR = "r9" # Revision of imx_2.6.35_10.12.01 branch SRCREV_mxs = "e4437f1c192a1a68028e6fcff3f50ff50352041d" @@ -22,8 +22,12 @@ SRC_URI_append_imx5 = " \ file://mx53_loco_bootenv.patch \ " -# Revision of imx_2.6.35_11.11.01 branch -SRCREV_mx6 = "daa30bb22e006d9f39298fb28ea8391ae4ccbc52" +# Revision of imx_2.6.35_12.09.01 branch +SRCREV_mx6 = "d9804829ee8fb221c4bd2001e8c0ac47783b5b0b" +SRC_URI_append_mx6 = " \ + file://mx6q_sabreauto-Fix-the-patch-for-the-default-environ.patch \ +" + SRC_URI = "git://git.freescale.com/imx/uboot-imx.git" @@ -31,11 +35,16 @@ UBOOT_MACHINE_imx53qsb = "mx53_loco_config" UBOOT_MACHINE_imx53ard = "mx53_ard_ddr3_config" UBOOT_MACHINE_imx51evk = "mx51_bbg_config" UBOOT_MACHINE_imx6qsabrelite = "mx6q_sabrelite_config" +UBOOT_MACHINE_imx6qsabreauto = "mx6q_sabreauto_config" UBOOT_MACHINE_imx28evk = "mx28_evk_config" UBOOT_MAKE_TARGET = "u-boot.bin" -UBOOT_SUFFIX = "bin" -UBOOT_PADDING = "2" + +# Please, add the following variables to conf/local.conf +# in order to use this u-boot version +# UBOOT_SUFFIX = "bin" +# UBOOT_PADDING = "2" +# PREFERRED_PROVIDER_u-boot = "u-boot-imx" S = "${WORKDIR}/git" EXTRA_OEMAKE += 'HOSTSTRIP=true' |