summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/uboot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch29
-rw-r--r--packages/uboot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb (renamed from packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb)0
-rw-r--r--packages/uboot/u-boot-openmoko_svn.bb (renamed from packages/uboot/uboot-openmoko_svn.bb)50
3 files changed, 53 insertions, 26 deletions
diff --git a/packages/uboot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch b/packages/uboot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch
new file mode 100644
index 0000000000..c97880a01c
--- /dev/null
+++ b/packages/uboot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch
@@ -0,0 +1,29 @@
+--- git.orig/drivers/video/cfb_console.c 2007-12-27 00:59:35.000000000 -0800
++++ git/drivers/video/cfb_console.c 2007-12-27 08:23:42.000000000 -0800
+@@ -141,6 +141,14 @@
+ #endif
+
+ /*****************************************************************************/
++/* Defines for the S3C2410 driver */
++/*****************************************************************************/
++#ifdef CONFIG_VIDEO_S3C2410
++/* it actually is little-endian, but the host CPU, too ! */
++//#define VIDEO_FB_LITTLE_ENDIAN
++#endif
++
++/*****************************************************************************/
+ /* Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc */
+ /*****************************************************************************/
+ #include <video_fb.h>
+@@ -309,6 +317,11 @@
+ #define SHORTSWAP32(x) (x)
+ #endif
+
++#ifdef CONFIG_VIDEO_S3C2410
++#undef SHORTSWAP32
++#define SHORTSWAP32(x) ((((x) & 0xffff) << 16) | (((x) >> 16) & 0xffff))
++#endif
++
+ #if defined(DEBUG) || defined(DEBUG_CFB_CONSOLE)
+ #define PRINTD(x) printf(x)
+ #else
diff --git a/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb b/packages/uboot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
index 1cee1edf37..1cee1edf37 100644
--- a/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
+++ b/packages/uboot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/u-boot-openmoko_svn.bb
index 1e59e0746d..550ff5d499 100644
--- a/packages/uboot/uboot-openmoko_svn.bb
+++ b/packages/uboot/u-boot-openmoko_svn.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
PROVIDES = "virtual/bootloader"
LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}"
PV = "1.3.1${LOCALVERSION}"
-PR = "r1"
+PR = "r2"
SRCREV_FORMAT = "patches"
@@ -20,6 +20,7 @@ SRC_URI = "\
file://uboot-eabi-fix-HACK.patch \
file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
file://makefile-no-dirafter.patch;patch=1 \
+ file://boot-menu-gfx-fix-openmoko-bug-1140.patch;patch=1 \
"
S = "${WORKDIR}/git"
@@ -27,14 +28,13 @@ EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
TARGET_LDFLAGS = ""
do_quilt() {
- mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
- rm -Rf patches .pc
+ mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
+ rm -Rf patches .pc
}
do_svnrev() {
mv -f tools/setlocalversion tools/setlocalversion.old
- echo -n "echo " >>tools/setlocalversion
- echo ${PV} >>tools/setlocalversion
+ echo "echo ${LOCALVERSION}" >>tools/setlocalversion
}
do_configure_prepend() {
@@ -44,27 +44,25 @@ do_configure_prepend() {
}
do_compile () {
- chmod +x board/neo1973/gta*/split_by_variant.sh
- for mach in ${UBOOT_MACHINES}
- do
- oe_runmake ${mach}_config
- oe_runmake clean
- find board -name lowlevel_foo.bin -exec rm '{}' \;
- oe_runmake all
- oe_runmake u-boot.udfu
- if [ -f u-boot.udfu ]; then
- mv u-boot.udfu u-boot_${mach}.bin
- else
- mv u-boot.bin u-boot_${mach}.bin
- fi
- if [ -f board/${mach}/lowlevel_foo.bin ]; then
- mv board/${mach}/lowlevel_foo.bin \
- lowlevel_foo_${mach}.bin
- else
- find board -name lowlevel_foo.bin \
- -exec mv '{}' lowlevel_foo_${mach}.bin \;
- fi
- done
+ chmod +x board/neo1973/gta*/split_by_variant.sh
+ for mach in ${UBOOT_MACHINES}
+ do
+ oe_runmake ${mach}_config
+ oe_runmake clean
+ find board -name lowlevel_foo.bin -exec rm '{}' \;
+ oe_runmake all
+ oe_runmake u-boot.udfu
+ if [ -f u-boot.udfu ]; then
+ mv u-boot.udfu u-boot_${mach}.bin
+ else
+ mv u-boot.bin u-boot_${mach}.bin
+ fi
+ if [ -f board/${mach}/lowlevel_foo.bin ]; then
+ mv board/${mach}/lowlevel_foo.bin lowlevel_foo_${mach}.bin
+ else
+ find board -name lowlevel_foo.bin -exec mv '{}' lowlevel_foo_${mach}.bin \;
+ fi
+ done
}
do_deploy () {