diff options
author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-10-06 19:09:16 +0200 |
---|---|---|
committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-10-06 19:09:16 +0200 |
commit | a266b5263d6fa6a86172f2ccd7c6f4b4d23fd1d6 (patch) | |
tree | 7732d2b5abbc867299fa2927531ddbb4a81035a2 /recipes/u-boot/u-boot-git | |
parent | 9aedaeda167e1adf065974bf078ce5615a60b38e (diff) | |
download | openembedded-a266b5263d6fa6a86172f2ccd7c6f4b4d23fd1d6.tar.gz |
u-boot : moved unused files to obsolete dir
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/u-boot/u-boot-git')
-rw-r--r-- | recipes/u-boot/u-boot-git/Cortex-A8-erratum-725233.diff | 45 | ||||
-rw-r--r-- | recipes/u-boot/u-boot-git/beagleboard/0040-BeagleBoard-Check-for-ramdisk-on-boot.patch | 97 |
2 files changed, 0 insertions, 142 deletions
diff --git a/recipes/u-boot/u-boot-git/Cortex-A8-erratum-725233.diff b/recipes/u-boot/u-boot-git/Cortex-A8-erratum-725233.diff deleted file mode 100644 index 73f955b69a..0000000000 --- a/recipes/u-boot/u-boot-git/Cortex-A8-erratum-725233.diff +++ /dev/null @@ -1,45 +0,0 @@ -From: Siarhei Siamashka <siarhei.siamashka@gmail.com> -Date: Wed, 24 Feb 2010 04:56:36 +0000 (-0500) -Subject: OMAP3: workaround for ARM Cortex-A8 erratum 725233 -X-Git-Url: http://git.denx.de/?p=u-boot%2Fu-boot-arm.git;a=commitdiff_plain;h=42d97d08838d4e010d80c92ad1300c426320dd18 - -OMAP3: workaround for ARM Cortex-A8 erratum 725233 - -725233: PLD instructions executed with PLD data forwarding -enabled can result in a processor deadlock - -This deadlock can happen when NEON load instructions are used together -with cache preload instructions (PLD). The problematic conditions -can be triggered in-the-wild by NEON optimized functions from pixman -library (http://cgit.freedesktop.org/pixman), which perform dynamic -adjustment of prefetch distance. - -The workaround disables PLD data forwarding by setting PLD_FWD bit -in L2 Cache Auxiliary Control Register as recommended in ARM Cortex-A8 -errata list. - -The deadlock can only happen on r1pX revisions of Cortex-A8 (used in -OMAP34xx/OMAP35xx). Performance impact of the workaround is practically -non-existant. - -Signed-off-by: Siarhei Siamashka <siarhei.siamashka@gmail.com> -Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> ---- - -diff --git a/cpu/arm_cortexa8/omap3/board.c b/cpu/arm_cortexa8/omap3/board.c -index 2aa69b3..7b78fa4 100644 ---- a/cpu/arm_cortexa8/omap3/board.c -+++ b/cpu/arm_cortexa8/omap3/board.c -@@ -146,6 +146,12 @@ void setup_auxcr() - __asm__ __volatile__("orr r0, r0, #1 << 5"); - /* SMI instruction to call ROM Code API */ - __asm__ __volatile__(".word 0xE1600070"); -+ /* Set PLD_FWD bit in L2AUXCR (Cortex-A8 erratum 725233 workaround) */ -+ __asm__ __volatile__("mov r12, #0x2"); -+ __asm__ __volatile__("mrc p15, 1, r0, c9, c0, 2"); -+ __asm__ __volatile__("orr r0, r0, #1 << 27"); -+ /* SMI instruction to call ROM Code API */ -+ __asm__ __volatile__(".word 0xE1600070"); - __asm__ __volatile__("mov r0, %0":"=r"(i)); - __asm__ __volatile__("mov r12, %0":"=r"(j)); - } diff --git a/recipes/u-boot/u-boot-git/beagleboard/0040-BeagleBoard-Check-for-ramdisk-on-boot.patch b/recipes/u-boot/u-boot-git/beagleboard/0040-BeagleBoard-Check-for-ramdisk-on-boot.patch deleted file mode 100644 index c3ba38fc38..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0040-BeagleBoard-Check-for-ramdisk-on-boot.patch +++ /dev/null @@ -1,97 +0,0 @@ -From bfeec530621dd8b30d81917abe94c3c55eed0fba Mon Sep 17 00:00:00 2001 -From: Jason Kridner <jkridner@beagleboard.org> -Date: Wed, 2 Jun 2010 18:27:38 -0500 -Subject: [PATCH] BeagleBoard: Check for ramdisk on boot - -To simplify booting into various boot configurations, there is now a -test for an existing ramdisk.gz image if loading the boot script fails. - -Adding additional boot arguments can also be done using optargs. - -(cherry picked from commit e96988f27cfa51f353ae4f678c59445deb161c5e) - -Signed-off-by: Jason Kridner <jkridner@beagleboard.org> ---- - include/configs/omap3_beagle.h | 29 ++++++++++++++++++++++++++--- - 1 files changed, 26 insertions(+), 3 deletions(-) - -diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index acca697..c2fc6ba 100644 ---- a/include/configs/omap3_beagle.h -+++ b/include/configs/omap3_beagle.h -@@ -181,9 +181,12 @@ - #define CONFIG_BOOTDELAY 3 - - #define CONFIG_EXTRA_ENV_SETTINGS \ -- "loadaddr=0x82000000\0" \ -+ "loadaddr=0x80200000\0" \ -+ "rdaddr=0x81600000\0" \ - "usbtty=cdc_acm\0" \ - "console=ttyS2,115200n8\0" \ -+ "optargs=\0" \ -+ "bootscr=boot.scr\0" \ - "mpurate=500\0" \ - "buddy=none\0" \ - "vram=12M\0" \ -@@ -195,6 +198,7 @@ - "nandroot=/dev/mtdblock4 rw\0" \ - "nandrootfstype=jffs2\0" \ - "mmcargs=setenv bootargs console=${console} " \ -+ "${optargs} " \ - "mpurate=${mpurate} " \ - "buddy=${buddy} "\ - "vram=${vram} " \ -@@ -203,6 +207,7 @@ - "root=${mmcroot} " \ - "rootfstype=${mmcrootfstype}\0" \ - "nandargs=setenv bootargs console=${console} " \ -+ "${optargs} " \ - "mpurate=${mpurate} " \ - "buddy=${buddy} "\ - "vram=${vram} " \ -@@ -210,7 +215,18 @@ - "omapdss.def_disp=${defaultdisplay} " \ - "root=${nandroot} " \ - "rootfstype=${nandrootfstype}\0" \ -- "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ -+ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} ${bootscr}\0" \ -+ "ramargs=setenv bootargs console=${console} " \ -+ "${optargs} " \ -+ "mpurate=${mpurate} " \ -+ "buddy=${buddy} "\ -+ "vram=${vram} " \ -+ "omapfb.mode=dvi:${dvimode} " \ -+ "omapdss.def_disp=${defaultdisplay} " \ -+ "root=/dev/ram0 rw ramdisk_size=65536 " \ -+ "initrd=${rdaddr},64M " \ -+ "rootfstype=\0" \ -+ "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ - "bootscript=echo Running bootscript from mmc ...; " \ - "source ${loadaddr}\0" \ - "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ -@@ -221,6 +237,9 @@ - "run nandargs; " \ - "nand read ${loadaddr} 280000 400000; " \ - "bootm ${loadaddr}\0" \ -+ "ramboot=echo Booting from ramdisk ...; " \ -+ "run ramargs; " \ -+ "bootm ${loadaddr}\0" \ - - #define CONFIG_BOOTCOMMAND \ - "if mmc init ${mmcdev}; then " \ -@@ -228,7 +247,11 @@ - "run bootscript; " \ - "else " \ - "if run loaduimage; then " \ -- "run mmcboot; " \ -+ "if run loadramdisk; then " \ -+ "run ramboot; " \ -+ "else " \ -+ "run mmcboot; " \ -+ "fi; " \ - "else run nandboot; " \ - "fi; " \ - "fi; " \ --- -1.5.6.4 - |