diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-06-12 22:21:07 +0200 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-06-12 22:21:07 +0200 |
| commit | c326ad5a1960df22c5efd71bd815b9b12688556e (patch) | |
| tree | 09bd868c4446f3510a070ed601e7b67c6b791cde /recipes/u-boot | |
| parent | dd0fdfe9ed922189f4251c688b7a16faa76cd904 (diff) | |
| parent | 2bca6bd1a15123af28ff5ef8fd6ebb417a3a4dee (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/tgt/tgt_1.0.5.bb
Diffstat (limited to 'recipes/u-boot')
| -rw-r--r-- | recipes/u-boot/files/bug20/bug-video-setting.patch | 10 | ||||
| -rw-r--r-- | recipes/u-boot/u-boot_git.bb | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/recipes/u-boot/files/bug20/bug-video-setting.patch b/recipes/u-boot/files/bug20/bug-video-setting.patch new file mode 100644 index 0000000000..caaccf5545 --- /dev/null +++ b/recipes/u-boot/files/bug20/bug-video-setting.patch @@ -0,0 +1,10 @@ +Index: git/include/configs/omap3_bug.h +=================================================================== +@@ -388,7 +388,7 @@ + #define CONFIG_EXTRA_ENV_SETTINGS \ + "console=ttyS2,115200n8\0" \ + "mmcboot=mmc init;ext2load mmc 0:1 0x80000000 /boot/uImage;run mmcargs;bootm 0x80000000\0"\ +- "mmcargs=setenv bootargs console=${console} root=/dev/mmcblk0p1 rw rootwait rootdelay=1 kgdboc=${console} usbcore.autosuspend=-1\0" \ ++ "mmcargs=setenv bootargs console=${console} root=/dev/mmcblk0p1 rw rootwait rootdelay=1 kgdboc=${console} usbcore.autosuspend=-1 vram=24M omapfb.vram=0:0M,1:24M,2:0M omapdss.def_disp=dvi omapfb.mode=dvi:1280x1024MR-32@57\0" \ + + #define CONFIG_ETHADDR aa:bb:cc:dd:ee:ff diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 1c36074023..4cde8e4f0a 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR ="r53" +PR ="r54" FILESPATHPKG =. "u-boot-git:" @@ -19,6 +19,7 @@ SRC_URI_append_afeb9260 = " file://AFEB9260-network-fix.patch" SRC_URI_append_afeb9260-180 = " file://AFEB9260-network-fix.patch" SRC_URI_append_cm-t35 = "file://cm-t35/cm-t35.patch" SRC_URI_append_bug20 = "file://bug-uboot.patch" +SRC_URI_append_bug20 += "file://bug-video-setting.patch" SRC_URI_beagleboard = "git://www.denx.de/git/u-boot.git;protocol=git \ file://0001-OMAP3-enable-i2c-bus-switching-for-Beagle-and-Overo.patch \ |