]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - glsdk/meta-ti-glsdk.git/blob - recipes-bsp/u-boot/u-boot-2012.04.01/0004-beagleboard-Load-uImage-to-the-default-kernel-linux-.patch
u-boot 2011.12: modify multi-machine version for the new .inc file
[glsdk/meta-ti-glsdk.git] / recipes-bsp / u-boot / u-boot-2012.04.01 / 0004-beagleboard-Load-uImage-to-the-default-kernel-linux-.patch
1 From 715afb049d2675106e26c5225e7e321374c32f85 Mon Sep 17 00:00:00 2001
2 From: Tom Rini <trini@ti.com>
3 Date: Thu, 17 Nov 2011 16:54:01 -0700
4 Subject: [PATCH 4/4] beagleboard: Load uImage to the default kernel linux address
6 This is TI Sitara SDK specific (unified user experience, load uImage
7 to an 'XIP' location).
9 Upstream-Status: Pending
10     * This functionality is being discussed upstream and there
11       is not a concensus yet.
13 Signed-off-by: Tom Rini <trini@ti.com>
14 ---
15  include/configs/omap3_beagle.h |   13 +++++++------
16  1 files changed, 7 insertions(+), 6 deletions(-)
18 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
19 index ea62580..00b2abe 100644
20 --- a/include/configs/omap3_beagle.h
21 +++ b/include/configs/omap3_beagle.h
22 @@ -219,6 +219,7 @@
23  
24  #define CONFIG_EXTRA_ENV_SETTINGS \
25         "loadaddr=0x80200000\0" \
26 +       "kloadaddr=0x80007fc0\0" \
27         "rdaddr=0x81000000\0" \
28         "usbtty=cdc_acm\0" \
29         "usbethaddr=de:ad:be:ef\0" \
30 @@ -272,18 +273,18 @@
31                 "root=${ramroot} " \
32                 "rootfstype=${ramrootfstype}\0" \
33         "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
34 -       "loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
35 -       "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \
36 +       "loaduimagefat=fatload mmc ${mmcdev} ${kloadaddr} uImage\0" \
37 +       "loaduimage=ext2load mmc ${mmcdev}:2 ${kloadaddr} /boot/uImage\0" \
38         "mmcboot=echo Booting from mmc ...; " \
39                 "run mmcargs; " \
40 -               "bootm ${loadaddr}\0" \
41 +               "bootm ${kloadaddr}\0" \
42         "nandboot=echo Booting from nand ...; " \
43                 "run nandargs; " \
44 -               "nand read ${loadaddr} 280000 400000; " \
45 -               "bootm ${loadaddr}\0" \
46 +               "nand read ${kloadaddr} 280000 400000; " \
47 +               "bootm ${kloadaddr}\0" \
48         "ramboot=echo Booting from ramdisk ...; " \
49                 "run ramargs; " \
50 -               "bootm ${loadaddr}\0" \
51 +               "bootm ${kloadaddr}\0" \
52         "userbutton=if gpio input 173; then run userbutton_xm; " \
53                 "else run userbutton_nonxm; fi;\0" \
54         "userbutton_xm=gpio input 4;\0" \
55 -- 
56 1.7.0.4