r3967 - in trunk/src/target/u-boot: patches scripts

werner at sita.openmoko.org werner at sita.openmoko.org
Mon Jan 28 14:42:22 CET 2008


Author: werner
Date: 2008-01-28 14:42:16 +0100 (Mon, 28 Jan 2008)
New Revision: 3967

Added:
   trunk/src/target/u-boot/patches/build-kludge.patch
Modified:
   trunk/src/target/u-boot/patches/series
   trunk/src/target/u-boot/scripts/build
Log:
Tracking upstream, with a small build error.

scripts/build: update to GIT_HEAD 98b742489c09780be6a832eeaa4e5eff824792bb,
  SVN_REV 3967.

98b742489c09780be6a832eeaa4e5eff824792bb did not build because
drivers/spi/mpc8xxx_spi.c referenced asm/mpc8xxx_spi.h, which doesn't exist on
non-MPC8xxx builds. Instead of fixing the build system to compile only drivers
we might actually use, the quick and dirty solution is to tweak the #include.

patches/series: added build-kludge.patch
patches/build-kludge.patch:
- drivers/spi/mpc8xxx_spi.c: #include asm-ppc/mpc8xxx_spi.h instead of
  asm/mpc8xxx_spi.h



Added: trunk/src/target/u-boot/patches/build-kludge.patch
===================================================================
--- trunk/src/target/u-boot/patches/build-kludge.patch	2008-01-26 19:06:48 UTC (rev 3966)
+++ trunk/src/target/u-boot/patches/build-kludge.patch	2008-01-28 13:42:16 UTC (rev 3967)
@@ -0,0 +1,13 @@
+Index: u-boot/drivers/spi/mpc8xxx_spi.c
+===================================================================
+--- u-boot.orig/drivers/spi/mpc8xxx_spi.c
++++ u-boot/drivers/spi/mpc8xxx_spi.c
+@@ -23,7 +23,7 @@
+ 
+ #include <common.h>
+ #include <spi.h>
+-#include <asm/mpc8xxx_spi.h>
++#include <asm-ppc/mpc8xxx_spi.h>
+ 
+ #ifdef CONFIG_HARD_SPI
+ 

Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series	2008-01-26 19:06:48 UTC (rev 3966)
+++ trunk/src/target/u-boot/patches/series	2008-01-28 13:42:16 UTC (rev 3967)
@@ -81,3 +81,4 @@
 neo1973-gsmver.patch
 uboot-nand_write_yaffs.patch
 uboot-neo1973_defaultconsole_usbtty.patch
+build-kludge.patch

Modified: trunk/src/target/u-boot/scripts/build
===================================================================
--- trunk/src/target/u-boot/scripts/build	2008-01-26 19:06:48 UTC (rev 3966)
+++ trunk/src/target/u-boot/scripts/build	2008-01-28 13:42:16 UTC (rev 3967)
@@ -20,10 +20,10 @@
 # DEVICE=gta02v4
 #
 # GIT_HEAD, if defined, specifies which git head we use, e.g.,
-# GIT_HEAD=f188896c2f1594fe749fdb99bbc8c54023cfab3a
+# GIT_HEAD=98b742489c09780be6a832eeaa4e5eff824792bb
 #
 # SVN_REV, if defined, specifies which SVN revision we use, e.g.,
-# SVN_REV=3890
+# SVN_REV=3967
 #
 
 git clone git://www.denx.de/git/u-boot.git





More information about the commitlog mailing list