summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-07-11 11:53:27 +0200
committerDenys Dmytriyenko <denys@ti.com>2012-07-31 15:48:26 -0400
commit463ddce7fe22514cf71f9da741c7c896133f8bc4 (patch)
tree640a1bd7e390fb58d6e9c51f3bfa16c6dfed62b3
parent3efdcce63926eaeb304114123df8730d7d60b444 (diff)
downloadmeta-ti-463ddce7fe22514cf71f9da741c7c896133f8bc4.tar.gz
u-boot 2011.09+git: update to latest version of Tom Rini's tree
All patches have been rediffed and boot tested Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0001-am335x_evm-add-option-to-boot-kernel-from-boot-in-ex.patch26
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0001-am335x_evm-only-do-in-kernel-dhcp-when-using-NFS-use.patch35
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0001-ddr_defs-change-DDR-timings-for-15x15-EVM.patch30
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0002-am335x_evm-boot-kernel-from-boot-in-ext2-3-filesyste.patch27
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0002-am335x_evm-set-bootdelay-to-1.patch (renamed from recipes-bsp/u-boot/u-boot/2011.09git/0003-am335x_evm-set-bootdelay-to-1.patch)18
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0003-am335x-evm-make-MMC-rootfs-RO-on-boot-so-fsck-works.patch (renamed from recipes-bsp/u-boot/u-boot/2011.09git/0004-am335x-evm-make-MMC-rootfs-RO-on-boot-so-fsck-works.patch)12
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0004-am335x_evm-switch-to-ext4.patch (renamed from recipes-bsp/u-boot/u-boot/2011.09git/0007-am335x_evm-switch-to-ext4.patch)14
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0005-am335x-Change-mmc_load_uimage-to-load-at-a-fixed-add.patch49
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0005-am335x-evm-enable-i2c2-pinmux-for-beaglebone.patch (renamed from recipes-bsp/u-boot/u-boot/2011.09git/0009-am335x-evm-enable-i2c2-pinmux-for-beaglebone.patch)18
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0006-am335x-evm-Fix-bone-pmic-shut-down-over-USB-power.patch82
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0006-ext2load-increase-read-speed.patch (renamed from recipes-bsp/u-boot/u-boot/2011.09git/0011-ext2load-increase-read-speed.patch)10
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0007-am335x-evm-fix-ext2load-and-specify-partition-for-bo.patch30
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0008-HACK-am335x-evm-turn-d-cache-on-globally-turn-it-off.patch46
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0008-am335x-evm-load-uImage-from-boot-instead-of-VFAT.patch (renamed from recipes-bsp/u-boot/u-boot/2011.09git/0013-am335x-evm-load-uImage-from-boot-instead-of-VFAT.patch)18
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0009-ext4fs-ls-load-support.patch (renamed from recipes-bsp/u-boot/u-boot/2011.09git/0014-ext4fs-ls-load-support.patch)12
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0010-am335x-switch-to-ext4-mode.patch (renamed from recipes-bsp/u-boot/u-boot/2011.09git/0015-am335x-switch-to-ext4-mode.patch)33
-rw-r--r--recipes-bsp/u-boot/u-boot/2011.09git/0012-am335x-evm-fix-ext2load-and-specify-partition-for-bo.patch28
-rw-r--r--recipes-bsp/u-boot/u-boot_2011.10rc.bb31
18 files changed, 137 insertions, 382 deletions
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0001-am335x_evm-add-option-to-boot-kernel-from-boot-in-ex.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0001-am335x_evm-add-option-to-boot-kernel-from-boot-in-ex.patch
new file mode 100644
index 00000000..03569d16
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot/2011.09git/0001-am335x_evm-add-option-to-boot-kernel-from-boot-in-ex.patch
@@ -0,0 +1,26 @@
1From 65ba75f46ec4c9749996ec290fa1c5e4e6264ce3 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Tue, 1 Nov 2011 12:21:07 +0100
4Subject: [PATCH 01/10] am335x_evm: add option to boot kernel from /boot in
5 ext2/3 filesystem
6
7Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
8---
9 include/configs/am335x_evm.h | 1 +
10 1 file changed, 1 insertion(+)
11
12diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
13index 44a8500..83ccb5a 100755
14--- a/include/configs/am335x_evm.h
15+++ b/include/configs/am335x_evm.h
16@@ -75,6 +75,7 @@
17 "importbootenv=echo Importing environment from mmc ...; " \
18 "env import -t $loadaddr $filesize\0" \
19 "mmc_load_uimage=fatload mmc ${mmc_dev} ${kloadaddr} ${bootfile}\0" \
20+ "mmc_load_uimage_ext2=ext2load ${mmc_dev} ${kloadaddr} /boot/${bootfile}\0" \
21 "optargs=\0" \
22 "bootargs_defaults=setenv bootargs " \
23 "console=${console} " \
24--
251.7.10
26
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0001-am335x_evm-only-do-in-kernel-dhcp-when-using-NFS-use.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0001-am335x_evm-only-do-in-kernel-dhcp-when-using-NFS-use.patch
deleted file mode 100644
index 1ccfe195..00000000
--- a/recipes-bsp/u-boot/u-boot/2011.09git/0001-am335x_evm-only-do-in-kernel-dhcp-when-using-NFS-use.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 557a773eb245f3f2508e40d6d8a6c593738fd46f Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Tue, 1 Nov 2011 12:19:54 +0100
4Subject: [PATCH 1/4] am335x_evm: only do in-kernel dhcp when using NFS, userspace will do dhcp otherwise
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8 include/configs/am335x_evm.h | 4 ++--
9 1 files changed, 2 insertions(+), 2 deletions(-)
10
11diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
12index 41a3316..93b3161 100755
13--- a/include/configs/am335x_evm.h
14+++ b/include/configs/am335x_evm.h
15@@ -69,7 +69,7 @@
16 "nfsopts=nolock\0" \
17 "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \
18 "::off\0" \
19- "ip_method=dhcp\0" \
20+ "ip_method=none\0" \
21 "bootenv=uEnv.txt\0" \
22 "loadbootenv=fatload mmc ${mmc_dev} ${loadaddr} ${bootenv}\0" \
23 "importbootenv=echo Importing environment from mmc ...; " \
24@@ -99,7 +99,7 @@
25 "setenv bootargs ${bootargs} " \
26 "root=/dev/nfs " \
27 "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
28- "ip=${ip_method}\0" \
29+ "ip=dhcp\0" \
30 "mmc_boot=run mmc_args; " \
31 "run mmc_load_uimage; " \
32 "bootm ${loadaddr}\0" \
33--
341.7.2.5
35
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0001-ddr_defs-change-DDR-timings-for-15x15-EVM.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0001-ddr_defs-change-DDR-timings-for-15x15-EVM.patch
deleted file mode 100644
index 4563a2ce..00000000
--- a/recipes-bsp/u-boot/u-boot/2011.09git/0001-ddr_defs-change-DDR-timings-for-15x15-EVM.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 7a3b3b04b1aed6a649d99396f914ec042968f924 Mon Sep 17 00:00:00 2001
2From: Chase Maupin <Chase.Maupin@ti.com>
3Date: Thu, 9 Feb 2012 13:09:27 -0600
4Subject: [PATCH] ddr_defs: change DDR timings for 15x15 EVM
5
6* For cold silicon the DDR timings need to be relaxed in order for
7 the device to boot with DDR at 266MHz
8* Fix proposed by James Doublesin
9
10Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
11---
12 arch/arm/include/asm/arch-ti81xx/ddr_defs.h | 2 +-
13 1 files changed, 1 insertions(+), 1 deletions(-)
14
15diff --git a/arch/arm/include/asm/arch-ti81xx/ddr_defs.h b/arch/arm/include/asm/arch-ti81xx/ddr_defs.h
16index 6c4b422..0b7ffe7 100644
17--- a/arch/arm/include/asm/arch-ti81xx/ddr_defs.h
18+++ b/arch/arm/include/asm/arch-ti81xx/ddr_defs.h
19@@ -338,7 +338,7 @@
20 #define DDR2_RD_DQS 0x40
21 #define DDR2_PHY_FIFO_WE 0x56
22 #else
23-#define EMIF_READ_LATENCY 0x04
24+#define EMIF_READ_LATENCY 0x05
25 #define EMIF_TIM1 0x0666B3D6
26 #define EMIF_TIM2 0x143731DA
27 #define EMIF_TIM3 0x00000347
28--
291.7.0.4
30
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0002-am335x_evm-boot-kernel-from-boot-in-ext2-3-filesyste.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0002-am335x_evm-boot-kernel-from-boot-in-ext2-3-filesyste.patch
deleted file mode 100644
index 61614f70..00000000
--- a/recipes-bsp/u-boot/u-boot/2011.09git/0002-am335x_evm-boot-kernel-from-boot-in-ext2-3-filesyste.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 206baf5d1d8eb19312c0c8216e6722a63548573d Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Tue, 1 Nov 2011 12:21:07 +0100
4Subject: [PATCH 2/4] am335x_evm: add option to boot kernel from /boot in ext2/3 filesystem
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8 include/configs/am335x_evm.h | 3 ++-
9 1 files changed, 2 insertions(+), 1 deletions(-)
10
11diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
12index 93b3161..9bbfe3b 100755
13--- a/include/configs/am335x_evm.h
14+++ b/include/configs/am335x_evm.h
15@@ -74,7 +74,8 @@
16 "loadbootenv=fatload mmc ${mmc_dev} ${loadaddr} ${bootenv}\0" \
17 "importbootenv=echo Importing environment from mmc ...; " \
18 "env import -t $loadaddr $filesize\0" \
19- "mmc_load_uimage=fatload mmc ${mmc_dev} ${loadaddr} ${bootfile}\0" \
20+ "mmc_load_uimage=fatload mmc ${mmc_dev} ${loadaddr} ${bootfile}\0" \
21+ "mmc_load_uimage_ext2=ext2load ${mmc_dev} ${loadaddr} /boot/${bootfile}\0" \
22 "optargs=\0" \
23 "bootargs_defaults=setenv bootargs " \
24 "console=${console} " \
25--
261.7.2.5
27
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0003-am335x_evm-set-bootdelay-to-1.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0002-am335x_evm-set-bootdelay-to-1.patch
index 32655400..fdce9c41 100644
--- a/recipes-bsp/u-boot/u-boot/2011.09git/0003-am335x_evm-set-bootdelay-to-1.patch
+++ b/recipes-bsp/u-boot/u-boot/2011.09git/0002-am335x_evm-set-bootdelay-to-1.patch
@@ -1,26 +1,26 @@
1From bf513a05bc37f6d32e14c1e46d090773d1664c99 Mon Sep 17 00:00:00 2001 1From cb92653d26476880602a20b62da03a35d36d622e Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net> 2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Tue, 1 Nov 2011 12:21:38 +0100 3Date: Tue, 1 Nov 2011 12:21:38 +0100
4Subject: [PATCH 3/4] am335x_evm: set bootdelay to 1 4Subject: [PATCH 02/10] am335x_evm: set bootdelay to 1
5 5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7--- 7---
8 include/configs/am335x_evm.h | 2 +- 8 include/configs/am335x_evm.h | 2 +-
9 1 files changed, 1 insertions(+), 1 deletions(-) 9 1 file changed, 1 insertion(+), 1 deletion(-)
10 10
11diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h 11diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
12index 9bbfe3b..6143dc3 100755 12index 83ccb5a..2558775 100755
13--- a/include/configs/am335x_evm.h 13--- a/include/configs/am335x_evm.h
14+++ b/include/configs/am335x_evm.h 14+++ b/include/configs/am335x_evm.h
15@@ -38,7 +38,7 @@ 15@@ -127,7 +127,7 @@
16 #define CONFIG_INITRD_TAG /* Required for ramdisk support */
17 16
17 #ifndef CONFIG_RESTORE_FLASH
18 /* set to negative value for no autoboot */ 18 /* set to negative value for no autoboot */
19-#define CONFIG_BOOTDELAY 3 19-#define CONFIG_BOOTDELAY 3
20+#define CONFIG_BOOTDELAY 1 20+#define CONFIG_BOOTDELAY 1
21 21
22 #define CONFIG_MMC 22 #define CONFIG_BOOTCOMMAND \
23 #define CONFIG_NAND 23 "if mmc rescan; then " \
24-- 24--
251.7.2.5 251.7.10
26 26
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0004-am335x-evm-make-MMC-rootfs-RO-on-boot-so-fsck-works.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0003-am335x-evm-make-MMC-rootfs-RO-on-boot-so-fsck-works.patch
index 72195547..8096df0a 100644
--- a/recipes-bsp/u-boot/u-boot/2011.09git/0004-am335x-evm-make-MMC-rootfs-RO-on-boot-so-fsck-works.patch
+++ b/recipes-bsp/u-boot/u-boot/2011.09git/0003-am335x-evm-make-MMC-rootfs-RO-on-boot-so-fsck-works.patch
@@ -1,15 +1,15 @@
1From 63e5b3b4271917e0a3c5a4903a76fdfb30118d3c Mon Sep 17 00:00:00 2001 1From ca9a3452249bfda3d9a8096794b4fbfbf212d72f Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net> 2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Tue, 1 Nov 2011 12:22:30 +0100 3Date: Tue, 1 Nov 2011 12:22:30 +0100
4Subject: [PATCH 4/4] am335x-evm: make MMC rootfs RO on boot so fsck works 4Subject: [PATCH 03/10] am335x-evm: make MMC rootfs RO on boot so fsck works
5 5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7--- 7---
8 include/configs/am335x_evm.h | 2 +- 8 include/configs/am335x_evm.h | 2 +-
9 1 files changed, 1 insertions(+), 1 deletions(-) 9 1 file changed, 1 insertion(+), 1 deletion(-)
10 10
11diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h 11diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
12index 6143dc3..56e36da 100755 12index 2558775..1b4fa37 100755
13--- a/include/configs/am335x_evm.h 13--- a/include/configs/am335x_evm.h
14+++ b/include/configs/am335x_evm.h 14+++ b/include/configs/am335x_evm.h
15@@ -50,7 +50,7 @@ 15@@ -50,7 +50,7 @@
@@ -18,9 +18,9 @@ index 6143dc3..56e36da 100755
18 "mmc_dev=0\0" \ 18 "mmc_dev=0\0" \
19- "mmc_root=/dev/mmcblk0p2 rw\0" \ 19- "mmc_root=/dev/mmcblk0p2 rw\0" \
20+ "mmc_root=/dev/mmcblk0p2 ro\0" \ 20+ "mmc_root=/dev/mmcblk0p2 ro\0" \
21 "nand_root=/dev/mtdblock7 rw\0" \ 21 "nand_root=ubi0:rootfs rw ubi.mtd=7,2048\0" \
22 "spi_root=/dev/mtdblock4 rw\0" \ 22 "spi_root=/dev/mtdblock4 rw\0" \
23 "nor_root=/dev/mtdblock3 rw\0" \ 23 "nor_root=/dev/mtdblock3 rw\0" \
24-- 24--
251.7.2.5 251.7.10
26 26
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0007-am335x_evm-switch-to-ext4.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0004-am335x_evm-switch-to-ext4.patch
index 891af6c0..3d8495eb 100644
--- a/recipes-bsp/u-boot/u-boot/2011.09git/0007-am335x_evm-switch-to-ext4.patch
+++ b/recipes-bsp/u-boot/u-boot/2011.09git/0004-am335x_evm-switch-to-ext4.patch
@@ -1,26 +1,26 @@
1From d2032a2932911159985451d76c547b4e6d99fb61 Mon Sep 17 00:00:00 2001 1From 97fa23e167d3e4b46c71a5fac1a5e9aa39f0a551 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net> 2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Mon, 7 Nov 2011 21:33:32 +0100 3Date: Mon, 7 Nov 2011 21:33:32 +0100
4Subject: [PATCH 7/7] am335x_evm: switch to ext4 4Subject: [PATCH 04/10] am335x_evm: switch to ext4
5 5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7--- 7---
8 include/configs/am335x_evm.h | 2 +- 8 include/configs/am335x_evm.h | 2 +-
9 1 files changed, 1 insertions(+), 1 deletions(-) 9 1 file changed, 1 insertion(+), 1 deletion(-)
10 10
11diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h 11diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
12index 8c0fae2..8bf3ff1 100755 12index 1b4fa37..3d37058 100755
13--- a/include/configs/am335x_evm.h 13--- a/include/configs/am335x_evm.h
14+++ b/include/configs/am335x_evm.h 14+++ b/include/configs/am335x_evm.h
15@@ -54,7 +54,7 @@ 15@@ -54,7 +54,7 @@
16 "nand_root=/dev/mtdblock7 rw\0" \ 16 "nand_root=ubi0:rootfs rw ubi.mtd=7,2048\0" \
17 "spi_root=/dev/mtdblock4 rw\0" \ 17 "spi_root=/dev/mtdblock4 rw\0" \
18 "nor_root=/dev/mtdblock3 rw\0" \ 18 "nor_root=/dev/mtdblock3 rw\0" \
19- "mmc_root_fs_type=ext3 rootwait\0" \ 19- "mmc_root_fs_type=ext3 rootwait\0" \
20+ "mmc_root_fs_type=ext4 rootwait\0" \ 20+ "mmc_root_fs_type=ext4 rootwait\0" \
21 "nand_root_fs_type=jffs2\0" \ 21 "nand_root_fs_type=ubifs rootwait=1\0" \
22 "spi_root_fs_type=jffs2\0" \ 22 "spi_root_fs_type=jffs2\0" \
23 "nor_root_fs_type=jffs2\0" \ 23 "nor_root_fs_type=jffs2\0" \
24-- 24--
251.7.2.5 251.7.10
26 26
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0005-am335x-Change-mmc_load_uimage-to-load-at-a-fixed-add.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0005-am335x-Change-mmc_load_uimage-to-load-at-a-fixed-add.patch
deleted file mode 100644
index 126ff24a..00000000
--- a/recipes-bsp/u-boot/u-boot/2011.09git/0005-am335x-Change-mmc_load_uimage-to-load-at-a-fixed-add.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From bd152bec1086a35f426c53c9bb9f0c309e216037 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Wed, 2 Nov 2011 19:07:10 +0100
4Subject: [PATCH 5/5] am335x: Change mmc_load_uimage to load at a fixed address
5 The kernel normally expects to be run from 0x80008000 so if we
6 load from SD card at that-mkimage header we can save a copy of
7 the kernel.
8
9Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
10---
11 include/configs/am335x_evm.h | 8 ++++----
12 1 files changed, 4 insertions(+), 4 deletions(-)
13
14diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
15index 56e36da..8c0fae2 100755
16--- a/include/configs/am335x_evm.h
17+++ b/include/configs/am335x_evm.h
18@@ -74,8 +74,8 @@
19 "loadbootenv=fatload mmc ${mmc_dev} ${loadaddr} ${bootenv}\0" \
20 "importbootenv=echo Importing environment from mmc ...; " \
21 "env import -t $loadaddr $filesize\0" \
22- "mmc_load_uimage=fatload mmc ${mmc_dev} ${loadaddr} ${bootfile}\0" \
23- "mmc_load_uimage_ext2=ext2load ${mmc_dev} ${loadaddr} /boot/${bootfile}\0" \
24+ "mmc_load_uimage=fatload mmc ${mmc_dev} 0x80007fc0 ${bootfile}\0" \
25+ "mmc_load_uimage_ext2=ext2load ${mmc_dev} 0x80007fc0 /boot/${bootfile}\0" \
26 "optargs=\0" \
27 "bootargs_defaults=setenv bootargs " \
28 "console=${console} " \
29@@ -103,7 +103,7 @@
30 "ip=dhcp\0" \
31 "mmc_boot=run mmc_args; " \
32 "run mmc_load_uimage; " \
33- "bootm ${loadaddr}\0" \
34+ "bootm 0x80007fc0\0" \
35 "nand_boot=echo Booting from nand ...; " \
36 "run nand_args; " \
37 "nand read.i ${loadaddr} ${nand_src_addr} ${nand_img_siz}; " \
38@@ -137,7 +137,7 @@
39 "fi;" \
40 "if run mmc_load_uimage; then " \
41 "run mmc_args;" \
42- "bootm ${loadaddr};" \
43+ "bootm 0x80007fc0;" \
44 "fi;" \
45 "fi;" \
46 "run nand_boot;" \
47--
481.7.2.5
49
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0009-am335x-evm-enable-i2c2-pinmux-for-beaglebone.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0005-am335x-evm-enable-i2c2-pinmux-for-beaglebone.patch
index b97fa16b..fa2790dc 100644
--- a/recipes-bsp/u-boot/u-boot/2011.09git/0009-am335x-evm-enable-i2c2-pinmux-for-beaglebone.patch
+++ b/recipes-bsp/u-boot/u-boot/2011.09git/0005-am335x-evm-enable-i2c2-pinmux-for-beaglebone.patch
@@ -1,18 +1,18 @@
1From 2df6e88944b98466e0b1225a873bfed005cea4e4 Mon Sep 17 00:00:00 2001 1From e2121ca4fd82f8313b764fe7fb24511ef7d10904 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net> 2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Wed, 16 Nov 2011 18:57:12 +0100 3Date: Wed, 16 Nov 2011 18:57:12 +0100
4Subject: [PATCH] am335x-evm: enable i2c2 pinmux for beaglebone 4Subject: [PATCH 05/10] am335x-evm: enable i2c2 pinmux for beaglebone
5 5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7--- 7---
8 board/ti/am335x/mux.c | 18 ++++++++++++++++++ 8 board/ti/am335x/mux.c | 18 ++++++++++++++++++
9 1 files changed, 18 insertions(+), 0 deletions(-) 9 1 file changed, 18 insertions(+)
10 10
11diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c 11diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c
12index d9956f3..313d5a5 100644 12index 885b33f..70645d4 100644
13--- a/board/ti/am335x/mux.c 13--- a/board/ti/am335x/mux.c
14+++ b/board/ti/am335x/mux.c 14+++ b/board/ti/am335x/mux.c
15@@ -309,6 +309,12 @@ static struct module_pin_mux i2c1_pin_mux[] = { 15@@ -310,6 +310,12 @@ static struct module_pin_mux i2c1_pin_mux[] = {
16 {-1}, 16 {-1},
17 }; 17 };
18 18
@@ -25,7 +25,7 @@ index d9956f3..313d5a5 100644
25 #ifndef CONFIG_NO_ETH 25 #ifndef CONFIG_NO_ETH
26 static struct module_pin_mux rgmii1_pin_mux[] = { 26 static struct module_pin_mux rgmii1_pin_mux[] = {
27 {OFFSET(mii1_txen), MODE(2)}, /* RGMII1_TCTL */ 27 {OFFSET(mii1_txen), MODE(2)}, /* RGMII1_TCTL */
28@@ -568,6 +574,7 @@ static struct evm_pin_mux low_cost_evm_pin_mux[] = { 28@@ -598,6 +604,7 @@ static struct evm_pin_mux sk_evm_pin_mux[] = {
29 static struct evm_pin_mux beaglebone_pin_mux[] = { 29 static struct evm_pin_mux beaglebone_pin_mux[] = {
30 {uart0_pin_mux, PROFILE_ALL, DEV_ON_BASEBOARD}, 30 {uart0_pin_mux, PROFILE_ALL, DEV_ON_BASEBOARD},
31 {i2c1_pin_mux, PROFILE_ALL & ~PROFILE_2 & ~PROFILE_4, DEV_ON_BASEBOARD}, 31 {i2c1_pin_mux, PROFILE_ALL & ~PROFILE_2 & ~PROFILE_4, DEV_ON_BASEBOARD},
@@ -33,7 +33,7 @@ index d9956f3..313d5a5 100644
33 #ifdef CONFIG_NAND 33 #ifdef CONFIG_NAND
34 {nand_pin_mux, PROFILE_ALL & ~PROFILE_2 & ~PROFILE_3, DEV_ON_DGHTR_BRD}, 34 {nand_pin_mux, PROFILE_ALL & ~PROFILE_2 & ~PROFILE_3, DEV_ON_DGHTR_BRD},
35 #endif 35 #endif
36@@ -587,6 +594,7 @@ static struct evm_pin_mux beaglebone_pin_mux[] = { 36@@ -617,6 +624,7 @@ static struct evm_pin_mux beaglebone_pin_mux[] = {
37 static struct evm_pin_mux beaglebone_old_pin_mux[] = { 37 static struct evm_pin_mux beaglebone_old_pin_mux[] = {
38 {uart0_pin_mux, PROFILE_ALL, DEV_ON_BASEBOARD}, 38 {uart0_pin_mux, PROFILE_ALL, DEV_ON_BASEBOARD},
39 {i2c1_pin_mux, PROFILE_ALL & ~PROFILE_2 & ~PROFILE_4, DEV_ON_BASEBOARD}, 39 {i2c1_pin_mux, PROFILE_ALL & ~PROFILE_2 & ~PROFILE_4, DEV_ON_BASEBOARD},
@@ -41,7 +41,7 @@ index d9956f3..313d5a5 100644
41 #ifdef CONFIG_NAND 41 #ifdef CONFIG_NAND
42 {nand_pin_mux, PROFILE_ALL & ~PROFILE_2 & ~PROFILE_3, DEV_ON_DGHTR_BRD}, 42 {nand_pin_mux, PROFILE_ALL & ~PROFILE_2 & ~PROFILE_3, DEV_ON_DGHTR_BRD},
43 #endif 43 #endif
44@@ -682,6 +690,16 @@ void enable_i2c0_pin_mux(void) 44@@ -713,6 +721,16 @@ void enable_i2c0_pin_mux(void)
45 configure_module_pin_mux(i2c0_pin_mux); 45 configure_module_pin_mux(i2c0_pin_mux);
46 } 46 }
47 47
@@ -59,5 +59,5 @@ index d9956f3..313d5a5 100644
59 { 59 {
60 configure_module_pin_mux(uart0_pin_mux); 60 configure_module_pin_mux(uart0_pin_mux);
61-- 61--
621.7.2.5 621.7.10
63 63
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0006-am335x-evm-Fix-bone-pmic-shut-down-over-USB-power.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0006-am335x-evm-Fix-bone-pmic-shut-down-over-USB-power.patch
deleted file mode 100644
index 158483b2..00000000
--- a/recipes-bsp/u-boot/u-boot/2011.09git/0006-am335x-evm-Fix-bone-pmic-shut-down-over-USB-power.patch
+++ /dev/null
@@ -1,82 +0,0 @@
1From 801316091ac7e14cc8fa9b0bd2cdce76bea06991 Mon Sep 17 00:00:00 2001
2From: Joel A Fernandes <joelagnel@ti.com>
3Date: Thu, 3 Nov 2011 22:19:19 -0500
4Subject: [PATCH v2] am335x-evm: Fix bone pmic shut down over USB power
5Cc: trini@ti.com,
6 chase.maupin@ti.com
7
8* Set DCDC2 to 1.2v for all power sources and board revs except for A1
9* Set USB current trip point to 1300mA for all boards and power sources.
10* Only Skip setting of MPU frequency to 720MHz for A1 and USB-powered boards.
11
12Credits to Jason for noticing this. Tested with several reboots over USB on a Rev A2/3.
13
14v2 changes:
15Take care of not upping DCDC2 and LDO voltages for A1.
16For A1- only operation done is to set the USB current limit.
17
18Signed-off-by: Jason Kridner <jdk@ti.com>
19Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
20---
21Chase has volunteered to test this out on his A1.
22
23 board/ti/am335x/evm.c | 31 ++++++++++++++++---------------
24 1 files changed, 16 insertions(+), 15 deletions(-)
25
26diff --git a/board/ti/am335x/evm.c b/board/ti/am335x/evm.c
27index e95a088..bc1119e 100644
28--- a/board/ti/am335x/evm.c
29+++ b/board/ti/am335x/evm.c
30@@ -483,12 +483,20 @@ void spl_board_init(void)
31 if (tps65217_reg_read(STATUS, &pmic_status_reg))
32 return;
33
34+ /* Increase USB current limit to 1300mA */
35+ if (tps65217_reg_write(PROT_LEVEL_NONE, POWER_PATH,
36+ USB_INPUT_CUR_LIMIT_1300MA,
37+ USB_INPUT_CUR_LIMIT_MASK))
38+ printf("tps65217_reg_write failure\n");
39+
40 /* Only perform PMIC configurations if board rev > A1 */
41 if (!strncmp(header.version, "00A1", 4))
42 return;
43
44- if (!(pmic_status_reg & PWR_SRC_AC_BITMASK)) {
45- printf("No AC power, disabling frequency switch\n");
46+ /* Set DCDC2 (MPU) voltage to 1.275V */
47+ if (tps65217_voltage_update(DEFDCDC2,
48+ DCDC_VOLT_SEL_1275MV)) {
49+ printf("tps65217_voltage_update failure\n");
50 return;
51 }
52
53@@ -501,20 +509,13 @@ void spl_board_init(void)
54 LDO_VOLTAGE_OUT_3_3, LDO_MASK))
55 printf("tps65217_reg_write failure\n");
56
57- /* Increase USB current limit to 1300mA */
58- if (tps65217_reg_write(PROT_LEVEL_NONE, POWER_PATH,
59- USB_INPUT_CUR_LIMIT_1300MA,
60- USB_INPUT_CUR_LIMIT_MASK))
61- printf("tps65217_reg_write failure\n");
62-
63- /* Set DCDC2 (MPU) voltage to 1.275V */
64- if (!tps65217_voltage_update(DEFDCDC2,
65- DCDC_VOLT_SEL_1275MV)) {
66- /* Set MPU Frequency to 720MHz */
67- mpu_pll_config(MPUPLL_M_720);
68- } else {
69- printf("tps65217_voltage_update failure\n");
70+ if (!(pmic_status_reg & PWR_SRC_AC_BITMASK)) {
71+ printf("No AC power, disabling frequency switch\n");
72+ return;
73 }
74+
75+ /* Set MPU Frequency to 720MHz */
76+ mpu_pll_config(MPUPLL_M_720);
77 } else {
78 /*
79 * EVM PMIC code. PMIC voltage is configuring for frequency
80--
811.7.4.1
82
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0011-ext2load-increase-read-speed.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0006-ext2load-increase-read-speed.patch
index ba86266e..ee33d908 100644
--- a/recipes-bsp/u-boot/u-boot/2011.09git/0011-ext2load-increase-read-speed.patch
+++ b/recipes-bsp/u-boot/u-boot/2011.09git/0006-ext2load-increase-read-speed.patch
@@ -1,7 +1,7 @@
1From 486ce56b1203dd71bad310940b321d3ae13cadec Mon Sep 17 00:00:00 2001 1From f6894e8bc193d225267e4d58a633354e9937c93d Mon Sep 17 00:00:00 2001
2From: u-boot@lakedaemon.net <u-boot@lakedaemon.net> 2From: "u-boot@lakedaemon.net" <u-boot@lakedaemon.net>
3Date: Wed, 28 Mar 2012 04:37:11 +0000 3Date: Wed, 28 Mar 2012 04:37:11 +0000
4Subject: [PATCH 11/15] ext2load: increase read speed 4Subject: [PATCH 06/10] ext2load: increase read speed
5 5
6This patch dramatically drops the amount of time u-boot needs to read a 6This patch dramatically drops the amount of time u-boot needs to read a
7file from an ext2 partition. On a typical 2 to 5 MB file (kernels and 7file from an ext2 partition. On a typical 2 to 5 MB file (kernels and
@@ -16,7 +16,7 @@ userspace, and then confirmed after ext2load.
16Signed-off-by: Jason Cooper <u-boot@lakedaemon.net> 16Signed-off-by: Jason Cooper <u-boot@lakedaemon.net>
17--- 17---
18 fs/ext2/ext2fs.c | 26 ++++++++++++++++++++++++-- 18 fs/ext2/ext2fs.c | 26 ++++++++++++++++++++++++--
19 1 files changed, 24 insertions(+), 2 deletions(-) 19 1 file changed, 24 insertions(+), 2 deletions(-)
20 20
21diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c 21diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c
22index e119e13..8531db5 100644 22index e119e13..8531db5 100644
@@ -70,5 +70,5 @@ index e119e13..8531db5 100644
70 return (len); 70 return (len);
71 } 71 }
72-- 72--
731.7.2.5 731.7.10
74 74
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0007-am335x-evm-fix-ext2load-and-specify-partition-for-bo.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0007-am335x-evm-fix-ext2load-and-specify-partition-for-bo.patch
new file mode 100644
index 00000000..ba7cf033
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot/2011.09git/0007-am335x-evm-fix-ext2load-and-specify-partition-for-bo.patch
@@ -0,0 +1,30 @@
1From 160a0a0145cbe4bca9c0f71286fc8529e57c21c4 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sun, 1 Apr 2012 22:57:37 +0200
4Subject: [PATCH 07/10] am335x-evm: fix ext2load and specify partition for
5 both fatload and ext2load
6
7Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
8---
9 include/configs/am335x_evm.h | 5 ++---
10 1 file changed, 2 insertions(+), 3 deletions(-)
11
12diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
13index 3d37058..a81d716 100755
14--- a/include/configs/am335x_evm.h
15+++ b/include/configs/am335x_evm.h
16@@ -74,9 +74,8 @@
17 "loadbootenv=fatload mmc ${mmc_dev} ${loadaddr} ${bootenv}\0" \
18 "importbootenv=echo Importing environment from mmc ...; " \
19 "env import -t $loadaddr $filesize\0" \
20- "mmc_load_uimage=fatload mmc ${mmc_dev} ${kloadaddr} ${bootfile}\0" \
21- "mmc_load_uimage_ext2=ext2load ${mmc_dev} ${kloadaddr} /boot/${bootfile}\0" \
22- "optargs=\0" \
23+ "mmc_load_uimage=fatload mmc ${mmc_dev}:1 ${kloadaddr} ${bootfile}\0" \
24+ "mmc_load_uimage_ext2=ext2load mmc ${mmc_dev}:2 ${kloadaddr} /boot/${bootfile}\0" \
25 "bootargs_defaults=setenv bootargs " \
26 "console=${console} " \
27 "${optargs}\0" \
28--
291.7.10
30
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
deleted file mode 100644
index b79a8844..00000000
--- a/recipes-bsp/u-boot/u-boot/2011.09git/0008-HACK-am335x-evm-turn-d-cache-on-globally-turn-it-off.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 31d430d8db335b7c3fea08b6aa8309b90b8f2cb9 Mon Sep 17 00:00:00 2001
2From: Tom Rini <trini@ti.com>
3Date: Tue, 8 Nov 2011 08:07:47 +0100
4Subject: [PATCH 8/8] HACK: am335x evm: turn d-cache on globally, turn it off when doing nfs stuff
5
6Signed-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
12diff --git a/board/ti/am335x/evm.c b/board/ti/am335x/evm.c
13index 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
32diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
33index 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--
451.7.2.5
46
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0013-am335x-evm-load-uImage-from-boot-instead-of-VFAT.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0008-am335x-evm-load-uImage-from-boot-instead-of-VFAT.patch
index 49720e9b..70408b6a 100644
--- a/recipes-bsp/u-boot/u-boot/2011.09git/0013-am335x-evm-load-uImage-from-boot-instead-of-VFAT.patch
+++ b/recipes-bsp/u-boot/u-boot/2011.09git/0008-am335x-evm-load-uImage-from-boot-instead-of-VFAT.patch
@@ -1,35 +1,35 @@
1From 4c7580268803485ecbc05c3da3e1bbb9f2f431e0 Mon Sep 17 00:00:00 2001 1From b01ee680bab7b40f6dc9b8087630e5c0251c6fcd Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net> 2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sun, 1 Apr 2012 23:10:22 +0200 3Date: Sun, 1 Apr 2012 23:10:22 +0200
4Subject: [PATCH 13/15] am335x-evm: load uImage from /boot instead of VFAT 4Subject: [PATCH 08/10] am335x-evm: load uImage from /boot instead of VFAT
5 5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7--- 7---
8 include/configs/am335x_evm.h | 4 ++-- 8 include/configs/am335x_evm.h | 4 ++--
9 1 files changed, 2 insertions(+), 2 deletions(-) 9 1 file changed, 2 insertions(+), 2 deletions(-)
10 10
11diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h 11diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
12index 9a4b407..b2628c5 100755 12index a81d716..e42febe 100755
13--- a/include/configs/am335x_evm.h 13--- a/include/configs/am335x_evm.h
14+++ b/include/configs/am335x_evm.h 14+++ b/include/configs/am335x_evm.h
15@@ -102,7 +102,7 @@ 15@@ -101,7 +101,7 @@
16 "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ 16 "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
17 "ip=dhcp\0" \ 17 "ip=dhcp\0" \
18 "mmc_boot=run mmc_args; " \ 18 "mmc_boot=run mmc_args; " \
19- "run mmc_load_uimage; " \ 19- "run mmc_load_uimage; " \
20+ "run mmc_load_uimage_ext2; " \ 20+ "run mmc_load_uimage_ext2; " \
21 "bootm 0x80007fc0\0" \ 21 "bootm ${kloadaddr}\0" \
22 "nand_boot=echo Booting from nand ...; " \ 22 "nand_boot=echo Booting from nand ...; " \
23 "run nand_args; " \ 23 "run nand_args; " \
24@@ -136,7 +136,7 @@ 24@@ -139,7 +139,7 @@
25 "echo Running uenvcmd ...;" \ 25 "echo Running uenvcmd ...;" \
26 "run uenvcmd;" \ 26 "run uenvcmd;" \
27 "fi;" \ 27 "fi;" \
28- "if run mmc_load_uimage; then " \ 28- "if run mmc_load_uimage; then " \
29+ "if run mmc_load_uimage_ext2; then " \ 29+ "if run mmc_load_uimage_ext2; then " \
30 "run mmc_args;" \ 30 "run mmc_args;" \
31 "bootm 0x80007fc0;" \ 31 "bootm ${kloadaddr};" \
32 "fi;" \ 32 "fi;" \
33-- 33--
341.7.2.5 341.7.10
35 35
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0014-ext4fs-ls-load-support.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0009-ext4fs-ls-load-support.patch
index bc81c18e..37ef5d4a 100644
--- a/recipes-bsp/u-boot/u-boot/2011.09git/0014-ext4fs-ls-load-support.patch
+++ b/recipes-bsp/u-boot/u-boot/2011.09git/0009-ext4fs-ls-load-support.patch
@@ -1,7 +1,7 @@
1From 881674a3a8258bfc0f3a130503e2663c2f22817d Mon Sep 17 00:00:00 2001 1From 4e2f3f39a37883bddbe92a71045cb90f489e1d5f Mon Sep 17 00:00:00 2001
2From: uma.shankar <uma.shankar@samsung.com> 2From: "uma.shankar" <uma.shankar@samsung.com>
3Date: Mon, 9 Jan 2012 07:54:50 +0000 3Date: Mon, 9 Jan 2012 07:54:50 +0000
4Subject: [PATCH 14/15] ext4fs ls load support 4Subject: [PATCH 09/10] ext4fs ls load support
5 5
6Signed-off-by: Uma Shankar <uma.shankar@samsung.com> 6Signed-off-by: Uma Shankar <uma.shankar@samsung.com>
7Signed-off-by: Manjunatha C Achar <a.manjunatha@samsung.com> 7Signed-off-by: Manjunatha C Achar <a.manjunatha@samsung.com>
@@ -13,7 +13,7 @@ Signed-off-by: Hakgoo Lee <goodguy.lee@samsung.com>
13 common/cmd_ext4.c | 266 +++++++++++++++ 13 common/cmd_ext4.c | 266 +++++++++++++++
14 fs/Makefile | 1 + 14 fs/Makefile | 1 +
15 fs/ext2/dev.c | 1 + 15 fs/ext2/dev.c | 1 +
16 fs/ext2/ext2fs.c | 181 ++--------- 16 fs/ext2/ext2fs.c | 181 ++--------
17 fs/ext4/Makefile | 51 +++ 17 fs/ext4/Makefile | 51 +++
18 fs/ext4/dev.c | 145 ++++++++ 18 fs/ext4/dev.c | 145 ++++++++
19 fs/ext4/ext4_common.c | 875 +++++++++++++++++++++++++++++++++++++++++++++++++ 19 fs/ext4/ext4_common.c | 875 +++++++++++++++++++++++++++++++++++++++++++++++++
@@ -45,7 +45,7 @@ index 99b9278..6a5068d 100644
45 LIBS += net/libnet.o 45 LIBS += net/libnet.o
46 LIBS += disk/libdisk.o 46 LIBS += disk/libdisk.o
47diff --git a/common/Makefile b/common/Makefile 47diff --git a/common/Makefile b/common/Makefile
48index 54dc558..a1ccfd8 100644 48index 838ae25..b9b5c85 100644
49--- a/common/Makefile 49--- a/common/Makefile
50+++ b/common/Makefile 50+++ b/common/Makefile
51@@ -87,6 +87,7 @@ COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o 51@@ -87,6 +87,7 @@ COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o
@@ -2358,5 +2358,5 @@ index 0000000..5d48021
2358+}; 2358+};
2359+#endif 2359+#endif
2360-- 2360--
23611.7.2.5 23611.7.10
2362 2362
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0015-am335x-switch-to-ext4-mode.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0010-am335x-switch-to-ext4-mode.patch
index 3a932896..4511b6b5 100644
--- a/recipes-bsp/u-boot/u-boot/2011.09git/0015-am335x-switch-to-ext4-mode.patch
+++ b/recipes-bsp/u-boot/u-boot/2011.09git/0010-am335x-switch-to-ext4-mode.patch
@@ -1,44 +1,45 @@
1From 89f08384d5048059ac0a8ab72b6a7a194513dc64 Mon Sep 17 00:00:00 2001 1From 9e1a99476875b1f1e6e34e70d9bf6e77d3ac8fba Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net> 2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Wed, 4 Apr 2012 00:06:31 +0200 3Date: Wed, 4 Apr 2012 00:06:31 +0200
4Subject: [PATCH 15/15] am335x: switch to ext4 mode 4Subject: [PATCH 10/10] am335x: switch to ext4 mode
5 5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7--- 7---
8 include/configs/am335x_evm.h | 6 ++++-- 8 include/configs/am335x_evm.h | 7 ++++---
9 1 files changed, 4 insertions(+), 2 deletions(-) 9 1 file changed, 4 insertions(+), 3 deletions(-)
10 10
11diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h 11diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
12index b2628c5..18d2cac 100755 12index e42febe..e2be380 100755
13--- a/include/configs/am335x_evm.h 13--- a/include/configs/am335x_evm.h
14+++ b/include/configs/am335x_evm.h 14+++ b/include/configs/am335x_evm.h
15@@ -76,6 +76,7 @@ 15@@ -75,7 +75,7 @@
16 "importbootenv=echo Importing environment from mmc ...; " \
16 "env import -t $loadaddr $filesize\0" \ 17 "env import -t $loadaddr $filesize\0" \
17 "mmc_load_uimage=fatload mmc ${mmc_dev}:1 0x80007fc0 ${bootfile}\0" \ 18 "mmc_load_uimage=fatload mmc ${mmc_dev}:1 ${kloadaddr} ${bootfile}\0" \
18 "mmc_load_uimage_ext2=ext2load mmc ${mmc_dev}:2 0x80007fc0 /boot/${bootfile}\0" \ 19- "mmc_load_uimage_ext2=ext2load mmc ${mmc_dev}:2 ${kloadaddr} /boot/${bootfile}\0" \
19+ "mmc_load_uimage_ext4=ext4load mmc ${mmc_dev}:2 0x80007fc0 /boot/${bootfile}\0" \ 20+ "mmc_load_uimage_ext4=ext4load mmc ${mmc_dev}:2 ${kloadaddr} /boot/${bootfile}\0" \
20 "optargs=\0" \
21 "bootargs_defaults=setenv bootargs " \ 21 "bootargs_defaults=setenv bootargs " \
22 "console=${console} " \ 22 "console=${console} " \
23@@ -102,7 +103,7 @@ 23 "${optargs}\0" \
24@@ -101,7 +101,7 @@
24 "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ 25 "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
25 "ip=dhcp\0" \ 26 "ip=dhcp\0" \
26 "mmc_boot=run mmc_args; " \ 27 "mmc_boot=run mmc_args; " \
27- "run mmc_load_uimage_ext2; " \ 28- "run mmc_load_uimage_ext2; " \
28+ "run mmc_load_uimage_ext4; " \ 29+ "run mmc_load_uimage_ext4; " \
29 "bootm 0x80007fc0\0" \ 30 "bootm ${kloadaddr}\0" \
30 "nand_boot=echo Booting from nand ...; " \ 31 "nand_boot=echo Booting from nand ...; " \
31 "run nand_args; " \ 32 "run nand_args; " \
32@@ -136,7 +137,7 @@ 33@@ -139,7 +139,7 @@
33 "echo Running uenvcmd ...;" \ 34 "echo Running uenvcmd ...;" \
34 "run uenvcmd;" \ 35 "run uenvcmd;" \
35 "fi;" \ 36 "fi;" \
36- "if run mmc_load_uimage_ext2; then " \ 37- "if run mmc_load_uimage_ext2; then " \
37+ "if run mmc_load_uimage_ext4; then " \ 38+ "if run mmc_load_uimage_ext4; then " \
38 "run mmc_args;" \ 39 "run mmc_args;" \
39 "bootm 0x80007fc0;" \ 40 "bootm ${kloadaddr};" \
40 "fi;" \ 41 "fi;" \
41@@ -404,6 +405,7 @@ 42@@ -426,6 +426,7 @@
42 #define CONFIG_DOS_PARTITION 43 #define CONFIG_DOS_PARTITION
43 #define CONFIG_CMD_FAT 44 #define CONFIG_CMD_FAT
44 #define CONFIG_CMD_EXT2 45 #define CONFIG_CMD_EXT2
@@ -47,5 +48,5 @@ index b2628c5..18d2cac 100755
47 48
48 /* Unsupported features */ 49 /* Unsupported features */
49-- 50--
501.7.2.5 511.7.10
51 52
diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0012-am335x-evm-fix-ext2load-and-specify-partition-for-bo.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0012-am335x-evm-fix-ext2load-and-specify-partition-for-bo.patch
deleted file mode 100644
index 8bd6a42f..00000000
--- a/recipes-bsp/u-boot/u-boot/2011.09git/0012-am335x-evm-fix-ext2load-and-specify-partition-for-bo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 6233c6274e86dad6bac240cf8703e0a0b3e14e27 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sun, 1 Apr 2012 22:57:37 +0200
4Subject: [PATCH 12/15] am335x-evm: fix ext2load and specify partition for both fatload and ext2load
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8 include/configs/am335x_evm.h | 4 ++--
9 1 files changed, 2 insertions(+), 2 deletions(-)
10
11diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
12index 5a7e9a8..9a4b407 100755
13--- a/include/configs/am335x_evm.h
14+++ b/include/configs/am335x_evm.h
15@@ -74,8 +74,8 @@
16 "loadbootenv=fatload mmc ${mmc_dev} ${loadaddr} ${bootenv}\0" \
17 "importbootenv=echo Importing environment from mmc ...; " \
18 "env import -t $loadaddr $filesize\0" \
19- "mmc_load_uimage=fatload mmc ${mmc_dev} 0x80007fc0 ${bootfile}\0" \
20- "mmc_load_uimage_ext2=ext2load ${mmc_dev} 0x80007fc0 /boot/${bootfile}\0" \
21+ "mmc_load_uimage=fatload mmc ${mmc_dev}:1 0x80007fc0 ${bootfile}\0" \
22+ "mmc_load_uimage_ext2=ext2load mmc ${mmc_dev}:2 0x80007fc0 /boot/${bootfile}\0" \
23 "optargs=\0" \
24 "bootargs_defaults=setenv bootargs " \
25 "console=${console} " \
26--
271.7.2.5
28
diff --git a/recipes-bsp/u-boot/u-boot_2011.10rc.bb b/recipes-bsp/u-boot/u-boot_2011.10rc.bb
index 48bc618a..c4b4ca7e 100644
--- a/recipes-bsp/u-boot/u-boot_2011.10rc.bb
+++ b/recipes-bsp/u-boot/u-boot_2011.10rc.bb
@@ -6,32 +6,27 @@ COMPATIBLE_MACHINE = "(ti33x)"
6DEFAULT_PREFERENCE_ti33x = "99" 6DEFAULT_PREFERENCE_ti33x = "99"
7 7
8PV = "2011.09+git" 8PV = "2011.09+git"
9PR = "r27" 9PR = "r28"
10 10
11# SPL build 11# SPL build
12UBOOT_BINARY = "u-boot.img" 12UBOOT_BINARY = "u-boot.img"
13UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img" 13UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img"
14UBOOT_SYMLINK = "u-boot-${MACHINE}.img" 14UBOOT_SYMLINK = "u-boot-${MACHINE}.img"
15 15
16SRC_URI = "git://arago-project.org/git/projects/u-boot-am33x.git;protocol=git;branch=int_am335xpsp_04.06.00.01-v2011.09-for-sdk-05.03.00.00 \ 16SRC_URI = "git://arago-project.org/git/projects/u-boot-am33x.git;protocol=git;branch=master \
17 file://2011.09git/0001-am335x_evm-only-do-in-kernel-dhcp-when-using-NFS-use.patch \ 17 file://2011.09git/0001-am335x_evm-add-option-to-boot-kernel-from-boot-in-ex.patch \
18 file://2011.09git/0002-am335x_evm-boot-kernel-from-boot-in-ext2-3-filesyste.patch \ 18 file://2011.09git/0002-am335x_evm-set-bootdelay-to-1.patch \
19 file://2011.09git/0003-am335x_evm-set-bootdelay-to-1.patch \ 19 file://2011.09git/0003-am335x-evm-make-MMC-rootfs-RO-on-boot-so-fsck-works.patch \
20 file://2011.09git/0004-am335x-evm-make-MMC-rootfs-RO-on-boot-so-fsck-works.patch \ 20 file://2011.09git/0004-am335x_evm-switch-to-ext4.patch \
21 file://2011.09git/0005-am335x-Change-mmc_load_uimage-to-load-at-a-fixed-add.patch \ 21 file://2011.09git/0005-am335x-evm-enable-i2c2-pinmux-for-beaglebone.patch \
22 file://2011.09git/0006-am335x-evm-Fix-bone-pmic-shut-down-over-USB-power.patch \ 22 file://2011.09git/0006-ext2load-increase-read-speed.patch \
23 file://2011.09git/0007-am335x_evm-switch-to-ext4.patch \ 23 file://2011.09git/0007-am335x-evm-fix-ext2load-and-specify-partition-for-bo.patch \
24 file://2011.09git/0008-HACK-am335x-evm-turn-d-cache-on-globally-turn-it-off.patch \ 24 file://2011.09git/0008-am335x-evm-load-uImage-from-boot-instead-of-VFAT.patch \
25 file://2011.09git/0009-am335x-evm-enable-i2c2-pinmux-for-beaglebone.patch \ 25 file://2011.09git/0009-ext4fs-ls-load-support.patch \
26 file://2011.09git/0001-ddr_defs-change-DDR-timings-for-15x15-EVM.patch \ 26 file://2011.09git/0010-am335x-switch-to-ext4-mode.patch \
27 file://2011.09git/0011-ext2load-increase-read-speed.patch \
28 file://2011.09git/0012-am335x-evm-fix-ext2load-and-specify-partition-for-bo.patch \
29 file://2011.09git/0013-am335x-evm-load-uImage-from-boot-instead-of-VFAT.patch \
30 file://2011.09git/0014-ext4fs-ls-load-support.patch \
31 file://2011.09git/0015-am335x-switch-to-ext4-mode.patch \
32 " 27 "
33 28
34SRCREV = "f63b270e47f62f4d1a05b2001357e215966c6f5a" 29SRCREV = "ec687252299796639ff9bcb981804fbec7b445a4"
35 30
36LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" 31LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
37 32