diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0001-am335x_evm-boot-kernel-from-ext2-3-filesystem.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0001-am335x_evm-boot-kernel-from-ext2-3-filesystem.patch new file mode 100644 index 00000000..1ed68ea8 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.09git/0001-am335x_evm-boot-kernel-from-ext2-3-filesystem.patch @@ -0,0 +1,27 @@ +From 30c5198d37863d4f1598f7fe2b8f690b6cf6ae53 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Thu, 13 Oct 2011 12:15:25 +0200 +Subject: [PATCH 1/2] am335x_evm: boot kernel from ext2/3 filesystem + +Signed-off-by: Koen Kooi +--- + include/configs/am335x_evm.h | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h +index f1cc2b2..9ce360d 100755 +--- a/include/configs/am335x_evm.h ++++ b/include/configs/am335x_evm.h +@@ -74,7 +74,8 @@ + "loadbootenv=fatload mmc ${mmc_dev} ${loadaddr} ${bootenv}\0" \ + "importbootenv=echo Importing environment from mmc ...; " \ + "env import -t $loadaddr $filesize\0" \ +- "mmc_load_uimage=fatload mmc ${mmc_dev} ${loadaddr} ${bootfile}\0" \ ++ "mmc_load_uimage_fat=fatload mmc ${mmc_dev} ${loadaddr} ${bootfile}\0" \ ++ "mmc_load_uimage=ext2load mmc 0:2 ${loadaddr} /boot/${bootfile}\0" \ + "bootargs_defaults=setenv bootargs " \ + "console=${console}\0" \ + "mmc_args=run bootargs_defaults;" \ +-- +1.6.6.1 + diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0002-am335x_evm-read-uEnv.txt-instead-of-boot.scr.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0002-am335x_evm-read-uEnv.txt-instead-of-boot.scr.patch deleted file mode 100644 index a2e0f6d1..00000000 --- a/recipes-bsp/u-boot/u-boot/2011.09git/0002-am335x_evm-read-uEnv.txt-instead-of-boot.scr.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 527309ca11da0a258479da8443f00de0003c4bf9 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Wed, 12 Oct 2011 10:50:51 +0200 -Subject: [PATCH 2/2] am335x_evm: read uEnv.txt instead of boot.scr - -Signed-off-by: Koen Kooi ---- - include/configs/am335x_evm.h | 25 ++++++++++++++----------- - 1 files changed, 14 insertions(+), 11 deletions(-) - -diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index dbb412a..5a28724 100755 ---- a/include/configs/am335x_evm.h -+++ b/include/configs/am335x_evm.h -@@ -116,6 +116,10 @@ - "loadbootscript=fatload mmc 0 ${script_addr} boot.scr\0" \ - "bootscript= echo Running bootscript from MMC/SD to set the ENV...; " \ - "source ${script_addr}\0" \ -+ "bootenv=uEnv.txt\0" \ -+ "loadbootenv=fatload mmc 0 ${loadaddr} ${bootenv}\0" \ -+ "importbootenv=echo Importing environment from mmc ...; " \ -+ "env import -t $loadaddr $filesize\0" \ - "mmc_load_uimage_fat=fatload mmc 0 ${loadaddr} ${bootfile}\0" \ - "mmc_load_uimage=ext2load mmc 0:2 ${loadaddr} /boot/${bootfile}\0" \ - "bootargs_defaults=setenv bootargs " \ -@@ -167,18 +171,17 @@ - - #define CONFIG_BOOTCOMMAND \ - "if mmc rescan; then " \ -- "if run loadbootscript; then " \ -- "run bootscript; " \ -- "else " \ -- "if run mmc_load_uimage; then " \ -- "run mmc_boot; " \ -- "else " \ -- "run nand_boot; " \ -- "fi; " \ -+ "if run loadbootenv; then " \ -+ "echo Loaded environment from ${bootenv};" \ -+ "run importbootenv; " \ - "fi; " \ -- "else " \ -- "run nand_boot; " \ -- "fi" -+ "if test -n $uenvcmd; then " \ -+ "echo Running uenvcmd ...;" \ -+ "run uenvcmd;" \ -+ "fi;" \ -+ "run mmc_boot; " \ -+ "fi; " \ -+ "run nand_boot; " \ - - #define CONFIG_DISPLAY_BOARDINFO - #define CONFIG_MISC_INIT_R --- -1.6.6.1 - diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0001-am335x_evm-reduced-bootdelay-to-1.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0002-am335x_evm-set-bootdelay-to-0.patch similarity index 54% rename from recipes-bsp/u-boot/u-boot/2011.09git/0001-am335x_evm-reduced-bootdelay-to-1.patch rename to recipes-bsp/u-boot/u-boot/2011.09git/0002-am335x_evm-set-bootdelay-to-0.patch index 126806de..f3ca6807 100644 --- a/recipes-bsp/u-boot/u-boot/2011.09git/0001-am335x_evm-reduced-bootdelay-to-1.patch +++ b/recipes-bsp/u-boot/u-boot/2011.09git/0002-am335x_evm-set-bootdelay-to-0.patch @@ -1,7 +1,7 @@ -From 722fc7ad06a0353c1c1d168804747c5c56614ae3 Mon Sep 17 00:00:00 2001 +From 481457db4fe870fcbab47fe29cb768daf235fd1f Mon Sep 17 00:00:00 2001 From: Koen Kooi -Date: Wed, 12 Oct 2011 10:45:17 +0200 -Subject: [PATCH 1/2] am335x_evm: reduced bootdelay to 1 +Date: Thu, 13 Oct 2011 12:17:27 +0200 +Subject: [PATCH 2/2] am335x_evm: set bootdelay to 0 Signed-off-by: Koen Kooi --- @@ -9,18 +9,18 @@ Signed-off-by: Koen Kooi 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index ddadc3e..dbb412a 100755 +index 9ce360d..78c823b 100755 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h -@@ -24,7 +24,7 @@ - #define CONFIG_AM335X_HSMMC_INSTANCE 0 /* 0 - MMC0, 1 - MMC1 */ +@@ -38,7 +38,7 @@ + #define CONFIG_INITRD_TAG /* Required for ramdisk support */ /* set to negative value for no autoboot */ -#define CONFIG_BOOTDELAY 3 -+#define CONFIG_BOOTDELAY 1 ++#define CONFIG_BOOTDELAY 0 - # if defined(CONFIG_SPI_BOOT) - # define CONFIG_SPI 1 + #define CONFIG_MMC + #define CONFIG_NAND -- 1.6.6.1 diff --git a/recipes-bsp/u-boot/u-boot/2011.09git/0003-am335x_evm-boot-kernel-from-ext2-filesystem.patch b/recipes-bsp/u-boot/u-boot/2011.09git/0003-am335x_evm-boot-kernel-from-ext2-filesystem.patch deleted file mode 100644 index 47fa7aa1..00000000 --- a/recipes-bsp/u-boot/u-boot/2011.09git/0003-am335x_evm-boot-kernel-from-ext2-filesystem.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9de8f53dea91169f3b8a9473ad2b5c9c0fdd0eb1 Mon Sep 17 00:00:00 2001 -From: Jason Kridner -Date: Sat, 8 Oct 2011 16:22:53 -0400 -Subject: [PATCH 3/5] am335x_evm: boot kernel from ext2 filesystem - ---- - include/configs/am335x_evm.h | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index c5e608c..a2e4564 100755 ---- a/include/configs/am335x_evm.h -+++ b/include/configs/am335x_evm.h -@@ -112,7 +112,8 @@ - "loadbootscript=fatload mmc 0 ${script_addr} boot.scr\0" \ - "bootscript= echo Running bootscript from MMC/SD to set the ENV...; " \ - "source ${script_addr}\0" \ -- "mmc_load_uimage=fatload mmc 0 ${loadaddr} ${bootfile}\0" \ -+ "mmc_load_uimage_fat=fatload mmc 0 ${loadaddr} ${bootfile}\0" \ -+ "mmc_load_uimage=ext2load mmc 0:2 ${loadaddr} /boot/${bootfile}\0" \ - "bootargs_defaults=setenv bootargs " \ - "console=${console}\0 " \ - "mmc_args=run bootargs_defaults;" \ -@@ -403,6 +404,7 @@ - # define CONFIG_CMD_MMC 1 - # define CONFIG_DOS_PARTITION 1 - # define CONFIG_CMD_FAT 1 -+# define CONFIG_CMD_EXT2 1 - #endif - - /* Unsupported features */ --- -1.6.6.1 - diff --git a/recipes-bsp/u-boot/u-boot_2011.10rc.bb b/recipes-bsp/u-boot/u-boot_2011.10rc.bb index 8c3384e6..44ebeb63 100644 --- a/recipes-bsp/u-boot/u-boot_2011.10rc.bb +++ b/recipes-bsp/u-boot/u-boot_2011.10rc.bb @@ -4,19 +4,19 @@ require u-boot.inc COMPATIBLE_MACHINE = "beaglebone" DEFAULT_PREFERENCE_beaglebone = "99" PV = "2011.09+git" -PR = "r4" +PR = "r5" # SPL build UBOOT_BINARY = "u-boot.img" UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img" UBOOT_SYMLINK = "u-boot-${MACHINE}.img" -SRC_URI = "git://github.com/joelagnel/u-boot.git;protocol=git;branch=bone-bringup \ - file://2011.09git/0003-am335x_evm-boot-kernel-from-ext2-filesystem.patch \ - file://2011.09git/0001-am335x_evm-reduced-bootdelay-to-1.patch \ - file://2011.09git/0002-am335x_evm-read-uEnv.txt-instead-of-boot.scr.patch \ +SRC_URI = "git://github.com/trini/u-boot.git;protocol=git;branch=int_am335xpsp_04.06.00.01-v2011.09-for-sdk-05.03.00.00 \ + file://2011.09git/0001-am335x_evm-boot-kernel-from-ext2-3-filesystem.patch \ + file://2011.09git/0002-am335x_evm-set-bootdelay-to-0.patch \ " -SRCREV = "fb3043c07bc05df83d38bfd2b303f2c9a96779c6" + +SRCREV = "456880b203bc44c025c374c98fa327b804a9cf64" LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"