From: Koen Kooi Date: Wed, 12 Oct 2011 09:01:16 +0000 (+0200) Subject: u-boot 2011.10rc: update to latest Joel, rebase Jasons patches X-Git-Tag: v2012.05-yocto1.2~330 X-Git-Url: https://git.ti.com/gitweb?p=glsdk%2Fmeta-ti-glsdk.git;a=commitdiff_plain;h=caae2e5a8fe057de9c48bb1da783a72dc6ddabaf u-boot 2011.10rc: update to latest Joel, rebase Jasons patches Signed-off-by: Koen Kooi --- diff --git a/recipes-bsp/u-boot/u-boot/0001-am335x-evm-hack-in-ethernet-rmii-clock.patch b/recipes-bsp/u-boot/u-boot/0001-am335x-evm-hack-in-ethernet-rmii-clock.patch deleted file mode 100644 index 3f03056..0000000 --- a/recipes-bsp/u-boot/u-boot/0001-am335x-evm-hack-in-ethernet-rmii-clock.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8bf8cbead1115e2a47b74f53b96272bbacad0df2 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Fri, 7 Oct 2011 18:17:50 +0200 -Subject: [PATCH 1/5] am335x-evm: hack in ethernet rmii clock - -Signed-off-by: Koen Kooi ---- - include/configs/am335x_evm.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index 543c604..0f806aa 100755 ---- a/include/configs/am335x_evm.h -+++ b/include/configs/am335x_evm.h -@@ -163,7 +163,7 @@ - "bootm ${loadaddr}\0" \ - - #define CONFIG_BOOTCOMMAND \ -- "if mmc rescan; then " \ -+ "mw.l 0x44e10650 0x05 ; if mmc rescan; then " \ - "if run loadbootscript; then " \ - "run bootscript; " \ - "else " \ --- -1.6.6.1 - diff --git a/recipes-bsp/u-boot/u-boot/0002-am335x_evm-reduced-bootdelay-to-0.patch b/recipes-bsp/u-boot/u-boot/0002-am335x_evm-reduced-bootdelay-to-0.patch deleted file mode 100644 index b93d704..0000000 --- a/recipes-bsp/u-boot/u-boot/0002-am335x_evm-reduced-bootdelay-to-0.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8c7d293dcbf1bb53c4e8f26fc2553e99880978d1 Mon Sep 17 00:00:00 2001 -From: Jason Kridner -Date: Sat, 8 Oct 2011 15:48:57 -0400 -Subject: [PATCH 2/5] am335x_evm: reduced bootdelay to 0 - ---- - include/configs/am335x_evm.h | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index 0f806aa..c5e608c 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 */ - - /* set to negative value for no autoboot */ --#define CONFIG_BOOTDELAY 3 -+#define CONFIG_BOOTDELAY 0 - - # if defined(CONFIG_SPI_BOOT) - # define CONFIG_SPI 1 -@@ -73,9 +73,6 @@ - #define CONFIG_SETUP_MEMORY_TAGS 1 - #define CONFIG_INITRD_TAG 1 /* Required for ramdisk support */ - --/* set to negative value for no autoboot */ --#define CONFIG_BOOTDELAY 3 -- - #define CONFIG_MMC 1 - - #ifndef CONFIG_NOR_BOOT --- -1.6.6.1 - diff --git a/recipes-bsp/u-boot/u-boot/0005-am335x_evm-remove-redundant-attempt-to-load-uImage.patch b/recipes-bsp/u-boot/u-boot/0005-am335x_evm-remove-redundant-attempt-to-load-uImage.patch deleted file mode 100644 index 6d48448..0000000 --- a/recipes-bsp/u-boot/u-boot/0005-am335x_evm-remove-redundant-attempt-to-load-uImage.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2f05cac97c5aba4d2dbd3e9ec6c53c8cbf27ee77 Mon Sep 17 00:00:00 2001 -From: Jason Kridner -Date: Sat, 8 Oct 2011 16:57:08 -0400 -Subject: [PATCH 5/5] am335x_evm: remove redundant attempt to load uImage - ---- - include/configs/am335x_evm.h | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index e157fd7..cb69176 100755 ---- a/include/configs/am335x_evm.h -+++ b/include/configs/am335x_evm.h -@@ -175,9 +175,7 @@ - "echo Running uenvcmd ...;" \ - "run uenvcmd;" \ - "fi;" \ -- "if run mmc_load_uimage; then " \ -- "run mmc_boot; " \ -- "fi; " \ -+ "run mmc_boot; " \ - "fi; " \ - "run nand_boot; " \ - --- -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/0001-am335x_evm-reduced-bootdelay-to-1.patch new file mode 100644 index 0000000..126806d --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.09git/0001-am335x_evm-reduced-bootdelay-to-1.patch @@ -0,0 +1,26 @@ +From 722fc7ad06a0353c1c1d168804747c5c56614ae3 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 + +Signed-off-by: Koen Kooi +--- + include/configs/am335x_evm.h | 2 +- + 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 +--- 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 */ + + /* set to negative value for no autoboot */ +-#define CONFIG_BOOTDELAY 3 ++#define CONFIG_BOOTDELAY 1 + + # if defined(CONFIG_SPI_BOOT) + # define CONFIG_SPI 1 +-- +1.6.6.1 + diff --git a/recipes-bsp/u-boot/u-boot/0004-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 similarity index 61% rename from recipes-bsp/u-boot/u-boot/0004-am335x_evm-read-uEnv.txt-instead-of-boot.scr.patch rename to recipes-bsp/u-boot/u-boot/2011.09git/0002-am335x_evm-read-uEnv.txt-instead-of-boot.scr.patch index c8a0539..a2e0f6d 100644 --- a/recipes-bsp/u-boot/u-boot/0004-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 @@ -1,35 +1,32 @@ -From abf7185e16b2b96db7aa06af56bd84836eff92f6 Mon Sep 17 00:00:00 2001 -From: Jason Kridner -Date: Sat, 8 Oct 2011 16:20:50 -0400 -Subject: [PATCH 4/5] am335x_evm: read uEnv.txt instead of boot.scr +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 -Also restructured the BOOTCMD flow a bit to avoid pointless if/then depth. - -I'm considering to respect both boot.scr and uEnv.txt. +Signed-off-by: Koen Kooi --- - include/configs/am335x_evm.h | 30 ++++++++++++++++++------------ - 1 files changed, 18 insertions(+), 12 deletions(-) + 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 a2e4564..e157fd7 100755 +index dbb412a..5a28724 100755 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h -@@ -112,6 +112,10 @@ +@@ -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" \ ++ "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 " \ -@@ -161,19 +165,21 @@ - "bootm ${loadaddr}\0" \ +@@ -167,18 +171,17 @@ #define CONFIG_BOOTCOMMAND \ -- "mw.l 0x44e10650 0x05 ; if mmc rescan; then " \ + "if mmc rescan; then " \ - "if run loadbootscript; then " \ - "run bootscript; " \ - "else " \ @@ -38,8 +35,6 @@ index a2e4564..e157fd7 100755 - "else " \ - "run nand_boot; " \ - "fi; " \ -+ "mw.l 0x44e10650 0x05 ; " \ -+ "if mmc rescan; then " \ + "if run loadbootenv; then " \ + "echo Loaded environment from ${bootenv};" \ + "run importbootenv; " \ @@ -51,9 +46,7 @@ index a2e4564..e157fd7 100755 + "echo Running uenvcmd ...;" \ + "run uenvcmd;" \ + "fi;" \ -+ "if run mmc_load_uimage; then " \ -+ "run mmc_boot; " \ -+ "fi; " \ ++ "run mmc_boot; " \ + "fi; " \ + "run nand_boot; " \ diff --git a/recipes-bsp/u-boot/u-boot/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 similarity index 100% rename from recipes-bsp/u-boot/u-boot/0003-am335x_evm-boot-kernel-from-ext2-filesystem.patch rename to recipes-bsp/u-boot/u-boot/2011.09git/0003-am335x_evm-boot-kernel-from-ext2-filesystem.patch diff --git a/recipes-bsp/u-boot/u-boot_2011.10rc.bb b/recipes-bsp/u-boot/u-boot_2011.10rc.bb index 5607bd6..8c3384e 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 COMPATIBLE_MACHINE = "beaglebone" DEFAULT_PREFERENCE_beaglebone = "99" PV = "2011.09+git" -PR = "r3" +PR = "r4" # SPL build UBOOT_BINARY = "u-boot.img" @@ -12,13 +12,11 @@ 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://0001-am335x-evm-hack-in-ethernet-rmii-clock.patch \ - file://0002-am335x_evm-reduced-bootdelay-to-0.patch \ - file://0003-am335x_evm-boot-kernel-from-ext2-filesystem.patch \ - file://0004-am335x_evm-read-uEnv.txt-instead-of-boot.scr.patch \ - file://0005-am335x_evm-remove-redundant-attempt-to-load-uImage.patch \ + 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 \ " -SRCREV = "d643e691ab2055ef64f73dd70300a73e0443d1ef" +SRCREV = "fb3043c07bc05df83d38bfd2b303f2c9a96779c6" LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"