[oe-commits] org.oe.dev uboot-openmoko git/svn rename files to more consistent naming
mickeyl commit
openembedded-commits at lists.openembedded.org
Fri Dec 28 13:36:31 UTC 2007
uboot-openmoko git/svn rename files to more consistent naming
* and add patch fixing OM bug #887
* fix formatting (don't mix tabs and spaces, choose one)
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 8e0f8c9a3960834207a2ef1f48aa7d85815ca95f
ViewMTN: http://monotone.openembedded.org/revision/info/8e0f8c9a3960834207a2ef1f48aa7d85815ca95f
Files:
1
packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
packages/uboot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
packages/uboot/uboot-openmoko_svn.bb
packages/uboot/u-boot-openmoko_svn.bb
packages/uboot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch
Diffs:
#
# mt diff -r3806d8894babdfee7e759b27b83e75430c119343 -r8e0f8c9a3960834207a2ef1f48aa7d85815ca95f
#
#
#
# rename "packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
# to "packages/uboot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
#
# rename "packages/uboot/uboot-openmoko_svn.bb"
# to "packages/uboot/u-boot-openmoko_svn.bb"
#
# add_file "packages/uboot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch"
# content [f687bd2f045dfad3693848409d187f63acdfd151]
#
# patch "packages/uboot/u-boot-openmoko_svn.bb"
# from [8a7b89b1fde79e94c6ddfbc706a42b171be5f547]
# to [67ec27434d36f171aedd9fb4e06f390505792635]
#
============================================================
--- packages/uboot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch f687bd2f045dfad3693848409d187f63acdfd151
+++ packages/uboot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch f687bd2f045dfad3693848409d187f63acdfd151
@@ -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
============================================================
--- packages/uboot/uboot-openmoko_svn.bb 8a7b89b1fde79e94c6ddfbc706a42b171be5f547
+++ packages/uboot/u-boot-openmoko_svn.bb 67ec27434d36f171aedd9fb4e06f390505792635
@@ -6,7 +6,7 @@ PV = "1.3.1${LOCALVERSION}"
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 @@ do_quilt() {
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_compile () {
}
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 () {
More information about the Openembedded-commits
mailing list