diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2013-02-13 14:05:17 -0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-02-14 11:18:24 -0200 |
commit | 3d69d9af168032083cace677c70ca67f4ab4b57e (patch) | |
tree | b844e2e98d91c1d681080cb64933f72281be9d58 /recipes-bsp/u-boot | |
parent | e280c54d1ba2c7ec46e5d699fbd880f70e6c387d (diff) | |
download | meta-fsl-arm-3d69d9af168032083cace677c70ca67f4ab4b57e.tar.gz |
u-boot-imx: Add imx6qsabresd support
Change-Id: I77cfb14fb92ac6750fab472b8a529a0157c899e0
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-bsp/u-boot')
-rw-r--r-- | recipes-bsp/u-boot/u-boot-imx/mx6q_sabresd-Change-default-environment-to-work-with.patch | 66 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-imx_2009.08.bb | 4 |
2 files changed, 69 insertions, 1 deletions
diff --git a/recipes-bsp/u-boot/u-boot-imx/mx6q_sabresd-Change-default-environment-to-work-with.patch b/recipes-bsp/u-boot/u-boot-imx/mx6q_sabresd-Change-default-environment-to-work-with.patch new file mode 100644 index 0000000..bf85800 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-imx/mx6q_sabresd-Change-default-environment-to-work-with.patch | |||
@@ -0,0 +1,66 @@ | |||
1 | From 970f04b228a60c805cce41ef8403ba2c8cb56d97 Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Wed, 13 Feb 2013 15:15:28 -0200 | ||
4 | Subject: [PATCH] mx6q_sabresd: Change default environment to work with OE | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
9 | --- | ||
10 | include/configs/mx6q_sabresd.h | 40 ++++++++++++++++++++++++---------------- | ||
11 | 1 file changed, 24 insertions(+), 16 deletions(-) | ||
12 | |||
13 | diff --git a/include/configs/mx6q_sabresd.h b/include/configs/mx6q_sabresd.h | ||
14 | index 6f07961..db31a34 100644 | ||
15 | --- a/include/configs/mx6q_sabresd.h | ||
16 | +++ b/include/configs/mx6q_sabresd.h | ||
17 | @@ -116,22 +116,30 @@ | ||
18 | #define CONFIG_RD_LOADADDR (0x1300000) | ||
19 | |||
20 | #define CONFIG_EXTRA_ENV_SETTINGS \ | ||
21 | - "netdev=eth0\0" \ | ||
22 | - "ethprime=FEC0\0" \ | ||
23 | - "uboot=u-boot.bin\0" \ | ||
24 | - "kernel=uImage\0" \ | ||
25 | - "nfsroot=/opt/eldk/arm\0" \ | ||
26 | - "bootargs_base=setenv bootargs console=ttymxc0,115200\0"\ | ||
27 | - "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\ | ||
28 | - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ | ||
29 | - "bootcmd_net=run bootargs_base bootargs_nfs; " \ | ||
30 | - "tftpboot ${loadaddr} ${kernel}; bootm\0" \ | ||
31 | - "bootargs_mmc=setenv bootargs ${bootargs} ip=dhcp " \ | ||
32 | - "root=/dev/mmcblk0p1 rootwait\0" \ | ||
33 | - "bootcmd_mmc=run bootargs_base bootargs_mmc; " \ | ||
34 | - "mmc dev 3; " \ | ||
35 | - "mmc read ${loadaddr} 0x800 0x2000; bootm\0" \ | ||
36 | - "bootcmd=run bootcmd_net\0" \ | ||
37 | + "script=boot.scr\0" \ | ||
38 | + "uimage=uImage\0" \ | ||
39 | + "mmcdev=2\0" \ | ||
40 | + "mmcpart=1\0" \ | ||
41 | + "mmcroot=/dev/mmcblk0p2 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 | |||
63 | #define CONFIG_ARP_TIMEOUT 200UL | ||
64 | -- | ||
65 | 1.8.1 | ||
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 a02c780..2210221 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 = "r10" | 14 | PR = "r11" |
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" |
@@ -26,6 +26,7 @@ SRC_URI_append_imx5 = " \ | |||
26 | SRCREV_mx6 = "d9804829ee8fb221c4bd2001e8c0ac47783b5b0b" | 26 | SRCREV_mx6 = "d9804829ee8fb221c4bd2001e8c0ac47783b5b0b" |
27 | SRC_URI_append_mx6 = " \ | 27 | SRC_URI_append_mx6 = " \ |
28 | file://mx6q_sabreauto-Fix-the-patch-for-the-default-environ.patch \ | 28 | file://mx6q_sabreauto-Fix-the-patch-for-the-default-environ.patch \ |
29 | file://mx6q_sabresd-Change-default-environment-to-work-with.patch \ | ||
29 | " | 30 | " |
30 | 31 | ||
31 | 32 | ||
@@ -36,6 +37,7 @@ UBOOT_MACHINE_imx53ard = "mx53_ard_ddr3_config" | |||
36 | UBOOT_MACHINE_imx51evk = "mx51_bbg_config" | 37 | UBOOT_MACHINE_imx51evk = "mx51_bbg_config" |
37 | UBOOT_MACHINE_imx6qsabrelite = "mx6q_sabrelite_config" | 38 | UBOOT_MACHINE_imx6qsabrelite = "mx6q_sabrelite_config" |
38 | UBOOT_MACHINE_imx6qsabreauto = "mx6q_sabreauto_config" | 39 | UBOOT_MACHINE_imx6qsabreauto = "mx6q_sabreauto_config" |
40 | UBOOT_MACHINE_imx6qsabresd = "mx6q_sabresd_config" | ||
39 | UBOOT_MACHINE_imx28evk = "mx28_evk_config" | 41 | UBOOT_MACHINE_imx28evk = "mx28_evk_config" |
40 | 42 | ||
41 | UBOOT_MAKE_TARGET = "u-boot.bin" | 43 | UBOOT_MAKE_TARGET = "u-boot.bin" |