diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-11-08 08:10:43 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-11-08 08:10:43 +0100 |
commit | 424830eb541e48eb2d898cfe48ba3c59e279cc94 (patch) | |
tree | dd6b759558d82b25d759060b8604db63b242eb18 /recipes-bsp | |
parent | 3bb013a14535b40b79fbeaa33799754fb74953be (diff) | |
download | meta-ti-424830eb541e48eb2d898cfe48ba3c59e279cc94.tar.gz |
u-boot 2011.10rc: turn on dcache for beaglebone
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-bsp')
-rw-r--r-- | recipes-bsp/u-boot/u-boot/2011.09git/0008-HACK-am335x-evm-turn-d-cache-on-globally-turn-it-off.patch | 46 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot_2011.10rc.bb | 3 |
2 files changed, 48 insertions, 1 deletions
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0008-HACK-am335x-evm-turn-d-cache-on-globally-turn-it-off.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0008-HACK-am335x-evm-turn-d-cache-on-globally-turn-it-off.patch new file mode 100644 index 00000000..b79a8844 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.09git/0008-HACK-am335x-evm-turn-d-cache-on-globally-turn-it-off.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 31d430d8db335b7c3fea08b6aa8309b90b8f2cb9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tom Rini <trini@ti.com> | ||
3 | Date: Tue, 8 Nov 2011 08:07:47 +0100 | ||
4 | Subject: [PATCH 8/8] HACK: am335x evm: turn d-cache on globally, turn it off when doing nfs stuff | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | --- | ||
8 | board/ti/am335x/evm.c | 12 ++++++++++++ | ||
9 | include/configs/am335x_evm.h | 1 + | ||
10 | 2 files changed, 13 insertions(+), 0 deletions(-) | ||
11 | |||
12 | diff --git a/board/ti/am335x/evm.c b/board/ti/am335x/evm.c | ||
13 | index bc1119e..e64626a 100644 | ||
14 | --- a/board/ti/am335x/evm.c | ||
15 | +++ b/board/ti/am335x/evm.c | ||
16 | @@ -1041,3 +1041,15 @@ U_BOOT_CMD( | ||
17 | |||
18 | #endif /* CONFIG_NAND_TI81XX */ | ||
19 | #endif /* CONFIG_SPL_BUILD */ | ||
20 | + | ||
21 | +/* | ||
22 | + * Not all drivers we use (such as ethernet) are dcache safe. But | ||
23 | + * we need cache on to boot quickly enough. | ||
24 | + */ | ||
25 | +#ifndef CONFIG_SYS_DCACHE_OFF | ||
26 | +void enable_caches(void) | ||
27 | +{ | ||
28 | + /* Enable D-cache. I-cache is already enabled in start.S */ | ||
29 | + dcache_enable(); | ||
30 | +} | ||
31 | +#endif | ||
32 | diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h | ||
33 | index 8bf3ff1..58fa2f6 100755 | ||
34 | --- a/include/configs/am335x_evm.h | ||
35 | +++ b/include/configs/am335x_evm.h | ||
36 | @@ -119,6 +119,7 @@ | ||
37 | "bootm ${loadaddr}\0" \ | ||
38 | "net_boot=echo Booting from network ...; " \ | ||
39 | "setenv autoload no; " \ | ||
40 | + "dcache off; " \ | ||
41 | "dhcp; " \ | ||
42 | "tftp ${loadaddr} ${bootfile}; " \ | ||
43 | "run net_args; " \ | ||
44 | -- | ||
45 | 1.7.2.5 | ||
46 | |||
diff --git a/recipes-bsp/u-boot/u-boot_2011.10rc.bb b/recipes-bsp/u-boot/u-boot_2011.10rc.bb index 2e0115f0..fd7d99c4 100644 --- a/recipes-bsp/u-boot/u-boot_2011.10rc.bb +++ b/recipes-bsp/u-boot/u-boot_2011.10rc.bb | |||
@@ -4,7 +4,7 @@ require u-boot.inc | |||
4 | COMPATIBLE_MACHINE = "(ti33x)" | 4 | COMPATIBLE_MACHINE = "(ti33x)" |
5 | DEFAULT_PREFERENCE_ti33x = "99" | 5 | DEFAULT_PREFERENCE_ti33x = "99" |
6 | PV = "2011.09+git" | 6 | PV = "2011.09+git" |
7 | PR = "r20" | 7 | PR = "r21" |
8 | 8 | ||
9 | # SPL build | 9 | # SPL build |
10 | UBOOT_BINARY = "u-boot.img" | 10 | UBOOT_BINARY = "u-boot.img" |
@@ -19,6 +19,7 @@ SRC_URI = "git://arago-project.org/git/projects/u-boot-am33x.git;protocol=git;br | |||
19 | file://2011.09git/0005-am335x-Change-mmc_load_uimage-to-load-at-a-fixed-add.patch \ | 19 | file://2011.09git/0005-am335x-Change-mmc_load_uimage-to-load-at-a-fixed-add.patch \ |
20 | file://2011.09git/0006-am335x-evm-Fix-bone-pmic-shut-down-over-USB-power.patch \ | 20 | file://2011.09git/0006-am335x-evm-Fix-bone-pmic-shut-down-over-USB-power.patch \ |
21 | file://2011.09git/0007-am335x_evm-switch-to-ext4.patch \ | 21 | file://2011.09git/0007-am335x_evm-switch-to-ext4.patch \ |
22 | file://2011.09git/0008-HACK-am335x-evm-turn-d-cache-on-globally-turn-it-off.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRCREV = "f63b270e47f62f4d1a05b2001357e215966c6f5a" | 25 | SRCREV = "f63b270e47f62f4d1a05b2001357e215966c6f5a" |