<!-- Generator: GNU source-highlight 2.4
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
<pre><tt>#
#
# patch "conf/machine/at32stk1000.conf"
#  from [3d5142529536576aea6056c6d761540974caa5ac]
#    to [163fd78fdfe07eb3befe4b759102820ed434730b]
#
============================================================
<font color="#FF6600">--- conf/machine/at32stk1000.conf        3d5142529536576aea6056c6d761540974caa5ac</font>
<font color="#009900">+++ conf/machine/at32stk1000.conf        163fd78fdfe07eb3befe4b759102820ed434730b</font>
<font color="#0000FF">@@ -22,8 +22,9 @@ KERNEL_IMAGETYPE = "uImage"</font>
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 
 KERNEL_IMAGETYPE = "uImage"
<font color="#FF6600">-PREFERRED_VERSION_u-boot = "1.1.4"</font>
<font color="#009900">+PREFERRED_VERSION_u-boot = "1.3.2"</font>
 
<font color="#009900">+UBOOT_MACHINE = "atstk1002_config"</font>
 UBOOT_ENTRYPOINT = "0x90000000"
 UBOOT_LOADADDRESS = "0x10000000"
 
</tt></pre>