From 518fac47b16e548ace1e23d1bc6f4a38b44670bb Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 28 Dec 2007 13:04:53 +0000 Subject: 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) --- .../boot-menu-gfx-fix-openmoko-bug-1140.patch | 29 ++++++++ ...24d4a328e6edd906456da98d2c537155c4f7+svn2943.bb | 86 +++++++++++++++++++++ packages/uboot/u-boot-openmoko_svn.bb | 85 +++++++++++++++++++++ ...24d4a328e6edd906456da98d2c537155c4f7+svn2943.bb | 86 --------------------- packages/uboot/uboot-openmoko_svn.bb | 87 ---------------------- 5 files changed, 200 insertions(+), 173 deletions(-) create mode 100644 packages/uboot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch create mode 100644 packages/uboot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb create mode 100644 packages/uboot/u-boot-openmoko_svn.bb delete mode 100644 packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb delete mode 100644 packages/uboot/uboot-openmoko_svn.bb 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 +@@ -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/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb b/packages/uboot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb new file mode 100644 index 0000000000..1cee1edf37 --- /dev/null +++ b/packages/uboot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb @@ -0,0 +1,86 @@ +DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support" +AUTHOR = "Harald Welte " +LICENSE = "GPL" +SECTION = "bootloader" +PRIORITY = "optional" + +UBOOT_UPSTREAM_REV = "f34024d4a328e6edd906456da98d2c537155c4f7" +UBOOT_OPENMOKO_REV = "2943" +UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4" + +PV = "1.2.0+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}" +PR = "r1" + +PROVIDES = "virtual/bootloader" +S = "${WORKDIR}/git" + +SRC_URI = "\ + git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV} \ + svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \ + file://uboot-eabi-fix-HACK.patch \ + file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ + file://makefile-no-dirafter.patch;patch=1 \ +" + +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" +TARGET_LDFLAGS = "" + +do_quilt() { + 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 +} + +do_configure_prepend() { + find . -name "*.mk" -exec sed -i 's,-mabi=apcs-gnu,,' {} \; + find . -name "Makefile" -exec sed -i 's,-mabi=apcs-gnu,,' {} \; + cat ${WORKDIR}/uboot-eabi-fix-HACK.patch |patch -p1 +} + +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 +} + +do_deploy () { + install -d ${DEPLOY_DIR_IMAGE} + for mach in ${UBOOT_MACHINES} + do + install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin + if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then + install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin + fi + done + install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage +} + +do_deploy[dirs] = "${S}" +addtask deploy before do_package after do_install +addtask quilt before do_patch after do_unpack +addtask svnrev before do_patch after do_quilt diff --git a/packages/uboot/u-boot-openmoko_svn.bb b/packages/uboot/u-boot-openmoko_svn.bb new file mode 100644 index 0000000000..550ff5d499 --- /dev/null +++ b/packages/uboot/u-boot-openmoko_svn.bb @@ -0,0 +1,85 @@ +DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support" +AUTHOR = "Harald Welte " +LICENSE = "GPL" +SECTION = "bootloader" +PRIORITY = "optional" +PROVIDES = "virtual/bootloader" +LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}" +PV = "1.3.1${LOCALVERSION}" +PR = "r2" + +SRCREV_FORMAT = "patches" + +UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8 qt2410 gta02v1 gta02v2 gta02v3 gta02v4" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "\ + git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream \ + svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \ + 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" + +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" +TARGET_LDFLAGS = "" + +do_quilt() { + mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av + rm -Rf patches .pc +} + +do_svnrev() { + mv -f tools/setlocalversion tools/setlocalversion.old + echo "echo ${LOCALVERSION}" >>tools/setlocalversion +} + +do_configure_prepend() { + find . -name "*.mk" -exec sed -i 's,-mabi=apcs-gnu,,' {} \; + find . -name "Makefile" -exec sed -i 's,-mabi=apcs-gnu,,' {} \; + cat ${WORKDIR}/uboot-eabi-fix-HACK.patch |patch -p1 +} + +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 +} + +do_deploy () { + install -d ${DEPLOY_DIR_IMAGE} + for mach in ${UBOOT_MACHINES} + do + install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin + if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then + install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin + fi + done + install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage +} + +do_deploy[dirs] = "${S}" +addtask deploy before do_package after do_install +addtask quilt before do_patch after do_unpack +addtask svnrev before do_patch after do_quilt diff --git a/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb b/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb deleted file mode 100644 index 1cee1edf37..0000000000 --- a/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb +++ /dev/null @@ -1,86 +0,0 @@ -DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support" -AUTHOR = "Harald Welte " -LICENSE = "GPL" -SECTION = "bootloader" -PRIORITY = "optional" - -UBOOT_UPSTREAM_REV = "f34024d4a328e6edd906456da98d2c537155c4f7" -UBOOT_OPENMOKO_REV = "2943" -UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4" - -PV = "1.2.0+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}" -PR = "r1" - -PROVIDES = "virtual/bootloader" -S = "${WORKDIR}/git" - -SRC_URI = "\ - git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV} \ - svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \ - file://uboot-eabi-fix-HACK.patch \ - file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ - file://makefile-no-dirafter.patch;patch=1 \ -" - -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" -TARGET_LDFLAGS = "" - -do_quilt() { - 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 -} - -do_configure_prepend() { - find . -name "*.mk" -exec sed -i 's,-mabi=apcs-gnu,,' {} \; - find . -name "Makefile" -exec sed -i 's,-mabi=apcs-gnu,,' {} \; - cat ${WORKDIR}/uboot-eabi-fix-HACK.patch |patch -p1 -} - -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 -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - for mach in ${UBOOT_MACHINES} - do - install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin - ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin - if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then - install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin - ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin - fi - done - install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage -} - -do_deploy[dirs] = "${S}" -addtask deploy before do_package after do_install -addtask quilt before do_patch after do_unpack -addtask svnrev before do_patch after do_quilt diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/uboot-openmoko_svn.bb deleted file mode 100644 index 1e59e0746d..0000000000 --- a/packages/uboot/uboot-openmoko_svn.bb +++ /dev/null @@ -1,87 +0,0 @@ -DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support" -AUTHOR = "Harald Welte " -LICENSE = "GPL" -SECTION = "bootloader" -PRIORITY = "optional" -PROVIDES = "virtual/bootloader" -LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}" -PV = "1.3.1${LOCALVERSION}" -PR = "r1" - -SRCREV_FORMAT = "patches" - -UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8 qt2410 gta02v1 gta02v2 gta02v3 gta02v4" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "\ - git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream \ - svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \ - file://uboot-eabi-fix-HACK.patch \ - file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ - file://makefile-no-dirafter.patch;patch=1 \ -" -S = "${WORKDIR}/git" - -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" -TARGET_LDFLAGS = "" - -do_quilt() { - 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 -} - -do_configure_prepend() { - find . -name "*.mk" -exec sed -i 's,-mabi=apcs-gnu,,' {} \; - find . -name "Makefile" -exec sed -i 's,-mabi=apcs-gnu,,' {} \; - cat ${WORKDIR}/uboot-eabi-fix-HACK.patch |patch -p1 -} - -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 -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - for mach in ${UBOOT_MACHINES} - do - install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin - ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin - if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then - install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin - ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin - fi - done - install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage -} - -do_deploy[dirs] = "${S}" -addtask deploy before do_package after do_install -addtask quilt before do_patch after do_unpack -addtask svnrev before do_patch after do_quilt -- cgit v1.2.3