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 @@ | |||
1 | From a81c7686f8c0c4fc6e88228f215092c00d4714c1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daiane Angolini <daiane.angolini@freescale.com> | ||
3 | Date: Tue, 30 Oct 2012 07:47:59 -0500 | ||
4 | Subject: [PATCH] mx6q_sabreauto: Fix the patch for the default environment | ||
5 | variable | ||
6 | |||
7 | Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com> | ||
8 | --- | ||
9 | include/configs/mx6q_sabreauto.h | 41 ++++++++++++++++++++++--------------- | ||
10 | 1 files changed, 24 insertions(+), 17 deletions(-) | ||
11 | |||
12 | diff --git a/include/configs/mx6q_sabreauto.h b/include/configs/mx6q_sabreauto.h | ||
13 | index 5f8f02c..5910eca 100644 | ||
14 | --- a/include/configs/mx6q_sabreauto.h | ||
15 | +++ b/include/configs/mx6q_sabreauto.h | ||
16 | @@ -121,23 +121,30 @@ | ||
17 | #define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000) | ||
18 | |||
19 | #define CONFIG_EXTRA_ENV_SETTINGS \ | ||
20 | - "netdev=eth0\0" \ | ||
21 | - "ethprime=FEC0\0" \ | ||
22 | - "uboot=u-boot.bin\0" \ | ||
23 | - "kernel=uImage\0" \ | ||
24 | - "nfsroot=/opt/eldk/arm\0" \ | ||
25 | - "bootargs_base=setenv bootargs console=ttymxc3,115200\0"\ | ||
26 | - "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\ | ||
27 | - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ | ||
28 | - "bootcmd_net=run bootargs_base bootargs_nfs; " \ | ||
29 | - "tftpboot ${loadaddr} ${kernel}; bootm\0" \ | ||
30 | - "bootargs_mmc=setenv bootargs ${bootargs} " \ | ||
31 | - "root=/dev/mmcblk0p1 rootwait\0" \ | ||
32 | - "bootcmd_mmc=run bootargs_base bootargs_mmc; " \ | ||
33 | - "mmc dev 2; " \ | ||
34 | - "mmc read ${loadaddr} 0x800 0x2000; bootm\0" \ | ||
35 | - "bootcmd=run bootcmd_mmc\0" \ | ||
36 | - | ||
37 | + "script=boot.scr\0" \ | ||
38 | + "uimage=uImage\0" \ | ||
39 | + "mmcdev=2\0" \ | ||
40 | + "mmcpart=1\0" \ | ||
41 | + "mmcroot=/dev/mmcblk1p2 rw\0" \ | ||
42 | + "mmcrootfstype=ext3 rootwait\0" \ | ||
43 | + "mmcargs=setenv bootargs console=ttymxc3,${baudrate} " \ | ||
44 | + "root=${mmcroot} " \ | ||
45 | + "rootfstype=${mmcrootfstype}\0" \ | ||
46 | + "loadbootscript=" \ | ||
47 | + "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ | ||
48 | + "bootscript=echo Running bootscript from mmc ...; " \ | ||
49 | + "source\0" \ | ||
50 | + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ | ||
51 | + "mmcboot=echo Booting from mmc ...; " \ | ||
52 | + "run mmcargs; " \ | ||
53 | + "bootm\0" \ | ||
54 | + "netargs=setenv bootargs console=ttymxc3,${baudrate} " \ | ||
55 | + "root=/dev/nfs " \ | ||
56 | + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ | ||
57 | + "netboot=echo Booting from net ...; " \ | ||
58 | + "run netargs; " \ | ||
59 | + "dhcp ${uimage}; bootm\0" \ | ||
60 | + "bootcmd=run loaduimage; run mmcboot;\0" \ | ||
61 | |||
62 | #define CONFIG_ARP_TIMEOUT 200UL | ||
63 | |||
64 | -- | ||
65 | 1.7.5.4 | ||
66 | |||
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" | |||
11 | 11 | ||
12 | DEPENDS_mxs += "elftosb-native" | 12 | DEPENDS_mxs += "elftosb-native" |
13 | 13 | ||
14 | PR = "r8" | 14 | PR = "r9" |
15 | 15 | ||
16 | # Revision of imx_2.6.35_10.12.01 branch | 16 | # Revision of imx_2.6.35_10.12.01 branch |
17 | SRCREV_mxs = "e4437f1c192a1a68028e6fcff3f50ff50352041d" | 17 | SRCREV_mxs = "e4437f1c192a1a68028e6fcff3f50ff50352041d" |
@@ -22,8 +22,12 @@ SRC_URI_append_imx5 = " \ | |||
22 | file://mx53_loco_bootenv.patch \ | 22 | file://mx53_loco_bootenv.patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | # Revision of imx_2.6.35_11.11.01 branch | 25 | # Revision of imx_2.6.35_12.09.01 branch |
26 | SRCREV_mx6 = "daa30bb22e006d9f39298fb28ea8391ae4ccbc52" | 26 | SRCREV_mx6 = "d9804829ee8fb221c4bd2001e8c0ac47783b5b0b" |
27 | SRC_URI_append_mx6 = " \ | ||
28 | file://mx6q_sabreauto-Fix-the-patch-for-the-default-environ.patch \ | ||
29 | " | ||
30 | |||
27 | 31 | ||
28 | SRC_URI = "git://git.freescale.com/imx/uboot-imx.git" | 32 | SRC_URI = "git://git.freescale.com/imx/uboot-imx.git" |
29 | 33 | ||
@@ -31,11 +35,16 @@ UBOOT_MACHINE_imx53qsb = "mx53_loco_config" | |||
31 | UBOOT_MACHINE_imx53ard = "mx53_ard_ddr3_config" | 35 | UBOOT_MACHINE_imx53ard = "mx53_ard_ddr3_config" |
32 | UBOOT_MACHINE_imx51evk = "mx51_bbg_config" | 36 | UBOOT_MACHINE_imx51evk = "mx51_bbg_config" |
33 | UBOOT_MACHINE_imx6qsabrelite = "mx6q_sabrelite_config" | 37 | UBOOT_MACHINE_imx6qsabrelite = "mx6q_sabrelite_config" |
38 | UBOOT_MACHINE_imx6qsabreauto = "mx6q_sabreauto_config" | ||
34 | UBOOT_MACHINE_imx28evk = "mx28_evk_config" | 39 | UBOOT_MACHINE_imx28evk = "mx28_evk_config" |
35 | 40 | ||
36 | UBOOT_MAKE_TARGET = "u-boot.bin" | 41 | UBOOT_MAKE_TARGET = "u-boot.bin" |
37 | UBOOT_SUFFIX = "bin" | 42 | |
38 | UBOOT_PADDING = "2" | 43 | # Please, add the following variables to conf/local.conf |
44 | # in order to use this u-boot version | ||
45 | # UBOOT_SUFFIX = "bin" | ||
46 | # UBOOT_PADDING = "2" | ||
47 | # PREFERRED_PROVIDER_u-boot = "u-boot-imx" | ||
39 | 48 | ||
40 | S = "${WORKDIR}/git" | 49 | S = "${WORKDIR}/git" |
41 | EXTRA_OEMAKE += 'HOSTSTRIP=true' | 50 | EXTRA_OEMAKE += 'HOSTSTRIP=true' |