5581 files changed, 53181 insertions, 192 deletions

diff --git a/.gitignore b/.gitignore
index 42358310b..ccd8f51ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,3 @@
-*.pyc
-*.pyo
-/*.patch
-build*/
-pyshtables.py
-pstage/
-scripts/oe-git-proxy-socks
-sources/
-meta-*/
-!meta-skeleton
-!meta-selftest
-hob-image-*.bb
-*.swp
-*.orig
-*.rej
-*~
-!meta-yocto
-!meta-yocto-bsp
-!meta-yocto-imported
-documentation/user-manual/user-manual.html
-documentation/user-manual/user-manual.pdf
-documentation/user-manual/user-manual.tgz
-pull-*/
-bitbake/lib/toaster/contrib/tts/backlog.txt
-bitbake/lib/toaster/contrib/tts/log/*
-bitbake/lib/toaster/contrib/tts/.cache/*
\ No newline at end of file
+build/*
+customrc
+*.sw?
diff --git a/.templateconf b/.templateconf
index 0650a4662..7809580f0 100644
--- a/.templateconf
+++ b/.templateconf
@@ -1,2 +1 @@
-# Template settings
-TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf}
+TEMPLATECONF=${TEMPLATECONF:-meta-phosphor/conf}
diff --git a/LICENSE b/LICENSE
index 21fa6e6bd..9bb9b1c6b 100644..120000
--- a/LICENSE
+++ b/LICENSE
@@ -1,14 +1 @@
-Different components of OpenEmbedded are under different licenses (a mix
-of MIT and GPLv2). Please see:
-
-meta/COPYING.GPLv2 (GPLv2)
-meta/COPYING.MIT (MIT)
-meta-selftest/COPYING.MIT (MIT)
-meta-skeleton/COPYING.MIT (MIT)
-
-All metadata is MIT licensed unless otherwise stated. Source code
-included in tree for individual recipes is under the LICENSE stated in
-the associated recipe (.bb file) unless otherwise stated.
-
-License information for any other files is either explicitly stated 
-or defaults to GPL version 2.
+yocto-poky/LICENSE
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..7f9a2a782
--- /dev/null
+++ b/README.md
@@ -0,0 +1,24 @@
+# OpenBMC #
+
+[![Build Status](https://openpower.xyz/buildStatus/icon?job=openbmc-build)](https://openpower.xyz/job/openbmc-build/)
+
+## Building ##
+
+OpenBMC uses Yocto/Open-Embedded for a build system, which supports an
+out-of-tree build.  It is recommended that you create an empty directory
+somewhere to hold the build.  This directory will get big.
+
+On Ubuntu 14.04 the following packages are required to build the default target
+
+    sudo apt-get install -y git build-essential libsdl1.2-dev texinfo gawk chrpath diffstat
+
+On Fedora 23 the following packages are required to build the default target:
+
+    sudo dnf install -y git patch diffstat texinfo chrpath SDL-devel bitbake
+    sudo dnf groupinstall "C Development Tools and Libraries"
+
+To start a build:
+
+    cd <builddir>
+    . <repodir>/openbmc-env
+    bitbake obmc-phosphor-image
diff --git a/bitbake b/bitbake
new file mode 120000
index 000000000..7d4825e63
--- /dev/null
+++ b/bitbake
@@ -0,0 +1 @@
+yocto-poky/bitbake
\ No newline at end of file
diff --git a/documentation b/documentation
new file mode 120000
index 000000000..362d784fd
--- /dev/null
+++ b/documentation
@@ -0,0 +1 @@
+yocto-poky/documentation
\ No newline at end of file
diff --git a/meta b/meta
new file mode 120000
index 000000000..90959577a
--- /dev/null
+++ b/meta
@@ -0,0 +1 @@
+yocto-poky/meta
\ No newline at end of file
diff --git a/meta-skeleton/COPYING.MIT b/meta-openbmc-bsp/meta-aspeed/COPYING.MIT
index fb950dc69..fb950dc69 100644
--- a/meta-skeleton/COPYING.MIT
+++ b/meta-openbmc-bsp/meta-aspeed/COPYING.MIT
diff --git a/meta-openbmc-bsp/meta-aspeed/COPYING.apache-2.0 b/meta-openbmc-bsp/meta-aspeed/COPYING.apache-2.0
new file mode 100644
index 000000000..67db85882
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/COPYING.apache-2.0
@@ -0,0 +1,175 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
diff --git a/meta-openbmc-bsp/meta-aspeed/LICENSE b/meta-openbmc-bsp/meta-aspeed/LICENSE
new file mode 100644
index 000000000..2bf823dc4
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/LICENSE
@@ -0,0 +1,12 @@
+Different components of Phosphor OpenBMC are under different licenses (a mix
+of MIT and Apache-2.0). Please see:
+
+COPYING.Apache-2.0
+COPYING.MIT (MIT)
+
+All metadata is MIT licensed unless otherwise stated. Source code
+included in tree for individual recipes is under the LICENSE stated in
+the associated recipe (.bb file) unless otherwise stated.
+
+License information for any other files is either explicitly stated 
+or defaults to Apache-2.0.
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/layer.conf b/meta-openbmc-bsp/meta-aspeed/conf/layer.conf
new file mode 100644
index 000000000..cc0460af6
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/conf/layer.conf
@@ -0,0 +1,5 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+BBFILE_COLLECTIONS += "aspeed"
+BBFILE_PATTERN_aspeed = ""
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf
new file mode 100644
index 000000000..a24ac97da
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf
@@ -0,0 +1,10 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_PATTERN_ast2400 = "^${LAYERDIR}/"
+BBFILE_COLLECTIONS += "ast2400"
+LAYERVERSION_ast2400 = "1"
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
new file mode 100644
index 000000000..58af4bb2f
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: Aspeed AST2400
+#@DESCRIPTION: Common machine configuration for the Aspeed AST2400 Chip
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc"
+
+UBOOT_MACHINE ?= "versatileab_config"
+UBOOT_ENTRYPOINT ?= "0x40001000"
+UBOOT_LOADADDRESS ?= "0x40001000"
+
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/config.patch b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/config.patch
new file mode 100644
index 000000000..c5216e7d6
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/config.patch
@@ -0,0 +1,14 @@
+--- a/include/configs/palmetto.h
++++ b/include/configs/palmetto.h
+@@ -96,11 +96,8 @@
+ #define CONFIG_UPDATE           "tftp 40800000 ast2400.scr; so 40800000'"
+ 
+ #define CONFIG_BOOTDELAY	3		/* autoboot after 3 seconds	*/
+-#define CONFIG_AUTOBOOT_KEYED
+ #define CONFIG_AUTOBOOT_PROMPT		\
+ 	"autoboot in %d seconds (stop with 'Delete' key)...\n", bootdelay
+-#define CONFIG_AUTOBOOT_STOP_STR	"\x1b\x5b\x33\x7e" /* 'Delete', ESC[3~ */
+-#define CONFIG_ZERO_BOOTDELAY_CHECK
+ 
+ #ifdef CONFIG_FLASH_AST2300
+ #define CONFIG_BOOTCOMMAND	"bootm 20080000 20300000"
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/fw_env.config b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/fw_env.config
new file mode 100644
index 000000000..978e4d6e5
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/fw_env.config
@@ -0,0 +1,24 @@
+# Configuration file for fw_(printenv/setenv) utility.
+# Up to two entries are valid, in this case the redundant
+# environment sector is assumed present.
+# Notice, that the "Number of sectors" is ignored on NOR and SPI-dataflash.
+# Futhermore, if the Flash sector size is ommitted, this value is assumed to
+# be the same as the Environment size, which is valid for NOR and SPI-dataflash
+
+# NOR example
+# MTD device name	Device offset	Env. size	Flash sector size	Number of sectors
+#/dev/mtd1		0x0000		0x20000		0x20000
+#/dev/mtd2		0x0000		0x4000		0x4000
+
+# MTD SPI-dataflash example
+# MTD device name	Device offset	Env. size	Flash sector size	Number of sectors
+#/dev/mtd2		0x00000		0x20000
+/run/fw_env		0x00000		0x20000
+#/dev/mtd5		0x4200		0x4200
+#/dev/mtd6		0x4200		0x4200
+
+# NAND example
+#/dev/mtd0		0x4000		0x4000		0x20000			2
+
+# Block device example
+#/dev/mmcblk0		0xc0000		0x20000
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/patch-2013.07/0000-u-boot-aspeed-064.patch b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/patch-2013.07/0000-u-boot-aspeed-064.patch
new file mode 100644
index 000000000..7d8c805c4
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/patch-2013.07/0000-u-boot-aspeed-064.patch
@@ -0,0 +1,44658 @@
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/COMMINF.H b/arch/arm/cpu/arm926ejs/aspeed/COMMINF.H
+new file mode 100644
+index 0000000..44b7540
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/COMMINF.H
+@@ -0,0 +1,641 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef COMMINF_H
++#define COMMINF_H
++
++#include "SWFUNC.H"
++
++#if defined(LinuxAP)
++#endif
++#ifdef SLT_UBOOT
++#endif
++#ifdef SLT_DOS
++  #include <stdio.h>
++  #include <time.h>
++  #include <dos.h>    // For delay()
++#endif
++
++#include "TYPEDEF.H"
++#include "LIB.H"
++
++//---------------------------------------------------------
++// Print Message 
++//---------------------------------------------------------
++// for function
++#define FP_LOG    0
++#define FP_IO     1    
++#define STD_OUT   2    
++    
++#ifdef SLT_UBOOT
++    #define PRINT     printf
++    #define OUT_OBJ   
++    #define FILE_VAR  
++
++    #define GET_OBJ( i )    \
++    do {                    \
++        if ( i != STD_OUT ) \
++            return;         \
++    } while ( 0 );
++            
++#else
++    #define PRINT     fprintf
++    #define OUT_OBJ   fp,    
++    #define FILE_VAR  FILE *fp;
++    
++    #define GET_OBJ( i )     \
++        switch( i ) {        \
++            case FP_LOG:     \
++                fp = fp_log; \
++                break;       \
++            case FP_IO:      \
++                fp = fp_io;  \
++                break;       \
++            case STD_OUT:    \
++                fp = stdout; \
++                break;       \
++            default : break; \
++        }                
++#endif
++
++//---------------------------------------------------------
++// Function
++//---------------------------------------------------------
++#ifdef SLT_UBOOT
++    #define DELAY( x )  udelay( x * 1000 ) // For Uboot, the unit of udelay() is us.
++    #define GET_CAHR    getc
++#endif
++#ifdef SLT_DOS
++    #define DELAY( x )  delay( x )         // For DOS, the unit of delay() is ms.
++    #define GET_CAHR    getchar
++#endif
++
++//---------------------------------------------------------
++// Default argument
++//---------------------------------------------------------
++#define  DEF_USER_DEF_PACKET_VAL      0x66666666     //0xff00ff00, 0xf0f0f0f0, 0xcccccccc, 0x55aa55aa, 0x5a5a5a5a, 0x66666666
++#define  DEF_IOTIMINGBUND             5              //0/1/3/5/7
++#define  DEF_PHY_ADR                  0
++#define  DEF_TESTMODE                 0              //[0]0: no burst mode, 1: 0xff, 2: 0x55, 3: random, 4: ARP, 5: ARP, 6: IO timing, 7: IO timing+IO Strength
++#define  DEF_LOOP_MAX                 1
++#define  DEF_MAC_LOOP_BACK            0              //GCtrl bit6
++#define  DEF_SKIP_CHECK_PHY           0              //GCtrl bit4
++#define  DEF_INIT_PHY                 1              //GCtrl bit3
++
++#define  SET_1GBPS                    0              // 1G bps
++#define  SET_100MBPS                  1              // 100M bps
++#define  SET_10MBPS                   2              // 10M bps
++#define  SET_1G_100M_10MBPS           3              // 1G and 100M and 10M bps
++#define  DEF_SPEED                    SET_1G_100M_10MBPS 
++#define  DEF_ARPNUMCNT                0
++
++//---------------------------------------------------------
++// MAC information
++//---------------------------------------------------------
++#if ( AST1010_IOMAP == 1 )
++  // AST1010 only has a MAC
++  #define MAC_BASE1               AST_MAC1_BASE
++  #define MAC_BASE2               AST_MAC1_BASE
++  #define MAC_BASE3               AST_MAC1_BASE
++  #define MAC_BASE4               AST_MAC1_BASE
++#endif
++
++#if ( AST1010_IOMAP == 2 )
++  // AST1010 only has a MAC
++  #define MAC_BASE1               0x0830000
++  #define MAC_BASE2               0x0830000
++  #define MAC_BASE3               0x0830000
++  #define MAC_BASE4               0x0830000
++#endif
++
++#ifndef AST1010_IOMAP
++  #define MAC_BASE1               0x1e660000
++  #define MAC_BASE2               0x1e680000
++  #define MAC_BASE3               0x1e670000
++  #define MAC_BASE4               0x1e690000
++#endif
++
++#define MDC_Thres                 0x3f
++#define MAC_PHYWr                 0x08000000
++#define MAC_PHYRd                 0x04000000
++
++#define MAC_PHYWr_New             0x00009400
++#define MAC_PHYRd_New             0x00009800
++#define MAC_PHYBusy_New           0x00008000
++
++//#define MAC_30h                   0x00001010
++//#define MAC_34h                   0x00000000
++//#define MAC_38h                   0x00d22f00 //default 0x22f00
++//#define MAC_38h                   0x00022f00 //default 0x22f00
++
++#define MAC_40h                   0x40000000
++
++#ifdef Enable_BufMerge
++    #define MAC_48h               0x007702F1 //default 0xf1
++#else
++  #ifdef AST1010_IOMAP
++    #define MAC_48h               0x000002F1 //default 0xf1
++  #else
++    #define MAC_48h               0x000001F1 //default 0xf1
++  #endif
++#endif
++
++//---------------------------------------------------------
++// Data information
++//---------------------------------------------------------
++#ifdef SelectSimpleBoundary
++  #define ZeroCopy_OFFSET       0
++#else
++  #define ZeroCopy_OFFSET       ( (BurstEnable) ? 0 : 2 )
++#endif
++
++//      --------------------------------- DRAM_MapAdr            = TDES_BASE1
++//              | TX descriptor ring #1 |
++//              ------------------------- DRAM_MapAdr + 0x040000 = RDES_BASE1
++//              | RX descriptor ring #1 |
++//              ------------------------- DRAM_MapAdr + 0x080000 = TDES_BASE2
++//              | TX descriptor ring #2 |
++//              ------------------------- DRAM_MapAdr + 0x0C0000 = RDES_BASE2
++//              | RX descriptor ring #2 |
++//      --------------------------------- DRAM_MapAdr + 0x100000 = DMA_BASE    -------------------------
++//              |   #1                  |  \                                   |     #1     Tx         |
++//  DMA buffer  |                       |   DMA_BufSize                        |      LOOP = 0         |
++// ( Tx/Rx )    -------------------------  /                                   --------------------------------------------------
++//              |   #2                  |                                      |     #2     Rx         |  #2     Tx             |
++//              |                       |                                      |      LOOP = 0         |   LOOP = 1             |
++//              -------------------------                                      --------------------------------------------------
++//              |   #3                  |                                                              |  #3     Rx             |
++//              |                       |                                                              |   LOOP = 1             |
++//              -------------------------                                                              -------------------------
++//              |   #4                  |                                                                                     ..........
++//              |                       |
++//              -------------------------
++//              |   #5                  | 
++//              |                       | 
++//              ------------------------- 
++//              |   #6                  |
++//              |                       |
++//              -------------------------
++//                           .           
++//                           .           
++//              -------------------------
++//              |   #n, n = DMA_BufNum  |
++//              |                       |
++//      --------------------------------- 
++
++#if ( AST1010_IOMAP == 1 )
++    #define DRAM_MapAdr                 ( CONFIG_DRAM_SWAP_BASE + 0x00200000 ) // We use 0xA00000 to 0xEFFFFF
++    #define CPU_BUS_ADDR_SDRAM_OFFSET   0x01000000                             // In ReMapping function, MAC engine need Bus address
++                                                                               // But Coldfire need CPU address, so need to do offset
++#endif
++
++#if ( AST1010_IOMAP == 2 )
++    #define DRAM_MapAdr                 0x0A00000                              // We use 0xA00000 to 0xEFFFFF
++    #define CPU_BUS_ADDR_SDRAM_OFFSET   0
++#endif
++                                                                               
++#ifndef AST1010_IOMAP
++  #ifdef AST3200_IOMAP
++    #define DRAM_MapAdr           0x80000000
++  #else
++    #define DRAM_MapAdr           0x44000000   
++  #endif
++  
++  #define   CPU_BUS_ADDR_SDRAM_OFFSET   0
++#endif  
++
++  #define TDES_BASE1              ( 0x00000000 + DRAM_MapAdr   )
++  #define RDES_BASE1              ( 0x00040000 + DRAM_MapAdr   )
++  #define TDES_BASE2              ( 0x00080000 + DRAM_MapAdr   )
++  #define RDES_BASE2              ( 0x000C0000 + DRAM_MapAdr   )
++                                               
++  #define TDES_IniVal             ( 0xb0000000 + FRAME_LEN_Cur )
++  #define RDES_IniVal             ( 0x00000fff )
++  #define EOR_IniVal              ( 0x40008000 )
++  #define HWOwnTx(dat)            (   (dat) & 0x80000000  )
++  #define HWOwnRx(dat)            ( !((dat) & 0x80000000) )
++  #define HWEOR(dat)              (    dat  & 0x40000000  )
++
++//---------------------------------------------------------
++// Error Flag Bits
++//---------------------------------------------------------
++#define Err_MACMode                            ( 1 <<  0 )   // MAC interface mode mismatch
++#define Err_PHY_Type                           ( 1 <<  1 )   // Unidentifiable PHY
++#define Err_MALLOC_FrmSize                     ( 1 <<  2 )   // Malloc fail at frame size buffer
++#define Err_MALLOC_LastWP                      ( 1 <<  3 )   // Malloc fail at last WP buffer
++#define Err_Check_Buf_Data                     ( 1 <<  4 )   // Received data mismatch
++#define Err_Check_Des                          ( 1 <<  5 )   // Descriptor error
++#define Err_NCSI_LinkFail                      ( 1 <<  6 )   // NCSI packet retry number over flows
++#define Err_NCSI_Check_TxOwnTimeOut            ( 1 <<  7 )   // Time out of checking Tx owner bit in NCSI packet
++#define Err_NCSI_Check_RxOwnTimeOut            ( 1 <<  8 )   // Time out of checking Rx owner bit in NCSI packet
++#define Err_NCSI_Check_ARPOwnTimeOut           ( 1 <<  9 )   // Time out of checking ARP owner bit in NCSI packet
++#define Err_NCSI_No_PHY                        ( 1 << 10 )   // Can not find NCSI PHY
++#define Err_NCSI_Channel_Num                   ( 1 << 11 )   // NCSI Channel Number Mismatch
++#define Err_NCSI_Package_Num                   ( 1 << 12 )   // NCSI Package Number Mismatch
++#define Err_PHY_TimeOut                        ( 1 << 13 )   // Time out of read/write/reset PHY register
++#define Err_RXBUF_UNAVA                        ( 1 << 14 )   // MAC00h[2]:Receiving buffer unavailable
++#define Err_RPKT_LOST                          ( 1 << 15 )   // MAC00h[3]:Received packet lost due to RX FIFO full
++#define Err_NPTXBUF_UNAVA                      ( 1 << 16 )   // MAC00h[6]:Normal priority transmit buffer unavailable
++#define Err_TPKT_LOST                          ( 1 << 17 )   // MAC00h[7]:Packets transmitted to Ethernet lost
++#define Err_DMABufNum                          ( 1 << 18 )   // DMA Buffer is not enough
++#define Err_IOMargin                           ( 1 << 19 )   // IO timing margin is not enough
++#define Err_IOMarginOUF                        ( 1 << 20 )   // IO timing testing out of boundary
++#define Err_MHCLK_Ratio                        ( 1 << 21 )   // Error setting of MAC AHB bus clock (SCU08[18:16])
++                                                                
++#define Check_Des_TxOwnTimeOut                 ( 1 <<  0 )   // Time out of checking Tx owner bit
++#define Check_Des_RxOwnTimeOut                 ( 1 <<  1 )   // Time out of checking Rx owner bit
++#define Check_Des_RxErr                        ( 1 <<  2 )   // Input signal RxErr
++#define Check_Des_OddNibble                    ( 1 <<  3 )   // Nibble bit happen
++#define Check_Des_CRC                          ( 1 <<  4 )   // CRC error of frame
++#define Check_Des_RxFIFOFull                   ( 1 <<  5 )   // Rx FIFO full
++#define Check_Des_FrameLen                     ( 1 <<  6 )   // Frame length mismatch
++
++#define NCSI_LinkFail_Get_Version_ID           ( 1 <<  0 )   // Time out when Get Version ID
++#define NCSI_LinkFail_Get_Capabilities         ( 1 <<  1 )   // Time out when Get Capabilities
++#define NCSI_LinkFail_Select_Active_Package    ( 1 <<  2 )   // Time out when Select Active Package
++#define NCSI_LinkFail_Enable_Set_MAC_Address   ( 1 <<  3 )   // Time out when Enable Set MAC Address
++#define NCSI_LinkFail_Enable_Broadcast_Filter  ( 1 <<  4 )   // Time out when Enable Broadcast Filter
++#define NCSI_LinkFail_Enable_Network_TX        ( 1 <<  5 )   // Time out when Enable Network TX
++#define NCSI_LinkFail_Enable_Channel           ( 1 <<  6 )   // Time out when Enable Channel
++#define NCSI_LinkFail_Disable_Network_TX       ( 1 <<  7 )   // Time out when Disable Network TX
++#define NCSI_LinkFail_Disable_Channel          ( 1 <<  8 )   // Time out when Disable Channel
++
++//---------------------------------------------------------
++// SCU information
++//---------------------------------------------------------
++#if ( AST1010_IOMAP == 1 )
++    #define SCU_BASE              AST_SCU_BASE
++#endif
++#if ( AST1010_IOMAP == 2 )
++    #define SCU_BASE              0x0841000
++#endif
++
++#ifndef AST1010_IOMAP                         
++  #define SCU_BASE                0x1e6e2000
++#endif                            
++
++#define SCU_48h_AST1010           0x00000200
++#define SCU_48h_AST2300           0x00222255
++
++//#ifdef SLT_DOS
++//  #define SCU_80h               0x00000000
++//  #define SCU_88h               0x00000000
++//  #define SCU_90h               0x00000000
++//  #define SCU_74h               0x00000000
++//#else
++//  #define SCU_80h               0x0000000f     //AST2300[3:0]MAC1~4 PHYLINK
++//  #define SCU_88h               0xc0000000     //AST2300[31]MAC1 MDIO, [30]MAC1 MDC
++//  #define SCU_90h               0x00000004     //AST2300[2 ]MAC2 MDC/MDIO
++//  #define SCU_74h               0x06300000     //AST3000[20]MAC2 MDC/MDIO, [21]MAC2 MII, [25]MAC1 PHYLINK, [26]MAC2 PHYLINK
++//#endif
++
++//---------------------------------------------------------
++// DMA Buffer information
++//---------------------------------------------------------
++#ifdef FPGA
++        #define DRAM_KByteSize    ( 56 * 1024 )
++#else
++  #ifdef AST1010_IOMAP
++        #define DRAM_KByteSize    ( 3 * 1024 )      // DATA buffer only use 0xB00000 to 0xE00000
++  #else
++      #define DRAM_KByteSize      ( 18 * 1024 )
++  #endif
++#endif
++
++#define DMA_BASE                ( 0x00100000 + DRAM_MapAdr )
++
++#ifdef Enable_Jumbo
++  #define DMA_PakSize           ( 10 * 1024 )
++#else
++  #define DMA_PakSize           ( 2 * 1024 ) // The size of one LAN packet
++#endif
++
++#ifdef SelectSimpleBoundary
++  #define DMA_BufSize           (    ( ( ( ( DES_NUMBER + 15 ) * DMA_PakSize ) >> 2 ) << 2 ) ) //vary by DES_NUMBER
++#else                                                                                        
++  #define DMA_BufSize           (4 + ( ( ( ( DES_NUMBER + 15 ) * DMA_PakSize ) >> 2 ) << 2 ) ) //vary by DES_NUMBER
++#endif
++
++#define DMA_BufNum              ( ( DRAM_KByteSize * 1024 ) / ( DMA_BufSize ) )                //vary by DES_NUMBER
++#define GET_DMA_BASE_SETUP      ( DMA_BASE )
++#define GET_DMA_BASE(x)         ( DMA_BASE + ( ( ( ( x ) % DMA_BufNum ) + 1 ) * DMA_BufSize ) )//vary by DES_NUMBER
++
++#define SEED_START              8
++#define DATA_SEED(seed)         ( ( seed ) | (( seed + 1 ) << 16 ) )
++#define DATA_IncVal             0x00020001
++//#define DATA_IncVal             0x01000001     //fail
++//#define DATA_IncVal             0x10000001     //fail
++//#define DATA_IncVal             0x10000000     //fail
++//#define DATA_IncVal             0x80000000     //fail
++//#define DATA_IncVal             0x00000001     //ok
++//#define DATA_IncVal             0x01000100     //ok
++//#define DATA_IncVal             0x01010000     //ok
++//#define DATA_IncVal             0x01010101     //ok
++//#define DATA_IncVal             0x00000101     //ok
++//#define DATA_IncVal             0x00001111     //fail
++//#define DATA_IncVal             0x00000011     //fail
++//#define DATA_IncVal             0x10100101     //fail
++//#define DATA_IncVal             0xfeff0201
++//#define DATA_IncVal             0x00010001
++#define PktByteSize              ( ( ( ( ZeroCopy_OFFSET + FRAME_LEN_Cur - 1 ) >> 2 ) + 1) << 2 )
++
++//---------------------------------------------------------
++// Delay (ms)
++//---------------------------------------------------------
++//#define Delay_DesGap              1000        //off
++//#define Delay_DesGap              700         //off
++
++//#define Delay_ChkRxOwn            10
++//#define Delay_ChkTxOwn            10
++#define Delay_CntMax              100000000
++//#define Delay_CntMax              1000
++//#define Delay_CntMax              8465
++//#define Delay_CntMaxIncVal        50000
++#define Delay_CntMaxIncVal        47500
++
++#define Delay_PHYRst              100
++#define Delay_PHYRd               5
++
++#define Delay_SCU                 11
++#define Delay_MACRst              1
++#define Delay_MACDump             100
++
++//#define Delay_DES                 1
++
++//---------------------------------------------------------
++// Time Out
++//---------------------------------------------------------
++#define TIME_OUT_Des              10000
++#define TIME_OUT_PHY_RW           10000
++#define TIME_OUT_PHY_Rst          10000
++
++//#define TIME_OUT_NCSI             300000
++#define TIME_OUT_NCSI             30000
++
++
++
++//---------------------------------------------------------
++// Chip memory MAP
++//---------------------------------------------------------
++#define LITTLE_ENDIAN_ADDRESS   0
++#define BIG_ENDIAN_ADDRESS      1
++
++typedef struct {
++    ULONG StartAddr;
++    ULONG EndAddr;
++}  LittleEndian_Area;
++
++#if ( AST1010_IOMAP == 1 )
++  static const LittleEndian_Area LittleEndianArea[] = { 
++            { AST_IO_BASE, (AST_IO_BASE + 0x000FFFFF) },
++            { 0xFFFFFFFF, 0xFFFFFFFF }  // End
++            };
++#else
++  static const LittleEndian_Area LittleEndianArea[] = { 
++            { 0xFFFFFFFF, 0xFFFFFFFF }  // End
++            };            
++#endif
++
++// ========================================================
++// For ncsi.c 
++
++#define DEF_PACKAGE2NUM                         1      // Default value
++#define DEF_CHANNEL2NUM                         2      // Default value
++
++typedef struct {
++    unsigned char Package_ID;
++    unsigned char Channel_ID;
++    unsigned long Capabilities_Flags;
++    unsigned long Broadcast_Packet_Filter_Capabilities;
++    unsigned long Multicast_Packet_Filter_Capabilities;
++    unsigned long Buffering_Capabilities;
++    unsigned long AEN_Control_Support;
++    unsigned long PCI_DID_VID;
++    unsigned long ManufacturerID;
++} NCSI_Capability;
++
++#undef GLOBAL
++#ifdef NCSI_C
++#define GLOBAL
++#else
++#define GLOBAL    extern
++#endif
++
++GLOBAL  NCSI_Capability     NCSI_Cap_SLT;
++GLOBAL  BYTE                number_chl;
++
++GLOBAL  char phy_ncsi (void);
++           
++// ========================================================
++// For mactest 
++
++#undef GLOBAL
++#ifdef MACTEST_C
++#define GLOBAL
++#else
++#define GLOBAL    extern
++#endif
++
++GLOBAL  ULONG    NCSI_DiSChannel;
++
++// 
++#ifdef SLT_UBOOT
++#else 
++// SLT_DOS
++GLOBAL  FILE        *fp_log;
++GLOBAL  FILE        *fp_io;
++#endif
++
++GLOBAL  CHAR        dlymap[16][16];
++GLOBAL  CHAR        PrintNCSIEn;
++GLOBAL  ULONG       ARPNumCnt;
++GLOBAL  CHAR        FileNameMain[256];
++GLOBAL  CHAR        FileName[256];
++GLOBAL  CHAR        ASTChipName[256];
++GLOBAL  CHAR        LOOP_Str[256];
++GLOBAL  BYTE        IOTimingBund;
++GLOBAL  BYTE        ChannelTolNum;
++GLOBAL  BYTE        PackageTolNum;
++GLOBAL  ULONG       IOdly_out_reg;
++GLOBAL  BYTE        IOdly_out_reg_idx;
++GLOBAL  ULONG       Dat_ULONG;
++GLOBAL  ULONG       IOdly_incval;
++GLOBAL  ULONG       IOdly_in_reg;
++GLOBAL  BYTE        IOdly_in_reg_idx;
++GLOBAL  ULONG       *wp_lst;
++GLOBAL  ULONG       *FRAME_LEN;
++GLOBAL  ULONG       DES_NUMBER;
++GLOBAL  ULONG       DES_NUMBER_Org;
++GLOBAL  int         LOOP_MAX;
++GLOBAL  ULONG       LOOP_CheckNum;
++GLOBAL  int         Loop;
++GLOBAL  ULONG       CheckBuf_MBSize;
++GLOBAL  ULONG       Err_Flag;
++GLOBAL  ULONG       SCU_f0h_old;
++#ifdef AST1010_IOMAP
++  GLOBAL  ULONG       SCU_11Ch_old;
++#endif
++GLOBAL  ULONG       SCU_04h;
++GLOBAL  ULONG       SCU_90h_old;
++GLOBAL  ULONG       SCU_7ch_old;
++GLOBAL  ULONG       MAC_50h;
++GLOBAL  ULONG       SCU_ach_old;
++GLOBAL  ULONG       SCU_70h_old;
++GLOBAL  ULONG       MAC_50h_Speed;
++GLOBAL  ULONG       SCU_48h_old;
++GLOBAL  ULONG       SCU_48h_mix;
++GLOBAL  ULONG       MAC_08h_old;
++GLOBAL  ULONG       MAC_0ch_old;
++GLOBAL  ULONG       MAC_40h_old;
++GLOBAL  ULONG       SCU_08h_old;
++GLOBAL  ULONG       MAC_PHYBASE;
++GLOBAL  ULONG       LOOP_MAX_arg;
++GLOBAL  BYTE        GRun_Mode;
++GLOBAL  ULONG       GSpeed_idx;
++GLOBAL  CHAR        GSpeed_sel[3];
++GLOBAL  CHAR        PHY_ADR;
++GLOBAL  CHAR        PHY_ADR_arg;
++GLOBAL  CHAR        PHYName[256];
++GLOBAL  ULONG       PHY_ID3;
++GLOBAL  ULONG       PHY_ID2;
++GLOBAL  BYTE        number_pak;
++GLOBAL  BYTE        TestMode;
++GLOBAL  ULONG       IOStr_i;
++GLOBAL  BYTE        IOTimingBund_arg;
++GLOBAL  BYTE        GSpeed;
++GLOBAL  BYTE        GCtrl;
++GLOBAL  ULONG       UserDVal;
++GLOBAL  ULONG       H_MAC_BASE;
++GLOBAL  ULONG       H_TDES_BASE;
++GLOBAL  ULONG       H_RDES_BASE;
++GLOBAL  CHAR         Loop_rl[3];
++GLOBAL  CHAR        IOTiming;
++GLOBAL  CHAR        LOOP_INFINI;
++GLOBAL  CHAR        SelectMAC;
++GLOBAL  CHAR        Enable_SkipChkPHY;
++GLOBAL  CHAR        Enable_MAC34;
++GLOBAL  CHAR        IOStrength;
++GLOBAL  CHAR        DataDelay;
++GLOBAL  CHAR        SA[6];
++GLOBAL  CHAR        RxDataEnable;
++GLOBAL  CHAR        IEEETesting;
++GLOBAL  CHAR        BurstEnable;
++GLOBAL  CHAR        MAC_Mode;
++GLOBAL  CHAR        Enable_MACLoopback;
++GLOBAL  CHAR        Enable_InitPHY;
++GLOBAL  CHAR        MAC1_1GEn;
++GLOBAL  CHAR        MAC2_RMII;
++GLOBAL  CHAR        Enable_RMII;
++GLOBAL  CHAR        MAC2_1GEn;
++GLOBAL  CHAR        TxDataEnable;
++GLOBAL  CHAR        AST2300_NewMDIO;
++GLOBAL  CHAR        ASTChipType;
++GLOBAL  CHAR        Err_Flag_PrintEn;
++GLOBAL  CHAR        AST2400;
++GLOBAL  CHAR        AST2300;
++GLOBAL  CHAR        AST1100;//Different in phy & dram initiation & dram size & RMII
++GLOBAL  CHAR        AST3200;
++GLOBAL  CHAR        AST1010;
++GLOBAL  SCHAR       IOdly_i_min;
++GLOBAL  SCHAR       IOdly_j_min;
++GLOBAL  SCHAR       IOdly_i_max;
++GLOBAL  SCHAR       IOdly_j_max;
++GLOBAL  BYTE        IOdly_i;
++GLOBAL  BYTE        IOdly_j;
++GLOBAL  BYTE        IOdly_in;
++GLOBAL  BYTE        IOdly_out;
++GLOBAL  SCHAR       IOdly_in_str;
++GLOBAL  BYTE        IOdly_in_end;
++GLOBAL  BYTE        IOdly_out_end;
++GLOBAL  BYTE        IOdly_out_shf;
++GLOBAL  BYTE        IOdly_in_shf;
++GLOBAL  SCHAR       IOdly_out_str;
++GLOBAL  BYTE        valary[16];
++
++#define MODE_DEDICATED      0x01
++#define MODE_NSCI           0x02
++GLOBAL  CHAR        ModeSwitch;
++
++#ifdef SLT_UBOOT
++#else
++    GLOBAL  time_t      timestart;
++#endif
++
++#ifdef SPI_BUS
++    GLOBAL ULONG   mmiobase;
++#else    
++    // ( USE_P2A | USE_LPC )
++    GLOBAL  UCHAR       *mmiobase;
++    GLOBAL  ULONG       ulPCIBaseAddress;
++    GLOBAL  ULONG       ulMMIOBaseAddress;
++#endif
++
++   
++// ========================================================
++// For mac.c 
++#undef GLOBAL
++#ifdef MAC_C
++#define GLOBAL
++#else
++#define GLOBAL    extern
++#endif
++    
++GLOBAL  ULONG   ARP_data[16];
++GLOBAL  ULONG   NCSI_LinkFail_Val;
++static  const  char version_name[] = VER_NAME;
++
++GLOBAL void    Debug_delay (void);
++GLOBAL void    read_scu (void);
++GLOBAL void    Setting_scu (void);
++GLOBAL void    PrintMode (void);
++GLOBAL void    PrintPakNUm (void);
++GLOBAL void    PrintChlNUm (void);
++GLOBAL void    PrintTest (void);
++GLOBAL void    PrintIOTimingBund (void);
++GLOBAL void    PrintSpeed (void);
++GLOBAL void    PrintCtrl (void);
++GLOBAL void    PrintLoop (void);
++GLOBAL void    PrintPHYAdr (void);
++GLOBAL void    Finish_Close (void);
++GLOBAL void    Calculate_LOOP_CheckNum (void);
++GLOBAL char    Finish_Check (int value);
++GLOBAL void    init_scu1 (void);
++GLOBAL void    init_scu_macrst (void);
++GLOBAL void    setup_arp (void);
++GLOBAL void    TestingSetup (void);
++GLOBAL void    init_scu2 (void);
++GLOBAL void    init_scu3 (void);
++GLOBAL void    init_mac (ULONG base, ULONG tdexbase, ULONG rdexbase);
++GLOBAL char    TestingLoop (ULONG loop_checknum);
++GLOBAL void    PrintIO_Line_LOG (void);
++GLOBAL void    init_phy (int loop_phy);
++GLOBAL void    recov_phy (int loop_phy);
++GLOBAL int     FindErr (int value);
++GLOBAL int     FindErr_Des (int value);
++GLOBAL void    PrintIO_Header (BYTE option);
++GLOBAL void    Print_Header (BYTE option);
++GLOBAL void    PrintIO_LineS (BYTE option);
++GLOBAL void    PrintIO_Line (BYTE option);
++GLOBAL void    FPri_ErrFlag (BYTE option);
++
++#ifdef SUPPORT_PHY_LAN9303
++// ========================================================
++// For LAN9303.c 
++#undef GLOBAL
++#ifdef LAN9303_C
++#define GLOBAL
++#else
++#define GLOBAL    extern
++#endif
++
++GLOBAL void LAN9303(int num, int phy_adr, int speed, int int_loopback);
++#endif // SUPPORT_PHY_LAN9303
++#endif // End COMMINF_H
++
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/DEF_SPI.H b/arch/arm/cpu/arm926ejs/aspeed/DEF_SPI.H
+new file mode 100644
+index 0000000..02353e7
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/DEF_SPI.H
+@@ -0,0 +1,35 @@
++/*

++ *  This program is distributed in the hope that it will be useful,

++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

++ *  GNU General Public License for more details.

++ *

++ *  You should have received a copy of the GNU General Public License

++ *  along with this program; if not, write to the Free Software

++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

++ */

++#ifndef DEF_SPI_H

++#define DEF_SPI_H

++

++#include "TYPEDEF.H"

++#include "SWFUNC.H"

++

++typedef struct _DEVICE_PCI_INFO

++{

++    USHORT    usVendorID;

++    USHORT    usDeviceID;

++    ULONG     ulPCIConfigurationBaseAddress;

++    ULONG     ulPhysicalBaseAddress;

++    ULONG     ulMMIOBaseAddress;

++    USHORT    usRelocateIO;

++} DEVICE_PCI_INFO;

++

++//VIDEO Engine Info

++typedef struct _VIDEO_ENGINE_INFO {

++    USHORT             iEngVersion;

++    DEVICE_PCI_INFO    VGAPCIInfo;

++} VIDEO_ENGINE_INFO;

++

++BOOLEAN  GetDevicePCIInfo (VIDEO_ENGINE_INFO *VideoEngineInfo);

++

++#endif // DEF_SPI_H

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/DRAM_SPI.c b/arch/arm/cpu/arm926ejs/aspeed/DRAM_SPI.c
+new file mode 100644
+index 0000000..fe2b5cf
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/DRAM_SPI.c
+@@ -0,0 +1,78 @@
++/*

++ *  This program is distributed in the hope that it will be useful,

++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

++ *  GNU General Public License for more details.

++ *

++ *  You should have received a copy of the GNU General Public License

++ *  along with this program; if not, write to the Free Software

++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

++ */

++#define DRAM_SPI_C

++static const char ThisFile[] = "DRAM_SPI.c";

++

++#include "SWFUNC.H"

++

++#ifdef SPI_BUS

++#include <stdio.h>

++#include "DEF_SPI.H"

++#include "LIB_SPI.H"

++

++VOID Set_MMIO_Base(ULONG PCI_BASE, ULONG addr)

++{

++  static ULONG MMIO_BASE = -1;

++

++  if(MMIO_BASE != (addr & 0xffff0000)){

++    if(MMIO_BASE == -1){

++      *(ULONG *)(PCI_BASE + 0xF000) = 1;

++    }

++    *(ULONG *)(PCI_BASE + 0xF004) = addr;

++    MMIO_BASE = addr & 0xffff0000;

++  }

++}

++

++VOID  MOutbm(ULONG PCI_BASE, ULONG Offset, BYTE Data)

++{

++  Set_MMIO_Base(PCI_BASE, Offset);

++  *(BYTE *)(PCI_BASE + 0x10000 + (Offset & 0xffff)) = Data;

++}

++

++VOID  MOutwm(ULONG PCI_BASE, ULONG Offset, USHORT Data)

++{

++  Set_MMIO_Base(PCI_BASE, Offset);

++  *(USHORT *)(PCI_BASE + 0x10000 + (Offset & 0xffff)) = Data;

++}

++

++VOID  MOutdwm(ULONG PCI_BASE, ULONG Offset, ULONG Data)

++{

++  Set_MMIO_Base(PCI_BASE, Offset);

++  *(ULONG *)(PCI_BASE + 0x10000 + (Offset & 0xffff)) = Data;

++}

++

++BYTE  MInbm(ULONG PCI_BASE, ULONG Offset)

++{

++  BYTE jData;

++

++  Set_MMIO_Base(PCI_BASE, Offset);

++  jData = *(BYTE *)(PCI_BASE + 0x10000 + (Offset & 0xffff));

++  return(jData);

++}

++

++USHORT  MInwm(ULONG PCI_BASE, ULONG Offset)

++{

++  USHORT usData;

++

++  Set_MMIO_Base(PCI_BASE, Offset);

++  usData = *(USHORT *)(PCI_BASE + 0x10000 + (Offset & 0xffff));

++  return(usData);

++}

++

++ULONG  MIndwm(ULONG PCI_BASE, ULONG Offset)

++{

++  ULONG ulData;

++

++  Set_MMIO_Base(PCI_BASE, Offset);

++  ulData = *(ULONG *)(PCI_BASE + 0x10000 + (Offset & 0xffff));

++  return(ulData);

++}

++#endif // End SPI_BUS

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/IO.H b/arch/arm/cpu/arm926ejs/aspeed/IO.H
+new file mode 100644
+index 0000000..5fe03f0
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/IO.H
+@@ -0,0 +1,36 @@
++/*

++ *  This program is distributed in the hope that it will be useful,

++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

++ *  GNU General Public License for more details.

++ *

++ *  You should have received a copy of the GNU General Public License

++ *  along with this program; if not, write to the Free Software

++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

++ */

++#ifndef IO_H

++#define IO_H

++

++#include "SWFUNC.H"

++

++//

++// Macro

++//

++#if 	defined(LinuxAP)

++    #define delay(val)	usleep(val*1000)

++    #define ob(p,d) outb(d,p)

++    #define ib(p) inb(p)

++#else

++    #define ob(p,d)	outp(p,d)

++    #define ib(p) inp(p)

++#endif

++

++#ifdef USE_LPC

++void open_aspeed_sio_password(void);

++void enable_aspeed_LDU(BYTE jldu_number);

++int findlpcport(BYTE jldu_number);

++#endif

++

++void WriteSOC_DD(ULONG addr, ULONG data);

++ULONG ReadSOC_DD(ULONG addr);

++#endif

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/IO.c b/arch/arm/cpu/arm926ejs/aspeed/IO.c
+new file mode 100644
+index 0000000..86e9918
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/IO.c
+@@ -0,0 +1,356 @@
++/*

++ *  This program is distributed in the hope that it will be useful,

++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

++ *  GNU General Public License for more details.

++ *

++ *  You should have received a copy of the GNU General Public License

++ *  along with this program; if not, write to the Free Software

++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

++ */

++#define IO_C

++static const char ThisFile[] = "IO.c";

++

++#include "SWFUNC.H"

++

++#if defined(LinuxAP)

++  #include <stdio.h>

++  #include <string.h>

++  #include <stdlib.h>

++  #include <stdarg.h>

++  #include <unistd.h>

++  #include <string.h>

++  #include <fcntl.h>

++  #include <pthread.h>

++  #include <sys/mman.h>

++  #include <sys/io.h>

++#endif

++#ifdef SLT_UBOOT

++  #include <common.h>

++  #include <command.h>

++  #include <post.h>

++  #include <malloc.h>

++  #include <net.h>

++  #include <COMMINF.H>

++#endif

++#ifdef SLT_DOS

++  #include <stdlib.h>

++  #include <stdio.h>

++  #include <time.h>

++  #include <conio.h>

++  #include <dos.h>

++  #include <mem.h>

++  #include "TYPEDEF.H"

++  #include "LIB.H"

++  #include "COMMINF.H"

++#endif

++

++#include "TYPEDEF.H"

++#include "IO.H"

++#include "LIB_SPI.H"

++

++#ifdef SPI_BUS

++#endif

++#ifdef USE_LPC

++    USHORT	usLPCPort;

++#endif

++#ifdef USE_P2A

++#endif

++

++#ifdef USE_LPC

++//------------------------------------------------------------

++// LPC access

++//------------------------------------------------------------

++void open_aspeed_sio_password(void)

++{

++    ob (usLPCPort, 0xaa);

++

++    ob (usLPCPort, 0xa5);

++    ob (usLPCPort, 0xa5);

++}

++

++//------------------------------------------------------------

++void close_aspeed_sio_password(void)

++{

++    ob (usLPCPort, 0xaa);

++}

++

++//------------------------------------------------------------

++void enable_aspeed_LDU(BYTE jldu_number)

++{

++    ob (usLPCPort, 0x07);

++    ob ((usLPCPort + 1), jldu_number);

++    ob (usLPCPort, 0x30);

++    ob ((usLPCPort + 1), 0x01);

++}

++

++//------------------------------------------------------------

++void disable_aspeed_LDU(BYTE jldu_number)

++{

++    ob (usLPCPort, 0x07);

++    ob ((usLPCPort + 1), jldu_number);

++    ob (usLPCPort, 0x30);

++    ob ((usLPCPort + 1), 0x00);

++}

++

++//------------------------------------------------------------

++/*

++ulAddress = AHB address

++jmode = 0: byte mode

++        1: word mode

++        2: dword mode

++*/

++static ULONG lpc_read (ULONG ulAddress, BYTE jmode)

++{

++    ULONG    uldata = 0;

++    ULONG    ultemp = 0;

++    BYTE     jtemp;

++

++    //Write Address

++    ob (  usLPCPort,        0xf0);

++    ob ( (usLPCPort + 1  ), ((ulAddress & 0xff000000) >> 24));

++    ob (  usLPCPort,        0xf1);

++    ob ( (usLPCPort + 1)  , ((ulAddress & 0x00ff0000) >> 16));

++    ob (  usLPCPort,        0xf2);

++    ob ( (usLPCPort + 1),   ((ulAddress & 0x0000ff00) >> 8));

++    ob (  usLPCPort,        0xf3);

++    ob ( (usLPCPort + 1),   ulAddress & 0xff);

++    

++    //Write Mode

++    ob (usLPCPort, 0xf8);

++    jtemp = ib ((usLPCPort + 1));

++    ob ((usLPCPort + 1), ((jtemp & 0xfc) | jmode));

++    

++    //Fire

++    ob (usLPCPort, 0xfe);

++    jtemp = ib ((usLPCPort + 1));

++    

++    //Get Data

++    switch ( jmode )

++    {

++        case 0:

++            ob (usLPCPort, 0xf7);

++            ultemp  = ib ((usLPCPort + 1));

++            uldata |= (ultemp);

++            break;

++        

++        case 1:

++            ob (usLPCPort, 0xf6);

++            ultemp  = ib ((usLPCPort + 1));

++            uldata |= (ultemp << 8);

++            ob (usLPCPort, 0xf7);

++            ultemp  = ib ((usLPCPort + 1));

++            uldata |= (ultemp << 0);

++            break;

++        

++        case 2:

++            ob (usLPCPort, 0xf4);

++            ultemp  = ib ((usLPCPort + 1));

++            uldata |= (ultemp << 24);

++            ob (usLPCPort, 0xf5);

++            ultemp  = ib ((usLPCPort + 1));

++            uldata |= (ultemp << 16);

++            ob (usLPCPort, 0xf6);

++            ultemp  = ib ((usLPCPort + 1));

++            uldata |= (ultemp << 8);

++            ob (usLPCPort, 0xf7);

++            ultemp  = ib ((usLPCPort + 1));

++            uldata |= ultemp;

++            break;

++    } // End switch ( jmode )

++

++    return uldata;

++} // End static ULONG lpc_read (ULONG ulAddress, BYTE jmode)

++

++//------------------------------------------------------------

++static void lpc_write (ULONG ulAddress, ULONG uldata, BYTE jmode)

++{

++    BYTE     jtemp;

++

++    //Write Address

++    ob ( usLPCPort,      0xf0);

++    ob ((usLPCPort + 1), ((ulAddress & 0xff000000) >> 24));

++    ob ( usLPCPort,      0xf1);

++    ob ((usLPCPort + 1), ((ulAddress & 0x00ff0000) >> 16));

++    ob ( usLPCPort,      0xf2);

++    ob ((usLPCPort + 1), ((ulAddress & 0x0000ff00) >> 8));

++    ob ( usLPCPort,      0xf3);

++    ob ((usLPCPort + 1), ulAddress & 0xff);

++    

++    //Write Data

++    switch ( jmode )

++    {

++        case 0:

++            ob ( usLPCPort,      0xf7);

++            ob ((usLPCPort + 1), (uldata & 0xff));

++            break;

++        case 1:

++            ob ( usLPCPort,      0xf6);

++            ob ((usLPCPort + 1), ((uldata & 0xff00) >> 8));

++            ob ( usLPCPort,      0xf7);

++            ob ((usLPCPort + 1), (uldata & 0x00ff));

++            break;

++        case 2:

++            ob ( usLPCPort,      0xf4);

++            ob ((usLPCPort + 1), ((uldata & 0xff000000) >> 24));

++            ob ( usLPCPort,      0xf5);

++            ob ((usLPCPort + 1), ((uldata & 0x00ff0000) >> 16));

++            ob ( usLPCPort,      0xf6);

++            ob ((usLPCPort + 1), ((uldata & 0x0000ff00) >> 8));

++            ob ( usLPCPort,      0xf7);

++            ob ((usLPCPort + 1), uldata & 0xff);

++            break;

++    } // End switch ( jmode )

++    

++    //Write Mode

++    ob (usLPCPort, 0xf8);

++    jtemp = ib ((usLPCPort + 1));

++    ob ((usLPCPort + 1), ((jtemp & 0xfc) | jmode));

++

++    //Fire

++    ob (usLPCPort, 0xfe);

++    ob ((usLPCPort + 1), 0xcf);

++    

++} // End static void lpc_write (ULONG ulAddress, ULONG uldata, BYTE jmode)

++

++//------------------------------------------------------------

++static USHORT usLPCPortList[] = {0x2e, 0x4e, 0xff};

++int findlpcport(BYTE jldu_number)

++{

++    USHORT  *jLPCPortPtr;

++    ULONG   ulData;

++

++    jLPCPortPtr = usLPCPortList;

++    while (*(USHORT *)(jLPCPortPtr) != 0xff )

++    {

++        usLPCPort = *(USHORT *)(jLPCPortPtr++);

++

++        open_aspeed_sio_password();

++        enable_aspeed_LDU(0x0d);

++

++        ulData  = lpc_read(0x1e6e207c, 2);

++        

++        if ( (ulData != 0x00000000)	&&

++             (ulData != 0xFFFFFFFF)   )

++        {

++            printf("Find LPC IO port at 0x%2x \n", usLPCPort);

++            return 1;

++        }

++

++        disable_aspeed_LDU(0x0d);

++        close_aspeed_sio_password();

++    }

++

++    //printf("[Error] Fail to find proper LPC IO Port \n");

++    return 0;

++}

++#endif // End ifdef USE_LPC

++

++#ifdef USE_P2A

++//------------------------------------------------------------

++// A2P Access

++//------------------------------------------------------------

++void mm_write (ULONG addr, ULONG data, BYTE jmode)

++{

++    *(ULONG *) (mmiobase + 0xF004) = (ULONG) ((addr) & 0xFFFF0000);

++    *(ULONG *) (mmiobase + 0xF000) = (ULONG) 0x00000001;

++    

++    switch ( jmode )

++    {

++        case 0:

++            *(BYTE *) (mmiobase + 0x10000 + ((addr) & 0x0000FFFF)) = (BYTE) data;

++            break;

++        case 1:

++            *(USHORT *) (mmiobase + 0x10000 + ((addr) & 0x0000FFFF)) = (USHORT) data;

++            break;

++        case 2:

++        default:

++            *(ULONG *) (mmiobase + 0x10000 + ((addr) & 0x0000FFFF)) = data;

++            break;

++    } //switch

++}

++

++//------------------------------------------------------------

++ULONG mm_read (ULONG addr, BYTE jmode)

++{

++    *(ULONG *) (mmiobase + 0xF004) = (ULONG) ((addr) & 0xFFFF0000);

++    *(ULONG *) (mmiobase + 0xF000) = (ULONG) 0x00000001;

++    switch (jmode)

++    {

++    case 0:

++        return ( *(BYTE *) (mmiobase + 0x10000 + ((addr) & 0x0000FFFF)) );

++        break;

++    case 1:

++        return ( *(USHORT *) (mmiobase + 0x10000 + ((addr) & 0x0000FFFF)) );

++        break;

++    default:

++    case 2:

++        return ( *(ULONG *) (mmiobase + 0x10000 + ((addr) & 0x0000FFFF)) );

++        break;

++    } //switch

++

++    return 0;

++}

++#endif // End ifdef USE_P2A

++

++//------------------------------------------------------------

++// General Access API

++//------------------------------------------------------------

++#ifdef SLT_UBOOT

++BYTE Check_BEorLN ( ULONG chkaddr )

++{

++    BYTE ret = BIG_ENDIAN_ADDRESS;

++    BYTE i   = 0;

++    

++    do {

++        if ( LittleEndianArea[i].StartAddr == LittleEndianArea[i].EndAddr )

++            break;

++        

++        if ( ( LittleEndianArea[i].StartAddr <= chkaddr ) &&

++             ( LittleEndianArea[i].EndAddr   >= chkaddr )    ) {

++            ret = LITTLE_ENDIAN_ADDRESS;

++            break;

++        }

++        i++;

++    } while ( 1 );

++    

++    return ret;

++}

++#endif

++

++void WriteSOC_DD(ULONG addr, ULONG data)

++{

++#ifdef SLT_UBOOT

++    if ( Check_BEorLN( addr ) == BIG_ENDIAN_ADDRESS )

++        *(volatile unsigned long *)(addr) = cpu_to_le32(data);

++    else

++        *(volatile unsigned long *)(addr) = data;

++#else

++    #ifdef USE_LPC

++        lpc_write(addr, data, 2);

++    #endif

++    #ifdef USE_P2A

++        mm_write(addr, data, 2);

++    #endif

++#endif

++}

++

++//------------------------------------------------------------

++ULONG ReadSOC_DD(ULONG addr)

++{

++#ifdef SLT_UBOOT

++    if ( Check_BEorLN( addr ) == BIG_ENDIAN_ADDRESS )

++        return le32_to_cpu(*(volatile unsigned long *) (addr));

++    else

++        return (*(volatile unsigned long *) (addr));

++#else

++    #ifdef USE_LPC

++        return (lpc_read(addr, 2));

++    #endif

++    #ifdef USE_P2A

++        return (mm_read(addr, 2));

++    #endif

++#endif

++    return 0;

++}

++

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/LAN9303.c b/arch/arm/cpu/arm926ejs/aspeed/LAN9303.c
+new file mode 100644
+index 0000000..498d4fd
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/LAN9303.c
+@@ -0,0 +1,525 @@
++/*

++ *  This program is distributed in the hope that it will be useful,

++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

++ *  GNU General Public License for more details.

++ *

++ *  You should have received a copy of the GNU General Public License

++ *  along with this program; if not, write to the Free Software

++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

++ */

++#define LAN9303_C

++static const char ThisFile[] = "LAN9303.c";

++

++#include "SWFUNC.H"
++#ifdef SLT_UBOOT

++  #include <COMMINF.H>

++  #include <MAC.H>

++  #include <IO.H>

++#endif

++

++#ifdef SLT_DOS

++  #include "COMMINF.H"

++  #include <stdlib.h>
++  #include "IO.H"
++#endif

++

++#ifdef SUPPORT_PHY_LAN9303
++//#define LAN9303M

++#define I2C_Debug           0

++#define Print_DWRW          0

++#define Print_PHYRW         0

++#define I2C_TIMEOUT         10000000

++

++ULONG   devbase;

++ULONG   busnum;

++ULONG   byte;

++ULONG   data_rd;

++

++//------------------------------------------------------------

++// Basic

++//------------------------------------------------------------

++void actime(ULONG ac1, ULONG ac2, ULONG *fact, ULONG *ckh, ULONG *ckl)

++{

++        static int      divcnt;

++

++        ac1 = ac1 * 50 + 1;

++        ac2 = ac2 * 50 + 1;

++

++        divcnt = 0;

++        while (ac1 > 8 || ac2 > 8) {

++                divcnt++;

++                ac1 >>= 1;

++                ac2 >>= 1;

++        }

++

++        if (ac1 < 2  ) ac1  = 2;

++        if (ac2 < 2  ) ac2  = 2;

++        if (ac1 > ac2) ac2  = 1;

++        else           ac1 += 1;

++

++#ifdef PRINT_MSG

++        printf("Divcnt = %d, ckdiv = %d, ckh = %d, ckl = %d\n",(1<<divcnt)*(ac1+ac2),divcnt,ac1-1,ac2-1);

++        printf("CKH = %d us, CKL = %d us\n",(1<<divcnt)*ac1/50,(1<<divcnt)*ac2/50);

++#endif

++

++        *fact = divcnt;

++        *ckh  = ac1 - 1;

++        *ckl  = ac2 - 1;

++}

++

++//------------------------------------------------------------

++ULONG PollStatus()

++{

++        static ULONG    status;

++        static ULONG    cnt = 0;

++

++        do {

++                status = ReadSOC_DD( devbase + 0x14 ) & 0xff;

++

++                if ( ++cnt > I2C_TIMEOUT ) {

++                        printf("\nWait1 Timeout at bus %d!\n", busnum);

++                        printf("Status 14 = %08x\n", ReadSOC_DD(devbase + 0x14));

++                        exit(0);

++                }

++        } while (status != 0);

++        

++        cnt = 0;

++        do {

++                status = ReadSOC_DD( devbase + 0x10 );

++                if ( ++cnt > I2C_TIMEOUT ) {

++                        printf("\nWait2 Timeout at bus %d!\n", busnum);

++                        printf("Status 14 = %08x\n", ReadSOC_DD(devbase + 0x14));

++                        exit(0);

++                }

++        } while (status == 0);

++

++        WriteSOC_DD( devbase + 0x10, status );

++

++        return(status);

++}

++

++

++//------------------------------------------------------------

++ULONG writeb(ULONG start, ULONG data, ULONG stop)

++{

++        WriteSOC_DD( devbase + 0x20, data);

++        WriteSOC_DD( devbase + 0x14, 0x02 | start | (stop << 5) );

++        return(PollStatus());

++}

++

++//------------------------------------------------------------

++ULONG readb(ULONG last, ULONG stop)

++{

++        static ULONG    data;

++

++        WriteSOC_DD( devbase + 0x14, 0x08 | (last << 4) | (stop << 5) );

++        data = PollStatus();

++        

++        if (data & 0x4) {

++                data = ReadSOC_DD( devbase + 0x20 );

++                return(data >> 8);

++        } 

++        else {

++                return(-1);

++        }

++}

++                                                              

++//------------------------------------------------------------

++void Initial(ULONG base, ULONG ckh, ULONG ckl)

++{

++        static ULONG    ackh;

++        static ULONG    ackl;

++        static ULONG    divx;

++

++        actime(ckh, ckl, &divx, &ackh, &ackl);

++        WriteSOC_DD(base + 0x00, 0x1);

++        if (ReadSOC_DD(base + 0x00) != 0x1) {

++                printf("Controller initial fail : %x\n",base);

++                exit(0);

++        }

++        WriteSOC_DD(base + 0x04, 0x77700360 | (ackh << 16) | (ackl << 12) | divx);

++        WriteSOC_DD(base + 0x08, 0x0);

++        WriteSOC_DD(base + 0x0c, 0x0);

++        WriteSOC_DD(base + 0x10, 0xffffffff);

++        WriteSOC_DD(base + 0x14, 0x00);

++        WriteSOC_DD(base + 0x1C, 0xff0000);

++        WriteSOC_DD(base + 0x20, 0x00);

++}

++

++//------------------------------------------------------------

++void print_status(ULONG status)

++{

++        if ( status & 0x02 ) printf( "Device NAK\n"       );

++        if ( status & 0x08 ) printf( "Arbitration Loss\n" );

++        if ( status & 0x10 ) printf( "STOP\n"             );

++        if ( status & 0x20 ) printf( "Abnormal STOP\n"    );

++        if ( status & 0x40 ) printf( "SCL Low timeout\n"  );

++}

++

++//------------------------------------------------------------

++void readme()

++{

++        printf("\nVersion:%s\n", version_name);

++#ifdef LAN9303M

++        printf("LAN9303M [bus] [vir_PHY_adr] [speed] [func]\n");

++#else

++        printf("LAN9303 [bus] [vir_PHY_adr] [speed] [func]\n" );

++#endif

++        printf("[bus]         | 1~14: I2C bus number\n"       );

++        printf("[vir_PHY_adr] | 0~1: virtual PHY address\n"   );

++        printf("[speed]       | 1: 100M\n"                    );

++        printf("              | 2: 10 M\n"                    );

++        printf("[func]        | 0: external loopback\n"       );

++        printf("              | 1: internal loopback\n"       );

++}

++

++//------------------------------------------------------------

++void quit()

++{

++        WriteSOC_DD( devbase + 0x14, 0x20 );

++        PollStatus();

++        readme();

++}

++

++//------------------------------------------------------------

++// Double-Word Read/Write

++//------------------------------------------------------------

++ULONG I2C_DWRead(ULONG adr)

++{

++        static ULONG    status;

++        int             i;

++

++        Initial(devbase, 10, 10);

++        

++        if ( Print_DWRW ) 

++            printf("RAdr %02x: ", adr);

++

++        status = writeb( 1, LAN9303_I2C_ADR, 0 );
++        if ( I2C_Debug ) 

++            printf("R1W[%02x]%02x ", status, LAN9303_I2C_ADR);
++            

++        if ( status != 0x1 ) {

++                print_status(status);

++                quit();

++                exit(0);

++        }

++        

++        status = writeb(0, adr, 0);

++        if ( I2C_Debug ) 

++            printf("R2W[%02x]%02x ", status, adr);

++        if ( !(status & 0x1) ) {

++                print_status(status);

++                quit();

++                exit(0);

++        }

++

++        status = writeb(1, LAN9303_I2C_ADR | 0x1, 0);
++        if ( I2C_Debug ) 

++            printf("R3W[%02x]%02x ", status, LAN9303_I2C_ADR | 0x1);
++        if ( status != 0x1 ) {

++                print_status(status);

++                quit();

++                exit(0);

++        }

++

++        if ( I2C_Debug ) 

++            printf("R4");

++            

++        data_rd = 0;

++        for (i = 24; i >= 0; i-=8) {

++                if (i == 0) byte = readb(1, 1);

++                else        byte = readb(0, 0);

++                    

++                if ( I2C_Debug ) 

++                    printf("%02x ", byte);

++                data_rd = data_rd | (byte << i);

++        }

++

++        if ( Print_DWRW ) 

++            printf("%08x\n", data_rd);

++

++        return (data_rd);

++} // End ULONG I2C_DWRead(ULONG adr)

++

++//------------------------------------------------------------

++void I2C_DWWrite(ULONG adr, ULONG dwdata)

++{

++        static ULONG    status;

++        int             i;

++        ULONG           endx;

++

++        Initial(devbase, 10, 10);

++        if (Print_DWRW) 

++            printf("WAdr %02x: ", adr);

++

++        status = writeb(1, LAN9303_I2C_ADR, 0);
++        if ( I2C_Debug ) 

++            printf("W1[%02x]%02x ", status, LAN9303_I2C_ADR);
++        if ( status != 0x1 ) {

++                print_status(status);

++                quit();

++                exit(0);

++        }

++        status = writeb(0, adr, 0);

++        if ( I2C_Debug ) 

++            printf("W2[%02x]%02x ", status, adr);

++        if ( !(status & 0x1) ) {

++                print_status(status);

++                quit();

++                exit(0);

++        }

++

++        if (I2C_Debug) 

++            printf("W3");

++        endx = 0;

++        for (i = 24; i >= 0; i-=8) {

++                if (i == 0) 

++                    endx = 1;

++                byte   = (dwdata >> i) & 0xff;

++                status = writeb(0, byte, endx);

++                

++            if (I2C_Debug) 

++                printf("[%02x]%02x ", status, byte);

++                if (!(status & 0x1)) {

++                        print_status(status);

++                        quit();

++                        exit(0);

++                }

++        }

++

++        if (Print_DWRW) printf("%08x\n", dwdata);

++} // End void I2C_DWWrite(ULONG adr, ULONG dwdata)

++

++//------------------------------------------------------------

++// PHY Read/Write

++//------------------------------------------------------------

++ULONG LAN9303_PHY_Read(ULONG phy_adr, ULONG reg_adr)

++{

++        static ULONG    data_rd;

++

++        I2C_DWWrite(0x2a, ((phy_adr & 0x1f) << 11) | ((reg_adr & 0x1f) << 6));//[0A8h]PMI_ACCESS

++        do {

++            data_rd = I2C_DWRead (0x2a);

++        } while(data_rd & 0x00000001);//[0A8h]PMI_ACCESS

++

++        data_rd = I2C_DWRead (0x29);//[0A4h]PMI_DATA

++        if (Print_PHYRW) 

++            printf("PHY:%2d, Reg:%2d, Data:%08x\n", phy_adr, reg_adr, data_rd);

++            

++        return(data_rd);

++}

++

++//------------------------------------------------------------

++void LAN9303_PHY_Write(ULONG phy_adr, ULONG reg_adr, ULONG data_wr)

++{

++        static ULONG    data_rd;

++

++        I2C_DWWrite(0x29, data_wr);//[0A4h]PMI_DATA

++

++        I2C_DWWrite(0x2a, ((phy_adr & 0x1f) << 11) | ((reg_adr & 0x1f) << 6) | 0x2);//[0A8h]PMI_ACCESS

++        do {

++            data_rd = I2C_DWRead (0x2a);

++        } while(data_rd & 0x00000001);//[0A8h]PMI_ACCESS

++}

++

++//------------------------------------------------------------

++ULONG LAN9303_PHY_Read_WD(ULONG data_ctl)

++{

++        static ULONG    data_rd;

++

++        I2C_DWWrite(0x2a, data_ctl);//[0A8h]PMI_ACCESS

++        do {

++            data_rd = I2C_DWRead (0x2a);

++        } while(data_rd & 0x00000001);//[0A8h]PMI_ACCESS

++

++        data_rd = I2C_DWRead (0x29);//[0A4h]PMI_DATA

++        if (Print_PHYRW) 

++            printf("WD Data:%08x\n", data_ctl);

++            

++        return(data_rd);

++}

++

++//------------------------------------------------------------

++void LAN9303_PHY_Write_WD(ULONG data_ctl, ULONG data_wr)

++{

++        static ULONG    data_rd;

++

++        I2C_DWWrite( 0x29, data_wr  ); //[0A4h]PMI_DATA

++        I2C_DWWrite( 0x2a, data_ctl ); //[0A8h]PMI_ACCESS

++        do {

++            data_rd = I2C_DWRead (0x2a);

++        } while(data_rd & 0x00000001); //[0A8h]PMI_ACCESS

++}

++

++//------------------------------------------------------------

++// Virtual PHY Read/Write

++//------------------------------------------------------------

++ULONG LAN9303_VirPHY_Read(ULONG reg_adr)

++{

++        static ULONG    data_rd;

++

++        data_rd = I2C_DWRead (0x70+reg_adr);//[1C0h]

++        if ( Print_PHYRW ) 

++            printf("VirPHY Reg:%2d, Data:%08x\n", reg_adr, data_rd);

++            

++        return(data_rd);

++}

++

++//------------------------------------------------------------

++void LAN9303_VirPHY_Write(ULONG reg_adr, ULONG data_wr)

++{

++        I2C_DWWrite(0x70+reg_adr, data_wr);//[1C0h]

++}

++

++//------------------------------------------------------------

++void LAN9303_VirPHY_RW(ULONG reg_adr, ULONG data_clr, ULONG data_set)

++{

++        I2C_DWWrite(0x70+reg_adr, (LAN9303_VirPHY_Read(reg_adr) & (~data_clr)) | data_set);//[1C0h]

++}

++

++//------------------------------------------------------------

++// PHY Read/Write

++//------------------------------------------------------------

++ULONG LAN9303_Read(ULONG adr)

++{

++        static ULONG    data_rd;

++

++        I2C_DWWrite(0x6c, 0xc00f0000 | adr & 0xffff);//[1B0h]SWITCH_CSR_CMD

++        do {

++            data_rd = I2C_DWRead (0x6c);

++        } while(data_rd & 0x80000000);//[1B0h]SWITCH_CSR_CMD

++

++        return(I2C_DWRead (0x6b));//[1ACh]SWITCH_CSR_DATA

++}

++

++//------------------------------------------------------------

++void LAN9303_Write(ULONG adr, ULONG data)

++{

++        static ULONG    data_rd;

++

++        I2C_DWWrite(0x6b, data);//[1ACh]SWITCH_CSR_DATA

++        I2C_DWWrite(0x6c, 0x800f0000 | adr & 0xffff);//[1B0h]SWITCH_CSR_CMD

++

++        do {

++            data_rd = I2C_DWRead (0x6c);

++        } while(data_rd & 0x80000000);//[1B0h]SWITCH_CSR_CMD

++}

++

++//------------------------------------------------------------

++void LAN9303(int num, int phy_adr, int speed, int int_loopback)

++{

++        static ULONG    data_rd;

++

++    //------------------------------------------------------------

++    // I2C Initial

++    //------------------------------------------------------------

++        busnum = num;

++        if (busnum <= 7) devbase = 0x1E78A000 + ( busnum    * 0x40);

++        else             devbase = 0x1E78A300 + ((busnum-8) * 0x40);

++        Initial(devbase, 10, 10);

++

++    //------------------------------------------------------------

++    // LAN9303 Register Setting

++    //------------------------------------------------------------

++    printf("----> Start\n");

++        if (int_loopback == 0) { 

++            //Force Speed & external loopback

++                if (speed == 1) { //100M

++                        LAN9303_VirPHY_RW(  0, 0xffff, 0x2300 );      //adr clr set //VPHY_BASIC_CTRL

++                        LAN9303_VirPHY_RW( 11, 0xffff, 0x2300 );      //adr clr set //P1_MII_BASIC_CONTROL

++                        LAN9303_PHY_Write( phy_adr + 1, 0, 0x2300 );

++                        LAN9303_PHY_Write( phy_adr + 2, 0, 0x2300 );

++                } 

++                else {

++                        LAN9303_VirPHY_RW(  0, 0xffff, 0x0100 );      //adr clr set //VPHY_BASIC_CTRL

++                        LAN9303_VirPHY_RW( 11, 0xffff, 0x0100 );      //adr clr set //P1_MII_BASIC_CONTROL

++                        LAN9303_PHY_Write( phy_adr + 1, 0, 0x0100);

++                        LAN9303_PHY_Write( phy_adr + 2, 0, 0x0100);

++                }

++

++                LAN9303_Write( 0x180c, 0x00000001 ); // SWE_VLAN_WR_DATA

++                LAN9303_Write( 0x180b, 0x00000010 ); // SWE_VLAN_CMD

++                do {data_rd = LAN9303_Read (0x1810);} while(data_rd & 0x1);

++

++                LAN9303_Write( 0x180c, 0x00000002 ); // SWE_VLAN_WR_DATA

++                LAN9303_Write( 0x180b, 0x00000011 ); // SWE_VLAN_CMD

++                do {data_rd = LAN9303_Read (0x1810);} while(data_rd & 0x1);

++

++                LAN9303_Write( 0x180c, 0x00000003 ); // SWE_VLAN_WR_DATA

++                LAN9303_Write( 0x180b, 0x00000012 ); // SWE_VLAN_CMD

++                do {data_rd = LAN9303_Read (0x1810);} while(data_rd & 0x1);

++

++#ifdef LAN9303M

++                LAN9303_Write( 0x180c, 0x00022001 ); // SWE_VLAN_WR_DATA

++                LAN9303_Write( 0x180b, 0x00000000 ); // SWE_VLAN_CMD

++                do {data_rd = LAN9303_Read (0x1810);} while(data_rd & 0x1);

++

++                LAN9303_Write( 0x180c, 0x00024002 ); // SWE_VLAN_WR_DATA

++                LAN9303_Write( 0x180b, 0x00000001 ); // SWE_VLAN_CMD

++                do {data_rd = LAN9303_Read (0x1810);} while(data_rd & 0x1);

++

++                LAN9303_Write( 0x180c, 0x0002a003 ); // SWE_VLAN_WR_DATA

++                LAN9303_Write( 0x180b, 0x00000002 ); // SWE_VLAN_CMD

++                do {data_rd = LAN9303_Read (0x1810);} while(data_rd & 0x1);

++#else

++                LAN9303_Write( 0x180c, 0x0002a001 ); // SWE_VLAN_WR_DATA

++                LAN9303_Write( 0x180b, 0x00000000 ); // SWE_VLAN_CMD

++                do {data_rd = LAN9303_Read (0x1810);} while(data_rd & 0x1);

++

++                LAN9303_Write( 0x180c, 0x0000a002 ); // SWE_VLAN_WR_DATA

++                LAN9303_Write( 0x180b, 0x00000001 ); // SWE_VLAN_CMD

++                do {data_rd = LAN9303_Read (0x1810);} while(data_rd & 0x1);

++

++                LAN9303_Write( 0x180c, 0x00022003 ); // SWE_VLAN_WR_DATA

++                LAN9303_Write( 0x180b, 0x00000002 ); // SWE_VLAN_CMD

++                do {data_rd = LAN9303_Read (0x1810);} while(data_rd & 0x1);

++#endif

++                LAN9303_Write( 0x1840, 0x00000007);

++        } 

++        else if ( int_loopback == 1 ) { 

++            //Force Speed & internal loopback

++                if ( speed == 1 ) { 

++                    //100M

++                        LAN9303_VirPHY_RW(  0, 0xffff, 0x6300 ); // adr clr set //VPHY_BASIC_CTRL

++                        LAN9303_VirPHY_RW( 11, 0xffff, 0x6300 ); // adr clr set //P1_MII_BASIC_CONTROL

++                        LAN9303_PHY_Write( phy_adr + 1, 0, 0x6300 );

++                        LAN9303_PHY_Write( phy_adr + 2, 0, 0x6300 );

++                } 

++                else {

++                        LAN9303_VirPHY_RW(  0, 0xffff, 0x4100 ); // adr clr set //VPHY_BASIC_CTRL

++                        LAN9303_VirPHY_RW( 11, 0xffff, 0x4100 ); // adr clr set //P1_MII_BASIC_CONTROL

++                        LAN9303_PHY_Write( phy_adr + 1, 0, 0x4100 );

++                        LAN9303_PHY_Write( phy_adr + 2, 0, 0x4100 );

++                }

++        } 

++        else { 

++            //Force Speed

++                if (speed == 1) { 

++                    //100M

++                        LAN9303_VirPHY_RW(  0, 0xffff, 0x2300 ); // adr clr set //VPHY_BASIC_CTRL

++                        LAN9303_VirPHY_RW( 11, 0xffff, 0x2300 ); // adr clr set //P1_MII_BASIC_CONTROL

++                        LAN9303_PHY_Write( phy_adr + 1, 0, 0x2300 );

++                        LAN9303_PHY_Write( phy_adr + 2, 0, 0x2300 );

++                } 

++                else {

++                        LAN9303_VirPHY_RW(  0, 0xffff, 0x0100 ); // adr clr set //VPHY_BASIC_CTRL

++                        LAN9303_VirPHY_RW( 11, 0xffff, 0x0100 ); // adr clr set //P1_MII_BASIC_CONTROL

++                        LAN9303_PHY_Write( phy_adr + 1, 0, 0x0100 );

++                        LAN9303_PHY_Write( phy_adr + 2, 0, 0x0100 );

++                }

++#ifdef LAN9303M

++#else

++                if (int_loopback == 3) { 

++                    //[LAN9303]IEEE measurement

++                        data_rd = LAN9303_PHY_Read(phy_adr+1, 27);//PHY_SPECIAL_CONTROL_STAT_IND_x

++                        LAN9303_PHY_Write(phy_adr+1, 27, (data_rd & 0x9fff) | 0x8000);//PHY_SPECIAL_CONTROL_STAT_IND_x

++

++                        data_rd = LAN9303_PHY_Read(phy_adr+2, 27);//PHY_SPECIAL_CONTROL_STAT_IND_x

++                        LAN9303_PHY_Write(phy_adr+2, 27, (data_rd & 0x9fff) | 0x8000);//PHY_SPECIAL_CONTROL_STAT_IND_x

++                }

++#endif

++        } // End if (int_loopback == 0)

++} // End void LAN9303(int num, int phy_adr, int speed, int int_loopback)

++#endif // SUPPORT_PHY_LAN9303
++

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/LIB.H b/arch/arm/cpu/arm926ejs/aspeed/LIB.H
+new file mode 100644
+index 0000000..a7c61dd
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/LIB.H
+@@ -0,0 +1,37 @@
++/*

++ *  This program is distributed in the hope that it will be useful,

++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

++ *  GNU General Public License for more details.

++ *

++ *  You should have received a copy of the GNU General Public License

++ *  along with this program; if not, write to the Free Software

++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

++ */

++#ifndef LIB_H

++#define LIB_H

++

++#include "TYPEDEF.H"

++

++//

++// Macro

++//

++#define   INTFUNC              int386

++

++#define   OUTDWPORT         	outpd

++#define   INDWPORT          	inpd

++#define   OUTPUT            	outp

++#define   INPUT             	inp

++

++//

++// PCI

++//

++ULONG ReadPCIReg (ULONG ulPCIConfigAddress, BYTE jOffest, ULONG ulMask);

++ULONG FindPCIDevice (USHORT usVendorID, USHORT usDeviceID, USHORT usBusType);

++VOID  WritePCIReg (ULONG ulPCIConfigAddress, BYTE jOffest, ULONG ulMask, ULONG ulData);

++

++//

++// Map Resource

++//

++ULONG    MapPhysicalToLinear (ULONG ulBaseAddress, ULONG ulSize);

++#endif

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/LIB.c b/arch/arm/cpu/arm926ejs/aspeed/LIB.c
+new file mode 100644
+index 0000000..f2a0c54
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/LIB.c
+@@ -0,0 +1,184 @@
++/*

++ *  This program is distributed in the hope that it will be useful,

++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

++ *  GNU General Public License for more details.

++ *

++ *  You should have received a copy of the GNU General Public License

++ *  along with this program; if not, write to the Free Software

++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

++ */

++#define LIB_C

++static const char ThisFile[] = "LIB.c";

++

++#include "SWFUNC.H"

++

++#ifdef SLT_UBOOT

++  #include <common.h>

++  #include <command.h>

++#endif

++#ifdef SLT_DOS

++#include <stdlib.h>

++#include <stdio.h>

++#include <time.h>

++#include <conio.h>

++#include <dos.h>

++#include <mem.h>

++#endif

++

++#include "LIB.H"

++#include "TYPEDEF.H"

++

++#ifdef USE_P2A

++//------------------------------------------------------------

++// PCI

++//------------------------------------------------------------

++ULONG ReadPCIReg (ULONG ulPCIConfigAddress, BYTE jOffest, ULONG ulMask)

++{

++#ifndef Windows

++    OUTDWPORT(0xcf8, ulPCIConfigAddress + jOffest);

++

++    return (((ULONG)INDWPORT(0xcfc)) & ulMask);

++#else

++    WRITE_PORT_ULONG((PULONG)0xcf8, ulPCIConfigAddress + jOffest);

++    

++    return (READ_PORT_ULONG((PULONG)0xcfc) & ulMask);

++#endif

++}

++

++//------------------------------------------------------------

++VOID WritePCIReg (ULONG ulPCIConfigAddress, BYTE jOffest, ULONG ulMask, ULONG ulData)

++{

++#ifndef Windows

++    OUTDWPORT(0xcf8, ulPCIConfigAddress + jOffest);

++    OUTDWPORT(0xcfc, (INDWPORT(0xcfc) & ulMask | ulData));

++#else

++    WRITE_PORT_ULONG((PULONG)0xcf8, ulPCIConfigAddress + jOffest);

++    WRITE_PORT_ULONG((PULONG)0xcfc, (READ_PORT_ULONG((PULONG)0xcfc) & ulMask | ulData));

++#endif

++}

++

++//------------------------------------------------------------

++ULONG FindPCIDevice (USHORT usVendorID, USHORT usDeviceID, USHORT usBusType)

++{

++//Return: ulPCIConfigAddress

++//usBusType: ACTIVE/PCI/AGP/PCI-E

++

++    ULONG   Base[256];

++    ULONG   ebx;

++    USHORT  i;

++    USHORT  j;

++    

++    for (i = 0; i < 256; i++) {

++        Base[i] = 0x80000000 + 0x10000 * i;

++    }

++    

++    if (usBusType == PCI)

++    {

++      ebx = 0x80000000;

++    }

++    else if (usBusType == PCIE)

++    {

++      ebx = 0x80020000;

++    }

++    else     // AGP and ACTIVE

++    {

++      ebx = 0x80010000;

++    }

++    

++    if ( usBusType != ACTIVE )    //AGP, PCI, PCIE

++    {

++      for (i = 0; i < 32; i++)

++      {

++        ebx = ebx + (0x800);

++        if (((USHORT)ReadPCIReg(ebx, 0, 0xffff) == usVendorID) && ((USHORT)(ReadPCIReg(ebx, 0, 0xffff0000) >> 16) == usDeviceID))

++        {

++          return ebx;

++        }

++      }

++      return 0;

++    }

++    else     //ACTIVE

++    {

++      for (j = 0; j < 256; j++)

++      {

++        ebx = Base[j];

++        for (i = 0; i < 32; i++)

++        {

++          ebx = ebx + (0x800);

++          if (((USHORT)ReadPCIReg(ebx, 0, 0xffff) == usVendorID) && ((USHORT)(ReadPCIReg(ebx, 0, 0xffff0000) >> 16) == usDeviceID))

++          {

++            return ebx;

++          }

++        }

++      }

++      return 0;

++    }

++} // End ULONG FindPCIDevice (USHORT usVendorID, USHORT usDeviceID, USHORT usBusType)

++#endif

++//------------------------------------------------------------

++// Allocate Resource

++//------------------------------------------------------------

++#ifdef SLT_DOS

++ULONG InitDOS32()

++{

++  union REGS regs ;

++

++  regs.w.ax = 0xee00;

++  INTFUNC(0x31, &regs, &regs) ;

++

++  if(regs.w.ax >= 0x301)    // DOS32 version >= 3.01 ?

++    return 1;

++  else

++    return 0;

++}

++

++//------------------------------------------------------------

++USHORT CheckDOS()

++{

++    union REGS  regs;

++

++    regs.w.ax = 0xeeff;

++    int386(0x31, &regs, &regs);

++    if (regs.x.eax == 0x504d4457)

++    {

++        return 0;

++    } else {

++        printf("PMODEW Init. fail\n");

++        return 1;

++    }

++}

++

++//------------------------------------------------------------

++ULONG MapPhysicalToLinear (ULONG ulBaseAddress, ULONG ulSize)

++{

++  union REGS regs;

++

++  regs.w.ax = 0x0800;                        // map physcial memory

++  regs.w.bx = ulBaseAddress >> 16;           // bx:cx = physical address

++  regs.w.cx = ulBaseAddress;

++  regs.w.si = ulSize >> 16;                  // si:di = mapped memory block size

++  regs.w.di = ulSize;

++  INTFUNC(0x31, &regs, &regs);               // int386(0x31, &regs, &regs);

++  if (regs.w.cflag == 0)

++    return (ULONG) (regs.w.bx << 16 + regs.w.cx);  // Linear Addr = bx:cx

++  else

++    return 0;

++}

++

++//------------------------------------------------------------

++USHORT FreePhysicalMapping(ULONG udwLinAddress)

++{

++    union REGS regs;

++

++    regs.w.ax = 0x0801;

++    regs.w.bx = udwLinAddress >> 16;

++    regs.w.cx = udwLinAddress & 0xFFFF;

++    int386(0x31, &regs, &regs);

++

++    if (regs.x.cflag)

++        return ((USHORT) 0);

++    else return ((USHORT) 1);

++}

++#endif

++

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/LIB_SPI.H b/arch/arm/cpu/arm926ejs/aspeed/LIB_SPI.H
+new file mode 100644
+index 0000000..78c8f1e
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/LIB_SPI.H
+@@ -0,0 +1,23 @@
++/*

++ *  This program is distributed in the hope that it will be useful,

++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

++ *  GNU General Public License for more details.

++ *

++ *  You should have received a copy of the GNU General Public License

++ *  along with this program; if not, write to the Free Software

++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

++ */

++#ifndef LIB_SPI_H

++#define LIB_SPI_H

++

++#ifdef SPI_BUS

++    // MMIO Functions

++    VOID       MOutwm (ULONG, ULONG, USHORT);

++    VOID       MOutdwm (ULONG, ULONG, ULONG);

++    ULONG      MIndwm (ULONG, ULONG);

++    

++    void spim_init(int cs);

++#endif

++

++#endif // LIB_SPI_H

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/MAC.H b/arch/arm/cpu/arm926ejs/aspeed/MAC.H
+new file mode 100644
+index 0000000..6732117
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/MAC.H
+@@ -0,0 +1,157 @@
++/*

++ *  This program is distributed in the hope that it will be useful,

++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

++ *  GNU General Public License for more details.

++ *

++ *  You should have received a copy of the GNU General Public License

++ *  along with this program; if not, write to the Free Software

++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

++ */

++#ifndef MAC_H

++#define MAC_H

++

++#ifdef SPI_BUS

++  #include <stdio.h>

++  #include <stdlib.h>

++  #include <time.h>

++  #define SPI_CS            1

++#endif

++// ( USE_P2A | USE_LPC )

++

++#if defined(LinuxAP)

++  #include <stdio.h>

++  #include <stdlib.h>

++  #include <string.h>

++  #include <stdarg.h>

++  #include <unistd.h>

++  #include <string.h>

++  #include <fcntl.h>

++  #include <pthread.h>

++  #include <sys/mman.h>

++  #include <sys/io.h>

++#endif

++#ifdef SLT_UBOOT

++  #include <common.h>

++  #include <command.h>

++#endif

++#ifdef SLT_DOS

++  #include <stdio.h>

++  #include <stdlib.h>

++  #include <time.h>

++  #include <conio.h>

++  #include <dos.h>

++  #include <mem.h>

++#endif

++

++#include "NCSI.H"

++#include "IO.H"

++

++// --------------------------------------------------------------

++// Define                                                        

++// --------------------------------------------------------------

++

++//#define Force_Enable_MAC34             //[ON][SLT:off] (Force enable mac34)

++//#define Force_Enable_NewMDIO           //[off][SLT:off] (Force enable new MDC/MDIO)

++//#define Enable_Fast_SCU                //[off]

++//#define Enable_Old_Style               //[off]

++#define ENABLE_DASA                    //[ON]

++//#define Enable_AST2300_Int125MHz       //[off]

++//#define ENABLE_ARP_2_WOL               //[off]

++//#define Enable_MAC_SWRst               //[off]

++

++#define Enable_Runt

++//#define Enable_Jumbo

++//#define Enable_BufMerge

++//#define Disable_VGA

++

++//#define SelectSimpleBoundary                        //[off] Using in debug

++//#define SelectSimpleData                            //[off] Using in debug

++//#define SelectSimpleLength         1512             //[off] 60(0x3c) ~ 1514(0x5ea); 1512(0x5e8)

++//#define SelectDesNumber            8                //[off] 1 ~

++//#define SelectSimpleDA                              //[off] Using in debug

++//#define SelectSimpleDes                             //[off]

++//#define SelectLengthInc                             //[off] Using in debug

++

++#define   SimpleData_Fix                                                //[ON] Using in debug

++#define   SimpleData_FixNum          12

++#define   SimpleData_FixVal00        0x00000000     //[0]no SelectSimpleDA: (60: 0412 8908)(1512: e20d e9da)

++#define   SimpleData_FixVal01        0xffffffff     //[0]no SelectSimpleDA: (60: f48c f14d)(1512: af05 260c)

++#define   SimpleData_FixVal02        0x55555555     //[0]no SelectSimpleDA: (60: 5467 5ecb)(1512: d90a 5368)

++#define   SimpleData_FixVal03        0xaaaaaaaa     //[0]no SelectSimpleDA: (60: a4f9 268e)(1512: 9402 9cbe)

++#define   SimpleData_FixVal04        0x5a5a5a5a     //[1]no SelectSimpleDA: (60: 7f01 e22d)(1512: 4fd3 8012)

++#define   SimpleData_FixVal05        0xc3c3c3c3     //[1]no SelectSimpleDA: (60: 5916 02d5)(1512: 99f1 6127)

++#define   SimpleData_FixVal06        0x96969696     //[1]no SelectSimpleDA: (60: 0963 d516)(1512: a2f6 db95)

++#define   SimpleData_FixVal07        0xf0f0f0f0     //[1]no SelectSimpleDA: (60: dfea 4dab)(1512: 39dc f576)

++#define   SimpleData_FixVal08        0x5555aaaa     //[2]no SelectSimpleDA: (60: b61b 5777)(1512: 4652 ddb0)

++#define   SimpleData_FixVal09        0xffff0000     //[2]no SelectSimpleDA: (60: 16f0 f8f1)(1512: 305d a8d4)

++#define   SimpleData_FixVal10        0x5a5aa5a5     //[2]no SelectSimpleDA: (60: 9d7d eb91)(1512: d08b 0eca)

++#define   SimpleData_FixVal11        0xc3c33c3c     //[2]no SelectSimpleDA: (60: bb6a 0b69)(1512: 06a9 efff)

++

++#define   SelectSimpleDA_Dat0        0x67052301

++#define   SelectSimpleDA_Dat1        0xe0cda089

++#define   SelectSimpleDA_Dat2        0x98badcfe

++

++#define   SelectWOLDA_DatH           0x206a

++#define   SelectWOLDA_DatL           0x8a374d9b

++

++#define   MOVE_DATA_MB_SEC           800            // MByte per second to move data

++

++//---------------------------------------------------------

++// Frame size

++//---------------------------------------------------------

++#define  ENABLE_RAND_SIZE             0

++#define  Rand_Sed                     0xffccd

++#define  FRAME_Rand_Simple            0

++#define  MIN_FRAME_RAND_SIZE               60

++#define  MAX_FRAME_RAND_SIZE               1514

++

++#define FRAME_SELH_PERD               7

++#ifdef Enable_Jumbo

++//    #define FRAME_LENH                9212           //max:9212

++//    #define FRAME_LENL                9211           //max:9212

++    #define FRAME_LENH                9212           //max:9212

++    #define FRAME_LENL                9212           //max:9212

++//    #define FRAME_LENH                8120

++//    #define FRAME_LENL                8119

++//    #define FRAME_LENH                7000

++//    #define FRAME_LENL                6999

++//    #define FRAME_LENH                4095

++//    #define FRAME_LENL                4094

++//    #define FRAME_LENH                2040

++//    #define FRAME_LENL                2039

++#else

++  #ifdef SelectSimpleLength

++//    #define FRAME_LENH                  ( SelectSimpleLength + 1 )

++//    #define FRAME_LENL                  ( SelectSimpleLength     )

++    #define FRAME_LENH                  SelectSimpleLength

++    #define FRAME_LENL                  SelectSimpleLength

++  #else

++//    #define FRAME_LENH                  1514           //max:1514

++//    #define FRAME_LENL                  1513           //max:1514

++    #define FRAME_LENH                  1514           //max:1514

++    #define FRAME_LENL                  1514           //max:1514

++  #endif

++#endif

++

++const  ULONG   ARP_org_data[16] = {

++        0xffffffff,

++        0x0000ffff, // SA:00 00

++        0x12345678, // SA:12 34 56 78

++        0x01000608, // ARP(0x0806)

++        0x04060008,    

++        0x00000100, // sender MAC Address: 00 00

++        0x12345678, // sender MAC Address: 12 34 56 78

++        0xeb00a8c0, // sender IP Address:  192.168.0.235

++        0x00000000, // target MAC Address: 00 00 00 00

++        0xa8c00000, // target MAC Address: 00 00, sender IP Address:192.168

++        0x00000100, // sender IP Address:  0.1

++//      0x0000de00, // sender IP Address:  0.222

++        0x00000000,

++        0x00000000,

++        0x00000000,

++        0x00000000,

++        0xc68e2bd5

++};

++

++#endif // MAC_H

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/MAC.c b/arch/arm/cpu/arm926ejs/aspeed/MAC.c
+new file mode 100644
+index 0000000..829da92
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/MAC.c
+@@ -0,0 +1,2085 @@
++/*

++ *  This program is distributed in the hope that it will be useful,

++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

++ *  GNU General Public License for more details.

++ *

++ *  You should have received a copy of the GNU General Public License

++ *  along with this program; if not, write to the Free Software

++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

++ */

++#define MAC_C

++static const char ThisFile[] = "MAC.c";

++

++#include "SWFUNC.H"

++

++#ifdef SLT_UBOOT

++  #include <common.h>

++  #include <command.h>

++  #include <COMMINF.H>

++  #include "STDUBOOT.H"

++#endif

++#ifdef SLT_DOS

++  #include <stdio.h>

++  #include <stdlib.h>

++  #include <conio.h>

++  #include <string.h>

++  #include "COMMINF.H"

++#endif

++

++#include "MAC.H"

++

++double	Avg_frame_len;

++ULONG	Check_Des_Val;

++ULONG	wp_fir;

++ULONG	wp;

++ULONG	FRAME_LEN_Cur;

++ULONG	gdata;

++ULONG	CheckDesFail_DesNum;

++ULONG	VGAMode;

++ULONG	SCU_1ch_old;

++ULONG	SCU_0ch_old;

++ULONG	SCU_48h_default;

++ULONG	SCU_2ch_old;

++ULONG	SCU_80h_old;

++ULONG	SCU_74h_old;

++ULONG	SCU_a4h_old;

++ULONG	SCU_88h_old;

++ULONG	WDT_0ch_old;

++ULONG	SCU_04h_mix;

++ULONG	SCU_04h_old;

++ULONG	WDT_2ch_old;

++char	SCU_oldvld = 0;

++

++#ifdef SLT_UBOOT

++#else

++    static  double      timeused;

++#endif

++// -------------------------------------------------------------

++

++void Debug_delay (void) {

++    #ifdef DbgPrn_Enable_Debug_delay

++    GET_CAHR();

++    #endif

++}

++    

++

++

++

++void dump_mac_ROreg (void) {

++	DELAY(Delay_MACDump);

++	printf("\n");

++	printf("[MAC-H] ROReg A0h~ACh: %08lx %08lx %08lx %08lx\n", ReadSOC_DD(H_MAC_BASE+0xA0), ReadSOC_DD(H_MAC_BASE+0xA4), ReadSOC_DD(H_MAC_BASE+0xA8), ReadSOC_DD(H_MAC_BASE+0xAC));

++	printf("[MAC-H] ROReg B0h~BCh: %08lx %08lx %08lx %08lx\n", ReadSOC_DD(H_MAC_BASE+0xB0), ReadSOC_DD(H_MAC_BASE+0xB4), ReadSOC_DD(H_MAC_BASE+0xB8), ReadSOC_DD(H_MAC_BASE+0xBC));

++	printf("[MAC-H] ROReg C0h~C8h: %08lx %08lx %08lx      \n", ReadSOC_DD(H_MAC_BASE+0xC0), ReadSOC_DD(H_MAC_BASE+0xC4), ReadSOC_DD(H_MAC_BASE+0xC8));

++}

++

++//------------------------------------------------------------

++// SCU

++//------------------------------------------------------------

++void recov_scu (void) {

++    #ifdef  DbgPrn_FuncHeader

++	    printf ("recov_scu\n"); 

++	    Debug_delay();

++    #endif

++

++	//MAC

++	WriteSOC_DD( H_MAC_BASE + 0x08, MAC_08h_old );

++	WriteSOC_DD( H_MAC_BASE + 0x0c, MAC_0ch_old );

++	WriteSOC_DD( H_MAC_BASE + 0x40, MAC_40h_old );

++

++	//SCU

++	WriteSOC_DD( SCU_BASE + 0x04, SCU_04h_old );

++	WriteSOC_DD( SCU_BASE + 0x08, SCU_08h_old );

++	WriteSOC_DD( SCU_BASE + 0x0c, SCU_0ch_old );

++	WriteSOC_DD( SCU_BASE + 0x1c, SCU_1ch_old );

++	WriteSOC_DD( SCU_BASE + 0x2c, SCU_2ch_old );

++	WriteSOC_DD( SCU_BASE + 0x48, SCU_48h_old );

++//	WriteSOC_DD( SCU_BASE + 0x70, SCU_70h_old );

++	WriteSOC_DD( SCU_BASE + 0x74, SCU_74h_old );

++	WriteSOC_DD( SCU_BASE + 0x7c, SCU_7ch_old );

++	WriteSOC_DD( SCU_BASE + 0x80, SCU_80h_old );

++	WriteSOC_DD( SCU_BASE + 0x88, SCU_88h_old );

++	WriteSOC_DD( SCU_BASE + 0x90, SCU_90h_old );

++	WriteSOC_DD( SCU_BASE + 0xa4, SCU_a4h_old );

++	WriteSOC_DD( SCU_BASE + 0xac, SCU_ach_old );

++    #ifdef AST1010_IOMAP

++      WriteSOC_DD( SCU_BASE + 0x11C, SCU_11Ch_old );

++    #endif

++

++	//WDT

++    #ifdef AST1010_IOMAP

++    #else

++    //    WriteSOC_DD(0x1e78500c, WDT_0ch_old);

++    //    WriteSOC_DD(0x1e78502c, WDT_2ch_old);

++    #endif

++

++	if ( ASTChipType == 3 ) {

++		if ( SCU_f0h_old & 0x01 ) WriteSOC_DD( SCU_BASE + 0xf0, 0xAEED0001 ); //Enable MAC34

++		if ( SCU_f0h_old & 0x02 ) WriteSOC_DD( SCU_BASE + 0xf0, 0x2000DEEA ); //Enable Decode

++		if ( SCU_f0h_old & 0x04 ) WriteSOC_DD( SCU_BASE + 0xf0, 0xA0E0E0D3 ); //Enable I2S

++		if ( SCU_f0h_old & 0x08 ) WriteSOC_DD( SCU_BASE + 0xf0, 0x4D0E0E0A ); //Enable PCI Host

++		if ( SCU_f0h_old & 0x10 ) WriteSOC_DD( SCU_BASE + 0xf0, 0x10ADDEED ); //Enable IR

++		if ( SCU_f0h_old & 0x20 ) WriteSOC_DD( SCU_BASE + 0xf0, 0x66559959 ); //Enabel Buffer Merge

++		if ( SCU_f0h_old & 0x40 ) WriteSOC_DD( SCU_BASE + 0xf0, 0x68961A33 ); //Enable PS2 IO

++		if ( SCU_f0h_old & 0x80 ) WriteSOC_DD( SCU_BASE + 0xf0, 0x68971A33 ); //Enable PS2 IO

++	}

++} // End void recov_scu (void)

++

++void read_scu (void) {

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("read_scu\n"); 

++	    Debug_delay();

++  #endif      

++

++	if (!SCU_oldvld) {

++		//SCU

++		SCU_04h_old = ReadSOC_DD( SCU_BASE + 0x04 );

++		SCU_08h_old = ReadSOC_DD( SCU_BASE + 0x08 );

++		SCU_0ch_old = ReadSOC_DD( SCU_BASE + 0x0c );

++		SCU_1ch_old = ReadSOC_DD( SCU_BASE + 0x1c );

++		SCU_2ch_old = ReadSOC_DD( SCU_BASE + 0x2c );

++		SCU_48h_old = ReadSOC_DD( SCU_BASE + 0x48 );

++		SCU_70h_old = ReadSOC_DD( SCU_BASE + 0x70 );

++		SCU_74h_old = ReadSOC_DD( SCU_BASE + 0x74 );

++		SCU_7ch_old = ReadSOC_DD( SCU_BASE + 0x7c );

++		SCU_80h_old = ReadSOC_DD( SCU_BASE + 0x80 );

++		SCU_88h_old = ReadSOC_DD( SCU_BASE + 0x88 );

++		SCU_90h_old = ReadSOC_DD( SCU_BASE + 0x90 );

++		SCU_a4h_old = ReadSOC_DD( SCU_BASE + 0xa4 );

++		SCU_ach_old = ReadSOC_DD( SCU_BASE + 0xac );

++		SCU_f0h_old = ReadSOC_DD( SCU_BASE + 0xf0 );

++        #ifdef AST1010_IOMAP

++          SCU_11Ch_old = ReadSOC_DD( SCU_BASE + 0x11C );

++		#endif

++

++		//WDT

++        #ifdef AST1010_IOMAP

++        #else

++		  WDT_0ch_old = ReadSOC_DD( 0x1e78500c );

++		  WDT_2ch_old = ReadSOC_DD( 0x1e78502c );

++        #endif

++

++		SCU_oldvld = 1;

++	} // End if (!SCU_oldvld) 

++} // End read_scu()

++

++void    Setting_scu (void)

++{

++    //SCU

++    if (AST1010) {

++        do {

++            WriteSOC_DD( SCU_BASE + 0x00 , 0x1688a8a8);

++            #ifndef SLT_UBOOT            

++            WriteSOC_DD( SCU_BASE + 0x70 , SCU_70h_old & 0xfffffffe);  // Disable CPU

++            #endif

++        } while ( ReadSOC_DD( SCU_BASE + 0x00 ) != 0x1 ); 

++

++        #if( AST1010_IOMAP == 1)

++  		WriteSOC_DD( SCU_BASE + 0x11C, 0x00000000); // Disable Cache functionn

++        #endif

++    } 

++    else {

++        do {

++            WriteSOC_DD( SCU_BASE + 0x00, 0x1688a8a8);

++            #ifndef SLT_UBOOT

++            WriteSOC_DD( SCU_BASE + 0x70, SCU_70h_old | 0x3 ); // Disable CPU

++            #endif

++        } while ( ReadSOC_DD( SCU_BASE + 0x00 ) != 0x1 );

++    } // End if (AST1010)

++

++    //WDT

++    #ifdef AST1010_IOMAP

++    #else

++        WriteSOC_DD( 0x1e78500c, WDT_0ch_old & 0xfffffffc );

++        WriteSOC_DD( 0x1e78502c, WDT_2ch_old & 0xfffffffc );

++    #endif      

++}

++

++//------------------------------------------------------------

++void init_scu1 (void) {

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("init_scu1\n"); 

++	    Debug_delay();

++  #endif

++

++	if (AST3200) {

++		WriteSOC_DD( SCU_BASE + 0x0c, (SCU_0ch_old & 0xffefffff) );//Clock Stop Control

++	} 

++	else if (AST1010) {

++		WriteSOC_DD( SCU_BASE + 0x0c, ( SCU_0ch_old & 0xffffffbf ) );//Clock Stop Control

++		WriteSOC_DD( SCU_BASE + 0x88, ((SCU_88h_old & 0x003fffff ) | 0xffc00000) );//Multi-function Pin Control

++	} 

++	else if (AST2300) {

++#ifdef Enable_BufMerge

++		WriteSOC_DD( SCU_BASE + 0xf0, 0x66559959 );//MAC buffer merge

++#endif

++

++#ifdef Enable_AST2300_Int125MHz

++		SCU_48h_mix = (SCU_48h_old & 0xf0000000) | 0x80000000;

++//		WriteSOC_DD( SCU_BASE + 0xf0, 0xa0e0e0d3 );//Enable I2S

++//		WriteSOC_DD( SCU_BASE + 0x04, SCU_04h_old & 0xfffdffff );//Rst(Enable I2S)

++//

++////		WriteSOC_DD( 0x1e6e5020, ReadSOC_DD(0x1e6e5020) | 0x00010000 );//P_I2SPLLAdjEnable

++//		WriteSOC_DD( 0x1e6e5020, ReadSOC_DD(0x1e6e5020) | 0x00000000 );//P_I2SPLLAdjEnable

++//		WriteSOC_DD( 0x1e6e5024, 0x00000175 );//P_I2SPLLAdjCnt

++

++//		WriteSOC_DD( SCU_BASE + 0x1c, 0x0000a51a );//124800000(24MHz)

++//		WriteSOC_DD( SCU_BASE + 0x1c, 0x0000a92f );//125333333(24MHz)

++//		WriteSOC_DD( SCU_BASE + 0x1c, 0x0000587d );//125000000(24MHz)

++		WriteSOC_DD( SCU_BASE + 0x1c, 0x00006c7d );//125000000(24MHz)

++		WriteSOC_DD( SCU_BASE + 0x2c, 0x00300000 | (SCU_2ch_old & 0xffcfffef) );//D-PLL assigned to VGA, D2-PLL assigned to I2S.

++		WriteSOC_DD( SCU_BASE + 0x48, 0x80000000 | SCU_48h_old );//125MHz come from I2SPLL

++#else

++		SCU_48h_mix = (SCU_48h_old & 0xf0000000);

++#endif

++		switch (SelectMAC) {

++			case 0  :

++				WriteSOC_DD( SCU_BASE + 0x88, (SCU_88h_old & 0x3fffffff) | 0xc0000000 );//[31]MAC1 MDIO, [30]MAC1 MDC

++				break;

++			case 1  :

++				WriteSOC_DD( SCU_BASE + 0x90, (SCU_90h_old & 0xfffffffb) | 0x00000004 );//[2 ]MAC2 MDC/MDIO

++				break;

++			case 2  :

++			case 3  :

++			default : break;

++		}

++

++		WriteSOC_DD(SCU_BASE+0x0c, (SCU_0ch_old & 0xff0fffff)             );//Clock Stop Control

++//		WriteSOC_DD(SCU_BASE+0x80, (SCU_80h_old & 0xfffffff0) | 0x0000000f);//MAC1LINK/MAC2LINK

++	} 

++	else {

++		switch (SelectMAC) {

++			case 0  :

++//				WriteSOC_DD(SCU_BASE+0x74, (SCU_74h_old & 0xfdffffff) | 0x02000000);//[25]MAC1 PHYLINK

++				break;

++			case 1  :

++				if (MAC2_RMII) {

++//					WriteSOC_DD(SCU_BASE+0x74, (SCU_74h_old & 0xfbefffff) | 0x04100000);//[26]MAC2 PHYLINK, [21]MAC2 MII, [20]MAC2 MDC/MDIO

++					WriteSOC_DD(SCU_BASE+0x74, (SCU_74h_old & 0xffefffff) | 0x00100000);//[26]MAC2 PHYLINK, [21]MAC2 MII, [20]MAC2 MDC/MDIO

++				} else {

++//					WriteSOC_DD(SCU_BASE+0x74, (SCU_74h_old & 0xfbcfffff) | 0x04300000);//[26]MAC2 PHYLINK, [21]MAC2 MII, [20]MAC2 MDC/MDIO

++					WriteSOC_DD(SCU_BASE+0x74, (SCU_74h_old & 0xffcfffff) | 0x00300000);//[26]MAC2 PHYLINK, [21]MAC2 MII, [20]MAC2 MDC/MDIO

++				}

++				break;

++			default : break;

++		} // End switch (SelectMAC)

++	} // End if (AST3200)

++} // End void init_scu1 (void)

++

++//------------------------------------------------------------

++void init_scu_macrst (void) {

++    

++#ifdef Enable_AST2300_Int125MHz

++	if (ASTChipType == 3) {

++		SCU_04h_mix = SCU_04h_old & 0xfffdffff;

++	} else {

++		SCU_04h_mix = SCU_04h_old;

++	}

++#else

++	SCU_04h_mix = SCU_04h_old; 

++#endif

++

++	WriteSOC_DD ( SCU_BASE + 0x04, (SCU_04h_mix & ~SCU_04h) | SCU_04h);//Rst

++	DELAY(Delay_SCU);

++	WriteSOC_DD ( SCU_BASE + 0x04, (SCU_04h_mix & ~SCU_04h)          );//Enable Engine

++//	DELAY(Delay_SCU);

++} // End void init_scu_macrst (void)

++

++//------------------------------------------------------------

++void init_scu2 (void) {

++    

++#ifdef SCU_74h

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("init_scu2\n"); 

++	    Debug_delay();

++  #endif

++

++	WriteSOC_DD( SCU_BASE + 0x74, SCU_74h_old | SCU_74h );//PinMux

++	delay(Delay_SCU);

++#endif

++

++} // End void init_scu2 (void)

++

++//------------------------------------------------------------

++void init_scu3 (void) {

++    

++#ifdef SCU_74h

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("init_scu3\n"); 

++	    Debug_delay();

++  #endif

++

++	WriteSOC_DD( SCU_BASE + 0x74, SCU_74h_old | (SCU_74h & 0xffefffff) );//PinMux

++	delay(Delay_SCU);

++#endif

++

++} // End void init_scu3 (void)

++

++//------------------------------------------------------------

++// MAC

++//------------------------------------------------------------

++void init_mac (ULONG base, ULONG tdexbase, ULONG rdexbase) {

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("init_mac\n"); 

++	    Debug_delay();

++  #endif

++

++#ifdef Enable_MAC_SWRst

++	WriteSOC_DD( base + 0x50, 0x80000000 | MAC_50h | MAC_50h_Speed);

++//	WriteSOC_DD( base + 0x50, 0x80000000);

++

++	while (0x80000000 & ReadSOC_DD(base+0x50)) {

++//printf(".");

++		DELAY(Delay_MACRst);

++	}

++	DELAY(Delay_MACRst);

++#endif

++

++	WriteSOC_DD( base + 0x20, (tdexbase + CPU_BUS_ADDR_SDRAM_OFFSET) ); // 20130730

++	WriteSOC_DD( base + 0x24, (rdexbase + CPU_BUS_ADDR_SDRAM_OFFSET) ); // 20130730

++	

++#ifdef MAC_30h          

++	WriteSOC_DD( base + 0x30, MAC_30h);//Int Thr/Cnt

++#endif

++                  

++#ifdef MAC_34h          

++	WriteSOC_DD( base + 0x34, MAC_34h);//Poll Cnt

++#endif

++

++#ifdef MAC_38h          

++	WriteSOC_DD( base + 0x38, MAC_38h);

++#endif

++

++#ifdef MAC_40h

++	if (Enable_MACLoopback) {

++		if (AST2300_NewMDIO) WriteSOC_DD( base + 0x40, MAC_40h | 0x80000000);

++		else                 WriteSOC_DD( base + 0x40, MAC_40h);

++	}

++#endif

++

++#ifdef MAC_48h

++	WriteSOC_DD( base + 0x48, MAC_48h);

++#endif

++

++	if ( ModeSwitch == MODE_NSCI )

++		WriteSOC_DD( base + 0x4c, NCSI_RxDMA_PakSize);   

++	else

++		WriteSOC_DD( base + 0x4c, DMA_PakSize);

++	

++	WriteSOC_DD( base + 0x50, MAC_50h | MAC_50h_Speed | 0xf);

++	DELAY(Delay_MACRst);

++} // End void init_mac (ULONG base, ULONG tdexbase, ULONG rdexbase)

++

++//------------------------------------------------------------

++// Basic

++//------------------------------------------------------------

++void FPri_RegValue (BYTE option) {

++    

++#ifdef SLT_UBOOT

++#else

++    time_t	timecur;

++#endif

++

++    FILE_VAR

++    

++    GET_OBJ( option )

++

++	PRINT(OUT_OBJ "[SCU] 04:%08lx 08:%08lx 0c:%08lx 48:%08lx\n", SCU_04h_old, SCU_08h_old, SCU_0ch_old, SCU_48h_old);

++	PRINT(OUT_OBJ "[SCU] 70:%08lx 74:%08lx 7c:%08lx\n",         SCU_70h_old, SCU_74h_old, SCU_7ch_old);

++	PRINT(OUT_OBJ "[SCU] 80:%08lx 88:%08lx 90:%08lx f0:%08lx\n", SCU_80h_old, SCU_88h_old, SCU_90h_old, SCU_f0h_old);

++	PRINT(OUT_OBJ "[SCU] a4:%08lx ac:%08lx\n", SCU_a4h_old, SCU_ach_old);

++	PRINT(OUT_OBJ "[WDT] 0c:%08lx 2c:%08lx\n", WDT_0ch_old, WDT_2ch_old);

++	PRINT(OUT_OBJ "[MAC] 08:%08lx 0c:%08lx\n", MAC_08h_old, MAC_0ch_old);

++            PRINT(OUT_OBJ "[MAC] A0|%08lx %08lx %08lx %08lx\n", ReadSOC_DD( MAC_PHYBASE + 0xa0), ReadSOC_DD( MAC_PHYBASE + 0xa4 ), ReadSOC_DD( MAC_PHYBASE + 0xa8 ), ReadSOC_DD(MAC_PHYBASE + 0xac ) );

++	PRINT(OUT_OBJ "[MAC] B0|%08lx %08lx %08lx %08lx\n", ReadSOC_DD( MAC_PHYBASE + 0xb0), ReadSOC_DD( MAC_PHYBASE + 0xb4 ), ReadSOC_DD( MAC_PHYBASE + 0xb8 ), ReadSOC_DD(MAC_PHYBASE + 0xbc ) );

++	PRINT(OUT_OBJ "[MAC] C0|%08lx %08lx %08lx\n",      ReadSOC_DD( MAC_PHYBASE + 0xc0), ReadSOC_DD( MAC_PHYBASE + 0xc4 ), ReadSOC_DD( MAC_PHYBASE + 0xc8 ));

++

++#ifdef SLT_UBOOT

++#else

++	fprintf(fp, "Time: %s", ctime(&timestart));

++	time(&timecur);

++	fprintf(fp, "----> %s", ctime(&timecur));

++#endif

++} // End void FPri_RegValue (BYTE *fp)

++

++//------------------------------------------------------------

++void FPri_End (BYTE option) {

++    

++    FILE_VAR

++    

++    GET_OBJ( option )

++    

++	if ( !RxDataEnable ) {

++	} 

++	else if ( Err_Flag ) {

++		PRINT(OUT_OBJ "                    \n----> fail !!!\n");

++	} else {

++		PRINT(OUT_OBJ "                    \n----> All Pass !!!\n");

++	}

++

++	if ( ModeSwitch == MODE_DEDICATED ) {

++		if (PHY_ADR_arg != PHY_ADR) 

++		    PRINT(OUT_OBJ "\n[Warning] PHY Address change from %d to %d !!!\n", PHY_ADR_arg, PHY_ADR);

++    }

++	

++	if ( AST1010 ) {

++		Dat_ULONG = (SCU_ach_old >> 12) & 0xf;

++		if (Dat_ULONG) {

++			PRINT(OUT_OBJ "\n[Warning] SCUAC[15:12] == 0x%02lx is not the suggestion value 0.\n", Dat_ULONG);

++			PRINT(OUT_OBJ "          This change at this platform must been proven again by the ASPEED.\n");

++		}

++

++		SCU_48h_default = SCU_48h_AST1010 & 0x01000f00;

++		if ((SCU_48h_old != SCU_48h_default)) {

++			PRINT(OUT_OBJ "\n[Warning] SCU48 == 0x%08lx is not the suggestion value 0x%08lx.\n", SCU_48h_old, SCU_48h_default);

++			PRINT(OUT_OBJ "          This change at this platform must been proven again by the ASPEED.\n");

++		}

++	} 

++	else if ( AST2300 ) {

++		if ( AST2400 ) {

++			Dat_ULONG = (SCU_90h_old >> 8) & 0xf;

++			if (Dat_ULONG) {

++				PRINT(OUT_OBJ "\n[Warning] SCU90[11: 8] == 0x%02lx is not the suggestion value 0.\n", Dat_ULONG);

++				PRINT(OUT_OBJ "          This change at this platform must been proven again by the ASPEED.\n");

++			}

++		} 

++		else {

++			Dat_ULONG = (SCU_90h_old >> 8) & 0xff;

++			if (Dat_ULONG) {

++				PRINT(OUT_OBJ "\n[Warning] SCU90[15: 8] == 0x%02lx is not the suggestion value 0.\n", Dat_ULONG);

++				PRINT(OUT_OBJ "          This change at this platform must been proven again by the ASPEED.\n");

++			}

++		}

++

++		if (Enable_MAC34) SCU_48h_default = SCU_48h_AST2300;

++		else              SCU_48h_default = SCU_48h_AST2300 & 0x0300ffff;

++		    

++		if ((SCU_48h_old != SCU_48h_default)) {

++			PRINT(OUT_OBJ "\n[Warning] SCU48 == 0x%08lx is not the suggestion value 0x%08lx.\n", SCU_48h_old, SCU_48h_default);

++			PRINT(OUT_OBJ "          This change at this platform must been proven again by the ASPEED.\n");

++		}

++	} // End if ( AST1010 )

++

++	if ( ModeSwitch == MODE_NSCI ) {

++		PRINT(OUT_OBJ "\n[Arg] %d %d %d %d %d %ld (%s)\n", GRun_Mode, PackageTolNum, ChannelTolNum, TestMode, IOTimingBund, (ARPNumCnt| (ULONG)PrintNCSIEn), ASTChipName);

++

++		switch (NCSI_Cap_SLT.PCI_DID_VID) {

++			case PCI_DID_VID_Intel_82574L		 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel 82574L       \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_82575_10d6	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel 82575        \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_82575_10a7	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel 82575        \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_82575_10a9	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel 82575        \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_82576_10c9	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel 82576        \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_82576_10e6	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel 82576        \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_82576_10e7	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel 82576        \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_82576_10e8	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel 82576        \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_82576_1518	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel 82576        \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_82576_1526	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel 82576        \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_82576_150a	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel 82576        \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_82576_150d	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel 82576        \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_82599_10fb	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel 82599        \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_82599_1557	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel 82599        \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_I350_1521	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel I350         \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_I350_1523	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel I350         \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_I210     	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel I210         \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Intel_X540	         : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel X540         \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Broadcom_BCM5718	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Broadcom BCM5718   \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Broadcom_BCM5720	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Broadcom BCM5720   \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Broadcom_BCM5725	 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Broadcom BCM5725   \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++//			case PCI_DID_VID_Broadcom_BCM57810	 : PRINT( OUT_OBJ "[NC]%08x %08x: Broadcom BCM57810  \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			case PCI_DID_VID_Mellanox_ConnectX_3 : PRINT( OUT_OBJ "[NC]%08lx %08lx: Mellanox ConnectX-3\n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++			default					:

++				switch (NCSI_Cap_SLT.ManufacturerID) {

++					case ManufacturerID_Intel    : PRINT( OUT_OBJ "[NC]%08lx %08lx: Intel   \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++					case ManufacturerID_Broadcom : PRINT( OUT_OBJ "[NC]%08lx %08lx: Broadcom\n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++					case ManufacturerID_Mellanox : PRINT( OUT_OBJ "[NC]%08lx %08lx: Mellanox\n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID ); break;

++					default				: PRINT(OUT_OBJ "[NC]%08lx %08lx          \n", NCSI_Cap_SLT.ManufacturerID, NCSI_Cap_SLT.PCI_DID_VID); break;

++				} // End switch (NCSI_Cap_SLT.ManufacturerID)

++		} // End switch (NCSI_Cap_SLT.PCI_DID_VID)

++	}

++	else {

++		if (LOOP_INFINI) PRINT(OUT_OBJ "\n[Arg] %d %d %d # %d %d %d %lx (%s)[%d %d %d]\n" , GRun_Mode, GSpeed, GCtrl,               TestMode, PHY_ADR_arg, IOTimingBund, UserDVal, ASTChipName, Loop_rl[0], Loop_rl[1], Loop_rl[2]);

++		else             PRINT(OUT_OBJ "\n[Arg] %d %d %d %ld %d %d %d %lx (%s)[%d %d %d]\n", GRun_Mode, GSpeed, GCtrl, LOOP_MAX_arg, TestMode, PHY_ADR_arg, IOTimingBund, UserDVal, ASTChipName, Loop_rl[0], Loop_rl[1], Loop_rl[2]);

++		    

++		PRINT(OUT_OBJ "[PHY] Adr:%d ID2:%04lx ID3:%04lx (%s)\n", PHY_ADR, PHY_ID2, PHY_ID3, PHYName);

++	} // End if ( ModeSwitch == MODE_NSCI ) 

++	

++#ifdef SUPPORT_PHY_LAN9303

++	PRINT(OUT_OBJ "[Ver II] %s (for LAN9303 with I2C%d)\n", version_name, LAN9303_I2C_BUSNUM);

++#else

++	PRINT(OUT_OBJ "[Ver II] %s\n", version_name);

++#endif

++} // End void FPri_End (BYTE option)

++

++//------------------------------------------------------------

++void FPri_ErrFlag (BYTE option) {

++    

++    FILE_VAR

++    

++    GET_OBJ( option )

++    

++	if (Err_Flag && Err_Flag_PrintEn) {

++		PRINT(OUT_OBJ "\n\n");

++//fprintf(fp, "Err_Flag: %x\n\n", Err_Flag);

++

++		if ( Err_Flag & Err_PHY_Type                ) PRINT( OUT_OBJ "[Err] Unidentifiable PHY                                     \n" );

++		if ( Err_Flag & Err_MALLOC_FrmSize          ) PRINT( OUT_OBJ "[Err] Malloc fail at frame size buffer                       \n" );

++		if ( Err_Flag & Err_MALLOC_LastWP           ) PRINT( OUT_OBJ "[Err] Malloc fail at last WP buffer                          \n" );

++		if ( Err_Flag & Err_Check_Buf_Data          ) PRINT( OUT_OBJ "[Err] Received data mismatch                                 \n" );

++		if ( Err_Flag & Err_NCSI_Check_TxOwnTimeOut ) PRINT( OUT_OBJ "[Err] Time out of checking Tx owner bit in NCSI packet       \n" );

++		if ( Err_Flag & Err_NCSI_Check_RxOwnTimeOut ) PRINT( OUT_OBJ "[Err] Time out of checking Rx owner bit in NCSI packet       \n" );

++		if ( Err_Flag & Err_NCSI_Check_ARPOwnTimeOut) PRINT( OUT_OBJ "[Err] Time out of checking ARP owner bit in NCSI packet      \n" );

++		if ( Err_Flag & Err_NCSI_No_PHY             ) PRINT( OUT_OBJ "[Err] Can not find NCSI PHY                                  \n" );

++		if ( Err_Flag & Err_NCSI_Channel_Num        ) PRINT( OUT_OBJ "[Err] NCSI Channel Number Mismatch                           \n" );

++		if ( Err_Flag & Err_NCSI_Package_Num        ) PRINT( OUT_OBJ "[Err] NCSI Package Number Mismatch                           \n" );

++		if ( Err_Flag & Err_PHY_TimeOut             ) PRINT( OUT_OBJ "[Err] Time out of read/write/reset PHY register              \n" );

++		if ( Err_Flag & Err_RXBUF_UNAVA             ) PRINT( OUT_OBJ "[Err] MAC00h[2]:Receiving buffer unavailable                 \n" );

++		if ( Err_Flag & Err_RPKT_LOST               ) PRINT( OUT_OBJ "[Err] MAC00h[3]:Received packet lost due to RX FIFO full     \n" );

++		if ( Err_Flag & Err_NPTXBUF_UNAVA           ) PRINT( OUT_OBJ "[Err] MAC00h[6]:Normal priority transmit buffer unavailable  \n" );

++		if ( Err_Flag & Err_TPKT_LOST               ) PRINT( OUT_OBJ "[Err] MAC00h[7]:Packets transmitted to Ethernet lost         \n" );

++		if ( Err_Flag & Err_DMABufNum               ) PRINT( OUT_OBJ "[Err] DMA Buffer is not enough                               \n" );

++		if ( Err_Flag & Err_IOMargin                ) PRINT( OUT_OBJ "[Err] IO timing margin is not enough                         \n" );

++		    

++		if ( Err_Flag & Err_MHCLK_Ratio             ) {

++			if ( AST1010 ) {

++				PRINT(OUT_OBJ "[Err] Error setting of MAC AHB bus clock (SCU08[13:12])      \n");

++				Dat_ULONG = (SCU_08h_old >> 12) & 0x3;

++				PRINT(OUT_OBJ "      SCU08[13:12] == 0x%01lx is not the suggestion value 0.\n", Dat_ULONG);

++			} 

++			else {

++				PRINT(OUT_OBJ "[Err] Error setting of MAC AHB bus clock (SCU08[18:16])      \n");

++				Dat_ULONG = (SCU_08h_old >> 16) & 0x7;

++				

++				if (MAC1_1GEn | MAC2_1GEn) {

++					PRINT(OUT_OBJ "      SCU08[18:16] == 0x%01lx is not the suggestion value 2.\n", Dat_ULONG);

++				} 

++				else {

++					PRINT(OUT_OBJ "      SCU08[18:16] == 0x%01lx is not the suggestion value 4.\n", Dat_ULONG);

++				}

++			} // end if ( AST1010 )

++		} // End if ( Err_Flag & Err_MHCLK_Ratio             )

++

++		if (Err_Flag & Err_IOMarginOUF             ) {

++			PRINT(OUT_OBJ "[Err] IO timing testing range out of boundary\n");

++			if (Enable_RMII) {

++#ifdef Enable_Old_Style

++				PRINT(OUT_OBJ "      (%d,%d): 1x%d [%d]x[%d:%d]\n",        IOdly_out_reg_idx, IOdly_in_reg_idx, IOTimingBund, IOdly_out_reg_idx, IOdly_in_reg_idx - (IOTimingBund>>1), IOdly_in_reg_idx + (IOTimingBund>>1));

++#else

++				PRINT(OUT_OBJ "      (%d,%d): %dx1 [%d:%d]x[%d]\n",        IOdly_in_reg_idx, IOdly_out_reg_idx, IOTimingBund, IOdly_in_reg_idx - (IOTimingBund>>1), IOdly_in_reg_idx + (IOTimingBund>>1), IOdly_out_reg_idx);

++#endif

++			} else {

++#ifdef Enable_Old_Style

++				PRINT(OUT_OBJ "      (%d,%d): %dx%d [%d:%d]x[%d:%d]\n", IOdly_out_reg_idx, IOdly_in_reg_idx, IOTimingBund, IOTimingBund, IOdly_out_reg_idx - (IOTimingBund>>1), IOdly_out_reg_idx + (IOTimingBund>>1), IOdly_in_reg_idx - (IOTimingBund>>1), IOdly_in_reg_idx + (IOTimingBund>>1));

++#else

++				PRINT(OUT_OBJ "      (%d,%d): %dx%d [%d:%d]x[%d:%d]\n", IOdly_in_reg_idx, IOdly_out_reg_idx, IOTimingBund, IOTimingBund, IOdly_in_reg_idx - (IOTimingBund>>1), IOdly_in_reg_idx + (IOTimingBund>>1), IOdly_out_reg_idx - (IOTimingBund>>1), IOdly_out_reg_idx + (IOTimingBund>>1));

++#endif

++			}

++		} // End if (Err_Flag & Err_IOMarginOUF             )

++		

++		if (Err_Flag & Err_Check_Des               ) {

++			PRINT(OUT_OBJ "[Err] Descriptor error\n");

++			if ( Check_Des_Val & Check_Des_TxOwnTimeOut ) PRINT( OUT_OBJ "[Des] Time out of checking Tx owner bit\n" );

++			if ( Check_Des_Val & Check_Des_RxOwnTimeOut ) PRINT( OUT_OBJ "[Des] Time out of checking Rx owner bit\n" );

++			if ( Check_Des_Val & Check_Des_RxErr        ) PRINT( OUT_OBJ "[Des] Input signal RxErr               \n" );

++			if ( Check_Des_Val & Check_Des_OddNibble    ) PRINT( OUT_OBJ "[Des] Nibble bit happen                \n" );

++			if ( Check_Des_Val & Check_Des_CRC          ) PRINT( OUT_OBJ "[Des] CRC error of frame               \n" );

++			if ( Check_Des_Val & Check_Des_RxFIFOFull   ) PRINT( OUT_OBJ "[Des] Rx FIFO full                     \n" );

++			if ( Check_Des_Val & Check_Des_FrameLen     ) PRINT( OUT_OBJ "[Des] Frame length mismatch            \n" );

++		} // End if (Err_Flag & Err_Check_Des               )

++		

++		if (Err_Flag & Err_MACMode                ) {

++			PRINT(OUT_OBJ "[Err] MAC interface mode mismatch\n");

++			if ( AST1010 ) {

++			} 

++			else if (AST2300) {

++				switch (MAC_Mode) {

++					case 0 : PRINT( OUT_OBJ "      SCU70h[7:6] == 0: [MAC#1] RMII   [MAC#2] RMII \n" ); break;

++					case 1 : PRINT( OUT_OBJ "      SCU70h[7:6] == 1: [MAC#1] RGMII  [MAC#2] RMII \n" ); break;

++					case 2 : PRINT( OUT_OBJ "      SCU70h[7:6] == 2: [MAC#1] RMII   [MAC#2] RGMII\n" ); break;

++					case 3 : PRINT( OUT_OBJ "      SCU70h[7:6] == 3: [MAC#1] RGMII  [MAC#2] RGMII\n" ); break;

++				}

++			} 

++			else {

++                switch (MAC_Mode) {

++                	case 0 : PRINT( OUT_OBJ "      SCU70h[8:6] == 000: [MAC#1] GMII               \n" ); break;

++                	case 1 : PRINT( OUT_OBJ "      SCU70h[8:6] == 001: [MAC#1] MII    [MAC#2] MII \n" ); break;

++                	case 2 : PRINT( OUT_OBJ "      SCU70h[8:6] == 010: [MAC#1] RMII   [MAC#2] MII \n" ); break;

++                	case 3 : PRINT( OUT_OBJ "      SCU70h[8:6] == 011: [MAC#1] MII                \n" ); break;

++                	case 4 : PRINT( OUT_OBJ "      SCU70h[8:6] == 100: [MAC#1] RMII               \n" ); break;

++                	case 5 : PRINT( OUT_OBJ "      SCU70h[8:6] == 101: Reserved                   \n" ); break;

++                	case 6 : PRINT( OUT_OBJ "      SCU70h[8:6] == 110: [MAC#1] RMII   [MAC#2] RMII\n" ); break;

++                	case 7 : PRINT( OUT_OBJ "      SCU70h[8:6] == 111: Disable MAC                \n" ); break;

++                }

++			} // End if ( AST1010 )

++		} // End if (Err_Flag & Err_MACMode                )

++

++		if ( ModeSwitch == MODE_NSCI ) {

++			if (Err_Flag & Err_NCSI_LinkFail           ) {

++				PRINT(OUT_OBJ "[Err] NCSI packet retry number over flows when find channel\n");

++				

++				if (NCSI_LinkFail_Val & NCSI_LinkFail_Get_Version_ID         ) PRINT(OUT_OBJ "[NCSI] Time out when Get Version ID         \n");

++				if (NCSI_LinkFail_Val & NCSI_LinkFail_Get_Capabilities       ) PRINT(OUT_OBJ "[NCSI] Time out when Get Capabilities       \n");

++				if (NCSI_LinkFail_Val & NCSI_LinkFail_Select_Active_Package  ) PRINT(OUT_OBJ "[NCSI] Time out when Select Active Package  \n");

++				if (NCSI_LinkFail_Val & NCSI_LinkFail_Enable_Set_MAC_Address ) PRINT(OUT_OBJ "[NCSI] Time out when Enable Set MAC Address \n");

++				if (NCSI_LinkFail_Val & NCSI_LinkFail_Enable_Broadcast_Filter) PRINT(OUT_OBJ "[NCSI] Time out when Enable Broadcast Filter\n");

++				if (NCSI_LinkFail_Val & NCSI_LinkFail_Enable_Network_TX      ) PRINT(OUT_OBJ "[NCSI] Time out when Enable Network TX      \n");

++				if (NCSI_LinkFail_Val & NCSI_LinkFail_Enable_Channel         ) PRINT(OUT_OBJ "[NCSI] Time out when Enable Channel         \n");

++				if (NCSI_LinkFail_Val & NCSI_LinkFail_Disable_Network_TX     ) PRINT(OUT_OBJ "[NCSI] Time out when Disable Network TX     \n");

++				if (NCSI_LinkFail_Val & NCSI_LinkFail_Disable_Channel        ) PRINT(OUT_OBJ "[NCSI] Time out when Disable Channel        \n");

++			}

++			

++			if (Err_Flag & Err_NCSI_Channel_Num       ) PRINT(OUT_OBJ "[NCSI] Channel number expected: %d, real: %d\n", ChannelTolNum, number_chl);

++			if (Err_Flag & Err_NCSI_Package_Num       ) PRINT(OUT_OBJ "[NCSI] Peckage number expected: %d, real: %d\n", PackageTolNum, number_pak);

++		} // End if ( ModeSwitch == MODE_NSCI )

++	} // End if (Err_Flag && Err_Flag_PrintEn)

++} // End void FPri_ErrFlag (BYTE option)

++

++//------------------------------------------------------------

++void Finish_Close (void) {

++

++	if (SCU_oldvld) 

++	    recov_scu();

++

++#ifdef SLT_DOS

++	if (fp_io && IOTiming) 

++	    fclose(fp_io);

++	    

++	if (fp_log) 

++	    fclose(fp_log);

++#endif    

++} // End void Finish_Close (void)

++

++//------------------------------------------------------------

++char Finish_Check (int value) {

++    ULONG temp;

++    CHAR  i = 0;

++    

++#ifdef Disable_VGA

++	if (VGAModeVld) {

++		outp(0x3d4, 0x17);

++		outp(0x3d5, VGAMode);

++	}

++#endif

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("Finish_Check\n"); 

++	    Debug_delay();

++    #endif

++

++	if ( FRAME_LEN ) 

++	    free(FRAME_LEN);

++	    

++	if ( wp_lst   ) 

++	    free(wp_lst   );

++

++	Err_Flag = Err_Flag | value;

++	

++	if ( DbgPrn_ErrFlg ) 

++	    printf ("\nErr_Flag: [%08lx]\n", Err_Flag);

++

++	if ( !BurstEnable ) 

++	    FPri_ErrFlag( FP_LOG );

++	    

++	if ( IOTiming    ) 

++	    FPri_ErrFlag( FP_IO );

++	    

++	FPri_ErrFlag( STD_OUT );

++

++	if ( !BurstEnable ) 

++	    FPri_End( FP_LOG );

++	    

++	if ( IOTiming   ) 

++	    FPri_End( FP_IO );

++	    

++	FPri_End( STD_OUT );

++	

++

++	if ( !BurstEnable ) FPri_RegValue( FP_LOG );

++	if ( IOTiming     ) FPri_RegValue( FP_IO  );

++

++	Finish_Close();

++

++    // 20140325

++    temp = ReadSOC_DD( 0x1e6e2040 );

++    if ( ModeSwitch == MODE_NSCI ) 

++    {

++        if ( SelectMAC == 0 )

++            i = 17;

++        else

++            i = 16;

++    }

++    else

++    {

++        if ( SelectMAC == 0 )

++            i = 19;

++        else

++            i = 18;

++    }

++    WriteSOC_DD( 0x1e6e2040, (temp | (1 << i)) );

++    

++    

++	if ( Err_Flag ) 

++    {

++        // Fail

++	    return( 1 );

++    }

++	else

++    {

++        // Pass

++	    return( 0 );

++    }

++} // End char Finish_Check (int value)

++

++//------------------------------------------------------------

++int FindErr (int value) {

++	Err_Flag = Err_Flag | value;

++	

++	if ( DbgPrn_ErrFlg ) 

++	    printf ("\nErr_Flag: [%08lx]\n", Err_Flag);

++

++	return(1);

++}

++

++//------------------------------------------------------------

++int FindErr_Des (int value) {

++	Check_Des_Val = Check_Des_Val | value;

++	Err_Flag      = Err_Flag | Err_Check_Des;

++	if ( DbgPrn_ErrFlg ) 

++	    printf ("\nErr_Flag: [%08lx] Check_Des_Val: [%08lx]\n", Err_Flag, Check_Des_Val);

++

++	return(1);

++}

++

++//------------------------------------------------------------

++// Get and Check status of Interrupt

++//------------------------------------------------------------

++int check_int ( char *type ) {

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("check_int  : %d\n", Loop); 

++	    Debug_delay();

++    #endif

++

++	Dat_ULONG = ReadSOC_DD( H_MAC_BASE + 0x00 );//Interrupt Status

++#ifdef SLT_DOS	

++#ifdef CheckRxbufUNAVA

++	if ( Dat_ULONG & 0x00000004 ) {

++		fprintf(fp_log, "[%sIntStatus] Receiving buffer unavailable               : %08lx [loop:%d]\n", type, Dat_ULONG, Loop);

++		FindErr( Err_RXBUF_UNAVA );

++	}

++#endif

++

++#ifdef CheckRPktLost

++	if ( Dat_ULONG & 0x00000008 ) {

++		fprintf(fp_log, "[%sIntStatus] Received packet lost due to RX FIFO full   : %08lx [loop:%d]\n", type, Dat_ULONG, Loop);

++		FindErr( Err_RPKT_LOST );

++	}

++#endif

++

++#ifdef CheckNPTxbufUNAVA

++	if ( Dat_ULONG & 0x00000040 ) {

++		fprintf(fp_log, "[%sIntStatus] Normal priority transmit buffer unavailable: %08lx [loop:%d]\n", type, Dat_ULONG, Loop);

++		FindErr( Err_NPTXBUF_UNAVA );

++	}

++#endif

++

++#ifdef CheckTPktLost

++	if ( Dat_ULONG & 0x00000080 ) {

++		fprintf(fp_log, "[%sIntStatus] Packets transmitted to Ethernet lost       : %08lx [loop:%d]\n", type, Dat_ULONG, Loop);

++		FindErr( Err_TPKT_LOST );

++	}

++#endif

++#endif

++	if (Err_Flag) 

++	    return(1);

++	else          

++	    return(0);

++} // End int check_int (char *type)

++

++

++//------------------------------------------------------------

++// Buffer

++//------------------------------------------------------------

++void setup_framesize (void) {

++    int	i;

++    

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("setup_framesize\n"); 

++	    Debug_delay();

++    #endif

++	    

++	//------------------------------------------------------------

++	// Fill Frame Size out descriptor area

++	//------------------------------------------------------------

++    #ifdef SLT_UBOOT

++	if (0)

++    #else

++	if ( ENABLE_RAND_SIZE )

++    #endif

++    {

++		for (i = 0; i < DES_NUMBER; i++) {

++			if ( FRAME_Rand_Simple ) {

++				switch(rand() % 5) {

++					case 0 : FRAME_LEN[i] = 0x4e ; break;

++					case 1 : FRAME_LEN[i] = 0x4ba; break;

++					default: FRAME_LEN[i] = 0x5ea; break;

++				}

++			} 

++			else {

++				FRAME_LEN_Cur = rand() % (MAX_FRAME_RAND_SIZE + 1);

++			

++				if (FRAME_LEN_Cur < MIN_FRAME_RAND_SIZE) 

++				    FRAME_LEN_Cur = MIN_FRAME_RAND_SIZE;

++

++				FRAME_LEN[i] = FRAME_LEN_Cur;

++			}

++#ifdef SLT_DOS			

++			if (DbgPrn_FRAME_LEN) 

++			    fprintf(fp_log, "[setup_framesize] FRAME_LEN_Cur:%08lx[Des:%d][loop:%d]\n", FRAME_LEN[i], i, Loop);

++#endif

++		}

++	} 

++	else {

++		for (i = 0; i < DES_NUMBER; i++) {

++            #ifdef SelectSimpleLength

++			if (i % FRAME_SELH_PERD) 

++			    FRAME_LEN[i] = FRAME_LENH;

++			else                          

++			    FRAME_LEN[i] = FRAME_LENL;

++            #else

++			if ( BurstEnable ) {

++				if (IEEETesting) {

++					FRAME_LEN[i] = 1514;

++				} 

++				else {

++                    #ifdef ENABLE_ARP_2_WOL

++					FRAME_LEN[i] = 164;

++                    #else

++					FRAME_LEN[i] = 60;

++                    #endif

++				}

++			} 

++			else {

++                #ifdef SelectLengthInc

++//				FRAME_LEN[i] = (i%1455)+60;

++				FRAME_LEN[i] = 1514-( i % 1455 );

++                #else

++				if (i % FRAME_SELH_PERD) 

++				    FRAME_LEN[i] = FRAME_LENH;

++				else                          

++				    FRAME_LEN[i] = FRAME_LENL;

++                #endif

++			} // End if (BurstEnable)

++            #endif

++/*

++			switch(i % 20) {

++				case 0 : FRAME_LEN[i] = FRAME_LENH; break;

++				case 1 : FRAME_LEN[i] = FRAME_LENH; break;

++				case 2 : FRAME_LEN[i] = FRAME_LENH; break;

++				default: FRAME_LEN[i] = FRAME_LENL; break;

++			}

++*/

++#ifdef SLT_DOS

++			if (DbgPrn_FRAME_LEN) 

++			    fprintf(fp_log, "[setup_framesize] FRAME_LEN_Cur:%08lx[Des:%d][loop:%d]\n", FRAME_LEN[i], i, Loop);

++#endif

++		} // End for (i = 0; i < DES_NUMBER; i++)

++	} // End if ( ENABLE_RAND_SIZE )

++

++    // Calculate average of frame size

++	Avg_frame_len = 0;

++	

++	for ( i = 0; i < DES_NUMBER; i++ ) {

++		Avg_frame_len += FRAME_LEN[i];

++	}

++	

++	Avg_frame_len = Avg_frame_len / (double)DES_NUMBER;

++

++	//------------------------------------------------------------

++	// Write Plane

++	//------------------------------------------------------------

++	switch( ZeroCopy_OFFSET & 0x3 ) {

++		case 0: wp_fir = 0xffffffff; break;

++		case 1: wp_fir = 0xffffff00; break;

++		case 2: wp_fir = 0xffff0000; break;

++		case 3: wp_fir = 0xff000000; break;

++	}

++	

++	for ( i = 0; i < DES_NUMBER; i++ ) {

++		switch( ( ZeroCopy_OFFSET + FRAME_LEN[i] - 1 ) & 0x3 ) {

++			case 0: wp_lst[i] = 0x000000ff; break;

++			case 1: wp_lst[i] = 0x0000ffff; break;

++			case 2: wp_lst[i] = 0x00ffffff; break;

++			case 3: wp_lst[i] = 0xffffffff; break;

++		}

++	} // End for ( i = 0; i < DES_NUMBER; i++ )

++} // End void setup_framesize (void)

++

++//------------------------------------------------------------

++void setup_arp (void) {

++    int i;

++    for (i = 0; i < 16; i++ )

++        ARP_data[i] = ARP_org_data[i];

++    

++	ARP_data[1] = 0x0000ffff | ( SA[0] << 16 )

++	                         | ( SA[1] << 24 );

++	                                         

++	ARP_data[2] =              ( SA[2]       )

++	                         | ( SA[3] <<  8 )

++	                         | ( SA[4] << 16 )

++	                         | ( SA[5] << 24 );

++	            

++	ARP_data[5] = 0x00000100 | ( SA[0] << 16 )

++	                         | ( SA[1] << 24 );

++	            

++	ARP_data[6] =              ( SA[2]       )

++	                         | ( SA[3] <<  8 )

++	                         | ( SA[4] << 16 )

++	                         | ( SA[5] << 24 );

++} // End void setup_arp (void)

++

++//------------------------------------------------------------

++void setup_buf (void) {

++    int     i;

++    int	    j;

++    ULONG	adr;

++    ULONG	adr_srt;

++    ULONG	adr_end;

++    ULONG	len;

++    #ifdef SelectSimpleDA

++        int     cnt;

++        ULONG   Current_framelen;

++    #endif

++    

++    #ifdef ENABLE_ARP_2_WOL

++    int	    DA[3];

++

++	DA[0] =  ( ( SelectWOLDA_DatH >>  8 ) & 0x00ff ) |

++	         ( ( SelectWOLDA_DatH <<  8 ) & 0xff00 );

++	         

++	DA[1] =  ( ( SelectWOLDA_DatL >> 24 ) & 0x00ff ) |

++	         ( ( SelectWOLDA_DatL >>  8 ) & 0xff00 );

++	         

++	DA[2] =  ( ( SelectWOLDA_DatL >>  8 ) & 0x00ff ) |

++	         ( ( SelectWOLDA_DatL <<  8 ) & 0xff00 );

++    #endif

++    

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("setup_buf  : %d\n", Loop); 

++	    Debug_delay();

++    #endif

++

++    // It need be multiple of 4

++	adr_srt = GET_DMA_BASE_SETUP & 0xfffffffc;

++	

++	for (j = 0; j < DES_NUMBER; j++) {

++		if ( DbgPrn_BufAdr ) 

++		    printf("[loop:%4d][des:%4d][setup_buf  ] %08lx\n", Loop, j, adr_srt);

++		    

++		if ( BurstEnable ) {

++			if ( IEEETesting ) {

++                #ifdef ENABLE_DASA

++				WriteSOC_DD( adr_srt    , 0xffffffff  );

++				WriteSOC_DD( adr_srt + 4, ARP_data[1] );

++				WriteSOC_DD( adr_srt + 8, ARP_data[2] );

++				

++				for (adr = (adr_srt + 12); adr < (adr_srt + DMA_PakSize); adr += 4 )

++                #else

++				for (adr = adr_srt; adr < (adr_srt + DMA_PakSize); adr += 4 )

++                #endif

++                {

++					switch( TestMode ) {

++						case 1: gdata = 0xffffffff;              break;

++						case 2: gdata = 0x55555555;              break;

++						case 3: gdata = rand() | (rand() << 16); break;

++						case 5: gdata = UserDVal;                break;

++					}

++					WriteSOC_DD(adr, gdata);

++				} // End for()

++			} 

++			else {

++				for (i = 0; i < 16; i++) {

++					WriteSOC_DD( adr_srt + ( i << 2 ), ARP_data[i] );

++				}                

++                

++                #ifdef ENABLE_ARP_2_WOL          

++				for (i = 16; i < 40; i += 3) {

++					WriteSOC_DD( adr_srt + ( i << 2 ),     ( DA[1] << 16 ) |  DA[0] );

++					WriteSOC_DD( adr_srt + ( i << 2 ) + 4, ( DA[0] << 16 ) |  DA[2] );

++					WriteSOC_DD( adr_srt + ( i << 2 ) + 8, ( DA[2] << 16 ) |  DA[1] );

++				}

++                #endif

++			} // End if ( IEEETesting ) 

++		} 

++		else {

++		    // --------------------------------------------

++            #ifdef SelectSimpleData

++                #ifdef SimpleData_Fix

++			    switch( j % SimpleData_FixNum ) {

++			    	case  0 : gdata = SimpleData_FixVal00; break;

++			    	case  1 : gdata = SimpleData_FixVal01; break;

++			    	case  2 : gdata = SimpleData_FixVal02; break;

++			    	case  3 : gdata = SimpleData_FixVal03; break;

++			    	case  4 : gdata = SimpleData_FixVal04; break;

++			    	case  5 : gdata = SimpleData_FixVal05; break;

++			    	case  6 : gdata = SimpleData_FixVal06; break;

++			    	case  7 : gdata = SimpleData_FixVal07; break;

++			    	case  8 : gdata = SimpleData_FixVal08; break;

++			    	case  9 : gdata = SimpleData_FixVal09; break;

++			    	case 10 : gdata = SimpleData_FixVal10; break;

++			    	default : gdata = SimpleData_FixVal11; break;

++			    }

++                #else

++			    gdata   = 0x11111111 * ((j + SEED_START) % 256);

++                #endif

++ 			

++ 			adr_end = adr_srt + DMA_PakSize;

++			for ( adr = adr_srt; adr < adr_end; adr += 4 ) {

++				WriteSOC_DD( adr, gdata );

++			}		  

++            // --------------------------------------------			

++			#elif SelectSimpleDA

++

++			gdata   = DATA_SEED(j + SEED_START);

++			Current_framelen = FRAME_LEN[j];

++			

++			if ( DbgPrn_FRAME_LEN ) 

++			    fprintf(fp_log, "[setup_buf      ] Current_framelen:%08lx[Des:%d][loop:%d]\n", Current_framelen, j, Loop);

++			

++			cnt     = 0;

++ 			len     = ( ( ( Current_framelen - 14 ) & 0xff ) << 8) | 

++ 			            ( ( Current_framelen - 14 ) >> 8 );

++

++ 			adr_end = adr_srt + DMA_PakSize;

++			for ( adr = adr_srt; adr < adr_end; adr += 4 ) {

++				cnt++;

++				if      (cnt == 1 ) WriteSOC_DD( adr, SelectSimpleDA_Dat0 );

++				else if (cnt == 2 ) WriteSOC_DD( adr, SelectSimpleDA_Dat1 );

++				else if (cnt == 3 ) WriteSOC_DD( adr, SelectSimpleDA_Dat2 );

++				else if (cnt == 4 ) WriteSOC_DD( adr, len | (len << 16)   );

++				else				

++				    WriteSOC_DD( adr, gdata );      

++				              

++				gdata += DATA_IncVal;

++			}			

++            // --------------------------------------------			

++			#else

++

++			gdata   = DATA_SEED(j + SEED_START);

++ 			adr_end = adr_srt + DMA_PakSize;

++			for ( adr = adr_srt; adr < adr_end; adr += 4 ) {			

++				WriteSOC_DD( adr, gdata );

++                

++				gdata += DATA_IncVal;

++			}

++

++			#endif

++			

++		} // End if ( BurstEnable )

++

++		adr_srt += DMA_PakSize;

++	} // End for (j = 0; j < DES_NUMBER; j++)

++} // End void setup_buf (void)

++

++//------------------------------------------------------------

++// Check data of one packet

++//------------------------------------------------------------

++char check_Data (ULONG desadr, LONG number) {

++	int	    index;

++	int     cnt;

++    ULONG	rdata;  

++    ULONG	wp_lst_cur;  

++    ULONG	adr_las;

++    ULONG	adr;

++    ULONG	adr_srt;

++    ULONG	adr_end;

++    ULONG	len;

++    #ifdef SelectSimpleDA

++        ULONG   gdata_bak;

++    #endif

++    

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("check_Data : %d\n", Loop); 

++	    Debug_delay();

++    #endif

++    //printf("[Des:%d][loop:%d]Desadr:%08x\n", number, Loop, desadr);

++

++	wp_lst_cur    = wp_lst[number];

++	FRAME_LEN_Cur = FRAME_LEN[number];

++#ifdef SLT_DOS	

++	if ( DbgPrn_FRAME_LEN ) 

++	    fprintf(fp_log, "[check_Data     ] FRAME_LEN_Cur:%08lx[Des:%d][loop:%d]\n", FRAME_LEN_Cur, number, Loop);

++#endif	    

++	adr_srt = ReadSOC_DD(desadr) & 0xfffffffc;

++	adr_end = adr_srt + PktByteSize;

++	

++    #ifdef SelectSimpleData

++        #ifdef SimpleData_Fix

++	switch( number % SimpleData_FixNum ) {

++		case  0 : gdata = SimpleData_FixVal00; break;

++		case  1 : gdata = SimpleData_FixVal01; break;

++		case  2 : gdata = SimpleData_FixVal02; break;

++		case  3 : gdata = SimpleData_FixVal03; break;

++		case  4 : gdata = SimpleData_FixVal04; break;

++		case  5 : gdata = SimpleData_FixVal05; break;

++		case  6 : gdata = SimpleData_FixVal06; break;

++		case  7 : gdata = SimpleData_FixVal07; break;

++		case  8 : gdata = SimpleData_FixVal08; break;

++		case  9 : gdata = SimpleData_FixVal09; break;

++		case 10 : gdata = SimpleData_FixVal10; break;

++		default : gdata = SimpleData_FixVal11; break;

++	}

++        #else

++	gdata   = 0x11111111 * ((number + SEED_START) % 256);

++        #endif

++    #else

++	gdata   = DATA_SEED(number + SEED_START);

++    #endif

++

++	wp      = wp_fir;

++	adr_las = adr_end - 4;

++

++	cnt     = 0;

++	len     = (((FRAME_LEN_Cur-14) & 0xff) << 8) | ((FRAME_LEN_Cur-14) >> 8);

++#ifdef SLT_DOS

++	if (DbgPrn_Bufdat) 

++	    fprintf(fp_log, " Inf:%08lx ~ %08lx(%08lx) %08lx [Des:%d][loop:%d]\n", adr_srt, adr_end, adr_las, gdata, number, Loop);

++#endif	    

++	for (adr = adr_srt; adr < adr_end; adr+=4) {

++

++        #ifdef SelectSimpleDA

++		cnt++;

++		if      ( cnt == 1 ) { gdata_bak = gdata; gdata = SelectSimpleDA_Dat0; }

++		else if ( cnt == 2 ) { gdata_bak = gdata; gdata = SelectSimpleDA_Dat1; }

++		else if ( cnt == 3 ) { gdata_bak = gdata; gdata = SelectSimpleDA_Dat2; }

++		else if ( cnt == 4 ) { gdata_bak = gdata; gdata = len | (len << 16);   }

++        #endif

++		rdata = ReadSOC_DD(adr);

++		if (adr == adr_las) 

++		    wp = wp & wp_lst_cur;

++		    

++		if ( (rdata & wp) != (gdata & wp) ) {

++#ifdef SLT_DOS

++            fprintf(fp_log, "\nError: Adr:%08lx[%3d] (%08lx) (%08lx:%08lx) [Des:%d][loop:%d]\n", adr, (adr - adr_srt) / 4, rdata, gdata, wp, number, Loop);

++#endif

++			for (index = 0; index < 6; index++) {

++				rdata = ReadSOC_DD(adr);

++#ifdef SLT_DOS                

++				fprintf(fp_log, "Rep  : Adr:%08lx      (%08lx) (%08lx:%08lx) [Des:%d][loop:%d]\n", adr, rdata, gdata, wp, number, Loop);

++#endif                

++            }

++

++			if ( DbgPrn_DumpMACCnt ) 

++			    dump_mac_ROreg();

++			    

++			return( FindErr( Err_Check_Buf_Data ) );

++		} // End if ( (rdata & wp) != (gdata & wp) )

++#ifdef SLT_DOS		

++		if ( DbgPrn_BufdatDetail ) 

++		    fprintf(fp_log, " Adr:%08lx[%3d] (%08lx) (%08lx:%08lx) [Des:%d][loop:%d]\n", adr, (adr - adr_srt) / 4, rdata, gdata, wp, number, Loop);

++#endif		    

++        #ifdef SelectSimpleDA

++		if ( cnt <= 4 ) 

++		    gdata = gdata_bak;

++        #endif

++

++        #ifdef SelectSimpleData

++        #else

++		gdata += DATA_IncVal;

++        #endif

++		

++		wp     = 0xffffffff;

++	}

++	return(0);

++} // End char check_Data (ULONG desadr, LONG number)

++

++//------------------------------------------------------------

++char check_buf (int loopcnt) {

++    int	    count;

++    ULONG	desadr;

++    

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("check_buf  : %d\n", Loop); 

++	    Debug_delay();

++    #endif

++

++	for ( count = DES_NUMBER - 1; count >= 0; count-- ) {

++		desadr = H_RDES_BASE + ( 16 * count ) + 12;

++        //printf("%d:%08x\n", count, desadr);

++		if (check_Data(desadr, count)) {

++			check_int ("");

++			

++			return(1);

++		}

++	}

++	if ( check_int ("") )

++	    return(1);

++

++	return(0);

++} // End char check_buf (int loopcnt)

++

++//------------------------------------------------------------

++// Descriptor

++//------------------------------------------------------------

++void setup_txdes (ULONG desadr, ULONG bufbase) {

++    ULONG	bufadr;

++    ULONG	desval;

++    int     count;

++    

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("setup_txdes: %d\n", Loop); 

++	    Debug_delay();

++    #endif

++

++	bufadr    = bufbase + ZeroCopy_OFFSET;

++	

++	if (TxDataEnable) {

++		for (count = 0; count < DES_NUMBER; count++) {

++			FRAME_LEN_Cur = FRAME_LEN[count];

++			desval        = TDES_IniVal;

++            #ifdef SLT_DOS	

++			if (DbgPrn_FRAME_LEN) 

++			    fprintf(fp_log, "[setup_txdes    ] FRAME_LEN_Cur:%08lx[Des:%d][loop:%d]\n", FRAME_LEN_Cur, count, Loop);

++            #endif

++			if (DbgPrn_BufAdr) 

++			    printf("[loop:%4d][des:%4d][setup_txdes] %08lx\n", Loop, count, bufadr);

++			    

++			WriteSOC_DD( desadr + 0x04, 0      );

++			WriteSOC_DD( desadr + 0x08, 0      );

++			WriteSOC_DD( desadr + 0x0C, (bufadr + CPU_BUS_ADDR_SDRAM_OFFSET) ); // 20130730

++			if ( count == ( DES_NUMBER - 1 ) )

++			    WriteSOC_DD( desadr       , desval | EOR_IniVal);

++			else

++			    WriteSOC_DD( desadr       , desval );

++

++			bufadr += DMA_PakSize;

++			desadr += 16;

++		}

++	} 

++	else {

++		WriteSOC_DD( desadr     , 0);

++	}

++} // End void setup_txdes (ULONG desadr, ULONG bufbase)

++

++//------------------------------------------------------------

++void setup_rxdes (ULONG desadr, ULONG bufbase) {

++    ULONG	bufadr;

++    ULONG	desval;    

++    int     count;

++    

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("setup_rxdes: %d\n", Loop); 

++	    Debug_delay();

++    #endif

++

++	bufadr = bufbase+ZeroCopy_OFFSET;

++	desval = RDES_IniVal;

++	

++	if ( RxDataEnable ) {

++		for (count = 0; count < DES_NUMBER; count++) {

++			if (DbgPrn_BufAdr) 

++			    printf("[loop:%4d][des:%4d][setup_rxdes] %08lx\n", Loop, count, bufadr);

++			WriteSOC_DD( desadr + 0x04, 0      );

++			WriteSOC_DD( desadr + 0x08, 0      );

++			WriteSOC_DD( desadr + 0x0C, ( bufadr + CPU_BUS_ADDR_SDRAM_OFFSET) ); // 20130730

++            if ( count == ( DES_NUMBER - 1 ) )

++                WriteSOC_DD( desadr       , desval | EOR_IniVal   );

++            else

++			    WriteSOC_DD( desadr       , desval );

++

++			desadr += 16;

++			bufadr += DMA_PakSize;

++		}

++	} 

++	else {

++		WriteSOC_DD( desadr     , 0x80000000   );

++	} // End if ( RxDataEnable )

++} // End void setup_rxdes (ULONG desadr, ULONG bufbase)

++

++//------------------------------------------------------------

++// First setting TX and RX information

++//------------------------------------------------------------

++void setup_des (ULONG bufnum) {

++

++	if ( DbgPrn_BufAdr ) {

++	    printf ("setup_rxdes: %ld\n", bufnum); 

++	    Debug_delay();

++	}

++

++    setup_txdes( H_TDES_BASE, GET_DMA_BASE_SETUP       );

++    setup_rxdes( H_RDES_BASE, GET_DMA_BASE(0)          );

++    

++} // End void setup_des (ULONG bufnum)

++

++//------------------------------------------------------------

++// Move buffer point of TX and RX descriptor to next DMA buffer

++//------------------------------------------------------------

++void setup_des_loop (ULONG bufnum) {

++    int	    count;

++    ULONG	H_rx_desadr;

++    ULONG	H_tx_desadr;

++    ULONG	H_tx_bufadr;

++    ULONG	H_rx_bufadr;

++

++	if ( DbgPrn_BufAdr ) {

++	    printf ("setup_rxdes_loop: %ld\n", bufnum); 

++	    Debug_delay();

++	}

++	

++	if (RxDataEnable) {

++		H_rx_bufadr = GET_DMA_BASE( bufnum + 1 ) + ZeroCopy_OFFSET;

++		H_rx_desadr = H_RDES_BASE;

++//printf (" =====>setup_rxdes_loop: %ld [%lX]\n", bufnum, H_rx_bufadr);

++		for (count = 0; count < DES_NUMBER; count++) {

++			WriteSOC_DD(H_rx_desadr + 0x0C,  (H_rx_bufadr + CPU_BUS_ADDR_SDRAM_OFFSET) ); // 20130730

++			

++			if (count == (DES_NUMBER - 1)) {

++				WriteSOC_DD( H_rx_desadr, RDES_IniVal | EOR_IniVal );

++			}                

++			else {           

++				WriteSOC_DD( H_rx_desadr, RDES_IniVal );

++			}

++			H_rx_bufadr += DMA_PakSize;

++			H_rx_desadr += 16;

++		}

++	}

++	

++	if (TxDataEnable) {

++		if (RxDataEnable) {

++			H_tx_bufadr = GET_DMA_BASE( bufnum ) + ZeroCopy_OFFSET;

++		} 

++		else {

++			H_tx_bufadr = GET_DMA_BASE( 0      ) + ZeroCopy_OFFSET;

++		}

++		H_tx_desadr = H_TDES_BASE;

++//printf (" =====>setup_Txdes_loop: %ld [%lX]\n", bufnum, H_tx_bufadr); 		

++		for (count = 0; count < DES_NUMBER; count++) {

++			FRAME_LEN_Cur = FRAME_LEN[count];

++			WriteSOC_DD( H_tx_desadr + 0x0C, ( H_tx_bufadr + CPU_BUS_ADDR_SDRAM_OFFSET) ); // 20130730

++			if (count == (DES_NUMBER - 1)) {

++				WriteSOC_DD( H_tx_desadr, TDES_IniVal | EOR_IniVal );

++			} 

++			else {

++				WriteSOC_DD( H_tx_desadr, TDES_IniVal );

++			}

++			H_tx_bufadr += DMA_PakSize;

++			H_tx_desadr += 16;

++		}

++	}

++

++	WriteSOC_DD( H_MAC_BASE + 0x18, 0x00000000 ); // Tx Poll

++	WriteSOC_DD( H_MAC_BASE + 0x1c, 0x00000000 ); // Rx Poll

++} // End void setup_des_loop (ULONG bufnum)

++

++//------------------------------------------------------------

++char check_des_header_Tx (char *type, ULONG adr, LONG desnum) {

++	int    timeout = 0;

++	ULONG  dat;

++	

++	dat = ReadSOC_DD(adr);

++	

++	while ( HWOwnTx(dat) ) {

++	    // we will run again, if transfer has not been completed.

++		if ( RxDataEnable && (++timeout > TIME_OUT_Des) ) {

++            #ifdef SLT_DOS

++            fprintf(fp_log, "[%sTxDesOwn] Address %08lx = %08lx [Des:%d][loop:%d]\n", type, adr, dat, desnum, Loop);

++            #endif			

++			return(FindErr_Des(Check_Des_TxOwnTimeOut));

++		}

++		WriteSOC_DD(H_MAC_BASE + 0x18, 0x00000000);//Tx Poll

++		WriteSOC_DD(H_MAC_BASE + 0x1c, 0x00000000);//Rx Poll

++        

++        #ifdef Delay_ChkTxOwn

++		delay(Delay_ChkTxOwn);

++        #endif

++		dat = ReadSOC_DD(adr);

++	}

++

++	return(0);

++} // End char check_des_header_Tx (char *type, ULONG adr, LONG desnum)

++

++//------------------------------------------------------------

++char check_des_header_Rx (char *type, ULONG adr, LONG desnum) {

++    #ifdef CheckRxOwn

++	int    timeout = 0;

++	ULONG  dat;

++	

++	dat = ReadSOC_DD(adr);

++	

++	while ( HWOwnRx( dat ) ) {

++	    // we will run again, if transfer has not been completed.

++		if (TxDataEnable && (++timeout > TIME_OUT_Des)) {

++            #ifdef SLT_DOS

++            fprintf(fp_log, "[%sRxDesOwn] Address %08lx = %08lx [Des:%d][loop:%d]\n", type, adr, dat, desnum, Loop);

++            #endif

++			return(FindErr_Des(Check_Des_RxOwnTimeOut));

++		}

++

++		WriteSOC_DD(H_MAC_BASE + 0x18, 0x00000000);//Tx Poll

++		WriteSOC_DD(H_MAC_BASE + 0x1c, 0x00000000);//Rx Poll

++        

++        #ifdef Delay_ChkRxOwn

++		delay(Delay_ChkRxOwn);

++        #endif

++		dat = ReadSOC_DD(adr);

++	};

++

++	Dat_ULONG = ReadSOC_DD( adr + 12 );

++

++    #ifdef CheckRxLen

++    #ifdef SLT_DOS

++    if ( DbgPrn_FRAME_LEN ) 

++	    fprintf(fp_log, "[%sRxDes          ] FRAME_LEN_Cur:%08lx[Des:%d][loop:%d]\n", type, (FRAME_LEN_Cur + 4), desnum, Loop);

++    #endif	  

++        

++	if ((dat & 0x3fff) != (FRAME_LEN_Cur + 4)) {

++        #ifdef SLT_DOS

++		fprintf(fp_log, "[%sRxDes] Error Frame Length %08lx:%08lx %08lx(%4d/%4d) [Des:%d][loop:%d]\n",   type, adr, dat, Dat_ULONG, (dat & 0x3fff), (FRAME_LEN_Cur + 4), desnum, Loop);

++        #endif

++		FindErr_Des(Check_Des_FrameLen);

++	}

++    #endif // End CheckRxLen

++

++    #ifdef CheckRxErr

++	if (dat & 0x00040000) {

++        #ifdef SLT_DOS

++		fprintf(fp_log, "[%sRxDes] Error RxErr        %08lx:%08lx %08lx            [Des:%d][loop:%d]\n", type, adr, dat, Dat_ULONG, desnum, Loop);

++        #endif

++        FindErr_Des(Check_Des_RxErr);

++	}

++    #endif // End CheckRxErr

++

++    #ifdef CheckOddNibble

++	if (dat & 0x00400000) {

++        #ifdef SLT_DOS

++		fprintf(fp_log, "[%sRxDes] Odd Nibble         %08lx:%08lx %08lx            [Des:%d][loop:%d]\n", type, adr, dat, Dat_ULONG, desnum, Loop);

++        #endif

++		FindErr_Des(Check_Des_OddNibble);

++	}

++    #endif // End CheckOddNibble

++

++    #ifdef CheckCRC

++	if (dat & 0x00080000) {

++        #ifdef SLT_DOS

++		fprintf(fp_log, "[%sRxDes] Error CRC          %08lx:%08lx %08lx            [Des:%d][loop:%d]\n", type, adr, dat, Dat_ULONG, desnum, Loop);

++        #endif

++		FindErr_Des(Check_Des_CRC);

++	}

++    #endif // End CheckCRC

++

++    #ifdef CheckRxFIFOFull

++	if (dat & 0x00800000) {

++		#ifdef SLT_DOS

++        fprintf(fp_log, "[%sRxDes] Error Rx FIFO Full %08lx:%08lx %08lx            [Des:%d][loop:%d]\n", type, adr, dat, Dat_ULONG, desnum, Loop);

++        #endif

++		FindErr_Des(Check_Des_RxFIFOFull);

++	}

++    #endif // End CheckRxFIFOFull

++    

++    //	if (check_int ("")) {return(1);}

++    #endif // End CheckRxOwn

++

++	if (Err_Flag) 

++	    return(1);

++	else          

++	    return(0);

++} // End char check_des_header_Rx (char *type, ULONG adr, LONG desnum)

++

++//------------------------------------------------------------

++char check_des (ULONG bufnum, int checkpoint) {

++    int     desnum;    

++    ULONG	H_rx_desadr;

++    ULONG	H_tx_desadr;

++    ULONG	H_tx_bufadr;

++    ULONG	H_rx_bufadr;

++    

++    #ifdef Delay_DesGap

++    ULONG	dly_cnt = 0;

++    ULONG	dly_max = Delay_CntMaxIncVal;

++    #endif

++    

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("check_des  : %d(%d)\n", Loop, checkpoint); 

++	    Debug_delay();

++    #endif

++    

++	// Fire the engine to send and recvice

++	WriteSOC_DD( H_MAC_BASE + 0x18, 0x00000000 );//Tx Poll

++	WriteSOC_DD( H_MAC_BASE + 0x1c, 0x00000000 );//Rx Poll

++	

++    #ifdef SelectSimpleDes

++    #else

++    if ( IEEETesting == 1 ) {

++        // IEEE test mode, there is the same data in every lan packet

++        H_tx_bufadr = GET_DMA_BASE_SETUP;

++        H_rx_bufadr = GET_DMA_BASE(0);

++    }

++    else {

++	    H_rx_bufadr = GET_DMA_BASE( bufnum + 1 ) + ZeroCopy_OFFSET;

++	    

++	    if (RxDataEnable) {

++	    	H_tx_bufadr = GET_DMA_BASE(bufnum  ) + ZeroCopy_OFFSET;

++	    } 

++	    else {

++	    	H_tx_bufadr = GET_DMA_BASE( 0      ) + ZeroCopy_OFFSET;

++	    }

++	}

++    #endif

++

++	H_rx_desadr = H_RDES_BASE;

++	H_tx_desadr = H_TDES_BASE;

++

++    #ifdef Delay_DES

++	delay(Delay_DES);

++    #endif

++	

++	for (desnum = 0; desnum < DES_NUMBER; desnum++) {

++		if ( DbgPrn_BufAdr ) 

++		    printf( "[loop:%4d][des:%4d][check_des  ] %08lx %08lx [%08lx] [%08lx]\n", Loop, desnum, ( H_tx_desadr ), ( H_rx_desadr ), ReadSOC_DD( H_tx_desadr + 12 ), ReadSOC_DD( H_rx_desadr + 12 ) );

++

++		//[Delay]--------------------

++        #ifdef Delay_DesGap

++		if ( dly_cnt++ > 3 ) {

++			switch ( rand() % 12 ) {

++				case 1 : dly_max = 00000; break;

++				case 3 : dly_max = 20000; break;

++				case 5 : dly_max = 40000; break;

++				case 7 : dly_max = 60000; break;

++				defaule: dly_max = 70000; break;

++			}

++			

++			dly_max += ( rand() % 4 ) * 14321;

++

++			while (dly_cnt < dly_max) {

++			    dly_cnt++;

++			}

++			

++			dly_cnt = 0;

++		} 

++		else {

++//			timeout = 0;

++//			while (timeout < 50000) {timeout++;};

++		}

++        #endif // End Delay_DesGap

++        

++		//[Check Owner Bit]--------------------

++		FRAME_LEN_Cur = FRAME_LEN[desnum];

++#ifdef SLT_DOS		

++		if ( DbgPrn_FRAME_LEN ) 

++		    fprintf(fp_log, "[check_des      ] FRAME_LEN_Cur:%08lx[Des:%d][loop:%d]%d\n", FRAME_LEN_Cur, desnum, Loop, checkpoint);

++#endif		    

++//		if (BurstEnable) {

++//			if (check_des_header_Tx("", H_tx_desadr, desnum)) {CheckDesFail_DesNum = desnum; return(1);}

++//		} else {

++//			if (check_des_header_Rx("", H_rx_desadr, desnum)) {CheckDesFail_DesNum = desnum; return(1);}

++//			if (check_des_header_Tx("", H_tx_desadr, desnum)) {CheckDesFail_DesNum = desnum; return(1);}

++//		}

++        

++        // Check the description of Tx and Rx

++		if ( RxDataEnable && check_des_header_Rx("", H_rx_desadr, desnum) ) {

++		    CheckDesFail_DesNum = desnum; 

++

++		    return(1);

++		}

++		if ( TxDataEnable && check_des_header_Tx("", H_tx_desadr, desnum) ) {

++		    CheckDesFail_DesNum = desnum; 

++

++		    return(1);

++		}

++//		else {

++//			printf(" %d                        \r", desnum);

++//		}

++

++        #ifdef SelectSimpleDes

++        #else

++		if ( !checkpoint ) {

++		    // Setting buffer address to description of Tx and Rx on next stage

++		    

++//			if (!BurstEnable) {

++//				WriteSOC_DD( H_rx_desadr + 0x0C, (H_rx_bufadr + CPU_BUS_ADDR_SDRAM_OFFSET) );

++//				WriteSOC_DD( H_tx_desadr + 0x0C, (H_tx_bufadr + CPU_BUS_ADDR_SDRAM_OFFSET) );

++//			}

++//

++//			if ( desnum == (DES_NUMBER - 1) ) {

++//				WriteSOC_DD( H_rx_desadr, RDES_IniVal | EOR_IniVal );

++//				WriteSOC_DD( H_tx_desadr, TDES_IniVal | EOR_IniVal );

++//			} 

++//          else {         

++//				WriteSOC_DD( H_rx_desadr, RDES_IniVal );

++//				WriteSOC_DD( H_tx_desadr, TDES_IniVal );

++//			}

++//			WriteSOC_DD( H_MAC_BASE+0x18, 0x00000000 ); //Tx Poll

++//			WriteSOC_DD( H_MAC_BASE+0x1c, 0x00000000 ); //Rx Poll

++

++			if ( RxDataEnable ) {

++				WriteSOC_DD( H_rx_desadr + 0x0C, (H_rx_bufadr + CPU_BUS_ADDR_SDRAM_OFFSET) ); // 20130730

++				

++				if ( desnum == (DES_NUMBER - 1) ) {

++					WriteSOC_DD( H_rx_desadr, RDES_IniVal | EOR_IniVal );

++				} else {         

++					WriteSOC_DD( H_rx_desadr, RDES_IniVal );

++				}

++			}

++			if ( TxDataEnable ) {

++				WriteSOC_DD( H_tx_desadr + 0x0C, (H_tx_bufadr + CPU_BUS_ADDR_SDRAM_OFFSET) ); // 20130730

++				if ( desnum == (DES_NUMBER - 1) ) {

++					WriteSOC_DD( H_tx_desadr, TDES_IniVal | EOR_IniVal );

++				}                

++				else {           

++					WriteSOC_DD( H_tx_desadr, TDES_IniVal );

++				}

++			}

++			WriteSOC_DD( H_MAC_BASE + 0x18, 0x00000000 ); //Tx Poll

++			WriteSOC_DD( H_MAC_BASE + 0x1c, 0x00000000 ); //Rx Poll

++		}

++		H_rx_bufadr += DMA_PakSize;

++		H_tx_bufadr += DMA_PakSize;

++        #endif // End SelectSimpleDes

++		

++		H_rx_desadr += 16;

++		H_tx_desadr += 16;

++	} // End for (desnum = 0; desnum < DES_NUMBER; desnum++)

++	

++	return(0);

++} // End char check_des (ULONG bufnum, int checkpoint)

++//#endif

++

++//------------------------------------------------------------

++// Print

++//------------------------------------------------------------

++void PrintMode (void) {

++	if (Enable_MAC34) printf ("run_mode[dec]    | 0->MAC1 1->MAC2 2->MAC3 3->MAC4\n");

++	else              printf ("run_mode[dec]    | 0->MAC1 1->MAC2\n");

++}

++

++//------------------------------------------------------------

++void PrintSpeed (void) {

++	printf ("speed[dec]       | 0->1G   1->100M 2->10M  3->all speed (default:%3d)\n", DEF_SPEED);

++}

++

++//------------------------------------------------------------

++void PrintCtrl (void) {

++	    printf ("ctrl[dec]        | bit0~2: Reserved\n");

++	    printf ("(default:%3d)    | bit3  : 1->Enable PHY init     0->Disable PHY init\n", GCtrl);

++	    printf ("                 | bit4  : 1->Enable PHY int-loop 0->Disable PHY int-loop\n");

++	    printf ("                 | bit5  : 1->Ignore PHY ID       0->Check PHY ID\n");

++	if (AST2400) {

++		printf ("                 | bit6  : 1->Enable MAC int-loop 0->Disable MAC int-loop\n");

++	}

++}

++

++//------------------------------------------------------------

++void PrintLoop (void) {

++	printf ("loop_max[dec]    | 1G  : 20 will run 1 sec (default:%3d)\n", DEF_LOOP_MAX * 20);

++	printf ("                 | 100M:  2 will run 1 sec (default:%3d)\n", DEF_LOOP_MAX * 2);

++	printf ("                 | 10M :  1 will run 1 sec (default:%3d)\n", DEF_LOOP_MAX);

++}

++

++//------------------------------------------------------------

++void PrintTest (void) {

++	if ( ModeSwitch == MODE_NSCI ) {

++		printf ("test_mode[dec]   | 0: NCSI configuration with    Disable_Channel request\n");

++		printf ("(default:%3d)    | 1: NCSI configuration without Disable_Channel request\n", DEF_TESTMODE);

++	}

++	else {

++		printf ("test_mode[dec]   | 0: Tx/Rx frame checking\n");

++		printf ("(default:%3d)    | 1: Tx output 0xff frame\n", DEF_TESTMODE);

++		printf ("                 | 2: Tx output 0x55 frame\n");

++		printf ("                 | 3: Tx output random frame\n");

++		printf ("                 | 4: Tx output ARP frame\n");

++		printf ("                 | 5: Tx output user defined value frame (default:0x%8x)\n", DEF_USER_DEF_PACKET_VAL);

++	} // End if ( ModeSwitch == MODE_NSCI )

++	

++	if (AST2300) {

++		printf ("                 | 6: IO timing testing\n");

++		printf ("                 | 7: IO timing/strength testing\n");

++	}

++}

++

++//------------------------------------------------------------

++void PrintPHYAdr (void) {

++	printf ("phy_adr[dec]     | 0~31: PHY Address (default:%d)\n", DEF_PHY_ADR);

++}

++

++//------------------------------------------------------------

++void PrintIOTimingBund (void) {

++	printf ("IO margin[dec]   | 0/1/3/5 (default:%d)\n", DEF_IOTIMINGBUND);

++}

++

++//------------------------------------------------------------

++void PrintPakNUm (void) {

++	printf ("package_num[dec] | 1~ 8: Total Number of NCSI Package (default:%d)\n", DEF_PACKAGE2NUM);

++}

++

++//------------------------------------------------------------

++void PrintChlNUm (void) {

++	printf ("channel_num[dec] | 1~32: Total Number of NCSI Channel (default:%d)\n", DEF_CHANNEL2NUM);

++}

++

++//------------------------------------------------------------

++

++void Print_Header (BYTE option) {

++    

++    FILE_VAR

++    

++    GET_OBJ( option )

++    

++	if      (GSpeed_sel[0]) PRINT(OUT_OBJ " 1G   ");

++	else if (GSpeed_sel[1]) PRINT(OUT_OBJ " 100M ");

++	else                    PRINT(OUT_OBJ " 10M  ");

++	    

++	switch (TestMode) {

++		case 0 : PRINT(OUT_OBJ "Tx/Rx frame checking       \n"          ); break;

++		case 1 : PRINT(OUT_OBJ "Tx output 0xff frame       \n"          ); break;

++		case 2 : PRINT(OUT_OBJ "Tx output 0x55 frame       \n"          ); break;

++		case 3 : PRINT(OUT_OBJ "Tx output random frame     \n"          ); break;

++		case 4 : PRINT(OUT_OBJ "Tx output ARP frame        \n"          ); break;

++		case 5 : PRINT(OUT_OBJ "Tx output 0x%08lx frame     \n", UserDVal); break;

++		case 6 : PRINT(OUT_OBJ "IO delay testing           \n"          ); break;

++		case 7 : PRINT(OUT_OBJ "IO delay testing(Strength) \n"          ); break;

++		case 8 : PRINT(OUT_OBJ "Tx frame                   \n"          ); break;

++		case 9 : PRINT(OUT_OBJ "Rx frame checking          \n"          ); break;

++	}

++}

++

++//------------------------------------------------------------

++void PrintIO_Header (BYTE option) {

++        

++    FILE_VAR

++    

++    GET_OBJ( option )

++    

++	if ( IOStrength ) {

++		if      (GSpeed_sel[0]) PRINT(OUT_OBJ "[Strength %ld][1G  ]========================================\n", IOStr_i);

++		else if (GSpeed_sel[1]) PRINT(OUT_OBJ "[Strength %ld][100M]========================================\n", IOStr_i);

++		else                    PRINT(OUT_OBJ "[Strength %ld][10M ]========================================\n", IOStr_i);

++	} else {

++		if      (GSpeed_sel[0]) PRINT(OUT_OBJ "[1G  ]========================================\n");

++		else if (GSpeed_sel[1]) PRINT(OUT_OBJ "[100M]========================================\n");

++		else                    PRINT(OUT_OBJ "[10M ]========================================\n");

++	}

++

++#ifdef Enable_Old_Style

++	if (Enable_RMII) PRINT(OUT_OBJ "Tx:SCU48[   %2d]=   ", IOdly_out_shf);

++	else             PRINT(OUT_OBJ "Tx:SCU48[%2d:%2d]=   ", IOdly_out_shf+3, IOdly_out_shf);

++	    

++	for (IOdly_j = IOdly_out_str; IOdly_j <= IOdly_out_end; IOdly_j+=IOdly_incval) {

++		IOdly_out = valary[IOdly_j];

++		PRINT(OUT_OBJ "%2x", IOdly_out);

++	}

++

++	PRINT(OUT_OBJ "\n                   ");

++	for (IOdly_j = IOdly_out_str; IOdly_j <= IOdly_out_end; IOdly_j+=IOdly_incval) {

++		if (IOdly_out_reg_idx == IOdly_j) PRINT(OUT_OBJ " |");

++		else                              PRINT(OUT_OBJ "  ");

++	}

++#else

++	PRINT(OUT_OBJ "Rx:SCU48[%2d:%2d]=   ", IOdly_in_shf+3, IOdly_in_shf);

++	

++	for (IOdly_i = IOdly_in_str; IOdly_i <= IOdly_in_end; IOdly_i+=IOdly_incval) {

++		IOdly_in = valary[IOdly_i];

++		PRINT(OUT_OBJ "%2x", IOdly_in);

++	}

++

++	PRINT(OUT_OBJ "\n                   ");

++	for (IOdly_i = IOdly_in_str; IOdly_i <= IOdly_in_end; IOdly_i+=IOdly_incval) {

++		if (IOdly_in_reg_idx == IOdly_i) PRINT(OUT_OBJ " |");

++		else                             PRINT(OUT_OBJ "  ");

++	}

++#endif

++

++	PRINT(OUT_OBJ "\n");

++} // End void PrintIO_Header (BYTE option)

++

++//------------------------------------------------------------

++void PrintIO_LineS (BYTE option) {

++            

++    FILE_VAR

++    

++    GET_OBJ( option )

++    

++    

++#ifdef Enable_Old_Style

++	if (IOdly_in_reg == IOdly_in) {

++		PRINT(OUT_OBJ "Rx:SCU48[%2d:%2d]=%01x:-", IOdly_in_shf+3, IOdly_in_shf, IOdly_in);

++	} 

++	else {

++		PRINT(OUT_OBJ "Rx:SCU48[%2d:%2d]=%01x: ", IOdly_in_shf+3, IOdly_in_shf, IOdly_in);

++	}

++#else

++	if (Enable_RMII) {

++		if (IOdly_out_reg == IOdly_out) {

++			PRINT(OUT_OBJ "Tx:SCU48[   %2d]=%01x:-", IOdly_out_shf, IOdly_out);

++		} 

++		else {

++			PRINT(OUT_OBJ "Tx:SCU48[   %2d]=%01x: ", IOdly_out_shf, IOdly_out);

++		}

++	} else {

++		if (IOdly_out_reg == IOdly_out) {

++			PRINT(OUT_OBJ "Tx:SCU48[%2d:%2d]=%01x:-", IOdly_out_shf+3, IOdly_out_shf, IOdly_out);

++		} 

++		else {

++			PRINT(OUT_OBJ "Tx:SCU48[%2d:%2d]=%01x: ", IOdly_out_shf+3, IOdly_out_shf, IOdly_out);

++		}

++	}

++#endif

++} // void PrintIO_LineS (BYTE option)

++

++//------------------------------------------------------------

++void PrintIO_Line (BYTE option) {

++            

++    FILE_VAR

++    

++    GET_OBJ( option )

++    

++	if ( ( IOdly_in_reg == IOdly_in ) && ( IOdly_out_reg == IOdly_out ) ) {

++		if (dlymap[IOdly_i][IOdly_j]) PRINT(OUT_OBJ " X");

++		else                          PRINT(OUT_OBJ " O");

++	} 

++	else {

++		if (dlymap[IOdly_i][IOdly_j]) PRINT(OUT_OBJ " x");

++		else                          PRINT(OUT_OBJ " o");

++	}

++} // End void PrintIO_Line (BYTE option)

++

++//------------------------------------------------------------

++void PrintIO_Line_LOG (void) {

++#ifndef SLT_UBOOT      

++#ifdef Enable_Old_Style

++	if (Enable_RMII) fprintf(fp_log, "\nTx:SCU48[   %2d]=%2x, ", IOdly_out_shf, IOdly_out);

++	else             fprintf(fp_log, "\nTx:SCU48[%2d:%2d]=%2x, ", IOdly_out_shf+3, IOdly_out_shf, IOdly_out);

++

++	fprintf(fp_log, "Rx:SCU48[%2d:%2d]=%01x: ", IOdly_in_shf+3, IOdly_in_shf, IOdly_in);

++

++	if (dlymap[IOdly_i][IOdly_j]) fprintf(fp_log, " X\n");

++	else                          fprintf(fp_log, " O\n");

++#else

++	fprintf(fp_log, "\nRx:SCU48[%2d:%2d]=%2x, ", IOdly_in_shf+3, IOdly_in_shf, IOdly_in);

++

++	if (Enable_RMII) fprintf(fp_log, "Tx:SCU48[   %2d]=%01x: ", IOdly_out_shf, IOdly_out);

++	else             fprintf(fp_log, "Tx:SCU48[%2d:%2d]=%01x: ", IOdly_out_shf+3, IOdly_out_shf, IOdly_out);

++

++	if (dlymap[IOdly_i][IOdly_j]) fprintf(fp_log, " X\n");

++	else                          fprintf(fp_log, " O\n");

++#endif

++#endif    

++}

++

++//------------------------------------------------------------

++// main

++//------------------------------------------------------------

++void Calculate_LOOP_CheckNum (void) {

++    

++#define ONE_MBYTE    1048576

++

++  #ifdef CheckDataEveryTime

++	LOOP_CheckNum   = 1;

++  #else

++	if (IOTiming || IOTimingBund || (GSpeed == SET_1G_100M_10MBPS)) {

++		LOOP_CheckNum = LOOP_MAX;

++	} 

++	else {

++		switch ( GSpeed ) {

++			case SET_1GBPS    : CheckBuf_MBSize =  MOVE_DATA_MB_SEC      ; break; // 1G

++			case SET_100MBPS  : CheckBuf_MBSize = (MOVE_DATA_MB_SEC >> 3); break; // 100M ~ 1G / 8

++			case SET_10MBPS   : CheckBuf_MBSize = (MOVE_DATA_MB_SEC >> 6); break; // 10M  ~ 1G / 64

++		}

++		LOOP_CheckNum = ( CheckBuf_MBSize / ( ((DES_NUMBER * DMA_PakSize) / ONE_MBYTE ) + 1) );

++	}

++  #endif

++}

++

++//------------------------------------------------------------

++void TestingSetup (void) {

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("TestingSetup\n"); 

++	    Debug_delay();

++    #endif

++

++  #ifdef SLT_UBOOT

++  #else

++    #ifdef Rand_Sed

++	srand((unsigned) Rand_Sed);

++    #else

++	srand((unsigned) timestart);

++    #endif

++  #endif              

++  

++    //[Disable VGA]--------------------

++    #ifdef Disable_VGA

++	if ( LOOP_INFINI & ~(BurstEnable || IOTiming) ) {

++		VGAModeVld = 1;

++		outp(0x3d4, 0x17);

++		VGAMode = inp(0x3d5);

++		outp(0x3d4, 0x17);

++		outp(0x3d5, 0);

++    }

++    #endif

++    

++    //[Setup]--------------------

++	setup_framesize();

++	setup_buf();

++}

++

++//------------------------------------------------------------

++// Return 1 ==> fail

++// Return 0 ==> PASS

++//------------------------------------------------------------

++char TestingLoop (ULONG loop_checknum) {

++    char	checkprd;

++    char	looplast;

++    char	checken;

++    

++    #ifdef SLT_UBOOT

++    #else

++        clock_t	timeold;

++    #endif

++

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("TestingLoop: %d\n", Loop); 

++	    Debug_delay();

++    #endif

++	

++	if ( DbgPrn_DumpMACCnt ) 

++	    dump_mac_ROreg();

++

++	//[Setup]--------------------

++	Loop     = 0;

++	checkprd = 0;

++	checken  = 0;

++	looplast = 0;

++

++	setup_des( 0 );

++

++    #ifdef SLT_UBOOT

++    #else

++	timeold = clock();

++    #endif

++

++	while ( (Loop < LOOP_MAX) || LOOP_INFINI ) {

++		looplast = !LOOP_INFINI && (Loop == LOOP_MAX - 1);

++        

++        #ifdef CheckRxBuf

++		if (!BurstEnable) {

++			checkprd = ((Loop % loop_checknum) == (loop_checknum - 1));

++		}

++		checken = looplast | checkprd;

++        #endif

++    

++		if ( DataDelay & ( Loop == 0 ) ) {

++			printf ("Press any key to start...\n");

++			GET_CAHR();

++		}

++		

++#ifdef  DbgPrn_FuncHeader

++        if ( DbgPrn_BufAdr ) {

++            printf ("for start ======> %d/%d(%d) looplast:%d checkprd:%d checken:%d\n", Loop, LOOP_MAX, LOOP_INFINI, looplast, checkprd, checken); 

++            Debug_delay();

++        }

++#endif

++        

++		//[Check DES]--------------------

++		if ( check_des(Loop, checken) ) {

++		    //descriptor error

++            #ifdef CheckRxBuf

++			DES_NUMBER = CheckDesFail_DesNum + 1;

++			if ( checkprd ) {

++				check_buf(loop_checknum);

++			} 

++			else {

++				check_buf((LOOP_MAX % loop_checknum));

++			}

++			DES_NUMBER = DES_NUMBER_Org;

++            #endif

++

++			if (DbgPrn_DumpMACCnt) 

++			    dump_mac_ROreg();

++			    

++			return(1);

++		}

++

++		//[Check Buf]--------------------

++		if ( RxDataEnable && checken ) {

++            #ifdef SLT_UBOOT

++            #else

++            timeused = (clock() - timeold) / (double) CLK_TCK;

++            #endif

++			

++			if ( checkprd ) {

++                #ifdef SLT_DOS

++                #else

++                  #ifdef SLT_UBOOT

++                  #else

++                printf("[run loop:%3d] BandWidth: %7.2f Mbps, %6.2f sec\n", loop_checknum, ((double)loop_checknum * (double)DES_NUMBER * Avg_frame_len * 8.0) / ((double)timeused * 1000000.0), timeused);

++                fprintf(fp_log, "[run loop:%3d] BandWidth: %7.2f Mbps, %6.2f sec\n", loop_checknum, ((double)loop_checknum * (double)DES_NUMBER * Avg_frame_len * 8.0) / ((double)timeused * 1000000.0), timeused);

++                  #endif

++                #endif

++                

++                #ifdef CheckRxBuf

++                if ( check_buf( loop_checknum ) ) 

++                    return(1);

++                #endif

++			} 

++			else {

++                #ifdef SLT_DOS

++                #else

++                  #ifdef SLT_UBOOT

++                  #else

++                printf("[run loop:%3d] BandWidth: %7.2f Mbps, %6.2f sec\n", (LOOP_MAX % loop_checknum), ((double)(LOOP_MAX % loop_checknum) * (double)DES_NUMBER * Avg_frame_len * 8.0) / ((double)timeused * 1000000.0), timeused);

++                fprintf(fp_log, "[run loop:%3d] BandWidth: %7.2f Mbps, %6.2f sec\n", (LOOP_MAX % loop_checknum), ((double)(LOOP_MAX % loop_checknum) * (double)DES_NUMBER * Avg_frame_len * 8.0) / ((double)timeused * 1000000.0), timeused);

++                  #endif

++                #endif

++                

++                #ifdef CheckRxBuf

++                if ( check_buf( ( LOOP_MAX % loop_checknum ) ) ) 

++                    return(1);                

++                #endif

++			} // End if ( checkprd )

++            

++            #ifdef SelectSimpleDes

++            #else

++            if ( !looplast ) 

++                setup_des_loop( Loop );

++            #endif

++

++            #ifdef SLT_DOS

++            #else

++              #ifdef SLT_UBOOT

++              #else

++        	timeold = clock();

++              #endif

++            #endif

++

++		} // End if ( RxDataEnable && checken )

++		

++        #ifdef SelectSimpleDes

++		if ( !looplast ) 

++		    setup_des_loop( Loop );

++        #endif

++        

++		if ( LOOP_INFINI ) {

++			    printf("===============> Loop: %d  \r", Loop);

++		} 

++		else if (TestMode == 0) {

++			if (!(DbgPrn_BufAdr || IOTimingBund)) 

++			    printf(" %d                        \r", Loop);

++//			switch (Loop % 4) {

++//				case 0x00: printf("| %d                        \r", Loop); break;

++//				case 0x01: printf("/ %d                        \r", Loop); break;

++//				case 0x02: printf("- %d                        \r", Loop); break;

++//				default  : printf("\ %d                        \r", Loop); break;

++//			}

++		}

++

++        if ( DbgPrn_BufAdr ) {

++            printf ("for end   ======> %d/%d(%d)\n", Loop, LOOP_MAX, LOOP_INFINI); 

++            Debug_delay();

++        }

++

++		Loop++;

++	}  // End while ((Loop < LOOP_MAX) || LOOP_INFINI)

++	

++	Loop_rl[GSpeed_idx] = Loop;

++	

++	return(0);

++} // End char TestingLoop (ULONG loop_checknum)

++

++

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/Makefile b/arch/arm/cpu/arm926ejs/aspeed/Makefile
+new file mode 100644
+index 0000000..378745e
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/Makefile
+@@ -0,0 +1,53 @@
++# This program is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License as
++# published by the Free Software Foundation; either version 2 of
++# the License, or (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++# MA 02111-1307 USA
++#
++
++include $(TOPDIR)/config.mk
++
++LIB	= $(obj)lib$(SOC).a
++
++COBJS	= timer.o
++COBJS	+= reset.o
++COBJS	+= mactest.o
++COBJS	+= DRAM_SPI.o
++COBJS	+= IO.o
++COBJS	+= LIB.o
++COBJS	+= MAC.o
++COBJS	+= NCSI.o
++COBJS	+= PCI_SPI.o
++COBJS	+= PHY.o
++COBJS	+= SPIM.o
++COBJS	+= STDUBOOT.o
++COBJS	+= PLLTESTU.o
++COBJS	+= TRAPTEST.o
++COBJS	+= STRESS.o
++
++SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
++OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS))
++START	:= $(addprefix $(obj),$(START))
++
++all:	$(obj).depend $(LIB)
++
++$(LIB):	$(OBJS)
++	$(AR) $(ARFLAGS) $@ $(OBJS)
++
++#########################################################################
++
++# defines $(obj).depend target
++include $(SRCTREE)/rules.mk
++
++sinclude $(obj).depend
++
++#########################################################################
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/NCSI.H b/arch/arm/cpu/arm926ejs/aspeed/NCSI.H
+new file mode 100644
+index 0000000..a0e448b
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/NCSI.H
+@@ -0,0 +1,189 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef NCSI_H
++#define NCSI_H
++
++#include "TYPEDEF.H"
++
++//---------------------------------------------------------
++// Define
++//---------------------------------------------------------
++#define MAX_PACKAGE_NUM                         8      // 1 ~ 8
++#define MAX_CHANNEL_NUM                         4      // 1 ~ 32
++//#define Enable_NCSI_LOOP_INFINI             //[off]
++
++//---------------------------------------------------------
++// Function
++//---------------------------------------------------------
++#define SENT_RETRY_COUNT                      1
++#define NCSI_RxDESNum                         50
++
++//#define NCSI_Skip_Phase1_DeSelectPackage
++//#define NCSI_Skip_DeSelectPackage
++//#define NCSI_Skip_DiSChannel
++//#define NCSI_EnableDelay_DeSelectPackage
++//#define NCSI_EnableDelay_GetLinkStatus
++//#define NCSI_EnableDelay_EachPackage
++//#define Print_Version_ID
++//#define Print_PackageName
++
++//---------------------------------------------------------
++// PCI DID/VID & Manufacturer ID
++//---------------------------------------------------------
++#define ManufacturerID_Intel                  0x00000157     //343
++#define ManufacturerID_Broadcom               0x0000113d     //4413
++#define ManufacturerID_Mellanox               0x000002c9     //713
++
++//PCI VID: [163c]intel
++//PCI VID: [8086]Intel Corporation
++//PCI VID: [8087]Intel
++//PCI VID: [14e4]Broadcom Corporation
++//PCI VID: [15b3]Mellanox
++#define PCI_DID_VID_Intel_82574L              0x10d38086     // IntelR 82574L Gigabit Ethernet Controller
++#define PCI_DID_VID_Intel_82575_10d6          0x10d68086     // 82566 DM-2-gigabyte
++#define PCI_DID_VID_Intel_82575_10a7          0x10a78086     // 82575EB Gigabit Network Connection
++#define PCI_DID_VID_Intel_82575_10a9          0x10a98086     // 82575EB Gigabit Network Connection
++#define PCI_DID_VID_Intel_82576_10c9          0x10c98086     //*82576 Gigabit ET Dual Port Server Adapter
++#define PCI_DID_VID_Intel_82576_10e6          0x10e68086     // 82576 Gigabit Network Connection
++#define PCI_DID_VID_Intel_82576_10e7          0x10e78086     // 82576 Gigabit Network Connection
++#define PCI_DID_VID_Intel_82576_10e8          0x10e88086     // E64750-xxx Intel Gigabit ET Quad Port Server Adapter
++#define PCI_DID_VID_Intel_82576_1518          0x15188086     // 82576NS SerDes Gigabit Network Connectio
++#define PCI_DID_VID_Intel_82576_1526          0x15268086     // Intel Gigabit ET2 Quad Port Server Adapter
++#define PCI_DID_VID_Intel_82576_150a          0x150a8086     // 82576NS Gigabit Ethernet Controller
++#define PCI_DID_VID_Intel_82576_150d          0x150d8086     // 82576 Gigabit Backplane Connection
++#define PCI_DID_VID_Intel_82599_10fb          0x10fb8086     // 10 Gb Ethernet controller
++#define PCI_DID_VID_Intel_82599_1557          0x15578086     //
++#define PCI_DID_VID_Intel_I350_1521           0x15218086     //
++#define PCI_DID_VID_Intel_I350_1523           0x15238086     //
++#define PCI_DID_VID_Intel_I210                0x15338086     //
++#define PCI_DID_VID_Intel_X540                0x15288086     //
++#define PCI_DID_VID_Broadcom_BCM5718          0x165614e4     //
++#define PCI_DID_VID_Broadcom_BCM5720          0x165f14e4     //
++#define PCI_DID_VID_Broadcom_BCM5725          0x164314e4     //
++#define PCI_DID_VID_Mellanox_ConnectX_3       0x100315b3     //*
++
++//---------------------------------------------------------
++// Delay (ms)
++//---------------------------------------------------------
++#define Delay_EachPackage                     1000
++#define Delay_DeSelectPackage                 50
++#define Delay_GetLinkStatus                   50
++
++//---------------------------------------------------------
++// NCSI Parameter
++//---------------------------------------------------------
++//Command and Response Type
++#define CLEAR_INITIAL_STATE                   0x00           //M
++#define SELECT_PACKAGE                        0x01           //M
++#define DESELECT_PACKAGE                      0x02           //M
++#define ENABLE_CHANNEL                        0x03           //M
++#define DISABLE_CHANNEL                       0x04           //M
++#define RESET_CHANNEL                         0x05           //M
++#define ENABLE_CHANNEL_NETWORK_TX             0x06           //M
++#define DISABLE_CHANNEL_NETWORK_TX            0x07           //M
++#define AEN_ENABLE                            0x08
++#define SET_LINK                              0x09           //M
++#define GET_LINK_STATUS                       0x0A           //M
++#define SET_VLAN_FILTER                       0x0B           //M
++#define ENABLE_VLAN                           0x0C           //M
++#define DISABLE_VLAN                          0x0D           //M
++#define SET_MAC_ADDRESS                       0x0E           //M
++#define ENABLE_BROADCAST_FILTERING            0x10           //M
++#define DISABLE_BROADCAST_FILTERING           0x11           //M
++#define ENABLE_GLOBAL_MULTICAST_FILTERING     0x12
++#define DISABLE_GLOBAL_MULTICAST_FILTERING    0x13
++#define SET_NCSI_FLOW_CONTROL                 0x14
++#define GET_VERSION_ID                        0x15           //M
++#define GET_CAPABILITIES                      0x16           //M
++#define GET_PARAMETERS                        0x17           //M
++#define GET_CONTROLLER_PACKET_STATISTICS      0x18
++#define GET_NCSI_STATISTICS                   0x19
++#define GET_NCSI_PASS_THROUGH_STATISTICS      0x1A
++
++//Standard Response Code
++#define COMMAND_COMPLETED                     0x00
++#define COMMAND_FAILED                        0x01
++#define COMMAND_UNAVAILABLE                   0x02
++#define COMMAND_UNSUPPORTED                   0x03
++
++//Standard Reason Code
++#define NO_ERROR                              0x0000
++#define INTERFACE_INITIALIZATION_REQUIRED     0x0001
++#define PARAMETER_IS_INVALID                  0x0002
++#define CHANNEL_NOT_READY                     0x0003
++#define PACKAGE_NOT_READY                     0x0004
++#define INVALID_PAYLOAD_LENGTH                0x0005
++#define UNKNOWN_COMMAND_TYPE                  0x7FFF
++
++//SET_MAC_ADDRESS
++#define UNICAST                               ( 0x00 << 5 )
++#define MULTICAST                             ( 0x01 << 5 )
++#define DISABLE_MAC_ADDRESS_FILTER            0x00
++#define ENABLE_MAC_ADDRESS_FILTER             0x01
++
++//GET_LINK_STATUS
++#define LINK_DOWN                             0
++#define LINK_UP                               1
++
++#define NCSI_RxDMA_PakSize                    2048
++#define NCSI_RxDMA_BASE                       (DMA_BASE+0x00100000)
++
++//---------------------------------------------------------
++// Variable
++//---------------------------------------------------------
++//NC-SI Command Packet
++typedef struct {
++//Ethernet Header
++    unsigned char  DA[6];                    // Destination Address
++    unsigned char  SA[6];                    // Source Address
++    unsigned short EtherType;                // DMTF NC-SI, it should be 0x88F8
++//NC-SI Control Packet
++    unsigned char  MC_ID;                    // Management Controller should set this field to 0x00
++    unsigned char  Header_Revision;          // For NC-SI 1.0 spec, this field has to set 0x01
++    unsigned char  Reserved_1;               // Reserved has to set to 0x00
++    unsigned char  IID;                      // Instance ID
++    unsigned char  Command;
++    unsigned char  Channel_ID;
++    unsigned short Payload_Length;           // Payload Length = 12 bits, 4 bits are reserved
++    unsigned long  Reserved_2;
++    unsigned long  Reserved_3;
++
++    unsigned short  Reserved_4;
++    unsigned short  Reserved_5;
++    unsigned short  Response_Code;
++    unsigned short  Reason_Code;
++    unsigned char   Payload_Data[64];
++}  NCSI_Command_Packet;
++
++//NC-SI Response Packet
++typedef struct {
++    unsigned char  DA[6];
++    unsigned char  SA[6];
++    unsigned short EtherType;                //DMTF NC-SI
++//NC-SI Control Packet
++    unsigned char  MC_ID;                    //Management Controller should set this field to 0x00
++    unsigned char  Header_Revision;          //For NC-SI 1.0 spec, this field has to set 0x01
++    unsigned char  Reserved_1;               //Reserved has to set to 0x00
++    unsigned char  IID;                      //Instance ID
++    unsigned char  Command;
++    unsigned char  Channel_ID;
++    unsigned short Payload_Length;           //Payload Length = 12 bits, 4 bits are reserved
++    unsigned short  Reserved_2;
++    unsigned short  Reserved_3;
++    unsigned short  Reserved_4;
++    unsigned short  Reserved_5;
++
++    unsigned short  Response_Code;
++    unsigned short  Reason_Code;
++    unsigned char   Payload_Data[64];
++}  NCSI_Response_Packet;
++
++#endif // NCSI_H
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/NCSI.c b/arch/arm/cpu/arm926ejs/aspeed/NCSI.c
+new file mode 100644
+index 0000000..7de06c3
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/NCSI.c
+@@ -0,0 +1,934 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#define NCSI_C
++static const char ThisFile[] = "NCSI.c";
++
++#include "SWFUNC.H"
++
++#ifdef SLT_UBOOT
++  #include <common.h>
++  #include <command.h>
++  #include <COMMINF.H>
++  #include <NCSI.H>
++  #include <IO.H>
++#endif
++#ifdef SLT_DOS
++  #include <stdio.h>
++  #include <stdlib.h>
++  #include <conio.h>
++  #include <string.h>
++  #include "COMMINF.H"
++  #include "NCSI.H"
++  #include "IO.H"
++#endif
++
++NCSI_Command_Packet     NCSI_Request_SLT;
++NCSI_Response_Packet    NCSI_Respond_SLT;
++int             InstanceID;
++int             NCSI_RxTimeOutScale;
++ULONG           NCSI_RxDesBase;
++ULONG           NCSI_TxDWBUF[512];
++ULONG           NCSI_RxDWBUF[512];
++char            NCSI_CommandStr[512];
++unsigned char   *NCSI_TxByteBUF;
++unsigned char   *NCSI_RxByteBUF;
++unsigned char   NCSI_Payload_Data[16];
++unsigned long   Payload_Checksum_NCSI = 0x00000000;
++ULONG           select_flag[MAX_PACKAGE_NUM];
++
++ULONG DWSwap_SLT (ULONG in) {
++	return( ((in & 0xff000000) >> 24)
++	      | ((in & 0x00ff0000) >>  8)
++	      | ((in & 0x0000ff00) <<  8)
++	      | ((in & 0x000000ff) << 24)
++	      );
++}
++USHORT WDSwap_SLT (USHORT in) {
++	return( ((in & 0xff00) >>  8)
++	      | ((in & 0x00ff) <<  8)
++	      );
++}
++
++//------------------------------------------------------------
++int FindErr_NCSI (int value) {
++	NCSI_LinkFail_Val = NCSI_LinkFail_Val | value;
++	Err_Flag          = Err_Flag | Err_NCSI_LinkFail;
++	if ( DbgPrn_ErrFlg ) 
++	    printf ("\nErr_Flag: [%08lx] NCSI_LinkFail_Val: [%08lx]\n", Err_Flag, NCSI_LinkFail_Val);
++
++	return(1);
++}
++
++//------------------------------------------------------------
++// PHY IC(NC-SI)
++//------------------------------------------------------------
++void ncsi_respdump ( NCSI_Response_Packet *in ) {
++    printf ("DA             : %02x %02x %02x %02x %02x %02x\n", in->DA[5], in->DA[4], in->DA[3], in->DA[2], in->DA[1], in->DA[0]);
++    printf ("SA             : %02x %02x %02x %02x %02x %02x\n", in->SA[5], in->SA[4], in->SA[3], in->SA[2], in->SA[1], in->SA[0]);
++    printf ("EtherType      : %04x\n", in->EtherType       );//DMTF NC-SI
++    printf ("MC_ID          : %02x\n", in->MC_ID           );//Management Controller should set this field to 0x00
++    printf ("Header_Revision: %02x\n", in->Header_Revision );//For NC-SI 1.0 spec, this field has to set 0x01
++//  printf ("Reserved_1     : %02x\n", in->Reserved_1      ); //Reserved has to set to 0x00
++    printf ("IID            : %02x\n", in->IID             );//Instance ID
++    printf ("Command        : %02x\n", in->Command         );
++    printf ("Channel_ID     : %02x\n", in->Channel_ID      );
++    printf ("Payload_Length : %04x\n", in->Payload_Length  );//Payload Length = 12 bits, 4 bits are reserved
++//  printf ("Reserved_2     : %04x\n", in->Reserved_2      );
++//  printf ("Reserved_3     : %04x\n", in->Reserved_3      );
++//  printf ("Reserved_4     : %04x\n", in->Reserved_4      );
++//  printf ("Reserved_5     : %04x\n", in->Reserved_5      );
++    printf ("Response_Code  : %04x\n", in->Response_Code   );
++    printf ("Reason_Code    : %04x\n", in->Reason_Code     );
++    printf ("Payload_Data   : %02x%02x%02x%02x\n", in->Payload_Data[ 3], in->Payload_Data[ 2], in->Payload_Data[ 1], in->Payload_Data[ 0]);
++//  printf ("Payload_Data   : %02x%02x%02x%02x\n", in->Payload_Data[ 7], in->Payload_Data[ 6], in->Payload_Data[ 5], in->Payload_Data[ 4]);
++//  printf ("Payload_Data   : %02x%02x%02x%02x\n", in->Payload_Data[11], in->Payload_Data[10], in->Payload_Data[ 9], in->Payload_Data[ 8]);
++//  printf ("Payload_Data   : %02x%02x%02x%02x\n", in->Payload_Data[15], in->Payload_Data[14], in->Payload_Data[13], in->Payload_Data[12]);
++//  printf ("Payload_Data   : %02x%02x%02x%02x\n", in->Payload_Data[19], in->Payload_Data[18], in->Payload_Data[17], in->Payload_Data[16]);
++//  printf ("Payload_Data   : %02x%02x%02x%02x\n", in->Payload_Data[23], in->Payload_Data[22], in->Payload_Data[21], in->Payload_Data[20]);
++}
++
++//------------------------------------------------------------
++void NCSI_Struct_Initialize_SLT (void) {
++    int i;
++
++    ULONG    NCSI_RxDatBase;
++
++    InstanceID = 0;
++    NCSI_RxTimeOutScale = 1;
++
++    for (i = 0; i < 6; i++) {
++        NCSI_Request_SLT.DA[i] = 0xFF;
++    }
++
++    for (i = 0; i < 6; i++) {
++//      NCSI_Request.SA[i] = i<<2;
++        NCSI_Request_SLT.SA[i] = SA[i];
++    }
++
++    NCSI_Request_SLT.EtherType       = WDSwap_SLT(0x88F8); // EtherType = 0x88F8 (DMTF NC-SI) page 50, table 8, NC-SI spec. version 1.0.0
++    NCSI_Request_SLT.MC_ID           = 0;
++    NCSI_Request_SLT.Header_Revision = 0x01;
++    NCSI_Request_SLT.Reserved_1      = 0;
++    NCSI_Request_SLT.Reserved_2      = 0;
++    NCSI_Request_SLT.Reserved_3      = 0;
++
++    NCSI_TxByteBUF = (unsigned char *) &NCSI_TxDWBUF[0];
++    NCSI_RxByteBUF = (unsigned char *) &NCSI_RxDWBUF[0];
++
++    NCSI_RxDesBase = H_RDES_BASE;
++    NCSI_RxDatBase = NCSI_RxDMA_BASE;
++    
++    for (i = 0; i < NCSI_RxDESNum - 1; i++) {
++        WriteSOC_DD( ( NCSI_RxDesBase +  0 ), 0x00000000     );
++        WriteSOC_DD( ( NCSI_RxDesBase +  4 ), 0x00000000     );
++        WriteSOC_DD( ( NCSI_RxDesBase +  8 ), 0x00000000     );
++        WriteSOC_DD( ( NCSI_RxDesBase + 0x0C ), (NCSI_RxDatBase + CPU_BUS_ADDR_SDRAM_OFFSET) ); // 20130730
++        NCSI_RxDesBase += 16;
++        NCSI_RxDatBase += NCSI_RxDMA_PakSize;
++    }
++    WriteSOC_DD( ( NCSI_RxDesBase +  0 ), EOR_IniVal     );
++    WriteSOC_DD( ( NCSI_RxDesBase +  4 ), 0x00000000     );
++    WriteSOC_DD( ( NCSI_RxDesBase +  8 ), 0x00000000     );
++    WriteSOC_DD( ( NCSI_RxDesBase + 0x0C ), (NCSI_RxDatBase + CPU_BUS_ADDR_SDRAM_OFFSET) ); // 20130730
++
++    NCSI_RxDesBase = H_RDES_BASE;
++}
++
++//------------------------------------------------------------
++void Calculate_Checksum_NCSI (unsigned char *buffer_base, int Length) {
++    ULONG	CheckSum = 0;   
++    ULONG	Data;
++    ULONG	Data1;
++    int     i;
++    
++    // Calculate checksum is from byte 14 of ethernet Haeder and Control packet header
++    // Page 50, NC-SI spec. ver. 1.0.0 form DMTF
++    for (i = 14; i < Length; i += 2 ) {
++        Data      = buffer_base[i];
++        Data1     = buffer_base[i + 1];
++        CheckSum += ((Data << 8) + Data1);
++    }
++    Payload_Checksum_NCSI = DWSwap_SLT(~(CheckSum) + 1); //2's complement
++}
++
++//------------------------------------------------------------
++// return 0: it is PASS
++// return 1: it is FAIL
++//------------------------------------------------------------
++char NCSI_Rx_SLT (unsigned char command) {
++    
++#define NCSI_RX_RETRY_TIME  2    
++    int     timeout = 0;
++    int	    bytesize;
++    int	    dwsize;
++    int     i;
++    int     retry   = 0;
++    char    ret     = 1;
++
++    ULONG   NCSI_RxDatBase;
++    ULONG   NCSI_RxDesDat;
++    ULONG   NCSI_RxData;
++
++    
++    do {
++        WriteSOC_DD( ( H_MAC_BASE + 0x1C ), 0x00000000 );//Rx Poll
++        
++        do {
++            NCSI_RxDesDat = ReadSOC_DD(NCSI_RxDesBase);
++            if ( ++timeout > TIME_OUT_NCSI * NCSI_RxTimeOutScale ) {
++                #ifdef SLT_DOS
++                fprintf(fp_log, "[Cmd:%02X][NCSI-RxDesOwn] %08lX \n", command, NCSI_RxDesDat );
++                #endif
++                return( FindErr(Err_NCSI_Check_RxOwnTimeOut) );
++            }
++        } while( HWOwnRx(NCSI_RxDesDat) );
++        
++        #ifdef CheckRxErr
++        if (NCSI_RxDesDat & 0x00040000) {
++            #ifdef SLT_DOS
++            fprintf(fp_log, "[RxDes] Error RxErr        %08lx\n", NCSI_RxDesDat);
++            #endif
++            FindErr_Des(Check_Des_RxErr);
++        }
++        #endif
++        
++        #ifdef CheckOddNibble
++        if (NCSI_RxDesDat & 0x00400000) {
++            #ifdef SLT_DOS
++            fprintf(fp_log, "[RxDes] Odd Nibble         %08lx\n", NCSI_RxDesDat);
++            #endif
++            FindErr_Des(Check_Des_OddNibble);
++        }
++        #endif
++        
++        #ifdef CheckCRC
++        if (NCSI_RxDesDat & 0x00080000) {
++            #ifdef SLT_DOS
++            fprintf(fp_log, "[RxDes] Error CRC          %08lx\n", NCSI_RxDesDat);
++            #endif
++            FindErr_Des(Check_Des_CRC);
++        }
++        #endif
++        
++        #ifdef CheckRxFIFOFull
++        if (NCSI_RxDesDat & 0x00800000) {
++            #ifdef SLT_DOS
++            fprintf(fp_log, "[RxDes] Error Rx FIFO Full %08lx\n", NCSI_RxDesDat);
++            #endif
++            FindErr_Des(Check_Des_RxFIFOFull);
++        }
++        #endif
++        
++        // Get point of RX DMA buffer
++        NCSI_RxDatBase = ReadSOC_DD( NCSI_RxDesBase + 0x0C );
++        NCSI_RxData    = ReadSOC_DD( NCSI_RxDatBase + 0x0C );
++        
++        if ( HWEOR( NCSI_RxDesDat ) ) {
++            // it is last the descriptor in the receive Ring
++            WriteSOC_DD( NCSI_RxDesBase     , EOR_IniVal    );
++            NCSI_RxDesBase  = H_RDES_BASE;
++        } 
++        else {
++            WriteSOC_DD( NCSI_RxDesBase     , 0x00000000    );
++            NCSI_RxDesBase += 16;
++        }
++        
++        // Get RX valid data in offset 00h of RXDS#0
++        bytesize  = (NCSI_RxDesDat & 0x3fff);
++        
++        // Fill up to multiple of 4
++        if ( ( bytesize % 4 ) != 0 )
++            dwsize = ( bytesize >> 2 ) + 1;
++        else
++            dwsize = bytesize >> 2;
++        
++        #ifdef SLT_DOS
++        if ( PrintNCSIEn ) 
++            fprintf(fp_log ,"[Rx] %d bytes(%xh)\n", bytesize, bytesize);
++        #endif
++        
++        for (i = 0; i < dwsize; i++) {
++            NCSI_RxDWBUF[i] = ReadSOC_DD(NCSI_RxDatBase + ( i << 2 ));
++            if ( PrintNCSIEn ) {
++                if ( i == ( dwsize - 1 ) ) {
++                    switch (bytesize % 4) {
++                        case 0  : NCSI_RxDWBUF[i] = NCSI_RxDWBUF[i] & 0xffffffff; break;
++                        case 3  : NCSI_RxDWBUF[i] = NCSI_RxDWBUF[i] & 0xffffff  ; break;
++                        case 2  : NCSI_RxDWBUF[i] = NCSI_RxDWBUF[i] & 0xffff    ; break;
++                        case 1  : NCSI_RxDWBUF[i] = NCSI_RxDWBUF[i] & 0xff      ; break;
++                    }
++                    #ifdef SLT_DOS
++                    switch (bytesize % 4) {
++                        case 0  : fprintf(fp_log ,"[Rx%02d]%08lx %08lx\n",             i, NCSI_RxDWBUF[i], DWSwap_SLT(NCSI_RxDWBUF[i])       ); break;
++                        case 3  : fprintf(fp_log ,"[Rx%02d]--%06lx %06lx--\n",         i, NCSI_RxDWBUF[i], DWSwap_SLT(NCSI_RxDWBUF[i]) >>  8 ); break;
++                        case 2  : fprintf(fp_log ,"[Rx%02d]----%04lx %04lx----\n",     i, NCSI_RxDWBUF[i], DWSwap_SLT(NCSI_RxDWBUF[i]) >> 16 ); break;
++                        case 1  : fprintf(fp_log ,"[Rx%02d]------%02lx %02lx------\n", i, NCSI_RxDWBUF[i], DWSwap_SLT(NCSI_RxDWBUF[i]) >> 24 ); break;
++                        default : fprintf(fp_log ,"[Rx%02d]error", i); break;
++                    }
++                    #endif
++                } 
++                else {
++                    #ifdef SLT_DOS
++                    fprintf(fp_log ,"[Rx%02d]%08lx %08lx\n", i, NCSI_RxDWBUF[i], DWSwap_SLT(NCSI_RxDWBUF[i]));
++                    #endif
++                }
++            }
++        } // End for (i = 0; i < dwsize; i++)
++        
++        // EtherType field of the response packet should be 0x88F8 
++        if ((NCSI_RxData & 0xffff) == 0xf888) {
++            memcpy (&NCSI_Respond_SLT, NCSI_RxByteBUF, bytesize);
++            
++            #ifdef SLT_DOS
++            if ( PrintNCSIEn ) 
++                fprintf(fp_log ,"[Rx IID:%2d]\n", NCSI_Respond_SLT.IID);
++            #endif
++            
++            NCSI_Respond_SLT.EtherType      = WDSwap_SLT( NCSI_Respond_SLT.EtherType      );
++            NCSI_Respond_SLT.Payload_Length = WDSwap_SLT( NCSI_Respond_SLT.Payload_Length );
++            NCSI_Respond_SLT.Response_Code  = WDSwap_SLT( NCSI_Respond_SLT.Response_Code  );
++            NCSI_Respond_SLT.Reason_Code    = WDSwap_SLT( NCSI_Respond_SLT.Reason_Code    );
++            
++            ret = 0;
++            break;
++        } 
++        else {
++            #ifdef SLT_DOS
++            if ( PrintNCSIEn ) 
++                fprintf(fp_log, "[Skip] Not NCSI Response: %08lx\n", NCSI_RxData);
++            #endif
++                
++            retry++;
++        }
++    } while ( retry < NCSI_RX_RETRY_TIME );
++
++    return( ret );
++} // End char NCSI_Rx_SLT (void)
++
++//------------------------------------------------------------
++char NCSI_Tx (void) {
++    int	   bytesize;
++    int	   dwsize;
++    int    i;
++    int    timeout = 0;
++    ULONG  NCSI_TxDesDat;
++    
++    // Header of NC-SI command format is 34 bytes. page 58, NC-SI spec. ver 1.0.0 from DMTF
++    // The minimum size of a NC-SI package is 64 bytes.
++    bytesize = 34 + WDSwap_SLT(NCSI_Request_SLT.Payload_Length);
++    if ( bytesize < 64 ) {
++        memset (NCSI_TxByteBUF + bytesize, 0, 60 - bytesize);
++        bytesize = 64;
++    }
++    
++    // Fill up to multiple of 4
++//    dwsize = (bytesize + 3) >> 2;
++    if ( ( bytesize % 4 ) != 0 )
++        dwsize = ( bytesize >> 2 ) + 1;
++    else
++        dwsize = bytesize >> 2;
++    
++    #ifdef SLT_DOS
++    if ( PrintNCSIEn ) 
++        fprintf(fp_log ,"[Tx IID:%2d] %d bytes(%xh)\n", NCSI_Request_SLT.IID, bytesize, bytesize);
++    #endif
++    
++    // Copy data to DMA buffer
++    for (i = 0; i < dwsize; i++) {
++        WriteSOC_DD( DMA_BASE + (i << 2), NCSI_TxDWBUF[i] );
++        if ( PrintNCSIEn ) {
++            if (i == (dwsize - 1)) {
++                switch (bytesize % 4) {
++                    case 0  : NCSI_TxDWBUF[i] = NCSI_TxDWBUF[i] & 0xffffffff; break;
++                    case 3  : NCSI_TxDWBUF[i] = NCSI_TxDWBUF[i] & 0x00ffffff; break;
++                    case 2  : NCSI_TxDWBUF[i] = NCSI_TxDWBUF[i] & 0x0000ffff; break;
++                    case 1  : NCSI_TxDWBUF[i] = NCSI_TxDWBUF[i] & 0x000000ff; break;
++                }
++                #ifdef SLT_DOS
++                switch (bytesize % 4) {
++                    case 0  : fprintf(fp_log ,"[Tx%02d]%08x %08x\n",             i, NCSI_TxDWBUF[i], DWSwap_SLT( NCSI_TxDWBUF[i])       ); break;
++                    case 3  : fprintf(fp_log ,"[Tx%02d]--%06x %06x--\n",         i, NCSI_TxDWBUF[i], DWSwap_SLT( NCSI_TxDWBUF[i]) >>  8 ); break;
++                    case 2  : fprintf(fp_log ,"[Tx%02d]----%04x %04x----\n",     i, NCSI_TxDWBUF[i], DWSwap_SLT( NCSI_TxDWBUF[i]) >> 16 ); break;
++                    case 1  : fprintf(fp_log ,"[Tx%02d]------%02x %02x------\n", i, NCSI_TxDWBUF[i], DWSwap_SLT( NCSI_TxDWBUF[i]) >> 24 ); break;
++                    default : fprintf(fp_log ,"[Tx%02d]error", i); break;
++                }
++                #endif
++            } 
++            else {
++                #ifdef SLT_DOS
++                fprintf( fp_log , "[Tx%02d]%08x %08x\n", i, NCSI_TxDWBUF[i], DWSwap_SLT(NCSI_TxDWBUF[i]) );
++                #endif
++            }
++        }
++    } // End for (i = 0; i < dwsize; i++)
++    
++    // Setting one TX descriptor
++    WriteSOC_DD( H_TDES_BASE + 0x04, 0                     );
++    WriteSOC_DD( H_TDES_BASE + 0x08, 0                     );
++    WriteSOC_DD( H_TDES_BASE + 0x0C, (DMA_BASE + CPU_BUS_ADDR_SDRAM_OFFSET)  ); // 20130730
++    WriteSOC_DD( H_TDES_BASE       , 0xf0008000 + bytesize );
++    // Fire             
++    WriteSOC_DD( H_MAC_BASE  + 0x18, 0x00000000            );//Tx Poll
++
++    do {
++        NCSI_TxDesDat = ReadSOC_DD(H_TDES_BASE);
++        if ( ++timeout > TIME_OUT_NCSI ) {
++            #ifdef SLT_DOS
++            fprintf(fp_log, "[NCSI-TxDesOwn] %08lx\n", NCSI_TxDesDat);
++            #endif
++            
++            return(FindErr(Err_NCSI_Check_TxOwnTimeOut));
++        }
++    } while ( HWOwnTx(NCSI_TxDesDat) );
++    
++    return(0);
++} // End char NCSI_Tx (void)
++
++//------------------------------------------------------------
++char NCSI_ARP (void) {
++    int    i;
++    int    timeout = 0;
++    ULONG  NCSI_TxDesDat;
++    
++    if ( ARPNumCnt ) {
++        #ifdef SLT_DOS
++        if ( PrintNCSIEn ) 
++            fprintf(fp_log ,"[ARP] 60 bytes x%d\n", ARPNumCnt);
++        #endif
++        
++        for (i = 0; i < 15; i++) {
++            #ifdef SLT_DOS
++            if ( PrintNCSIEn ) 
++                fprintf(fp_log ,"[Tx%02d] %08x %08x\n", i, ARP_data[i], DWSwap_SLT(ARP_data[i]));
++            #endif
++            WriteSOC_DD( DMA_BASE + ( i << 2 ), ARP_data[i] );
++        }
++        WriteSOC_DD( H_TDES_BASE + 0x04, 0               );
++        WriteSOC_DD( H_TDES_BASE + 0x08, 0               );
++        WriteSOC_DD( H_TDES_BASE + 0x0C, (DMA_BASE + CPU_BUS_ADDR_SDRAM_OFFSET)  ); // 20130730
++        WriteSOC_DD( H_TDES_BASE       , 0xf0008000 + 60 );
++
++        for (i = 0; i < ARPNumCnt; i++) {
++            WriteSOC_DD( H_TDES_BASE      , 0xf0008000 + 60);
++
++            WriteSOC_DD( H_MAC_BASE + 0x18, 0x00000000      );//Tx Poll
++
++            timeout = 0;
++            do {
++                NCSI_TxDesDat = ReadSOC_DD(H_TDES_BASE);
++                
++                if (++timeout > TIME_OUT_NCSI) {
++                    #ifdef SLT_DOS
++                    fprintf(fp_log, "[ARP-TxDesOwn] %08lx\n", NCSI_TxDesDat);
++                    #endif
++                    
++                    return(FindErr(Err_NCSI_Check_ARPOwnTimeOut));
++                }
++            } while (HWOwnTx(NCSI_TxDesDat));
++        }
++    }
++    return(0);
++} // End char NCSI_ARP (void)
++
++//------------------------------------------------------------
++void WrRequest (unsigned char command, unsigned char id, unsigned short length) {
++
++    NCSI_Request_SLT.IID            = InstanceID;
++    NCSI_Request_SLT.Command        = command;
++    NCSI_Request_SLT.Channel_ID     = id;
++    NCSI_Request_SLT.Payload_Length = WDSwap_SLT(length);
++
++    memcpy ( NCSI_TxByteBUF               , &NCSI_Request_SLT    , 30    );
++    memcpy ((NCSI_TxByteBUF + 30         ), &NCSI_Payload_Data    , length);
++    Calculate_Checksum_NCSI(NCSI_TxByteBUF, 30 + length);
++    memcpy ((NCSI_TxByteBUF + 30 + length), &Payload_Checksum_NCSI, 4     );
++}
++
++//------------------------------------------------------------
++void NCSI_PrintCommandStr (unsigned char command, unsigned iid) {
++    switch (command & 0x80) {
++        case 0x80   : sprintf(NCSI_CommandStr, "IID:%3d [%02x][Respond]", iid, command); break;
++        default     : sprintf(NCSI_CommandStr, "IID:%3d [%02x][Request]", iid, command); break;
++    }
++    switch (command & 0x7f) {
++        case 0x00   : sprintf(NCSI_CommandStr, "%s[CLEAR_INITIAL_STATE                ]", NCSI_CommandStr); break;
++        case 0x01   : sprintf(NCSI_CommandStr, "%s[SELECT_PACKAGE                     ]", NCSI_CommandStr); break;
++        case 0x02   : sprintf(NCSI_CommandStr, "%s[DESELECT_PACKAGE                   ]", NCSI_CommandStr); break;
++        case 0x03   : sprintf(NCSI_CommandStr, "%s[ENABLE_CHANNEL                     ]", NCSI_CommandStr); break;
++        case 0x04   : sprintf(NCSI_CommandStr, "%s[DISABLE_CHANNEL                    ]", NCSI_CommandStr); break;
++        case 0x05   : sprintf(NCSI_CommandStr, "%s[RESET_CHANNEL                      ]", NCSI_CommandStr); break;
++        case 0x06   : sprintf(NCSI_CommandStr, "%s[ENABLE_CHANNEL_NETWORK_TX          ]", NCSI_CommandStr); break;
++        case 0x07   : sprintf(NCSI_CommandStr, "%s[DISABLE_CHANNEL_NETWORK_TX         ]", NCSI_CommandStr); break;
++        case 0x08   : sprintf(NCSI_CommandStr, "%s[AEN_ENABLE                         ]", NCSI_CommandStr); break;
++        case 0x09   : sprintf(NCSI_CommandStr, "%s[SET_LINK                           ]", NCSI_CommandStr); break;
++        case 0x0A   : sprintf(NCSI_CommandStr, "%s[GET_LINK_STATUS                    ]", NCSI_CommandStr); break;
++        case 0x0B   : sprintf(NCSI_CommandStr, "%s[SET_VLAN_FILTER                    ]", NCSI_CommandStr); break;
++        case 0x0C   : sprintf(NCSI_CommandStr, "%s[ENABLE_VLAN                        ]", NCSI_CommandStr); break;
++        case 0x0D   : sprintf(NCSI_CommandStr, "%s[DISABLE_VLAN                       ]", NCSI_CommandStr); break;
++        case 0x0E   : sprintf(NCSI_CommandStr, "%s[SET_MAC_ADDRESS                    ]", NCSI_CommandStr); break;
++        case 0x10   : sprintf(NCSI_CommandStr, "%s[ENABLE_BROADCAST_FILTERING         ]", NCSI_CommandStr); break;
++        case 0x11   : sprintf(NCSI_CommandStr, "%s[DISABLE_BROADCAST_FILTERING        ]", NCSI_CommandStr); break;
++        case 0x12   : sprintf(NCSI_CommandStr, "%s[ENABLE_GLOBAL_MULTICAST_FILTERING  ]", NCSI_CommandStr); break;
++        case 0x13   : sprintf(NCSI_CommandStr, "%s[DISABLE_GLOBAL_MULTICAST_FILTERING ]", NCSI_CommandStr); break;
++        case 0x14   : sprintf(NCSI_CommandStr, "%s[SET_NCSI_FLOW_CONTROL              ]", NCSI_CommandStr); break;
++        case 0x15   : sprintf(NCSI_CommandStr, "%s[GET_VERSION_ID                     ]", NCSI_CommandStr); break;
++        case 0x16   : sprintf(NCSI_CommandStr, "%s[GET_CAPABILITIES                   ]", NCSI_CommandStr); break;
++        case 0x17   : sprintf(NCSI_CommandStr, "%s[GET_PARAMETERS                     ]", NCSI_CommandStr); break;
++        case 0x18   : sprintf(NCSI_CommandStr, "%s[GET_CONTROLLER_PACKET_STATISTICS   ]", NCSI_CommandStr); break;
++        case 0x19   : sprintf(NCSI_CommandStr, "%s[GET_NCSI_STATISTICS                ]", NCSI_CommandStr); break;
++        case 0x1A   : sprintf(NCSI_CommandStr, "%s[GET_NCSI_PASS_THROUGH_STATISTICS   ]", NCSI_CommandStr); break;
++        case 0x50   : sprintf(NCSI_CommandStr, "%s[OEM_COMMAND                        ]", NCSI_CommandStr); break;
++        default     : sprintf(NCSI_CommandStr, "%s Not Support Command", NCSI_CommandStr); break ;
++    }
++} // End void NCSI_PrintCommandStr (unsigned char command, unsigned iid)
++
++//------------------------------------------------------------
++void NCSI_PrintCommandType (unsigned char command, unsigned iid) {
++    NCSI_PrintCommandStr(command, iid);
++    printf ("%s\n", NCSI_CommandStr);
++}
++
++//------------------------------------------------------------
++void NCSI_PrintCommandType2File (unsigned char command, unsigned iid) {
++    NCSI_PrintCommandStr(command, iid);
++    #ifdef SLT_DOS
++    fprintf(fp_log, "%s\n", NCSI_CommandStr);
++    #endif
++}
++
++//------------------------------------------------------------
++char NCSI_SentWaitPacket (unsigned char command, unsigned char id, unsigned short length) {
++    int     Retry = 0;
++    char    ret;
++    
++    do {
++        InstanceID++;
++        WrRequest(command, id, length);
++
++        ret = NCSI_Tx();
        if ( ret != 0 ) 
++        {
++            // printf("======> NCSI_Tx return code = %X\n", ret );                  
++            return(1);
++        }
            
++#ifdef Print_PackageName
++        NCSI_PrintCommandType(command, InstanceID);
++#endif
++
++#ifdef NCSI_EnableDelay_EachPackage
++        delay(Delay_EachPackage);
++#endif
++        if ( NCSI_Rx_SLT( command ) ) 
++            return(2);
++        
++        #ifdef SLT_DOS
++        if ( PrintNCSIEn ) 
++            fprintf(fp_log, "[Request] ETyp:%04x MC_ID:%02x HeadVer:%02x IID:%02x Comm:%02x ChlID:%02x PayLen:%04x\n", WDSwap_SLT(NCSI_Request_SLT.EtherType), 
++                                                                                                                       NCSI_Request_SLT.MC_ID, 
++                                                                                                                       NCSI_Request_SLT.Header_Revision, 
++                                                                                                                       NCSI_Request_SLT.IID, 
++                                                                                                                       NCSI_Request_SLT.Command, 
++                                                                                                                       NCSI_Request_SLT.Channel_ID, 
++                                                                                                                       WDSwap_SLT(NCSI_Request_SLT.Payload_Length) );
++        if ( PrintNCSIEn ) 
++            fprintf(fp_log, "[Respond] ETyp:%04x MC_ID:%02x HeadVer:%02x IID:%02x Comm:%02x ChlID:%02x PayLen:%04x ResCd:%02x ReaCd:%02x\n",        
++                                                                                                                       NCSI_Respond_SLT.EtherType, 
++                                                                                                                       NCSI_Respond_SLT.MC_ID, 
++                                                                                                                       NCSI_Respond_SLT.Header_Revision, 
++                                                                                                                       NCSI_Respond_SLT.IID, 
++                                                                                                                       NCSI_Respond_SLT.Command, 
++                                                                                                                       NCSI_Respond_SLT.Channel_ID,        
++                                                                                                                       NCSI_Respond_SLT.Payload_Length, 
++                                                                                                                       NCSI_Respond_SLT.Response_Code, 
++                                                                                                                       NCSI_Respond_SLT.Reason_Code);
++        #endif
++        
++        if ( (NCSI_Respond_SLT.IID           != InstanceID)       || 
++             (NCSI_Respond_SLT.Command       != (command | 0x80)) || 
++             (NCSI_Respond_SLT.Response_Code != COMMAND_COMPLETED)  ) {
++            #ifdef SLT_DOS
++            if ( PrintNCSIEn ) 
++                fprintf(fp_log, "Retry: Command = %x, Response_Code = %x\n", NCSI_Request_SLT.Command, NCSI_Respond_SLT.Response_Code);
++
++            #endif
++            Retry++;
++        } 
++        else {
++            if ( PrintNCSIEn ) 
++                NCSI_PrintCommandType2File(command, InstanceID);
++
++            return(0);
++        }
++    } while (Retry <= SENT_RETRY_COUNT);
++
++    return( 3 );
++} // End char NCSI_SentWaitPacket (unsigned char command, unsigned char id, unsigned short length)
++
++//------------------------------------------------------------
++char Clear_Initial_State_SLT (int Channel_ID) {//Command:0x00
++    return(NCSI_SentWaitPacket(CLEAR_INITIAL_STATE, (NCSI_Cap_SLT.Package_ID << 5) + Channel_ID, 0));//Internal Channel ID = 0
++}
++
++//------------------------------------------------------------
++char Select_Package_SLT (int Package_ID) {//Command:0x01
++    memset ((void *)NCSI_Payload_Data, 0, 4);
++    NCSI_Payload_Data[3] = 1; //Arbitration Disable
++
++    return(NCSI_SentWaitPacket(SELECT_PACKAGE, (Package_ID << 5) + 0x1F, 4));//Internal Channel ID = 0x1F, 0x1F means all channel
++}
++
++//------------------------------------------------------------
++void Select_Active_Package_SLT (void) {//Command:0x01
++    memset ((void *)NCSI_Payload_Data, 0, 4);
++    NCSI_Payload_Data[3] = 1; //Arbitration Disable
++
++    if (NCSI_SentWaitPacket(SELECT_PACKAGE, (NCSI_Cap_SLT.Package_ID << 5) + 0x1F, 4)) {//Internal Channel ID = 0x1F
++        FindErr_NCSI(NCSI_LinkFail_Select_Active_Package);
++    }
++}
++
++//------------------------------------------------------------
++void DeSelect_Package_SLT (int Package_ID) {//Command:0x02
++    NCSI_SentWaitPacket(DESELECT_PACKAGE, (Package_ID << 5) + 0x1F, 0);//Internal Channel ID = 0x1F, 0x1F means all channel
++
++#ifdef NCSI_EnableDelay_DeSelectPackage
++    delay(Delay_DeSelectPackage);
++#endif
++}
++
++//------------------------------------------------------------
++void Enable_Channel_SLT (void) {//Command:0x03
++    if ( NCSI_SentWaitPacket(ENABLE_CHANNEL, (NCSI_Cap_SLT.Package_ID << 5) + NCSI_Cap_SLT.Channel_ID, 0) ) {
++        FindErr_NCSI(NCSI_LinkFail_Enable_Channel);
++    }
++}
++
++//------------------------------------------------------------
++void Disable_Channel_SLT (void) {//Command:0x04
++    memset ((void *)NCSI_Payload_Data, 0, 4);
++    NCSI_Payload_Data[3] = 0x1; //ALD
++
++    if (NCSI_SentWaitPacket(DISABLE_CHANNEL, (NCSI_Cap_SLT.Package_ID << 5) + NCSI_Cap_SLT.Channel_ID, 4)) {
++        FindErr_NCSI(NCSI_LinkFail_Disable_Channel);
++    }
++}
++void Enable_Network_TX_SLT (void) {//Command:0x06
++    if ( NCSI_SentWaitPacket(ENABLE_CHANNEL_NETWORK_TX, (NCSI_Cap_SLT.Package_ID << 5) + NCSI_Cap_SLT.Channel_ID, 0) ) {
++        FindErr_NCSI(NCSI_LinkFail_Enable_Network_TX);
++    }
++}
++
++//------------------------------------------------------------
++void Disable_Network_TX_SLT (void) {//Command:0x07
++    if ( NCSI_SentWaitPacket(DISABLE_CHANNEL_NETWORK_TX, (NCSI_Cap_SLT.Package_ID << 5) + NCSI_Cap_SLT.Channel_ID, 0) ) {
++        FindErr_NCSI(NCSI_LinkFail_Disable_Network_TX);
++    }
++}
++
++//------------------------------------------------------------
++void Set_Link_SLT (void) {//Command:0x09
++    memset ((void *)NCSI_Payload_Data, 0, 8);
++    NCSI_Payload_Data[2] = 0x02; //full duplex
++//  NCSI_Payload_Data[3] = 0x04; //100M, auto-disable
++    NCSI_Payload_Data[3] = 0x05; //100M, auto-enable
++
++    NCSI_SentWaitPacket(SET_LINK, (NCSI_Cap_SLT.Package_ID << 5) + NCSI_Cap_SLT.Channel_ID, 8);
++}
++
++//------------------------------------------------------------
++char Get_Link_Status_SLT (void) {//Command:0x0a
++    
++    if (NCSI_SentWaitPacket(GET_LINK_STATUS, (NCSI_Cap_SLT.Package_ID << 5) + NCSI_Cap_SLT.Channel_ID, 0)) {
++        return(0);
++    } 
++    else {
++        if (NCSI_Respond_SLT.Payload_Data[3] & 0x20) {
++            if (NCSI_Respond_SLT.Payload_Data[3] & 0x40) {
++                if (NCSI_Respond_SLT.Payload_Data[3] & 0x01) 
++                    return(1); //Link Up or Not
++                else                                     
++                    return(0);
++            } else
++                return(0); //Auto Negotiate did not finish
++        } else {
++            if (NCSI_Respond_SLT.Payload_Data[3] & 0x01) 
++                return(1); //Link Up or Not
++            else                                     
++                return(0);
++        }
++    }
++} // End char Get_Link_Status_SLT (void)
++
++//------------------------------------------------------------
++void Enable_Set_MAC_Address_SLT (void) {//Command:0x0e
++    int i;
++    
++    for ( i = 0; i < 6; i++ ) {
++        NCSI_Payload_Data[i] = NCSI_Request_SLT.SA[i];
++    }
++    NCSI_Payload_Data[6] = 1; //MAC Address Num = 1 --> address filter 1, fixed in sample code
++    NCSI_Payload_Data[7] = UNICAST + 0 + ENABLE_MAC_ADDRESS_FILTER; //AT + Reserved + E
++
++    if ( NCSI_SentWaitPacket(SET_MAC_ADDRESS, (NCSI_Cap_SLT.Package_ID << 5) + NCSI_Cap_SLT.Channel_ID, 8) ) {
++        FindErr_NCSI(NCSI_LinkFail_Enable_Set_MAC_Address);
++    }
++}
++
++//------------------------------------------------------------
++void Enable_Broadcast_Filter_SLT (void) {//Command:0x10
++    memset ((void *)NCSI_Payload_Data, 0, 4);
++    NCSI_Payload_Data[3] = 0xF; //ARP, DHCP, NetBIOS
++
++    if (NCSI_SentWaitPacket(ENABLE_BROADCAST_FILTERING, (NCSI_Cap_SLT.Package_ID << 5) + NCSI_Cap_SLT.Channel_ID, 4) ) {
++        FindErr_NCSI(NCSI_LinkFail_Enable_Broadcast_Filter);
++    }
++}
++
++//------------------------------------------------------------
++void Get_Version_ID_SLT (void) {//Command:0x15
++    
++    if (NCSI_SentWaitPacket(GET_VERSION_ID, (NCSI_Cap_SLT.Package_ID << 5) + NCSI_Cap_SLT.Channel_ID, 0) ) {
++        FindErr_NCSI(NCSI_LinkFail_Get_Version_ID);
++    } 
++    else {
++#ifdef Print_Version_ID
++        printf ("NCSI Version        : %02x %02x %02x %02x\n", NCSI_Respond_SLT.Payload_Data[ 0], NCSI_Respond_SLT.Payload_Data[ 1], NCSI_Respond_SLT.Payload_Data[ 2], NCSI_Respond_SLT.Payload_Data[ 3]);
++        printf ("NCSI Version        : %02x %02x %02x %02x\n", NCSI_Respond_SLT.Payload_Data[ 4], NCSI_Respond_SLT.Payload_Data[ 5], NCSI_Respond_SLT.Payload_Data[ 6], NCSI_Respond_SLT.Payload_Data[ 7]);
++        printf ("Firmware Name String: %02x %02x %02x %02x\n", NCSI_Respond_SLT.Payload_Data[ 8], NCSI_Respond_SLT.Payload_Data[ 9], NCSI_Respond_SLT.Payload_Data[10], NCSI_Respond_SLT.Payload_Data[11]);
++        printf ("Firmware Name String: %02x %02x %02x %02x\n", NCSI_Respond_SLT.Payload_Data[12], NCSI_Respond_SLT.Payload_Data[13], NCSI_Respond_SLT.Payload_Data[14], NCSI_Respond_SLT.Payload_Data[15]);
++        printf ("Firmware Name String: %02x %02x %02x %02x\n", NCSI_Respond_SLT.Payload_Data[16], NCSI_Respond_SLT.Payload_Data[17], NCSI_Respond_SLT.Payload_Data[18], NCSI_Respond_SLT.Payload_Data[19]);
++        printf ("Firmware Version    : %02x %02x %02x %02x\n", NCSI_Respond_SLT.Payload_Data[20], NCSI_Respond_SLT.Payload_Data[21], NCSI_Respond_SLT.Payload_Data[22], NCSI_Respond_SLT.Payload_Data[23]);
++        printf ("PCI DID/VID         : %02x %02x/%02x %02x\n", NCSI_Respond_SLT.Payload_Data[24], NCSI_Respond_SLT.Payload_Data[25], NCSI_Respond_SLT.Payload_Data[26], NCSI_Respond_SLT.Payload_Data[27]);
++        printf ("PCI SSID/SVID       : %02x %02x/%02x %02x\n", NCSI_Respond_SLT.Payload_Data[28], NCSI_Respond_SLT.Payload_Data[29], NCSI_Respond_SLT.Payload_Data[30], NCSI_Respond_SLT.Payload_Data[31]);
++        printf ("Manufacturer ID     : %02x %02x %02x %02x\n", NCSI_Respond_SLT.Payload_Data[32], NCSI_Respond_SLT.Payload_Data[33], NCSI_Respond_SLT.Payload_Data[34], NCSI_Respond_SLT.Payload_Data[35]);
++        printf ("Checksum            : %02x %02x %02x %02x\n", NCSI_Respond_SLT.Payload_Data[36], NCSI_Respond_SLT.Payload_Data[37], NCSI_Respond_SLT.Payload_Data[38], NCSI_Respond_SLT.Payload_Data[39]);
++#endif
++        NCSI_Cap_SLT.PCI_DID_VID    = (NCSI_Respond_SLT.Payload_Data[24]<<24)
++                                | (NCSI_Respond_SLT.Payload_Data[25]<<16)
++                                | (NCSI_Respond_SLT.Payload_Data[26]<< 8)
++                                | (NCSI_Respond_SLT.Payload_Data[27]    );
++        NCSI_Cap_SLT.ManufacturerID = (NCSI_Respond_SLT.Payload_Data[32]<<24)
++                                | (NCSI_Respond_SLT.Payload_Data[33]<<16)
++                                | (NCSI_Respond_SLT.Payload_Data[34]<< 8)
++                                | (NCSI_Respond_SLT.Payload_Data[35]    );
++    }
++} // End void Get_Version_ID_SLT (void)
++
++//------------------------------------------------------------
++void Get_Capabilities_SLT (void) {//Command:0x16
++    
++    if (NCSI_SentWaitPacket(GET_CAPABILITIES, (NCSI_Cap_SLT.Package_ID << 5) + NCSI_Cap_SLT.Channel_ID, 0)) {
++        FindErr_NCSI(NCSI_LinkFail_Get_Capabilities);
++    } 
++    else {
++        NCSI_Cap_SLT.Capabilities_Flags                   = NCSI_Respond_SLT.Payload_Data[0];
++        NCSI_Cap_SLT.Broadcast_Packet_Filter_Capabilities = NCSI_Respond_SLT.Payload_Data[1];
++        NCSI_Cap_SLT.Multicast_Packet_Filter_Capabilities = NCSI_Respond_SLT.Payload_Data[2];
++        NCSI_Cap_SLT.Buffering_Capabilities               = NCSI_Respond_SLT.Payload_Data[3];
++        NCSI_Cap_SLT.AEN_Control_Support                  = NCSI_Respond_SLT.Payload_Data[4];
++    }
++}
++
++//------------------------------------------------------------
++void Get_Controller_Packet_Statistics (void) {//Command:0x18
++
++    NCSI_SentWaitPacket(GET_CONTROLLER_PACKET_STATISTICS, (NCSI_Cap_SLT.Package_ID << 5) + NCSI_Cap_SLT.Channel_ID, 0);
++}
++
++//------------------------------------------------------------
++char phy_ncsi (void) {
++    ULONG   Channel_Found = 0;
++    ULONG   Package_Found = 0;
++    ULONG   Re_Send;
++    ULONG   Err_Flag_bak;
++    ULONG   pkg_idx;
++    ULONG   chl_idx;
++    ULONG   Link_Status;
++    ULONG   NCSI_LinkFail_Val_bak;
++
++    number_chl    = 0;
++    number_pak    = 0;
++    
++    NCSI_LinkFail_Val = 0;
++
    #ifdef SLT_DOS
++		fprintf(fp_log, "\n\n======> Start:\n" );
++    #endif

++    NCSI_Struct_Initialize_SLT();
++
++    #ifdef NCSI_Skip_Phase1_DeSelectPackage
++    #else
++    
++    //NCSI Start
++    //Disable Channel then DeSelect Package
++    for (pkg_idx = 0; pkg_idx < MAX_PACKAGE_NUM; pkg_idx++) {
++        // Ignore error flag in the NCSI command
++        Err_Flag_bak          = Err_Flag;
++        NCSI_LinkFail_Val_bak = NCSI_LinkFail_Val;
++        select_flag[pkg_idx]  = Select_Package_SLT (pkg_idx); // Command:0x01
++        Err_Flag              = Err_Flag_bak;
++        NCSI_LinkFail_Val     = NCSI_LinkFail_Val_bak;
++        
++        if ( select_flag[pkg_idx] == 0 ) {
++            NCSI_Cap_SLT.Package_ID = pkg_idx;
++
++            for ( chl_idx = 0; chl_idx < MAX_CHANNEL_NUM; chl_idx++ ) {
++                NCSI_Cap_SLT.Channel_ID = chl_idx;
++                // Ignore error flag in the NCSI command
++                Err_Flag_bak          = Err_Flag;
++                NCSI_LinkFail_Val_bak = NCSI_LinkFail_Val;
++                Disable_Channel_SLT();    // Command: 0x04
++                Err_Flag              = Err_Flag_bak;
++                NCSI_LinkFail_Val     = NCSI_LinkFail_Val_bak;
++            }
++            #ifdef NCSI_Skip_DeSelectPackage
++            #else
++            DeSelect_Package_SLT (pkg_idx); // Command:0x02
++            #endif
++        } // End if ( select_flag[pkg_idx] == 0 )
++    } // End for (pkg_idx = 0; pkg_idx < MAX_PACKAGE_NUM; pkg_idx++)
++    #endif
++
++    //Select Package
++    for (pkg_idx = 0; pkg_idx < MAX_PACKAGE_NUM; pkg_idx++) {
++        #ifdef NCSI_Skip_Phase1_DeSelectPackage
++        // Ignore error flag in the NCSI command
++        Err_Flag_bak          = Err_Flag;
++        NCSI_LinkFail_Val_bak = NCSI_LinkFail_Val;
++        select_flag[pkg_idx]  = Select_Package_SLT (pkg_idx);//Command:0x01
++        Err_Flag              = Err_Flag_bak;
++        NCSI_LinkFail_Val     = NCSI_LinkFail_Val_bak;
++        #endif
++
++        if (select_flag[pkg_idx] == 0) {
++            //NCSI_RxTimeOutScale = 1000;
++            NCSI_RxTimeOutScale = 10;
++            number_pak++;
++            Package_Found       = 1;
++            NCSI_Cap_SLT.Package_ID = pkg_idx;
++
++            if ( !(IOTiming||IOTimingBund) ) 
++                printf ("====Find Package ID: %d\n", NCSI_Cap_SLT.Package_ID);
++            #ifdef SLT_DOS
++            fprintf(fp_log, "====Find Package ID: %d\n", NCSI_Cap_SLT.Package_ID);
++            #endif
++            
++            #ifdef NCSI_Skip_Phase1_DeSelectPackage
++            #else
++            Select_Package_SLT (pkg_idx);//Command:0x01
++            #endif
++            
++            // Scan all channel in the package
++            for ( chl_idx = 0; chl_idx < MAX_CHANNEL_NUM; chl_idx++ ) {
++                // backup error flag
++                Err_Flag_bak          = Err_Flag;
++                NCSI_LinkFail_Val_bak = NCSI_LinkFail_Val;
++                if (Clear_Initial_State_SLT(chl_idx) == 0) { //Command:0x00
++                    number_chl++;
++                    Channel_Found       = 1;
++                    NCSI_Cap_SLT.Channel_ID = chl_idx;
++
++                    if ( !(IOTiming || IOTimingBund) ) 
++                        printf ("--------Find Channel ID: %d\n", NCSI_Cap_SLT.Channel_ID);
++                        
++                    #ifdef SLT_DOS
++                    fprintf(fp_log, "--------Find Channel ID: %d\n", NCSI_Cap_SLT.Channel_ID);
++                    #endif
++                    // Get Version and Capabilities
++                    Get_Version_ID_SLT();          //Command:0x15
++                    Get_Capabilities_SLT();        //Command:0x16
++                    Select_Active_Package_SLT();   //Command:0x01
++                    Enable_Set_MAC_Address_SLT();  //Command:0x0e
++                    Enable_Broadcast_Filter_SLT(); //Command:0x10
++
++                    // Enable TX
++                    Enable_Network_TX_SLT();       //Command:0x06
++
++                    // Enable Channel
++                    Enable_Channel_SLT();          //Command:0x03
++                    
++                    // Get Link Status
++                    Re_Send = 0;
++                    do {
++                        #ifdef NCSI_EnableDelay_GetLinkStatus
++                        if ( Re_Send >= 2 ) 
++                            delay(Delay_GetLinkStatus);
++                        #endif
++                        
++                        Link_Status = Get_Link_Status_SLT();//Command:0x0a
++                        
++                        if ( Link_Status == LINK_UP ) {
++                            if (!(IOTiming||IOTimingBund)) 
++                                printf ("        This Channel is LINK_UP\n");
++                            
++                            #ifdef SLT_DOS
++                            fprintf(fp_log, "        This Channel is LINK_UP\n");
++                            #endif
++                            
++                            NCSI_ARP ();
++                            
++                            break;
++                        } 
++                        else if ( Link_Status == LINK_DOWN ) {
++                            if ( Re_Send >= 2 ) {   
++                                if ( !(IOTiming || IOTimingBund) ) 
++                                    printf ("        This Channel is LINK_DOWN\n");
++	                    	    
++                                #ifdef SLT_DOS
++                                fprintf(fp_log, "        This Channel is LINK_DOWN\n");
++                                #endif
++                                
++	                    	    break;
++	                    	}
++                        } // End if ( Link_Status == LINK_UP )
++                    } while ( Re_Send++ <= 2 );
++
++                    #ifdef NCSI_Skip_DiSChannel
++                    #else
++                    if ( NCSI_DiSChannel ) {
++                        // Disable TX
++                        Disable_Network_TX_SLT(); //Command:0x07
++                        // Disable Channel
++                        Disable_Channel_SLT();    //Command:0x04
++                    }
++                    #endif
++                } 
++                else {
++                    Err_Flag          = Err_Flag_bak;
++                    NCSI_LinkFail_Val = NCSI_LinkFail_Val_bak;
++                }
++            } // End for ( chl_idx = 0; chl_idx < MAX_CHANNEL_NUM; chl_idx++ )
++            
++            #ifdef NCSI_Skip_DeSelectPackage
++            #else
++            DeSelect_Package_SLT (pkg_idx);//Command:0x02
++            #endif
++            NCSI_RxTimeOutScale = 1;
++        } 
++        else {
++            if (!(IOTiming||IOTimingBund)) {
++                printf ("====Absence of Package ID: %ld\n", pkg_idx);
++                #ifdef SLT_DOS
++                fprintf(fp_log, "====Absence of Package ID: %ld\n", pkg_idx);
++                #endif
++            }
++        } // End if (select_flag[pkg_idx] == 0)
++    } // End for (pkg_idx = 0; pkg_idx < MAX_PACKAGE_NUM; pkg_idx++)
++
++    if ( !Package_Found              ) FindErr( Err_NCSI_No_PHY      );
++    if ( ChannelTolNum != number_chl ) FindErr( Err_NCSI_Channel_Num );
++    if ( PackageTolNum != number_pak ) FindErr( Err_NCSI_Package_Num );
++//  if ( !Channel_Found) FindErr();
++
++    if ( Err_Flag ) 
++        return(1);
++    else          
++        return(0);
++}
++
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/PCI_SPI.c b/arch/arm/cpu/arm926ejs/aspeed/PCI_SPI.c
+new file mode 100644
+index 0000000..77aac47
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/PCI_SPI.c
+@@ -0,0 +1,83 @@
++/*

++ *  This program is distributed in the hope that it will be useful,

++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

++ *  GNU General Public License for more details.

++ *

++ *  You should have received a copy of the GNU General Public License

++ *  along with this program; if not, write to the Free Software

++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

++ */

++#define PCI_SPI_C

++static const char ThisFile[] = "PCI_SPI.c";

++

++#include "SWFUNC.H"

++

++#ifdef SLT_UBOOT

++  #include <common.h>

++  #include <command.h>

++#endif

++#ifdef SLT_DOS

++  #include <stdio.h>

++  #include <stdlib.h>

++  #include <conio.h>

++  #include <string.h>

++  #include <dos.h>

++#endif

++

++#include "DEF_SPI.H"

++#include "LIB.H"

++#include "TYPEDEF.H"

++

++#ifdef SPI_BUS

++ULONG  GetPCIInfo (DEVICE_PCI_INFO  *VGAPCIInfo)

++{

++    ULONG ulPCIBaseAddress, MMIOBaseAddress, LinearAddressBase, busnum, data;

++

++    ulPCIBaseAddress = FindPCIDevice (0x1A03, 0x2000, ACTIVE);

++    busnum = 0;

++    while (ulPCIBaseAddress == 0 && busnum < 256) {

++        ulPCIBaseAddress = FindPCIDevice (0x1A03, 0x2000, busnum);

++        if (ulPCIBaseAddress == 0) {

++            ulPCIBaseAddress = FindPCIDevice (0x1688, 0x2000, busnum);

++        }

++        if (ulPCIBaseAddress == 0) {

++            ulPCIBaseAddress = FindPCIDevice (0x1A03, 0x1160, busnum);

++        }

++        if (ulPCIBaseAddress == 0) {

++            ulPCIBaseAddress = FindPCIDevice (0x1A03, 0x1180, busnum);

++        }

++        busnum++;

++    }

++    printf ("ulPCIBaseAddress = %lx\n", ulPCIBaseAddress);

++    if (ulPCIBaseAddress != 0) {

++        VGAPCIInfo->ulPCIConfigurationBaseAddress = ulPCIBaseAddress;

++        VGAPCIInfo->usVendorID = ReadPCIReg(ulPCIBaseAddress, 0, 0xFFFF);

++        VGAPCIInfo->usDeviceID = ReadPCIReg(ulPCIBaseAddress, 0, 0xFFFF0000) >> 16;

++        LinearAddressBase = ReadPCIReg (ulPCIBaseAddress, 0x10, 0xFFFFFFF0);

++        VGAPCIInfo->ulPhysicalBaseAddress = MapPhysicalToLinear (LinearAddressBase, 64 * 1024 * 1024 + 0x200000);

++        MMIOBaseAddress = ReadPCIReg (ulPCIBaseAddress, 0x14, 0xFFFF0000);

++        VGAPCIInfo->ulMMIOBaseAddress = MapPhysicalToLinear (MMIOBaseAddress, 64 * 1024 * 1024);

++        VGAPCIInfo->usRelocateIO = ReadPCIReg (ulPCIBaseAddress, 0x18, 0x0000FF80);

++        OUTDWPORT(0xcf8, ulPCIBaseAddress + 0x4);

++        data = INDWPORT(0xcfc);

++        OUTDWPORT(0xcfc, data | 0x3);

++        return    TRUE;

++    }

++    else {

++        return    FALSE;

++    }

++} // End ULONG  GetPCIInfo (DEVICE_PCI_INFO  *VGAPCIInfo)

++

++BOOLEAN  GetDevicePCIInfo (VIDEO_ENGINE_INFO *VideoEngineInfo)

++{

++    if (GetPCIInfo (&VideoEngineInfo->VGAPCIInfo) == TRUE) {

++        return    TRUE;

++    }

++    else {

++        printf("Can not find PCI device!\n");

++        exit(0);

++        return    FALSE;

++    }

++} // End

++#endif // End ifdef SPI_BUS

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/PHY.H b/arch/arm/cpu/arm926ejs/aspeed/PHY.H
+new file mode 100644
+index 0000000..81d9470
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/PHY.H
+@@ -0,0 +1,56 @@
++/*

++ *  This program is distributed in the hope that it will be useful,

++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

++ *  GNU General Public License for more details.

++ *

++ *  You should have received a copy of the GNU General Public License

++ *  along with this program; if not, write to the Free Software

++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

++ */

++#ifndef PHY_H

++#define PHY_H

++

++//

++// Define

++//

++#define Enable_SearchPHYID             //[ON] (Search vlid PHY ID)

++#define Enable_CheckZeroPHYID          //[ON] (Check PHY ID with value 0)

++

++#ifdef Enable_CheckZeroPHYID

++  #define PHY_IS_VALID( dat )      ( ( (dat & 0xffff) != 0xffff ) && ( ( dat & 0xffff ) != 0x0 ) )

++#else

++  #define PHY_IS_VALID( dat )      ( ( dat & 0xffff) != 0xffff )

++#endif

++

++// Define PHY basic register

++#define PHY_REG_BMCR    0x00 // Basic Mode Control Register

++#define PHY_REG_BMSR    0x01 // Basic Mode Status Register

++#define PHY_REG_ID_1    0x02

++#define PHY_REG_ID_2    0x03

++#define PHY_ANER        0x06 // Auto-negotiation Expansion Register

++#define PHY_GBCR        0x09 // 1000Base-T Control Register

++#define PHY_SR          0x11 // PHY Specific Status Register

++#define PHY_INER        0x12 // Interrupt Enable Register

++

++#define TIME_OUT_PHY_RW           10000

++#define TIME_OUT_PHY_Rst          10000

++

++#define PHYID3_Mask                0xfc00         //0xffc0

++

++/* --- Note for SettingPHY chip ---

++void phy_xxxx (int loop_phy) {

++

++	if ( BurstEnable ) {

++        // IEEE test

++	} 

++	else if (loop_phy) {

++        // Internal loop back

++	} 

++	else {

++        // external loop back

++	}

++}

++----------------------------------- */

++

++#endif // PHY_H

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/PHY.c b/arch/arm/cpu/arm926ejs/aspeed/PHY.c
+new file mode 100644
+index 0000000..6afed9d
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/PHY.c
+@@ -0,0 +1,1541 @@
++/*

++ *  This program is distributed in the hope that it will be useful,

++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

++ *  GNU General Public License for more details.

++ *

++ *  You should have received a copy of the GNU General Public License

++ *  along with this program; if not, write to the Free Software

++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

++ */

++#define PHY_C

++static const char ThisFile[] = "PHY.c";

++

++#include "SWFUNC.H"

++

++#ifdef SLT_UBOOT

++  #include <common.h>

++  #include <command.h>

++  #include <COMMINF.H>

++  #include "STDUBOOT.H"

++#endif

++#ifdef SLT_DOS

++  #include <stdio.h>

++  #include <stdlib.h>

++  #include <conio.h>

++  #include <string.h>

++  #include "COMMINF.H"

++#endif

++  

++#include "PHY.H"                    

++#include "TYPEDEF.H"

++#include "IO.H"

++

++ULONG	PHY_09h;

++ULONG	PHY_18h;

++ULONG	PHY_1fh;

++ULONG	PHY_06hA[7];

++ULONG	PHY_11h;

++ULONG	PHY_12h;

++ULONG	PHY_15h;

++ULONG	PHY_06h;

++char	PHYID[256];

++ULONG	PHY_00h;

++

++//------------------------------------------------------------

++// PHY R/W basic

++//------------------------------------------------------------

++void phy_write (int adr, ULONG data) {

++    int timeout = 0;

++    

++	if (AST2300_NewMDIO) {

++		WriteSOC_DD( MAC_PHYBASE + 0x60, ( data << 16 ) | MAC_PHYWr_New | (PHY_ADR<<5) | (adr & 0x1f));

++

++		while ( ReadSOC_DD( MAC_PHYBASE + 0x60 ) & MAC_PHYBusy_New ) {

++			if ( ++timeout > TIME_OUT_PHY_RW ) {

++				if (!BurstEnable) 

++#ifdef SLT_DOS

++                    fprintf(fp_log, "[PHY-Write] Time out: %08lx\n", ReadSOC_DD( MAC_PHYBASE + 0x60 ) );

++#endif

++                    FindErr( Err_PHY_TimeOut );

++				break;

++			}

++		}

++	} 

++	else {

++		WriteSOC_DD( MAC_PHYBASE + 0x64, data );

++

++		WriteSOC_DD( MAC_PHYBASE + 0x60, MDC_Thres | MAC_PHYWr | (PHY_ADR<<16) | ((adr & 0x1f) << 21));

++

++		while ( ReadSOC_DD( MAC_PHYBASE + 0x60 ) & MAC_PHYWr ) {

++			if ( ++timeout > TIME_OUT_PHY_RW ) {

++#ifdef SLT_DOS

++                if (!BurstEnable) 

++				    fprintf(fp_log, "[PHY-Write] Time out: %08lx\n", ReadSOC_DD( MAC_PHYBASE + 0x60 ) );

++#endif

++                FindErr( Err_PHY_TimeOut );

++				break;

++			}

++		}

++	} // End if (AST2300_NewMDIO)

++

++	if ( DbgPrn_PHYRW ) 

++	    printf ("[Wr ]%02d: %04lx\n", adr, data);

++} // End void phy_write (int adr, ULONG data)

++

++//------------------------------------------------------------

++ULONG phy_read (int adr) {

++    int timeout = 0;

++    

++	if ( AST2300_NewMDIO ) {

++		WriteSOC_DD( MAC_PHYBASE + 0x60, MAC_PHYRd_New | (PHY_ADR << 5) | ( adr & 0x1f ) );

++

++		while ( ReadSOC_DD( MAC_PHYBASE + 0x60 ) & MAC_PHYBusy_New ) {

++			if ( ++timeout > TIME_OUT_PHY_RW ) {

++				if ( !BurstEnable ) 

++#ifdef SLT_DOS

++                    fprintf(fp_log, "[PHY-Read] Time out: %08lx\n", ReadSOC_DD( MAC_PHYBASE + 0x60 ));

++#endif

++                    FindErr( Err_PHY_TimeOut );

++				break;

++			}

++		}

++

++		DELAY(Delay_PHYRd);

++		Dat_ULONG = ReadSOC_DD( MAC_PHYBASE + 0x64 ) & 0xffff;

++	} 

++	else {

++		WriteSOC_DD( MAC_PHYBASE + 0x60, MDC_Thres | MAC_PHYRd | (PHY_ADR << 16) | ((adr & 0x1f) << 21) );

++

++		while ( ReadSOC_DD( MAC_PHYBASE + 0x60 ) & MAC_PHYRd ) {

++			if ( ++timeout > TIME_OUT_PHY_RW ) {

++#ifdef SLT_DOS

++                if ( !BurstEnable ) 

++				    fprintf( fp_log, "[PHY-Read] Time out: %08lx\n", ReadSOC_DD( MAC_PHYBASE + 0x60 ) );

++#endif

++                FindErr( Err_PHY_TimeOut );

++				break;

++			}

++		}

++

++		DELAY( Delay_PHYRd );

++		Dat_ULONG = ReadSOC_DD( MAC_PHYBASE + 0x64 ) >> 16;

++	}

++

++	if ( DbgPrn_PHYRW ) 

++	    printf ("[Rd ]%02d: %04lx\n", adr, Dat_ULONG );

++	    

++	return( Dat_ULONG );

++} // End ULONG phy_read (int adr)

++

++//------------------------------------------------------------

++void phy_Read_Write (int adr, ULONG clr_mask, ULONG set_mask) {

++	if ( DbgPrn_PHYRW ) 

++	    printf ("[RW ]%02d: clr:%04lx: set:%04lx\n", adr, clr_mask, set_mask);

++	phy_write(adr, ((phy_read(adr) & (~clr_mask)) | set_mask));

++}

++

++//------------------------------------------------------------

++void phy_out ( int adr ) {

++	printf ("%02d: %04lx\n", adr, phy_read(adr));

++}

++

++//------------------------------------------------------------

++//void phy_outchg ( int adr ) {

++//    ULONG	PHY_valold = 0;

++//    ULONG	PHY_val;

++//

++//	while (1) {

++//		PHY_val = phy_read(adr);

++//		if (PHY_valold != PHY_val) {

++//			printf ("%02d: %04lx\n", adr, PHY_val);

++//			PHY_valold = PHY_val;

++//		}

++//	}

++//}

++

++//------------------------------------------------------------

++void phy_dump (char *name) {

++	int	index;

++

++	printf ("[%s][%d]----------------\n", name, PHY_ADR);

++	for (index = 0; index < 32; index++) {

++		printf ("%02d: %04lx ", index, phy_read(index));

++		

++		if ((index % 8) == 7) 

++		    printf ("\n");

++	}

++}

++

++//------------------------------------------------------------

++void phy_id (BYTE option) {

++    

++    ULONG	reg_adr;

++    CHAR    PHY_ADR_org;

++    FILE_VAR

++    

++    GET_OBJ( option )

++

++    PHY_ADR_org = PHY_ADR;

++	for (PHY_ADR = 0; PHY_ADR < 32; PHY_ADR++) {

++

++		PRINT(OUT_OBJ "[%02d] ", PHY_ADR);

++

++        for (reg_adr = 2; reg_adr <= 3; reg_adr++)

++			PRINT(OUT_OBJ "%ld:%04lx ", reg_adr, phy_read(reg_adr));

++

++		if ((PHY_ADR % 4) == 3) 

++		    PRINT(OUT_OBJ "\n");

++	}

++	PHY_ADR = PHY_ADR_org;

++}

++

++

++//------------------------------------------------------------

++void phy_delay (int dt) {

++    DELAY( dt );

++}

++

++//------------------------------------------------------------

++// PHY IC

++//------------------------------------------------------------

++void phy_basic_setting (int loop_phy) {

++	phy_Read_Write(0,  0x7140, PHY_00h); //clr set

++	if ( DbgPrn_PHYRW ) 

++	    printf ("[Set]00: %04lx\n", phy_read( PHY_REG_BMCR ));

++}

++

++//------------------------------------------------------------

++void phy_Wait_Reset_Done (void) {

++	int timeout = 0;

++	

++	while (  phy_read( PHY_REG_BMCR ) & 0x8000 ) {

++		if (DbgPrn_PHYRW) 

++		    printf ("00: %04lx\n", phy_read( PHY_REG_BMCR ));

++		    

++		if (++timeout > TIME_OUT_PHY_Rst) {

++#ifdef SLT_DOS

++            if (!BurstEnable) fprintf(fp_log, "[PHY-Reset] Time out: %08lx\n", ReadSOC_DD(MAC_PHYBASE+0x60));

++#endif

++            FindErr(Err_PHY_TimeOut);

++			break;

++		}

++	}//wait Rst Done

++

++	if (DbgPrn_PHYRW) printf ("[Clr]00: %04lx\n", phy_read( PHY_REG_BMCR ));

++	DELAY(Delay_PHYRst);

++}

++

++//------------------------------------------------------------

++void phy_Reset (int loop_phy) {

++	phy_basic_setting(loop_phy);

++

++	phy_Read_Write(0,  0x0000, 0x8000 | PHY_00h);//clr set//Rst PHY

++	phy_Wait_Reset_Done();

++

++	phy_basic_setting(loop_phy);

++	DELAY(Delay_PHYRst);

++}

++

++//------------------------------------------------------------

++void recov_phy_marvell (int loop_phy) {//88E1111

++	if ( BurstEnable ) {

++	} 

++	else if ( loop_phy ) {

++	} 

++	else {

++		if (GSpeed_sel[0]) {

++			phy_write(9, PHY_09h);

++

++			phy_Reset(loop_phy);

++

++			phy_write(29, 0x0007);

++			phy_Read_Write(30, 0x0008, 0x0000);//clr set

++			phy_write(29, 0x0010);

++			phy_Read_Write(30, 0x0002, 0x0000);//clr set

++			phy_write(29, 0x0012);

++			phy_Read_Write(30, 0x0001, 0x0000);//clr set

++

++			phy_write(18, PHY_12h);

++		}

++	}

++}

++

++//------------------------------------------------------------

++void phy_marvell (int loop_phy) {//88E1111

++    int	Retry;

++

++	if ( DbgPrn_PHYName ) 

++	    printf ("--->(%04lx %04lx)[Marvell] %s\n", PHY_ID2, PHY_ID3, PHYName);

++

++	if ( BurstEnable ) {

++		phy_Reset(loop_phy);

++	} 

++	else if ( loop_phy ) {

++		phy_Reset(loop_phy);

++	} 

++	else {

++		if ( GSpeed_sel[0] ) {

++			PHY_09h = phy_read( PHY_GBCR );

++			PHY_12h = phy_read( PHY_INER );

++			phy_write ( 18, 0x0000         );

++			phy_Read_Write(  9, 0x0000, 0x1800 );//clr set

++		}                              

++                                       

++		phy_Reset(loop_phy);           

++                                       

++		if (GSpeed_sel[0]) {           

++			phy_write ( 29, 0x0007         );

++			phy_Read_Write( 30, 0x0000, 0x0008 );//clr set

++			phy_write ( 29, 0x0010         );

++			phy_Read_Write( 30, 0x0000, 0x0002 );//clr set

++			phy_write ( 29, 0x0012         );

++			phy_Read_Write( 30, 0x0000, 0x0001 );//clr set

++		}

++	}

++

++	Retry = 0;

++	do {

++		PHY_11h = phy_read( PHY_SR );

++	} while ( !( ( PHY_11h & 0x0400 ) | loop_phy | ( Retry++ > 20 ) ) );

++}

++

++//------------------------------------------------------------

++void recov_phy_marvell0 (int loop_phy) {//88E1310

++	if (BurstEnable) {

++	} else if (loop_phy) {

++	} else {

++		if (GSpeed_sel[0]) {

++			phy_write(22, 0x0006);

++			phy_Read_Write(16, 0x0020, 0x0000);//clr set

++			phy_write(22, 0x0000);

++		}

++	}

++}

++

++//------------------------------------------------------------

++void phy_marvell0 (int loop_phy) {//88E1310

++    int	Retry;

++    

++	if (DbgPrn_PHYName) 

++	    printf ("--->(%04lx %04lx)[Marvell] %s\n", PHY_ID2, PHY_ID3, PHYName);

++

++	phy_write( 22, 0x0002 );

++

++    PHY_15h = phy_read(21);

++	if (PHY_15h & 0x0030) {

++		printf ("\n\n[Warning] Page2, Register 21, bit 4~5 must be 0 [Reg15_2:%04lx]\n\n", PHY_15h);

++#ifdef SLT_DOS

++        if ( IOTiming    ) 

++		    fprintf (fp_io, "\n\n[Warning] Page2, Register 21, bit 4~5 must be 0 [Reg15_2:%04lx]\n\n", PHY_15h);

++		if ( !BurstEnable) 

++		    fprintf (fp_log, "\n\n[Warning] Page2, Register 21, bit 4~5 must be 0 [Reg15_2:%04lx]\n\n", PHY_15h);

++#endif		    

++//		phy_Read_Write(21, 0x0030, 0x0000);//clr set//[5]Rx Dly, [4]Tx Dly

++        phy_write(21, PHY_15h & 0xffcf); // Set [5]Rx Dly, [4]Tx Dly to 0

++	}

++	phy_write(22, 0x0000);

++

++	if ( BurstEnable ) {

++		phy_Reset(loop_phy);

++	} 

++	else if ( loop_phy ) {

++		phy_write( 22, 0x0002 );

++		

++		if ( GSpeed_sel[0] ) {

++			phy_Read_Write( 21, 0x6040, 0x0040 );//clr set

++		} 

++		else if ( GSpeed_sel[1] ) {

++			phy_Read_Write( 21, 0x6040, 0x2000 );//clr set

++		} 

++		else {

++			phy_Read_Write( 21, 0x6040, 0x0000 );//clr set

++		}

++		phy_write( 22, 0x0000 );

++		phy_Reset( loop_phy );

++	} 

++	else {

++		if ( GSpeed_sel[0] ) {

++			phy_write(  22, 0x0006         );

++			phy_Read_Write( 16, 0x0000, 0x0020 );//clr set

++			phy_write(  22, 0x0000         );

++		}

++

++		phy_Reset(loop_phy);

++	}

++

++	Retry = 0;

++	do {

++		PHY_11h = phy_read( PHY_SR );

++	} while (!((PHY_11h & 0x0400) | loop_phy | (Retry++ > 20)));

++}

++

++//------------------------------------------------------------

++void recov_phy_marvell1 (int loop_phy) {//88E6176

++    CHAR    PHY_ADR_org;

++    

++	PHY_ADR_org = PHY_ADR;

++	for ( PHY_ADR = 16; PHY_ADR <= 22; PHY_ADR++ ) {

++		if ( BurstEnable ) {

++		} 

++		else {

++			phy_write(6, PHY_06hA[PHY_ADR-16]);//06h[5]P5 loopback, 06h[6]P6 loopback

++		}

++	}

++	for ( PHY_ADR = 21; PHY_ADR <= 22; PHY_ADR++ ) {

++		phy_write(1, 0x3); //01h[1:0]00 = 10 Mbps, 01 = 100 Mbps, 10 = 1000 Mbps, 11 = Speed is not forced.

++	}

++	PHY_ADR = PHY_ADR_org;

++}

++

++//------------------------------------------------------------

++void phy_marvell1 (int loop_phy) {//88E6176

++//    ULONG	PHY_01h;

++    CHAR    PHY_ADR_org;

++    

++	if (DbgPrn_PHYName) 

++	    printf ("--->(%04lx %04lx)[Marvell] %s\n", PHY_ID2, PHY_ID3, PHYName);

++

++	//The 88E6176 is switch with 7 Port(P0~P6) and the PHYAdr will be fixed at 0x10~0x16, and only P5/P6 can be connected to the MAC.

++	//Therefor, the 88E6176 only can run the internal loopback.

++	PHY_ADR_org = PHY_ADR;

++	for ( PHY_ADR = 16; PHY_ADR <= 20; PHY_ADR++ ) {

++		if ( BurstEnable ) {

++		} 

++		else {

++			PHY_06hA[PHY_ADR-16] = phy_read( PHY_ANER );

++			phy_write(6, 0x00);//06h[5]P5 loopback, 06h[6]P6 loopback

++		}

++	}

++	

++	for ( PHY_ADR = 21; PHY_ADR <= 22; PHY_ADR++ ) {

++//		PHY_01h = phy_read( PHY_REG_BMSR );

++//		if      (GSpeed_sel[0]) phy_write(1, (PHY_01h & 0xfffc) | 0x2);//[1:0]00 = 10 Mbps, 01 = 100 Mbps, 10 = 1000 Mbps, 11 = Speed is not forced.

++//		else if (GSpeed_sel[1]) phy_write(1, (PHY_01h & 0xfffc) | 0x1);//[1:0]00 = 10 Mbps, 01 = 100 Mbps, 10 = 1000 Mbps, 11 = Speed is not forced.

++//		else                    phy_write(1, (PHY_01h & 0xfffc)      );//[1:0]00 = 10 Mbps, 01 = 100 Mbps, 10 = 1000 Mbps, 11 = Speed is not forced.

++		if      (GSpeed_sel[0]) phy_write(1, 0x2);//01h[1:0]00 = 10 Mbps, 01 = 100 Mbps, 10 = 1000 Mbps, 11 = Speed is not forced.

++		else if (GSpeed_sel[1]) phy_write(1, 0x1);//01h[1:0]00 = 10 Mbps, 01 = 100 Mbps, 10 = 1000 Mbps, 11 = Speed is not forced.

++		else                    phy_write(1, 0x0);//01h[1:0]00 = 10 Mbps, 01 = 100 Mbps, 10 = 1000 Mbps, 11 = Speed is not forced.

++

++		if (BurstEnable) {

++		} 

++		else {

++			PHY_06hA[PHY_ADR-16] = phy_read( PHY_ANER );

++			if (PHY_ADR == 21) phy_write(6, 0x20);//06h[5]P5 loopback, 06h[6]P6 loopback

++			else               phy_write(6, 0x40);//06h[5]P5 loopback, 06h[6]P6 loopback

++		}

++	}

++	PHY_ADR = PHY_ADR_org;

++}

++

++//------------------------------------------------------------

++void recov_phy_marvell2 (int loop_phy) {//88E1512

++	if (BurstEnable) {

++	} 

++	else if (loop_phy) {

++	} 

++	else {

++		if (GSpeed_sel[0]) {

++			phy_write(22, 0x0006);

++			phy_Read_Write(18, 0x0008, 0x0000);//clr set

++			phy_write(22, 0x0000);

++		}

++	}

++}

++

++//------------------------------------------------------------

++void phy_marvell2 (int loop_phy) {//88E1512

++    int	    Retry = 0;

++    ULONG   temp_reg;

++

++	if ( DbgPrn_PHYName ) 

++	    printf ("--->(%04lx %04lx)[Marvell] %s\n", PHY_ID2, PHY_ID3, PHYName);

++

++	phy_write(22, 0x0002);

++	PHY_15h = phy_read(21);

++	

++	if ( PHY_15h & 0x0030 ) {

++		printf ("\n\n[Warning] Page2, Register 21, bit 4~5 must be 0 [Reg15h_2:%04lx]\n\n", PHY_15h);

++#ifdef SLT_DOS

++        if (IOTiming    ) fprintf (fp_io, "\n\n[Warning] Page2, Register 21, bit 4~5 must be 0 [Reg15h_2:%04lx]\n\n", PHY_15h);

++		if (!BurstEnable) fprintf (fp_log, "\n\n[Warning] Page2, Register 21, bit 4~5 must be 0 [Reg15h_2:%04lx]\n\n", PHY_15h);

++#endif

++        //		phy_Read_Write(21, 0x0030, 0x0000);//clr set//[5]Rx Dly, [4]Tx Dly

++//		phy_write(21, PHY_15h & 0xffcf);

++	}

++	phy_write(22, 0x0000);

++

++	if ( BurstEnable ) {

++		phy_Reset(loop_phy);

++	} 

++	else if (loop_phy) {

++	    // Internal loopback funciton only support in copper mode

++	    // switch page 18

++	    phy_write(22, 0x0012);

++	    // Change mode to Copper mode

++	    phy_write(20, 0x8210);

++	    // do software reset

++	    do {

++	        temp_reg = phy_read( 20 );

++	    } while ( ( (temp_reg & 0x8000) == 0x8000 ) & (Retry++ < 20) );

++	    

++	    // switch page 2

++		phy_write(22, 0x0002);

++		if (GSpeed_sel[0]) {

++			phy_Read_Write(21, 0x2040, 0x0040);//clr set

++		} 

++		else if (GSpeed_sel[1]) {

++			phy_Read_Write(21, 0x2040, 0x2000);//clr set

++		} 

++		else {

++			phy_Read_Write(21, 0x2040, 0x0000);//clr set

++		}

++		phy_write(22, 0x0000);

++

++		phy_Reset(loop_phy);

++	} 

++	else {

++		if (GSpeed_sel[0]) {

++			phy_write(22, 0x0006);

++			phy_Read_Write(18, 0x0000, 0x0008);//clr set

++			phy_write(22, 0x0000);

++		}

++

++		phy_Reset(loop_phy);

++	}

++

++	Retry = 0;

++	do {

++		PHY_11h = phy_read( PHY_SR );

++	} while (!((PHY_11h & 0x0400) | loop_phy | (Retry++ > 20)));

++}

++

++//------------------------------------------------------------

++void phy_broadcom (int loop_phy) {//BCM5221

++	if (DbgPrn_PHYName) 

++	    printf ("--->(%04lx %04lx)[Broadcom] %s\n", PHY_ID2, PHY_ID3, PHYName);

++

++	phy_Reset(loop_phy);

++

++	if (IEEETesting) {

++		if (IOTimingBund_arg == 0) {

++			phy_write(25, 0x1f01);//Force MDI  //Measuring from channel A

++		} 

++		else {

++			phy_Read_Write(24, 0x0000, 0x4000);//clr set//Force Link

++//			phy_write( 0, PHY_00h);

++//			phy_write(30, 0x1000);

++		}

++	}

++}

++

++//------------------------------------------------------------

++void recov_phy_broadcom0 (int loop_phy) {//BCM54612

++

++    // Need to do it for AST2400

++    phy_write(0x1C, 0x8C00); // Disable GTXCLK Clock Delay Enable

++    phy_write(0x18, 0xF0E7); // Disable RGMII RXD to RXC Skew            

++

++    if (BurstEnable) {

++	} 

++	else if (loop_phy) {

++		phy_write( 0, PHY_00h);

++	} 

++	else {

++		phy_write(0x00, PHY_00h);

++		phy_write(0x09, PHY_09h);

++		phy_write(0x18, PHY_18h);

++	}

++}

++

++//------------------------------------------------------------

++void phy_broadcom0 (int loop_phy) {//BCM54612

++	if ( DbgPrn_PHYName ) 

++	    printf ("--->(%04lx %04lx)[Broadcom] %s\n", PHY_ID2, PHY_ID3, PHYName);

++

++    // Need to do it for AST2400

++    phy_write(0x1C, 0x8C00); // Disable GTXCLK Clock Delay Enable

++    phy_write(0x18, 0xF0E7); // Disable RGMII RXD to RXC Skew            

++        

++    // Backup org value

++    // read reg 18H, Page 103, BCM54612EB1KMLG_Spec.pdf

++    phy_write(0x18, 0x7007);

++    PHY_18h = phy_read(0x18);

++       

++    PHY_00h = phy_read( PHY_REG_BMCR );

++    PHY_09h = phy_read( PHY_GBCR );   

++    

++	if ( BurstEnable ) {

++		phy_basic_setting(loop_phy);

++	} 

++	else if (loop_phy) {

++		phy_basic_setting(loop_phy);

++   

++    // Enable Internal Loopback mode

++    // Page 58, BCM54612EB1KMLG_Spec.pdf

++    phy_write(0x0, 0x5140);

++		DELAY(Delay_PHYRst);

++    /* Only 1G Test is PASS, 100M and 10M is false @20130619 */     

++

++// Waiting for BCM FAE's response

++//        if (GSpeed_sel[0]) {

++//            // Speed 1G

++//            // Enable Internal Loopback mode

++//            // Page 58, BCM54612EB1KMLG_Spec.pdf

++//            phy_write(0x0, 0x5140);

++//        } 

++//        else if (GSpeed_sel[1]) {

++//            // Speed 100M

++//            // Enable Internal Loopback mode

++//            // Page 58, BCM54612EB1KMLG_Spec.pdf

++//            phy_write(0x0, 0x7100);

++//            phy_write(0x1E, 0x1000);

++//        } 

++//        else if (GSpeed_sel[2]) {

++//            // Speed 10M

++//            // Enable Internal Loopback mode

++//            // Page 58, BCM54612EB1KMLG_Spec.pdf

++//            phy_write(0x0, 0x5100);

++//            phy_write(0x1E, 0x1000);

++//        }

++//            

++//		DELAY(Delay_PHYRst);

++    } 

++	else {

++      

++		if (GSpeed_sel[0]) {

++            // Page 60, BCM54612EB1KMLG_Spec.pdf

++            // need to insert loopback plug

++			phy_write( 9, 0x1800);

++			phy_write( 0, 0x0140);

++            phy_write( 0x18, 0x8400); // Enable Transmit test mode

++		} else if (GSpeed_sel[1]) {

++            // Page 60, BCM54612EB1KMLG_Spec.pdf

++            // need to insert loopback plug

++			phy_write( 0, 0x2100);

++            phy_write( 0x18, 0x8400); // Enable Transmit test mode            

++		} else {

++            // Page 60, BCM54612EB1KMLG_Spec.pdf

++            // need to insert loopback plug

++			phy_write( 0, 0x0100);

++            phy_write( 0x18, 0x8400); // Enable Transmit test mode                               

++		}

++	}

++}

++

++//------------------------------------------------------------

++void phy_realtek (int loop_phy) {//RTL8201N

++	if ( DbgPrn_PHYName ) 

++	    printf ("--->(%04lx %04lx)[Realtek] %s\n", PHY_ID2, PHY_ID3, PHYName);

++

++	phy_Reset(loop_phy);

++}

++

++//------------------------------------------------------------

++//internal loop 100M: Don't support

++//internal loop 10M : no  loopback stub

++void phy_realtek0 (int loop_phy) {//RTL8201E

++	if ( DbgPrn_PHYName ) 

++	    printf ("--->(%04lx %04lx)[Realtek] %s\n", PHY_ID2, PHY_ID3, PHYName);

++

++	phy_Reset(loop_phy);

++

++//	phy_Read_Write(25, 0x2800, 0x0000);//clr set

++//	printf("Enable phy output RMII clock\n");

++	if (IEEETesting) {

++		phy_write(31, 0x0001);

++		if (IOTimingBund_arg == 0) {

++			phy_write(25, 0x1f01);//Force MDI  //Measuring from channel A

++		} 

++		else {

++			phy_write(25, 0x1f00);//Force MDIX //Measuring from channel B

++		}

++		phy_write(31, 0x0000);

++	}

++}

++

++//------------------------------------------------------------

++void recov_phy_realtek1 (int loop_phy) {//RTL8211D

++	if ( BurstEnable ) {

++		if ( IEEETesting ) {

++			if ( GSpeed_sel[0] ) {

++				if (IOTimingBund_arg == 0) {

++					//Test Mode 1

++					phy_write( 31, 0x0002 );

++					phy_write(  2, 0xc203 );

++					phy_write( 31, 0x0000 );

++					phy_write(  9, 0x0000 );

++				} 

++				else {

++					//Test Mode 4

++					phy_write( 31, 0x0000 );

++					phy_write(  9, 0x0000 );

++				}

++

++				phy_write( 31, 0x0000 );

++			} 

++			else if ( GSpeed_sel[1] ) {

++				phy_write( 23, 0x2100 );

++				phy_write( 16, 0x016e );

++			} 

++			else {

++//				phy_write( 31, 0x0006 );

++//				phy_write(  0, 0x5a00 );

++//				phy_write( 31, 0x0000 );

++			}

++		} // End if ( IEEETesting )

++	} 

++	else if (loop_phy) {

++		if ( GSpeed_sel[0] ) {

++			phy_write( 31, 0x0000 ); // new in Rev. 1.6

++			phy_write(  0, 0x1140 ); // new in Rev. 1.6

++			phy_write( 20, 0x8040 ); // new in Rev. 1.6

++		}

++	} 

++	else {

++		if ( GSpeed_sel[0] ) {

++			phy_write( 31, 0x0001 );

++			phy_write(  3, 0xdf41 );

++			phy_write(  2, 0xdf20 );

++			phy_write(  1, 0x0140 );

++			phy_write(  0, 0x00bb );

++			phy_write(  4, 0xb800 );

++			phy_write(  4, 0xb000 );

++                              

++			phy_write( 31, 0x0000 );

++//			phy_write( 26, 0x0020 ); // Rev. 1.2

++			phy_write( 26, 0x0040 ); // new in Rev. 1.6

++			phy_write(  0, 0x1140 );    

++//			phy_write( 21, 0x0006 ); // Rev. 1.2

++			phy_write( 21, 0x1006 ); // new in Rev. 1.6

++			phy_write( 23, 0x2100 ); 

++//		} else if ( GSpeed_sel[1] ) {//option

++//			phy_write( 31, 0x0000 );

++//			phy_write(  9, 0x0200 );

++//			phy_write(  0, 0x1200 );

++//		} else if ( GSpeed_sel[2] ) {//option

++//			phy_write( 31, 0x0000 );

++//			phy_write(  9, 0x0200 );

++//			phy_write(  4, 0x05e1 );

++//			phy_write(  0, 0x1200 );

++		}

++	} // End if ( BurstEnable )

++} // End void recov_phy_realtek1 (int loop_phy)

++

++//------------------------------------------------------------

++//internal loop 1G  : no  loopback stub

++//internal loop 100M: no  loopback stub

++//internal loop 10M : no  loopback stub

++void phy_realtek1 (int loop_phy) {//RTL8211D

++	if ( DbgPrn_PHYName ) 

++	    printf ("--->(%04lx %04lx)[Realtek] %s\n", PHY_ID2, PHY_ID3, PHYName);

++         

++	if ( BurstEnable ) {

++		if ( IEEETesting ) {

++			if ( GSpeed_sel[0] ) {

++				if (IOTimingBund_arg == 0) {

++					//Test Mode 1

++					phy_write( 31, 0x0002 );

++					phy_write(  2, 0xc22b );

++					phy_write( 31, 0x0000 );

++					phy_write(  9, 0x2000 );

++				} 

++				else {

++					//Test Mode 4

++					phy_write( 31, 0x0000 );

++					phy_write(  9, 0x8000 );

++				}

++				phy_write( 31, 0x0000 );

++			} 

++			else if ( GSpeed_sel[1] ) {

++				if ( IOTimingBund_arg == 0 ) {

++					//From Channel A

++					phy_write( 23, 0xa102 );

++					phy_write( 16, 0x01ae );//MDI

++				} 

++				else {

++					//From Channel B

++					phy_Read_Write( 17, 0x0008, 0x0000 ); // clr set

++					phy_write(  23, 0xa102 );         // MDI

++					phy_write(  16, 0x010e );

++				}

++			} else {

++//				if ( IOTimingBund_arg == 0 ) {//Pseudo-random pattern

++//					phy_write( 31, 0x0006 );

++//					phy_write(  0, 0x5a21 );

++//					phy_write( 31, 0x0000 );

++//				} 

++//              else if ( IOTimingBund_arg == 1 ) {//¡§FF¡¨ pattern

++//					phy_write( 31, 0x0006 );

++//					phy_write(  2, 0x05ee );

++//					phy_write(  0, 0xff21 );

++//					phy_write( 31, 0x0000 );

++//				} else {//¡§00¡¨ pattern

++//					phy_write( 31, 0x0006 );

++//					phy_write(  2, 0x05ee );

++//					phy_write(  0, 0x0021 );

++//					phy_write( 31, 0x0000 );

++//				}

++			}

++		} 

++		else {

++			phy_Reset(loop_phy);

++		}

++	} 

++	else if ( loop_phy ) {

++		phy_Reset(loop_phy);

++		

++		if ( GSpeed_sel[0] ) {

++			phy_write(20, 0x0042);//new in Rev. 1.6

++		}

++	} 

++	else {

++		if ( GSpeed_sel[0] ) {

++			phy_write( 31, 0x0001 );

++			phy_write(  3, 0xff41 );

++			phy_write(  2, 0xd720 );

++			phy_write(  1, 0x0140 );

++			phy_write(  0, 0x00bb );

++			phy_write(  4, 0xb800 );

++			phy_write(  4, 0xb000 );

++                              

++			phy_write( 31, 0x0007 );

++			phy_write( 30, 0x0040 );

++			phy_write( 24, 0x0008 );

++                              

++			phy_write( 31, 0x0000 );

++			phy_write(  9, 0x0300 );

++			phy_write( 26, 0x0020 );

++			phy_write(  0, 0x0140 );

++			phy_write( 23, 0xa101 );

++			phy_write( 21, 0x0200 );

++			phy_write( 23, 0xa121 );

++			phy_write( 23, 0xa161 );

++			phy_write(  0, 0x8000 );

++			phy_Wait_Reset_Done();

++			phy_delay(200); // new in Rev. 1.6

++//		} 

++//      else if ( GSpeed_sel[1] ) {//option

++//			phy_write( 31, 0x0000 );

++//			phy_write(  9, 0x0000 );

++//			phy_write(  4, 0x0061 );

++//			phy_write(  0, 0x1200 );

++//			phy_delay(5000);

++//		} 

++//      else if (GSpeed_sel[2]) {//option

++//			phy_write( 31, 0x0000 );

++//			phy_write(  9, 0x0000 );

++//			phy_write(  4, 0x05e1 );

++//			phy_write(  0, 0x1200 );

++//			phy_delay(5000);

++		} 

++		else {

++			phy_Reset(loop_phy);

++		}

++	}

++} // End void phy_realtek1 (int loop_phy)

++

++//------------------------------------------------------------

++void recov_phy_realtek2 (int loop_phy) {//RTL8211E

++	if ( BurstEnable ) {

++		if ( IEEETesting ) {

++			phy_write( 31, 0x0005 );

++			phy_write(  5, 0x8b86 );

++			phy_write(  6, 0xe201 );

++			phy_write( 31, 0x0007 );

++			phy_write( 30, 0x0020 );

++			phy_write( 21, 0x1108 );

++			phy_write( 31, 0x0000 );

++

++			if ( GSpeed_sel[0] ) {

++				phy_write( 31, 0x0000 );

++				phy_write(  9, 0x0000 );

++			} 

++			else if ( GSpeed_sel[1] ) {

++				phy_write( 31, 0x0007 );

++				phy_write( 30, 0x002f );

++				phy_write( 23, 0xd88f );

++				phy_write( 30, 0x002d );

++				phy_write( 24, 0xf050 );

++				phy_write( 31, 0x0000 );

++				phy_write( 16, 0x006e );

++			} 

++			else {

++			}

++		} 

++		else {

++		}

++	} 

++	else if (loop_phy) {

++	} 

++	else {

++		if (GSpeed_sel[0]) {

++			//Rev 1.5  //not stable

++//			phy_write( 31, 0x0000 );

++//			phy_write(  0, 0x8000 );

++//			phy_Wait_Reset_Done();

++//			phy_delay(30);

++//			phy_write( 23, 0x2160 );

++//			phy_write( 31, 0x0007 );

++//			phy_write( 30, 0x0040 );

++//			phy_write( 24, 0x0004 );

++//			phy_write( 24, 0x1a24 );

++//			phy_write( 25, 0xfd00 );

++//			phy_write( 24, 0x0000 );

++//			phy_write( 31, 0x0000 );

++//			phy_write(  0, 0x1140 );

++//			phy_write( 26, 0x0040 );

++//			phy_write( 31, 0x0007 );

++//			phy_write( 30, 0x002f );

++//			phy_write( 23, 0xd88f );

++//			phy_write( 30, 0x0023 );

++//			phy_write( 22, 0x0300 );

++//			phy_write( 31, 0x0000 );

++//			phy_write( 21, 0x1006 );

++//			phy_write( 23, 0x2100 );

++/**/

++			//Rev 1.6

++			phy_write( 31, 0x0000 );

++			phy_write(  0, 0x8000 );

++			phy_Wait_Reset_Done();

++			phy_delay(30);

++			phy_write( 31, 0x0007 );

++			phy_write( 30, 0x0042 );

++			phy_write( 21, 0x0500 );

++			phy_write( 31, 0x0000 );

++			phy_write(  0, 0x1140 );

++			phy_write( 26, 0x0040 );

++			phy_write( 31, 0x0007 );

++			phy_write( 30, 0x002f );

++			phy_write( 23, 0xd88f );

++			phy_write( 30, 0x0023 );

++			phy_write( 22, 0x0300 );

++			phy_write( 31, 0x0000 );

++			phy_write( 21, 0x1006 );

++			phy_write( 23, 0x2100 );

++/**/

++//		} else if (GSpeed_sel[1]) {//option

++//			phy_write( 31, 0x0000 );

++//			phy_write(  9, 0x0200 );

++//			phy_write(  0, 0x1200 );

++//		} else if (GSpeed_sel[2]) {//option

++//			phy_write( 31, 0x0000 );

++//			phy_write(  9, 0x0200 );

++//			phy_write(  4, 0x05e1 );

++//			phy_write(  0, 0x1200 );

++		}

++	}

++} // End void recov_phy_realtek2 (int loop_phy)

++

++//------------------------------------------------------------

++//internal loop 1G  : no  loopback stub

++//internal loop 100M: no  loopback stub

++//internal loop 10M : no  loopback stub

++void phy_realtek2 (int loop_phy) {//RTL8211E

++

++	if ( DbgPrn_PHYName ) 

++	    printf ("--->(%04lx %04lx)[Realtek] %s\n", PHY_ID2, PHY_ID3, PHYName);

++

++	phy_Read_Write( 0,  0x0000, 0x8000 | PHY_00h ); // clr set // Rst PHY

++	phy_Wait_Reset_Done();

++	phy_delay(30);

++

++	if ( BurstEnable ) {

++		if ( IEEETesting ) {

++			phy_write( 31, 0x0005 );

++			phy_write(  5, 0x8b86 );

++			phy_write(  6, 0xe200 );

++			phy_write( 31, 0x0007 );

++			phy_write( 30, 0x0020 );

++			phy_write( 21, 0x0108 );

++			phy_write( 31, 0x0000 );

++

++			if ( GSpeed_sel[0] ) {

++				phy_write( 31, 0x0000 );

++				

++				if ( IOTimingBund_arg == 0 ) {

++					phy_write( 9, 0x2000);//Test Mode 1

++				} 

++				else {

++					phy_write( 9, 0x8000);//Test Mode 4

++				}

++			} 

++			else if ( GSpeed_sel[1] ) {

++				phy_write( 31, 0x0007 );

++				phy_write( 30, 0x002f );

++				phy_write( 23, 0xd818 );

++				phy_write( 30, 0x002d );

++				phy_write( 24, 0xf060 );

++				phy_write( 31, 0x0000 );

++				

++				if ( IOTimingBund_arg == 0 ) {

++					phy_write(16, 0x00ae);//From Channel A

++				} 

++				else {

++					phy_write(16, 0x008e);//From Channel B

++				}

++			} 

++			else {

++			}

++		} 

++		else {

++			phy_basic_setting(loop_phy);

++			phy_delay(30);

++		}

++	} 

++	else if (loop_phy) {

++		phy_basic_setting(loop_phy);

++

++		phy_Read_Write(0,  0x0000, 0x8000 | PHY_00h);//clr set//Rst PHY

++		phy_Wait_Reset_Done();

++		phy_delay(30);

++

++		phy_basic_setting(loop_phy);

++		phy_delay(30);

++	} 

++	else {

++		if ( GSpeed_sel[0] ) {

++			//Rev 1.5  //not stable

++//			phy_write( 23, 0x2160 );

++//			phy_write( 31, 0x0007 );

++//			phy_write( 30, 0x0040 );

++//			phy_write( 24, 0x0004 );

++//			phy_write( 24, 0x1a24 );

++//			phy_write( 25, 0x7d00 );

++//			phy_write( 31, 0x0000 );

++//			phy_write( 23, 0x2100 );

++//			phy_write( 31, 0x0007 );

++//			phy_write( 30, 0x0040 );

++//			phy_write( 24, 0x0000 );

++//			phy_write( 30, 0x0023 );

++//			phy_write( 22, 0x0006 );

++//			phy_write( 31, 0x0000 );

++//			phy_write(  0, 0x0140 );

++//			phy_write( 26, 0x0060 );

++//			phy_write( 31, 0x0007 );

++//			phy_write( 30, 0x002f );

++//			phy_write( 23, 0xd820 );

++//			phy_write( 31, 0x0000 );

++//			phy_write( 21, 0x0206 );

++//			phy_write( 23, 0x2120 );

++//			phy_write( 23, 0x2160 );

++/**/                          

++            //Rev 1.6                     

++			phy_write( 31, 0x0007 );

++			phy_write( 30, 0x0042 );

++			phy_write( 21, 0x2500 );

++			phy_write( 30, 0x0023 );

++			phy_write( 22, 0x0006 );

++			phy_write( 31, 0x0000 );

++			phy_write(  0, 0x0140 );

++			phy_write( 26, 0x0060 );

++			phy_write( 31, 0x0007 );

++			phy_write( 30, 0x002f );

++			phy_write( 23, 0xd820 );

++			phy_write( 31, 0x0000 );

++			phy_write( 21, 0x0206 );

++			phy_write( 23, 0x2120 );

++			phy_write( 23, 0x2160 );

++			phy_delay(300);

++/**/

++//		} 

++//      else if ( GSpeed_sel[1] ) {//option

++//			phy_write( 31, 0x0000 );

++//			phy_write(  9, 0x0000 );

++//			phy_write(  4, 0x0061 );

++//			phy_write(  0, 0x1200 );

++//			phy_delay(5000);

++//		} 

++//      else if ( GSpeed_sel[2] ) {//option

++//			phy_write( 31, 0x0000 );

++//			phy_write(  9, 0x0000 );

++//			phy_write(  4, 0x05e1 );

++//			phy_write(  0, 0x1200 );

++//			phy_delay(5000);

++		} 

++		else {

++			phy_basic_setting(loop_phy);

++			phy_delay(150);

++		}

++	}

++} // End void phy_realtek2 (int loop_phy)

++

++//------------------------------------------------------------

++void recov_phy_realtek3 (int loop_phy) {//RTL8211C

++	if ( BurstEnable ) {

++		if ( IEEETesting ) {

++			if ( GSpeed_sel[0] ) {

++				phy_write(  9, 0x0000 );

++			} 

++			else if ( GSpeed_sel[1] ) {

++				phy_write( 17, PHY_11h );

++				phy_write( 14, 0x0000  );

++				phy_write( 16, 0x00a0  );

++			} 

++			else {

++//				phy_write( 31, 0x0006 );

++//				phy_write(  0, 0x5a00 );

++//				phy_write( 31, 0x0000 );

++			}

++		} 

++		else {

++		}

++	} 

++	else if (loop_phy) {

++		if ( GSpeed_sel[0] ) {

++			phy_write( 11, 0x0000 );

++		}

++		phy_write( 12, 0x1006 );

++	} 

++	else {

++		if ( GSpeed_sel[0] ) {

++			phy_write( 31, 0x0001 );

++			phy_write(  4, 0xb000 );

++			phy_write(  3, 0xff41 );

++			phy_write(  2, 0xdf20 );

++			phy_write(  1, 0x0140 );

++			phy_write(  0, 0x00bb );

++			phy_write(  4, 0xb800 );

++			phy_write(  4, 0xb000 );

++                              

++			phy_write( 31, 0x0000 );

++			phy_write( 25, 0x8c00 );

++			phy_write( 26, 0x0040 );

++			phy_write(  0, 0x1140 );

++			phy_write( 14, 0x0000 );

++			phy_write( 12, 0x1006 );

++			phy_write( 23, 0x2109 );

++		}

++	}

++}

++

++//------------------------------------------------------------

++void phy_realtek3 (int loop_phy) {//RTL8211C

++	if ( DbgPrn_PHYName ) 

++	    printf ("--->(%04lx %04lx)[Realtek] %s\n", PHY_ID2, PHY_ID3, PHYName);

++

++	if ( BurstEnable ) {

++		if ( IEEETesting ) {

++			if ( GSpeed_sel[0] ) {

++				if ( IOTimingBund_arg == 0 ) {   //Test Mode 1

++					phy_write( 9, 0x2000);

++				} 

++				else if (IOTimingBund_arg == 1) {//Test Mode 2

++					phy_write( 9, 0x4000);

++				} 

++				else if (IOTimingBund_arg == 2) {//Test Mode 3

++					phy_write( 9, 0x6000);

++				} 

++				else {                           //Test Mode 4

++					phy_write( 9, 0x8000);

++				}

++			} 

++			else if ( GSpeed_sel[1] ) {

++				PHY_11h = phy_read( PHY_SR );

++				phy_write( 17, PHY_11h & 0xfff7 );

++				phy_write( 14, 0x0660 );

++				

++				if ( IOTimingBund_arg == 0 ) {

++					phy_write( 16, 0x00a0 );//MDI  //From Channel A

++				} 

++				else {

++					phy_write( 16, 0x0080 );//MDIX //From Channel B

++				}

++			} 

++			else {

++//				if (IOTimingBund_arg == 0) {//Pseudo-random pattern

++//					phy_write( 31, 0x0006 );

++//					phy_write(  0, 0x5a21 );

++//					phy_write( 31, 0x0000 );

++//				} 

++//              else if (IOTimingBund_arg == 1) {//¡§FF¡¨ pattern

++//					phy_write( 31, 0x0006 );

++//					phy_write(  2, 0x05ee );

++//					phy_write(  0, 0xff21 );

++//					phy_write( 31, 0x0000 );

++//				} 

++//              else {//¡§00¡¨ pattern

++//					phy_write( 31, 0x0006 );

++//					phy_write(  2, 0x05ee );

++//					phy_write(  0, 0x0021 );

++//					phy_write( 31, 0x0000 );

++//				}

++			}

++		} 

++		else {

++			phy_Reset(loop_phy);

++		}

++	} 

++	else if (loop_phy) {

++		phy_write( 0, 0x9200);

++		phy_Wait_Reset_Done();

++		phy_delay(30);

++

++		phy_write( 17, 0x401c );

++		phy_write( 12, 0x0006 );

++		

++		if ( GSpeed_sel[0] ) {

++			phy_write(11, 0x0002);

++		} 

++		else {

++			phy_basic_setting(loop_phy);

++		}

++	} 

++	else {

++		if (GSpeed_sel[0]) {

++			phy_write( 31, 0x0001 );

++			phy_write(  4, 0xb000 );

++			phy_write(  3, 0xff41 );

++			phy_write(  2, 0xd720 );

++			phy_write(  1, 0x0140 );

++			phy_write(  0, 0x00bb );

++			phy_write(  4, 0xb800 );

++			phy_write(  4, 0xb000 );

++                              

++			phy_write( 31, 0x0000 );

++			phy_write( 25, 0x8400 );

++			phy_write( 26, 0x0020 );

++			phy_write(  0, 0x0140 );

++			phy_write( 14, 0x0210 );

++			phy_write( 12, 0x0200 );

++			phy_write( 23, 0x2109 );

++			phy_write( 23, 0x2139 );

++		} 

++		else {

++			phy_Reset(loop_phy);

++		}

++	}

++} // End void phy_realtek3 (int loop_phy)

++

++//------------------------------------------------------------

++void phy_realtek4 (int loop_phy) {//RTL8201F

++	if ( DbgPrn_PHYName ) 

++	    printf ("--->(%04lx %04lx)[Realtek] %s\n", PHY_ID2, PHY_ID3, PHYName);

++

++	if ( BurstEnable ) {

++		if ( IEEETesting ) {

++			phy_write( 31, 0x0004 );

++			phy_write( 16, 0x4077 );

++			phy_write( 21, 0xc5a0 );

++			phy_write( 31, 0x0000 );

++

++			if ( GSpeed_sel[1] ) {

++				phy_write(  0, 0x8000 ); // Reset PHY

++				phy_write( 24, 0x0310 ); // Disable ALDPS

++				

++				if ( IOTimingBund_arg == 0 ) {

++					phy_write( 28, 0x40c2 ); //Force MDI //From Channel A (RJ45 pair 1, 2)

++				}                        

++				else {                   

++					phy_write( 28, 0x40c0 ); //Force MDIX//From Channel B (RJ45 pair 3, 6)

++				}

++				phy_write( 0, 0x2100);       //Force 100M/Full Duplex)

++			}

++		} else {

++			phy_Reset(loop_phy);

++		}

++	} 

++	else {

++		phy_Reset(loop_phy);

++	}

++}

++

++//------------------------------------------------------------

++void phy_smsc (int loop_phy) {//LAN8700

++	if ( DbgPrn_PHYName ) 

++	    printf ("--->(%04lx %04lx)[SMSC] %s\n", PHY_ID2, PHY_ID3, PHYName);

++

++	phy_Reset(loop_phy);

++}

++

++//------------------------------------------------------------

++void phy_micrel (int loop_phy) {//KSZ8041

++	if ( DbgPrn_PHYName ) 

++	    printf ("--->(%04lx %04lx)[Micrel] %s\n", PHY_ID2, PHY_ID3, PHYName);

++

++	phy_Reset(loop_phy);

++

++//	phy_write(24,  0x0600);

++}

++

++//------------------------------------------------------------

++void phy_micrel0 (int loop_phy) {//KSZ8031/KSZ8051

++	if ( DbgPrn_PHYName ) printf ("--->(%04lx %04lx)[Micrel] %s\n", PHY_ID2, PHY_ID3, PHYName);

++

++	//For KSZ8051RNL only

++	//Reg1Fh[7] = 0(default): 25MHz Mode, XI, XO(pin 9, 8) is 25MHz(crystal/oscilator).

++	//Reg1Fh[7] = 1         : 50MHz Mode, XI(pin 9) is 50MHz(oscilator).

++	PHY_1fh = phy_read(31);

++	if (PHY_1fh & 0x0080) sprintf(PHYName, "%s-50MHz Mode", PHYName);

++	else                  sprintf(PHYName, "%s-25MHz Mode", PHYName);

++

++	if (IEEETesting) {

++		phy_Read_Write( 0,  0x0000, 0x8000 | PHY_00h );//clr set//Rst PHY

++		phy_Wait_Reset_Done();

++

++		phy_Read_Write( 31, 0x0000, 0x2000 );//clr set//1Fh[13] = 1: Disable auto MDI/MDI-X

++		phy_basic_setting(loop_phy);

++		phy_Read_Write( 31, 0x0000, 0x0800 );//clr set//1Fh[11] = 1: Force link pass

++

++//		phy_delay(2500);//2.5 sec

++	} 

++	else {

++		phy_Reset(loop_phy);

++

++		//Reg16h[6] = 1         : RMII B-to-B override

++		//Reg16h[1] = 1(default): RMII override

++		phy_Read_Write( 22, 0x0000, 0x0042 );//clr set

++	}

++

++	if ( PHY_1fh & 0x0080 ) 

++	    phy_Read_Write( 31, 0x0000, 0x0080 );//clr set//Reset PHY will clear Reg1Fh[7]

++}

++

++//------------------------------------------------------------

++void recov_phy_vitesse (int loop_phy) {//VSC8601

++	if ( BurstEnable ) {

++//		if (IEEETesting) {

++//		} else {

++//		}

++	} 

++	else if ( loop_phy ) {

++	} 

++	else {

++		if ( GSpeed_sel[0] ) {

++			phy_write( 24, PHY_18h );

++			phy_write( 18, PHY_12h );

++		}

++	}

++}

++

++//------------------------------------------------------------

++void phy_vitesse (int loop_phy) {//VSC8601

++	if ( DbgPrn_PHYName ) 

++	    printf ("--->(%04lx %04lx)[VITESSE] %s\n", PHY_ID2, PHY_ID3, PHYName);

++

++	if ( BurstEnable ) {

++		if ( IEEETesting ) {

++			phy_Reset(loop_phy);

++		} 

++		else {

++			phy_Reset(loop_phy);

++		}

++	} 

++	else if ( loop_phy ) {

++		phy_Reset(loop_phy);

++	} 

++	else {

++		if ( GSpeed_sel[0] ) {

++			PHY_18h = phy_read( 24 );

++			PHY_12h = phy_read( PHY_INER );

++

++			phy_Reset(loop_phy);

++

++			phy_write( 24, PHY_18h | 0x0001 );

++			phy_write( 18, PHY_12h | 0x0020 );

++		} 

++		else {

++			phy_Reset(loop_phy);

++		}

++	}

++}

++

++//------------------------------------------------------------

++void phy_default (int loop_phy) {

++	if ( DbgPrn_PHYName ) 

++	    printf ("--->(%04lx %04lx)%s\n", PHY_ID2, PHY_ID3, PHYName);

++

++	phy_Reset(loop_phy);

++}

++

++//------------------------------------------------------------

++// PHY Init

++//------------------------------------------------------------

++BOOLEAN find_phyadr (void) {

++    ULONG       PHY_val;

++    BOOLEAN     ret = FALSE;

++    

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("find_phyadr\n"); 

++	    Debug_delay();

++    #endif

++

++	do {

++	    // Check current PHY address by user setting

++	    PHY_val = phy_read( PHY_REG_ID_1 );

++    	if ( PHY_IS_VALID(PHY_val) ) {

++    		ret = TRUE;

++    		break;

++    	}

++    	 

++    	if ( Enable_SkipChkPHY ) {

++    		PHY_val = phy_read( PHY_REG_BMCR );

++    		

++    		if ((PHY_val & 0x8000) & Enable_InitPHY) {

++    		    // PHY is reseting and need to inital PHY

++                #ifndef Enable_SearchPHYID

++    			break;

++                #endif

++    		} 

++    		else {

++    			ret = TRUE;

++                break;    			

++    		}

++    	} 

++    	

++    	#ifdef Enable_SearchPHYID

++    	// Scan PHY address from 0 to 31

++        printf("Search PHY address\n");

++        for ( PHY_ADR = 0; PHY_ADR < 32; PHY_ADR++ ) {

++        	PHY_val = phy_read( PHY_REG_ID_1 );

++        	if ( PHY_IS_VALID(PHY_val) ) {

++        		ret = TRUE;

++        		break;

++        	}

++        }

++        // Don't find PHY address

++        PHY_ADR = PHY_ADR_arg;

++        #endif

++    } while ( 0 );

++

++	if ( ret == TRUE ) {

++		if ( PHY_ADR_arg != PHY_ADR ) {

++

++            if ( !BurstEnable ) 

++			    phy_id( FP_LOG );

++

++            phy_id( STD_OUT );

++		}

++	} 

++	else {

++

++		if ( !BurstEnable ) 

++		    phy_id( FP_LOG );

++

++        phy_id( STD_OUT );

++		FindErr( Err_PHY_Type );

++	}

++	

++	return ret;

++} // End BOOLEAN find_phyadr (void)

++

++//------------------------------------------------------------

++char phy_chk (ULONG id2, ULONG id3, ULONG id3_mask) {

++	if ((PHY_ID2 == id2) && ((PHY_ID3 & id3_mask) == (id3 & id3_mask))) 

++	    return(1);

++	else                                                                

++	    return(0);

++}

++

++//------------------------------------------------------------

++void phy_set00h (int loop_phy) {

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("phy_set00h\n"); 

++	    Debug_delay();

++    #endif

++

++	if (BurstEnable) {

++		if (IEEETesting) {

++			if      (GSpeed_sel[0]) PHY_00h = 0x0140;

++			else if (GSpeed_sel[1]) PHY_00h = 0x2100;

++			else                    PHY_00h = 0x0100;

++		} 

++		else {

++			if      (GSpeed_sel[0]) PHY_00h = 0x1140;

++			else if (GSpeed_sel[1]) PHY_00h = 0x3100;

++			else                    PHY_00h = 0x1100;

++		}

++	} 

++	else if (loop_phy) {

++		if      (GSpeed_sel[0]) PHY_00h = 0x4140;

++		else if (GSpeed_sel[1]) PHY_00h = 0x6100;

++		else                    PHY_00h = 0x4100;

++	} 

++	else {

++		if      (GSpeed_sel[0]) PHY_00h = 0x0140;

++		else if (GSpeed_sel[1]) PHY_00h = 0x2100;

++		else                    PHY_00h = 0x0100;

++	}

++}

++

++//------------------------------------------------------------

++void phy_sel (int loop_phy) {

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("phy_sel\n"); 

++	    Debug_delay();

++    #endif

++

++	PHY_ID2 = phy_read( PHY_REG_ID_1 );

++	PHY_ID3 = phy_read( PHY_REG_ID_2 );

++	phy_set00h(loop_phy);

++

++	if      ((PHY_ID2 == 0xffff) && (PHY_ID3 == 0xffff) && !Enable_SkipChkPHY) {

++	    sprintf(PHYName, "--"); 

++	    FindErr(Err_PHY_Type);

++	}

++#ifdef Enable_CheckZeroPHYID

++	else if ((PHY_ID2 == 0x0000) && (PHY_ID3 == 0x0000) && !Enable_SkipChkPHY) {

++	    sprintf(PHYName, "--"); FindErr(Err_PHY_Type);

++	}

++#endif

++

++	if      (phy_chk(0x0362, 0x5e6a, 0xfff0     )) {sprintf(PHYName, "BCM54612"        ); if (Enable_InitPHY) phy_broadcom0(loop_phy);}//BCM54612         1G/100/10M  RGMII

++	else if (phy_chk(0x0362, 0x5d10, 0xfff0     )) {sprintf(PHYName, "BCM54616S"       ); if (Enable_InitPHY) phy_broadcom0(loop_phy);}//BCM54616A        1G/100/10M  RGMII	    

++	else if (phy_chk(0x0040, 0x61e0, PHYID3_Mask)) {sprintf(PHYName, "BCM5221"         ); if (Enable_InitPHY) phy_broadcom (loop_phy);}//BCM5221             100/10M  MII, RMII

++	else if (phy_chk(0x0141, 0x0dd0, 0xfff0     )) {sprintf(PHYName, "88E1512"         ); if (Enable_InitPHY) phy_marvell2 (loop_phy);}//88E1512          1G/100/10M  RGMII

++	else if (phy_chk(0xff00, 0x1761, 0xffff     )) {sprintf(PHYName, "88E6176(IntLoop)"); if (Enable_InitPHY) phy_marvell1 (loop_phy);}//88E6176          1G/100/10M  2 RGMII Switch

++	else if (phy_chk(0x0141, 0x0e90, 0xfff0     )) {sprintf(PHYName, "88E1310"         ); if (Enable_InitPHY) phy_marvell0 (loop_phy);}//88E1310          1G/100/10M  RGMII

++	else if (phy_chk(0x0141, 0x0cc0, PHYID3_Mask)) {sprintf(PHYName, "88E1111"         ); if (Enable_InitPHY) phy_marvell  (loop_phy);}//88E1111          1G/100/10M  GMII, MII, RGMII

++	else if (phy_chk(0x001c, 0xc816, 0xffff     )) {sprintf(PHYName, "RTL8201F"        ); if (Enable_InitPHY) phy_realtek4 (loop_phy);}//RTL8201F            100/10M  MII, RMII

++	else if (phy_chk(0x001c, 0xc815, 0xfff0     )) {sprintf(PHYName, "RTL8201E"        ); if (Enable_InitPHY) phy_realtek0 (loop_phy);}//RTL8201E            100/10M  MII, RMII(RTL8201E(L)-VC only)

++	else if (phy_chk(0x001c, 0xc912, 0xffff     )) {sprintf(PHYName, "RTL8211C"        ); if (Enable_InitPHY) phy_realtek3 (loop_phy);}//RTL8211C         1G/100/10M  RGMII

++	else if (phy_chk(0x001c, 0xc914, 0xffff     )) {sprintf(PHYName, "RTL8211D"        ); if (Enable_InitPHY) phy_realtek1 (loop_phy);}//RTL8211D         1G/100/10M  GMII(RTL8211DN/RTL8211DG only), MII(RTL8211DN/RTL8211DG only), RGMII

++	else if (phy_chk(0x001c, 0xc915, 0xffff     )) {sprintf(PHYName, "RTL8211E"        ); if (Enable_InitPHY) phy_realtek2 (loop_phy);}//RTL8211E         1G/100/10M  GMII(RTL8211EG only), RGMII

++	else if (phy_chk(0x0000, 0x8201, PHYID3_Mask)) {sprintf(PHYName, "RTL8201N"        ); if (Enable_InitPHY) phy_realtek  (loop_phy);}//RTL8201N            100/10M  MII, RMII

++	else if (phy_chk(0x0007, 0xc0c4, PHYID3_Mask)) {sprintf(PHYName, "LAN8700"         ); if (Enable_InitPHY) phy_smsc     (loop_phy);}//LAN8700             100/10M  MII, RMII

++	else if (phy_chk(0x0022, 0x1555, 0xfff0     )) {sprintf(PHYName, "KSZ8031/KSZ8051" ); if (Enable_InitPHY) phy_micrel0  (loop_phy);}//KSZ8051/KSZ8031     100/10M  RMII

++	else if (phy_chk(0x0022, 0x1560, 0xfff0     )) {sprintf(PHYName, "KSZ8081"         ); if (Enable_InitPHY) phy_micrel0  (loop_phy);}//KSZ8081             100/10M  RMII

++	else if (phy_chk(0x0022, 0x1512, 0xfff0     )) {sprintf(PHYName, "KSZ8041"         ); if (Enable_InitPHY) phy_micrel   (loop_phy);}//KSZ8041             100/10M  RMII

++	else if (phy_chk(0x0007, 0x0421, 0xfff0     )) {sprintf(PHYName, "VSC8601"         ); if (Enable_InitPHY) phy_vitesse  (loop_phy);}//VSC8601          1G/100/10M  RGMII

++	else                                           {sprintf(PHYName, "default"         ); if (Enable_InitPHY) phy_default  (loop_phy);}//

++}

++

++//------------------------------------------------------------

++void recov_phy (int loop_phy) {

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("recov_phy\n"); 

++	    Debug_delay();

++    #endif

++

++	if      (phy_chk(0x0362, 0x5e6a, 0xfff0     )) recov_phy_broadcom0(loop_phy);//BCM54612  1G/100/10M  RGMII

++	else if (phy_chk(0x0362, 0x5d10, 0xfff0     )) recov_phy_broadcom0(loop_phy);//BCM54616A 1G/100/10M  RGMII

++	else if (phy_chk(0x0141, 0x0dd0, 0xfff0     )) recov_phy_marvell2 (loop_phy);//88E1512   1G/100/10M  RGMII

++	else if (phy_chk(0xff00, 0x1761, 0xffff     )) recov_phy_marvell1 (loop_phy);//88E6176   1G/100/10M  2 RGMII Switch

++	else if (phy_chk(0x0141, 0x0e90, 0xfff0     )) recov_phy_marvell0 (loop_phy);//88E1310   1G/100/10M  RGMII

++	else if (phy_chk(0x0141, 0x0cc0, PHYID3_Mask)) recov_phy_marvell  (loop_phy);//88E1111   1G/100/10M  GMII, MII, RGMII

++	else if (phy_chk(0x001c, 0xc914, 0xffff     )) recov_phy_realtek1 (loop_phy);//RTL8211D  1G/100/10M  GMII(RTL8211DN/RTL8211DG only), MII(RTL8211DN/RTL8211DG only), RGMII

++	else if (phy_chk(0x001c, 0xc915, 0xffff     )) recov_phy_realtek2 (loop_phy);//RTL8211E  1G/100/10M  GMII(RTL8211EG only), RGMII

++	else if (phy_chk(0x001c, 0xc912, 0xffff     )) recov_phy_realtek3 (loop_phy);//RTL8211C  1G/100/10M  RGMII

++	else if (phy_chk(0x0007, 0x0421, 0xfff0     )) recov_phy_vitesse  (loop_phy);//VSC8601   1G/100/10M  RGMII

++}

++

++//------------------------------------------------------------

++void init_phy (int loop_phy) {

++	#ifdef  DbgPrn_FuncHeader

++	    printf ("init_phy\n"); 

++	    Debug_delay();

++    #endif

++	

++	sprintf( PHYID, "PHY%d", SelectMAC + 1 );

++

++	if ( DbgPrn_PHYInit ) 

++	    phy_dump( PHYID );

++

++	if ( find_phyadr() == TRUE ) 

++	    phy_sel( loop_phy );

++

++	if ( DbgPrn_PHYInit )

++	    phy_dump( PHYID );

++}

++

++

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/PLLTESTU.H b/arch/arm/cpu/arm926ejs/aspeed/PLLTESTU.H
+new file mode 100644
+index 0000000..6fa96e6
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/PLLTESTU.H
+@@ -0,0 +1,50 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef PLLTESTU_H
++#define PLLTESTU_H
++
++//PLL Mode Definition
++#define	NAND_PLLMODE		    0x00
++#define	DELAY_PLLMODE		    0x04
++#define	PCI_PLLMODE	            0x08
++#define	DPLL_PLLMODE		    0x2c
++#define	MPLL_PLLMODE		    0x10
++#define	HPLL_PLLMODE		    0x14
++#define	LPC_PLLMODE	            0x18
++#define	VIDEOA_PLLMODE		    0x1c
++#define	D2PLL_PLLMODE		    0x0c
++#define	VIDEOB_PLLMODE		    0x3c
++
++#define	PCI_PLLMODE_AST1160     0x10
++#define	MPLL_PLLMODE_AST1160	0x14
++#define	HPLL_PLLMODE_AST1160	0x14
++#define	DPLL_PLLMODE_AST1160	0x1c
++
++#define	PCI_PLLMODE_AST2300     0x2c
++#define	MPLL_PLLMODE_AST2300	0x10
++#define	HPLL_PLLMODE_AST2300	0x30
++#define	DPLL_PLLMODE_AST2300	0x08
++#define	DEL0_PLLMODE_AST2300	0x00
++
++#define ERR_FATAL		0x00000001
++
++typedef struct _VGAINFO {
++    USHORT usDeviceID;
++    UCHAR  jRevision;           
++    
++    ULONG  ulMCLK;
++    ULONG  ulDRAMBusWidth;    
++    
++    ULONG  ulCPUCLK;
++    ULONG  ulAHBCLK;    
++} _VGAInfo;
++
++#endif // End PLLTESTU_H
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/PLLTESTU.c b/arch/arm/cpu/arm926ejs/aspeed/PLLTESTU.c
+new file mode 100644
+index 0000000..95958b0
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/PLLTESTU.c
+@@ -0,0 +1,411 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#define PLLTEST_C
++static const char ThisFile[] = "PLLTEST.c";
++
++#include "SWFUNC.H"
++
++#include <COMMINF.H>
++#include <STDUBOOT.H>
++#include <TYPEDEF.H>
++#include <IO.H>
++#include <PLLTESTU.H>
++
++/*
++ * static
++ */
++static UCHAR jVersion[] = "v.0.57.00";
++             
++void print_usage( void )
++{
++    printf(" PLLTest [pll mode] [err rate]\n");
++    printf("      [pll mode] h-pll: ARM CPU Clock PLL\n");
++    printf("                 m-pll: Memory Clock PLL\n");
++    printf("      [err rate] Error Rate: unit %\n");
++    printf("                 default is 1%\n");
++}             
++             
++BOOL CompareToRing(_VGAInfo *VGAInfo, ULONG ulPLLMode, ULONG ulDCLK, ULONG ulErrRate)
++{
++    ULONG ulCounter, ulLowLimit, ulHighLimit;
++    ULONG ulData, ulValue, ulDiv;
++    ULONG ulSCUBase;
++    double del0;
++    ULONG uldel0;
++    
++    if ((VGAInfo->usDeviceID == 0x1160) || (VGAInfo->usDeviceID == 0x1180))
++        ulSCUBase = 0x80fc8200;    
++    else
++        ulSCUBase = 0x1e6e2000;
++
++    //Fixed AST2300 H-PLL can't Get Correct Value in VGA only mode, ycchen@081711
++    if ( (VGAInfo->jRevision >= 0x20) && (ulPLLMode == HPLL_PLLMODE_AST2300) )
++    {
++        WriteSOC_DD(ulSCUBase, 0x1688a8a8);	    
++        ulData = ReadSOC_DD(ulSCUBase + 0x08);            
++        WriteSOC_DD(ulSCUBase + 0x08, ulData & 0xFFFFFF00);	    
++    }
++	    	    
++    ulCounter = (ulDCLK/1000) * 512 / 24000 - 1;
++    ulLowLimit = ulCounter * (100 - ulErrRate) / 100;
++    ulHighLimit = ulCounter * (100 + ulErrRate) / 100;
++
++    DELAY(10);
++    WriteSOC_DD(ulSCUBase, 0x1688a8a8);
++    WriteSOC_DD(ulSCUBase + 0x28, (ulHighLimit << 16) | ulLowLimit);
++    WriteSOC_DD(ulSCUBase + 0x10, ulPLLMode);
++    WriteSOC_DD(ulSCUBase + 0x10, ulPLLMode | 0x03);
++    DELAY(1);
++    do {
++        ulData = ReadSOC_DD(ulSCUBase + 0x10);            
++    } while (!(ulData & 0x40));	
++    ulValue = ReadSOC_DD(ulSCUBase + 0x14);            
++    
++    //Patch for AST1160/1180 DCLK calculate
++    if ( ((VGAInfo->usDeviceID == 0x1160) || (VGAInfo->usDeviceID == 0x1180)) && (ulPLLMode == DPLL_PLLMODE_AST1160) )
++    {
++        ulData = ReadSOC_DD(0x80fc906c);            
++    	ulDiv   = ulData & 0x000c0000;
++    	ulDiv >>= 18;
++    	ulDiv++;
++    	ulValue /= ulDiv;
++    }
++    
++    if ( (VGAInfo->jRevision >= 0x20) && (ulPLLMode == DEL0_PLLMODE_AST2300) )
++    {
++      del0 = (double)(24.0 * (ulValue + 1) / 512.0);
++      del0 = 1000/del0/16/8;
++      uldel0 = (ULONG) (del0 * 1000000);
++      if (uldel0 < ulDCLK)
++      {
++          printf( "[PASS][DEL0] Actual DEL0:%f ns, Max. DEL0:%f ns \n", del0, (double)ulDCLK/1000000);    		      
++          ulData |= 0x80;
++      }    
++      else
++      {
++          printf( "[ERROR][DEL0] Actual DEL0:%f ns, Max. DEL0:%f ns \n", del0, (double)ulDCLK/1000000);    		      	      
++          ulData == 0x00;    
++      }    
++    }	
++    else
++    {
++        printf( "[INFO] PLL Predict Count = %x, Actual Count = %x \n", ulCounter, ulValue);	
++    }
++    
++    WriteSOC_DD(ulSCUBase + 0x10, 0x2C);	//disable ring
++        
++    if (ulData & 0x80)
++        return (TRUE);
++    else
++        return(FALSE);    	
++} /* CompareToRing */	
++
++VOID GetDRAMInfo(_VGAInfo *VGAInfo)
++{
++    ULONG ulData, ulData2;
++    ULONG ulRefPLL, ulDeNumerator, ulNumerator, ulDivider, ulOD;
++
++    if (VGAInfo->jRevision >= 0x10)
++    {
++        WriteSOC_DD(0x1e6e2000, 0x1688A8A8);
++	    
++        //Get DRAM Bus Width
++        ulData  = ReadSOC_DD(0x1e6e0004);        
++        if (ulData & 0x40)
++           VGAInfo->ulDRAMBusWidth = 16;
++        else    
++           VGAInfo->ulDRAMBusWidth = 32;    
++  
++        ulRefPLL = 24000;	            
++        if (VGAInfo->jRevision >= 0x30)	//AST2400
++        {
++            ulData = ReadSOC_DD(0x1e6e2070);
++            if (ulData & 0x00800000)	//D[23] = 1
++                ulRefPLL = 25000;	            
++        }         
++
++        ulData  = ReadSOC_DD(0x1e6e2020);                                
++        ulDeNumerator = ulData & 0x0F;
++        ulNumerator = (ulData & 0x07E0) >> 5;
++        ulOD = (ulData & 0x10) ? 1:2;
++            
++        ulData = (ulData & 0x7000) >> 12;        
++        switch (ulData)
++        {
++            case 0x07:
++                ulDivider = 16;
++                break;
++            case 0x06:
++                ulDivider = 8;
++                break;
++            case 0x05:
++                ulDivider = 4;
++                break;
++            case 0x04:
++                ulDivider = 2;
++                break;        
++            default:
++                ulDivider = 0x01;                         
++        }    
++    
++        VGAInfo->ulMCLK = ulRefPLL * ulOD * (ulNumerator + 2) / ((ulDeNumerator + 1) * ulDivider * 1000);                  	        
++    }    
++} // GetDRAMInfo
++
++VOID GetCLKInfo( _VGAInfo *VGAInfo)
++{
++    ULONG ulData, ulCPUTrap, ulAHBTrap;
++    ULONG ulRefPLL, ulDeNumerator, ulNumerator, ulDivider, ulOD;
++
++    if (VGAInfo->jRevision >= 0x30)
++    {
++        WriteSOC_DD(0x1e6e2000, 0x1688a8a8);
++        ulData = ReadSOC_DD(0x1e6e2024);            
++        if (ulData & 0x40000)		//from H-PLL		
++        {
++            ulRefPLL = 24000;	            
++            ulData = ReadSOC_DD(0x1e6e2070);
++            if (ulData & 0x00800000)	//D[23] = 1
++                ulRefPLL = 25000;	            
++	        
++            ulData = ReadSOC_DD(0x1e6e2024);            
++                
++            ulDeNumerator = ulData & 0x0F;
++            ulNumerator = (ulData & 0x07E0) >> 5;
++            ulOD = (ulData & 0x10) ? 1:2;                    
++            
++            VGAInfo->ulCPUCLK = ulRefPLL * ulOD * (ulNumerator + 2) / ((ulDeNumerator + 1) * 1000);          
++        	
++        }
++        else				//from trapping
++        {        
++             ulRefPLL = 24;	            
++             ulData = ReadSOC_DD(0x1e6e2070);
++             if (ulData & 0x00800000)	//D[23] = 1
++                ulRefPLL = 25; 
++                         
++             ulCPUTrap = ulData & 0x0300;
++             ulCPUTrap >>= 8;
++         
++             switch (ulCPUTrap)
++             {
++                case 0x00:
++                    VGAInfo->ulCPUCLK = ulRefPLL * 16;
++                    break;
++                case 0x01:
++                    VGAInfo->ulCPUCLK = ulRefPLL * 15;
++                    break;
++                case 0x02:
++                    VGAInfo->ulCPUCLK = ulRefPLL * 14;
++                    break;
++                case 0x03:
++                    VGAInfo->ulCPUCLK = ulRefPLL * 17;
++                    break;
++             }	
++         
++        }
++        
++        ulData = ReadSOC_DD(0x1e6e2070);            
++        ulAHBTrap = ulData & 0x0c00;
++        ulAHBTrap >>= 10;        
++        switch (ulAHBTrap)
++        {
++            case 0x00:
++                VGAInfo->ulAHBCLK = VGAInfo->ulCPUCLK;
++                break;	
++            case 0x01:
++                VGAInfo->ulAHBCLK = VGAInfo->ulCPUCLK / 2;
++                break;	        
++            case 0x02:
++                VGAInfo->ulAHBCLK = VGAInfo->ulCPUCLK / 4;
++                break;	        
++            case 0x03:
++                VGAInfo->ulAHBCLK = VGAInfo->ulCPUCLK / 3;
++            break;	
++        }	
++	        
++    } //AST2400	    
++    else if (VGAInfo->jRevision >= 0x20)
++    {
++        WriteSOC_DD(0x1e6e2000, 0x1688a8a8);
++        ulData = ReadSOC_DD(0x1e6e2024);            
++        if (ulData & 0x40000)		//from H-PLL		
++        {
++            ulRefPLL = 24000;
++            
++            ulData = ReadSOC_DD(0x1e6e2024);            
++                
++            ulDeNumerator = ulData & 0x0F;
++            ulNumerator = (ulData & 0x07E0) >> 5;
++            ulOD = (ulData & 0x10) ? 1:2;                    
++            
++            VGAInfo->ulCPUCLK = ulRefPLL * ulOD * (ulNumerator + 2) / ((ulDeNumerator + 1) * 1000);          
++        	
++        }
++        else				//from trapping
++        {        
++             ulData = ReadSOC_DD(0x1e6e2070);            
++             ulCPUTrap = ulData & 0x0300;
++             ulCPUTrap >>= 8;
++         
++             switch (ulCPUTrap)
++             {
++                case 0x00:
++                    VGAInfo->ulCPUCLK = 384;
++                    break;
++                case 0x01:
++                    VGAInfo->ulCPUCLK = 360;
++                    break;
++                case 0x02:
++                    VGAInfo->ulCPUCLK = 336;
++                    break;
++                case 0x03:
++                    VGAInfo->ulCPUCLK = 408;
++                    break;
++             }	
++         
++        }
++        
++        ulData = ReadSOC_DD(0x1e6e2070);            
++        ulAHBTrap = ulData & 0x0c00;
++        ulAHBTrap >>= 10;        
++        switch (ulAHBTrap)
++        {
++            case 0x00:
++                VGAInfo->ulAHBCLK = VGAInfo->ulCPUCLK;
++                break;	
++            case 0x01:
++                VGAInfo->ulAHBCLK = VGAInfo->ulCPUCLK / 2;
++                break;	        
++            case 0x02:
++                VGAInfo->ulAHBCLK = VGAInfo->ulCPUCLK / 4;
++                break;	        
++            case 0x03:
++                VGAInfo->ulAHBCLK = VGAInfo->ulCPUCLK / 3;
++            break;	
++        }	
++	        
++    } //AST2300    
++} // GetCLKInfo
++
++int pll_function(int argc, char *argv[])
++{
++    _VGAInfo *pVGAInfo;
++    ULONG    ulErrRate = 1;
++    ULONG    PLLMode;
++    ULONG    RefClk;
++    CHAR     *stop_at;
++    CHAR     i;
++    
++    printf("**************************************************** \n");       
++    printf("*** ASPEED Graphics PLL Test %s Log       *** \n", jVersion);
++    printf("***                                   for u-boot *** \n");
++    printf("**************************************************** \n"); 
++    printf("\n"); 
++    
++    // Check chip type
++    switch ( ReadSOC_DD( 0x1e6e2000 + 0x7c ) ) {   
++        case 0x02010303 :
++        case 0x02000303 : 
++            printf("The chip is AST2400\n" ); 
++            pVGAInfo->usDeviceID = 0x2400; 
++            pVGAInfo->jRevision  = 0x30;         
++            break;
++            
++        case 0x02010103 :
++        case 0x02000003 : 
++            printf("The chip is AST1400\n" ); 
++            pVGAInfo->usDeviceID = 0x1400; 
++            pVGAInfo->jRevision  = 0x30;   
++            break;
++            
++        case 0x01010303 :
++        case 0x01000003 : 
++            printf("The chip is AST2300\n" ); 
++            pVGAInfo->usDeviceID = 0x2300; 
++            pVGAInfo->jRevision  = 0x20;   
++            break;
++        
++        case 0x01010203 : 
++            printf("The chip is AST1050\n" ); 
++            pVGAInfo->usDeviceID = 0x1050; 
++            pVGAInfo->jRevision  = 0x20;   
++            break;
++                    
++        default     : 
++            printf ("Error Silicon Revision ID(SCU7C) %08lx!!!\n", ReadSOC_DD( 0x1e6e2000 + 0x7c ) ); 
++            return(1);
++    }
++    
++    
++    GetDRAMInfo( pVGAInfo );
++    GetCLKInfo( pVGAInfo );
++
++    if ( ( argc <= 1 ) || ( argc >= 4 ) ){
++        print_usage();
++        return (ERR_FATAL);
++    }
++    else {
++        for ( i = 1; i < argc; i++ ) {
++            switch ( i ) {
++                case 1:
++                    if (!strcmp(argv[i], "m-pll"))
++                    {
++                    	if (pVGAInfo->jRevision >= 0x20)
++                    	    PLLMode = MPLL_PLLMODE_AST2300;
++                    	else
++                    	    PLLMode = MPLL_PLLMODE;
++                    	
++                    	RefClk = pVGAInfo->ulMCLK * 1000000;
++                    	if (pVGAInfo->jRevision >= 0x20)	//dual-edge
++                    	    RefClk /= 2;            	
++                    }
++                    else if (!strcmp(argv[i], "h-pll"))
++                    {
++           	            if (pVGAInfo->jRevision >= 0x20)
++                            PLLMode = HPLL_PLLMODE_AST2300;
++                        else
++                            PLLMode = HPLL_PLLMODE;
++                        
++                        //AST2300 only has HCLK ring test mode, ycchen@040512
++                        RefClk = pVGAInfo->ulCPUCLK * 1000000;	//Other  : H-PLL
++                        if (pVGAInfo->jRevision >= 0x20)	//AST2300: HCLK
++                            RefClk = pVGAInfo->ulAHBCLK * 1000000;
++                    }
++                    else {
++                        print_usage();
++                        return (ERR_FATAL);
++                    }
++                    break;
++                case 2:
++                    ulErrRate = (ULONG) strtoul(argv[i], &stop_at, 10);	                    
++
++                    break;
++                default: 
++                    break;
++            } // End switch()
++        } // End for
++    } 
++    
++    /* Compare ring */
++    if (CompareToRing(pVGAInfo, PLLMode, RefClk, ulErrRate ) == TRUE)
++    {
++	    printf("[PASS] %s PLL Check Pass!! \n", argv[1]);
++        return 0;
++    }
++    else
++    {
++	    printf("[ERROR] %s PLL Check Failed!! \n", argv[1]);	
++        return (ERR_FATAL);
++    }
++}
++
++
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/SPIM.c b/arch/arm/cpu/arm926ejs/aspeed/SPIM.c
+new file mode 100644
+index 0000000..e1bdd07
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/SPIM.c
+@@ -0,0 +1,63 @@
++/*

++ *  This program is distributed in the hope that it will be useful,

++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

++ *  GNU General Public License for more details.

++ *

++ *  You should have received a copy of the GNU General Public License

++ *  along with this program; if not, write to the Free Software

++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

++ */

++#define SPIM_C

++static const char ThisFile[] = "SPIM.c";

++

++#include "SWFUNC.H"

++

++#ifdef SPI_BUS

++

++#include <stdio.h>

++#include <stdlib.h>

++#include <conio.h>

++#include <string.h>

++#include "TYPEDEF.H"

++#include "LIB_SPI.H"

++

++#define SPIM_CMD_WHA     0x01

++#define SPIM_CMD_RD      0x0B

++#define SPIM_CMD_DRD     0xBB

++#define SPIM_CMD_WR      0x02

++#define SPIM_CMD_DWR     0xD2

++#define SPIM_CMD_STA     0x05

++#define SPIM_CMD_ENBYTE  0x06

++#define SPIM_CMD_DISBYTE 0x04

++

++ULONG spim_cs;

++ULONG spim_base;

++ULONG spim_hadr;

++

++void spim_end()

++{

++  ULONG data;

++

++  data = MIndwm((ULONG)mmiobase, 0x1E620010 + (spim_cs << 2));

++  MOutdwm( (ULONG)mmiobase, 0x1E620010 + (spim_cs << 2), data | 0x4);

++  MOutdwm( (ULONG)mmiobase, 0x1E620010 + (spim_cs << 2), data);

++}

++

++//------------------------------------------------------------

++void spim_init(int cs)

++{

++  ULONG data;

++

++  spim_cs = cs;

++  MOutdwm( (ULONG)mmiobase, 0x1E620000, (0x2 << (cs << 1)) | (0x10000 << cs));

++  MOutdwm( (ULONG)mmiobase, 0x1E620010 + (cs << 2), 0x00000007);

++  MOutdwm( (ULONG)mmiobase, 0x1E620010 + (cs << 2), 0x00002003);

++  MOutdwm( (ULONG)mmiobase, 0x1E620004, 0x100 << cs);

++  data = MIndwm((ULONG)mmiobase, 0x1E620030 + (cs << 2));

++  spim_base = 0x20000000 | ((data & 0x007f0000) << 7);

++  MOutwm ( (ULONG)mmiobase, spim_base, SPIM_CMD_WHA);

++  spim_end();

++  spim_hadr = 0;

++}

++#endif // End SPI_BUS

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/STDUBOOT.H b/arch/arm/cpu/arm926ejs/aspeed/STDUBOOT.H
+new file mode 100644
+index 0000000..7fbf590
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/STDUBOOT.H
+@@ -0,0 +1,18 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef STDUBOOT_H
++#define STDUBOOT_H
++
++unsigned long int strtoul(char *string, char **endPtr, int base);
++int atoi( char s[] );
++int rand(void);
++
++#endif // End STDUBOOT_H
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/STDUBOOT.c b/arch/arm/cpu/arm926ejs/aspeed/STDUBOOT.c
+new file mode 100644
+index 0000000..90e2997
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/STDUBOOT.c
+@@ -0,0 +1,235 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#define STDUBOOT_C
++static const char ThisFile[] = "STDUBOOT.c";
++
++#include "SWFUNC.H"
++
++#ifdef SLT_UBOOT
++
++int isspace ( char c )
++{
++    if ( ( c == ' ' ) || ( c == 9 ) || ( c == 13 ) )
++        return 1;
++    
++    return 0;
++}
++
++/* 
++ * strtoul.c --
++ *
++ *  Source code for the "strtoul" library procedure.
++ *
++ * Copyright 1988 Regents of the University of California
++ * Permission to use, copy, modify, and distribute this
++ * software and its documentation for any purpose and without
++ * fee is hereby granted, provided that the above copyright
++ * notice appear in all copies.  The University of California
++ * makes no representations about the suitability of this
++ * software for any purpose.  It is provided "as is" without
++ * express or implied warranty.
++ */
++
++//#include <ctype.h>
++
++/*
++ * The table below is used to convert from ASCII digits to a
++ * numerical equivalent.  It maps from '0' through 'z' to integers
++ * (100 for non-digit characters).
++ */
++
++static char cvtIn[] = {
++    0, 1, 2, 3, 4, 5, 6, 7, 8, 9,       /* '0' - '9' */
++    100, 100, 100, 100, 100, 100, 100,      /* punctuation */
++    10, 11, 12, 13, 14, 15, 16, 17, 18, 19, /* 'A' - 'Z' */
++    20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
++    30, 31, 32, 33, 34, 35,
++    100, 100, 100, 100, 100, 100,       /* punctuation */
++    10, 11, 12, 13, 14, 15, 16, 17, 18, 19, /* 'a' - 'z' */
++    20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
++    30, 31, 32, 33, 34, 35};
++
++/*
++ *----------------------------------------------------------------------
++ *
++ * strtoul --
++ *
++ *  Convert an ASCII string into an integer.
++ *
++ * Results:
++ *  The return value is the integer equivalent of string.  If endPtr
++ *  is non-NULL, then *endPtr is filled in with the character
++ *  after the last one that was part of the integer.  If string
++ *  doesn't contain a valid integer value, then zero is returned
++ *  and *endPtr is set to string.
++ *
++ * Side effects:
++ *  None.
++ *
++ *----------------------------------------------------------------------
++ */
++
++unsigned long int
++strtoul(char *string, char **endPtr, int base)
++    /* string;     String of ASCII digits, possibly
++                 * preceded by white space.  For bases
++                 * greater than 10, either lower- or
++                 * upper-case digits may be used.
++                 */
++    /* **endPtr;   Where to store address of terminating
++                 * character, or NULL. */
++    /* base;       Base for conversion.  Must be less
++                 * than 37.  If 0, then the base is chosen
++                 * from the leading characters of string:
++                 * "0x" means hex, "0" means octal, anything
++                 * else means decimal.
++                 */
++{
++    register char *p;
++    register unsigned long int result = 0;
++    register unsigned digit;
++    int anyDigits = 0;
++
++    /*
++     * Skip any leading blanks.
++     */
++
++    p = string;
++    while (isspace(*p)) {
++    p += 1;
++    }
++
++    /*
++     * If no base was provided, pick one from the leading characters
++     * of the string.
++     */
++    
++    if (base == 0)
++    {
++    if (*p == '0') {
++        p += 1;
++        if (*p == 'x') {
++        p += 1;
++        base = 16;
++        } else {
++
++        /*
++         * Must set anyDigits here, otherwise "0" produces a
++         * "no digits" error.
++         */
++
++        anyDigits = 1;
++        base = 8;
++        }
++    }
++    else base = 10;
++    } else if (base == 16) {
++
++    /*
++     * Skip a leading "0x" from hex numbers.
++     */
++
++    if ((p[0] == '0') && (p[1] == 'x')) {
++        p += 2;
++    }
++    }
++
++    /*
++     * Sorry this code is so messy, but speed seems important.  Do
++     * different things for base 8, 10, 16, and other.
++     */
++
++    if (base == 8) {
++    for ( ; ; p += 1) {
++        digit = *p - '0';
++        if (digit > 7) {
++        break;
++        }
++        result = (result << 3) + digit;
++        anyDigits = 1;
++    }
++    } else if (base == 10) {
++    for ( ; ; p += 1) {
++        digit = *p - '0';
++        if (digit > 9) {
++        break;
++        }
++        result = (10*result) + digit;
++        anyDigits = 1;
++    }
++    } else if (base == 16) {
++    for ( ; ; p += 1) {
++        digit = *p - '0';
++        if (digit > ('z' - '0')) {
++        break;
++        }
++        digit = cvtIn[digit];
++        if (digit > 15) {
++        break;
++        }
++        result = (result << 4) + digit;
++        anyDigits = 1;
++    }
++    } else {
++    for ( ; ; p += 1) {
++        digit = *p - '0';
++        if (digit > ('z' - '0')) {
++        break;
++        }
++        digit = cvtIn[digit];
++        if (digit >= base) {
++        break;
++        }
++        result = result*base + digit;
++        anyDigits = 1;
++    }
++    }
++
++    /*
++     * See if there were any digits at all.
++     */
++
++    if (!anyDigits) {
++    p = string;
++    }
++
++    if (endPtr != 0) {
++    *endPtr = p;
++    }
++
++    return result;
++}
++
++// -----------------------------------------------------------------------------
++int atoi( char s[] )
++{
++
++    int i;
++    int ans = 0;
++
++    for( i = 0; s[i] >= '0' && s[i] <= '9'; ++i )
++        ans = ( 10 * ans ) + ( s[i] - '0' );
++
++    return ans;
++} 
++
++// -----------------------------------------------------------------------------
++/* rand:return pseudo-random integer on 0...32767 */
++int rand(void)
++{
++    static unsigned long int next = 1;
++    
++    next = next * 1103515245 + 12345; 
++
++    return (unsigned int) ( next / 65536 ) % 32768;
++}
++
++#endif // End SLT_UBOOT
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/STRESS.c b/arch/arm/cpu/arm926ejs/aspeed/STRESS.c
+new file mode 100644
+index 0000000..dffd64f
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/STRESS.c
+@@ -0,0 +1,145 @@
++/*

++ *  This program is distributed in the hope that it will be useful,

++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

++ *  GNU General Public License for more details.

++ *

++ *  You should have received a copy of the GNU General Public License

++ *  along with this program; if not, write to the Free Software

++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

++ */

++#define STRESS_C

++static const char ThisFile[] = "STRESS.c";

++

++#include "SWFUNC.H"

++#include <COMMINF.H>

++#include <IO.H>

++

++#define TIMEOUT_DRAM              5000000

++

++/* ------------------------------------------------------------------------- */

++int MMCTestBurst(unsigned int datagen)

++{

++  unsigned int data;

++  unsigned int timeout = 0;

++  

++  WriteSOC_DD( 0x1E6E0070, 0x00000000 );

++  WriteSOC_DD( 0x1E6E0070, (0x000000C1 | (datagen << 3)) );

++  

++  do {

++    data = ReadSOC_DD( 0x1E6E0070 ) & 0x3000;

++

++    if( data & 0x2000 )

++      return(0);

++

++    if( ++timeout > TIMEOUT_DRAM ) {

++      printf("Timeout!!\n");

++      WriteSOC_DD( 0x1E6E0070, 0x00000000 );

++      

++      return(0);

++    }

++  } while( !data );

++  WriteSOC_DD( 0x1E6E0070, 0x00000000 );

++  

++  return(1);

++}

++

++/* ------------------------------------------------------------------------- */

++int MMCTestSingle(unsigned int datagen)

++{

++  unsigned int data;

++  unsigned int timeout = 0;

++

++  WriteSOC_DD( 0x1E6E0070, 0x00000000 );

++  WriteSOC_DD( 0x1E6E0070, (0x00000085 | (datagen << 3)) );

++  

++  do {

++    data = ReadSOC_DD( 0x1E6E0070 ) & 0x3000;

++    

++    if( data & 0x2000 )

++      return(0);

++    

++    if( ++timeout > TIMEOUT_DRAM ){

++      printf("Timeout!!\n");

++      WriteSOC_DD( 0x1E6E0070, 0x00000000 );

++      

++      return(0);

++    }

++  } while ( !data );

++  WriteSOC_DD( 0x1E6E0070, 0x00000000 );

++  

++  return(1);

++}

++

++/* ------------------------------------------------------------------------- */

++int MMCTest()

++{

++  unsigned int pattern;

++

++  pattern = ReadSOC_DD( 0x1E6E2078 );

++  printf("Pattern = %08X : ",pattern);

++

++  WriteSOC_DD(0x1E6E0074, (DRAM_MapAdr | 0x7fffff) );

++  WriteSOC_DD(0x1E6E007C, pattern );

++  

++  if(!MMCTestBurst(0))    return(0);

++  if(!MMCTestBurst(1))    return(0);

++  if(!MMCTestBurst(2))    return(0);

++  if(!MMCTestBurst(3))    return(0);

++  if(!MMCTestBurst(4))    return(0);

++  if(!MMCTestBurst(5))    return(0);

++  if(!MMCTestBurst(6))    return(0);

++  if(!MMCTestBurst(7))    return(0);

++  if(!MMCTestSingle(0))   return(0);

++  if(!MMCTestSingle(1))   return(0);

++  if(!MMCTestSingle(2))   return(0);

++  if(!MMCTestSingle(3))   return(0);

++  if(!MMCTestSingle(4))   return(0);

++  if(!MMCTestSingle(5))   return(0);

++  if(!MMCTestSingle(6))   return(0);

++  if(!MMCTestSingle(7))   return(0);

++

++  return(1);

++}

++

++/* ------------------------------------------------------------------------- */

++int dram_stress_function(int argc, char *argv[])

++{

++    unsigned int Pass;

++    unsigned int PassCnt     = 0;

++    unsigned int Testcounter = 0;

++    int          ret = 1;

++    char         *stop_at;

++

++    printf("**************************************************** \n");       

++    printf("*** ASPEED Stress DRAM                           *** \n");

++    printf("***                          20131107 for u-boot *** \n");

++    printf("**************************************************** \n"); 

++    printf("\n"); 

++  

++    if ( argc != 2 ){

++        ret = 0;

++        return ( ret );

++    }

++    else {

++        Testcounter = (unsigned int) strtoul(argv[1], &stop_at, 10);                     

++    }

++

++    WriteSOC_DD(0x1E6E0000, 0xFC600309);   

++

++    while( ( Testcounter > PassCnt ) || ( Testcounter == 0 ) ){

++        if( !MMCTest() ) {

++            printf("FAIL...%d/%d\n", PassCnt, Testcounter);

++            ret = 0;

++      

++            break;

++        }

++        else {

++            PassCnt++;

++            printf("Pass %d/%d\n", PassCnt, Testcounter);

++        }

++     } // End while()

++     

++     return( ret );

++}

++

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/SWFUNC.H b/arch/arm/cpu/arm926ejs/aspeed/SWFUNC.H
+new file mode 100644
+index 0000000..0a03654
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/SWFUNC.H
+@@ -0,0 +1,137 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef SWFUNC_H
++#define SWFUNC_H
++
++
++//---------------------------------------------------------
++// Program information
++//---------------------------------------------------------
++#define    VER_NAME    "Ver 0.34 version @2014/03/25 0932"
++
++/* == Step 1: ====== Support OS system =================== */
++// LinuxAP
++// #define Windows
++#define SLT_UBOOT
++//#define SLT_DOS
++
++/* == Step 2:======== Support interface ================== */
++/* Choose One */
++//#define SPI_BUS
++//#define USE_LPC
++//#define USE_P2A     // PCI or PCIe bus to AHB bus
++
++/* == Step 3:==========  Support Chip   ================== */
++//#define AST1010_CHIP
++//#define AST3200_IOMAP
++//#define FPGA
++
++#ifdef AST1010_CHIP
++    #ifdef SLT_UBOOT
++        #define AST1010_IOMAP   1
++    #endif
++    #ifdef SLT_DOS
++        #define AST1010_IOMAP   2
++        
++        // AST1010 only has LPC interface 
++        #undef USE_P2A
++        #undef SPI_BUS
++        #define USE_LPC
++    #endif
++#endif   
++
++/* == Step 4:==========   Select PHY    ================== */
++//#define SUPPORT_PHY_LAN9303        // Initial PHY via I2C bus
++#define LAN9303_I2C_BUSNUM      6  // 1-based
++#define LAN9303_I2C_ADR         0x14
++
++/* ====================== Program ======================== */
++// The "PHY_NCSI" option is only for DOS compiler
++#if defined (PHY_NCSI)
++    #ifdef SLT_UBOOT
++        #error Wrong setting......
++    #endif
++#endif
++
++#if defined (PHY_NCSI)
++    #ifdef SUPPORT_PHY_LAN9303
++        #error Wrong setting (Can't support LAN9303)......
++    #endif
++#endif
++
++/* =================  Check setting  ===================== */
++#ifdef SLT_UBOOT
++    #ifdef SLT_DOS
++        #error Can NOT support two OS 
++    #endif
++#endif
++#ifdef SLT_DOS
++    #ifdef SLT_UBOOT
++        #error Can NOT support two OS 
++    #endif
++#endif
++
++#ifdef USE_P2A
++    #ifdef SLT_UBOOT
++        #error Can NOT be set PCI bus in Uboot
++    #endif
++#endif
++#ifdef USE_LPC
++    #ifdef SLT_UBOOT
++        #error Can NOT be set LPC bus in Uboot
++    #endif
++#endif
++#ifdef SPI_BUS
++    #ifdef SLT_UBOOT
++        #error Can NOT be set SPI bus in Uboot 
++    #endif
++#endif
++
++/* ======================== Program flow control ======================== */
++#define RUN_STEP                     5
++// 0: read_scu
++// 1: parameter setup
++// 2: init_scu1,
++// 3: init_scu_macrst
++// 4: Data Initial
++// 5: ALL
++
++/* ====================== Switch print debug message ====================== */
++#define   DbgPrn_Enable_Debug_delay  0
++//#define   DbgPrn_FuncHeader          0 //1
++#define   DbgPrn_ErrFlg              0
++#define   DbgPrn_BufAdr              0 //1
++#define   DbgPrn_Bufdat              0
++#define   DbgPrn_BufdatDetail        0
++#define   DbgPrn_PHYRW               0
++#define   DbgPrn_PHYInit             0
++#define   DbgPrn_PHYName             0
++#define   DbgPrn_DumpMACCnt          0
++#define   DbgPrn_Info                0 //1
++#define   DbgPrn_FRAME_LEN           0
++
++
++/* ============ Enable or Disable Check item of the descriptor ============ */
++#define   CheckRxOwn
++#define   CheckRxErr
++//#define   CheckOddNibble
++#define   CheckCRC
++#define   CheckRxFIFOFull
++#define   CheckRxLen
++//#define   CheckDataEveryTime
++
++//#define   CheckRxbufUNAVA
++#define   CheckRPktLost
++//#define   CheckNPTxbufUNAVA
++#define   CheckTPktLost
++#define   CheckRxBuf
++
++#endif // SWFUNC_H
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/TRAPTEST.c b/arch/arm/cpu/arm926ejs/aspeed/TRAPTEST.c
+new file mode 100644
+index 0000000..72936c0
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/TRAPTEST.c
+@@ -0,0 +1,151 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#define PLLTEST_C
++static const char ThisFile[] = "PLLTEST.c";
++
++#include "SWFUNC.H"
++
++#include <COMMINF.H>
++#include <TYPEDEF.H>
++#include <IO.H>
++
++#define ASTCHIP_2400    0
++#define ASTCHIP_2300    1
++#define ASTCHIP_1400    2
++#define ASTCHIP_1300    3
++#define ASTCHIP_1050    4
++
++const UCHAR jVersion[] = "v.0.60.06";
++
++typedef struct _TRAPINFO {
++    USHORT  CPU_clk;
++    UCHAR   CPU_AHB_ratio;
++} _TrapInfo;
++
++const _TrapInfo AST_default_trap_setting[] = {
++    // CPU_clk, CPU_AHB_ratio
++    { 384,      2 },            // AST2400 or AST1250 ( ASTCHIP_2400 )
++    { 384,      2 },            // AST2300 ( ASTCHIP_2300 )
++    { 384,   0xFF },            // AST1400 ( ASTCHIP_1400 )
++    { 384,   0xFF },            // AST1300 ( ASTCHIP_1300 )
++    { 384,      2 }             // AST1050 ( ASTCHIP_1050 )
++};
++
++int trap_function(int argc, char *argv[])
++{
++    UCHAR   chiptype;   
++    ULONG   ulData, ulTemp; 
++    UCHAR   status = TRUE;
++    USHORT  val_trap;
++    
++    printf("**************************************************** \n");       
++    printf("*** ASPEED Trap Test %s Log               *** \n", jVersion);
++    printf("***                                   for u-boot *** \n");
++    printf("**************************************************** \n"); 
++    printf("\n"); 
++    
++    // Check chip type
++    switch ( ReadSOC_DD( 0x1e6e2000 + 0x7c ) ) {   
++        case 0x02010303 :
++        case 0x02000303 : 
++            printf("The chip is AST2400 or AST1250\n" ); 
++            chiptype = ASTCHIP_2400; 
++            break;
++            
++        case 0x02010103 :
++        case 0x02000003 : 
++            printf("The chip is AST1400\n" ); 
++            chiptype = ASTCHIP_1400; 
++            break;
++            
++        case 0x01010303 :
++        case 0x01000003 : 
++            printf("The chip is AST2300\n" ); 
++            chiptype = ASTCHIP_2300; 
++            break;
++        
++        case 0x01010203 : 
++            printf("The chip is AST1050\n" ); 
++            chiptype = ASTCHIP_1050; 
++            break;
++            
++        case 0x01010003 : 
++            printf("The chip is AST1300\n" ); 
++            chiptype = ASTCHIP_1300; 
++            break;
++            
++        default     : 
++            printf ("Error Silicon Revision ID(SCU7C) %08lx!!!\n", ReadSOC_DD( 0x1e6e2000 + 0x7c ) ); 
++            return(1);
++    }
++    
++    WriteSOC_DD(0x1e6e2000, 0x1688A8A8);
++    ulData = ReadSOC_DD(0x1e6e2070);
++    
++    // Check CPU clock
++    ulTemp  = ulData;
++    ulTemp &= 0x0300;
++    ulTemp >>= 8;
++    
++    switch (ulTemp)
++    {
++        case 0x00:
++            val_trap = 384;
++            break;
++        case 0x01:
++            val_trap = 360;
++            break;
++        case 0x02:
++            val_trap = 336;
++            break;
++        case 0x03:
++            val_trap = 408;
++            break;
++    }
++    
++    if (AST_default_trap_setting[chiptype].CPU_clk != val_trap)
++    {
++        printf("[ERROR] CPU CLK: Correct is %d; Real is %d \n", AST_default_trap_setting[chiptype].CPU_clk, val_trap);	
++    	status = FALSE;
++    }
++           	
++    // Check cpu_ahb_ratio
++    ulTemp  = ulData;
++    ulTemp &= 0x0c00;
++    ulTemp >>= 10;
++    
++    switch (ulTemp)
++    {
++        case 0x00:
++            val_trap = 1;
++            break;
++        case 0x01:
++            val_trap = 2;
++            break;
++        case 0x02:
++            val_trap = 4;
++            break;
++        case 0x03:
++            val_trap = 3;
++            break;
++    }
++    
++    if (AST_default_trap_setting[chiptype].CPU_AHB_ratio != val_trap)
++    {
++        printf("[ERROR] CPU:AHB: Correct is %x:1; Real is %x:1 \n", AST_default_trap_setting[chiptype].CPU_AHB_ratio, val_trap);	
++    	status = FALSE;
++    }
++    
++    if ( status == TRUE )
++        printf("[PASS] hardware trap for CPU clock and CPU\\AHB ratio.\n");
++    
++    return status;
++}
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/TYPEDEF.H b/arch/arm/cpu/arm926ejs/aspeed/TYPEDEF.H
+new file mode 100644
+index 0000000..3053ad7
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/TYPEDEF.H
+@@ -0,0 +1,74 @@
++/*

++ *  This program is distributed in the hope that it will be useful,

++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

++ *  GNU General Public License for more details.

++ *

++ *  You should have received a copy of the GNU General Public License

++ *  along with this program; if not, write to the Free Software

++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

++ */

++#ifndef TYPEDEF_H

++#define TYPEDEF_H

++

++#include "SWFUNC.H"

++

++//

++// Define

++//

++#define   PCI                   1

++#define   PCIE                  2

++#define   AGP                   3

++#define   ACTIVE                4

++

++#if defined(LinuxAP)

++    #ifndef FLONG

++        #define FLONG   unsigned long

++    #endif

++    #ifndef ULONG

++        #define ULONG   unsigned long

++    #endif

++    #ifndef LONG

++        #define LONG    long

++    #endif

++    #ifndef USHORT

++        #define USHORT  unsigned short

++    #endif

++    #ifndef SHORT

++        #define SHORT   short

++    #endif

++    #ifndef UCHAR

++        #define UCHAR   unsigned char

++    #endif

++    #ifndef CHAR

++        #define CHAR    char

++    #endif

++    #ifndef BYTE

++        #define BYTE    unsigned char

++    #endif

++    #ifndef VOID

++        #define VOID    void

++    #endif

++    #ifndef SCHAR

++        #define SCHAR   signed char

++    #endif

++#else	

++/* DOS Program */

++    #define     VOID	  void

++    #define     FLONG     unsigned long

++    #define     ULONG     unsigned long

++    #define     USHORT    unsigned short

++    #define     UCHAR     unsigned char

++    #define     LONG      long

++    #define     SHORT     short

++    #define     CHAR      char

++    #define     BYTE	  UCHAR

++    #define     BOOL	  SHORT

++    #define     BOOLEAN   unsigned short

++    #define     PULONG    ULONG *

++    #define     SCHAR     signed char

++#endif    

++    #define	    TRUE      1

++    #define	    FALSE     0

++    

++#endif // TYPEDEF_H

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/mactest.c b/arch/arm/cpu/arm926ejs/aspeed/mactest.c
+new file mode 100644
+index 0000000..95bd560
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/mactest.c
+@@ -0,0 +1,1215 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#define MACTEST_C
++static const char ThisFile[] = "MACTEST.c";
++
++#include "SWFUNC.H"
++
++#ifdef SLT_UBOOT
++  #include <common.h>
++  #include <command.h>
++  #include <post.h>
++  #include <malloc.h>
++  #include <net.h>
++  #include <COMMINF.H>
++  #include <STDUBOOT.H>
++  #include <IO.H>
++#else
++  #include <stdlib.h>
++  #include <string.h>
++  #include "LIB.H"
++  #include "COMMINF.H"
++  #include "IO.H"
++#endif
++
++const  BYTE        Val_Array[16]    = {0,1, 2,3, 4,5, 6,7, 8,9, 10,11, 12,13, 14,15}; // AST2300-A1
++const  BYTE        Val_Array_A0[16] = {8,1, 10,3, 12,5, 14,7, 0,9, 2,11, 4,13, 6,15}; // AST2300-A0
++
++#ifdef SLT_UBOOT
++int main_function(int argc, char *argv[])
++#endif
++#ifdef SLT_DOS
++int main(int argc, char *argv[])
++#endif
++{
++    CHAR    MAC2_Valid;
++    CHAR    MAC_1GEn;
++    CHAR    MAC1_RMII;
++    CHAR    Enable_IntLoopPHY;
++    CHAR    Disable_RecovPHY;
++    CHAR    Force1G;
++    CHAR    Force10M;
++    CHAR    Force100M;
++    CHAR    *stop_at;
++    ULONG   IOStr_val;
++    ULONG   IOStr_max;
++    ULONG   IOStr_shf;
++    ULONG   IOdly_val;
++    ULONG   Err_Flag_allapeed;    
++    int     DES_LowNumber;
++    int     index;
++    int     i;
++    int     j;
++    #ifdef Enable_NCSI_LOOP_INFINI
++        BYTE    GSpeed_org[3];
++    #endif
++
++#ifdef SPI_BUS
++    VIDEO_ENGINE_INFO VideoEngineInfo;
++#else
++    // ( USE_P2A | USE_LPC )
++    UCHAR   *ulMMIOLinearBaseAddress;
++#endif
++
++    #ifdef SLT_UBOOT
++    #else
++        time(&timestart);
++    #endif
++
++    // For DOS system
++    #if defined(PHY_NCSI)
++        // For DOS compiler OPEN WATCOM
++        ModeSwitch = MODE_NSCI;
++    #else
++        #ifdef SLT_DOS
++        ModeSwitch = MODE_DEDICATED;
++        #endif
++    #endif
++    
++//------------------------------------------------------------
++// Argument Initial
++//------------------------------------------------------------
++    Err_Flag_allapeed = 0;
++    Err_Flag          = 0;
++    Err_Flag_PrintEn  = 1;
++    Loop_rl[0]        = 0;
++    Loop_rl[1]        = 0;
++    Loop_rl[2]        = 0;
++
++//------------------------------------------------------------
++// Bus Initial
++//------------------------------------------------------------
++#if defined(LinuxAP)
++#else   
++  //DOS system
++  #ifdef SPI_BUS
++  #endif
++  #ifdef USE_LPC
++
++        if ( findlpcport( 0x0d ) == 0) {
++            printf("Failed to find proper LPC port \n");
++            
++            return(1);
++        }
++        open_aspeed_sio_password();
++        enable_aspeed_LDU( 0x0d );
++  #endif
++  #ifdef USE_P2A
++        // PCI bus
++        #ifdef DOS_PMODEW
++        if (CheckDOS()) return 1;
++        #endif
++
++        #ifdef  DbgPrn_FuncHeader
++            printf ("Initial-MMIO\n"); 
++            Debug_delay();
++        #endif
++        ulPCIBaseAddress = FindPCIDevice (0x1A03, 0x2000, ACTIVE);
++        if ( ulPCIBaseAddress == 0 ) 
++            ulPCIBaseAddress = FindPCIDevice (0x1688, 0x2000, ACTIVE);
++        if ( ulPCIBaseAddress == 0 ) 
++            ulPCIBaseAddress = FindPCIDevice (0x1A03, 0x0200, ACTIVE);
++        if ( ulPCIBaseAddress == 0 ) 
++            ulPCIBaseAddress = FindPCIDevice (0x1A03, 0x3000, ACTIVE);
++        if ( ulPCIBaseAddress == 0 ) 
++            ulPCIBaseAddress = FindPCIDevice (0x1A03, 0x2010, ACTIVE);
++        if ( ulPCIBaseAddress == 0 ) { 
++            printf ("Can't find device\n"); 
++            
++            return(1);
++        }
++
++        WritePCIReg (ulPCIBaseAddress, 0x04, 0xFFFFFFFc, 0x3);
++        ulMMIOBaseAddress       = ReadPCIReg (ulPCIBaseAddress, 0x14, 0xFFFF0000);
++        ulMMIOLinearBaseAddress = (UCHAR *)MapPhysicalToLinear (ulMMIOBaseAddress, 64 * 1024 * 1024);
++  #endif // #ifdef USE_P2A
++#endif // End defined(LinuxAP)
++
++#ifdef SPI_BUS
++    GetDevicePCIInfo (&VideoEngineInfo);
++    mmiobase = VideoEngineInfo.VGAPCIInfo.ulMMIOBaseAddress;
++    spim_init(SPI_CS);
++#else    
++    // ( USE_P2A | USE_LPC )
++    mmiobase = ulMMIOLinearBaseAddress;
++#endif
++
++//------------------------------------------------------------
++// Check Chip Feature
++//------------------------------------------------------------
++    read_scu();
++
++    if (RUN_STEP >= 1) {
++        switch (SCU_7ch_old) {
++//          case 0x02000003 : sprintf(ASTChipName, "[ ]AST3200-FPGA"                  ); ASTChipType = 6; AST1100 = 0; break;
++            
++            case 0x03020003 : sprintf(ASTChipName, "[ ]AST1010-A2"                    ); ASTChipType = 5; AST1100 = 0; break;
++            case 0x03010003 : sprintf(ASTChipName, "[ ]AST1010-A1"                    ); ASTChipType = 5; AST1100 = 0; break;
++            case 0x03000003 : sprintf(ASTChipName, "[*]AST1010-A0"                    ); ASTChipType = 5; AST1100 = 0; break;
++            
++            case 0x02010303 : sprintf(ASTChipName, "[*]AST2400-A1"                    ); ASTChipType = 4; AST1100 = 0; break;//AST2400-A1
++            case 0x02000303 : sprintf(ASTChipName, "[ ]AST2400-A0"                    ); ASTChipType = 4; AST1100 = 0; break;//AST2400-A0
++            case 0x02010103 : sprintf(ASTChipName, "[*]AST1400-A1"                    ); ASTChipType = 4; AST1100 = 0; break;//AST1400-A1
++            case 0x02000003 : sprintf(ASTChipName, "[ ]AST1400-A0"                    ); ASTChipType = 4; AST1100 = 0; break;//AST1400-A0
++            
++            case 0x01010303 : sprintf(ASTChipName, "[*]AST2300-A1"                    ); ASTChipType = 3; AST1100 = 0; break;//AST2300-A1
++            case 0x01010203 : sprintf(ASTChipName, "[*]AST1050-A1"                    ); ASTChipType = 3; AST1100 = 0; break;//AST1050-A1
++            case 0x01010003 : sprintf(ASTChipName, "[*]AST1300-A1"                    ); ASTChipType = 3; AST1100 = 0; break;//AST1300-A1
++            case 0x01000003 : sprintf(ASTChipName, "[ ]AST2300-A0"                    ); ASTChipType = 3; AST1100 = 0; break;//AST2300-A0
++//          case 0x01860003 : sprintf(ASTChipName, "[ ]AST2300-FPGA"                  ); ASTChipType = 3; AST1100 = 0; break;
++            
++            case 0x00000102 : sprintf(ASTChipName, "[*]AST2200-A1"                    ); ASTChipType = 2; AST1100 = 0; break;//AST2200-A1/A0
++            
++            case 0x00000302 : sprintf(ASTChipName, "[*]AST2100-A3"                    ); ASTChipType = 1; AST1100 = 0; break;//AST2100-A3/A2
++            case 0x00000301 : sprintf(ASTChipName, "[ ]AST2100-A1"                    ); ASTChipType = 1; AST1100 = 0; break;//AST2100-A1
++            case 0x00000300 : sprintf(ASTChipName, "[ ]AST2100-A0"                    ); ASTChipType = 1; AST1100 = 0; break;//AST2100-A0
++            case 0x00000202 : sprintf(ASTChipName, "[*]AST2050/AST1100-A3, AST2150-A1"); ASTChipType = 1; AST1100 = 1; break;//AST2050/AST1100-A3/A2 AST2150-A1/A0
++            case 0x00000201 : sprintf(ASTChipName, "[ ]AST2050/AST1100-A1"            ); ASTChipType = 1; AST1100 = 1; break;//AST2050/AST1100-A1
++            case 0x00000200 : sprintf(ASTChipName, "[ ]AST2050/AST1100-A0"            ); ASTChipType = 1; AST1100 = 1; break;//AST2050/AST1100-A0
++            
++            default     : 
++                printf ("Error Silicon Revision ID(SCU7C) %08lx!!!\n", SCU_7ch_old); 
++                return(1);
++        } // End switch (SCU_7ch_old)
++        
++        switch (ASTChipType) {
++            case 6  : AST2300 = 1; AST2400 = 1; AST1010 = 0; AST3200 = 1; break;
++            case 5  : AST2300 = 1; AST2400 = 1; AST1010 = 1; AST3200 = 0; break;
++            case 4  : AST2300 = 1; AST2400 = 1; AST1010 = 0; AST3200 = 0; break;
++            case 3  : AST2300 = 1; AST2400 = 0; AST1010 = 0; AST3200 = 0; break;
++            default : AST2300 = 0; AST2400 = 0; AST1010 = 0; AST3200 = 0; break;
++        } // End switch (ASTChipType)
++
++        if (ASTChipType == 3) {
++#ifdef Force_Enable_MAC34
++            WriteSOC_DD( SCU_BASE + 0xf0, 0xAEED0001 ); //enable mac34
++            Enable_MAC34 = 1;
++#else
++            if (SCU_f0h_old & 0x00000001) 
++                Enable_MAC34 = 1;
++            else                          
++                Enable_MAC34 = 0;
++#endif
++        } 
++        else {
++            Enable_MAC34 = 0;
++        } // End if (ASTChipType == 3)
++
++    Setting_scu();
++
++//------------------------------------------------------------
++// Argument Input
++//------------------------------------------------------------
++        // Load default value
++        UserDVal         = DEF_USER_DEF_PACKET_VAL;
++        IOTimingBund_arg = DEF_IOTIMINGBUND;
++        PHY_ADR_arg      = DEF_PHY_ADR;
++        TestMode         = DEF_TESTMODE;
++        LOOP_INFINI      = 0;
++        LOOP_MAX_arg     = 0;
++        GCtrl            = ( DEF_MAC_LOOP_BACK << 6 ) | ( DEF_SKIP_CHECK_PHY << 5 ) | ( DEF_INIT_PHY << 3 );
++        GSpeed           = DEF_SPEED;
++        
++        // Get setting information by user
++        GRun_Mode        = (BYTE)atoi(argv[1]);
++
++        if ( ModeSwitch == MODE_NSCI ) {
++            ARPNumCnt        = DEF_ARPNUMCNT;
++            ChannelTolNum    = DEF_CHANNEL2NUM;
++            PackageTolNum    = DEF_PACKAGE2NUM;
++            GSpeed           = SET_100MBPS;        // In NCSI mode, we set to 100M bps
++        }
++        
++        // Setting user's configuration
++        if (argc > 1) {
++            if ( ModeSwitch == MODE_NSCI )
++                switch (argc) {
++                    case 7: ARPNumCnt        = (ULONG)atoi(argv[6]);
++                    case 6: IOTimingBund_arg = (BYTE)atoi(argv[5]);
++                    case 5: TestMode         = (BYTE)atoi(argv[4]);
++                    case 4: ChannelTolNum    = (BYTE)atoi(argv[3]);
++                    case 3: PackageTolNum    = (BYTE)atoi(argv[2]);
++                    default: break;
++                }
++            else
++                switch (argc) {
++                    case 9: UserDVal         = strtoul (argv[8], &stop_at, 16);
++                    case 8: IOTimingBund_arg = (BYTE)atoi(argv[7]);
++                    case 7: PHY_ADR_arg      = (BYTE)atoi(argv[6]);
++                    case 6: TestMode         = (BYTE)atoi(argv[5]);
++                    case 5: strcpy(LOOP_Str, argv[4]);
++                        if (!strcmp(LOOP_Str, "#")) LOOP_INFINI = 1;
++                        else                        LOOP_MAX_arg = (ULONG)atoi(LOOP_Str);
++                    case 4: GCtrl            = (BYTE)atoi(argv[3]);
++                    case 3: GSpeed           = (BYTE)atoi(argv[2]);
++                    default: break;
++                }
++
++            IOTimingBund = IOTimingBund_arg;
++            PHY_ADR      = PHY_ADR_arg;
++        } 
++        else {
++            // Wrong parameter
++            if ( ModeSwitch == MODE_NSCI ) {
++                if (AST2300) 
++                    printf ("\nNCSITEST.exe  run_mode  <package_num>  <channel_num>  <test_mode>  <IO margin>\n\n");
++                else         
++                    printf ("\nNCSITEST.exe  run_mode  <package_num>  <channel_num>  <test_mode>\n\n");
++                PrintMode ();
++                PrintPakNUm();
++                PrintChlNUm();
++                PrintTest ();
++                if (AST2300) 
++                    PrintIOTimingBund ();
++            } 
++            else {
++                if (AST2300) 
++                    printf ("\nMACTEST.exe  run_mode  <speed>  <ctrl>  <loop_max>  <test_mode>  <phy_adr>  <IO margin>\n\n");
++                else         
++                    printf ("\nMACTEST.exe  run_mode  <speed>  <ctrl>  <loop_max>  <test_mode>  <phy_adr>\n\n");
++                PrintMode ();
++                PrintSpeed ();
++                PrintCtrl ();
++                PrintLoop ();
++                PrintTest ();
++                PrintPHYAdr ();
++                if (AST2300) 
++                    PrintIOTimingBund ();
++            }
++            Finish_Close();
++            
++            return(1);
++        } // End if (argc > 1) 
++
++//------------------------------------------------------------
++// Check Argument
++//------------------------------------------------------------
++        switch ( GRun_Mode ) {
++            case 0:                    printf ("\n[MAC1]\n"); SelectMAC = 0; H_MAC_BASE = MAC_BASE1; break;
++            case 1:                    printf ("\n[MAC2]\n"); SelectMAC = 1; H_MAC_BASE = MAC_BASE2; break;
++            case 2: if (Enable_MAC34) {printf ("\n[MAC3]\n"); SelectMAC = 2; H_MAC_BASE = MAC_BASE3; break;} 
++                    else 
++                        goto Error_MAC_Mode;
++            case 3: if (Enable_MAC34) {printf ("\n[MAC4]\n"); SelectMAC = 3; H_MAC_BASE = MAC_BASE4; break;} 
++                    else 
++                        goto Error_MAC_Mode;
++            default:
++Error_MAC_Mode:     
++                    printf ("Error run_mode!!!\n");
++                    PrintMode ();
++                    
++                    return(1);
++        } // End switch ( GRun_Mode )
++        
++        H_TDES_BASE   = TDES_BASE1;
++        H_RDES_BASE   = RDES_BASE1;
++        MAC_PHYBASE   = H_MAC_BASE;
++        
++        Force1G       = 0;
++        Force10M      = 0;
++        Force100M     = 0;
++        GSpeed_sel[0] = 0;//1G
++        GSpeed_sel[1] = 0;//100M
++        GSpeed_sel[2] = 0;//10M
++        
++        switch ( GSpeed ) {
++            case SET_1GBPS          : Force1G   = 1; GSpeed_sel[0] = 1; break;
++            case SET_100MBPS        : Force100M = 1; GSpeed_sel[1] = 1; break;
++            case SET_10MBPS         : Force10M  = 1; GSpeed_sel[2] = 1; break;
++            case SET_1G_100M_10MBPS :                                   break;
++            default: printf ("Error speed!!!\n");
++                PrintSpeed ();
++                return(1);
++        } // End switch ( GSpeed )
++
++        if ( ModeSwitch == MODE_NSCI ) {
++            Enable_MACLoopback = 0; // For mactest function
++            Enable_SkipChkPHY  = 0; // For mactest function
++            Enable_IntLoopPHY  = 0; // For mactest function
++            Enable_InitPHY     = 0; // For mactest function
++            Disable_RecovPHY   = 0; // For mactest function
++            BurstEnable        = 0; // For mactest function
++
++            PrintNCSIEn = (ARPNumCnt & 0x1);
++            ARPNumCnt   = ARPNumCnt & 0xfffffffe;
++    
++            // Check parameter
++            if ((PackageTolNum < 1) || (PackageTolNum >  8)) { 
++                PrintPakNUm();
++                return(1);
++            }
++//            if ((ChannelTolNum < 0) || (ChannelTolNum > 32)) { 
++            if (ChannelTolNum > 32) { 
++                PrintChlNUm(); 
++                return(1);
++            }
++
++            switch (TestMode) {
++                case 0 :               NCSI_DiSChannel = 1; IOTiming = 0; IOStrength = 0; TxDataEnable = 1; RxDataEnable = 1; break;
++                case 1 :               NCSI_DiSChannel = 0; IOTiming = 0; IOStrength = 0; TxDataEnable = 1; RxDataEnable = 1; break;
++                case 6 : if (AST2300) {NCSI_DiSChannel = 1; IOTiming = 1; IOStrength = 0; TxDataEnable = 1; RxDataEnable = 1; break;} 
++                         else 
++                            goto Error_Test_Mode_NCSI;
++                case 7 : if (AST2300) {NCSI_DiSChannel = 1; IOTiming = 1; IOStrength = 1; TxDataEnable = 1; RxDataEnable = 1; break;} 
++                         else 
++                            goto Error_Test_Mode_NCSI;
++                default:
++                    // Wrong parameter
++Error_Test_Mode_NCSI:       
++                    printf ("Error test_mode!!!\n");
++                    PrintTest ();
++                    return(1);
++            } // End switch (TestMode)
++        }
++        else {
++            if ( GCtrl & 0xffffff83 ) {
++                printf ("Error ctrl!!!\n");
++                PrintCtrl ();
++                return(1);
++            } 
++            else {
++                Enable_MACLoopback = ( GCtrl >> 6 ) & 0x1; // ??
++                Enable_SkipChkPHY  = ( GCtrl >> 5 ) & 0x1; // ??
++                Enable_IntLoopPHY  = ( GCtrl >> 4 ) & 0x1;
++                Enable_InitPHY     = ( GCtrl >> 3 ) & 0x1;
++                Disable_RecovPHY   = ( GCtrl >> 2 ) & 0x1; // ??
++            
++                if (!AST2400 && Enable_MACLoopback) {
++                    printf ("Error ctrl!!!\n");
++                    PrintCtrl ();
++                    return(1);
++                }
++            } // End if ( GCtrl & 0xffffff83 )
++            
++            if (!LOOP_MAX_arg) {
++                switch (GSpeed) {
++                    case SET_1GBPS         : LOOP_MAX_arg  = DEF_LOOP_MAX * 200; break; // 20140325
++                    case SET_100MBPS       : LOOP_MAX_arg  = DEF_LOOP_MAX * 20 ; break; // 20140325
++                    case SET_10MBPS        : LOOP_MAX_arg  = DEF_LOOP_MAX * 10 ; break; // 20140325
++                    case SET_1G_100M_10MBPS: LOOP_MAX_arg  = DEF_LOOP_MAX * 10 ; break; // 20140325
++                }
++            } // End if (!LOOP_MAX_arg)
++            
++            LOOP_MAX = LOOP_MAX_arg * 10; // 20140325
++            Calculate_LOOP_CheckNum();
++
++            switch (TestMode) {
++                case  0 :               BurstEnable = 0; IEEETesting = 0; IOTiming = 0; IOStrength = 0; TxDataEnable = 1; RxDataEnable = 1; DataDelay = 0; break;
++                case  1 :               BurstEnable = 1; IEEETesting = 1; IOTiming = 0; IOStrength = 0; TxDataEnable = 1; RxDataEnable = 0; DataDelay = 0; break;
++                case  2 :               BurstEnable = 1; IEEETesting = 1; IOTiming = 0; IOStrength = 0; TxDataEnable = 1; RxDataEnable = 0; DataDelay = 0; break;
++                case  3 :               BurstEnable = 1; IEEETesting = 1; IOTiming = 0; IOStrength = 0; TxDataEnable = 1; RxDataEnable = 0; DataDelay = 0; break;
++                case  4 :               BurstEnable = 1; IEEETesting = 0; IOTiming = 0; IOStrength = 0; TxDataEnable = 1; RxDataEnable = 0; DataDelay = 0; break; // ??
++                case  5 :               BurstEnable = 1; IEEETesting = 1; IOTiming = 0; IOStrength = 0; TxDataEnable = 1; RxDataEnable = 0; DataDelay = 0; break; // ??
++                case  6 : if (AST2300) {BurstEnable = 0; IEEETesting = 0; IOTiming = 1; IOStrength = 0; TxDataEnable = 1; RxDataEnable = 1; DataDelay = 0; break;} 
++                          else 
++                            goto Error_Test_Mode;
++                case  7 : if (AST2300) {BurstEnable = 0; IEEETesting = 0; IOTiming = 1; IOStrength = 1; TxDataEnable = 1; RxDataEnable = 1; DataDelay = 0; break;} 
++                          else 
++                            goto Error_Test_Mode;
++                case  8 :               BurstEnable = 0; IEEETesting = 0; IOTiming = 0; IOStrength = 0; TxDataEnable = 1; RxDataEnable = 0; DataDelay = 0; break; // ??
++                case  9 :               BurstEnable = 0; IEEETesting = 0; IOTiming = 0; IOStrength = 0; TxDataEnable = 0; RxDataEnable = 1; DataDelay = 0; break; // ??
++                case 10 :               BurstEnable = 0; IEEETesting = 0; IOTiming = 0; IOStrength = 0; TxDataEnable = 1; RxDataEnable = 1; DataDelay = 1; break; // ??
++                default:
++Error_Test_Mode:        
++                    printf ("Error test_mode!!!\n");
++                    PrintTest ();
++                    return(1);
++            } // End switch (TestMode)
++
++            if ( PHY_ADR > 31 ) {
++                printf ("Error phy_adr!!!\n");
++                PrintPHYAdr ();
++                return(1);
++            } // End if (PHY_ADR > 31)
++        } // End if ( ModeSwitch == MODE_NSCI )
++
++        if ( BurstEnable ) {
++            IOTimingBund = 0;
++        } 
++        else {
++            if ( ~DataDelay && AST2300 ) {
++                if ( !( ( (7 >= IOTimingBund) && (IOTimingBund & 0x1) ) || 
++                        ( IOTimingBund == 0 )                              ) ) {
++                    printf ("Error IO margin!!!\n");
++                    PrintIOTimingBund ();
++                    return(1);
++                }
++            } 
++            else {
++                IOTimingBund = 0;
++            } // End if ( ~DataDelay && AST2300 )
++            
++            // Define Output file name
++            if ( ModeSwitch == MODE_NSCI )
++                sprintf(FileNameMain, "%d", SelectMAC+1);
++            else {
++                if (Enable_IntLoopPHY) 
++                    sprintf(FileNameMain, "%dI", SelectMAC+1);
++                else                   
++                    sprintf(FileNameMain, "%dE", SelectMAC+1);
++            }
++        
++            #ifndef SLT_UBOOT
++            if ( IOTiming ) {
++                if ( IOStrength ) 
++                    sprintf(FileName, "MIOD%sS.log", FileNameMain);
++                else            
++                    sprintf(FileName, "MIOD%s.log", FileNameMain);
++
++                fp_log = fopen(FileName,"w");
++        
++                if ( IOStrength ) 
++                    sprintf(FileName, "MIO%sS.log", FileNameMain);
++                else            
++                    sprintf(FileName, "MIO%s.log", FileNameMain);
++
++                fp_io  = fopen(FileName,"w");
++            } 
++            else {
++                sprintf(FileName, "MAC%s.log", FileNameMain);
++
++                fp_log = fopen(FileName,"w");
++            }
++            #endif
++        } // End if (BurstEnable)
++
++//------------------------------------------------------------
++// Check Definition
++//------------------------------------------------------------
++        for (i = 0; i < 16; i++) 
++            valary[i] = Val_Array[i];
++        
++        if ( AST3200 ) {
++            MAC_Mode   = (SCU_70h_old >> 6) & 0x1;
++            MAC1_1GEn  = (MAC_Mode & 0x1) ? 1 : 0;//1:RGMII, 0:RMII
++            MAC2_1GEn  = 0;
++        
++            MAC1_RMII  = !MAC1_1GEn;
++            MAC2_RMII  = 0;
++            MAC2_Valid = 0;
++        } 
++        else if ( AST1010 ) {
++            MAC_Mode   = 0;
++            MAC1_1GEn  = 0;
++            MAC2_1GEn  = 0;
++        
++            MAC1_RMII  = 1;
++            MAC2_RMII  = 0;
++            MAC2_Valid = 0;
++        } 
++        else if ( AST2300 ) {
++            if (SCU_7ch_old == 0x01000003) {
++                //AST2300-A0
++                for (i = 0; i < 16; i++) {
++                    valary[i] = Val_Array_A0[i];
++                }
++            }
++        
++            MAC_Mode   = (SCU_70h_old >> 6) & 0x3;
++            MAC1_1GEn  = (MAC_Mode & 0x1) ? 1 : 0;//1:RGMII, 0:RMII
++            MAC2_1GEn  = (MAC_Mode & 0x2) ? 1 : 0;//1:RGMII, 0:RMII
++        
++            MAC1_RMII  = !MAC1_1GEn;
++            MAC2_RMII  = !MAC2_1GEn;
++            MAC2_Valid = 1;
++        } 
++        else {
++            MAC_Mode   = (SCU_70h_old >> 6) & 0x7;
++            MAC1_1GEn  = (MAC_Mode == 0x0) ? 1 : 0;
++            MAC2_1GEn  = 0;
++        
++            switch ( MAC_Mode ) {
++                case 0 : MAC1_RMII = 0; MAC2_RMII = 0; MAC2_Valid = 0; break; //000: Select GMII(MAC#1) only
++                case 1 : MAC1_RMII = 0; MAC2_RMII = 0; MAC2_Valid = 1; break; //001: Select MII (MAC#1) and MII(MAC#2)
++                case 2 : MAC1_RMII = 1; MAC2_RMII = 0; MAC2_Valid = 1; break; //010: Select RMII(MAC#1) and MII(MAC#2)
++                case 3 : MAC1_RMII = 0; MAC2_RMII = 0; MAC2_Valid = 0; break; //011: Select MII (MAC#1) only
++                case 4 : MAC1_RMII = 1; MAC2_RMII = 0; MAC2_Valid = 0; break; //100: Select RMII(MAC#1) only
++//              case 5 : MAC1_RMII = 0; MAC2_RMII = 0; MAC2_Valid = 0; break; //101: Reserved
++                case 6 : MAC1_RMII = 1; MAC2_RMII = 1; MAC2_Valid = 1; break; //110: Select RMII(MAC#1) and RMII(MAC#2)
++//              case 7 : MAC1_RMII = 0; MAC2_RMII = 0; MAC2_Valid = 0; break; //111: Disable dual MAC
++                default: return(Finish_Check(Err_MACMode));
++            }
++        } // End if ( AST3200 )
++        
++        if ( SelectMAC == 0 ) {
++            Enable_RMII = MAC1_RMII;
++            MAC_1GEn    = MAC1_1GEn;
++        
++            if ( Force1G & !MAC1_1GEn ) {
++                printf ("\nMAC1 don't support 1Gbps !!!\n"); 
++                return( Finish_Check(Err_MACMode) );
++            }
++        } else if (SelectMAC == 1) {
++            Enable_RMII = MAC2_RMII;
++            MAC_1GEn    = MAC2_1GEn;
++        
++            if ( Force1G & !MAC2_1GEn ) {
++                printf ("\nMAC2 don't support 1Gbps !!!\n"); 
++                return(Finish_Check(Err_MACMode));
++            }
++            if ( !MAC2_Valid ) {
++                printf ("\nMAC2 not valid !!!\n"); 
++                return(Finish_Check(Err_MACMode));
++            }
++        } 
++        else {
++            Enable_RMII = 1;
++            MAC_1GEn = 0;
++        
++            if (Force1G) {
++                printf ("\nMAC3/MAC4 don't support 1Gbps !!!\n"); 
++                return(Finish_Check(Err_MACMode));
++            }
++        } // End if ( SelectMAC == 0 )
++
++        if ( ModeSwitch == MODE_NSCI ) {
++            if (!Enable_RMII) {
++                printf ("\nNCSI must be RMII interface !!!\n");
++                return(Finish_Check(Err_MACMode));
++            }
++        }
++
++        if ( GSpeed == SET_1G_100M_10MBPS ) {
++            GSpeed_sel[0] = MAC_1GEn;
++            GSpeed_sel[1] = 1;
++            GSpeed_sel[2] = 1;
++        }
++
++        if ( AST1010 ) {
++            // Check bit 13:12
++            Dat_ULONG = SCU_08h_old & 0x00003000;
++            if (Dat_ULONG != 0x00000000)
++                return(Finish_Check(Err_MHCLK_Ratio));
++        } 
++        else if ( AST2300 ) {
++            Dat_ULONG = (SCU_08h_old >> 16) & 0x7;
++            if (MAC1_1GEn | MAC2_1GEn) {
++                if ( (Dat_ULONG == 0) || (Dat_ULONG > 2) )
++                    return(Finish_Check(Err_MHCLK_Ratio));
++            } 
++            else {
++                if (Dat_ULONG != 4)
++                    return(Finish_Check(Err_MHCLK_Ratio));
++            }
++        } // End if (AST1010)
++
++        //MAC
++        MAC_08h_old = ReadSOC_DD( H_MAC_BASE + 0x08 );
++        MAC_0ch_old = ReadSOC_DD( H_MAC_BASE + 0x0c );
++        MAC_40h_old = ReadSOC_DD( H_MAC_BASE + 0x40 );
++        
++        if (  ((MAC_08h_old == 0x0000) && (MAC_0ch_old == 0x00000000))
++           || ((MAC_08h_old == 0xffff) && (MAC_0ch_old == 0xffffffff))
++//         || (MAC_0ch_old & 0x1)
++//         || (MAC_0ch_old & 0x2)
++           ) 
++        {
++            // Load default for MAC address
++            SA[0] = 0x00;
++            SA[1] = 0x57;
++            SA[2] = 0x89;
++            SA[3] = 0x56;
++            SA[4] = 0x88;
++            SA[5] = 0x38;
++        } 
++        else {
++            SA[0] = (MAC_08h_old >>  8) & 0xff;
++            SA[1] = (MAC_08h_old      ) & 0xff;
++            SA[2] = (MAC_0ch_old >> 24) & 0xff;
++            SA[3] = (MAC_0ch_old >> 16) & 0xff;
++            SA[4] = (MAC_0ch_old >>  8) & 0xff;
++            SA[5] = (MAC_0ch_old      ) & 0xff;
++        }
++        // printf ("%08x %08x: %02x %02x %02x %02x %02x %02x\n", MAC_08h_old, MAC_0ch_old, SA[0], SA[1], SA[2], SA[3], SA[4], SA[5]);        
++
++        if ( AST2300 ) {
++#ifdef Force_Enable_NewMDIO
++            AST2300_NewMDIO = 1;
++            WriteSOC_DD(H_MAC_BASE+0x40, MAC_40h_old | 0x80000000)
++#else
++            AST2300_NewMDIO = (MAC_40h_old & 0x80000000) ? 1 : 0;
++#endif
++        } 
++        else {
++            AST2300_NewMDIO = 0;
++        } // End if (AST2300)
++
++//------------------------------------------------------------
++// Parameter Initial
++//------------------------------------------------------------
++        if ( AST3200 ) {
++            SCU_04h = 0x0c000800; //Reset Engine
++        } 
++        else if (AST1010) {
++            SCU_04h = 0x00000010; //Reset Engine
++        } 
++        else if (AST2300) {
++            SCU_04h = 0x0c001800; //Reset Engine
++        } 
++        else {
++            SCU_04h = 0x00001800; //Reset Engine
++        } // End if ( AST3200 )
++    
++        if ( ModeSwitch == MODE_NSCI )
++            // Set to 100Mbps and Enable RX broabcast packets and CRC_APD and Full duplex
++            MAC_50h = 0x000a0500;
++        else {
++            // RX_ALLADR and CRC_APD and Full duplex
++            MAC_50h = 0x00004500;
++            
++            #ifdef Enable_Runt
++            MAC_50h = MAC_50h | 0x00001000;
++            #endif
++            
++            #ifdef Enable_Jumbo
++            MAC_50h = MAC_50h | 0x00002000;
++            #endif
++        } // End if ( ModeSwitch == MODE_NSCI )
++
++//------------------------------------------------------------
++// Descriptor Number
++//------------------------------------------------------------
++        if ( ModeSwitch == MODE_DEDICATED ) {
++
++            #ifdef Enable_Jumbo
++            DES_LowNumber = 1;
++            #else
++            DES_LowNumber = IOTiming;
++            #endif
++            if ( Enable_SkipChkPHY && ( TestMode == 0 ) ) {
++                DES_NUMBER = 114;//for SMSC's LAN9303 issue
++            } 
++            else {
++                if ( AST1010 | AST3200 ) {
++                    DES_NUMBER = (IOTimingBund) ? 100 : 256;
++                } 
++                else {
++                    switch ( GSpeed ) {
++                        case SET_1GBPS          : DES_NUMBER = (IOTimingBund) ? 10 : (DES_LowNumber) ? 50 : 400; break; // 20140325
++                        case SET_100MBPS        : DES_NUMBER = (IOTimingBund) ? 10 : (DES_LowNumber) ? 50 : 400; break; // 20140325
++                        case SET_10MBPS         : DES_NUMBER = (IOTimingBund) ? 10 : (DES_LowNumber) ? 10 :  80; break; // 20140325
++                        case SET_1G_100M_10MBPS : DES_NUMBER = (IOTimingBund) ? 10 : (DES_LowNumber) ? 10 :  80; break; // 20140325
++                    }
++                } // End if ( Enable_SkipChkPHY && ( TestMode == 0 ) )
++            } 
++
++            #ifdef SelectDesNumber
++            DES_NUMBER = SelectDesNumber;
++            #endif
++            
++            #ifdef USE_LPC
++                DES_NUMBER /= 8;
++            #endif
++        
++            #ifdef ENABLE_ARP_2_WOL
++            if ( TestMode == 4 ) {
++                DES_NUMBER = 1;
++            }
++            #endif
++            
++            DES_NUMBER_Org = DES_NUMBER;
++            
++            if ( DbgPrn_Info ) {
++                printf ("CheckBuf_MBSize : %ld\n", CheckBuf_MBSize);
++                printf ("LOOP_CheckNum   : %ld\n", LOOP_CheckNum);
++                printf ("DES_NUMBER      : %ld\n", DES_NUMBER);
++                printf ("DMA_BufSize     : %ld bytes\n", DMA_BufSize);
++                printf ("DMA_BufNum      : %d\n", DMA_BufNum);
++                printf ("\n");
++            }
++//          if (3 > DMA_BufNum) 
++//                return( Finish_Check(Err_DMABufNum) );
++            
++            if (2 > DMA_BufNum) 
++                return( Finish_Check(Err_DMABufNum) );
++        } // End if ( ModeSwitch == MODE_DEDICATED )
++    } // End if (RUN_STEP >= 1)
++
++//------------------------------------------------------------
++// SCU Initial
++//------------------------------------------------------------
++    if ( RUN_STEP >= 2 ) {
++        init_scu1();
++    }
++    
++    if ( RUN_STEP >= 3 ) {
++        init_scu_macrst();
++    }
++
++//------------------------------------------------------------
++// Data Initial
++//------------------------------------------------------------
++    if (RUN_STEP >= 4) {
++        setup_arp();
++        if ( ModeSwitch ==  MODE_DEDICATED ) {
++
++            FRAME_LEN = (ULONG *)malloc(DES_NUMBER * sizeof( ULONG ));
++            wp_lst    = (ULONG *)malloc(DES_NUMBER * sizeof( ULONG ));
++        
++            if ( !FRAME_LEN ) 
++                return( Finish_Check( Err_MALLOC_FrmSize ) );
++                
++            if ( !wp_lst ) 
++                return( Finish_Check( Err_MALLOC_LastWP ));
++                
++            // Setup data and length
++            TestingSetup();
++        } // End if ( ModeSwitch ==  MODE_DEDICATED )
++        
++        // Get bit (shift) of IO driving strength register
++        if ( IOStrength ) {
++            if (AST1010) {
++                IOStr_max = 1;//0~1
++            } 
++            else if (AST2400) {
++                IOStr_max = 1;//0~1
++                switch (SelectMAC) {
++                    case 0  : IOStr_shf =  9; break;
++                    case 1  : IOStr_shf = 11; break;
++                }
++            } 
++            else {
++                IOStr_max = 3;//0~3
++                switch (SelectMAC) {
++                    case 0  : IOStr_shf =  8; break;
++                    case 1  : IOStr_shf = 10; break;
++                    case 2  : IOStr_shf = 12; break;
++                    case 3  : IOStr_shf = 14; break;
++                }
++            }
++        } 
++        else {
++            IOStr_max = 0;
++            IOStr_shf = 0;
++        } // End if (IOStrength)
++
++        // Get current clock delay value of TX(out) and RX(in) in the SCU48 register
++        // and setting test range
++        if ( Enable_RMII ) {
++            switch (GRun_Mode) {
++                case 0  : IOdly_out_shf = 24; IOdly_in_shf =  8; break;
++                case 1  : IOdly_out_shf = 25; IOdly_in_shf = 12; break;
++                case 2  : IOdly_out_shf = 26; IOdly_in_shf = 16; break;
++                case 3  : IOdly_out_shf = 27; IOdly_in_shf = 20; break;
++            }
++            IOdly_in_reg  = (SCU_48h_old >> IOdly_in_shf ) & 0xf;
++            IOdly_out_reg = (SCU_48h_old >> IOdly_out_shf) & 0x1;
++        } 
++        else {
++            switch (GRun_Mode) {
++                case 0  : IOdly_out_shf =  0; IOdly_in_shf  =  8; break;
++                case 1  : IOdly_out_shf =  4; IOdly_in_shf  = 12; break;
++            }
++            IOdly_in_reg  = (SCU_48h_old >> IOdly_in_shf ) & 0xf;
++            IOdly_out_reg = (SCU_48h_old >> IOdly_out_shf) & 0xf;
++        } // End if ( Enable_RMII )
++        
++        // Find the coordinate in X-Y axis
++        for ( index = 0; index <= 15; index++ ) 
++            if ( IOdly_in_reg == valary[index] ) {
++                IOdly_in_reg_idx = index; 
++                break;
++            }
++        for ( index = 0; index <= 15; index++ ) 
++            if ( IOdly_out_reg == valary[index] ) {
++                IOdly_out_reg_idx = index; 
++                break;
++            }
++        
++        // Get the range for testmargin block
++        if ( IOTiming ) {
++            if ( Enable_RMII ) {
++                IOdly_incval  = 1;
++                IOdly_in_str  = 0;
++                IOdly_in_end  = 15;
++                IOdly_out_str = 0;
++                IOdly_out_end = 1;
++            } 
++            else {
++                IOdly_incval  = 1;
++                IOdly_in_str  = 0;
++                IOdly_in_end  = 15;
++                IOdly_out_str = 0;
++                IOdly_out_end = 15;
++            }
++        } 
++        else if ( IOTimingBund ) {
++            if ( Enable_RMII ) {
++                IOdly_incval  = 1;
++                IOdly_in_str  = IOdly_in_reg_idx  - ( IOTimingBund >> 1 );
++                IOdly_in_end  = IOdly_in_reg_idx  + ( IOTimingBund >> 1 );
++                IOdly_out_str = IOdly_out_reg_idx;
++                IOdly_out_end = IOdly_out_reg_idx;
++            } 
++            else {
++                IOdly_incval  = 1;
++                IOdly_in_str  = IOdly_in_reg_idx  - ( IOTimingBund >> 1 );
++                IOdly_in_end  = IOdly_in_reg_idx  + ( IOTimingBund >> 1 );
++                IOdly_out_str = IOdly_out_reg_idx - ( IOTimingBund >> 1 );
++                IOdly_out_end = IOdly_out_reg_idx + ( IOTimingBund >> 1 );
++            }
++            if ((IOdly_in_str  < 0) || (IOdly_in_end  > 15)) 
++                return( Finish_Check( Err_IOMarginOUF ) );
++                
++            if ((IOdly_out_str < 0) || (IOdly_out_end > 15)) 
++                return( Finish_Check( Err_IOMarginOUF ) );
++
++//          if (IOdly_in_str  <  0) IOdly_in_str  =  0;
++//          if (IOdly_in_end  > 15) IOdly_in_end  = 15;
++//          if (IOdly_out_str <  0) IOdly_out_str =  0;
++//          if (IOdly_out_end > 15) IOdly_out_end = 15;
++        } 
++        else {
++            IOdly_incval  = 1;
++            IOdly_in_str  = 0;
++            IOdly_in_end  = 0;
++            IOdly_out_str = 0;
++            IOdly_out_end = 0;
++        } // End if (IOTiming)
++    } // End if (RUN_STEP >= 4)
++
++//------------------------------------------------------------
++// main
++//------------------------------------------------------------
++    if (RUN_STEP >= 5) {
++        #ifdef  DbgPrn_FuncHeader
++            printf ("GSpeed_sel: %d %d %d\n", GSpeed_sel[0], GSpeed_sel[1], GSpeed_sel[2]); 
++            Debug_delay();
++        #endif
++
++    if ( ModeSwitch == MODE_NSCI ) {
++        #ifdef Enable_NCSI_LOOP_INFINI
++        for ( GSpeed_idx = 0; GSpeed_idx < 3; GSpeed_idx++ ) {
++            GSpeed_org[GSpeed_idx] = GSpeed_sel[GSpeed_idx];
++        }
++NCSI_LOOP_INFINI:;
++        for ( GSpeed_idx = 0; GSpeed_idx < 3; GSpeed_idx++ ) {
++            GSpeed_sel[GSpeed_idx] = GSpeed_org[GSpeed_idx];
++        }
++        #endif
++    } // End if ( ModeSwitch == MODE_NSCI )
++
++        for (GSpeed_idx = 0; GSpeed_idx < 3; GSpeed_idx++) {
++            Err_Flag_PrintEn = 1;
++            if ( GSpeed_sel[GSpeed_idx] ) {
++                // Setting the LAN speed
++                if ( ModeSwitch ==  MODE_DEDICATED ) {
++
++
++                    // Test three speed of LAN, we will modify loop number
++                    if (GSpeed == SET_1G_100M_10MBPS) {
++                        if      (GSpeed_sel[0]) LOOP_MAX = LOOP_MAX_arg;
++                        else if (GSpeed_sel[1]) LOOP_MAX = LOOP_MAX_arg / 10;
++                        else                    LOOP_MAX = LOOP_MAX_arg / 100;
++                            
++                        if ( !LOOP_MAX ) 
++                            LOOP_MAX = 1;
++                        
++                        Calculate_LOOP_CheckNum();
++                    }
++                    
++                    // Setting speed of LAN
++                    if      (GSpeed_sel[0]) MAC_50h_Speed = 0x00000200;
++                    else if (GSpeed_sel[1]) MAC_50h_Speed = 0x00080000;
++                    else                    MAC_50h_Speed = 0x00000000;
++                        
++                    //------------------------------------------------------------
++                    // PHY Initial
++                    //------------------------------------------------------------
++                    if ( AST1100 ) 
++                        init_scu2();
++                        
++                    if ( Enable_InitPHY ) {
++#ifdef SUPPORT_PHY_LAN9303
++                        LAN9303(LAN9303_I2C_BUSNUM, PHY_ADR_arg, GSpeed_idx, Enable_IntLoopPHY | (BurstEnable<<1) | IEEETesting);
++#else
++                        init_phy( Enable_IntLoopPHY );
++#endif
++                        DELAY( Delay_PHYRst * 10 );
++                    } // End if (Enable_InitPHY)
++
++                    if ( AST1100 ) 
++                        init_scu3();
++
++                    if ( Err_Flag ) 
++                        return( Finish_Check( 0 ) );
++                } // End if ( ModeSwitch ==  MODE_DEDICATED )
++
++                //------------------------------------------------------------
++                // Start
++                //------------------------------------------------------------
++                
++                // The loop is for different IO strength
++                for ( IOStr_i = 0; IOStr_i <= IOStr_max; IOStr_i++ ) {
++                    
++                    // Print Header of report to monitor and log file
++                    if ( IOTiming || IOTimingBund ) {
++                        if ( IOStrength ) {
++                            if ( AST1010 ) {
++                                IOStr_val = (SCU_ach_old & 0xfff0ffff) | ((IOStr_i) ? 0xf0000 : 0x0);
++                            } 
++                            else {
++                                IOStr_val = (SCU_90h_old & 0xffff00ff) | (IOStr_i << IOStr_shf);
++                            }
++                            //printf("\nIOStrength_val= %08x, ", IOStr_val);
++                            //printf("SCU90h: %08x ->", ReadSOC_DD(SCU_BASE+0x90));
++                            WriteSOC_DD( SCU_BASE + 0x90, IOStr_val );
++                            //printf(" %08x\n", ReadSOC_DD(SCU_BASE+0x90));
++                            
++                            #ifndef SLT_UBOOT
++                            if      (GSpeed_sel[0]) fprintf(fp_log, "[Strength %d][1G  ]========================================\n", IOStr_i);
++                            else if (GSpeed_sel[1]) fprintf(fp_log, "[Strength %d][100M]========================================\n", IOStr_i);
++                            else                    fprintf(fp_log, "[Strength %d][10M ]========================================\n", IOStr_i);
++                            #endif
++                        } 
++                        else {
++                            #ifndef SLT_UBOOT
++                            if      (GSpeed_sel[0]) fprintf(fp_log, "[1G  ]========================================\n");
++                            else if (GSpeed_sel[1]) fprintf(fp_log, "[100M]========================================\n");
++                            else                    fprintf(fp_log, "[10M ]========================================\n");
++                            #endif
++                        }
++
++                        if ( IOTimingBund ) 
++                            PrintIO_Header(FP_LOG);
++                        if ( IOTiming     ) 
++                            PrintIO_Header(FP_IO);
++
++                        PrintIO_Header(STD_OUT);
++                        
++                    } 
++                    else {
++                        if ( ModeSwitch == MODE_DEDICATED ) {
++
++                            if (!BurstEnable) 
++                                Print_Header(FP_LOG);
++
++                            Print_Header(STD_OUT);
++                        }
++                    } // End if (IOTiming || IOTimingBund)
++                    
++#ifdef Enable_Old_Style
++                    for (IOdly_i = IOdly_in_str; IOdly_i <= IOdly_in_end; IOdly_i+=IOdly_incval) {
++                        IOdly_in  = valary[IOdly_i];
++#else
++                    for (IOdly_j = IOdly_out_str; IOdly_j <= IOdly_out_end; IOdly_j+=IOdly_incval) {
++                        IOdly_out = valary[IOdly_j];
++#endif
++
++                        if (IOTiming || IOTimingBund) {
++#ifdef Enable_Fast_SCU
++  #ifdef Enable_Old_Style
++                            WriteSOC_DD(SCU_BASE + 0x48, SCU_48h_mix | (IOdly_in << IOdly_in_shf));
++  #else
++                            WriteSOC_DD(SCU_BASE + 0x48, SCU_48h_mix | (IOdly_out << IOdly_out_shf));
++  #endif
++#endif
++
++                            if ( IOTimingBund ) 
++                                PrintIO_LineS(FP_LOG);
++                            if ( IOTiming     ) 
++                                PrintIO_LineS(FP_IO);
++
++                            PrintIO_LineS(STD_OUT);
++                        } // End if (IOTiming || IOTimingBund)
++                        
++                        //------------------------------------------------------------
++                        // SCU Initial
++                        //------------------------------------------------------------
++#ifdef Enable_Fast_SCU
++                        init_scu_macrst();
++#endif
++#ifdef Enable_Old_Style
++                        for (IOdly_j = IOdly_out_str; IOdly_j <= IOdly_out_end; IOdly_j+=IOdly_incval) {
++                            IOdly_out = valary[IOdly_j];
++#else
++                        for (IOdly_i = IOdly_in_str; IOdly_i <= IOdly_in_end; IOdly_i+=IOdly_incval) {
++                            IOdly_in  = valary[IOdly_i];
++#endif
++                            if ( IOTiming || IOTimingBund ) {
++                                IOdly_val = (IOdly_in  << IOdly_in_shf) | (IOdly_out << IOdly_out_shf);
++
++//printf("\nIOdly_val= %08x, ", IOdly_val);
++//printf("SCU48h: %08x ->", ReadSOC_DD( SCU_BASE + 0x48 ) );
++                            WriteSOC_DD( SCU_BASE + 0x48, SCU_48h_mix | IOdly_val );
++//printf(" %08x\n", ReadSOC_DD(SCU_BASE+0x48));
++                            } // End if (IOTiming || IOTimingBund)
++                        
++                            //------------------------------------------------------------
++                            // SCU Initial
++                            //------------------------------------------------------------
++#ifdef Enable_Fast_SCU
++#else
++                            init_scu_macrst();
++#endif
++
++                            //------------------------------------------------------------
++                            // MAC Initial
++                            //------------------------------------------------------------
++                            init_mac(H_MAC_BASE, H_TDES_BASE, H_RDES_BASE);
++                            if ( Err_Flag ) 
++                                return( Finish_Check(0) );
++
++                            // Testing 
++                            if ( ModeSwitch == MODE_NSCI )
++                                dlymap[IOdly_i][IOdly_j] = phy_ncsi();
++                            else
++                                dlymap[IOdly_i][IOdly_j] = TestingLoop(LOOP_CheckNum);
++                            
++                            
++                            // Display to Log file and monitor
++                            if ( IOTiming || IOTimingBund ) {
++
++                                if ( IOTimingBund ) 
++                                    PrintIO_Line(FP_LOG);
++                                    
++                                if ( IOTiming     ) 
++                                    PrintIO_Line(FP_IO);
++
++                                PrintIO_Line(STD_OUT);
++
++                                // Find the range of current setting 
++                                if ( ( IOdly_in_reg == IOdly_in ) && ( IOdly_out_reg == IOdly_out ) ) {
++                                    IOdly_i_min = IOdly_i - ( IOTimingBund >> 1 );
++                                    IOdly_i_max = IOdly_i + ( IOTimingBund >> 1 );
++                                
++                                    if ( Enable_RMII ) {
++                                        IOdly_j_min = IOdly_j;
++                                        IOdly_j_max = IOdly_j;
++                                    } 
++                                    else {
++                                        IOdly_j_min = IOdly_j - (IOTimingBund >> 1 );
++                                        IOdly_j_max = IOdly_j + (IOTimingBund >> 1 );
++                                    }
++                                }
++                                
++                                PrintIO_Line_LOG();
++                                FPri_ErrFlag(FP_LOG);
++
++//                              Err_Flag_allapeed = Err_Flag_allapeed | Err_Flag;
++                                Err_Flag = 0;
++                            }
++                        }// End for (IOdly_j = IOdly_out_str; IOdly_j <= IOdly_out_end; IOdly_j+=IOdly_incval)
++#ifndef SLT_UBOOT                        
++                        if ( IOTiming || IOTimingBund ) {
++                            if ( IOTimingBund ) 
++                                fprintf(fp_log, "\n");
++                            if (IOTiming    ) 
++                                fprintf(fp_io, "\n");
++                        }
++#endif
++                        printf("\n");
++                    } // End for (IOdly_j = IOdly_out_str; IOdly_j <= IOdly_out_end; IOdly_j+=IOdly_incval)
++                    
++                    //------------------------------------------------------------
++                    // End
++                    //------------------------------------------------------------
++
++                    if ( IOTiming || IOTimingBund ) {
++                        if ( ( IOdly_i_min < 0 ) || ( IOdly_i_max > 15 ) ) 
++                            FindErr(Err_IOMarginOUF);
++                        if ( ( IOdly_j_min < 0 ) || ( IOdly_j_max > 15 ) ) 
++                            FindErr(Err_IOMarginOUF);
++
++                        if ( IOdly_i_min <  0 ) IOdly_i_min =  0;
++                        if ( IOdly_i_max > 15 ) IOdly_i_max = 15;
++                        if ( IOdly_j_min <  0 ) IOdly_j_min =  0;
++                        if ( IOdly_j_max > 15 ) IOdly_j_max = 15;
++
++#ifdef Enable_Old_Style
++                        for (IOdly_i = IOdly_i_min; IOdly_i <= IOdly_i_max; IOdly_i++)
++                            for (IOdly_j = IOdly_j_min; IOdly_j <= IOdly_j_max; IOdly_j++)
++#else
++                        for (IOdly_j = IOdly_j_min; IOdly_j <= IOdly_j_max; IOdly_j++)
++                            for (IOdly_i = IOdly_i_min; IOdly_i <= IOdly_i_max; IOdly_i++)
++#endif
++                            {             
++                                if ( dlymap[IOdly_i][IOdly_j] ) {
++#ifdef SLT_DOS                   
++                                    if ( IOTiming ) {
++#ifdef Enable_Old_Style
++                                        for (i = IOdly_i_min; i <= IOdly_i_max; i++)
++#else
++                                        for (j = IOdly_j_min; j <= IOdly_j_max; j++)
++#endif
++                                        {
++#ifdef Enable_Old_Style
++                                            for (j = IOdly_j_min; j <= IOdly_j_max; j++)
++#else
++                                            for (i = IOdly_i_min; i <= IOdly_i_max; i++)
++#endif
++                                            {    
++                                                if (dlymap[i][j]) fprintf(fp_io, "x ");
++                                                else              fprintf(fp_io, "o ");
++                                            }
++                                            fprintf(fp_io, "\n");
++                                        }
++                                    } // End if ( IOTiming )
++#endif // End SLT_DOS  
++                                    FindErr(Err_IOMargin);
++                                    goto Find_Err_IOMargin;
++                                } // End if ( dlymap[IOdly_i][IOdly_j] )
++                            }
++                    } // End if ( IOTiming || IOTimingBund )
++
++Find_Err_IOMargin:;
++                    if ( !BurstEnable ) 
++                        FPri_ErrFlag(FP_LOG);
++                    if ( IOTiming ) 
++                        FPri_ErrFlag(FP_IO);
++
++                    FPri_ErrFlag(STD_OUT);
++                    
++                    Err_Flag_allapeed = Err_Flag_allapeed | Err_Flag;
++                    Err_Flag = 0;
++                } // End for (IOStr_i = 0; IOStr_i <= IOStr_max; IOStr_i++)
++                
++                if ( ModeSwitch == MODE_DEDICATED ) {
++                    if ( Enable_InitPHY & !Disable_RecovPHY ) 
++                        recov_phy(Enable_IntLoopPHY);
++                }
++                    
++                GSpeed_sel[GSpeed_idx] = 0;
++            } // End if (GSpeed_sel[GSpeed_idx])
++            
++            Err_Flag_PrintEn = 0;
++        } // End for (GSpeed_idx = 0; GSpeed_idx < 3; GSpeed_idx++)
++        
++        Err_Flag = Err_Flag_allapeed;
++
++        if ( ModeSwitch == MODE_NSCI ) {
++            #ifdef Enable_NCSI_LOOP_INFINI
++            if (Err_Flag == 0) {
++                if (fp_log) {
++                    fclose(fp_log);
++                    fp_log = fopen(FileName,"w");
++                }
++                goto NCSI_LOOP_INFINI;
++            }
++            #endif
++        }
++        
++    } // End if (RUN_STEP >= 5)
++
++    return(Finish_Check(0));
++   
++}
++
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/reset.c b/arch/arm/cpu/arm926ejs/aspeed/reset.c
+new file mode 100644
+index 0000000..e0a57f9
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/reset.c
+@@ -0,0 +1,24 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++*/
++
++#include <common.h>
++#include <asm/io.h>
++
++#define AST_WDT_BASE 0x1e785000
++void reset_cpu(ulong addr)
++{
++	__raw_writel(0x10 , AST_WDT_BASE+0x04);
++	__raw_writel(0x4755, AST_WDT_BASE+0x08);
++	__raw_writel(0x3, AST_WDT_BASE+0x0c);
++
++	while (1)
++	/*nothing*/;
++}
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/timer.c b/arch/arm/cpu/arm926ejs/aspeed/timer.c
+new file mode 100644
+index 0000000..4bba5c5
+--- /dev/null
++++ b/arch/arm/cpu/arm926ejs/aspeed/timer.c
+@@ -0,0 +1,153 @@
++/*
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#include <common.h>
++#include <arm926ejs.h>
++
++#define TIMER_LOAD_VAL 0xffffffff
++
++/* macro to read the 32 bit timer */
++#define READ_TIMER (*(volatile ulong *)(CONFIG_SYS_TIMERBASE+0))
++
++static ulong timestamp;
++static ulong lastdec;
++
++int timer_init (void)
++{
++	*(volatile ulong *)(CONFIG_SYS_TIMERBASE + 4)    = TIMER_LOAD_VAL;
++	*(volatile ulong *)(CONFIG_SYS_TIMERBASE + 0x30) = 0x3;		/* enable timer1 */
++
++	/* init the timestamp and lastdec value */
++	reset_timer_masked();
++
++	return 0;
++}
++
++/*
++ * timer without interrupts
++ */
++
++void reset_timer (void)
++{
++	reset_timer_masked ();
++}
++
++ulong get_timer (ulong base)
++{
++	return get_timer_masked () - base;
++}
++
++void set_timer (ulong t)
++{
++	timestamp = t;
++}
++
++/* delay x useconds AND perserve advance timstamp value */
++void udelay (unsigned long usec)
++{
++	ulong tmo, tmp;
++
++	if(usec >= 1000){		/* if "big" number, spread normalization to seconds */
++		tmo = usec / 1000;	/* start to normalize for usec to ticks per sec */
++		tmo *= CONFIG_SYS_HZ;		/* find number of "ticks" to wait to achieve target */
++		tmo /= 1000;		/* finish normalize. */
++	}else{				/* else small number, don't kill it prior to HZ multiply */
++		tmo = usec * CONFIG_SYS_HZ;
++		tmo /= (1000*1000);
++	}
++
++	tmp = get_timer (0);		/* get current timestamp */
++	if( (tmo + tmp + 1) < tmp )	/* if setting this fordward will roll time stamp */
++		reset_timer_masked ();	/* reset "advancing" timestamp to 0, set lastdec value */
++	else
++		tmo += tmp;		/* else, set advancing stamp wake up time */
++
++	while (get_timer_masked () < tmo)/* loop till event */
++		/*NOP*/;
++}
++
++void reset_timer_masked (void)
++{
++	/* reset time */
++	lastdec = READ_TIMER;  /* capure current decrementer value time */
++	timestamp = 0;	       /* start "advancing" time stamp from 0 */
++}
++
++ulong get_timer_masked (void)
++{
++	ulong now = READ_TIMER;		/* current tick value */
++
++	if (lastdec >= now) {		/* normal mode (non roll) */
++		/* normal mode */
++		timestamp += lastdec - now; /* move stamp fordward with absoulte diff ticks */
++	} else {			/* we have overflow of the count down timer */
++		/* nts = ts + ld + (TLV - now)
++		 * ts=old stamp, ld=time that passed before passing through -1
++		 * (TLV-now) amount of time after passing though -1
++		 * nts = new "advancing time stamp"...it could also roll and cause problems.
++		 */
++		timestamp += lastdec + TIMER_LOAD_VAL - now;
++	}
++	lastdec = now;
++
++	return timestamp;
++}
++
++/* waits specified delay value and resets timestamp */
++void udelay_masked (unsigned long usec)
++{
++	ulong tmo;
++	ulong endtime;
++	signed long diff;
++
++	if (usec >= 1000) {		/* if "big" number, spread normalization to seconds */
++		tmo = usec / 1000;	/* start to normalize for usec to ticks per sec */
++		tmo *= CONFIG_SYS_HZ;		/* find number of "ticks" to wait to achieve target */
++		tmo /= 1000;		/* finish normalize. */
++	} else {			/* else small number, don't kill it prior to HZ multiply */
++		tmo = usec * CONFIG_SYS_HZ;
++		tmo /= (1000*1000);
++	}
++
++	endtime = get_timer_masked () + tmo;
++
++	do {
++		ulong now = get_timer_masked ();
++		diff = endtime - now;
++	} while (diff >= 0);
++}
++
++/*
++ * This function is derived from PowerPC code (read timebase as long long).
++ * On ARM it just returns the timer value.
++ */
++unsigned long long get_ticks(void)
++{
++	return get_timer(0);
++}
++
++/*
++ * This function is derived from PowerPC code (timebase clock frequency).
++ * On ARM it returns the number of timer ticks per second.
++ */
++ulong get_tbclk (void)
++{
++	ulong tbclk;
++
++	tbclk = CONFIG_SYS_HZ;
++	return tbclk;
++}
+diff --git a/arch/arm/include/asm/arch-aspeed/aspeed_i2c.h b/arch/arm/include/asm/arch-aspeed/aspeed_i2c.h
+new file mode 100644
+index 0000000..5419fca
+--- /dev/null
++++ b/arch/arm/include/asm/arch-aspeed/aspeed_i2c.h
+@@ -0,0 +1,69 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#if	defined(CONFIG_AST1300)
++#define  SCU_BASE       CONFIG_SCUREG_BASE
++#define  I2C_BASE       CONFIG_I2CREG_BASE
++#define  I2C_CHANNEL    CONFIG_I2C_CHANNEL
++#else
++#define  SCU_BASE       0x1E6E2000
++#define  I2C_BASE       0x1E78A000
++/* Cause U-boot i2c command limitation, it can't assign channel number. Our EEPROM is at channel 3 now*/
++/* AST2200's EEPROM is at channel 4 */
++#if defined(CONFIG_AST2200) || defined(CONFIG_AST2300) || defined(CONFIG_AST2400)
++#define  I2C_CHANNEL    4
++#else
++#define  I2C_CHANNEL    3
++#endif
++#endif
++
++/* Fix timing for EEPROM 100Khz*/
++#define  AC_TIMING      0x77743335
++#define  ALL_CLEAR      0xFFFFFFFF
++#define  MASTER_ENABLE  0x01
++#define  SLAVE_ENABLE   0x02
++#define  LOOP_COUNT     0x100000
++#define  SCU_RESET_CONTROL    0x04
++#define  SCU_MULTIFUNCTION_PIN_CTL5_REG    0x90
++
++/* I2C Register */
++#define  I2C_FUNCTION_CONTROL_REGISTER    (I2C_BASE + I2C_CHANNEL * 0x40 + 0x00)
++#define  I2C_AC_TIMING_REGISTER_1         (I2C_BASE + I2C_CHANNEL * 0x40 + 0x04)
++#define  I2C_AC_TIMING_REGISTER_2         (I2C_BASE + I2C_CHANNEL * 0x40 + 0x08)
++#define  I2C_INTERRUPT_CONTROL_REGISTER   (I2C_BASE + I2C_CHANNEL * 0x40 + 0x0c)
++#define  I2C_INTERRUPT_STATUS_REGISTER    (I2C_BASE + I2C_CHANNEL * 0x40 + 0x10)
++#define  I2C_COMMAND_REGISTER             (I2C_BASE + I2C_CHANNEL * 0x40 + 0x14)
++#define  I2C_DEVICE_ADDRESS_REGISTER      (I2C_BASE + I2C_CHANNEL * 0x40 + 0x18)
++#define  I2C_BUFFER_CONTROL_REGISTER      (I2C_BASE + I2C_CHANNEL * 0x40 + 0x1c)
++#define  I2C_BYTE_BUFFER_REGISTER         (I2C_BASE + I2C_CHANNEL * 0x40 + 0x20)
++#define  I2C_DMA_CONTROL_REGISTER         (I2C_BASE + I2C_CHANNEL * 0x40 + 0x24)
++#define  I2C_DMA_STATUS_REGISTER          (I2C_BASE + I2C_CHANNEL * 0x40 + 0x28)
++
++/* Command Bit */
++#define  MASTER_START_COMMAND    (1 << 0)
++#define  MASTER_TX_COMMAND       (1 << 1)
++#define  MASTER_RX_COMMAND       (1 << 3)
++#define  RX_COMMAND_LIST         (1 << 4)
++#define  MASTER_STOP_COMMAND     (1 << 5)
++
++/* Interrupt Status Bit */
++#define  TX_ACK        (1 << 0)
++#define  TX_NACK       (1 << 1)
++#define  RX_DONE       (1 << 2)
++#define  STOP_DONE     (1 << 4)
++
++/* Macros to access registers */
++#define outb(v,p) *(volatile u8 *) (p) = v
++#define outw(v,p) *(volatile u16 *) (p) = v
++#define outl(v,p) *(volatile u32 *) (p) = v
++
++#define inb(p)	*(volatile u8 *) (p)
++#define inw(p)	*(volatile u16 *) (p)
++#define inl(p)	*(volatile u32 *) (p)
+diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h
+index 440b041..48fcf2b 100644
+--- a/arch/arm/include/asm/mach-types.h
++++ b/arch/arm/include/asm/mach-types.h
+@@ -175,6 +175,16 @@ extern unsigned int __machine_arch_type;
+ #define MACH_TYPE_PALMTX               885
+ #define MACH_TYPE_S3C2413              887
+ #define MACH_TYPE_WG302V2              890
++#define MACH_TYPE_AST1100              903
++#define MACH_TYPE_AST2000              900
++#define MACH_TYPE_AST2100              902
++#define MACH_TYPE_AST2150              907
++#define MACH_TYPE_AST2200              906
++#define MACH_TYPE_AST2300_FPGA_1       901
++#define MACH_TYPE_AST2300_FPGA_2       901
++#define MACH_TYPE_AST2300              901
++#define MACH_TYPE_AST3100              901
++#define MACH_TYPE_ASPEED               8888
+ #define MACH_TYPE_OMAP_2430SDP         900
+ #define MACH_TYPE_DAVINCI_EVM          901
+ #define MACH_TYPE_PALMZ72              904
+@@ -840,7 +850,6 @@ extern unsigned int __machine_arch_type;
+ #define MACH_TYPE_NV1000               3218
+ #define MACH_TYPE_NUC950TS             3219
+ #define MACH_TYPE_NOKIA_RM680          3220
+-#define MACH_TYPE_AST2200              3221
+ #define MACH_TYPE_LEAD                 3222
+ #define MACH_TYPE_UNINO1               3223
+ #define MACH_TYPE_GREECO               3224
+@@ -3063,6 +3072,126 @@ extern unsigned int __machine_arch_type;
+ # define machine_is_wg302v2()	(0)
+ #endif
+ 
++#ifdef CONFIG_MACH_AST1100
++# ifdef machine_arch_type
++#  undef machine_arch_type
++#  define machine_arch_type	__machine_arch_type
++# else
++#  define machine_arch_type	MACH_TYPE_AST1100
++# endif
++# define machine_is_ast1100()	(machine_arch_type == MACH_TYPE_AST1100)
++#else
++# define machine_is_ast1100()	(0)
++#endif
++
++#ifdef CONFIG_MACH_AST2000
++# ifdef machine_arch_type
++#  undef machine_arch_type
++#  define machine_arch_type	__machine_arch_type
++# else
++#  define machine_arch_type	MACH_TYPE_AST2000
++# endif
++# define machine_is_ast2000()	(machine_arch_type == MACH_TYPE_AST2000)
++#else
++# define machine_is_ast2000()	(0)
++#endif
++
++#ifdef CONFIG_MACH_AST2100
++# ifdef machine_arch_type
++#  undef machine_arch_type
++#  define machine_arch_type	__machine_arch_type
++# else
++#  define machine_arch_type	MACH_TYPE_AST2100
++# endif
++# define machine_is_ast2100()	(machine_arch_type == MACH_TYPE_AST2100)
++#else
++# define machine_is_ast2100()	(0)
++#endif
++
++#ifdef CONFIG_MACH_AST2150
++# ifdef machine_arch_type
++#  undef machine_arch_type
++#  define machine_arch_type	__machine_arch_type
++# else
++#  define machine_arch_type	MACH_TYPE_AST2150
++# endif
++# define machine_is_ast2150()	(machine_arch_type == MACH_TYPE_AST2150)
++#else
++# define machine_is_ast2150()	(0)
++#endif
++
++#ifdef CONFIG_MACH_AST2200
++# ifdef machine_arch_type
++#  undef machine_arch_type
++#  define machine_arch_type	__machine_arch_type
++# else
++#  define machine_arch_type	MACH_TYPE_AST2200
++# endif
++# define machine_is_ast2200()	(machine_arch_type == MACH_TYPE_AST2200)
++#else
++# define machine_is_ast2200()	(0)
++#endif
++
++#ifdef CONFIG_MACH_AST2300_FPGA_1
++# ifdef machine_arch_type
++#  undef machine_arch_type
++#  define machine_arch_type	__machine_arch_type
++# else
++#  define machine_arch_type	MACH_TYPE_AST2300_FPGA_1
++# endif
++# define machine_is_ast2300_fpga_1()	(machine_arch_type == MACH_TYPE_AST2300_FPGA_1)
++#else
++# define machine_is_ast2300_fpga_1()	(0)
++#endif
++
++#ifdef CONFIG_MACH_AST2300_FPGA_2
++# ifdef machine_arch_type
++#  undef machine_arch_type
++#  define machine_arch_type	__machine_arch_type
++# else
++#  define machine_arch_type	MACH_TYPE_AST2300_FPGA_2
++# endif
++# define machine_is_ast2300_fpga_2()	(machine_arch_type == MACH_TYPE_AST2300_FPGA_2)
++#else
++# define machine_is_ast2300_fpga_2()	(0)
++#endif
++
++#ifdef CONFIG_MACH_AST3100
++# ifdef machine_arch_type
++#  undef machine_arch_type
++#  define machine_arch_type	__machine_arch_type
++# else
++#  define machine_arch_type	MACH_TYPE_AST3100
++# endif
++# define machine_is_ast3100()	(machine_arch_type == MACH_TYPE_AST3100)
++#else
++# define machine_is_ast3100()	(0)
++#endif
++
++#ifdef CONFIG_MACH_ASPEED
++# ifdef machine_arch_type
++#  undef machine_arch_type
++#  define machine_arch_type	__machine_arch_type
++# else
++#  define machine_arch_type	MACH_TYPE_ASPEED
++# endif
++# define machine_is_aspeed()	(machine_arch_type == MACH_TYPE_ASPEED)
++#else
++# define machine_is_aspeed()	(0)
++#endif
++
++#ifdef CONFIG_MACH_AST2300
++# ifdef machine_arch_type
++#  undef machine_arch_type
++#  define machine_arch_type	__machine_arch_type
++# else
++#  define machine_arch_type	MACH_TYPE_AST2300
++# endif
++# define machine_is_ast2300()	(machine_arch_type == MACH_TYPE_AST2300)
++#else
++# define machine_is_ast2300()	(0)
++#endif
++
+ #ifdef CONFIG_MACH_OMAP_2430SDP
+ # ifdef machine_arch_type
+ #  undef machine_arch_type
+@@ -11043,18 +11172,6 @@ extern unsigned int __machine_arch_type;
+ # define machine_is_nokia_rm680()	(0)
+ #endif
+ 
+-#ifdef CONFIG_MACH_AST2200
+-# ifdef machine_arch_type
+-#  undef machine_arch_type
+-#  define machine_arch_type	__machine_arch_type
+-# else
+-#  define machine_arch_type	MACH_TYPE_AST2200
+-# endif
+-# define machine_is_ast2200()	(machine_arch_type == MACH_TYPE_AST2200)
+-#else
+-# define machine_is_ast2200()	(0)
+-#endif
+-
+ #ifdef CONFIG_MACH_LEAD
+ # ifdef machine_arch_type
+ #  undef machine_arch_type
+diff --git a/board/aspeed/ast2300/Makefile b/board/aspeed/ast2300/Makefile
+new file mode 100644
+index 0000000..d5300e6
+--- /dev/null
++++ b/board/aspeed/ast2300/Makefile
+@@ -0,0 +1,42 @@
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++# MA 02111-1307 USA
++#
++
++include $(TOPDIR)/config.mk
++
++LIB	= $(obj)lib$(BOARD).a
++
++COBJS	= ast2300.o flash.o flash_spi.o pci.o crc32.o slt.o regtest.o vfun.o vhace.o crt.o videotest.o mactest.o hactest.o mictest.o
++
++ifdef CONFIG_FPGA_ASPEED
++SOBJS   := platform_fpga.o
++else
++SOBJS   := platform.o
++endif
++
++SRCS    := $(SOBJS:.o=.S) $(COBJS:.o=.c)
++OBJS    := $(addprefix $(obj),$(COBJS))
++SOBJS   := $(addprefix $(obj),$(SOBJS))
++
++$(LIB): $(obj).depend $(OBJS) $(SOBJS)
++	$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
++
++clean:
++	rm -f $(SOBJS) $(OBJS)
++
++distclean:	clean
++	rm -f $(LIB) core *.bak $(obj).depend
++
++# defines $(obj).depend target
++include $(SRCTREE)/rules.mk
++
++sinclude .depend
++
++#########################################################################
+diff --git a/board/aspeed/ast2300/aes.c b/board/aspeed/ast2300/aes.c
+new file mode 100755
+index 0000000..f30ab99
+--- /dev/null
++++ b/board/aspeed/ast2300/aes.c
+@@ -0,0 +1,573 @@
++/*
++ *  AES implementation
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++/* uncomment the following line to run the test suite */
++
++/* #define TEST */
++
++/* uncomment the following line to use pre-computed tables */
++/* otherwise the tables will be generated at the first run */
++
++#define FIXED_TABLES
++
++#ifndef FIXED_TABLES
++
++/* forward S-box & tables */
++
++uint32 FSb[256];
++uint32 FT0[256]; 
++uint32 FT1[256]; 
++uint32 FT2[256]; 
++uint32 FT3[256]; 
++
++/* reverse S-box & tables */
++
++uint32 RSb[256];
++uint32 RT0[256];
++uint32 RT1[256];
++uint32 RT2[256];
++uint32 RT3[256];
++
++/* round constants */
++
++uint32 RCON[10];
++
++/* tables generation flag */
++
++int do_init = 1;
++
++/* tables generation routine */
++
++#define ROTR8(x) ( ( ( x << 24 ) & 0xFFFFFFFF ) | \
++                   ( ( x & 0xFFFFFFFF ) >>  8 ) )
++
++#define XTIME(x) ( ( x <<  1 ) ^ ( ( x & 0x80 ) ? 0x1B : 0x00 ) )
++#define MUL(x,y) ( ( x &&  y ) ? pow[(log[x] + log[y]) % 255] : 0 )
++
++void aes_gen_tables( void )
++{
++    int i;
++    uint8 x, y;
++    uint8 pow[256];
++    uint8 log[256];
++
++    /* compute pow and log tables over GF(2^8) */
++
++    for( i = 0, x = 1; i < 256; i++, x ^= XTIME( x ) )
++    {
++        pow[i] = x;
++        log[x] = i;
++    }
++
++    /* calculate the round constants */
++
++    for( i = 0, x = 1; i < 10; i++, x = XTIME( x ) )
++    {
++        RCON[i] = (uint32) x << 24;
++    }
++
++    /* generate the forward and reverse S-boxes */
++
++    FSb[0x00] = 0x63;
++    RSb[0x63] = 0x00;
++
++    for( i = 1; i < 256; i++ )
++    {
++        x = pow[255 - log[i]];
++
++        y = x;  y = ( y << 1 ) | ( y >> 7 );
++        x ^= y; y = ( y << 1 ) | ( y >> 7 );
++        x ^= y; y = ( y << 1 ) | ( y >> 7 );
++        x ^= y; y = ( y << 1 ) | ( y >> 7 );
++        x ^= y ^ 0x63;
++
++        FSb[i] = x;
++        RSb[x] = i;
++    }
++
++    /* generate the forward and reverse tables */
++
++    for( i = 0; i < 256; i++ )
++    {
++        x = (unsigned char) FSb[i]; y = XTIME( x );
++
++        FT0[i] =   (uint32) ( x ^ y ) ^
++                 ( (uint32) x <<  8 ) ^
++                 ( (uint32) x << 16 ) ^
++                 ( (uint32) y << 24 );
++
++        FT0[i] &= 0xFFFFFFFF;
++
++        FT1[i] = ROTR8( FT0[i] );
++        FT2[i] = ROTR8( FT1[i] );
++        FT3[i] = ROTR8( FT2[i] );
++
++        y = (unsigned char) RSb[i];
++
++        RT0[i] = ( (uint32) MUL( 0x0B, y )       ) ^
++                 ( (uint32) MUL( 0x0D, y ) <<  8 ) ^
++                 ( (uint32) MUL( 0x09, y ) << 16 ) ^
++                 ( (uint32) MUL( 0x0E, y ) << 24 );
++
++        RT0[i] &= 0xFFFFFFFF;
++
++        RT1[i] = ROTR8( RT0[i] );
++        RT2[i] = ROTR8( RT1[i] );
++        RT3[i] = ROTR8( RT2[i] );
++    }
++}
++
++#else
++
++/* forward S-box */
++
++static const uint32 FSb[256] =
++{
++    0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5,
++    0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
++    0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0,
++    0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
++    0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC,
++    0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
++    0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A,
++    0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
++    0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0,
++    0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
++    0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B,
++    0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
++    0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85,
++    0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
++    0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5,
++    0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
++    0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17,
++    0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
++    0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88,
++    0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
++    0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C,
++    0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
++    0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9,
++    0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
++    0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6,
++    0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
++    0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E,
++    0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
++    0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94,
++    0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
++    0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68,
++    0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
++};
++
++/* forward tables */
++
++#define FT \
++\
++    V(C6,63,63,A5), V(F8,7C,7C,84), V(EE,77,77,99), V(F6,7B,7B,8D), \
++    V(FF,F2,F2,0D), V(D6,6B,6B,BD), V(DE,6F,6F,B1), V(91,C5,C5,54), \
++    V(60,30,30,50), V(02,01,01,03), V(CE,67,67,A9), V(56,2B,2B,7D), \
++    V(E7,FE,FE,19), V(B5,D7,D7,62), V(4D,AB,AB,E6), V(EC,76,76,9A), \
++    V(8F,CA,CA,45), V(1F,82,82,9D), V(89,C9,C9,40), V(FA,7D,7D,87), \
++    V(EF,FA,FA,15), V(B2,59,59,EB), V(8E,47,47,C9), V(FB,F0,F0,0B), \
++    V(41,AD,AD,EC), V(B3,D4,D4,67), V(5F,A2,A2,FD), V(45,AF,AF,EA), \
++    V(23,9C,9C,BF), V(53,A4,A4,F7), V(E4,72,72,96), V(9B,C0,C0,5B), \
++    V(75,B7,B7,C2), V(E1,FD,FD,1C), V(3D,93,93,AE), V(4C,26,26,6A), \
++    V(6C,36,36,5A), V(7E,3F,3F,41), V(F5,F7,F7,02), V(83,CC,CC,4F), \
++    V(68,34,34,5C), V(51,A5,A5,F4), V(D1,E5,E5,34), V(F9,F1,F1,08), \
++    V(E2,71,71,93), V(AB,D8,D8,73), V(62,31,31,53), V(2A,15,15,3F), \
++    V(08,04,04,0C), V(95,C7,C7,52), V(46,23,23,65), V(9D,C3,C3,5E), \
++    V(30,18,18,28), V(37,96,96,A1), V(0A,05,05,0F), V(2F,9A,9A,B5), \
++    V(0E,07,07,09), V(24,12,12,36), V(1B,80,80,9B), V(DF,E2,E2,3D), \
++    V(CD,EB,EB,26), V(4E,27,27,69), V(7F,B2,B2,CD), V(EA,75,75,9F), \
++    V(12,09,09,1B), V(1D,83,83,9E), V(58,2C,2C,74), V(34,1A,1A,2E), \
++    V(36,1B,1B,2D), V(DC,6E,6E,B2), V(B4,5A,5A,EE), V(5B,A0,A0,FB), \
++    V(A4,52,52,F6), V(76,3B,3B,4D), V(B7,D6,D6,61), V(7D,B3,B3,CE), \
++    V(52,29,29,7B), V(DD,E3,E3,3E), V(5E,2F,2F,71), V(13,84,84,97), \
++    V(A6,53,53,F5), V(B9,D1,D1,68), V(00,00,00,00), V(C1,ED,ED,2C), \
++    V(40,20,20,60), V(E3,FC,FC,1F), V(79,B1,B1,C8), V(B6,5B,5B,ED), \
++    V(D4,6A,6A,BE), V(8D,CB,CB,46), V(67,BE,BE,D9), V(72,39,39,4B), \
++    V(94,4A,4A,DE), V(98,4C,4C,D4), V(B0,58,58,E8), V(85,CF,CF,4A), \
++    V(BB,D0,D0,6B), V(C5,EF,EF,2A), V(4F,AA,AA,E5), V(ED,FB,FB,16), \
++    V(86,43,43,C5), V(9A,4D,4D,D7), V(66,33,33,55), V(11,85,85,94), \
++    V(8A,45,45,CF), V(E9,F9,F9,10), V(04,02,02,06), V(FE,7F,7F,81), \
++    V(A0,50,50,F0), V(78,3C,3C,44), V(25,9F,9F,BA), V(4B,A8,A8,E3), \
++    V(A2,51,51,F3), V(5D,A3,A3,FE), V(80,40,40,C0), V(05,8F,8F,8A), \
++    V(3F,92,92,AD), V(21,9D,9D,BC), V(70,38,38,48), V(F1,F5,F5,04), \
++    V(63,BC,BC,DF), V(77,B6,B6,C1), V(AF,DA,DA,75), V(42,21,21,63), \
++    V(20,10,10,30), V(E5,FF,FF,1A), V(FD,F3,F3,0E), V(BF,D2,D2,6D), \
++    V(81,CD,CD,4C), V(18,0C,0C,14), V(26,13,13,35), V(C3,EC,EC,2F), \
++    V(BE,5F,5F,E1), V(35,97,97,A2), V(88,44,44,CC), V(2E,17,17,39), \
++    V(93,C4,C4,57), V(55,A7,A7,F2), V(FC,7E,7E,82), V(7A,3D,3D,47), \
++    V(C8,64,64,AC), V(BA,5D,5D,E7), V(32,19,19,2B), V(E6,73,73,95), \
++    V(C0,60,60,A0), V(19,81,81,98), V(9E,4F,4F,D1), V(A3,DC,DC,7F), \
++    V(44,22,22,66), V(54,2A,2A,7E), V(3B,90,90,AB), V(0B,88,88,83), \
++    V(8C,46,46,CA), V(C7,EE,EE,29), V(6B,B8,B8,D3), V(28,14,14,3C), \
++    V(A7,DE,DE,79), V(BC,5E,5E,E2), V(16,0B,0B,1D), V(AD,DB,DB,76), \
++    V(DB,E0,E0,3B), V(64,32,32,56), V(74,3A,3A,4E), V(14,0A,0A,1E), \
++    V(92,49,49,DB), V(0C,06,06,0A), V(48,24,24,6C), V(B8,5C,5C,E4), \
++    V(9F,C2,C2,5D), V(BD,D3,D3,6E), V(43,AC,AC,EF), V(C4,62,62,A6), \
++    V(39,91,91,A8), V(31,95,95,A4), V(D3,E4,E4,37), V(F2,79,79,8B), \
++    V(D5,E7,E7,32), V(8B,C8,C8,43), V(6E,37,37,59), V(DA,6D,6D,B7), \
++    V(01,8D,8D,8C), V(B1,D5,D5,64), V(9C,4E,4E,D2), V(49,A9,A9,E0), \
++    V(D8,6C,6C,B4), V(AC,56,56,FA), V(F3,F4,F4,07), V(CF,EA,EA,25), \
++    V(CA,65,65,AF), V(F4,7A,7A,8E), V(47,AE,AE,E9), V(10,08,08,18), \
++    V(6F,BA,BA,D5), V(F0,78,78,88), V(4A,25,25,6F), V(5C,2E,2E,72), \
++    V(38,1C,1C,24), V(57,A6,A6,F1), V(73,B4,B4,C7), V(97,C6,C6,51), \
++    V(CB,E8,E8,23), V(A1,DD,DD,7C), V(E8,74,74,9C), V(3E,1F,1F,21), \
++    V(96,4B,4B,DD), V(61,BD,BD,DC), V(0D,8B,8B,86), V(0F,8A,8A,85), \
++    V(E0,70,70,90), V(7C,3E,3E,42), V(71,B5,B5,C4), V(CC,66,66,AA), \
++    V(90,48,48,D8), V(06,03,03,05), V(F7,F6,F6,01), V(1C,0E,0E,12), \
++    V(C2,61,61,A3), V(6A,35,35,5F), V(AE,57,57,F9), V(69,B9,B9,D0), \
++    V(17,86,86,91), V(99,C1,C1,58), V(3A,1D,1D,27), V(27,9E,9E,B9), \
++    V(D9,E1,E1,38), V(EB,F8,F8,13), V(2B,98,98,B3), V(22,11,11,33), \
++    V(D2,69,69,BB), V(A9,D9,D9,70), V(07,8E,8E,89), V(33,94,94,A7), \
++    V(2D,9B,9B,B6), V(3C,1E,1E,22), V(15,87,87,92), V(C9,E9,E9,20), \
++    V(87,CE,CE,49), V(AA,55,55,FF), V(50,28,28,78), V(A5,DF,DF,7A), \
++    V(03,8C,8C,8F), V(59,A1,A1,F8), V(09,89,89,80), V(1A,0D,0D,17), \
++    V(65,BF,BF,DA), V(D7,E6,E6,31), V(84,42,42,C6), V(D0,68,68,B8), \
++    V(82,41,41,C3), V(29,99,99,B0), V(5A,2D,2D,77), V(1E,0F,0F,11), \
++    V(7B,B0,B0,CB), V(A8,54,54,FC), V(6D,BB,BB,D6), V(2C,16,16,3A)
++
++#define V(a,b,c,d) 0x##a##b##c##d
++static const uint32 FT0[256] = { FT };
++#undef V
++
++#define V(a,b,c,d) 0x##d##a##b##c
++static const uint32 FT1[256] = { FT };
++#undef V
++
++#define V(a,b,c,d) 0x##c##d##a##b
++static const uint32 FT2[256] = { FT };
++#undef V
++
++#define V(a,b,c,d) 0x##b##c##d##a
++static const uint32 FT3[256] = { FT };
++#undef V
++
++#undef FT
++
++/* reverse S-box */
++
++static const uint32 RSb[256] =
++{
++    0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38,
++    0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
++    0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87,
++    0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
++    0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D,
++    0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
++    0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2,
++    0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
++    0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16,
++    0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
++    0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA,
++    0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
++    0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A,
++    0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
++    0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02,
++    0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
++    0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA,
++    0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
++    0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85,
++    0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
++    0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89,
++    0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
++    0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20,
++    0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
++    0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31,
++    0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
++    0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D,
++    0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
++    0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0,
++    0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
++    0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26,
++    0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
++};
++
++/* reverse tables */
++
++#define RT \
++\
++    V(51,F4,A7,50), V(7E,41,65,53), V(1A,17,A4,C3), V(3A,27,5E,96), \
++    V(3B,AB,6B,CB), V(1F,9D,45,F1), V(AC,FA,58,AB), V(4B,E3,03,93), \
++    V(20,30,FA,55), V(AD,76,6D,F6), V(88,CC,76,91), V(F5,02,4C,25), \
++    V(4F,E5,D7,FC), V(C5,2A,CB,D7), V(26,35,44,80), V(B5,62,A3,8F), \
++    V(DE,B1,5A,49), V(25,BA,1B,67), V(45,EA,0E,98), V(5D,FE,C0,E1), \
++    V(C3,2F,75,02), V(81,4C,F0,12), V(8D,46,97,A3), V(6B,D3,F9,C6), \
++    V(03,8F,5F,E7), V(15,92,9C,95), V(BF,6D,7A,EB), V(95,52,59,DA), \
++    V(D4,BE,83,2D), V(58,74,21,D3), V(49,E0,69,29), V(8E,C9,C8,44), \
++    V(75,C2,89,6A), V(F4,8E,79,78), V(99,58,3E,6B), V(27,B9,71,DD), \
++    V(BE,E1,4F,B6), V(F0,88,AD,17), V(C9,20,AC,66), V(7D,CE,3A,B4), \
++    V(63,DF,4A,18), V(E5,1A,31,82), V(97,51,33,60), V(62,53,7F,45), \
++    V(B1,64,77,E0), V(BB,6B,AE,84), V(FE,81,A0,1C), V(F9,08,2B,94), \
++    V(70,48,68,58), V(8F,45,FD,19), V(94,DE,6C,87), V(52,7B,F8,B7), \
++    V(AB,73,D3,23), V(72,4B,02,E2), V(E3,1F,8F,57), V(66,55,AB,2A), \
++    V(B2,EB,28,07), V(2F,B5,C2,03), V(86,C5,7B,9A), V(D3,37,08,A5), \
++    V(30,28,87,F2), V(23,BF,A5,B2), V(02,03,6A,BA), V(ED,16,82,5C), \
++    V(8A,CF,1C,2B), V(A7,79,B4,92), V(F3,07,F2,F0), V(4E,69,E2,A1), \
++    V(65,DA,F4,CD), V(06,05,BE,D5), V(D1,34,62,1F), V(C4,A6,FE,8A), \
++    V(34,2E,53,9D), V(A2,F3,55,A0), V(05,8A,E1,32), V(A4,F6,EB,75), \
++    V(0B,83,EC,39), V(40,60,EF,AA), V(5E,71,9F,06), V(BD,6E,10,51), \
++    V(3E,21,8A,F9), V(96,DD,06,3D), V(DD,3E,05,AE), V(4D,E6,BD,46), \
++    V(91,54,8D,B5), V(71,C4,5D,05), V(04,06,D4,6F), V(60,50,15,FF), \
++    V(19,98,FB,24), V(D6,BD,E9,97), V(89,40,43,CC), V(67,D9,9E,77), \
++    V(B0,E8,42,BD), V(07,89,8B,88), V(E7,19,5B,38), V(79,C8,EE,DB), \
++    V(A1,7C,0A,47), V(7C,42,0F,E9), V(F8,84,1E,C9), V(00,00,00,00), \
++    V(09,80,86,83), V(32,2B,ED,48), V(1E,11,70,AC), V(6C,5A,72,4E), \
++    V(FD,0E,FF,FB), V(0F,85,38,56), V(3D,AE,D5,1E), V(36,2D,39,27), \
++    V(0A,0F,D9,64), V(68,5C,A6,21), V(9B,5B,54,D1), V(24,36,2E,3A), \
++    V(0C,0A,67,B1), V(93,57,E7,0F), V(B4,EE,96,D2), V(1B,9B,91,9E), \
++    V(80,C0,C5,4F), V(61,DC,20,A2), V(5A,77,4B,69), V(1C,12,1A,16), \
++    V(E2,93,BA,0A), V(C0,A0,2A,E5), V(3C,22,E0,43), V(12,1B,17,1D), \
++    V(0E,09,0D,0B), V(F2,8B,C7,AD), V(2D,B6,A8,B9), V(14,1E,A9,C8), \
++    V(57,F1,19,85), V(AF,75,07,4C), V(EE,99,DD,BB), V(A3,7F,60,FD), \
++    V(F7,01,26,9F), V(5C,72,F5,BC), V(44,66,3B,C5), V(5B,FB,7E,34), \
++    V(8B,43,29,76), V(CB,23,C6,DC), V(B6,ED,FC,68), V(B8,E4,F1,63), \
++    V(D7,31,DC,CA), V(42,63,85,10), V(13,97,22,40), V(84,C6,11,20), \
++    V(85,4A,24,7D), V(D2,BB,3D,F8), V(AE,F9,32,11), V(C7,29,A1,6D), \
++    V(1D,9E,2F,4B), V(DC,B2,30,F3), V(0D,86,52,EC), V(77,C1,E3,D0), \
++    V(2B,B3,16,6C), V(A9,70,B9,99), V(11,94,48,FA), V(47,E9,64,22), \
++    V(A8,FC,8C,C4), V(A0,F0,3F,1A), V(56,7D,2C,D8), V(22,33,90,EF), \
++    V(87,49,4E,C7), V(D9,38,D1,C1), V(8C,CA,A2,FE), V(98,D4,0B,36), \
++    V(A6,F5,81,CF), V(A5,7A,DE,28), V(DA,B7,8E,26), V(3F,AD,BF,A4), \
++    V(2C,3A,9D,E4), V(50,78,92,0D), V(6A,5F,CC,9B), V(54,7E,46,62), \
++    V(F6,8D,13,C2), V(90,D8,B8,E8), V(2E,39,F7,5E), V(82,C3,AF,F5), \
++    V(9F,5D,80,BE), V(69,D0,93,7C), V(6F,D5,2D,A9), V(CF,25,12,B3), \
++    V(C8,AC,99,3B), V(10,18,7D,A7), V(E8,9C,63,6E), V(DB,3B,BB,7B), \
++    V(CD,26,78,09), V(6E,59,18,F4), V(EC,9A,B7,01), V(83,4F,9A,A8), \
++    V(E6,95,6E,65), V(AA,FF,E6,7E), V(21,BC,CF,08), V(EF,15,E8,E6), \
++    V(BA,E7,9B,D9), V(4A,6F,36,CE), V(EA,9F,09,D4), V(29,B0,7C,D6), \
++    V(31,A4,B2,AF), V(2A,3F,23,31), V(C6,A5,94,30), V(35,A2,66,C0), \
++    V(74,4E,BC,37), V(FC,82,CA,A6), V(E0,90,D0,B0), V(33,A7,D8,15), \
++    V(F1,04,98,4A), V(41,EC,DA,F7), V(7F,CD,50,0E), V(17,91,F6,2F), \
++    V(76,4D,D6,8D), V(43,EF,B0,4D), V(CC,AA,4D,54), V(E4,96,04,DF), \
++    V(9E,D1,B5,E3), V(4C,6A,88,1B), V(C1,2C,1F,B8), V(46,65,51,7F), \
++    V(9D,5E,EA,04), V(01,8C,35,5D), V(FA,87,74,73), V(FB,0B,41,2E), \
++    V(B3,67,1D,5A), V(92,DB,D2,52), V(E9,10,56,33), V(6D,D6,47,13), \
++    V(9A,D7,61,8C), V(37,A1,0C,7A), V(59,F8,14,8E), V(EB,13,3C,89), \
++    V(CE,A9,27,EE), V(B7,61,C9,35), V(E1,1C,E5,ED), V(7A,47,B1,3C), \
++    V(9C,D2,DF,59), V(55,F2,73,3F), V(18,14,CE,79), V(73,C7,37,BF), \
++    V(53,F7,CD,EA), V(5F,FD,AA,5B), V(DF,3D,6F,14), V(78,44,DB,86), \
++    V(CA,AF,F3,81), V(B9,68,C4,3E), V(38,24,34,2C), V(C2,A3,40,5F), \
++    V(16,1D,C3,72), V(BC,E2,25,0C), V(28,3C,49,8B), V(FF,0D,95,41), \
++    V(39,A8,01,71), V(08,0C,B3,DE), V(D8,B4,E4,9C), V(64,56,C1,90), \
++    V(7B,CB,84,61), V(D5,32,B6,70), V(48,6C,5C,74), V(D0,B8,57,42)
++
++#define V(a,b,c,d) 0x##a##b##c##d
++static const uint32 RT0[256] = { RT };
++#undef V
++
++#define V(a,b,c,d) 0x##d##a##b##c
++static const uint32 RT1[256] = { RT };
++#undef V
++
++#define V(a,b,c,d) 0x##c##d##a##b
++static const uint32 RT2[256] = { RT };
++#undef V
++
++#define V(a,b,c,d) 0x##b##c##d##a
++static const uint32 RT3[256] = { RT };
++#undef V
++
++#undef RT
++
++/* round constants */
++
++static const uint32 RCON[10] =
++{
++    0x01000000, 0x02000000, 0x04000000, 0x08000000,
++    0x10000000, 0x20000000, 0x40000000, 0x80000000,
++    0x1B000000, 0x36000000
++};
++
++int do_init = 0;
++
++void aes_gen_tables( void )
++{
++}
++
++#endif
++
++/* platform-independant 32-bit integer manipulation macros */
++
++#define GET_UINT32_aes(n,b,i)                       \
++{                                               \
++    (n) = ( (uint32) (b)[(i)    ] << 24 )       \
++        | ( (uint32) (b)[(i) + 1] << 16 )       \
++        | ( (uint32) (b)[(i) + 2] <<  8 )       \
++        | ( (uint32) (b)[(i) + 3]       );      \
++}
++
++#define PUT_UINT32_aes(n,b,i)                       \
++{                                               \
++    (b)[(i)    ] = (uint8) ( (n) >> 24 );       \
++    (b)[(i) + 1] = (uint8) ( (n) >> 16 );       \
++    (b)[(i) + 2] = (uint8) ( (n) >>  8 );       \
++    (b)[(i) + 3] = (uint8) ( (n)       );       \
++}
++
++/* decryption key schedule tables */
++
++int KT_init = 1;
++
++uint32 KT0[256];
++uint32 KT1[256];
++uint32 KT2[256];
++uint32 KT3[256];
++
++/* AES key scheduling routine */
++int aes_set_key( aes_context *ctx, uint8 *key, int nbits )
++{
++    int i;
++    uint32 *RK, *SK;
++
++    if( do_init )
++    {
++        aes_gen_tables();
++
++        do_init = 0;
++    }
++
++    switch( nbits )
++    {
++        case 128: ctx->nr = 10; break;
++        case 192: ctx->nr = 12; break;
++        case 256: ctx->nr = 14; break;
++        default : return( 1 );
++    }
++
++    RK = ctx->erk;
++
++    for( i = 0; i < (nbits >> 5); i++ )
++    {
++        GET_UINT32_aes( RK[i], key, i * 4 );
++    }
++
++    /* setup encryption round keys */
++
++    switch( nbits )
++    {
++    case 128:
++
++        for( i = 0; i < 10; i++, RK += 4 )
++        {
++            RK[4]  = RK[0] ^ RCON[i] ^
++                        ( FSb[ (uint8) ( RK[3] >> 16 ) ] << 24 ) ^
++                        ( FSb[ (uint8) ( RK[3] >>  8 ) ] << 16 ) ^
++                        ( FSb[ (uint8) ( RK[3]       ) ] <<  8 ) ^
++                        ( FSb[ (uint8) ( RK[3] >> 24 ) ]       );
++
++            RK[5]  = RK[1] ^ RK[4];
++            RK[6]  = RK[2] ^ RK[5];
++            RK[7]  = RK[3] ^ RK[6];
++        }
++        break;
++
++    case 192:
++
++        for( i = 0; i < 8; i++, RK += 6 )
++        {
++            RK[6]  = RK[0] ^ RCON[i] ^
++                        ( FSb[ (uint8) ( RK[5] >> 16 ) ] << 24 ) ^
++                        ( FSb[ (uint8) ( RK[5] >>  8 ) ] << 16 ) ^
++                        ( FSb[ (uint8) ( RK[5]       ) ] <<  8 ) ^
++                        ( FSb[ (uint8) ( RK[5] >> 24 ) ]       );
++
++            RK[7]  = RK[1] ^ RK[6];
++            RK[8]  = RK[2] ^ RK[7];
++            RK[9]  = RK[3] ^ RK[8];
++            RK[10] = RK[4] ^ RK[9];
++            RK[11] = RK[5] ^ RK[10];
++        }
++        break;
++
++    case 256:
++
++        for( i = 0; i < 7; i++, RK += 8 )
++        {
++            RK[8]  = RK[0] ^ RCON[i] ^
++                        ( FSb[ (uint8) ( RK[7] >> 16 ) ] << 24 ) ^
++                        ( FSb[ (uint8) ( RK[7] >>  8 ) ] << 16 ) ^
++                        ( FSb[ (uint8) ( RK[7]       ) ] <<  8 ) ^
++                        ( FSb[ (uint8) ( RK[7] >> 24 ) ]       );
++
++            RK[9]  = RK[1] ^ RK[8];
++            RK[10] = RK[2] ^ RK[9];
++            RK[11] = RK[3] ^ RK[10];
++
++            RK[12] = RK[4] ^
++                        ( FSb[ (uint8) ( RK[11] >> 24 ) ] << 24 ) ^
++                        ( FSb[ (uint8) ( RK[11] >> 16 ) ] << 16 ) ^
++                        ( FSb[ (uint8) ( RK[11] >>  8 ) ] <<  8 ) ^
++                        ( FSb[ (uint8) ( RK[11]       ) ]       );
++
++            RK[13] = RK[5] ^ RK[12];
++            RK[14] = RK[6] ^ RK[13];
++            RK[15] = RK[7] ^ RK[14];
++        }
++        break;
++    }
++
++    /* setup decryption round keys */
++
++    if( KT_init )
++    {
++        for( i = 0; i < 256; i++ )
++        {
++            KT0[i] = RT0[ FSb[i] ];
++            KT1[i] = RT1[ FSb[i] ];
++            KT2[i] = RT2[ FSb[i] ];
++            KT3[i] = RT3[ FSb[i] ];
++        }
++
++        KT_init = 0;
++    }
++
++    SK = ctx->drk;
++
++    *SK++ = *RK++;
++    *SK++ = *RK++;
++    *SK++ = *RK++;
++    *SK++ = *RK++;
++
++    for( i = 1; i < ctx->nr; i++ )
++    {
++        RK -= 8;
++
++        *SK++ = KT0[ (uint8) ( *RK >> 24 ) ] ^
++                KT1[ (uint8) ( *RK >> 16 ) ] ^
++                KT2[ (uint8) ( *RK >>  8 ) ] ^
++                KT3[ (uint8) ( *RK       ) ]; RK++;
++
++        *SK++ = KT0[ (uint8) ( *RK >> 24 ) ] ^
++                KT1[ (uint8) ( *RK >> 16 ) ] ^
++                KT2[ (uint8) ( *RK >>  8 ) ] ^
++                KT3[ (uint8) ( *RK       ) ]; RK++;
++
++        *SK++ = KT0[ (uint8) ( *RK >> 24 ) ] ^
++                KT1[ (uint8) ( *RK >> 16 ) ] ^
++                KT2[ (uint8) ( *RK >>  8 ) ] ^
++                KT3[ (uint8) ( *RK       ) ]; RK++;
++
++        *SK++ = KT0[ (uint8) ( *RK >> 24 ) ] ^
++                KT1[ (uint8) ( *RK >> 16 ) ] ^
++                KT2[ (uint8) ( *RK >>  8 ) ] ^
++                KT3[ (uint8) ( *RK       ) ]; RK++;
++    }
++
++    RK -= 8;
++
++    *SK++ = *RK++;
++    *SK++ = *RK++;
++    *SK++ = *RK++;
++    *SK++ = *RK++;
++
++    return( 0 );
++}
+diff --git a/board/aspeed/ast2300/ast2300.c b/board/aspeed/ast2300/ast2300.c
+new file mode 100644
+index 0000000..b317786
+--- /dev/null
++++ b/board/aspeed/ast2300/ast2300.c
+@@ -0,0 +1,171 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++#include <common.h>
++#include <command.h>
++#include <pci.h>
++
++int board_init (void)
++{
++    DECLARE_GLOBAL_DATA_PTR;
++    unsigned char data;
++    unsigned long reg;
++
++    /* AHB Controller */
++    *((volatile ulong*) 0x1E600000)  = 0xAEED1A03;	/* unlock AHB controller */ 
++    *((volatile ulong*) 0x1E60008C) |= 0x01;		/* map DRAM to 0x00000000 */
++#ifdef CONFIG_PCI
++    *((volatile ulong*) 0x1E60008C) |= 0x30;		/* map PCI */
++#endif
++
++    /* Flash Controller */
++#ifdef	CONFIG_FLASH_AST2300
++    *((volatile ulong*) 0x1e620000) |= 0x800f0000;	/* enable Flash Write */     
++#else
++    *((volatile ulong*) 0x16000000) |= 0x00001c00;	/* enable Flash Write */ 
++#endif    
++
++    /* SCU */
++    *((volatile ulong*) 0x1e6e2000) = 0x1688A8A8;	/* unlock SCU */
++    reg = *((volatile ulong*) 0x1e6e2008);		
++    reg &= 0x1c0fffff;                                  
++    reg |= 0x61800000;						/* PCLK  = HPLL/8 */				
++#ifdef CONFIG_AST1070	
++	reg |= 0x300000;					/* LHCLK = HPLL/8 */
++	reg |= 0x80000;					/* LPC Host Clock */
++#endif	
++    *((volatile ulong*) 0x1e6e2008) = reg;     
++    reg = *((volatile ulong*) 0x1e6e200c);		/* enable 2D Clk */
++    *((volatile ulong*) 0x1e6e200c) &= 0xFFFFFFFD;
++/* enable wide screen. If your video driver does not support wide screen, don't
++enable this bit 0x1e6e2040 D[0]*/
++    reg = *((volatile ulong*) 0x1e6e2040);
++    *((volatile ulong*) 0x1e6e2040) |= 0x01;
++#ifdef CONFIG_AST1070                                                                          
++/*set VPPL1 */
++
++    *((volatile ulong*) 0x1e6e201c) = 0x6420;
++
++// set d2-pll & enable d2-pll D[21:20], D[4]
++    reg = *((volatile ulong*) 0x1e6e202c);
++    reg &= 0xffcfffef;
++    reg |= 0x00200010;
++    *((volatile ulong*) 0x1e6e202c) = reg;
++
++// set OSCCLK = VPLL1
++    *((volatile ulong*) 0x1e6e2010) = 0x8;
++
++// enable OSCCLK
++    reg = *((volatile ulong*) 0x1e6e202c);
++    reg &= 0xfffffffd;
++    reg |= 0x00000002;
++    *((volatile ulong*) 0x1e6e202c) = reg;
++
++// enable AST1050's LPC master
++    reg = *((volatile ulong*) 0x1e7890a0);
++    *((volatile ulong*) 0x1e7890a0) |= 0x11;
++#endif
++    /* arch number */
++    gd->bd->bi_arch_number = MACH_TYPE_ASPEED;
++                                                                                                                             
++    /* adress of boot parameters */
++    gd->bd->bi_boot_params = 0x40000100;
++                                                                                                                             
++    return 0;
++}
++
++int dram_init (void)
++{
++    DECLARE_GLOBAL_DATA_PTR;
++                                                                                                                             
++    gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
++    gd->bd->bi_dram[0].size  = PHYS_SDRAM_1_SIZE;
++                                                                                                                 
++    return 0;
++}
++
++/*
++SCU7C: Silicon Revision ID Register
++D[31:24]: Chip ID
++0: AST2050/AST2100/AST2150/AST2200/AST3000
++1: AST2300
++
++D[23:16] Silicon revision ID for AST2300 generation and later
++0: A0
++1: A1
++2: A2
++.
++.
++.
++FPGA revision starts from 0x80
++
++
++D[11:8] Bounding option
++
++D[7:0] Silicon revision ID for AST2050/AST2100 generation (for software compatible)
++0: A0
++1: A1
++2: A2
++3: A3
++.
++.
++FPGA revision starts from 0x08, 8~10 means A0, 11+ means A1, AST2300 should be assigned to 3
++*/
++int misc_init_r(void)
++{
++    unsigned int reg1, revision, chip_id;
++
++    /* Show H/W Version */
++    reg1 = (unsigned int) (*((ulong*) 0x1e6e207c));
++    chip_id = (reg1 & 0xff000000) >> 24;
++    revision = (reg1 & 0xff0000) >> 16;
++
++    puts ("H/W:   ");
++    if (chip_id == 1) {
++    	if (revision >= 0x80) {
++    		printf("AST2300 series FPGA Rev. %02x \n", revision);
++    	}
++    	else {
++    		printf("AST2300 series chip Rev. %02x \n", revision);
++    	}
++    }
++    else if (chip_id == 0) {
++	printf("AST2050/AST2150 series chip\n");
++    }
++
++#ifdef CONFIG_AST1070
++	puts ("C/C:   ");
++	revision = (unsigned int) (*((ulong*) 0x60002034));
++	printf("AST1070 ID [%08x] \n", revision);
++#endif
++
++#ifdef	CONFIG_PCI	
++    pci_init ();
++#endif
++
++    if (getenv ("verify") == NULL) {
++	setenv ("verify", "n");
++    }
++    if (getenv ("eeprom") == NULL) {
++	setenv ("eeprom", "y");
++    }
++}
++
++#ifdef	CONFIG_PCI
++static struct pci_controller hose;
++
++extern void aspeed_init_pci (struct pci_controller *hose);
++
++void pci_init_board(void)
++{
++    aspeed_init_pci(&hose);
++}
++#endif
+diff --git a/board/aspeed/ast2300/config.mk b/board/aspeed/ast2300/config.mk
+new file mode 100755
+index 0000000..24ca09b
+--- /dev/null
++++ b/board/aspeed/ast2300/config.mk
+@@ -0,0 +1,18 @@
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++# MA 02111-1307 USA
++#
++
++# ROM version
++#TEXT_BASE = 0xBFC00000
++
++# RAM version
++TEXT_BASE = 0x40500000
++#TEXT_BASE = 0x00000000
++#TEXT_BASE = 0x00400000
+diff --git a/board/aspeed/ast2300/crc32.c b/board/aspeed/ast2300/crc32.c
+new file mode 100755
+index 0000000..cc8d2ac
+--- /dev/null
++++ b/board/aspeed/ast2300/crc32.c
+@@ -0,0 +1,127 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#include <common.h>
++#include <asm/processor.h>
++#include <asm/byteorder.h>
++#include <environment.h>
++
++#ifdef CONFIG_2SPIFLASH
++
++extern flash_info_t flash_info[CFG_MAX_FLASH_BANKS];
++
++/* ========================================================================
++ * Table of CRC-32's of all single-byte values (made by make_aspeed_crc_table)
++ */
++unsigned long aspeed_crc_table[256] = {
++  0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
++  0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
++  0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
++  0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
++  0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
++  0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
++  0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
++  0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
++  0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
++  0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
++  0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
++  0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
++  0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
++  0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
++  0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
++  0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
++  0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
++  0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
++  0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
++  0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
++  0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
++  0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
++  0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
++  0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
++  0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
++  0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
++  0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
++  0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
++  0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
++  0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
++  0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
++  0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
++  0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
++  0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
++  0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
++  0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
++  0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
++  0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
++  0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
++  0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
++  0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
++  0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
++  0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
++  0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
++  0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
++  0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
++  0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
++  0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
++  0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
++  0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
++  0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
++  0x2d02ef8dL
++};
++
++/* ========================================================================= */
++#define ASPEED_DO1(buf)  crc = aspeed_crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
++#define ASPEED_DO2(buf)  ASPEED_DO1(buf); ASPEED_DO1(buf);
++#define ASPEED_DO4(buf)  ASPEED_DO2(buf); ASPEED_DO2(buf);
++#define ASPEED_DO8(buf)  ASPEED_DO4(buf); ASPEED_DO4(buf);
++
++/* ========================================================================= */
++unsigned long spi2_crc32(crc, buf, len)
++    unsigned long crc;
++    unsigned char *buf;
++    unsigned long len;
++{
++
++    size_t len1, len2;
++    char *s;
++
++    len1 = len2 = 0;
++    if ( (ulong)(buf) <= (flash_info[0].start[0] + flash_info[0].size) )
++        len1 = (flash_info[0].start[0] + flash_info[0].size) - (ulong)(buf);
++    
++    len1 = (len < len1) ? len:len1;
++    len2 = (len < len1) ? 0: (len - len1);
++
++    crc = crc ^ 0xffffffffL;
++    while (len1 >= 8)
++    {
++      ASPEED_DO8(buf);
++      len1 -= 8;
++    }
++    if (len1) do {
++      ASPEED_DO1(buf);
++    } while (--len1);
++    
++    //s = (char *) flash_info[1].start[0];
++    s= (char *) flash_make_addr (&flash_info[1], 0, 0);
++    while (len2 >= 8)
++    {
++      ASPEED_DO8(s);
++      len2 -= 8;
++    }
++    if (len2) do {
++      ASPEED_DO1(s);
++    } while (--len2);   
++
++    return crc ^ 0xffffffffL;
++    
++}
++
++#endif /* CONFIG_2SPIFLASH */
++
+diff --git a/board/aspeed/ast2300/crt.c b/board/aspeed/ast2300/crt.c
+new file mode 100755
+index 0000000..b67f669
+--- /dev/null
++++ b/board/aspeed/ast2300/crt.c
+@@ -0,0 +1,322 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#include <common.h>
++#include <command.h>
++
++#include "type.h"
++#include "vesa.h"
++#include "vdef.h"
++#include "vfun.h"
++#include "vreg.h"
++#include "crt.h"
++
++ULONG AST3000DCLKTableV [] = {
++    0x00046515,     /* 00: VCLK25_175 */  
++    0x00047255,     /* 01: VCLK28_322 */
++    0x0004682a,     /* 02: VCLK31_5         */
++    0x0004672a,     /* 03: VCLK36          */
++    0x00046c50,     /* 04: VCLK40           */
++    0x00046842,     /* 05: VCLK49_5         */
++    0x00006c32,     /* 06: VCLK50           */
++    0x00006a2f,     /* 07: VCLK56_25        */
++    0x00006c41,     /* 08: VCLK65  */
++    0x00006832,     /* 09: VCLK75         */
++    0x0000672e,     /* 0A: VCLK78_75        */
++    0x0000683f,     /* 0B: VCLK94_5         */
++    0x00004824,     /* 0C: VCLK108          */
++	0x00004723,		/* 0D: VCLK119			*/
++    0x0000482d,     /* 0E: VCLK135          */
++	0x00004B37,		/* 0F: VCLK146_25		*/
++    0x0000472e,     /* 10: VCLK157_5        */
++    0x00004836,     /* 11: VCLK162          */
++
++};
++
++BOOL CheckDAC(int nCRTIndex)
++{
++	BYTE	btValue;	
++	BOOL	bValue;
++
++	BYTE btDeviceSelect;
++
++	switch (nCRTIndex)
++	{
++	case CRT_1:
++		btDeviceSelect = DEVICE_ADDRESS_CH7301_CRT1;
++		break;
++	case CRT_2:
++		btDeviceSelect = DEVICE_ADDRESS_CH7301_CRT2;
++		break;
++	default:
++		printf("CRTIndex is not 1 or 2");
++		return FALSE;
++		break;
++	}
++
++	//Enable all DAC's and set register 21h[0] = '0'
++	//DVIP and DVIL disable for DAC
++	SetI2CRegClient(0, DEVICE_SELECT_CH7301, btDeviceSelect, CH7301_PM_REG, 0x00);
++
++	btValue = GetI2CRegClient(0, DEVICE_SELECT_CH7301, btDeviceSelect, CH7301_DC_REG);
++	btValue = btValue & 0xFE;
++	SetI2CRegClient(0, DEVICE_SELECT_CH7301, btDeviceSelect, CH7301_DC_REG, btValue);
++
++	//Set SENSE bit to 1
++	btValue = GetI2CRegClient(0, DEVICE_SELECT_CH7301, btDeviceSelect, CH7301_CD_REG);
++	btValue = btValue | 0x01;
++	SetI2CRegClient(0, DEVICE_SELECT_CH7301, btDeviceSelect, CH7301_CD_REG, btValue);
++
++	//Reset SENSE bit to 0
++	btValue = GetI2CRegClient(0, DEVICE_SELECT_CH7301, btDeviceSelect, CH7301_CD_REG);
++	btValue = btValue & 0xFE;
++	SetI2CRegClient(0, DEVICE_SELECT_CH7301, btDeviceSelect, CH7301_CD_REG, btValue);
++
++	bValue = (GetI2CRegClient(0, DEVICE_SELECT_CH7301, btDeviceSelect, CH7301_CD_REG) & CD_DACT) ? TRUE : FALSE;
++
++	return bValue;
++}
++
++VOID  SetCH7301C(ULONG	MMIOBase,
++				 int	nCRTIndex,
++                 int	inFreqRange,
++				 int	inOperating)
++{
++	BYTE btDeviceSelect;
++	BYTE btValue;
++
++//#ifdef EVB_CLIENT
++	//output RGB doesn't need to set CH7301
++	//if (1 == inOperating)
++	//	return;
++//#endif
++
++	switch (nCRTIndex)
++	{
++	case CRT_1:
++		btDeviceSelect = 0xEA;
++
++		break;
++	case CRT_2:
++		btDeviceSelect = 0xEC;
++
++		break;
++	default:
++		printf("CRTIndex is not 1 or 2");
++		return;
++		break;
++	}
++
++	if (inFreqRange <= VCLK65)
++	{
++	  printf("ch7301: low f \n");
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x33, 0x08);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x34, 0x16);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x36, 0x60);
++	}
++	else
++	{
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x33, 0x06);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x34, 0x26);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x36, 0xA0);
++	}
++
++	switch (inOperating)
++	{
++	case 0:
++		//DVI is normal function
++		 SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x49, 0xC0);
++		 SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x1D, 0x47);
++		break;
++	case 1:
++		//RGB
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x48, 0x18);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x49, 0x0);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x56, 0x0);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x21, 0x9);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x1D, 0x48);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x1C, 0x00);
++		break;
++	default:
++		break;
++	};
++}
++
++void SetASTModeTiming (ULONG MMIOBase, int nCRTIndex, BYTE ModeIndex, BYTE ColorDepth)
++{
++    ULONG    temp, RetraceStart, RetraceEnd, DisplayOffset, TerminalCount, bpp;
++
++//  Access CRT Engine
++	//  SetPolarity
++    WriteMemoryLongWithMASKClient(SCU_BASE, CRT1_CONTROL_REG + nCRTIndex*0x60, ((vModeTable[ModeIndex].HorPolarity << HOR_SYNC_SELECT_BIT) | (vModeTable[ModeIndex].VerPolarity << VER_SYNC_SELECT_BIT)), (HOR_SYNC_SELECT_MASK|VER_SYNC_SELECT_MASK));
++
++#if CONFIG_AST3000
++	WriteMemoryLongClient(SCU_BASE, CRT1_CONTROL2_REG + nCRTIndex*0x60, 0xc0);
++#else
++    //2100 is single edge
++	WriteMemoryLongClient(SCU_BASE, CRT1_CONTROL2_REG + nCRTIndex*0x60, 0x80);
++#endif    
++	//  Horizontal Timing
++	temp = 0;
++    temp = ((vModeTable[ModeIndex].HorizontalActive - 1) << HOR_ENABLE_END_BIT) | ((vModeTable[ModeIndex].HorizontalTotal - 1) << HOR_TOTAL_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_HOR_TOTAL_END_REG  + nCRTIndex*0x60, temp);
++
++    RetraceStart = vModeTable[ModeIndex].HorizontalTotal - vModeTable[ModeIndex].HBackPorch - vModeTable[ModeIndex].HSyncTime - vModeTable[ModeIndex].HLeftBorder - 1;
++    RetraceEnd = (RetraceStart + vModeTable[ModeIndex].HSyncTime);
++	temp = 0;
++    temp = (RetraceEnd << HOR_RETRACE_END_BIT) | (RetraceStart << HOR_RETRACE_START_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_HOR_RETRACE_REG  + nCRTIndex*0x60, temp);
++
++	//  Vertical Timing
++	temp = 0;
++    temp = ((vModeTable[ModeIndex].VerticalActive - 1) << VER_ENABLE_END_BIT) | ((vModeTable[ModeIndex].VerticalTotal - 1) << VER_TOTAL_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_VER_TOTAL_END_REG  + nCRTIndex*0x60, temp);
++
++	temp = 0;
++    RetraceStart = vModeTable[ModeIndex].VerticalTotal - vModeTable[ModeIndex].VBackPorch - vModeTable[ModeIndex].VSyncTime - vModeTable[ModeIndex].VTopBorder - 1;
++    RetraceEnd = (RetraceStart + vModeTable[ModeIndex].VSyncTime);
++    temp = (RetraceEnd << VER_RETRACE_END_BIT) | (RetraceStart << VER_RETRACE_START_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_VER_RETRACE_REG  + nCRTIndex*0x60, temp);
++
++	//  Set CRT Display Offset and Terminal Count
++    if (ColorDepth == RGB_565) {
++        bpp = 16;
++    }
++    else {
++        bpp = 32;
++    }
++
++    DisplayOffset = vModeTable[ModeIndex].HorizontalActive * bpp / 8;
++    TerminalCount = vModeTable[ModeIndex].HorizontalActive * bpp / 64;
++    if (ColorDepth == YUV_444) {
++        TerminalCount = TerminalCount * 3 / 4;
++    }
++    if (((vModeTable[ModeIndex].HorizontalActive * bpp) % 64) != 0) {
++        TerminalCount++;
++    }
++
++    WriteMemoryLongClient(SCU_BASE, CRT1_DISPLAY_OFFSET + nCRTIndex*0x60, ((TerminalCount << TERMINAL_COUNT_BIT) | DisplayOffset));
++
++	//  Set Color Format
++    WriteMemoryLongWithMASKClient(SCU_BASE, CRT1_CONTROL_REG + nCRTIndex*0x60, (ColorDepth << FORMAT_SELECT_BIT), FORMAT_SELECT_MASK);
++
++	//  Set Threshold
++	temp = 0;
++    temp = (CRT_HIGH_THRESHOLD_VALUE << THRES_HIGHT_BIT) | (CRT_LOW_THRESHOLD_VALUE << THRES_LOW_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_THRESHOLD_REG + nCRTIndex*0x60, temp);
++
++	WriteMemoryLongClient(SCU_BASE, CRT1_VIDEO_PLL_REG + nCRTIndex*0x60, AST3000DCLKTableV[vModeTable[ModeIndex].PixelClock]);
++}
++
++void SetASTCenter1024ModeTiming (ULONG MMIOBase, int nCRTIndex, BYTE ModeIndex, BYTE ColorDepth)
++{
++    ULONG    temp, RetraceStart, RetraceEnd, DisplayOffset, TerminalCount, bpp;
++
++	//  Access CRT Engine
++	//  SetPolarity
++    WriteMemoryLongWithMASKClient(SCU_BASE, CRT1_CONTROL_REG + nCRTIndex*0x60, (HOR_NEGATIVE << HOR_SYNC_SELECT_BIT) | (VER_NEGATIVE << VER_SYNC_SELECT_BIT), HOR_SYNC_SELECT_MASK|VER_SYNC_SELECT_MASK);
++
++	WriteMemoryLongClient(SCU_BASE, CRT1_CONTROL2_REG + nCRTIndex*0x60, 0xC0);
++
++	//  Horizontal Timing
++	temp = 0;
++    temp = ((vModeTable[ModeIndex].HorizontalActive - 1) << HOR_ENABLE_END_BIT) | ((vModeTable[10].HorizontalTotal - 1) << HOR_TOTAL_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_HOR_TOTAL_END_REG + nCRTIndex*0x60, temp);
++
++    RetraceStart = vModeTable[10].HorizontalTotal - vModeTable[10].HBackPorch - vModeTable[10].HSyncTime - vModeTable[10].HLeftBorder - 1;
++    RetraceStart = RetraceStart - (vModeTable[10].HorizontalActive - vModeTable[ModeIndex].HorizontalActive) / 2 - 1;
++    RetraceEnd = (RetraceStart + vModeTable[10].HSyncTime);
++	temp = 0;
++    temp = (RetraceEnd << HOR_RETRACE_END_BIT) | (RetraceStart << HOR_RETRACE_START_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_HOR_RETRACE_REG + nCRTIndex*0x60, temp);
++
++	//  Vertical Timing
++	temp = 0;
++    temp = ((vModeTable[ModeIndex].VerticalActive - 1) << VER_ENABLE_END_BIT) | ((vModeTable[10].VerticalTotal - 1) << VER_TOTAL_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_VER_TOTAL_END_REG + nCRTIndex*0x60, temp);
++
++    RetraceStart = vModeTable[10].VerticalTotal - vModeTable[10].VBackPorch - vModeTable[10].VSyncTime - vModeTable[10].VTopBorder - 1;
++    RetraceStart = RetraceStart - (vModeTable[10].VerticalActive - vModeTable[ModeIndex].VerticalActive) / 2 - 1;
++    RetraceEnd = (RetraceStart + vModeTable[10].VSyncTime);
++    temp = (RetraceEnd << VER_RETRACE_END_BIT) | (RetraceStart << VER_RETRACE_START_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_VER_RETRACE_REG + nCRTIndex*0x60, temp);
++
++	//  Set CRT Display Offset and Terminal Count
++    if (ColorDepth == RGB_565) {
++        bpp = 16;
++    }
++    else {
++        bpp = 32;
++    }
++    DisplayOffset = vModeTable[ModeIndex].HorizontalActive * bpp / 8;
++    TerminalCount = vModeTable[ModeIndex].HorizontalActive * bpp / 64;
++    if (ColorDepth == YUV_444) {
++        TerminalCount = TerminalCount * 3 / 4;
++    }
++    if (((vModeTable[ModeIndex].HorizontalActive * bpp) % 64) != 0) {
++        TerminalCount++;
++    }
++
++    WriteMemoryLongClient(SCU_BASE, CRT1_DISPLAY_OFFSET + nCRTIndex*0x60, (TerminalCount << TERMINAL_COUNT_BIT) | DisplayOffset);
++
++	//  Set Color Format
++    WriteMemoryLongWithMASKClient(SCU_BASE, CRT1_CONTROL_REG + nCRTIndex*0x60, (ColorDepth << FORMAT_SELECT_BIT), FORMAT_SELECT_MASK);
++
++	//  Set Threshold
++	temp = 0;
++    temp = (CRT_HIGH_THRESHOLD_VALUE << THRES_HIGHT_BIT) | (CRT_LOW_THRESHOLD_VALUE << THRES_LOW_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_THRESHOLD_REG + nCRTIndex*0x60, temp);
++    
++	// Set DCLK
++	WriteMemoryLongClient(SCU_BASE, CRT1_VIDEO_PLL_REG + nCRTIndex*0x60, AST3000DCLKTableV[vModeTable[ModeIndex].PixelClock]);
++
++}
++
++BOOL  ASTSetModeV (ULONG MMIOBase, int nCRTIndex, ULONG VGABaseAddr, USHORT Horizontal, USHORT Vertical, BYTE ColorFormat, BYTE CenterMode)
++{
++    BYTE    i, ModeIndex;
++    BOOL	bDAC;	
++    ULONG   ulTemp;
++
++    //  Access CRT Engine
++    //Enable CRT1 graph
++    WriteMemoryLongWithMASKClient(SCU_BASE, CRT1_CONTROL_REG + 0x60*nCRTIndex, GRAPH_DISPLAY_ON, GRAPH_DISPLAY_MASK);
++    
++    //  Set CRT Display Start Address
++    WriteMemoryLongWithMASKClient(SCU_BASE, CRT1_DISPLAY_ADDRESS + 0x60*nCRTIndex, VGABaseAddr, DISPLAY_ADDRESS_MASK);
++
++    for (i = 0; i < Mode60HZCount; i++) {
++        if ((vModeTable[i].HorizontalActive == Horizontal) && (vModeTable[i].VerticalActive == Vertical)) {
++
++	    ModeIndex = i;
++
++            if (CenterMode != 1) {
++                SetASTModeTiming(MMIOBase, nCRTIndex, i, ColorFormat);
++            }
++            else {
++                SetASTCenter1024ModeTiming (MMIOBase, nCRTIndex, i, ColorFormat);
++            }
++
++            //use internal video out sigal and don't need use 7301
++            /*
++			bDAC = CheckDAC(nCRTIndex);
++            
++			SetCH7301C(0,
++				nCRTIndex,
++				vModeTable[ModeIndex].PixelClock,
++				bDAC);		//For RGB
++			*/	
++			return TRUE;
++        }
++    }
++
++    return FALSE;
++}
++
+diff --git a/board/aspeed/ast2300/crt.h b/board/aspeed/ast2300/crt.h
+new file mode 100755
+index 0000000..e7483be
+--- /dev/null
++++ b/board/aspeed/ast2300/crt.h
+@@ -0,0 +1,121 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef _CRT_H_
++#define _CRT_H_
++
++#ifdef Watcom
++#define		CRT_REMAP_OFFSET	0x10000
++#else
++#define		CRT_REMAP_OFFSET	0x0
++#endif
++
++/********************************************************/
++/*    CRT register                                      */
++/********************************************************/
++#define		CRT_BASE_OFFSET						0x6000+CRT_REMAP_OFFSET
++
++#define		CRT1_CONTROL_REG					0x00 + CRT_BASE_OFFSET
++	#define		GRAPH_DISPLAY_BIT				0
++	#define     GRAPH_DISPLAY_MASK				(1<<0)
++		#define		GRAPH_DISPLAY_ON			1
++		#define		GRAPH_DISPLAY_OFF			0
++    #define     FORMAT_SELECT_BIT               8
++    #define     FORMAT_SELECT_MASK              (3<<8)   
++	#define		HOR_SYNC_SELECT_BIT				16
++    #define		HOR_SYNC_SELECT_MASK			(1<<16)	
++		#define		HOR_NEGATIVE				1
++		#define		HOR_POSITIVE				0
++	#define		VER_SYNC_SELECT_BIT				17
++    #define		VER_SYNC_SELECT_MASK			(1<<17)	
++		#define		VER_NEGATIVE				1
++		#define		VER_POSITIVE				0
++
++#define		CRT1_CONTROL2_REG					0x04 + CRT_BASE_OFFSET
++        
++#define     CRT1_VIDEO_PLL_REG                  0x0C + CRT_BASE_OFFSET
++    #define     POST_DIV_BIT                    18
++    #define     POST_DIV_MASK                   3<<18
++        #define     DIV_1_1                     0
++        //#define     DIV_1_2                     1
++        #define     DIV_1_2                     2
++        #define     DIV_1_4                     3
++        
++#define     CRT1_HOR_TOTAL_END_REG              0x10 + CRT_BASE_OFFSET
++    #define     HOR_TOTAL_BIT                   0
++    #define     HOR_ENABLE_END_BIT              16
++
++#define     CRT1_HOR_RETRACE_REG                0x14 + CRT_BASE_OFFSET
++    #define     HOR_RETRACE_START_BIT           0
++    #define     HOR_RETRACE_END_BIT             16
++
++#define     CRT1_VER_TOTAL_END_REG              0x18 + CRT_BASE_OFFSET
++    #define     VER_TOTAL_BIT                   0
++    #define     VER_ENABLE_END_BIT              16
++
++#define     CRT1_VER_RETRACE_REG                0x1C + CRT_BASE_OFFSET
++    #define     VER_RETRACE_START_BIT           0
++    #define     VER_RETRACE_END_BIT             16
++
++#define     CRT1_DISPLAY_ADDRESS				0x20 + CRT_BASE_OFFSET
++	#define		DISPLAY_ADDRESS_MASK			0x0FFFFFFF
++
++#define     CRT1_DISPLAY_OFFSET                 0x24 + CRT_BASE_OFFSET
++    #define     DISPLAY_OFFSET_ALIGN            7 /* 8 byte alignment*/
++    #define     TERMINAL_COUNT_BIT              16    
++
++#define     CRT1_THRESHOLD_REG                  0x28 + CRT_BASE_OFFSET
++    #define     THRES_LOW_BIT                   0
++    #define     THRES_HIGHT_BIT                 8
++
++#define    CURSOR_POSITION                  0x30 + OFFSET
++#define    CURSOR_OFFSET                    0x34 + OFFSET
++#define    CURSOR_PATTERN                   0x38 + OFFSET
++#define    OSD_HORIZONTAL                   0x40 + OFFSET
++#define    OSD_VERTICAL                     0x44 + OFFSET
++#define    OSD_PATTERN                      0x48 + OFFSET
++#define    OSD_OFFSET                       0x4C + OFFSET
++#define    OSD_THRESHOLD                    0x50 + OFFSET
++
++//Ch7301c
++#define		DEVICE_ADDRESS_CH7301_CRT1	0xEA
++#define		DEVICE_ADDRESS_CH7301_CRT2	0xEC
++
++
++#define		DEVICE_SELECT_CH7301		0x3
++
++/* CH7301 Register Definition */
++#define     CH7301_CD_REG				0x20
++	#define     CD_DACT					0x0E
++	#define		CD_DVIT					1 << 5
++#define     CH7301_DC_REG				0x21
++#define     CH7301_PM_REG				0x49
++
++BOOL CheckHotPlug(int nCRTIndex);
++BOOL CheckDAC(int nCRTIndex);
++
++BOOL  ASTSetModeV (ULONG MMIOBase, 
++                int nCRTIndex, 
++                ULONG VGABaseAddr, 
++                USHORT Horizontal, 
++                USHORT Vertical, 
++                BYTE ColorFormat, 
++                BYTE CenterMode);
++                
++BOOL  SelCRTClock(ULONG MMIOBase,
++				  int	nCRTIndex,
++				  USHORT Horizontal, 
++				  USHORT Vertical);
++
++void DisableCRT(ULONG MMIOBase, int nCRTIndex);
++void ClearCRTWithBlack(ULONG ulCRTAddr, int iWidth, int iHeight);
++
++#endif /* _CRT_H_ */
++
+diff --git a/board/aspeed/ast2300/flash.c b/board/aspeed/ast2300/flash.c
+new file mode 100755
+index 0000000..d611d0d
+--- /dev/null
++++ b/board/aspeed/ast2300/flash.c
+@@ -0,0 +1,1651 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ * History
++ * 01/20/2004 - combined variants of original driver.
++ * 01/22/2004 - Write performance enhancements for parallel chips (Tolunay)
++ * 01/23/2004 - Support for x8/x16 chips (Rune Raknerud)
++ * 01/27/2004 - Little endian support Ed Okerson
++ *
++ * Tested Architectures
++ * Port Width  Chip Width    # of banks	   Flash Chip  Board
++ * 32	       16	     1		   28F128J3    seranoa/eagle
++ * 64	       16	     1		   28F128J3    seranoa/falcon
++ */
++// (Sun) This CFI driver is written for fixed-width flash chips.
++// It was not designed for flexible 8-bit/16-bit chips, which are the norm.
++// When those chips are connected to a bus in 8-bit mode, the address wires
++// right-shifted by 1.
++//FIXME: Fix the driver to auto-detect "16-bit flash wired in 8-bit mode".
++// Left-shift CFI offsets by 1 bit instead of doubling the #define values.
++
++/* The DEBUG define must be before common to enable debugging */
++// (Sun) Changed to DEBUG_FLASH because flash debug()s are too numerous.
++// #define DEBUG
++
++#include <common.h>
++#include <asm/processor.h>
++#include <asm/byteorder.h>
++#include <environment.h>
++#ifdef	CONFIG_SYS_FLASH_CFI
++
++/*
++ * This file implements a Common Flash Interface (CFI) driver for U-Boot.
++ * The width of the port and the width of the chips are determined at initialization.
++ * These widths are used to calculate the address for access CFI data structures.
++ * It has been tested on an Intel Strataflash implementation and AMD 29F016D.
++ *
++ * References
++ * JEDEC Standard JESD68 - Common Flash Interface (CFI)
++ * JEDEC Standard JEP137-A Common Flash Interface (CFI) ID Codes
++ * Intel Application Note 646 Common Flash Interface (CFI) and Command Sets
++ * Intel 290667-008 3 Volt Intel StrataFlash Memory datasheet
++ *
++ * TODO
++ *
++ * Use Primary Extended Query table (PRI) and Alternate Algorithm Query
++ * Table (ALT) to determine if protection is available
++ *
++ * Add support for other command sets Use the PRI and ALT to determine command set
++ * Verify erase and program timeouts.
++ */
++
++#ifndef CONFIG_FLASH_BANKS_LIST
++#define CONFIG_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE }
++#endif
++
++#define FLASH_CMD_CFI			0x98
++#define FLASH_CMD_READ_ID		0x90
++#define FLASH_CMD_RESET			0xff
++#define FLASH_CMD_BLOCK_ERASE		0x20
++#define FLASH_CMD_ERASE_CONFIRM		0xD0
++#define FLASH_CMD_WRITE			0x40
++#define FLASH_CMD_PROTECT		0x60
++#define FLASH_CMD_PROTECT_SET		0x01
++#define FLASH_CMD_PROTECT_CLEAR		0xD0
++#define FLASH_CMD_CLEAR_STATUS		0x50
++#define FLASH_CMD_WRITE_TO_BUFFER	0xE8
++#define FLASH_CMD_WRITE_BUFFER_CONFIRM	0xD0
++
++#define FLASH_STATUS_DONE		0x80
++#define FLASH_STATUS_ESS		0x40
++#define FLASH_STATUS_ECLBS		0x20
++#define FLASH_STATUS_PSLBS		0x10
++#define FLASH_STATUS_VPENS		0x08
++#define FLASH_STATUS_PSS		0x04
++#define FLASH_STATUS_DPS		0x02
++#define FLASH_STATUS_R			0x01
++#define FLASH_STATUS_PROTECT		0x01
++
++#define AMD_CMD_RESET			0xF0
++#define AMD_CMD_WRITE			0xA0
++#define AMD_CMD_ERASE_START		0x80
++#define AMD_CMD_ERASE_SECTOR		0x30
++#define AMD_CMD_UNLOCK_START		0xAA
++#define AMD_CMD_UNLOCK_ACK		0x55
++#define AMD_CMD_WRITE_TO_BUFFER		0x25
++#define AMD_CMD_BUFFER_TO_FLASH		0x29
++
++#define AMD_STATUS_TOGGLE		0x40
++#define AMD_STATUS_ERROR		0x20
++//FIXME: These 3 were also changed for 8-bit/16-bit flash chips.
++#define AMD_ADDR_ERASE_START		(0xAAA/info->portwidth)
++#define AMD_ADDR_START			(0xAAA/info->portwidth)
++#define AMD_ADDR_ACK			(0x555/info->portwidth)
++
++//FIXME: Fix the driver to auto-detect "16-bit flash wired in 8-bit mode".
++// Left-shift CFI offsets by 1 bit instead of doubling the #define values.
++#define FLASH_OFFSET_CFI		(0xAA/info->portwidth)
++#define FLASH_OFFSET_CFI_RESP		(0x20/info->portwidth)
++#define FLASH_OFFSET_CFI_RESP1		(0x22/info->portwidth)
++#define FLASH_OFFSET_CFI_RESP2		(0x24/info->portwidth)
++#define FLASH_OFFSET_PRIMARY_VENDOR	(0x26/info->portwidth)
++#define FLASH_OFFSET_WTOUT		(0x3E/info->portwidth)
++#define FLASH_OFFSET_WBTOUT		(0x40/info->portwidth)
++#define FLASH_OFFSET_ETOUT		(0x42/info->portwidth)
++#define FLASH_OFFSET_CETOUT		(0x44/info->portwidth)
++#define FLASH_OFFSET_WMAX_TOUT		(0x46/info->portwidth)
++#define FLASH_OFFSET_WBMAX_TOUT		(0x48/info->portwidth)
++#define FLASH_OFFSET_EMAX_TOUT		(0x4A/info->portwidth)
++#define FLASH_OFFSET_CEMAX_TOUT		(0x4C/info->portwidth)
++#define FLASH_OFFSET_SIZE		(0x4E/info->portwidth)
++#define FLASH_OFFSET_INTERFACE		(0x50/info->portwidth)
++#define FLASH_OFFSET_BUFFER_SIZE	(0x54/info->portwidth)
++#define FLASH_OFFSET_NUM_ERASE_REGIONS	(0x58/info->portwidth)
++#define FLASH_OFFSET_ERASE_REGIONS	(0x5A/info->portwidth)
++#define FLASH_OFFSET_PROTECT		(0x02/info->portwidth)
++#define FLASH_OFFSET_USER_PROTECTION	(0x85/info->portwidth)
++#define FLASH_OFFSET_INTEL_PROTECTION	(0x81/info->portwidth)
++
++#define MAX_NUM_ERASE_REGIONS		4
++
++#define FLASH_MAN_CFI			0x01000000
++
++#define CFI_CMDSET_NONE		    0
++#define CFI_CMDSET_INTEL_EXTENDED   1
++#define CFI_CMDSET_AMD_STANDARD	    2
++#define CFI_CMDSET_INTEL_STANDARD   3
++#define CFI_CMDSET_AMD_EXTENDED	    4
++#define CFI_CMDSET_MITSU_STANDARD   256
++#define CFI_CMDSET_MITSU_EXTENDED   257
++#define CFI_CMDSET_SST		    258
++
++
++#ifdef CONFIG_SYS_FLASH_CFI_AMD_RESET /* needed for STM_ID_29W320DB on UC100 */
++# undef  FLASH_CMD_RESET
++# define FLASH_CMD_RESET                AMD_CMD_RESET /* use AMD-Reset instead */
++#endif
++
++
++typedef union {
++	unsigned char c;
++	unsigned short w;
++	unsigned long l;
++	unsigned long long ll;
++} cfiword_t;
++
++typedef union {
++	volatile unsigned char *cp;
++	volatile unsigned short *wp;
++	volatile unsigned long *lp;
++	volatile unsigned long long *llp;
++} cfiptr_t;
++
++/* use CFG_MAX_FLASH_BANKS_DETECT if defined */
++#ifdef CONFIG_SYS_MAX_FLASH_BANKS_DETECT
++static ulong bank_base[CONFIG_SYS_MAX_FLASH_BANKS_DETECT] = CONFIG_FLASH_BANKS_LIST;
++flash_info_t flash_info[CFG_MAX_FLASH_BANKS_DETECT];	/* FLASH chips info */
++#else
++static ulong bank_base[CONFIG_SYS_MAX_FLASH_BANKS] = CONFIG_FLASH_BANKS_LIST;
++flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];		/* FLASH chips info */
++#endif
++
++
++/*-----------------------------------------------------------------------
++ * Functions
++ */
++static void flash_add_byte (flash_info_t * info, cfiword_t * cword, uchar c);
++static void flash_make_cmd (flash_info_t * info, uchar cmd, void *cmdbuf);
++static void flash_write_cmd (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd);
++static void flash_write_cmd_nodbg (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd);
++static void flash_write_cmd_int (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd, int noDebug);
++static void flash_unlock_seq (flash_info_t * info, flash_sect_t sect);
++static int flash_isequal (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd);
++static int flash_isset (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd);
++static int flash_toggle (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd);
++static int flash_detect_cfi (flash_info_t * info);
++ulong flash_get_size (ulong base, int banknum);
++static int flash_write_cfiword (flash_info_t * info, ulong dest, cfiword_t cword);
++static int flash_full_status_check (flash_info_t * info, flash_sect_t sector,
++				    ulong tout, char *prompt);
++static void write_buffer_abort_reset(flash_info_t * info, flash_sect_t sector);				    
++#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
++static flash_info_t *flash_get_info(ulong base);
++#endif
++#ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp, int len);
++static int flash_write_cfibuffer_amd (flash_info_t * info, ulong dest, uchar * cp, int len);
++#endif
++
++/*-----------------------------------------------------------------------
++ * create an address based on the offset and the port width
++ */
++inline uchar *flash_make_addr (flash_info_t * info, flash_sect_t sect, uint offset)
++{
++	return ((uchar *) (info->start[sect] + (offset * info->portwidth)));
++}
++
++/*-----------------------------------------------------------------------
++ * Debug support
++ */
++#ifdef DEBUG_FLASH
++static void print_longlong (char *str, unsigned long long data)
++{
++	int i;
++	char *cp;
++
++	cp = (unsigned char *) &data;
++	for (i = 0; i < 8; i++)
++		sprintf (&str[i * 2], "%2.2x", *cp++);
++}
++#endif
++
++#if defined(DEBUG_FLASH)
++static void flash_printqry (flash_info_t * info, flash_sect_t sect)
++{
++	cfiptr_t cptr;
++	int x, y;
++
++	for (x = 0; x < 0x40; x += 16U / info->portwidth) {
++		cptr.cp =
++			flash_make_addr (info, sect,
++					 x + FLASH_OFFSET_CFI_RESP);
++		debug ("%p : ", cptr.cp);
++		for (y = 0; y < 16; y++) {
++			debug ("%2.2x ", cptr.cp[y]);
++		}
++		debug (" ");
++		for (y = 0; y < 16; y++) {
++			if (cptr.cp[y] >= 0x20 && cptr.cp[y] <= 0x7e) {
++				debug ("%c", cptr.cp[y]);
++			} else {
++				debug (".");
++			}
++		}
++		debug ("\n");
++	}
++}
++#endif
++
++/*-----------------------------------------------------------------------
++ * read a character at a port width address
++ */
++inline uchar flash_read_uchar (flash_info_t * info, uint offset)
++{
++	uchar *cp;
++
++	cp = flash_make_addr (info, 0, offset);
++#if defined(__LITTLE_ENDIAN)
++	return (cp[0]);
++#else
++	return (cp[info->portwidth - 1]);
++#endif
++}
++
++/*-----------------------------------------------------------------------
++ * read a short word by swapping for ppc format.
++ */
++#if 0
++static ushort flash_read_ushort (flash_info_t * info, flash_sect_t sect, uint offset)
++{
++	uchar *addr;
++	ushort retval;
++
++#ifdef DEBUG_FLASH
++	int x;
++#endif
++	addr = flash_make_addr (info, sect, offset);
++
++#ifdef DEBUG_FLASH
++	debug ("ushort addr is at %p info->portwidth = %d\n", addr,
++	       info->portwidth);
++	for (x = 0; x < 2 * info->portwidth; x++) {
++		debug ("addr[%x] = 0x%x\n", x, addr[x]);
++	}
++#endif
++#if defined(__LITTLE_ENDIAN)
++	if (info->interface == FLASH_CFI_X8X16) {
++	    retval = (addr[0] | (addr[2] << 8));
++	} else {
++	    retval = (addr[0] | (addr[(info->portwidth)] << 8));
++	}
++#else
++	retval = ((addr[(2 * info->portwidth) - 1] << 8) |
++		  addr[info->portwidth - 1]);
++#endif
++
++	debug ("retval = 0x%x\n", retval);
++	return retval;
++}
++#endif
++
++/*-----------------------------------------------------------------------
++ * read a long word by picking the least significant byte of each maximum
++ * port size word. Swap for ppc format.
++ */
++static ulong flash_read_long (flash_info_t * info, flash_sect_t sect, uint offset)
++{
++	uchar *addr;
++	ulong retval;
++#ifdef DEBUG_FLASH
++	int x;
++#endif
++#if 0
++	switch (info->interface) {
++	case FLASH_CFI_X8:
++	case FLASH_CFI_X16:
++	    break;
++	case FLASH_CFI_X8X16:
++	    offset <<= 1;
++	}
++#endif	
++	// flash_make_addr() multiplies offset by info->portwidth.
++	addr = flash_make_addr (info, sect, offset);
++
++#ifdef DEBUG_FLASH
++	debug ("long addr is at %p info->portwidth = %d\n", addr,
++	       info->portwidth);
++	for (x = 0; x < 4 * info->portwidth; x++) {
++		debug ("addr[%x] = 0x%x\n", x, addr[x]);
++	}
++#endif
++#if defined(__LITTLE_ENDIAN)
++	if (info->interface == FLASH_CFI_X8X16) {
++	    retval = (addr[0] | (addr[2] << 8) | (addr[4] << 16) | (addr[6] << 24));
++	} else {
++	    retval = (addr[0] | (addr[(info->portwidth)] << 8) |
++		      (addr[(2 * info->portwidth)] << 16) |
++		      (addr[(3 * info->portwidth)] << 24));
++	}
++#else
++	//FIXME: This undocumented code appears to match broken bus wiring.
++	retval = (addr[(2 * info->portwidth) - 1] << 24) |
++		(addr[(info->portwidth) - 1] << 16) |
++		(addr[(4 * info->portwidth) - 1] << 8) |
++		addr[(3 * info->portwidth) - 1];
++#endif
++	return retval;
++}
++
++/*-----------------------------------------------------------------------
++ */
++unsigned long flash_init (void)
++{
++	unsigned long size = 0;
++	int i;
++
++	/* Init: no FLASHes known */
++	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
++		flash_info[i].flash_id = FLASH_UNKNOWN;
++		size += flash_info[i].size = flash_get_size (bank_base[i], i);
++		if (flash_info[i].flash_id == FLASH_UNKNOWN) {
++#ifndef CFG_FLASH_QUIET_TEST
++			printf ("## Unknown FLASH on Bank %d - Size = 0x%08lx = %ld MB\n",
++				i, flash_info[i].size, flash_info[i].size << 20);
++#endif /* CFG_FLASH_QUIET_TEST */
++		}
++	}
++
++	/* Monitor protection ON by default */
++#if (CONFIG_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE)
++	flash_protect (FLAG_PROTECT_SET,
++		       CONFIG_MONITOR_BASE,
++		       CONFIG_MONITOR_BASE + monitor_flash_len  - 1,
++		       flash_get_info(CONFIG_MONITOR_BASE));
++#endif
++
++	/* Environment protection ON by default */
++#ifdef CONFIG_ENV_IS_IN_FLASH
++	flash_protect (FLAG_PROTECT_SET,
++		       CONFIG_ENV_ADDR,
++		       CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
++		       flash_get_info(CONFIG_ENV_ADDR));
++#endif
++
++	/* Redundant environment protection ON by default */
++#ifdef CONFIG_ENV_ADDR_REDUND
++	flash_protect (FLAG_PROTECT_SET,
++		       CONFIG_ENV_ADDR_REDUND,
++		       CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,
++		       flash_get_info(CONFIG_ENV_ADDR_REDUND));
++#endif
++	return (size);
++}
++
++/*-----------------------------------------------------------------------
++ */
++#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_ADDR_REDUND) || (CONFIG_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE)
++static flash_info_t *flash_get_info(ulong base)
++{
++	int i;
++	flash_info_t * info = 0;
++
++	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i ++) {
++		info = & flash_info[i];
++		if (info->size && info->start[0] <= base &&
++		    base <= info->start[0] + info->size - 1)
++			break;
++	}
++
++	return i == CONFIG_SYS_MAX_FLASH_BANKS ? 0 : info;
++}
++#endif
++
++/*-----------------------------------------------------------------------
++ */
++int flash_erase (flash_info_t * info, int s_first, int s_last)
++{
++	int rcode = 0;
++	int prot;
++	flash_sect_t sect;
++        uchar ch;
++	uchar *addr;
++  
++	if (info->flash_id != FLASH_MAN_CFI) {
++		puts ("Can't erase unknown flash type - aborted\n");
++		return 1;
++	}
++	if ((s_first < 0) || (s_first > s_last)) {
++		puts ("- no sectors to erase\n");
++		return 1;
++	}
++
++	prot = 0;
++	for (sect = s_first; sect <= s_last; ++sect) {
++		if (info->protect[sect]) {
++			prot++;
++		}
++	}
++	if (prot) {
++		printf ("- Warning: %d protected sectors will not be erased!\n", prot);
++	} else {
++		putc ('\n');
++	}
++
++
++	for (sect = s_first; sect <= s_last; sect++) {
++		if (info->protect[sect] == 0) { /* not protected */
++			switch (info->vendor) {
++			case CFI_CMDSET_INTEL_STANDARD:
++			case CFI_CMDSET_INTEL_EXTENDED:
++				flash_write_cmd (info, sect, 0, FLASH_CMD_CLEAR_STATUS);
++				flash_write_cmd (info, sect, 0, FLASH_CMD_BLOCK_ERASE);
++				flash_write_cmd (info, sect, 0, FLASH_CMD_ERASE_CONFIRM);
++				break;
++			case CFI_CMDSET_AMD_STANDARD:
++			case CFI_CMDSET_AMD_EXTENDED:
++				flash_unlock_seq (info, sect);
++				flash_write_cmd (info, sect, AMD_ADDR_ERASE_START,
++							AMD_CMD_ERASE_START);
++				flash_unlock_seq (info, sect);
++				flash_write_cmd (info, sect, 0, AMD_CMD_ERASE_SECTOR);
++				
++				/* toggle */
++	                        addr = flash_make_addr (info, sect, 0);				
++				do {
++				    ch = *(volatile uchar *)(addr);
++                                } while ( ((ch & 0x80) == 0) || (ch != 0xFF) );
++				break;
++			default:
++				debug ("Unkown flash vendor %d\n",
++				       info->vendor);
++				break;
++			}
++
++			if (flash_full_status_check
++			    (info, sect, info->erase_blk_tout, "erase")) {
++				rcode = 1;
++			} else
++				putc ('.');
++		}
++	}
++	puts (" done\n");
++	return rcode;
++}
++
++/*-----------------------------------------------------------------------
++ */
++void flash_print_info (flash_info_t * info)
++{
++	int i;
++
++	if (info->flash_id != FLASH_MAN_CFI) {
++		puts ("missing or unknown FLASH type\n");
++		return;
++	}
++
++	printf ("CFI conformant FLASH (%d x %d)",
++		(info->portwidth << 3), (info->chipwidth << 3));
++	printf ("  Size: %ld MB in %d Sectors\n",
++		info->size >> 20, info->sector_count);
++	printf (" Erase timeout %ld ms, write timeout %ld ms, buffer write timeout %ld ms, buffer size %d\n",
++		info->erase_blk_tout,
++		info->write_tout,
++		info->buffer_write_tout,
++		info->buffer_size);
++
++	puts ("  Sector Start Addresses:");
++	for (i = 0; i < info->sector_count; ++i) {
++#ifdef CFG_FLASH_EMPTY_INFO
++		int k;
++		int size;
++		int erased;
++		volatile unsigned long *flash;
++
++		/*
++		 * Check if whole sector is erased
++		 */
++		if (i != (info->sector_count - 1))
++			size = info->start[i + 1] - info->start[i];
++		else
++			size = info->start[0] + info->size - info->start[i];
++		erased = 1;
++		flash = (volatile unsigned long *) info->start[i];
++		size = size >> 2;	/* divide by 4 for longword access */
++		for (k = 0; k < size; k++) {
++			if (*flash++ != 0xffffffff) {
++				erased = 0;
++				break;
++			}
++		}
++
++		if ((i % 5) == 0)
++			printf ("\n");
++		/* print empty and read-only info */
++		printf (" %08lX%s%s",
++			info->start[i],
++			erased ? " E" : "  ",
++			info->protect[i] ? "RO " : "   ");
++#else	/* ! CFG_FLASH_EMPTY_INFO */
++		if ((i % 5) == 0)
++			printf ("\n   ");
++		printf (" %08lX%s",
++			info->start[i], info->protect[i] ? " (RO)" : "     ");
++#endif
++	}
++	putc ('\n');
++	return;
++}
++
++/*-----------------------------------------------------------------------
++ * Copy memory to flash, returns:
++ * 0 - OK
++ * 1 - write timeout
++ * 2 - Flash not erased
++ */
++int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
++{
++	ulong wp;
++	ulong cp;
++	int aln;
++	cfiword_t cword;
++	int i, rc;
++
++#ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++	unsigned char pat[] = {'|', '-', '/', '\\'};
++       	int patcnt = 0;
++	int buffered_size;
++#endif
++	/* get lower aligned address */
++	/* get lower aligned address */
++	wp = (addr & ~(info->portwidth - 1));
++
++	/* handle unaligned start */
++	if ((aln = addr - wp) != 0) {
++		cword.l = 0;
++		cp = wp;
++		for (i = 0; i < aln; ++i, ++cp)
++			flash_add_byte (info, &cword, (*(uchar *) cp));
++
++		for (; (i < info->portwidth) && (cnt > 0); i++) {
++			flash_add_byte (info, &cword, *src++);
++			cnt--;
++			cp++;
++		}
++		for (; (cnt == 0) && (i < info->portwidth); ++i, ++cp)
++			flash_add_byte (info, &cword, (*(uchar *) cp));
++		if ((rc = flash_write_cfiword (info, wp, cword)) != 0)
++			return rc;
++		wp = cp;
++	}
++
++	/* handle the aligned part */
++#ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++	buffered_size = (info->portwidth / info->chipwidth);
++	buffered_size *= info->buffer_size;
++	while (cnt >= info->portwidth) {
++		/* Show processing */
++		if ((++patcnt % 256) == 0)
++		    printf("%c\b", pat[(patcnt / 256) & 0x03]);
++
++		i = buffered_size > cnt ? cnt : buffered_size;
++		if ((rc = flash_write_cfibuffer (info, wp, src, i)) != ERR_OK)
++			return rc;
++		i -= i & (info->portwidth - 1);
++		wp += i;
++		src += i;
++		cnt -= i;
++	}
++#else
++	while (cnt >= info->portwidth) {
++		cword.l = 0;
++		for (i = 0; i < info->portwidth; i++) {
++			flash_add_byte (info, &cword, *src++);
++		}
++		if ((rc = flash_write_cfiword (info, wp, cword)) != 0)
++			return rc;
++		wp += info->portwidth;
++		cnt -= info->portwidth;
++	}
++#endif /* CONFIG_SYS_FLASH_USE_BUFFER_WRITE */
++	if (cnt == 0) {
++		return (0);
++	}
++
++	/*
++	 * handle unaligned tail bytes
++	 */
++	cword.l = 0;
++	for (i = 0, cp = wp; (i < info->portwidth) && (cnt > 0); ++i, ++cp) {
++		flash_add_byte (info, &cword, *src++);
++		--cnt;
++	}
++	for (; i < info->portwidth; ++i, ++cp) {
++		flash_add_byte (info, &cword, (*(uchar *) cp));
++	}
++
++	return flash_write_cfiword (info, wp, cword);
++}
++
++/*-----------------------------------------------------------------------
++ */
++#ifdef CFG_FLASH_PROTECTION
++
++int flash_real_protect (flash_info_t * info, long sector, int prot)
++{
++	int retcode = 0;
++
++	flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS);
++	flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT);
++	if (prot)
++		flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT_SET);
++	else
++		flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT_CLEAR);
++
++	if ((retcode =
++	     flash_full_status_check (info, sector, info->erase_blk_tout,
++				      prot ? "protect" : "unprotect")) == 0) {
++
++		info->protect[sector] = prot;
++		/* Intel's unprotect unprotects all locking */
++		if (prot == 0) {
++			flash_sect_t i;
++
++			for (i = 0; i < info->sector_count; i++) {
++				if (info->protect[i])
++					flash_real_protect (info, i, 1);
++			}
++		}
++	}
++	return retcode;
++}
++
++/*-----------------------------------------------------------------------
++ * flash_read_user_serial - read the OneTimeProgramming cells
++ */
++void flash_read_user_serial (flash_info_t * info, void *buffer, int offset,
++			     int len)
++{
++	uchar *src;
++	uchar *dst;
++
++	dst = buffer;
++	src = flash_make_addr (info, 0, FLASH_OFFSET_USER_PROTECTION);
++	flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID);
++	memcpy (dst, src + offset, len);
++	flash_write_cmd (info, 0, 0, info->cmd_reset);
++}
++
++/*
++ * flash_read_factory_serial - read the device Id from the protection area
++ */
++void flash_read_factory_serial (flash_info_t * info, void *buffer, int offset,
++				int len)
++{
++	uchar *src;
++
++	src = flash_make_addr (info, 0, FLASH_OFFSET_INTEL_PROTECTION);
++	flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID);
++	memcpy (buffer, src + offset, len);
++	flash_write_cmd (info, 0, 0, info->cmd_reset);
++}
++
++#endif /* CFG_FLASH_PROTECTION */
++
++/*
++ * flash_is_busy - check to see if the flash is busy
++ * This routine checks the status of the chip and returns true if the chip is busy
++ */
++static int flash_is_busy (flash_info_t * info, flash_sect_t sect)
++{
++	int retval;
++
++	switch (info->vendor) {
++	case CFI_CMDSET_INTEL_STANDARD:
++	case CFI_CMDSET_INTEL_EXTENDED:
++		retval = !flash_isset (info, sect, 0, FLASH_STATUS_DONE);
++		break;
++	case CFI_CMDSET_AMD_STANDARD:
++	case CFI_CMDSET_AMD_EXTENDED:
++		retval = flash_toggle (info, sect, 0, AMD_STATUS_TOGGLE);
++		break;
++	default:
++		retval = 0;
++	}
++#ifdef DEBUG_FLASH
++	if (retval)
++	    debug ("flash_is_busy: %d\n", retval);
++#endif
++	return retval;
++}
++
++/*-----------------------------------------------------------------------
++ *  wait for XSR.7 to be set. Time out with an error if it does not.
++ *  This routine does not set the flash to read-array mode.
++ */
++static int flash_status_check (flash_info_t * info, flash_sect_t sector,
++			       ulong tout, char *prompt)
++{
++	ulong start, now;
++
++	/* Wait for command completion */
++	// (Sun) Fix order of checking time so it works when the CPU is very
++	// slow, e.g., single-stepping or emulation.
++	start = get_timer (0);
++	while (now = get_timer(start),
++	       flash_is_busy (info, sector))
++	{
++		if (now > info->erase_blk_tout) {
++			printf ("Flash %s timeout at address %lx data %lx\n",
++				prompt, info->start[sector],
++				flash_read_long (info, sector, 0));
++			flash_write_cmd (info, sector, 0, info->cmd_reset);
++			return ERR_TIMOUT;
++		}
++	}
++	return ERR_OK;
++}
++
++/*-----------------------------------------------------------------------
++ * Wait for XSR.7 to be set, if it times out print an error, otherwise do a full status check.
++ * This routine sets the flash to read-array mode.
++ */
++static int flash_full_status_check (flash_info_t * info, flash_sect_t sector,
++				    ulong tout, char *prompt)
++{
++	int retcode;
++
++	retcode = flash_status_check (info, sector, tout, prompt);
++	switch (info->vendor) {
++	case CFI_CMDSET_INTEL_EXTENDED:
++	case CFI_CMDSET_INTEL_STANDARD:
++		if ((retcode != ERR_OK)
++		    && !flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) {
++			retcode = ERR_INVAL;
++			printf ("Flash %s error at address %lx\n", prompt,
++				info->start[sector]);
++			if (flash_isset (info, sector, 0, FLASH_STATUS_ECLBS | FLASH_STATUS_PSLBS)) {
++				puts ("Command Sequence Error.\n");
++			} else if (flash_isset (info, sector, 0, FLASH_STATUS_ECLBS)) {
++				puts ("Block Erase Error.\n");
++				retcode = ERR_NOT_ERASED;
++			} else if (flash_isset (info, sector, 0, FLASH_STATUS_PSLBS)) {
++				puts ("Locking Error\n");
++			}
++			if (flash_isset (info, sector, 0, FLASH_STATUS_DPS)) {
++				puts ("Block locked.\n");
++				retcode = ERR_PROTECTED;
++			}
++			if (flash_isset (info, sector, 0, FLASH_STATUS_VPENS))
++				puts ("Vpp Low Error.\n");
++		}
++		flash_write_cmd (info, sector, 0, info->cmd_reset);
++		break;
++	default:
++		break;
++	}
++	return retcode;
++}
++
++static void write_buffer_abort_reset(flash_info_t * info, flash_sect_t sector)
++{
++     flash_write_cmd (info, sector, 0xaaa, 0xaa);
++     flash_write_cmd (info, sector, 0x555, 0x55);
++     flash_write_cmd (info, sector, 0xaaa, 0xf0);    	
++}	
++
++/*-----------------------------------------------------------------------
++ */
++static void flash_add_byte (flash_info_t * info, cfiword_t * cword, uchar c)
++{
++#if defined(__LITTLE_ENDIAN)
++	unsigned short	w;
++	unsigned int	l;
++	unsigned long long ll;
++#endif
++
++	switch (info->portwidth) {
++	case FLASH_CFI_8BIT:
++		cword->c = c;
++		break;
++	case FLASH_CFI_16BIT:
++#if defined(__LITTLE_ENDIAN)
++		w = c;
++		w <<= 8;
++		cword->w = (cword->w >> 8) | w;
++#else
++		cword->w = (cword->w << 8) | c;
++#endif
++		break;
++	case FLASH_CFI_32BIT:
++#if defined(__LITTLE_ENDIAN)
++		l = c;
++		l <<= 24;
++		cword->l = (cword->l >> 8) | l;
++#else
++		cword->l = (cword->l << 8) | c;
++#endif
++		break;
++	case FLASH_CFI_64BIT:
++#if defined(__LITTLE_ENDIAN)
++		ll = c;
++		ll <<= 56;
++		cword->ll = (cword->ll >> 8) | ll;
++#else
++		cword->ll = (cword->ll << 8) | c;
++#endif
++		break;
++	}
++}
++
++
++/*-----------------------------------------------------------------------
++ * make a proper sized command based on the port and chip widths
++ */
++static void flash_make_cmd (flash_info_t * info, uchar cmd, void *cmdbuf)
++{
++	int i;
++	uchar *cp = (uchar *) cmdbuf;
++
++#if defined(__LITTLE_ENDIAN)
++	for (i = info->portwidth; i > 0; i--)
++#else
++	for (i = 1; i <= info->portwidth; i++)
++#endif
++		*cp++ = (i & (info->chipwidth - 1)) ? '\0' : cmd;
++}
++
++/*
++ * Write a proper sized command to the correct address
++ */
++static void
++flash_write_cmd (flash_info_t * info, flash_sect_t sect, uint offset,
++		 uchar cmd)
++{
++#ifdef DEBUG_FLASH
++    const int noDebug = 0;
++#else
++    const int noDebug = 1;
++#endif
++    return flash_write_cmd_int(info, sect, offset, cmd, noDebug);
++}
++static void
++flash_write_cmd_nodbg (flash_info_t * info, flash_sect_t sect, uint offset,
++		       uchar cmd)
++{
++    return flash_write_cmd_int(info, sect, offset, cmd, 1);
++}
++
++static void
++flash_write_cmd_int (flash_info_t * info, flash_sect_t sect, uint offset,
++		     uchar cmd, int noDebug)
++{
++
++	volatile cfiptr_t addr;
++	cfiword_t cword;
++
++	addr.cp = flash_make_addr (info, sect, offset);
++	flash_make_cmd (info, cmd, &cword);
++	switch (info->portwidth) {
++	case FLASH_CFI_8BIT:
++		if (noDebug == 0)
++		debug ("fwc addr %p cmd %x %x 8bit x %d bit\n", addr.cp, cmd,
++		       cword.c, info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
++		*addr.cp = cword.c;
++		break;
++	case FLASH_CFI_16BIT:
++		if (noDebug == 0)
++		debug ("fwc addr %p cmd %x %4.4x 16bit x %d bit\n", addr.wp,
++		       cmd, cword.w,
++		       info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
++		*addr.wp = cword.w;
++		break;
++	case FLASH_CFI_32BIT:
++		if (noDebug == 0)
++		debug ("fwc addr %p cmd %x %8.8lx 32bit x %d bit\n", addr.lp,
++		       cmd, cword.l,
++		       info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
++		*addr.lp = cword.l;
++		break;
++	case FLASH_CFI_64BIT:
++#ifdef DEBUG_FLASH
++		if (noDebug == 0)
++		{
++			char str[20];
++
++			print_longlong (str, cword.ll);
++
++			debug ("fwrite addr %p cmd %x %s 64 bit x %d bit\n",
++			       addr.llp, cmd, str,
++			       info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
++		}
++#endif
++		*addr.llp = cword.ll;
++		break;
++	}
++}
++
++static void flash_unlock_seq (flash_info_t * info, flash_sect_t sect)
++{
++	flash_write_cmd_nodbg (info, sect, AMD_ADDR_START, AMD_CMD_UNLOCK_START);
++	flash_write_cmd_nodbg (info, sect, AMD_ADDR_ACK, AMD_CMD_UNLOCK_ACK);
++}
++
++/*-----------------------------------------------------------------------
++ */
++static int flash_isequal (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd)
++{
++	cfiptr_t cptr;
++	cfiword_t cword;
++	int retval;
++#ifdef DEBUG_FLASH
++	const int dbg = 1;
++#else
++	const int dbg = 0;
++#endif
++	cptr.cp = flash_make_addr (info, sect, offset);
++	flash_make_cmd (info, cmd, &cword);
++
++	if (dbg)
++	    debug ("is= cmd %x(%c) addr %p ", cmd, cmd, cptr.cp);
++	switch (info->portwidth) {
++	case FLASH_CFI_8BIT:
++		if (dbg)
++		    debug ("is= %x %x\n", cptr.cp[0], cword.c);
++		retval = (cptr.cp[0] == cword.c);
++		break;
++	case FLASH_CFI_16BIT:
++		if (dbg)
++		    debug ("is= %4.4x %4.4x\n", cptr.wp[0], cword.w);
++		retval = (cptr.wp[0] == cword.w);
++		break;
++	case FLASH_CFI_32BIT:
++		if (dbg)
++		    debug ("is= %8.8lx %8.8lx\n", cptr.lp[0], cword.l);
++		retval = (cptr.lp[0] == cword.l);
++		break;
++	case FLASH_CFI_64BIT:
++#ifdef DEBUG_FLASH
++		{
++			char str1[20];
++			char str2[20];
++
++			print_longlong (str1, cptr.llp[0]);
++			print_longlong (str2, cword.ll);
++			debug ("is= %s %s\n", str1, str2);
++		}
++#endif
++		retval = (cptr.llp[0] == cword.ll);
++		break;
++	default:
++		retval = 0;
++		break;
++	}
++	return retval;
++}
++
++/*-----------------------------------------------------------------------
++ */
++static int flash_isset (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd)
++{
++	cfiptr_t cptr;
++	cfiword_t cword;
++	int retval;
++
++	cptr.cp = flash_make_addr (info, sect, offset);
++	flash_make_cmd (info, cmd, &cword);
++	switch (info->portwidth) {
++	case FLASH_CFI_8BIT:
++		retval = ((cptr.cp[0] & cword.c) == cword.c);
++		break;
++	case FLASH_CFI_16BIT:
++		retval = ((cptr.wp[0] & cword.w) == cword.w);
++		break;
++	case FLASH_CFI_32BIT:
++		retval = ((cptr.lp[0] & cword.l) == cword.l);
++		break;
++	case FLASH_CFI_64BIT:
++		retval = ((cptr.llp[0] & cword.ll) == cword.ll);
++		break;
++	default:
++		retval = 0;
++		break;
++	}
++	return retval;
++}
++
++/*-----------------------------------------------------------------------
++ */
++static int flash_toggle (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd)
++{
++	cfiptr_t cptr;
++	cfiword_t cword;
++	int retval;
++
++	cptr.cp = flash_make_addr (info, sect, offset);
++	flash_make_cmd (info, cmd, &cword);
++	switch (info->portwidth) {
++	case FLASH_CFI_8BIT:
++		retval = ((cptr.cp[0] & cword.c) != (cptr.cp[0] & cword.c));
++		break;
++	case FLASH_CFI_16BIT:
++		retval = ((cptr.wp[0] & cword.w) != (cptr.wp[0] & cword.w));
++		break;
++	case FLASH_CFI_32BIT:
++		retval = ((cptr.lp[0] & cword.l) != (cptr.lp[0] & cword.l));
++		break;
++	case FLASH_CFI_64BIT:
++		retval = ((cptr.llp[0] & cword.ll) !=
++			  (cptr.llp[0] & cword.ll));
++		break;
++	default:
++		retval = 0;
++		break;
++	}
++	return retval;
++}
++
++/*-----------------------------------------------------------------------
++ * detect if flash is compatible with the Common Flash Interface (CFI)
++ * http://www.jedec.org/download/search/jesd68.pdf
++ *
++*/
++static int flash_detect_cfi (flash_info_t * info)
++{
++        ulong data;
++        	
++	debug ("flash_detect_cfi()... ");
++
++#if     defined(CONFIG_FLASH_AST2300)
++        data = *(ulong *)(0x1e6e2070);		/* hardware traping */
++        if (data & 0x10)			/* D[4]: 0/1 (8/16) */
++            info->portwidth = FLASH_CFI_16BIT;
++        else
++            info->portwidth = FLASH_CFI_8BIT;            
++#else
++        info->portwidth = FLASH_CFI_8BIT;
++#endif
++
++	{     	
++		for (info->chipwidth = FLASH_CFI_BY8;
++		     info->chipwidth <= info->portwidth;
++		     info->chipwidth <<= 1) {
++			flash_write_cmd (info, 0, 0, FLASH_CMD_RESET);
++			flash_write_cmd (info, 0, FLASH_OFFSET_CFI, FLASH_CMD_CFI);
++			if (flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP, 'Q')
++			    //FIXME: Next 3 lines were changed for 8-bit/16-bit flash chips.
++			    && flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP1, 'R')
++			    && flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP2, 'Y')) {
++				info->interface = flash_read_uchar (info, FLASH_OFFSET_INTERFACE);
++				debug ("device interface is %d\n",
++				       info->interface);
++				debug ("found port %d chip %d ",
++				       info->portwidth, info->chipwidth);
++				debug ("port %d bits chip %d bits\n",
++				       info->portwidth << CFI_FLASH_SHIFT_WIDTH,
++				       info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
++				return 1;
++			}
++		}
++	}
++	debug ("not found\n");
++	return 0;
++}
++
++/*
++ * The following code cannot be run from FLASH!
++ *
++ */
++ulong flash_get_size (ulong base, int banknum)
++{
++	flash_info_t *info = &flash_info[banknum];
++	int i, j;
++	flash_sect_t sect_cnt;
++	unsigned long sector;
++	unsigned long tmp;
++	int size_ratio;
++	uchar num_erase_regions;
++	int erase_region_size;
++	int erase_region_count;
++
++	info->start[0] = base;
++
++	if (flash_detect_cfi (info)) {
++		info->vendor = flash_read_uchar (info, FLASH_OFFSET_PRIMARY_VENDOR);
++#if defined(DEBUG_FLASH)
++		flash_printqry (info, 0);
++#endif
++		switch (info->vendor) {
++		case CFI_CMDSET_INTEL_STANDARD:
++		case CFI_CMDSET_INTEL_EXTENDED:
++		default:
++			info->cmd_reset = FLASH_CMD_RESET;
++			break;
++		case CFI_CMDSET_AMD_STANDARD:
++		case CFI_CMDSET_AMD_EXTENDED:
++			info->cmd_reset = AMD_CMD_RESET;
++			break;
++		}
++
++		debugX(2, "manufacturer is %d\n", info->vendor);
++		size_ratio = info->portwidth / info->chipwidth;
++		/* if the chip is x8/x16 reduce the ratio by half */
++#if 0
++		if ((info->interface == FLASH_CFI_X8X16)
++		    && (info->chipwidth == FLASH_CFI_BY8)) {
++			size_ratio >>= 1;
++		}
++#endif
++		num_erase_regions = flash_read_uchar (info, FLASH_OFFSET_NUM_ERASE_REGIONS);
++		debugX(2, "size_ratio %d port %d bits chip %d bits\n",
++		       size_ratio, info->portwidth << CFI_FLASH_SHIFT_WIDTH,
++		       info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
++		debugX(2, "found %d erase regions\n", num_erase_regions);
++		sect_cnt = 0;
++		sector = base;
++		for (i = 0; i < num_erase_regions; i++) {
++			if (i > MAX_NUM_ERASE_REGIONS) {
++				printf ("%d erase regions found, only %d used\n",
++					num_erase_regions, MAX_NUM_ERASE_REGIONS);
++				break;
++			}
++			// CFI Erase Block Region Information:
++			// Bits[31:16] = sect_size/256, 0 means 128-byte
++			// Bits[15:0]  = num_sectors - 1
++			tmp = flash_read_long(info, 0,
++					      FLASH_OFFSET_ERASE_REGIONS + i * 4);
++			debug("CFI erase block region info[%d]: 0x%08x, ",
++			      i, tmp);
++			erase_region_count = (tmp & 0xffff) + 1;
++			tmp >>= 16;
++			erase_region_size = (tmp ? tmp * 256 : 128);
++			debug ("erase_region_count=%d erase_region_size=%d\n",
++				erase_region_count, erase_region_size);
++#if 0
++                        erase_region_size  = CFG_FLASH_SECTOR_SIZE;	// Commented out
++                        erase_region_count = CFG_FLASH_SECTOR_COUNT;	// Commented out
++#endif
++			if (sect_cnt + erase_region_count > CONFIG_SYS_MAX_FLASH_SECT) {
++			    printf("Warning: Erase region %d adds too many flash sectors"
++				   " %d+%d; reducing to fit total limit of %d\n",
++				   i, sect_cnt, erase_region_count, CONFIG_SYS_MAX_FLASH_SECT);
++			    erase_region_count = CONFIG_SYS_MAX_FLASH_SECT - sect_cnt;
++			}
++			for (j = 0; j < erase_region_count; j++) {
++				info->start[sect_cnt] = sector;
++				sector += (erase_region_size * size_ratio);
++
++				/*
++				 * Only read protection status from supported devices (intel...)
++				 */
++				switch (info->vendor) {
++				case CFI_CMDSET_INTEL_EXTENDED:
++				case CFI_CMDSET_INTEL_STANDARD:
++					info->protect[sect_cnt] =
++						flash_isset (info, sect_cnt,
++							     FLASH_OFFSET_PROTECT,
++							     FLASH_STATUS_PROTECT);
++					break;
++				default:
++					info->protect[sect_cnt] = 0; /* default: not protected */
++				}
++
++				sect_cnt++;
++			}
++		}
++
++		info->sector_count = sect_cnt;
++		/* multiply the size by the number of chips */
++		// info->size = (1 << flash_read_uchar (info, FLASH_OFFSET_SIZE)) * size_ratio;
++		// Use only the sectors that fit within the flash_info array size.
++		info->size = sector - base;
++		printf("Flash bank %d at %08x has 0x%x bytes in %d sectors"
++		       " (chipSize 1<<%d, size_ratio %d).\n",
++		       banknum, base, info->size, info->sector_count,
++		       flash_read_uchar(info, FLASH_OFFSET_SIZE), size_ratio);
++
++		info->buffer_size = (1 << flash_read_uchar (info, FLASH_OFFSET_BUFFER_SIZE));		
++		/* Limit the buffer size to 32bytes to meet most of AMD-styles flash's minimum requirement */
++		if (info->buffer_size > 32)
++		    info->buffer_size = 32;    
++		tmp = 1 << flash_read_uchar (info, FLASH_OFFSET_ETOUT);
++		info->erase_blk_tout = (tmp * (1 << flash_read_uchar (info, FLASH_OFFSET_EMAX_TOUT)));
++		tmp = 1 << flash_read_uchar (info, FLASH_OFFSET_WBTOUT);
++		info->buffer_write_tout = (tmp * (1 << flash_read_uchar (info, FLASH_OFFSET_WBMAX_TOUT)));
++		tmp = 1 << flash_read_uchar (info, FLASH_OFFSET_WTOUT);
++		info->write_tout = (tmp * (1 << flash_read_uchar (info, FLASH_OFFSET_WMAX_TOUT))) / 1000;
++		info->flash_id = FLASH_MAN_CFI;
++#if 0
++		if ((info->interface == FLASH_CFI_X8X16) && (info->chipwidth == FLASH_CFI_BY8)) {
++			info->portwidth >>= 1;	/* XXX - Need to test on x8/x16 in parallel. */
++		}
++#endif
++	}
++
++	flash_write_cmd (info, 0, 0, info->cmd_reset);
++	return (info->size);
++}
++
++
++/*-----------------------------------------------------------------------
++ */
++static int flash_write_cfiword (flash_info_t * info, ulong dest,
++				cfiword_t cword)
++{
++
++	cfiptr_t ctladdr;
++	cfiptr_t cptr;
++	int flag;
++
++	ctladdr.cp = flash_make_addr (info, 0, 0);
++	cptr.cp = (uchar *) dest;
++
++
++	/* Check if Flash is (sufficiently) erased */
++	switch (info->portwidth) {
++	case FLASH_CFI_8BIT:
++		flag = ((cptr.cp[0] & cword.c) == cword.c);
++		break;
++	case FLASH_CFI_16BIT:
++		flag = ((cptr.wp[0] & cword.w) == cword.w);
++		break;
++	case FLASH_CFI_32BIT:
++		flag = ((cptr.lp[0] & cword.l) == cword.l);
++		break;
++	case FLASH_CFI_64BIT:
++		flag = ((cptr.llp[0] & cword.ll) == cword.ll);
++		break;
++	default:
++		return 2;
++	}
++	if (!flag)
++		return 2;
++
++	/* Disable interrupts which might cause a timeout here */
++	flag = disable_interrupts ();
++
++	switch (info->vendor) {
++	case CFI_CMDSET_INTEL_EXTENDED:
++	case CFI_CMDSET_INTEL_STANDARD:
++		flash_write_cmd_nodbg (info, 0, 0, FLASH_CMD_CLEAR_STATUS);
++		flash_write_cmd_nodbg (info, 0, 0, FLASH_CMD_WRITE);
++		break;
++	case CFI_CMDSET_AMD_EXTENDED:
++	case CFI_CMDSET_AMD_STANDARD:
++		flash_unlock_seq (info, 0);
++		flash_write_cmd_nodbg (info, 0, AMD_ADDR_START, AMD_CMD_WRITE);
++		break;
++	}
++
++	switch (info->portwidth) {
++	case FLASH_CFI_8BIT:
++		cptr.cp[0] = cword.c;
++		break;
++	case FLASH_CFI_16BIT:
++		cptr.wp[0] = cword.w;
++		break;
++	case FLASH_CFI_32BIT:
++		cptr.lp[0] = cword.l;
++		break;
++	case FLASH_CFI_64BIT:
++		cptr.llp[0] = cword.ll;
++		break;
++	}
++
++	/* re-enable interrupts if necessary */
++	if (flag)
++		enable_interrupts ();
++
++	return flash_full_status_check (info, 0, info->write_tout, "write");
++}
++
++#ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++
++/* loop through the sectors from the highest address
++ * when the passed address is greater or equal to the sector address
++ * we have a match
++ */
++static flash_sect_t find_sector (flash_info_t * info, ulong addr)
++{
++	flash_sect_t sector;
++
++	for (sector = info->sector_count - 1; sector >= 0; sector--) {
++		if (addr >= info->start[sector])
++			break;
++	}
++	return sector;
++}
++
++static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp,
++				  int len)
++{
++	flash_sect_t sector;
++	int cnt;
++	int retcode;
++	volatile cfiptr_t src;
++	volatile cfiptr_t dst;
++
++/* Add AMD write buffer mode support, ycchen@102006 */
++#if 0
++	/* buffered writes in the AMD chip set is not supported yet */
++	if((info->vendor ==  CFI_CMDSET_AMD_STANDARD) ||
++		(info->vendor == CFI_CMDSET_AMD_EXTENDED))
++		return ERR_INVAL;
++#endif
++	if((info->vendor ==  CFI_CMDSET_AMD_STANDARD) ||
++		(info->vendor == CFI_CMDSET_AMD_EXTENDED))
++	{
++		retcode = flash_write_cfibuffer_amd(info, dest, cp, len);
++                return retcode;
++        }
++
++	src.cp = cp;
++	dst.cp = (uchar *) dest;
++	sector = find_sector (info, dest);
++	flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS);
++	flash_write_cmd (info, sector, 0, FLASH_CMD_WRITE_TO_BUFFER);
++	if ((retcode =
++	     flash_status_check (info, sector, info->buffer_write_tout,
++				 "write to buffer")) == ERR_OK) {
++		/* reduce the number of loops by the width of the port	*/
++		switch (info->portwidth) {
++		case FLASH_CFI_8BIT:
++			cnt = len;
++			break;
++		case FLASH_CFI_16BIT:
++			cnt = len >> 1;
++			break;
++		case FLASH_CFI_32BIT:
++			cnt = len >> 2;
++			break;
++		case FLASH_CFI_64BIT:
++			cnt = len >> 3;
++			break;
++		default:
++			return ERR_INVAL;
++			break;
++		}
++		flash_write_cmd (info, sector, 0, (uchar) cnt - 1);
++		while (cnt-- > 0) {
++			switch (info->portwidth) {
++			case FLASH_CFI_8BIT:
++				*dst.cp++ = *src.cp++;
++				break;
++			case FLASH_CFI_16BIT:
++				*dst.wp++ = *src.wp++;
++				break;
++			case FLASH_CFI_32BIT:
++				*dst.lp++ = *src.lp++;
++				break;
++			case FLASH_CFI_64BIT:
++				*dst.llp++ = *src.llp++;
++				break;
++			default:
++				return ERR_INVAL;
++				break;
++			}
++		}
++		flash_write_cmd (info, sector, 0,
++				 FLASH_CMD_WRITE_BUFFER_CONFIRM);
++		retcode =
++			flash_full_status_check (info, sector,
++						 info->buffer_write_tout,
++						 "buffer write");
++	}
++	flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS);
++	return retcode;
++}
++
++
++static int flash_write_cfibuffer_amd (flash_info_t * info, ulong dest, uchar * cp,
++				  int len)
++{
++	flash_sect_t sector;
++	int cnt;
++	int retcode;
++	volatile cfiptr_t src;
++	volatile cfiptr_t dst;
++	volatile cfiword_t tmpsrc, tmpdst;
++
++	src.cp = cp;
++	dst.cp = (uchar *) dest;
++	sector = find_sector (info, dest);
++	flash_unlock_seq (info, 0);
++	if ((retcode =
++	     flash_status_check (info, sector, info->buffer_write_tout,
++				 "write to buffer")) == ERR_OK) {
++		/* reduce the number of loops by the width of the port	*/
++		switch (info->portwidth) {
++		case FLASH_CFI_8BIT:
++			cnt = len;
++			*dst.cp = (uchar) (AMD_CMD_WRITE_TO_BUFFER);
++			*dst.cp = (uchar) (cnt -1);
++			break;
++		case FLASH_CFI_16BIT:
++			cnt = len >> 1;
++			*dst.wp = (unsigned short) (AMD_CMD_WRITE_TO_BUFFER);
++			*dst.wp = (unsigned short) (cnt -1);
++			break;
++		case FLASH_CFI_32BIT:
++			cnt = len >> 2;
++			*dst.lp = (unsigned long) (AMD_CMD_WRITE_TO_BUFFER);
++			*dst.lp = (unsigned long) (cnt -1);
++			break;
++		case FLASH_CFI_64BIT:
++			cnt = len >> 3;
++			*dst.llp = (unsigned long long) (AMD_CMD_WRITE_TO_BUFFER);
++			*dst.llp = (unsigned long long) (cnt -1);
++			break;
++		default:
++			return ERR_INVAL;
++			break;
++		}
++		while (cnt-- > 0) {
++			switch (info->portwidth) {
++			case FLASH_CFI_8BIT:
++				*dst.cp++ = *src.cp++;
++				break;
++			case FLASH_CFI_16BIT:
++				*dst.wp++ = *src.wp++;
++				break;
++			case FLASH_CFI_32BIT:
++				*dst.lp++ = *src.lp++;
++				break;
++			case FLASH_CFI_64BIT:
++				*dst.llp++ = *src.llp++;
++				break;
++			default:
++				return ERR_INVAL;
++				break;
++			}
++		}				
++		switch (info->portwidth) {
++		case FLASH_CFI_8BIT:
++		        src.cp--;
++		        dst.cp--;
++			*dst.cp = (unsigned char) (AMD_CMD_BUFFER_TO_FLASH);
++		        tmpsrc.c = *src.cp & 0x80;
++		        
++		        do {
++		            tmpdst.c = *(volatile uchar *)(dst.cp);		        
++		        	
++		            if (tmpdst.c & 0x20) {	/* toggle DQ5 */
++		                 tmpdst.c = *(volatile uchar *)(dst.cp);		        
++		                 if ((tmpdst.c & 0x80) != tmpsrc.c)
++		                 {
++		                     printf("program error occurred\n");
++			             flash_write_cmd (info, sector, 0, info->cmd_reset);		            
++			             return ERR_PROG_ERROR;			             
++			         }    
++		            }
++		            else if (tmpdst.c & 0x02) {	/* toggle DQ1 */
++		                 tmpdst.c = *(volatile uchar *)(dst.cp);		        
++		                 if ((tmpdst.c & 0x80) != tmpsrc.c)
++		                 {
++		                     printf("write buffer error occurred \n");
++		                     write_buffer_abort_reset(info, sector);
++			             return ERR_PROG_ERROR;			             
++			         } 		            
++		            }	
++		            		                	
++		        } while ((tmpdst.c & 0x80) != tmpsrc.c);
++		        			        
++			break;
++		case FLASH_CFI_16BIT:
++		        src.wp--;
++		        dst.wp--;
++			*dst.wp = (unsigned short) (AMD_CMD_BUFFER_TO_FLASH);
++		        tmpsrc.w = *src.wp & 0x80;
++
++		        do {
++		            tmpdst.w = *(volatile short *)(dst.wp);		        
++		        	
++		            if (tmpdst.w & 0x20) {	/* toggle DQ5 */
++		                 tmpdst.w = *(volatile ushort *)(dst.wp);		        
++		                 if ((tmpdst.w & 0x80) != tmpsrc.w)
++		                 {
++		                     printf("program error occurred\n");
++			             flash_write_cmd (info, sector, 0, info->cmd_reset);		            
++			             return ERR_PROG_ERROR;			             
++			         }    
++		            }
++		            else if (tmpdst.w & 0x02) {	/* toggle DQ1 */
++		                 tmpdst.w = *(volatile ushort *)(dst.wp);		        
++		                 if ((tmpdst.w & 0x80) != tmpsrc.w)
++		                 {
++		                     printf("write buffer error occurred \n");
++		                     write_buffer_abort_reset(info, sector);
++			             return ERR_PROG_ERROR;			             
++			         } 		            
++		            }	
++		            		                	
++		        } while ((tmpdst.w & 0x80) != tmpsrc.w);
++		        
++			break;
++		case FLASH_CFI_32BIT:
++		        src.lp--;
++		        dst.lp--;
++			*dst.lp = (unsigned long) (AMD_CMD_BUFFER_TO_FLASH);
++		        tmpsrc.l = *src.lp & 0x80;
++		        
++		        do {
++		            tmpdst.l = *(volatile ulong *)(dst.lp);		        
++		        	
++		            if (tmpdst.l & 0x20) {	/* toggle DQ5 */
++		                 tmpdst.l = *(volatile ulong *)(dst.lp);		        
++		                 if ((tmpdst.l & 0x80) != tmpsrc.l)
++		                 {
++		                     printf("program error occurred\n");
++			             flash_write_cmd (info, sector, 0, info->cmd_reset);		            
++			             return ERR_PROG_ERROR;			             
++			         }    
++		            }
++		            else if (tmpdst.l & 0x02) {	/* toggle DQ1 */
++		                 tmpdst.l = *(volatile ulong *)(dst.lp);		        
++		                 if ((tmpdst.l & 0x80) != tmpsrc.l)
++		                 {
++		                     printf("write buffer error occurred \n");
++		                     write_buffer_abort_reset(info, sector);
++			             return ERR_PROG_ERROR;			             
++			         } 		            
++		            }	
++		            		                	
++		        } while ((tmpdst.l & 0x80) != tmpsrc.l);
++		        
++			break;
++		case FLASH_CFI_64BIT:
++		        src.llp--;
++		        dst.llp--;
++			*dst.llp = (unsigned long long) (AMD_CMD_BUFFER_TO_FLASH);
++		        tmpsrc.ll = *src.llp & 0x80;
++		        
++		        do {
++		            tmpdst.ll = *(volatile unsigned long long *)(dst.llp);		        
++		        	
++		            if (tmpdst.ll & 0x20) {	/* toggle DQ5 */
++		                 tmpdst.ll = *(volatile unsigned long long *)(dst.llp);		        
++		                 if ((tmpdst.ll & 0x80) != tmpsrc.ll)
++		                 {
++		                     printf("program error occurred\n");
++			             flash_write_cmd (info, sector, 0, info->cmd_reset);		            
++			             return ERR_PROG_ERROR;			             
++			         }    
++		            }
++		            else if (tmpdst.ll & 0x02) {	/* toggle DQ1 */
++		                 tmpdst.ll = *(volatile unsigned long long *)(dst.llp);		        
++		                 if ((tmpdst.ll & 0x80) != tmpsrc.ll)
++		                 {
++		                     printf("write buffer error occurred \n");
++		                     write_buffer_abort_reset(info, sector);
++			             return ERR_PROG_ERROR;			             
++			         } 		            
++		            }	
++		            		                	
++		        } while ((tmpdst.ll & 0x80) != tmpsrc.ll);
++		        
++			break;
++		default:
++			return ERR_INVAL;
++			break;
++		}
++
++		retcode =
++			flash_full_status_check (info, sector,
++						 info->buffer_write_tout,
++						 "buffer write");
++	}
++
++	return retcode;
++}
++#endif /* CONFIG_SYS_FLASH_USE_BUFFER_WRITE */
++
++#ifdef	CONFIG_FLASH_AST2300_DMA
++#define STCBaseAddress			0x1e620000
++
++/* for DMA */
++#define REG_FLASH_INTERRUPT_STATUS	0x08
++#define REG_FLASH_DMA_CONTROL		0x80
++#define REG_FLASH_DMA_FLASH_BASE	0x84
++#define REG_FLASH_DMA_DRAM_BASE		0x88
++#define REG_FLASH_DMA_LENGTH		0x8c
++
++#define FLASH_STATUS_DMA_BUSY		0x0000
++#define FLASH_STATUS_DMA_READY		0x0800
++#define FLASH_STATUS_DMA_CLEAR		0x0800
++
++#define FLASH_DMA_ENABLE		0x01
++
++void * memmove_dma(void * dest,const void *src,size_t count)
++{
++	ulong count_align, poll_time, data;
++	
++	count_align = (count + 3) & 0xFFFFFFFC;	/* 4-bytes align */
++        poll_time = 100;			/* set 100 us as default */
++
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_CONTROL) = (ulong) (~FLASH_DMA_ENABLE);
++	
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_FLASH_BASE) = (ulong *) (src);
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_DRAM_BASE) = (ulong *) (dest);
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_LENGTH) = (ulong) (count_align);
++        udelay(10);
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_CONTROL) = (ulong) (FLASH_DMA_ENABLE);
++	
++	/* wait poll */
++	do {
++	    udelay(poll_time);	
++	    data = *(ulong *) (STCBaseAddress + REG_FLASH_INTERRUPT_STATUS);
++	} while (!(data & FLASH_STATUS_DMA_READY));
++	
++	/* clear status */
++	*(ulong *) (STCBaseAddress + REG_FLASH_INTERRUPT_STATUS) |= FLASH_STATUS_DMA_CLEAR;
++}	
++#endif
++#endif /* CFG_FLASH_CFI */
+diff --git a/board/aspeed/ast2300/flash_spi.c b/board/aspeed/ast2300/flash_spi.c
+new file mode 100755
+index 0000000..6660628
+--- /dev/null
++++ b/board/aspeed/ast2300/flash_spi.c
+@@ -0,0 +1,1639 @@
++/*
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ * History
++ * 01/20/2004 - combined variants of original driver.
++ * 01/22/2004 - Write performance enhancements for parallel chips (Tolunay)
++ * 01/23/2004 - Support for x8/x16 chips (Rune Raknerud)
++ * 01/27/2004 - Little endian support Ed Okerson
++ *
++ * Tested Architectures
++ * Port Width  Chip Width    # of banks	   Flash Chip  Board
++ * 32	       16	     1		   28F128J3    seranoa/eagle
++ * 64	       16	     1		   28F128J3    seranoa/falcon
++ *
++ */
++
++/* The DEBUG define must be before common to enable debugging */
++/* #define DEBUG	*/
++
++#include <common.h>
++#include <asm/processor.h>
++#include <asm/byteorder.h>
++#include <environment.h>
++#ifdef	CONFIG_FLASH_SPI
++
++/*
++ * This file implements a Common Flash Interface (CFI) driver for U-Boot.
++ * The width of the port and the width of the chips are determined at initialization.
++ * These widths are used to calculate the address for access CFI data structures.
++ * It has been tested on an Intel Strataflash implementation and AMD 29F016D.
++ *
++ * References
++ * JEDEC Standard JESD68 - Common Flash Interface (CFI)
++ * JEDEC Standard JEP137-A Common Flash Interface (CFI) ID Codes
++ * Intel Application Note 646 Common Flash Interface (CFI) and Command Sets
++ * Intel 290667-008 3 Volt Intel StrataFlash Memory datasheet
++ *
++ * TODO
++ *
++ * Use Primary Extended Query table (PRI) and Alternate Algorithm Query
++ * Table (ALT) to determine if protection is available
++ *
++ * Add support for other command sets Use the PRI and ALT to determine command set
++ * Verify erase and program timeouts.
++ */
++
++#ifndef CONFIG_FLASH_BANKS_LIST
++#define CONFIG_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE }
++#endif
++
++/* use CFG_MAX_FLASH_BANKS_DETECT if defined */
++#ifdef CONFIG_SYS_MAX_FLASH_BANKS_DETECT
++static ulong bank_base[CONFIG_SYS_MAX_FLASH_BANKS_DETECT] = CONFIG_FLASH_BANKS_LIST;
++flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS_DETECT];	/* FLASH chips info */
++#else
++static ulong bank_base[CONFIG_SYS_MAX_FLASH_BANKS] = CONFIG_FLASH_BANKS_LIST;
++flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];		/* FLASH chips info */
++#endif
++
++/* Support Flash ID */
++#define STM25P64		0x172020
++#define STM25P128		0x182020
++#define N25Q256			0x19ba20
++#define N25Q512			0x20ba20
++#define S25FL064A		0x160201
++#define S25FL128P		0x182001
++#define S25FL256S		0x190201
++#define W25X16			0x1530ef
++#define W25X64			0x1730ef
++#define W25Q64BV		0x1740ef
++#define W25Q128BV		0x1840ef
++#define W25Q256FV		0x1940ef
++#define MX25L1605D		0x1520C2
++#define MX25L12805D		0x1820C2
++#define MX25L25635E		0x1920C2
++#define SST25VF016B             0x4125bf
++#define SST25VF064C             0x4b25bf
++#define AT25DF161		0x02461F
++#define AT25DF321		0x01471F
++
++/* SPI Define */
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++#if	defined(CONFIG_AST1300)
++#define STCBaseAddress			0x00620000
++#else
++#define STCBaseAddress			0x1e620000
++#endif
++#define SCU_REVISION_REGISTER		0x1e6e207c
++#define SCU_CACHE_CTRL_REGISTER		0x1e6e2118
++
++#define SPICtrlRegOffset		0x10
++#define SPICtrlRegOffset2		0x14
++
++#define SPIMiscCtrlRegOffset		0x54
++
++/* for DMA */
++#define REG_FLASH_INTERRUPT_STATUS	0x08
++#define REG_FLASH_DMA_CONTROL		0x80
++#define REG_FLASH_DMA_FLASH_BASE	0x84
++#define REG_FLASH_DMA_DRAM_BASE		0x88
++#define REG_FLASH_DMA_LENGTH		0x8c
++
++#define FLASH_STATUS_DMA_BUSY		0x0000
++#define FLASH_STATUS_DMA_READY		0x0800
++#define FLASH_STATUS_DMA_CLEAR		0x0800
++
++#define FLASH_DMA_ENABLE		0x01
++#else
++#define STCBaseAddress			0x16000000
++
++#define SPICtrlRegOffset		0x04
++#define SPICtrlRegOffset2		0x0C
++#endif	/* CONFIG_FLASH_AST2300 */
++
++#define CMD_MASK		0xFFFFFFF8
++
++#define NORMALREAD		0x00
++#define	FASTREAD		0x01
++#define NORMALWRITE		0x02
++#define USERMODE		0x03
++
++#define CE_LOW			0x00
++#define CE_HIGH			0x04
++
++/* AST2300 only */
++#define IOMODEx1		0x00000000
++#define IOMODEx2		0x20000000
++#define IOMODEx2_dummy		0x30000000
++#define IOMODEx4		0x40000000
++#define IOMODEx4_dummy		0x50000000
++
++#define DUMMY_COMMAND_OUT	0x00008000
++/* ~AST2300 only */
++
++/* specificspi */
++#define SpecificSPI_N25Q512	0x00000001		
++
++static ulong AST2300_SPICLK_DIV[16] = {0x0F, 0x07, 0x0E, 0x06, 0x0D, 0x05, 0x0C, 0x04, \
++                                       0x0B, 0x03, 0x0A, 0x02, 0x09, 0x01, 0x08, 0x00 };
++
++/*-----------------------------------------------------------------------
++ * Functions
++ */
++static void reset_flash (flash_info_t * info);
++static void enable_write (flash_info_t * info);
++static void write_status_register (flash_info_t * info, uchar data);
++static void enable4b (flash_info_t * info);
++static void enable4b_spansion (flash_info_t * info);
++static void enable4b_numonyx (flash_info_t * info);
++static ulong flash_get_size (ulong base, int banknum);
++static int flash_write_buffer (flash_info_t *info, uchar *src, ulong addr, int len);
++#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
++static flash_info_t *flash_get_info(ulong base);
++#endif
++
++
++/*-----------------------------------------------------------------------
++ * create an address based on the offset and the port width
++ */
++inline uchar *flash_make_addr (flash_info_t * info, flash_sect_t sect, uint offset)
++{
++#ifdef CONFIG_2SPIFLASH
++        if (info->start[0] >= PHYS_FLASH_2)
++	    return ((uchar *) (info->start[sect] + (offset * 1) - (PHYS_FLASH_2 - PHYS_FLASH_2_BASE) ));        
++        else
++	    return ((uchar *) (info->start[sect] + (offset * 1)));
++#else
++	return ((uchar *) (info->start[sect] + (offset * 1)));
++#endif	
++}
++
++/*-----------------------------------------------------------------------
++ * read a character at a port width address
++ */
++inline uchar flash_read_uchar (flash_info_t * info, uint offset)
++{
++	uchar *cp;
++
++	cp = flash_make_addr (info, 0, offset);
++#if defined(__LITTLE_ENDIAN)
++	return (cp[0]);
++#else
++	return (cp[1 - 1]);
++#endif
++}
++
++/*-----------------------------------------------------------------------
++ * read a short word by swapping for ppc format.
++ */
++ushort flash_read_ushort (flash_info_t * info, flash_sect_t sect, uint offset)
++{
++	uchar *addr;
++	ushort retval;
++
++#ifdef DEBUG
++	int x;
++#endif
++	addr = flash_make_addr (info, sect, offset);
++
++#ifdef DEBUG
++	debug ("ushort addr is at %p 1 = %d\n", addr,
++	       1);
++	for (x = 0; x < 2 * 1; x++) {
++		debug ("addr[%x] = 0x%x\n", x, addr[x]);
++	}
++#endif
++#if defined(__LITTLE_ENDIAN)
++	retval = ((addr[(1)] << 8) | addr[0]);
++#else
++	retval = ((addr[(2 * 1) - 1] << 8) |
++		  addr[1 - 1]);
++#endif
++
++	debug ("retval = 0x%x\n", retval);
++	return retval;
++}
++
++/*-----------------------------------------------------------------------
++ * read a long word by picking the least significant byte of each maiximum
++ * port size word. Swap for ppc format.
++ */
++ulong flash_read_long (flash_info_t * info, flash_sect_t sect, uint offset)
++{
++	uchar *addr;
++	ulong retval;
++
++#ifdef DEBUG
++	int x;
++#endif
++	addr = flash_make_addr (info, sect, offset);
++
++#ifdef DEBUG
++	debug ("long addr is at %p 1 = %d\n", addr,
++	       1);
++	for (x = 0; x < 4 * 1; x++) {
++		debug ("addr[%x] = 0x%x\n", x, addr[x]);
++	}
++#endif
++#if defined(__LITTLE_ENDIAN)
++	retval = (addr[0] << 16) | (addr[(1)] << 24) |
++		(addr[(2 * 1)]) | (addr[(3 * 1)] << 8);
++#else
++	retval = (addr[(2 * 1) - 1] << 24) |
++		(addr[(1) - 1] << 16) |
++		(addr[(4 * 1) - 1] << 8) |
++		addr[(3 * 1) - 1];
++#endif
++	return retval;
++}
++
++/*-----------------------------------------------------------------------
++ */
++static void disable_cache(void)
++{
++#if	defined(AST1300_CPU_CACHE_ENABLE)
++        ulong uldata;
++        
++        uldata  = *(volatile ulong *) (SCU_CACHE_CTRL_REGISTER);
++        uldata &= 0xfffffffd;
++        *(ulong *) (SCU_CACHE_CTRL_REGISTER) = uldata;        
++#endif
++}	
++
++static void enable_cache(void)
++{
++#if	defined(AST1300_CPU_CACHE_ENABLE)
++        ulong uldata;
++        
++        uldata  = *(volatile ulong *) (SCU_CACHE_CTRL_REGISTER);
++        uldata |= 0x00000002;
++        *(ulong *) (SCU_CACHE_CTRL_REGISTER) = uldata;        
++#endif
++}
++	 
++static void reset_flash (flash_info_t * info)
++{
++        ulong ulCtrlData, CtrlOffset, MiscCtrlOffset;
++        
++        if (info->CE == 2)
++        {
++            CtrlOffset = SPICtrlRegOffset2;
++        }    
++        else
++        {
++            CtrlOffset = SPICtrlRegOffset;
++        }    
++
++#if    defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++        ulCtrlData = info->iomode | (info->readcmd << 16) | (info->tCK_Read << 8) | (info->dummybyte << 6) | FASTREAD;
++#if 0        
++        if (info->quadport)
++        {        	
++            MiscCtrlOffset = SPIMiscCtrlRegOffset;
++            *(ulong *) (STCBaseAddress + MiscCtrlOffset) = info->dummydata;                	                   
++            ulCtrlData |= DUMMY_COMMAND_OUT;
++        }
++#endif        
++#else      
++        ulCtrlData  = (info->readcmd << 16) | (info->tCK_Read << 8) | (info->dummybyte << 6) | FASTREAD;         
++        if (info->dualport)
++            ulCtrlData  |= 0x08;        
++#endif        
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;        
++        
++        enable_cache();    
++}
++	 
++static void enable_write (flash_info_t * info)
++{
++	ulong base;
++        ulong ulCtrlData, CtrlOffset;
++        uchar jReg;
++        
++        if (info->CE == 2)
++        {
++            CtrlOffset = SPICtrlRegOffset2;
++        }    
++        else
++        {
++            CtrlOffset = SPICtrlRegOffset;
++        }    
++                  
++	//base = info->start[0];
++	base = flash_make_addr (info, 0, 0);
++
++        ulCtrlData  = (info->tCK_Write << 8);        
++        ulCtrlData |= CE_LOW | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        *(uchar *) (base) = (uchar) (0x06);
++        udelay(10);
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_HIGH | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_LOW | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        *(uchar *) (base) = (uchar) (0x05);
++        udelay(10);
++        do {                                
++            jReg = *(volatile uchar *) (base);
++        } while (!(jReg & 0x02));                  	                
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_HIGH | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++
++}
++		
++static void write_status_register (flash_info_t * info, uchar data)
++{
++	ulong base;
++        ulong ulSMMBase, ulCtrlData, CtrlOffset;
++        uchar jReg;
++        
++        if (info->CE == 2)
++        {
++            CtrlOffset = SPICtrlRegOffset2;
++        }    
++        else
++        {
++            CtrlOffset = SPICtrlRegOffset;
++        }    
++    
++	//base = info->start[0];
++	base = flash_make_addr (info, 0, 0);
++
++        enable_write (info);
++
++        ulCtrlData  = (info->tCK_Write << 8);
++        ulCtrlData |= CE_LOW | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        *(uchar *) (base) = (uchar) (0x01);
++        udelay(10);
++        *(uchar *) (base) = (uchar) (data);                
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_HIGH | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_LOW | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        *(uchar *) (base) = (uchar) (0x05);
++        udelay(10);
++        do {                                
++            jReg = *(volatile uchar *) (base);
++        } while (jReg & 0x01);
++        ulCtrlData &= CMD_MASK;                          	                
++        ulCtrlData |= CE_HIGH | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++
++}
++
++static void enable4b (flash_info_t * info)
++{
++	ulong base;
++        ulong ulSMMBase, ulCtrlData, CtrlOffset;
++        uchar jReg;
++        
++        if (info->CE == 2)
++        {
++            CtrlOffset = SPICtrlRegOffset2;
++        }    
++        else
++        {
++            CtrlOffset = SPICtrlRegOffset;
++        }    
++    
++	//base = info->start[0];
++	base = flash_make_addr (info, 0, 0);
++
++        ulCtrlData  = (info->tCK_Write << 8);
++        ulCtrlData |= CE_LOW | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        *(uchar *) (base) = (uchar) (0xb7);
++        ulCtrlData &= CMD_MASK;                          	                
++        ulCtrlData |= CE_HIGH | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++ 
++} /* enable4b */
++
++static void enable4b_spansion (flash_info_t * info)
++{
++	ulong base;
++    	ulong ulSMMBase, ulCtrlData, CtrlOffset;
++    	uchar jReg;
++        
++    	if (info->CE == 2)
++    	{
++            CtrlOffset = SPICtrlRegOffset2;
++    	}    
++    	else
++    	{
++            CtrlOffset = SPICtrlRegOffset;
++    	}    
++    
++	//base = info->start[0];
++	base = flash_make_addr (info, 0, 0);
++
++	/* Enable 4B: BAR0 D[7] = 1 */
++    	ulCtrlData  = (info->tCK_Write << 8);
++    	ulCtrlData |= CE_LOW | USERMODE;
++    	*(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++    	udelay(200);
++    	*(uchar *) (base) = (uchar) (0x17);
++    	udelay(10);
++    	*(uchar *) (base) = (uchar) (0x80);    
++    	ulCtrlData &= CMD_MASK;                          	                
++    	ulCtrlData |= CE_HIGH | USERMODE;
++    	*(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++    	udelay(200);
++
++    	ulCtrlData &= CMD_MASK;                          	                
++    	ulCtrlData |= CE_LOW | USERMODE;
++    	*(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++    	udelay(200);
++    	*(uchar *) (base) = (uchar) (0x16);
++    	udelay(10);
++    	do {                                
++            jReg = *(volatile uchar *) (base);
++    	} while (!(jReg & 0x80));
++    	ulCtrlData &= CMD_MASK;                          	                                          	                
++    	ulCtrlData |= CE_HIGH | USERMODE;
++   	 *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++    	udelay(200);
++	
++} /* enable4b_spansion */
++
++static void enable4b_numonyx (flash_info_t * info)
++{
++	ulong base;
++    	ulong ulSMMBase, ulCtrlData, CtrlOffset;
++    	uchar jReg;
++        
++    	if (info->CE == 2)
++    	{
++            CtrlOffset = SPICtrlRegOffset2;
++    	}    
++    	else
++    	{
++            CtrlOffset = SPICtrlRegOffset;
++    	}    
++    
++	//base = info->start[0];
++	base = flash_make_addr (info, 0, 0);
++
++	/* Enable Write */
++	enable_write (info);
++	
++	/* Enable 4B: CMD:0xB7 */
++    	ulCtrlData  = (info->tCK_Write << 8);
++    	ulCtrlData |= CE_LOW | USERMODE;
++    	*(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++    	udelay(200);
++    	*(uchar *) (base) = (uchar) (0xB7);
++    	udelay(10);
++    	ulCtrlData &= CMD_MASK;                          	                
++    	ulCtrlData |= CE_HIGH | USERMODE;
++    	*(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++    	udelay(200);
++
++} /* enable4b_numonyx */
++
++/*
++ *
++ */
++static ulong flash_get_size (ulong base, int banknum)
++{
++	flash_info_t *info = &flash_info[banknum];
++	int j;
++	unsigned long sector;
++	int erase_region_size;
++        ulong ulCtrlData, CtrlOffset;
++        ulong ulID;
++        uchar ch[3];
++        ulong cpuclk, div, reg;
++        ulong WriteClk, EraseClk, ReadClk;
++        ulong vbase;
++        ulong SCURevision;
++
++        ulong ulRefPLL;
++        ulong ulDeNumerator;
++        ulong ulNumerator;
++        ulong ulOD;                    
++                  
++        disable_cache();
++        
++	info->start[0] = base;
++	vbase = flash_make_addr (info, 0, 0);
++
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++        CtrlOffset = SPICtrlRegOffset;        	
++        info->CE = 0;                	
++#else
++        if (vbase == PHYS_FLASH_1)
++        {
++            CtrlOffset = SPICtrlRegOffset2;
++            info->CE = 2;
++        }    
++        else
++        {
++            CtrlOffset = SPICtrlRegOffset;        	
++            info->CE = 0;        	
++        }    
++#endif
++            
++        /* Get Flash ID */
++        ulCtrlData  = *(ulong *) (STCBaseAddress + CtrlOffset) & CMD_MASK;        
++        ulCtrlData |= CE_LOW | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        *(uchar *) (vbase) = (uchar) (0x9F);
++        udelay(10);
++        ch[0] = *(volatile uchar *)(vbase);
++        udelay(10);
++        ch[1] = *(volatile uchar *)(vbase);
++        udelay(10);
++        ch[2] = *(volatile uchar *)(vbase);
++        udelay(10);               
++        ulCtrlData  = *(ulong *) (STCBaseAddress + CtrlOffset) & CMD_MASK;        
++        ulCtrlData |= CE_HIGH | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        ulID = ((ulong)ch[0]) | ((ulong)ch[1] << 8) | ((ulong)ch[2] << 16) ;        
++        info->flash_id = ulID;
++        
++        //printf("SPI Flash ID: %x \n", ulID);
++
++        /* init default */        
++        info->iomode = IOMODEx1;
++        info->address32 = 0;
++        info->quadport = 0;
++        info->specificspi = 0;
++
++        switch (info->flash_id)
++        {
++        case STM25P64:
++	    info->sector_count = 128;
++	    info->size = 0x800000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;
++            WriteClk = 40;
++            EraseClk = 20;
++            ReadClk  = 40;
++            break;
++
++        case STM25P128:
++	    info->sector_count = 64;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x40000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++            break;
++            
++        case N25Q256:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++	    info->sector_count = 512;
++	    info->size = 0x2000000;
++	    info->address32 = 1;        	
++#endif
++	    break;
++
++        case N25Q512:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256; 
++            info->specificspi = SpecificSPI_N25Q512;           
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++	    info->sector_count = 1024;
++	    info->size = 0x4000000;
++	    info->address32 = 1;        	
++#endif
++	    break;
++	    	    	                            
++        case W25X16:
++	    info->sector_count = 32;
++	    info->size = 0x200000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x3b;            
++            info->dualport = 1;            
++            info->dummybyte = 1;
++            info->iomode = IOMODEx2; 
++            info->buffersize = 256;                                   
++            WriteClk = 50;
++            EraseClk = 25;
++            ReadClk  = 50;            
++            break;
++            
++        case W25X64:
++	    info->sector_count = 128;
++	    info->size = 0x800000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x3b;            
++            info->dualport = 1;            
++            info->dummybyte = 1;
++            info->iomode = IOMODEx2;
++            info->buffersize = 256;                                    
++            WriteClk = 50;
++            EraseClk = 25;
++            ReadClk  = 50;            
++            break;
++
++        case W25Q64BV:
++	    info->sector_count = 128;
++	    info->size = 0x800000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x3b;            
++            info->dualport = 1;            
++            info->dummybyte = 1;
++            info->iomode = IOMODEx2; 
++            info->buffersize = 256;                                   
++            WriteClk = 80;
++            EraseClk = 40;
++            ReadClk  = 80;
++            break;
++            
++        case W25Q128BV:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x3b;            
++            info->dualport = 1;            
++            info->dummybyte = 1;
++            info->iomode = IOMODEx2; 
++            info->buffersize = 256;                                   
++            WriteClk = 104;
++            EraseClk = 50;
++            ReadClk  = 104;
++            break;
++
++        case W25Q256FV:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++	    info->sector_count = 512;
++	    info->size = 0x2000000;
++	    info->address32 = 1;        	
++#endif
++	    break;
++	                
++        case S25FL064A:
++	    info->sector_count = 128;
++	    info->size = 0x800000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;            
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 50;
++            EraseClk = 25;
++            ReadClk  = 50;            
++            break;
++
++        case S25FL128P:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;            
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 100;
++            EraseClk = 40;
++            ReadClk  = 100;            
++            break;
++
++        case S25FL256S:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++	    info->sector_count = 512;
++	    info->size = 0x2000000;
++	    info->address32 = 1;        	
++#endif
++	    break;
++
++        case MX25L25635E:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++	    info->sector_count = 512;
++	    info->size = 0x2000000;
++	    info->address32 = 1;        	
++#if	defined(CONFIG_FLASH_SPIx2_Dummy)
++            info->readcmd = 0xbb;            
++            info->dummybyte = 1;
++            info->dualport = 1;            
++            info->iomode = IOMODEx2_dummy;
++#elif	defined(CONFIG_FLASH_SPIx4_Dummy)
++            info->readcmd = 0xeb;            
++            info->dummybyte = 3;
++            info->dualport = 0;            
++            info->iomode = IOMODEx4_dummy;
++            info->quadport = 1;
++            info->dummydata = 0xaa;            
++#endif            
++#endif             
++            break;
++
++        case MX25L12805D:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++/*
++SCU7C: Silicon Revision ID Register
++D[31:24]: Chip ID
++0: AST2050/AST2100/AST2150/AST2200/AST3000
++1: AST2300
++
++D[23:16] Silicon revision ID for AST2300 generation and later
++0: A0
++1: A1
++2: A2
++.
++.
++.
++FPGA revision starts from 0x80
++
++AST2300 A0 SPI can't run faster than 50Mhz
++*/
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++
++            SCURevision = *(ulong *) (SCU_REVISION_REGISTER);
++            if (((SCURevision >> 24) & 0xff) == 0x01) { //AST2300
++            	if (((SCURevision >> 16) & 0xff) == 0x00) { //A0
++            		WriteClk = 25;
++            		EraseClk = 20;
++            		ReadClk  = 25;
++            	}
++            }
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++#if	defined(CONFIG_FLASH_SPIx2_Dummy)
++            info->readcmd = 0xbb;            
++            info->dummybyte = 1;
++            info->dualport = 1;            
++            info->iomode = IOMODEx2_dummy;
++#elif	defined(CONFIG_FLASH_SPIx4_Dummy)
++            info->readcmd = 0xeb;            
++            info->dummybyte = 3;
++            info->dualport = 0;            
++            info->iomode = IOMODEx4_dummy;
++            info->quadport = 1;
++            info->dummydata = 0xaa;            
++#endif            
++#endif             
++            break;
++
++        case MX25L1605D:
++	    info->sector_count = 32;
++	    info->size = 0x200000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++            break;
++
++        case SST25VF016B:
++	    info->sector_count = 32;
++	    info->size = 0x200000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;            
++            info->dummybyte = 1;
++            info->buffersize = 1;            
++            WriteClk = 50;
++            EraseClk = 25;
++            ReadClk  = 50;            
++            break;
++
++        case SST25VF064C:
++	    info->sector_count = 128;
++	    info->size = 0x800000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;            
++            info->dummybyte = 1;
++            info->buffersize = 1;            
++            WriteClk = 50;
++            EraseClk = 25;
++            ReadClk  = 50;            
++            break;
++
++        case AT25DF161:
++	    info->sector_count = 32;
++	    info->size = 0x200000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;            
++            info->dummybyte = 1;
++            info->buffersize = 1;            
++            WriteClk = 50;
++            EraseClk = 25;
++            ReadClk  = 50;            
++            break;
++ 
++        case AT25DF321:
++	    info->sector_count = 32;
++	    info->size = 0x400000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;            
++            info->dummybyte = 1;
++            info->buffersize = 1;            
++            WriteClk = 50;
++            EraseClk = 25;
++            ReadClk  = 50;            
++            break;
++                                                                      
++        default:	/* use JEDEC ID */
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;                        
++            info->dualport  = 0;            
++            info->dummybyte = 1;
++            info->buffersize = 1;            
++            WriteClk = 50;
++            EraseClk = 25;
++            ReadClk  = 50;  
++            if ((info->flash_id & 0xFF) == 0x1F)	/* Atmel */
++            {
++                switch (info->flash_id & 0x001F00)
++                {
++                case 0x000400:	
++        	    info->sector_count = 8;
++    	            info->size = 0x80000;        	
++	            break;	            	                
++                case 0x000500:	
++        	    info->sector_count = 16;
++    	            info->size = 0x100000;        	
++	            break;	            	                
++                case 0x000600:	
++        	    info->sector_count = 32;
++    	            info->size = 0x200000;        	
++	            break;
++                case 0x000700:	
++        	    info->sector_count = 64;
++    	            info->size = 0x400000;        	
++	            break;
++                case 0x000800:	
++        	    info->sector_count = 128;
++    	            info->size = 0x800000;        	
++	            break;	            
++                case 0x000900:	
++        	    info->sector_count = 256;
++    	            info->size = 0x1000000;        	
++	            break;	            	            
++                default:
++                    printf("Can't support this SPI Flash!! \n");
++                    return 0;	            
++                }   	            
++            } /* Atmel JDEC */        
++            else	/* JDEC */				
++            {
++                switch (info->flash_id & 0xFF0000)
++                {
++                case 0x120000:	
++        	    info->sector_count = 4;
++    	            info->size = 0x40000;        	
++	            break;
++                case 0x130000:	
++	            info->sector_count = 8;
++	            info->size = 0x80000;        	
++	            break;
++                case 0x140000:	
++	            info->sector_count =16;
++	            info->size = 0x100000;        	
++	            break;
++                case 0x150000:	
++	            info->sector_count =32;
++	            info->size = 0x200000;        	
++	            break;
++                case 0x160000:	
++	            info->sector_count =64;
++	            info->size = 0x400000;        	
++	            break;
++                case 0x170000:	
++	            info->sector_count =128;
++	            info->size = 0x800000;        	
++	            break;
++                case 0x180000:	
++	            info->sector_count =256;
++	            info->size = 0x1000000;        	
++	            break;
++                case 0x190000:	
++	            info->sector_count =256;
++	            info->size = 0x1000000;
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++	            info->sector_count = 512;
++	            info->size = 0x2000000;
++	            info->address32 = 1;        	
++#if	defined(CONFIG_FLASH_SPIx2_Dummy)
++                    info->readcmd = 0xbb;            
++                    info->dummybyte = 1;
++                    info->dualport = 1;            
++                    info->iomode = IOMODEx2_dummy;
++#elif	defined(CONFIG_FLASH_SPIx4_Dummy)
++                    info->readcmd = 0xeb;            
++                    info->dummybyte = 3;
++                    info->dualport = 0;            
++                    info->iomode = IOMODEx4_dummy;
++                    info->quadport = 1;
++                    info->dummydata = 0xaa;            
++#endif            
++#endif             	                	
++	            break;
++	            
++                case 0x200000:	
++	            info->sector_count =256;
++	            info->size = 0x1000000;
++                    if ((info->flash_id & 0xFF) == 0x20)	/* numonyx */
++                        info->specificspi = SpecificSPI_N25Q512;
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++	            info->sector_count = 1024;
++	            info->size = 0x4000000;
++	            info->address32 = 1;        	
++#if	defined(CONFIG_FLASH_SPIx2_Dummy)
++                    info->readcmd = 0xbb;            
++                    info->dummybyte = 1;
++                    info->dualport = 1;            
++                    info->iomode = IOMODEx2_dummy;
++#elif	defined(CONFIG_FLASH_SPIx4_Dummy)
++                    info->readcmd = 0xeb;            
++                    info->dummybyte = 3;
++                    info->dualport = 0;            
++                    info->iomode = IOMODEx4_dummy;
++                    info->quadport = 1;
++                    info->dummydata = 0xaa;            
++#endif            
++#endif             	                	
++	            break;
++	            	        	            	        
++                default:
++                    printf("Can't support this SPI Flash!! \n");
++                    return 0;
++                }    
++            } /* JDEC */        
++        }
++        				
++        debug ("erase_region_count = %d erase_region_size = %d\n",
++		erase_region_count, erase_region_size);
++
++	sector = base;			
++	for (j = 0; j < info->sector_count; j++) {
++		
++		info->start[j] = sector;
++		sector += erase_region_size;
++		info->protect[j] = 0; /* default: not protected */
++	}
++
++        /* set SPI flash extended info */
++#if 	defined(CONFIG_AST1300)
++	if (info->size > 0x200000)	/* limit MAX Flash to 2MB for AST1300 */
++	    info->size = 0x200000;
++#endif
++#if	defined(CONFIG_AST2400) || defined(CONFIG_AST2300) || defined(CONFIG_AST2300_FPGA_1) || defined(CONFIG_AST2300_FPGA_2) || defined(CONFIG_AST1300)
++        reg = *((volatile ulong*) 0x1e6e2024);
++        if (reg & 0x40000)
++        {
++            reg = *((volatile ulong*) 0x1e6e2070);	        
++	        
++            ulRefPLL = 24;
++            ulDeNumerator = reg & 0x0F;
++            ulNumerator = (reg & 0x07E0) >> 5;
++            ulOD = (reg & 0x10) ? 1:2;                    
++     	    
++            cpuclk = ulRefPLL * ulOD * (ulNumerator + 2) / (ulDeNumerator + 1);    
++        }        
++        else
++        {
++            reg = *((volatile ulong*) 0x1e6e2070);	        
++#if	defined(CONFIG_AST2400)
++            if (reg & 0x00800000)	//ref. clk:25MHz
++            {
++                switch (reg & 0x300)
++                {
++                case 0x000:
++                    cpuclk = 400;
++                    break;
++                case 0x100:
++                    cpuclk = 375;
++                    break;        
++                case 0x200:
++                    cpuclk = 350;
++                    break;        
++                case 0x300:
++                    cpuclk = 325;
++                    break;
++                }	            	            
++            }        
++            else
++            {
++                switch (reg & 0x300)	//ref. clk:24MHz
++                {
++                case 0x000:
++                    cpuclk = 384;
++                    break;
++                case 0x100:
++                    cpuclk = 360;
++                    break;        
++                case 0x200:
++                    cpuclk = 336;
++                    break;        
++                case 0x300:
++                    cpuclk = 312;
++                    break;
++                }	            
++            }
++#else	        
++            switch (reg & 0x300)
++            {
++            case 0x000:
++                 cpuclk = 384;
++                 break;
++            case 0x100:
++                 cpuclk = 360;
++                 break;        
++            case 0x200:
++                 cpuclk = 336;
++                 break;        
++            case 0x300:
++                 cpuclk = 408;
++                 break;
++            }
++#endif            
++        }	
++        
++        reg = *((volatile ulong*) 0x1e6e2070);        
++        switch (reg & 0xc00)
++        {
++        case 0x000:
++                 cpuclk /= 1;
++                 break;
++        case 0x400:
++                 cpuclk /= 2;
++                 break;        
++        case 0x800:	
++                 cpuclk /= 4;
++                 break;
++        case 0xC00:	
++                 cpuclk /= 3;
++                 break;                                 
++        }
++#else	/* AST2100 */        
++        reg = *((volatile ulong*) 0x1e6e2070);
++        switch (reg & 0xe00)
++        {
++        case 0x000:
++                 cpuclk = 266;
++                 break;
++        case 0x200:
++                 cpuclk = 233;
++                 break;        
++        case 0x400:
++                 cpuclk = 200;
++                 break;        
++        case 0x600:
++                 cpuclk = 166;
++                 break;        
++        case 0x800:
++                 cpuclk = 133;
++                 break;        
++        case 0xA00:
++                 cpuclk = 100;
++                 break;        
++        case 0xC00:
++                 cpuclk = 300;
++                 break;        
++        case 0xE00:	
++                 cpuclk = 24;
++                 break;        
++        }	
++        switch (reg & 0x3000)
++        {
++        case 0x1000:
++                 cpuclk /= 2;
++                 break;
++        case 0x2000:
++                 cpuclk /= 4;
++                 break;        
++        case 0x3000:	
++                 cpuclk /= 3;
++                 break;        
++        }
++#endif
++
++#if	defined(CONFIG_AST2400) || defined(CONFIG_AST2300) || defined(CONFIG_AST2300_FPGA_1) || defined(CONFIG_AST2300_FPGA_2) || defined(CONFIG_AST1300)
++
++#if     defined(CONFIG_AST2300) || defined(CONFIG_AST1300)
++        /* limit Max SPI CLK to 50MHz (Datasheet v1.2) */
++        if (WriteClk > 50) WriteClk = 50;
++        if (EraseClk > 50) EraseClk = 50;
++        if (ReadClk > 50)  ReadClk  = 50;
++#endif
++
++        div = 1;
++        while ( ((cpuclk/div) > WriteClk) && (div < 16) )
++        {
++            div++;	
++        }
++        info->tCK_Write = AST2300_SPICLK_DIV[div-1];
++        
++        div = 1;
++        while ( ((cpuclk/div) > EraseClk) && (div < 16) )
++        {
++            div++;	
++        }        
++        info->tCK_Erase = AST2300_SPICLK_DIV[div-1];
++
++        div = 1;
++        while ( ((cpuclk/div) > ReadClk) && (div < 16) )
++        {
++            div++;	
++        }        
++        info->tCK_Read = AST2300_SPICLK_DIV[div-1];
++#else        	
++        div = 2;
++        info->tCK_Write = 7;
++        while ( (cpuclk/div) > WriteClk )
++        {
++            info->tCK_Write--;	
++            div +=2;	
++        }
++        div = 2;
++        info->tCK_Erase = 7;
++        while ( (cpuclk/div) > EraseClk )
++        {
++            info->tCK_Erase--;	
++            div +=2;	
++        }
++        div = 2;
++        info->tCK_Read = 7;
++        while ( (cpuclk/div) > ReadClk )
++        {
++            info->tCK_Read--;	
++            div +=2;	
++        }
++#endif
++	
++	/* unprotect flash */	
++        write_status_register(info, 0);
++
++        if (info->quadport)
++            write_status_register(info, 0x40);	/* enable QE */
++
++        if (info->address32)	 
++        {          
++            reg = *((volatile ulong*) 0x1e6e2070);	/* set H/W Trappings */
++            reg |= 0x10;
++            *((volatile ulong*) 0x1e6e2070) = reg;
++            
++            reg  = *((volatile ulong*) 0x1e620004);	/* enable 32b control bit*/
++            reg |= (0x01 << info->CE);
++            *((volatile ulong*) 0x1e620004) = reg;
++            
++            /* set flash chips to 32bits addressing mode */
++            if ((info->flash_id & 0xFF) == 0x01)	/* Spansion */
++                enable4b_spansion(info);
++            else if ((info->flash_id & 0xFF) == 0x20)	/* Numonyx */
++                enable4b_numonyx(info);                
++            else /* MXIC, Winbond */
++                enable4b(info);                
++                
++        }    
++                    
++        reset_flash(info);
++        
++	return (info->size);
++}
++
++
++/*-----------------------------------------------------------------------
++ */
++static int flash_write_buffer (flash_info_t *info, uchar *src, ulong addr, int len)
++{
++        ulong j, base, offset;
++        ulong ulSMMBase, ulCtrlData, CtrlOffset;
++        uchar jReg;
++
++        if (info->CE == 2)
++        {
++            CtrlOffset = SPICtrlRegOffset2;
++        }    
++        else
++        {
++            CtrlOffset = SPICtrlRegOffset;
++        }    
++            
++	base = info->start[0];
++	offset = addr - base;
++	base = flash_make_addr (info, 0, 0);
++	
++        enable_write (info);
++
++        ulCtrlData  = (info->tCK_Write << 8);
++
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_LOW | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        *(uchar *) (base) = (uchar) (0x02);
++        udelay(10);
++        if (info->address32)
++        {
++            *(uchar *) (base) = (uchar) ((offset & 0xff000000) >> 24);
++            udelay(10);
++        }
++        *(uchar *) (base) = (uchar) ((offset & 0xff0000) >> 16);
++        udelay(10);
++        *(uchar *) (base) = (uchar) ((offset & 0x00ff00) >> 8);
++        udelay(10);
++        *(uchar *) (base) = (uchar) ((offset & 0x0000ff));
++        udelay(10);
++
++        for (j=0; j<len; j++)
++        {
++            *(uchar *) (base) = *(uchar *) (src++);
++            udelay(10);
++        }    
++                 
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_HIGH | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_LOW | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        *(uchar *) (base) = (uchar) (0x05);
++        udelay(10);
++        do {                             
++            jReg = *(volatile uchar *) (base);
++        } while ((jReg & 0x01));
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_HIGH | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++
++        /* RFSR */
++        if (info->specificspi == SpecificSPI_N25Q512)
++        {
++            ulCtrlData &= CMD_MASK;
++            ulCtrlData |= CE_LOW | USERMODE;
++            *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++            udelay(200);
++            *(uchar *) (base) = (uchar) (0x70);
++            udelay(10);
++            do {                                                            
++                jReg = *(volatile uchar *) (base);
++            } while (!(jReg & 0x80));
++            ulCtrlData &= CMD_MASK;
++            ulCtrlData |= CE_HIGH | USERMODE;
++            *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++            udelay(200);
++        }           
++}	
++
++/*-----------------------------------------------------------------------
++ *
++ * export functions
++ *  
++ */
++ 
++/*-----------------------------------------------------------------------
++ * 
++ */
++unsigned long flash_init (void)
++{
++	unsigned long size = 0;
++	int i;
++
++	/* Init: no FLASHes known */
++	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
++		flash_info[i].flash_id = FLASH_UNKNOWN;
++		size += flash_info[i].size = flash_get_size (bank_base[i], i);
++		if (flash_info[i].flash_id == FLASH_UNKNOWN) {
++#ifndef CFG_FLASH_QUIET_TEST
++			printf ("## Unknown FLASH on Bank %d - Size = 0x%08lx = %ld MB\n",
++				i, flash_info[i].size, flash_info[i].size << 20);
++#endif /* CFG_FLASH_QUIET_TEST */
++		}
++	}
++
++	/* Monitor protection ON by default */
++#if (CONFIG_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE)
++	flash_protect (FLAG_PROTECT_SET,
++		       CONFIG_MONITOR_BASE,
++		       CONFIG_MONITOR_BASE + monitor_flash_len  - 1,
++		       flash_get_info(CONFIG_MONITOR_BASE));
++#endif
++
++	/* Environment protection ON by default */
++#ifdef CONFIG_ENV_IS_IN_FLASH
++	flash_protect (FLAG_PROTECT_SET,
++		       CONFIG_ENV_ADDR,
++		       CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
++		       flash_get_info(CONFIG_ENV_ADDR));
++#endif
++
++	/* Redundant environment protection ON by default */
++#ifdef CONFIG_ENV_ADDR_REDUND
++	flash_protect (FLAG_PROTECT_SET,
++		       CONFIG_ENV_ADDR_REDUND,
++		       CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,
++		       flash_get_info(CONFIG_ENV_ADDR_REDUND));
++#endif
++	return (size);
++}
++
++/*-----------------------------------------------------------------------
++ */
++#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_ADDR_REDUND) || (CONFIG_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE)
++static flash_info_t *flash_get_info(ulong base)
++{
++	int i;
++	flash_info_t * info = 0;
++
++	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i ++) {
++		info = & flash_info[i];
++		if (info->size && info->start[0] <= base &&
++		    base <= info->start[0] + info->size - 1)
++			break;
++	}
++
++	return i == CONFIG_SYS_MAX_FLASH_BANKS ? 0 : info;
++}
++#endif
++
++/*-----------------------------------------------------------------------
++ */
++int flash_erase (flash_info_t * info, int s_first, int s_last)
++{
++	int rcode = 0;
++	int prot;
++	flash_sect_t sect;
++
++        ulong base, offset;
++        ulong ulSMMBase, ulCtrlData, CtrlOffset;
++        uchar jReg;
++        
++        disable_cache();
++        
++        if (info->CE == 2)
++        {
++            CtrlOffset = SPICtrlRegOffset2;
++        }    
++        else
++        {
++            CtrlOffset = SPICtrlRegOffset;
++        }    
++                    
++	if ((s_first < 0) || (s_first > s_last)) {
++		puts ("- no sectors to erase\n");
++		return 1;
++	}
++
++	prot = 0;
++	for (sect = s_first; sect <= s_last; ++sect) {
++		if (info->protect[sect]) {
++			prot++;
++		}
++	}
++	if (prot) {
++		printf ("- Warning: %d protected sectors will not be erased!\n", prot);
++	} else {
++		putc ('\n');
++	}
++
++        ulCtrlData  = (info->tCK_Erase << 8);
++	for (sect = s_first; sect <= s_last; sect++) {
++		if (info->protect[sect] == 0) { /* not protected */
++                        /* start erasing */
++                        enable_write(info);
++
++	                base = info->start[0];
++                        offset = info->start[sect] - base;
++	                base = flash_make_addr (info, 0, 0);
++
++                        ulCtrlData &= CMD_MASK;
++                        ulCtrlData |= CE_LOW | USERMODE;
++                        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++                        udelay(200);
++                        *(uchar *) (base) = (uchar) (0xd8);
++                        udelay(10);
++                        if (info->address32)
++                        { 
++                            *(uchar *) (base) = (uchar) ((offset & 0xff000000) >> 24);
++                            udelay(10);
++                        }                        
++                        *(uchar *) (base) = (uchar) ((offset & 0xff0000) >> 16);
++                        udelay(10);
++                        *(uchar *) (base) = (uchar) ((offset & 0x00ff00) >> 8);
++                        udelay(10);
++                        *(uchar *) (base) = (uchar) ((offset & 0x0000ff));
++                        udelay(10);
++
++                        ulCtrlData &= CMD_MASK;
++                        ulCtrlData |= CE_HIGH | USERMODE;
++                        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++                        udelay(200);
++
++                        ulCtrlData &= CMD_MASK;
++                        ulCtrlData |= CE_LOW | USERMODE;
++                        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++                        udelay(200);
++                        *(uchar *) (base) = (uchar) (0x05);
++                        udelay(10);
++                        do {                                                            
++                            jReg = *(volatile uchar *) (base);
++                        } while ((jReg & 0x01));
++                        ulCtrlData &= CMD_MASK;
++                        ulCtrlData |= CE_HIGH | USERMODE;
++                        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++                        udelay(200);
++
++                        /* RFSR */
++                        if (info->specificspi == SpecificSPI_N25Q512)
++                        {
++                            ulCtrlData &= CMD_MASK;
++                            ulCtrlData |= CE_LOW | USERMODE;
++                            *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++                            udelay(200);
++                            *(uchar *) (base) = (uchar) (0x70);
++                            udelay(10);
++                            do {                                                            
++                                jReg = *(volatile uchar *) (base);
++                            } while (!(jReg & 0x80));
++                            ulCtrlData &= CMD_MASK;
++                            ulCtrlData |= CE_HIGH | USERMODE;
++                            *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++                            udelay(200);
++                        }   
++                        
++			putc ('.');
++		}
++	}
++	puts (" done\n");
++	
++	reset_flash(info);
++	
++	return rcode;
++}
++
++/*-----------------------------------------------------------------------
++ */
++void flash_print_info (flash_info_t * info)
++{
++	putc ('\n');
++	return;
++}
++
++/*-----------------------------------------------------------------------
++ * Copy memory to flash, returns:
++ * 0 - OK
++ * 1 - write timeout
++ * 2 - Flash not erased
++ */
++int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
++{
++	int count;
++	unsigned char pat[] = {'|', '-', '/', '\\'};
++	int patcnt;
++	
++        disable_cache();	
++        
++	/* get lower aligned address */	
++        if (addr & (info->buffersize - 1))
++        {
++            count = cnt >= info->buffersize ? (info->buffersize - (addr & 0xff)):cnt;	
++            flash_write_buffer (info, src, addr, count);
++            addr+= count;
++            src += count;
++            cnt -= count;	
++        }
++	
++	/* prog */		
++	while (cnt > 0) {				
++	    count = cnt >= info->buffersize ? info->buffersize:cnt;
++            flash_write_buffer (info, src, addr, count);
++            addr+= count;
++            src += count;
++            cnt -= count;
++            printf("%c\b", pat[(patcnt++) & 0x03]);            	     	
++	} 		
++
++	reset_flash(info);
++
++        return (0);
++}
++
++#ifdef	CONFIG_FLASH_AST2300_DMA
++void * memmove_dma(void * dest,const void *src,size_t count)
++{
++	ulong count_align, poll_time, data;
++	
++	count_align = (count + 3) & 0xFFFFFFFC;	/* 4-bytes align */
++        poll_time = 100;			/* set 100 us as default */
++
++        /* force end of burst read */
++	*(volatile ulong *) (STCBaseAddress + SPICtrlRegOffset) |= CE_HIGH;
++	*(volatile ulong *) (STCBaseAddress + SPICtrlRegOffset) &= ~CE_HIGH;
++          
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_CONTROL) = (ulong) (~FLASH_DMA_ENABLE);	
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_FLASH_BASE) = (ulong *) (src);
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_DRAM_BASE) = (ulong *) (dest);
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_LENGTH) = (ulong) (count_align);
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_CONTROL) = (ulong) (FLASH_DMA_ENABLE);
++	
++	/* wait poll */
++	do {
++	    udelay(poll_time);	
++	    data = *(ulong *) (STCBaseAddress + REG_FLASH_INTERRUPT_STATUS);
++	} while (!(data & FLASH_STATUS_DMA_READY));
++	
++	/* clear status */
++	*(ulong *) (STCBaseAddress + REG_FLASH_INTERRUPT_STATUS) |= FLASH_STATUS_DMA_CLEAR;
++}	
++#endif
++#endif /* CONFIG_FLASH_SPI */
+diff --git a/board/aspeed/ast2300/hactest.c b/board/aspeed/ast2300/hactest.c
+new file mode 100755
+index 0000000..bfa87d5
+--- /dev/null
++++ b/board/aspeed/ast2300/hactest.c
+@@ -0,0 +1,762 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++/*
++ * Diagnostics support
++ */
++#include <common.h>
++#include <command.h>
++#include <post.h>
++#include "slt.h"
++
++#if ((CFG_CMD_SLT & CFG_CMD_HACTEST) && defined(CONFIG_SLT))
++#include "hactest.h"
++
++#include "aes.c"
++#include "rc4.c"
++
++static unsigned char crypto_src[CRYPTO_MAX_SRC], crypto_dst[CRYPTO_MAX_DST], crypto_context[CRYPTO_MAX_CONTEXT];
++static unsigned char hash_src[HASH_MAX_SRC], hash_dst[HASH_MAX_DST], hmac_key[HMAC_MAX_KEY];
++
++/*
++ * table 
++ */
++static aes_test aestest[] = {
++    { CRYPTOMODE_ECB, 128,
++     {0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c, '\0'},
++     {0x32, 0x43, 0xf6, 0xa8, 0x88, 0x5a, 0x30, 0x8d, 0x31, 0x31, 0x98, 0xa2, 0xe0, 0x37, 0x07, 0x34, '\0'},
++     {0x39, 0x25, 0x84, 0x1d, 0x02, 0xdc, 0x09, 0xfb, 0xdc, 0x11, 0x85, 0x97, 0x19, 0x6a, 0x0b, 0x32, '\0'} },
++    {0xFF, 0xFF, "", "", ""},		/* End Mark */
++};
++
++static rc4_test rc4test[] = {
++    {{0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, '\0'},
++     {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, '\0'}}, 	
++    {{0xff}, {0xff}},				/* End Mark */	
++};
++
++static hash_test hashtest[] = {
++    {HASHMODE_SHA1, 20,
++     "abc",
++     {0x53, 0x20, 0xb0, 0x8c, 0xa1, 0xf5, 0x74, 0x62, 0x50, 0x71, 0x89, 0x41, 0xc5, 0x0a, 0xdf, 0x4e, 0xbb, 0x55, 0x76, 0x06, '\0'}},
++    {0xFF, 0xFF, "", ""},			/* End Mark */ 
++};
++
++static hmac_test hmactest[] = {
++    {HASHMODE_SHA1, 64, 20,
++     {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, '\0' },
++     "Sample #1",
++     {0xbf, 0x39, 0xda, 0xb1, 0x7d, 0xc2, 0xe1, 0x23, 0x0d, 0x28, 0x35, 0x3b, 0x8c, 0xcb, 0x14, 0xb6, 0x22, 0x02, 0x65, 0xb3, '\0'}},
++    {0xFF, 0xFF, 0xFF, "", "", ""},			/* End Mark */ 
++};
++
++void EnableHMAC(void)
++{
++    unsigned long ulData;
++    	
++    /* init SCU */
++    *(unsigned long *) (0x1e6e2000) = 0x1688a8a8;
++    
++    ulData = *(volatile unsigned long *) (0x1e6e200c);
++    ulData &= 0xfdfff;
++    *(unsigned long *) (0x1e6e200c) = ulData;
++    udelay(100);
++    ulData = *(volatile unsigned long *) (0x1e6e2004);
++    ulData &= 0xfffef;
++    *(unsigned long *) (0x1e6e2004) = ulData;
++    
++}
++
++/* AES */
++void aes_enc_ast3000(aes_context *ctx, uint8 *input, uint8 *iv, uint8 *output, uint32 ulMsgLength , uint32 ulAESMode)
++{
++
++    unsigned long i, ulTemp, ulCommand;
++    unsigned char ch;
++    unsigned char *pjsrc, *pjdst, *pjcontext;
++    
++    ulCommand = CRYPTO_ENABLE_RW | CRYPTO_ENABLE_CONTEXT_LOAD | CRYPTO_ENABLE_CONTEXT_SAVE | \
++                CRYPTO_AES | CRYPTO_ENCRYPTO | CRYPTO_SYNC_MODE_ASYNC;
++
++    switch (ctx->nr)
++    {
++    case 10:
++        ulCommand |= CRYPTO_AES128;
++        break;
++    case 12:
++        ulCommand |= CRYPTO_AES192;
++        break;    
++    case 14:
++        ulCommand |= CRYPTO_AES256;
++        break;    
++    }
++
++    switch (ulAESMode)
++    {
++    case CRYPTOMODE_ECB:
++        ulCommand |= CRYPTO_AES_ECB;
++        break;
++    case CRYPTOMODE_CBC:
++        ulCommand |= CRYPTO_AES_CBC;
++        break;
++    case CRYPTOMODE_CFB:
++        ulCommand |= CRYPTO_AES_CFB;
++        break;
++    case CRYPTOMODE_OFB:
++        ulCommand |= CRYPTO_AES_OFB;
++        break;
++    case CRYPTOMODE_CTR:
++        ulCommand |= CRYPTO_AES_CTR;
++        break;                
++    }
++
++    pjsrc = (unsigned char *) m16byteAlignment((unsigned long) crypto_src);
++    pjdst = (unsigned char *) m16byteAlignment((unsigned long) crypto_dst);
++    pjcontext = (unsigned char *) m16byteAlignment((unsigned long) crypto_context);
++    	
++    /* Init HW */
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_SRC_BASE_OFFSET) = (unsigned long) pjsrc;
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_DST_BASE_OFFSET) = (unsigned long) pjdst;
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_CONTEXT_BASE_OFFSET) = (unsigned long) pjcontext;
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_LEN_OFFSET) = ulMsgLength;
++
++    /* Set source */
++    for (i=0; i< ulMsgLength; i++)
++    {
++    	ch = *(uint8 *)(input + i);    	
++    	*(uint8 *) (pjsrc + i) = ch;
++    }
++     
++    /* Set Context */
++    /* Set IV */
++    for (i=0; i<16; i++)
++    {
++        ch = *(uint8 *) (iv + i);
++    	*(uint8 *) (pjcontext + i) = ch;
++    }
++       
++    /* Set Expansion Key */   
++    for (i=0; i<(4*(ctx->nr+1)); i++)
++    {
++        ulTemp = ((ctx->erk[i] & 0xFF) << 24) + ((ctx->erk[i] & 0xFF00) << 8) + ((ctx->erk[i] & 0xFF0000) >> 8) + ((ctx->erk[i] & 0xFF000000) >> 24);
++    	*(uint32 *) (pjcontext + i*4 + 16) = ulTemp;
++    }
++
++    /* fire cmd */
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_CMD_BASE_OFFSET) = ulCommand;
++    do {
++        ulTemp = *(volatile unsigned long *) (HAC_REG_BASE + REG_CRYPTO_STATUS_OFFSET);
++    } while (ulTemp & CRYPTO_BUSY);	
++    
++    /* Output */
++    for (i=0; i<ulMsgLength; i++)
++    {
++        ch = *(uint8 *) (pjdst + i);        
++        *(uint8 *) (output + i) = ch;    
++    }
++    
++} /* aes_enc_ast3000 */
++
++
++void aes_dec_ast3000(aes_context *ctx, uint8 *input, uint8 *iv, uint8 *output, uint32 ulMsgLength , uint32 ulAESMode)
++{
++    unsigned long i, ulTemp, ulCommand;
++    unsigned char ch;
++    unsigned char *pjsrc, *pjdst, *pjcontext;
++    
++    ulCommand = CRYPTO_ENABLE_RW | CRYPTO_ENABLE_CONTEXT_LOAD | CRYPTO_ENABLE_CONTEXT_SAVE | \
++                CRYPTO_AES | CRYPTO_DECRYPTO | CRYPTO_SYNC_MODE_ASYNC;
++
++    switch (ctx->nr)
++    {
++    case 10:
++        ulCommand |= CRYPTO_AES128;
++        break;
++    case 12:
++        ulCommand |= CRYPTO_AES192;
++        break;    
++    case 14:
++        ulCommand |= CRYPTO_AES256;
++        break;    
++    }
++
++    switch (ulAESMode)
++    {
++    case CRYPTOMODE_ECB:
++        ulCommand |= CRYPTO_AES_ECB;
++        break;
++    case CRYPTOMODE_CBC:
++        ulCommand |= CRYPTO_AES_CBC;
++        break;
++    case CRYPTOMODE_CFB:
++        ulCommand |= CRYPTO_AES_CFB;
++        break;
++    case CRYPTOMODE_OFB:
++        ulCommand |= CRYPTO_AES_OFB;
++        break;
++    case CRYPTOMODE_CTR:
++        ulCommand |= CRYPTO_AES_CTR;
++        break;                
++    }
++
++    pjsrc = (unsigned char *) m16byteAlignment((unsigned long) crypto_src);
++    pjdst = (unsigned char *) m16byteAlignment((unsigned long) crypto_dst);
++    pjcontext = (unsigned char *) m16byteAlignment((unsigned long) crypto_context);
++	
++    /* Init HW */
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_SRC_BASE_OFFSET) = (unsigned long) pjsrc;
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_DST_BASE_OFFSET) = (unsigned long) pjdst;
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_CONTEXT_BASE_OFFSET) = (unsigned long) pjcontext;
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_LEN_OFFSET) = ulMsgLength;
++
++    /* Set source */
++    for (i=0; i< ulMsgLength; i++)
++    {
++    	ch = *(uint8 *)(input + i);    	
++    	*(uint8 *) (pjsrc + i) = ch;
++    }
++     
++    /* Set Context */
++    /* Set IV */
++    for (i=0; i<16; i++)
++    {
++        ch = *(uint8 *) (iv + i);
++    	*(uint8 *) (pjcontext + i) = ch;
++    }
++       
++    /* Set Expansion Key */   
++    for (i=0; i<(4*(ctx->nr+1)); i++)
++    {
++        ulTemp = ((ctx->erk[i] & 0xFF) << 24) + ((ctx->erk[i] & 0xFF00) << 8) + ((ctx->erk[i] & 0xFF0000) >> 8) + ((ctx->erk[i] & 0xFF000000) >> 24);
++    	*(uint32 *) (pjcontext + i*4 + 16) = ulTemp;
++    }
++
++    /* fire cmd */
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_CMD_BASE_OFFSET) = ulCommand;
++    do {
++        ulTemp = *(volatile unsigned long *) (HAC_REG_BASE + REG_CRYPTO_STATUS_OFFSET);
++    } while (ulTemp & CRYPTO_BUSY);	
++    
++    /* Output */
++    for (i=0; i<ulMsgLength; i++)
++    {
++        ch = *(uint8 *) (pjdst + i);        
++        *(uint8 *) (output + i) = ch;    
++    }
++
++} /* aes_dec_ast3000 */
++
++void rc4_crypt_ast3000(uint8 *data, int ulMsgLength, uint8 *rc4_key, uint32 ulKeyLength)
++{
++    struct rc4_state s;
++    unsigned long i, ulTemp, ulCommand;
++    unsigned char ch;
++    unsigned char *pjsrc, *pjdst, *pjcontext;
++
++    ulCommand = CRYPTO_ENABLE_RW | CRYPTO_ENABLE_CONTEXT_LOAD | CRYPTO_ENABLE_CONTEXT_SAVE | \
++                CRYPTO_RC4 | CRYPTO_SYNC_MODE_ASYNC;
++
++    rc4_setup( &s, rc4_key, ulKeyLength );
++
++    pjsrc = (unsigned char *) m16byteAlignment((unsigned long) crypto_src);
++    pjdst = (unsigned char *) m16byteAlignment((unsigned long) crypto_dst);
++    pjcontext = (unsigned char *) m16byteAlignment((unsigned long) crypto_context);
++	
++    /* Init HW */
++    *(uint32 *) (HAC_REG_BASE + REG_CRYPTO_SRC_BASE_OFFSET) = (unsigned long) pjsrc;	
++    *(uint32 *) (HAC_REG_BASE + REG_CRYPTO_DST_BASE_OFFSET) = (unsigned long) pjdst;	
++    *(uint32 *) (HAC_REG_BASE + REG_CRYPTO_CONTEXT_BASE_OFFSET) = (unsigned long) pjcontext;	
++    *(uint32 *) (HAC_REG_BASE + REG_CRYPTO_LEN_OFFSET) = ulMsgLength;	
++          	
++
++    /* Set source */
++    for (i=0; i< ulMsgLength; i++)
++    {
++    	ch = *(uint8 *)(data + i);
++    	*(uint8 *) (pjsrc + i) = ch;
++    }
++     
++    /* Set Context */
++    /* Set i, j */
++    *(uint32 *) (pjcontext + 8) = 0x0001;	
++       
++    /* Set Expansion Key */   
++    for (i=0; i<(256/4); i++)
++    {
++       ulTemp = (s.m[i * 4] & 0xFF) + ((s.m[i * 4 + 1] & 0xFF) << 8) + ((s.m[i * 4 + 2] & 0xFF) << 16) + ((s.m[i * 4+ 3] & 0xFF) << 24);
++       *(uint32 *) (pjcontext + i*4 + 16) = ulTemp;	
++    }
++
++    /* fire cmd */
++    *(uint32 *) (HAC_REG_BASE + REG_CRYPTO_CMD_BASE_OFFSET) = ulCommand;    
++    do {
++    	ulTemp = *(volatile uint32 *) (HAC_REG_BASE + REG_CRYPTO_STATUS_OFFSET);
++    } while (ulTemp & CRYPTO_BUSY);	
++
++    /* Output */
++    for (i=0; i<ulMsgLength; i++)
++    {
++        ch = *(volatile uint8 *) (pjdst + i);
++        *(uint8 *) (data + i) = ch;    
++    }
++
++} /* rc4_crypt_ast3000	*/
++
++/* Hash */
++void hash_ast3000(uint8 *msg, uint32 ulLength, unsigned char *output, uint32 ulHashMode)
++{
++   uint32 i, ulTemp, ulCommand, ulDigestLength, ulMyMsgLength;
++   uint8 ch;
++   unsigned char *pjsrc, *pjdst;
++   
++   /* Get Info */
++   switch (ulHashMode)
++   {
++   case HASHMODE_MD5:
++        ulCommand = HASH_ALG_SELECT_MD5;
++        ulDigestLength = 16;
++       break;
++   case HASHMODE_SHA1:
++        ulCommand = HASH_ALG_SELECT_SHA1 | 0x08;
++        ulDigestLength = 20;
++       break;
++   case HASHMODE_SHA256:
++        ulCommand = HASH_ALG_SELECT_SHA256 | 0x08;
++        ulDigestLength = 32;
++       break;
++   case HASHMODE_SHA224:
++        ulCommand = HASH_ALG_SELECT_SHA224 | 0x08;
++        ulDigestLength = 28;
++       break;       	
++   }   	    
++
++    pjsrc = (unsigned char *) m16byteAlignment((unsigned long) hash_src);
++    pjdst = (unsigned char *) m16byteAlignment((unsigned long) hash_dst);
++
++    /* 16byte alignment */
++    ulMyMsgLength = m16byteAlignment(ulLength);
++   	
++   /* Init. HW */
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_SRC_BASE_OFFSET) = (unsigned long) pjsrc;	
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_DST_BASE_OFFSET) = (unsigned long) pjdst;	
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_LEN_OFFSET) = ulMyMsgLength;	
++        
++    /* write src */
++    for (i=0; i<ulLength; i++)
++    {
++    	ch = *(uint8 *)(msg+i);
++    	*(uint8 *) (pjsrc + i) = ch;
++    }    
++    for (i=ulLength; i<ulMyMsgLength; i++)
++        *(uint8 *) (pjsrc + i) = 0;
++        
++    /* fire cmd */
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_CMD_OFFSET) = ulCommand;	
++    
++    /* get digest */
++    do {
++    	ulTemp = *(volatile uint32 *) (HAC_REG_BASE + REG_HASH_STATUS_OFFSET);    	
++    } while (ulTemp & HASH_BUSY);	
++    	
++    for (i=0; i<ulDigestLength; i++)
++    {
++        ch = *(volatile uint8 *) (pjdst + i);
++       *(uint8 *) (output + i) = ch;    
++    }        
++ 
++} /* hash_ast3000 */	
++
++/* HMAC */
++void hmackey_ast3000(uint8 *key, uint32 ulKeyLength, uint32 ulHashMode)
++{
++    uint32 i, ulBlkLength, ulDigestLength, ulTemp, ulCommand;
++    uint8 k0[64], sum[32];
++    uint8 ch;
++    unsigned char *pjsrc, *pjdst, *pjkey;
++
++   /* Get Info */
++   switch (ulHashMode)
++   {
++   case HASHMODE_MD5:
++        ulCommand = HASH_ALG_SELECT_MD5;
++        ulDigestLength = 16;
++       break;
++   case HASHMODE_SHA1:
++        ulCommand = HASH_ALG_SELECT_SHA1 | 0x08;
++        ulDigestLength = 20;
++       break;
++   case HASHMODE_SHA256:
++        ulCommand = HASH_ALG_SELECT_SHA256 | 0x08;
++        ulDigestLength = 32;
++       break;
++   case HASHMODE_SHA224:
++        ulCommand = HASH_ALG_SELECT_SHA224 | 0x08;
++        ulDigestLength = 28;
++       break;       	
++   }   	    
++   ulBlkLength = 64;				/* MD5, SHA1/256/224: 64bytes */
++
++    /* Init */
++    memset( (void *) k0, 0, 64);		/* reset to zero */
++    memset( (void *) sum, 0, 32);		/* reset to zero */
++
++    /* Get k0 */
++    if (ulKeyLength <= ulBlkLength)
++        memcpy( (void *) k0, (void *) key, ulKeyLength );       
++    else /* (ulKeyLength > ulBlkLength) */
++    {
++        hash_ast3000(key, ulKeyLength, sum, ulHashMode);
++        memcpy( (void *) k0, (void *) sum, ulDigestLength );                           
++    }    	
++
++    pjsrc = (unsigned char *) m16byteAlignment((unsigned long) hash_src);
++    pjdst = (unsigned char *) m16byteAlignment((unsigned long) hash_dst);
++    pjkey = (unsigned char *) m64byteAlignment((unsigned long) hmac_key);
++    
++    /* Calculate digest */
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_SRC_BASE_OFFSET) = (unsigned long) pjsrc;
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_DST_BASE_OFFSET) = (unsigned long) pjdst;
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_KEY_BASE_OFFSET) = (unsigned long) pjkey;
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_LEN_OFFSET) = ulBlkLength;
++        
++    /* write key to src */
++    for (i=0; i<ulBlkLength; i++)
++    {
++    	ch = *(uint8 *)(k0+i);
++        *(uint8 *) (pjsrc + i) = ch;
++    }    
++    
++    /* fire cmd for calculate */
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_CMD_OFFSET) = ulCommand | HAC_DIGEST_CAL_ENABLE;    
++    do {
++    	ulTemp = *(volatile uint32 *) (HAC_REG_BASE + REG_HASH_STATUS_OFFSET);    	
++    } while (ulTemp & HASH_BUSY);	
++         
++} /* hmackey_ast3000 */
++
++void hmac_ast3000(uint8 *key, uint32 ulKeyLength, uint8 *msg, uint32 ulMsgLength, uint32 ulHashMode, unsigned char *output)
++{
++    uint32 i, ulTemp, ulCommand, ulDigestLength, ulMyMsgLength;;
++    uint8 ch;
++    unsigned char *pjsrc, *pjdst, *pjkey;
++
++    /* Calculate digest */
++   switch (ulHashMode)
++   {
++   case HASHMODE_MD5:
++        ulCommand = HASH_ALG_SELECT_MD5;
++        ulDigestLength = 16;
++       break;
++   case HASHMODE_SHA1:
++        ulCommand = HASH_ALG_SELECT_SHA1 | 0x08;
++        ulDigestLength = 20;
++       break;
++   case HASHMODE_SHA256:
++        ulCommand = HASH_ALG_SELECT_SHA256 | 0x08;
++        ulDigestLength = 32;
++       break;
++   case HASHMODE_SHA224:
++        ulCommand = HASH_ALG_SELECT_SHA224 | 0x08;
++        ulDigestLength = 28;
++       break;       	
++   }   	    
++ 
++    pjsrc = (unsigned char *) m16byteAlignment((unsigned long) hash_src);
++    pjdst = (unsigned char *) m16byteAlignment((unsigned long) hash_dst);
++    pjkey = (unsigned char *) m64byteAlignment((unsigned long) hmac_key);
++    
++    /* 16byte alignment */
++    ulMyMsgLength = m16byteAlignment(ulMsgLength);
++    		
++    /* Init. HW */
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_SRC_BASE_OFFSET) = (unsigned long) pjsrc;
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_DST_BASE_OFFSET) = (unsigned long) pjdst;
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_KEY_BASE_OFFSET) = (unsigned long) pjkey;
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_LEN_OFFSET) = ulMyMsgLength;
++
++    /* write Text to src */
++    for (i=0; i<ulMsgLength; i++)
++    {
++    	ch = *(uint8 *)(msg+i);
++        *(uint8 *) (pjsrc + i) = ch;
++    }    
++    for (i=ulMsgLength; i<ulMyMsgLength; i++)
++        *(uint8 *) (pjsrc + i) = 0;
++    
++    /* fire cmd */
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_CMD_OFFSET) = ulCommand | HAC_ENABLE;        
++    do {
++    	ulTemp = *(volatile uint32 *) (HAC_REG_BASE + REG_HASH_STATUS_OFFSET);    	
++    } while (ulTemp & HASH_BUSY);
++
++    /* Output Digest */
++    for (i=0; i<ulDigestLength; i++)
++    {
++        ch = *(uint8 *) (pjdst + i);
++        *(uint8 *) (output + i) = ch;    
++    }
++
++} /* hmac_ast3000 */
++
++/* main hactest procedure */
++int do_hactest (void)
++{
++        unsigned long i, j, Flags = 0;
++	aes_test *pjaes_test;
++        aes_context aes_ctx;
++        unsigned char AES_Mode[8], aes_output[64];
++	unsigned long ulAESMsgLength;
++	
++	rc4_test *pjrc4_test;
++	unsigned char rc4_buf_sw[64], rc4_buf_hw[64];
++	unsigned long ulRC4KeyLength, ulRC4MsgLength;
++	
++	hash_test *pjhash_test;
++	unsigned char HASH_Mode[8], hash_out[64];
++
++	hmac_test *pjhmac_test;
++	unsigned char HMAC_Mode[8], hmac_out[64];
++
++	EnableHMAC();
++	
++	/* AES Test */
++	pjaes_test = aestest;
++	while (pjaes_test->aes_mode != 0xFF)
++	{
++
++            if (pjaes_test->aes_mode == CRYPTOMODE_CBC)
++                strcpy (AES_Mode, "CBC");
++            else if (pjaes_test->aes_mode == CRYPTOMODE_CFB)
++                strcpy (AES_Mode, "CFB");
++            else if (pjaes_test->aes_mode == CRYPTOMODE_OFB)
++                strcpy (AES_Mode, "OFB");
++            else if (pjaes_test->aes_mode == CRYPTOMODE_CTR)
++                strcpy (AES_Mode, "CTR");
++            else    
++                strcpy (AES_Mode, "ECB");
++
++            /* Get Msg. Length */
++            ulAESMsgLength = strlen(pjaes_test->plaintext);
++            j = ( (ulAESMsgLength + 15) >> 4) << 4;
++            for (i=ulAESMsgLength; i<j; i++)
++                pjaes_test->plaintext[i] = 0;
++            ulAESMsgLength = j;    
++                		
++            aes_set_key(&aes_ctx, pjaes_test->key, pjaes_test->key_length);
++            
++            /* Encryption Test */
++            aes_enc_ast3000(&aes_ctx, pjaes_test->plaintext, pjaes_test->key, aes_output, ulAESMsgLength, pjaes_test->aes_mode);	    
++	    if (strncmp(aes_output, pjaes_test->ciphertext, ulAESMsgLength))
++	    {
++	    	Flags |= FLAG_AESTEST_FAIL;	    	
++	        printf("[INFO] AES%d %s Mode Encryption Failed \n", pjaes_test->key_length, AES_Mode);
++	        printf("[DBG] Golden Data Dump .... \n");	        
++	        for (i=0; i< ulAESMsgLength; i++)
++	        {
++	            printf("%02x ", pjaes_test->ciphertext[i]);	        	
++	            if (((i+1) % 8) == 0)
++	                printf("\n");        
++	        }        
++	        printf("\n [DBG] Error Data Dump .... \n");
++	        for (i=0; i< ulAESMsgLength; i++)
++	        {
++	            printf("%02x ", aes_output[i]);	        	
++	            if (((i+1) % 8) == 0)
++	                printf("\n");        
++	        }
++	        printf("\n");	                
++	    }
++	    else
++	    {
++	    	/*
++	        printf("[INFO] AES%d %s Mode Encryption Passed \n", pjaes_test->key_length, AES_Mode);
++	        */
++	    }	
++
++            /* Decryption Test */
++            aes_dec_ast3000(&aes_ctx, pjaes_test->ciphertext, pjaes_test->key, aes_output, ulAESMsgLength, pjaes_test->aes_mode);	    
++	    if (strncmp(aes_output, pjaes_test->plaintext, ulAESMsgLength))
++	    {
++	    	Flags |= FLAG_AESTEST_FAIL;
++	        printf("[INFO] AES%d %s Mode Decryption Failed \n", pjaes_test->key_length, AES_Mode);	        
++	        printf("[DBG] Golden Data Dump .... \n");
++	        for (i=0; i< ulAESMsgLength; i++)
++	        {
++	            printf("%02x ", pjaes_test->plaintext[i]);	        	
++	            if (((i+1) % 8) == 0)
++	                printf("\n");        
++	        }        
++	        printf("\n [DBG] Error Data Dump .... \n");
++	        for (i=0; i< ulAESMsgLength; i++)
++	        {
++	            printf("%02x ", aes_output[i]);	        	
++	            if (((i+1) % 8) == 0)
++	                printf("\n");        
++	        }
++	        printf("\n");	                
++	    }
++	    else
++	    {
++	    	/*
++	        printf("[INFO] AES%d %s Mode Decryption Passed \n", pjaes_test->key_length, AES_Mode);
++	        */
++	    }	
++	    
++	    pjaes_test++;
++        } /* AES */
++
++	/* RC4 Test */
++	pjrc4_test = rc4test;
++	while ((pjrc4_test->key[0] != 0xff) && (pjrc4_test->data[0] != 0xff))
++	{
++
++            /* Get Info */
++            ulRC4KeyLength = strlen(pjrc4_test->key);
++            ulRC4MsgLength = strlen(pjrc4_test->data);
++            memcpy( (void *) rc4_buf_sw, (void *) pjrc4_test->data, ulRC4MsgLength );
++            memcpy( (void *) rc4_buf_hw, (void *) pjrc4_test->data, ulRC4MsgLength );                                       
++
++            /* Crypto */
++            rc4_crypt_sw(rc4_buf_sw, ulRC4MsgLength, pjrc4_test->key, ulRC4KeyLength);
++            rc4_crypt_ast3000(rc4_buf_hw, ulRC4MsgLength, pjrc4_test->key, ulRC4KeyLength);
++           
++	    if (strncmp(rc4_buf_hw, rc4_buf_sw, ulRC4MsgLength))
++	    {
++	    	Flags |= FLAG_RC4TEST_FAIL;	    	
++	        printf("[INFO] RC4 Encryption Failed \n");
++	        printf("[DBG] Golden Data Dump .... \n");
++	        for (i=0; i< ulRC4MsgLength; i++)
++	        {
++	            printf("%02x ", rc4_buf_sw[i]);
++	            if (((i+1) % 8) == 0)
++	                printf("\n");        
++	        }
++	        printf("\n [DBG] Error Data Dump .... \n");
++	        for (i=0; i< ulRC4MsgLength; i++)
++	        {
++	            printf("%02x ", rc4_buf_hw[i]);
++	            if (((i+1) % 8) == 0)
++	                printf("\n");        
++	        }
++	        printf("\n");	        
++	    }
++	    else
++	    {
++	    	/*
++	        printf("[INFO] RC4 Encryption Passed \n");
++	        */
++	    }	
++
++	    pjrc4_test++;
++	    
++        } /* RC4 */
++       
++	/* Hash Test */
++	pjhash_test = hashtest;
++	while (pjhash_test->hash_mode != 0xFF)
++	{
++
++            if (pjhash_test->hash_mode == HASHMODE_MD5)
++                strcpy (HASH_Mode, "MD5");
++            else if (pjhash_test->hash_mode == HASHMODE_SHA1)
++                strcpy (HASH_Mode, "SHA1");
++            else if (pjhash_test->hash_mode == HASHMODE_SHA256)
++                strcpy (HASH_Mode, "SHA256");
++            else if (pjhash_test->hash_mode == HASHMODE_SHA224)
++                strcpy (HASH_Mode, "SHA224");
++            
++            /* Hash */   		
++            hash_ast3000(pjhash_test->input, strlen(pjhash_test->input), hash_out, pjhash_test->hash_mode);            
++	    if (strncmp(hash_out, pjhash_test->digest, pjhash_test->digest_length))
++	    {
++	    	Flags |= FLAG_HASHTEST_FAIL;	    	
++	        printf("[INFO] HASH %s Failed \n", HASH_Mode);
++	        printf("[DBG] Golden Data Dump .... \n");	        
++	        for (i=0; i< pjhash_test->digest_length; i++)
++	        {
++	            printf("%02x ",pjhash_test->digest[i]);
++	            if (((i+1) % 8) == 0) 	
++	                printf("\n");        
++	        }        
++	        printf("\n [DBG] Error Data Dump .... \n");
++	        for (i=0; i< pjhash_test->digest_length; i++)
++	        {
++	            printf("%02x ",hash_out[i]);
++	            if (((i+1) % 8) == 0) 	
++	                printf("\n");        
++	        }
++	        printf("\n");
++	    }
++	    else
++	    {
++	    	/*
++	        printf("[INFO] HASH %s Passed \n", HASH_Mode);
++	        */
++	    }	
++
++            pjhash_test++;
++            
++        } /* Hash Test */
++
++	/* HMAC Test */
++	pjhmac_test = hmactest;
++	while (pjhmac_test->hash_mode != 0xFF)
++	{
++
++            if (pjhmac_test->hash_mode == HASHMODE_MD5)
++                strcpy (HMAC_Mode, "MD5");
++            else if (pjhmac_test->hash_mode == HASHMODE_SHA1)
++                strcpy (HMAC_Mode, "SHA1");
++            else if (pjhmac_test->hash_mode == HASHMODE_SHA256)
++                strcpy (HMAC_Mode, "SHA256");
++            else if (pjhmac_test->hash_mode == HASHMODE_SHA224)
++                strcpy (HMAC_Mode, "SHA224");
++            
++            /* HMAC */   		
++            hmackey_ast3000(pjhmac_test->key, pjhmac_test->key_length, pjhmac_test->hash_mode);
++            hmac_ast3000(pjhmac_test->key, pjhmac_test->key_length, pjhmac_test->input, strlen(pjhmac_test->input), pjhmac_test->hash_mode, hmac_out);            
++	    if (strncmp(hmac_out, pjhmac_test->digest, pjhmac_test->digest_length))
++	    {
++	    	Flags |= FLAG_HASHTEST_FAIL;	    	
++	        printf("[INFO] HMAC %s Failed \n", HMAC_Mode);
++	        printf("[DBG] Golden Data Dump .... \n");	        
++	        for (i=0; i< pjhmac_test->digest_length; i++)
++	        {
++	            printf("%02x ",pjhmac_test->digest[i]);
++	            if (((i+1) % 8) == 0) 	
++	                printf("\n");        
++	        }        
++	        printf("\n [DBG] Error Data Dump .... \n");
++	        for (i=0; i< pjhmac_test->digest_length; i++)
++	        {
++	            printf("%02x ",hmac_out[i]);
++	            if (((i+1) % 8) == 0) 	
++	                printf("\n");        
++	        }
++	        printf("\n");
++	    }
++	    else
++	    {
++	    	/*
++	        printf("[INFO] HMAC %s Passed \n", HMAC_Mode);
++	        */
++	    }	
++
++            pjhmac_test++;
++            
++        } /* HMAC Test */
++
++	return Flags;
++	
++}
++
++#endif /* CONFIG_SLT */
+diff --git a/board/aspeed/ast2300/hactest.h b/board/aspeed/ast2300/hactest.h
+new file mode 100755
+index 0000000..fcf2186
+--- /dev/null
++++ b/board/aspeed/ast2300/hactest.h
+@@ -0,0 +1,194 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++/* Err Flags */
++#define FLAG_AESTEST_FAIL  		0x00000001
++#define FLAG_RC4TEST_FAIL  		0x00000002
++#define FLAG_HASHTEST_FAIL  		0x00000004
++
++/* Specific */
++/*
++#define DRAM_BASE			0x40000000
++#define	CRYPTO_SRC_BASE			(DRAM_BASE + 0x100000)
++#define	CRYPTO_DST_BASE			(DRAM_BASE + 0x200000)
++#define	CRYPTO_CONTEXT_BASE		(DRAM_BASE + 0x300000)
++
++#define	HASH_SRC_BASE			(DRAM_BASE + 0x400000)
++#define	HASH_DST_BASE			(DRAM_BASE + 0x500000)
++#define	HMAC_KEY_BASE			(DRAM_BASE + 0x600000)
++*/
++#define m08byteAlignment(x)		((x + 0x00000007) & 0xFFFFFFF8)
++#define m16byteAlignment(x)		((x + 0x0000000F) & 0xFFFFFFF0)
++#define m64byteAlignment(x)		((x + 0x0000003F) & 0xFFFFFFC0)
++
++#define CRYPTO_ALIGNMENT		16
++#define CRYPTO_MAX_SRC			(100+CRYPTO_ALIGNMENT)
++#define CRYPTO_MAX_DST			(100+CRYPTO_ALIGNMENT)
++#define CRYPTO_MAX_CONTEXT		(100+CRYPTO_ALIGNMENT)
++
++#define HASH_ALIGNMENT			16
++#define HMAC_KEY_ALIGNMENT	 	64
++#define HASH_MAX_SRC			(100+HASH_ALIGNMENT)
++#define HASH_MAX_DST			(32+HASH_ALIGNMENT)
++#define HMAC_MAX_KEY			(64+HMAC_KEY_ALIGNMENT)
++
++/* General */
++#define HAC_REG_BASE 			0x1e6e3000
++
++#define MAX_KEYLENGTH			100
++#define MAX_TEXTLENGTH			100
++#define MAX_AESTEXTLENGTH		256
++#define MAX_RC4TEXTLENGTH		256
++#define MAX_RC4KEYLENGTH		256
++
++#define CRYPTOMODE_ECB			0x00
++#define CRYPTOMODE_CBC			0x01
++#define CRYPTOMODE_CFB			0x02
++#define CRYPTOMODE_OFB			0x03
++#define CRYPTOMODE_CTR			0x04
++
++#define HASHMODE_MD5			0x00
++#define HASHMODE_SHA1			0x01
++#define HASHMODE_SHA256			0x02
++#define HASHMODE_SHA224			0x03
++
++#define MIXMODE_DISABLE                 0x00
++#define MIXMODE_CRYPTO                  0x02
++#define MIXMODE_HASH                    0x03
++
++#define REG_CRYPTO_SRC_BASE_OFFSET	0x00
++#define REG_CRYPTO_DST_BASE_OFFSET	0x04
++#define REG_CRYPTO_CONTEXT_BASE_OFFSET	0x08
++#define REG_CRYPTO_LEN_OFFSET		0x0C
++#define REG_CRYPTO_CMD_BASE_OFFSET	0x10
++//#define REG_CRYPTO_ENABLE_OFFSET	0x14
++#define REG_CRYPTO_STATUS_OFFSET	0x1C
++
++#define REG_HASH_SRC_BASE_OFFSET	0x20
++#define REG_HASH_DST_BASE_OFFSET	0x24
++#define REG_HASH_KEY_BASE_OFFSET	0x28
++#define REG_HASH_LEN_OFFSET		0x2C
++#define REG_HASH_CMD_OFFSET		0x30
++//#define REG_HASH_ENABLE_OFFSET		0x14
++#define REG_HASH_STATUS_OFFSET		0x1C
++
++#define HASH_BUSY			0x01
++#define CRYPTO_BUSY			0x02
++
++//#define ENABLE_HASH			0x01
++//#define DISABLE_HASH			0x00
++//#define ENABLE_CRYPTO			0x02
++//#define DISABLE_CRYPTO			0x00
++
++#define CRYPTO_SYNC_MODE_MASK		0x03
++#define CRYPTO_SYNC_MODE_ASYNC		0x00
++#define CRYPTO_SYNC_MODE_PASSIVE	0x02
++#define CRYPTO_SYNC_MODE_ACTIVE		0x03
++
++#define CRYPTO_AES128			0x00
++#define CRYPTO_AES192			0x04
++#define CRYPTO_AES256			0x08
++
++#define CRYPTO_AES_ECB			0x00
++#define CRYPTO_AES_CBC			0x10
++#define CRYPTO_AES_CFB			0x20
++#define CRYPTO_AES_OFB			0x30
++#define CRYPTO_AES_CTR			0x40
++
++#define CRYPTO_ENCRYPTO			0x80
++#define CRYPTO_DECRYPTO			0x00
++
++#define CRYPTO_AES			0x000
++#define CRYPTO_RC4			0x100
++
++#define CRYPTO_ENABLE_RW		0x000
++#define CRYPTO_ENABLE_CONTEXT_LOAD	0x000
++#define CRYPTO_ENABLE_CONTEXT_SAVE	0x000
++
++#define HASH_SYNC_MODE_MASK		0x03
++#define HASH_SYNC_MODE_ASYNC		0x00
++#define HASH_SYNC_MODE_PASSIVE		0x02
++#define HASH_SYNC_MODE_ACTIVE		0x03
++
++#define HASH_READ_SWAP_ENABLE		0x04
++#define HMAC_SWAP_CONTROL_ENABLE	0x08
++
++#define HASH_ALG_SELECT_MASK		0x70
++#define HASH_ALG_SELECT_MD5		0x00
++#define HASH_ALG_SELECT_SHA1		0x20
++#define HASH_ALG_SELECT_SHA224		0x40
++#define HASH_ALG_SELECT_SHA256		0x50
++
++#define HAC_ENABLE			0x80
++#define HAC_DIGEST_CAL_ENABLE		0x180
++#define HASH_INT_ENABLE			0x200
++
++/* AES */
++#ifndef uint8
++#define uint8  unsigned char
++#endif
++
++#ifndef uint32
++#define uint32 unsigned long int
++#endif
++
++typedef struct
++{
++    uint32 erk[64];     /* encryption round keys */
++    uint32 drk[64];     /* decryption round keys */
++    int nr;             /* number of rounds */
++}
++aes_context;
++
++typedef struct
++{
++    int	  aes_mode;
++    int	  key_length;
++	
++    uint8 key[32];	/* as iv in CTR mode */
++    uint8 plaintext[64];
++    uint8 ciphertext[64];
++    
++}
++aes_test;
++
++/* RC4 */
++typedef struct
++{
++    uint8 key[32];
++    uint8 data[64];
++}
++rc4_test;
++
++/* Hash */
++typedef struct
++{
++    int	  hash_mode;
++    int	  digest_length;
++	
++    uint8 input[64];
++    uint8 digest[64];
++    
++}
++hash_test;
++	
++/* HMAC */
++typedef struct
++{
++    int	  hash_mode;
++    int	  key_length;
++    int	  digest_length;
++
++    uint8 key[100];	
++    uint8 input[64];
++    uint8 digest[64];
++    
++}
++hmac_test;
+diff --git a/board/aspeed/ast2300/mactest.c b/board/aspeed/ast2300/mactest.c
+new file mode 100755
+index 0000000..5566b65
+--- /dev/null
++++ b/board/aspeed/ast2300/mactest.c
+@@ -0,0 +1,504 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++/*
++ * (C) Copyright 2007 ASPEED Software
++ * MAC Manufacture Test in ASPEED's SDK version 0.20.01
++ *
++ * Release History
++ * 1. First Release, river@20071130
++ * 2. Fix the endless loop when PHY is not ready, river@20071204
++ *
++ * Test items:
++ * 1. Support MARVELL PHY only in this version
++ * 2. MDC/MDIO
++ * 3. GMAC/Duplex TX/RX Full_Size, Packet_Length Test
++ * 4. 100M/Duplex TX/RX Full_Size, Packet_Length Test
++ *
++ *
++ *
++*/
++
++
++/*
++* Diagnostics support
++*/
++#include <common.h>
++#include <command.h>
++#include <post.h>
++#include <malloc.h>
++#include <net.h>
++#include "slt.h"
++
++#if ((CFG_CMD_SLT & CFG_CMD_MACTEST) && defined(CONFIG_SLT))
++#include "mactest.h"
++
++static int INL(u_long base, u_long addr)
++{
++	return le32_to_cpu(*(volatile u_long *)(addr + base));
++}
++
++static void OUTL(u_long base, int command, u_long addr)
++{
++	*(volatile u_long *)(addr + base) = cpu_to_le32(command);
++}
++
++
++static void SCU_MAC1_Enable (void)
++{
++	unsigned int SCU_Register;
++
++//MAC1 RESET/PHY_LINK in SCU
++        SCU_Register = INL(SCU_BASE, SCU_RESET_CONTROL_REG);
++	OUTL(SCU_BASE, SCU_Register & ~(0x800), SCU_RESET_CONTROL_REG);
++	
++}
++
++/*------------------------------------------------------------
++ . Reads a register from the MII Management serial interface
++ .-------------------------------------------------------------*/
++static u16 phy_read_register (u8 PHY_Register, u8 PHY_Address)
++{
++	u32 Data, Status = 0, Loop_Count = 0, PHY_Ready = 1;
++	u16 Return_Data;
++
++	OUTL(MAC1_IO_BASE, (PHY_Register << 21) + (PHY_Address << 16) + MIIRD + MDC_CYCTHR, PHYCR_REG);
++	do {
++		Status = (INL (MAC1_IO_BASE, PHYCR_REG) & MIIRD);
++		Loop_Count++;
++		if (Loop_Count >= PHY_LOOP) {
++			PHY_Ready = 0;
++			break;
++		}
++	} while (Status == MIIRD);
++       
++	if (PHY_Ready == 0) {
++		printf ("PHY NOT REDAY\n");
++		return 0;
++	}
++	
++	udelay(5*1000);
++	Data = INL (MAC1_IO_BASE, PHYDATA_REG);
++	Return_Data = (Data >> 16);
++
++	return Return_Data;
++}
++
++static void phy_write_register (u8 PHY_Register, u8 PHY_Address, u16 PHY_Data)
++{
++	u32 Status = 0, Loop_Count = 0, PHY_Ready = 1;
++
++	OUTL(MAC1_IO_BASE, PHY_Data, PHYDATA_REG);
++	OUTL(MAC1_IO_BASE, (PHY_Register << 21) + (PHY_Address << 16) + MIIWR + MDC_CYCTHR, PHYCR_REG);
++	do {
++		Status = (INL (MAC1_IO_BASE, PHYCR_REG) & MIIWR);
++		Loop_Count++;
++		if (Loop_Count >= PHY_LOOP) {
++			PHY_Ready = 0;
++			break;
++		}
++	} while (Status == MIIWR);
++	if (PHY_Ready == 0) {
++		printf ("PHY NOT REDAY\n");
++	}
++}
++
++static int wait_link_resolve (void)
++{
++	int resolved_status, Loop_Count = 0, PHY_Ready = 1;
++
++        do {
++       		resolved_status = (phy_read_register (0x11, 0) & (PHY_RESOLVED_bit | PHY_LINK_bit));
++               	Loop_Count++;
++               	if (Loop_Count >= PHY_LOOP) {
++                   	PHY_Ready = 0;
++                    	printf ("PHY NOT READY\n");
++                    	break;
++                }
++        } while (resolved_status != (PHY_RESOLVED_bit | PHY_LINK_bit));
++        
++        return PHY_Ready;
++}
++
++static void set_phy_speed (int chip, int speed, int duplex)
++{
++	unsigned short data, status;
++
++
++	if (chip == PHYID_VENDOR_MARVELL) {
++		if ((speed == PHY_SPEED_1G) && (duplex == DUPLEX_FULL)) {
++//Manual Control
++			phy_write_register (18, 0, 0);
++			data = phy_read_register (9, 0);
++			phy_write_register (9, 0, data | 0x1800);
++//PHY Reset
++			phy_write_register (0, 0, 0x0140 | 0x8000);
++			do {
++				status = (phy_read_register (0, 0) & 0x8000); 
++			} while (status != 0);
++	
++//Force 1G
++			phy_write_register (29, 0, 0x07);
++			data = phy_read_register (30, 0);
++			phy_write_register (30, 0, data | 0x08);
++			phy_write_register (29, 0, 0x10);
++			data = phy_read_register (30, 0);
++			phy_write_register (30, 0, data | 0x02);
++			phy_write_register (29, 0, 0x12);
++			data = phy_read_register (30, 0);
++			phy_write_register (30, 0, data | 0x01);
++	
++			printf ("FORCE MARVELL PHY to 1G/DUPLEX DONE\n");
++		}
++		else if ((speed == PHY_SPEED_100M) && (duplex == DUPLEX_FULL)) {
++//PHY Reset
++			phy_write_register (0, 0, 0x2100 | 0x8000);
++			do {
++				status = (phy_read_register (0, 0) & 0x8000); 
++			} while (status != 0);
++	
++//Force 100M
++			data = phy_read_register (0, 0);
++			phy_write_register (0, 0, data | 0x4000 | 0x8000);
++			do {
++				status = (phy_read_register (0, 0) & 0x8000); 
++			} while (status != 0);
++			data = phy_read_register (0, 0);
++
++			printf ("FORCE MARVELL PHY to 100M/DUPLEX DONE\n");
++		}
++	}
++	else if ( (chip == PHYID_VENDOR_RTL8201E) || (chip == PHYID_VENDOR_BROADCOM) ){
++		/* basic setting */
++		data  = phy_read_register (0, 0);
++		data &= 0x7140;
++		data |= 0x4000;
++		if (speed == PHY_SPEED_100M)
++		    data |= 0x2000;
++                if (duplex == DUPLEX_FULL)		    
++                    data |= 0x0100;
++		phy_write_register (0, 0, data);
++
++                /* reset */
++		phy_write_register (0, 0, data | 0x8000);
++		do {
++			status = (phy_read_register (0, 0) & 0x8000); 
++		} while (status != 0);
++	        udelay(100*1000);
++		
++		/* basic setting */
++		phy_write_register (0, 0, data);
++
++                if (chip == PHYID_VENDOR_RTL8201E)
++		    printf ("FORCE RTL8201E PHY to 100M/DUPLEX DONE\n");		
++                else if (chip == PHYID_VENDOR_BROADCOM)
++		    printf ("FORCE Broadcom PHY to 100M/DUPLEX DONE\n");		
++		    
++	}	
++	
++}
++
++static void MAC1_reset (void)
++{
++    OUTL(MAC1_IO_BASE, SW_RST_bit, MACCR_REG);
++    for (; (INL(MAC1_IO_BASE, MACCR_REG ) & SW_RST_bit) != 0; ) {udelay(1000);}
++    OUTL(MAC1_IO_BASE, 0, IER_REG );
++}
++
++static int set_mac1_control_register (int Chip_ID)
++{
++	unsigned long	MAC_CR_Register = 0;
++	int    PHY_Ready = 1;
++	u16    PHY_Status, PHY_Speed, PHY_Duplex, Advertise, Link_Partner;
++
++	MAC_CR_Register = SPEED_100M_MODE_bit | RX_ALLADR_bit | FULLDUP_bit | RXMAC_EN_bit | RXDMA_EN_bit | TXMAC_EN_bit | TXDMA_EN_bit | CRC_APD_bit;
++
++	if ( (Chip_ID == PHYID_VENDOR_BROADCOM) || (Chip_ID == PHYID_VENDOR_RTL8201E)) {
++		Advertise = phy_read_register (0x04, 0);
++		Link_Partner = phy_read_register (0x05, 0);
++		Advertise = (Advertise & PHY_SPEED_DUPLEX_MASK);
++		Link_Partner = (Link_Partner & PHY_SPEED_DUPLEX_MASK);
++		if ((Advertise & Link_Partner) & PHY_100M_DUPLEX) {
++			MAC_CR_Register |= SPEED_100M_MODE_bit;
++			MAC_CR_Register |= FULLDUP_bit;
++		}
++		else if ((Advertise & Link_Partner) & PHY_100M_HALF) {
++			MAC_CR_Register |= SPEED_100M_MODE_bit;
++			MAC_CR_Register &= ~FULLDUP_bit;
++		}
++		else if ((Advertise & Link_Partner) & PHY_10M_DUPLEX) {
++			MAC_CR_Register &= ~SPEED_100M_MODE_bit;
++			MAC_CR_Register |= FULLDUP_bit;
++		}
++		else if ((Advertise & Link_Partner) & PHY_10M_HALF) {
++			MAC_CR_Register &= ~SPEED_100M_MODE_bit;
++			MAC_CR_Register &= ~FULLDUP_bit;
++		}
++	}
++	else if (Chip_ID == PHYID_VENDOR_MARVELL) {
++
++		PHY_Ready = wait_link_resolve ();
++
++		if (PHY_Ready == 1) {
++			PHY_Status = phy_read_register (0x11, 0);
++			PHY_Speed = (PHY_Status & PHY_SPEED_MASK) >> 14;
++			PHY_Duplex = (PHY_Status & PHY_DUPLEX_MASK) >> 13;
++
++			if (PHY_Speed == SPEED_1000M) {
++				MAC_CR_Register |= GMAC_MODE_bit;
++                	}
++			else {
++				MAC_CR_Register &= ~GMAC_MODE_bit;
++				if (PHY_Speed == SPEED_10M) {
++                        		MAC_CR_Register &= ~SPEED_100M_MODE_bit;
++                    		}
++                	}
++                	if (PHY_Duplex == DUPLEX_HALF) {
++				MAC_CR_Register &= ~FULLDUP_bit;
++			}
++		}
++	}
++	OUTL(MAC1_IO_BASE, MAC_CR_Register, MACCR_REG);
++
++	return PHY_Ready;
++}
++
++static void ring_buffer_alloc (void)
++{
++	unsigned int i, j;
++
++//Write data into TX buffer
++	for (i = 0; i < NUM_TX; i++) {
++		for (j = 0; j < TX_BUFF_SZ; j++) {
++			tx_buffer[i][j] = i * 4 + j;
++		}
++	}
++//Initialize RX buffer to 0
++	for (i = 0; i < NUM_RX; i++) {
++		for (j = 0; j < RX_BUFF_SZ; j++) {
++			rx_buffer[i][j] = 0;
++		}
++	}
++//Prepare descriptor
++	for (i = 0; i < NUM_RX; i++) {
++		rx_ring[i].status = cpu_to_le32(RXPKT_RDY + RX_BUFF_SZ);
++		rx_ring[i].buf = ((u32) &rx_buffer[i]);
++		rx_ring[i].reserved = 0;
++	}
++	for (i = 0; i < NUM_TX; i++) {
++		tx_ring[i].status = 0;
++		tx_ring[i].des1 = 0;
++		tx_ring[i].buf = ((u32) &tx_buffer[i]);
++		tx_ring[i].reserved = 0;
++	}
++
++	rx_ring[NUM_RX - 1].status |= cpu_to_le32(EDORR);
++	tx_ring[NUM_TX - 1].status |= cpu_to_le32(EDOTR);
++
++	OUTL(MAC1_IO_BASE, ((u32) &tx_ring), TXR_BADR_REG);
++	OUTL(MAC1_IO_BASE, ((u32) &rx_ring), RXR_BADR_REG);
++	
++	tx_new = 0;
++	rx_new = 0;
++}
++
++static int packet_test (void)
++{
++	unsigned int rx_status, length, i, Loop_Count = 0;
++
++	tx_ring[tx_new].status |= cpu_to_le32(LTS | FTS | TX_BUFF_SZ);
++	tx_ring[tx_new].status |= cpu_to_le32(TXDMA_OWN);
++	OUTL(MAC1_IO_BASE, POLL_DEMAND, TXPD_REG);
++
++//Compare result
++	do {
++		rx_status = rx_ring[rx_new].status;
++		Loop_Count++;
++	} while (!(rx_status & RXPKT_STATUS) && (Loop_Count < PHY_LOOP));
++	if (rx_status & (RX_ERR | CRC_ERR | FTL | RUNT | RX_ODD_NB)) {
++		/* There was an error.*/
++		printf("RX error status = 0x%08X\n", rx_status);
++		return PACKET_TEST_FAIL;
++	} else {
++		length = (rx_status & BYTE_COUNT_MASK);
++		for (i = 0; i < RX_BUFF_SZ / 4; i++) {
++			if (rx_buffer[rx_new][i] != tx_buffer[tx_new][i]) {
++				printf ("ERROR at packet %d, address %x\n", rx_new, i);
++				printf ("Gold = %8x, Real = %8x\n", tx_buffer[tx_new][i], rx_buffer[rx_new][i]);
++				return PACKET_TEST_FAIL;
++			}
++		}
++	}
++    	tx_new = (tx_new + 1) % NUM_TX;
++	rx_new = (rx_new + 1) % NUM_RX;
++
++	return TEST_PASS;
++}
++
++static int packet_length_test (int packet_length)
++{
++	unsigned int rx_status, length, i, Loop_Count = 0;
++
++	tx_ring[tx_new].status &= (~(BYTE_COUNT_MASK));
++	tx_ring[tx_new].status |= cpu_to_le32(LTS | FTS | packet_length);
++	tx_ring[tx_new].status |= cpu_to_le32(TXDMA_OWN);
++	OUTL(MAC1_IO_BASE, POLL_DEMAND, TXPD_REG);
++
++//Compare result
++	do {
++		rx_status = rx_ring[rx_new].status;
++		Loop_Count++;
++	} while (!(rx_status & RXPKT_STATUS) && (Loop_Count < PHY_LOOP));
++	if (rx_status & (RX_ERR | CRC_ERR | FTL | RUNT | RX_ODD_NB)) {
++		/* There was an error.*/
++		printf("RX error status = 0x%08X\n", rx_status);
++		return PACKET_LENGTH_TEST_FAIL;
++	} else {
++		length = (rx_status & BYTE_COUNT_MASK) - 4;
++                if (length != packet_length) {
++			printf ("Received Length ERROR. Gold = %d, Fail = %d\n",packet_length, length);
++			printf ("rx_new = %d, tx_new = %d\n", rx_new, tx_new);
++			return PACKET_LENGTH_TEST_FAIL;
++                }
++		for (i = 0; i < length; i++) {
++		    if (rx_buffer[rx_new][i] != tx_buffer[tx_new][i]) {
++		    	printf ("ERROR at packet %d, address %x\n", rx_new, i);
++		    	printf ("Gold = %8x, Real = %8x\n", tx_buffer[tx_new][i], rx_buffer[rx_new][i]);
++		    	return PACKET_LENGTH_TEST_FAIL;
++		    }
++		}
++	}
++	rx_ring[rx_new].status &= (~(RXPKT_STATUS));
++    	tx_new = (tx_new + 1) % NUM_TX;
++	rx_new = (rx_new + 1) % NUM_RX;
++
++	return TEST_PASS;
++}
++
++static int MAC1_init (int id)
++{
++	int phy_status = 0;
++
++	MAC1_reset ();
++	phy_status = set_mac1_control_register (id);
++       	ring_buffer_alloc ();
++       	
++       	return phy_status;
++}
++
++int do_mactest (void)
++{
++	unsigned int phy_id, i;
++	int test_result = 0, phy_status = 0;
++
++	SCU_MAC1_Enable();
++	phy_id = ((phy_read_register (0x02, 0) << 16) + phy_read_register (0x03, 0)) & PHYID_VENDOR_MASK;
++	if (phy_id == PHYID_VENDOR_MARVELL) {
++        	printf ("PHY DETECTED ------> MARVELL\n");
++
++        	set_phy_speed (phy_id, PHY_SPEED_1G, DUPLEX_FULL);
++        	if ((phy_status = MAC1_init (phy_id)) != 0) {
++	        	for (i = 0; i < NUM_TX; i++) {
++				test_result |= packet_test ();
++				if (test_result != 0)
++					break;
++        		}
++        	}
++		else if (phy_status == 0) {
++			printf ("PHY FAIL: Please Check If you are using LOOP BACK Connector\n");
++			test_result = 3;
++			return	test_result;
++		}
++        	if ((phy_status = MAC1_init (phy_id)) != 0) {
++        		for (i = 60; i < TX_BUFF_SZ; i++) {
++				test_result |= packet_length_test (i);
++				if (test_result != 0)
++					break;
++        		}
++        	}
++		else if (phy_status == 0) {
++			printf ("PHY FAIL: Please Check If you are using LOOP BACK Connector\n");
++			test_result = 3;
++			return	test_result;
++		}
++        	set_phy_speed (phy_id, PHY_SPEED_100M, DUPLEX_FULL);
++        	if ((phy_status = MAC1_init (phy_id)) != 0) {
++        		for (i = 0; i < NUM_TX; i++) {
++				test_result |= packet_test ();
++				if (test_result != 0)
++					break;
++        		}
++        	}
++		else if (phy_status == 0) {
++			printf ("PHY FAIL: Please Check If you are using LOOP BACK Connector\n");
++			test_result = 3;
++			return	test_result;
++		}
++
++        	if ((phy_status = MAC1_init (phy_id)) != 0) {
++        		for (i = 60; i < TX_BUFF_SZ; i++) {
++				test_result |= packet_length_test (i);
++        			if (test_result != 0)
++	        	    		break;
++        		}
++        	}
++		else if (phy_status == 0) {
++			printf ("PHY FAIL: Please Check If you are using LOOP BACK Connector\n");
++			test_result = 3;
++			return	test_result;
++		}
++        }
++	else if ( (phy_id == PHYID_VENDOR_RTL8201E) || (phy_id == PHYID_VENDOR_BROADCOM) ){
++		
++        	if (phy_id == PHYID_VENDOR_RTL8201E)
++        	    printf ("PHY DETECTED ------> RTL 8201E \n");
++        	else if (phy_id == PHYID_VENDOR_BROADCOM)
++        	    printf ("PHY DETECTED ------> Broadcom \n");
++        	
++        	set_phy_speed (phy_id, PHY_SPEED_100M, DUPLEX_FULL);
++        	if ((phy_status = MAC1_init (phy_id)) != 0) {
++        		for (i = 0; i < NUM_TX; i++) {
++				test_result |= packet_test ();
++				if (test_result != 0)
++					break;
++        		}
++        	}
++		else if (phy_status == 0) {
++			printf ("PHY FAIL: Please Check If you are using LOOP BACK Connector\n");
++			test_result = 3;
++			return	test_result;
++		}
++
++        	if ((phy_status = MAC1_init (phy_id)) != 0) {
++        		for (i = 60; i < TX_BUFF_SZ; i++) {
++				test_result |= packet_length_test (i);
++        			if (test_result != 0)
++	        	    		break;
++        		}
++        	}
++		else if (phy_status == 0) {
++			printf ("PHY FAIL: Please Check If you are using LOOP BACK Connector\n");
++			test_result = 3;
++			return	test_result;
++		}        	
++        }	
++          
++	if ((phy_status == 0) && (test_result & PACKET_TEST_FAIL)) {
++		printf ("Packet Test FAIL !\n");
++	}
++	else if ((phy_status == 0) && (test_result & PACKET_LENGTH_TEST_FAIL)) {
++		printf ("Packet Length Test FAIL !\n");
++	}
++
++	return test_result;
++	
++}
++
++#endif /* CONFIG_SLT */
+diff --git a/board/aspeed/ast2300/mactest.h b/board/aspeed/ast2300/mactest.h
+new file mode 100755
+index 0000000..e75b7bb
+--- /dev/null
++++ b/board/aspeed/ast2300/mactest.h
+@@ -0,0 +1,215 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++/* MACTest.h */
++
++// --------------------------------------------------------------------
++//              General Definition
++// --------------------------------------------------------------------
++#define MAC1_IO_BASE		0x1E660000
++#define PHY_LOOP		100000
++#define NUM_RX			48
++#define NUM_TX			48
++#define RX_BUFF_SZ		1514
++#define TX_BUFF_SZ		1514
++#define TOUT_LOOP		1000000
++#define ETH_ALEN		6
++#define POLL_DEMAND		1
++
++
++// --------------------------------------------------------------------
++//              MAC Register Index
++// --------------------------------------------------------------------
++#define ISR_REG			0x00				// interrups status register
++#define IER_REG			0x04				// interrupt maks register
++#define MAC_MADR_REG		0x08				// MAC address (Most significant)
++#define MAC_LADR_REG		0x0c				// MAC address (Least significant)
++#define MAHT0_REG		0x10				// Multicast Address Hash Table 0 register
++#define MAHT1_REG		0x14				// Multicast Address Hash Table 1 register
++#define TXPD_REG		0x18				// Transmit Poll Demand register
++#define RXPD_REG		0x1c				// Receive Poll Demand register
++#define TXR_BADR_REG		0x20				// Transmit Ring Base Address register
++#define RXR_BADR_REG		0x24				// Receive Ring Base Address register
++#define HPTXPD_REG		0x28
++#define HPTXR_BADR_REG		0x2c
++#define ITC_REG			0x30				// interrupt timer control register
++#define APTC_REG		0x34				// Automatic Polling Timer control register
++#define DBLAC_REG		0x38				// DMA Burst Length and Arbitration control register
++#define DMAFIFOS_REG		0x3c
++#define FEAR_REG		0x44
++#define TPAFCR_REG		0x48
++#define RBSR_REG		0x4c
++#define MACCR_REG		0x50				// MAC control register
++#define MACSR_REG		0x54				// MAC status register
++#define PHYCR_REG		0x60				// PHY control register
++#define PHYDATA_REG		0x64				// PHY Write Data register
++
++// --------------------------------------------------------------------
++//		PHYCR_REG
++// --------------------------------------------------------------------
++#define PHY_RE_AUTO_bit			(1UL<<9)
++#define PHY_READ_bit			(1UL<<26)
++#define PHY_WRITE_bit			(1UL<<27)
++// --------------------------------------------------------------------
++//		PHYCR_REG 
++// --------------------------------------------------------------------
++#define PHY_AUTO_OK_bit			(1UL<<5)
++// --------------------------------------------------------------------
++//		PHY INT_STAT_REG 
++// --------------------------------------------------------------------
++#define PHY_SPEED_CHG_bit		(1UL<<14)
++#define PHY_DUPLEX_CHG_bit		(1UL<<13)
++#define PHY_LINK_CHG_bit		(1UL<<10)
++#define PHY_AUTO_COMP_bit		(1UL<<11)
++// --------------------------------------------------------------------
++//		PHY SPE_STAT_REG 
++// --------------------------------------------------------------------
++#define PHY_RESOLVED_bit		(1UL<<11)
++#define PHY_LINK_bit			(1UL<<10)
++#define PHY_SPEED_mask			0xC000
++#define PHY_SPEED_10M			0x0
++#define PHY_SPEED_100M			0x1
++#define PHY_SPEED_1G			0x2
++#define PHY_DUPLEX_mask                 0x2000
++#define PHY_SPEED_DUPLEX_MASK           0x01E0
++#define PHY_100M_DUPLEX                 0x0100
++#define PHY_100M_HALF                   0x0080
++#define PHY_10M_DUPLEX                  0x0040
++#define PHY_10M_HALF                    0x0020
++#define LINK_STATUS                     0x04
++#define PHYID_VENDOR_MASK		0xfffffc00
++#define PHYID_VENDOR_MARVELL		0x01410c00
++#define PHYID_VENDOR_BROADCOM		0x00406000
++#define PHYID_VENDOR_RTL8201E		0x001cc800
++#define DUPLEX_FULL			0x01
++#define DUPLEX_HALF			0x00
++
++
++
++// --------------------------------------------------------------------
++//		MACCR_REG
++// --------------------------------------------------------------------
++
++#define SW_RST_bit		(1UL<<31)				// software reset/
++#define DIRPATH_bit		(1UL<<21)
++#define RX_IPCS_FAIL_bit	(1UL<<20)
++#define SPEED_100M_MODE_bit		(1UL<<19)
++#define RX_UDPCS_FAIL_bit	(1UL<<18)
++#define RX_BROADPKT_bit		(1UL<<17)				// Receiving broadcast packet
++#define RX_MULTIPKT_bit		(1UL<<16)				// receiving multicast packet
++#define RX_HT_EN_bit		(1UL<<15)
++#define RX_ALLADR_bit		(1UL<<14)				// not check incoming packet's destination address
++#define JUMBO_LF_bit		(1UL<<13)
++#define RX_RUNT_bit		(1UL<<12)				// Store incoming packet even its length is les than 64 byte
++#define CRC_CHK_bit		(1UL<<11)
++#define CRC_APD_bit		(1UL<<10)				// append crc to transmit packet
++#define GMAC_MODE_bit		(1UL<<9)
++#define FULLDUP_bit		(1UL<<8)				// full duplex
++#define ENRX_IN_HALFTX_bit	(1UL<<7)
++#define LOOP_EN_bit		(1UL<<6)				// Internal loop-back
++#define HPTXR_EN_bit		(1UL<<5)
++#define REMOVE_VLAN_bit		(1UL<<4)
++#define RXMAC_EN_bit		(1UL<<3)				// receiver enable
++#define TXMAC_EN_bit		(1UL<<2)				// transmitter enable
++#define RXDMA_EN_bit		(1UL<<1)				// enable DMA receiving channel
++#define TXDMA_EN_bit		(1UL<<0)				// enable DMA transmitting channel
++
++
++// --------------------------------------------------------------------
++//		SCU_REG
++// --------------------------------------------------------------------
++#define  SCU_BASE			0x1E6E2000
++#define  SCU_PROTECT_KEY_REG            0x0
++#define  SCU_PROT_KEY_MAGIC             0x1688a8a8
++#define  SCU_RESET_CONTROL_REG          0x04
++#define  SCU_RESET_MAC1                 (1u << 11)
++#define  SCU_RESET_MAC2                 (1u << 12)
++#define  SCU_HARDWARE_TRAPPING_REG      0x70
++#define  SCU_HT_MAC_INTF_LSBIT          6
++#define  SCU_HT_MAC_INTERFACE           (0x7u << SCU_HT_MAC_INTF_LSBIT)
++#define  MAC_INTF_SINGLE_PORT_MODES     (1u<<0/*GMII*/ | 1u<<3/*MII_ONLY*/ | 1u<<4/*RMII_ONLY*/)
++#define  SCU_HT_MAC_GMII                0x0u
++// MII and MII mode
++#define  SCU_HT_MAC_MII_MII             0x1u
++#define  SCU_HT_MAC_MII_ONLY            0x3u
++#define  SCU_HT_MAC_RMII_ONLY           0x4u
++#define  SCU_MULTIFUNCTION_PIN_REG      0x74
++#define  SCU_MFP_MAC2_PHYLINK           (1u << 26)
++#define  SCU_MFP_MAC1_PHYLINK           (1u << 25)
++#define  SCU_MFP_MAC2_MII_INTF          (1u << 21)
++#define  SCU_MFP_MAC2_MDC_MDIO          (1u << 20)
++#define  SCU_SILICON_REVISION_REG       0x7C
++
++//---------------------------------------------------
++//  PHY R/W Register Bit
++//---------------------------------------------------
++#define MIIWR                   (1UL<<27)
++#define MIIRD                   (1UL<<26)
++#define MDC_CYCTHR              0x34
++#define PHY_SPEED_MASK          0xC000
++#define PHY_DUPLEX_MASK         0x2000
++#define SPEED_1000M             0x02
++#define SPEED_100M              0x01
++#define SPEED_10M               0x00
++#define DUPLEX_FULL             0x01
++#define DUPLEX_HALF             0x00
++#define RESOLVED_BIT            0x800
++
++#define PHY_SPEED_DUPLEX_MASK   0x01E0
++#define PHY_100M_DUPLEX         0x0100
++#define PHY_100M_HALF           0x0080
++#define PHY_10M_DUPLEX          0x0040
++#define PHY_10M_HALF            0x0020
++
++//---------------------------------------------------
++// Descriptor bits.
++//---------------------------------------------------
++#define TXDMA_OWN	0x80000000	/* Own Bit */
++#define RXPKT_RDY       0x00000000      
++#define RXPKT_STATUS    0x80000000
++#define EDORR		0x40000000	/* Receive End Of Ring */
++#define LRS		0x10000000	/* Last Descriptor */
++#define RD_ES		0x00008000	/* Error Summary */
++#define EDOTR		0x40000000	/* Transmit End Of Ring */
++#define T_OWN		0x80000000	/* Own Bit */
++#define LTS		0x10000000	/* Last Segment */
++#define FTS		0x20000000	/* First Segment */
++#define CRC_ERR         0x00080000
++#define TD_ES		0x00008000	/* Error Summary */
++#define TD_SET		0x08000000	/* Setup Packet */
++#define RX_ERR          0x00040000
++#define FTL             0x00100000
++#define RUNT            0x00200000
++#define RX_ODD_NB       0x00400000
++#define BYTE_COUNT_MASK 0x00003FFF
++
++//---------------------------------------------------
++// SPEED/DUPLEX Parameters
++//---------------------------------------------------
++
++//---------------------------------------------------
++// Return Status
++//---------------------------------------------------
++#define TEST_PASS			0
++#define PACKET_TEST_FAIL		1
++#define PACKET_LENGTH_TEST_FAIL		2
++
++struct  mac_desc {
++	volatile s32 status;
++	u32 des1;
++	u32 reserved;
++	u32 buf;	
++};
++static struct mac_desc rx_ring[NUM_RX] __attribute__ ((aligned(32))); /* RX descriptor ring         */
++static struct mac_desc tx_ring[NUM_TX] __attribute__ ((aligned(32))); /* TX descriptor ring         */
++static int rx_new;                             /* RX descriptor ring pointer */
++static int tx_new;                             /* TX descriptor ring pointer */
++static volatile unsigned char rx_buffer[NUM_RX][RX_BUFF_SZ] __attribute__ ((aligned(32))); /* RX buffer         */
++static volatile unsigned char tx_buffer[NUM_TX][TX_BUFF_SZ] __attribute__ ((aligned(32))); /* TX buffer         */
+diff --git a/board/aspeed/ast2300/mictest.c b/board/aspeed/ast2300/mictest.c
+new file mode 100755
+index 0000000..1b2b342
+--- /dev/null
++++ b/board/aspeed/ast2300/mictest.c
+@@ -0,0 +1,146 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++/*
++ * Diagnostics support
++ */
++#include <common.h>
++#include <command.h>
++#include <post.h>
++#include "slt.h"
++
++#if ((CFG_CMD_SLT & CFG_CMD_MICTEST) && defined(CONFIG_SLT))
++#include "mictest.h"
++
++static unsigned char ctrlbuf[MIC_MAX_CTRL];
++static unsigned char chksumbuf[MIC_MAX_CHKSUM];
++
++void vInitSCU(void)
++{
++    unsigned long ulData;
++
++    *(unsigned long *) (0x1e6e2000) = 0x1688A8A8;
++
++    udelay(100);
++
++    ulData = *(unsigned long *) (0x1e6e2004);
++    ulData &= 0xbffff;
++    *(unsigned long *) (0x1e6e2004) = ulData;
++         	
++}
++
++void vInitMIC(void)
++{
++    unsigned long i, j, ulPageNumber;
++    unsigned char *pjctrl, *pjsum;
++    
++    ulPageNumber = DRAMSIZE >> 12;	
++
++    pjctrl = (unsigned char *)(m16byteAlignment((unsigned long) ctrlbuf));
++    pjsum = (unsigned char *)(m16byteAlignment((unsigned long) chksumbuf));
++    
++    /* init ctrl buffer (2bits for one page) */
++    for (i=0; i< (ulPageNumber/4); i++)
++        *(unsigned char *) (pjctrl + i) = DEFAULT_CTRL;
++      
++    /* init chksum buf (4bytes for one page) */
++    for (i=0; i<ulPageNumber; i++)
++        *(unsigned long *) (pjsum + i*4) = DEFAULT_CHKSUM;
++    
++    *(unsigned long *) (MIC_BASE + MIC_CTRLBUFF_REG)   = (unsigned long) pjctrl;
++    *(unsigned long *) (MIC_BASE + MIC_CHKSUMBUF_REG)  = (unsigned long) pjsum;
++    *(unsigned long *) (MIC_BASE + MIC_RATECTRL_REG)   = (unsigned long) DEFAULT_RATE;
++    *(unsigned long *) (MIC_BASE + MIC_ENGINECTRL_REG) = MIC_ENABLE_MIC | (DRAMSIZE - 0x1000);
++	
++}
++
++void vDisableMIC(void)
++{
++    *(unsigned long *) (MIC_BASE + MIC_ENGINECTRL_REG)   = MIC_RESET_MIC;
++	
++}
++
++int do_chksum(void)
++{
++    unsigned long i, j, k, ulPageNumber;
++    int Status = 0;
++    unsigned short tmp;
++    volatile unsigned long sum1, sum2;
++    unsigned long goldensum, chksum;
++    unsigned long len, tlen;
++    unsigned char *pjsum;
++
++    ulPageNumber = DRAMSIZE >> 12;	
++    pjsum = (unsigned char *)(m16byteAlignment((unsigned long) chksumbuf));
++
++    /* start test */    
++    for (i=0; i<ulPageNumber; i++)
++    {
++    	
++    	sum1 = 0xffff, sum2 = 0xffff;
++    	len = 0x0800;
++    	j = 0;
++    	
++    	while (len)
++    	{
++    	    tlen = len > 360 ? 360 : len;
++    	    len -= tlen;
++    	    do {
++    	       tmp = *(unsigned short *) (DRAM_BASE + ((i << 12) + j));	
++               sum1 += (unsigned long) tmp;   	    	
++    	       sum2 += sum1;
++    	       j+=2;
++    	    } while (--tlen);
++    	    sum1 = (sum1 & 0xffff) + (sum1 >> 16);
++    	    sum2 = (sum2 & 0xffff) + (sum2 >> 16);   	        	
++    	}
++    	
++    	sum1 = (sum1 & 0xffff) + (sum1 >> 16);
++    	sum2 = (sum2 & 0xffff) + (sum2 >> 16);
++    	
++    	goldensum = (sum2 << 16) | sum1;
++        k= 0;
++        do {
++            chksum = *(unsigned long *) (pjsum + i*4);
++            udelay(100);
++            k++;
++    	} while ((chksum == 0) && (k<1000));
++    	
++    	if (chksum != goldensum)
++    	{
++    	        Status = 1;	
++                printf("[FAIL] MIC Chksum Failed at Page %x \n", i);
++    	}
++
++    } /* end of i loop */
++		
++    return (Status);
++    	
++}
++
++int do_mictest (void)
++{
++        unsigned long Flags = 0;
++
++        vInitSCU();
++        vInitMIC();
++        
++        if (do_chksum())
++            Flags = 1;
++            
++        vDisableMIC();
++        
++	return Flags;
++	
++}
++
++#endif /* CONFIG_SLT */
+diff --git a/board/aspeed/ast2300/mictest.h b/board/aspeed/ast2300/mictest.h
+new file mode 100755
+index 0000000..e14bb41
+--- /dev/null
++++ b/board/aspeed/ast2300/mictest.h
+@@ -0,0 +1,55 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++/* Macro */
++#define m08byteAlignment(x)		((x + 0x00000007) & 0xFFFFFFF8)
++#define m16byteAlignment(x)		((x + 0x0000000F) & 0xFFFFFFF0)
++#define m64byteAlignment(x)		((x + 0x0000003F) & 0xFFFFFFC0)
++
++/* Options */
++#define MIC_TEST_PAGE		32
++#define DRAMSIZE		(MIC_TEST_PAGE * 0x1000)
++#define MIC_MAX_CTRL		(MIC_TEST_PAGE / 4 + 16)
++#define MIC_MAX_CHKSUM		(MIC_TEST_PAGE * 4 + 16)
++
++/* Default Setting */
++#define DEFAULT_RATE		0x00000000
++#define DEFAULT_CTRL		0xFF
++#define DEFAULT_CHKSUM		0x00000000
++#define DEFAULT_WRITEBACK	0x08880000
++
++/* Reg. Definition */
++#define DRAM_BASE		0x40000000
++#define MIC_BASE		0x1e640000
++#define MIC_CTRLBUFF_REG	0x00
++#define MIC_CHKSUMBUF_REG	0x04
++#define MIC_RATECTRL_REG	0x08
++#define MIC_ENGINECTRL_REG	0x0C
++#define MIC_STOPPAGE_REG	0x10
++#define MIC_STATUS_REG		0x14
++#define MIC_STATUS1_REG		0x18
++#define MIC_STATUS2_REG		0x1C
++
++#define MIC_RESET_MIC		0x00000000
++#define MIC_ENABLE_MIC		0x10000000
++#define MIC_MAXPAGE_MASK	0x0FFFF000
++#define MIC_WRITEBACK_MASK	0xFFFF0000
++#define MIC_STOPPAGE_MASK	0x0000FFFF
++#define MIC_PAGEERROR		0x40000000
++#define MIC_PAGE1ERROR		0x10000000
++#define MIC_PAGE2ERROR		0x20000000
++#define MIC_INTMASK		0x00060000
++#define MIC_ERRPAGENO_MASK	0x0000FFFF
++
++#define MIC_CTRL_MASK		0x03
++#define MIC_CTRL_SKIP		0x00
++#define MIC_CTRL_CHK1		0x01
++#define MIC_CTRL_CHK2		0x02
++#define MIC_CTRL_CHK3		0x03
+diff --git a/board/aspeed/ast2300/pci.c b/board/aspeed/ast2300/pci.c
+new file mode 100755
+index 0000000..5b17466
+--- /dev/null
++++ b/board/aspeed/ast2300/pci.c
+@@ -0,0 +1,243 @@
++/*
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2, or (at
++ * your option) any later version.
++ */
++
++#include <common.h>
++#include <pci.h>
++
++#ifdef CONFIG_PCI
++
++#define PCI_CSR_BASE		0x60000000
++#define ASPEED_PCI_IO_BASE	0x00000000
++#define ASPEED_PCI_IO_SIZE	0x00010000
++#define ASPEED_PCI_MEM_BASE	0x68000000
++#define ASPEED_PCI_MEM_SIZE	0x18000000
++
++#define CSR_CRP_CMD_OFFSET	0x00
++#define CSR_CRP_WRITE_OFFSET    0x04
++#define CSR_CRP_READ_OFFSET	0x08
++#define CSR_PCI_ADDR_OFFSET	0x0C
++#define CSR_PCI_CMD_OFFSET	0x10
++#define CSR_PCI_WRITE_OFFSET	0x14
++#define CSR_PCI_READ_OFFSET	0x18
++#define CSR_PCI_STATUS_OFFSET	0x1C
++
++#define CRP_ADDR_REG		(volatile ulong*) (PCI_CSR_BASE + CSR_CRP_CMD_OFFSET)
++#define CRP_WRITE_REG		(volatile ulong*) (PCI_CSR_BASE + CSR_CRP_WRITE_OFFSET)
++#define CRP_READ_REG		(volatile ulong*) (PCI_CSR_BASE + CSR_CRP_READ_OFFSET)
++#define PCI_ADDR_REG		(volatile ulong*) (PCI_CSR_BASE + CSR_PCI_ADDR_OFFSET)
++#define PCI_CMD_REG		(volatile ulong*) (PCI_CSR_BASE + CSR_PCI_CMD_OFFSET)
++#define PCI_WRITE_REG		(volatile ulong*) (PCI_CSR_BASE + CSR_PCI_WRITE_OFFSET)
++#define PCI_READ_REG		(volatile ulong*) (PCI_CSR_BASE + CSR_PCI_READ_OFFSET)
++
++#define PCI_CMD_READ		0x0A
++#define PCI_CMD_WRITE		0x0B
++
++#define RESET_PCI_STATUS        *(volatile ulong*) (PCI_CSR_BASE + CSR_PCI_STATUS_OFFSET) = 0x01
++#define CHK_PCI_STATUS          (*(volatile ulong*) (PCI_CSR_BASE + CSR_PCI_STATUS_OFFSET) & 0x03)
++
++static int pci_config_access (u8 access_type, u32 dev, u32 reg, u32 * data)
++{
++	u32 bus;
++	u32 device;
++	u32 function;
++
++	bus = ((dev & 0xff0000) >> 16);
++	device = ((dev & 0xf800) >> 11);
++	function = (dev & 0x0700);
++
++	if (bus == 0) {
++		// Type 0 Configuration 		
++		*PCI_ADDR_REG = (u32) (1UL << device | function | (reg & 0xfc));
++	} else {
++		// Type 1 Configuration 
++		*PCI_ADDR_REG = (u32) (dev | ((reg / 4) << 2) | 1);
++	}
++
++        RESET_PCI_STATUS;
++        
++	if (access_type == PCI_CMD_WRITE) {
++		*PCI_CMD_REG = (ulong) PCI_CMD_WRITE;
++		*PCI_WRITE_REG = *data;
++	} else {
++		*PCI_CMD_REG = (ulong) PCI_CMD_READ;		
++		*data = *PCI_READ_REG;
++	}
++            
++	return (CHK_PCI_STATUS);
++}
++
++static int aspeed_pci_read_config_byte (u32 hose, u32 dev, u32 reg, u8 * val)
++{
++	u32 data;
++
++	if (pci_config_access (PCI_CMD_READ, dev, reg, &data)) {
++		*val = 0;
++		return -1;
++	}	
++
++	*val = (data >> ((reg & 3) << 3)) & 0xff;
++
++	return 0;
++}
++
++
++static int aspeed_pci_read_config_word (u32 hose, u32 dev, u32 reg, u16 * val)
++{
++	u32 data;
++
++	if (reg & 1)
++		return -1;
++
++	if (pci_config_access (PCI_CMD_READ, dev, reg, &data)) {
++		*val = 0;
++		return -1;
++	} 		
++
++	*val = (data >> ((reg & 3) << 3)) & 0xffff;
++
++	return 0;
++}
++
++
++static int aspeed_pci_read_config_dword (u32 hose, u32 dev, u32 reg,
++					 u32 * val)
++{
++	u32 data = 0;
++
++	if (reg & 3)
++		return -1;
++
++	if (pci_config_access (PCI_CMD_READ, dev, reg, &data))	{
++		*val = 0;
++		return -1;
++	}		
++
++	*val = data;
++
++	return (0);
++}
++
++static int aspeed_pci_write_config_byte (u32 hose, u32 dev, u32 reg, u8 val)
++{
++	u32 data = 0;
++
++	if (pci_config_access (PCI_CMD_READ, dev, reg, &data))
++		return -1;
++
++	data = (data & ~(0xff << ((reg & 3) << 3))) | (val <<
++						       ((reg & 3) << 3));
++
++	if (pci_config_access (PCI_CMD_WRITE, dev, reg, &data))
++		return -1;
++
++	return 0;
++}
++
++
++static int aspeed_pci_write_config_word (u32 hose, u32 dev, u32 reg, u16 val)
++{
++	u32 data = 0;
++
++	if (reg & 1)
++		return -1;
++
++	if (pci_config_access (PCI_CMD_READ, dev, reg, &data))
++		return -1;
++
++	data = (data & ~(0xffff << ((reg & 3) << 3))) | (val <<
++							 ((reg & 3) << 3));
++
++	if (pci_config_access (PCI_CMD_WRITE, dev, reg, &data))
++		return -1;
++
++	return 0;
++}
++
++static int aspeed_pci_write_config_dword (u32 hose, u32 dev, u32 reg, u32 val)
++{
++	u32 data;
++
++	if (reg & 3) {
++		return -1;
++	}
++
++	data = val;
++
++	if (pci_config_access (PCI_CMD_WRITE, dev, reg, &data))
++		return -1;
++
++	return (0);
++}
++
++/*
++ *	Initialize PCIU
++ */
++aspeed_pciu_init ()
++{
++
++    unsigned long reg;
++
++    /* Reset PCI Host */
++    reg = *((volatile ulong*) 0x1e6e2004);
++    *((volatile ulong*) 0x1e6e2004) = reg | 0x00280000;
++
++    reg = *((volatile ulong*) 0x1e6e2074);		/* REQ2 */    
++    *((volatile ulong*) 0x1e6e2074) = reg | 0x00000010;
++
++    *((volatile ulong*) 0x1e6e2008) |= 0x00080000;        
++    reg = *((volatile ulong*) 0x1e6e200c); 
++    *((volatile ulong*) 0x1e6e200c) = reg & 0xfff7ffff;
++    udelay(1); 
++    *((volatile ulong*) 0x1e6e2004) &= 0xfff7ffff;
++                 
++    /* Initial PCI Host */
++    RESET_PCI_STATUS;
++	
++    *CRP_ADDR_REG = ((ulong)(PCI_CMD_READ) << 16) | 0x04;
++    reg = *CRP_READ_REG;
++    
++    *CRP_ADDR_REG = ((ulong)(PCI_CMD_WRITE) << 16) | 0x04;
++    *CRP_WRITE_REG = reg | 0x07;
++   
++}
++
++/*
++ *	Initialize Module
++ */
++
++void aspeed_init_pci (struct pci_controller *hose)
++{
++	hose->first_busno = 0;
++	hose->last_busno = 0xff;
++
++	aspeed_pciu_init ();			/* Initialize PCIU */
++
++	/* PCI memory space #1 */
++	pci_set_region (hose->regions + 0,
++			ASPEED_PCI_MEM_BASE, ASPEED_PCI_MEM_BASE, ASPEED_PCI_MEM_SIZE, PCI_REGION_MEM);
++
++	/* PCI I/O space */
++	pci_set_region (hose->regions + 1,
++			ASPEED_PCI_IO_BASE, ASPEED_PCI_IO_BASE, ASPEED_PCI_IO_SIZE, PCI_REGION_IO);
++
++	hose->region_count = 2;
++
++	hose->read_byte   = aspeed_pci_read_config_byte;
++	hose->read_word   = aspeed_pci_read_config_word;
++	hose->read_dword  = aspeed_pci_read_config_dword;
++	hose->write_byte  = aspeed_pci_write_config_byte;
++	hose->write_word  = aspeed_pci_write_config_word;
++	hose->write_dword = aspeed_pci_write_config_dword;
++
++	pci_register_hose (hose);
++
++	hose->last_busno = pci_hose_scan (hose);
++
++	return;
++}
++#endif /* CONFIG_PCI */
++
+diff --git a/board/aspeed/ast2300/platform.S b/board/aspeed/ast2300/platform.S
+new file mode 100644
+index 0000000..27e8f26
+--- /dev/null
++++ b/board/aspeed/ast2300/platform.S
+@@ -0,0 +1,3089 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++/*
++ * Board specific setup info
++ *
++ ******************************************************************************
++ * ASPEED Technology Inc.
++ * AST2300/AST2400 DDR2/DDR3 SDRAM controller initialization and calibration sequence
++ *
++ * Gary Hsu, <gary_hsu@aspeedtech.com>
++ *
++ * Release date: 2014.12.29 formal release for SDK0.60
++ *
++ * Modified list from v0.23
++ * EC1. Modify DQIDLY and DQSI-MCLK2X calibration algorithm
++ * EC2. Remove pass 2 DQIDLY finetune process
++ * EC3. Modify ECC code
++ * EC4. Add AST2400 supporting
++ * EC5. Add SPI timing calibration for AST2400
++ * EC6. Remove AST2300-A0 PCI-e workaround
++ * EC7. Add CK duty calibration for AST2400
++ * EC8. Remove #define CONFIG_DRAM_UART_OUT, default has message output to UART5
++ * EC9. Add DRAM size auto-detection
++ * EC10. Add GPIO register clear when watchdog reboot (only for AST2400)
++ * EC11. Move the "Solve ASPM" code position of AST2300 to avoid watchdog reset
++ *
++ * Modified list from v0.53
++ * EC1. Add solution of LPC lock issue due to watchdog reset. (AP note A2300-11)
++ *
++ * Modified list from v0.56
++ * EC1. Fix read DQS input mask window too late issue if DRAM's t_DQSCK is earlier too much
++ *      (ex. Nanya NT5CB64M16FP)
++ *      1. Change init value of MCR18[4] from '1' to '0'
++ *      2. Add CBR4 code to finetune MCR18[4]
++ *
++ * Modified list from v0.59
++ * EC1. Add DQS input gating window delay tuning (1/2 T) when CBR retry
++ * EC2. Modify DLL1 MAdj = 0x4C
++ *
++ * Optional define variable
++ * 1. DRAM Speed             //
++ *    CONFIG_DRAM_336        // 336MHz (DDR-667)
++ *    CONFIG_DRAM_408        // 408MHz (DDR-800) (default)
++ * 2. ECC Function enable
++ *    CONFIG_DRAM_ECC        // define to enable ECC function
++ *                           // when enabled, must define the ECC protected memory size at 0x1e6e0054
++ * 3. UART5 message output   //
++ *    CONFIG_DRAM_UART_38400 // set the UART baud rate to 38400, default is 115200
++ ******************************************************************************
++ */
++
++#include <config.h>
++#include <version.h>
++/******************************************************************************
++ Calibration Macro Start
++ Usable registers:
++  r0, r1, r2, r3, r5, r6, r7, r8, r9, r10, r11
++ ******************************************************************************/
++/* PATTERN_TABLE,
++   init_delay_timer,
++   check_delay_timer,
++   clear_delay_timer,
++   record_dll2_pass_range,
++   record_dll2_pass_range_h,
++   are for DRAM calibration */
++
++PATTERN_TABLE:
++    .word   0xff00ff00
++    .word   0xcc33cc33
++    .word   0xaa55aa55
++    .word   0x88778877
++    .word   0x92cc4d6e       @ 5
++    .word   0x543d3cde
++    .word   0xf1e843c7
++    .word   0x7c61d253
++    .word   0x00000000       @ 8
++
++    .macro init_delay_timer
++    ldr r0, =0x1e782024                          @ Set Timer3 Reload
++    str r2, [r0]
++
++    ldr r0, =0x1e6c0038                          @ Clear Timer3 ISR
++    ldr r1, =0x00040000
++    str r1, [r0]
++
++    ldr r0, =0x1e782030                          @ Enable Timer3
++    ldr r1, [r0]
++    mov r2, #7
++    orr r1, r1, r2, lsl #8
++    str r1, [r0]
++
++    ldr r0, =0x1e6c0090                          @ Check ISR for Timer3 timeout
++    .endm
++
++    .macro check_delay_timer
++    ldr r1, [r0]
++    bic r1, r1, #0xFFFBFFFF
++    mov r2, r1, lsr #18
++    cmp r2, #0x01
++    .endm
++
++    .macro clear_delay_timer
++    ldr r0, =0x1e782030                          @ Disable Timer3
++    ldr r1, [r0]
++    bic r1, r1, #0x00000F00
++    str r1, [r0]
++
++    ldr r0, =0x1e6c0038                          @ Clear Timer3 ISR
++    ldr r1, =0x00040000
++    str r1, [r0]
++    .endm
++
++    .macro record_dll2_pass_range
++    ldr                 r1, [r0]
++    bic                 r2, r1, #0xFFFFFF00
++    cmp                 r2, r3                   @ record min
++    bicgt               r1, r1, #0x000000FF
++    orrgt               r1, r1, r3
++    bic                 r2, r1, #0xFFFF00FF
++    cmp                 r3, r2, lsr #8           @ record max
++    bicgt               r1, r1, #0x0000FF00
++    orrgt               r1, r1, r3, lsl #8
++    str                 r1, [r0]
++    .endm
++
++    .macro record_dll2_pass_range_h
++    ldr                 r1, [r0]
++    bic                 r2, r1, #0xFF00FFFF
++    mov                 r2, r2, lsr #16
++    cmp                 r2, r3                   @ record min
++    bicgt               r1, r1, #0x00FF0000
++    orrgt               r1, r1, r3, lsl #16
++    bic                 r2, r1, #0x00FFFFFF
++    cmp                 r3, r2, lsr #24          @ record max
++    bicgt               r1, r1, #0xFF000000
++    orrgt               r1, r1, r3, lsl #24
++    str                 r1, [r0]
++    .endm
++
++    .macro init_spi_checksum
++    ldr r0, =0x1e620084
++    ldr r1, =0x20010000
++    str r1, [r0]
++    ldr r0, =0x1e62008C
++    ldr r1, =0x20000200
++    str r1, [r0]
++    ldr r0, =0x1e620080
++    ldr r1, =0x0000000D
++    orr r2, r2, r7
++    orr r1, r1, r2, lsl #8
++    and r2, r6, #0xF
++    orr r1, r1, r2, lsl #4
++    str r1, [r0]
++    ldr r0, =0x1e620008
++    ldr r2, =0x00000800
++    .endm
++
++/******************************************************************************
++ Calibration Macro End
++ ******************************************************************************/
++LPC_Patch:                                       @ load to SRAM base 0x1e720400
++    str   r1, [r0]
++    str   r3, [r2]
++    bic   r1, r1, #0xFF
++LPC_Patch_S1:
++    subs  r5, r5, #0x01
++    moveq pc, r8
++    ldr   r3, [r2]
++    tst   r3, #0x01
++    movne pc, r8
++    mov   pc, r7
++LPC_Patch_S2:                                    @ load to SRAM base 0x1e720480
++    str   r1, [r0]
++    mov   pc, r9
++LPC_Patch_E:
++
++.globl lowlevel_init
++lowlevel_init:
++
++init_dram:
++    /* save lr */
++    mov r4, lr
++/* Test - DRAM initial time */
++    ldr r0, =0x1e782044
++    ldr r1, =0xFFFFFFFF
++    str r1, [r0]
++
++    ldr r0, =0x1e782030
++    ldr r1, [r0]
++    bic r1, r1, #0x0000F000
++    str r1, [r0]
++    mov r2, #3
++    orr r1, r1, r2, lsl #12
++    str r1, [r0]
++/* Test - DRAM initial time */
++
++    /*Set Scratch register Bit 7 before initialize*/
++    ldr r0, =0x1e6e2000
++    ldr r1, =0x1688a8a8
++    str r1, [r0]
++
++    ldr r0, =0x1e6e2040
++    ldr r1, [r0]
++    orr r1, r1, #0x80
++    str r1, [r0]
++
++    /* Fix LPC lock issue for AST2300 */
++    ldr r0, =0x1e6e207c                          @ Check AST2300
++    ldr r1, [r0]
++    mov r1, r1, lsr #24
++    cmp r1, #0x01
++    bne lpc_recover_end                          @ not match AST2300
++
++    mov r3, #0x0
++lpc_recover_check:
++    ldr r0, =0x1e78900c                          @ check HICR3[4]=0x1
++    ldr r1, [r0]
++    tst r1, #0x10
++    beq lpc_recover_end
++    ldr r0, =0x1e789004                          @ check HICR1[7]=0x1
++    ldr r1, [r0]
++    tst r1, #0x80
++    beq lpc_recover_end
++    ldr r0, =0x1e7890a0                          @ check LHCR0[27:24]=0x6
++    ldr r1, [r0]
++    mov r1, r1, lsr #24
++    and r1, r1, #0xF
++    cmp r1, #0x06
++    bne lpc_recover_end
++    add r3, r3, #0x01
++    cmp r3, #0x5                                 @ repeat 5 times
++    ble lpc_recover_check
++
++    mov r3, #0x0
++lpc_recover_init:
++    ldr r0, =0x1e7890a4                          @ set LHCR1[1:0]=0x0
++    ldr r1, =0x00000000
++    str r1, [r0]
++    add r3, r3, #0x01
++    cmp r3, #0x20
++    bge lpc_recover_end
++    ldr r1, [r0]
++    tst r1, #0x01
++    bne lpc_recover_init
++
++    ldr r0, =0x1e7890b0                          @ set LHCR4[7:0]=0xFF
++    ldr r1, =0x000000FF
++    str r1, [r0]
++    ldr r0, =0x1e7890b4                          @ set LHCR5[31:0]=0xFFFFFFFF
++    ldr r1, =0xFFFFFFFF
++    str r1, [r0]
++    ldr r0, =0x1e7890b8                          @ set LHCR6[31:0]=0xFFFFFFFF
++    str r1, [r0]
++
++    adr r6, LPC_Patch
++    adr r7, LPC_Patch_S2
++    ldr r0, =0x1e720400
++copy_lpc_patch_1:
++    ldr r1, [r6]
++    str r1, [r0]
++    add r6, r6, #0x4
++    add r0, r0, #0x4
++    cmp r6, r7
++    bne copy_lpc_patch_1
++
++    adr r6, LPC_Patch_S2
++    adr r7, LPC_Patch_E
++    ldr r0, =0x1e720480
++copy_lpc_patch_2:
++    ldr r1, [r6]
++    str r1, [r0]
++    add r6, r6, #0x4
++    add r0, r0, #0x4
++    cmp r6, r7
++    bne copy_lpc_patch_2
++
++    ldr r0, =0x1e7890a0                          @ set LHCR0[31:0]=0xFFFFFF01
++    ldr r1, =0xFFFFFF01
++    add r2, r0, #0x4
++    mov r3, #0x01
++    mov r5, #0x10
++    adr r9, lpc_recover_end
++    adr r6, LPC_Patch
++    adr r7, LPC_Patch_S1
++    sub r6, r7, r6
++    ldr r7, =0x1e720400
++    add r7, r7, r6
++    ldr r8, =0x1e720480
++    ldr pc, =0x1e720400
++
++lpc_recover_end:
++    ldr r0, =0x1e7890a0                          @ set LHCR0[31:0]=0xFFFFFF00
++    ldr r1, =0xFFFFFF00
++    str r1, [r0]
++    /* <END> Fix LPC lock issue for AST2300 */
++
++    /* Check Scratch Register Bit 6 */
++    ldr r0, =0x1e6e2040
++    ldr r1, [r0]
++    bic r1, r1, #0xFFFFFFBF
++    mov r2, r1, lsr #6
++    cmp r2, #0x01
++    beq platform_exit
++
++    ldr r2, =0x033103F1                          @ load PLL parameter for 24Mhz CLKIN (396:324)
++/*  ldr r2, =0x019001F0                          @ load PLL parameter for 24Mhz CLKIN (408:336) */
++    ldr r0, =0x1e6e207c                          @ Check Revision ID
++    ldr r1, [r0]
++    mov r1, r1, lsr #24
++    cmp r1, #0x02
++    bne set_MPLL                                 @ not match AST2400
++
++    ldr r0, =0x1e6e2070                          @ Check CLKIN freq
++    ldr r1, [r0]
++    mov r1, r1, lsr #23
++    tst r1, #0x01
++    ldrne r2, =0x017001D0                        @ load PLL parameter for 25Mhz CLKIN (400:325)
++
++set_MPLL:
++    ldr r0, =0x1e6e2020                          @ M-PLL (DDR SDRAM) Frequency
++    ldr r1, =0xFFFF
++#if defined(CONFIG_DRAM_336)
++    mov r2, r2, lsr #16
++#endif
++    and r1, r2, r1
++    str r1, [r0]
++
++/* Debug - UART console message */
++    ldr r0, =0x1e78400c
++    mov r1, #0x83
++    str r1, [r0]
++
++    ldr r0, =0x1e6e202c
++    ldr r2, [r0]
++    mov r2, r2, lsr #12
++    tst r2, #0x01
++    ldr r0, =0x1e784000
++    moveq r1, #0x0D                              @ Baudrate 115200
++    movne r1, #0x01                              @ Baudrate 115200, div13
++#if defined(CONFIG_DRAM_UART_38400)
++    moveq r1, #0x27                              @ Baudrate 38400
++    movne r1, #0x03                              @ Baudrate 38400 , div13
++#endif
++    str r1, [r0]
++
++    ldr r0, =0x1e784004
++    mov r1, #0x00
++    str r1, [r0]
++
++    ldr r0, =0x1e78400c
++    mov r1, #0x03
++    str r1, [r0]
++
++    ldr r0, =0x1e784008
++    mov r1, #0x07
++    str r1, [r0]
++
++    ldr r0, =0x1e784000
++    mov r1, #0x0D                                @ '\r'
++    str r1, [r0]
++    mov r1, #0x0A                                @ '\n'
++    str r1, [r0]
++    mov r1, #0x44                                @ 'D'
++    str r1, [r0]
++    mov r1, #0x52                                @ 'R'
++    str r1, [r0]
++    mov r1, #0x41                                @ 'A'
++    str r1, [r0]
++    mov r1, #0x4D                                @ 'M'
++    str r1, [r0]
++    mov r1, #0x20                                @ ' '
++    str r1, [r0]
++    mov r1, #0x49                                @ 'I'
++    str r1, [r0]
++    mov r1, #0x6E                                @ 'n'
++    str r1, [r0]
++    mov r1, #0x69                                @ 'i'
++    str r1, [r0]
++    mov r1, #0x74                                @ 't'
++    str r1, [r0]
++    mov r1, #0x2D                                @ '-'
++    str r1, [r0]
++    mov r1, #0x44                                @ 'D'
++    str r1, [r0]
++    mov r1, #0x44                                @ 'D'
++    str r1, [r0]
++    mov r1, #0x52                                @ 'R'
++    str r1, [r0]
++/* Debug - UART console message */
++
++    /* Delay about 100us */
++    ldr r0, =0x1e782030                          @ Init Timer3 Control
++    ldr r1, [r0]
++    bic r1, r1, #0x00000F00
++    str r1, [r0]
++
++    ldr r2, =0x00000064                          @ Set Timer3 Reload = 100 us
++    init_delay_timer
++delay_0:
++    check_delay_timer
++    bne delay_0
++    clear_delay_timer
++    /* end delay 100us */
++
++/******************************************************************************
++ Init DRAM common registers
++ ******************************************************************************/
++    ldr r0, =0x1e6e0000
++    ldr r1, =0xfc600309
++    str r1, [r0]
++
++    /* Reset MMC */
++    ldr r1, =0x00000000
++    ldr r0, =0x1e6e0034
++    str r1, [r0]
++    ldr r0, =0x1e6e0018
++    str r1, [r0]
++    ldr r0, =0x1e6e0024
++    str r1, [r0]
++    ldr r0, =0x1e6e0064                          @ REG_MADJ, power down DLL
++    str r1, [r0]
++
++    ldr r1, =0x00034C4C                          @ REG_MADJ, reset DLL
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0068                          @ REG_SADJ
++    ldr r1, =0x00001800
++    str r1, [r0]
++
++    /* Delay about 10us */
++    ldr r2, =0x0000000B                          @ Set Timer3 Reload = 10 us
++    init_delay_timer
++delay_1:
++    check_delay_timer
++    bne delay_1
++    clear_delay_timer
++    /* end delay 10us */
++
++    ldr r0, =0x1e6e0064                          @ REG_MADJ | 0xC0000, enable DLL
++    ldr r1, [r0]
++    ldr r2, =0xC0000
++    orr r1, r1, r2
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0008
++    ldr r1, =0x0090040f                          /* VGA */
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0018
++    ldr r1, =0x4000A120
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0018
++    ldr r1, =0x00000120
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0038
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0040
++    ldr r1, =0xFF444444
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0044
++    ldr r1, =0x22222222
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0048
++    ldr r1, =0x22222222
++    str r1, [r0]
++
++    ldr r0, =0x1e6e004c
++    ldr r1, =0x22222222
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0050
++    ldr r1, =0x80000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0050
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0054
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0060                          @ REG_DRV
++    ldr r1, =0x000000FA                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x000000FA
++#endif
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0070
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0074
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0078
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e007c
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0080
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0084
++    ldr r1, =0x00FFFFFF
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0088                          @ REG_DQIDLY
++    ldr r1, =0x00000089                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00000074
++#endif
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0020                          @ REG_DQSIC
++    ldr r1, =0x000000E2                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x000000BA
++#endif
++    str r1, [r0]
++
++    /* Delay about 10us */
++    ldr r2, =0x0000000B                          @ Set Timer3 Reload = 10 us
++    init_delay_timer
++delay_2:
++    check_delay_timer
++    bne delay_2
++    clear_delay_timer
++    /* end delay 10us */
++
++    /* Check DRAM Type by H/W Trapping */
++    ldr r0, =0x1e6e2070
++    ldr r1, [r0]
++    bic r1, r1, #0xFEFFFFFF                      @ bit[24]=1 => DDR2
++    mov r2, r1, lsr #24
++    cmp r2, #0x01
++    beq ddr2_init
++    b   ddr3_init
++.LTORG
++
++/******************************************************************************
++ DDR3 Init
++
++ tRCD   = 15     ns
++ tRAS   = 37.5   ns
++ tRRD   = max(4 CK,10 ns)
++ tRP    = 15     ns
++ tRFC   = 110ns/1Gbit, 160ns/2Gbit, 300ns/4Gbit
++ tRTP   = max(4 CK,7.5 ns)
++ tWR    = 15     ns
++ tXSNR  = max(10 CK,200 ns)
++ tWTR   = max(4 CK,7.5 ns)
++ tFAW   = 50     ns
++ tMRD   = max(15 CK,20 ns)
++ ******************************************************************************/
++ddr3_init:
++/* Debug - UART console message */
++    ldr r0, =0x1e784000
++    mov r1, #0x33                                @ '3'
++    str r1, [r0]
++    mov r1, #0x0D                                @ '\r'
++    str r1, [r0]
++    mov r1, #0x0A                                @ '\n'
++    str r1, [r0]
++/* Debug - UART console message */
++
++    ldr r0, =0x1e6e0004
++    ldr r1, =0x00000531                          @ Default set to 1Gbit
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0010                          @ REG_AC1
++    ldr r1, =0x33302825                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x22202725
++#endif
++    str r1, [r0]
++
++    /* Check DRAM CL Timing by H/W Trapping */
++    ldr r0, =0x1e6e2070
++    ldr r1, [r0]
++    bic r1, r1, #0xF9FFFFFF
++    mov r2, r1, lsr #9                           @ Set CL
++    ldr r1, =0x00020000
++    add r2, r2, r1
++    ldr r1, [r0]
++    bic r1, r1, #0xFBFFFFFF
++    mov r1, r1, lsr #6                           @ Set CWL
++    orr r2, r2, r1
++    ldr r1, =0x00300000
++    add r2, r2, r1
++
++    ldr r0, =0x1e6e0014                          @ REG_AC2
++    ldr r1, =0xCC00963F                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0xAA007636
++#endif
++    orr r1, r1, r2
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0004                          @ check 2400 mode
++    ldr r2, [r0]
++    mov r2, r2, lsr #10
++
++    ldr r0, =0x1e6e006c                          @ REG_IOZ
++    ldr r1, =0x00002312                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00002312
++#endif
++    tst r2, #0x01
++    moveq r1, r1, lsr #8
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0120
++    mov r1, #0
++    str r1, [r0]
++    tst r2, #0x01                                @ check AST2300
++    beq CBRDLL1_2300_Start
++    ldr r0, =0x1e6e207c                          @ check AST2400 revision A0
++    ldr r1, [r0]
++    mov r1, r1, lsr #16
++    and r1, r1, #0xFF
++    cmp r1, #0x0
++    beq CBRDLL1_2300_Start
++    b   CBRDLL1_2400_Start
++MCLK2X_Phase_CBR_Done_DDR3:
++    ldr r0, =0x1e6e0018
++    ldr r1, [r0]
++    orr r1, r1, #0x40
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0034
++    ldr r1, =0x00000001
++    str r1, [r0]
++
++    ldr r0, =0x1e6e000c
++    ldr r1, =0x00000040
++    str r1, [r0]
++
++    /* Delay about 400us */
++    ldr r2, =0x00000190                          @ Set Timer3 Reload = 400 us
++    init_delay_timer
++delay3_4:
++    check_delay_timer
++    bne delay3_4
++    clear_delay_timer
++    /* end delay 400us */
++
++    /* Check DRAM CL Timing by H/W Trapping */
++    ldr r0, =0x1e6e2070
++    ldr r1, [r0]
++    bic r1, r1, #0xF9FFFFFF
++    mov r2, r1, lsr #21                          @ Set CL
++    ldr r1, =0x00000010
++    add r2, r2, r1
++    ldr r1, [r0]
++    bic r1, r1, #0xFBFFFFFF
++    mov r1, r1, lsr #7                           @ Set CWL
++    orr r2, r2, r1
++
++    ldr r0, =0x1e6e002c                          @ REG_MRS
++    ldr r1, =0x04001700                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x04001500
++#endif
++    orr r1, r1, r2
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0030                          @ REG_EMRS
++    ldr r1, =0x00000000                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00000000
++#endif
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set EMRS2
++    ldr r1, =0x00000005
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set EMRS3
++    ldr r1, =0x00000007
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set EMRS
++    ldr r1, =0x00000003
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set MRS
++    ldr r1, =0x00000001
++    str r1, [r0]
++
++    ldr r0, =0x1e6e002c                          @ REG_MRS
++    ldr r1, =0x04001600                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x04001400
++#endif
++    orr r1, r1, r2
++    str r1, [r0]
++
++    ldr r0, =0x1e6e000c                          @ Refresh 8 times
++    ldr r1, =0x00005C48
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set MRS
++    ldr r1, =0x00000001
++    str r1, [r0]
++
++    ldr r0, =0x1e6e000c                          @ Set refresh cycle
++    ldr r1, =0x00002001
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0014
++    ldr r1, [r0]
++    bic r1, r1, #0xFFF9FFFF
++    mov r2, r1, lsr #3                           @ get CL
++
++    ldr r0, =0x1e6e0034                          @ REG_PWC
++    ldr r1, =0x00000303                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00000303
++#endif
++    orr r1, r1, r2
++    str r1, [r0]
++
++    b   Calibration_Start
++.LTORG
++/******************************************************************************
++ End DDR3 Init
++ ******************************************************************************/
++
++/******************************************************************************
++ DDR2 Init
++
++ tRCD   = 15    ns
++ tRAS   = 45    ns
++ tRRD   = 10    ns
++ tRP    = 15    ns
++ tRFC   = 105ns/512Mbit, 127.5ns/1Gbit, 197.5ns/2Gbit, 327.5ns/4Gbit
++ tRTP   = 7.5   ns
++ tWR    = 15    ns
++ tXSNR  = 200   ns
++ tWTR   = 7.5   ns
++ tFAW   = 50    ns
++ tMRD   = 4     CK
++ ******************************************************************************/
++ddr2_init:
++/* Debug - UART console message */
++    ldr r0, =0x1e784000
++    mov r1, #0x32                                @ '2'
++    str r1, [r0]
++    mov r1, #0x0D                                @ '\r'
++    str r1, [r0]
++    mov r1, #0x0A                                @ '\n'
++    str r1, [r0]
++/* Debug - UART console message */
++
++    ldr r0, =0x1e6e0004
++    ldr r1, =0x00000510                          @ Default set to 512Mbit
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0010                          @ REG_AC1
++    ldr r1, =0x33302714                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x22201613
++#endif
++    str r1, [r0]
++
++    /* Check DRAM CL Timing by H/W Trapping */
++    ldr r0, =0x1e6e2070
++    ldr r1, [r0]
++    bic r1, r1, #0xF9FFFFFF
++    mov r2, r1, lsr #5                           @ Set CL
++    mov r1, r2, lsr #4                           @ Set CWL
++    orr r2, r2, r1
++    ldr r1, =0x00110000
++    add r2, r2, r1
++
++    ldr r0, =0x1e6e0014                          @ REG_AC2
++    ldr r1, =0xCC00B03F                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0xAA00903B
++#endif
++    orr r1, r1, r2
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0004                          @ check 2400 mode
++    ldr r2, [r0]
++    mov r2, r2, lsr #10
++
++    ldr r0, =0x1e6e006c                          @ REG_IOZ
++    ldr r1, =0x00002312                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00002312
++#endif
++    tst r2, #0x01
++    moveq r1, r1, lsr #8
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0120
++    mov r1, #1
++    str r1, [r0]
++    tst r2, #0x01                                @ check AST2300
++    beq CBRDLL1_2300_Start
++    ldr r0, =0x1e6e207c                          @ check AST2400 revision A0
++    ldr r1, [r0]
++    mov r1, r1, lsr #16
++    and r1, r1, #0xFF
++    cmp r1, #0x0
++    beq CBRDLL1_2300_Start
++    b   CBRDLL1_2400_Start
++MCLK2X_Phase_CBR_Done_DDR2:
++
++    ldr r0, =0x1e6e0034
++    ldr r1, =0x00000001
++    str r1, [r0]
++
++    ldr r0, =0x1e6e000c
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    /* Delay about 400us */
++    ldr r2, =0x00000190                          @ Set Timer3 Reload = 400 us
++    init_delay_timer
++delay2_4:
++    check_delay_timer
++    bne delay2_4
++    clear_delay_timer
++    /* end delay 400us */
++
++    /* Check DRAM CL Timing by H/W Trapping */
++    ldr r0, =0x1e6e2070
++    ldr r1, [r0]
++    bic r1, r1, #0xF9FFFFFF
++    mov r2, r1, lsr #21                          @ Set CL
++    ldr r1, =0x00000040
++    orr r2, r2, r1
++
++    ldr r0, =0x1e6e002c                          @ REG_MRS
++    ldr r1, =0x00000D03                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00000B03
++#endif
++    orr r1, r1, r2
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0030                          @ REG_EMRS
++    ldr r1, =0x00000040                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00000040
++#endif
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set EMRS2
++    ldr r1, =0x00000005
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set EMRS3
++    ldr r1, =0x00000007
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set EMRS
++    ldr r1, =0x00000003
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set MRS
++    ldr r1, =0x00000001
++    str r1, [r0]
++
++    ldr r0, =0x1e6e000c                          @ Refresh 8 times
++    ldr r1, =0x00005C08
++    str r1, [r0]
++
++    ldr r0, =0x1e6e002c                          @ REG_MRS
++    ldr r1, =0x00000C03                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00000A03
++#endif
++    orr r1, r1, r2
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set MRS
++    ldr r1, =0x00000001
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0030                          @ REG_EMRS
++    ldr r1, =0x000003C0                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x000003C0
++#endif
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set EMRS
++    ldr r1, =0x00000003
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0030                          @ REG_EMRS
++    ldr r1, =0x00000040                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00000040
++#endif
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set EMRS
++    ldr r1, =0x00000003
++    str r1, [r0]
++
++    ldr r0, =0x1e6e000c                          @ Set refresh cycle
++    ldr r1, =0x00002001
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0014
++    ldr r1, [r0]
++    bic r1, r1, #0xFFF9FFFF
++    mov r2, r1, lsr #3                           @ get CL
++
++    ldr r0, =0x1e6e0034                          @ REG_PWC
++    ldr r1, =0x00000503                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00000503
++#endif
++    orr r1, r1, r2
++    str r1, [r0]
++
++    b   Calibration_Start
++.LTORG
++/******************************************************************************
++ End DDR2 Init
++ ******************************************************************************/
++/******************************************************************************
++ DDR CK duty finetune program
++    SRAM buffer definition
++    0x1E720204 : gdll     golden DLL1 record
++    0x1E720208 : gduty    golden duty setting record
++    0x1E72020C : gdutysum golden duty data record
++    0x1E720210 : duty record of delay 0  invert
++    0x1E720214 : duty record of delay 1  invert
++    ....
++    0x1E72024C : duty record of delay 15 invert
++    0x1E720250 : duty record of delay 0
++    0x1E720254 : duty record of delay 1
++    ....
++    0x1E72028C : duty record of delay 15
++
++    Register usage
++    r0 - r3 = free
++    r4  = record the return pc value, do not use
++    r5  = free
++    r6  = free
++    r7  = duty count
++    r8  = gdll
++    r9  = gduty
++    r10 = gdutysum
++ ******************************************************************************/
++CBRDLL1_2400_Start:
++    ldr   r0, =0x1e6e0120
++    ldr   r1, [r0]
++    orr   r1, r1, #0x02
++    str   r1, [r0]
++
++    ldr   r1, =0x00000000
++    ldr   r0, =0x1e720204
++    ldr   r2, =0x1e7202a0
++init_sram_start0:
++    str   r1, [r0]
++    add   r0, r0, #4
++    cmp   r0, r2
++    blt   init_sram_start0
++
++    ldr   r0, =0x1e6e0034
++    mov   r1, #0x20
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0060
++    ldr   r1, [r0]
++    mov   r2, #0x01
++    orr   r1, r1, r2, lsl #13
++    str   r1, [r0]
++
++    mov   r7, #0x0                               @ init duty count
++    mov   r8, #0x0                               @ init gdll
++    mov   r9, #0x0                               @ init gduty
++    mov   r10, #0x0                              @ init gdutysum
++cbrdll1_duty_start:
++    cmp   r7, #32
++    bge   cbrdll1_duty_end
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, =0x00008120
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0060
++    ldr   r1, [r0]
++    bic   r1, r1, #0x00001F00
++    orr   r1, r1, r7, lsl #8
++    mov   r2, #0x10
++    eor   r1, r1, r2, lsl #8
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0000                        @ dummy read
++    ldr   r1, [r0]
++
++    b     CBRDLL1_2300_Start
++CBRDLL1_2400_Call:
++
++    mov   r5, #0x01                              @ init dqidly count
++    mov   r6, #0x00                              @ init duty sum
++cbrdll1_duty_cal_start:
++    cmp   r5, #0x05
++    bge   cbrdll1_duty_cal_end
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, =0x00200120
++    orr   r1, r1, r5, lsl #16
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0000
++    ldr   r1, [r0]
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, [r0]
++    mov   r2, #0x10
++    orr   r1, r1, r2, lsl #24
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0080
++    ldr   r1, =0x80000000                        @ init duty cal waiting
++cbrdll1_duty_cal_wait:
++    ldr   r2, [r0]
++    tst   r2, r1
++    beq   cbrdll1_duty_cal_wait
++
++    ldr   r0, =0x1e6e008c
++    ldr   r2, [r0]
++
++    ldr   r0, =0x1e720210
++    add   r0, r0, r7, lsl #2
++    str   r2, [r0]
++
++    ldr   r1, =0xFFFF
++    and   r3, r1, r2
++    cmp   r3, r1
++    moveq r2, r2, lsr #16
++    and   r3, r1, r2
++    add   r6, r6, r3
++    ldr   r1, =0xF000
++    cmp   r3, r1
++    blt   cbrdll1_duty_cal_end
++    add   r5, r5, #0x01
++    b     cbrdll1_duty_cal_start
++
++cbrdll1_duty_cal_end:
++    mov   r6, r6, lsr #2                         @ get dutysum
++    cmp   r6, r10                                @ check dutysum > gdutysum
++    ble   cbrdll1_duty_next
++    ldr   r0, =0x1e6e0068
++    ldr   r8, [r0]
++    eor   r9, r7, #0x10
++    mov   r10, r6
++
++cbrdll1_duty_next:
++    add   r7, r7, #0x01
++    cmp   r7, #16                                @ check duty >= 15
++    blt   cbrdll1_duty_start
++    ldr   r0, =0xFA00                            @ check gdutysum > 0xFA00
++    cmp   r10, r0
++    blt   cbrdll1_duty_start
++
++cbrdll1_duty_end:
++    ldr   r0, =0x1e6e0060
++    ldr   r1, [r0]
++    bic   r1, r1, #0x00001F00
++    orr   r1, r1, r9, lsl #8
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0068
++    bic   r8, r8, #0xFF000000
++    bic   r8, r8, #0x00FF0000
++    str   r8, [r0]
++
++    ldr   r0, =0x1e720204                        @ record result
++    str   r8, [r0]
++    add   r0, r0, #0x04
++    str   r9, [r0]
++    add   r0, r0, #0x04
++    str   r10, [r0]
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, =0x00008120
++    str   r1, [r0]
++    ldr   r0, =0x1e6e0000                        @ dummy read
++    ldr   r1, [r0]
++    ldr   r0, =0x1e6e0018
++    ldr   r1, =0x00000120
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0120
++    ldr   r1, [r0]
++    cmp   r1, #0x3
++    beq   MCLK2X_Phase_CBR_Done_DDR2
++    b     MCLK2X_Phase_CBR_Done_DDR3
++
++/******************************************************************************
++ MCLK2X lock to MCLK program
++  r0 - r3 = free
++  r5 = madjmax
++  r6 = dllend
++  0x1E720200 = 0x96cnt:failcnt:dllmax:dllmin
++ ******************************************************************************/
++CBRDLL1_2300_Start:
++    ldr   r0, =0x1e6e0064
++    ldr   r5, [r0]
++    and   r5, r5, #0xFF                          @ init madjmax
++    mov   r6, r5                                 @ init dllend
++
++    ldr   r1, =0x000000ff
++    ldr   r0, =0x1e720200
++    str   r1, [r0]                               @ init dllcnt2:dllmax:dllmin
++
++    mov   r3, #0x0                               @ init loop count
++cbrdll1_scan_start:
++    cmp   r3, r6
++    bge   cbrdll1_scan_end
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, =0x00008120
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0068
++    mov   r1, r3
++    cmp   r1, r5
++    subge r1, r1, r5
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0000                        @ dummy read
++    ldr   r1, [r0]
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, =0x00000120
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0000                        @ dummy read
++    ldr   r1, [r0]
++    ldr   r0, =0x1e6e0000                        @ dummy read
++    ldr   r1, [r0]
++
++    ldr   r0, =0x1e6e001c
++    ldr   r1, [r0]
++    mov   r1, r1, lsr #16
++    and   r1, r1, #0xFF
++
++    and   r2, r1, #0x96
++    cmp   r2, #0x96
++    beq   cbrdll1_scan_pass                      @ if (mclk2x_phase & 0x96) == 0x96
++    ldr   r0, =0x1e720200
++    ldr   r1, [r0]
++    mov   r2, r1, lsr #8
++    ands  r2, r2, #0xFF                          @ get dllmax
++    beq   cbrdll1_scan_next                      @ if dllmax == 0
++    mov   r2, r1, lsr #16
++    and   r2, r2, #0xFF
++    add   r2, r2, #0x01
++    cmp   r2, #0x02
++    movge r6, r3
++    bic   r1, r1, #0x00FF0000
++    orr   r1, r1, r2, lsl #16
++    str   r1, [r0]
++    b     cbrdll1_scan_next
++
++cbrdll1_scan_pass:
++    cmp   r3, #0x0                               @ if dll = 0
++    moveq r3, #0x0F
++    addeq r6, r6, #0x10
++    beq   cbrdll1_scan_next
++    ldr   r0, =0x1e720200
++    ldr   r2, [r0]
++    cmp   r1, #0x96
++    bne   cbrdll1_scan_pass2
++    mov   r1, r2, lsr #24
++    add   r1, r1, #0x01
++    bic   r2, r2, #0xFF000000
++    orr   r2, r2, r1, lsl #24
++    cmp   r1, #0x03                              @ check (phase == 0x96) count == 3
++    bicge r2, r2, #0x0000FF00
++    bicge r2, r2, #0x000000FF
++    orrge r2, r2, r3, lsl #8
++    orrge r2, r2, r3
++    str   r2, [r0]
++    bge   cbrdll1_scan_end
++
++cbrdll1_scan_pass2:
++    and   r1, r2, #0xFF                          @ if(dllmin > dll)
++    cmp   r1, r3
++    bicgt r2, r2, #0x000000FF
++    orrgt r2, r2, r3
++
++    mov   r1, r2, lsr #8                         @ if(dllmax < dll)
++    and   r1, r1, #0xFF
++    cmp   r1, r3
++    biclt r2, r2, #0x0000FF00
++    orrlt r2, r2, r3, lsl #8
++
++    bic   r2, r2, #0x00FF0000
++    str   r2, [r0]
++
++cbrdll1_scan_next:
++    add   r3, r3, #0x01
++    b     cbrdll1_scan_start
++
++cbrdll1_scan_end:
++    ldr   r0, =0x1e720200
++    ldr   r1, [r0]
++    mov   r2, r1, lsr #8                         @ get dllmax
++    ands  r2, r2, #0xFF
++    bne   cbrdll1_scan_done                      @ if(dllmax != 0)
++    ldr   r0, =0x1e6e0064
++    ldr   r3, [r0]
++    bic   r1, r3, #0x000C0000
++    str   r1, [r0]
++    add   r0, r0, #0x04
++    mov   r1, #0x0
++    str   r1, [r0]
++
++    /* Delay about 10us */
++    ldr r2, =0x0000000A                          @ Set Timer3 Reload = 10 us
++    init_delay_timer
++delay0_1:
++    check_delay_timer
++    bne delay0_1
++    clear_delay_timer
++    /* end delay 10us */
++
++    ldr   r0, =0x1e6e0064
++    str   r3, [r0]
++
++    /* Delay about 10us */
++    ldr r2, =0x0000000A                          @ Set Timer3 Reload = 10 us
++    init_delay_timer
++delay0_2:
++    check_delay_timer
++    bne delay0_2
++    clear_delay_timer
++    /* end delay 10us */
++
++    b     CBRDLL1_2300_Start
++
++cbrdll1_scan_done:
++    and   r1, r1, #0xFF
++    add   r1, r1, r2
++    mov   r6, r1, lsr #1                         @ dll1.0 = (dllmin + dllmax) >> 1
++    cmp   r6, r5
++    subge r6, r6, r5
++    add   r3, r6, r5, lsr #2                     @ dll1.1 = dll1.0 + (MADJ >> 2)
++
++    ldr   r0, =0x1e6e0004
++    ldr   r1, [r0]
++    mov   r1, r1, lsr #10
++    tst   r1, #0x1
++    bne   cbrdll1_scan_set_2400
++    cmp   r3, r5
++    subge r3, r3, r5
++    mov   r2, #0x0
++    tst   r3, #0x08
++    beq   cbrdll1_scan_set_2300_2                @ if !(dll & 8)
++cbrdll1_scan_set_2300_1:                         @ if  (dll & 8)
++    mov   r1, #0x0
++    tst   r3, #0x08
++    addeq r1, r1, #0x01
++    cmp   r2, #0x05
++    addge r1, r1, #0x01
++    cmp   r1, #0x02
++    beq   cbrdll1_scan_set
++    add   r2, r2, #0x01
++    add   r3, r3, #0x01
++    cmp   r3, r5
++    subge r3, r3, r5
++    b     cbrdll1_scan_set_2300_1
++
++cbrdll1_scan_set_2300_2:
++    and   r1, r3, #0x07
++    cmp   r1, #0x07
++    beq   cbrdll1_scan_set
++    cmp   r2, #0x05
++    bge   cbrdll1_scan_set
++    add   r2, r2, #0x01
++    add   r3, r3, #0x01
++    cmp   r3, r5
++    subge r3, r3, r5
++    b     cbrdll1_scan_set_2300_2
++
++cbrdll1_scan_set_2400:
++    add   r3, r3, #0x05                          @ dll1.1 = dll1.0 + (MADJ >> 2) + 5
++    cmp   r3, r5
++    subge r3, r3, r5
++
++cbrdll1_scan_set:
++    orr   r1, r6, r3, lsl #8
++    ldr   r0, =0x1e6e0068
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0120
++    ldr   r1, [r0]
++    cmp   r1, #0x0
++    beq   MCLK2X_Phase_CBR_Done_DDR3
++    cmp   r1, #0x1
++    beq   MCLK2X_Phase_CBR_Done_DDR2
++    b     CBRDLL1_2400_Call
++
++.LTORG
++
++/******************************************************************************
++ Calibration Code Start
++    SRAM buffer definition
++    0x1E720000 : Pass 1, DLLI MIN value range
++    0x1E720008 : DQS0 DLL valid range, 2nd time CBR
++    0x1E72000C : DQS1 DLL valid range, 2nd time CBR
++    0x1E720010 : DQ0  DLL valid range, Pass 1
++    0x1E720014 : DQ1  DLL valid range, Pass 1
++    ....
++    0x1E720048 : DQ14 DLL valid range, Pass 1
++    0x1E72004C : DQ15 DLL valid range, Pass 1
++    0x1E720090 : DLL1 SAdj record
++    0x1E720094 : DQL  Pass1 finetune result
++    0x1E720098 : DQH  Pass1 finetune result
++    0x1E72009C : DRAM initial time, (us)
++    0x1E7200A0 : CBR3 retry counter
++    0x1E7200A4 : DRAM initial time, (us)
++    0x1E7200A8 : Released date
++    0x1E7200AC : Released SDK version
++    0x1E7200B0 : DQS input mask window for MCR18[4] = 0
++    0x1E7200B4 : DQS input mask window for MCR18[4] = 1
++    0x1E720100 : DQIDLY=00, DLL valid range
++    0x1E720104 : DQIDLY=01, DLL valid range
++    ....
++    0x1E720178 : DQIDLY=30, DLL valid range
++    0x1E72017C : DQIDLY=31, DLL valid range
++    0x1E720180 : DQSI-MCLK2X P-phase pass record DLL2= 0-31
++    0x1E720184 : DQSI-MCLK2X P-phase pass record DLL2=32-63
++    0x1E720188 : DQSI-MCLK2X N-phase pass record DLL2= 0-31
++    0x1E72018C : DQSI-MCLK2X N-phase pass record DLL2=32-63
++ ******************************************************************************/
++Calibration_Start_pre:                           @ Toggle DQSI mask delay
++    ldr r0, =0x1e6e0018
++    ldr r1, [r0]
++    eor r1, r1, #0x10
++    str r1, [r0]
++
++Calibration_Start:
++/* Init SRAM buffer */
++    ldr r1, =0x000000ff
++    ldr r0, =0x1e720000
++    ldr r2, =0x1e720100
++init_sram_start:
++    str r1, [r0]
++    add r0, r0, #4
++    cmp r0, r2
++    blt init_sram_start
++
++    ldr r1, =0x00ff00ff
++    ldr r0, =0x1e720100
++    ldr r2, =0x1e720180
++init_sram_start2:
++    str r1, [r0]
++    add r0, r0, #4
++    cmp r0, r2
++    blt init_sram_start2
++
++    ldr r1, =0x00000000
++    ldr r0, =0x1e720180
++    ldr r2, =0x1e720200
++init_sram_start3:
++    str r1, [r0]
++    add r0, r0, #4
++    cmp r0, r2
++    blt init_sram_start3
++
++    ldr r0, =0x1e6e0068                          @ save the DLL1 SAdj initial value
++    ldr r1, [r0]
++    ldr r0, =0x1e720090
++    str r1, [r0]
++
++/* Start
++  r0 = free
++  r1 = free
++  r2 = free
++  r3 = free
++  r4 = record the return pc value, do not use
++  r5 = pattern table index
++  r6 = pass count
++  r7 = dram DLL2 parameter index (0x1e6e0068), max is 0x4C
++*/
++/******************************************************************************
++ Fine DQI delay and DQSI-MCLK phase
++  r8  = DQIDLY count
++  r9  = DQSI-MCLK2X phase count
++  r10 = pattern fail retry counter, initialize to 2 (fail 2 times)
++  r11 = passcnt accumulator for each DQIDLY
++ *****************************************************************************/
++CBR0_START:
++/* Debug - UART console message */
++    ldr r0, =0x1e784000
++    mov r1, #0x43                                @ 'C'
++    str r1, [r0]
++    mov r1, #0x42                                @ 'B'
++    str r1, [r0]
++    mov r1, #0x52                                @ 'R'
++    str r1, [r0]
++    mov r1, #0x30                                @ '0'
++    str r1, [r0]
++    mov r1, #0x2D                                @ '-'
++    str r1, [r0]
++/* Debug - UART console message */
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, [r0]
++    bic   r1, r1, #0xFF000000
++    bic   r1, r1, #0x00FF0000
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0074                        @ set the testing DRAM size = 1KB
++    ldr   r1, =0x000003FF
++    str   r1, [r0]
++
++    mov   r8, #0x00                              @ init DQIDLY
++    mov   r9, #0x00                              @ init DQSI-MCLK2X phase
++    mov   r11, #0x01                             @ init passcnt accumulator
++
++cbr0_next_dqidly:
++    cmp   r9, #0x00
++    bne   cbr0_next_dqsiphase
++    cmp   r11, #0x00
++    addeq r8, r8, #0x01                          @ jump 1 stage if no pass at previous stage
++    mov   r11, #0x00
++    add   r8, r8, #0x01
++    cmp   r8, #0x1F                              @ max DQIDLY = 31
++    bgt   CBR0_END
++
++/* Debug - UART console message */
++    ldr   r0, =0x1e784000
++    and   r1, r8, #0x07
++    add   r1, r1, #0x30                          @ '0-7'
++    str   r1, [r0]
++/* Debug - UART console message */
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, [r0]
++    bic   r1, r1, #0x00FF0000
++    orr   r1, r1, r8, lsl #16
++    str   r1, [r0]
++    mov   r9, #0x01                              @ '1':p_phase, '0':n_phase
++
++    /* Delay about 3us */                        @ wait DQIDLY load
++    ldr r2, =0x00000003                          @ Set Timer4 Reload = 3 us
++    init_delay_timer
++delay_4:
++    check_delay_timer
++    bne delay_4
++    clear_delay_timer
++    /* end delay 3us */
++
++    b     cbr0_dll2_scan_start
++
++cbr0_next_dqsiphase:
++    ldr   r0, =0x1e6e0018
++    ldr   r1, [r0]
++    orr   r1, r1, r9, lsl #23                    @ set DQSI-MCLK2X phase
++    str   r1, [r0]
++    mov   r9, #0x00
++
++cbr0_dll2_scan_start:
++    mov   r6, #0x00                              @ init pass count
++    mov   r7, #0x00                              @ init DLL2 parameter index
++
++/****************************
++ DLL2 delay margin test loop
++ ***************************/
++cbr0_next_dll2_parameter:
++    ldr   r0, =0x1e6e0068                        @ load DLL2 parameter
++    ldr   r1, [r0]
++    bic   r1, r1, #0x00FF0000
++    bic   r1, r1, #0xFF000000
++    orr   r1, r1, r7, lsl #16
++    str   r1, [r0]
++    ldr   r2, =0x40404040                        @ DLL2 max is 0x40404040
++    cmp   r7, r2
++    bge   cbr0_next_dqidly
++    ldr   r2, =0x01010101
++    add   r7, r7, r2
++
++/* CBRScan3() start */
++    adrl  r5, PATTERN_TABLE                      @ init pattern table index
++/****************************
++ Test pattern iteration loop
++ ***************************/
++cbr0_next_test_pattern:
++    mov   r10, #2                                @ set the retry loop = 2 of each pattern
++    ldr   r1, [r5]                               @ load test pattern
++    ldr   r0, =0x1e6e007c
++    str   r1, [r0]
++    cmp   r1, #0x00                              @ the last data in pattern is 0x00
++    bne   cbr0_test_burst
++
++    and   r3, r7, #0xFF
++    sub   r3, r3, #0x01                          @ we add 1 after loop check so we need to decrease 1
++    cmp   r3, #0x00
++    beq   cbr0_next_dqidly                       @ pass at dlli = 0, invalid
++    add   r6, r6, #0x01                          @ increment pass count
++    add   r11, r11, #0x01                        @ increment pass count
++
++    ldr   r0, =0x1e720180                        @ record DLL2 pass window
++    cmp   r9, #0x00                              @ DQSI-MCLK2X phase check
++    addeq r0, r0, #0x08
++    cmp   r3, #32
++    addge r0, r0, #0x4
++    and   r1, r3, #0x1F
++    mov   r2, #0x1
++    mov   r2, r2, lsl r1
++    ldr   r1, [r0]
++    orr   r1, r1, r2
++    str   r1, [r0]
++
++    ldr   r0, =0x1e720100                        @ record DLL2 min:max value for each DQIDLY
++    add   r0, r0, r8, lsl #2
++    cmp   r9, #0x00                              @ DQSI-MCLK2X phase check
++    beq   cbr0_test_pass_dqsin
++    record_dll2_pass_range
++    b     cbr0_next_dll2_parameter
++
++cbr0_test_pass_dqsin:
++    record_dll2_pass_range_h
++    b     cbr0_next_dll2_parameter
++
++cbr0_test_pattern_fail:
++    cmp   r6, #5                                 @ passcnt >= 5
++    bge   cbr0_next_dqidly
++    ldr   r0, =0x1e720100                        @ reset DLL2 min:max value
++    add   r0, r0, r8, lsl #2
++    ldr   r1, [r0]
++    ldr   r2, =0xFFFF0000
++    ldr   r3, =0x000000FF
++    cmp   r9, #0x00
++    moveq r2, r2, lsr #16
++    moveq r3, r3, lsl #16
++    and   r1, r1, r2
++    orr   r1, r1, r3
++    str   r1, [r0]
++    b     cbr0_next_dll2_parameter               @ CBRScan3() end and test result fail, go to next step
++
++/****************************
++ Test fail retry loop
++ ***************************/
++cbr0_pattern_fail_retry:
++
++/* CBRTest3() start */
++cbr0_test_burst:
++    ldr   r0, =0x1e6e0070
++    ldr   r1, =0x00000000
++    str   r1, [r0]
++    ldr   r1, =0x000000C1
++    str   r1, [r0]
++    ldr   r3, =0x3000
++cbr0_wait_engine_idle_0:
++    ldr   r2, [r0]
++    tst   r2, r3                                 @ D[12] = idle bit
++    beq   cbr0_wait_engine_idle_0
++
++    ldr   r2, [r0]                               @ read fail bit status
++    mov   r1, #0x0
++    str   r1, [r0]
++    mov   r2, r2, lsr #13                        @ D[13] = fail bit
++    cmp   r2, #0x00
++    bne   cbr0_test_fail
++
++cbr0_test_single:
++    ldr   r0, =0x1e6e0070
++    ldr   r1, =0x00000000
++    str   r1, [r0]
++    ldr   r1, =0x00000085
++    str   r1, [r0]
++    ldr   r3, =0x3000
++cbr0_wait_engine_idle_1:
++    ldr   r2, [r0]
++    tst   r2, r3                                 @ D[12] = idle bit
++    beq   cbr0_wait_engine_idle_1
++
++    ldr   r2, [r0]                               @ read fail bit status
++    mov   r1, #0x0
++    str   r1, [r0]
++    mov   r2, r2, lsr #13                        @ D[13] = fail bit
++    cmp   r2, #0x00
++    beq   cbr0_test_pass
++
++/* CBRTest3() end */
++
++cbr0_test_fail:
++    subs  r10, r10, #1
++    bne   cbr0_pattern_fail_retry
++    b     cbr0_test_pattern_fail                 @ CBRScan3() return(0)
++
++cbr0_test_pass:
++    add   r5, r5, #0x04                          @ increase the test pattern index
++    b     cbr0_next_test_pattern
++
++CBR0_END:
++    mov   r5, #0x0                               @ init DQIDLY search count
++    mov   r6, #0x0                               @ init max_margin:g_margin
++    mov   r8, #0x0                               @ init g_side
++    mov   r7, #0x0                               @ init maximum margin DQIDLY,DQSI-MCLK2X phase
++cbr0_search_dll_margin_s:
++    ldr   r0, =0x1e720100
++    add   r0, r0, r5, lsl #2
++    ldr   r1, [r0]
++    and   r2, r1, #0xFF                          @ get dllmin_p
++    mov   r1, r1, lsr #8
++    and   r3, r1, #0xFF                          @ get dllmax_p
++    subs  r2, r3, r2                             @ get margin-P
++    movmi r2, #0x0
++    mov   r1, r1, lsr #8
++    and   r3, r1, #0xFF                          @ get dllmin_n
++    mov   r1, r1, lsr #8
++    and   r1, r1, #0xFF                          @ get dllmax_n
++    subs  r3, r1, r3                             @ get margin-N
++    movmi r3, #0x0
++    add   r1, r2, r3
++    cmp   r1, #0x0
++    beq   cbr0_search_dll_margin_e               @ if margin-P = 0 && margin-N = 0
++
++    ldr   r9, [r0]
++    ldr   r0, =0x1e720180
++    cmp   r2, r3
++    orrlt r5, r5, #0x80                          @ margin-N > margin-P
++    addlt r0, r0, #0x08
++    movlt r9, r9, lsr #16
++    movge r3, r2                                 @ max(margin-P/N)
++    add   r2, r3, #0x2                           @ define +/- 2 steps of variation
++    mov   r1, r6, lsr #16
++    cmp   r2, r1
++    blt   cbr0_search_dll_margin_e               @ if max(margin-P/N) + 2 < max_margin
++
++    and   r1, r9, #0xFF                          @ r1 = dlli counter
++    cmp   r1, #32
++    ldrge r2, [r0, #0x4]                         @ load pass window
++    ldrlt r2, [r0]
++    and   r1, r1, #0x1F
++    mov   r10, #0x1                              @ init test bit mask
++    mov   r10, r10, lsl r1
++    and   r1, r9, #0xFF
++cbr0_search_dllmin_margin_s:
++    tst   r2, r10
++    beq   cbr0_search_dllmin_margin_e
++    mov   r10, r10, lsr #1
++    cmp   r1, #32
++    ldreq r2, [r0]
++    ldreq r10, =0x80000000
++    subs  r1, r1, #0x1
++    bne   cbr0_search_dllmin_margin_s
++
++cbr0_search_dllmin_margin_e:
++    and   r2, r9, #0xFF
++    sub   r11, r2, r1                            @ get dllmin side margin
++
++    mov   r9, r9, lsr #8
++    and   r1, r9, #0xFF                          @ r1 = dlli counter
++    cmp   r1, #32
++    ldrge r2, [r0, #0x4]                         @ load pass window
++    ldrlt r2, [r0]
++    and   r1, r1, #0x1F
++    mov   r10, #0x1                              @ init test bit mask
++    mov   r10, r10, lsl r1
++    and   r1, r9, #0xFF
++cbr0_search_dllmax_margin_s:
++    tst   r2, r10
++    beq   cbr0_search_dllmax_margin_e
++    mov   r10, r10, lsl #1
++    cmp   r1, #31
++    ldreq r2, [r0, #0x4]
++    ldreq r10, =0x00000001
++    add   r1, r1, #0x1
++    cmp   r1, #64
++    bne   cbr0_search_dllmax_margin_s
++
++cbr0_search_dllmax_margin_e:
++    and   r2, r9, #0xFF
++    sub   r1, r1, r2                             @ get dllmax side margin
++    cmp   r1, r11
++    movlt r11, r1                                @ get side_margin
++
++cbr0_check_dll_margin:                           @ if max(margin-P/N) > g_margin && side_margin >= g_side && dqidly <= 20
++    cmp   r5, #20
++    bgt   cbr0_check_dll_margin2
++    and   r1, r6, #0xFF
++    cmp   r3, r1
++    ble   cbr0_check_dll_margin3
++    cmp   r11, r8
++    bge   cbr0_set_dll_margin
++
++cbr0_check_dll_margin2:                          @ if max(margin-P/N) > g_margin+1 && side_margin >= g_side)
++    and   r1, r6, #0xFF
++    add   r2, r1, #0x1
++    cmp   r3, r2
++    ble   cbr0_check_dll_margin3
++    cmp   r11, r8
++    bge   cbr0_set_dll_margin
++
++cbr0_check_dll_margin3:                          @ if side_margin > g_side && g_side < 8
++    cmp   r8, #8
++    bge   cbr0_search_dll_margin_e
++    cmp   r11, r8
++    ble   cbr0_search_dll_margin_e
++
++cbr0_set_dll_margin:
++    mov   r1, r6, lsr #16
++    cmp   r3, r1
++    bicgt r6, r6, #0x00FF0000
++    orrgt r6, r6, r3, lsl #16
++    bic   r6, r6, #0x000000FF
++    orr   r6, r6, r3
++    mov   r7, r5
++    mov   r8, r11
++
++cbr0_search_dll_margin_e:
++    and   r5, r5, #0x7F
++    add   r5, r5, #0x01
++    cmp   r5, #0x20                              @ last DQIDLY
++    blt   cbr0_search_dll_margin_s
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, [r0]
++    bic   r1, r1, #0x00FF0000
++    orr   r1, r1, r7, lsl #16
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0068
++    ldr   r1, [r0]
++    bic   r1, r1, #0x00FF0000
++    bic   r1, r1, #0xFF000000
++    str   r1, [r0]
++
++    /* Delay about 5us */
++    ldr r2, =0x00000005                          @ Set Timer5 Reload = 5 us
++    init_delay_timer
++delay_5:
++    check_delay_timer
++    bne delay_5
++    clear_delay_timer
++    /* end delay 5us */
++
++    ldr r0, =0x1e6e000c                          @ Set refresh cycle
++    ldr r1, =0x00005C01
++    str r1, [r0]
++
++/******************************************************************************
++ Fine tune per bit DQ input delay -- Pass 1, left edge align
++  r8  = free
++  r9  = DQ fail bit accumulator
++  r10 = pattern fail counter, initialize to 5 (fail 5 times)
++  r11 = free
++ *****************************************************************************/
++CBR1_START:
++/* Debug - UART console message */
++    ldr r0, =0x1e784000
++    mov r1, #0x0D                                @ '\r'
++    str r1, [r0]
++    mov r1, #0x0A                                @ '\n'
++    str r1, [r0]
++    mov r1, #0x43                                @ 'C'
++    str r1, [r0]
++    mov r1, #0x42                                @ 'B'
++    str r1, [r0]
++    mov r1, #0x52                                @ 'R'
++    str r1, [r0]
++    mov r1, #0x31                                @ '1'
++    str r1, [r0]
++/* Debug - UART console message */
++
++    mov   r6, #0x00                              @ init pass count
++    mov   r7, #0x00                              @ init DLL2 parameter index
++
++/****************************
++ DLL2 delay margin test loop
++ ***************************/
++cbr1_next_dll2_parameter:
++    ldr   r0, =0x1e6e0068                        @ load DLL2 parameter
++    ldr   r1, [r0]
++    bic   r1, r1, #0x00FF0000
++    bic   r1, r1, #0xFF000000
++    orr   r1, r1, r7, lsl #16
++    str   r1, [r0]
++    ldr   r2, =0x40404040                        @ parameter's max is to 0x40404040
++    cmp   r7, r2
++    bge   CBR1_END
++    ldr   r2, =0x01010101
++    add   r7, r7, r2
++
++    ldr   r0, =0x1e6e0074                        @ set the testing DRAM size = 4KB
++    ldr   r1, =0x00000FFF
++    str   r1, [r0]
++
++/* CBRScan2() start */
++    ldr   r9, =0xFFFF                            @ init test status
++    adrl  r5, PATTERN_TABLE                      @ init pattern table index
++/****************************
++ Test pattern iteration loop
++ ***************************/
++cbr1_next_test_pattern:
++    mov   r10, #5                                @ set the retry loop of each pattern
++    ldr   r1, [r5]                               @ load test pattern
++    ldr   r0, =0x1e6e007c
++    str   r1, [r0]
++    cmp   r1, #0x00                              @ the last data in pattern is 0x00
++    bne   cbr1_test_single
++
++cbr1_test_pattern_end:
++    cmp   r9, #0x00
++    bne   cbr1_test_pass_dqi
++    cmp   r6, #10
++    bge   CBR1_END
++    b     cbr1_next_dll2_parameter               @ CBRScan2() end and test result fail, go to next step
++
++cbr1_test_pass_dqi:
++    and   r3, r7, #0xFF
++    sub   r3, r3, #0x01                          @ we add 1 after loop check so we need to decrease 1
++    add   r6, r6, #0x01                          @ increment pass count
++    ldr   r0, =0x1e720010
++    mov   r8, #0x01
++cbr1_test_pass_dqi_loop_s:
++    tst   r9, r8
++    beq   cbr1_test_pass_dqi_loop_e
++    record_dll2_pass_range
++
++cbr1_test_pass_dqi_loop_e:
++    add   r0, r0, #0x04
++    mov   r8, r8, lsl #1
++    ldr   r1, =0xFFFF
++    tst   r8, r1
++    bne   cbr1_test_pass_dqi_loop_s
++    b     cbr1_next_dll2_parameter
++
++/****************************
++ Test fail retry loop
++ ***************************/
++cbr1_pattern_fail_retry:
++
++/* CBRTest2() start */
++cbr1_test_single:
++    ldr   r0, =0x1e6e0070
++    ldr   r1, =0x00000000
++    str   r1, [r0]
++    ldr   r1, =0x00000005
++    str   r1, [r0]
++    ldr   r3, =0x1000
++    ldr   r1, =0x1000
++cbr1_wait_engine_idle_0:
++    subs  r1, r1, #1
++    beq   cbr1_test_single_end
++    ldr   r2, [r0]
++    tst   r2, r3                                 @ D[12] = idle bit
++    beq   cbr1_wait_engine_idle_0
++
++cbr1_test_single_end:
++    ldr   r0, =0x1e6e0078                        @ read fail bit status
++    ldr   r11, [r0]
++    orr   r11, r11, r11, lsr #16
++    bic   r11, r11, #0xFF000000
++    bic   r11, r11, #0x00FF0000
++
++    ldr   r1, =0xFFFF
++    cmp   r11, r1
++    beq   cbr1_test_fail
++
++cbr1_test_burst:
++    ldr   r0, =0x1e6e0070
++    ldr   r2, =0x00000000
++    str   r2, [r0]
++    ldr   r2, =0x00000041
++    str   r2, [r0]
++    ldr   r3, =0x1000
++    ldr   r1, =0x1000
++cbr1_wait_engine_idle_1:
++    subs  r1, r1, #1
++    beq   cbr1_test_burst_end
++    ldr   r2, [r0]
++    tst   r2, r3                                 @ D[12] = idle bit
++    beq   cbr1_wait_engine_idle_1
++
++cbr1_test_burst_end:
++    ldr   r0, =0x1e6e0078                        @ read fail bit status
++    ldr   r2, [r0]
++    orr   r2, r2, r2, lsr #16
++    bic   r2, r2, #0xFF000000
++    bic   r2, r2, #0x00FF0000
++    orr   r11, r11, r2
++
++    ldr   r2, =0xFFFF
++    cmp   r11, r2
++    bne   cbr1_test_pass
++/* CBRTest2() end */
++
++cbr1_test_fail:
++    subs  r10, r10, #1
++    bne   cbr1_pattern_fail_retry
++    mov   r9, #0x00
++    b     cbr1_test_pattern_end                  @ CBRScan2() return(0)
++
++cbr1_test_pass:
++    ldr   r1, =0xFFFF                            @ record the pass bit
++    eor   r11, r11, r1
++    and   r9, r9, r11                            @ DQ pass bit
++    cmp   r9, #0x00
++    beq   cbr1_test_pattern_end                  @ CBRScan2() return(0)
++
++    add   r5, r5, #0x04                          @ increase the test pattern index
++    b     cbr1_next_test_pattern
++
++CBR1_END:
++    mov   r5, #0x0                               @ init DQ DLL_min sum
++    mov   r6, #0x0                               @ init DQ DLL_min valid count
++    ldr   r0, =0x1e72000c
++    ldr   r3, =0x1e720050
++cbr1_search_dllmin_s:
++    add   r0, r0, #0x04
++    cmp   r0, r3
++    beq   cbr1_search_dllmin_e
++    ldr   r1, [r0]
++    mov   r2, r1, lsr #8
++    and   r2, r2, #0xFF                          @ get dllmax
++    and   r1, r1, #0xFF                          @ get dllmin
++    subs  r2, r2, r1                             @ dllmax - dllmin
++    bmi   cbr1_search_dllmin_s                   @ no valid margin found, bypass fine tune
++    cmp   r2, #10                                @ (dllmax - dllmin) < 10
++    blt   cbr1_search_dllmin_s                   @ no enough margin found, bypass fine tune
++    add   r5, r5, r1
++    add   r6, r6, #1
++    b     cbr1_search_dllmin_s
++
++cbr1_search_dllmin_e:
++    cmp   r6, #16
++    bne   Calibration_Start_pre                  @ not all bits valid, retry again
++
++    mov   r5, r5, lsr #4
++    ldr   r0, =0x1e720000
++    str   r5, [r0]
++
++    mov   r6, #0x00                              @ init DQL CBR value
++    ldr   r0, =0x1e720030
++    ldr   r7, =0x1e72000c
++cbr1_set_result_dql:
++    sub   r0, r0, #4
++    cmp   r0, r7
++    beq   cbr1_set_result_next
++    mov   r6, r6, lsl #3
++    ldr   r1, [r0]
++    mov   r2, r1, lsr #8
++    and   r2, r2, #0xFF                          @ get dllmax
++    and   r1, r1, #0xFF                          @ get dllmin
++    mov   r3, r1                                 @ dll = dllmin
++    cmp   r5, r3
++    blt   cbr1_set_result_dql_neg
++    sub   r1, r5, r3
++    mov   r2, #19
++    mul   r1, r2, r1
++    mov   r1, r1, lsr #5                         @ dqi_tune = ((gold_dll - dll) * 19) >> 5
++    cmp   r1, #2                                 @ dqi_tune max = 2
++    movgt r1, #2
++    orr   r6, r6, r1
++    b     cbr1_set_result_dql
++
++cbr1_set_result_dql_neg:
++    sub   r1, r3, r5
++    mov   r2, #19
++    mul   r1, r2, r1
++    mov   r1, r1, lsr #5                         @ dqi_tune = ((gold_dll - dll) * 19) >> 5
++    cmp   r1, #2                                 @ dqi_tune max = -2
++    movgt r1, #2
++    mov   r2, #8
++    sub   r1, r2, r1
++    and   r1, r1, #7
++    orr   r6, r6, r1
++    b     cbr1_set_result_dql
++
++cbr1_set_result_next:
++    ldr   r0, =0x1e6e0080                        @ save DQL fine tune result
++    str   r6, [r0]
++    ldr   r0, =0x1e720094
++    str   r6, [r0]
++
++    mov   r6, #0x00                              @ init DQH CBR value
++    ldr   r0, =0x1e720050
++    ldr   r7, =0x1e72002c
++cbr1_set_result_dqh:
++    sub   r0, r0, #4
++    cmp   r0, r7
++    beq   cbr1_set_result_end
++    mov   r6, r6, lsl #3
++    ldr   r1, [r0]
++    mov   r2, r1, lsr #8
++    and   r2, r2, #0xFF                          @ get dllmax
++    and   r1, r1, #0xFF                          @ get dllmin
++    mov   r3, r1                                 @ dll = dllmin
++    cmp   r5, r3
++    blt   cbr1_set_result_dqh_neg
++    sub   r1, r5, r3
++    mov   r2, #19
++    mul   r1, r2, r1
++    mov   r1, r1, lsr #5                         @ dqi_tune = ((gold_dll - dll) * 19) >> 5
++    cmp   r1, #3                                 @ dqi_tune max = 2
++    movgt r1, #3
++    subs  r1, r1, #1
++    movmi r1, #7
++    orr   r6, r6, r1
++    b     cbr1_set_result_dqh
++
++cbr1_set_result_dqh_neg:
++    sub   r1, r3, r5
++    mov   r2, #19
++    mul   r1, r2, r1
++    mov   r1, r1, lsr #5                         @ dqi_tune = ((gold_dll - dll) * 19) >> 5
++    add   r1, r1, #1
++    cmp   r1, #2                                 @ dqi_tune max = -2
++    movgt r1, #2
++    mov   r2, #8
++    sub   r1, r2, r1
++    and   r1, r1, #7
++    orr   r6, r6, r1
++    b     cbr1_set_result_dqh
++
++cbr1_set_result_end:
++    ldr   r0, =0x1e6e0084                        @ save DQH fine tune result
++    str   r6, [r0]
++    ldr   r0, =0x1e720098
++    str   r6, [r0]
++
++/******************************************************************************
++ Search the DLL2 detail margin
++ *****************************************************************************/
++    ldr   r0, =0x1e7200a0
++    mov   r1, #0
++    str   r1, [r0]
++
++CBR3_START:
++/* Debug - UART console message */
++    ldr r0, =0x1e784000
++    mov r1, #0x33                                @ '3'
++    str r1, [r0]
++/* Debug - UART console message */
++
++    mov   r6, #0x00                              @ init pass count
++    mov   r7, #0x00                              @ init DLL2 parameter index
++    ldr   r1, =0x000000ff
++    ldr   r0, =0x1e720008                        @ init DQL dllmax,dllmin
++    str   r1, [r0]
++    ldr   r0, =0x1e72000c                        @ init DQH dllmax,dllmin
++    str   r1, [r0]
++
++    ldr   r0, =0x1e7200a0                        @ CBR3 iteration counter
++    ldr   r1, [r0]
++    add   r1, r1, #1
++    str   r1, [r0]
++
++/****************************
++ DLL2 delay margin test loop
++ ***************************/
++cbr3_next_dll2_parameter:
++    ldr   r0, =0x1e6e0068                        @ load DLL2 parameter
++    ldr   r1, [r0]
++    bic   r1, r1, #0x00FF0000
++    bic   r1, r1, #0xFF000000
++    orr   r1, r1, r7, lsl #16
++    str   r1, [r0]
++    ldr   r2, =0x40404040                        @ parameter's max is to 0x40404040
++    cmp   r7, r2
++    bge   CBR3_END
++    ldr   r2, =0x01010101
++    add   r7, r7, r2
++
++    ldr   r0, =0x1e6e0074                        @ set the testing DRAM size = 64KB
++    ldr   r1, =0x0000FFFF
++    str   r1, [r0]
++
++/* CBRScan() start */
++    mov   r9, #0x03                              @ init test status
++    adrl  r5, PATTERN_TABLE                      @ init pattern table index
++/****************************
++ Test pattern iteration loop
++ ***************************/
++cbr3_next_test_pattern:
++    mov   r10, #5                                @ set the retry loop of each pattern
++    ldr   r1, [r5]                               @ load test pattern
++    ldr   r0, =0x1e6e007c
++    str   r1, [r0]
++    cmp   r1, #0x00                              @ the last data in pattern is 0x00
++    bne   cbr3_test_single
++
++cbr3_test_pattern_end:
++    cmp   r9, #0x00
++    bne   cbr3_test_pass_dql
++    cmp   r6, #10
++    bge   CBR3_END
++    b     cbr3_next_dll2_parameter               @ CBRScan() end and test result fail, go to next step
++
++cbr3_test_pass_dql:
++    and   r3, r7, #0xFF
++    sub   r3, r3, #0x01                          @ we add one after loop check so we need to decrease 1
++    add   r6, r6, #0x01                          @ increment pass count
++    tst   r9, #0x01
++    beq   cbr3_test_pass_dqh
++
++    ldr   r0, =0x1E720008
++    record_dll2_pass_range
++
++cbr3_test_pass_dqh:
++    tst   r9, #0x02
++    beq   cbr3_next_dll2_parameter
++    ldr   r0, =0x1E72000c
++    record_dll2_pass_range
++    b     cbr3_next_dll2_parameter
++
++/****************************
++ Test fail retry loop
++ ***************************/
++cbr3_pattern_fail_retry:
++
++/* CBRTest() start */
++cbr3_test_single:
++    ldr   r0, =0x1e6e0070
++    ldr   r1, =0x00000000
++    str   r1, [r0]
++    ldr   r1, =0x00000005
++    str   r1, [r0]
++    ldr   r3, =0x1000
++    ldr   r8, =0x10000
++cbr3_wait_engine_idle_0:
++    subs  r8, r8, #1
++    beq   cbr3_test_single_end
++    ldr   r2, [r0]
++    tst   r2, r3                                 @ D[12] = idle bit
++    beq   cbr3_wait_engine_idle_0
++
++cbr3_test_single_end:
++    ldr   r0, =0x1e6e0078                        @ read fail bit status
++    ldr   r11, [r0]
++    orr   r11, r11, r11, lsr #16
++    bic   r11, r11, #0xFF000000
++    bic   r11, r11, #0x00FF0000
++
++    ldr   r1, =0xFF
++    tst   r11, r1
++    beq   cbr3_test_burst
++    tst   r11, r1, lsl #8
++    bne   cbr3_test_fail
++
++cbr3_test_burst:
++    mov   r1, #0x00                              @ initialize loop index, r1 is loop's index
++cbr3_test_burst_loop:
++    ldr   r0, =0x1e6e0070
++    ldr   r2, =0x00000000
++    str   r2, [r0]
++    mov   r2, r1, lsl #3
++    orr   r2, r2, #0x41                          @ test command = 0x41 | (datagen << 3)
++    str   r2, [r0]
++    ldr   r3, =0x1000
++    ldr   r8, =0x10000
++cbr3_wait_engine_idle_1:
++    subs  r8, r8, #1
++    beq   cbr3_test_burst_end
++    ldr   r2, [r0]
++    tst   r2, r3                                 @ D[12] = idle bit
++    beq   cbr3_wait_engine_idle_1
++
++cbr3_test_burst_end:
++    ldr   r0, =0x1e6e0078                        @ read fail bit status
++    ldr   r2, [r0]
++    orr   r2, r2, r2, lsr #16
++    bic   r2, r2, #0xFF000000
++    bic   r2, r2, #0x00FF0000
++    orr   r11, r11, r2
++
++    ldr   r2, =0xFF
++    tst   r11, r2
++    beq   cbr3_next_test_burst_mode
++    tst   r11, r2, lsl #8
++    beq   cbr3_next_test_burst_mode
++/* CBRTest() end */
++
++cbr3_test_fail:
++    subs  r10, r10, #1
++    bne   cbr3_pattern_fail_retry
++    mov   r9, #0x00
++    b     cbr3_test_pattern_end                  @ CBRScan() return(0)
++
++cbr3_next_test_burst_mode:
++    add   r1, r1, #1                             @ increase the test mode index
++    cmp   r1, #0x08                              @ there are 8 modes
++    bne   cbr3_test_burst_loop
++
++    ldr   r1, =0xFF                              @ record the pass byte
++    tst   r11, r1
++    andne r9, r9, #0x02                          @ DQL fail
++    tst   r11, r1, lsl #8
++    andne r9, r9, #0x01                          @ DQH fail
++    cmp   r9, #0x00
++    beq   cbr3_test_pattern_end                  @ CBRScan() return(0)
++
++    add   r5, r5, #0x04                          @ increase the test pattern index
++    b     cbr3_next_test_pattern
++
++CBR3_END:
++    ldr   r0, =0x1e72000c                        @ check DQH margin
++    ldr   r1, [r0]
++    mov   r2, r1, lsr #8
++    and   r2, r2, #0xFF                          @ get dllmax
++    and   r1, r1, #0xFF                          @ get dllmin
++    subs  r5, r2, r1                             @ dllmax - dllmin
++    bmi   CBR3_START                             @ no valid margin found, retry again
++    cmp   r5, #10                                @ (dllmax - dllmin) < 10
++    blt   CBR3_START                             @ no enough margin found, retry again
++    add   r2, r1, r2                             @ (dllmin[1] + dllmax[1] + 1) >> 1
++    add   r2, r2, #0x01
++    mov   r1, r2, lsr #1
++    mov   r3, r1, lsl #8
++    ldr   r1, [r0]                               @ store the dll search result
++    bic   r1, r1, #0xFF000000
++    bic   r1, r1, #0x00FF0000
++    orr   r1, r1, r3, lsl #8
++    str   r1, [r0]
++
++    ldr   r0, =0x1e720008                        @ check DQL margin
++    ldr   r1, [r0]
++    mov   r2, r1, lsr #8
++    and   r2, r2, #0xFF                          @ get dllmax
++    and   r1, r1, #0xFF                          @ get dllmin
++    subs  r5, r2, r1                             @ dllmax - dllmin
++    bmi   CBR3_START                             @ no valid margin found, retry again
++    cmp   r5, #10                                @ (dllmax - dllmin) < 10
++    blt   CBR3_START                             @ no enough margin found, retry again
++    add   r2, r1, r2                             @ (dllmin[0] + dllmax[0] + 1) >> 1
++    add   r2, r2, #0x01
++    mov   r1, r2, lsr #1
++    ldr   r2, [r0]                               @ store the dll search result
++    bic   r2, r2, #0xFF000000
++    bic   r2, r2, #0x00FF0000
++    orr   r2, r2, r1, lsl #16
++    str   r2, [r0]
++    orr   r3, r3, r1
++
++    ldr   r0, =0x1e6e0068                        @ save the result dll value
++    ldr   r1, [r0]
++    bic   r1, r1, #0xFF000000
++    bic   r1, r1, #0x00FF0000
++    orr   r1, r1, r3, lsl #16
++    str   r1, [r0]
++    b     CBR4_START
++
++.LTORG
++
++/******************************************************************************
++ Search the DQS input mask margin
++ *****************************************************************************/
++CBR4_START:
++/* Debug - UART console message */
++    ldr r0, =0x1e784000
++    mov r1, #0x34                                @ '4'
++    str r1, [r0]
++/* Debug - UART console message */
++
++    ldr   r0, =0x1e6e0074                        @ set the testing DRAM size = 4KB
++    ldr   r1, =0x00000FFF
++    str   r1, [r0]
++
++    mov   r8, #0x00                              @ init MCR18[4]
++    ldr   r1, =0x000000ff
++    ldr   r0, =0x1e7200b0                        @ init MCR18[4]=0 max,min
++    str   r1, [r0]
++    ldr   r0, =0x1e7200b4                        @ init MCR18[4]=1 max,min
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, [r0]
++    bic   r1, r1, #0x0000001F
++    str   r1, [r0]
++
++    b     cbr4_scan_start
++
++cbr4_next_maskdly:
++    add   r8, r8, #0x01
++    and   r2, r8, #0x01
++    ldr   r0, =0x1e6e0018
++    ldr   r1, [r0]
++    bic   r1, r1, #0x0000001F
++    orr   r1, r1, r2, lsl #4
++    str   r1, [r0]
++    cmp   r8, #0x02
++    bge   CBR4_END
++
++cbr4_scan_start:
++    mov   r6, #0x00                              @ init pass count
++    mov   r7, #0x00                              @ init mask delay
++
++/****************************
++ DQS Mask delay margin test loop
++ ***************************/
++cbr4_next_parameter:
++    cmp   r7, #0x10                              @ max delay = 0xF
++    bge   cbr4_next_maskdly
++    ldr   r0, =0x1e6e0018                        @ load MCR18 parameter
++    ldr   r1, [r0]
++    bic   r1, r1, #0x0000000F
++    orr   r1, r1, r7
++    str   r1, [r0]
++    add   r7, r7, #0x01
++
++/* CBRScan3() start */
++    adrl  r5, PATTERN_TABLE                      @ init pattern table index
++/****************************
++ Test pattern iteration loop
++ ***************************/
++cbr4_next_test_pattern:
++    mov   r10, #2                                @ set the retry loop = 2 of each pattern
++    ldr   r1, [r5]                               @ load test pattern
++    ldr   r0, =0x1e6e007c
++    str   r1, [r0]
++    cmp   r1, #0x00                              @ the last data in pattern is 0x00
++    bne   cbr4_test_burst
++
++    and   r3, r7, #0xFF
++    sub   r3, r3, #0x01                          @ we add 1 after loop check so we need to decrease 1
++    add   r6, r6, #0x01                          @ increment pass count
++
++    ldr   r0, =0x1e7200b0                        @ record pass window
++    add   r0, r0, r8, lsl #2
++    record_dll2_pass_range
++    mov   r2, #0x01
++    add   r1, r1, r2, lsl #16
++    str   r1, [r0]
++    b     cbr4_next_parameter
++
++cbr4_test_pattern_fail:
++    cmp   r6, #5                                 @ passcnt >= 5
++    bge   cbr4_next_maskdly
++    b     cbr4_next_parameter
++
++/****************************
++ Test fail retry loop
++ ***************************/
++cbr4_pattern_fail_retry:
++
++/* CBRTest3() start */
++cbr4_test_burst:
++    ldr   r0, =0x1e6e0070
++    ldr   r1, =0x00000000
++    str   r1, [r0]
++    ldr   r1, =0x000000C1
++    str   r1, [r0]
++    ldr   r3, =0x3000
++cbr4_wait_engine_idle_0:
++    ldr   r2, [r0]
++    tst   r2, r3                                 @ D[12] = idle bit
++    beq   cbr4_wait_engine_idle_0
++
++    ldr   r2, [r0]                               @ read fail bit status
++    mov   r1, #0x0
++    str   r1, [r0]
++    mov   r2, r2, lsr #13                        @ D[13] = fail bit
++    cmp   r2, #0x00
++    bne   cbr4_test_fail
++
++cbr4_test_single:
++    ldr   r0, =0x1e6e0070
++    ldr   r1, =0x00000000
++    str   r1, [r0]
++    ldr   r1, =0x00000085
++    str   r1, [r0]
++    ldr   r3, =0x3000
++cbr4_wait_engine_idle_1:
++    ldr   r2, [r0]
++    tst   r2, r3                                 @ D[12] = idle bit
++    beq   cbr4_wait_engine_idle_1
++
++    ldr   r2, [r0]                               @ read fail bit status
++    mov   r1, #0x0
++    str   r1, [r0]
++    mov   r2, r2, lsr #13                        @ D[13] = fail bit
++    cmp   r2, #0x00
++    beq   cbr4_test_pass
++
++/* CBRTest3() end */
++
++cbr4_test_fail:
++    subs  r10, r10, #1
++    bne   cbr4_pattern_fail_retry
++    b     cbr4_test_pattern_fail                 @ CBRScan3() return(0)
++
++cbr4_test_pass:
++    add   r5, r5, #0x04                          @ increase the test pattern index
++    b     cbr4_next_test_pattern
++
++CBR4_END:
++    ldr   r0, =0x1e7200b0                        @ check mask margin
++    ldr   r1, [r0]
++    add   r0, r0, #0x04
++    ldr   r2, [r0]
++    ands  r6, r2, #0xFF                          @ get min of MCR18[4] = 1
++    bne   cbr4_noset_delay
++    ands  r5, r1, #0xFF                          @ get min of MCR18[4] = 0
++    bne   cbr4_set_delay
++    mov   r1, r1, lsr #8                         @ get max of MCR18[4] = 0
++    and   r1, r1, #0xFF
++    mov   r2, r2, lsr #8                         @ get max of MCR18[4] = 1
++    and   r2, r2, #0xFF
++    sub   r1, r1, r5
++    sub   r2, r2, r6
++    cmp   r1, r2
++    bge   cbr4_noset_delay
++
++cbr4_set_delay:
++    ldr   r0, =0x1e6e0018
++    ldr   r1, [r0]
++    orr   r1, r1, #0x10
++    str   r1, [r0]
++
++cbr4_noset_delay:
++    ldr   r0, =0x1e6e0070
++    ldr   r1, =0x00000000
++    str   r1, [r0]
++
++/******************************************************************************
++ CBR Finish
++ *****************************************************************************/
++/******************************************************************************
++ Check DRAM Size
++ *****************************************************************************/
++    ldr   r0, =0x1e6e2070
++    ldr   r1, [r0]
++    bic   r1, r1, #0xFEFFFFFF                    @ bit[24]=1 => DDR2
++    mov   r2, r1, lsr #24
++    cmp   r2, #0x01
++    beq   check_ddr2_size
++
++    ldr   r0, =0x1e6e0004
++    ldr   r5, [r0]
++    bic   r5, r5, #0x00000003                    @ record MCR04
++    orr   r1, r5, #0x3
++    str   r1, [r0]                               @ set to 4Gbit
++    ldr   r6, =0x003F2217
++#if defined(CONFIG_DRAM_336)
++    ldr   r6, =0x00361C13
++#endif
++    b     check_dram_size
++
++check_ddr2_size:
++    ldr   r0, =0x1e6e0004
++    ldr   r5, [r0]
++    bic   r5, r5, #0x00000023                    @ record MCR04
++    orr   r1, r5, #0x23
++    str   r1, [r0]                               @ set to 4Gbit
++    ldr   r6, =0x3F2B1B16
++#if defined(CONFIG_DRAM_336)
++    ldr   r6, =0x3B231612
++#endif
++
++    ldr   r0, =0x40000000
++    ldr   r1, =0x1817191A
++    str   r1, [r0]
++    ldr   r0, =0x40002000
++    ldr   r1, =0x73616532
++    str   r1, [r0]
++    ldr   r0, =0x40000000
++    ldr   r1, =0x1817191A
++    ldr   r2, [r0]
++    cmp   r1, r2
++    bne   check_dram_size_end                    @ == 512Mbit
++    orr   r5, r5, #0x20                          @ >= 1Gbit
++    mov   r6, r6, lsr #8
++
++check_dram_size:
++    ldr   r0, =0x50100000
++    ldr   r1, =0x41424344
++    str   r1, [r0]
++    ldr   r0, =0x48100000
++    ldr   r1, =0x25262728
++    str   r1, [r0]
++    ldr   r0, =0x40100000
++    ldr   r1, =0x191A1B1C
++    str   r1, [r0]
++    ldr   r0, =0x50100000
++    ldr   r1, =0x41424344
++    ldr   r2, [r0]
++    cmp   r2, r1                                 @ == 4Gbit
++    orreq r5, r5, #0x03
++    moveq r6, r6, lsr #16
++    beq   check_dram_size_end
++    ldr   r0, =0x48100000
++    ldr   r1, =0x25262728
++    ldr   r2, [r0]
++    cmp   r2, r1                                 @ == 2Gbit
++    orreq r5, r5, #0x02
++    moveq r6, r6, lsr #8
++    beq   check_dram_size_end
++    orr   r5, r5, #0x01                          @ == 1Gbit
++
++check_dram_size_end:
++    ldr   r0, =0x1e6e0004
++    str   r5, [r0]
++    ldr   r0, =0x1e6e0014
++    ldr   r1, [r0]
++    bic   r1, r1, #0x000000FF
++    and   r6, r6, #0xFF
++    orr   r1, r1, r6
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0120                        @ VGA Compatible Mode
++    ldr   r1, =0x000050C0                        @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr   r1, =0x00004DC0
++#endif
++    str   r1, [r0]
++
++/******************************************************************************
++ Version Number
++ *****************************************************************************/
++    ldr   r0, =0x1e7200a8
++    ldr   r1, =0x20141229                        @ released date
++    str   r1, [r0]
++
++    add   r0, r0, #4
++    ldr   r1, =0x00000060                        @ released SDK version
++    str   r1, [r0]
++
++/******************************************************************************
++ Calibration Code End
++ ******************************************************************************/
++
++set_scratch:
++    /*Set Scratch register Bit 6 after ddr initial finished */
++    ldr r0, =0x1e6e2040
++    ldr r1, [r0]
++    orr r1, r1, #0x40
++    str r1, [r0]
++
++/* Debug - UART console message */
++    ldr r0, =0x1e784000
++    mov r1, #0x44                                @ 'D'
++    str r1, [r0]
++    mov r1, #0x6F                                @ 'o'
++    str r1, [r0]
++    mov r1, #0x6E                                @ 'n'
++    str r1, [r0]
++    mov r1, #0x65                                @ 'e'
++    str r1, [r0]
++    mov r1, #0x0D                                @ '\r'
++    str r1, [r0]
++    mov r1, #0x0A                                @ '\n'
++    str r1, [r0]
++/* Debug - UART console message */
++
++/******************************************************************************
++ Solve PCIe ASPM issue, only applied to AST2300 series
++ ******************************************************************************/
++    ldr r0, =0x1e6e207c                          @ Check bounding for AST1150 existence
++    ldr r1, [r0]
++    mov r2, r1, lsr #24
++    cmp r2, #0x01
++    bne platform_exit                            @ not match AST2300
++    bic r1, r1, #0xFFFFFCFF
++    mov r1, r1, lsr #8
++    cmp r1, #0x02
++    beq platform_exit                            @ match AST1050
++
++    ldr r0, =0x1e6e2004                          @ Disable I2C controller reset
++    ldr r1, [r0]
++    orr r1, r1, #0x04
++    str r1, [r0]
++    bic r1, r1, #0x04
++    str r1, [r0]
++
++    ldr r0, =0x1e78a054                          @ Check I2C bus state, if busy then quit
++    ldr r1, [r0]
++    mov r1, r1, lsr #17
++    and r1, r1, #0x03
++    cmp r1, #0x03
++    bne platform_exit
++
++    ldr r0, =0x1e78a040                          @ Init I2C1 controller
++    mov r1, #0x01
++    orr r1, r1, r1, lsl #16
++    str r1, [r0]
++
++    ldr r0, =0x1e78a044
++    ldr r1, =0x77776704
++    str r1, [r0]
++
++    mov r1, #0x0
++    ldr r0, =0x1e78a048
++    str r1, [r0]
++    ldr r0, =0x1e78a04c
++    str r1, [r0]
++
++    ldr r0, =0x1e78a050
++    ldr r1, =0xFFFFFFFF
++    str r1, [r0]
++
++    ldr r0, =0x1e78a200                          @ Set AST1150 I2C password
++    ldr r1, =0x00A88FA8
++    str r1, [r0]
++
++    ldr r0, =0x1e78a05c
++    ldr r1, =0x00000200                          @ Enable buffer mode transfering 3 bytes
++    str r1, [r0]
++
++    ldr r0, =0x1e78a054
++    ldr r1, =0x00000063                          @ Fire commmand
++    str r1, [r0]
++
++    ldr r0, =0x1e78a050
++i2c_wait_cmddone_1:
++    ldr r1, [r0]
++    tst r1, #0x38
++    beq i2c_wait_cmddone_1
++    tst r1, #0x2A                                @ transmit error
++    bne platform_exit2
++    ldr r1, =0xFFFFFFFF
++    str r1, [r0]
++
++    ldr r0, =0x1e78a200                          @ Disable ASPM capability
++    ldr r1, =0x04005DA8
++    str r1, [r0]
++
++    ldr r0, =0x1e78a204
++    ldr r1, =0x00000024
++    str r1, [r0]
++
++    ldr r0, =0x1e78a05c
++    ldr r1, =0x00000200                          @ Enable buffer mode transfering 3 bytes
++    str r1, [r0]
++
++    ldr r0, =0x1e78a054
++    ldr r1, =0x00000063                          @ Fire commmand
++    str r1, [r0]
++
++    ldr r0, =0x1e78a050
++i2c_wait_cmddone_2:
++    ldr r1, [r0]
++    tst r1, #0x38
++    beq i2c_wait_cmddone_2
++    tst r1, #0x2A                                @ transmit error
++    bne platform_exit2
++    ldr r1, =0xFFFFFFFF
++    str r1, [r0]
++
++platform_exit2:
++    ldr r0, =0x1e78a040                          @ Disable I2C1 controller
++    mov r1, #0x00
++    str r1, [r0]
++
++    b   platform_exit
++.LTORG
++
++platform_exit:
++#ifdef      CONFIG_DRAM_ECC
++    ldr r0, =0x1e6e0004
++    ldr r1, [r0]
++    orr r1, r1, #0x80
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0054
++    ldr r1, =0x05000000                          /* ECC protected memory size, default set at 80M   */
++    str r1, [r0]
++
++    ldr r0, =0x1e6e007C
++    ldr r1, =0x00000000
++    str r1, [r0]
++    ldr r0, =0x1e6e0074
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0070
++    ldr r1, =0x00000221
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0070
++    ldr r2, =0x00001000
++ECC_Init_Flag:
++    ldr r1, [r0]
++    tst r1, r2                                   @ D[12] = 1, Done
++    beq ECC_Init_Flag
++
++    ldr r0, =0x1e6e0070
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0050
++    ldr r1, =0x80000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0050
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0070
++    ldr r1, =0x00000400
++    str r1, [r0]
++#endif
++    ldr r0, =0x1e6e2008                          @ Set Video ECLK phase
++    ldr r1, [r0]
++    ldr r2, =0xfffffff3
++    and r1, r1, r2
++    orr r1, r1, #0x08
++    str r1, [r0]
++
++    ldr r0, =0x1e6e2004
++    ldr r1, [r0]
++    ldr r2, =0xFFBFFFFF                          @ Enable JTAG Master, solve ARM stucked by JTAG issue
++    and r1, r1, r2
++    str r1, [r0]
++
++    ldr r0, =0x1e6e2048                          @ Set MAC interface delay timing
++    ldr r1, =0x2255
++    str r1, [r0]
++
++    ldr r0, =0x1e6e2070                          @ Set MAC AHB bus clock
++    ldr r1, [r0]
++    mov r2, #0x04                                @ Default RMII, set MHCLK = HPLL/10
++    tst r1, #0xC0
++    movne r2, #0x02                              @ if RGMII,     set MHCLK = HPLL/6
++    ldr r0, =0x1e6e2008
++    ldr r1, [r0]
++    bic r1, r1, #0x00070000
++    orr r1, r1, r2, lsl #16
++    str r1, [r0]
++
++/* Test - DRAM initial time */
++    ldr r0, =0x1e782040
++    ldr r1, [r0]
++    ldr r0, =0xFFFFFFFF
++    sub r1, r0, r1
++    ldr r0, =0x1e72009c
++    str r1, [r0]
++    ldr r0, =0x1e7200a4
++    str r1, [r0]
++    ldr r0, =0x1e782030
++    ldr r1, [r0]
++    bic r1, r1, #0x0000F000
++    str r1, [r0]
++/* Test - DRAM initial time */
++
++/******************************************************************************
++ Reset GPIO registers when watchdog reset
++ ******************************************************************************/
++    ldr r0, =0x1e6e207c                          @ Check Revision ID
++    ldr r1, [r0]
++    mov r1, r1, lsr #24
++    cmp r1, #0x02
++    bne platform_exit3                           @ not match AST2400
++
++    ldr r0, =0x1e6e203c                          @ Check watchdog reset event
++    ldr r1, [r0]
++    and r1, r1, #0x06
++    cmp r1, #0x0
++    beq platform_exit3                           @ no watchdog reset event
++
++    ldr r0, =0x1e6e209c                          @ Check watchdog GPIO selection
++    ldr r1, [r0]
++    mov r1, r1, lsr #21
++    tst r1, #0x01
++    beq platform_exit3                           @ no watchdog reset selection
++
++    ldr r1, =0x00000000                          @ clear GPIO register reset by PRST_N
++    ldr r2, =0xFFFFFFFF
++    ldr r0, =0x1e780008
++    str r1, [r0]
++    ldr r0, =0x1e78000c
++    str r1, [r0]
++    ldr r0, =0x1e780010
++    str r1, [r0]
++    ldr r0, =0x1e780014
++    str r1, [r0]
++    ldr r0, =0x1e780018
++    str r2, [r0]
++    ldr r0, =0x1e780028
++    str r1, [r0]
++    ldr r0, =0x1e78002c
++    str r1, [r0]
++    ldr r0, =0x1e780030
++    str r1, [r0]
++    ldr r0, =0x1e780034
++    str r1, [r0]
++    ldr r0, =0x1e780038
++    str r2, [r0]
++    ldr r0, =0x1e780040
++    str r1, [r0]
++    ldr r0, =0x1e780044
++    str r1, [r0]
++    ldr r0, =0x1e780048
++    str r1, [r0]
++    ldr r0, =0x1e78004c
++    str r1, [r0]
++    ldr r0, =0x1e780050
++    str r1, [r0]
++    ldr r0, =0x1e780054
++    str r1, [r0]
++    ldr r0, =0x1e780058
++    str r1, [r0]
++    ldr r0, =0x1e780060
++    str r1, [r0]
++    ldr r0, =0x1e780064
++    str r1, [r0]
++    ldr r0, =0x1e780068
++    str r1, [r0]
++    ldr r0, =0x1e78006c
++    str r1, [r0]
++    ldr r0, =0x1e780090
++    str r1, [r0]
++    ldr r0, =0x1e780094
++    str r1, [r0]
++    ldr r0, =0x1e780098
++    str r1, [r0]
++    ldr r0, =0x1e78009c
++    str r1, [r0]
++    ldr r0, =0x1e7800a0
++    str r1, [r0]
++    ldr r0, =0x1e7800a4
++    str r1, [r0]
++    ldr r0, =0x1e7800a8
++    str r2, [r0]
++    ldr r0, =0x1e7800b0
++    str r1, [r0]
++    ldr r0, =0x1e7800b4
++    str r1, [r0]
++    ldr r0, =0x1e7800b8
++    str r1, [r0]
++    ldr r0, =0x1e7800e0
++    str r1, [r0]
++    ldr r0, =0x1e7800e4
++    str r1, [r0]
++    ldr r0, =0x1e7800e8
++    str r1, [r0]
++    ldr r0, =0x1e7800ec
++    str r1, [r0]
++    ldr r0, =0x1e7800f0
++    str r1, [r0]
++    ldr r0, =0x1e7800f4
++    str r1, [r0]
++    ldr r0, =0x1e7800f8
++    str r2, [r0]
++    ldr r0, =0x1e780100
++    str r1, [r0]
++    ldr r0, =0x1e780104
++    str r1, [r0]
++    ldr r0, =0x1e780108
++    str r1, [r0]
++    ldr r0, =0x1e780110
++    str r1, [r0]
++    ldr r0, =0x1e780114
++    str r1, [r0]
++    ldr r0, =0x1e780118
++    str r1, [r0]
++    ldr r0, =0x1e78011c
++    str r1, [r0]
++    ldr r0, =0x1e780120
++    str r1, [r0]
++    ldr r0, =0x1e780124
++    str r1, [r0]
++    ldr r0, =0x1e780128
++    str r2, [r0]
++    ldr r0, =0x1e780130
++    str r1, [r0]
++    ldr r0, =0x1e780134
++    str r1, [r0]
++    ldr r0, =0x1e780138
++    str r1, [r0]
++    ldr r0, =0x1e780140
++    str r1, [r0]
++    ldr r0, =0x1e780144
++    str r1, [r0]
++    ldr r0, =0x1e780148
++    str r1, [r0]
++    ldr r0, =0x1e78014c
++    str r1, [r0]
++    ldr r0, =0x1e780150
++    str r1, [r0]
++    ldr r0, =0x1e780154
++    str r1, [r0]
++    ldr r0, =0x1e780158
++    str r2, [r0]
++    ldr r0, =0x1e780160
++    str r1, [r0]
++    ldr r0, =0x1e780164
++    str r1, [r0]
++    ldr r0, =0x1e780168
++    str r1, [r0]
++    ldr r0, =0x1e780170
++    str r1, [r0]
++    ldr r0, =0x1e780174
++    str r1, [r0]
++    ldr r0, =0x1e780178
++    str r1, [r0]
++    ldr r0, =0x1e78017c
++    str r1, [r0]
++    ldr r0, =0x1e780180
++    str r1, [r0]
++    ldr r0, =0x1e780184
++    str r1, [r0]
++    ldr r0, =0x1e780188
++    str r2, [r0]
++    ldr r0, =0x1e780190
++    str r1, [r0]
++    ldr r0, =0x1e780194
++    str r1, [r0]
++    ldr r0, =0x1e780198
++    str r1, [r0]
++    ldr r0, =0x1e7801d0
++    str r1, [r0]
++    ldr r0, =0x1e7801d4
++    str r1, [r0]
++
++    ldr r0, =0x1e780204                          @ clear SGPIOM register reset by PRST_N
++    str r1, [r0]
++    ldr r0, =0x1e780208
++    str r1, [r0]
++    ldr r0, =0x1e78020c
++    str r1, [r0]
++    ldr r0, =0x1e780210
++    str r1, [r0]
++    ldr r0, =0x1e780214
++    str r2, [r0]
++    ldr r0, =0x1e780220
++    str r1, [r0]
++    ldr r0, =0x1e780224
++    str r1, [r0]
++    ldr r0, =0x1e780228
++    str r1, [r0]
++    ldr r0, =0x1e78022c
++    str r1, [r0]
++    ldr r0, =0x1e780230
++    str r2, [r0]
++    ldr r0, =0x1e78023c
++    str r1, [r0]
++    ldr r0, =0x1e780240
++    str r1, [r0]
++    ldr r0, =0x1e780244
++    str r1, [r0]
++    ldr r0, =0x1e780248
++    str r1, [r0]
++    ldr r0, =0x1e78024c
++    str r2, [r0]
++    ldr r0, =0x1e780254
++    ldr r3, =0x01000040
++    str r3, [r0]
++    ldr r0, =0x1e780258
++    str r1, [r0]
++    ldr r0, =0x1e78025c
++    str r1, [r0]
++    ldr r0, =0x1e780260
++    str r1, [r0]
++
++    ldr r0, =0x1e780300                          @ clear SGPIOS register reset by PRST_N
++    str r1, [r0]
++    ldr r0, =0x1e780304
++    str r1, [r0]
++    ldr r0, =0x1e780308
++    str r1, [r0]
++    ldr r0, =0x1e78030c
++    str r1, [r0]
++    ldr r0, =0x1e780310
++    str r1, [r0]
++    ldr r0, =0x1e780314
++    str r1, [r0]
++    ldr r0, =0x1e780318
++    str r2, [r0]
++    ldr r0, =0x1e78031c
++    str r2, [r0]
++    ldr r0, =0x1e780320
++    str r2, [r0]
++
++platform_exit3:
++
++/******************************************************************************
++ SPI Timing Calibration, not applicable to AST2300 series
++ ******************************************************************************/
++    ldr r0, =0x1e6e207c                          @ Check Revision ID
++    ldr r1, [r0]
++    mov r1, r1, lsr #24
++    cmp r1, #0x02
++    blt platform_exit4                           @ not match AST2400 or later
++
++    ldr r0, =0x1e6e2070                          @ Check SPI flash
++    ldr r1, [r0]
++    and r1, r1, #0x03
++    cmp r1, #0x02
++    bne platform_exit4
++
++    mov r2, #0x0
++    mov r6, #0x0
++    mov r7, #0x0
++    init_spi_checksum
++spi_checksum_wait_0:
++    ldr r1, [r0]
++    tst r1, r2
++    beq spi_checksum_wait_0
++    ldr r0, =0x1e620090
++    ldr r5, [r0]                                 @ record golden checksum
++    ldr r0, =0x1e620080
++    mov r1, #0x0
++    str r1, [r0]
++
++    ldr r0, =0x1e620010                          @ set to fast read mode
++    ldr r1, =0x000B0041
++    str r1, [r0]
++
++    ldr r6, =0x00F7E6D0                          @ Init spiclk loop
++    mov r8, #0x0                                 @ Init delay record
++
++spi_cbr_next_clkrate:
++    mov r6, r6, lsr #0x4
++    cmp r6, #0x0
++    beq spi_cbr_end
++
++    mov r7, #0x0                                 @ Init delay loop
++    mov r8, r8, lsl #4
++
++spi_cbr_next_delay_s:
++    mov r2, #0x8
++    init_spi_checksum
++spi_checksum_wait_1:
++    ldr r1, [r0]
++    tst r1, r2
++    beq spi_checksum_wait_1
++    ldr r0, =0x1e620090
++    ldr r2, [r0]                                 @ read checksum
++    ldr r0, =0x1e620080
++    mov r1, #0x0
++    str r1, [r0]
++    cmp r2, r5
++    bne spi_cbr_next_delay_e
++
++    mov r2, #0x0
++    init_spi_checksum
++spi_checksum_wait_2:
++    ldr r1, [r0]
++    tst r1, r2
++    beq spi_checksum_wait_2
++    ldr r0, =0x1e620090
++    ldr r2, [r0]                                 @ read checksum
++    ldr r0, =0x1e620080
++    mov r1, #0x0
++    str r1, [r0]
++    cmp r2, r5
++    bne spi_cbr_next_delay_e
++
++    orr r8, r8, r7                               @ record passed delay
++    b   spi_cbr_next_clkrate
++
++spi_cbr_next_delay_e:
++    add r7, r7, #0x1
++    cmp r7, #0x6
++    blt spi_cbr_next_delay_s
++    b   spi_cbr_next_clkrate
++
++spi_cbr_end:
++    ldr r0, =0x1e620094
++    str r8, [r0]
++    ldr r0, =0x1e620010
++    mov r1, #0x0
++    str r1, [r0]
++
++platform_exit4:
++
++    /* restore lr */
++    mov lr, r4
++
++    /* back to arch calling code */
++    mov pc, lr
+diff --git a/board/aspeed/ast2300/rc4.c b/board/aspeed/ast2300/rc4.c
+new file mode 100755
+index 0000000..32e0ffa
+--- /dev/null
++++ b/board/aspeed/ast2300/rc4.c
+@@ -0,0 +1,68 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++struct rc4_state
++{
++    int x, y, m[256];
++};
++
++void rc4_setup( struct rc4_state *s, unsigned char *key,  int length )
++{
++    int i, j, k, *m, a;
++
++    s->x = 0;
++    s->y = 0;
++    m = s->m;
++
++    for( i = 0; i < 256; i++ )
++    {
++        m[i] = i;
++    }
++
++    j = k = 0;
++
++    for( i = 0; i < 256; i++ )
++    {
++        a = m[i];
++        j = (unsigned char) ( j + a + key[k] );
++        m[i] = m[j]; m[j] = a;
++        if( ++k >= length ) k = 0;
++    }
++}
++
++void rc4_crypt( struct rc4_state *s, unsigned char *data, int length )
++{ 
++    int i, x, y, *m, a, b;
++
++    x = s->x;
++    y = s->y;
++    m = s->m;
++
++    for( i = 0; i < length; i++ )
++    {
++        x = (unsigned char) ( x + 1 ); a = m[x];
++        y = (unsigned char) ( y + a );
++        m[x] = b = m[y];
++        m[y] = a;
++        data[i] ^= m[(unsigned char) ( a + b )];
++    }
++
++    s->x = x;
++    s->y = y;
++}
++
++void rc4_crypt_sw(unsigned char *data, int ulMsgLength, unsigned char *rc4_key, unsigned long ulKeyLength )
++{
++    struct rc4_state s;
++    
++    rc4_setup( &s, rc4_key, ulKeyLength );
++                                    
++    rc4_crypt( &s, data, ulMsgLength );    
++}
+diff --git a/board/aspeed/ast2300/regtest.c b/board/aspeed/ast2300/regtest.c
+new file mode 100755
+index 0000000..1cd75ae
+--- /dev/null
++++ b/board/aspeed/ast2300/regtest.c
+@@ -0,0 +1,91 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++/*
++ * Diagnostics support
++ */
++#include <common.h>
++#include <command.h>
++#include <post.h>
++#include "slt.h"
++
++#if ((CFG_CMD_SLT & CFG_CMD_REGTEST) && defined(CONFIG_SLT))
++#include "regtest.h"
++
++int do_regtest (void)
++{
++	_SOCRegTestInfo	*pjSOCRegInfo;
++	_SOCRegTestTbl *pjRegTable;
++	unsigned long ulRegBase;
++        unsigned long ulIndex, ulBack, ulAND, ulMask, ulData, ulTemp;
++        unsigned long Flags = 0;
++	
++	/* unlock reg */
++        *(unsigned long *) (0x1e600000) = 0xaeed1a03;	/* AHBC */
++        *(unsigned long *) (0x1e6e0000) = 0xfc600309;	/* MMC */
++        *(unsigned long *) (0x1e6e2000) = 0x1688a8a8;	/* SCU */
++
++        /* SCU */
++
++        /* do test */	
++        pjSOCRegInfo = SOCRegTestInfo;
++        while (strcmp(pjSOCRegInfo->jName, "END"))
++        {
++            /* Reg. Test Start */
++            ulRegBase = pjSOCRegInfo->ulRegOffset;
++            pjRegTable = pjSOCRegInfo->pjTblIndex;
++            
++            while (pjRegTable->ulIndex != 0xFFFFFFFF)
++            {
++                ulIndex = ulRegBase + pjRegTable->ulIndex;	
++
++                ulBack = *(unsigned long *) (ulIndex);
++
++                ulMask  = pjRegTable->ulMask;
++                ulAND  = ~pjRegTable->ulMask;
++       	        	    	
++                ulData  = 0xFFFFFFFF & pjRegTable->ulMask;
++                *(unsigned long *) (ulIndex) = ulData;                
++                ulTemp = *(volatile unsigned long *) (ulIndex) & pjRegTable->ulMask;
++                if (ulData != ulTemp)
++                {
++                    Flags |= pjSOCRegInfo->ulFlags;
++                    printf("[DBG] RegTest: Failed Index:%x, Data:%x, Temp:%x \n", ulIndex, ulData, ulTemp);
++                }
++                
++                ulData  = 0x00000000 & pjRegTable->ulMask;
++                *(unsigned long *) (ulIndex) = ulData;                
++                ulTemp = *(volatile unsigned long *) (ulIndex) & pjRegTable->ulMask;
++                if (ulData != ulTemp)
++                {
++                    Flags |= pjSOCRegInfo->ulFlags;
++                    printf("[DBG] RegTest: Failed Index:%x, Data:%x, Temp:%x \n", ulIndex, ulData, ulTemp);
++                }
++                             
++                *(unsigned long *) (ulIndex) = ulBack;
++       
++                pjRegTable++;
++          	
++           } /* Individual Reg. Test */
++
++           if (Flags & pjSOCRegInfo->ulFlags)
++               printf("[INFO] RegTest: %s Failed \n", pjSOCRegInfo->jName);
++           
++           pjSOCRegInfo++;
++           
++        } /* Reg. Test */
++
++	return Flags;
++	
++}
++
++#endif /* CONFIG_SLT */
+diff --git a/board/aspeed/ast2300/regtest.h b/board/aspeed/ast2300/regtest.h
+new file mode 100755
+index 0000000..49a360e
+--- /dev/null
++++ b/board/aspeed/ast2300/regtest.h
+@@ -0,0 +1,255 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++typedef struct {
++    unsigned long ulIndex;
++    unsigned long ulMask;
++} _SOCRegTestTbl;
++
++typedef struct {
++    unsigned char jName[10];
++    unsigned long ulRegOffset;
++    _SOCRegTestTbl *pjTblIndex;
++    unsigned long ulFlags;
++} _SOCRegTestInfo;
++
++_SOCRegTestTbl SMCRegTestTbl[] = {
++    {0x00000000, 0x00001FF3},
++    {0x00000004, 0xFFFFFFFF},
++    {0x00000008, 0x0FFF17FF},
++    {0x0000000C, 0xFFFFFFFF},
++    {0x00000010, 0xFF5FFFF3},
++    {0x00000018, 0x0FFFFFFF},
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl AHBCRegTestTbl[] = {
++    {0x00000080, 0x0000FFFE},        	
++    {0x00000088, 0x01000000},
++    {0x0000008c, 0x00000031},	
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl MICRegTestTbl[] = {
++/*	
++    {0x00000000, 0x0FFFFFF8},
++    {0x00000004, 0x0FFFFFF8},
++    {0x00000008, 0x0000FFFF},
++    {0x0000000C, 0x0FFFF000},
++    {0x00000010, 0xFFFFFFFF},
++*/
++    {0xFFFFFFFF, 0xFFFFFFFF},
++};
++
++_SOCRegTestTbl MAC1RegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl MAC2RegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl USB2RegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl VICRegTestTbl[] = {
++    {0x0000000C, 0xFFFFFFFF},
++    {0x00000024, 0xFFFFFFFF},
++    {0x00000028, 0xFFFFFFFF},
++    {0x0000002C, 0xFFFFFFFF},
++    {0xFFFFFFFF, 0xFFFFFFFF},
++};
++
++_SOCRegTestTbl MMCRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl USB11RegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl SCURegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl HASERegTestTbl[] = {
++    {0x00000000, 0x0FFFFFF8},
++    {0x00000004, 0x0FFFFFF8},
++    {0x00000008, 0x0FFFFFF8},
++    {0x0000000C, 0x0FFFFFF8},
++    //{0x00000010, 0x00001FFF},
++    {0x00000020, 0x0FFFFFF8},
++    {0x00000024, 0x0FFFFFF8},
++    {0x00000028, 0x0FFFFFc0},
++    {0x0000002C, 0x0FFFFFFF},
++    //{0x00000030, 0x000003FF},
++    {0xFFFFFFFF, 0xFFFFFFFF},
++};
++
++_SOCRegTestTbl I2SRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl CRTRegTestTbl[] = {
++/*	
++    {0x00000000, 0x001F3703},
++    {0x00000004, 0x0000FFC1},
++*/    
++    {0x00000010, 0x0FFF0FFF},
++    {0x00000014, 0x0FFF0FFF},
++    {0x00000018, 0x07FF07FF},
++    {0x0000001C, 0x07FF07FF},
++    {0x00000020, 0x0FFFFFF8},
++    {0x00000024, 0x07FF3FF8},
++/*    
++    {0x00000028, 0x003F003F},
++    {0x00000030, 0x003F003F},
++    {0x00000034, 0x0FFF0FFF},
++    {0x00000038, 0x0FFFFFF8},
++*/    
++    {0x00000040, 0x0FFF0FFF},
++    {0x00000044, 0x07FF07FF},
++    {0x00000048, 0x0FFFFFF8},
++    {0x0000004C, 0x00FF07F8},
++    {0x00000050, 0x000F0F0F},
++/*    
++    {0x00000060, 0x001F3703},
++    {0x00000064, 0x0000FFC1},
++*/    
++    {0x00000070, 0x0FFF0FFF},
++    {0x00000074, 0x0FFF0FFF},
++    {0x00000078, 0x07FF07FF},
++    {0x0000007C, 0x07FF07FF},
++    {0x00000080, 0x0FFFFFF8},
++    {0x00000084, 0x07FF3FF8},
++/*    
++    {0x00000088, 0x003F003F},
++    {0x00000090, 0x003F003F},
++    {0x00000094, 0x0FFF0FFF},
++    {0x00000098, 0x0FFFFFF8},
++*/    
++    {0x000000A0, 0x0FFF0FFF},
++    {0x000000A4, 0x07FF07FF},
++    {0x000000A8, 0x0FFFFFF8},
++    {0x000000AC, 0x00FF07F8},
++    {0x000000B0, 0x000F0F0F},
++    {0xFFFFFFFF, 0xFFFFFFFF},
++};
++
++_SOCRegTestTbl VIDEORegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl A2PRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl MDMARegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl M2DRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl GPIORegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl RTCRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl TIMERRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl UART1RegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl UART2RegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl WDTRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl PWMRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl VUART1RegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl VUART2RegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl LPCRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl I2CRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl PECIRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl PCIARegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl PCIRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++
++/* Test List */
++_SOCRegTestInfo SOCRegTestInfo[] = {
++    /* Test Name, Reg. Offset,      Test Table, Error Code  */
++    {   "SMCREG", 0x16000000,    SMCRegTestTbl, 0x00000001},
++    {  "AHBCREG", 0x1e600000,   AHBCRegTestTbl, 0x00000002},
++    {   "MICREG", 0x1e640000,    MICRegTestTbl, 0x00000004},
++    {  "MAC1REG", 0x1e660000,   MAC1RegTestTbl, 0x00000008},
++    {  "MAC2REG", 0x1e680000,   MAC2RegTestTbl, 0x00000010},
++    {  "USB2REG", 0x1e6a0000,   USB2RegTestTbl, 0x00000020},
++    {   "VICREG", 0x1e6c0000,    VICRegTestTbl, 0x00000040},
++    {   "MMCREG", 0x1e6e0000,    MMCRegTestTbl, 0x00000080},
++    { "USB11REG", 0x1e6e1000,  USB11RegTestTbl, 0x00000100},
++    {   "SCUREG", 0x1e6e2000,    SCURegTestTbl, 0x00000200},
++    {  "HASEREG", 0x1e6e3000,   HASERegTestTbl, 0x00000400},
++    {   "I2SREG", 0x1e6e5000,    I2SRegTestTbl, 0x00000800},
++    {   "CRTREG", 0x1e6e6000,    CRTRegTestTbl, 0x00001000},
++    { "VIDEOREG", 0x1e700000,  VIDEORegTestTbl, 0x00002000},
++    {   "A2PREG", 0x1e720000,    A2PRegTestTbl, 0x00004000},
++    {  "MDMAREG", 0x1e740000,   MDMARegTestTbl, 0x00008000},
++    {    "2DREG", 0x1e760000,    M2DRegTestTbl, 0x00010000},
++    {  "GPIOREG", 0x1e780000,   GPIORegTestTbl, 0x00020000},
++    {   "RTCREG", 0x1e781000,    RTCRegTestTbl, 0x00040000},
++    { "TIMERREG", 0x1e782000,  TIMERRegTestTbl, 0x00080000},
++    { "UART1REG", 0x1e783000,  UART1RegTestTbl, 0x00100000},
++    { "UART2REG", 0x1e784000,  UART2RegTestTbl, 0x00200000},
++    {   "WDTREG", 0x1e785000,    WDTRegTestTbl, 0x00400000},
++    {   "PWMREG", 0x1e786000,    PWMRegTestTbl, 0x00800000},
++    {"VUART1REG", 0x1e787000, VUART1RegTestTbl, 0x01000000},
++    {"VUART2REG", 0x1e788000, VUART2RegTestTbl, 0x02000000},
++    {   "LPCREG", 0x1e789000,    LPCRegTestTbl, 0x04000000},
++    {   "I2CREG", 0x1e78A000,    I2CRegTestTbl, 0x08000000},
++    {  "PECIREG", 0x1e78B000,   PECIRegTestTbl, 0x10000000},
++    {  "PCIAREG", 0x1e78C000,   PCIARegTestTbl, 0x20000000},
++    {   "PCIREG", 0x60000000,    PCIRegTestTbl, 0x40000000},        
++    {      "END", 0xffffffff,             NULL, 0xffffffff}
++};
+diff --git a/board/aspeed/ast2300/slt.c b/board/aspeed/ast2300/slt.c
+new file mode 100755
+index 0000000..3283d34
+--- /dev/null
++++ b/board/aspeed/ast2300/slt.c
+@@ -0,0 +1,105 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++/*
++ * Diagnostics support
++ */
++#include <common.h>
++#include <command.h>
++#include <post.h>
++#include "slt.h"
++
++#if defined (CONFIG_SLT)
++
++int do_slt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
++{
++    int flags = 0;
++    int loop  = 1;
++	
++    if (argc > 1) {
++        loop = simple_strtoul(argv[1], NULL, 10);
++    }
++	
++    do {
++
++do_slt_start:
++	/* Reg. Test */
++#if (CFG_CMD_SLT & CFG_CMD_REGTEST)
++	if (do_regtest())
++	{
++	    flags |= FLAG_REGTEST_FAIL;	
++            printf("[INFO] RegTest Failed \n");
++	}    
++	else
++            printf("[INFO] RegTest Passed \n");
++#endif
++#if (CFG_CMD_SLT & CFG_CMD_MACTEST)
++	if (do_mactest())
++	{
++	    flags |= FLAG_MACTEST_FAIL;	
++            printf("[INFO] MACTest Failed \n");
++	}    
++	else
++            printf("[INFO] MACTest Passed \n");
++#endif
++#if (CFG_CMD_SLT & CFG_CMD_VIDEOTEST)
++	if (do_videotest())
++	{
++	    flags |= FLAG_VIDEOTEST_FAIL;	
++            printf("[INFO] VideoTest Failed \n");
++	}    
++	else
++            printf("[INFO] VideoTest Passed \n");
++#endif
++#if (CFG_CMD_SLT & CFG_CMD_HACTEST)
++	if (do_hactest())
++	{
++	    flags |= FLAG_HACTEST_FAIL;	
++            printf("[INFO] HACTest Failed \n");
++	}    
++	else
++            printf("[INFO] HACTest Passed \n");
++#endif
++#if (CFG_CMD_SLT & CFG_CMD_MICTEST)
++	if (do_mictest())
++	{
++	    flags |= FLAG_MICTEST_FAIL;	
++            printf("[INFO] MICTest Failed \n");
++	}    
++	else
++            printf("[INFO] MICTest Passed \n");
++#endif
++	
++	/* Summary */
++	if (flags)
++            printf ("[INFO] SLT Test Failed!! \n");
++        else
++            printf ("[INFO] SLT Test Passed!! \n");    
++       
++        if (loop == 0)			/* infinite */
++            goto do_slt_start;
++        else
++            loop--;    
++            
++    } while (loop);
++
++    return 0;
++}
++/***************************************************/
++
++U_BOOT_CMD(
++	slt,	CONFIG_SYS_MAXARGS,	0,	do_slt,
++	"slt - slt test program \n",
++	NULL
++);
++
++#endif /* CONFIG_SLT */
+diff --git a/board/aspeed/ast2300/slt.h b/board/aspeed/ast2300/slt.h
+new file mode 100755
+index 0000000..4e650bc
+--- /dev/null
++++ b/board/aspeed/ast2300/slt.h
+@@ -0,0 +1,29 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#define CFG_CMD_REGTEST		0x00000001
++#define CFG_CMD_MACTEST		0x00000002
++#define CFG_CMD_VIDEOTEST	0x00000004
++#define CFG_CMD_HACTEST		0x00000008
++#define CFG_CMD_MICTEST		0x00000010
++#define CFG_CMD_OSDTEST		0x00000020
++#define CFG_CMD_2DTEST  	0x00000040
++#define CFG_CMD_HWCTEST  	0x00000080
++
++#define FLAG_REGTEST_FAIL  	0x00000001
++#define FLAG_MACTEST_FAIL  	0x00000002
++#define FLAG_VIDEOTEST_FAIL  	0x00000004
++#define FLAG_HACTEST_FAIL  	0x00000008
++#define FLAG_MICTEST_FAIL  	0x00000010
++#define FLAG_OSDTEST_FAIL  	0x00000020
++#define FLAG_2DTEST_FAIL  	0x00000040
++#define FLAG_HWCTEST_FAIL  	0x00000080
++
++
+diff --git a/board/aspeed/ast2300/type.h b/board/aspeed/ast2300/type.h
+new file mode 100755
+index 0000000..f57ee5a
+--- /dev/null
++++ b/board/aspeed/ast2300/type.h
+@@ -0,0 +1,116 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef _TYPE_H_
++#define _TYPE_H_
++
++	typedef unsigned char               BOOL;
++	typedef unsigned char               UINT8;
++	typedef unsigned short              UINT16;
++	typedef unsigned int                UINT32;
++
++	#define  FLONG                    unsigned long
++	#define  BYTE                     unsigned char
++	#define  INT                      int
++	#define  VOID                     void
++	#define  BOOLEAN                  unsigned short
++	#define  ULONG                    unsigned long
++	#define  USHORT                   unsigned short
++	#define  UCHAR                    unsigned char
++	#define  CHAR                     char
++	#define  LONG                     long
++	#define  PUCHAR                   UCHAR *
++	#define  PULONG                   ULONG *
++
++	#define  FAIL                     1
++
++	#define  intfunc      int386
++
++	#define  outdwport         outpd
++	#define  indwport          inpd
++	#define  outport           outp
++	#define  inport            inp
++
++	//#define     NULL    ((void *)0)
++	#define     FALSE   0
++	#define     TRUE    1
++
++	#define ReadMemoryBYTE(baseaddress,offset)        *(BYTE *)((ULONG)(baseaddress)+(ULONG)(offset))
++	#define ReadMemoryLong(baseaddress,offset)        *(ULONG *)((ULONG)(baseaddress)+(ULONG)(offset))
++	#define ReadMemoryShort(baseaddress,offset)       *(USHORT *)((ULONG)(baseaddress)+(ULONG)(offset))
++	#define WriteMemoryBYTE(baseaddress,offset,data)  *(BYTE *)((ULONG)(baseaddress)+(ULONG)(offset)) = (BYTE)(data)
++	#define WriteMemoryLong(baseaddress,offset,data)  *(ULONG *)((ULONG)(baseaddress)+(ULONG)(offset))=(ULONG)(data)
++	#define WriteMemoryShort(baseaddress,offset,data) *(USHORT *)((ULONG)(baseaddress)+(ULONG)(offset))=(USHORT)(data)
++	#define WriteMemoryLongWithANDData(baseaddress, offset, anddata, data)  *(ULONG *)((ULONG)(baseaddress)+(ULONG)(offset)) = *(ULONG *)((ULONG)(baseaddress)+(ULONG)(offset)) & (ULONG)(anddata) | (ULONG)(data)
++
++	#define WriteMemoryLongWithMASK(baseaddress, offset, data, mask) \
++	*(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset)) = *(volatile ULONG *)(((ULONG)(baseaddress)+(ULONG)(offset)) & (ULONG)(~(mask))) | ((ULONG)(data) & (ULONG)(mask))
++
++	#define ReadMemoryLongHost(baseaddress,offset)        *(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset))
++	#define WriteMemoryLongHost(baseaddress,offset,data)  *(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset))=(ULONG)(data)
++	#define WriteMemoryBYTEHost(baseaddress,offset,data)  *(volatile BYTE *)((ULONG)(baseaddress)+(ULONG)(offset)) = (BYTE)(data)    
++#define WriteMemoryLongWithMASKHost(baseaddress, offset, data, mask)  *(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset)) = (((*(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset)))&(~mask)) | (ULONG)((data)&(mask)))
++    
++	#define ReadMemoryLongClient(baseaddress,offset)        *(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset))
++	#define WriteMemoryLongClient(baseaddress,offset,data)  *(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset))=(ULONG)(data)
++	#define WriteMemoryBYTEClient(baseaddress,offset,data)  *(volatile BYTE *)((ULONG)(baseaddress)+(ULONG)(offset)) = (BYTE)(data)    
++#define WriteMemoryLongWithMASKClient(baseaddress, offset, data, mask)  *(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset)) = (((*(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset)))&(~mask)) | (ULONG)((data)&(mask)))
++
++#ifdef BUF_GLOBALS
++#define BUF_EXT
++#else
++#define BUF_EXT extern
++#endif
++
++BUF_EXT ULONG    g_CAPTURE_VIDEO1_BUF1_ADDR; /* VIDEO1_BUF_1_ADDR*/ 
++BUF_EXT ULONG    g_CAPTURE_VIDEO1_BUF2_ADDR; /* VIDEO1_BUF_2_ADDR*/
++BUF_EXT ULONG    g_VIDEO1_COMPRESS_BUF_ADDR; /* Encode destination address */
++BUF_EXT ULONG    g_VIDEO1_CRC_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEO1_FLAG_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEO1_RC4_BUF_ADDR;
++
++
++BUF_EXT ULONG    g_CAPTURE_VIDEO2_BUF1_ADDR; 
++BUF_EXT ULONG    g_CAPTURE_VIDEO2_BUF2_ADDR; 
++BUF_EXT ULONG    g_VIDEO2_COMPRESS_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEO2_CRC_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEO2_FLAG_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEO2_RC4_BUF_ADDR;
++
++BUF_EXT ULONG    g_VIDEO1_DECODE_BUF_1_ADDR;
++BUF_EXT ULONG    g_VIDEO1_DECODE_BUF_2_ADDR;
++BUF_EXT ULONG    g_VIDEO1_DECOMPRESS_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEO1_DECODE_RC4_BUF_ADDR;
++
++BUF_EXT ULONG    g_VIDEO2_DECODE_BUF_1_ADDR;
++BUF_EXT ULONG    g_VIDEO2_DECODE_BUF_2_ADDR;
++BUF_EXT ULONG    g_VIDEO2_DECOMPRESS_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEO2_DECODE_RC4_BUF_ADDR;
++
++BUF_EXT ULONG    g_CAPTURE_VIDEOM_BUF1_ADDR; 
++BUF_EXT ULONG    g_CAPTURE_VIDEOM_BUF2_ADDR; 
++BUF_EXT ULONG    g_VIDEOM_COMPRESS_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEOM_FLAG_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEOM_RC4_BUF_ADDR;
++
++BUF_EXT ULONG    g_VIDEOM_DECODE_BUF_1_ADDR;
++BUF_EXT ULONG    g_VIDEOM_DECODE_BUF_2_ADDR;
++BUF_EXT ULONG    g_VIDEOM_DECOMPRESS_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEOM_DECODE_RC4_BUF_ADDR;
++
++#ifdef WIN_GLOBALS
++#define WIN_EXT
++#else
++#define WIN_EXT extern
++#endif
++
++WIN_EXT USHORT	g_DefWidth, g_DefHeight;
++   
++#endif
+diff --git a/board/aspeed/ast2300/u-boot.lds b/board/aspeed/ast2300/u-boot.lds
+new file mode 100755
+index 0000000..b5a90ef
+--- /dev/null
++++ b/board/aspeed/ast2300/u-boot.lds
+@@ -0,0 +1,45 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
++/*OUTPUT_FORMAT("elf32-arm", "elf32-arm", "elf32-arm")*/
++OUTPUT_ARCH(arm)
++ENTRY(_start)
++SECTIONS
++{
++	. = 0x00000000;
++
++	. = ALIGN(4);
++	.text	   :
++	{
++	  cpu/arm926ejs/start.o	(.text)
++	  *(.text)
++	}
++
++	. = ALIGN(4);
++	.rodata : { *(.rodata) }
++
++	. = ALIGN(4);
++	.data : { *(.data) }
++
++	. = ALIGN(4);
++	.got : { *(.got) }
++
++	__u_boot_cmd_start = .;
++	.u_boot_cmd : { *(.u_boot_cmd) }
++	__u_boot_cmd_end = .;
++
++	. = ALIGN(4);
++	__bss_start = .;
++	.bss : { *(.bss) }
++	_end = .;
++}
+diff --git a/board/aspeed/ast2300/vdef.h b/board/aspeed/ast2300/vdef.h
+new file mode 100755
+index 0000000..3c99b7e
+--- /dev/null
++++ b/board/aspeed/ast2300/vdef.h
+@@ -0,0 +1,500 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef _VDEF_H_
++#define _VDEF_H_
++
++#define     VIDEO1                              0
++#define     VIDEO1_ON                           0x01
++#define     VIDEO2                              1
++#define     VIDEO2_ON                           0x02
++
++#define		VIDEOM_ON							0x04
++#define     VIDEOM                              2
++
++#define		CRT_1								0
++#define		CRT_1_ON							0x01
++#define		CRT_2								1
++#define		CRT_2_ON							0x02
++
++#define		SINGLE_CODEC_SINGLE_CAPTURE			0
++#define     AUTO_CODEC_SINGLE_CAPTURE			2
++#define		AUTO_CODEC_AUTO_CAPTURE				3
++
++#define		MAC1_BASE							0x1E660000
++#define     APB_BRIDGE_1_BASE                   0x1E6E0000
++#define     VIDEO_REG_BASE                      0x1E700000
++#define     APB_BRIDGE_2_BASE                   0x1E780000
++
++#define		DRAM_INIT_BASE						0x1E6E0000
++
++#define		SDRAM_PROTECT_REG					0x00
++    #define     SDRAM_WRITE_DISABLE             0
++    #define     SDRAM_WRITE_ENABLE              1
++
++#define		SCU_BASE							0x1E6E0000
++#define		SCU_OFFSET							0x2000
++
++#define		VIC_BASE							0x1E6C0000
++	#define		VIDEO_INT_BIT				7
++
++#define		IRQ_STATUS_REG						0x00
++#define		RAW_INT_STATUS_REG					0x08
++#define		INT_SEL_REG							0x0C
++	#define		FIQ_INT							1
++	#define		IRQ_INT							0	
++#define		INT_EN_REG							0x10
++#define		INT_EN_CLEAR_REG					0x14
++#define		INT_SOFT_REG						0x18
++#define		INT_SOFT_CLEAR_REG					0x1C
++#define		INT_SENSE_REG						0x24
++	#define		LEVEL_SENSE						1
++	#define		EDGE_SENSE						0
++#define		INT_EVENT_REG						0x2C
++	#define		HIGH_LEVEL_SENSE				1
++	#define		LOW_LEVEL_SENSE					0
++
++#define		SCU_HW_TRAPPING_REG					0x70 + SCU_OFFSET
++	#define		CLIENT_MODE_EN_BIT				18
++	#define		CLIENT_MODE_EN_MASK				0x00040000
++		#define		BE_HOST_CHIP				0
++		#define		BE_CLIENT_CHIP				1
++
++#define     SCU_ULOCK_KEY                       0x1688A8A8
++    
++#define     SCU_PROTECT_REG                     0x00 + SCU_OFFSET
++    #define     SCU_WRITE_DISABLE               0
++    #define     SCU_WRITE_ENABLE                1
++
++#define     SCU_CONTROL_REG                     0x04 + SCU_OFFSET    
++	#define     VIDEO_ENGINE_RESET				0x00000040
++		#define     VIDEO_ENGINE_RESET_BIT      6
++		#define     VIDEO_ENGINE_RESET_MASK     0x00000040
++        #define     VIDEO_RESET_EN              1
++        #define     VIDEO_RESET_OFF             0
++
++#define     SCU_CLOCK_SELECTION_REG             0x08 + SCU_OFFSET
++	#define		PORTA_CLOCK_DELAY_MASK			7 << 8	//Video port A output clcok selection
++		#define	PORTA_CLOCK_INV_DELAY_1NS		5 << 8	//Clock inversed and delay ~ 2ns
++		#define	PORTA_CLOCK_INV_DELAY_2NS		6 << 8	//Clock inversed and delay ~ 3ns
++	#define		PORTB_CLOCK_DELAY_MASK			7 << 12	//Video port B output clock delay
++		#define	PORTB_CLOCK_INV_DELAY_1NS		5 << 12	//Clock inversed and delay ~ 3ns
++		#define	PORTB_CLOCK_INV_DELAY_2NS		6 << 12	//Clock inversed and delay ~ 3ns
++	#define		PORTB_CLOCK_SEL					1 << 15 //Video port B clock selection
++		#define	PORTB_FROM_D1CLK				0 << 15
++		#define PORTB_FROM_D2CLK				1 << 15
++	#define		ECLK_CLK_SEL_MASK				(3 << 2)
++		#define	ECLK_FROM_HPLL					(1 << 2)
++
++	#define     D2CLK_CLOCK_SELECTION			0x00020000
++		#define     D2CLK_CLOCK_SELECTION_BIT   17
++		#define     D2CLK_CLOCK_SELECTION_MASK  0x00060000
++		#define		NORMAL_CRT1					0
++        #define     V1CLK_VIDEO1				2
++        #define     V1CLK_VIDEO2				3
++
++#define     SCU_CLOCK_STOP_REG					0x0C + SCU_OFFSET    
++	#define		EN_ECLK							0 << 0	//Enable ECLK (For Video Engine)
++	#define		STOP_ECLK_BIT					0
++	#define		STOP_ECLK_MASK					1 << 0
++	#define		EN_V1CLK						0 << 3  //Enable V1CLK (For Video Capture #1)
++	#define		STOP_V1CLK_BIT					3
++	#define		STOP_V1CLK_MASK					1 << 3
++	#define		EN_D1CLK						0 << 10 //Enable D1CLK (For CRT1)
++	#define		STOP_D1CLK_BIT					10
++	#define		STOP_D1CLK_MASK					1 << 10
++	#define		EN_D2CLK						0 << 11 //Stop D2CLK (For CRT2)
++	#define		STOP_D2CLK						(1 << 11)
++	#define		STOP_D2CLK_BIT					11
++	#define		STOP_D2CLK_MASK					1 << 11
++	#define		EN_V2CLK						0 << 12 //Stop V2CLK (For Video Capture #2)
++	#define		STOP_V2CLK_BIT					12
++	#define		STOP_V2CLK_MASK					1 << 12
++	#define		STOP_HACE_BIT					13
++	#define		EN_HACE							(0 << 13)
++	#define		STOP_HACE_MASK					(1 << 13)
++	#define     EN_I2SCLK						0 << 18
++	#define     STOP_I2SCLK_MASK				1 << 18
++
++#define     SCU_PIN_CTRL1_REG					0x74 + SCU_OFFSET
++	#define		I2C_5_PIN_EN					1 << 12	//Enable I2C #5 PIN
++	#define		I2C_5_PIN_OFF					0 << 12	//Disable I2C #5 PIN
++	#define		I2C_5_PIN_MASK					1 << 12
++	#define		VGA_PIN_OFF						0 << 15 //Enable VGA pins
++	#define		VGA_PIN_MASK					1 << 15
++	#define		VIDEO_PORTA_EN					1 << 16 //Enable Video port A control pins
++	#define		VIDEO_PORTA_MASK				1 << 16
++	#define		VIDEO_PORTB_EN					1 << 17 //Enable Video port B control pins
++	#define		VIDEO_PORTB_MASK				1 << 17
++	#define		VIDEO_VP1_EN					1 << 22 //Enable VP[11:0]
++	#define		VIDEO_VP1_MASK					1 << 22 
++	#define		VIDEO_VP2_EN					1 << 23 //Enable VP[23:12]
++	#define		VIDEO_VP2_MASK					1 << 23
++	#define		I2S_PIN_EN						1 << 29 //Enable I2S function pins
++	#define		I2S_PIN_MASK					1 << 29
++
++#define     SCU_PIN_CTRL2_REG					0x78 + SCU_OFFSET
++	#define		VIDEO_PORTA_SINGLE_EDGE_MASK	1 << 0
++		#define		VIDEO_PORTA_SINGLE_EDGE		1 << 0	//Enable Video port A single mode
++		#define		VIDEO_PORTA_DUAL_EDGE		0 << 0
++	#define		VIDEO_PORTB_SINGLE_EDGE_MASK	1 << 1
++		#define		VIDEO_PORTB_DUAL_EDGE		0 << 1
++		#define		VIDEO_PORTB_SINGLE_EDGE		1 << 1	//Enable Video port B single mode
++
++#define		SCU_M_PLL_PARAM_REG					0x20 + SCU_OFFSET
++
++#define		DRAM_BASE							0x40000000
++
++#define     INPUT_BITCOUNT_YUV444				4
++#define		INPUT_BITCOUNT_YUV420				2
++
++/* HW comment value */
++//PASSWORD
++#define     VIDEO_UNLOCK_KEY                    0x1A038AA8
++#define		SCU_UNLOCK_KEY						0x1688A8A8
++#define		SDRAM_UNLOCK_KEY					0xFC600309
++
++
++//#define     SAMPLE_RATE                                 12000000.0
++#ifdef OSC_NEW
++    #define     SAMPLE_RATE                                 24576000.0
++#else
++    #define     SAMPLE_RATE                                 24000000.0
++#endif
++
++#define     MODEDETECTION_VERTICAL_STABLE_MAXIMUM       0x4
++#define     MODEDETECTION_HORIZONTAL_STABLE_MAXIMUM     0x4
++#define     MODEDETECTION_VERTICAL_STABLE_THRESHOLD     0x4
++#define     MODEDETECTION_HORIZONTAL_STABLE_THRESHOLD   0x8
++
++#define     MODEDETECTION_EDGE_PIXEL_THRES_DIGITAL      2
++#define     MODEDETECTION_EDGE_PIXEL_THRES_ANALOGE      0x0A
++
++#define		MODEDETECTION_OK							0
++#define		MODEDETECTION_ERROR							1
++#define		JUDGE_MODE_ERROR							2
++
++//I2C Loop Count
++#define    LOOP_COUNT                                  1000
++#define    CAN_NOT_FIND_DEVICE                         1
++#define    SET_I2C_DONE                                0
++#define	   I2C_BASE									   0xA000
++#define    AC_TIMING                                   0x77743355
++
++//I2C channel and Devices
++#define     I2C_VIDEO1_EEPROM                           0x2
++#define     I2C_VIDEO2_EEPROM                           0x5
++#define     I2C_VIDEO2_9883                             0x4
++/*
++ULONG    CAPTURE1_ADDRESS =                     0x1000000;
++ULONG    CAPTURE2_ADDRESS =                     0x3000000;
++ULONG    PASS1_ENCODE_SOURCE_ADDRESS =          0x1000000;
++ULONG    PASS1_ENCODE_DESTINATION_ADDRESS =     0x2000000;
++ULONG    Buffer1_DECODE_SOURCE_ADDRESS =        0x1000000;
++ULONG    Buffer2_DECODE_SOURCE_ADDRESS =        0x1400000;
++ULONG    PASS1_DECODE_DESTINATION_ADDRESS =     0x600000;
++ULONG    CAPTURE_2ND_ADDRESS =                  0x1800000;
++ULONG    PASS1_2ND_ENCODE_SOURCE_ADDRESS =      0x1800000;
++ULONG    PASS1_2ND_ENCODE_DESTINATION_ADDRESS = 0x2800000;
++ULONG    PASS1_2ND_DECODE_SOURCE_ADDRESS =      0x1000000;
++ULONG    PASS1_2ND_DECODE_DESTINATION_ADDRESS = 0x600000;
++ULONG    PASS2_ENCODE_SOURCE_ADDRESS =          0x000000;
++ULONG    PASS2_ENCODE_DESTINATION_ADDRESS =     0xC00000;
++ULONG    PASS2_DECODE_SOURCE_ADDRESS =          0xC00000;
++ULONG    PASS2_DECODE_DESTINATION_ADDRESS =     0x600000;
++ULNG    PASS2_DECODE_REFERENCE_ADDRESS =       0x600000;
++*/
++
++typedef struct _CTL_REG_G {
++    ULONG   CompressMode:1;
++    ULONG   SkipEmptyFrame:1;
++    ULONG   MemBurstLen:2;
++    ULONG   LineBufEn:2;
++    ULONG   Unused:26;
++} CTL_REG_G;
++
++
++typedef union _U_CTL_G {
++    ULONG       Value;
++    CTL_REG_G   CtlReg;
++} U_CTL_G;
++
++typedef struct _MODE_DETECTION_PARAM_REG {
++    ULONG   Unused1:8;
++    ULONG   EdgePixelThres:8;
++    ULONG   VerStableMax:4;
++    ULONG   HorStableMax:4;
++    ULONG   VerDiffMax:4;
++    ULONG   HorDiffMax:4;
++} MODE_DETECTION_PARAM_REG;
++
++typedef struct _CRC_PRI_PARAM_REG {
++    ULONG   Enable:1;
++    ULONG   HighBitOnly:1;
++    ULONG   SkipCountMax:6;
++    ULONG   PolyLow:8;
++    ULONG   PolyHigh:16;
++} CRC_PRI_PARAM_REG;
++
++typedef union _U_CRC_PRI_PARAM {
++    ULONG               Value;
++    CRC_PRI_PARAM_REG   CRCPriParam;
++} U_CRC_PRI_PARAM;
++
++typedef struct _CRC_SEC_PARAM_REG {
++    ULONG   Unused1:8;
++    ULONG   PolyLow:8;
++    ULONG   PolyHigh:16;
++} CRC_SEC_PARAM_REG;
++
++typedef union _U_CRC_SEC_PARAM {
++    ULONG               Value;
++    CRC_SEC_PARAM_REG   CRCSecParam;
++} U_CRC_SEC_PARAM;
++
++typedef struct _GENERAL_INFO {
++    BYTE                EnableVideoM;
++    BYTE                CenterMode;
++	BYTE				RC4NoResetFrame;
++	BYTE				RC4TestMode;
++    U_CTL_G             uCtlReg;
++    U_CRC_PRI_PARAM     uCRCPriParam;
++    U_CRC_SEC_PARAM     uCRCSecParam;
++} GENERAL_INFO, *PGENERAL_INFO;
++
++typedef struct _SEQ_CTL_REG {
++    ULONG   Unused1:1;
++    ULONG   Unused2:1;
++    ULONG   Unused3:1;
++    ULONG   CaptureAutoMode:1;
++    ULONG   Unused4:1;
++    ULONG   CodecAutoMode:1;
++    ULONG   Unused5:1;
++    ULONG   WatchDog:1;
++    ULONG   CRTSel:1;
++    ULONG   AntiTearing:1;
++    ULONG   DataType:2;
++    ULONG   Unused6:20;
++} SEQ_CTL_REG;
++
++typedef union _U_SEQ_CTL {
++    ULONG               Value;
++    SEQ_CTL_REG   SeqCtlReg;
++} U_SEQ_CTL;
++
++typedef struct _CTL_REG {
++    ULONG   SrcHsync:1;
++    ULONG   SrcVsync:1;
++    ULONG   ExtSrc:1;
++    ULONG   AnalongExtSrc:1;
++    ULONG   IntTimingGen:1;
++    ULONG   IntDataFrom:1;
++    ULONG   WriteFmt:2;
++    ULONG   VGACursor:1;
++    ULONG   LinearMode:1;
++    ULONG   ClockDelay:2;
++    ULONG   CCIR656Src:1;
++    ULONG   PortClock:1;
++    ULONG   ExtPort:1;        
++    ULONG   Unused1:1;
++    ULONG   FrameRate:8;
++    ULONG   Unused2:8;
++} CTL_REG;
++
++typedef union _U_CTL {
++    ULONG       Value;
++    CTL_REG     CtlReg;
++} U_CTL_REG;
++
++typedef struct _TIMING_GEN_SETTING_H {
++    ULONG   HDEEnd:13;
++    ULONG   Unused1:3;
++    ULONG   HDEStart:13;
++    ULONG   Unused2:3;
++} TIMING_GEN_SETTING_H;
++
++typedef struct _TIMING_GEN_SETTING_V {
++    ULONG   VDEEnd:13;
++    ULONG   Unused1:3;
++    ULONG   VDEStart:13;
++    ULONG   Unused2:3;
++} TIMING_GEN_SETTING_V;
++
++typedef struct _BCD_CTL_REG {
++    ULONG   Enable:1;
++    ULONG   Unused1:15;
++    ULONG   Tolerance:8;
++    ULONG   Unused2:8;
++} BCD_CTL_REG;
++
++typedef union _U_BCD_CTL {
++    ULONG           Value;
++    BCD_CTL_REG     BCDCtlReg;
++} U_BCD_CTL;
++
++typedef struct _COMPRESS_WINDOW_REG {
++    ULONG   VerLine:13;
++    ULONG   Unused1:3;
++    ULONG   HorPixel:13;
++    ULONG   Unused2:3;
++} COMPRESS_WINDOW_REG;
++
++typedef struct _STREAM_BUF_SIZE {
++    ULONG   PacketSize:3;
++    ULONG   RingBufNum:2;
++    ULONG   Unused1:11;
++    ULONG   SkipHighMBThres:7;
++    ULONG   SkipTestMode:2;
++    ULONG   Unused2:7;
++} STREAM_BUF_SIZE;
++
++typedef union _U_STREAM_BUF {
++    ULONG               Value;
++    STREAM_BUF_SIZE     StreamBufSize;
++} U_STREAM_BUF;
++
++
++typedef struct _COMPRESS_CTL_REG {
++    ULONG   JPEGOnly:1; /* True: Jpeg Only mode(Disable VQ), False:Jpeg and VQ mix mode */
++    ULONG   En4VQ:1; /* True: 1, 2, 4 color mode, False: 1,2 color mode */
++    ULONG   CodecMode:1; /* High and best Quantization encoding/decoding setting*/
++    ULONG   DualQuality:1;
++    ULONG   EnBest:1;
++    ULONG   EnRC4:1;
++    ULONG   NorChromaDCTTable:5;
++    ULONG   NorLumaDCTTable:5;
++    ULONG   EnHigh:1;
++    ULONG   TestCtl:2;
++    ULONG   UVFmt:1;
++    ULONG   HufTable:2;
++    ULONG   AlterValue1:5;
++    ULONG   AlterValue2:5;
++} COMPRESS_CTL_REG;
++
++typedef union _U_COMPRESS_CTL {
++    ULONG               Value;
++    COMPRESS_CTL_REG    CompressCtlReg;
++} U_COMPRESS_CTL;
++
++typedef struct _QUANTI_TABLE_LOW_REG {
++    ULONG   ChromaTable:5;
++    ULONG   LumaTable:5;
++    ULONG   Unused1:22;
++} QUANTI_TABLE_LOW_REG;
++
++typedef union _U_CQUANTI_TABLE_LOW {
++    ULONG                   Value;
++    QUANTI_TABLE_LOW_REG    QTableLowReg;
++} U_QUANTI_TABLE_LOW;
++
++typedef struct _QUANTI_VALUE_REG {
++    ULONG   High:15;
++	ULONG	Unused1:1;
++    ULONG   Best:15;
++    ULONG   Unused2:1;
++} QUANTI_VALUE_REG;
++
++typedef union _U_QUANTI_VALUE {
++    ULONG               Value;
++    QUANTI_VALUE_REG    QValueReg;
++} U_QUANTI_VALUE;
++
++typedef struct _BSD_PARAM_REG {
++    ULONG   HighThres:8;
++    ULONG   LowThres:8;
++    ULONG   HighCount:6;
++    ULONG   Unused1:2;
++    ULONG   LowCount:6;
++    ULONG   Unused2:2;
++} BSD_PARAM_REG;
++
++typedef union _U_BSD_PARAM {
++    ULONG           Value;
++    BSD_PARAM_REG   BSDParamReg;
++} U_BSD_PARAM;
++
++typedef struct _VIDEO_INFO {
++    BYTE      ExtADCAct;    /* read from modection register */
++	BYTE	  EnableRC4;
++    BYTE      DownScalingMethod;
++    USHORT    AnalogDifferentialThreshold; /* BCD tolerance */
++    USHORT    DigitalDifferentialThreshold; /* BCD tolerance */
++    USHORT    DstWidth;
++    USHORT    DstHeight;
++    USHORT    SrcWidth;
++    USHORT    SrcHeight;
++    BYTE      HighLumaTable; /* if High and best Jpeg codec enable, use HighLumaTable and HighChromaTable, otherwise HighDeQuantiValue and BestDequantiValue*/
++    BYTE      HighChromaTable;
++    BYTE      HighDeQuantiValue;
++    BYTE      BestDequantiValue;
++    U_SEQ_CTL               uSeqCtlReg;
++    U_CTL_REG               uCtlReg;
++    U_BCD_CTL               uBCDCtlReg;
++    U_STREAM_BUF            uStreamBufSize;
++    U_COMPRESS_CTL          uCompressCtlReg;
++    U_QUANTI_TABLE_LOW      uQTableLowReg;
++    U_QUANTI_VALUE          uQValueReg;
++    U_BSD_PARAM             uBSDParamReg;
++} VIDEO_INFO, *PVIDEO_INFO ;
++
++typedef struct _VIDEOM_SEQ_CTL_REG {
++    ULONG   Unused1:1;  //Bit 0
++    ULONG   Unused2:1;	//Bit 1
++    ULONG   Unused3:1;		//Bit 2
++    ULONG   StreamMode:1;	//Bit 3
++    ULONG   Unused4:1;	//Bit 4
++    ULONG   CodecAutoMode:1;	//Bit 5
++	ULONG	Unused6:1;	//Bit 6
++    ULONG   Unused7:1;	//Bit 7
++    ULONG   SrcSel:1;	//Bit 8
++    ULONG   Unused9:1;	//Bit 9
++    ULONG   DataType:2;  //Bit[11:10]
++    ULONG   Unused12:20;
++} VIDEOM_SEQ_CTL_REG;
++
++typedef union _U_VIDEOM_SEQ_CTL {
++    ULONG					Value;
++    VIDEOM_SEQ_CTL_REG		SeqCtlReg;
++} U_VIDEOM_SEQ_CTL;
++
++typedef struct _VIDEOM_INFO {
++    BYTE      DownScalingMethod;
++    USHORT    AnalogDifferentialThreshold; /* BCD tolerance */
++    USHORT    DigitalDifferentialThreshold; /* BCD tolerance */
++    USHORT    DstWidth;
++    USHORT    DstHeight;
++    USHORT    SrcWidth;
++    USHORT    SrcHeight;
++    BYTE      HighLumaTable; /* if High and best Jpeg codec enable, use HighLumaTable and HighChromaTable, otherwise HighDeQuantiValue and BestDequantiValue*/
++    BYTE      HighChromaTable;
++    BYTE      HighDeQuantiValue;
++    BYTE      BestDequantiValue;
++    BYTE      PacketSize;   //the same as video1 & video2
++    BYTE      RingBufNum;
++	BYTE	  EnableRC4;
++    U_VIDEOM_SEQ_CTL        uSeqCtlReg;
++    U_BCD_CTL               uBCDCtlReg;
++    U_COMPRESS_CTL          uCompressCtlReg;
++    U_QUANTI_TABLE_LOW      uQTableLowReg;
++    U_QUANTI_VALUE          uQValueReg;
++    U_BSD_PARAM             uBSDParamReg;
++} VIDEOM_INFO, *PVIDEOM_INFO ;
++
++typedef struct _VIDEO_MODE_INFO
++{
++    USHORT    X;
++    USHORT    Y;
++    USHORT    ColorDepth;
++    USHORT    RefreshRate;
++    BYTE      ModeIndex;
++} VIDEO_MODE_INFO, *PVIDEO_MODE_INFO;
++
++#endif
++
+diff --git a/board/aspeed/ast2300/vesa.h b/board/aspeed/ast2300/vesa.h
+new file mode 100755
+index 0000000..69aba90
+--- /dev/null
++++ b/board/aspeed/ast2300/vesa.h
+@@ -0,0 +1,163 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef _VESA_H_
++#define _VESA_H_
++
++typedef enum 
++{
++	VCLK25_175	= 0x00,
++	VCLK28_322	= 0x01,
++	VCLK31_5	= 0x02,
++	VCLK31_574	= 0x03,
++	VCLK32_76	= 0x04,
++	VCLK33_154	= 0x05,
++	VCLK36		= 0x06,
++	VCLK40		= 0x07,
++	VCLK45_978	= 0x08,
++	VCLK49_5	= 0x09,
++	VCLK50		= 0x0A,
++	VCLK52_95	= 0x0B,
++	VCLK56_25	= 0x0C,
++	VCLK65		= 0x0D,
++	VCLK74_48	= 0x0E,
++	VCLK75		= 0x0F,
++	VCLK78_75	= 0x10,
++	VCLK79_373	= 0x11,
++	VCLK81_624	= 0x12,
++	VCLK83_462	= 0x13,
++	VCLK84_715	= 0x14,
++	VCLK94_5	= 0x15,
++	VCLK106_5	= 0x16,
++	VCLK108		= 0x17,
++	VCLK119		= 0x18,
++	VCLK135		= 0x19,
++	VCLK136_358 = 0x1A,
++	VCLK146_25	= 0x1B,
++	VCLK154		= 0x1C,
++	VCLK157_5	= 0x1D,
++	VCLK162		= 0x1E
++} ePIXEL_CLOCK;
++
++typedef struct {
++    USHORT    HorizontalTotal;
++    USHORT    VerticalTotal;
++    USHORT    HorizontalActive;
++    USHORT    VerticalActive;
++    BYTE      RefreshRate;
++    double    HorizontalFrequency;
++    USHORT    HSyncTime;
++    USHORT    HBackPorch;
++    USHORT    VSyncTime;
++    USHORT    VBackPorch;
++    USHORT    HLeftBorder;
++    USHORT    HRightBorder;
++    USHORT    VBottomBorder;
++    USHORT	  VTopBorder;
++	USHORT	  PixelClock;
++	BOOL	  HorPolarity;
++	BOOL	  VerPolarity;
++    BYTE      ADCIndex1;
++    BYTE      ADCIndex2;
++    BYTE      ADCIndex3;
++    BYTE      ADCIndex5;
++    BYTE      ADCIndex6;
++    BYTE      ADCIndex7;
++    BYTE      ADCIndex8;
++    BYTE      ADCIndex9;
++    BYTE      ADCIndexA;
++    BYTE      ADCIndexF;
++    BYTE      ADCIndex15;
++    int       HorizontalShift;
++    int       VerticalShift;
++} VESA_MODE;
++
++#define HOR_POSITIVE 0
++#define HOR_NEGATIVE 1
++#define VER_POSITIVE 0
++#define VER_NEGATIVE 1
++
++#ifdef VESA_GLOBALS
++
++//  Note: Modified for modes which have border issue
++VESA_MODE vModeTable[] = {
++////////////////////////// 60Hz mode
++// 720x480 done
++  {1056, 497,  720,  480,  60, 29.900, 88,  104, 3, 13, 0, 0, 0, 0,	VCLK31_574,  HOR_NEGATIVE, VER_NEGATIVE, 0x41,	0xF0, 0x48, 0x05, 0x20, 0x58, 0x60, 0x60, 0x60,	0x5E, 0xFE,  6,	2},
++// 848x480 done                                                                               
++  {1064, 517,  848,  480,  60, 31.160, 88,  91,  3, 26, 0, 0, 0, 0,	VCLK33_154,  HOR_NEGATIVE, VER_NEGATIVE, 0x42,	0x70, 0x48, 0x05, 0x20, 0x58, 0x60, 0x60, 0x60,	0x5E, 0xFE,  6,	2},
++  {800,  525,  640,  480,  60, 31.469, 96,  40,  2, 25, 1, 1, 8, 8,	VCLK25_175,  HOR_NEGATIVE, VER_NEGATIVE, 0x31,	0xF0, 0x48, 0x05, 0x20, 0x60, 0x60, 0x60, 0x60,	0x5E, 0xFE,  6,	2},
++// 720x576                                                                                    
++  {912,  597,  720,  576,  60, 35.920, 72,  88,  3, 17, 0, 0, 0, 0,	VCLK32_76,   HOR_NEGATIVE, VER_NEGATIVE, 0x38,	0xF0, 0x48, 0x05, 0x20, 0x48, 0x60, 0x60, 0x60,	0x5E, 0xFE,  6,	2},
++// 960x600 GTF done                                                                           
++  {1232, 622,  960,  600,  60, 37.320, 96,  136, 3, 18, 0, 0, 0, 0,	VCLK45_978,  HOR_NEGATIVE, VER_NEGATIVE, 0x4C,	0xF0, 0x60, 0x05, 0x20, 0x60, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1056, 628,  800,  600,  60, 37.879, 128, 88,  4, 23, 0, 0, 0, 0,	VCLK40,	     HOR_POSITIVE, VER_POSITIVE, 0x41,	0xF0, 0x60, 0x05, 0x20, 0x80, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++// 1088x612 GTF done                                                                          
++  {1392, 634,  1088, 612,  60, 38.04,  112, 152, 3, 18, 0, 0, 0, 0,	VCLK52_95,   HOR_NEGATIVE, VER_NEGATIVE, 0x56,	0xF0, 0x60, 0x05, 0x20, 0x70, 0x60, 0x60, 0x60, 0x5E, 0xFE, -1, 0},
++// 1280x720 GTF done                                                                          
++  {1664, 746,  1280, 720,  60, 44.760, 136, 192, 3, 22, 0, 0, 0, 0,	VCLK74_48,   HOR_NEGATIVE, VER_NEGATIVE, 0x67,	0xF0, 0xA8, 0x05, 0x20, 0x88, 0x60, 0x60, 0x60, 0x5E, 0xFE, -1, 0},
++// 1360x768 GTF done                                                                          
++  {1776, 795,  1360, 768,  60, 47.700, 144, 208, 3, 23, 0, 0, 0, 0,	VCLK84_715,  HOR_NEGATIVE, VER_NEGATIVE, 0x6E,	0xF0, 0xA8, 0x05, 0x20, 0x90, 0x60, 0x60, 0x60, 0x5E, 0xFE,  7, 1},
++// 1280x768 done                                                                              
++  {1664, 798,  1280, 768,  60, 47.700, 128, 184, 7, 20, 0, 0, 0, 0,	VCLK79_373,  HOR_NEGATIVE, VER_NEGATIVE, 0x67,	0xF0, 0xA8, 0x05, 0x20, 0x80, 0x60, 0x60, 0x60, 0x5E, 0xFE,  7, 1},
++  {1344, 806,  1024, 768,  60, 48.363, 136, 160, 6, 29, 0, 0, 0, 0,	VCLK65,	     HOR_NEGATIVE, VER_NEGATIVE, 0x53,	0xF0, 0xA8, 0x05, 0x20, 0x88, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	7},
++// 1280x800 GTF done                                                                          
++  {1680, 828,  1280, 800,  60, 49.680, 136, 200, 3, 24, 0, 0, 0, 0,	VCLK83_462,  HOR_NEGATIVE, VER_NEGATIVE, 0x68,	0xF0, 0xA8, 0x05, 0x20, 0x88, 0x60, 0x60, 0x60, 0x5E, 0xFE, -1, 0},
++// 1152x864 GTF done                                                                          
++  {1520, 895,  1152, 864,  60, 53.700, 120, 184, 3, 27, 0, 0, 0, 0,	VCLK81_624,  HOR_NEGATIVE, VER_NEGATIVE, 0x5E,	0xF0, 0xA8, 0x05, 0x20, 0x78, 0x60, 0x60, 0x60, 0x5E, 0xFE, -1, 0},
++// 1600x900 GTF done                                                                          
++  {2128, 932,  1600, 900,  60, 55.920, 168, 264, 3, 28, 0, 0, 0, 0,	VCLK119,	 HOR_NEGATIVE, VER_NEGATIVE, 0x84,	0xF0, 0xA8, 0x05, 0x20, 0xA8, 0x60, 0x60, 0x60, 0x5E, 0xFE, -1, 0},
++// 1440X900 CVT done                                                                          
++  {1904, 933,  1440, 900,  60, 55.935, 152, 232, 6,	25,	0, 0, 0, 0,	VCLK106_5,   HOR_NEGATIVE, VER_POSITIVE, 0x76,	0xF0, 0xA8, 0x05, 0x20, 0x96, 0x60, 0x60, 0x60, 0x5E, 0xFE, -1, 0},
++  {1800, 1000, 1280, 960,  60, 60.000, 112, 312, 3, 36, 0, 0, 0, 0,	VCLK108,	 HOR_POSITIVE, VER_POSITIVE, 0x70,	0x70, 0xA8, 0x05, 0x20, 0x70, 0x60, 0x60, 0x60, 0x5E, 0xFE, -1, 0},
++// 1600x1024 GTF done                                                                            
++  {2144, 1060, 1600, 1024, 60, 63.600, 168, 272, 3, 32, 0, 0, 0, 0,	VCLK136_358, HOR_NEGATIVE, VER_NEGATIVE, 0x85,	0xF0, 0xE8, 0x05, 0x20, 0xA8, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1688, 1066, 1280, 1024, 60, 63.981, 112, 248, 3, 38, 0, 0, 0, 0,	VCLK108,	 HOR_POSITIVE, VER_POSITIVE, 0x69,	0x70, 0xA8, 0x05, 0x20, 0x70, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++// 1680X1050 CVT done Reduced Blanking                                                          
++  {1840, 1080, 1680, 1050, 60, 64.674, 32,  80,	 6,	21,	0, 0, 0, 0,	VCLK119,	 HOR_POSITIVE, VER_NEGATIVE, 0x72,	0xF0, 0xA8, 0x05, 0x20, 0x20, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++// 1920X1200 CVT done Reduced Blanking                           
++  {2080, 1235, 1920, 1200, 60, 74.038, 32,  80,  6, 26, 0, 0, 0, 0, VCLK154,     HOR_POSITIVE, VER_NEGATIVE, 0x81,	0xF0, 0xA8, 0x05, 0x20, 0x20, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  //{2160,           1250,           1600,           1200, 60,75.000,           192,        304,         3,          46,          0,            0,             0,              0,			VCLK162,		HOR_POSITIVE,	VER_POSITIVE},
++  {2160, 1248, 1600, 1200, 60, 75.000, 192, 304, 3, 46, 0, 0, 0, 0,	VCLK162,	 HOR_POSITIVE, VER_POSITIVE, 0x86,	0xF0, 0xE8, 0x05, 0x20, 0xC0, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++                                                              
++//////////////////////  Not 60Hz mode                                                                                                                  
++  {900,  449,  720,  400,  70, 31.469, 108, 45,  2, 25, 1, 1, 8, 8,	0,			 HOR_NEGATIVE, VER_NEGATIVE, 0x38,	0x30, 0x48, 0x05, 0x20, 0x6C, 0x60, 0x60, 0x60,	0x5E, 0xFE,  6,	1},
++  {832,  520,  640,  480,  72, 37.861, 40,  120, 3, 20, 1, 1, 8, 8,	0,			 HOR_NEGATIVE, VER_NEGATIVE, 0x33,	0xF0, 0x48, 0x05, 0x20, 0x28, 0x60, 0x60, 0x60,	0x5E, 0xFE,  6,	3},
++  {840,  500,  640,  480,  75, 37.500, 64,  120, 3, 16, 0, 0, 0, 0,	0,			 HOR_NEGATIVE, VER_NEGATIVE, 0x34,	0x70, 0x48, 0x05, 0x20, 0x40, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	3},                                         
++  {832,  509,  640,  480,  85, 43.269, 56,  80,  3, 25, 0, 0, 0, 0,	0,			 HOR_NEGATIVE, VER_NEGATIVE, 0x33,	0xF0, 0x48, 0x05, 0x20, 0x38, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	3},
++  {1024, 625,  800,  600,  56, 35.156, 72,  128, 2, 22, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x3F,	0xF0, 0x60, 0x05, 0x20, 0x48, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1040, 666,  800,  600,  72, 48.077, 120, 64,  6, 23, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x40,	0xF0, 0x60, 0x05, 0x20, 0x78, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1056, 625,  800,  600,  75, 46.875, 80,  160, 3, 21, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x41,	0xF0, 0x60, 0x05, 0x20, 0x50, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1048, 631,  800,  600,  85, 53.674, 64,  152, 3, 27, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x41,	0x70, 0x60, 0x05, 0x20, 0x40, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1328, 806,  1024, 768,  70, 56.476, 136, 144, 6, 29, 0, 0, 0, 0,	0,			 HOR_NEGATIVE, VER_NEGATIVE, 0x52,	0xF0, 0xA8, 0x05, 0x20, 0x88, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	7},
++  {1312, 800,  1024, 768,  75, 60.023, 96,  176, 3, 28, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x51,	0xF0, 0xA8, 0x05, 0x20, 0x60, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	1},
++  {1376, 808,  1024, 768,  85, 68.677, 96,  208, 3, 36, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x55,	0xF0, 0xA8, 0x05, 0x20, 0x60, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	1},
++  {1600, 900,  1152, 864,  75, 67.500, 128, 256, 3, 32, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x63,	0xF0, 0xA8, 0x05, 0x20, 0x80, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1728, 1011, 1280, 960,  85, 85.938, 160, 224, 3, 47, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x6B,	0xF0, 0xA8, 0x05, 0x20, 0xA0, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1688, 1066, 1280, 1024, 75, 79.976, 144, 248, 3, 38, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x69,	0x70, 0xE8, 0x05, 0x20, 0x90, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1728, 1072, 1280, 1024, 85, 91.146, 160, 224, 3, 44, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x6B,	0xF0, 0xA8, 0x05, 0x20, 0xA0, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {2160, 1250, 1600, 1200, 65, 81.250, 192, 304, 3, 46, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x86,	0xF0, 0xA8, 0x05, 0x20, 0xC0, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {2160, 1250, 1600, 1200, 70, 87.500, 192, 304, 3, 46, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x86,	0xF0, 0xA8, 0x05, 0x20, 0xC0, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {2160, 1250, 1600, 1200, 75, 93.750, 192, 304, 3, 46, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x86,	0xF0, 0xA8, 0x05, 0x20, 0xC0, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {2160, 1250, 1600, 1200, 85, 106.250,192, 304, 3, 46, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x86,	0xF0, 0xA8, 0x05, 0x20, 0xC0, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0}
++};
++
++USHORT  ModeNumberCount = sizeof (vModeTable) / sizeof (VESA_MODE);
++USHORT  Mode60HZCount = 21;
++
++#else  /* NOT VESA_GLOBALS */
++extern VESA_MODE vModeTable[];
++extern USHORT  ModeNumberCount;
++extern USHORT  Mode60HZCount;
++#endif
++
++#endif /* _VESA_H_ */
++
++
+diff --git a/board/aspeed/ast2300/vfun.c b/board/aspeed/ast2300/vfun.c
+new file mode 100755
+index 0000000..f707e80
+--- /dev/null
++++ b/board/aspeed/ast2300/vfun.c
+@@ -0,0 +1,545 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#define BUF_GLOBALS
++#include "type.h"
++#include "vdef.h"
++#include "vreg.h"
++#include "crt.h"
++#include "vfun.h"
++
++ULONG UnlockSCURegHost(ULONG   MMIOBase, ULONG Key)
++{
++    WriteMemoryLongHost(SCU_BASE, SCU_PROTECT_REG, Key);
++    return ReadMemoryLongHost(SCU_BASE,SCU_PROTECT_REG);
++}
++
++void ResetVideoHost(void)
++{
++	WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CONTROL_REG, VIDEO_RESET_EN << VIDEO_ENGINE_RESET_BIT, VIDEO_ENGINE_RESET_MASK);
++	WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CONTROL_REG, VIDEO_RESET_OFF << VIDEO_ENGINE_RESET_BIT, VIDEO_ENGINE_RESET_MASK);
++}
++
++void StartModeDetectionTriggerHost(ULONG   MMIOBase, ULONG offset)
++{
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, offset, 0, MODE_DETECTION_TRIGGER);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, offset, MODE_DETECTION_TRIGGER, MODE_DETECTION_TRIGGER);
++}
++
++BOOL ReadVideoInterruptHost(ULONG   MMIOBase, ULONG value)
++{
++    return ((ReadMemoryLongHost(VIDEO_REG_BASE, VIDEO_INT_CONTROL_READ_REG) & value) ? TRUE : FALSE);
++}
++
++ULONG UnlockVideoRegHost(ULONG   MMIOBase, ULONG Key)
++{
++    WriteMemoryLongHost(VIDEO_REG_BASE, KEY_CONTROL_REG, Key);
++    return ReadMemoryLongHost(VIDEO_REG_BASE,KEY_CONTROL_REG);
++}
++
++void StartVideoCaptureTriggerHost(ULONG   MMIOBase, ULONG offset)
++{
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, offset, 0, VIDEO_CAPTURE_TRIGGER);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, offset, VIDEO_CAPTURE_TRIGGER, VIDEO_CAPTURE_TRIGGER);
++}
++
++void StartVideoCodecTriggerHost(ULONG   MMIOBase, ULONG offset)
++{
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, offset, 0, VIDEO_CODEC_TRIGGER);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, offset, VIDEO_CODEC_TRIGGER, VIDEO_CODEC_TRIGGER);
++}
++
++void StopModeDetectionTriggerHost(ULONG   MMIOBase, ULONG offset)
++{
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, offset, 0, MODE_DETECTION_TRIGGER);
++}
++
++void ClearVideoInterruptHost(ULONG   MMIOBase, ULONG value)
++{
++    //WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO_INT_CONTROL_CLEAR_REG, value, value);
++	WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO_INT_CONTROL_CLEAR_REG, value);
++}
++
++/* UnLock SCU Host and Reset Engine */
++BOOL CheckOnStartHost(void)
++{
++    int i=0, dwValue=0;
++    
++    do
++    {
++	dwValue = UnlockSCURegHost(0, SCU_UNLOCK_KEY);
++	i++;
++    }
++    while ((SCU_WRITE_ENABLE != dwValue) && (i<10));
++
++    //Clear SCU Reset Register
++    WriteMemoryLongHost(SCU_BASE, SCU_CONTROL_REG, 0);
++
++    WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_STOP_REG, (EN_ECLK | EN_V1CLK | EN_V2CLK), (STOP_ECLK_MASK | STOP_V1CLK_MASK | STOP_V2CLK_MASK));
++
++#if	defined(CONFIG_AST2300)
++    WriteMemoryLongWithMASKHost(SCU_BASE, (0x90 + SCU_OFFSET), 0x00000020, 0x00000030);	//enable 24bits
++    WriteMemoryLongWithMASKHost(SCU_BASE, (0x88 + SCU_OFFSET), 0x000fff00, 0x000fff00);	//enable video multi-pins    
++#else	//AST2100 
++    //WriteMemoryLongWithMASKHost(SCU_BASE, SCU_PIN_CTRL1_REG, (VIDEO_PORTA_EN | VIDEO_PORTB_EN | VIDEO_VP1_EN | VIDEO_VP2_EN) , 
++    //							(VIDEO_PORTA_MASK | VIDEO_PORTB_MASK | VIDEO_VP1_MASK | VIDEO_VP2_MASK));
++    WriteMemoryLongWithMASKHost(SCU_BASE, SCU_PIN_CTRL2_REG, (VIDEO_PORTA_SINGLE_EDGE | VIDEO_PORTB_SINGLE_EDGE) , 
++	      						     (VIDEO_PORTA_SINGLE_EDGE_MASK | VIDEO_PORTB_SINGLE_EDGE_MASK));
++#endif	      						     
++
++    ResetVideoHost();
++
++    return TRUE;
++}
++
++BOOL CheckOnStartClient(void)
++{
++	int i=0, dwValue=0;
++    
++	do
++	{
++		dwValue = UnlockSCURegHost(0, SCU_UNLOCK_KEY);
++		i++;
++	}
++	while ((SCU_WRITE_ENABLE != dwValue) && (i<10));
++
++	//Clear SCU Reset Register
++	WriteMemoryLongClient(SCU_BASE, SCU_CONTROL_REG, 0);
++
++	WriteMemoryLongWithMASKClient(SCU_BASE, SCU_CLOCK_STOP_REG, (EN_ECLK | EN_V1CLK | EN_D1CLK | EN_D2CLK | EN_V2CLK), 
++								  (STOP_ECLK_MASK | STOP_D1CLK_MASK | STOP_D2CLK_MASK | STOP_V1CLK_MASK | STOP_V2CLK_MASK));
++
++	//WriteMemoryLongWithMASKClient(SCU_BASE, SCU_CLOCK_SELECTION_REG, PORTB_FROM_D2CLK | PORTB_CLOCK_INV_DELAY_3NS | PORTA_CLOCK_INV_DELAY_3NS, PORTB_CLOCK_SEL | PORTB_CLOCK_DELAY_MASK | PORTA_CLOCK_DELAY_MASK);
++	//A1EVA
++	WriteMemoryLongWithMASKClient(SCU_BASE, SCU_CLOCK_SELECTION_REG, (PORTB_FROM_D2CLK | PORTB_CLOCK_INV_DELAY_1NS | PORTA_CLOCK_INV_DELAY_1NS), (PORTB_CLOCK_SEL | PORTB_CLOCK_DELAY_MASK | PORTA_CLOCK_DELAY_MASK));
++	WriteMemoryLongWithMASKClient(SCU_BASE, 0x202C, (0x03<<9), (0x03<<9));
++
++	WriteMemoryLongWithMASKClient(SCU_BASE, SCU_PIN_CTRL1_REG, (VIDEO_PORTA_EN | VIDEO_PORTB_EN | VIDEO_VP1_EN | VIDEO_VP2_EN), 
++								  (VIDEO_PORTA_MASK | VIDEO_PORTB_MASK | VIDEO_VP1_MASK | VIDEO_VP2_MASK));
++
++#if CONFIG_AST3000
++	WriteMemoryLongWithMASKClient(SCU_BASE, SCU_PIN_CTRL2_REG, (VIDEO_PORTA_DUAL_EDGE | VIDEO_PORTB_DUAL_EDGE), 
++								  (VIDEO_PORTA_SINGLE_EDGE_MASK | VIDEO_PORTB_SINGLE_EDGE_MASK));
++#else
++	//2100 is single edge
++	WriteMemoryLongWithMASKClient(SCU_BASE, SCU_PIN_CTRL2_REG, (VIDEO_PORTA_SINGLE_EDGE | VIDEO_PORTB_SINGLE_EDGE), 
++								  (VIDEO_PORTA_SINGLE_EDGE_MASK | VIDEO_PORTB_SINGLE_EDGE_MASK));
++#endif
++
++	WriteMemoryLongWithMASKClient(SCU_BASE, SCU_CLOCK_STOP_REG, (EN_D1CLK | EN_D2CLK), (STOP_D1CLK_MASK | STOP_D2CLK_MASK));
++	WriteMemoryLongWithMASKClient(SCU_BASE, SCU_PIN_CTRL1_REG, VGA_PIN_OFF, VGA_PIN_MASK);
++
++    //ResetVideoHost();
++
++	return TRUE;
++}
++
++ULONG  InitializeVideoEngineHost (ULONG                MMIOBase,
++                               int                  nVideo,
++							   BOOL					HorPolarity,
++							   BOOL					VerPolarity)
++{
++    //ULONG   temp, temp1, temp2; 
++    ULONG   dwRegOffset = nVideo * 0x100;
++    ULONG   dwValue;
++    int     i;
++
++
++    /* General Video Control */
++    //LineBufEn 0
++    //dwValue = (COMPRESS_MODE << CODEC_DECOMPRESS_MODE_BIT) | DELAY_VSYNC_EN;
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO_CONTROL_REG, dwValue);
++    //Video Data Truncation Register
++	WriteMemoryLongHost(VIDEO_REG_BASE, 0x328, 0);
++
++	//D2CLK clock must config according to video's line buffer
++	if (VIDEO1 == nVideo)
++	    dwValue = LINE_BUFFER_VIDEO1;
++    else
++        dwValue = LINE_BUFFER_VIDEO2;
++    
++	//D2CLK clock must config according to video's line buffer
++	switch (dwValue)
++	{
++	case LINE_BUFFER_OFF:
++		WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_SELECTION_REG, NORMAL_CRT1, D2CLK_CLOCK_SELECTION_MASK);
++		WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_STOP_REG, STOP_D2CLK, STOP_D2CLK_MASK);
++		break;
++	case LINE_BUFFER_VIDEO1:
++		WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_SELECTION_REG, V1CLK_VIDEO1 << D2CLK_CLOCK_SELECTION_BIT, D2CLK_CLOCK_SELECTION_MASK);
++		WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_STOP_REG, EN_D2CLK, STOP_D2CLK_MASK);
++		break;
++	case LINE_BUFFER_VIDEO2:
++		WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_SELECTION_REG, V1CLK_VIDEO2 << D2CLK_CLOCK_SELECTION_BIT, D2CLK_CLOCK_SELECTION_MASK);
++		WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_STOP_REG, EN_D2CLK, STOP_D2CLK_MASK);
++		break;
++	case LINE_BUFFER_VIDEOM:
++		//If select this option, it will config at videoM INIT
++		break;
++	default:
++		break;
++	}
++
++    dwValue = 0;
++    //VR30 now is capture window in the compression
++    dwValue = g_DefHeight << CAPTURE_VER_LINE_BIT |
++    g_DefWidth << CAPTURE_HOR_PIXEL_BIT;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_CAPTURE_WINDOWS_REG + dwRegOffset, dwValue);        
++
++    dwValue = 0;
++    //VR34 now is destionation window in the compression
++	dwValue = g_DefHeight << COMPRESS_VER_LINE_BIT |
++	g_DefWidth << COMPRESS_HOR_PIXEL_BIT;
++
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_WINDOWS_REG + dwRegOffset, dwValue);        
++
++    //BitCOUNT according compress data format
++    dwValue = YUV444_MODE;
++	if (YUV444_MODE == dwValue)
++		WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_LINE_OFFSET_REG + dwRegOffset, g_DefWidth * INPUT_BITCOUNT_YUV444, BUF_LINE_OFFSET_MASK);
++	else
++		WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_LINE_OFFSET_REG + dwRegOffset, g_DefWidth * INPUT_BITCOUNT_YUV420, BUF_LINE_OFFSET_MASK);
++              
++    //  CRC
++    //Disable
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO_CRC_PRIMARY_REG, 0x0);    
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO_CRC_SECOND_REG, 0x0);
++    
++    /* Sequence Control register */
++	//Oonly Encoder need to set
++	/* Engine Sequence Contol Register */
++	dwValue = (WATCH_DOG_EN << WATCH_DOG_ENABLE_BIT) |
++	            VIDEO_CAPTURE_AUTO_MODE |
++	            VIDEO_CODEC_AUTO_MODE;
++    
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG + dwRegOffset, dwValue);
++    
++    /* Control register */
++	dwValue = (HOR_NEGATIVE == HorPolarity) ? NO_INVERSE_POL : INVERSE_POL;
++	dwValue = (((VER_NEGATIVE == VerPolarity) ? NO_INVERSE_POL : INVERSE_POL) << VIDEO_VSYNC_POLARITY_BIT) | dwValue;
++    
++	/* HW Recommand*/
++	//dwValue = (TILE_MODE << 9) | dwValue;
++	dwValue = (EXTERNAL_VGA_SOURCE << EXTERNAL_SOURCE_BIT) | dwValue;
++    
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_CONTROL_REG + dwRegOffset, dwValue);
++        
++    /* BCD register */
++    //NO BCD
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_BCD_CONTROL_REG + dwRegOffset, dwValue);
++
++    /* Stream Buffer Size register */
++    dwValue = (YUV_TEST << SKIP_TEST_MODE_BIT) |
++                (PACKET_SIZE_32KB << STREAM_PACKET_SIZE_BIT) |
++                (PACKETS_8 << RING_BUF_PACKET_NUM_BIT);
++    /* the same with Video1, Video2, and VideoM*/
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_STREAM_BUF_SIZE, dwValue);
++
++    /* Comression control register */
++    dwValue = (USE_UV_CIR656 << UV_CIR656_FORMAT_BIT)|
++                (JPEG_MIX_MODE << JPEG_ONLY_BIT)|
++                (VQ_4_COLOR_MODE << VQ_4_COLOR_BIT)|
++                (QUANTI_CODEC_MODE << QUALITY_CODEC_SETTING_BIT)|
++                (7 << NORMAL_QUANTI_CHROMI_TABLE_BIT) |
++                (23 << NORMAL_QUANTI_LUMI_TABLE_BIT);
++   
++    //Video2 have same value as video1
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_CONTROL_REG, dwValue);
++
++    /* JPEG Quantization Table register */
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_QUANTI_TABLE_LOW_REG, dwValue);
++    
++    /* Quantization value register */
++    //Video2 have same value as video1
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_QUANTI_VALUE_REG, dwValue);
++
++    //Video BSD Parameter Register
++    //Video2 have same value as video1
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_BSD_PARA_REG, dwValue);
++
++    //no scale
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_SCALE_FACTOR_REG,  0x10001000);
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_SCALE_FACTOR_PARAMETER0_REG, 0x00200000);
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_SCALE_FACTOR_PARAMETER1_REG, 0x00200000);
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_SCALE_FACTOR_PARAMETER2_REG, 0x00200000);
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_SCALE_FACTOR_PARAMETER3_REG, 0x00200000);
++    return TRUE;
++}
++
++ULONG  InitializeVideoEngineClient (ULONG                MMIOBase,
++                               int                  nVideo)
++{
++    //ULONG   temp, temp1, temp2; 
++    ULONG   dwRegOffset = nVideo * 0x100;
++    ULONG   dwValue;
++    int     i;
++
++
++    /* General Video Control */
++    //LineBufEn 0
++    dwValue = (DECOMPRESS_MODE << CODEC_DECOMPRESS_MODE_BIT);
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO_CONTROL_REG, dwValue);
++    //Video Data Truncation Register
++	WriteMemoryLongHost(VIDEO_REG_BASE, 0x328, 0);
++
++    //VR30 now is capture window in the compression
++    dwValue = g_DefHeight << CAPTURE_VER_LINE_BIT |
++    g_DefWidth << CAPTURE_HOR_PIXEL_BIT;
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_CAPTURE_WINDOWS_REG + dwRegOffset, dwValue, CAPTURE_VER_LINE_MASK | CAPTURE_HOR_PIXEL_MASK);        
++
++    //VR34 now is destionation window in the compression
++	dwValue = g_DefHeight << COMPRESS_VER_LINE_BIT |
++	g_DefWidth << COMPRESS_HOR_PIXEL_BIT;
++
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_WINDOWS_REG + dwRegOffset, dwValue, COMPRESS_VER_LINE_MASK | COMPRESS_HOR_PIXEL_MASK);        
++
++    //BitCOUNT according compress data format
++    dwValue = YUV444_MODE;
++	if (YUV444_MODE == dwValue)
++		WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_LINE_OFFSET_REG + dwRegOffset, g_DefWidth * INPUT_BITCOUNT_YUV444, BUF_LINE_OFFSET_MASK);
++	else
++		WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_LINE_OFFSET_REG + dwRegOffset, g_DefWidth * INPUT_BITCOUNT_YUV420, BUF_LINE_OFFSET_MASK);
++              
++    //  CRC
++    //Disable
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO_CRC_PRIMARY_REG, 0x0);    
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO_CRC_SECOND_REG, 0x0);
++    
++    /* Sequence Control register */
++	//Oonly Encoder need to set
++	/* Engine Sequence Contol Register */
++    dwValue = VIDEO_CAPTURE_AUTO_MODE |
++        VIDEO_CODEC_AUTO_MODE;
++    
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG + dwRegOffset, dwValue);
++    
++    /* Control register */
++	/* HW Recommand*/
++	dwValue = (TILE_MODE << 9); 	
++    
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_CONTROL_REG + dwRegOffset, dwValue);
++        
++    /* BCD register */
++    //NO BCD
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_BCD_CONTROL_REG + dwRegOffset, dwValue);
++
++    /* Stream Buffer Size register */
++    dwValue = (YUV_TEST << SKIP_TEST_MODE_BIT) |
++                (PACKET_SIZE_32KB << STREAM_PACKET_SIZE_BIT) |
++                (PACKETS_8 << RING_BUF_PACKET_NUM_BIT);
++    /* the same with Video1, Video2, and VideoM*/
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_STREAM_BUF_SIZE, dwValue);
++        
++
++    /* Comression control register */
++    dwValue = (USE_UV_CIR656 << UV_CIR656_FORMAT_BIT)|
++                (JPEG_MIX_MODE << JPEG_ONLY_BIT)|
++                (VQ_4_COLOR_MODE << VQ_4_COLOR_BIT)|
++                (QUANTI_CODEC_MODE << QUALITY_CODEC_SETTING_BIT)|
++                (7 << NORMAL_QUANTI_CHROMI_TABLE_BIT) |
++                (23 << NORMAL_QUANTI_LUMI_TABLE_BIT);
++   
++    //Video2 have same value as video1
++    if (VIDEO1 == nVideo)
++    {
++        WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_CONTROL_REG, dwValue);
++    }
++    else
++    {
++        WriteMemoryLongHost(VIDEO_REG_BASE, VIDEOM_COMPRESS_CONTROL_REG, dwValue);
++    }
++
++    /* JPEG Quantization Table register */
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_QUANTI_TABLE_LOW_REG, dwValue);
++    
++    /* Quantization value register */
++    //Video2 have same value as video1
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_QUANTI_VALUE_REG, dwValue);
++
++    //Video BSD Parameter Register
++    //Video2 have same value as video1
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_BSD_PARA_REG, dwValue);
++
++    return TRUE;
++}
++
++BYTE  GetI2CRegClient(ULONG  MMIOBase, 
++				 BYTE DeviceSelect, 
++				 BYTE DeviceAddress, 
++				 BYTE RegisterIndex)
++{
++    BYTE    Data;
++    ULONG   Status;
++
++//  Reset
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x00, 0);
++//  Set AC Timing and Speed
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x04, AC_TIMING);
++//  Lower Speed
++//    WriteMemoryLongWithANDData (VideoEngineInfo->VGAPCIInfo.ulMMIOBaseAddress, I2C_BASE + DeviceSelect * 0x40 + 0x04, 0, 0x33317805);
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x08, 0);
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++//  Enable Master Mode
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x00, 1);
++//  Enable Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x0C, 0xAF);
++//  BYTE I2C Mode
++//  Start and Send Device Address
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x20, DeviceAddress);
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x3);
++//  Wait TX ACK
++    do {
++        Status = ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10) & 0x03;
++    } while (Status != 1);
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++//  Send Device Register Index
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x20, RegisterIndex);
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x2);
++//  Wait Tx ACK
++    do {
++        Status = ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10) & 0x03;
++    } while (Status != 1);
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++//  Start, Send Device Address + 1(Read Mode), Receive Data
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x20, DeviceAddress + 1);
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x1B);
++//  Wait Rx Done
++    do {
++        Status = (ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10) & 0x04) >> 2;
++    } while (Status != 1);
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++
++//  Enable STOP Interrupt
++    WriteMemoryLongWithMASKClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x0C, 0x10, 0x10);
++//  Issue STOP Command
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x20);
++//  Wait STOP
++    do {
++        Status = (ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10) & 0x10) >> 4;
++    } while (Status != 1);
++//  Disable STOP Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x0C, 0x10);
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++//  Read Received Data
++    Data = (BYTE)((ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x20) & 0xFF00) >> 8);
++
++    return    Data;
++}
++
++ULONG  SetI2CRegClient(ULONG  MMIOBase, 
++                 BYTE   DeviceSelect, 
++                 BYTE   DeviceAddress, 
++                 BYTE   RegisterIndex, 
++                 BYTE   RegisterValue)
++{
++    ULONG   Status; 
++	ULONG   Count = 0;
++
++//  Reset
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x00, 0);
++//  Set Speed
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x04, AC_TIMING);
++//  Lower Speed
++//    WriteMemoryLongWithANDData (VideoEngineInfo->VGAPCIInfo.ulMMIOBaseAddress, I2C_BASE + DeviceSelect * 0x40 + 0x04, 0, 0x33317805);
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x08, 0);
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++//  Enable Master Mode
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x00, 1);
++//  Enable Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x0C, 0xAF);
++//  BYTE I2C Mode
++//  Start and Send Device Address
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x20, DeviceAddress);
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x3);
++//  Wait Tx ACK
++    do {
++        Count++;
++        Status = ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10) & 0x03;
++
++		if (2 == Status)
++		{
++			//Clear Interrupt
++			WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++			//Re-Send Start and Send Device Address while NACK return
++			WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x20, DeviceAddress);
++			WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x3);
++		}
++		//else
++		{
++			if (Count > LOOP_COUNT) {
++				return CAN_NOT_FIND_DEVICE;
++			}
++		}
++    } while (Status != 1);
++    Count = 0;
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++//  Send Device Register Index
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x20, RegisterIndex);
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x2);
++//  Wait Tx ACK
++    do {
++        Count++;
++        Status = ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10) & 0x03;
++        if (Count > LOOP_COUNT) {
++            return CAN_NOT_FIND_DEVICE;
++        }
++    } while (Status != 1);
++    Count = 0;
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++//  Send Device Register Value and Stop
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x20, RegisterValue);
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x2);
++//  Wait Tx ACK
++    do {
++        Count++;
++        Status = ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10) & 0x03;
++        if (Count > LOOP_COUNT) {
++            return CAN_NOT_FIND_DEVICE;
++        }
++    } while (Status != 1);
++    Count = 0;
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++//  Enable STOP Interrupt
++    WriteMemoryLongWithMASKClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x0C, 0x10, 0x10);
++//  Issue STOP Command
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x20);
++//  Wait STOP
++    do {
++        Count++;
++        Status = (ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10) & 0x10) >> 4;
++        if (Count > LOOP_COUNT) {
++            return CAN_NOT_FIND_DEVICE;
++        }
++    } while (Status != 1);
++//  Disable STOP Interrupt
++    WriteMemoryLongWithMASKClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x0C, 0, 0x10);
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++
++    return SET_I2C_DONE;
++}
+diff --git a/board/aspeed/ast2300/vfun.h b/board/aspeed/ast2300/vfun.h
+new file mode 100755
+index 0000000..90f9ec4
+--- /dev/null
++++ b/board/aspeed/ast2300/vfun.h
+@@ -0,0 +1,79 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef _VFUN_H_
++#define _VFUN_H_
++
++//#define vBufAlign(x)		    ((x + 0x0000007F) & 0xFFFFFF80) //128 byte alignment
++#define vBufAlign(x)		    ((x + 0x000003FF) & 0xFFFFFC00) //128 byte alignment
++#define vBufAlign2(x)		    ((x + 0x0000FFFF) & 0xFFFF0000) //128 byte alignment
++#define v16byteAlign(x)		    ((x + 0x0000000F) & 0xFFFFFFF0)
++#define vBuf_ALIGNMENT			128
++
++#define HOST_TOTAL_SIZE         0x8000000   /* 128M */
++#define STATION_TOTAL_SIZE      0xF800000   /* 120M */
++
++#define VIDEO_SOURCE_SIZE       0x200000    /* 800X600X4 = 0x1D4C00 */
++#define VIDEO_MAX_STREAM_SIZE   0x400000    /* 32X128K = 0x400000 */
++#define VIDEO_FLAG_SIZE         0x5000      /* 1920X1200/128 = 0x4650*/ 
++#define VIDEO_CRC_SIZE          0x50000     /* 1920/64X1200X8 = 0x46500*/
++
++#define VIDEO1_EN_TOTAL_SIZE    (VIDEO_SOURCE_SIZE*2+VIDEO_MAX_STREAM_SIZE+VIDEO_FLAG_SIZE+VIDEO_CRC_SIZE) /* 0x1655000 =  about 23M*/
++#define VIDEO2_EN_TOTAL_SIZE    VIDEO1_EN_TOTAL_SIZE
++//#define VIDEOM_EN_TOTAL_SIZE    (VIDEO_SOURCE_SIZE*2+VIDEO_MAX_STREAM_SIZE+VIDEO_FLAG_SIZE) /* 0x1605000 = about 22.7M */
++//#define VIDEO_HOST_SIZE         (VIDEO1_EN_TOTAL_SIZE + VIDEO2_EN_TOTAL_SIZE + VIDEOM_EN_TOTAL_SIZE) /* 0x69922816 = about 70M */
++#define VIDEO_HOST_SIZE         (VIDEO1_EN_TOTAL_SIZE + VIDEO2_EN_TOTAL_SIZE) /* NOT NEED VIDEOM */
++
++#define VIDEO1_EN_BASE          0x100000
++#define VIDEO2_EN_BASE          (VIDEO1_EN_BASE + VIDEO1_EN_TOTAL_SIZE)
++#define VIDEOM_EN_BASE          (VIDEO2_EN_BASE + VIDEO2_EN_TOTAL_SIZE)
++
++#define VIDEO1_DE_TOTAL_SIZE    (VIDEO_MAX_STREAM_SIZE + VIDEO_SOURCE_SIZE) /* 0xD00000 = 13M*/
++#define VIDEO2_DE_TOTAL_SIZE    (VIDEO1_DE_TOTAL_SIZE)
++#define VIDEO_STATION_SIZE      (VIDEO1_DE_TOTAL_SIZE + VIDEO2_DE_TOTAL_SIZE) /* 26M */
++
++#define VIDEO1_DE_BASE          VIDEO_HOST_SIZE
++#define VIDEO2_DE_BASE          (VIDEO1_DE_BASE + VIDEO1_DE_TOTAL_SIZE)
++#define VIDEO_ALL_SIZE          (VIDEO_HOST_SIZE + VIDEO_STATION_SIZE) //Host and Station
++
++#define OutdwmBankModeHost(offset,data)         WriteMemoryLongHost(DRAM_BASE,offset,data)
++#define IndwmBankModeHost(offset)               ReadMemoryLongHost(DRAM_BASE,offset)      
++
++ULONG UnlockVideoRegHost(ULONG   MMIOBase, ULONG Key);
++BOOL CheckOnStartHost(void);
++BOOL CheckOnStartClient(void);
++void StartVideoCaptureTriggerHost(ULONG   MMIOBase, ULONG offset);
++void StartVideoCaptureTriggerHost(ULONG   MMIOBase, ULONG offset);
++void StartVideoCodecTriggerHost(ULONG   MMIOBase, ULONG offset);
++ULONG UnlockSCURegHost(ULONG   MMIOBase, ULONG Key);
++ULONG UnlockSCURegHost(ULONG   MMIOBase, ULONG Key);
++void StartModeDetectionTriggerHost(ULONG   MMIOBase, ULONG offset);
++void ClearVideoInterruptHost(ULONG   MMIOBase, ULONG value);
++BOOL ReadVideoInterruptHost(ULONG   MMIOBase, ULONG value);
++void StopModeDetectionTriggerHost(ULONG   MMIOBase, ULONG offset);
++void ResetVideoHost(void);
++ULONG  InitializeVideoEngineHost (ULONG                MMIOBase,
++                               int                  nVideo,
++							   BOOL					HorPolarity,
++				  BOOL					VerPolarity);
++ULONG  InitializeVideoEngineClient (ULONG                MMIOBase,
++				    int                  nVideo);
++BYTE  GetI2CRegClient(ULONG  MMIOBase, 
++				 BYTE DeviceSelect, 
++				 BYTE DeviceAddress, 
++				 BYTE RegisterIndex);
++
++ULONG  SetI2CRegClient(ULONG  MMIOBase, 
++                 BYTE   DeviceSelect, 
++                 BYTE   DeviceAddress, 
++                 BYTE   RegisterIndex, 
++				 BYTE   RegisterValue);
++#endif //_VFUN_H_
++
+diff --git a/board/aspeed/ast2300/vgahw.h b/board/aspeed/ast2300/vgahw.h
+new file mode 100755
+index 0000000..7cbba0d
+--- /dev/null
++++ b/board/aspeed/ast2300/vgahw.h
+@@ -0,0 +1,175 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++/******************************************************************************
++ * Mode Stuff
++ ******************************************************************************/
++/* Default Settings */
++#define CRT_LOW_THRESHOLD_VALUE         0x12
++#define CRT_HIGH_THRESHOLD_VALUE        0x1E
++
++/* Output Selection */
++#define CRT1				0x00
++#define CRT2				0x01
++#define DVI1				0x10
++#define DVI2				0x11
++#define LVDS1				0x20
++#define LVDS2				0x21
++
++/* Mode Limitation */
++#define MAX_HResolution		1600
++#define MAX_VResolution		1200
++ 
++/* Std. Table Index Definition */
++#define TextModeIndex 		0
++#define EGAModeIndex 		1
++#define VGAModeIndex 		2
++#define HiCModeIndex 		3
++#define TrueCModeIndex 		4
++
++/* DCLK Index */
++#define VCLK25_175     		0x00
++#define VCLK28_322     		0x01
++#define VCLK31_5       		0x02
++#define VCLK36         		0x03
++#define VCLK40         		0x04
++#define VCLK49_5       		0x05
++#define VCLK50         		0x06
++#define VCLK56_25      		0x07
++#define VCLK65		 	0x08
++#define VCLK75	        	0x09
++#define VCLK78_75      		0x0A
++#define VCLK94_5       		0x0B
++#define VCLK108        		0x0C
++#define VCLK135        		0x0D
++#define VCLK157_5      		0x0E
++#define VCLK162        		0x0F
++#define VCLK119        		0x10
++
++/* Flags Definition */
++#define Charx8Dot               0x00000001
++#define HalfDCLK                0x00000002
++#define DoubleScanMode          0x00000004
++#define LineCompareOff          0x00000008
++#define SyncPP                  0x00000000
++#define SyncPN                  0x00000040
++#define SyncNP                  0x00000080
++#define SyncNN                  0x000000C0
++#define HBorder                 0x00000020
++#define VBorder                 0x00000010
++#define COLORINDEX		0x00000000
++#define MONOINDEX		0x00000100
++
++/* DAC Definition */
++#define DAC_NUM_TEXT		64
++#define DAC_NUM_EGA		64
++#define DAC_NUM_VGA		256
++
++/* AST3000 Reg. Definition */
++#define	AST3000_VGAREG_BASE	0x1e6e6000
++#define AST3000_VGA1_CTLREG	0x00
++#define AST3000_VGA1_CTLREG2	0x04
++#define AST3000_VGA1_STATUSREG	0x08 
++#define AST3000_VGA1_PLL	0x0C
++#define AST3000_VGA1_HTREG	0x10
++#define AST3000_VGA1_HRREG	0x14
++#define AST3000_VGA1_VTREG	0x18
++#define AST3000_VGA1_VRREG	0x1C
++#define AST3000_VGA1_STARTADDR	0x20
++#define AST3000_VGA1_OFFSETREG	0x24
++#define AST3000_VGA1_THRESHOLD	0x28
++#define AST3000_HWC1_OFFSET     0x30
++#define AST3000_HWC1_XY		0x34
++#define AST3000_HWC1_PBase      0x38
++#define AST3000_OSD1_H          0x40
++#define AST3000_OSD1_V          0x44
++#define AST3000_OSD1_PBase      0x48
++#define AST3000_OSD1_Offset     0x4C
++#define AST3000_OSD1_THRESHOLD  0x50
++
++#define AST3000_VGA2_CTLREG	0x60
++#define AST3000_VGA2_CTLREG2	0x64
++#define AST3000_VGA2_STATUSREG	0x68 
++#define AST3000_VGA2_PLL	0x6C
++#define AST3000_VGA2_HTREG	0x70
++#define AST3000_VGA2_HRREG	0x74
++#define AST3000_VGA2_VTREG	0x78
++#define AST3000_VGA2_VRREG	0x7C
++#define AST3000_VGA2_STARTADDR	0x80
++#define AST3000_VGA2_OFFSETREG	0x84
++#define AST3000_VGA2_THRESHOLD	0x88
++#define AST3000_HWC2_OFFSET     0x90
++#define AST3000_HWC2_XY		0x94
++#define AST3000_HWC2_PBase      0x98
++#define AST3000_OSD2_H          0xA0
++#define AST3000_OSD2_V          0xA4
++#define AST3000_OSD2_PBase      0xA8
++#define AST3000_OSD2_Offset     0xAC
++#define AST3000_OSD2_THRESHOLD  0xB0
++
++/* Data Structure */
++typedef struct {
++    UCHAR ModeName[20];
++    USHORT usModeIndex;
++    USHORT usModeID;
++    USHORT usColorIndex;
++    USHORT usRefreshRateIndex;
++    USHORT usWidth;
++    USHORT usHeight;
++    USHORT usBitsPerPlane;
++    USHORT usRefreshRate;    
++} ModeInfoStruct;
++
++typedef struct {
++	
++    UCHAR MISC;	
++    UCHAR SEQ[4];
++    UCHAR CRTC[25];
++    UCHAR AR[20];	    
++    UCHAR GR[9];
++    
++} VBIOS_STDTABLE_STRUCT, *PVBIOS_STDTABLE_STRUCT;
++
++typedef struct {
++	
++    ULONG HT;
++    ULONG HDE;
++    ULONG HFP;
++    ULONG HSYNC;
++    ULONG VT;
++    ULONG VDE;
++    ULONG VFP;
++    ULONG VSYNC;
++    ULONG DCLKIndex;        
++    ULONG Flags;
++
++    ULONG ulRefreshRate;
++    ULONG ulRefreshRateIndex;
++    ULONG ulModeID;
++        
++} VBIOS_ENHTABLE_STRUCT, *PVBIOS_ENHTABLE_STRUCT;
++
++typedef struct {
++    UCHAR Param1;
++    UCHAR Param2;
++    UCHAR Param3;	
++} VBIOS_DCLK_INFO, *PVBIOS_DCLK_INFO;
++
++typedef struct {
++    UCHAR DACR;
++    UCHAR DACG;
++    UCHAR DACB;	
++} VBIOS_DAC_INFO, *PVBIOS_DAC_INFO;
++
++typedef struct {
++    PVBIOS_STDTABLE_STRUCT pStdTableEntry;
++    PVBIOS_ENHTABLE_STRUCT pEnhTableEntry;
++    	
++} VBIOS_MODE_INFO, *PVBIOS_MODE_INFO;
+diff --git a/board/aspeed/ast2300/vhace.c b/board/aspeed/ast2300/vhace.c
+new file mode 100755
+index 0000000..d045cbd
+--- /dev/null
++++ b/board/aspeed/ast2300/vhace.c
+@@ -0,0 +1,66 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#define HASH_GLOBALS
++#include "type.h"
++#include "vdef.h"
++#include "vhace.h"
++#include "vfun.h"
++
++void HashAst3000(ULONG ulLength, ULONG *output, ULONG ulHashMode)
++{
++	ULONG i, ulTemp, ulCommand, ulDigestLength;
++	ULONG ulValue;
++   
++	/* Get Info */
++	switch (ulHashMode)
++	{
++	case VHASHMODE_MD5:
++		ulCommand = VHASH_ALG_SELECT_MD5;
++		ulDigestLength = 16;
++		break;
++	case VHASHMODE_SHA1:
++		ulCommand = VHASH_ALG_SELECT_SHA1;
++		ulDigestLength = 20;
++		break;
++	case VHASHMODE_SHA256:
++		ulCommand = VHASH_ALG_SELECT_SHA256;
++		ulDigestLength = 32;
++		break;
++	case VHASHMODE_SHA224:
++		ulCommand = VHASH_ALG_SELECT_SHA224;
++		ulDigestLength = 28;
++		break;       	
++	}
++   	
++	/* Init. HW */
++	WriteMemoryLongHost(VHAC_REG_BASE, VREG_HASH_SRC_BASE_OFFSET, g_HashSrcBuffer);
++	WriteMemoryLongHost(VHAC_REG_BASE, VREG_HASH_DST_BASE_OFFSET, g_HashDstBuffer);
++	WriteMemoryLongHost(VHAC_REG_BASE, VREG_HASH_LEN_OFFSET, ulLength);
++        
++    /* write src */
++	//already fill in g_VIDEO1_COMPRESS_BUF_ADDR
++
++    /* fire cmd */
++	WriteMemoryLongHost(VHAC_REG_BASE, VREG_HASH_CMD_OFFSET, ulCommand);
++    
++    /* get digest */
++    do {
++    	ulTemp = ReadMemoryLongHost(VHAC_REG_BASE, VREG_HASH_STATUS_OFFSET);
++    } while (ulTemp & VHASH_BUSY);	
++    	
++    for (i=0; i<ulDigestLength/4; i++)
++    {
++                ulValue = *(((ULONG *)g_HashDstBuffer) + i); 
++
++		//output is ULONG pointer
++		*(output + i) = ulValue;    
++    }        
++}
+diff --git a/board/aspeed/ast2300/vhace.h b/board/aspeed/ast2300/vhace.h
+new file mode 100755
+index 0000000..460989b
+--- /dev/null
++++ b/board/aspeed/ast2300/vhace.h
+@@ -0,0 +1,58 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef _VHACE_H_
++#define _VHACE_H_
++
++#define VHASHMODE_MD5			0x00
++#define VHASHMODE_SHA1			0x01
++#define VHASHMODE_SHA256			0x02
++#define VHASHMODE_SHA224			0x03
++
++#define VHASH_ALG_SELECT_MASK		0x70
++#define VHASH_ALG_SELECT_MD5			0x00
++#define VHASH_ALG_SELECT_SHA1		0x20
++#define VHASH_ALG_SELECT_SHA224		0x40
++#define VHASH_ALG_SELECT_SHA256		0x50
++
++#define VHASH_BUSY			0x01
++
++#define VHAC_REG_BASE 			0x1e6e0000
++#define	VHAC_REG_OFFSET			0x3000
++
++#define VREG_HASH_SRC_BASE_OFFSET	(0x20+VHAC_REG_OFFSET)
++#define VREG_HASH_DST_BASE_OFFSET	(0x24+VHAC_REG_OFFSET)
++#define VREG_HASH_KEY_BASE_OFFSET	(0x28+VHAC_REG_OFFSET)
++#define VREG_HASH_LEN_OFFSET			(0x2C+VHAC_REG_OFFSET)
++#define VREG_HASH_CMD_OFFSET			(0x30+VHAC_REG_OFFSET)
++
++#define VREG_HASH_STATUS_OFFSET		(0x1C+VHAC_REG_OFFSET)
++
++typedef struct
++{
++	int HashMode;
++	int DigestLen;
++} HASH_METHOD;
++
++
++#ifdef HASH_GLOBALS
++#define HASH_EXT
++#else
++#define HASH_EXT extern
++#endif
++
++HASH_EXT HASH_METHOD	g_HashMethod;
++HASH_EXT BYTE			g_DigestBuf[32];
++HASH_EXT ULONG			g_HashSrcBuffer;
++HASH_EXT ULONG			g_HashDstBuffer;
++
++void HashAst3000(ULONG ulLength, ULONG *output, ULONG ulHashMode);
++#endif
++
+diff --git a/board/aspeed/ast2300/videotest.c b/board/aspeed/ast2300/videotest.c
+new file mode 100755
+index 0000000..f2e4953
+--- /dev/null
++++ b/board/aspeed/ast2300/videotest.c
+@@ -0,0 +1,779 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++/*
++ * Diagnostics support
++ */
++#include <common.h>
++#include <command.h>
++#include <malloc.h>
++#include <post.h>
++
++#include "slt.h"
++#define WIN_GLOBALS
++#include "type.h"
++#include "vreg.h"
++#define VESA_GLOBALS
++#include "vesa.h"
++#include "vfun.h"
++#include "vdef.h"
++#include "vhace.h"
++#include "crt.h"
++#include "videotest.h"
++
++#define VHASH_ALIGNMENT			16
++#define VHASH_MAX_DST			(32+VHASH_ALIGNMENT)
++
++
++#if ((CFG_CMD_SLT & CFG_CMD_VIDEOTEST) && defined(CONFIG_SLT))
++#include "videotest.h"
++
++#define RAND_MAX 32767 //2^16-1
++
++ULONG randSeed = 1;
++
++void srand(ULONG seed)
++{
++  randSeed = seed;
++}
++
++int rand(void)
++{
++  randSeed = randSeed * 214013 + 2531011;
++  return (int)(randSeed >> 17); //32 -15 = 17
++}
++
++//static unsigned char CaptureVideo1Buf1Addr[VIDEO_SOURCE_SIZE], CaptureVideo1Buf2Addr[VIDEO_SOURCE_SIZE], Video1CompressBufAddr[CRYPTO_MAX_CONTEXT];
++ULONG pCaptureVideo1Buf1Addr[VIDEO_SOURCE_SIZE/4], pCaptureVideo1Buf2Addr[VIDEO_SOURCE_SIZE/4], pVideo1CompressBufAddr[VIDEO_MAX_STREAM_SIZE/4], pVideo1FlagBufAddr[VIDEO_FLAG_SIZE];
++ULONG pCaptureVideo2Buf1Addr[VIDEO_SOURCE_SIZE/4], pCaptureVideo2Buf2Addr[VIDEO_SOURCE_SIZE/4], pVideo2CompressBufAddr[VIDEO_MAX_STREAM_SIZE/4], pVideo2FlagBufAddr[VIDEO_FLAG_SIZE];
++
++ULONG pVHashDstBuffer[VHASH_MAX_DST/4];
++
++ULONG pVideo1DecAddr[VIDEO_SOURCE_SIZE/4];
++ULONG pCrt1Addr[VIDEO_SOURCE_SIZE/4];
++//ULONG pCap1Addr[VIDEO_SOURCE_SIZE/4];
++
++BOOL AllocateEncodeBufHost(ULONG MMIOBase, int nVideo)
++{
++    //ULONG     Addr;
++    //ULONG     dwRegOffset = nVideo * 0x100;
++
++    if (VIDEO1 == nVideo)
++    {
++        
++        //Addr = (ULONG)malloc(pVideoInfo->SrcWidth * pVideoInfo->SrcHeight * 4);
++        //pCaptureVideo1Buf1Addr = malloc(VIDEO_SOURCE_SIZE);
++
++        g_CAPTURE_VIDEO1_BUF1_ADDR = vBufAlign((ULONG)pCaptureVideo1Buf1Addr);
++        WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_1_ADDR_REG, g_CAPTURE_VIDEO1_BUF1_ADDR, BUF_1_ADDR_MASK);
++        
++        //Addr = (ULONG)malloc(pVideoInfo->SrcWidth * pVideoInfo->SrcHeight * 4);
++        //pCaptureVideo1Buf2Addr = malloc(VIDEO_SOURCE_SIZE);
++
++        g_CAPTURE_VIDEO1_BUF2_ADDR = vBufAlign((ULONG)pCaptureVideo1Buf2Addr);
++        WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_2_ADDR_REG, g_CAPTURE_VIDEO1_BUF2_ADDR, BUF_2_ADDR_MASK);
++        
++        //Addr = (ULONG)malloc(pVideoInfo->uStreamBufSize.StreamBufSize.RingBufNum * pVideoInfo->uStreamBufSize.StreamBufSize.PacketSize)
++        //pVideo1CompressBufAddr = malloc(VIDEO_MAX_STREAM_SIZE);
++        g_VIDEO1_COMPRESS_BUF_ADDR = vBufAlign((ULONG)pVideo1CompressBufAddr);
++        WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_BUF_ADDR_REG, g_VIDEO1_COMPRESS_BUF_ADDR, BUF_2_ADDR_MASK);
++        
++        //Addr = (ULONG)malloc((pVideoInfo->SrcHeigh/64) * pVideoInfo->SrcWidth * 8);
++        //g_VIDEO1_CRC_BUF_ADDR = vBufAlign((ULONG)malloc(VIDEO_MAX_STREAM_SIZE));
++        //WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_CRC_BUF_ADDR_REG, g_VIDEO1_CRC_BUF_ADDR, BUF_2_ADDR_MASK);
++        
++
++        //Addr = (ULONG)malloc(pVideoInfo->SrcHeigh * pVideoInfo->SrcWidth  / 128 (/64*4/8));
++        //pVideo1FlagBufAddr = malloc(VIDEO_FLAG_SIZE);
++        g_VIDEO1_FLAG_BUF_ADDR = vBufAlign((ULONG)pVideo1FlagBufAddr);
++        WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_FLAG_BUF_ADDR_REG, g_VIDEO1_FLAG_BUF_ADDR, BUF_2_ADDR_MASK);
++    }
++    else if (VIDEO2 == nVideo)
++    {
++        //Addr = (ULONG)malloc(pVideoInfo->SrcWidth * pVideoInfo->SrcHeight * 4);
++        //pCaptureVideo2Buf1Addr = malloc(VIDEO_SOURCE_SIZE);
++        g_CAPTURE_VIDEO2_BUF1_ADDR = vBufAlign((ULONG)pCaptureVideo2Buf1Addr);
++        WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO2_BUF_1_ADDR_REG, g_CAPTURE_VIDEO2_BUF1_ADDR, BUF_1_ADDR_MASK);
++        
++        //Addr = (ULONG)malloc(pVideoInfo->SrcWidth * pVideoInfo->SrcHeight * 4);
++        //pCaptureVideo2Buf2Addr = malloc(VIDEO_SOURCE_SIZE);
++        g_CAPTURE_VIDEO2_BUF2_ADDR = vBufAlign((ULONG)pCaptureVideo2Buf2Addr);
++        WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO2_BUF_2_ADDR_REG, g_CAPTURE_VIDEO2_BUF2_ADDR, BUF_2_ADDR_MASK);
++        
++        //Addr = (ULONG)malloc(pVideoInfo->uStreamBufSize.StreamBufSize.RingBufNum * pVideoInfo->uStreamBufSize.StreamBufSize.PacketSize)
++        //pVideo2CompressBufAddr = malloc(VIDEO_MAX_STREAM_SIZE);
++        g_VIDEO2_COMPRESS_BUF_ADDR = vBufAlign((ULONG)pVideo2CompressBufAddr);
++        WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO2_COMPRESS_BUF_ADDR_REG, g_VIDEO2_COMPRESS_BUF_ADDR, BUF_2_ADDR_MASK);
++        
++        //Addr = (ULONG)malloc((pVideoInfo->SrcHeigh/64) * pVideoInfo->SrcWidth * 8);
++        //g_VIDEO1_CRC_BUF_ADDR = vBufAlign((ULONG)malloc(VIDEO_MAX_STREAM_SIZE));
++        //WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_CRC_BUF_ADDR_REG, g_VIDEO1_CRC_BUF_ADDR, BUF_2_ADDR_MASK);
++        
++
++        //Addr = (ULONG)malloc(pVideoInfo->SrcHeigh * pVideoInfo->SrcWidth  / 128 (/64*4/8));
++        //pVideo2FlagBufAddr = malloc(VIDEO_FLAG_SIZE);
++        g_VIDEO2_FLAG_BUF_ADDR = vBufAlign((ULONG)pVideo2FlagBufAddr);
++        WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO2_FLAG_BUF_ADDR_REG, g_VIDEO2_FLAG_BUF_ADDR, BUF_2_ADDR_MASK);
++    }
++  
++}
++
++/********************************************************/
++/* 1. product random data to encode                     */
++/* 2. use hash to verify encode function                */
++/* 3. use encode stream to decompress original data     */
++/********************************************************/
++int CodecTest(void)
++{
++    int	  num, i=0, j=0;
++    ULONG ulTemp = 0, ulTemp2;
++    int   dwValue;
++    ULONG ulHWWp;
++    ULONG ulHWPt;
++
++    //max size
++    ULONG tArray[32/4];
++    
++    //mode detection
++    BOOL	bExternal = TRUE;
++    BOOL	bAnalog = TRUE;
++    ULONG	Status;	    
++
++#if defined(CONFIG_AST2300)
++    ULONG ulHashSha1[5]  = {0x3f0c2ad6,0xc8eb7074,0xa9929352,0xfcd5b8b0,0x76fa8461};
++    ULONG aHashDecode[5] = {0xb23b62bb,0xd22a602b,0x113038a0,0x7217c6ab,0xcb156f06};
++#else
++    ULONG ulHashSha1[5] = {0x2a19e99f,0x99b1bb2d,0x9ac82862,0x49205e43,0x6bc4b4d7};
++    ULONG aHashDecode[5] = {0x2907a827,0xaf337079,0x47817f1f,0xb0b7cd68,0x8d33bd2};
++#endif
++
++    //Load pattern to src1 & src2 buffer
++    srand(1);
++
++    //Total size : DefWidth*DeHeight*4
++    //rand function: 16 bits one time is equal to 2 bytes
++    //OutdwmBankMode: 32 bits one time is equal to 4 bytes
++    for (i=0; i<g_DefWidth*g_DefHeight*2; i++)
++    {
++	if (i%2)
++	{
++	    ulTemp2 = rand();
++	    ulTemp = (ulTemp2 << 16) | ulTemp;
++	    //WriteMemoryLongHost(DRAM_BASE, g_CAPTURE_VIDEO1_BUF1_ADDR + ((i-1)/2)*4, ulTemp);
++	    *(((ULONG *)g_CAPTURE_VIDEO1_BUF1_ADDR) + (i-1)/2) = ulTemp;
++	    ulTemp = 0;
++	}
++	else
++	{
++	    ulTemp = rand();
++	}
++    }
++
++    /* init encoder engine */
++    InitializeVideoEngineHost (0,
++			       VIDEO1,
++			       vModeTable[2].HorPolarity,
++			       vModeTable[2].VerPolarity);
++
++    /* reset offset pointer register*/    
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG, 0, VIDEO_CODEC_TRIGGER | VIDEO_CAPTURE_TRIGGER);
++
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_BUF_READ_OFFSET_REG, 0, COMPRESS_BUF_READ_OFFSET_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_CODEC_OFFSET_READ, 0, BUF_CODEC_OFFSET_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_BUF_PROCESS_OFFSET_REG, 0, COMPRESS_BUF_PROCESS_OFFSET_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_FRAME_END_READ, 0, COMPRESS_FRAME_END_READ_MASK);
++
++    /* start compress stream */
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG, MODE_DETECTION_TRIGGER, MODE_DETECTION_TRIGGER);
++    //Stream mode: set CODEC trigger first
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG, VIDEO_CODEC_TRIGGER, VIDEO_CODEC_TRIGGER);
++
++    //Stream mode: start trigger (only trigger capture bit)
++    StartVideoCaptureTriggerHost(0, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG);
++
++    //stop engine
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG, 0, 0xFF);    
++#if defined(CONFIG_AST2300)
++    do {	/* wait compress engine idle */
++	ulTemp = ReadMemoryLongHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG);    	
++    } while (!(ulTemp & 0x40000));	
++#endif
++
++    //read 30 times to get HW write pointer
++    for (i=0; i<30000; i++)
++	ulHWWp = ReadMemoryLongHost(VIDEO_REG_BASE, VIDEO1_BUF_CODEC_OFFSET_READ);
++
++    g_HashSrcBuffer = g_VIDEO1_COMPRESS_BUF_ADDR + 128; //skip encode data 128 byte	
++    g_HashDstBuffer = v16byteAlign((unsigned long)pVHashDstBuffer);
++    ulTemp = 300;
++
++    //Enable hash clock
++    WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_STOP_REG, EN_HACE, STOP_HACE_MASK);
++    g_HashMethod.HashMode = VHASHMODE_SHA1;
++    g_HashMethod.DigestLen = 20;
++    HashAst3000(ulTemp, tArray, g_HashMethod.HashMode);
++
++    if (strncmp((const char *)tArray, (const char *)ulHashSha1, g_HashMethod.DigestLen))
++    {
++	printf("[VIDEO] Encoder Test: Wrong\n");
++        //ExitVideoTest();
++        return VIDEO_ENCODE_FAIL;
++    }
++    else
++    {    
++	printf("[VIDEO] Encoder Test: Pass\n");
++    }
++
++#if 0
++    /******** prepare for next decoding test at the same chip ***********/
++    ResetVideoHost();
++
++    dwValue=0;
++
++    do
++    {
++	dwValue = UnlockVideoRegHost(0, VIDEO_UNLOCK_KEY);
++	i++;
++    }
++    while ((VIDEO_UNLOCK != dwValue) && (i<10));
++
++    if (VIDEO_UNLOCK != dwValue)
++    {
++	printf("[VIDEO] Video register is locked");
++	return VIDEO_UNLOCK_FAIL;
++    }
++
++    // allocate decoding buffer
++    //Use Compress buffer last time, and Don't need to allocate
++    g_VIDEO1_DECODE_BUF_1_ADDR = g_VIDEO1_COMPRESS_BUF_ADDR;
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_1_ADDR_REG, g_VIDEO1_DECODE_BUF_1_ADDR, BUF_1_ADDR_MASK);
++    
++    //	pVideo1DecAddr = malloc(VIDEO_SOURCE_SIZE);
++    g_VIDEO1_DECOMPRESS_BUF_ADDR = vBufAlign((unsigned long)pVideo1DecAddr);    
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_BUF_ADDR_REG, g_VIDEO1_DECOMPRESS_BUF_ADDR, COMPRESS_BUF_ADDR_MASK);
++    
++    //Addr = (ULONG)malloc(256);
++    //g_VIDEO1_RC4_BUF_ADDR = Addr;
++    //g_VIDEO1_DECODE_RC4_BUF_ADDR = g_VIDEO1_DECOMPRESS_BUF_ADDR + 0x800000; //assume video size is 8MB for umcompressed buf;
++    //WriteMemoryLongWithMASKClient(VIDEO_REG_BASE, VIDEO1_RC4_TABLE_ADDR, g_VIDEO1_DECODE_RC4_BUF_ADDR, RC4_TABLE_ADDR_MASK);
++
++    //HW recommanded value
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_2_ADDR_REG, g_VIDEO1_DECOMPRESS_BUF_ADDR, BUF_2_ADDR_MASK);
++    //WriteMemoryLongWithMASKClient(VIDEO_REG_BASE, VIDEO1_BUF_2_ADDR_REG, 0, BUF_2_ADDR_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_CRC_BUF_ADDR_REG, 0, BUF_2_ADDR_MASK);            
++
++    /* init encoder engine */
++    InitializeVideoEngineClient (0, VIDEO1);
++
++    /* reset offset pointer register*/    
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG, 0, VIDEO_CODEC_TRIGGER | VIDEO_CAPTURE_TRIGGER);
++
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_BUF_READ_OFFSET_REG, 0, COMPRESS_BUF_READ_OFFSET_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_CODEC_OFFSET_READ, 0, BUF_CODEC_OFFSET_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_BUF_PROCESS_OFFSET_REG, 0, COMPRESS_BUF_PROCESS_OFFSET_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_FRAME_END_READ, 0, COMPRESS_FRAME_END_READ_MASK);
++
++    StartVideoCodecTriggerHost(0, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG);
++
++    //wrtie SW write pointer
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_DECOMPRESS_BUF_PROCESS_OFFSET_REG, ulHWWp, COMPRESS_BUF_READ_OFFSET_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_DECOMPRESS_BUF_WRITE_OFFSET_REG, ulHWWp, COMPRESS_BUF_READ_OFFSET_MASK);
++
++    i = 0;
++
++    do
++    {
++        ulHWPt = ReadMemoryLongHost(VIDEO_REG_BASE, VIDEO1_BUF_CODEC_OFFSET_READ);
++        i++;
++    }while((ulHWPt != ulHWWp) && (i<10000));
++
++    if (10000 > i)
++    {
++ 	printf("[VIDEO] Decoder Pointer cannot move!!! /n");
++        //ExitVideoTest();
++	return VIDEO_DECODE_FAIL;       
++    }
++        
++    //8*8 YUVA block
++    for (i=24; i<g_DefWidth*g_DefHeight; i=i+32)
++    {
++        *(((ULONG *)g_VIDEO1_DECOMPRESS_BUF_ADDR) + i) = 0x0;
++	*(((ULONG *)g_VIDEO1_DECOMPRESS_BUF_ADDR) + i+1) = 0x0;
++    }
++
++    g_HashSrcBuffer = g_VIDEO1_DECOMPRESS_BUF_ADDR;
++    //g_HashDstBuffer = VIDEO1_EN_BASE + VIDEO_ALL_SIZE; //config forward
++
++    ulTemp = 300;
++
++    //Enable hash clock
++    WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_STOP_REG, EN_HACE, STOP_HACE_MASK);
++    g_HashMethod.HashMode = VHASHMODE_SHA1;
++    g_HashMethod.DigestLen = 20;
++    HashAst3000(ulTemp, tArray, g_HashMethod.HashMode);
++
++    if (strncmp((const char *)tArray, (const char *)aHashDecode, g_HashMethod.DigestLen))
++    {
++	printf("[VIDEO] Decoder Test: Wrong\n");
++        //ExitVideoTest();
++        return VIDEO_DECODE_FAIL;
++    }
++    else
++    {
++	printf("[VIDEO] Decoder Test: Pass\n");
++    }
++#endif
++
++    return VIDEO_TEST_OK;
++}
++
++/********************************************************/
++/*  Only used in the host                               */
++/*  test function: Mode detection and Capture pattern   */
++/********************************************************/
++int CapTest(void)
++{
++    ULONG   dwValue, Status;
++    int     i;
++    BOOL    bAnalog;
++    ULONG	HStart, HEnd, VStart, VEnd;
++    USHORT	usCRTHor, usCRTVer;
++    ULONG   ulHor, ulVer;
++    ULONG   ulVGABaseAddr, ulCapAddr;
++    ULONG   ulFlag;
++    
++    printf("\n --------- Mode Detection Test --------- \n");
++    //clear clear register
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_CONTROL_REG, 0);
++    dwValue = ReadMemoryLongHost(VIDEO_REG_BASE, VIDEO1_CONTROL_REG);
++
++    //  Note: Current mode detection procedure has to set signal input 1st
++    //Note: Clear and enable interrupt Encode
++    ClearVideoInterruptHost(0, VIDEO1_MODE_DETECTION_READY_CLEAR);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO_INT_CONTROL_EN_REG, VIDEO1_MODE_DETECTION_READY_INT_EN, VIDEO1_MODE_DETECTION_READY_INT_EN);
++    //  Set input signal
++    dwValue |= EXTERNAL_VGA_SOURCE;
++    
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_CONTROL_REG, (dwValue <<EXTERNAL_SOURCE_BIT), EXTERNAL_SOURCE_MASK);
++
++//  Set H/V stable maximum
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO_MODE_DETECTION_PARAM_REG, (MODEDETECTION_VERTICAL_STABLE_MAXIMUM << VER_STABLE_MAX_BIT), 0x000F0000);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO_MODE_DETECTION_PARAM_REG, (MODEDETECTION_HORIZONTAL_STABLE_MAXIMUM << HOR_STABLE_MAX_BIT), HOR_STABLE_MAX_BIT_MASK);
++//  Set H/V stable threshold
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO_MODE_DETECTION_PARAM_REG, (MODEDETECTION_VERTICAL_STABLE_THRESHOLD << VER_STABLE_THRES_BIT), VER_STABLE_THRES_BIT_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO_MODE_DETECTION_PARAM_REG, (MODEDETECTION_HORIZONTAL_STABLE_THRESHOLD << HOR_STABLE_THRES_BIT), HOR_STABLE_THRES_BIT_MASK);
++    
++    //Trigger mode detection
++    // turn off WATCH_DOG first
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG, (WATCH_DOG_OFF << WATCH_DOG_ENABLE_BIT), WATCH_DOG_EN_MASK);
++        
++    //  Note: Clear mode detection ready interrupt
++    //ClearVideoInterrupt(MMIOBase, MODE_DETECTION_READY_CLEAR);
++    StartModeDetectionTriggerHost(0, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG);
++
++
++//  Note: Polling mode detection ready interrupt
++    //it sometime take a long time, especially during change mode, 
++    //so the loop count must be big, or you can't pull it by timer
++    i = 0;
++    do {
++
++		Status = ReadVideoInterruptHost(0, VIDEO1_MODE_DETECTION_READY_READ);
++		i++;
++    } while ((!Status) & (i<500000));
++
++    if (!Status)
++    {
++	printf("[VIDEO] Mode detection error\n");
++        //ExitVideoTest();
++	return VIDEO_TEST_FAIL;
++    }
++
++    HStart	= (ReadMemoryLongHost(VIDEO_REG_BASE, VIDE1_MODE_DETECTION_EDGE_H_REG) & LEFT_EDGE_LOCATION_MASK) >> LEFT_EDGE_LOCATION_BIT;
++    HEnd	= (ReadMemoryLongHost(VIDEO_REG_BASE, VIDE1_MODE_DETECTION_EDGE_H_REG) & RIGHT_EDGE_LOCATION_MASK) >> RIGHT_EDGE_LOCATION_BIT;
++
++    VStart	= (ReadMemoryLongHost(VIDEO_REG_BASE, VIDE1_MODE_DETECTION_EDGE_V_REG) & TOP_EDGE_LOCATION_MASK) >> TOP_EDGE_LOCATION_BIT;
++    VEnd	= (ReadMemoryLongHost(VIDEO_REG_BASE, VIDE1_MODE_DETECTION_EDGE_V_REG) & BOTTOM_EDGE_LOCATION_MASK) >> BOTTOM_EDGE_LOCATION_BIT;
++
++    ulHor = HEnd-HStart+1;
++    ulVer = VEnd-VStart+1;
++
++    printf("[VIDEO] Resolution: H[%d] * V[%d]\n", ulHor, ulVer);
++
++    if ((g_DefWidth == ulHor) & (g_DefHeight == ulVer))
++    {
++    	printf("[VIDEO] Mode detection PASS\n");
++    }
++    else
++    {
++	printf("[VIDEO] Mode detection FAIL\n");
++	return VIDEO_TEST_FAIL;
++    }
++
++    if(!((ReadMemoryLongHost(VIDEO_REG_BASE, VIDEO1_MODE_DETECTION_STATUS_READ_REG) & ANALONG_DIGITAL_READ) >> ANALONG_DIGITAL_READ_BIT))
++	bAnalog = FALSE;
++    else
++	bAnalog = TRUE;
++
++    //  Note: Clear mode detection ready interrupt
++    ClearVideoInterruptHost(0, VIDEO1_MODE_DETECTION_READY_CLEAR);
++
++    printf("\n --------- Capture Test --------- \n");
++
++    //capture engine
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_TIMEING_GEN_HOR_REG, (HEnd << VIDEO_HDE_END_BIT), VIDEO_HDE_END_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_TIMEING_GEN_HOR_REG, (HStart << VIDEO_HDE_START_BIT), VIDEO_HDE_START_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_TIMEING_GEN_V_REG, (VEnd << VIDEO_VDE_END_BIT), VIDEO_VDE_END_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_TIMEING_GEN_V_REG, (VStart << VIDEO_VDE_START_BIT), VIDEO_VDE_START_MASK);
++	
++    ulCapAddr = vBufAlign2((ULONG)pCaptureVideo1Buf1Addr);    
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_1_ADDR_REG, ulCapAddr, BUF_1_ADDR_MASK);
++    
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_2_ADDR_REG, 0, BUF_2_ADDR_MASK);
++
++    InitializeVideoEngineHost (0,
++			       VIDEO1,
++		               vModeTable[2].HorPolarity,
++			       vModeTable[2].VerPolarity);
++
++    WriteMemoryLongHost(VIDEO_REG_BASE, 0x04, 0x01);
++    WriteMemoryLongHost(VIDEO_REG_BASE, 0x300, 0x0);
++#if defined(CONFIG_AST2300)
++	WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, 0x8, 0x0880, 0x0ec0);
++#elif defined(CONFIG_AST3000)
++	WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, 0x8, 0x2800, 0x2800);	
++#else
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, 0x8, 0xa00, 0x2a80); //tile mode
++#endif
++
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_TIMEING_GEN_HOR_REG, 0xa0000000, 0xa0000000);
++   
++    //only trigger capture, in source buffer (vr44), the front of data is correct.
++    //StartVideoCaptureTriggerHost(0, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG);
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG, VIDEO_CAPTURE_TRIGGER);
++
++    i = 0;
++    do {
++        Status = ReadMemoryLongHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG) & CAPTURE_READY_MASK;
++	i++;
++    } while ((!Status) & (i<500000));
++
++    if (!Status)
++    {
++	printf("[VIDEO] Capture is not READY\n");
++	return VIDEO_TEST_FAIL;
++    }  
++
++#if !defined(CONFIG_AST2300)	
++    ulVGABaseAddr = ulCapAddr + 0x1000;
++
++    /* check pattern */
++    ulFlag = 0; //no 0 is error
++
++    for (i=0; i<100; i++)
++    {
++        dwValue = *(ULONG *)(ulVGABaseAddr + i*32);
++	if (0x32323232 != dwValue)
++	{
++	    printf("[VIDEO] Capture Test fail -- capture data doesn't match source \n");
++	    printf("[VIDEO]1 i=%d value=%x\n", i, dwValue);
++            ulFlag = 1;
++            break;
++	}
++
++	dwValue = *(ULONG *)(ulVGABaseAddr + i*32 + 4);
++	if (0x32323232 != dwValue)
++	{
++	    printf("[VIDEO] Capture Test fail -- capture data doesn't match source \n");
++	    printf("[VIDEO]2 i=%d value=%x\n", i, dwValue);
++	    ulFlag = 1;
++	    break;
++	}
++
++	dwValue = *(ULONG *)(ulVGABaseAddr + i*32 + 8);
++	if (0x80808080 != dwValue)
++	{
++	    printf("[VIDEO] Capture Test fail -- capture data doesn't match source \n");
++	    printf("[VIDEO]3 i=%d value=%x\n", i, dwValue);
++	    ulFlag = 1;
++	    break;
++	}
++
++	dwValue = *(ULONG *)(ulVGABaseAddr + i*32 + 12);
++	if (0x80808080 != dwValue)
++	{
++	    printf("[VIDEO] Capture Test fail -- capture data doesn't match source \n");
++	    printf("4 i=%d value=%x\n", i, dwValue);
++	    ulFlag = 1;
++	    break;
++	}
++
++	dwValue = *(ULONG *)(ulVGABaseAddr + i*32 + 16);
++	if (0x80808080 != dwValue)
++	{
++	   printf("[VIDEO] Capture Test fail -- capture data doesn't match source \n");
++	   printf("5 i=%d value=%x\n", i, dwValue);
++	   ulFlag = 1;
++	   break;
++	}
++
++	dwValue = *(ULONG *)(ulVGABaseAddr + i*32 + 20);
++	if (0x80808080 != dwValue)
++	{
++	   printf("[VIDEO] Capture Test fail -- capture data doesn't match source \n");
++	   printf("6 i=%d value=%x\n", i, dwValue);
++	   ulFlag = 1;
++	   break;
++	  }
++    }
++#endif
++
++    if (!ulFlag)
++    {
++        printf("[VIDEO] Capture Test OK\n");
++    }
++    else
++    {
++	printf("[VIDEO] Capture Test FAIL\n");
++	return VIDEO_TEST_FAIL;
++    }
++	
++    return VIDEO_TEST_OK;
++}
++
++/********************************************************/
++/*  Only used in the station                            */
++/********************************************************/
++int CRTTest(void)
++{
++    ULONG   ulVGABaseAddr;
++    BYTE    btCRTCenterMode, btCRTColorFmt;
++    USHORT  usCRTHor, usCRTVer;
++    ULONG   ulData;
++
++    int i,j;
++
++    //printf("\n --------- Turn on CRT --------- \n");
++    
++    //Enable CRT1 first
++    ulVGABaseAddr = vBufAlign((unsigned long)pCrt1Addr);
++    
++    btCRTCenterMode     = 0;
++    btCRTColorFmt	= YUV_444;
++    usCRTHor		= g_DefWidth;
++    usCRTVer		= g_DefHeight;	
++
++    CheckOnStartClient();
++
++    /* Fill Pattern */
++    for (i=0; i<usCRTHor; i++)
++    {
++	for (j=0; j<usCRTVer/8; j++)
++	{
++	    //Y
++	    //ulData = 0x10101010;
++	    ulData = 0x32323232;
++	    *(ULONG *)(ulVGABaseAddr + (i*usCRTVer*4+j*32)) = ulData;
++	    //ulData = 0x10101010;
++	    ulData = 0x32323232;
++	    *(ULONG *)(ulVGABaseAddr + (i*usCRTVer*4+j*32) +4) = ulData;
++	    //U
++	    ulData = 0x80808080;
++	    //ulData = 0x77777777;
++	    *(ULONG *)(ulVGABaseAddr + (i*usCRTVer*4+j*32) +8) = ulData;
++	    ulData = 0x80808080;
++	    //ulData = 0x77777777;
++	    *(ULONG *)(ulVGABaseAddr + (i*usCRTVer*4+j*32) +12) = ulData;
++	    //V
++	    ulData = 0x80808080;
++	    //ulData = 0x11111111;
++	    *(ULONG *)(ulVGABaseAddr + (i*usCRTVer*4+j*32) +16) = ulData;
++	    ulData = 0x80808080;
++	    //ulData = 0x11111111;
++	    *(ULONG *)(ulVGABaseAddr + (i*usCRTVer*4+j*32) +20) = ulData;
++	    //A
++	    ulData = 0xFFFFFFFFF;
++	    *(ULONG *)(ulVGABaseAddr + (i*usCRTVer*4+j*32) +24) = ulData;
++	    ulData = 0xFFFFFFFFF;
++	    *(ULONG *)(ulVGABaseAddr + (i*usCRTVer*4+j*32) +28) = ulData;
++	}
++    }  /* ~Fill Pattern */
++
++#if defined(CONFIG_AST2300)       
++    if(!ASTSetModeV (0, CRT_2, ulVGABaseAddr, usCRTHor, usCRTVer, btCRTColorFmt, btCRTCenterMode))
++#else
++    if(!ASTSetModeV (0, CRT_1, ulVGABaseAddr, usCRTHor, usCRTVer, btCRTColorFmt, btCRTCenterMode))
++#endif    
++    {   
++        printf("[VIDEO] The resolution is not in mode table list\n");
++        return CRT_FAIL;
++    }
++    
++    //printf("[VIDEO] CRT turn on\n");
++
++    return VIDEO_TEST_OK;
++}
++
++int do_videotest (void)
++{
++    int dwValue=0;
++    int i = 0;
++    int iRet;    
++    ULONG   ulRestore1, ulTemp;
++    BOOL    bClient;
++
++
++    //InitVideoTest();
++    g_DefWidth = 640; 
++    g_DefHeight= 480;
++
++    printf("\n --------- Codec Test --------- \n");
++
++#if defined(CONFIG_AST2300)
++    WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CONTROL_REG, 0x00002000, 0x00002000);
++#endif
++
++    CheckOnStartHost();
++    
++    do
++    {
++        dwValue = UnlockVideoRegHost(0, VIDEO_UNLOCK_KEY);
++	i++;
++    }
++    while ((VIDEO_UNLOCK != dwValue) && (i<1000));
++
++    if (VIDEO_UNLOCK != dwValue)
++    {
++	printf("[VIDEO] Video register is locked \n");
++	return VIDEO_TEST_FAIL;
++    }
++    AllocateEncodeBufHost(0, VIDEO1);
++
++    iRet = CodecTest();	
++    if (iRet)
++        return VIDEO_TEST_FAIL;
++
++#if defined(CONFIG_AST2300)
++    /* Init SCU */ 
++    WriteMemoryLongWithMASKHost(SCU_BASE, (0x2c + SCU_OFFSET), 0x00040000, 0x00040010);	/* Enable D2-PLL */
++    WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_STOP_REG, 0, 0x00000400);		/* Enable D2CLK */
++    udelay(10);
++    WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CONTROL_REG, 0, 0x00002000);
++    
++    WriteMemoryLongWithMASKHost(SCU_BASE, (0x90 + SCU_OFFSET), 0x20, 0x00000030); 	/* enable video mode single edge */
++    WriteMemoryLongWithMASKHost(SCU_BASE, (0x84 + SCU_OFFSET), 0xfffe0000, 0xfffe0000); /* multi-pins */
++    WriteMemoryLongWithMASKHost(SCU_BASE, (0x88 + SCU_OFFSET), 0x000fffff, 0x000fffff); /* multi-pins */    
++    
++    iRet = CRTTest();
++    if (iRet)
++    {
++    	printf("[VIDEO] CRT Test Failed \n");
++        return VIDEO_TEST_FAIL;
++    }
++
++    iRet = CapTest();		
++    if (iRet)
++    {
++    	printf("[VIDEO] Capture Test Failed \n");
++        return VIDEO_TEST_FAIL;
++    }
++#else
++    //Host or Client
++    bClient = ((ReadMemoryLong(SCU_BASE, SCU_HW_TRAPPING_REG) & CLIENT_MODE_EN_MASK)?TRUE:FALSE);
++    //reset video for another testing
++    ResetVideoHost();
++    dwValue=0;
++    i = 0;
++    do
++    {
++	dwValue = UnlockVideoRegHost(0, VIDEO_UNLOCK_KEY);
++	i++;
++    }
++    while ((VIDEO_UNLOCK != dwValue) && (i<10));
++
++    if (VIDEO_UNLOCK != dwValue)
++    {
++	printf("[VIDEO] Video register is locked");
++	return VIDEO_UNLOCK_FAIL;
++    }
++
++    //check if 1e6e0008[3,0] is 0
++    ulRestore1 = ReadMemoryLongHost(0x1e6e0000, 8);
++    dwValue = ReadMemoryLongHost(0x1e6e0000, 8)&0xF;
++
++    //set 1e6e0008[3,0] to 0
++    if (dwValue)
++    {
++        WriteMemoryLongHost(0x1e6e0000, 0, 0xfc600309);
++        
++        i=0;
++        do
++        {
++            i++;
++            dwValue = ReadMemoryLongHost(0x1e6e0000,0);
++        }while((1 != dwValue)&& (i<10));
++        
++        if (1 != dwValue)
++    	{
++    		printf("0x1e6e0000 is locked");
++    		return VIDEO_UNLOCK_FAIL;
++    	}
++    }
++
++    //only clear 1e6e0008[3,0]
++    WriteMemoryLongWithMASKHost(0x1e6e0000, 8, 0, 0xf);
++    
++    bClient = 0;
++    if (!bClient)
++    {
++        //To turn on crt, must be the client mode
++        WriteMemoryLongWithMASKHost(SCU_BASE, SCU_HW_TRAPPING_REG, (BE_CLIENT_CHIP << CLIENT_MODE_EN_BIT), CLIENT_MODE_EN_MASK);
++            
++        iRet = CRTTest();
++
++        if (iRet)
++        {
++            //trapping to host, the Vsync of CRT can't output and the host doesn't have video sync input
++            WriteMemoryLongWithMASKHost(SCU_BASE, SCU_HW_TRAPPING_REG, (BE_HOST_CHIP << CLIENT_MODE_EN_BIT), CLIENT_MODE_EN_MASK);
++            //restore value
++            WriteMemoryLongHost(0x1e6e0000, 8, ulRestore1);
++            //lock register
++            WriteMemoryLongHost(0x1e6e0000, 0, 0x12345678); 
++            return VIDEO_TEST_FAIL;
++        }
++        
++        iRet = CapTest();
++		
++        if (iRet)
++        {
++            //trapping to host, the Vsync of CRT can't output and the host doesn't have video sync input
++            WriteMemoryLongWithMASKHost(SCU_BASE, SCU_HW_TRAPPING_REG, (BE_HOST_CHIP << CLIENT_MODE_EN_BIT), CLIENT_MODE_EN_MASK);
++            //restore value
++            WriteMemoryLongHost(0x1e6e0000, 8, ulRestore1);
++            //lock register
++            WriteMemoryLongHost(0x1e6e0000, 0, 0x12345678); 
++
++            return VIDEO_TEST_FAIL;
++        }
++		//WriteMemoryLongWithMASKHost(SCU_BASE, SCU_HW_TRAPPING_REG, (BE_HOST_CHIP << CLIENT_MODE_EN_BIT), CLIENT_MODE_EN_MASK);
++    }
++    //trapping to host, the Vsync of CRT can't output and the host doesn't have video sync input
++    WriteMemoryLongWithMASKHost(SCU_BASE, SCU_HW_TRAPPING_REG, (BE_HOST_CHIP << CLIENT_MODE_EN_BIT), CLIENT_MODE_EN_MASK);
++    //restore value
++    WriteMemoryLongHost(0x1e6e0000, 8, ulRestore1);
++    //lock register
++    WriteMemoryLongHost(0x1e6e0000, 0, 0x12345678); 
++#endif
++
++    return VIDEO_TEST_OK;	
++}
++#endif /* CONFIG_SLT */
+diff --git a/board/aspeed/ast2300/videotest.h b/board/aspeed/ast2300/videotest.h
+new file mode 100755
+index 0000000..79b8dd9
+--- /dev/null
++++ b/board/aspeed/ast2300/videotest.h
+@@ -0,0 +1,24 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++/* VideoTest.h */
++#ifndef _VIDEOTEST_H_
++#define _VIDEOTEST_H_
++
++#define VIDEO_TEST_OK       0
++#define VIDEO_TEST_FAIL     1
++
++#define VIDEO_UNLOCK_FAIL   1
++#define VIDEO_ENCODE_FAIL   2
++#define VIDEO_DECODE_FAIL   3
++#define CRT_FAIL            4
++
++#endif /* _VIDEOTEST_H_ */
++
+diff --git a/board/aspeed/ast2300/vreg.h b/board/aspeed/ast2300/vreg.h
+new file mode 100755
+index 0000000..9738548
+--- /dev/null
++++ b/board/aspeed/ast2300/vreg.h
+@@ -0,0 +1,845 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef _VREG_H_
++#define _VREG_H_
++
++/********************************************************/
++/*    CRT register                                      */
++/********************************************************/
++#define    CRT_BASE_ADDRESS                    0x000400
++#define    VGA_GRAPH_BASE_ADDRESS              0x600000
++#define    VGA_CURSOR_BASE_ADDRESS             0x300000
++#define    VGA_OSD_BASE_ADDRESS                0x300000
++#define    RGB_565                             0x0
++#define    RGB_888                             0x1
++#define    YUV_444                             0x2
++#define	   NO_SUPPORTED_CRT_FMT				   0x3
++#define    CRT_LOW_THRESHOLD_VALUE             0x12
++#define    CRT_HIGH_THRESHOLD_VALUE            0x1E
++
++// AST3000's Registers 
++#ifdef Watcom
++#define     VIDEOBASE_OFFSET                            0x10000
++#else
++#define     VIDEOBASE_OFFSET                            0x0
++#endif
++
++#define     KEY_CONTROL_REG                             0x00 + VIDEOBASE_OFFSET
++    #define     VIDEO_LOCKED                            0
++    #define     VIDEO_UNLOCK                            1
++
++// Registers for video1 and video2
++#define     VIDEO1_ENGINE_SEQUENCE_CONTROL_REG          0x04 + VIDEOBASE_OFFSET
++#define     VIDEO2_ENGINE_SEQUENCE_CONTROL_REG          0x104 + VIDEOBASE_OFFSET
++    #define     MODE_DETECTION_TRIGGER                  0x00000001  //Bit[0] trigger HW auto mode detection
++    #define     VIDEO_CAPTURE_TRIGGER                   0x00000002  //Bit[1] trigger HW to capture video
++	#define		FORCE_HW_IDLE_MASK						(1<<2)		//Bit[2] Force engine into ready(idle) state
++		#define		ENGINE_RESET						(0<<2)
++		#define		ENGINE_IDLE							(1<<2)
++    #define     VIDEO_CAPTURE_AUTO_MODE                 0x00000008  //Bit[3]
++        #define     CAPTURE_FRAME_MODE                  0
++        #define     CAPTURE_AUTO_MODE                   1
++		#define		CAPTURE_AUTO_MODE_BIT				3
++		#define		CAPTURE_AUTO_MODE_MASK				0x00000008
++    #define     VIDEO_CODEC_TRIGGER                     0x00000010  //Bit[4] trigger HW to compress or decompress video
++        #define     CODEC_TRIGGER_BIT                   4
++        #define     CODEC_TRIGGER_MASK                  0x00000010
++        #define     CLEAR_CODEC_TRIGGER                 0
++        #define     EN_CODEC_TRIGGER                    1
++    #define     VIDEO_CODEC_AUTO_MODE                   0x00000020  //Bit[5]
++        #define     CODEC_FRAME_MODE                    0
++        #define     CODEC_AUTO_MODE                     1
++		#define		CODEC_AUTO_MODE_BIT					5
++        #define     CODEC_AUTO_MODE_MASK                0x00000020
++	#define		INSERT_FULL_FRAME_MASK					(1<<6)		//Bit[6] Insert full frame compression
++		#define		INSERT_FULL_FRAME_EN				(1<<6)
++		#define		INSERT_FULL_FRAME_OFF				(0<<6)
++    #define     WATCH_DOG_ENABLE                        0x00000080  //Bit[7] Video Enable watch dog for mode change detection
++        #define     WATCH_DOG_ENABLE_BIT                7
++        #define     WATCH_DOG_OFF                       0
++        #define     WATCH_DOG_EN                        1
++        #define     WATCH_DOG_EN_MASK                   0x00000080
++    #define     VIDEO_CRT_SELECTION                     0x00000100  //Bit[8]
++        #define     CRT1                                0
++        #define     CRT2                                1
++    #define     ANTI_TEARING_ENABLE                     0x00000200  //Bit[9] Anti-tearing mode enable for decoding
++        #define     ANTI_TEARING_EN                     1
++    #define     STREAM_DATA_MODE                        0x00000400  //Bit[11:10] Buffer and Stream Data type
++        #define     STREAM_DATA_MODE_BIT                10
++        #define     STREAM_DATA_MODE_MASK               0x00000C00
++        #define     YUV444_MODE                         0
++        #define     YUV420_MODE                         1
++        #define     YUV420_MODE_WITH_AST2000            2 //AST2000 compatible
++    #define     VIDEO_CAPTURE_READY                     0x00010000  //Bit[16] Video capture ready status read back(read only)
++		#define		CAPTURE_READY_MASK                  0x00010000  
++        #define     HW_BUSY                             0
++        #define     HW_IDLE                             1
++    #define     VIDEO_CODEC_READY                       0x00040000  //Bit[18] Video codec ready status read back(read only)
++		#define		CODEC_READY_MASK					0x00040000
++        //#define     HW_BUSY                             0
++        //#define     HW_IDLE                             1
++    
++#define    VIDEO1_CONTROL_REG                           0x08 + VIDEOBASE_OFFSET
++#define    VIDEO2_CONTROL_REG                           0x108 + VIDEOBASE_OFFSET
++    #define     VIDEO_HSYNC_POLARITY                    0x00000001  //Bit[0] Video source hsync polarity
++        #define     VIDEO_HSYNC_POLARITY_BIT            0
++        #define     NO_INVERSE_POL                      0
++        #define     INVERSE_POL							1
++    #define     VIDEO_VSYNC_POLARITY                    0x00000002  //Bit[1] Video source vsync polarity
++        #define     VIDEO_VSYNC_POLARITY_BIT            1        
++        //Setting defination the same as VIDEO_HSYNC_POLARITY
++    #define     VIDEO_EXTERNAL_SOURCE                   0x00000004  //Bit[2] Video external source
++        #define     EXTERNAL_SOURCE_BIT                 2
++        #define     INTERNAL_VGA_SOURCE                 0
++        #define     EXTERNAL_VGA_SOURCE                 1
++        #define     EXTERNAL_SOURCE_MASK                0x00000004                     
++    #define     VIDEO_ANALONG_EXTERNAL_SOURCE           0x00000008  //Bit[3] Video Analog external source
++        #define     ANALONG_EXTERNAL_SOURCE_BIT         3
++        #define     DVI_SOURCE                          0
++        #define     ANALOG_RGB_SOURCE                   1
++    #define     VIDEO_INTERNAL_TIMING_GEN               0x00000010  //Bit[4] Video Use internal timing generator
++        #define     INTERNAL_TIMING_GEN_BIT             4
++        #define     EXTERNAL_DE_SIGNAL                  0 //DVI only
++        #define     VR0C_VR10_DE_SINGAL                 1 //use VR0C and VR10 for generate VDE signal
++    /******     Video2 Only from DAC    ******/        
++    #define     VIDEO1_CAPTURE_FROM                     0x00000020  //Bit[5] Video1 capture data direct from VGA frame buffer(internal VGA only)  
++        #define     FROM_DAC_PORT                       0
++        #define     FROM_FRAME_BUFFER                   1     
++    #define     WRITE_DATA_FORMAT                       0x00000040  //Bit[7:6] Write data format
++        #define     WRITE_DATA_FORMAT_BIT               6
++        #define     WRTIE_DATA_FORMAT_MASK              0x000000C0
++        #define     CCIR601_2_YUV_FORMAT                0
++        #define     FULL_YUV_FORMAT                     1
++        #define     RGB_FORMAT                          2
++		#define     VGA_CURSOR_DISABLE                      0x00000100  //Bit[8] External video port slection
++        #define     VGA_CURSOR_NORMAL                   0
++        #define     VGA_CURSOR_OFF                      1    
++    #define     VIDEO_CAPTURE_LINEAR_MODE               0x00000200  //Bit[9] VIDEO_CAPTURE_LINEAR_MODE
++        #define     LINEAR_MODE                         0
++        #define     TILE_MODE		                    1		
++    #define     VIDEO_CLOCK_DELAY                       0x00000400  //Bit[11:10] Video clock delay control
++        #define     VIDEO_CLOCK_DELAY_BIT               10
++        #define     VIDEO_CLOCK_DELAY_MASK              0x00000C00
++        #define     DELAY_0_NS                          0
++        #define     DELAY_1_NS                          1
++        #define     INV_AND_DELAY_0_NS                  2
++        #define     INV_AND_DELAY_1_NS                  3
++    #define     VIDEO_CCIR656_SOURCE_MODE               0x00001000  //Bit[12] Video CCIR656 source mode
++        #define     RGB_SOURCE_MODE                     0
++        #define     CCIR656_SOURCE_MODE                 1
++    #define     SOURCE_PORT_CLOCK_MODE                  0x00002000  //Bit[13] Video Source port clock mode
++        #define     SINGLE_EDGE_MODE                    0
++        #define     DUAL_EDGE_MODE                      1
++    #define     EXTERNAL_PORT_SELECTION                 0x00004000  //Bit[14] External video port slection
++        #define     VIDEO_PORT_A                        0
++        #define     VIDEO_PORT_B                        1
++    #define     VIDEO_CAPTURE_FRAME_RATE                0x00010000  //Bit[23:16] Video capture frame rate control
++        #define     VIDEO_CAPTURE_FRAME_RATE_BIT        16
++        #define     VIDEO_CAPTURE_FRAME_RATE_MASK       0x00FF0000  //Maximum frame rate = XX * SourceFPS / 60
++
++#define    VIDEO1_TIMEING_GEN_HOR_REG                   0x0C + VIDEOBASE_OFFSET
++#define    VIDEO2_TIMEING_GEN_HOR_REG                   0x10C + VIDEOBASE_OFFSET
++    #define     VIDEO_HDE_END                           0x00000000  //Bit[12:0] Video HDE End timing generator
++    #define     VIDEO_HDE_END_BIT                       0  //Number of pixels from rising edge of Hsync for first active pixel
++    #define     VIDEO_HDE_END_MASK                      0x00001FFF
++    #define     VIDEO_HDE_START                         0x00010000  //Bit[28:16] Video HDE Start timing generator
++    #define     VIDEO_HDE_START_BIT                     16 //Number of pixels from rising edge of Hsync for last active pixel
++    #define     VIDEO_HDE_START_MASK                    0x1FFF0000
++        #define     FRAME_RATE_OFF                      0    
++    
++#define    VIDEO1_TIMEING_GEN_V_REG                     0x10 + VIDEOBASE_OFFSET
++#define    VIDEO2_TIMEING_GEN_V_REG                     0x110 + VIDEOBASE_OFFSET
++    #define     VIDEO_VDE_END                           0x00000001  //Bit[11:0] Video VDE End timing generator
++    #define     VIDEO_VDE_END_BIT                       0  //Number of pixels from rising edge of Vsync for first active pixel
++    #define     VIDEO_VDE_END_MASK                      0x00000FFF
++    #define     VIDEO_VDE_START                         0x00010000  //Bit[27:16] Video VDE Start timing generator
++    #define     VIDEO_VDE_START_BIT                     16 //Number of pixels from rising edge of Vsync for last active pixel
++    #define     VIDEO_VDE_START_MASK                    0x0FFF0000
++
++#define    VIDEO1_SCALE_FACTOR_REG                      0x14 + VIDEOBASE_OFFSET
++#define    VIDEO2_SCALE_FACTOR_REG                      0x114 + VIDEOBASE_OFFSET
++    #define     HOR_SCALING_FACTOR                      0x00000001  //Bit[15:0] Video Horizontal scaling factor
++    #define     HOR_SCALING_FACTOR_BIT                  0   //The formula=4096/(Horizontal scaling facotr)
++    #define     HOR_SCALING_FACTOR_MASK                 0x0000FFFF
++    #define     VER_SCALING_FACTOR                      0x00000000  //Bit[31:16] Video Vertical scaling factor
++    #define     VER_SCALING_FACTOR_BIT                  16   //The formula=4096/(Vertical scaling facotr)
++    #define     VER_SCALING_FACTOR_MASK                 0xFFFF0000
++
++#define    VIDEO1_SCALE_FACTOR_PARAMETER0_REG           0x18 + VIDEOBASE_OFFSET  //Scaling Parameters F00, F01, F02, F03
++#define    VIDEO2_SCALE_FACTOR_PARAMETER0_REG           0x118 + VIDEOBASE_OFFSET   
++
++#define    VIDEO1_SCALE_FACTOR_PARAMETER1_REG           0x1C + VIDEOBASE_OFFSET  //Scaling Parameters F10, F11, F12, F13
++#define    VIDEO2_SCALE_FACTOR_PARAMETER1_REG           0x11C + VIDEOBASE_OFFSET   
++
++#define    VIDEO1_SCALE_FACTOR_PARAMETER2_REG           0x20 + VIDEOBASE_OFFSET  //Scaling Parameters F20, F21, F22, F23
++#define    VIDEO2_SCALE_FACTOR_PARAMETER2_REG           0x120 + VIDEOBASE_OFFSET   
++
++#define    VIDEO1_SCALE_FACTOR_PARAMETER3_REG           0x24 + VIDEOBASE_OFFSET  //Scaling Parameters F30, F31, F32, F33
++#define    VIDEO2_SCALE_FACTOR_PARAMETER3_REG           0x124 + VIDEOBASE_OFFSET
++
++#define    VIDEO1_BCD_CONTROL_REG                       0x2C + VIDEOBASE_OFFSET
++#define    VIDEO2_BCD_CONTROL_REG                       0x12C + VIDEOBASE_OFFSET
++    #define     BCD_ENABLE                              0x00000001  //Bit[0] Enable block change detection(BCD)
++        #define     BCD_ENABLE_BIT                      0
++        #define     BCD_ENABLE_MASK                     0x00000001
++    #define     BCD_TOLERANCE                           0x00010000  //Bit[23:16]
++        #define     BCD_TOLERANCE_BIT                   16 //flag as changed block when the video data difference greater
++        #define     BCD_TOLERANCE_MASK                  0x00FF0000
++
++#define     VIDEO1_CAPTURE_WINDOWS_REG                  0x30 + VIDEOBASE_OFFSET
++#define     VIDEO2_CAPTURE_WINDOWS_REG                  0x130 + VIDEOBASE_OFFSET
++    #define     CAPTURE_VER_LINE						0x00000001  //Bit[10:0] Video compression vertical line total
++    #define     CAPTURE_VER_LINE_BIT					0
++    #define     CAPTURE_VER_LINE_MASK					0x000007FF
++    #define     CAPTURE_HOR_PIXEL						0x00010000  //Bit[26:16] Video compression vertical line total
++    #define     CAPTURE_HOR_PIXEL_BIT					16
++    #define     CAPTURE_HOR_PIXEL_MASK					0x07FF0000
++
++#define     VIDEO1_COMPRESS_WINDOWS_REG                 0x34 + VIDEOBASE_OFFSET
++#define     VIDEO2_COMPRESS_WINDOWS_REG                 0x134 + VIDEOBASE_OFFSET
++    #define     COMPRESS_VER_LINE                       0x00000001  //Bit[10:0] Video compression vertical line total
++    #define     COMPRESS_VER_LINE_BIT                   0
++    #define     COMPRESS_VER_LINE_MASK                  0x000007FF
++    #define     COMPRESS_HOR_PIXEL                      0x00010000  //Bit[26:16] Video compression vertical line total
++    #define     COMPRESS_HOR_PIXEL_BIT                  16
++    #define     COMPRESS_HOR_PIXEL_MASK                 0x07FF0000
++
++#define     VIDEO1_COMPRESS_BUF_PROCESS_OFFSET_REG      0x38
++#define     VIDEO2_COMPRESS_BUF_PROCESS_OFFSET_REG      0x138
++    #define     COMPRESS_BUF_PROCESS_OFFSET_ALIGN       127 //128 byte alignment
++    #define     COMPRESS_BUF_PROCESS_OFFSET_MASK        0xFFFFFF
++
++#define     VIDEO1_DECOMPRESS_BUF_PROCESS_OFFSET_REG    0x38
++#define     VIDEO2_DECOMPRESS_BUF_PROCESS_OFFSET_REG    0x138
++    #define     DECOMPRESS_BUF_PROCESS_OFFSET_ALIGN     127 //128 byte alignment
++    #define     DECOMPRESS_BUF_PROCESS_OFFSET_MASK      0xFFFFFF
++
++
++//For Compression
++#define     VIDEO1_COMPRESS_BUF_READ_OFFSET_REG         0x3C + VIDEOBASE_OFFSET     //For stream mode
++#define     VIDEO2_COMPRESS_BUF_READ_OFFSET_REG         0x13C + VIDEOBASE_OFFSET
++    #define     COMPRESS_BUF_READ_OFFSET_ALIGN          127 //128 byte alignment
++    #define     COMPRESS_BUF_READ_OFFSET_MASK           0x00FFFFFF
++//For Decompression
++#define     VIDEO1_DECOMPRESS_BUF_WRITE_OFFSET_REG      0x3C + VIDEOBASE_OFFSET     //For stream mode 
++#define     VIDEO2_DECOMPRESS_BUF_WRITE_OFFSET_REG      0x13C + VIDEOBASE_OFFSET
++    #define     DECOMPRESS_BUF_WRITE_OFFSET_ALIGN       127 //128 byte alignment
++    #define     DECOMPRESS_BUF_WRITE_OFFSET_MASK        0x00FFFFFF
++
++#define     VIDEO1_CRC_BUF_ADDR_REG                     0x40 + VIDEOBASE_OFFSET
++#define     VIDEO2_CRC_BUF_ADDR_REG                     0x140 + VIDEOBASE_OFFSET
++    #define     CRC_BUF_ADDR_ALIGN                      7   //8 byte alignment
++    #define     CRC_BUF_ADDR_MASK                       0x0FFFFFFF
++
++#define     VIDEO1_BUF_1_ADDR_REG                       0x44 + VIDEOBASE_OFFSET     //For Source Buffer in frame mode
++#define     VIDEO2_BUF_1_ADDR_REG                       0x144 + VIDEOBASE_OFFSET
++    #define     BUF_1_ADDR_ALIGN                        255 //256 byte alignment
++    #define     BUF_1_ADDR_MASK                         0x1FFFFFFF
++
++#define     VIDEO1_BUF_LINE_OFFSET_REG                  0x48 + VIDEOBASE_OFFSET     //Must set both in Frame/Stream mode
++#define     VIDEO2_BUF_LINE_OFFSET_REG                  0x148 + VIDEOBASE_OFFSET
++    #define     BUF_LINE_OFFSET_ALIGN                   7 //8 byte alignment
++    #define     BUF_LINE_OFFSET_MASK                    0x00003FFF
++
++#define     VIDEO1_BUF_2_ADDR_REG                       0x4C + VIDEOBASE_OFFSET     //For BCD Buffer in frame mode
++#define     VIDEO2_BUF_2_ADDR_REG                       0x14C + VIDEOBASE_OFFSET     
++    #define     BUF_2_ADDR_ALIGN                        255 //256 byte alignment
++    #define     BUF_2_ADDR_MASK                         0x1FFFFFFF
++
++#define     VIDEO1_FLAG_BUF_ADDR_REG                    0x50 + VIDEOBASE_OFFSET     //For block change flag buffer
++#define     VIDEO2_FLAG_BUF_ADDR_REG                    0x150 + VIDEOBASE_OFFSET     
++    #define     FLAG_BUF_ADDR_ALIGN                     7 //8 byte alignment
++    #define     FLAG_BUF_ADDR_MASK                      0x1FFFFFFF
++
++#define     VIDEO1_COMPRESS_BUF_ADDR_REG                0x54 + VIDEOBASE_OFFSET     //For stream mode
++#define     VIDEO2_COMPRESS_BUF_ADDR_REG                0x154 + VIDEOBASE_OFFSET     
++    #define     COMPRESS_BUF_ADDR_ALIGN                 127 //128 byte alignment
++    #define     COMPRESS_BUF_ADDR_MASK                  0x1FFFFFFF
++
++#define     VIDEO1_STREAM_BUF_SIZE                      0x58 + VIDEOBASE_OFFSET     //For stream mode 
++#define     VIDEO2_STREAM_BUF_SIZE                      0x158 + VIDEOBASE_OFFSET
++    #define     STREAM_PACKET_SIZE                      0x00000001
++        #define     STREAM_PACKET_SIZE_BIT              0
++        #define     STREAM_PACKET_SIZE_MASK             0x00000007
++        #define     PACKET_SIZE_1KB                     0
++        #define     PACKET_SIZE_2KB                     1
++        #define     PACKET_SIZE_4KB                     2
++        #define     PACKET_SIZE_8KB                     3
++        #define     PACKET_SIZE_16KB                    4
++        #define     PACKET_SIZE_32KB                    5
++        #define     PACKET_SIZE_64KB                    6
++        #define     PACKET_SIZE_128KB                   7
++    #define     RING_BUF_PACKET_NUM                     0x00000008
++        #define     RING_BUF_PACKET_NUM_BIT             3
++        #define     RING_BUF_PACKET_NUM_MASK            0x00000018
++        #define     PACKETS_4                           0
++        #define     PACKETS_8                           1
++        #define     PACKETS_16                          2
++        #define     PACKETS_32                          3
++    #define     SKIP_HIGH_MB_THRES                      0x00010000  //Bit[22:16] Skip high quality macro block threshold
++        #define     SKIP_HIGH_MB_THRES_BIT              16
++        #define     SKIP_HIGH_MB_THRES_MASK             0x007F0000
++    #define     SKIP_TEST_MODE                          0x00800000  //Bit[24:23] Skip test mode
++        #define     SKIP_TEST_MODE_BIT                  23
++        #define     SKIP_TEST_MODE_MASK                 0x01800000
++        #define     YUV_TEST                            2   //recommend
++
++#define     VIDEO1_BUF_CODEC_OFFSET_READ                0x5C + VIDEOBASE_OFFSET     //For stream mode,         
++#define     VIDEO2_BUF_CODEC_OFFSET_READ                0x15C + VIDEOBASE_OFFSET    //Video stream buffer offset read back(HW)
++    #define     BUF_CODEC_OFFSET_ALIGN                  255 //256 byte alignment
++    #define     BUF_CODEC_OFFSET_MASK                   0x00FFFFFF
++
++#define     VIDEO1_COMPRESS_CONTROL_REG                 0x60 + VIDEOBASE_OFFSET
++#define     VIDEO2_COMPRESS_CONTROL_REG                 0x160 + VIDEOBASE_OFFSET
++    #define     JPEG_ONLY_ENCODE                        0x00000001  //Bit[0] JPEG only encoding
++        #define     JPEG_ONLY_BIT                       0
++        #define     JPEG_MIX_MODE                       0   //Enable JPEG/VQ mix mode encoding
++        #define     JPEG_ONLY_MODE                      1   //JPEG encoding mode only
++    #define     VQ_4_COLOR_ENCODE                       0x00000002  //Bit[1] Enable 4 color VQ encoding
++        #define     VQ_4_COLOR_BIT                      1
++        #define     VQ_1_2_COLOR_MODE                   0   //1 and 2 color mode VQ encoding
++        #define     VQ_4_COLOR_MODE                     1   //1, 2 and 4 color VQ encoding
++    #define     QUALITY_CODEC_SETTING                   0x00000004  //Bit[2] High and best video quality codec mode setting
++        #define     QUALITY_CODEC_SETTING_BIT           2
++        #define     JPEG_CODEC_MODE                     0   //not supported in best video quality mode
++        #define     QUANTI_CODEC_MODE                   1
++    #define     JPEG_DUAL_QUALITY_EN                    0x00000008  //Bit[3] JPEG dual quality mode
++        #define     EN_JPEG_DUAL_QUALITY                1   //enable(only for normal video quality mode)
++    #define     BEST_QUALITY_EN                         0x00000010  //Bit[4] Best quality video mode enable
++        #define     BEST_QUALITY_EN_BIT                 4
++        #define     EN_BEST_QUALITY                     1   //enable(only for quantization codec mode)
++    #define     RC4_CRYPT_EN                            0x00000020  //Bit[5] Enable RC4 encryption/decryption
++		#define		RC4_CRYPT_EN_BIT					5
++		#define     RC4_CRYPT_EN_MASK                   0x00000020
++        #define     RC4_CRYPT_ON                        1   //enable
++    #define     NORMAL_QUANTI_CHROMI_TABLE              0x00000040  //Bit[10:6] Normal video quality mode JPEG DCT chromi quantination table
++        #define     NORMAL_QUANTI_CHROMI_TABLE_BIT      6
++        #define     NORMAL_QUANTI_CHROMI_TABLE_MASK     0x000007C0
++    #define     NORMAL_QUANTI_LUMI_TABLE                0x00000800  //Bit[15:11] Normal video quality mode JPEG DCT lumi quantination table
++        #define     NORMAL_QUANTI_LUMI_TABLE_BIT        11
++        #define     NORMAL_QUANTI_LUMI_TABLE_MASK       0x0000F800
++    #define     HIGH_QUALITY_EN                         0x00010000  //Bit[16] High video quality mode enable
++        #define     HIGH_QUALITY_EN_BIT                 16
++        #define     EN_HIGH_QUALITY                     1   //Enable
++    #define     UV_CIR656_FORMAT                        0x00080000  //Bit[19] UV fromat
++        #define     UV_CIR656_FORMAT_BIT                19
++        #define     USE_UV_CIR656                       1   //recommand
++    #define     HUFFMAN_TABLE_SELECT                    0x00100000  //Bit[20] JPEG Huffman table combination
++        #define     DUAL_TABLE                          0   //Dual Y, UV table
++        #define     SINGLE_TABLE                        1   //Single Y table
++        #define     SINGLE_UV_TABLE                     0x00200000  //1x: Single UV table
++    #define     HIGH_QUANTI_CHROMI_TABLE                0x00400000  //Bit[26:22] High quality JPEG DCT chromi quantization table
++        #define     HIGH_QUANTI_CHROMI_TABLE_BIT        22
++        #define     HIGH_QUANTI_CHROMI_TABLE_MASK       0x07C00000                
++    #define     HIGH_DEQUANTI_VALUE                     0x00400000  //Bit[26:22] High quality de-quantization value
++        #define     HIGH_DEQUANTI_VALUE_BIT             22
++        #define     HIGH_DEQUANTI_VALUE_MASK            0x07C00000        
++    #define     HIGH_QUANTI_LUMI_TABLE                  0x08000000  //Bit[31:27] High quality JPEG DCT lumi quantization table
++        #define     HIGH_QUANTI_LUMI_TABLE_BIT          27
++        #define     HIGH_QUANTI_LUMI_TABLE_MASK         0xF8000000
++    #define     BEST_DEQUANTI_VALUE                     0x08000000  //Bit[31:27] Best quality de-quantization value
++        #define     BEST_DEQUANTI_VALUE_BIT             27
++        #define     BEST_DEQUANTI_VALUE_MASK            0xF8000000
++        
++
++#define     VIDEO1_QUANTI_TABLE_LOW_REG                 0x64 + VIDEOBASE_OFFSET     //Match with 0x60 Bit[10:6], Bit[15:11]
++#define     VIDEO2_QUANTI_TABLE_LOW_REG                 0x164 + VIDEOBASE_OFFSET
++    #define     QUANTI_CHROMI_TABLE_LOW                 0x00000001  //Bit[4:0] Normal video low quality block chromi quantization table
++        #define     QUANTI_CHROMI_TABLE_LOW_BIT         0
++        #define     QUANTI_CHROMI_TABLE_LOW_MASK        0x0000001F
++    #define     QUANTI_LUMI_TABLE_LOW                   0x00000020  //Bit[9:5] Normal video low quality block lumi quantization table
++        #define     QUANTI_LUMI_TABLE_LOW_BIT           5
++        #define     QUANTI_LUMI_TABLE_LOW_MASK          0x000003E0
++
++#define     VIDEO1_QUANTI_VALUE_REG                     0x68 + VIDEOBASE_OFFSET     //Match with 0x60 Bit[26:22],Bit[31:27]
++#define     VIDEO2_QUANTI_VALUE_REG                     0x168 + VIDEOBASE_OFFSET
++    #define     HIGH_QUANTI_VALUE                       0x00000001  //Bit[14:0] High quality quantization value. Format is 1.14
++        #define     HIGH_QUANTI_VALUE_BIT               0
++        #define     HIGH_QUANTI_VALUE_MASK              0x00007FFF
++    #define     BEST_QUANTI_VALUE                       0x00010000  //Bit[30:16] Best quality quantization value. Format is 1.14
++        #define     BEST_QUANTI_VALUE_BIT               16
++        #define     BEST_QUANTI_VALUE_MASK              0x7FFF0000
++    
++#define     VIDEO1_BSD_PARA_REG                         0x6C + VIDEOBASE_OFFSET    //Video BSD Parameters Register    
++#define     VIDEO2_BSD_PARA_REG                         0x16C + VIDEOBASE_OFFSET
++    #define     BSD_HIGH_THRES                          0x00000001  //Bit[7:0] Block sharpness detection high threshold
++    #define     BSD_HIGH_THRES_BIT                      0
++    #define     BSD_HIGH_THRES_MASK                     0x000000FF
++    #define     BSD_LOW_THRES                           0x00000100  //Bit[15:8] Block shaprpness detection low threshold
++    #define     BSD_LOW_THRES_BIT                       8
++    #define     BSD_LOW_THRES_MASK                      0x0000FF00
++    #define     BSD_HIGH_COUNTS                         0x00010000  //Bit[21:16] Block sharpness detection high counts threshold
++    #define     BSD_HIGH_COUNTS_BIT                     16
++    #define     BSD_HIGH_COUNTS_MASK                    0x003F0000
++    #define     BSD_LOW_COUNTS                          0x00400000  //Bit[27:22] Block sharpness detection low counts threshold
++    #define     BSD_LOW_COUNTS_BIT                      22
++    #define     BSD_LOW_COUNTS_MASK                     0x0FC00000
++
++#define VIDEO1_COMPRESS_FRAME_SIZE_REG                  0x70 + VIDEOBASE_OFFSET
++#define VIDEO2_COMPRESS_FRAME_SIZE_REG                  0x170 + VIDEOBASE_OFFSET
++    #define     COMPRESS_FRAME_SIZE_READ                0x00000001  //Bit[19:0] Video compression frame size read back(number of DW)
++    #define     COMPRESS_FRAME_SIZE_READ_BIT            0
++    #define     COMPRESS_FRAME_SIZE_READ_MASK           0x003FFFFF
++
++#define     VIDEO1_COMPRESS_BLOCK_COUNT_REG             0x74 + VIDEOBASE_OFFSET
++#define     VIDEO2_COMPRESS_BLOCK_COUNT_REG             0x174 + VIDEOBASE_OFFSET
++    #define     PROCESS_BLOCK_COUNT_READ_BIT            0
++    #define     PROCESS_BLOCK_COUNT_READ_MASK			0x00003FFF	//Bit[13:0] Video processed total block counter read back(number of blocks)
++    #define     COMPRESS_BLOCK_COUNT_READ_BIT           16
++    #define     COMPRESS_BLOCK_COUNT_READ_MASK          0xFFFF0000	//Bit[29:16] Video processed total block counter read back(number of blocks)
++
++#define     VIDEO1_COMPRESS_FRAME_END_READ              0x78 + VIDEOBASE_OFFSET     //Video compression stream frame end pointer    
++#define     VIDEO2_COMPRESS_FRAME_END_READ              0x178 + VIDEOBASE_OFFSET
++    #define     COMPRESS_FRAME_END_READ_ALIGN           7
++    #define     COMPRESS_FRAME_END_READ_MASK            0x00FFFFFF
++
++#define     VIDEO1_COMPRESS_FRAME_COUNT_READ            0x7C + VIDEOBASE_OFFSET     
++#define     VIDEO2_COMPRESS_FRAME_COUNT_READ            0x17C + VIDEOBASE_OFFSET 
++    #define     COMPRESS_FRAME_COUNT_READ               0x00000001  //Bit[15:0] Video compression frame count read back(number of frame)
++    #define     COMPRESS_FRAME_COUNT_READ_BIT           0
++    #define     COMPRESS_FRAME_COUNT_READ_MASK          0xFFFFFFFF
++
++#define     VIDEO1_USER_DEFINE_HEADER                   0x80 + VIDEOBASE_OFFSET
++#define     VIDEO2_USER_DEFINE_HEADER                   0x180 + VIDEOBASE_OFFSET
++    #define     USER_DEFINE_HEADER                      0x00000001  //Bit[15:0] Video user defined header parameter
++    #define     USER_DEFINE_HEADER_BIT                  0
++    #define     USER_DEFINE_HEADER_MASK                 0x0000FFFF
++    
++#define     VIDE1_MODE_DETECTION_EDGE_H_REG             0x90 + VIDEOBASE_OFFSET
++#define     VIDE2_MODE_DETECTION_EDGE_H_REG             0x190 + VIDEOBASE_OFFSET
++    #define     LEFT_EDGE_LOCATION                      0x00000001  //Bit[11:0] Video source left edge location from sync rising edge
++    #define     LEFT_EDGE_LOCATION_BIT                  0
++    #define     LEFT_EDGE_LOCATION_MASK                 0x00000FFF
++	#define		NO_VER_SYNC								(1 << 12)		//Bit[12] No Vertical sync detected
++	#define		NO_HOR_SYNC								(1 << 13)		//Bit[13] No horizontal sync detected
++	#define		NO_ACTIVE_DISP							(1 << 14)		//Bit[14] No active display detected
++	#define		NO_DISP_CLOCK							(1 << 15)		
++    #define     RIGHT_EDGE_LOCATION                     0x00010000  //Bit[27:16] Video source right edge location from sync rising edge
++    #define     RIGHT_EDGE_LOCATION_BIT                 16
++    #define     RIGHT_EDGE_LOCATION_MASK                0x0FFF0000
++
++#define     VIDE1_MODE_DETECTION_EDGE_V_REG             0x94 + VIDEOBASE_OFFSET
++#define     VIDE2_MODE_DETECTION_EDGE_V_REG             0x194 + VIDEOBASE_OFFSET
++    #define     TOP_EDGE_LOCATION                       0x00000001  //Bit[11:0] Video source top edge location from sync rising edge
++    #define     TOP_EDGE_LOCATION_BIT                   0
++    #define     TOP_EDGE_LOCATION_MASK                  0x00000FFF
++    #define     BOTTOM_EDGE_LOCATION                    0x00010000  //Bit[27:16] Video source bottom edge location from sync rising edge
++    #define     BOTTOM_EDGE_LOCATION_BIT                16
++    #define     BOTTOM_EDGE_LOCATION_MASK               0x0FFF0000
++
++#define VIDEO1_MODE_DETECTION_STATUS_READ_REG           0x98 + VIDEOBASE_OFFSET
++#define VIDEO2_MODE_DETECTION_STATUS_READ_REG           0x198 + VIDEOBASE_OFFSET    
++    #define     MODE_DETECTION_HOR_TIME_READ            0x00000001  //Bit[11:0] Mode detection Horizontal time read back (read only)
++    #define     MODE_DETECTION_HOR_TIME_READ_BIT        0
++    #define     MODE_DETECTION_HOR_TIME_READ_MASK       0x00000FFF
++    #define     ANALONG_DIGITAL_READ                    0x00001000  //Bit[12] Auto detection for external analog or digital source read back
++        #define     ANALONG_DIGITAL_READ_BIT            12
++        #define     DVI_SIGNAL                          0
++        #define     ADC_SIGNAL                          1
++    #define     MODE_DETECTION_HOR_STABLE_READ          0x00002000  //Bit[13] Mode detection horizontal stable read back
++        #define     HOR_STABLE                          1
++    #define     MODE_DETECTION_VER_STABLE_READ          0x00004000  //Bit[14] Mode detection vertical stable read back
++        #define     VER_STABLE                          1
++    #define     OUT_LOCK_READ                           0x00008000  //Bit[15] Mode detection out of lock read back
++        #define     SIGNAL_OUT_LOCK                     1
++    #define     MODE_DETECTION_VER_LINE_READ            0x00010000  //Bit[27:16] Mode detection Vertical lines read back
++    #define     MODE_DETECTION_VER_LINE_READ_BIT        16
++    #define     MODE_DETECTION_VER_LINE_READ_MASK       0x0FFF0000
++    #define     VSYNC_POLARITY_READ                     0x10000000  //Bit[28] Vsync polarity read back
++    #define     HSYNC_POLARITY_READ                     0x20000000  //Bit[29] Hsync polarity read back
++    #define     MODE_DETECTION_VSYNC_READY              0x40000000  //Bit[30] Mode detection Vsync ready
++    #define     MODE_DETECTION_HSYNC_READY              0x80000000  //Bit[31] Mode detection Hsync ready
++
++/******     VIDEO MEMAGER SETTING               ******/
++#define     VIDEOM_ENGINE_SEQUENCE_CONTROL_REG          0x204 + VIDEOBASE_OFFSET
++    #define     VIDEOM_CAPTURE_TRIGGER                  0x00000002  //Bit[1] trigger HW to capture video
++    #define     VIDEOM_AUTO_MODE						0x00000008  //Bit[3]
++        #define     DISABLE_AUTO_MODE                   0
++        #define     AUTO_COMPRESS						1
++    #define     VIDEOM_CODEC_TRIGGER                    0x00000010  //Bit[4] trigger HW to compress or decompress video
++    #define     VIDEOM_SOURCE_SELECTION                 0x00000100  //Bit[8]
++        #define     VIDEO1                              0
++        #define     VIDEO2                              1
++    //#define     STREAM_DATA_MODE                        0x00000400  //Bit[11:10] Buffer and Stream Data type
++    //    #define     STREAM_DATA_MODE_BIT                10
++    //    #define     STREAM_DATA_MODE_MASK               0x00000C00
++    //    #define     YUV444_MODE                         0
++    //    #define     YUV420_MODE                         1
++    //    #define     YUV420_MODE_WITH_AST2000            2 //AST2000 compatible
++    #define     VIDEOM_CAPTURE_READY                    0x00010000  //Bit[16] Video capture ready status read back(read only)
++        //#define     HW_BUSY                             0
++        //#define     HW_IDLE                             1
++    #define     VIDEOM_CODEC_READY                      0x00040000  //Bit[18] Video codec ready status read back(read only)
++        //#define     HW_BUSY                             0
++        //#define     HW_IDLE                             1
++
++#define    VIDEOM_SCALE_FACTOR_REG                      0x214 + VIDEOBASE_OFFSET
++//    #define     HOR_SCALING_FACTOR                      0x00000001  //Bit[15:0] Video Horizontal scaling factor
++//    #define     HOR_SCALING_FACTOR_BIT                  0   //The formula=4096/(Horizontal scaling facotr)
++//    #define     HOR_SCALING_FACTOR_MASK                 0x0000FFFF
++//    #define     VER_SCALING_FACTOR                      0x00000000  //Bit[31:16] Video Vertical scaling factor
++//    #define     VER_SCALING_FACTOR_BIT                  16   //The formula=4096/(Vertical scaling facotr)
++//    #define     VER_SCALING_FACTOR_MASK                 0xFFFF0000
++
++#define    VIDEOM_SCALE_FACTOR_PARAMETER0_REG           0x218 + VIDEOBASE_OFFSET  //Scaling Parameters F00, F01, F02, F03
++
++#define    VIDEOM_SCALE_FACTOR_PARAMETER1_REG           0x21C + VIDEOBASE_OFFSET  //Scaling Parameters F10, F11, F12, F13
++
++#define    VIDEOM_SCALE_FACTOR_PARAMETER2_REG           0x220 + VIDEOBASE_OFFSET  //Scaling Parameters F20, F21, F22, F23
++
++#define    VIDEOM_SCALE_FACTOR_PARAMETER3_REG           0x224 + VIDEOBASE_OFFSET  //Scaling Parameters F30, F31, F32, F33
++
++#define    VIDEOM_BCD_CONTROL_REG                       0x22C + VIDEOBASE_OFFSET
++    //#define     BCD_ENABLE                              0x00000001  //Bit[0] Enable block change detection(BCD)
++    //#define     BCD_TOLERANCE                           0x00010000  //Bit[23:16]
++    //    #define     BCD_TOLERANCE_BIT                   16 //flag as changed block when the video data difference greater
++    //    #define     BCD_TOLERANCE_MASK                  0x00FF0000
++
++#define     VIDEOM_CAPTURE_WINDOWS_REG                  0x230 + VIDEOBASE_OFFSET
++    //#define     RC4_TABLE_ADDR_ALIGN                    7   //8 byte alignment
++    //#define     RC4_TABLE_ADDR_MASK                     0x0FFFFFFF
++
++#define     VIDEOM_COMPRESS_WINDOWS_REG                 0x234 + VIDEOBASE_OFFSET
++    //#define     COMPRESS_VER_LINE                       0x00000001  //Bit[12:0] Video compression vertical line total
++    //#define     COMPRESS_VER_LINE_BIT                   0
++    //#define     COMPRESS_VER_LINE_MASK                  0x00001FFF
++    //#define     COMPRESS_HOR_PIXEL                      0x00010000  //Bit[12:0] Video compression vertical line total
++    //#define     COMPRESS_HOR_PIXEL_BIT                  16
++    //#define     COMPRESS_HOR_PIXEL_MASK                 0x1FFF0000
++
++#define     VIDEOM_COMPRESS_BUF_PROCESS_OFFSET_REG      0x238
++    //#define     COMPRESS_BUF_PROCESS_OFFSET_ALIGN       127 //128 byte alignment
++    //#define     COMPRESS_BUF_PROCESS_OFFSET_MASK        0x3FFFFF
++
++
++//For Compression
++#define     VIDEOM_COMPRESS_BUF_READ_OFFSET_REG         0x23C + VIDEOBASE_OFFSET     //For stream mode
++    //#define     COMPRESS_BUF_READ_OFFSET_ALIGN          127 //128 byte alignment
++    //#define     COMPRESS_BUF_READ_OFFSET_MASK           0x003FFFFF
++//For Decompression
++#define     VIDEOM_DECOMPRESS_BUF_WRITE_OFFSET_REG      0x23C + VIDEOBASE_OFFSET     //For stream mode 
++    //#define     DECOMPRESS_BUF_WRITE_OFFSET_ALIGN       127 //128 byte alignment
++    //#define     DECOMPRESS_BUF_WRITE_OFFSET_MASK        0x003FFFFF
++    
++#define     VIDEOM_BUF_1_ADDR_REG                       0x244 + VIDEOBASE_OFFSET     //For Source Buffer in frame mode
++    //#define     BUF_1_ADDR_ALIGN                        255 //256 byte alignment
++    //#define     BUF_1_ADDR_MASK                         0x0FFFFFFF
++
++#define     VIDEOM_BUF_LINE_OFFSET_REG                  0x248 + VIDEOBASE_OFFSET     //Must set both in Frame/Stream mode
++    //#define     BUF_LINE_OFFSET_ALIGN                   7 //8 byte alignment
++    //#define     BUF_LINE_OFFSET_MASK                    0x00003FFF
++
++#define     VIDEOM_BUF_2_ADDR_REG                       0x24C + VIDEOBASE_OFFSET     //For BCD Buffer in frame mode
++    //#define     BUF_2_ADDR_ALIGN                        255 //256 byte alignment
++    //#define     BUF_2_ADDR_MASK                         0x0FFFFFFF
++
++#define     VIDEOM_FLAG_BUF_ADDR_REG                    0x250 + VIDEOBASE_OFFSET     //For block change flag buffer
++    //#define     FLAG_BUF_ADDR_ALIGN                     7 //8 byte alignment
++    //#define     FLAG_BUF_ADDR_MASK                      0x0FFFFFFF
++
++#define     VIDEOM_COMPRESS_BUF_ADDR_REG                0x254 + VIDEOBASE_OFFSET     //For stream mode
++    //#define     FLAG_BUF_ADDR_ALIGN                     7 //8 byte alignment
++    //#define     FLAG_BUF_ADDR_MASK                      0x0FFFFFFF
++    
++#define     VIDEOM_BUF_CODEC_OFFSET_READ                0x25C + VIDEOBASE_OFFSET     //For stream mode,         
++    //#define     BUF_CODEC_OFFSET_ALIGN                  255 //256 byte alignment
++    //#define     BUF_CODEC_OFFSET_MASK                   0x003FFFFF
++    
++#define     VIDEOM_COMPRESS_CONTROL_REG                 0x260 + VIDEOBASE_OFFSET
++    //#define     JPEG_ONLY_ENCODE                        0x00000001  //Bit[0] JPEG only encoding
++    //    #define     JPEG_MIX_MODE                       0   //Enable JPEG/VQ mix mode encoding
++    //    #define     JPEG_ONLY_MODE                      1   //JPEG encoding mode only
++    //#define     VQ_4_COLOR_ENCODE                       0x00000002  //Bit[1] Enable 4 color VQ encoding
++    //    #define     VQ_1_2_COLOR_MODE                   0   //1 and 2 color mode VQ encoding
++    //    #define     VQ_4_COLOR_MODE                     1   //1, 2 and 4 color VQ encoding
++    //#define     QUALITY_CODEC_SETTING                   0x00000004  //Bit[2] High and best video quality codec mode setting
++    //    #define     JPEG_CODEC_MODE                     0   //not supported in best video quality mode
++    //    #define     QUANTI_CODEC_MODE                   1
++    //#define     JPEG_DUAL_QUALITY_EN                    0x00000008  //Bit[3] JPEG dual quality mode
++    //    #define     EN_JPEG_DUAL_QUALITY                1   //enable(only for normal video quality mode)
++    //#define     BEST_QUALITY_EN                         0x00000010  //Bit[4] Best quality video mode enable
++    //    #define     EN_BEST_QUALITY                     1   //enable(only for quantization codec mode)
++    //#define     RC4_CRYPT_EN                            0x00000020  //Bit[5] Enable RC4 encryption/decryption
++    //    #define     EN_RC4_CRYPT                        1   //enable
++    //#define     NORMAL_QUANTI_CHROMI_TABLE              0x00000040  //Bit[10:6] Normal video quality mode JPEG DCT chromi quantination table
++    //    #define     NORMAL_QUANTI_CHROMI_TABLE_BIT      6
++    //    #define     NORMAL_QUANTI_CHROMI_TABLE_MASK     0x000007C0
++    //#define     NORMAL_QUANTI_LUMI_TABLE                0x00000800  //Bit[15:11] Normal video quality mode JPEG DCT lumi quantination table
++    //    #define     NORMAL_QUANTI_LUMI_TABLE_BIT        11
++    //    #define     NORMAL_QUANTI_LUMI_TABLE_MASK       0x0000F800
++    //#define     HIGH_QUALITY_EN                         0x00010000  //Bit[16] High video quality mode enable
++    //    #define     EN_HIGH_QUALITY                     1   //Enable
++    //#define     UV_CIR656_FORMAT                        0x00080000  //Bit[19] UV fromat
++    //    #define     USE_UV_CIR656                       1   //recommand
++    //#define     HUFFMAN_TABLE_SELECT                    0x00100000  //Bit[20] JPEG Huffman table combination
++    //    #define     DUAL_TABLE                          0   //Dual Y, UV table
++    //    #define     SINGLE_TABLE                        1   //Single Y table
++    //    #define     SINGLE_UV_TABLE                     0x00200000  //1x: Single UV table
++    //#define     HIGH_QUANTI_CHROMI_TABLE                0x00400000  //Bit[26:22] High quality JPEG DCT chromi quantization table
++    //    #define     HIGH_QUANTI_CHROMI_TABLE_BIT        22
++    //    #define     HIGH_QUANTI_CHROMI_TABLE_MASK       0x07C00000                
++    //#define     HIGH_DEQUANTI_VALUE                     0x00400000  //Bit[26:22] High quality de-quantization value
++    //    #define     HIGH_DEQUANTI_VALUE_BIT             22
++    //    #define     HIGH_DEQUANTI_VALUE_MASK            0x07C00000        
++    //#define     HIGH_QUANTI_LUMI_TABLE                  0x08000000  //Bit[31:27] High quality JPEG DCT lumi quantization table
++    //    #define     HIGH_QUANTI_LUMI_TABLE_BIT          27
++    //    #define     HIGH_QUANTI_LUMI_TABLE_MASK         0xF8000000
++    //#define     BEST_DEQUANTI_VALUE                     0x08000000  //Bit[31:27] Best quality de-quantization value
++    //    #define     BEST_QUANTI_VALUE_BIT               27
++    //    #define     BEST_QUANTI_VALUE_MASK              0xF8000000
++    
++#define     VIDEOM_QUANTI_TABLE_LOW_REG                 0x264 + VIDEOBASE_OFFSET     //Match with 0x60 Bit[10:6], Bit[15:11]
++//    #define     QUANTI_CHROMI_TABLE_LOW                 0x00000001  //Bit[4:0] Normal video low quality block chromi quantization table
++//        #define     QUANTI_CHROMI_TABLE_LOW_BIT         0
++//        #define     QUANTI_CHROMI_TABLE_LOW_MASK        0x0000001F
++//    #define     QUANTI_LUMI_TABLE_LOW                   0x00000020  //Bit[9:5] Normal video low quality block lumi quantization table
++//        #define     QUANTI_CHROMI_TABLE_LOW_BIT         5
++//        #define     QUANTI_CHROMI_TABLE_LOW_MASK        0x000003E0
++
++#define     VIDEOM_QUANTI_VALUE_REG                     0x268 + VIDEOBASE_OFFSET     //Match with 0x60 Bit[26:22],Bit[31:27]
++//    #define     HIGH_QUANTI_VALUE                       0x00000001  //Bit[14:0] High quality quantization value. Format is 1.14
++//        #define     HIGH_QUANTI_VALUE_BIT               0
++//        #define     HIGH_QUANTI_VALUE_MASK              0x00007FFF
++//    #define     BEST_QUANTI_VALUE                       0x00010000  //Bit[30:16] Best quality quantization value. Format is 1.14
++//        #define     BEST_QUANTI_VALUE_BIT               16
++//        #define     BEST_QUANTI_VALUE_MASK              0x7FFF0000
++    
++#define     VIDEOM_BSD_PARA_REG                         0x26C + VIDEOBASE_OFFSET    //Video BSD Parameters Register    
++//    #define     BSD_HIGH_THRES                          0x00000001  //Bit[7:0] Block sharpness detection high threshold
++//    #define     BSD_HIGH_THRES_BIT                      0
++//    #define     BSD_HIGH_THRES_MASK                     0x000000FF
++//    #define     BSD_LOW_THRES                           0x00000100  //Bit[15:8] Block shaprpness detection low threshold
++//    #define     BSD_LOW_THRES_BIT                       8
++//    #define     BSD_LOW_THRES_MASK                      0x0000FF00
++//    #define     BSD_HIGH_COUNTS                         0x00010000  //Bit[21:16] Block sharpness detection high counts threshold
++//    #define     BSD_HIGH_COUNTS_BIT                     16
++//    #define     BSD_HIGH_COUNTS_MASK                    0x003F0000
++//    #define     BSD_LOW_COUNTS                          0x01000000  //Bit[27:24] Block sharpness detection low counts threshold
++//    #define     BSD_LOW_COUNTS_BIT                      24
++//    #define     BSD_LOW_COUNTS_MASK                     0x3F000000
++
++#define VIDEOM_COMPRESS_FRAME_SIZE_REG					  0x270 + VIDEOBASE_OFFSET
++//    #define     COMPRESS_FRAME_SIZE_READ                0x00000001  //Bit[19:0] Video compression frame size read back(number of DW)
++//    #define     COMPRESS_FRAME_SIZE_READ_BIT            0
++//    #define     COMPRESS_FRAME_SIZE_READ_MASK           0x000FFFFF
++
++#define     VIDEOM_COMPRESS_BLOCK_COUNT_REG				  0x274 + VIDEOBASE_OFFSET
++//    #define     COMPRESS_BLOCK_COUNT_READ               0x00000001  //Bit[15:0] Video compress block counter read back(number of blocks)
++//    #define     COMPRESS_BLOCK_COUNT_READ_BIT           0
++//    #define     COMPRESS_BLOCK_COUNT_READ_MASK          0x0000FFFF
++
++#define     VIDEOM_COMPRESS_FRAME_END_READ              0x278 + VIDEOBASE_OFFSET     //Video compression stream frame end pointer    
++    //#define     COMPRESS_FRAME_END_READ_ALIGN           7
++    //#define     COMPRESS_FRAME_END_READ_MASK            0x003FFFFF
++    
++#define     VIDEOM_USER_DEFINE_HEADER_REG			      0x280 + VIDEOBASE_OFFSET
++//    #define     USER_DEFINE_HEADER                      0x00000001  //Bit[15:0] Video user defined header parameter
++//    #define     USER_DEFINE_HEADER_BIT                  0
++//    #define     USER_DEFINE_HEADER_MASK                 0x0000FFFF
++
++/******  VR300-VR3FC: General Control registers  *****/
++#define     VIDEO_CONTROL_REG                           0x300 + VIDEOBASE_OFFSET
++    #define     CODEC_DECOMPRESS_MODE                   0x00000001  //Bit[0] Codec in de-compression mode
++        #define     CODEC_DECOMPRESS_MODE_BIT           0
++        #define     CODEC_DECOMPRESS_MODE_MASK          0x00000001 
++        #define     COMPRESS_MODE                       0
++        #define     DECOMPRESS_MODE                     1
++    #define     VIDEO_SAFE_MODE							0x00000002  //Bit[1] VIDEO SAFE MODE
++		#define     VIDEO_SAFE_MODE_BIT					1
++		#define     VIDEO_SAFE_MODE_OFF		            0
++        #define     VIDEO_SAFE_MODE_ON		            1
++    #define     DELAY_VSYNC								0x00000004  //Bit[2] Delay Internal VSYNC
++        #define     DELAY_VSYNC_BIT                     2
++        #define     DELAY_VSYNC_MASK                    (1<<2)
++		#define		DELAY_VSYNC_OFF						(0<<2)
++		#define		DELAY_VSYNC_EN						(1<<2)
++    #define     VER_DOWNSCALING_LINE_BUFFER_EN          0x00000010  //Bit[5:4] Video vertical downscaling line buffer enable
++		#define		VER_LINE_BUFFER_MASK				(3<<4)
++        #define     LINE_BUFFER_OFF                     (0<<4)
++        #define     LINE_BUFFER_VIDEO1                  1
++        #define     LINE_BUFFER_VIDEO2                  2
++        #define     LINE_BUFFER_VIDEOM                  3
++    #define     RC4_KEY_BUFFER_SELECTION				(1UL<<6)  //Bit[7:6] RC4 Key Buffer Selection
++		#define		RC4_KEY_BUFFER_SELECTION_BIT		6
++		#define		RC4_KEY_BUFFER_SELECTION_MASK		(3UL<<6)
++        #define     RC4_KEY_BUFFER_VIDEO1               0
++        #define     RC4_KEY_BUFFER_VIDEO2               1
++        #define     RC4_KEY_BUFFER_VIDEOM               2
++    #define     RC4_INIT_RESET							(1UL<<8)  //Bit[8] RC4 initial reset
++		#define     RC4_INIT_RESET_BIT					8
++		#define     RC4_INIT_RESET_MASK					(1UL<<8)
++		#define     RC4_NORMAL_MODE						0
++		#define     RC4_RESET_COUNTER					1
++    #define     RC4_TEST_MODE							(1UL<<9)  //Bit[9] RC4 test mode
++		#define     RC4_TEST_MODE_BIT					9
++		#define     RC4_TEST_OFF						0
++		#define     RC4_TEST_ON							1
++    #define     RC4_SAVE_MODE							(1UL<<14)  //Bit[14] RC4 save mode
++		#define     RC4_SAVE_MODE_BIT					14
++		#define     RC4_SAVE_MODE_MASK					(1UL<<14)
++		#define     RC4_SAVE_MODE_OFF					0
++		#define     RC4_SAVE_MODE_ON					1
++    #define     RC4_NO_RESET_FRAME						(1UL<<15)  //Bit[15] RC4 no reset when frame completed
++		#define     RC4_NO_RESET_FRAME_BIT				15
++		#define     RC4_NO_RESET_FRAME_MASK				(1UL<<15)
++		#define     RC4_NO_RESET_FRAME_OFF				0		//Always reset
++		#define     RC4_NO_RESET_FRAME_ON				1
++
++#define VIDEO_INT_CONTROL_EN_REG                        0x304 + VIDEOBASE_OFFSET
++    #define     VIDEO1_WATCH_DOG_INT_EN                 0x00000001  //Bit[0] Enable Video1 mode detection watch dog out of lock interrupt
++    #define     VIDEO1_INPUT_COMPLETE_INT_EN            0x00000002  //Bit[1] Enable Video1 video input complete interrupt  (frame complete only for frame mode)
++    #define     VIDEO1_PACKET_READY_INT_EN              0x00000004  //Bit[2] Enable Video1 packet ready interrupt
++    #define     VIDEO1_COMPRESS_COMPLETE_INT_EN         0x00000008  //Bit[3] Enable Video1 compression complete interrupt
++    #define     VIDEO1_MODE_DETECTION_READY_INT_EN      0x00000010  //Bit[4] Enable video1 mode detection ready interrupt
++    #define     VIDEO1_FRAME_COMPLETE_INT_EN            0x00000020  //Bit[5] Enable Video1 frame complete interrupt     (only for stream mode)
++    #define     VIDEO1_STREAM_ERR_INT_EN                0x00000040  //Bit[6] Enable Video1 decode stream error interrupt
++    #define     VIDEO2_WATCH_DOG_INT_EN                 0x00000100  //Bit[8] Enable Video2 mode detection watch dog out of lock interrupt
++    #define     VIDEO2_INPUT_COMPLETE_INT_EN            0x00000200  //Bit[9] Enable Video2 video input complete interrupt  (frame complete only for frame mode)
++    #define     VIDEO2_PACKET_READY_INT_EN              0x00000400  //Bit[10] Enable Video2 packet ready interrupt
++    #define     VIDEO2_COMPRESS_COMPLETE_INT_EN         0x00000800  //Bit[11] Enable Video2 compression complete interrupt
++    #define     VIDEO2_MODE_DETECTION_READY_INT_EN      0x00001000  //Bit[12] Enable video2 mode detection ready interrupt
++    #define     VIDEO2_FRAME_COMPLETE_INT_EN            0x00002000  //Bit[13] Enable Video2 frame complete interrupt    (only for stream mode)
++    #define     VIDEO2_STREAM_ERR_INT_EN                0x00004000  //Bit[14] Enable Video2 decode stream error interrupt
++    #define     VIDEOM_INPUT_COMPLETE_INT_EN            0x00010000  //Bit[16] Enable VideoM video input complete interrupt
++    #define     VIDEOM_COMPRESS_COMPLETE_INT_EN         0x00020000  //Bit[17] Enable VideoM compression complete interrupt
++	#define     VIDEOM_PACKET_READY_INT_EN				0x00040000  //Bit[18] Enable VideoM packet ready interrupt
++	#define     VIDEOM_FRAME_COMPLETE_INT_EN            0x00080000  //Bit[19] Enable VideoM frame complete interrupt    (only for stream mode)
++    
++#define VIDEO_INT_CONTROL_READ_REG                      0x308 + VIDEOBASE_OFFSET //Clear when write 1
++    #define     VIDEO1_WATCH_DOG_READ                   0x00000001  //Bit[0] Video1 mode detection watch dog out of lock interrupt status read back
++        #define     VIDEO1_WATCH_DOG_BIT				0
++        #define     VIDEO1_WATCH_DOG_MASK				0x00000001
++    #define     VIDEO1_INPUT_COMPLETE_READ              0x00000002  //Bit[1] Video1 video input complete interrupt status read back (frame complete only for frame mode)
++        #define     VIDEO1_INPUT_COMPLETE_BIT			1
++        #define     VIDEO1_INPUT_COMPLETE_MASK			0x00000002
++    #define     VIDEO1_PACKET_READY_READ                0x00000004  //Bit[2] Video1 packet ready interrupt status read back
++        #define     VIDEO1_PACKET_READY_BIT		        2
++        #define     VIDEO1_PACKET_READY_MASK		    0x00000004
++    #define     VIDEO1_COMPRESS_COMPLETE_READ           0x00000008  //Bit[3] Video1 compression complete interrupt status read back
++        #define     VIDEO1_COMPRESS_COMPLETE_BIT		3
++        #define     VIDEO1_COMPRESS_COMPLETE_MASK		0x00000008
++    #define     VIDEO1_MODE_DETECTION_READY_READ        0x00000010  //Bit[4] Video1 mode detection ready interrupt status read back
++        #define     VIDEO1_MODE_DETECTION_READY_BIT     4
++    #define     VIDEO1_FRAME_COMPLETE_READ              0x00000020  //Bit[5] Video1 frame complete interrupt status read back
++        #define     VIDEO1_FRAME_COMPLETE_BIT			5
++        #define     VIDEO1_FRAME_COMPLETE_MASK			0x00000020
++    #define     VIDEO1_STREAM_ERR_READ                  0x00000040  //Bit[6] Video1 decode stream error interrupt status read back
++        #define     VIDEO1_STREAM_ERR_BIT				6
++        #define     VIDEO1_STREAM_ERR_MASK				0x00000040
++    #define     VIDEO2_WATCH_DOG_READ                   0x00000100  //Bit[8] Video2 mode detection watch dog out of lock interrupt status read back
++        #define     VIDEO2_WATCH_DOG_BIT				8
++        #define     VIDEO2_WATCH_DOG_MASK				0x00000100
++    #define     VIDEO2_INPUT_COMPLETE_READ              0x00000200  //Bit[9] Video2 video input complete interrupt status read back (frame complete only for frame mode)
++        #define     VIDEO2_INPUT_COMPLETE_BIT			9
++        #define     VIDEO2_INPUT_COMPLETE_MASK			0x00000200
++    #define     VIDEO2_PACKET_READY_READ                0x00000400  //Bit[10] Video2 packet ready interrupt status read back
++        #define     VIDEO2_PACKET_READY_BIT		        10
++        #define     VIDEO2_PACKET_READY_MASK		    0x00000400
++    #define     VIDEO2_COMPRESS_COMPLETE_READ           0x00000800  //Bit[11] Video2 compression complete interrupt status read back 
++        #define     VIDEO2_COMPRESS_COMPLETE_BIT		11
++        #define     VIDEO2_COMPRESS_COMPLETE_MASK		0x00000800      
++		#define     VIDEO2_MODE_DETECTION_READY_READ    0x00001000  //Bit[12] Video2 mode detection ready interrupt status read back
++        #define     VIDEO2_MODE_DETECTION_READY_BIT     12              
++    #define     VIDEO2_FRAME_COMPLETE_READ              0x00002000  //Bit[13] Video2 frame complete interrupt status read back
++        #define     VIDEO2_FRAME_COMPLETE_BIT		    13
++        #define     VIDEO2_FRAME_COMPLETE_MASK			0x00002000
++    #define     VIDEO2_STREAM_ERR_READ                  0x00004000  //Bit[14] Video2 decode stream error interrupt status read back
++        #define     VIDEO2_STREAM_ERR_BIT				14
++        #define     VIDEO2_STREAM_ERR_MASK				0x00004000
++    //need check spec
++    #define     VIDEOM_INPUT_COMPLETE_READ              0x00010000  //Bit[16] VideoM video input complete interrupt status read back
++        #define     VIDEOM_INPUT_COMPLETE_BIT			16
++        #define     VIDEOM_INPUT_COMPLETE_MASK			0x00010000
++    #define     VIDEOM_COMPRESS_COMPLETE_READ           0x00020000  //Bit[17] VideoM compression complete interrupt status read back
++        #define     VIDEOM_COMPRESS_COMPLETE_BIT		17
++        #define     VIDEOM_COMPRESS_COMPLETE_MASK		0x00020000
++    #define     VIDEOM_PACKET_READY_READ                0x00040000  //Bit[18] Clear Packet ready interrupt when write 1
++        #define     VIDEOM_PACKET_READY_BIT             18
++        #define     VIDEOM_PACKET_READY_MASK            0x00040000    
++    #define     VIDEOM_FRAME_COMPLETE_READ              0x00080000  //Bit[19] Clear Frame complete interrupt when write 1
++        #define     VIDEOM_FRAME_COMPLETE_BIT           19
++        #define     VIDEOM_FRAME_COMPLETE_MASK          0x00080000
++   
++#define VIDEO_INT_CONTROL_CLEAR_REG                     0x308 + VIDEOBASE_OFFSET //Clear when write 1
++    //Clear when write 1
++    #define     VIDEO1_WATCH_DOG_CLEAR                  0x00000001  //Bit[0] Clear mode detection watch dog out of lock interrupt when write 1
++    #define     VIDEO1_INPUT_COMPLETE_CLEAR             0x00000002  //Bit[1] Clear video input complete interrupt when write 1 (frame complete only for frame mode)
++    #define     VIDEO1_PACKET_READY_CLEAR               0x00000004  //Bit[2] Clear Packet ready interrupt when write 1
++        #define     VIDEO1_PACKET_READY_CLEAR_BIT       2
++        #define     VIDEO1_PACKET_READY_CLEAR_MASK      0x00000004
++    #define     VIDEO1_COMPRESS_COMPLETE_CLEAR          0x00000008  //Bit[3] Clear video compression interrupt when write 1
++    #define     VIDEO1_MODE_DETECTION_READY_CLEAR       0x00000010  //Bit[4] Clear Video1 Mode detection ready interrupt when write 1
++    #define     VIDEO1_FRAME_COMPLETE_CLEAR             0x00000020  //Bit[5] Clear Frame complete interrupt when write 1
++        #define     VIDEO1_FRAME_COMPLETE_CLEAR_BIT     5
++        #define     VIDEO1_FRAME_COMPLETE_CLEAR_MASK    0x00000020
++    #define     VIDEO1_STREAM_ERR_CLEAR                 0x00000040  //Bit[6] Clear decode stream error interrupt when write 1
++    #define     VIDEO2_WATCH_DOG_CLEAR                  0x00000100  //Bit[8] Clear Mode detection interrupt when write 1
++    #define     VIDEO2_INPUT_COMPLETE_CLEAR             0x00000200  //Bit[9] Clear video input complete interrupt when write 1
++    #define     VIDEO2_PACKET_READY_CLEAR               0x00000400  //Bit[10] Clear packet ready interrupt when write 1
++    #define     VIDEO2_COMPRESS_COMPLETE_CLEAR          0x00000800  //Bit[11] Clear video compression complete interrupt when write 1
++    #define     VIDEO2_MODE_DETECTION_READY_CLEAR       0x00001000  //Bit[12] Clear Video2 Mode detection ready interrupt when write 1
++    #define     VIDEO2_FRAME_COMPLETE_CLEAR             0x00002000  //Bit[13] Clear Frame complete interrupt when write 1 (frame complete only for frame mode)
++    #define     VIDEO2_STREAM_ERR_CLEAR                 0x00004000  //Bit[14] Clear Decode stream error interrupt when write 1
++    //need check spec
++    #define     VIDEOM_INPUT_COMPLETE_CLEAR             0x00010000  //Bit[16] Clear video input complete interrupt when write 1
++    #define     VIDEOM_COMPRESS_COMPLETE_CLEAR          0x00020000  //Bit[17] Clear compression complete interrupt when write 1
++        #define     VIDEOM_COMPRESS_COMPLETE_CLEAR_BIT  17
++        #define     VIDEOM_COMPRESS_COMPLETE_CLEAR_MASK 0x00020000    
++	#define     VIDEOM_PACKET_READY_CLEAR				0x00040000  //Bit[18] Clear compression complete interrupt when write 1
++        #define     VIDEOM_PACKET_READY_CLEAR_BIT       18
++        #define     VIDEOM_PACKET_READY_CLEAR_MASK      0x00040000    
++    #define     VIDEOM_FRAME_COMPLETE_CLEAR             0x00100000  //Bit[20] Clear Frame complete interrupt when write 1
++        #define     VIDEOM_FRAME_COMPLETE_CLEAR_BIT     20
++        #define     VIDEOM_FRAME_COMPLETE_CLEAR_MASK    0x00100000
++    #define     VIDEOM_STREAM_ERR_CLEAR                 0x00200000  //Bit[21] Clear decode stream error interrupt when write 1
++    
++#define VIDEO_MODE_DETECTION_PARAM_REG                  0x30C + VIDEOBASE_OFFSET
++    #define     EDGE_PIXEL_THRES_BIT                    8           //Bit[15:8] Mode detection edge pixel threshold
++    #define     EDGE_PIXEL_THRES_MASK                   0x0000FF00  
++    #define     VER_STABLE_MAX_BIT                      16          //Bit[19:16] Mode detection vertical stable maximum
++    #define     VER_STABLE_MAX_BIT_MASK                 0x000F0000  
++    #define     HOR_STABLE_MAX_BIT                      20          //Bit[23:20] Mode detection horizontal stable maximum
++    #define     HOR_STABLE_MAX_BIT_MASK                 0x00F00000
++    #define     VER_STABLE_THRES_BIT                    24          //Bit[27:24] Mode detection vertical stable threshold
++    #define     VER_STABLE_THRES_BIT_MASK               0x0F000000  
++    #define     HOR_STABLE_THRES_BIT                    28          //Bit[31:28] Mode detection horizontal stable threshold
++    #define     HOR_STABLE_THRES_BIT_MASK               0xF0000000
++    
++#define VIDEO_CRC_PRIMARY_REG                           0x320 + VIDEOBASE_OFFSET
++    #define     CRC_CHECK_EN                            0x00000001  //Bit[0] Video port 1/2 Enable video capture write CRC check
++        #define     CRC_CHECK_EN_BIT                    0
++    #define     CRC_CHECK_HIGH                          0x00000002  //Bit[1] Video port 1/2 CRC check high bit only
++        #define     CRC_CHECK_HIGH_BIT                  1
++    #define     SKIP_COUNT_MAX                          0x00000004  //Bit[7:2] Video port 1/2 Max capture write skip count
++        #define     SKIP_COUNT_MAX_BIT                  2
++        #define     SKIP_COUNT_MAX_MASK                 0x000000FC
++    #define     CRC_PRIMARY_POLY_LOW                    0x00000100  //Bit[15:8] Primary CRC low 8-bit polynomial
++        #define     CRC_RIMARY_POLY_LOW_BIT             8
++        #define     CRC_RIMARY_POLY_LOW_MASK            0x0000FF00
++    #define     CRC_PRIMARY_POLY_HIGH                   0x00010000  //Bit[31:16] Primary CRC high 8-bit polynomial
++        #define     CRC_RIMARY_POLY_HIGH_BIT            16
++        #define     CRC_RIMARY_POLY_HIGH_MASK           0xFFFF0000
++        
++
++#define VIDEO_CRC_SECOND_REG                            0x324 + VIDEOBASE_OFFSET
++    #define     CRC_SECOND_POLY_LOW                     0x00000100  //Bit[15:8] Secondary CRC low 8-bit polynomial
++        #define     CRC_SECOND_POLY_LOW_BIT             8
++        #define     CRC_SECOND_POLY_LOW_MASK            0x0000FF00
++    #define     CRC_SECOND_POLY_HIGH                    0x00010000  //Bit[31:16] Secondary CRC high 8-bit polynomial
++        #define     CRC_SECOND_POLY_HIGH_BIT            16
++        #define     CRC_SECOND_POLY_HIGH_MASK           0xFFFF0000
++
++#define VIDEO1_RC4_KEYS_REG                              0x400 + VIDEOBASE_OFFSET //Total Video1 RC4 Keys     
++#define VIDEO2_RC4_KEYS_REG                              0x500 + VIDEOBASE_OFFSET //Total Video2 RC4 Keys     
++#define VIDEOM_RC4_KEYS_REG                              0x600 + VIDEOBASE_OFFSET //Total VideoM RC4 Keys     
++
++#endif /* end of _VREG_H_ */
++
+diff --git a/board/aspeed/ast2400/Makefile b/board/aspeed/ast2400/Makefile
+new file mode 100644
+index 0000000..1970ea1
+--- /dev/null
++++ b/board/aspeed/ast2400/Makefile
+@@ -0,0 +1,44 @@
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++# MA 02111-1307 USA
++#
++
++include $(TOPDIR)/config.mk
++
++LIB	= $(obj)lib$(BOARD).a
++
++COBJS   := ast2400.o flash.o flash_spi.o pci.o crc32.o slt.o regtest.o vfun.o vhace.o crt.o videotest.o mactest.o hactest.o mictest.o
++
++ifeq ($(CONFIG_FPGA_ASPEED),y)
++SOBJS   := platform_fpga.o
++else ifeq ($(CONFIG_SLT_ASPEED),y)
++SOBJS	:= platform_slt.o
++else
++SOBJS   := platform.o
++endif
++
++SRCS    := $(SOBJS:.o=.S) $(COBJS:.o=.c)
++OBJS    := $(addprefix $(obj),$(COBJS))
++SOBJS   := $(addprefix $(obj),$(SOBJS))
++
++$(LIB): $(obj).depend $(OBJS) $(SOBJS)
++	$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
++
++clean:
++	rm -f $(SOBJS) $(OBJS)
++
++distclean:	clean
++	rm -f $(LIB) core *.bak $(obj).depend
++
++# defines $(obj).depend target
++include $(SRCTREE)/rules.mk
++
++sinclude .depend
++
++#########################################################################
+diff --git a/board/aspeed/ast2400/aes.c b/board/aspeed/ast2400/aes.c
+new file mode 100755
+index 0000000..76262e7
+--- /dev/null
++++ b/board/aspeed/ast2400/aes.c
+@@ -0,0 +1,579 @@
++/*
++ *  AES implementation
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++/* uncomment the following line to run the test suite */
++
++/* #define TEST */
++
++/* uncomment the following line to use pre-computed tables */
++/* otherwise the tables will be generated at the first run */
++
++#define FIXED_TABLES
++
++#ifndef FIXED_TABLES
++
++/* forward S-box & tables */
++
++uint32 FSb[256];
++uint32 FT0[256]; 
++uint32 FT1[256]; 
++uint32 FT2[256]; 
++uint32 FT3[256]; 
++
++/* reverse S-box & tables */
++
++uint32 RSb[256];
++uint32 RT0[256];
++uint32 RT1[256];
++uint32 RT2[256];
++uint32 RT3[256];
++
++/* round constants */
++
++uint32 RCON[10];
++
++/* tables generation flag */
++
++int do_init = 1;
++
++/* tables generation routine */
++
++#define ROTR8(x) ( ( ( x << 24 ) & 0xFFFFFFFF ) | \
++                   ( ( x & 0xFFFFFFFF ) >>  8 ) )
++
++#define XTIME(x) ( ( x <<  1 ) ^ ( ( x & 0x80 ) ? 0x1B : 0x00 ) )
++#define MUL(x,y) ( ( x &&  y ) ? pow[(log[x] + log[y]) % 255] : 0 )
++
++void aes_gen_tables( void )
++{
++    int i;
++    uint8 x, y;
++    uint8 pow[256];
++    uint8 log[256];
++
++    /* compute pow and log tables over GF(2^8) */
++
++    for( i = 0, x = 1; i < 256; i++, x ^= XTIME( x ) )
++    {
++        pow[i] = x;
++        log[x] = i;
++    }
++
++    /* calculate the round constants */
++
++    for( i = 0, x = 1; i < 10; i++, x = XTIME( x ) )
++    {
++        RCON[i] = (uint32) x << 24;
++    }
++
++    /* generate the forward and reverse S-boxes */
++
++    FSb[0x00] = 0x63;
++    RSb[0x63] = 0x00;
++
++    for( i = 1; i < 256; i++ )
++    {
++        x = pow[255 - log[i]];
++
++        y = x;  y = ( y << 1 ) | ( y >> 7 );
++        x ^= y; y = ( y << 1 ) | ( y >> 7 );
++        x ^= y; y = ( y << 1 ) | ( y >> 7 );
++        x ^= y; y = ( y << 1 ) | ( y >> 7 );
++        x ^= y ^ 0x63;
++
++        FSb[i] = x;
++        RSb[x] = i;
++    }
++
++    /* generate the forward and reverse tables */
++
++    for( i = 0; i < 256; i++ )
++    {
++        x = (unsigned char) FSb[i]; y = XTIME( x );
++
++        FT0[i] =   (uint32) ( x ^ y ) ^
++                 ( (uint32) x <<  8 ) ^
++                 ( (uint32) x << 16 ) ^
++                 ( (uint32) y << 24 );
++
++        FT0[i] &= 0xFFFFFFFF;
++
++        FT1[i] = ROTR8( FT0[i] );
++        FT2[i] = ROTR8( FT1[i] );
++        FT3[i] = ROTR8( FT2[i] );
++
++        y = (unsigned char) RSb[i];
++
++        RT0[i] = ( (uint32) MUL( 0x0B, y )       ) ^
++                 ( (uint32) MUL( 0x0D, y ) <<  8 ) ^
++                 ( (uint32) MUL( 0x09, y ) << 16 ) ^
++                 ( (uint32) MUL( 0x0E, y ) << 24 );
++
++        RT0[i] &= 0xFFFFFFFF;
++
++        RT1[i] = ROTR8( RT0[i] );
++        RT2[i] = ROTR8( RT1[i] );
++        RT3[i] = ROTR8( RT2[i] );
++    }
++}
++
++#else
++
++/* forward S-box */
++
++static const uint32 FSb[256] =
++{
++    0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5,
++    0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
++    0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0,
++    0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
++    0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC,
++    0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
++    0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A,
++    0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
++    0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0,
++    0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
++    0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B,
++    0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
++    0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85,
++    0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
++    0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5,
++    0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
++    0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17,
++    0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
++    0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88,
++    0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
++    0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C,
++    0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
++    0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9,
++    0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
++    0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6,
++    0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
++    0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E,
++    0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
++    0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94,
++    0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
++    0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68,
++    0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
++};
++
++/* forward tables */
++
++#define FT \
++\
++    V(C6,63,63,A5), V(F8,7C,7C,84), V(EE,77,77,99), V(F6,7B,7B,8D), \
++    V(FF,F2,F2,0D), V(D6,6B,6B,BD), V(DE,6F,6F,B1), V(91,C5,C5,54), \
++    V(60,30,30,50), V(02,01,01,03), V(CE,67,67,A9), V(56,2B,2B,7D), \
++    V(E7,FE,FE,19), V(B5,D7,D7,62), V(4D,AB,AB,E6), V(EC,76,76,9A), \
++    V(8F,CA,CA,45), V(1F,82,82,9D), V(89,C9,C9,40), V(FA,7D,7D,87), \
++    V(EF,FA,FA,15), V(B2,59,59,EB), V(8E,47,47,C9), V(FB,F0,F0,0B), \
++    V(41,AD,AD,EC), V(B3,D4,D4,67), V(5F,A2,A2,FD), V(45,AF,AF,EA), \
++    V(23,9C,9C,BF), V(53,A4,A4,F7), V(E4,72,72,96), V(9B,C0,C0,5B), \
++    V(75,B7,B7,C2), V(E1,FD,FD,1C), V(3D,93,93,AE), V(4C,26,26,6A), \
++    V(6C,36,36,5A), V(7E,3F,3F,41), V(F5,F7,F7,02), V(83,CC,CC,4F), \
++    V(68,34,34,5C), V(51,A5,A5,F4), V(D1,E5,E5,34), V(F9,F1,F1,08), \
++    V(E2,71,71,93), V(AB,D8,D8,73), V(62,31,31,53), V(2A,15,15,3F), \
++    V(08,04,04,0C), V(95,C7,C7,52), V(46,23,23,65), V(9D,C3,C3,5E), \
++    V(30,18,18,28), V(37,96,96,A1), V(0A,05,05,0F), V(2F,9A,9A,B5), \
++    V(0E,07,07,09), V(24,12,12,36), V(1B,80,80,9B), V(DF,E2,E2,3D), \
++    V(CD,EB,EB,26), V(4E,27,27,69), V(7F,B2,B2,CD), V(EA,75,75,9F), \
++    V(12,09,09,1B), V(1D,83,83,9E), V(58,2C,2C,74), V(34,1A,1A,2E), \
++    V(36,1B,1B,2D), V(DC,6E,6E,B2), V(B4,5A,5A,EE), V(5B,A0,A0,FB), \
++    V(A4,52,52,F6), V(76,3B,3B,4D), V(B7,D6,D6,61), V(7D,B3,B3,CE), \
++    V(52,29,29,7B), V(DD,E3,E3,3E), V(5E,2F,2F,71), V(13,84,84,97), \
++    V(A6,53,53,F5), V(B9,D1,D1,68), V(00,00,00,00), V(C1,ED,ED,2C), \
++    V(40,20,20,60), V(E3,FC,FC,1F), V(79,B1,B1,C8), V(B6,5B,5B,ED), \
++    V(D4,6A,6A,BE), V(8D,CB,CB,46), V(67,BE,BE,D9), V(72,39,39,4B), \
++    V(94,4A,4A,DE), V(98,4C,4C,D4), V(B0,58,58,E8), V(85,CF,CF,4A), \
++    V(BB,D0,D0,6B), V(C5,EF,EF,2A), V(4F,AA,AA,E5), V(ED,FB,FB,16), \
++    V(86,43,43,C5), V(9A,4D,4D,D7), V(66,33,33,55), V(11,85,85,94), \
++    V(8A,45,45,CF), V(E9,F9,F9,10), V(04,02,02,06), V(FE,7F,7F,81), \
++    V(A0,50,50,F0), V(78,3C,3C,44), V(25,9F,9F,BA), V(4B,A8,A8,E3), \
++    V(A2,51,51,F3), V(5D,A3,A3,FE), V(80,40,40,C0), V(05,8F,8F,8A), \
++    V(3F,92,92,AD), V(21,9D,9D,BC), V(70,38,38,48), V(F1,F5,F5,04), \
++    V(63,BC,BC,DF), V(77,B6,B6,C1), V(AF,DA,DA,75), V(42,21,21,63), \
++    V(20,10,10,30), V(E5,FF,FF,1A), V(FD,F3,F3,0E), V(BF,D2,D2,6D), \
++    V(81,CD,CD,4C), V(18,0C,0C,14), V(26,13,13,35), V(C3,EC,EC,2F), \
++    V(BE,5F,5F,E1), V(35,97,97,A2), V(88,44,44,CC), V(2E,17,17,39), \
++    V(93,C4,C4,57), V(55,A7,A7,F2), V(FC,7E,7E,82), V(7A,3D,3D,47), \
++    V(C8,64,64,AC), V(BA,5D,5D,E7), V(32,19,19,2B), V(E6,73,73,95), \
++    V(C0,60,60,A0), V(19,81,81,98), V(9E,4F,4F,D1), V(A3,DC,DC,7F), \
++    V(44,22,22,66), V(54,2A,2A,7E), V(3B,90,90,AB), V(0B,88,88,83), \
++    V(8C,46,46,CA), V(C7,EE,EE,29), V(6B,B8,B8,D3), V(28,14,14,3C), \
++    V(A7,DE,DE,79), V(BC,5E,5E,E2), V(16,0B,0B,1D), V(AD,DB,DB,76), \
++    V(DB,E0,E0,3B), V(64,32,32,56), V(74,3A,3A,4E), V(14,0A,0A,1E), \
++    V(92,49,49,DB), V(0C,06,06,0A), V(48,24,24,6C), V(B8,5C,5C,E4), \
++    V(9F,C2,C2,5D), V(BD,D3,D3,6E), V(43,AC,AC,EF), V(C4,62,62,A6), \
++    V(39,91,91,A8), V(31,95,95,A4), V(D3,E4,E4,37), V(F2,79,79,8B), \
++    V(D5,E7,E7,32), V(8B,C8,C8,43), V(6E,37,37,59), V(DA,6D,6D,B7), \
++    V(01,8D,8D,8C), V(B1,D5,D5,64), V(9C,4E,4E,D2), V(49,A9,A9,E0), \
++    V(D8,6C,6C,B4), V(AC,56,56,FA), V(F3,F4,F4,07), V(CF,EA,EA,25), \
++    V(CA,65,65,AF), V(F4,7A,7A,8E), V(47,AE,AE,E9), V(10,08,08,18), \
++    V(6F,BA,BA,D5), V(F0,78,78,88), V(4A,25,25,6F), V(5C,2E,2E,72), \
++    V(38,1C,1C,24), V(57,A6,A6,F1), V(73,B4,B4,C7), V(97,C6,C6,51), \
++    V(CB,E8,E8,23), V(A1,DD,DD,7C), V(E8,74,74,9C), V(3E,1F,1F,21), \
++    V(96,4B,4B,DD), V(61,BD,BD,DC), V(0D,8B,8B,86), V(0F,8A,8A,85), \
++    V(E0,70,70,90), V(7C,3E,3E,42), V(71,B5,B5,C4), V(CC,66,66,AA), \
++    V(90,48,48,D8), V(06,03,03,05), V(F7,F6,F6,01), V(1C,0E,0E,12), \
++    V(C2,61,61,A3), V(6A,35,35,5F), V(AE,57,57,F9), V(69,B9,B9,D0), \
++    V(17,86,86,91), V(99,C1,C1,58), V(3A,1D,1D,27), V(27,9E,9E,B9), \
++    V(D9,E1,E1,38), V(EB,F8,F8,13), V(2B,98,98,B3), V(22,11,11,33), \
++    V(D2,69,69,BB), V(A9,D9,D9,70), V(07,8E,8E,89), V(33,94,94,A7), \
++    V(2D,9B,9B,B6), V(3C,1E,1E,22), V(15,87,87,92), V(C9,E9,E9,20), \
++    V(87,CE,CE,49), V(AA,55,55,FF), V(50,28,28,78), V(A5,DF,DF,7A), \
++    V(03,8C,8C,8F), V(59,A1,A1,F8), V(09,89,89,80), V(1A,0D,0D,17), \
++    V(65,BF,BF,DA), V(D7,E6,E6,31), V(84,42,42,C6), V(D0,68,68,B8), \
++    V(82,41,41,C3), V(29,99,99,B0), V(5A,2D,2D,77), V(1E,0F,0F,11), \
++    V(7B,B0,B0,CB), V(A8,54,54,FC), V(6D,BB,BB,D6), V(2C,16,16,3A)
++
++#define V(a,b,c,d) 0x##a##b##c##d
++static const uint32 FT0[256] = { FT };
++#undef V
++
++#define V(a,b,c,d) 0x##d##a##b##c
++static const uint32 FT1[256] = { FT };
++#undef V
++
++#define V(a,b,c,d) 0x##c##d##a##b
++static const uint32 FT2[256] = { FT };
++#undef V
++
++#define V(a,b,c,d) 0x##b##c##d##a
++static const uint32 FT3[256] = { FT };
++#undef V
++
++#undef FT
++
++/* reverse S-box */
++
++static const uint32 RSb[256] =
++{
++    0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38,
++    0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
++    0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87,
++    0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
++    0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D,
++    0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
++    0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2,
++    0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
++    0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16,
++    0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
++    0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA,
++    0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
++    0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A,
++    0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
++    0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02,
++    0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
++    0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA,
++    0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
++    0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85,
++    0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
++    0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89,
++    0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
++    0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20,
++    0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
++    0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31,
++    0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
++    0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D,
++    0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
++    0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0,
++    0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
++    0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26,
++    0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
++};
++
++/* reverse tables */
++
++#define RT \
++\
++    V(51,F4,A7,50), V(7E,41,65,53), V(1A,17,A4,C3), V(3A,27,5E,96), \
++    V(3B,AB,6B,CB), V(1F,9D,45,F1), V(AC,FA,58,AB), V(4B,E3,03,93), \
++    V(20,30,FA,55), V(AD,76,6D,F6), V(88,CC,76,91), V(F5,02,4C,25), \
++    V(4F,E5,D7,FC), V(C5,2A,CB,D7), V(26,35,44,80), V(B5,62,A3,8F), \
++    V(DE,B1,5A,49), V(25,BA,1B,67), V(45,EA,0E,98), V(5D,FE,C0,E1), \
++    V(C3,2F,75,02), V(81,4C,F0,12), V(8D,46,97,A3), V(6B,D3,F9,C6), \
++    V(03,8F,5F,E7), V(15,92,9C,95), V(BF,6D,7A,EB), V(95,52,59,DA), \
++    V(D4,BE,83,2D), V(58,74,21,D3), V(49,E0,69,29), V(8E,C9,C8,44), \
++    V(75,C2,89,6A), V(F4,8E,79,78), V(99,58,3E,6B), V(27,B9,71,DD), \
++    V(BE,E1,4F,B6), V(F0,88,AD,17), V(C9,20,AC,66), V(7D,CE,3A,B4), \
++    V(63,DF,4A,18), V(E5,1A,31,82), V(97,51,33,60), V(62,53,7F,45), \
++    V(B1,64,77,E0), V(BB,6B,AE,84), V(FE,81,A0,1C), V(F9,08,2B,94), \
++    V(70,48,68,58), V(8F,45,FD,19), V(94,DE,6C,87), V(52,7B,F8,B7), \
++    V(AB,73,D3,23), V(72,4B,02,E2), V(E3,1F,8F,57), V(66,55,AB,2A), \
++    V(B2,EB,28,07), V(2F,B5,C2,03), V(86,C5,7B,9A), V(D3,37,08,A5), \
++    V(30,28,87,F2), V(23,BF,A5,B2), V(02,03,6A,BA), V(ED,16,82,5C), \
++    V(8A,CF,1C,2B), V(A7,79,B4,92), V(F3,07,F2,F0), V(4E,69,E2,A1), \
++    V(65,DA,F4,CD), V(06,05,BE,D5), V(D1,34,62,1F), V(C4,A6,FE,8A), \
++    V(34,2E,53,9D), V(A2,F3,55,A0), V(05,8A,E1,32), V(A4,F6,EB,75), \
++    V(0B,83,EC,39), V(40,60,EF,AA), V(5E,71,9F,06), V(BD,6E,10,51), \
++    V(3E,21,8A,F9), V(96,DD,06,3D), V(DD,3E,05,AE), V(4D,E6,BD,46), \
++    V(91,54,8D,B5), V(71,C4,5D,05), V(04,06,D4,6F), V(60,50,15,FF), \
++    V(19,98,FB,24), V(D6,BD,E9,97), V(89,40,43,CC), V(67,D9,9E,77), \
++    V(B0,E8,42,BD), V(07,89,8B,88), V(E7,19,5B,38), V(79,C8,EE,DB), \
++    V(A1,7C,0A,47), V(7C,42,0F,E9), V(F8,84,1E,C9), V(00,00,00,00), \
++    V(09,80,86,83), V(32,2B,ED,48), V(1E,11,70,AC), V(6C,5A,72,4E), \
++    V(FD,0E,FF,FB), V(0F,85,38,56), V(3D,AE,D5,1E), V(36,2D,39,27), \
++    V(0A,0F,D9,64), V(68,5C,A6,21), V(9B,5B,54,D1), V(24,36,2E,3A), \
++    V(0C,0A,67,B1), V(93,57,E7,0F), V(B4,EE,96,D2), V(1B,9B,91,9E), \
++    V(80,C0,C5,4F), V(61,DC,20,A2), V(5A,77,4B,69), V(1C,12,1A,16), \
++    V(E2,93,BA,0A), V(C0,A0,2A,E5), V(3C,22,E0,43), V(12,1B,17,1D), \
++    V(0E,09,0D,0B), V(F2,8B,C7,AD), V(2D,B6,A8,B9), V(14,1E,A9,C8), \
++    V(57,F1,19,85), V(AF,75,07,4C), V(EE,99,DD,BB), V(A3,7F,60,FD), \
++    V(F7,01,26,9F), V(5C,72,F5,BC), V(44,66,3B,C5), V(5B,FB,7E,34), \
++    V(8B,43,29,76), V(CB,23,C6,DC), V(B6,ED,FC,68), V(B8,E4,F1,63), \
++    V(D7,31,DC,CA), V(42,63,85,10), V(13,97,22,40), V(84,C6,11,20), \
++    V(85,4A,24,7D), V(D2,BB,3D,F8), V(AE,F9,32,11), V(C7,29,A1,6D), \
++    V(1D,9E,2F,4B), V(DC,B2,30,F3), V(0D,86,52,EC), V(77,C1,E3,D0), \
++    V(2B,B3,16,6C), V(A9,70,B9,99), V(11,94,48,FA), V(47,E9,64,22), \
++    V(A8,FC,8C,C4), V(A0,F0,3F,1A), V(56,7D,2C,D8), V(22,33,90,EF), \
++    V(87,49,4E,C7), V(D9,38,D1,C1), V(8C,CA,A2,FE), V(98,D4,0B,36), \
++    V(A6,F5,81,CF), V(A5,7A,DE,28), V(DA,B7,8E,26), V(3F,AD,BF,A4), \
++    V(2C,3A,9D,E4), V(50,78,92,0D), V(6A,5F,CC,9B), V(54,7E,46,62), \
++    V(F6,8D,13,C2), V(90,D8,B8,E8), V(2E,39,F7,5E), V(82,C3,AF,F5), \
++    V(9F,5D,80,BE), V(69,D0,93,7C), V(6F,D5,2D,A9), V(CF,25,12,B3), \
++    V(C8,AC,99,3B), V(10,18,7D,A7), V(E8,9C,63,6E), V(DB,3B,BB,7B), \
++    V(CD,26,78,09), V(6E,59,18,F4), V(EC,9A,B7,01), V(83,4F,9A,A8), \
++    V(E6,95,6E,65), V(AA,FF,E6,7E), V(21,BC,CF,08), V(EF,15,E8,E6), \
++    V(BA,E7,9B,D9), V(4A,6F,36,CE), V(EA,9F,09,D4), V(29,B0,7C,D6), \
++    V(31,A4,B2,AF), V(2A,3F,23,31), V(C6,A5,94,30), V(35,A2,66,C0), \
++    V(74,4E,BC,37), V(FC,82,CA,A6), V(E0,90,D0,B0), V(33,A7,D8,15), \
++    V(F1,04,98,4A), V(41,EC,DA,F7), V(7F,CD,50,0E), V(17,91,F6,2F), \
++    V(76,4D,D6,8D), V(43,EF,B0,4D), V(CC,AA,4D,54), V(E4,96,04,DF), \
++    V(9E,D1,B5,E3), V(4C,6A,88,1B), V(C1,2C,1F,B8), V(46,65,51,7F), \
++    V(9D,5E,EA,04), V(01,8C,35,5D), V(FA,87,74,73), V(FB,0B,41,2E), \
++    V(B3,67,1D,5A), V(92,DB,D2,52), V(E9,10,56,33), V(6D,D6,47,13), \
++    V(9A,D7,61,8C), V(37,A1,0C,7A), V(59,F8,14,8E), V(EB,13,3C,89), \
++    V(CE,A9,27,EE), V(B7,61,C9,35), V(E1,1C,E5,ED), V(7A,47,B1,3C), \
++    V(9C,D2,DF,59), V(55,F2,73,3F), V(18,14,CE,79), V(73,C7,37,BF), \
++    V(53,F7,CD,EA), V(5F,FD,AA,5B), V(DF,3D,6F,14), V(78,44,DB,86), \
++    V(CA,AF,F3,81), V(B9,68,C4,3E), V(38,24,34,2C), V(C2,A3,40,5F), \
++    V(16,1D,C3,72), V(BC,E2,25,0C), V(28,3C,49,8B), V(FF,0D,95,41), \
++    V(39,A8,01,71), V(08,0C,B3,DE), V(D8,B4,E4,9C), V(64,56,C1,90), \
++    V(7B,CB,84,61), V(D5,32,B6,70), V(48,6C,5C,74), V(D0,B8,57,42)
++
++#define V(a,b,c,d) 0x##a##b##c##d
++static const uint32 RT0[256] = { RT };
++#undef V
++
++#define V(a,b,c,d) 0x##d##a##b##c
++static const uint32 RT1[256] = { RT };
++#undef V
++
++#define V(a,b,c,d) 0x##c##d##a##b
++static const uint32 RT2[256] = { RT };
++#undef V
++
++#define V(a,b,c,d) 0x##b##c##d##a
++static const uint32 RT3[256] = { RT };
++#undef V
++
++#undef RT
++
++/* round constants */
++
++static const uint32 RCON[10] =
++{
++    0x01000000, 0x02000000, 0x04000000, 0x08000000,
++    0x10000000, 0x20000000, 0x40000000, 0x80000000,
++    0x1B000000, 0x36000000
++};
++
++int do_init = 0;
++
++void aes_gen_tables( void )
++{
++}
++
++#endif
++
++/* platform-independant 32-bit integer manipulation macros */
++
++#define GET_UINT32_aes(n,b,i)                       \
++{                                               \
++    (n) = ( (uint32) (b)[(i)    ] << 24 )       \
++        | ( (uint32) (b)[(i) + 1] << 16 )       \
++        | ( (uint32) (b)[(i) + 2] <<  8 )       \
++        | ( (uint32) (b)[(i) + 3]       );      \
++}
++
++#define PUT_UINT32_aes(n,b,i)                       \
++{                                               \
++    (b)[(i)    ] = (uint8) ( (n) >> 24 );       \
++    (b)[(i) + 1] = (uint8) ( (n) >> 16 );       \
++    (b)[(i) + 2] = (uint8) ( (n) >>  8 );       \
++    (b)[(i) + 3] = (uint8) ( (n)       );       \
++}
++
++/* decryption key schedule tables */
++
++int KT_init = 1;
++
++uint32 KT0[256];
++uint32 KT1[256];
++uint32 KT2[256];
++uint32 KT3[256];
++
++/* AES key scheduling routine */
++int aes_set_key( aes_context *ctx, uint8 *key, int nbits )
++{
++    int i;
++    uint32 *RK, *SK;
++
++    if( do_init )
++    {
++        aes_gen_tables();
++
++        do_init = 0;
++    }
++
++    switch( nbits )
++    {
++        case 128: ctx->nr = 10; break;
++        case 192: ctx->nr = 12; break;
++        case 256: ctx->nr = 14; break;
++        default : return( 1 );
++    }
++
++    RK = ctx->erk;
++
++    for( i = 0; i < (nbits >> 5); i++ )
++    {
++        GET_UINT32_aes( RK[i], key, i * 4 );
++    }
++
++    /* setup encryption round keys */
++
++    switch( nbits )
++    {
++    case 128:
++
++        for( i = 0; i < 10; i++, RK += 4 )
++        {
++            RK[4]  = RK[0] ^ RCON[i] ^
++                        ( FSb[ (uint8) ( RK[3] >> 16 ) ] << 24 ) ^
++                        ( FSb[ (uint8) ( RK[3] >>  8 ) ] << 16 ) ^
++                        ( FSb[ (uint8) ( RK[3]       ) ] <<  8 ) ^
++                        ( FSb[ (uint8) ( RK[3] >> 24 ) ]       );
++
++            RK[5]  = RK[1] ^ RK[4];
++            RK[6]  = RK[2] ^ RK[5];
++            RK[7]  = RK[3] ^ RK[6];
++        }
++        break;
++
++    case 192:
++
++        for( i = 0; i < 8; i++, RK += 6 )
++        {
++            RK[6]  = RK[0] ^ RCON[i] ^
++                        ( FSb[ (uint8) ( RK[5] >> 16 ) ] << 24 ) ^
++                        ( FSb[ (uint8) ( RK[5] >>  8 ) ] << 16 ) ^
++                        ( FSb[ (uint8) ( RK[5]       ) ] <<  8 ) ^
++                        ( FSb[ (uint8) ( RK[5] >> 24 ) ]       );
++
++            RK[7]  = RK[1] ^ RK[6];
++            RK[8]  = RK[2] ^ RK[7];
++            RK[9]  = RK[3] ^ RK[8];
++            RK[10] = RK[4] ^ RK[9];
++            RK[11] = RK[5] ^ RK[10];
++        }
++        break;
++
++    case 256:
++
++        for( i = 0; i < 7; i++, RK += 8 )
++        {
++            RK[8]  = RK[0] ^ RCON[i] ^
++                        ( FSb[ (uint8) ( RK[7] >> 16 ) ] << 24 ) ^
++                        ( FSb[ (uint8) ( RK[7] >>  8 ) ] << 16 ) ^
++                        ( FSb[ (uint8) ( RK[7]       ) ] <<  8 ) ^
++                        ( FSb[ (uint8) ( RK[7] >> 24 ) ]       );
++
++            RK[9]  = RK[1] ^ RK[8];
++            RK[10] = RK[2] ^ RK[9];
++            RK[11] = RK[3] ^ RK[10];
++
++            RK[12] = RK[4] ^
++                        ( FSb[ (uint8) ( RK[11] >> 24 ) ] << 24 ) ^
++                        ( FSb[ (uint8) ( RK[11] >> 16 ) ] << 16 ) ^
++                        ( FSb[ (uint8) ( RK[11] >>  8 ) ] <<  8 ) ^
++                        ( FSb[ (uint8) ( RK[11]       ) ]       );
++
++            RK[13] = RK[5] ^ RK[12];
++            RK[14] = RK[6] ^ RK[13];
++            RK[15] = RK[7] ^ RK[14];
++        }
++        break;
++    }
++
++    /* setup decryption round keys */
++
++    if( KT_init )
++    {
++        for( i = 0; i < 256; i++ )
++        {
++            KT0[i] = RT0[ FSb[i] ];
++            KT1[i] = RT1[ FSb[i] ];
++            KT2[i] = RT2[ FSb[i] ];
++            KT3[i] = RT3[ FSb[i] ];
++        }
++
++        KT_init = 0;
++    }
++
++    SK = ctx->drk;
++
++    *SK++ = *RK++;
++    *SK++ = *RK++;
++    *SK++ = *RK++;
++    *SK++ = *RK++;
++
++    for( i = 1; i < ctx->nr; i++ )
++    {
++        RK -= 8;
++
++        *SK++ = KT0[ (uint8) ( *RK >> 24 ) ] ^
++                KT1[ (uint8) ( *RK >> 16 ) ] ^
++                KT2[ (uint8) ( *RK >>  8 ) ] ^
++                KT3[ (uint8) ( *RK       ) ]; RK++;
++
++        *SK++ = KT0[ (uint8) ( *RK >> 24 ) ] ^
++                KT1[ (uint8) ( *RK >> 16 ) ] ^
++                KT2[ (uint8) ( *RK >>  8 ) ] ^
++                KT3[ (uint8) ( *RK       ) ]; RK++;
++
++        *SK++ = KT0[ (uint8) ( *RK >> 24 ) ] ^
++                KT1[ (uint8) ( *RK >> 16 ) ] ^
++                KT2[ (uint8) ( *RK >>  8 ) ] ^
++                KT3[ (uint8) ( *RK       ) ]; RK++;
++
++        *SK++ = KT0[ (uint8) ( *RK >> 24 ) ] ^
++                KT1[ (uint8) ( *RK >> 16 ) ] ^
++                KT2[ (uint8) ( *RK >>  8 ) ] ^
++                KT3[ (uint8) ( *RK       ) ]; RK++;
++    }
++
++    RK -= 8;
++
++    *SK++ = *RK++;
++    *SK++ = *RK++;
++    *SK++ = *RK++;
++    *SK++ = *RK++;
++
++    return( 0 );
++}
+diff --git a/board/aspeed/ast2400/ast2400.c b/board/aspeed/ast2400/ast2400.c
+new file mode 100644
+index 0000000..65bccbe
+--- /dev/null
++++ b/board/aspeed/ast2400/ast2400.c
+@@ -0,0 +1,304 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++#include <common.h>
++#include <command.h>
++#include <pci.h>
++
++int board_init (void)
++{
++    DECLARE_GLOBAL_DATA_PTR;
++	unsigned char data;
++	unsigned long gpio;
++	unsigned long reg;
++
++    /* AHB Controller */
++    *((volatile ulong*) 0x1E600000)  = 0xAEED1A03;	/* unlock AHB controller */
++    *((volatile ulong*) 0x1E60008C) |= 0x01;		/* map DRAM to 0x00000000 */
++
++    /* Flash Controller */
++#ifdef	CONFIG_FLASH_AST2300
++    *((volatile ulong*) 0x1e620000) |= 0x800f0000;	/* enable Flash Write */
++#else
++    *((volatile ulong*) 0x16000000) |= 0x00001c00;	/* enable Flash Write */
++#endif
++
++    /* SCU */
++    *((volatile ulong*) 0x1e6e2000) = 0x1688A8A8;	/* unlock SCU */
++	reg = *((volatile ulong*) 0x1e6e2008);
++	reg &= 0x1c0fffff;
++	reg |= 0x61800000;				/* PCLK  = HPLL/8 */
++#ifdef CONFIG_AST1070
++	//check lpc or lpc+ mode
++////////////////////////////////////////////////////////////////////////
++	gpio = *((volatile ulong*) 0x1e780070);		/* mode check */
++	if(gpio & 0x2)
++		reg |= 0x100000;				/* LHCLK = HPLL/4 */
++	else
++		reg |= 0x300000;				/* LHCLK = HPLL/8 */
++
++	reg |= 0x80000; 				/* enable LPC Host Clock */
++
++    *((volatile ulong*) 0x1e6e2008) = reg;
++
++	reg = *((volatile ulong*) 0x1e6e200c);		/* enable LPC clock */
++	*((volatile ulong*) 0x1e6e200c) &= ~(1 << 28);
++
++	if(gpio & 0x2) {
++
++		//use LPC+ for sys clk
++		// set OSCCLK = VPLL1
++		*((volatile ulong*) 0x1e6e2010) = 0x18;
++
++		// enable OSCCLK
++		reg = *((volatile ulong*) 0x1e6e202c);
++		reg |= 0x00000002;
++		*((volatile ulong*) 0x1e6e202c) = reg;
++	} else {
++		// USE LPC use D2 clk
++		/*set VPPL1 */
++	    *((volatile ulong*) 0x1e6e201c) = 0x6420;
++
++		// set d2-pll & enable d2-pll D[21:20], D[4]
++	    reg = *((volatile ulong*) 0x1e6e202c);
++	    reg &= 0xffcfffef;
++	    reg |= 0x00200010;
++	    *((volatile ulong*) 0x1e6e202c) = reg;
++
++		// set OSCCLK = VPLL1
++	    *((volatile ulong*) 0x1e6e2010) = 0x8;
++
++		// enable OSCCLK
++	    reg = *((volatile ulong*) 0x1e6e202c);
++	    reg &= 0xfffffffd;
++	    reg |= 0x00000002;
++	    *((volatile ulong*) 0x1e6e202c) = reg;
++	}
++#else
++	*((volatile ulong*) 0x1e6e2008) = reg;
++#endif
++    reg = *((volatile ulong*) 0x1e6e200c);		/* enable 2D Clk */
++    *((volatile ulong*) 0x1e6e200c) &= 0xFFFFFFFD;
++/* enable wide screen. If your video driver does not support wide screen, don't
++enable this bit 0x1e6e2040 D[0]*/
++    reg = *((volatile ulong*) 0x1e6e2040);
++    *((volatile ulong*) 0x1e6e2040) |= 0x01;
++
++    /* arch number */
++    gd->bd->bi_arch_number = MACH_TYPE_ASPEED;
++
++    /* adress of boot parameters */
++    gd->bd->bi_boot_params = 0x40000100;
++
++    return 0;
++}
++
++int dram_init (void)
++{
++    DECLARE_GLOBAL_DATA_PTR;
++
++    gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
++    gd->bd->bi_dram[0].size  = PHYS_SDRAM_1_SIZE;
++
++    return 0;
++}
++
++/*
++SCU7C: Silicon Revision ID Register
++D[31:24]: Chip ID
++0: AST2050/AST2100/AST2150/AST2200/AST3000
++1: AST2300
++
++D[23:16] Silicon revision ID for AST2300 generation and later
++0: A0
++1: A1
++2: A2
++.
++.
++.
++FPGA revision starts from 0x80
++
++
++D[11:8] Bounding option
++
++D[7:0] Silicon revision ID for AST2050/AST2100 generation (for software compatible)
++0: A0
++1: A1
++2: A2
++3: A3
++.
++.
++FPGA revision starts from 0x08, 8~10 means A0, 11+ means A1, AST2300 should be assigned to 3
++*/
++int wait_calibration_done()
++{
++	DECLARE_GLOBAL_DATA_PTR;
++	unsigned char data;
++	unsigned long reg, count = 0;
++
++	do {
++		udelay(1000);
++		count++;
++		if (count >= 1000) {
++
++			return 1;
++		}
++	} while ((*(volatile ulong*) 0x1e6ec000) & 0xf00);
++
++//	printf ("count = %d\n", count);
++
++	return 0;
++}
++
++/* AST1070 Calibration
++Program 0x101 to 0x1e6ec000
++Wait till 1e6ec000 [8] = 0
++Check 0x1e6ec004 = 0x5a5a5a5a
++*/
++int ast1070_calibration()
++{
++	DECLARE_GLOBAL_DATA_PTR;
++	unsigned char data;
++	unsigned long reg, i, j;
++
++	//only for 2 chip
++	for (i = 0; i < 2; i++) {
++		for (j = 0; j < 4; j++) {
++//			printf ("chip = %d, delay = %d\n", i, j);
++			*((volatile ulong*) 0x1e6ec000) = (j << (12 + i * 2)) + (1 << (8 + i)) + 0x01;
++//			printf ("1e6ec000 = %x\n", *(volatile ulong*)0x1e6ec000);
++			if (!wait_calibration_done()) {
++				if ((*(volatile ulong*) 0x1e6ec004) == 0x5a5a5a5a) {
++//					printf ("calibration result: chip %d pass, timing = %d\n", i, j);
++					break;
++				}
++				else {
++//					printf ("calibration result: chip %d fail, timing = %d\n", i, j);
++				}
++			}
++		}
++	}
++
++	return 0;
++}
++
++int misc_init_r(void)
++{
++    unsigned int reg, reg1, revision, chip_id, lpc_plus;
++
++#ifdef CONFIG_AST1070
++	//Reset AST1070 and AST2400 engine [bit 23:15]
++	reg = *((volatile ulong*) 0x1e7890a0);
++	reg &= ~0x808000;
++	*((volatile ulong*) 0x1e7890a0) = reg;
++
++	udelay(5000);
++
++	lpc_plus = (*((volatile ulong*) 0x1e780070)) & 0x2;
++
++	reg = *((volatile ulong*) 0x1e7890a0);
++	reg |= 0x800000;
++	*((volatile ulong*) 0x1e7890a0) = reg;
++
++	udelay(1000);
++
++	reg = *((volatile ulong*) 0x1e7890a0);
++	reg |= 0x008000;
++	*((volatile ulong*) 0x1e7890a0) = reg;
++
++
++	if(lpc_plus) {
++		*((volatile ulong*) 0x1E60008C) |= 0x011;		/* map DRAM to 0x00000000 and LPC+ 0x70000000*/
++
++		//SCU multi-Function pin
++		reg = *((volatile ulong*) 0x1e6e2090);
++		reg |= (1 << 30);
++		*((volatile ulong*) 0x1e6e2090) = reg;
++		//LPC+ Engine Enable
++		reg = *((volatile ulong*) 0x1e6ec000);
++		reg |= 1;
++		*((volatile ulong*) 0x1e6ec000) = reg;
++
++		ast1070_calibration();
++
++	} else {
++		// enable AST1050's LPC master
++		reg = *((volatile ulong*) 0x1e7890a0);
++		*((volatile ulong*) 0x1e7890a0) |= 0x11;
++
++	}
++
++#endif
++    /* Show H/W Version */
++    reg1 = (unsigned int) (*((ulong*) 0x1e6e207c));
++    chip_id = (reg1 & 0xff000000) >> 24;
++    revision = (reg1 & 0xff0000) >> 16;
++
++    puts ("H/W:   ");
++    if (chip_id == 1) {
++    	if (revision >= 0x80) {
++    		printf("AST2300 series FPGA Rev. %02x \n", revision);
++    	}
++    	else {
++    		printf("AST2300 series chip Rev. %02x \n", revision);
++    	}
++    }
++    else if (chip_id == 2) {
++    	printf("AST2400 series chip Rev. %02x \n", revision);
++    }
++    else if (chip_id == 0) {
++		printf("AST2050/AST2150 series chip\n");
++    }
++
++#ifdef CONFIG_AST1070
++	if(lpc_plus) {
++		puts ("C/C:   LPC+ :");
++		revision = (unsigned int) (*((ulong*) 0x70002034));
++		printf("AST1070 ID [%08x] ", revision);
++
++		if((*((volatile ulong*) 0x1e780070)) & 0x4) {
++			if((unsigned int) (*((ulong*) 0x70012034)) == 0x10700001)
++				printf(", 2nd : AST1070 ID [%08x] \n", (unsigned int) (*((ulong*) 0x70012034)));
++			else
++				printf("\n");
++		} else {
++			printf("\n");
++		}
++	} else {
++		puts ("C/C:   LPC  :");
++		revision = (unsigned int) (*((ulong*) 0x60002034));
++		printf("LPC : AST1070 ID [%08x] \n", revision);
++
++	}
++#endif
++
++#ifdef	CONFIG_PCI
++    pci_init ();
++#endif
++
++    if (getenv ("verify") == NULL) {
++	setenv ("verify", "n");
++    }
++    if (getenv ("eeprom") == NULL) {
++	setenv ("eeprom", "y");
++    }
++}
++
++#ifdef	CONFIG_PCI
++static struct pci_controller hose;
++
++extern void aspeed_init_pci (struct pci_controller *hose);
++
++void pci_init_board(void)
++{
++    aspeed_init_pci(&hose);
++}
++#endif
+diff --git a/board/aspeed/ast2400/config.mk b/board/aspeed/ast2400/config.mk
+new file mode 100755
+index 0000000..24ca09b
+--- /dev/null
++++ b/board/aspeed/ast2400/config.mk
+@@ -0,0 +1,18 @@
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++# MA 02111-1307 USA
++#
++
++# ROM version
++#TEXT_BASE = 0xBFC00000
++
++# RAM version
++TEXT_BASE = 0x40500000
++#TEXT_BASE = 0x00000000
++#TEXT_BASE = 0x00400000
+diff --git a/board/aspeed/ast2400/crc32.c b/board/aspeed/ast2400/crc32.c
+new file mode 100755
+index 0000000..cc8d2ac
+--- /dev/null
++++ b/board/aspeed/ast2400/crc32.c
+@@ -0,0 +1,127 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#include <common.h>
++#include <asm/processor.h>
++#include <asm/byteorder.h>
++#include <environment.h>
++
++#ifdef CONFIG_2SPIFLASH
++
++extern flash_info_t flash_info[CFG_MAX_FLASH_BANKS];
++
++/* ========================================================================
++ * Table of CRC-32's of all single-byte values (made by make_aspeed_crc_table)
++ */
++unsigned long aspeed_crc_table[256] = {
++  0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
++  0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
++  0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
++  0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
++  0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
++  0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
++  0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
++  0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
++  0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
++  0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
++  0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
++  0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
++  0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
++  0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
++  0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
++  0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
++  0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
++  0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
++  0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
++  0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
++  0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
++  0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
++  0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
++  0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
++  0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
++  0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
++  0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
++  0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
++  0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
++  0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
++  0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
++  0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
++  0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
++  0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
++  0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
++  0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
++  0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
++  0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
++  0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
++  0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
++  0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
++  0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
++  0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
++  0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
++  0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
++  0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
++  0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
++  0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
++  0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
++  0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
++  0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
++  0x2d02ef8dL
++};
++
++/* ========================================================================= */
++#define ASPEED_DO1(buf)  crc = aspeed_crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
++#define ASPEED_DO2(buf)  ASPEED_DO1(buf); ASPEED_DO1(buf);
++#define ASPEED_DO4(buf)  ASPEED_DO2(buf); ASPEED_DO2(buf);
++#define ASPEED_DO8(buf)  ASPEED_DO4(buf); ASPEED_DO4(buf);
++
++/* ========================================================================= */
++unsigned long spi2_crc32(crc, buf, len)
++    unsigned long crc;
++    unsigned char *buf;
++    unsigned long len;
++{
++
++    size_t len1, len2;
++    char *s;
++
++    len1 = len2 = 0;
++    if ( (ulong)(buf) <= (flash_info[0].start[0] + flash_info[0].size) )
++        len1 = (flash_info[0].start[0] + flash_info[0].size) - (ulong)(buf);
++    
++    len1 = (len < len1) ? len:len1;
++    len2 = (len < len1) ? 0: (len - len1);
++
++    crc = crc ^ 0xffffffffL;
++    while (len1 >= 8)
++    {
++      ASPEED_DO8(buf);
++      len1 -= 8;
++    }
++    if (len1) do {
++      ASPEED_DO1(buf);
++    } while (--len1);
++    
++    //s = (char *) flash_info[1].start[0];
++    s= (char *) flash_make_addr (&flash_info[1], 0, 0);
++    while (len2 >= 8)
++    {
++      ASPEED_DO8(s);
++      len2 -= 8;
++    }
++    if (len2) do {
++      ASPEED_DO1(s);
++    } while (--len2);   
++
++    return crc ^ 0xffffffffL;
++    
++}
++
++#endif /* CONFIG_2SPIFLASH */
++
+diff --git a/board/aspeed/ast2400/crt.c b/board/aspeed/ast2400/crt.c
+new file mode 100755
+index 0000000..b67f669
+--- /dev/null
++++ b/board/aspeed/ast2400/crt.c
+@@ -0,0 +1,322 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#include <common.h>
++#include <command.h>
++
++#include "type.h"
++#include "vesa.h"
++#include "vdef.h"
++#include "vfun.h"
++#include "vreg.h"
++#include "crt.h"
++
++ULONG AST3000DCLKTableV [] = {
++    0x00046515,     /* 00: VCLK25_175 */  
++    0x00047255,     /* 01: VCLK28_322 */
++    0x0004682a,     /* 02: VCLK31_5         */
++    0x0004672a,     /* 03: VCLK36          */
++    0x00046c50,     /* 04: VCLK40           */
++    0x00046842,     /* 05: VCLK49_5         */
++    0x00006c32,     /* 06: VCLK50           */
++    0x00006a2f,     /* 07: VCLK56_25        */
++    0x00006c41,     /* 08: VCLK65  */
++    0x00006832,     /* 09: VCLK75         */
++    0x0000672e,     /* 0A: VCLK78_75        */
++    0x0000683f,     /* 0B: VCLK94_5         */
++    0x00004824,     /* 0C: VCLK108          */
++	0x00004723,		/* 0D: VCLK119			*/
++    0x0000482d,     /* 0E: VCLK135          */
++	0x00004B37,		/* 0F: VCLK146_25		*/
++    0x0000472e,     /* 10: VCLK157_5        */
++    0x00004836,     /* 11: VCLK162          */
++
++};
++
++BOOL CheckDAC(int nCRTIndex)
++{
++	BYTE	btValue;	
++	BOOL	bValue;
++
++	BYTE btDeviceSelect;
++
++	switch (nCRTIndex)
++	{
++	case CRT_1:
++		btDeviceSelect = DEVICE_ADDRESS_CH7301_CRT1;
++		break;
++	case CRT_2:
++		btDeviceSelect = DEVICE_ADDRESS_CH7301_CRT2;
++		break;
++	default:
++		printf("CRTIndex is not 1 or 2");
++		return FALSE;
++		break;
++	}
++
++	//Enable all DAC's and set register 21h[0] = '0'
++	//DVIP and DVIL disable for DAC
++	SetI2CRegClient(0, DEVICE_SELECT_CH7301, btDeviceSelect, CH7301_PM_REG, 0x00);
++
++	btValue = GetI2CRegClient(0, DEVICE_SELECT_CH7301, btDeviceSelect, CH7301_DC_REG);
++	btValue = btValue & 0xFE;
++	SetI2CRegClient(0, DEVICE_SELECT_CH7301, btDeviceSelect, CH7301_DC_REG, btValue);
++
++	//Set SENSE bit to 1
++	btValue = GetI2CRegClient(0, DEVICE_SELECT_CH7301, btDeviceSelect, CH7301_CD_REG);
++	btValue = btValue | 0x01;
++	SetI2CRegClient(0, DEVICE_SELECT_CH7301, btDeviceSelect, CH7301_CD_REG, btValue);
++
++	//Reset SENSE bit to 0
++	btValue = GetI2CRegClient(0, DEVICE_SELECT_CH7301, btDeviceSelect, CH7301_CD_REG);
++	btValue = btValue & 0xFE;
++	SetI2CRegClient(0, DEVICE_SELECT_CH7301, btDeviceSelect, CH7301_CD_REG, btValue);
++
++	bValue = (GetI2CRegClient(0, DEVICE_SELECT_CH7301, btDeviceSelect, CH7301_CD_REG) & CD_DACT) ? TRUE : FALSE;
++
++	return bValue;
++}
++
++VOID  SetCH7301C(ULONG	MMIOBase,
++				 int	nCRTIndex,
++                 int	inFreqRange,
++				 int	inOperating)
++{
++	BYTE btDeviceSelect;
++	BYTE btValue;
++
++//#ifdef EVB_CLIENT
++	//output RGB doesn't need to set CH7301
++	//if (1 == inOperating)
++	//	return;
++//#endif
++
++	switch (nCRTIndex)
++	{
++	case CRT_1:
++		btDeviceSelect = 0xEA;
++
++		break;
++	case CRT_2:
++		btDeviceSelect = 0xEC;
++
++		break;
++	default:
++		printf("CRTIndex is not 1 or 2");
++		return;
++		break;
++	}
++
++	if (inFreqRange <= VCLK65)
++	{
++	  printf("ch7301: low f \n");
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x33, 0x08);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x34, 0x16);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x36, 0x60);
++	}
++	else
++	{
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x33, 0x06);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x34, 0x26);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x36, 0xA0);
++	}
++
++	switch (inOperating)
++	{
++	case 0:
++		//DVI is normal function
++		 SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x49, 0xC0);
++		 SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x1D, 0x47);
++		break;
++	case 1:
++		//RGB
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x48, 0x18);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x49, 0x0);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x56, 0x0);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x21, 0x9);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x1D, 0x48);
++		SetI2CRegClient(MMIOBase, 0x3, btDeviceSelect, 0x1C, 0x00);
++		break;
++	default:
++		break;
++	};
++}
++
++void SetASTModeTiming (ULONG MMIOBase, int nCRTIndex, BYTE ModeIndex, BYTE ColorDepth)
++{
++    ULONG    temp, RetraceStart, RetraceEnd, DisplayOffset, TerminalCount, bpp;
++
++//  Access CRT Engine
++	//  SetPolarity
++    WriteMemoryLongWithMASKClient(SCU_BASE, CRT1_CONTROL_REG + nCRTIndex*0x60, ((vModeTable[ModeIndex].HorPolarity << HOR_SYNC_SELECT_BIT) | (vModeTable[ModeIndex].VerPolarity << VER_SYNC_SELECT_BIT)), (HOR_SYNC_SELECT_MASK|VER_SYNC_SELECT_MASK));
++
++#if CONFIG_AST3000
++	WriteMemoryLongClient(SCU_BASE, CRT1_CONTROL2_REG + nCRTIndex*0x60, 0xc0);
++#else
++    //2100 is single edge
++	WriteMemoryLongClient(SCU_BASE, CRT1_CONTROL2_REG + nCRTIndex*0x60, 0x80);
++#endif    
++	//  Horizontal Timing
++	temp = 0;
++    temp = ((vModeTable[ModeIndex].HorizontalActive - 1) << HOR_ENABLE_END_BIT) | ((vModeTable[ModeIndex].HorizontalTotal - 1) << HOR_TOTAL_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_HOR_TOTAL_END_REG  + nCRTIndex*0x60, temp);
++
++    RetraceStart = vModeTable[ModeIndex].HorizontalTotal - vModeTable[ModeIndex].HBackPorch - vModeTable[ModeIndex].HSyncTime - vModeTable[ModeIndex].HLeftBorder - 1;
++    RetraceEnd = (RetraceStart + vModeTable[ModeIndex].HSyncTime);
++	temp = 0;
++    temp = (RetraceEnd << HOR_RETRACE_END_BIT) | (RetraceStart << HOR_RETRACE_START_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_HOR_RETRACE_REG  + nCRTIndex*0x60, temp);
++
++	//  Vertical Timing
++	temp = 0;
++    temp = ((vModeTable[ModeIndex].VerticalActive - 1) << VER_ENABLE_END_BIT) | ((vModeTable[ModeIndex].VerticalTotal - 1) << VER_TOTAL_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_VER_TOTAL_END_REG  + nCRTIndex*0x60, temp);
++
++	temp = 0;
++    RetraceStart = vModeTable[ModeIndex].VerticalTotal - vModeTable[ModeIndex].VBackPorch - vModeTable[ModeIndex].VSyncTime - vModeTable[ModeIndex].VTopBorder - 1;
++    RetraceEnd = (RetraceStart + vModeTable[ModeIndex].VSyncTime);
++    temp = (RetraceEnd << VER_RETRACE_END_BIT) | (RetraceStart << VER_RETRACE_START_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_VER_RETRACE_REG  + nCRTIndex*0x60, temp);
++
++	//  Set CRT Display Offset and Terminal Count
++    if (ColorDepth == RGB_565) {
++        bpp = 16;
++    }
++    else {
++        bpp = 32;
++    }
++
++    DisplayOffset = vModeTable[ModeIndex].HorizontalActive * bpp / 8;
++    TerminalCount = vModeTable[ModeIndex].HorizontalActive * bpp / 64;
++    if (ColorDepth == YUV_444) {
++        TerminalCount = TerminalCount * 3 / 4;
++    }
++    if (((vModeTable[ModeIndex].HorizontalActive * bpp) % 64) != 0) {
++        TerminalCount++;
++    }
++
++    WriteMemoryLongClient(SCU_BASE, CRT1_DISPLAY_OFFSET + nCRTIndex*0x60, ((TerminalCount << TERMINAL_COUNT_BIT) | DisplayOffset));
++
++	//  Set Color Format
++    WriteMemoryLongWithMASKClient(SCU_BASE, CRT1_CONTROL_REG + nCRTIndex*0x60, (ColorDepth << FORMAT_SELECT_BIT), FORMAT_SELECT_MASK);
++
++	//  Set Threshold
++	temp = 0;
++    temp = (CRT_HIGH_THRESHOLD_VALUE << THRES_HIGHT_BIT) | (CRT_LOW_THRESHOLD_VALUE << THRES_LOW_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_THRESHOLD_REG + nCRTIndex*0x60, temp);
++
++	WriteMemoryLongClient(SCU_BASE, CRT1_VIDEO_PLL_REG + nCRTIndex*0x60, AST3000DCLKTableV[vModeTable[ModeIndex].PixelClock]);
++}
++
++void SetASTCenter1024ModeTiming (ULONG MMIOBase, int nCRTIndex, BYTE ModeIndex, BYTE ColorDepth)
++{
++    ULONG    temp, RetraceStart, RetraceEnd, DisplayOffset, TerminalCount, bpp;
++
++	//  Access CRT Engine
++	//  SetPolarity
++    WriteMemoryLongWithMASKClient(SCU_BASE, CRT1_CONTROL_REG + nCRTIndex*0x60, (HOR_NEGATIVE << HOR_SYNC_SELECT_BIT) | (VER_NEGATIVE << VER_SYNC_SELECT_BIT), HOR_SYNC_SELECT_MASK|VER_SYNC_SELECT_MASK);
++
++	WriteMemoryLongClient(SCU_BASE, CRT1_CONTROL2_REG + nCRTIndex*0x60, 0xC0);
++
++	//  Horizontal Timing
++	temp = 0;
++    temp = ((vModeTable[ModeIndex].HorizontalActive - 1) << HOR_ENABLE_END_BIT) | ((vModeTable[10].HorizontalTotal - 1) << HOR_TOTAL_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_HOR_TOTAL_END_REG + nCRTIndex*0x60, temp);
++
++    RetraceStart = vModeTable[10].HorizontalTotal - vModeTable[10].HBackPorch - vModeTable[10].HSyncTime - vModeTable[10].HLeftBorder - 1;
++    RetraceStart = RetraceStart - (vModeTable[10].HorizontalActive - vModeTable[ModeIndex].HorizontalActive) / 2 - 1;
++    RetraceEnd = (RetraceStart + vModeTable[10].HSyncTime);
++	temp = 0;
++    temp = (RetraceEnd << HOR_RETRACE_END_BIT) | (RetraceStart << HOR_RETRACE_START_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_HOR_RETRACE_REG + nCRTIndex*0x60, temp);
++
++	//  Vertical Timing
++	temp = 0;
++    temp = ((vModeTable[ModeIndex].VerticalActive - 1) << VER_ENABLE_END_BIT) | ((vModeTable[10].VerticalTotal - 1) << VER_TOTAL_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_VER_TOTAL_END_REG + nCRTIndex*0x60, temp);
++
++    RetraceStart = vModeTable[10].VerticalTotal - vModeTable[10].VBackPorch - vModeTable[10].VSyncTime - vModeTable[10].VTopBorder - 1;
++    RetraceStart = RetraceStart - (vModeTable[10].VerticalActive - vModeTable[ModeIndex].VerticalActive) / 2 - 1;
++    RetraceEnd = (RetraceStart + vModeTable[10].VSyncTime);
++    temp = (RetraceEnd << VER_RETRACE_END_BIT) | (RetraceStart << VER_RETRACE_START_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_VER_RETRACE_REG + nCRTIndex*0x60, temp);
++
++	//  Set CRT Display Offset and Terminal Count
++    if (ColorDepth == RGB_565) {
++        bpp = 16;
++    }
++    else {
++        bpp = 32;
++    }
++    DisplayOffset = vModeTable[ModeIndex].HorizontalActive * bpp / 8;
++    TerminalCount = vModeTable[ModeIndex].HorizontalActive * bpp / 64;
++    if (ColorDepth == YUV_444) {
++        TerminalCount = TerminalCount * 3 / 4;
++    }
++    if (((vModeTable[ModeIndex].HorizontalActive * bpp) % 64) != 0) {
++        TerminalCount++;
++    }
++
++    WriteMemoryLongClient(SCU_BASE, CRT1_DISPLAY_OFFSET + nCRTIndex*0x60, (TerminalCount << TERMINAL_COUNT_BIT) | DisplayOffset);
++
++	//  Set Color Format
++    WriteMemoryLongWithMASKClient(SCU_BASE, CRT1_CONTROL_REG + nCRTIndex*0x60, (ColorDepth << FORMAT_SELECT_BIT), FORMAT_SELECT_MASK);
++
++	//  Set Threshold
++	temp = 0;
++    temp = (CRT_HIGH_THRESHOLD_VALUE << THRES_HIGHT_BIT) | (CRT_LOW_THRESHOLD_VALUE << THRES_LOW_BIT);
++    WriteMemoryLongClient(SCU_BASE, CRT1_THRESHOLD_REG + nCRTIndex*0x60, temp);
++    
++	// Set DCLK
++	WriteMemoryLongClient(SCU_BASE, CRT1_VIDEO_PLL_REG + nCRTIndex*0x60, AST3000DCLKTableV[vModeTable[ModeIndex].PixelClock]);
++
++}
++
++BOOL  ASTSetModeV (ULONG MMIOBase, int nCRTIndex, ULONG VGABaseAddr, USHORT Horizontal, USHORT Vertical, BYTE ColorFormat, BYTE CenterMode)
++{
++    BYTE    i, ModeIndex;
++    BOOL	bDAC;	
++    ULONG   ulTemp;
++
++    //  Access CRT Engine
++    //Enable CRT1 graph
++    WriteMemoryLongWithMASKClient(SCU_BASE, CRT1_CONTROL_REG + 0x60*nCRTIndex, GRAPH_DISPLAY_ON, GRAPH_DISPLAY_MASK);
++    
++    //  Set CRT Display Start Address
++    WriteMemoryLongWithMASKClient(SCU_BASE, CRT1_DISPLAY_ADDRESS + 0x60*nCRTIndex, VGABaseAddr, DISPLAY_ADDRESS_MASK);
++
++    for (i = 0; i < Mode60HZCount; i++) {
++        if ((vModeTable[i].HorizontalActive == Horizontal) && (vModeTable[i].VerticalActive == Vertical)) {
++
++	    ModeIndex = i;
++
++            if (CenterMode != 1) {
++                SetASTModeTiming(MMIOBase, nCRTIndex, i, ColorFormat);
++            }
++            else {
++                SetASTCenter1024ModeTiming (MMIOBase, nCRTIndex, i, ColorFormat);
++            }
++
++            //use internal video out sigal and don't need use 7301
++            /*
++			bDAC = CheckDAC(nCRTIndex);
++            
++			SetCH7301C(0,
++				nCRTIndex,
++				vModeTable[ModeIndex].PixelClock,
++				bDAC);		//For RGB
++			*/	
++			return TRUE;
++        }
++    }
++
++    return FALSE;
++}
++
+diff --git a/board/aspeed/ast2400/crt.h b/board/aspeed/ast2400/crt.h
+new file mode 100755
+index 0000000..e7483be
+--- /dev/null
++++ b/board/aspeed/ast2400/crt.h
+@@ -0,0 +1,121 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef _CRT_H_
++#define _CRT_H_
++
++#ifdef Watcom
++#define		CRT_REMAP_OFFSET	0x10000
++#else
++#define		CRT_REMAP_OFFSET	0x0
++#endif
++
++/********************************************************/
++/*    CRT register                                      */
++/********************************************************/
++#define		CRT_BASE_OFFSET						0x6000+CRT_REMAP_OFFSET
++
++#define		CRT1_CONTROL_REG					0x00 + CRT_BASE_OFFSET
++	#define		GRAPH_DISPLAY_BIT				0
++	#define     GRAPH_DISPLAY_MASK				(1<<0)
++		#define		GRAPH_DISPLAY_ON			1
++		#define		GRAPH_DISPLAY_OFF			0
++    #define     FORMAT_SELECT_BIT               8
++    #define     FORMAT_SELECT_MASK              (3<<8)   
++	#define		HOR_SYNC_SELECT_BIT				16
++    #define		HOR_SYNC_SELECT_MASK			(1<<16)	
++		#define		HOR_NEGATIVE				1
++		#define		HOR_POSITIVE				0
++	#define		VER_SYNC_SELECT_BIT				17
++    #define		VER_SYNC_SELECT_MASK			(1<<17)	
++		#define		VER_NEGATIVE				1
++		#define		VER_POSITIVE				0
++
++#define		CRT1_CONTROL2_REG					0x04 + CRT_BASE_OFFSET
++        
++#define     CRT1_VIDEO_PLL_REG                  0x0C + CRT_BASE_OFFSET
++    #define     POST_DIV_BIT                    18
++    #define     POST_DIV_MASK                   3<<18
++        #define     DIV_1_1                     0
++        //#define     DIV_1_2                     1
++        #define     DIV_1_2                     2
++        #define     DIV_1_4                     3
++        
++#define     CRT1_HOR_TOTAL_END_REG              0x10 + CRT_BASE_OFFSET
++    #define     HOR_TOTAL_BIT                   0
++    #define     HOR_ENABLE_END_BIT              16
++
++#define     CRT1_HOR_RETRACE_REG                0x14 + CRT_BASE_OFFSET
++    #define     HOR_RETRACE_START_BIT           0
++    #define     HOR_RETRACE_END_BIT             16
++
++#define     CRT1_VER_TOTAL_END_REG              0x18 + CRT_BASE_OFFSET
++    #define     VER_TOTAL_BIT                   0
++    #define     VER_ENABLE_END_BIT              16
++
++#define     CRT1_VER_RETRACE_REG                0x1C + CRT_BASE_OFFSET
++    #define     VER_RETRACE_START_BIT           0
++    #define     VER_RETRACE_END_BIT             16
++
++#define     CRT1_DISPLAY_ADDRESS				0x20 + CRT_BASE_OFFSET
++	#define		DISPLAY_ADDRESS_MASK			0x0FFFFFFF
++
++#define     CRT1_DISPLAY_OFFSET                 0x24 + CRT_BASE_OFFSET
++    #define     DISPLAY_OFFSET_ALIGN            7 /* 8 byte alignment*/
++    #define     TERMINAL_COUNT_BIT              16    
++
++#define     CRT1_THRESHOLD_REG                  0x28 + CRT_BASE_OFFSET
++    #define     THRES_LOW_BIT                   0
++    #define     THRES_HIGHT_BIT                 8
++
++#define    CURSOR_POSITION                  0x30 + OFFSET
++#define    CURSOR_OFFSET                    0x34 + OFFSET
++#define    CURSOR_PATTERN                   0x38 + OFFSET
++#define    OSD_HORIZONTAL                   0x40 + OFFSET
++#define    OSD_VERTICAL                     0x44 + OFFSET
++#define    OSD_PATTERN                      0x48 + OFFSET
++#define    OSD_OFFSET                       0x4C + OFFSET
++#define    OSD_THRESHOLD                    0x50 + OFFSET
++
++//Ch7301c
++#define		DEVICE_ADDRESS_CH7301_CRT1	0xEA
++#define		DEVICE_ADDRESS_CH7301_CRT2	0xEC
++
++
++#define		DEVICE_SELECT_CH7301		0x3
++
++/* CH7301 Register Definition */
++#define     CH7301_CD_REG				0x20
++	#define     CD_DACT					0x0E
++	#define		CD_DVIT					1 << 5
++#define     CH7301_DC_REG				0x21
++#define     CH7301_PM_REG				0x49
++
++BOOL CheckHotPlug(int nCRTIndex);
++BOOL CheckDAC(int nCRTIndex);
++
++BOOL  ASTSetModeV (ULONG MMIOBase, 
++                int nCRTIndex, 
++                ULONG VGABaseAddr, 
++                USHORT Horizontal, 
++                USHORT Vertical, 
++                BYTE ColorFormat, 
++                BYTE CenterMode);
++                
++BOOL  SelCRTClock(ULONG MMIOBase,
++				  int	nCRTIndex,
++				  USHORT Horizontal, 
++				  USHORT Vertical);
++
++void DisableCRT(ULONG MMIOBase, int nCRTIndex);
++void ClearCRTWithBlack(ULONG ulCRTAddr, int iWidth, int iHeight);
++
++#endif /* _CRT_H_ */
++
+diff --git a/board/aspeed/ast2400/flash.c b/board/aspeed/ast2400/flash.c
+new file mode 100755
+index 0000000..d611d0d
+--- /dev/null
++++ b/board/aspeed/ast2400/flash.c
+@@ -0,0 +1,1651 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ * History
++ * 01/20/2004 - combined variants of original driver.
++ * 01/22/2004 - Write performance enhancements for parallel chips (Tolunay)
++ * 01/23/2004 - Support for x8/x16 chips (Rune Raknerud)
++ * 01/27/2004 - Little endian support Ed Okerson
++ *
++ * Tested Architectures
++ * Port Width  Chip Width    # of banks	   Flash Chip  Board
++ * 32	       16	     1		   28F128J3    seranoa/eagle
++ * 64	       16	     1		   28F128J3    seranoa/falcon
++ */
++// (Sun) This CFI driver is written for fixed-width flash chips.
++// It was not designed for flexible 8-bit/16-bit chips, which are the norm.
++// When those chips are connected to a bus in 8-bit mode, the address wires
++// right-shifted by 1.
++//FIXME: Fix the driver to auto-detect "16-bit flash wired in 8-bit mode".
++// Left-shift CFI offsets by 1 bit instead of doubling the #define values.
++
++/* The DEBUG define must be before common to enable debugging */
++// (Sun) Changed to DEBUG_FLASH because flash debug()s are too numerous.
++// #define DEBUG
++
++#include <common.h>
++#include <asm/processor.h>
++#include <asm/byteorder.h>
++#include <environment.h>
++#ifdef	CONFIG_SYS_FLASH_CFI
++
++/*
++ * This file implements a Common Flash Interface (CFI) driver for U-Boot.
++ * The width of the port and the width of the chips are determined at initialization.
++ * These widths are used to calculate the address for access CFI data structures.
++ * It has been tested on an Intel Strataflash implementation and AMD 29F016D.
++ *
++ * References
++ * JEDEC Standard JESD68 - Common Flash Interface (CFI)
++ * JEDEC Standard JEP137-A Common Flash Interface (CFI) ID Codes
++ * Intel Application Note 646 Common Flash Interface (CFI) and Command Sets
++ * Intel 290667-008 3 Volt Intel StrataFlash Memory datasheet
++ *
++ * TODO
++ *
++ * Use Primary Extended Query table (PRI) and Alternate Algorithm Query
++ * Table (ALT) to determine if protection is available
++ *
++ * Add support for other command sets Use the PRI and ALT to determine command set
++ * Verify erase and program timeouts.
++ */
++
++#ifndef CONFIG_FLASH_BANKS_LIST
++#define CONFIG_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE }
++#endif
++
++#define FLASH_CMD_CFI			0x98
++#define FLASH_CMD_READ_ID		0x90
++#define FLASH_CMD_RESET			0xff
++#define FLASH_CMD_BLOCK_ERASE		0x20
++#define FLASH_CMD_ERASE_CONFIRM		0xD0
++#define FLASH_CMD_WRITE			0x40
++#define FLASH_CMD_PROTECT		0x60
++#define FLASH_CMD_PROTECT_SET		0x01
++#define FLASH_CMD_PROTECT_CLEAR		0xD0
++#define FLASH_CMD_CLEAR_STATUS		0x50
++#define FLASH_CMD_WRITE_TO_BUFFER	0xE8
++#define FLASH_CMD_WRITE_BUFFER_CONFIRM	0xD0
++
++#define FLASH_STATUS_DONE		0x80
++#define FLASH_STATUS_ESS		0x40
++#define FLASH_STATUS_ECLBS		0x20
++#define FLASH_STATUS_PSLBS		0x10
++#define FLASH_STATUS_VPENS		0x08
++#define FLASH_STATUS_PSS		0x04
++#define FLASH_STATUS_DPS		0x02
++#define FLASH_STATUS_R			0x01
++#define FLASH_STATUS_PROTECT		0x01
++
++#define AMD_CMD_RESET			0xF0
++#define AMD_CMD_WRITE			0xA0
++#define AMD_CMD_ERASE_START		0x80
++#define AMD_CMD_ERASE_SECTOR		0x30
++#define AMD_CMD_UNLOCK_START		0xAA
++#define AMD_CMD_UNLOCK_ACK		0x55
++#define AMD_CMD_WRITE_TO_BUFFER		0x25
++#define AMD_CMD_BUFFER_TO_FLASH		0x29
++
++#define AMD_STATUS_TOGGLE		0x40
++#define AMD_STATUS_ERROR		0x20
++//FIXME: These 3 were also changed for 8-bit/16-bit flash chips.
++#define AMD_ADDR_ERASE_START		(0xAAA/info->portwidth)
++#define AMD_ADDR_START			(0xAAA/info->portwidth)
++#define AMD_ADDR_ACK			(0x555/info->portwidth)
++
++//FIXME: Fix the driver to auto-detect "16-bit flash wired in 8-bit mode".
++// Left-shift CFI offsets by 1 bit instead of doubling the #define values.
++#define FLASH_OFFSET_CFI		(0xAA/info->portwidth)
++#define FLASH_OFFSET_CFI_RESP		(0x20/info->portwidth)
++#define FLASH_OFFSET_CFI_RESP1		(0x22/info->portwidth)
++#define FLASH_OFFSET_CFI_RESP2		(0x24/info->portwidth)
++#define FLASH_OFFSET_PRIMARY_VENDOR	(0x26/info->portwidth)
++#define FLASH_OFFSET_WTOUT		(0x3E/info->portwidth)
++#define FLASH_OFFSET_WBTOUT		(0x40/info->portwidth)
++#define FLASH_OFFSET_ETOUT		(0x42/info->portwidth)
++#define FLASH_OFFSET_CETOUT		(0x44/info->portwidth)
++#define FLASH_OFFSET_WMAX_TOUT		(0x46/info->portwidth)
++#define FLASH_OFFSET_WBMAX_TOUT		(0x48/info->portwidth)
++#define FLASH_OFFSET_EMAX_TOUT		(0x4A/info->portwidth)
++#define FLASH_OFFSET_CEMAX_TOUT		(0x4C/info->portwidth)
++#define FLASH_OFFSET_SIZE		(0x4E/info->portwidth)
++#define FLASH_OFFSET_INTERFACE		(0x50/info->portwidth)
++#define FLASH_OFFSET_BUFFER_SIZE	(0x54/info->portwidth)
++#define FLASH_OFFSET_NUM_ERASE_REGIONS	(0x58/info->portwidth)
++#define FLASH_OFFSET_ERASE_REGIONS	(0x5A/info->portwidth)
++#define FLASH_OFFSET_PROTECT		(0x02/info->portwidth)
++#define FLASH_OFFSET_USER_PROTECTION	(0x85/info->portwidth)
++#define FLASH_OFFSET_INTEL_PROTECTION	(0x81/info->portwidth)
++
++#define MAX_NUM_ERASE_REGIONS		4
++
++#define FLASH_MAN_CFI			0x01000000
++
++#define CFI_CMDSET_NONE		    0
++#define CFI_CMDSET_INTEL_EXTENDED   1
++#define CFI_CMDSET_AMD_STANDARD	    2
++#define CFI_CMDSET_INTEL_STANDARD   3
++#define CFI_CMDSET_AMD_EXTENDED	    4
++#define CFI_CMDSET_MITSU_STANDARD   256
++#define CFI_CMDSET_MITSU_EXTENDED   257
++#define CFI_CMDSET_SST		    258
++
++
++#ifdef CONFIG_SYS_FLASH_CFI_AMD_RESET /* needed for STM_ID_29W320DB on UC100 */
++# undef  FLASH_CMD_RESET
++# define FLASH_CMD_RESET                AMD_CMD_RESET /* use AMD-Reset instead */
++#endif
++
++
++typedef union {
++	unsigned char c;
++	unsigned short w;
++	unsigned long l;
++	unsigned long long ll;
++} cfiword_t;
++
++typedef union {
++	volatile unsigned char *cp;
++	volatile unsigned short *wp;
++	volatile unsigned long *lp;
++	volatile unsigned long long *llp;
++} cfiptr_t;
++
++/* use CFG_MAX_FLASH_BANKS_DETECT if defined */
++#ifdef CONFIG_SYS_MAX_FLASH_BANKS_DETECT
++static ulong bank_base[CONFIG_SYS_MAX_FLASH_BANKS_DETECT] = CONFIG_FLASH_BANKS_LIST;
++flash_info_t flash_info[CFG_MAX_FLASH_BANKS_DETECT];	/* FLASH chips info */
++#else
++static ulong bank_base[CONFIG_SYS_MAX_FLASH_BANKS] = CONFIG_FLASH_BANKS_LIST;
++flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];		/* FLASH chips info */
++#endif
++
++
++/*-----------------------------------------------------------------------
++ * Functions
++ */
++static void flash_add_byte (flash_info_t * info, cfiword_t * cword, uchar c);
++static void flash_make_cmd (flash_info_t * info, uchar cmd, void *cmdbuf);
++static void flash_write_cmd (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd);
++static void flash_write_cmd_nodbg (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd);
++static void flash_write_cmd_int (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd, int noDebug);
++static void flash_unlock_seq (flash_info_t * info, flash_sect_t sect);
++static int flash_isequal (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd);
++static int flash_isset (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd);
++static int flash_toggle (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd);
++static int flash_detect_cfi (flash_info_t * info);
++ulong flash_get_size (ulong base, int banknum);
++static int flash_write_cfiword (flash_info_t * info, ulong dest, cfiword_t cword);
++static int flash_full_status_check (flash_info_t * info, flash_sect_t sector,
++				    ulong tout, char *prompt);
++static void write_buffer_abort_reset(flash_info_t * info, flash_sect_t sector);				    
++#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
++static flash_info_t *flash_get_info(ulong base);
++#endif
++#ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp, int len);
++static int flash_write_cfibuffer_amd (flash_info_t * info, ulong dest, uchar * cp, int len);
++#endif
++
++/*-----------------------------------------------------------------------
++ * create an address based on the offset and the port width
++ */
++inline uchar *flash_make_addr (flash_info_t * info, flash_sect_t sect, uint offset)
++{
++	return ((uchar *) (info->start[sect] + (offset * info->portwidth)));
++}
++
++/*-----------------------------------------------------------------------
++ * Debug support
++ */
++#ifdef DEBUG_FLASH
++static void print_longlong (char *str, unsigned long long data)
++{
++	int i;
++	char *cp;
++
++	cp = (unsigned char *) &data;
++	for (i = 0; i < 8; i++)
++		sprintf (&str[i * 2], "%2.2x", *cp++);
++}
++#endif
++
++#if defined(DEBUG_FLASH)
++static void flash_printqry (flash_info_t * info, flash_sect_t sect)
++{
++	cfiptr_t cptr;
++	int x, y;
++
++	for (x = 0; x < 0x40; x += 16U / info->portwidth) {
++		cptr.cp =
++			flash_make_addr (info, sect,
++					 x + FLASH_OFFSET_CFI_RESP);
++		debug ("%p : ", cptr.cp);
++		for (y = 0; y < 16; y++) {
++			debug ("%2.2x ", cptr.cp[y]);
++		}
++		debug (" ");
++		for (y = 0; y < 16; y++) {
++			if (cptr.cp[y] >= 0x20 && cptr.cp[y] <= 0x7e) {
++				debug ("%c", cptr.cp[y]);
++			} else {
++				debug (".");
++			}
++		}
++		debug ("\n");
++	}
++}
++#endif
++
++/*-----------------------------------------------------------------------
++ * read a character at a port width address
++ */
++inline uchar flash_read_uchar (flash_info_t * info, uint offset)
++{
++	uchar *cp;
++
++	cp = flash_make_addr (info, 0, offset);
++#if defined(__LITTLE_ENDIAN)
++	return (cp[0]);
++#else
++	return (cp[info->portwidth - 1]);
++#endif
++}
++
++/*-----------------------------------------------------------------------
++ * read a short word by swapping for ppc format.
++ */
++#if 0
++static ushort flash_read_ushort (flash_info_t * info, flash_sect_t sect, uint offset)
++{
++	uchar *addr;
++	ushort retval;
++
++#ifdef DEBUG_FLASH
++	int x;
++#endif
++	addr = flash_make_addr (info, sect, offset);
++
++#ifdef DEBUG_FLASH
++	debug ("ushort addr is at %p info->portwidth = %d\n", addr,
++	       info->portwidth);
++	for (x = 0; x < 2 * info->portwidth; x++) {
++		debug ("addr[%x] = 0x%x\n", x, addr[x]);
++	}
++#endif
++#if defined(__LITTLE_ENDIAN)
++	if (info->interface == FLASH_CFI_X8X16) {
++	    retval = (addr[0] | (addr[2] << 8));
++	} else {
++	    retval = (addr[0] | (addr[(info->portwidth)] << 8));
++	}
++#else
++	retval = ((addr[(2 * info->portwidth) - 1] << 8) |
++		  addr[info->portwidth - 1]);
++#endif
++
++	debug ("retval = 0x%x\n", retval);
++	return retval;
++}
++#endif
++
++/*-----------------------------------------------------------------------
++ * read a long word by picking the least significant byte of each maximum
++ * port size word. Swap for ppc format.
++ */
++static ulong flash_read_long (flash_info_t * info, flash_sect_t sect, uint offset)
++{
++	uchar *addr;
++	ulong retval;
++#ifdef DEBUG_FLASH
++	int x;
++#endif
++#if 0
++	switch (info->interface) {
++	case FLASH_CFI_X8:
++	case FLASH_CFI_X16:
++	    break;
++	case FLASH_CFI_X8X16:
++	    offset <<= 1;
++	}
++#endif	
++	// flash_make_addr() multiplies offset by info->portwidth.
++	addr = flash_make_addr (info, sect, offset);
++
++#ifdef DEBUG_FLASH
++	debug ("long addr is at %p info->portwidth = %d\n", addr,
++	       info->portwidth);
++	for (x = 0; x < 4 * info->portwidth; x++) {
++		debug ("addr[%x] = 0x%x\n", x, addr[x]);
++	}
++#endif
++#if defined(__LITTLE_ENDIAN)
++	if (info->interface == FLASH_CFI_X8X16) {
++	    retval = (addr[0] | (addr[2] << 8) | (addr[4] << 16) | (addr[6] << 24));
++	} else {
++	    retval = (addr[0] | (addr[(info->portwidth)] << 8) |
++		      (addr[(2 * info->portwidth)] << 16) |
++		      (addr[(3 * info->portwidth)] << 24));
++	}
++#else
++	//FIXME: This undocumented code appears to match broken bus wiring.
++	retval = (addr[(2 * info->portwidth) - 1] << 24) |
++		(addr[(info->portwidth) - 1] << 16) |
++		(addr[(4 * info->portwidth) - 1] << 8) |
++		addr[(3 * info->portwidth) - 1];
++#endif
++	return retval;
++}
++
++/*-----------------------------------------------------------------------
++ */
++unsigned long flash_init (void)
++{
++	unsigned long size = 0;
++	int i;
++
++	/* Init: no FLASHes known */
++	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
++		flash_info[i].flash_id = FLASH_UNKNOWN;
++		size += flash_info[i].size = flash_get_size (bank_base[i], i);
++		if (flash_info[i].flash_id == FLASH_UNKNOWN) {
++#ifndef CFG_FLASH_QUIET_TEST
++			printf ("## Unknown FLASH on Bank %d - Size = 0x%08lx = %ld MB\n",
++				i, flash_info[i].size, flash_info[i].size << 20);
++#endif /* CFG_FLASH_QUIET_TEST */
++		}
++	}
++
++	/* Monitor protection ON by default */
++#if (CONFIG_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE)
++	flash_protect (FLAG_PROTECT_SET,
++		       CONFIG_MONITOR_BASE,
++		       CONFIG_MONITOR_BASE + monitor_flash_len  - 1,
++		       flash_get_info(CONFIG_MONITOR_BASE));
++#endif
++
++	/* Environment protection ON by default */
++#ifdef CONFIG_ENV_IS_IN_FLASH
++	flash_protect (FLAG_PROTECT_SET,
++		       CONFIG_ENV_ADDR,
++		       CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
++		       flash_get_info(CONFIG_ENV_ADDR));
++#endif
++
++	/* Redundant environment protection ON by default */
++#ifdef CONFIG_ENV_ADDR_REDUND
++	flash_protect (FLAG_PROTECT_SET,
++		       CONFIG_ENV_ADDR_REDUND,
++		       CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,
++		       flash_get_info(CONFIG_ENV_ADDR_REDUND));
++#endif
++	return (size);
++}
++
++/*-----------------------------------------------------------------------
++ */
++#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_ADDR_REDUND) || (CONFIG_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE)
++static flash_info_t *flash_get_info(ulong base)
++{
++	int i;
++	flash_info_t * info = 0;
++
++	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i ++) {
++		info = & flash_info[i];
++		if (info->size && info->start[0] <= base &&
++		    base <= info->start[0] + info->size - 1)
++			break;
++	}
++
++	return i == CONFIG_SYS_MAX_FLASH_BANKS ? 0 : info;
++}
++#endif
++
++/*-----------------------------------------------------------------------
++ */
++int flash_erase (flash_info_t * info, int s_first, int s_last)
++{
++	int rcode = 0;
++	int prot;
++	flash_sect_t sect;
++        uchar ch;
++	uchar *addr;
++  
++	if (info->flash_id != FLASH_MAN_CFI) {
++		puts ("Can't erase unknown flash type - aborted\n");
++		return 1;
++	}
++	if ((s_first < 0) || (s_first > s_last)) {
++		puts ("- no sectors to erase\n");
++		return 1;
++	}
++
++	prot = 0;
++	for (sect = s_first; sect <= s_last; ++sect) {
++		if (info->protect[sect]) {
++			prot++;
++		}
++	}
++	if (prot) {
++		printf ("- Warning: %d protected sectors will not be erased!\n", prot);
++	} else {
++		putc ('\n');
++	}
++
++
++	for (sect = s_first; sect <= s_last; sect++) {
++		if (info->protect[sect] == 0) { /* not protected */
++			switch (info->vendor) {
++			case CFI_CMDSET_INTEL_STANDARD:
++			case CFI_CMDSET_INTEL_EXTENDED:
++				flash_write_cmd (info, sect, 0, FLASH_CMD_CLEAR_STATUS);
++				flash_write_cmd (info, sect, 0, FLASH_CMD_BLOCK_ERASE);
++				flash_write_cmd (info, sect, 0, FLASH_CMD_ERASE_CONFIRM);
++				break;
++			case CFI_CMDSET_AMD_STANDARD:
++			case CFI_CMDSET_AMD_EXTENDED:
++				flash_unlock_seq (info, sect);
++				flash_write_cmd (info, sect, AMD_ADDR_ERASE_START,
++							AMD_CMD_ERASE_START);
++				flash_unlock_seq (info, sect);
++				flash_write_cmd (info, sect, 0, AMD_CMD_ERASE_SECTOR);
++				
++				/* toggle */
++	                        addr = flash_make_addr (info, sect, 0);				
++				do {
++				    ch = *(volatile uchar *)(addr);
++                                } while ( ((ch & 0x80) == 0) || (ch != 0xFF) );
++				break;
++			default:
++				debug ("Unkown flash vendor %d\n",
++				       info->vendor);
++				break;
++			}
++
++			if (flash_full_status_check
++			    (info, sect, info->erase_blk_tout, "erase")) {
++				rcode = 1;
++			} else
++				putc ('.');
++		}
++	}
++	puts (" done\n");
++	return rcode;
++}
++
++/*-----------------------------------------------------------------------
++ */
++void flash_print_info (flash_info_t * info)
++{
++	int i;
++
++	if (info->flash_id != FLASH_MAN_CFI) {
++		puts ("missing or unknown FLASH type\n");
++		return;
++	}
++
++	printf ("CFI conformant FLASH (%d x %d)",
++		(info->portwidth << 3), (info->chipwidth << 3));
++	printf ("  Size: %ld MB in %d Sectors\n",
++		info->size >> 20, info->sector_count);
++	printf (" Erase timeout %ld ms, write timeout %ld ms, buffer write timeout %ld ms, buffer size %d\n",
++		info->erase_blk_tout,
++		info->write_tout,
++		info->buffer_write_tout,
++		info->buffer_size);
++
++	puts ("  Sector Start Addresses:");
++	for (i = 0; i < info->sector_count; ++i) {
++#ifdef CFG_FLASH_EMPTY_INFO
++		int k;
++		int size;
++		int erased;
++		volatile unsigned long *flash;
++
++		/*
++		 * Check if whole sector is erased
++		 */
++		if (i != (info->sector_count - 1))
++			size = info->start[i + 1] - info->start[i];
++		else
++			size = info->start[0] + info->size - info->start[i];
++		erased = 1;
++		flash = (volatile unsigned long *) info->start[i];
++		size = size >> 2;	/* divide by 4 for longword access */
++		for (k = 0; k < size; k++) {
++			if (*flash++ != 0xffffffff) {
++				erased = 0;
++				break;
++			}
++		}
++
++		if ((i % 5) == 0)
++			printf ("\n");
++		/* print empty and read-only info */
++		printf (" %08lX%s%s",
++			info->start[i],
++			erased ? " E" : "  ",
++			info->protect[i] ? "RO " : "   ");
++#else	/* ! CFG_FLASH_EMPTY_INFO */
++		if ((i % 5) == 0)
++			printf ("\n   ");
++		printf (" %08lX%s",
++			info->start[i], info->protect[i] ? " (RO)" : "     ");
++#endif
++	}
++	putc ('\n');
++	return;
++}
++
++/*-----------------------------------------------------------------------
++ * Copy memory to flash, returns:
++ * 0 - OK
++ * 1 - write timeout
++ * 2 - Flash not erased
++ */
++int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
++{
++	ulong wp;
++	ulong cp;
++	int aln;
++	cfiword_t cword;
++	int i, rc;
++
++#ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++	unsigned char pat[] = {'|', '-', '/', '\\'};
++       	int patcnt = 0;
++	int buffered_size;
++#endif
++	/* get lower aligned address */
++	/* get lower aligned address */
++	wp = (addr & ~(info->portwidth - 1));
++
++	/* handle unaligned start */
++	if ((aln = addr - wp) != 0) {
++		cword.l = 0;
++		cp = wp;
++		for (i = 0; i < aln; ++i, ++cp)
++			flash_add_byte (info, &cword, (*(uchar *) cp));
++
++		for (; (i < info->portwidth) && (cnt > 0); i++) {
++			flash_add_byte (info, &cword, *src++);
++			cnt--;
++			cp++;
++		}
++		for (; (cnt == 0) && (i < info->portwidth); ++i, ++cp)
++			flash_add_byte (info, &cword, (*(uchar *) cp));
++		if ((rc = flash_write_cfiword (info, wp, cword)) != 0)
++			return rc;
++		wp = cp;
++	}
++
++	/* handle the aligned part */
++#ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++	buffered_size = (info->portwidth / info->chipwidth);
++	buffered_size *= info->buffer_size;
++	while (cnt >= info->portwidth) {
++		/* Show processing */
++		if ((++patcnt % 256) == 0)
++		    printf("%c\b", pat[(patcnt / 256) & 0x03]);
++
++		i = buffered_size > cnt ? cnt : buffered_size;
++		if ((rc = flash_write_cfibuffer (info, wp, src, i)) != ERR_OK)
++			return rc;
++		i -= i & (info->portwidth - 1);
++		wp += i;
++		src += i;
++		cnt -= i;
++	}
++#else
++	while (cnt >= info->portwidth) {
++		cword.l = 0;
++		for (i = 0; i < info->portwidth; i++) {
++			flash_add_byte (info, &cword, *src++);
++		}
++		if ((rc = flash_write_cfiword (info, wp, cword)) != 0)
++			return rc;
++		wp += info->portwidth;
++		cnt -= info->portwidth;
++	}
++#endif /* CONFIG_SYS_FLASH_USE_BUFFER_WRITE */
++	if (cnt == 0) {
++		return (0);
++	}
++
++	/*
++	 * handle unaligned tail bytes
++	 */
++	cword.l = 0;
++	for (i = 0, cp = wp; (i < info->portwidth) && (cnt > 0); ++i, ++cp) {
++		flash_add_byte (info, &cword, *src++);
++		--cnt;
++	}
++	for (; i < info->portwidth; ++i, ++cp) {
++		flash_add_byte (info, &cword, (*(uchar *) cp));
++	}
++
++	return flash_write_cfiword (info, wp, cword);
++}
++
++/*-----------------------------------------------------------------------
++ */
++#ifdef CFG_FLASH_PROTECTION
++
++int flash_real_protect (flash_info_t * info, long sector, int prot)
++{
++	int retcode = 0;
++
++	flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS);
++	flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT);
++	if (prot)
++		flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT_SET);
++	else
++		flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT_CLEAR);
++
++	if ((retcode =
++	     flash_full_status_check (info, sector, info->erase_blk_tout,
++				      prot ? "protect" : "unprotect")) == 0) {
++
++		info->protect[sector] = prot;
++		/* Intel's unprotect unprotects all locking */
++		if (prot == 0) {
++			flash_sect_t i;
++
++			for (i = 0; i < info->sector_count; i++) {
++				if (info->protect[i])
++					flash_real_protect (info, i, 1);
++			}
++		}
++	}
++	return retcode;
++}
++
++/*-----------------------------------------------------------------------
++ * flash_read_user_serial - read the OneTimeProgramming cells
++ */
++void flash_read_user_serial (flash_info_t * info, void *buffer, int offset,
++			     int len)
++{
++	uchar *src;
++	uchar *dst;
++
++	dst = buffer;
++	src = flash_make_addr (info, 0, FLASH_OFFSET_USER_PROTECTION);
++	flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID);
++	memcpy (dst, src + offset, len);
++	flash_write_cmd (info, 0, 0, info->cmd_reset);
++}
++
++/*
++ * flash_read_factory_serial - read the device Id from the protection area
++ */
++void flash_read_factory_serial (flash_info_t * info, void *buffer, int offset,
++				int len)
++{
++	uchar *src;
++
++	src = flash_make_addr (info, 0, FLASH_OFFSET_INTEL_PROTECTION);
++	flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID);
++	memcpy (buffer, src + offset, len);
++	flash_write_cmd (info, 0, 0, info->cmd_reset);
++}
++
++#endif /* CFG_FLASH_PROTECTION */
++
++/*
++ * flash_is_busy - check to see if the flash is busy
++ * This routine checks the status of the chip and returns true if the chip is busy
++ */
++static int flash_is_busy (flash_info_t * info, flash_sect_t sect)
++{
++	int retval;
++
++	switch (info->vendor) {
++	case CFI_CMDSET_INTEL_STANDARD:
++	case CFI_CMDSET_INTEL_EXTENDED:
++		retval = !flash_isset (info, sect, 0, FLASH_STATUS_DONE);
++		break;
++	case CFI_CMDSET_AMD_STANDARD:
++	case CFI_CMDSET_AMD_EXTENDED:
++		retval = flash_toggle (info, sect, 0, AMD_STATUS_TOGGLE);
++		break;
++	default:
++		retval = 0;
++	}
++#ifdef DEBUG_FLASH
++	if (retval)
++	    debug ("flash_is_busy: %d\n", retval);
++#endif
++	return retval;
++}
++
++/*-----------------------------------------------------------------------
++ *  wait for XSR.7 to be set. Time out with an error if it does not.
++ *  This routine does not set the flash to read-array mode.
++ */
++static int flash_status_check (flash_info_t * info, flash_sect_t sector,
++			       ulong tout, char *prompt)
++{
++	ulong start, now;
++
++	/* Wait for command completion */
++	// (Sun) Fix order of checking time so it works when the CPU is very
++	// slow, e.g., single-stepping or emulation.
++	start = get_timer (0);
++	while (now = get_timer(start),
++	       flash_is_busy (info, sector))
++	{
++		if (now > info->erase_blk_tout) {
++			printf ("Flash %s timeout at address %lx data %lx\n",
++				prompt, info->start[sector],
++				flash_read_long (info, sector, 0));
++			flash_write_cmd (info, sector, 0, info->cmd_reset);
++			return ERR_TIMOUT;
++		}
++	}
++	return ERR_OK;
++}
++
++/*-----------------------------------------------------------------------
++ * Wait for XSR.7 to be set, if it times out print an error, otherwise do a full status check.
++ * This routine sets the flash to read-array mode.
++ */
++static int flash_full_status_check (flash_info_t * info, flash_sect_t sector,
++				    ulong tout, char *prompt)
++{
++	int retcode;
++
++	retcode = flash_status_check (info, sector, tout, prompt);
++	switch (info->vendor) {
++	case CFI_CMDSET_INTEL_EXTENDED:
++	case CFI_CMDSET_INTEL_STANDARD:
++		if ((retcode != ERR_OK)
++		    && !flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) {
++			retcode = ERR_INVAL;
++			printf ("Flash %s error at address %lx\n", prompt,
++				info->start[sector]);
++			if (flash_isset (info, sector, 0, FLASH_STATUS_ECLBS | FLASH_STATUS_PSLBS)) {
++				puts ("Command Sequence Error.\n");
++			} else if (flash_isset (info, sector, 0, FLASH_STATUS_ECLBS)) {
++				puts ("Block Erase Error.\n");
++				retcode = ERR_NOT_ERASED;
++			} else if (flash_isset (info, sector, 0, FLASH_STATUS_PSLBS)) {
++				puts ("Locking Error\n");
++			}
++			if (flash_isset (info, sector, 0, FLASH_STATUS_DPS)) {
++				puts ("Block locked.\n");
++				retcode = ERR_PROTECTED;
++			}
++			if (flash_isset (info, sector, 0, FLASH_STATUS_VPENS))
++				puts ("Vpp Low Error.\n");
++		}
++		flash_write_cmd (info, sector, 0, info->cmd_reset);
++		break;
++	default:
++		break;
++	}
++	return retcode;
++}
++
++static void write_buffer_abort_reset(flash_info_t * info, flash_sect_t sector)
++{
++     flash_write_cmd (info, sector, 0xaaa, 0xaa);
++     flash_write_cmd (info, sector, 0x555, 0x55);
++     flash_write_cmd (info, sector, 0xaaa, 0xf0);    	
++}	
++
++/*-----------------------------------------------------------------------
++ */
++static void flash_add_byte (flash_info_t * info, cfiword_t * cword, uchar c)
++{
++#if defined(__LITTLE_ENDIAN)
++	unsigned short	w;
++	unsigned int	l;
++	unsigned long long ll;
++#endif
++
++	switch (info->portwidth) {
++	case FLASH_CFI_8BIT:
++		cword->c = c;
++		break;
++	case FLASH_CFI_16BIT:
++#if defined(__LITTLE_ENDIAN)
++		w = c;
++		w <<= 8;
++		cword->w = (cword->w >> 8) | w;
++#else
++		cword->w = (cword->w << 8) | c;
++#endif
++		break;
++	case FLASH_CFI_32BIT:
++#if defined(__LITTLE_ENDIAN)
++		l = c;
++		l <<= 24;
++		cword->l = (cword->l >> 8) | l;
++#else
++		cword->l = (cword->l << 8) | c;
++#endif
++		break;
++	case FLASH_CFI_64BIT:
++#if defined(__LITTLE_ENDIAN)
++		ll = c;
++		ll <<= 56;
++		cword->ll = (cword->ll >> 8) | ll;
++#else
++		cword->ll = (cword->ll << 8) | c;
++#endif
++		break;
++	}
++}
++
++
++/*-----------------------------------------------------------------------
++ * make a proper sized command based on the port and chip widths
++ */
++static void flash_make_cmd (flash_info_t * info, uchar cmd, void *cmdbuf)
++{
++	int i;
++	uchar *cp = (uchar *) cmdbuf;
++
++#if defined(__LITTLE_ENDIAN)
++	for (i = info->portwidth; i > 0; i--)
++#else
++	for (i = 1; i <= info->portwidth; i++)
++#endif
++		*cp++ = (i & (info->chipwidth - 1)) ? '\0' : cmd;
++}
++
++/*
++ * Write a proper sized command to the correct address
++ */
++static void
++flash_write_cmd (flash_info_t * info, flash_sect_t sect, uint offset,
++		 uchar cmd)
++{
++#ifdef DEBUG_FLASH
++    const int noDebug = 0;
++#else
++    const int noDebug = 1;
++#endif
++    return flash_write_cmd_int(info, sect, offset, cmd, noDebug);
++}
++static void
++flash_write_cmd_nodbg (flash_info_t * info, flash_sect_t sect, uint offset,
++		       uchar cmd)
++{
++    return flash_write_cmd_int(info, sect, offset, cmd, 1);
++}
++
++static void
++flash_write_cmd_int (flash_info_t * info, flash_sect_t sect, uint offset,
++		     uchar cmd, int noDebug)
++{
++
++	volatile cfiptr_t addr;
++	cfiword_t cword;
++
++	addr.cp = flash_make_addr (info, sect, offset);
++	flash_make_cmd (info, cmd, &cword);
++	switch (info->portwidth) {
++	case FLASH_CFI_8BIT:
++		if (noDebug == 0)
++		debug ("fwc addr %p cmd %x %x 8bit x %d bit\n", addr.cp, cmd,
++		       cword.c, info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
++		*addr.cp = cword.c;
++		break;
++	case FLASH_CFI_16BIT:
++		if (noDebug == 0)
++		debug ("fwc addr %p cmd %x %4.4x 16bit x %d bit\n", addr.wp,
++		       cmd, cword.w,
++		       info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
++		*addr.wp = cword.w;
++		break;
++	case FLASH_CFI_32BIT:
++		if (noDebug == 0)
++		debug ("fwc addr %p cmd %x %8.8lx 32bit x %d bit\n", addr.lp,
++		       cmd, cword.l,
++		       info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
++		*addr.lp = cword.l;
++		break;
++	case FLASH_CFI_64BIT:
++#ifdef DEBUG_FLASH
++		if (noDebug == 0)
++		{
++			char str[20];
++
++			print_longlong (str, cword.ll);
++
++			debug ("fwrite addr %p cmd %x %s 64 bit x %d bit\n",
++			       addr.llp, cmd, str,
++			       info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
++		}
++#endif
++		*addr.llp = cword.ll;
++		break;
++	}
++}
++
++static void flash_unlock_seq (flash_info_t * info, flash_sect_t sect)
++{
++	flash_write_cmd_nodbg (info, sect, AMD_ADDR_START, AMD_CMD_UNLOCK_START);
++	flash_write_cmd_nodbg (info, sect, AMD_ADDR_ACK, AMD_CMD_UNLOCK_ACK);
++}
++
++/*-----------------------------------------------------------------------
++ */
++static int flash_isequal (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd)
++{
++	cfiptr_t cptr;
++	cfiword_t cword;
++	int retval;
++#ifdef DEBUG_FLASH
++	const int dbg = 1;
++#else
++	const int dbg = 0;
++#endif
++	cptr.cp = flash_make_addr (info, sect, offset);
++	flash_make_cmd (info, cmd, &cword);
++
++	if (dbg)
++	    debug ("is= cmd %x(%c) addr %p ", cmd, cmd, cptr.cp);
++	switch (info->portwidth) {
++	case FLASH_CFI_8BIT:
++		if (dbg)
++		    debug ("is= %x %x\n", cptr.cp[0], cword.c);
++		retval = (cptr.cp[0] == cword.c);
++		break;
++	case FLASH_CFI_16BIT:
++		if (dbg)
++		    debug ("is= %4.4x %4.4x\n", cptr.wp[0], cword.w);
++		retval = (cptr.wp[0] == cword.w);
++		break;
++	case FLASH_CFI_32BIT:
++		if (dbg)
++		    debug ("is= %8.8lx %8.8lx\n", cptr.lp[0], cword.l);
++		retval = (cptr.lp[0] == cword.l);
++		break;
++	case FLASH_CFI_64BIT:
++#ifdef DEBUG_FLASH
++		{
++			char str1[20];
++			char str2[20];
++
++			print_longlong (str1, cptr.llp[0]);
++			print_longlong (str2, cword.ll);
++			debug ("is= %s %s\n", str1, str2);
++		}
++#endif
++		retval = (cptr.llp[0] == cword.ll);
++		break;
++	default:
++		retval = 0;
++		break;
++	}
++	return retval;
++}
++
++/*-----------------------------------------------------------------------
++ */
++static int flash_isset (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd)
++{
++	cfiptr_t cptr;
++	cfiword_t cword;
++	int retval;
++
++	cptr.cp = flash_make_addr (info, sect, offset);
++	flash_make_cmd (info, cmd, &cword);
++	switch (info->portwidth) {
++	case FLASH_CFI_8BIT:
++		retval = ((cptr.cp[0] & cword.c) == cword.c);
++		break;
++	case FLASH_CFI_16BIT:
++		retval = ((cptr.wp[0] & cword.w) == cword.w);
++		break;
++	case FLASH_CFI_32BIT:
++		retval = ((cptr.lp[0] & cword.l) == cword.l);
++		break;
++	case FLASH_CFI_64BIT:
++		retval = ((cptr.llp[0] & cword.ll) == cword.ll);
++		break;
++	default:
++		retval = 0;
++		break;
++	}
++	return retval;
++}
++
++/*-----------------------------------------------------------------------
++ */
++static int flash_toggle (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd)
++{
++	cfiptr_t cptr;
++	cfiword_t cword;
++	int retval;
++
++	cptr.cp = flash_make_addr (info, sect, offset);
++	flash_make_cmd (info, cmd, &cword);
++	switch (info->portwidth) {
++	case FLASH_CFI_8BIT:
++		retval = ((cptr.cp[0] & cword.c) != (cptr.cp[0] & cword.c));
++		break;
++	case FLASH_CFI_16BIT:
++		retval = ((cptr.wp[0] & cword.w) != (cptr.wp[0] & cword.w));
++		break;
++	case FLASH_CFI_32BIT:
++		retval = ((cptr.lp[0] & cword.l) != (cptr.lp[0] & cword.l));
++		break;
++	case FLASH_CFI_64BIT:
++		retval = ((cptr.llp[0] & cword.ll) !=
++			  (cptr.llp[0] & cword.ll));
++		break;
++	default:
++		retval = 0;
++		break;
++	}
++	return retval;
++}
++
++/*-----------------------------------------------------------------------
++ * detect if flash is compatible with the Common Flash Interface (CFI)
++ * http://www.jedec.org/download/search/jesd68.pdf
++ *
++*/
++static int flash_detect_cfi (flash_info_t * info)
++{
++        ulong data;
++        	
++	debug ("flash_detect_cfi()... ");
++
++#if     defined(CONFIG_FLASH_AST2300)
++        data = *(ulong *)(0x1e6e2070);		/* hardware traping */
++        if (data & 0x10)			/* D[4]: 0/1 (8/16) */
++            info->portwidth = FLASH_CFI_16BIT;
++        else
++            info->portwidth = FLASH_CFI_8BIT;            
++#else
++        info->portwidth = FLASH_CFI_8BIT;
++#endif
++
++	{     	
++		for (info->chipwidth = FLASH_CFI_BY8;
++		     info->chipwidth <= info->portwidth;
++		     info->chipwidth <<= 1) {
++			flash_write_cmd (info, 0, 0, FLASH_CMD_RESET);
++			flash_write_cmd (info, 0, FLASH_OFFSET_CFI, FLASH_CMD_CFI);
++			if (flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP, 'Q')
++			    //FIXME: Next 3 lines were changed for 8-bit/16-bit flash chips.
++			    && flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP1, 'R')
++			    && flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP2, 'Y')) {
++				info->interface = flash_read_uchar (info, FLASH_OFFSET_INTERFACE);
++				debug ("device interface is %d\n",
++				       info->interface);
++				debug ("found port %d chip %d ",
++				       info->portwidth, info->chipwidth);
++				debug ("port %d bits chip %d bits\n",
++				       info->portwidth << CFI_FLASH_SHIFT_WIDTH,
++				       info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
++				return 1;
++			}
++		}
++	}
++	debug ("not found\n");
++	return 0;
++}
++
++/*
++ * The following code cannot be run from FLASH!
++ *
++ */
++ulong flash_get_size (ulong base, int banknum)
++{
++	flash_info_t *info = &flash_info[banknum];
++	int i, j;
++	flash_sect_t sect_cnt;
++	unsigned long sector;
++	unsigned long tmp;
++	int size_ratio;
++	uchar num_erase_regions;
++	int erase_region_size;
++	int erase_region_count;
++
++	info->start[0] = base;
++
++	if (flash_detect_cfi (info)) {
++		info->vendor = flash_read_uchar (info, FLASH_OFFSET_PRIMARY_VENDOR);
++#if defined(DEBUG_FLASH)
++		flash_printqry (info, 0);
++#endif
++		switch (info->vendor) {
++		case CFI_CMDSET_INTEL_STANDARD:
++		case CFI_CMDSET_INTEL_EXTENDED:
++		default:
++			info->cmd_reset = FLASH_CMD_RESET;
++			break;
++		case CFI_CMDSET_AMD_STANDARD:
++		case CFI_CMDSET_AMD_EXTENDED:
++			info->cmd_reset = AMD_CMD_RESET;
++			break;
++		}
++
++		debugX(2, "manufacturer is %d\n", info->vendor);
++		size_ratio = info->portwidth / info->chipwidth;
++		/* if the chip is x8/x16 reduce the ratio by half */
++#if 0
++		if ((info->interface == FLASH_CFI_X8X16)
++		    && (info->chipwidth == FLASH_CFI_BY8)) {
++			size_ratio >>= 1;
++		}
++#endif
++		num_erase_regions = flash_read_uchar (info, FLASH_OFFSET_NUM_ERASE_REGIONS);
++		debugX(2, "size_ratio %d port %d bits chip %d bits\n",
++		       size_ratio, info->portwidth << CFI_FLASH_SHIFT_WIDTH,
++		       info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
++		debugX(2, "found %d erase regions\n", num_erase_regions);
++		sect_cnt = 0;
++		sector = base;
++		for (i = 0; i < num_erase_regions; i++) {
++			if (i > MAX_NUM_ERASE_REGIONS) {
++				printf ("%d erase regions found, only %d used\n",
++					num_erase_regions, MAX_NUM_ERASE_REGIONS);
++				break;
++			}
++			// CFI Erase Block Region Information:
++			// Bits[31:16] = sect_size/256, 0 means 128-byte
++			// Bits[15:0]  = num_sectors - 1
++			tmp = flash_read_long(info, 0,
++					      FLASH_OFFSET_ERASE_REGIONS + i * 4);
++			debug("CFI erase block region info[%d]: 0x%08x, ",
++			      i, tmp);
++			erase_region_count = (tmp & 0xffff) + 1;
++			tmp >>= 16;
++			erase_region_size = (tmp ? tmp * 256 : 128);
++			debug ("erase_region_count=%d erase_region_size=%d\n",
++				erase_region_count, erase_region_size);
++#if 0
++                        erase_region_size  = CFG_FLASH_SECTOR_SIZE;	// Commented out
++                        erase_region_count = CFG_FLASH_SECTOR_COUNT;	// Commented out
++#endif
++			if (sect_cnt + erase_region_count > CONFIG_SYS_MAX_FLASH_SECT) {
++			    printf("Warning: Erase region %d adds too many flash sectors"
++				   " %d+%d; reducing to fit total limit of %d\n",
++				   i, sect_cnt, erase_region_count, CONFIG_SYS_MAX_FLASH_SECT);
++			    erase_region_count = CONFIG_SYS_MAX_FLASH_SECT - sect_cnt;
++			}
++			for (j = 0; j < erase_region_count; j++) {
++				info->start[sect_cnt] = sector;
++				sector += (erase_region_size * size_ratio);
++
++				/*
++				 * Only read protection status from supported devices (intel...)
++				 */
++				switch (info->vendor) {
++				case CFI_CMDSET_INTEL_EXTENDED:
++				case CFI_CMDSET_INTEL_STANDARD:
++					info->protect[sect_cnt] =
++						flash_isset (info, sect_cnt,
++							     FLASH_OFFSET_PROTECT,
++							     FLASH_STATUS_PROTECT);
++					break;
++				default:
++					info->protect[sect_cnt] = 0; /* default: not protected */
++				}
++
++				sect_cnt++;
++			}
++		}
++
++		info->sector_count = sect_cnt;
++		/* multiply the size by the number of chips */
++		// info->size = (1 << flash_read_uchar (info, FLASH_OFFSET_SIZE)) * size_ratio;
++		// Use only the sectors that fit within the flash_info array size.
++		info->size = sector - base;
++		printf("Flash bank %d at %08x has 0x%x bytes in %d sectors"
++		       " (chipSize 1<<%d, size_ratio %d).\n",
++		       banknum, base, info->size, info->sector_count,
++		       flash_read_uchar(info, FLASH_OFFSET_SIZE), size_ratio);
++
++		info->buffer_size = (1 << flash_read_uchar (info, FLASH_OFFSET_BUFFER_SIZE));		
++		/* Limit the buffer size to 32bytes to meet most of AMD-styles flash's minimum requirement */
++		if (info->buffer_size > 32)
++		    info->buffer_size = 32;    
++		tmp = 1 << flash_read_uchar (info, FLASH_OFFSET_ETOUT);
++		info->erase_blk_tout = (tmp * (1 << flash_read_uchar (info, FLASH_OFFSET_EMAX_TOUT)));
++		tmp = 1 << flash_read_uchar (info, FLASH_OFFSET_WBTOUT);
++		info->buffer_write_tout = (tmp * (1 << flash_read_uchar (info, FLASH_OFFSET_WBMAX_TOUT)));
++		tmp = 1 << flash_read_uchar (info, FLASH_OFFSET_WTOUT);
++		info->write_tout = (tmp * (1 << flash_read_uchar (info, FLASH_OFFSET_WMAX_TOUT))) / 1000;
++		info->flash_id = FLASH_MAN_CFI;
++#if 0
++		if ((info->interface == FLASH_CFI_X8X16) && (info->chipwidth == FLASH_CFI_BY8)) {
++			info->portwidth >>= 1;	/* XXX - Need to test on x8/x16 in parallel. */
++		}
++#endif
++	}
++
++	flash_write_cmd (info, 0, 0, info->cmd_reset);
++	return (info->size);
++}
++
++
++/*-----------------------------------------------------------------------
++ */
++static int flash_write_cfiword (flash_info_t * info, ulong dest,
++				cfiword_t cword)
++{
++
++	cfiptr_t ctladdr;
++	cfiptr_t cptr;
++	int flag;
++
++	ctladdr.cp = flash_make_addr (info, 0, 0);
++	cptr.cp = (uchar *) dest;
++
++
++	/* Check if Flash is (sufficiently) erased */
++	switch (info->portwidth) {
++	case FLASH_CFI_8BIT:
++		flag = ((cptr.cp[0] & cword.c) == cword.c);
++		break;
++	case FLASH_CFI_16BIT:
++		flag = ((cptr.wp[0] & cword.w) == cword.w);
++		break;
++	case FLASH_CFI_32BIT:
++		flag = ((cptr.lp[0] & cword.l) == cword.l);
++		break;
++	case FLASH_CFI_64BIT:
++		flag = ((cptr.llp[0] & cword.ll) == cword.ll);
++		break;
++	default:
++		return 2;
++	}
++	if (!flag)
++		return 2;
++
++	/* Disable interrupts which might cause a timeout here */
++	flag = disable_interrupts ();
++
++	switch (info->vendor) {
++	case CFI_CMDSET_INTEL_EXTENDED:
++	case CFI_CMDSET_INTEL_STANDARD:
++		flash_write_cmd_nodbg (info, 0, 0, FLASH_CMD_CLEAR_STATUS);
++		flash_write_cmd_nodbg (info, 0, 0, FLASH_CMD_WRITE);
++		break;
++	case CFI_CMDSET_AMD_EXTENDED:
++	case CFI_CMDSET_AMD_STANDARD:
++		flash_unlock_seq (info, 0);
++		flash_write_cmd_nodbg (info, 0, AMD_ADDR_START, AMD_CMD_WRITE);
++		break;
++	}
++
++	switch (info->portwidth) {
++	case FLASH_CFI_8BIT:
++		cptr.cp[0] = cword.c;
++		break;
++	case FLASH_CFI_16BIT:
++		cptr.wp[0] = cword.w;
++		break;
++	case FLASH_CFI_32BIT:
++		cptr.lp[0] = cword.l;
++		break;
++	case FLASH_CFI_64BIT:
++		cptr.llp[0] = cword.ll;
++		break;
++	}
++
++	/* re-enable interrupts if necessary */
++	if (flag)
++		enable_interrupts ();
++
++	return flash_full_status_check (info, 0, info->write_tout, "write");
++}
++
++#ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++
++/* loop through the sectors from the highest address
++ * when the passed address is greater or equal to the sector address
++ * we have a match
++ */
++static flash_sect_t find_sector (flash_info_t * info, ulong addr)
++{
++	flash_sect_t sector;
++
++	for (sector = info->sector_count - 1; sector >= 0; sector--) {
++		if (addr >= info->start[sector])
++			break;
++	}
++	return sector;
++}
++
++static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp,
++				  int len)
++{
++	flash_sect_t sector;
++	int cnt;
++	int retcode;
++	volatile cfiptr_t src;
++	volatile cfiptr_t dst;
++
++/* Add AMD write buffer mode support, ycchen@102006 */
++#if 0
++	/* buffered writes in the AMD chip set is not supported yet */
++	if((info->vendor ==  CFI_CMDSET_AMD_STANDARD) ||
++		(info->vendor == CFI_CMDSET_AMD_EXTENDED))
++		return ERR_INVAL;
++#endif
++	if((info->vendor ==  CFI_CMDSET_AMD_STANDARD) ||
++		(info->vendor == CFI_CMDSET_AMD_EXTENDED))
++	{
++		retcode = flash_write_cfibuffer_amd(info, dest, cp, len);
++                return retcode;
++        }
++
++	src.cp = cp;
++	dst.cp = (uchar *) dest;
++	sector = find_sector (info, dest);
++	flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS);
++	flash_write_cmd (info, sector, 0, FLASH_CMD_WRITE_TO_BUFFER);
++	if ((retcode =
++	     flash_status_check (info, sector, info->buffer_write_tout,
++				 "write to buffer")) == ERR_OK) {
++		/* reduce the number of loops by the width of the port	*/
++		switch (info->portwidth) {
++		case FLASH_CFI_8BIT:
++			cnt = len;
++			break;
++		case FLASH_CFI_16BIT:
++			cnt = len >> 1;
++			break;
++		case FLASH_CFI_32BIT:
++			cnt = len >> 2;
++			break;
++		case FLASH_CFI_64BIT:
++			cnt = len >> 3;
++			break;
++		default:
++			return ERR_INVAL;
++			break;
++		}
++		flash_write_cmd (info, sector, 0, (uchar) cnt - 1);
++		while (cnt-- > 0) {
++			switch (info->portwidth) {
++			case FLASH_CFI_8BIT:
++				*dst.cp++ = *src.cp++;
++				break;
++			case FLASH_CFI_16BIT:
++				*dst.wp++ = *src.wp++;
++				break;
++			case FLASH_CFI_32BIT:
++				*dst.lp++ = *src.lp++;
++				break;
++			case FLASH_CFI_64BIT:
++				*dst.llp++ = *src.llp++;
++				break;
++			default:
++				return ERR_INVAL;
++				break;
++			}
++		}
++		flash_write_cmd (info, sector, 0,
++				 FLASH_CMD_WRITE_BUFFER_CONFIRM);
++		retcode =
++			flash_full_status_check (info, sector,
++						 info->buffer_write_tout,
++						 "buffer write");
++	}
++	flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS);
++	return retcode;
++}
++
++
++static int flash_write_cfibuffer_amd (flash_info_t * info, ulong dest, uchar * cp,
++				  int len)
++{
++	flash_sect_t sector;
++	int cnt;
++	int retcode;
++	volatile cfiptr_t src;
++	volatile cfiptr_t dst;
++	volatile cfiword_t tmpsrc, tmpdst;
++
++	src.cp = cp;
++	dst.cp = (uchar *) dest;
++	sector = find_sector (info, dest);
++	flash_unlock_seq (info, 0);
++	if ((retcode =
++	     flash_status_check (info, sector, info->buffer_write_tout,
++				 "write to buffer")) == ERR_OK) {
++		/* reduce the number of loops by the width of the port	*/
++		switch (info->portwidth) {
++		case FLASH_CFI_8BIT:
++			cnt = len;
++			*dst.cp = (uchar) (AMD_CMD_WRITE_TO_BUFFER);
++			*dst.cp = (uchar) (cnt -1);
++			break;
++		case FLASH_CFI_16BIT:
++			cnt = len >> 1;
++			*dst.wp = (unsigned short) (AMD_CMD_WRITE_TO_BUFFER);
++			*dst.wp = (unsigned short) (cnt -1);
++			break;
++		case FLASH_CFI_32BIT:
++			cnt = len >> 2;
++			*dst.lp = (unsigned long) (AMD_CMD_WRITE_TO_BUFFER);
++			*dst.lp = (unsigned long) (cnt -1);
++			break;
++		case FLASH_CFI_64BIT:
++			cnt = len >> 3;
++			*dst.llp = (unsigned long long) (AMD_CMD_WRITE_TO_BUFFER);
++			*dst.llp = (unsigned long long) (cnt -1);
++			break;
++		default:
++			return ERR_INVAL;
++			break;
++		}
++		while (cnt-- > 0) {
++			switch (info->portwidth) {
++			case FLASH_CFI_8BIT:
++				*dst.cp++ = *src.cp++;
++				break;
++			case FLASH_CFI_16BIT:
++				*dst.wp++ = *src.wp++;
++				break;
++			case FLASH_CFI_32BIT:
++				*dst.lp++ = *src.lp++;
++				break;
++			case FLASH_CFI_64BIT:
++				*dst.llp++ = *src.llp++;
++				break;
++			default:
++				return ERR_INVAL;
++				break;
++			}
++		}				
++		switch (info->portwidth) {
++		case FLASH_CFI_8BIT:
++		        src.cp--;
++		        dst.cp--;
++			*dst.cp = (unsigned char) (AMD_CMD_BUFFER_TO_FLASH);
++		        tmpsrc.c = *src.cp & 0x80;
++		        
++		        do {
++		            tmpdst.c = *(volatile uchar *)(dst.cp);		        
++		        	
++		            if (tmpdst.c & 0x20) {	/* toggle DQ5 */
++		                 tmpdst.c = *(volatile uchar *)(dst.cp);		        
++		                 if ((tmpdst.c & 0x80) != tmpsrc.c)
++		                 {
++		                     printf("program error occurred\n");
++			             flash_write_cmd (info, sector, 0, info->cmd_reset);		            
++			             return ERR_PROG_ERROR;			             
++			         }    
++		            }
++		            else if (tmpdst.c & 0x02) {	/* toggle DQ1 */
++		                 tmpdst.c = *(volatile uchar *)(dst.cp);		        
++		                 if ((tmpdst.c & 0x80) != tmpsrc.c)
++		                 {
++		                     printf("write buffer error occurred \n");
++		                     write_buffer_abort_reset(info, sector);
++			             return ERR_PROG_ERROR;			             
++			         } 		            
++		            }	
++		            		                	
++		        } while ((tmpdst.c & 0x80) != tmpsrc.c);
++		        			        
++			break;
++		case FLASH_CFI_16BIT:
++		        src.wp--;
++		        dst.wp--;
++			*dst.wp = (unsigned short) (AMD_CMD_BUFFER_TO_FLASH);
++		        tmpsrc.w = *src.wp & 0x80;
++
++		        do {
++		            tmpdst.w = *(volatile short *)(dst.wp);		        
++		        	
++		            if (tmpdst.w & 0x20) {	/* toggle DQ5 */
++		                 tmpdst.w = *(volatile ushort *)(dst.wp);		        
++		                 if ((tmpdst.w & 0x80) != tmpsrc.w)
++		                 {
++		                     printf("program error occurred\n");
++			             flash_write_cmd (info, sector, 0, info->cmd_reset);		            
++			             return ERR_PROG_ERROR;			             
++			         }    
++		            }
++		            else if (tmpdst.w & 0x02) {	/* toggle DQ1 */
++		                 tmpdst.w = *(volatile ushort *)(dst.wp);		        
++		                 if ((tmpdst.w & 0x80) != tmpsrc.w)
++		                 {
++		                     printf("write buffer error occurred \n");
++		                     write_buffer_abort_reset(info, sector);
++			             return ERR_PROG_ERROR;			             
++			         } 		            
++		            }	
++		            		                	
++		        } while ((tmpdst.w & 0x80) != tmpsrc.w);
++		        
++			break;
++		case FLASH_CFI_32BIT:
++		        src.lp--;
++		        dst.lp--;
++			*dst.lp = (unsigned long) (AMD_CMD_BUFFER_TO_FLASH);
++		        tmpsrc.l = *src.lp & 0x80;
++		        
++		        do {
++		            tmpdst.l = *(volatile ulong *)(dst.lp);		        
++		        	
++		            if (tmpdst.l & 0x20) {	/* toggle DQ5 */
++		                 tmpdst.l = *(volatile ulong *)(dst.lp);		        
++		                 if ((tmpdst.l & 0x80) != tmpsrc.l)
++		                 {
++		                     printf("program error occurred\n");
++			             flash_write_cmd (info, sector, 0, info->cmd_reset);		            
++			             return ERR_PROG_ERROR;			             
++			         }    
++		            }
++		            else if (tmpdst.l & 0x02) {	/* toggle DQ1 */
++		                 tmpdst.l = *(volatile ulong *)(dst.lp);		        
++		                 if ((tmpdst.l & 0x80) != tmpsrc.l)
++		                 {
++		                     printf("write buffer error occurred \n");
++		                     write_buffer_abort_reset(info, sector);
++			             return ERR_PROG_ERROR;			             
++			         } 		            
++		            }	
++		            		                	
++		        } while ((tmpdst.l & 0x80) != tmpsrc.l);
++		        
++			break;
++		case FLASH_CFI_64BIT:
++		        src.llp--;
++		        dst.llp--;
++			*dst.llp = (unsigned long long) (AMD_CMD_BUFFER_TO_FLASH);
++		        tmpsrc.ll = *src.llp & 0x80;
++		        
++		        do {
++		            tmpdst.ll = *(volatile unsigned long long *)(dst.llp);		        
++		        	
++		            if (tmpdst.ll & 0x20) {	/* toggle DQ5 */
++		                 tmpdst.ll = *(volatile unsigned long long *)(dst.llp);		        
++		                 if ((tmpdst.ll & 0x80) != tmpsrc.ll)
++		                 {
++		                     printf("program error occurred\n");
++			             flash_write_cmd (info, sector, 0, info->cmd_reset);		            
++			             return ERR_PROG_ERROR;			             
++			         }    
++		            }
++		            else if (tmpdst.ll & 0x02) {	/* toggle DQ1 */
++		                 tmpdst.ll = *(volatile unsigned long long *)(dst.llp);		        
++		                 if ((tmpdst.ll & 0x80) != tmpsrc.ll)
++		                 {
++		                     printf("write buffer error occurred \n");
++		                     write_buffer_abort_reset(info, sector);
++			             return ERR_PROG_ERROR;			             
++			         } 		            
++		            }	
++		            		                	
++		        } while ((tmpdst.ll & 0x80) != tmpsrc.ll);
++		        
++			break;
++		default:
++			return ERR_INVAL;
++			break;
++		}
++
++		retcode =
++			flash_full_status_check (info, sector,
++						 info->buffer_write_tout,
++						 "buffer write");
++	}
++
++	return retcode;
++}
++#endif /* CONFIG_SYS_FLASH_USE_BUFFER_WRITE */
++
++#ifdef	CONFIG_FLASH_AST2300_DMA
++#define STCBaseAddress			0x1e620000
++
++/* for DMA */
++#define REG_FLASH_INTERRUPT_STATUS	0x08
++#define REG_FLASH_DMA_CONTROL		0x80
++#define REG_FLASH_DMA_FLASH_BASE	0x84
++#define REG_FLASH_DMA_DRAM_BASE		0x88
++#define REG_FLASH_DMA_LENGTH		0x8c
++
++#define FLASH_STATUS_DMA_BUSY		0x0000
++#define FLASH_STATUS_DMA_READY		0x0800
++#define FLASH_STATUS_DMA_CLEAR		0x0800
++
++#define FLASH_DMA_ENABLE		0x01
++
++void * memmove_dma(void * dest,const void *src,size_t count)
++{
++	ulong count_align, poll_time, data;
++	
++	count_align = (count + 3) & 0xFFFFFFFC;	/* 4-bytes align */
++        poll_time = 100;			/* set 100 us as default */
++
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_CONTROL) = (ulong) (~FLASH_DMA_ENABLE);
++	
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_FLASH_BASE) = (ulong *) (src);
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_DRAM_BASE) = (ulong *) (dest);
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_LENGTH) = (ulong) (count_align);
++        udelay(10);
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_CONTROL) = (ulong) (FLASH_DMA_ENABLE);
++	
++	/* wait poll */
++	do {
++	    udelay(poll_time);	
++	    data = *(ulong *) (STCBaseAddress + REG_FLASH_INTERRUPT_STATUS);
++	} while (!(data & FLASH_STATUS_DMA_READY));
++	
++	/* clear status */
++	*(ulong *) (STCBaseAddress + REG_FLASH_INTERRUPT_STATUS) |= FLASH_STATUS_DMA_CLEAR;
++}	
++#endif
++#endif /* CFG_FLASH_CFI */
+diff --git a/board/aspeed/ast2400/flash_spi.c b/board/aspeed/ast2400/flash_spi.c
+new file mode 100755
+index 0000000..ad89254
+--- /dev/null
++++ b/board/aspeed/ast2400/flash_spi.c
+@@ -0,0 +1,1634 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ * History
++ * 01/20/2004 - combined variants of original driver.
++ * 01/22/2004 - Write performance enhancements for parallel chips (Tolunay)
++ * 01/23/2004 - Support for x8/x16 chips (Rune Raknerud)
++ * 01/27/2004 - Little endian support Ed Okerson
++ *
++ * Tested Architectures
++ * Port Width  Chip Width    # of banks	   Flash Chip  Board
++ * 32	       16	     1		   28F128J3    seranoa/eagle
++ * 64	       16	     1		   28F128J3    seranoa/falcon
++ *
++ */
++
++/* The DEBUG define must be before common to enable debugging */
++/* #define DEBUG	*/
++
++#include <common.h>
++#include <asm/processor.h>
++#include <asm/byteorder.h>
++#include <environment.h>
++#ifdef	CONFIG_FLASH_SPI
++
++/*
++ * This file implements a Common Flash Interface (CFI) driver for U-Boot.
++ * The width of the port and the width of the chips are determined at initialization.
++ * These widths are used to calculate the address for access CFI data structures.
++ * It has been tested on an Intel Strataflash implementation and AMD 29F016D.
++ *
++ * References
++ * JEDEC Standard JESD68 - Common Flash Interface (CFI)
++ * JEDEC Standard JEP137-A Common Flash Interface (CFI) ID Codes
++ * Intel Application Note 646 Common Flash Interface (CFI) and Command Sets
++ * Intel 290667-008 3 Volt Intel StrataFlash Memory datasheet
++ *
++ * TODO
++ *
++ * Use Primary Extended Query table (PRI) and Alternate Algorithm Query
++ * Table (ALT) to determine if protection is available
++ *
++ * Add support for other command sets Use the PRI and ALT to determine command set
++ * Verify erase and program timeouts.
++ */
++
++#ifndef CONFIG_FLASH_BANKS_LIST
++#define CONFIG_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE }
++#endif
++
++/* use CFG_MAX_FLASH_BANKS_DETECT if defined */
++#ifdef CONFIG_SYS_MAX_FLASH_BANKS_DETECT
++static ulong bank_base[CONFIG_SYS_MAX_FLASH_BANKS_DETECT] = CONFIG_FLASH_BANKS_LIST;
++flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS_DETECT];	/* FLASH chips info */
++#else
++static ulong bank_base[CONFIG_SYS_MAX_FLASH_BANKS] = CONFIG_FLASH_BANKS_LIST;
++flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];		/* FLASH chips info */
++#endif
++
++/* Support Flash ID */
++#define STM25P64		0x172020
++#define STM25P128		0x182020
++#define N25Q256			0x19ba20
++#define N25Q512			0x20ba20
++#define S25FL064A		0x160201
++#define S25FL128P		0x182001
++#define S25FL256S		0x190201
++#define W25X16			0x1530ef
++#define W25X64			0x1730ef
++#define W25Q64BV		0x1740ef
++#define W25Q128BV		0x1840ef
++#define W25Q256FV		0x1940ef
++#define MX25L1605D		0x1520C2
++#define MX25L12805D		0x1820C2
++#define MX25L25635E		0x1920C2
++#define SST25VF016B             0x4125bf
++#define SST25VF064C             0x4b25bf
++#define AT25DF161		0x02461F
++#define AT25DF321		0x01471F
++
++/* SPI Define */
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++#if	defined(CONFIG_AST1300)
++#define STCBaseAddress			0x00620000
++#else
++#define STCBaseAddress			0x1e620000
++#endif
++#define SCU_REVISION_REGISTER		0x1e6e207c
++#define SCU_CACHE_CTRL_REGISTER		0x1e6e2118
++
++#define SPICtrlRegOffset		0x10
++#define SPICtrlRegOffset2		0x14
++
++#define SPIMiscCtrlRegOffset		0x54
++
++/* for DMA */
++#define REG_FLASH_INTERRUPT_STATUS	0x08
++#define REG_FLASH_DMA_CONTROL		0x80
++#define REG_FLASH_DMA_FLASH_BASE	0x84
++#define REG_FLASH_DMA_DRAM_BASE		0x88
++#define REG_FLASH_DMA_LENGTH		0x8c
++
++#define FLASH_STATUS_DMA_BUSY		0x0000
++#define FLASH_STATUS_DMA_READY		0x0800
++#define FLASH_STATUS_DMA_CLEAR		0x0800
++
++#define FLASH_DMA_ENABLE		0x01
++#else
++#define STCBaseAddress			0x16000000
++
++#define SPICtrlRegOffset		0x04
++#define SPICtrlRegOffset2		0x0C
++#endif	/* CONFIG_FLASH_AST2300 */
++
++#define CMD_MASK		0xFFFFFFF8
++
++#define NORMALREAD		0x00
++#define	FASTREAD		0x01
++#define NORMALWRITE		0x02
++#define USERMODE		0x03
++
++#define CE_LOW			0x00
++#define CE_HIGH			0x04
++
++/* AST2300 only */
++#define IOMODEx1		0x00000000
++#define IOMODEx2		0x20000000
++#define IOMODEx2_dummy		0x30000000
++#define IOMODEx4		0x40000000
++#define IOMODEx4_dummy		0x50000000
++
++#define DUMMY_COMMAND_OUT	0x00008000
++/* ~AST2300 only */
++
++/* specificspi */
++#define SpecificSPI_N25Q512	0x00000001		
++
++static ulong AST2300_SPICLK_DIV[16] = {0x0F, 0x07, 0x0E, 0x06, 0x0D, 0x05, 0x0C, 0x04, \
++                                       0x0B, 0x03, 0x0A, 0x02, 0x09, 0x01, 0x08, 0x00 };
++
++/*-----------------------------------------------------------------------
++ * Functions
++ */
++static void reset_flash (flash_info_t * info);
++static void enable_write (flash_info_t * info);
++static void write_status_register (flash_info_t * info, uchar data);
++static void enable4b (flash_info_t * info);
++static void enable4b_spansion (flash_info_t * info);
++static void enable4b_numonyx (flash_info_t * info);
++static ulong flash_get_size (ulong base, int banknum);
++static int flash_write_buffer (flash_info_t *info, uchar *src, ulong addr, int len);
++#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
++static flash_info_t *flash_get_info(ulong base);
++#endif
++
++
++/*-----------------------------------------------------------------------
++ * create an address based on the offset and the port width
++ */
++inline uchar *flash_make_addr (flash_info_t * info, flash_sect_t sect, uint offset)
++{
++#ifdef CONFIG_2SPIFLASH
++        if (info->start[0] >= PHYS_FLASH_2)
++	    return ((uchar *) (info->start[sect] + (offset * 1) - (PHYS_FLASH_2 - PHYS_FLASH_2_BASE) ));        
++        else
++	    return ((uchar *) (info->start[sect] + (offset * 1)));
++#else
++	return ((uchar *) (info->start[sect] + (offset * 1)));
++#endif	
++}
++
++/*-----------------------------------------------------------------------
++ * read a character at a port width address
++ */
++inline uchar flash_read_uchar (flash_info_t * info, uint offset)
++{
++	uchar *cp;
++
++	cp = flash_make_addr (info, 0, offset);
++#if defined(__LITTLE_ENDIAN)
++	return (cp[0]);
++#else
++	return (cp[1 - 1]);
++#endif
++}
++
++/*-----------------------------------------------------------------------
++ * read a short word by swapping for ppc format.
++ */
++ushort flash_read_ushort (flash_info_t * info, flash_sect_t sect, uint offset)
++{
++	uchar *addr;
++	ushort retval;
++
++#ifdef DEBUG
++	int x;
++#endif
++	addr = flash_make_addr (info, sect, offset);
++
++#ifdef DEBUG
++	debug ("ushort addr is at %p 1 = %d\n", addr,
++	       1);
++	for (x = 0; x < 2 * 1; x++) {
++		debug ("addr[%x] = 0x%x\n", x, addr[x]);
++	}
++#endif
++#if defined(__LITTLE_ENDIAN)
++	retval = ((addr[(1)] << 8) | addr[0]);
++#else
++	retval = ((addr[(2 * 1) - 1] << 8) |
++		  addr[1 - 1]);
++#endif
++
++	debug ("retval = 0x%x\n", retval);
++	return retval;
++}
++
++/*-----------------------------------------------------------------------
++ * read a long word by picking the least significant byte of each maiximum
++ * port size word. Swap for ppc format.
++ */
++ulong flash_read_long (flash_info_t * info, flash_sect_t sect, uint offset)
++{
++	uchar *addr;
++	ulong retval;
++
++#ifdef DEBUG
++	int x;
++#endif
++	addr = flash_make_addr (info, sect, offset);
++
++#ifdef DEBUG
++	debug ("long addr is at %p 1 = %d\n", addr,
++	       1);
++	for (x = 0; x < 4 * 1; x++) {
++		debug ("addr[%x] = 0x%x\n", x, addr[x]);
++	}
++#endif
++#if defined(__LITTLE_ENDIAN)
++	retval = (addr[0] << 16) | (addr[(1)] << 24) |
++		(addr[(2 * 1)]) | (addr[(3 * 1)] << 8);
++#else
++	retval = (addr[(2 * 1) - 1] << 24) |
++		(addr[(1) - 1] << 16) |
++		(addr[(4 * 1) - 1] << 8) |
++		addr[(3 * 1) - 1];
++#endif
++	return retval;
++}
++
++/*-----------------------------------------------------------------------
++ */
++static void disable_cache(void)
++{
++#if	defined(AST1300_CPU_CACHE_ENABLE)
++        ulong uldata;
++        
++        uldata  = *(volatile ulong *) (SCU_CACHE_CTRL_REGISTER);
++        uldata &= 0xfffffffd;
++        *(ulong *) (SCU_CACHE_CTRL_REGISTER) = uldata;        
++#endif
++}	
++
++static void enable_cache(void)
++{
++#if	defined(AST1300_CPU_CACHE_ENABLE)
++        ulong uldata;
++        
++        uldata  = *(volatile ulong *) (SCU_CACHE_CTRL_REGISTER);
++        uldata |= 0x00000002;
++        *(ulong *) (SCU_CACHE_CTRL_REGISTER) = uldata;        
++#endif
++}
++	 
++static void reset_flash (flash_info_t * info)
++{
++        ulong ulCtrlData, CtrlOffset, MiscCtrlOffset;
++        
++        if (info->CE == 2)
++        {
++            CtrlOffset = SPICtrlRegOffset2;
++        }    
++        else
++        {
++            CtrlOffset = SPICtrlRegOffset;
++        }    
++
++#if    defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++        ulCtrlData = info->iomode | (info->readcmd << 16) | (info->tCK_Read << 8) | (info->dummybyte << 6) | FASTREAD;
++#if 0        
++        if (info->quadport)
++        {        	
++            MiscCtrlOffset = SPIMiscCtrlRegOffset;
++            *(ulong *) (STCBaseAddress + MiscCtrlOffset) = info->dummydata;                	                   
++            ulCtrlData |= DUMMY_COMMAND_OUT;
++        }
++#endif        
++#else      
++        ulCtrlData  = (info->readcmd << 16) | (info->tCK_Read << 8) | (info->dummybyte << 6) | FASTREAD;         
++        if (info->dualport)
++            ulCtrlData  |= 0x08;        
++#endif        
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;        
++        
++        enable_cache();    
++}
++	 
++static void enable_write (flash_info_t * info)
++{
++	ulong base;
++        ulong ulCtrlData, CtrlOffset;
++        uchar jReg;
++        
++        if (info->CE == 2)
++        {
++            CtrlOffset = SPICtrlRegOffset2;
++        }    
++        else
++        {
++            CtrlOffset = SPICtrlRegOffset;
++        }    
++                  
++	//base = info->start[0];
++	base = flash_make_addr (info, 0, 0);
++
++        ulCtrlData  = (info->tCK_Write << 8);        
++        ulCtrlData |= CE_LOW | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        *(uchar *) (base) = (uchar) (0x06);
++        udelay(10);
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_HIGH | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_LOW | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        *(uchar *) (base) = (uchar) (0x05);
++        udelay(10);
++        do {                                
++            jReg = *(volatile uchar *) (base);
++        } while (!(jReg & 0x02));                  	                
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_HIGH | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++
++}
++		
++static void write_status_register (flash_info_t * info, uchar data)
++{
++	ulong base;
++        ulong ulSMMBase, ulCtrlData, CtrlOffset;
++        uchar jReg;
++        
++        if (info->CE == 2)
++        {
++            CtrlOffset = SPICtrlRegOffset2;
++        }    
++        else
++        {
++            CtrlOffset = SPICtrlRegOffset;
++        }    
++    
++	//base = info->start[0];
++	base = flash_make_addr (info, 0, 0);
++
++        enable_write (info);
++
++        ulCtrlData  = (info->tCK_Write << 8);
++        ulCtrlData |= CE_LOW | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        *(uchar *) (base) = (uchar) (0x01);
++        udelay(10);
++        *(uchar *) (base) = (uchar) (data);                
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_HIGH | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_LOW | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        *(uchar *) (base) = (uchar) (0x05);
++        udelay(10);
++        do {                                
++            jReg = *(volatile uchar *) (base);
++        } while (jReg & 0x01);
++        ulCtrlData &= CMD_MASK;                          	                
++        ulCtrlData |= CE_HIGH | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++
++}
++
++static void enable4b (flash_info_t * info)
++{
++	ulong base;
++        ulong ulSMMBase, ulCtrlData, CtrlOffset;
++        uchar jReg;
++        
++        if (info->CE == 2)
++        {
++            CtrlOffset = SPICtrlRegOffset2;
++        }    
++        else
++        {
++            CtrlOffset = SPICtrlRegOffset;
++        }    
++    
++	//base = info->start[0];
++	base = flash_make_addr (info, 0, 0);
++
++        ulCtrlData  = (info->tCK_Write << 8);
++        ulCtrlData |= CE_LOW | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        *(uchar *) (base) = (uchar) (0xb7);
++        ulCtrlData &= CMD_MASK;                          	                
++        ulCtrlData |= CE_HIGH | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++ 
++} /* enable4b */
++
++static void enable4b_spansion (flash_info_t * info)
++{
++	ulong base;
++    	ulong ulSMMBase, ulCtrlData, CtrlOffset;
++    	uchar jReg;
++        
++    	if (info->CE == 2)
++    	{
++            CtrlOffset = SPICtrlRegOffset2;
++    	}    
++    	else
++    	{
++            CtrlOffset = SPICtrlRegOffset;
++    	}    
++    
++	//base = info->start[0];
++	base = flash_make_addr (info, 0, 0);
++
++	/* Enable 4B: BAR0 D[7] = 1 */
++    	ulCtrlData  = (info->tCK_Write << 8);
++    	ulCtrlData |= CE_LOW | USERMODE;
++    	*(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++    	udelay(200);
++    	*(uchar *) (base) = (uchar) (0x17);
++    	udelay(10);
++    	*(uchar *) (base) = (uchar) (0x80);    
++    	ulCtrlData &= CMD_MASK;                          	                
++    	ulCtrlData |= CE_HIGH | USERMODE;
++    	*(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++    	udelay(200);
++
++    	ulCtrlData &= CMD_MASK;                          	                
++    	ulCtrlData |= CE_LOW | USERMODE;
++    	*(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++    	udelay(200);
++    	*(uchar *) (base) = (uchar) (0x16);
++    	udelay(10);
++    	do {                                
++            jReg = *(volatile uchar *) (base);
++    	} while (!(jReg & 0x80));
++    	ulCtrlData &= CMD_MASK;                          	                                          	                
++    	ulCtrlData |= CE_HIGH | USERMODE;
++   	 *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++    	udelay(200);
++	
++} /* enable4b_spansion */
++
++static void enable4b_numonyx (flash_info_t * info)
++{
++	ulong base;
++    	ulong ulSMMBase, ulCtrlData, CtrlOffset;
++    	uchar jReg;
++        
++    	if (info->CE == 2)
++    	{
++            CtrlOffset = SPICtrlRegOffset2;
++    	}    
++    	else
++    	{
++            CtrlOffset = SPICtrlRegOffset;
++    	}    
++    
++	//base = info->start[0];
++	base = flash_make_addr (info, 0, 0);
++
++	/* Enable Write */
++	enable_write (info);
++	
++	/* Enable 4B: CMD:0xB7 */
++    	ulCtrlData  = (info->tCK_Write << 8);
++    	ulCtrlData |= CE_LOW | USERMODE;
++    	*(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++    	udelay(200);
++    	*(uchar *) (base) = (uchar) (0xB7);
++    	udelay(10);
++    	ulCtrlData &= CMD_MASK;                          	                
++    	ulCtrlData |= CE_HIGH | USERMODE;
++    	*(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++    	udelay(200);
++
++} /* enable4b_numonyx */
++
++/*
++ *
++ */
++static ulong flash_get_size (ulong base, int banknum)
++{
++	flash_info_t *info = &flash_info[banknum];
++	int j;
++	unsigned long sector;
++	int erase_region_size;
++        ulong ulCtrlData, CtrlOffset;
++        ulong ulID;
++        uchar ch[3];
++        ulong cpuclk, div, reg;
++        ulong WriteClk, EraseClk, ReadClk;
++        ulong vbase;
++        ulong SCURevision;
++
++        ulong ulRefPLL;
++        ulong ulDeNumerator;
++        ulong ulNumerator;
++        ulong ulOD;                    
++                  
++        disable_cache();
++        
++	info->start[0] = base;
++	vbase = flash_make_addr (info, 0, 0);
++
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++        CtrlOffset = SPICtrlRegOffset;        	
++        info->CE = 0;                	
++#else
++        if (vbase == PHYS_FLASH_1)
++        {
++            CtrlOffset = SPICtrlRegOffset2;
++            info->CE = 2;
++        }    
++        else
++        {
++            CtrlOffset = SPICtrlRegOffset;        	
++            info->CE = 0;        	
++        }    
++#endif
++            
++        /* Get Flash ID */
++        ulCtrlData  = *(ulong *) (STCBaseAddress + CtrlOffset) & CMD_MASK;        
++        ulCtrlData |= CE_LOW | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        *(uchar *) (vbase) = (uchar) (0x9F);
++        udelay(10);
++        ch[0] = *(volatile uchar *)(vbase);
++        udelay(10);
++        ch[1] = *(volatile uchar *)(vbase);
++        udelay(10);
++        ch[2] = *(volatile uchar *)(vbase);
++        udelay(10);               
++        ulCtrlData  = *(ulong *) (STCBaseAddress + CtrlOffset) & CMD_MASK;        
++        ulCtrlData |= CE_HIGH | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        ulID = ((ulong)ch[0]) | ((ulong)ch[1] << 8) | ((ulong)ch[2] << 16) ;        
++        info->flash_id = ulID;
++        
++        //printf("SPI Flash ID: %x \n", ulID);
++
++        /* init default */        
++        info->iomode = IOMODEx1;
++        info->address32 = 0;
++        info->quadport = 0;
++        info->specificspi = 0;
++
++        switch (info->flash_id)
++        {
++        case STM25P64:
++	    info->sector_count = 128;
++	    info->size = 0x800000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;
++            WriteClk = 40;
++            EraseClk = 20;
++            ReadClk  = 40;
++            break;
++
++        case STM25P128:
++	    info->sector_count = 64;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x40000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++            break;
++            
++        case N25Q256:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++	    info->sector_count = 512;
++	    info->size = 0x2000000;
++	    info->address32 = 1;        	
++#endif
++	    break;
++
++        case N25Q512:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256; 
++            info->specificspi = SpecificSPI_N25Q512;           
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++	    info->sector_count = 1024;
++	    info->size = 0x4000000;
++	    info->address32 = 1;        	
++#endif
++	    break;
++	    	    	                            
++        case W25X16:
++	    info->sector_count = 32;
++	    info->size = 0x200000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x3b;            
++            info->dualport = 1;            
++            info->dummybyte = 1;
++            info->iomode = IOMODEx2; 
++            info->buffersize = 256;                                   
++            WriteClk = 50;
++            EraseClk = 25;
++            ReadClk  = 50;            
++            break;
++            
++        case W25X64:
++	    info->sector_count = 128;
++	    info->size = 0x800000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x3b;            
++            info->dualport = 1;            
++            info->dummybyte = 1;
++            info->iomode = IOMODEx2;
++            info->buffersize = 256;                                    
++            WriteClk = 50;
++            EraseClk = 25;
++            ReadClk  = 50;            
++            break;
++
++        case W25Q64BV:
++	    info->sector_count = 128;
++	    info->size = 0x800000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x3b;            
++            info->dualport = 1;            
++            info->dummybyte = 1;
++            info->iomode = IOMODEx2; 
++            info->buffersize = 256;                                   
++            WriteClk = 80;
++            EraseClk = 40;
++            ReadClk  = 80;
++            break;
++            
++        case W25Q128BV:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x3b;            
++            info->dualport = 1;            
++            info->dummybyte = 1;
++            info->iomode = IOMODEx2; 
++            info->buffersize = 256;                                   
++            WriteClk = 104;
++            EraseClk = 50;
++            ReadClk  = 104;
++            break;
++
++        case W25Q256FV:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++	    info->sector_count = 512;
++	    info->size = 0x2000000;
++	    info->address32 = 1;        	
++#endif
++	    break;
++	                
++        case S25FL064A:
++	    info->sector_count = 128;
++	    info->size = 0x800000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;            
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 50;
++            EraseClk = 25;
++            ReadClk  = 50;            
++            break;
++
++        case S25FL128P:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;            
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 100;
++            EraseClk = 40;
++            ReadClk  = 100;            
++            break;
++
++        case S25FL256S:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++	    info->sector_count = 512;
++	    info->size = 0x2000000;
++	    info->address32 = 1;        	
++#endif
++	    break;
++
++        case MX25L25635E:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++	    info->sector_count = 512;
++	    info->size = 0x2000000;
++	    info->address32 = 1;        	
++#if	defined(CONFIG_FLASH_SPIx2_Dummy)
++            info->readcmd = 0xbb;            
++            info->dummybyte = 1;
++            info->dualport = 1;            
++            info->iomode = IOMODEx2_dummy;
++#elif	defined(CONFIG_FLASH_SPIx4_Dummy)
++            info->readcmd = 0xeb;            
++            info->dummybyte = 3;
++            info->dualport = 0;            
++            info->iomode = IOMODEx4_dummy;
++            info->quadport = 1;
++            info->dummydata = 0xaa;            
++#endif            
++#endif             
++            break;
++
++        case MX25L12805D:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++/*
++SCU7C: Silicon Revision ID Register
++D[31:24]: Chip ID
++0: AST2050/AST2100/AST2150/AST2200/AST3000
++1: AST2300
++
++D[23:16] Silicon revision ID for AST2300 generation and later
++0: A0
++1: A1
++2: A2
++.
++.
++.
++FPGA revision starts from 0x80
++
++AST2300 A0 SPI can't run faster than 50Mhz
++*/
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++
++            SCURevision = *(ulong *) (SCU_REVISION_REGISTER);
++            if (((SCURevision >> 24) & 0xff) == 0x01) { //AST2300
++            	if (((SCURevision >> 16) & 0xff) == 0x00) { //A0
++            		WriteClk = 25;
++            		EraseClk = 20;
++            		ReadClk  = 25;
++            	}
++            }
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++#if	defined(CONFIG_FLASH_SPIx2_Dummy)
++            info->readcmd = 0xbb;            
++            info->dummybyte = 1;
++            info->dualport = 1;            
++            info->iomode = IOMODEx2_dummy;
++#elif	defined(CONFIG_FLASH_SPIx4_Dummy)
++            info->readcmd = 0xeb;            
++            info->dummybyte = 3;
++            info->dualport = 0;            
++            info->iomode = IOMODEx4_dummy;
++            info->quadport = 1;
++            info->dummydata = 0xaa;            
++#endif            
++#endif             
++            break;
++
++        case MX25L1605D:
++	    info->sector_count = 32;
++	    info->size = 0x200000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++            break;
++
++        case SST25VF016B:
++	    info->sector_count = 32;
++	    info->size = 0x200000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;            
++            info->dummybyte = 1;
++            info->buffersize = 1;            
++            WriteClk = 50;
++            EraseClk = 25;
++            ReadClk  = 50;            
++            break;
++
++        case SST25VF064C:
++	    info->sector_count = 128;
++	    info->size = 0x800000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;            
++            info->dummybyte = 1;
++            info->buffersize = 1;            
++            WriteClk = 50;
++            EraseClk = 25;
++            ReadClk  = 50;            
++            break;
++
++        case AT25DF161:
++	    info->sector_count = 32;
++	    info->size = 0x200000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;            
++            info->dummybyte = 1;
++            info->buffersize = 1;            
++            WriteClk = 50;
++            EraseClk = 25;
++            ReadClk  = 50;            
++            break;
++ 
++        case AT25DF321:
++	    info->sector_count = 32;
++	    info->size = 0x400000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;            
++            info->dummybyte = 1;
++            info->buffersize = 1;            
++            WriteClk = 50;
++            EraseClk = 25;
++            ReadClk  = 50;            
++            break;
++                                                                      
++        default:	/* use JEDEC ID */
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;                        
++            info->dualport  = 0;            
++            info->dummybyte = 1;
++            info->buffersize = 1;            
++            WriteClk = 50;
++            EraseClk = 25;
++            ReadClk  = 50;  
++            if ((info->flash_id & 0xFF) == 0x1F)	/* Atmel */
++            {
++                switch (info->flash_id & 0x001F00)
++                {
++                case 0x000400:	
++        	    info->sector_count = 8;
++    	            info->size = 0x80000;        	
++	            break;	            	                
++                case 0x000500:	
++        	    info->sector_count = 16;
++    	            info->size = 0x100000;        	
++	            break;	            	                
++                case 0x000600:	
++        	    info->sector_count = 32;
++    	            info->size = 0x200000;        	
++	            break;
++                case 0x000700:	
++        	    info->sector_count = 64;
++    	            info->size = 0x400000;        	
++	            break;
++                case 0x000800:	
++        	    info->sector_count = 128;
++    	            info->size = 0x800000;        	
++	            break;	            
++                case 0x000900:	
++        	    info->sector_count = 256;
++    	            info->size = 0x1000000;        	
++	            break;	            	            
++                default:
++                    printf("Can't support this SPI Flash!! \n");
++                    return 0;	            
++                }   	            
++            } /* Atmel JDEC */        
++            else	/* JDEC */				
++            {
++                switch (info->flash_id & 0xFF0000)
++                {
++                case 0x120000:	
++        	    info->sector_count = 4;
++    	            info->size = 0x40000;        	
++	            break;
++                case 0x130000:	
++	            info->sector_count = 8;
++	            info->size = 0x80000;        	
++	            break;
++                case 0x140000:	
++	            info->sector_count =16;
++	            info->size = 0x100000;        	
++	            break;
++                case 0x150000:	
++	            info->sector_count =32;
++	            info->size = 0x200000;        	
++	            break;
++                case 0x160000:	
++	            info->sector_count =64;
++	            info->size = 0x400000;        	
++	            break;
++                case 0x170000:	
++	            info->sector_count =128;
++	            info->size = 0x800000;        	
++	            break;
++                case 0x180000:	
++	            info->sector_count =256;
++	            info->size = 0x1000000;        	
++	            break;
++                case 0x190000:	
++	            info->sector_count =256;
++	            info->size = 0x1000000;
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++	            info->sector_count = 512;
++	            info->size = 0x2000000;
++	            info->address32 = 1;        	
++#if	defined(CONFIG_FLASH_SPIx2_Dummy)
++                    info->readcmd = 0xbb;            
++                    info->dummybyte = 1;
++                    info->dualport = 1;            
++                    info->iomode = IOMODEx2_dummy;
++#elif	defined(CONFIG_FLASH_SPIx4_Dummy)
++                    info->readcmd = 0xeb;            
++                    info->dummybyte = 3;
++                    info->dualport = 0;            
++                    info->iomode = IOMODEx4_dummy;
++                    info->quadport = 1;
++                    info->dummydata = 0xaa;            
++#endif            
++#endif             	                	
++	            break;
++	            
++                case 0x200000:	
++	            info->sector_count =256;
++	            info->size = 0x1000000;
++                    if ((info->flash_id & 0xFF) == 0x20)	/* numonyx */
++                        info->specificspi = SpecificSPI_N25Q512;
++#if	defined(CONFIG_FLASH_AST2300) || defined(CONFIG_AST1300)
++	            info->sector_count = 1024;
++	            info->size = 0x4000000;
++	            info->address32 = 1;        	
++#if	defined(CONFIG_FLASH_SPIx2_Dummy)
++                    info->readcmd = 0xbb;            
++                    info->dummybyte = 1;
++                    info->dualport = 1;            
++                    info->iomode = IOMODEx2_dummy;
++#elif	defined(CONFIG_FLASH_SPIx4_Dummy)
++                    info->readcmd = 0xeb;            
++                    info->dummybyte = 3;
++                    info->dualport = 0;            
++                    info->iomode = IOMODEx4_dummy;
++                    info->quadport = 1;
++                    info->dummydata = 0xaa;            
++#endif            
++#endif             	                	
++	            break;
++	            	        	            	        
++                default:
++                    printf("Can't support this SPI Flash!! \n");
++                    return 0;
++                }    
++            } /* JDEC */        
++        }
++        				
++        debug ("erase_region_count = %d erase_region_size = %d\n",
++		erase_region_count, erase_region_size);
++
++	sector = base;			
++	for (j = 0; j < info->sector_count; j++) {
++		
++		info->start[j] = sector;
++		sector += erase_region_size;
++		info->protect[j] = 0; /* default: not protected */
++	}
++
++        /* set SPI flash extended info */
++#if 	defined(CONFIG_AST1300)
++	if (info->size > 0x200000)	/* limit MAX Flash to 2MB for AST1300 */
++	    info->size = 0x200000;
++#endif
++#if	defined(CONFIG_AST2400) || defined(CONFIG_AST2300) || defined(CONFIG_AST2300_FPGA_1) || defined(CONFIG_AST2300_FPGA_2) || defined(CONFIG_AST1300)
++        reg = *((volatile ulong*) 0x1e6e2024);
++        if (reg & 0x40000)
++        {
++            reg = *((volatile ulong*) 0x1e6e2070);	        
++	        
++            ulRefPLL = 24;
++            ulDeNumerator = reg & 0x0F;
++            ulNumerator = (reg & 0x07E0) >> 5;
++            ulOD = (reg & 0x10) ? 1:2;                    
++     	    
++            cpuclk = ulRefPLL * ulOD * (ulNumerator + 2) / (ulDeNumerator + 1);    
++        }        
++        else
++        {
++            reg = *((volatile ulong*) 0x1e6e2070);	        
++#if	defined(CONFIG_AST2400)
++            if (reg & 0x00800000)	//ref. clk:25MHz
++            {
++                switch (reg & 0x300)
++                {
++                case 0x000:
++                    cpuclk = 400;
++                    break;
++                case 0x100:
++                    cpuclk = 375;
++                    break;        
++                case 0x200:
++                    cpuclk = 350;
++                    break;        
++                case 0x300:
++                    cpuclk = 325;
++                    break;
++                }	            	            
++            }        
++            else
++            {
++                switch (reg & 0x300)	//ref. clk:24MHz
++                {
++                case 0x000:
++                    cpuclk = 384;
++                    break;
++                case 0x100:
++                    cpuclk = 360;
++                    break;        
++                case 0x200:
++                    cpuclk = 336;
++                    break;        
++                case 0x300:
++                    cpuclk = 312;
++                    break;
++                }	            
++            }
++#else	        
++            switch (reg & 0x300)
++            {
++            case 0x000:
++                 cpuclk = 384;
++                 break;
++            case 0x100:
++                 cpuclk = 360;
++                 break;        
++            case 0x200:
++                 cpuclk = 336;
++                 break;        
++            case 0x300:
++                 cpuclk = 408;
++                 break;
++            }
++#endif            
++        }	
++        
++        reg = *((volatile ulong*) 0x1e6e2070);        
++        switch (reg & 0xc00)
++        {
++        case 0x000:
++                 cpuclk /= 1;
++                 break;
++        case 0x400:
++                 cpuclk /= 2;
++                 break;        
++        case 0x800:	
++                 cpuclk /= 4;
++                 break;
++        case 0xC00:	
++                 cpuclk /= 3;
++                 break;                                 
++        }
++#else	/* AST2100 */        
++        reg = *((volatile ulong*) 0x1e6e2070);
++        switch (reg & 0xe00)
++        {
++        case 0x000:
++                 cpuclk = 266;
++                 break;
++        case 0x200:
++                 cpuclk = 233;
++                 break;        
++        case 0x400:
++                 cpuclk = 200;
++                 break;        
++        case 0x600:
++                 cpuclk = 166;
++                 break;        
++        case 0x800:
++                 cpuclk = 133;
++                 break;        
++        case 0xA00:
++                 cpuclk = 100;
++                 break;        
++        case 0xC00:
++                 cpuclk = 300;
++                 break;        
++        case 0xE00:	
++                 cpuclk = 24;
++                 break;        
++        }	
++        switch (reg & 0x3000)
++        {
++        case 0x1000:
++                 cpuclk /= 2;
++                 break;
++        case 0x2000:
++                 cpuclk /= 4;
++                 break;        
++        case 0x3000:	
++                 cpuclk /= 3;
++                 break;        
++        }
++#endif
++
++#if	defined(CONFIG_AST2400) || defined(CONFIG_AST2300) || defined(CONFIG_AST2300_FPGA_1) || defined(CONFIG_AST2300_FPGA_2) || defined(CONFIG_AST1300)
++
++#if     defined(CONFIG_AST2300) || defined(CONFIG_AST1300)
++        /* limit Max SPI CLK to 50MHz (Datasheet v1.2) */
++        if (WriteClk > 50) WriteClk = 50;
++        if (EraseClk > 50) EraseClk = 50;
++        if (ReadClk > 50)  ReadClk  = 50;
++#endif
++
++        div = 1;
++        while ( ((cpuclk/div) > WriteClk) && (div < 16) )
++        {
++            div++;	
++        }
++        info->tCK_Write = AST2300_SPICLK_DIV[div-1];
++        
++        div = 1;
++        while ( ((cpuclk/div) > EraseClk) && (div < 16) )
++        {
++            div++;	
++        }        
++        info->tCK_Erase = AST2300_SPICLK_DIV[div-1];
++
++        div = 1;
++        while ( ((cpuclk/div) > ReadClk) && (div < 16) )
++        {
++            div++;	
++        }        
++        info->tCK_Read = AST2300_SPICLK_DIV[div-1];
++#else        	
++        div = 2;
++        info->tCK_Write = 7;
++        while ( (cpuclk/div) > WriteClk )
++        {
++            info->tCK_Write--;	
++            div +=2;	
++        }
++        div = 2;
++        info->tCK_Erase = 7;
++        while ( (cpuclk/div) > EraseClk )
++        {
++            info->tCK_Erase--;	
++            div +=2;	
++        }
++        div = 2;
++        info->tCK_Read = 7;
++        while ( (cpuclk/div) > ReadClk )
++        {
++            info->tCK_Read--;	
++            div +=2;	
++        }
++#endif
++	
++	/* unprotect flash */	
++        write_status_register(info, 0);
++
++        if (info->quadport)
++            write_status_register(info, 0x40);	/* enable QE */
++
++        if (info->address32)	 
++        {          
++            reg = *((volatile ulong*) 0x1e6e2070);	/* set H/W Trappings */
++            reg |= 0x10;
++            *((volatile ulong*) 0x1e6e2070) = reg;
++            
++            reg  = *((volatile ulong*) 0x1e620004);	/* enable 32b control bit*/
++            reg |= (0x01 << info->CE);
++            *((volatile ulong*) 0x1e620004) = reg;
++            
++            /* set flash chips to 32bits addressing mode */
++            if ((info->flash_id & 0xFF) == 0x01)	/* Spansion */
++                enable4b_spansion(info);
++            else if ((info->flash_id & 0xFF) == 0x20)	/* Numonyx */
++                enable4b_numonyx(info);                
++            else /* MXIC, Winbond */
++                enable4b(info);                
++                
++        }    
++                    
++        reset_flash(info);
++        
++	return (info->size);
++}
++
++
++/*-----------------------------------------------------------------------
++ */
++static int flash_write_buffer (flash_info_t *info, uchar *src, ulong addr, int len)
++{
++        ulong j, base, offset;
++        ulong ulSMMBase, ulCtrlData, CtrlOffset;
++        uchar jReg;
++
++        if (info->CE == 2)
++        {
++            CtrlOffset = SPICtrlRegOffset2;
++        }    
++        else
++        {
++            CtrlOffset = SPICtrlRegOffset;
++        }    
++            
++	base = info->start[0];
++	offset = addr - base;
++	base = flash_make_addr (info, 0, 0);
++	
++        enable_write (info);
++
++        ulCtrlData  = (info->tCK_Write << 8);
++
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_LOW | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        *(uchar *) (base) = (uchar) (0x02);
++        udelay(10);
++        if (info->address32)
++        {
++            *(uchar *) (base) = (uchar) ((offset & 0xff000000) >> 24);
++            udelay(10);
++        }
++        *(uchar *) (base) = (uchar) ((offset & 0xff0000) >> 16);
++        udelay(10);
++        *(uchar *) (base) = (uchar) ((offset & 0x00ff00) >> 8);
++        udelay(10);
++        *(uchar *) (base) = (uchar) ((offset & 0x0000ff));
++        udelay(10);
++
++        for (j=0; j<len; j++)
++        {
++            *(uchar *) (base) = *(uchar *) (src++);
++            udelay(10);
++        }    
++                 
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_HIGH | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_LOW | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++        *(uchar *) (base) = (uchar) (0x05);
++        udelay(10);
++        do {                             
++            jReg = *(volatile uchar *) (base);
++        } while ((jReg & 0x01));
++        ulCtrlData &= CMD_MASK;
++        ulCtrlData |= CE_HIGH | USERMODE;
++        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++        udelay(200);
++
++        /* RFSR */
++        if (info->specificspi == SpecificSPI_N25Q512)
++        {
++            ulCtrlData &= CMD_MASK;
++            ulCtrlData |= CE_LOW | USERMODE;
++            *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++            udelay(200);
++            *(uchar *) (base) = (uchar) (0x70);
++            udelay(10);
++            do {                                                            
++                jReg = *(volatile uchar *) (base);
++            } while (!(jReg & 0x80));
++            ulCtrlData &= CMD_MASK;
++            ulCtrlData |= CE_HIGH | USERMODE;
++            *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++            udelay(200);
++        }           
++}	
++
++/*-----------------------------------------------------------------------
++ *
++ * export functions
++ *  
++ */
++ 
++/*-----------------------------------------------------------------------
++ * 
++ */
++unsigned long flash_init (void)
++{
++	unsigned long size = 0;
++	int i;
++
++	/* Init: no FLASHes known */
++	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
++		flash_info[i].flash_id = FLASH_UNKNOWN;
++		size += flash_info[i].size = flash_get_size (bank_base[i], i);
++		if (flash_info[i].flash_id == FLASH_UNKNOWN) {
++#ifndef CFG_FLASH_QUIET_TEST
++			printf ("## Unknown FLASH on Bank %d - Size = 0x%08lx = %ld MB\n",
++				i, flash_info[i].size, flash_info[i].size << 20);
++#endif /* CFG_FLASH_QUIET_TEST */
++		}
++	}
++
++	/* Monitor protection ON by default */
++#if (CONFIG_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE)
++	flash_protect (FLAG_PROTECT_SET,
++		       CONFIG_MONITOR_BASE,
++		       CONFIG_MONITOR_BASE + monitor_flash_len  - 1,
++		       flash_get_info(CONFIG_MONITOR_BASE));
++#endif
++
++	/* Environment protection ON by default */
++#ifdef CONFIG_ENV_IS_IN_FLASH
++	flash_protect (FLAG_PROTECT_SET,
++		       CONFIG_ENV_ADDR,
++		       CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
++		       flash_get_info(CONFIG_ENV_ADDR));
++#endif
++
++	/* Redundant environment protection ON by default */
++#ifdef CONFIG_ENV_ADDR_REDUND
++	flash_protect (FLAG_PROTECT_SET,
++		       CONFIG_ENV_ADDR_REDUND,
++		       CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,
++		       flash_get_info(CONFIG_ENV_ADDR_REDUND));
++#endif
++	return (size);
++}
++
++/*-----------------------------------------------------------------------
++ */
++#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_ADDR_REDUND) || (CONFIG_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE)
++static flash_info_t *flash_get_info(ulong base)
++{
++	int i;
++	flash_info_t * info = 0;
++
++	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i ++) {
++		info = & flash_info[i];
++		if (info->size && info->start[0] <= base &&
++		    base <= info->start[0] + info->size - 1)
++			break;
++	}
++
++	return i == CONFIG_SYS_MAX_FLASH_BANKS ? 0 : info;
++}
++#endif
++
++/*-----------------------------------------------------------------------
++ */
++int flash_erase (flash_info_t * info, int s_first, int s_last)
++{
++	int rcode = 0;
++	int prot;
++	flash_sect_t sect;
++
++        ulong base, offset;
++        ulong ulSMMBase, ulCtrlData, CtrlOffset;
++        uchar jReg;
++        
++        disable_cache();
++        
++        if (info->CE == 2)
++        {
++            CtrlOffset = SPICtrlRegOffset2;
++        }    
++        else
++        {
++            CtrlOffset = SPICtrlRegOffset;
++        }    
++                    
++	if ((s_first < 0) || (s_first > s_last)) {
++		puts ("- no sectors to erase\n");
++		return 1;
++	}
++
++	prot = 0;
++	for (sect = s_first; sect <= s_last; ++sect) {
++		if (info->protect[sect]) {
++			prot++;
++		}
++	}
++	if (prot) {
++		printf ("- Warning: %d protected sectors will not be erased!\n", prot);
++	} else {
++		putc ('\n');
++	}
++
++        ulCtrlData  = (info->tCK_Erase << 8);
++	for (sect = s_first; sect <= s_last; sect++) {
++		if (info->protect[sect] == 0) { /* not protected */
++                        /* start erasing */
++                        enable_write(info);
++
++	                base = info->start[0];
++                        offset = info->start[sect] - base;
++	                base = flash_make_addr (info, 0, 0);
++
++                        ulCtrlData &= CMD_MASK;
++                        ulCtrlData |= CE_LOW | USERMODE;
++                        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++                        udelay(200);
++                        *(uchar *) (base) = (uchar) (0xd8);
++                        udelay(10);
++                        if (info->address32)
++                        { 
++                            *(uchar *) (base) = (uchar) ((offset & 0xff000000) >> 24);
++                            udelay(10);
++                        }                        
++                        *(uchar *) (base) = (uchar) ((offset & 0xff0000) >> 16);
++                        udelay(10);
++                        *(uchar *) (base) = (uchar) ((offset & 0x00ff00) >> 8);
++                        udelay(10);
++                        *(uchar *) (base) = (uchar) ((offset & 0x0000ff));
++                        udelay(10);
++
++                        ulCtrlData &= CMD_MASK;
++                        ulCtrlData |= CE_HIGH | USERMODE;
++                        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++                        udelay(200);
++
++                        ulCtrlData &= CMD_MASK;
++                        ulCtrlData |= CE_LOW | USERMODE;
++                        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++                        udelay(200);
++                        *(uchar *) (base) = (uchar) (0x05);
++                        udelay(10);
++                        do {                                                            
++                            jReg = *(volatile uchar *) (base);
++                        } while ((jReg & 0x01));
++                        ulCtrlData &= CMD_MASK;
++                        ulCtrlData |= CE_HIGH | USERMODE;
++                        *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++                        udelay(200);
++
++                        /* RFSR */
++                        if (info->specificspi == SpecificSPI_N25Q512)
++                        {
++                            ulCtrlData &= CMD_MASK;
++                            ulCtrlData |= CE_LOW | USERMODE;
++                            *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++                            udelay(200);
++                            *(uchar *) (base) = (uchar) (0x70);
++                            udelay(10);
++                            do {                                                            
++                                jReg = *(volatile uchar *) (base);
++                            } while (!(jReg & 0x80));
++                            ulCtrlData &= CMD_MASK;
++                            ulCtrlData |= CE_HIGH | USERMODE;
++                            *(ulong *) (STCBaseAddress + CtrlOffset) = ulCtrlData;
++                            udelay(200);
++                        }   
++                        
++			putc ('.');
++		}
++	}
++	puts (" done\n");
++	
++	reset_flash(info);
++	
++	return rcode;
++}
++
++/*-----------------------------------------------------------------------
++ */
++void flash_print_info (flash_info_t * info)
++{
++	putc ('\n');
++	return;
++}
++
++/*-----------------------------------------------------------------------
++ * Copy memory to flash, returns:
++ * 0 - OK
++ * 1 - write timeout
++ * 2 - Flash not erased
++ */
++int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
++{
++	int count;
++	unsigned char pat[] = {'|', '-', '/', '\\'};
++	int patcnt;
++	
++        disable_cache();	
++        
++	/* get lower aligned address */	
++        if (addr & (info->buffersize - 1))
++        {
++            count = cnt >= info->buffersize ? (info->buffersize - (addr & 0xff)):cnt;	
++            flash_write_buffer (info, src, addr, count);
++            addr+= count;
++            src += count;
++            cnt -= count;	
++        }
++	
++	/* prog */		
++	while (cnt > 0) {				
++	    count = cnt >= info->buffersize ? info->buffersize:cnt;
++            flash_write_buffer (info, src, addr, count);
++            addr+= count;
++            src += count;
++            cnt -= count;
++            printf("%c\b", pat[(patcnt++) & 0x03]);            	     	
++	} 		
++
++	reset_flash(info);
++
++        return (0);
++}
++
++#ifdef	CONFIG_FLASH_AST2300_DMA
++void * memmove_dma(void * dest,const void *src,size_t count)
++{
++	ulong count_align, poll_time, data;
++	
++	count_align = (count + 3) & 0xFFFFFFFC;	/* 4-bytes align */
++        poll_time = 100;			/* set 100 us as default */
++
++        /* force end of burst read */
++	*(volatile ulong *) (STCBaseAddress + SPICtrlRegOffset) |= CE_HIGH;
++	*(volatile ulong *) (STCBaseAddress + SPICtrlRegOffset) &= ~CE_HIGH;
++          
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_CONTROL) = (ulong) (~FLASH_DMA_ENABLE);	
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_FLASH_BASE) = (ulong *) (src);
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_DRAM_BASE) = (ulong *) (dest);
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_LENGTH) = (ulong) (count_align);
++	*(ulong *) (STCBaseAddress + REG_FLASH_DMA_CONTROL) = (ulong) (FLASH_DMA_ENABLE);
++	
++	/* wait poll */
++	do {
++	    udelay(poll_time);	
++	    data = *(ulong *) (STCBaseAddress + REG_FLASH_INTERRUPT_STATUS);
++	} while (!(data & FLASH_STATUS_DMA_READY));
++	
++	/* clear status */
++	*(ulong *) (STCBaseAddress + REG_FLASH_INTERRUPT_STATUS) |= FLASH_STATUS_DMA_CLEAR;
++}	
++#endif
++#endif /* CONFIG_FLASH_SPI */
+diff --git a/board/aspeed/ast2400/hactest.c b/board/aspeed/ast2400/hactest.c
+new file mode 100755
+index 0000000..bfa87d5
+--- /dev/null
++++ b/board/aspeed/ast2400/hactest.c
+@@ -0,0 +1,762 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++/*
++ * Diagnostics support
++ */
++#include <common.h>
++#include <command.h>
++#include <post.h>
++#include "slt.h"
++
++#if ((CFG_CMD_SLT & CFG_CMD_HACTEST) && defined(CONFIG_SLT))
++#include "hactest.h"
++
++#include "aes.c"
++#include "rc4.c"
++
++static unsigned char crypto_src[CRYPTO_MAX_SRC], crypto_dst[CRYPTO_MAX_DST], crypto_context[CRYPTO_MAX_CONTEXT];
++static unsigned char hash_src[HASH_MAX_SRC], hash_dst[HASH_MAX_DST], hmac_key[HMAC_MAX_KEY];
++
++/*
++ * table 
++ */
++static aes_test aestest[] = {
++    { CRYPTOMODE_ECB, 128,
++     {0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c, '\0'},
++     {0x32, 0x43, 0xf6, 0xa8, 0x88, 0x5a, 0x30, 0x8d, 0x31, 0x31, 0x98, 0xa2, 0xe0, 0x37, 0x07, 0x34, '\0'},
++     {0x39, 0x25, 0x84, 0x1d, 0x02, 0xdc, 0x09, 0xfb, 0xdc, 0x11, 0x85, 0x97, 0x19, 0x6a, 0x0b, 0x32, '\0'} },
++    {0xFF, 0xFF, "", "", ""},		/* End Mark */
++};
++
++static rc4_test rc4test[] = {
++    {{0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, '\0'},
++     {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, '\0'}}, 	
++    {{0xff}, {0xff}},				/* End Mark */	
++};
++
++static hash_test hashtest[] = {
++    {HASHMODE_SHA1, 20,
++     "abc",
++     {0x53, 0x20, 0xb0, 0x8c, 0xa1, 0xf5, 0x74, 0x62, 0x50, 0x71, 0x89, 0x41, 0xc5, 0x0a, 0xdf, 0x4e, 0xbb, 0x55, 0x76, 0x06, '\0'}},
++    {0xFF, 0xFF, "", ""},			/* End Mark */ 
++};
++
++static hmac_test hmactest[] = {
++    {HASHMODE_SHA1, 64, 20,
++     {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, '\0' },
++     "Sample #1",
++     {0xbf, 0x39, 0xda, 0xb1, 0x7d, 0xc2, 0xe1, 0x23, 0x0d, 0x28, 0x35, 0x3b, 0x8c, 0xcb, 0x14, 0xb6, 0x22, 0x02, 0x65, 0xb3, '\0'}},
++    {0xFF, 0xFF, 0xFF, "", "", ""},			/* End Mark */ 
++};
++
++void EnableHMAC(void)
++{
++    unsigned long ulData;
++    	
++    /* init SCU */
++    *(unsigned long *) (0x1e6e2000) = 0x1688a8a8;
++    
++    ulData = *(volatile unsigned long *) (0x1e6e200c);
++    ulData &= 0xfdfff;
++    *(unsigned long *) (0x1e6e200c) = ulData;
++    udelay(100);
++    ulData = *(volatile unsigned long *) (0x1e6e2004);
++    ulData &= 0xfffef;
++    *(unsigned long *) (0x1e6e2004) = ulData;
++    
++}
++
++/* AES */
++void aes_enc_ast3000(aes_context *ctx, uint8 *input, uint8 *iv, uint8 *output, uint32 ulMsgLength , uint32 ulAESMode)
++{
++
++    unsigned long i, ulTemp, ulCommand;
++    unsigned char ch;
++    unsigned char *pjsrc, *pjdst, *pjcontext;
++    
++    ulCommand = CRYPTO_ENABLE_RW | CRYPTO_ENABLE_CONTEXT_LOAD | CRYPTO_ENABLE_CONTEXT_SAVE | \
++                CRYPTO_AES | CRYPTO_ENCRYPTO | CRYPTO_SYNC_MODE_ASYNC;
++
++    switch (ctx->nr)
++    {
++    case 10:
++        ulCommand |= CRYPTO_AES128;
++        break;
++    case 12:
++        ulCommand |= CRYPTO_AES192;
++        break;    
++    case 14:
++        ulCommand |= CRYPTO_AES256;
++        break;    
++    }
++
++    switch (ulAESMode)
++    {
++    case CRYPTOMODE_ECB:
++        ulCommand |= CRYPTO_AES_ECB;
++        break;
++    case CRYPTOMODE_CBC:
++        ulCommand |= CRYPTO_AES_CBC;
++        break;
++    case CRYPTOMODE_CFB:
++        ulCommand |= CRYPTO_AES_CFB;
++        break;
++    case CRYPTOMODE_OFB:
++        ulCommand |= CRYPTO_AES_OFB;
++        break;
++    case CRYPTOMODE_CTR:
++        ulCommand |= CRYPTO_AES_CTR;
++        break;                
++    }
++
++    pjsrc = (unsigned char *) m16byteAlignment((unsigned long) crypto_src);
++    pjdst = (unsigned char *) m16byteAlignment((unsigned long) crypto_dst);
++    pjcontext = (unsigned char *) m16byteAlignment((unsigned long) crypto_context);
++    	
++    /* Init HW */
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_SRC_BASE_OFFSET) = (unsigned long) pjsrc;
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_DST_BASE_OFFSET) = (unsigned long) pjdst;
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_CONTEXT_BASE_OFFSET) = (unsigned long) pjcontext;
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_LEN_OFFSET) = ulMsgLength;
++
++    /* Set source */
++    for (i=0; i< ulMsgLength; i++)
++    {
++    	ch = *(uint8 *)(input + i);    	
++    	*(uint8 *) (pjsrc + i) = ch;
++    }
++     
++    /* Set Context */
++    /* Set IV */
++    for (i=0; i<16; i++)
++    {
++        ch = *(uint8 *) (iv + i);
++    	*(uint8 *) (pjcontext + i) = ch;
++    }
++       
++    /* Set Expansion Key */   
++    for (i=0; i<(4*(ctx->nr+1)); i++)
++    {
++        ulTemp = ((ctx->erk[i] & 0xFF) << 24) + ((ctx->erk[i] & 0xFF00) << 8) + ((ctx->erk[i] & 0xFF0000) >> 8) + ((ctx->erk[i] & 0xFF000000) >> 24);
++    	*(uint32 *) (pjcontext + i*4 + 16) = ulTemp;
++    }
++
++    /* fire cmd */
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_CMD_BASE_OFFSET) = ulCommand;
++    do {
++        ulTemp = *(volatile unsigned long *) (HAC_REG_BASE + REG_CRYPTO_STATUS_OFFSET);
++    } while (ulTemp & CRYPTO_BUSY);	
++    
++    /* Output */
++    for (i=0; i<ulMsgLength; i++)
++    {
++        ch = *(uint8 *) (pjdst + i);        
++        *(uint8 *) (output + i) = ch;    
++    }
++    
++} /* aes_enc_ast3000 */
++
++
++void aes_dec_ast3000(aes_context *ctx, uint8 *input, uint8 *iv, uint8 *output, uint32 ulMsgLength , uint32 ulAESMode)
++{
++    unsigned long i, ulTemp, ulCommand;
++    unsigned char ch;
++    unsigned char *pjsrc, *pjdst, *pjcontext;
++    
++    ulCommand = CRYPTO_ENABLE_RW | CRYPTO_ENABLE_CONTEXT_LOAD | CRYPTO_ENABLE_CONTEXT_SAVE | \
++                CRYPTO_AES | CRYPTO_DECRYPTO | CRYPTO_SYNC_MODE_ASYNC;
++
++    switch (ctx->nr)
++    {
++    case 10:
++        ulCommand |= CRYPTO_AES128;
++        break;
++    case 12:
++        ulCommand |= CRYPTO_AES192;
++        break;    
++    case 14:
++        ulCommand |= CRYPTO_AES256;
++        break;    
++    }
++
++    switch (ulAESMode)
++    {
++    case CRYPTOMODE_ECB:
++        ulCommand |= CRYPTO_AES_ECB;
++        break;
++    case CRYPTOMODE_CBC:
++        ulCommand |= CRYPTO_AES_CBC;
++        break;
++    case CRYPTOMODE_CFB:
++        ulCommand |= CRYPTO_AES_CFB;
++        break;
++    case CRYPTOMODE_OFB:
++        ulCommand |= CRYPTO_AES_OFB;
++        break;
++    case CRYPTOMODE_CTR:
++        ulCommand |= CRYPTO_AES_CTR;
++        break;                
++    }
++
++    pjsrc = (unsigned char *) m16byteAlignment((unsigned long) crypto_src);
++    pjdst = (unsigned char *) m16byteAlignment((unsigned long) crypto_dst);
++    pjcontext = (unsigned char *) m16byteAlignment((unsigned long) crypto_context);
++	
++    /* Init HW */
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_SRC_BASE_OFFSET) = (unsigned long) pjsrc;
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_DST_BASE_OFFSET) = (unsigned long) pjdst;
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_CONTEXT_BASE_OFFSET) = (unsigned long) pjcontext;
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_LEN_OFFSET) = ulMsgLength;
++
++    /* Set source */
++    for (i=0; i< ulMsgLength; i++)
++    {
++    	ch = *(uint8 *)(input + i);    	
++    	*(uint8 *) (pjsrc + i) = ch;
++    }
++     
++    /* Set Context */
++    /* Set IV */
++    for (i=0; i<16; i++)
++    {
++        ch = *(uint8 *) (iv + i);
++    	*(uint8 *) (pjcontext + i) = ch;
++    }
++       
++    /* Set Expansion Key */   
++    for (i=0; i<(4*(ctx->nr+1)); i++)
++    {
++        ulTemp = ((ctx->erk[i] & 0xFF) << 24) + ((ctx->erk[i] & 0xFF00) << 8) + ((ctx->erk[i] & 0xFF0000) >> 8) + ((ctx->erk[i] & 0xFF000000) >> 24);
++    	*(uint32 *) (pjcontext + i*4 + 16) = ulTemp;
++    }
++
++    /* fire cmd */
++    *(unsigned long *) (HAC_REG_BASE + REG_CRYPTO_CMD_BASE_OFFSET) = ulCommand;
++    do {
++        ulTemp = *(volatile unsigned long *) (HAC_REG_BASE + REG_CRYPTO_STATUS_OFFSET);
++    } while (ulTemp & CRYPTO_BUSY);	
++    
++    /* Output */
++    for (i=0; i<ulMsgLength; i++)
++    {
++        ch = *(uint8 *) (pjdst + i);        
++        *(uint8 *) (output + i) = ch;    
++    }
++
++} /* aes_dec_ast3000 */
++
++void rc4_crypt_ast3000(uint8 *data, int ulMsgLength, uint8 *rc4_key, uint32 ulKeyLength)
++{
++    struct rc4_state s;
++    unsigned long i, ulTemp, ulCommand;
++    unsigned char ch;
++    unsigned char *pjsrc, *pjdst, *pjcontext;
++
++    ulCommand = CRYPTO_ENABLE_RW | CRYPTO_ENABLE_CONTEXT_LOAD | CRYPTO_ENABLE_CONTEXT_SAVE | \
++                CRYPTO_RC4 | CRYPTO_SYNC_MODE_ASYNC;
++
++    rc4_setup( &s, rc4_key, ulKeyLength );
++
++    pjsrc = (unsigned char *) m16byteAlignment((unsigned long) crypto_src);
++    pjdst = (unsigned char *) m16byteAlignment((unsigned long) crypto_dst);
++    pjcontext = (unsigned char *) m16byteAlignment((unsigned long) crypto_context);
++	
++    /* Init HW */
++    *(uint32 *) (HAC_REG_BASE + REG_CRYPTO_SRC_BASE_OFFSET) = (unsigned long) pjsrc;	
++    *(uint32 *) (HAC_REG_BASE + REG_CRYPTO_DST_BASE_OFFSET) = (unsigned long) pjdst;	
++    *(uint32 *) (HAC_REG_BASE + REG_CRYPTO_CONTEXT_BASE_OFFSET) = (unsigned long) pjcontext;	
++    *(uint32 *) (HAC_REG_BASE + REG_CRYPTO_LEN_OFFSET) = ulMsgLength;	
++          	
++
++    /* Set source */
++    for (i=0; i< ulMsgLength; i++)
++    {
++    	ch = *(uint8 *)(data + i);
++    	*(uint8 *) (pjsrc + i) = ch;
++    }
++     
++    /* Set Context */
++    /* Set i, j */
++    *(uint32 *) (pjcontext + 8) = 0x0001;	
++       
++    /* Set Expansion Key */   
++    for (i=0; i<(256/4); i++)
++    {
++       ulTemp = (s.m[i * 4] & 0xFF) + ((s.m[i * 4 + 1] & 0xFF) << 8) + ((s.m[i * 4 + 2] & 0xFF) << 16) + ((s.m[i * 4+ 3] & 0xFF) << 24);
++       *(uint32 *) (pjcontext + i*4 + 16) = ulTemp;	
++    }
++
++    /* fire cmd */
++    *(uint32 *) (HAC_REG_BASE + REG_CRYPTO_CMD_BASE_OFFSET) = ulCommand;    
++    do {
++    	ulTemp = *(volatile uint32 *) (HAC_REG_BASE + REG_CRYPTO_STATUS_OFFSET);
++    } while (ulTemp & CRYPTO_BUSY);	
++
++    /* Output */
++    for (i=0; i<ulMsgLength; i++)
++    {
++        ch = *(volatile uint8 *) (pjdst + i);
++        *(uint8 *) (data + i) = ch;    
++    }
++
++} /* rc4_crypt_ast3000	*/
++
++/* Hash */
++void hash_ast3000(uint8 *msg, uint32 ulLength, unsigned char *output, uint32 ulHashMode)
++{
++   uint32 i, ulTemp, ulCommand, ulDigestLength, ulMyMsgLength;
++   uint8 ch;
++   unsigned char *pjsrc, *pjdst;
++   
++   /* Get Info */
++   switch (ulHashMode)
++   {
++   case HASHMODE_MD5:
++        ulCommand = HASH_ALG_SELECT_MD5;
++        ulDigestLength = 16;
++       break;
++   case HASHMODE_SHA1:
++        ulCommand = HASH_ALG_SELECT_SHA1 | 0x08;
++        ulDigestLength = 20;
++       break;
++   case HASHMODE_SHA256:
++        ulCommand = HASH_ALG_SELECT_SHA256 | 0x08;
++        ulDigestLength = 32;
++       break;
++   case HASHMODE_SHA224:
++        ulCommand = HASH_ALG_SELECT_SHA224 | 0x08;
++        ulDigestLength = 28;
++       break;       	
++   }   	    
++
++    pjsrc = (unsigned char *) m16byteAlignment((unsigned long) hash_src);
++    pjdst = (unsigned char *) m16byteAlignment((unsigned long) hash_dst);
++
++    /* 16byte alignment */
++    ulMyMsgLength = m16byteAlignment(ulLength);
++   	
++   /* Init. HW */
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_SRC_BASE_OFFSET) = (unsigned long) pjsrc;	
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_DST_BASE_OFFSET) = (unsigned long) pjdst;	
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_LEN_OFFSET) = ulMyMsgLength;	
++        
++    /* write src */
++    for (i=0; i<ulLength; i++)
++    {
++    	ch = *(uint8 *)(msg+i);
++    	*(uint8 *) (pjsrc + i) = ch;
++    }    
++    for (i=ulLength; i<ulMyMsgLength; i++)
++        *(uint8 *) (pjsrc + i) = 0;
++        
++    /* fire cmd */
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_CMD_OFFSET) = ulCommand;	
++    
++    /* get digest */
++    do {
++    	ulTemp = *(volatile uint32 *) (HAC_REG_BASE + REG_HASH_STATUS_OFFSET);    	
++    } while (ulTemp & HASH_BUSY);	
++    	
++    for (i=0; i<ulDigestLength; i++)
++    {
++        ch = *(volatile uint8 *) (pjdst + i);
++       *(uint8 *) (output + i) = ch;    
++    }        
++ 
++} /* hash_ast3000 */	
++
++/* HMAC */
++void hmackey_ast3000(uint8 *key, uint32 ulKeyLength, uint32 ulHashMode)
++{
++    uint32 i, ulBlkLength, ulDigestLength, ulTemp, ulCommand;
++    uint8 k0[64], sum[32];
++    uint8 ch;
++    unsigned char *pjsrc, *pjdst, *pjkey;
++
++   /* Get Info */
++   switch (ulHashMode)
++   {
++   case HASHMODE_MD5:
++        ulCommand = HASH_ALG_SELECT_MD5;
++        ulDigestLength = 16;
++       break;
++   case HASHMODE_SHA1:
++        ulCommand = HASH_ALG_SELECT_SHA1 | 0x08;
++        ulDigestLength = 20;
++       break;
++   case HASHMODE_SHA256:
++        ulCommand = HASH_ALG_SELECT_SHA256 | 0x08;
++        ulDigestLength = 32;
++       break;
++   case HASHMODE_SHA224:
++        ulCommand = HASH_ALG_SELECT_SHA224 | 0x08;
++        ulDigestLength = 28;
++       break;       	
++   }   	    
++   ulBlkLength = 64;				/* MD5, SHA1/256/224: 64bytes */
++
++    /* Init */
++    memset( (void *) k0, 0, 64);		/* reset to zero */
++    memset( (void *) sum, 0, 32);		/* reset to zero */
++
++    /* Get k0 */
++    if (ulKeyLength <= ulBlkLength)
++        memcpy( (void *) k0, (void *) key, ulKeyLength );       
++    else /* (ulKeyLength > ulBlkLength) */
++    {
++        hash_ast3000(key, ulKeyLength, sum, ulHashMode);
++        memcpy( (void *) k0, (void *) sum, ulDigestLength );                           
++    }    	
++
++    pjsrc = (unsigned char *) m16byteAlignment((unsigned long) hash_src);
++    pjdst = (unsigned char *) m16byteAlignment((unsigned long) hash_dst);
++    pjkey = (unsigned char *) m64byteAlignment((unsigned long) hmac_key);
++    
++    /* Calculate digest */
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_SRC_BASE_OFFSET) = (unsigned long) pjsrc;
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_DST_BASE_OFFSET) = (unsigned long) pjdst;
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_KEY_BASE_OFFSET) = (unsigned long) pjkey;
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_LEN_OFFSET) = ulBlkLength;
++        
++    /* write key to src */
++    for (i=0; i<ulBlkLength; i++)
++    {
++    	ch = *(uint8 *)(k0+i);
++        *(uint8 *) (pjsrc + i) = ch;
++    }    
++    
++    /* fire cmd for calculate */
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_CMD_OFFSET) = ulCommand | HAC_DIGEST_CAL_ENABLE;    
++    do {
++    	ulTemp = *(volatile uint32 *) (HAC_REG_BASE + REG_HASH_STATUS_OFFSET);    	
++    } while (ulTemp & HASH_BUSY);	
++         
++} /* hmackey_ast3000 */
++
++void hmac_ast3000(uint8 *key, uint32 ulKeyLength, uint8 *msg, uint32 ulMsgLength, uint32 ulHashMode, unsigned char *output)
++{
++    uint32 i, ulTemp, ulCommand, ulDigestLength, ulMyMsgLength;;
++    uint8 ch;
++    unsigned char *pjsrc, *pjdst, *pjkey;
++
++    /* Calculate digest */
++   switch (ulHashMode)
++   {
++   case HASHMODE_MD5:
++        ulCommand = HASH_ALG_SELECT_MD5;
++        ulDigestLength = 16;
++       break;
++   case HASHMODE_SHA1:
++        ulCommand = HASH_ALG_SELECT_SHA1 | 0x08;
++        ulDigestLength = 20;
++       break;
++   case HASHMODE_SHA256:
++        ulCommand = HASH_ALG_SELECT_SHA256 | 0x08;
++        ulDigestLength = 32;
++       break;
++   case HASHMODE_SHA224:
++        ulCommand = HASH_ALG_SELECT_SHA224 | 0x08;
++        ulDigestLength = 28;
++       break;       	
++   }   	    
++ 
++    pjsrc = (unsigned char *) m16byteAlignment((unsigned long) hash_src);
++    pjdst = (unsigned char *) m16byteAlignment((unsigned long) hash_dst);
++    pjkey = (unsigned char *) m64byteAlignment((unsigned long) hmac_key);
++    
++    /* 16byte alignment */
++    ulMyMsgLength = m16byteAlignment(ulMsgLength);
++    		
++    /* Init. HW */
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_SRC_BASE_OFFSET) = (unsigned long) pjsrc;
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_DST_BASE_OFFSET) = (unsigned long) pjdst;
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_KEY_BASE_OFFSET) = (unsigned long) pjkey;
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_LEN_OFFSET) = ulMyMsgLength;
++
++    /* write Text to src */
++    for (i=0; i<ulMsgLength; i++)
++    {
++    	ch = *(uint8 *)(msg+i);
++        *(uint8 *) (pjsrc + i) = ch;
++    }    
++    for (i=ulMsgLength; i<ulMyMsgLength; i++)
++        *(uint8 *) (pjsrc + i) = 0;
++    
++    /* fire cmd */
++    *(uint32 *) (HAC_REG_BASE + REG_HASH_CMD_OFFSET) = ulCommand | HAC_ENABLE;        
++    do {
++    	ulTemp = *(volatile uint32 *) (HAC_REG_BASE + REG_HASH_STATUS_OFFSET);    	
++    } while (ulTemp & HASH_BUSY);
++
++    /* Output Digest */
++    for (i=0; i<ulDigestLength; i++)
++    {
++        ch = *(uint8 *) (pjdst + i);
++        *(uint8 *) (output + i) = ch;    
++    }
++
++} /* hmac_ast3000 */
++
++/* main hactest procedure */
++int do_hactest (void)
++{
++        unsigned long i, j, Flags = 0;
++	aes_test *pjaes_test;
++        aes_context aes_ctx;
++        unsigned char AES_Mode[8], aes_output[64];
++	unsigned long ulAESMsgLength;
++	
++	rc4_test *pjrc4_test;
++	unsigned char rc4_buf_sw[64], rc4_buf_hw[64];
++	unsigned long ulRC4KeyLength, ulRC4MsgLength;
++	
++	hash_test *pjhash_test;
++	unsigned char HASH_Mode[8], hash_out[64];
++
++	hmac_test *pjhmac_test;
++	unsigned char HMAC_Mode[8], hmac_out[64];
++
++	EnableHMAC();
++	
++	/* AES Test */
++	pjaes_test = aestest;
++	while (pjaes_test->aes_mode != 0xFF)
++	{
++
++            if (pjaes_test->aes_mode == CRYPTOMODE_CBC)
++                strcpy (AES_Mode, "CBC");
++            else if (pjaes_test->aes_mode == CRYPTOMODE_CFB)
++                strcpy (AES_Mode, "CFB");
++            else if (pjaes_test->aes_mode == CRYPTOMODE_OFB)
++                strcpy (AES_Mode, "OFB");
++            else if (pjaes_test->aes_mode == CRYPTOMODE_CTR)
++                strcpy (AES_Mode, "CTR");
++            else    
++                strcpy (AES_Mode, "ECB");
++
++            /* Get Msg. Length */
++            ulAESMsgLength = strlen(pjaes_test->plaintext);
++            j = ( (ulAESMsgLength + 15) >> 4) << 4;
++            for (i=ulAESMsgLength; i<j; i++)
++                pjaes_test->plaintext[i] = 0;
++            ulAESMsgLength = j;    
++                		
++            aes_set_key(&aes_ctx, pjaes_test->key, pjaes_test->key_length);
++            
++            /* Encryption Test */
++            aes_enc_ast3000(&aes_ctx, pjaes_test->plaintext, pjaes_test->key, aes_output, ulAESMsgLength, pjaes_test->aes_mode);	    
++	    if (strncmp(aes_output, pjaes_test->ciphertext, ulAESMsgLength))
++	    {
++	    	Flags |= FLAG_AESTEST_FAIL;	    	
++	        printf("[INFO] AES%d %s Mode Encryption Failed \n", pjaes_test->key_length, AES_Mode);
++	        printf("[DBG] Golden Data Dump .... \n");	        
++	        for (i=0; i< ulAESMsgLength; i++)
++	        {
++	            printf("%02x ", pjaes_test->ciphertext[i]);	        	
++	            if (((i+1) % 8) == 0)
++	                printf("\n");        
++	        }        
++	        printf("\n [DBG] Error Data Dump .... \n");
++	        for (i=0; i< ulAESMsgLength; i++)
++	        {
++	            printf("%02x ", aes_output[i]);	        	
++	            if (((i+1) % 8) == 0)
++	                printf("\n");        
++	        }
++	        printf("\n");	                
++	    }
++	    else
++	    {
++	    	/*
++	        printf("[INFO] AES%d %s Mode Encryption Passed \n", pjaes_test->key_length, AES_Mode);
++	        */
++	    }	
++
++            /* Decryption Test */
++            aes_dec_ast3000(&aes_ctx, pjaes_test->ciphertext, pjaes_test->key, aes_output, ulAESMsgLength, pjaes_test->aes_mode);	    
++	    if (strncmp(aes_output, pjaes_test->plaintext, ulAESMsgLength))
++	    {
++	    	Flags |= FLAG_AESTEST_FAIL;
++	        printf("[INFO] AES%d %s Mode Decryption Failed \n", pjaes_test->key_length, AES_Mode);	        
++	        printf("[DBG] Golden Data Dump .... \n");
++	        for (i=0; i< ulAESMsgLength; i++)
++	        {
++	            printf("%02x ", pjaes_test->plaintext[i]);	        	
++	            if (((i+1) % 8) == 0)
++	                printf("\n");        
++	        }        
++	        printf("\n [DBG] Error Data Dump .... \n");
++	        for (i=0; i< ulAESMsgLength; i++)
++	        {
++	            printf("%02x ", aes_output[i]);	        	
++	            if (((i+1) % 8) == 0)
++	                printf("\n");        
++	        }
++	        printf("\n");	                
++	    }
++	    else
++	    {
++	    	/*
++	        printf("[INFO] AES%d %s Mode Decryption Passed \n", pjaes_test->key_length, AES_Mode);
++	        */
++	    }	
++	    
++	    pjaes_test++;
++        } /* AES */
++
++	/* RC4 Test */
++	pjrc4_test = rc4test;
++	while ((pjrc4_test->key[0] != 0xff) && (pjrc4_test->data[0] != 0xff))
++	{
++
++            /* Get Info */
++            ulRC4KeyLength = strlen(pjrc4_test->key);
++            ulRC4MsgLength = strlen(pjrc4_test->data);
++            memcpy( (void *) rc4_buf_sw, (void *) pjrc4_test->data, ulRC4MsgLength );
++            memcpy( (void *) rc4_buf_hw, (void *) pjrc4_test->data, ulRC4MsgLength );                                       
++
++            /* Crypto */
++            rc4_crypt_sw(rc4_buf_sw, ulRC4MsgLength, pjrc4_test->key, ulRC4KeyLength);
++            rc4_crypt_ast3000(rc4_buf_hw, ulRC4MsgLength, pjrc4_test->key, ulRC4KeyLength);
++           
++	    if (strncmp(rc4_buf_hw, rc4_buf_sw, ulRC4MsgLength))
++	    {
++	    	Flags |= FLAG_RC4TEST_FAIL;	    	
++	        printf("[INFO] RC4 Encryption Failed \n");
++	        printf("[DBG] Golden Data Dump .... \n");
++	        for (i=0; i< ulRC4MsgLength; i++)
++	        {
++	            printf("%02x ", rc4_buf_sw[i]);
++	            if (((i+1) % 8) == 0)
++	                printf("\n");        
++	        }
++	        printf("\n [DBG] Error Data Dump .... \n");
++	        for (i=0; i< ulRC4MsgLength; i++)
++	        {
++	            printf("%02x ", rc4_buf_hw[i]);
++	            if (((i+1) % 8) == 0)
++	                printf("\n");        
++	        }
++	        printf("\n");	        
++	    }
++	    else
++	    {
++	    	/*
++	        printf("[INFO] RC4 Encryption Passed \n");
++	        */
++	    }	
++
++	    pjrc4_test++;
++	    
++        } /* RC4 */
++       
++	/* Hash Test */
++	pjhash_test = hashtest;
++	while (pjhash_test->hash_mode != 0xFF)
++	{
++
++            if (pjhash_test->hash_mode == HASHMODE_MD5)
++                strcpy (HASH_Mode, "MD5");
++            else if (pjhash_test->hash_mode == HASHMODE_SHA1)
++                strcpy (HASH_Mode, "SHA1");
++            else if (pjhash_test->hash_mode == HASHMODE_SHA256)
++                strcpy (HASH_Mode, "SHA256");
++            else if (pjhash_test->hash_mode == HASHMODE_SHA224)
++                strcpy (HASH_Mode, "SHA224");
++            
++            /* Hash */   		
++            hash_ast3000(pjhash_test->input, strlen(pjhash_test->input), hash_out, pjhash_test->hash_mode);            
++	    if (strncmp(hash_out, pjhash_test->digest, pjhash_test->digest_length))
++	    {
++	    	Flags |= FLAG_HASHTEST_FAIL;	    	
++	        printf("[INFO] HASH %s Failed \n", HASH_Mode);
++	        printf("[DBG] Golden Data Dump .... \n");	        
++	        for (i=0; i< pjhash_test->digest_length; i++)
++	        {
++	            printf("%02x ",pjhash_test->digest[i]);
++	            if (((i+1) % 8) == 0) 	
++	                printf("\n");        
++	        }        
++	        printf("\n [DBG] Error Data Dump .... \n");
++	        for (i=0; i< pjhash_test->digest_length; i++)
++	        {
++	            printf("%02x ",hash_out[i]);
++	            if (((i+1) % 8) == 0) 	
++	                printf("\n");        
++	        }
++	        printf("\n");
++	    }
++	    else
++	    {
++	    	/*
++	        printf("[INFO] HASH %s Passed \n", HASH_Mode);
++	        */
++	    }	
++
++            pjhash_test++;
++            
++        } /* Hash Test */
++
++	/* HMAC Test */
++	pjhmac_test = hmactest;
++	while (pjhmac_test->hash_mode != 0xFF)
++	{
++
++            if (pjhmac_test->hash_mode == HASHMODE_MD5)
++                strcpy (HMAC_Mode, "MD5");
++            else if (pjhmac_test->hash_mode == HASHMODE_SHA1)
++                strcpy (HMAC_Mode, "SHA1");
++            else if (pjhmac_test->hash_mode == HASHMODE_SHA256)
++                strcpy (HMAC_Mode, "SHA256");
++            else if (pjhmac_test->hash_mode == HASHMODE_SHA224)
++                strcpy (HMAC_Mode, "SHA224");
++            
++            /* HMAC */   		
++            hmackey_ast3000(pjhmac_test->key, pjhmac_test->key_length, pjhmac_test->hash_mode);
++            hmac_ast3000(pjhmac_test->key, pjhmac_test->key_length, pjhmac_test->input, strlen(pjhmac_test->input), pjhmac_test->hash_mode, hmac_out);            
++	    if (strncmp(hmac_out, pjhmac_test->digest, pjhmac_test->digest_length))
++	    {
++	    	Flags |= FLAG_HASHTEST_FAIL;	    	
++	        printf("[INFO] HMAC %s Failed \n", HMAC_Mode);
++	        printf("[DBG] Golden Data Dump .... \n");	        
++	        for (i=0; i< pjhmac_test->digest_length; i++)
++	        {
++	            printf("%02x ",pjhmac_test->digest[i]);
++	            if (((i+1) % 8) == 0) 	
++	                printf("\n");        
++	        }        
++	        printf("\n [DBG] Error Data Dump .... \n");
++	        for (i=0; i< pjhmac_test->digest_length; i++)
++	        {
++	            printf("%02x ",hmac_out[i]);
++	            if (((i+1) % 8) == 0) 	
++	                printf("\n");        
++	        }
++	        printf("\n");
++	    }
++	    else
++	    {
++	    	/*
++	        printf("[INFO] HMAC %s Passed \n", HMAC_Mode);
++	        */
++	    }	
++
++            pjhmac_test++;
++            
++        } /* HMAC Test */
++
++	return Flags;
++	
++}
++
++#endif /* CONFIG_SLT */
+diff --git a/board/aspeed/ast2400/hactest.h b/board/aspeed/ast2400/hactest.h
+new file mode 100755
+index 0000000..fcf2186
+--- /dev/null
++++ b/board/aspeed/ast2400/hactest.h
+@@ -0,0 +1,194 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++/* Err Flags */
++#define FLAG_AESTEST_FAIL  		0x00000001
++#define FLAG_RC4TEST_FAIL  		0x00000002
++#define FLAG_HASHTEST_FAIL  		0x00000004
++
++/* Specific */
++/*
++#define DRAM_BASE			0x40000000
++#define	CRYPTO_SRC_BASE			(DRAM_BASE + 0x100000)
++#define	CRYPTO_DST_BASE			(DRAM_BASE + 0x200000)
++#define	CRYPTO_CONTEXT_BASE		(DRAM_BASE + 0x300000)
++
++#define	HASH_SRC_BASE			(DRAM_BASE + 0x400000)
++#define	HASH_DST_BASE			(DRAM_BASE + 0x500000)
++#define	HMAC_KEY_BASE			(DRAM_BASE + 0x600000)
++*/
++#define m08byteAlignment(x)		((x + 0x00000007) & 0xFFFFFFF8)
++#define m16byteAlignment(x)		((x + 0x0000000F) & 0xFFFFFFF0)
++#define m64byteAlignment(x)		((x + 0x0000003F) & 0xFFFFFFC0)
++
++#define CRYPTO_ALIGNMENT		16
++#define CRYPTO_MAX_SRC			(100+CRYPTO_ALIGNMENT)
++#define CRYPTO_MAX_DST			(100+CRYPTO_ALIGNMENT)
++#define CRYPTO_MAX_CONTEXT		(100+CRYPTO_ALIGNMENT)
++
++#define HASH_ALIGNMENT			16
++#define HMAC_KEY_ALIGNMENT	 	64
++#define HASH_MAX_SRC			(100+HASH_ALIGNMENT)
++#define HASH_MAX_DST			(32+HASH_ALIGNMENT)
++#define HMAC_MAX_KEY			(64+HMAC_KEY_ALIGNMENT)
++
++/* General */
++#define HAC_REG_BASE 			0x1e6e3000
++
++#define MAX_KEYLENGTH			100
++#define MAX_TEXTLENGTH			100
++#define MAX_AESTEXTLENGTH		256
++#define MAX_RC4TEXTLENGTH		256
++#define MAX_RC4KEYLENGTH		256
++
++#define CRYPTOMODE_ECB			0x00
++#define CRYPTOMODE_CBC			0x01
++#define CRYPTOMODE_CFB			0x02
++#define CRYPTOMODE_OFB			0x03
++#define CRYPTOMODE_CTR			0x04
++
++#define HASHMODE_MD5			0x00
++#define HASHMODE_SHA1			0x01
++#define HASHMODE_SHA256			0x02
++#define HASHMODE_SHA224			0x03
++
++#define MIXMODE_DISABLE                 0x00
++#define MIXMODE_CRYPTO                  0x02
++#define MIXMODE_HASH                    0x03
++
++#define REG_CRYPTO_SRC_BASE_OFFSET	0x00
++#define REG_CRYPTO_DST_BASE_OFFSET	0x04
++#define REG_CRYPTO_CONTEXT_BASE_OFFSET	0x08
++#define REG_CRYPTO_LEN_OFFSET		0x0C
++#define REG_CRYPTO_CMD_BASE_OFFSET	0x10
++//#define REG_CRYPTO_ENABLE_OFFSET	0x14
++#define REG_CRYPTO_STATUS_OFFSET	0x1C
++
++#define REG_HASH_SRC_BASE_OFFSET	0x20
++#define REG_HASH_DST_BASE_OFFSET	0x24
++#define REG_HASH_KEY_BASE_OFFSET	0x28
++#define REG_HASH_LEN_OFFSET		0x2C
++#define REG_HASH_CMD_OFFSET		0x30
++//#define REG_HASH_ENABLE_OFFSET		0x14
++#define REG_HASH_STATUS_OFFSET		0x1C
++
++#define HASH_BUSY			0x01
++#define CRYPTO_BUSY			0x02
++
++//#define ENABLE_HASH			0x01
++//#define DISABLE_HASH			0x00
++//#define ENABLE_CRYPTO			0x02
++//#define DISABLE_CRYPTO			0x00
++
++#define CRYPTO_SYNC_MODE_MASK		0x03
++#define CRYPTO_SYNC_MODE_ASYNC		0x00
++#define CRYPTO_SYNC_MODE_PASSIVE	0x02
++#define CRYPTO_SYNC_MODE_ACTIVE		0x03
++
++#define CRYPTO_AES128			0x00
++#define CRYPTO_AES192			0x04
++#define CRYPTO_AES256			0x08
++
++#define CRYPTO_AES_ECB			0x00
++#define CRYPTO_AES_CBC			0x10
++#define CRYPTO_AES_CFB			0x20
++#define CRYPTO_AES_OFB			0x30
++#define CRYPTO_AES_CTR			0x40
++
++#define CRYPTO_ENCRYPTO			0x80
++#define CRYPTO_DECRYPTO			0x00
++
++#define CRYPTO_AES			0x000
++#define CRYPTO_RC4			0x100
++
++#define CRYPTO_ENABLE_RW		0x000
++#define CRYPTO_ENABLE_CONTEXT_LOAD	0x000
++#define CRYPTO_ENABLE_CONTEXT_SAVE	0x000
++
++#define HASH_SYNC_MODE_MASK		0x03
++#define HASH_SYNC_MODE_ASYNC		0x00
++#define HASH_SYNC_MODE_PASSIVE		0x02
++#define HASH_SYNC_MODE_ACTIVE		0x03
++
++#define HASH_READ_SWAP_ENABLE		0x04
++#define HMAC_SWAP_CONTROL_ENABLE	0x08
++
++#define HASH_ALG_SELECT_MASK		0x70
++#define HASH_ALG_SELECT_MD5		0x00
++#define HASH_ALG_SELECT_SHA1		0x20
++#define HASH_ALG_SELECT_SHA224		0x40
++#define HASH_ALG_SELECT_SHA256		0x50
++
++#define HAC_ENABLE			0x80
++#define HAC_DIGEST_CAL_ENABLE		0x180
++#define HASH_INT_ENABLE			0x200
++
++/* AES */
++#ifndef uint8
++#define uint8  unsigned char
++#endif
++
++#ifndef uint32
++#define uint32 unsigned long int
++#endif
++
++typedef struct
++{
++    uint32 erk[64];     /* encryption round keys */
++    uint32 drk[64];     /* decryption round keys */
++    int nr;             /* number of rounds */
++}
++aes_context;
++
++typedef struct
++{
++    int	  aes_mode;
++    int	  key_length;
++	
++    uint8 key[32];	/* as iv in CTR mode */
++    uint8 plaintext[64];
++    uint8 ciphertext[64];
++    
++}
++aes_test;
++
++/* RC4 */
++typedef struct
++{
++    uint8 key[32];
++    uint8 data[64];
++}
++rc4_test;
++
++/* Hash */
++typedef struct
++{
++    int	  hash_mode;
++    int	  digest_length;
++	
++    uint8 input[64];
++    uint8 digest[64];
++    
++}
++hash_test;
++	
++/* HMAC */
++typedef struct
++{
++    int	  hash_mode;
++    int	  key_length;
++    int	  digest_length;
++
++    uint8 key[100];	
++    uint8 input[64];
++    uint8 digest[64];
++    
++}
++hmac_test;
+diff --git a/board/aspeed/ast2400/mactest.c b/board/aspeed/ast2400/mactest.c
+new file mode 100755
+index 0000000..22054b9
+--- /dev/null
++++ b/board/aspeed/ast2400/mactest.c
+@@ -0,0 +1,510 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++/*
++ * (C) Copyright 2007 ASPEED Software
++ * MAC Manufacture Test in ASPEED's SDK version 0.20.01
++ *
++ * Release History
++ * 1. First Release, river@20071130
++ * 2. Fix the endless loop when PHY is not ready, river@20071204
++ *
++ * Test items:
++ * 1. Support MARVELL PHY only in this version
++ * 2. MDC/MDIO
++ * 3. GMAC/Duplex TX/RX Full_Size, Packet_Length Test
++ * 4. 100M/Duplex TX/RX Full_Size, Packet_Length Test
++ *
++ *
++ *
++*/
++
++
++/*
++* Diagnostics support
++*/
++#include <common.h>
++#include <command.h>
++#include <post.h>
++#include <malloc.h>
++#include <net.h>
++#include "slt.h"
++
++#if ((CFG_CMD_SLT & CFG_CMD_MACTEST) && defined(CONFIG_SLT))
++#include "mactest.h"
++
++static int INL(u_long base, u_long addr)
++{
++	return le32_to_cpu(*(volatile u_long *)(addr + base));
++}
++
++static void OUTL(u_long base, int command, u_long addr)
++{
++	*(volatile u_long *)(addr + base) = cpu_to_le32(command);
++}
++
++
++static void SCU_MAC1_Enable (u8 enable)
++{
++	unsigned int SCU_Register;
++
++	if(enable) {
++//MAC1 RESET/PHY_LINK in SCU
++        SCU_Register = INL(SCU_BASE, SCU_RESET_CONTROL_REG);
++	OUTL(SCU_BASE, SCU_Register & ~(0x800), SCU_RESET_CONTROL_REG);
++	} else {
++		SCU_Register = INL(SCU_BASE, SCU_RESET_CONTROL_REG);
++		OUTL(SCU_BASE, SCU_Register |(0x800), SCU_RESET_CONTROL_REG);
++	
++}
++}
++
++/*------------------------------------------------------------
++ . Reads a register from the MII Management serial interface
++ .-------------------------------------------------------------*/
++static u16 phy_read_register (u8 PHY_Register, u8 PHY_Address)
++{
++	u32 Data, Status = 0, Loop_Count = 0, PHY_Ready = 1;
++	u16 Return_Data;
++
++	OUTL(MAC1_IO_BASE, (PHY_Register << 21) + (PHY_Address << 16) + MIIRD + MDC_CYCTHR, PHYCR_REG);
++	do {
++		Status = (INL (MAC1_IO_BASE, PHYCR_REG) & MIIRD);
++		Loop_Count++;
++		if (Loop_Count >= PHY_LOOP) {
++			PHY_Ready = 0;
++			break;
++		}
++	} while (Status == MIIRD);
++       
++	if (PHY_Ready == 0) {
++		printf ("PHY NOT REDAY\n");
++		return 0;
++	}
++	
++	udelay(5*1000);
++	Data = INL (MAC1_IO_BASE, PHYDATA_REG);
++	Return_Data = (Data >> 16);
++
++	return Return_Data;
++}
++
++static void phy_write_register (u8 PHY_Register, u8 PHY_Address, u16 PHY_Data)
++{
++	u32 Status = 0, Loop_Count = 0, PHY_Ready = 1;
++
++	OUTL(MAC1_IO_BASE, PHY_Data, PHYDATA_REG);
++	OUTL(MAC1_IO_BASE, (PHY_Register << 21) + (PHY_Address << 16) + MIIWR + MDC_CYCTHR, PHYCR_REG);
++	do {
++		Status = (INL (MAC1_IO_BASE, PHYCR_REG) & MIIWR);
++		Loop_Count++;
++		if (Loop_Count >= PHY_LOOP) {
++			PHY_Ready = 0;
++			break;
++		}
++	} while (Status == MIIWR);
++	if (PHY_Ready == 0) {
++		printf ("PHY NOT REDAY\n");
++	}
++}
++
++static int wait_link_resolve (void)
++{
++	int resolved_status, Loop_Count = 0, PHY_Ready = 1;
++
++        do {
++       		resolved_status = (phy_read_register (0x11, 0) & (PHY_RESOLVED_bit | PHY_LINK_bit));
++               	Loop_Count++;
++               	if (Loop_Count >= PHY_LOOP) {
++                   	PHY_Ready = 0;
++                    	printf ("PHY NOT READY\n");
++                    	break;
++                }
++        } while (resolved_status != (PHY_RESOLVED_bit | PHY_LINK_bit));
++        
++        return PHY_Ready;
++}
++
++static void set_phy_speed (int chip, int speed, int duplex)
++{
++	unsigned short data, status;
++
++
++	if (chip == PHYID_VENDOR_MARVELL) {
++		if ((speed == PHY_SPEED_1G) && (duplex == DUPLEX_FULL)) {
++//Manual Control
++			phy_write_register (18, 0, 0);
++			data = phy_read_register (9, 0);
++			phy_write_register (9, 0, data | 0x1800);
++//PHY Reset
++			phy_write_register (0, 0, 0x0140 | 0x8000);
++			do {
++				status = (phy_read_register (0, 0) & 0x8000); 
++			} while (status != 0);
++	
++//Force 1G
++			phy_write_register (29, 0, 0x07);
++			data = phy_read_register (30, 0);
++			phy_write_register (30, 0, data | 0x08);
++			phy_write_register (29, 0, 0x10);
++			data = phy_read_register (30, 0);
++			phy_write_register (30, 0, data | 0x02);
++			phy_write_register (29, 0, 0x12);
++			data = phy_read_register (30, 0);
++			phy_write_register (30, 0, data | 0x01);
++	
++			printf ("FORCE MARVELL PHY to 1G/DUPLEX DONE\n");
++		}
++		else if ((speed == PHY_SPEED_100M) && (duplex == DUPLEX_FULL)) {
++//PHY Reset
++			phy_write_register (0, 0, 0x2100 | 0x8000);
++			do {
++				status = (phy_read_register (0, 0) & 0x8000); 
++			} while (status != 0);
++	
++//Force 100M
++			data = phy_read_register (0, 0);
++			phy_write_register (0, 0, data | 0x4000 | 0x8000);
++			do {
++				status = (phy_read_register (0, 0) & 0x8000); 
++			} while (status != 0);
++			data = phy_read_register (0, 0);
++
++			printf ("FORCE MARVELL PHY to 100M/DUPLEX DONE\n");
++		}
++	}
++	else if ( (chip == PHYID_VENDOR_RTL8201E) || (chip == PHYID_VENDOR_BROADCOM) ){
++		/* basic setting */
++		data  = phy_read_register (0, 0);
++		data &= 0x7140;
++		data |= 0x4000;
++		if (speed == PHY_SPEED_100M)
++		    data |= 0x2000;
++                if (duplex == DUPLEX_FULL)		    
++                    data |= 0x0100;
++		phy_write_register (0, 0, data);
++
++                /* reset */
++		phy_write_register (0, 0, data | 0x8000);
++		do {
++			status = (phy_read_register (0, 0) & 0x8000); 
++		} while (status != 0);
++	        udelay(100*1000);
++		
++		/* basic setting */
++		phy_write_register (0, 0, data);
++
++                if (chip == PHYID_VENDOR_RTL8201E)
++		    printf ("FORCE RTL8201E PHY to 100M/DUPLEX DONE\n");		
++                else if (chip == PHYID_VENDOR_BROADCOM)
++		    printf ("FORCE Broadcom PHY to 100M/DUPLEX DONE\n");		
++		    
++	}	
++	
++}
++
++static void MAC1_reset (void)
++{
++    OUTL(MAC1_IO_BASE, SW_RST_bit, MACCR_REG);
++    for (; (INL(MAC1_IO_BASE, MACCR_REG ) & SW_RST_bit) != 0; ) {udelay(1000);}
++    OUTL(MAC1_IO_BASE, 0, IER_REG );
++}
++
++static int set_mac1_control_register (int Chip_ID)
++{
++	unsigned long	MAC_CR_Register = 0;
++	int    PHY_Ready = 1;
++	u16    PHY_Status, PHY_Speed, PHY_Duplex, Advertise, Link_Partner;
++
++	MAC_CR_Register = SPEED_100M_MODE_bit | RX_ALLADR_bit | FULLDUP_bit | RXMAC_EN_bit | RXDMA_EN_bit | TXMAC_EN_bit | TXDMA_EN_bit | CRC_APD_bit;
++
++	if ( (Chip_ID == PHYID_VENDOR_BROADCOM) || (Chip_ID == PHYID_VENDOR_RTL8201E)) {
++		Advertise = phy_read_register (0x04, 0);
++		Link_Partner = phy_read_register (0x05, 0);
++		Advertise = (Advertise & PHY_SPEED_DUPLEX_MASK);
++		Link_Partner = (Link_Partner & PHY_SPEED_DUPLEX_MASK);
++		if ((Advertise & Link_Partner) & PHY_100M_DUPLEX) {
++			MAC_CR_Register |= SPEED_100M_MODE_bit;
++			MAC_CR_Register |= FULLDUP_bit;
++		}
++		else if ((Advertise & Link_Partner) & PHY_100M_HALF) {
++			MAC_CR_Register |= SPEED_100M_MODE_bit;
++			MAC_CR_Register &= ~FULLDUP_bit;
++		}
++		else if ((Advertise & Link_Partner) & PHY_10M_DUPLEX) {
++			MAC_CR_Register &= ~SPEED_100M_MODE_bit;
++			MAC_CR_Register |= FULLDUP_bit;
++		}
++		else if ((Advertise & Link_Partner) & PHY_10M_HALF) {
++			MAC_CR_Register &= ~SPEED_100M_MODE_bit;
++			MAC_CR_Register &= ~FULLDUP_bit;
++		}
++	}
++	else if (Chip_ID == PHYID_VENDOR_MARVELL) {
++
++		PHY_Ready = wait_link_resolve ();
++
++		if (PHY_Ready == 1) {
++			PHY_Status = phy_read_register (0x11, 0);
++			PHY_Speed = (PHY_Status & PHY_SPEED_MASK) >> 14;
++			PHY_Duplex = (PHY_Status & PHY_DUPLEX_MASK) >> 13;
++
++			if (PHY_Speed == SPEED_1000M) {
++				MAC_CR_Register |= GMAC_MODE_bit;
++                	}
++			else {
++				MAC_CR_Register &= ~GMAC_MODE_bit;
++				if (PHY_Speed == SPEED_10M) {
++                        		MAC_CR_Register &= ~SPEED_100M_MODE_bit;
++                    		}
++                	}
++                	if (PHY_Duplex == DUPLEX_HALF) {
++				MAC_CR_Register &= ~FULLDUP_bit;
++			}
++		}
++	}
++	OUTL(MAC1_IO_BASE, MAC_CR_Register, MACCR_REG);
++
++	return PHY_Ready;
++}
++
++static void ring_buffer_alloc (void)
++{
++	unsigned int i, j;
++
++//Write data into TX buffer
++	for (i = 0; i < NUM_TX; i++) {
++		for (j = 0; j < TX_BUFF_SZ; j++) {
++			tx_buffer[i][j] = i * 4 + j;
++		}
++	}
++//Initialize RX buffer to 0
++	for (i = 0; i < NUM_RX; i++) {
++		for (j = 0; j < RX_BUFF_SZ; j++) {
++			rx_buffer[i][j] = 0;
++		}
++	}
++//Prepare descriptor
++	for (i = 0; i < NUM_RX; i++) {
++		rx_ring[i].status = cpu_to_le32(RXPKT_RDY + RX_BUFF_SZ);
++		rx_ring[i].buf = ((u32) &rx_buffer[i]);
++		rx_ring[i].reserved = 0;
++	}
++	for (i = 0; i < NUM_TX; i++) {
++		tx_ring[i].status = 0;
++		tx_ring[i].des1 = 0;
++		tx_ring[i].buf = ((u32) &tx_buffer[i]);
++		tx_ring[i].reserved = 0;
++	}
++
++	rx_ring[NUM_RX - 1].status |= cpu_to_le32(EDORR);
++	tx_ring[NUM_TX - 1].status |= cpu_to_le32(EDOTR);
++
++	OUTL(MAC1_IO_BASE, ((u32) &tx_ring), TXR_BADR_REG);
++	OUTL(MAC1_IO_BASE, ((u32) &rx_ring), RXR_BADR_REG);
++	
++	tx_new = 0;
++	rx_new = 0;
++}
++
++static int packet_test (void)
++{
++	unsigned int rx_status, length, i, Loop_Count = 0;
++
++	tx_ring[tx_new].status |= cpu_to_le32(LTS | FTS | TX_BUFF_SZ);
++	tx_ring[tx_new].status |= cpu_to_le32(TXDMA_OWN);
++	OUTL(MAC1_IO_BASE, POLL_DEMAND, TXPD_REG);
++
++//Compare result
++	do {
++		rx_status = rx_ring[rx_new].status;
++		Loop_Count++;
++	} while (!(rx_status & RXPKT_STATUS) && (Loop_Count < PHY_LOOP));
++	if (rx_status & (RX_ERR | CRC_ERR | FTL | RUNT | RX_ODD_NB)) {
++		/* There was an error.*/
++		printf("RX error status = 0x%08X\n", rx_status);
++		return PACKET_TEST_FAIL;
++	} else {
++		length = (rx_status & BYTE_COUNT_MASK);
++		for (i = 0; i < RX_BUFF_SZ / 4; i++) {
++			if (rx_buffer[rx_new][i] != tx_buffer[tx_new][i]) {
++				printf ("ERROR at packet %d, address %x\n", rx_new, i);
++				printf ("Gold = %8x, Real = %8x\n", tx_buffer[tx_new][i], rx_buffer[rx_new][i]);
++				return PACKET_TEST_FAIL;
++			}
++		}
++	}
++    	tx_new = (tx_new + 1) % NUM_TX;
++	rx_new = (rx_new + 1) % NUM_RX;
++
++	return TEST_PASS;
++}
++
++static int packet_length_test (int packet_length)
++{
++	unsigned int rx_status, length, i, Loop_Count = 0;
++
++	tx_ring[tx_new].status &= (~(BYTE_COUNT_MASK));
++	tx_ring[tx_new].status |= cpu_to_le32(LTS | FTS | packet_length);
++	tx_ring[tx_new].status |= cpu_to_le32(TXDMA_OWN);
++	OUTL(MAC1_IO_BASE, POLL_DEMAND, TXPD_REG);
++
++//Compare result
++	do {
++		rx_status = rx_ring[rx_new].status;
++		Loop_Count++;
++	} while (!(rx_status & RXPKT_STATUS) && (Loop_Count < PHY_LOOP));
++	if (rx_status & (RX_ERR | CRC_ERR | FTL | RUNT | RX_ODD_NB)) {
++		/* There was an error.*/
++		printf("RX error status = 0x%08X\n", rx_status);
++		return PACKET_LENGTH_TEST_FAIL;
++	} else {
++		length = (rx_status & BYTE_COUNT_MASK) - 4;
++                if (length != packet_length) {
++			printf ("Received Length ERROR. Gold = %d, Fail = %d\n",packet_length, length);
++			printf ("rx_new = %d, tx_new = %d\n", rx_new, tx_new);
++			return PACKET_LENGTH_TEST_FAIL;
++                }
++		for (i = 0; i < length; i++) {
++		    if (rx_buffer[rx_new][i] != tx_buffer[tx_new][i]) {
++		    	printf ("ERROR at packet %d, address %x\n", rx_new, i);
++		    	printf ("Gold = %8x, Real = %8x\n", tx_buffer[tx_new][i], rx_buffer[rx_new][i]);
++		    	return PACKET_LENGTH_TEST_FAIL;
++		    }
++		}
++	}
++	rx_ring[rx_new].status &= (~(RXPKT_STATUS));
++    	tx_new = (tx_new + 1) % NUM_TX;
++	rx_new = (rx_new + 1) % NUM_RX;
++
++	return TEST_PASS;
++}
++
++static int MAC1_init (int id)
++{
++	int phy_status = 0;
++
++	MAC1_reset ();
++	phy_status = set_mac1_control_register (id);
++       	ring_buffer_alloc ();
++       	
++       	return phy_status;
++}
++
++int do_mactest (void)
++{
++	unsigned int phy_id, i;
++	int test_result = 0, phy_status = 0;
++
++	SCU_MAC1_Enable(1);
++	phy_id = ((phy_read_register (0x02, 0) << 16) + phy_read_register (0x03, 0)) & PHYID_VENDOR_MASK;
++	if (phy_id == PHYID_VENDOR_MARVELL) {
++        	printf ("PHY DETECTED ------> MARVELL\n");
++
++        	set_phy_speed (phy_id, PHY_SPEED_1G, DUPLEX_FULL);
++        	if ((phy_status = MAC1_init (phy_id)) != 0) {
++	        	for (i = 0; i < NUM_TX; i++) {
++				test_result |= packet_test ();
++				if (test_result != 0)
++					break;
++        		}
++        	}
++		else if (phy_status == 0) {
++			printf ("PHY FAIL: Please Check If you are using LOOP BACK Connector\n");
++			test_result = 3;
++			return	test_result;
++		}
++        	if ((phy_status = MAC1_init (phy_id)) != 0) {
++        		for (i = 60; i < TX_BUFF_SZ; i++) {
++				test_result |= packet_length_test (i);
++				if (test_result != 0)
++					break;
++        		}
++        	}
++		else if (phy_status == 0) {
++			printf ("PHY FAIL: Please Check If you are using LOOP BACK Connector\n");
++			test_result = 3;
++			return	test_result;
++		}
++        	set_phy_speed (phy_id, PHY_SPEED_100M, DUPLEX_FULL);
++        	if ((phy_status = MAC1_init (phy_id)) != 0) {
++        		for (i = 0; i < NUM_TX; i++) {
++				test_result |= packet_test ();
++				if (test_result != 0)
++					break;
++        		}
++        	}
++		else if (phy_status == 0) {
++			printf ("PHY FAIL: Please Check If you are using LOOP BACK Connector\n");
++			test_result = 3;
++			return	test_result;
++		}
++
++        	if ((phy_status = MAC1_init (phy_id)) != 0) {
++        		for (i = 60; i < TX_BUFF_SZ; i++) {
++				test_result |= packet_length_test (i);
++        			if (test_result != 0)
++	        	    		break;
++        		}
++        	}
++		else if (phy_status == 0) {
++			printf ("PHY FAIL: Please Check If you are using LOOP BACK Connector\n");
++			test_result = 3;
++			return	test_result;
++		}
++        }
++	else if ( (phy_id == PHYID_VENDOR_RTL8201E) || (phy_id == PHYID_VENDOR_BROADCOM) ){
++		
++        	if (phy_id == PHYID_VENDOR_RTL8201E)
++        	    printf ("PHY DETECTED ------> RTL 8201E \n");
++        	else if (phy_id == PHYID_VENDOR_BROADCOM)
++        	    printf ("PHY DETECTED ------> Broadcom \n");
++        	
++        	set_phy_speed (phy_id, PHY_SPEED_100M, DUPLEX_FULL);
++        	if ((phy_status = MAC1_init (phy_id)) != 0) {
++        		for (i = 0; i < NUM_TX; i++) {
++				test_result |= packet_test ();
++				if (test_result != 0)
++					break;
++        		}
++        	}
++		else if (phy_status == 0) {
++			printf ("PHY FAIL: Please Check If you are using LOOP BACK Connector\n");
++			test_result = 3;
++			return	test_result;
++		}
++
++        	if ((phy_status = MAC1_init (phy_id)) != 0) {
++        		for (i = 60; i < TX_BUFF_SZ; i++) {
++				test_result |= packet_length_test (i);
++        			if (test_result != 0)
++	        	    		break;
++        		}
++        	}
++		else if (phy_status == 0) {
++			printf ("PHY FAIL: Please Check If you are using LOOP BACK Connector\n");
++			test_result = 3;
++			return	test_result;
++		}        	
++        }	
++          
++	if ((phy_status == 0) && (test_result & PACKET_TEST_FAIL)) {
++		printf ("Packet Test FAIL !\n");
++	}
++	else if ((phy_status == 0) && (test_result & PACKET_LENGTH_TEST_FAIL)) {
++		printf ("Packet Length Test FAIL !\n");
++	}
++
++	SCU_MAC1_Enable(0);
++	return test_result;
++	
++}
++
++#endif /* CONFIG_SLT */
+diff --git a/board/aspeed/ast2400/mactest.h b/board/aspeed/ast2400/mactest.h
+new file mode 100755
+index 0000000..e75b7bb
+--- /dev/null
++++ b/board/aspeed/ast2400/mactest.h
+@@ -0,0 +1,215 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++/* MACTest.h */
++
++// --------------------------------------------------------------------
++//              General Definition
++// --------------------------------------------------------------------
++#define MAC1_IO_BASE		0x1E660000
++#define PHY_LOOP		100000
++#define NUM_RX			48
++#define NUM_TX			48
++#define RX_BUFF_SZ		1514
++#define TX_BUFF_SZ		1514
++#define TOUT_LOOP		1000000
++#define ETH_ALEN		6
++#define POLL_DEMAND		1
++
++
++// --------------------------------------------------------------------
++//              MAC Register Index
++// --------------------------------------------------------------------
++#define ISR_REG			0x00				// interrups status register
++#define IER_REG			0x04				// interrupt maks register
++#define MAC_MADR_REG		0x08				// MAC address (Most significant)
++#define MAC_LADR_REG		0x0c				// MAC address (Least significant)
++#define MAHT0_REG		0x10				// Multicast Address Hash Table 0 register
++#define MAHT1_REG		0x14				// Multicast Address Hash Table 1 register
++#define TXPD_REG		0x18				// Transmit Poll Demand register
++#define RXPD_REG		0x1c				// Receive Poll Demand register
++#define TXR_BADR_REG		0x20				// Transmit Ring Base Address register
++#define RXR_BADR_REG		0x24				// Receive Ring Base Address register
++#define HPTXPD_REG		0x28
++#define HPTXR_BADR_REG		0x2c
++#define ITC_REG			0x30				// interrupt timer control register
++#define APTC_REG		0x34				// Automatic Polling Timer control register
++#define DBLAC_REG		0x38				// DMA Burst Length and Arbitration control register
++#define DMAFIFOS_REG		0x3c
++#define FEAR_REG		0x44
++#define TPAFCR_REG		0x48
++#define RBSR_REG		0x4c
++#define MACCR_REG		0x50				// MAC control register
++#define MACSR_REG		0x54				// MAC status register
++#define PHYCR_REG		0x60				// PHY control register
++#define PHYDATA_REG		0x64				// PHY Write Data register
++
++// --------------------------------------------------------------------
++//		PHYCR_REG
++// --------------------------------------------------------------------
++#define PHY_RE_AUTO_bit			(1UL<<9)
++#define PHY_READ_bit			(1UL<<26)
++#define PHY_WRITE_bit			(1UL<<27)
++// --------------------------------------------------------------------
++//		PHYCR_REG 
++// --------------------------------------------------------------------
++#define PHY_AUTO_OK_bit			(1UL<<5)
++// --------------------------------------------------------------------
++//		PHY INT_STAT_REG 
++// --------------------------------------------------------------------
++#define PHY_SPEED_CHG_bit		(1UL<<14)
++#define PHY_DUPLEX_CHG_bit		(1UL<<13)
++#define PHY_LINK_CHG_bit		(1UL<<10)
++#define PHY_AUTO_COMP_bit		(1UL<<11)
++// --------------------------------------------------------------------
++//		PHY SPE_STAT_REG 
++// --------------------------------------------------------------------
++#define PHY_RESOLVED_bit		(1UL<<11)
++#define PHY_LINK_bit			(1UL<<10)
++#define PHY_SPEED_mask			0xC000
++#define PHY_SPEED_10M			0x0
++#define PHY_SPEED_100M			0x1
++#define PHY_SPEED_1G			0x2
++#define PHY_DUPLEX_mask                 0x2000
++#define PHY_SPEED_DUPLEX_MASK           0x01E0
++#define PHY_100M_DUPLEX                 0x0100
++#define PHY_100M_HALF                   0x0080
++#define PHY_10M_DUPLEX                  0x0040
++#define PHY_10M_HALF                    0x0020
++#define LINK_STATUS                     0x04
++#define PHYID_VENDOR_MASK		0xfffffc00
++#define PHYID_VENDOR_MARVELL		0x01410c00
++#define PHYID_VENDOR_BROADCOM		0x00406000
++#define PHYID_VENDOR_RTL8201E		0x001cc800
++#define DUPLEX_FULL			0x01
++#define DUPLEX_HALF			0x00
++
++
++
++// --------------------------------------------------------------------
++//		MACCR_REG
++// --------------------------------------------------------------------
++
++#define SW_RST_bit		(1UL<<31)				// software reset/
++#define DIRPATH_bit		(1UL<<21)
++#define RX_IPCS_FAIL_bit	(1UL<<20)
++#define SPEED_100M_MODE_bit		(1UL<<19)
++#define RX_UDPCS_FAIL_bit	(1UL<<18)
++#define RX_BROADPKT_bit		(1UL<<17)				// Receiving broadcast packet
++#define RX_MULTIPKT_bit		(1UL<<16)				// receiving multicast packet
++#define RX_HT_EN_bit		(1UL<<15)
++#define RX_ALLADR_bit		(1UL<<14)				// not check incoming packet's destination address
++#define JUMBO_LF_bit		(1UL<<13)
++#define RX_RUNT_bit		(1UL<<12)				// Store incoming packet even its length is les than 64 byte
++#define CRC_CHK_bit		(1UL<<11)
++#define CRC_APD_bit		(1UL<<10)				// append crc to transmit packet
++#define GMAC_MODE_bit		(1UL<<9)
++#define FULLDUP_bit		(1UL<<8)				// full duplex
++#define ENRX_IN_HALFTX_bit	(1UL<<7)
++#define LOOP_EN_bit		(1UL<<6)				// Internal loop-back
++#define HPTXR_EN_bit		(1UL<<5)
++#define REMOVE_VLAN_bit		(1UL<<4)
++#define RXMAC_EN_bit		(1UL<<3)				// receiver enable
++#define TXMAC_EN_bit		(1UL<<2)				// transmitter enable
++#define RXDMA_EN_bit		(1UL<<1)				// enable DMA receiving channel
++#define TXDMA_EN_bit		(1UL<<0)				// enable DMA transmitting channel
++
++
++// --------------------------------------------------------------------
++//		SCU_REG
++// --------------------------------------------------------------------
++#define  SCU_BASE			0x1E6E2000
++#define  SCU_PROTECT_KEY_REG            0x0
++#define  SCU_PROT_KEY_MAGIC             0x1688a8a8
++#define  SCU_RESET_CONTROL_REG          0x04
++#define  SCU_RESET_MAC1                 (1u << 11)
++#define  SCU_RESET_MAC2                 (1u << 12)
++#define  SCU_HARDWARE_TRAPPING_REG      0x70
++#define  SCU_HT_MAC_INTF_LSBIT          6
++#define  SCU_HT_MAC_INTERFACE           (0x7u << SCU_HT_MAC_INTF_LSBIT)
++#define  MAC_INTF_SINGLE_PORT_MODES     (1u<<0/*GMII*/ | 1u<<3/*MII_ONLY*/ | 1u<<4/*RMII_ONLY*/)
++#define  SCU_HT_MAC_GMII                0x0u
++// MII and MII mode
++#define  SCU_HT_MAC_MII_MII             0x1u
++#define  SCU_HT_MAC_MII_ONLY            0x3u
++#define  SCU_HT_MAC_RMII_ONLY           0x4u
++#define  SCU_MULTIFUNCTION_PIN_REG      0x74
++#define  SCU_MFP_MAC2_PHYLINK           (1u << 26)
++#define  SCU_MFP_MAC1_PHYLINK           (1u << 25)
++#define  SCU_MFP_MAC2_MII_INTF          (1u << 21)
++#define  SCU_MFP_MAC2_MDC_MDIO          (1u << 20)
++#define  SCU_SILICON_REVISION_REG       0x7C
++
++//---------------------------------------------------
++//  PHY R/W Register Bit
++//---------------------------------------------------
++#define MIIWR                   (1UL<<27)
++#define MIIRD                   (1UL<<26)
++#define MDC_CYCTHR              0x34
++#define PHY_SPEED_MASK          0xC000
++#define PHY_DUPLEX_MASK         0x2000
++#define SPEED_1000M             0x02
++#define SPEED_100M              0x01
++#define SPEED_10M               0x00
++#define DUPLEX_FULL             0x01
++#define DUPLEX_HALF             0x00
++#define RESOLVED_BIT            0x800
++
++#define PHY_SPEED_DUPLEX_MASK   0x01E0
++#define PHY_100M_DUPLEX         0x0100
++#define PHY_100M_HALF           0x0080
++#define PHY_10M_DUPLEX          0x0040
++#define PHY_10M_HALF            0x0020
++
++//---------------------------------------------------
++// Descriptor bits.
++//---------------------------------------------------
++#define TXDMA_OWN	0x80000000	/* Own Bit */
++#define RXPKT_RDY       0x00000000      
++#define RXPKT_STATUS    0x80000000
++#define EDORR		0x40000000	/* Receive End Of Ring */
++#define LRS		0x10000000	/* Last Descriptor */
++#define RD_ES		0x00008000	/* Error Summary */
++#define EDOTR		0x40000000	/* Transmit End Of Ring */
++#define T_OWN		0x80000000	/* Own Bit */
++#define LTS		0x10000000	/* Last Segment */
++#define FTS		0x20000000	/* First Segment */
++#define CRC_ERR         0x00080000
++#define TD_ES		0x00008000	/* Error Summary */
++#define TD_SET		0x08000000	/* Setup Packet */
++#define RX_ERR          0x00040000
++#define FTL             0x00100000
++#define RUNT            0x00200000
++#define RX_ODD_NB       0x00400000
++#define BYTE_COUNT_MASK 0x00003FFF
++
++//---------------------------------------------------
++// SPEED/DUPLEX Parameters
++//---------------------------------------------------
++
++//---------------------------------------------------
++// Return Status
++//---------------------------------------------------
++#define TEST_PASS			0
++#define PACKET_TEST_FAIL		1
++#define PACKET_LENGTH_TEST_FAIL		2
++
++struct  mac_desc {
++	volatile s32 status;
++	u32 des1;
++	u32 reserved;
++	u32 buf;	
++};
++static struct mac_desc rx_ring[NUM_RX] __attribute__ ((aligned(32))); /* RX descriptor ring         */
++static struct mac_desc tx_ring[NUM_TX] __attribute__ ((aligned(32))); /* TX descriptor ring         */
++static int rx_new;                             /* RX descriptor ring pointer */
++static int tx_new;                             /* TX descriptor ring pointer */
++static volatile unsigned char rx_buffer[NUM_RX][RX_BUFF_SZ] __attribute__ ((aligned(32))); /* RX buffer         */
++static volatile unsigned char tx_buffer[NUM_TX][TX_BUFF_SZ] __attribute__ ((aligned(32))); /* TX buffer         */
+diff --git a/board/aspeed/ast2400/mictest.c b/board/aspeed/ast2400/mictest.c
+new file mode 100755
+index 0000000..1b2b342
+--- /dev/null
++++ b/board/aspeed/ast2400/mictest.c
+@@ -0,0 +1,146 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++/*
++ * Diagnostics support
++ */
++#include <common.h>
++#include <command.h>
++#include <post.h>
++#include "slt.h"
++
++#if ((CFG_CMD_SLT & CFG_CMD_MICTEST) && defined(CONFIG_SLT))
++#include "mictest.h"
++
++static unsigned char ctrlbuf[MIC_MAX_CTRL];
++static unsigned char chksumbuf[MIC_MAX_CHKSUM];
++
++void vInitSCU(void)
++{
++    unsigned long ulData;
++
++    *(unsigned long *) (0x1e6e2000) = 0x1688A8A8;
++
++    udelay(100);
++
++    ulData = *(unsigned long *) (0x1e6e2004);
++    ulData &= 0xbffff;
++    *(unsigned long *) (0x1e6e2004) = ulData;
++         	
++}
++
++void vInitMIC(void)
++{
++    unsigned long i, j, ulPageNumber;
++    unsigned char *pjctrl, *pjsum;
++    
++    ulPageNumber = DRAMSIZE >> 12;	
++
++    pjctrl = (unsigned char *)(m16byteAlignment((unsigned long) ctrlbuf));
++    pjsum = (unsigned char *)(m16byteAlignment((unsigned long) chksumbuf));
++    
++    /* init ctrl buffer (2bits for one page) */
++    for (i=0; i< (ulPageNumber/4); i++)
++        *(unsigned char *) (pjctrl + i) = DEFAULT_CTRL;
++      
++    /* init chksum buf (4bytes for one page) */
++    for (i=0; i<ulPageNumber; i++)
++        *(unsigned long *) (pjsum + i*4) = DEFAULT_CHKSUM;
++    
++    *(unsigned long *) (MIC_BASE + MIC_CTRLBUFF_REG)   = (unsigned long) pjctrl;
++    *(unsigned long *) (MIC_BASE + MIC_CHKSUMBUF_REG)  = (unsigned long) pjsum;
++    *(unsigned long *) (MIC_BASE + MIC_RATECTRL_REG)   = (unsigned long) DEFAULT_RATE;
++    *(unsigned long *) (MIC_BASE + MIC_ENGINECTRL_REG) = MIC_ENABLE_MIC | (DRAMSIZE - 0x1000);
++	
++}
++
++void vDisableMIC(void)
++{
++    *(unsigned long *) (MIC_BASE + MIC_ENGINECTRL_REG)   = MIC_RESET_MIC;
++	
++}
++
++int do_chksum(void)
++{
++    unsigned long i, j, k, ulPageNumber;
++    int Status = 0;
++    unsigned short tmp;
++    volatile unsigned long sum1, sum2;
++    unsigned long goldensum, chksum;
++    unsigned long len, tlen;
++    unsigned char *pjsum;
++
++    ulPageNumber = DRAMSIZE >> 12;	
++    pjsum = (unsigned char *)(m16byteAlignment((unsigned long) chksumbuf));
++
++    /* start test */    
++    for (i=0; i<ulPageNumber; i++)
++    {
++    	
++    	sum1 = 0xffff, sum2 = 0xffff;
++    	len = 0x0800;
++    	j = 0;
++    	
++    	while (len)
++    	{
++    	    tlen = len > 360 ? 360 : len;
++    	    len -= tlen;
++    	    do {
++    	       tmp = *(unsigned short *) (DRAM_BASE + ((i << 12) + j));	
++               sum1 += (unsigned long) tmp;   	    	
++    	       sum2 += sum1;
++    	       j+=2;
++    	    } while (--tlen);
++    	    sum1 = (sum1 & 0xffff) + (sum1 >> 16);
++    	    sum2 = (sum2 & 0xffff) + (sum2 >> 16);   	        	
++    	}
++    	
++    	sum1 = (sum1 & 0xffff) + (sum1 >> 16);
++    	sum2 = (sum2 & 0xffff) + (sum2 >> 16);
++    	
++    	goldensum = (sum2 << 16) | sum1;
++        k= 0;
++        do {
++            chksum = *(unsigned long *) (pjsum + i*4);
++            udelay(100);
++            k++;
++    	} while ((chksum == 0) && (k<1000));
++    	
++    	if (chksum != goldensum)
++    	{
++    	        Status = 1;	
++                printf("[FAIL] MIC Chksum Failed at Page %x \n", i);
++    	}
++
++    } /* end of i loop */
++		
++    return (Status);
++    	
++}
++
++int do_mictest (void)
++{
++        unsigned long Flags = 0;
++
++        vInitSCU();
++        vInitMIC();
++        
++        if (do_chksum())
++            Flags = 1;
++            
++        vDisableMIC();
++        
++	return Flags;
++	
++}
++
++#endif /* CONFIG_SLT */
+diff --git a/board/aspeed/ast2400/mictest.h b/board/aspeed/ast2400/mictest.h
+new file mode 100755
+index 0000000..e14bb41
+--- /dev/null
++++ b/board/aspeed/ast2400/mictest.h
+@@ -0,0 +1,55 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++/* Macro */
++#define m08byteAlignment(x)		((x + 0x00000007) & 0xFFFFFFF8)
++#define m16byteAlignment(x)		((x + 0x0000000F) & 0xFFFFFFF0)
++#define m64byteAlignment(x)		((x + 0x0000003F) & 0xFFFFFFC0)
++
++/* Options */
++#define MIC_TEST_PAGE		32
++#define DRAMSIZE		(MIC_TEST_PAGE * 0x1000)
++#define MIC_MAX_CTRL		(MIC_TEST_PAGE / 4 + 16)
++#define MIC_MAX_CHKSUM		(MIC_TEST_PAGE * 4 + 16)
++
++/* Default Setting */
++#define DEFAULT_RATE		0x00000000
++#define DEFAULT_CTRL		0xFF
++#define DEFAULT_CHKSUM		0x00000000
++#define DEFAULT_WRITEBACK	0x08880000
++
++/* Reg. Definition */
++#define DRAM_BASE		0x40000000
++#define MIC_BASE		0x1e640000
++#define MIC_CTRLBUFF_REG	0x00
++#define MIC_CHKSUMBUF_REG	0x04
++#define MIC_RATECTRL_REG	0x08
++#define MIC_ENGINECTRL_REG	0x0C
++#define MIC_STOPPAGE_REG	0x10
++#define MIC_STATUS_REG		0x14
++#define MIC_STATUS1_REG		0x18
++#define MIC_STATUS2_REG		0x1C
++
++#define MIC_RESET_MIC		0x00000000
++#define MIC_ENABLE_MIC		0x10000000
++#define MIC_MAXPAGE_MASK	0x0FFFF000
++#define MIC_WRITEBACK_MASK	0xFFFF0000
++#define MIC_STOPPAGE_MASK	0x0000FFFF
++#define MIC_PAGEERROR		0x40000000
++#define MIC_PAGE1ERROR		0x10000000
++#define MIC_PAGE2ERROR		0x20000000
++#define MIC_INTMASK		0x00060000
++#define MIC_ERRPAGENO_MASK	0x0000FFFF
++
++#define MIC_CTRL_MASK		0x03
++#define MIC_CTRL_SKIP		0x00
++#define MIC_CTRL_CHK1		0x01
++#define MIC_CTRL_CHK2		0x02
++#define MIC_CTRL_CHK3		0x03
+diff --git a/board/aspeed/ast2400/pci.c b/board/aspeed/ast2400/pci.c
+new file mode 100755
+index 0000000..5b17466
+--- /dev/null
++++ b/board/aspeed/ast2400/pci.c
+@@ -0,0 +1,243 @@
++/*
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2, or (at
++ * your option) any later version.
++ */
++
++#include <common.h>
++#include <pci.h>
++
++#ifdef CONFIG_PCI
++
++#define PCI_CSR_BASE		0x60000000
++#define ASPEED_PCI_IO_BASE	0x00000000
++#define ASPEED_PCI_IO_SIZE	0x00010000
++#define ASPEED_PCI_MEM_BASE	0x68000000
++#define ASPEED_PCI_MEM_SIZE	0x18000000
++
++#define CSR_CRP_CMD_OFFSET	0x00
++#define CSR_CRP_WRITE_OFFSET    0x04
++#define CSR_CRP_READ_OFFSET	0x08
++#define CSR_PCI_ADDR_OFFSET	0x0C
++#define CSR_PCI_CMD_OFFSET	0x10
++#define CSR_PCI_WRITE_OFFSET	0x14
++#define CSR_PCI_READ_OFFSET	0x18
++#define CSR_PCI_STATUS_OFFSET	0x1C
++
++#define CRP_ADDR_REG		(volatile ulong*) (PCI_CSR_BASE + CSR_CRP_CMD_OFFSET)
++#define CRP_WRITE_REG		(volatile ulong*) (PCI_CSR_BASE + CSR_CRP_WRITE_OFFSET)
++#define CRP_READ_REG		(volatile ulong*) (PCI_CSR_BASE + CSR_CRP_READ_OFFSET)
++#define PCI_ADDR_REG		(volatile ulong*) (PCI_CSR_BASE + CSR_PCI_ADDR_OFFSET)
++#define PCI_CMD_REG		(volatile ulong*) (PCI_CSR_BASE + CSR_PCI_CMD_OFFSET)
++#define PCI_WRITE_REG		(volatile ulong*) (PCI_CSR_BASE + CSR_PCI_WRITE_OFFSET)
++#define PCI_READ_REG		(volatile ulong*) (PCI_CSR_BASE + CSR_PCI_READ_OFFSET)
++
++#define PCI_CMD_READ		0x0A
++#define PCI_CMD_WRITE		0x0B
++
++#define RESET_PCI_STATUS        *(volatile ulong*) (PCI_CSR_BASE + CSR_PCI_STATUS_OFFSET) = 0x01
++#define CHK_PCI_STATUS          (*(volatile ulong*) (PCI_CSR_BASE + CSR_PCI_STATUS_OFFSET) & 0x03)
++
++static int pci_config_access (u8 access_type, u32 dev, u32 reg, u32 * data)
++{
++	u32 bus;
++	u32 device;
++	u32 function;
++
++	bus = ((dev & 0xff0000) >> 16);
++	device = ((dev & 0xf800) >> 11);
++	function = (dev & 0x0700);
++
++	if (bus == 0) {
++		// Type 0 Configuration 		
++		*PCI_ADDR_REG = (u32) (1UL << device | function | (reg & 0xfc));
++	} else {
++		// Type 1 Configuration 
++		*PCI_ADDR_REG = (u32) (dev | ((reg / 4) << 2) | 1);
++	}
++
++        RESET_PCI_STATUS;
++        
++	if (access_type == PCI_CMD_WRITE) {
++		*PCI_CMD_REG = (ulong) PCI_CMD_WRITE;
++		*PCI_WRITE_REG = *data;
++	} else {
++		*PCI_CMD_REG = (ulong) PCI_CMD_READ;		
++		*data = *PCI_READ_REG;
++	}
++            
++	return (CHK_PCI_STATUS);
++}
++
++static int aspeed_pci_read_config_byte (u32 hose, u32 dev, u32 reg, u8 * val)
++{
++	u32 data;
++
++	if (pci_config_access (PCI_CMD_READ, dev, reg, &data)) {
++		*val = 0;
++		return -1;
++	}	
++
++	*val = (data >> ((reg & 3) << 3)) & 0xff;
++
++	return 0;
++}
++
++
++static int aspeed_pci_read_config_word (u32 hose, u32 dev, u32 reg, u16 * val)
++{
++	u32 data;
++
++	if (reg & 1)
++		return -1;
++
++	if (pci_config_access (PCI_CMD_READ, dev, reg, &data)) {
++		*val = 0;
++		return -1;
++	} 		
++
++	*val = (data >> ((reg & 3) << 3)) & 0xffff;
++
++	return 0;
++}
++
++
++static int aspeed_pci_read_config_dword (u32 hose, u32 dev, u32 reg,
++					 u32 * val)
++{
++	u32 data = 0;
++
++	if (reg & 3)
++		return -1;
++
++	if (pci_config_access (PCI_CMD_READ, dev, reg, &data))	{
++		*val = 0;
++		return -1;
++	}		
++
++	*val = data;
++
++	return (0);
++}
++
++static int aspeed_pci_write_config_byte (u32 hose, u32 dev, u32 reg, u8 val)
++{
++	u32 data = 0;
++
++	if (pci_config_access (PCI_CMD_READ, dev, reg, &data))
++		return -1;
++
++	data = (data & ~(0xff << ((reg & 3) << 3))) | (val <<
++						       ((reg & 3) << 3));
++
++	if (pci_config_access (PCI_CMD_WRITE, dev, reg, &data))
++		return -1;
++
++	return 0;
++}
++
++
++static int aspeed_pci_write_config_word (u32 hose, u32 dev, u32 reg, u16 val)
++{
++	u32 data = 0;
++
++	if (reg & 1)
++		return -1;
++
++	if (pci_config_access (PCI_CMD_READ, dev, reg, &data))
++		return -1;
++
++	data = (data & ~(0xffff << ((reg & 3) << 3))) | (val <<
++							 ((reg & 3) << 3));
++
++	if (pci_config_access (PCI_CMD_WRITE, dev, reg, &data))
++		return -1;
++
++	return 0;
++}
++
++static int aspeed_pci_write_config_dword (u32 hose, u32 dev, u32 reg, u32 val)
++{
++	u32 data;
++
++	if (reg & 3) {
++		return -1;
++	}
++
++	data = val;
++
++	if (pci_config_access (PCI_CMD_WRITE, dev, reg, &data))
++		return -1;
++
++	return (0);
++}
++
++/*
++ *	Initialize PCIU
++ */
++aspeed_pciu_init ()
++{
++
++    unsigned long reg;
++
++    /* Reset PCI Host */
++    reg = *((volatile ulong*) 0x1e6e2004);
++    *((volatile ulong*) 0x1e6e2004) = reg | 0x00280000;
++
++    reg = *((volatile ulong*) 0x1e6e2074);		/* REQ2 */    
++    *((volatile ulong*) 0x1e6e2074) = reg | 0x00000010;
++
++    *((volatile ulong*) 0x1e6e2008) |= 0x00080000;        
++    reg = *((volatile ulong*) 0x1e6e200c); 
++    *((volatile ulong*) 0x1e6e200c) = reg & 0xfff7ffff;
++    udelay(1); 
++    *((volatile ulong*) 0x1e6e2004) &= 0xfff7ffff;
++                 
++    /* Initial PCI Host */
++    RESET_PCI_STATUS;
++	
++    *CRP_ADDR_REG = ((ulong)(PCI_CMD_READ) << 16) | 0x04;
++    reg = *CRP_READ_REG;
++    
++    *CRP_ADDR_REG = ((ulong)(PCI_CMD_WRITE) << 16) | 0x04;
++    *CRP_WRITE_REG = reg | 0x07;
++   
++}
++
++/*
++ *	Initialize Module
++ */
++
++void aspeed_init_pci (struct pci_controller *hose)
++{
++	hose->first_busno = 0;
++	hose->last_busno = 0xff;
++
++	aspeed_pciu_init ();			/* Initialize PCIU */
++
++	/* PCI memory space #1 */
++	pci_set_region (hose->regions + 0,
++			ASPEED_PCI_MEM_BASE, ASPEED_PCI_MEM_BASE, ASPEED_PCI_MEM_SIZE, PCI_REGION_MEM);
++
++	/* PCI I/O space */
++	pci_set_region (hose->regions + 1,
++			ASPEED_PCI_IO_BASE, ASPEED_PCI_IO_BASE, ASPEED_PCI_IO_SIZE, PCI_REGION_IO);
++
++	hose->region_count = 2;
++
++	hose->read_byte   = aspeed_pci_read_config_byte;
++	hose->read_word   = aspeed_pci_read_config_word;
++	hose->read_dword  = aspeed_pci_read_config_dword;
++	hose->write_byte  = aspeed_pci_write_config_byte;
++	hose->write_word  = aspeed_pci_write_config_word;
++	hose->write_dword = aspeed_pci_write_config_dword;
++
++	pci_register_hose (hose);
++
++	hose->last_busno = pci_hose_scan (hose);
++
++	return;
++}
++#endif /* CONFIG_PCI */
++
+diff --git a/board/aspeed/ast2400/platform.S b/board/aspeed/ast2400/platform.S
+new file mode 100644
+index 0000000..27e8f26
+--- /dev/null
++++ b/board/aspeed/ast2400/platform.S
+@@ -0,0 +1,3089 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++/*
++ * Board specific setup info
++ *
++ ******************************************************************************
++ * ASPEED Technology Inc.
++ * AST2300/AST2400 DDR2/DDR3 SDRAM controller initialization and calibration sequence
++ *
++ * Gary Hsu, <gary_hsu@aspeedtech.com>
++ *
++ * Release date: 2014.12.29 formal release for SDK0.60
++ *
++ * Modified list from v0.23
++ * EC1. Modify DQIDLY and DQSI-MCLK2X calibration algorithm
++ * EC2. Remove pass 2 DQIDLY finetune process
++ * EC3. Modify ECC code
++ * EC4. Add AST2400 supporting
++ * EC5. Add SPI timing calibration for AST2400
++ * EC6. Remove AST2300-A0 PCI-e workaround
++ * EC7. Add CK duty calibration for AST2400
++ * EC8. Remove #define CONFIG_DRAM_UART_OUT, default has message output to UART5
++ * EC9. Add DRAM size auto-detection
++ * EC10. Add GPIO register clear when watchdog reboot (only for AST2400)
++ * EC11. Move the "Solve ASPM" code position of AST2300 to avoid watchdog reset
++ *
++ * Modified list from v0.53
++ * EC1. Add solution of LPC lock issue due to watchdog reset. (AP note A2300-11)
++ *
++ * Modified list from v0.56
++ * EC1. Fix read DQS input mask window too late issue if DRAM's t_DQSCK is earlier too much
++ *      (ex. Nanya NT5CB64M16FP)
++ *      1. Change init value of MCR18[4] from '1' to '0'
++ *      2. Add CBR4 code to finetune MCR18[4]
++ *
++ * Modified list from v0.59
++ * EC1. Add DQS input gating window delay tuning (1/2 T) when CBR retry
++ * EC2. Modify DLL1 MAdj = 0x4C
++ *
++ * Optional define variable
++ * 1. DRAM Speed             //
++ *    CONFIG_DRAM_336        // 336MHz (DDR-667)
++ *    CONFIG_DRAM_408        // 408MHz (DDR-800) (default)
++ * 2. ECC Function enable
++ *    CONFIG_DRAM_ECC        // define to enable ECC function
++ *                           // when enabled, must define the ECC protected memory size at 0x1e6e0054
++ * 3. UART5 message output   //
++ *    CONFIG_DRAM_UART_38400 // set the UART baud rate to 38400, default is 115200
++ ******************************************************************************
++ */
++
++#include <config.h>
++#include <version.h>
++/******************************************************************************
++ Calibration Macro Start
++ Usable registers:
++  r0, r1, r2, r3, r5, r6, r7, r8, r9, r10, r11
++ ******************************************************************************/
++/* PATTERN_TABLE,
++   init_delay_timer,
++   check_delay_timer,
++   clear_delay_timer,
++   record_dll2_pass_range,
++   record_dll2_pass_range_h,
++   are for DRAM calibration */
++
++PATTERN_TABLE:
++    .word   0xff00ff00
++    .word   0xcc33cc33
++    .word   0xaa55aa55
++    .word   0x88778877
++    .word   0x92cc4d6e       @ 5
++    .word   0x543d3cde
++    .word   0xf1e843c7
++    .word   0x7c61d253
++    .word   0x00000000       @ 8
++
++    .macro init_delay_timer
++    ldr r0, =0x1e782024                          @ Set Timer3 Reload
++    str r2, [r0]
++
++    ldr r0, =0x1e6c0038                          @ Clear Timer3 ISR
++    ldr r1, =0x00040000
++    str r1, [r0]
++
++    ldr r0, =0x1e782030                          @ Enable Timer3
++    ldr r1, [r0]
++    mov r2, #7
++    orr r1, r1, r2, lsl #8
++    str r1, [r0]
++
++    ldr r0, =0x1e6c0090                          @ Check ISR for Timer3 timeout
++    .endm
++
++    .macro check_delay_timer
++    ldr r1, [r0]
++    bic r1, r1, #0xFFFBFFFF
++    mov r2, r1, lsr #18
++    cmp r2, #0x01
++    .endm
++
++    .macro clear_delay_timer
++    ldr r0, =0x1e782030                          @ Disable Timer3
++    ldr r1, [r0]
++    bic r1, r1, #0x00000F00
++    str r1, [r0]
++
++    ldr r0, =0x1e6c0038                          @ Clear Timer3 ISR
++    ldr r1, =0x00040000
++    str r1, [r0]
++    .endm
++
++    .macro record_dll2_pass_range
++    ldr                 r1, [r0]
++    bic                 r2, r1, #0xFFFFFF00
++    cmp                 r2, r3                   @ record min
++    bicgt               r1, r1, #0x000000FF
++    orrgt               r1, r1, r3
++    bic                 r2, r1, #0xFFFF00FF
++    cmp                 r3, r2, lsr #8           @ record max
++    bicgt               r1, r1, #0x0000FF00
++    orrgt               r1, r1, r3, lsl #8
++    str                 r1, [r0]
++    .endm
++
++    .macro record_dll2_pass_range_h
++    ldr                 r1, [r0]
++    bic                 r2, r1, #0xFF00FFFF
++    mov                 r2, r2, lsr #16
++    cmp                 r2, r3                   @ record min
++    bicgt               r1, r1, #0x00FF0000
++    orrgt               r1, r1, r3, lsl #16
++    bic                 r2, r1, #0x00FFFFFF
++    cmp                 r3, r2, lsr #24          @ record max
++    bicgt               r1, r1, #0xFF000000
++    orrgt               r1, r1, r3, lsl #24
++    str                 r1, [r0]
++    .endm
++
++    .macro init_spi_checksum
++    ldr r0, =0x1e620084
++    ldr r1, =0x20010000
++    str r1, [r0]
++    ldr r0, =0x1e62008C
++    ldr r1, =0x20000200
++    str r1, [r0]
++    ldr r0, =0x1e620080
++    ldr r1, =0x0000000D
++    orr r2, r2, r7
++    orr r1, r1, r2, lsl #8
++    and r2, r6, #0xF
++    orr r1, r1, r2, lsl #4
++    str r1, [r0]
++    ldr r0, =0x1e620008
++    ldr r2, =0x00000800
++    .endm
++
++/******************************************************************************
++ Calibration Macro End
++ ******************************************************************************/
++LPC_Patch:                                       @ load to SRAM base 0x1e720400
++    str   r1, [r0]
++    str   r3, [r2]
++    bic   r1, r1, #0xFF
++LPC_Patch_S1:
++    subs  r5, r5, #0x01
++    moveq pc, r8
++    ldr   r3, [r2]
++    tst   r3, #0x01
++    movne pc, r8
++    mov   pc, r7
++LPC_Patch_S2:                                    @ load to SRAM base 0x1e720480
++    str   r1, [r0]
++    mov   pc, r9
++LPC_Patch_E:
++
++.globl lowlevel_init
++lowlevel_init:
++
++init_dram:
++    /* save lr */
++    mov r4, lr
++/* Test - DRAM initial time */
++    ldr r0, =0x1e782044
++    ldr r1, =0xFFFFFFFF
++    str r1, [r0]
++
++    ldr r0, =0x1e782030
++    ldr r1, [r0]
++    bic r1, r1, #0x0000F000
++    str r1, [r0]
++    mov r2, #3
++    orr r1, r1, r2, lsl #12
++    str r1, [r0]
++/* Test - DRAM initial time */
++
++    /*Set Scratch register Bit 7 before initialize*/
++    ldr r0, =0x1e6e2000
++    ldr r1, =0x1688a8a8
++    str r1, [r0]
++
++    ldr r0, =0x1e6e2040
++    ldr r1, [r0]
++    orr r1, r1, #0x80
++    str r1, [r0]
++
++    /* Fix LPC lock issue for AST2300 */
++    ldr r0, =0x1e6e207c                          @ Check AST2300
++    ldr r1, [r0]
++    mov r1, r1, lsr #24
++    cmp r1, #0x01
++    bne lpc_recover_end                          @ not match AST2300
++
++    mov r3, #0x0
++lpc_recover_check:
++    ldr r0, =0x1e78900c                          @ check HICR3[4]=0x1
++    ldr r1, [r0]
++    tst r1, #0x10
++    beq lpc_recover_end
++    ldr r0, =0x1e789004                          @ check HICR1[7]=0x1
++    ldr r1, [r0]
++    tst r1, #0x80
++    beq lpc_recover_end
++    ldr r0, =0x1e7890a0                          @ check LHCR0[27:24]=0x6
++    ldr r1, [r0]
++    mov r1, r1, lsr #24
++    and r1, r1, #0xF
++    cmp r1, #0x06
++    bne lpc_recover_end
++    add r3, r3, #0x01
++    cmp r3, #0x5                                 @ repeat 5 times
++    ble lpc_recover_check
++
++    mov r3, #0x0
++lpc_recover_init:
++    ldr r0, =0x1e7890a4                          @ set LHCR1[1:0]=0x0
++    ldr r1, =0x00000000
++    str r1, [r0]
++    add r3, r3, #0x01
++    cmp r3, #0x20
++    bge lpc_recover_end
++    ldr r1, [r0]
++    tst r1, #0x01
++    bne lpc_recover_init
++
++    ldr r0, =0x1e7890b0                          @ set LHCR4[7:0]=0xFF
++    ldr r1, =0x000000FF
++    str r1, [r0]
++    ldr r0, =0x1e7890b4                          @ set LHCR5[31:0]=0xFFFFFFFF
++    ldr r1, =0xFFFFFFFF
++    str r1, [r0]
++    ldr r0, =0x1e7890b8                          @ set LHCR6[31:0]=0xFFFFFFFF
++    str r1, [r0]
++
++    adr r6, LPC_Patch
++    adr r7, LPC_Patch_S2
++    ldr r0, =0x1e720400
++copy_lpc_patch_1:
++    ldr r1, [r6]
++    str r1, [r0]
++    add r6, r6, #0x4
++    add r0, r0, #0x4
++    cmp r6, r7
++    bne copy_lpc_patch_1
++
++    adr r6, LPC_Patch_S2
++    adr r7, LPC_Patch_E
++    ldr r0, =0x1e720480
++copy_lpc_patch_2:
++    ldr r1, [r6]
++    str r1, [r0]
++    add r6, r6, #0x4
++    add r0, r0, #0x4
++    cmp r6, r7
++    bne copy_lpc_patch_2
++
++    ldr r0, =0x1e7890a0                          @ set LHCR0[31:0]=0xFFFFFF01
++    ldr r1, =0xFFFFFF01
++    add r2, r0, #0x4
++    mov r3, #0x01
++    mov r5, #0x10
++    adr r9, lpc_recover_end
++    adr r6, LPC_Patch
++    adr r7, LPC_Patch_S1
++    sub r6, r7, r6
++    ldr r7, =0x1e720400
++    add r7, r7, r6
++    ldr r8, =0x1e720480
++    ldr pc, =0x1e720400
++
++lpc_recover_end:
++    ldr r0, =0x1e7890a0                          @ set LHCR0[31:0]=0xFFFFFF00
++    ldr r1, =0xFFFFFF00
++    str r1, [r0]
++    /* <END> Fix LPC lock issue for AST2300 */
++
++    /* Check Scratch Register Bit 6 */
++    ldr r0, =0x1e6e2040
++    ldr r1, [r0]
++    bic r1, r1, #0xFFFFFFBF
++    mov r2, r1, lsr #6
++    cmp r2, #0x01
++    beq platform_exit
++
++    ldr r2, =0x033103F1                          @ load PLL parameter for 24Mhz CLKIN (396:324)
++/*  ldr r2, =0x019001F0                          @ load PLL parameter for 24Mhz CLKIN (408:336) */
++    ldr r0, =0x1e6e207c                          @ Check Revision ID
++    ldr r1, [r0]
++    mov r1, r1, lsr #24
++    cmp r1, #0x02
++    bne set_MPLL                                 @ not match AST2400
++
++    ldr r0, =0x1e6e2070                          @ Check CLKIN freq
++    ldr r1, [r0]
++    mov r1, r1, lsr #23
++    tst r1, #0x01
++    ldrne r2, =0x017001D0                        @ load PLL parameter for 25Mhz CLKIN (400:325)
++
++set_MPLL:
++    ldr r0, =0x1e6e2020                          @ M-PLL (DDR SDRAM) Frequency
++    ldr r1, =0xFFFF
++#if defined(CONFIG_DRAM_336)
++    mov r2, r2, lsr #16
++#endif
++    and r1, r2, r1
++    str r1, [r0]
++
++/* Debug - UART console message */
++    ldr r0, =0x1e78400c
++    mov r1, #0x83
++    str r1, [r0]
++
++    ldr r0, =0x1e6e202c
++    ldr r2, [r0]
++    mov r2, r2, lsr #12
++    tst r2, #0x01
++    ldr r0, =0x1e784000
++    moveq r1, #0x0D                              @ Baudrate 115200
++    movne r1, #0x01                              @ Baudrate 115200, div13
++#if defined(CONFIG_DRAM_UART_38400)
++    moveq r1, #0x27                              @ Baudrate 38400
++    movne r1, #0x03                              @ Baudrate 38400 , div13
++#endif
++    str r1, [r0]
++
++    ldr r0, =0x1e784004
++    mov r1, #0x00
++    str r1, [r0]
++
++    ldr r0, =0x1e78400c
++    mov r1, #0x03
++    str r1, [r0]
++
++    ldr r0, =0x1e784008
++    mov r1, #0x07
++    str r1, [r0]
++
++    ldr r0, =0x1e784000
++    mov r1, #0x0D                                @ '\r'
++    str r1, [r0]
++    mov r1, #0x0A                                @ '\n'
++    str r1, [r0]
++    mov r1, #0x44                                @ 'D'
++    str r1, [r0]
++    mov r1, #0x52                                @ 'R'
++    str r1, [r0]
++    mov r1, #0x41                                @ 'A'
++    str r1, [r0]
++    mov r1, #0x4D                                @ 'M'
++    str r1, [r0]
++    mov r1, #0x20                                @ ' '
++    str r1, [r0]
++    mov r1, #0x49                                @ 'I'
++    str r1, [r0]
++    mov r1, #0x6E                                @ 'n'
++    str r1, [r0]
++    mov r1, #0x69                                @ 'i'
++    str r1, [r0]
++    mov r1, #0x74                                @ 't'
++    str r1, [r0]
++    mov r1, #0x2D                                @ '-'
++    str r1, [r0]
++    mov r1, #0x44                                @ 'D'
++    str r1, [r0]
++    mov r1, #0x44                                @ 'D'
++    str r1, [r0]
++    mov r1, #0x52                                @ 'R'
++    str r1, [r0]
++/* Debug - UART console message */
++
++    /* Delay about 100us */
++    ldr r0, =0x1e782030                          @ Init Timer3 Control
++    ldr r1, [r0]
++    bic r1, r1, #0x00000F00
++    str r1, [r0]
++
++    ldr r2, =0x00000064                          @ Set Timer3 Reload = 100 us
++    init_delay_timer
++delay_0:
++    check_delay_timer
++    bne delay_0
++    clear_delay_timer
++    /* end delay 100us */
++
++/******************************************************************************
++ Init DRAM common registers
++ ******************************************************************************/
++    ldr r0, =0x1e6e0000
++    ldr r1, =0xfc600309
++    str r1, [r0]
++
++    /* Reset MMC */
++    ldr r1, =0x00000000
++    ldr r0, =0x1e6e0034
++    str r1, [r0]
++    ldr r0, =0x1e6e0018
++    str r1, [r0]
++    ldr r0, =0x1e6e0024
++    str r1, [r0]
++    ldr r0, =0x1e6e0064                          @ REG_MADJ, power down DLL
++    str r1, [r0]
++
++    ldr r1, =0x00034C4C                          @ REG_MADJ, reset DLL
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0068                          @ REG_SADJ
++    ldr r1, =0x00001800
++    str r1, [r0]
++
++    /* Delay about 10us */
++    ldr r2, =0x0000000B                          @ Set Timer3 Reload = 10 us
++    init_delay_timer
++delay_1:
++    check_delay_timer
++    bne delay_1
++    clear_delay_timer
++    /* end delay 10us */
++
++    ldr r0, =0x1e6e0064                          @ REG_MADJ | 0xC0000, enable DLL
++    ldr r1, [r0]
++    ldr r2, =0xC0000
++    orr r1, r1, r2
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0008
++    ldr r1, =0x0090040f                          /* VGA */
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0018
++    ldr r1, =0x4000A120
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0018
++    ldr r1, =0x00000120
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0038
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0040
++    ldr r1, =0xFF444444
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0044
++    ldr r1, =0x22222222
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0048
++    ldr r1, =0x22222222
++    str r1, [r0]
++
++    ldr r0, =0x1e6e004c
++    ldr r1, =0x22222222
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0050
++    ldr r1, =0x80000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0050
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0054
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0060                          @ REG_DRV
++    ldr r1, =0x000000FA                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x000000FA
++#endif
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0070
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0074
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0078
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e007c
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0080
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0084
++    ldr r1, =0x00FFFFFF
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0088                          @ REG_DQIDLY
++    ldr r1, =0x00000089                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00000074
++#endif
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0020                          @ REG_DQSIC
++    ldr r1, =0x000000E2                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x000000BA
++#endif
++    str r1, [r0]
++
++    /* Delay about 10us */
++    ldr r2, =0x0000000B                          @ Set Timer3 Reload = 10 us
++    init_delay_timer
++delay_2:
++    check_delay_timer
++    bne delay_2
++    clear_delay_timer
++    /* end delay 10us */
++
++    /* Check DRAM Type by H/W Trapping */
++    ldr r0, =0x1e6e2070
++    ldr r1, [r0]
++    bic r1, r1, #0xFEFFFFFF                      @ bit[24]=1 => DDR2
++    mov r2, r1, lsr #24
++    cmp r2, #0x01
++    beq ddr2_init
++    b   ddr3_init
++.LTORG
++
++/******************************************************************************
++ DDR3 Init
++
++ tRCD   = 15     ns
++ tRAS   = 37.5   ns
++ tRRD   = max(4 CK,10 ns)
++ tRP    = 15     ns
++ tRFC   = 110ns/1Gbit, 160ns/2Gbit, 300ns/4Gbit
++ tRTP   = max(4 CK,7.5 ns)
++ tWR    = 15     ns
++ tXSNR  = max(10 CK,200 ns)
++ tWTR   = max(4 CK,7.5 ns)
++ tFAW   = 50     ns
++ tMRD   = max(15 CK,20 ns)
++ ******************************************************************************/
++ddr3_init:
++/* Debug - UART console message */
++    ldr r0, =0x1e784000
++    mov r1, #0x33                                @ '3'
++    str r1, [r0]
++    mov r1, #0x0D                                @ '\r'
++    str r1, [r0]
++    mov r1, #0x0A                                @ '\n'
++    str r1, [r0]
++/* Debug - UART console message */
++
++    ldr r0, =0x1e6e0004
++    ldr r1, =0x00000531                          @ Default set to 1Gbit
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0010                          @ REG_AC1
++    ldr r1, =0x33302825                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x22202725
++#endif
++    str r1, [r0]
++
++    /* Check DRAM CL Timing by H/W Trapping */
++    ldr r0, =0x1e6e2070
++    ldr r1, [r0]
++    bic r1, r1, #0xF9FFFFFF
++    mov r2, r1, lsr #9                           @ Set CL
++    ldr r1, =0x00020000
++    add r2, r2, r1
++    ldr r1, [r0]
++    bic r1, r1, #0xFBFFFFFF
++    mov r1, r1, lsr #6                           @ Set CWL
++    orr r2, r2, r1
++    ldr r1, =0x00300000
++    add r2, r2, r1
++
++    ldr r0, =0x1e6e0014                          @ REG_AC2
++    ldr r1, =0xCC00963F                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0xAA007636
++#endif
++    orr r1, r1, r2
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0004                          @ check 2400 mode
++    ldr r2, [r0]
++    mov r2, r2, lsr #10
++
++    ldr r0, =0x1e6e006c                          @ REG_IOZ
++    ldr r1, =0x00002312                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00002312
++#endif
++    tst r2, #0x01
++    moveq r1, r1, lsr #8
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0120
++    mov r1, #0
++    str r1, [r0]
++    tst r2, #0x01                                @ check AST2300
++    beq CBRDLL1_2300_Start
++    ldr r0, =0x1e6e207c                          @ check AST2400 revision A0
++    ldr r1, [r0]
++    mov r1, r1, lsr #16
++    and r1, r1, #0xFF
++    cmp r1, #0x0
++    beq CBRDLL1_2300_Start
++    b   CBRDLL1_2400_Start
++MCLK2X_Phase_CBR_Done_DDR3:
++    ldr r0, =0x1e6e0018
++    ldr r1, [r0]
++    orr r1, r1, #0x40
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0034
++    ldr r1, =0x00000001
++    str r1, [r0]
++
++    ldr r0, =0x1e6e000c
++    ldr r1, =0x00000040
++    str r1, [r0]
++
++    /* Delay about 400us */
++    ldr r2, =0x00000190                          @ Set Timer3 Reload = 400 us
++    init_delay_timer
++delay3_4:
++    check_delay_timer
++    bne delay3_4
++    clear_delay_timer
++    /* end delay 400us */
++
++    /* Check DRAM CL Timing by H/W Trapping */
++    ldr r0, =0x1e6e2070
++    ldr r1, [r0]
++    bic r1, r1, #0xF9FFFFFF
++    mov r2, r1, lsr #21                          @ Set CL
++    ldr r1, =0x00000010
++    add r2, r2, r1
++    ldr r1, [r0]
++    bic r1, r1, #0xFBFFFFFF
++    mov r1, r1, lsr #7                           @ Set CWL
++    orr r2, r2, r1
++
++    ldr r0, =0x1e6e002c                          @ REG_MRS
++    ldr r1, =0x04001700                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x04001500
++#endif
++    orr r1, r1, r2
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0030                          @ REG_EMRS
++    ldr r1, =0x00000000                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00000000
++#endif
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set EMRS2
++    ldr r1, =0x00000005
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set EMRS3
++    ldr r1, =0x00000007
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set EMRS
++    ldr r1, =0x00000003
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set MRS
++    ldr r1, =0x00000001
++    str r1, [r0]
++
++    ldr r0, =0x1e6e002c                          @ REG_MRS
++    ldr r1, =0x04001600                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x04001400
++#endif
++    orr r1, r1, r2
++    str r1, [r0]
++
++    ldr r0, =0x1e6e000c                          @ Refresh 8 times
++    ldr r1, =0x00005C48
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set MRS
++    ldr r1, =0x00000001
++    str r1, [r0]
++
++    ldr r0, =0x1e6e000c                          @ Set refresh cycle
++    ldr r1, =0x00002001
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0014
++    ldr r1, [r0]
++    bic r1, r1, #0xFFF9FFFF
++    mov r2, r1, lsr #3                           @ get CL
++
++    ldr r0, =0x1e6e0034                          @ REG_PWC
++    ldr r1, =0x00000303                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00000303
++#endif
++    orr r1, r1, r2
++    str r1, [r0]
++
++    b   Calibration_Start
++.LTORG
++/******************************************************************************
++ End DDR3 Init
++ ******************************************************************************/
++
++/******************************************************************************
++ DDR2 Init
++
++ tRCD   = 15    ns
++ tRAS   = 45    ns
++ tRRD   = 10    ns
++ tRP    = 15    ns
++ tRFC   = 105ns/512Mbit, 127.5ns/1Gbit, 197.5ns/2Gbit, 327.5ns/4Gbit
++ tRTP   = 7.5   ns
++ tWR    = 15    ns
++ tXSNR  = 200   ns
++ tWTR   = 7.5   ns
++ tFAW   = 50    ns
++ tMRD   = 4     CK
++ ******************************************************************************/
++ddr2_init:
++/* Debug - UART console message */
++    ldr r0, =0x1e784000
++    mov r1, #0x32                                @ '2'
++    str r1, [r0]
++    mov r1, #0x0D                                @ '\r'
++    str r1, [r0]
++    mov r1, #0x0A                                @ '\n'
++    str r1, [r0]
++/* Debug - UART console message */
++
++    ldr r0, =0x1e6e0004
++    ldr r1, =0x00000510                          @ Default set to 512Mbit
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0010                          @ REG_AC1
++    ldr r1, =0x33302714                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x22201613
++#endif
++    str r1, [r0]
++
++    /* Check DRAM CL Timing by H/W Trapping */
++    ldr r0, =0x1e6e2070
++    ldr r1, [r0]
++    bic r1, r1, #0xF9FFFFFF
++    mov r2, r1, lsr #5                           @ Set CL
++    mov r1, r2, lsr #4                           @ Set CWL
++    orr r2, r2, r1
++    ldr r1, =0x00110000
++    add r2, r2, r1
++
++    ldr r0, =0x1e6e0014                          @ REG_AC2
++    ldr r1, =0xCC00B03F                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0xAA00903B
++#endif
++    orr r1, r1, r2
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0004                          @ check 2400 mode
++    ldr r2, [r0]
++    mov r2, r2, lsr #10
++
++    ldr r0, =0x1e6e006c                          @ REG_IOZ
++    ldr r1, =0x00002312                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00002312
++#endif
++    tst r2, #0x01
++    moveq r1, r1, lsr #8
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0120
++    mov r1, #1
++    str r1, [r0]
++    tst r2, #0x01                                @ check AST2300
++    beq CBRDLL1_2300_Start
++    ldr r0, =0x1e6e207c                          @ check AST2400 revision A0
++    ldr r1, [r0]
++    mov r1, r1, lsr #16
++    and r1, r1, #0xFF
++    cmp r1, #0x0
++    beq CBRDLL1_2300_Start
++    b   CBRDLL1_2400_Start
++MCLK2X_Phase_CBR_Done_DDR2:
++
++    ldr r0, =0x1e6e0034
++    ldr r1, =0x00000001
++    str r1, [r0]
++
++    ldr r0, =0x1e6e000c
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    /* Delay about 400us */
++    ldr r2, =0x00000190                          @ Set Timer3 Reload = 400 us
++    init_delay_timer
++delay2_4:
++    check_delay_timer
++    bne delay2_4
++    clear_delay_timer
++    /* end delay 400us */
++
++    /* Check DRAM CL Timing by H/W Trapping */
++    ldr r0, =0x1e6e2070
++    ldr r1, [r0]
++    bic r1, r1, #0xF9FFFFFF
++    mov r2, r1, lsr #21                          @ Set CL
++    ldr r1, =0x00000040
++    orr r2, r2, r1
++
++    ldr r0, =0x1e6e002c                          @ REG_MRS
++    ldr r1, =0x00000D03                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00000B03
++#endif
++    orr r1, r1, r2
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0030                          @ REG_EMRS
++    ldr r1, =0x00000040                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00000040
++#endif
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set EMRS2
++    ldr r1, =0x00000005
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set EMRS3
++    ldr r1, =0x00000007
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set EMRS
++    ldr r1, =0x00000003
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set MRS
++    ldr r1, =0x00000001
++    str r1, [r0]
++
++    ldr r0, =0x1e6e000c                          @ Refresh 8 times
++    ldr r1, =0x00005C08
++    str r1, [r0]
++
++    ldr r0, =0x1e6e002c                          @ REG_MRS
++    ldr r1, =0x00000C03                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00000A03
++#endif
++    orr r1, r1, r2
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set MRS
++    ldr r1, =0x00000001
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0030                          @ REG_EMRS
++    ldr r1, =0x000003C0                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x000003C0
++#endif
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set EMRS
++    ldr r1, =0x00000003
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0030                          @ REG_EMRS
++    ldr r1, =0x00000040                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00000040
++#endif
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0028                          @ Set EMRS
++    ldr r1, =0x00000003
++    str r1, [r0]
++
++    ldr r0, =0x1e6e000c                          @ Set refresh cycle
++    ldr r1, =0x00002001
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0014
++    ldr r1, [r0]
++    bic r1, r1, #0xFFF9FFFF
++    mov r2, r1, lsr #3                           @ get CL
++
++    ldr r0, =0x1e6e0034                          @ REG_PWC
++    ldr r1, =0x00000503                          @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr r1, =0x00000503
++#endif
++    orr r1, r1, r2
++    str r1, [r0]
++
++    b   Calibration_Start
++.LTORG
++/******************************************************************************
++ End DDR2 Init
++ ******************************************************************************/
++/******************************************************************************
++ DDR CK duty finetune program
++    SRAM buffer definition
++    0x1E720204 : gdll     golden DLL1 record
++    0x1E720208 : gduty    golden duty setting record
++    0x1E72020C : gdutysum golden duty data record
++    0x1E720210 : duty record of delay 0  invert
++    0x1E720214 : duty record of delay 1  invert
++    ....
++    0x1E72024C : duty record of delay 15 invert
++    0x1E720250 : duty record of delay 0
++    0x1E720254 : duty record of delay 1
++    ....
++    0x1E72028C : duty record of delay 15
++
++    Register usage
++    r0 - r3 = free
++    r4  = record the return pc value, do not use
++    r5  = free
++    r6  = free
++    r7  = duty count
++    r8  = gdll
++    r9  = gduty
++    r10 = gdutysum
++ ******************************************************************************/
++CBRDLL1_2400_Start:
++    ldr   r0, =0x1e6e0120
++    ldr   r1, [r0]
++    orr   r1, r1, #0x02
++    str   r1, [r0]
++
++    ldr   r1, =0x00000000
++    ldr   r0, =0x1e720204
++    ldr   r2, =0x1e7202a0
++init_sram_start0:
++    str   r1, [r0]
++    add   r0, r0, #4
++    cmp   r0, r2
++    blt   init_sram_start0
++
++    ldr   r0, =0x1e6e0034
++    mov   r1, #0x20
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0060
++    ldr   r1, [r0]
++    mov   r2, #0x01
++    orr   r1, r1, r2, lsl #13
++    str   r1, [r0]
++
++    mov   r7, #0x0                               @ init duty count
++    mov   r8, #0x0                               @ init gdll
++    mov   r9, #0x0                               @ init gduty
++    mov   r10, #0x0                              @ init gdutysum
++cbrdll1_duty_start:
++    cmp   r7, #32
++    bge   cbrdll1_duty_end
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, =0x00008120
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0060
++    ldr   r1, [r0]
++    bic   r1, r1, #0x00001F00
++    orr   r1, r1, r7, lsl #8
++    mov   r2, #0x10
++    eor   r1, r1, r2, lsl #8
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0000                        @ dummy read
++    ldr   r1, [r0]
++
++    b     CBRDLL1_2300_Start
++CBRDLL1_2400_Call:
++
++    mov   r5, #0x01                              @ init dqidly count
++    mov   r6, #0x00                              @ init duty sum
++cbrdll1_duty_cal_start:
++    cmp   r5, #0x05
++    bge   cbrdll1_duty_cal_end
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, =0x00200120
++    orr   r1, r1, r5, lsl #16
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0000
++    ldr   r1, [r0]
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, [r0]
++    mov   r2, #0x10
++    orr   r1, r1, r2, lsl #24
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0080
++    ldr   r1, =0x80000000                        @ init duty cal waiting
++cbrdll1_duty_cal_wait:
++    ldr   r2, [r0]
++    tst   r2, r1
++    beq   cbrdll1_duty_cal_wait
++
++    ldr   r0, =0x1e6e008c
++    ldr   r2, [r0]
++
++    ldr   r0, =0x1e720210
++    add   r0, r0, r7, lsl #2
++    str   r2, [r0]
++
++    ldr   r1, =0xFFFF
++    and   r3, r1, r2
++    cmp   r3, r1
++    moveq r2, r2, lsr #16
++    and   r3, r1, r2
++    add   r6, r6, r3
++    ldr   r1, =0xF000
++    cmp   r3, r1
++    blt   cbrdll1_duty_cal_end
++    add   r5, r5, #0x01
++    b     cbrdll1_duty_cal_start
++
++cbrdll1_duty_cal_end:
++    mov   r6, r6, lsr #2                         @ get dutysum
++    cmp   r6, r10                                @ check dutysum > gdutysum
++    ble   cbrdll1_duty_next
++    ldr   r0, =0x1e6e0068
++    ldr   r8, [r0]
++    eor   r9, r7, #0x10
++    mov   r10, r6
++
++cbrdll1_duty_next:
++    add   r7, r7, #0x01
++    cmp   r7, #16                                @ check duty >= 15
++    blt   cbrdll1_duty_start
++    ldr   r0, =0xFA00                            @ check gdutysum > 0xFA00
++    cmp   r10, r0
++    blt   cbrdll1_duty_start
++
++cbrdll1_duty_end:
++    ldr   r0, =0x1e6e0060
++    ldr   r1, [r0]
++    bic   r1, r1, #0x00001F00
++    orr   r1, r1, r9, lsl #8
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0068
++    bic   r8, r8, #0xFF000000
++    bic   r8, r8, #0x00FF0000
++    str   r8, [r0]
++
++    ldr   r0, =0x1e720204                        @ record result
++    str   r8, [r0]
++    add   r0, r0, #0x04
++    str   r9, [r0]
++    add   r0, r0, #0x04
++    str   r10, [r0]
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, =0x00008120
++    str   r1, [r0]
++    ldr   r0, =0x1e6e0000                        @ dummy read
++    ldr   r1, [r0]
++    ldr   r0, =0x1e6e0018
++    ldr   r1, =0x00000120
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0120
++    ldr   r1, [r0]
++    cmp   r1, #0x3
++    beq   MCLK2X_Phase_CBR_Done_DDR2
++    b     MCLK2X_Phase_CBR_Done_DDR3
++
++/******************************************************************************
++ MCLK2X lock to MCLK program
++  r0 - r3 = free
++  r5 = madjmax
++  r6 = dllend
++  0x1E720200 = 0x96cnt:failcnt:dllmax:dllmin
++ ******************************************************************************/
++CBRDLL1_2300_Start:
++    ldr   r0, =0x1e6e0064
++    ldr   r5, [r0]
++    and   r5, r5, #0xFF                          @ init madjmax
++    mov   r6, r5                                 @ init dllend
++
++    ldr   r1, =0x000000ff
++    ldr   r0, =0x1e720200
++    str   r1, [r0]                               @ init dllcnt2:dllmax:dllmin
++
++    mov   r3, #0x0                               @ init loop count
++cbrdll1_scan_start:
++    cmp   r3, r6
++    bge   cbrdll1_scan_end
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, =0x00008120
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0068
++    mov   r1, r3
++    cmp   r1, r5
++    subge r1, r1, r5
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0000                        @ dummy read
++    ldr   r1, [r0]
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, =0x00000120
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0000                        @ dummy read
++    ldr   r1, [r0]
++    ldr   r0, =0x1e6e0000                        @ dummy read
++    ldr   r1, [r0]
++
++    ldr   r0, =0x1e6e001c
++    ldr   r1, [r0]
++    mov   r1, r1, lsr #16
++    and   r1, r1, #0xFF
++
++    and   r2, r1, #0x96
++    cmp   r2, #0x96
++    beq   cbrdll1_scan_pass                      @ if (mclk2x_phase & 0x96) == 0x96
++    ldr   r0, =0x1e720200
++    ldr   r1, [r0]
++    mov   r2, r1, lsr #8
++    ands  r2, r2, #0xFF                          @ get dllmax
++    beq   cbrdll1_scan_next                      @ if dllmax == 0
++    mov   r2, r1, lsr #16
++    and   r2, r2, #0xFF
++    add   r2, r2, #0x01
++    cmp   r2, #0x02
++    movge r6, r3
++    bic   r1, r1, #0x00FF0000
++    orr   r1, r1, r2, lsl #16
++    str   r1, [r0]
++    b     cbrdll1_scan_next
++
++cbrdll1_scan_pass:
++    cmp   r3, #0x0                               @ if dll = 0
++    moveq r3, #0x0F
++    addeq r6, r6, #0x10
++    beq   cbrdll1_scan_next
++    ldr   r0, =0x1e720200
++    ldr   r2, [r0]
++    cmp   r1, #0x96
++    bne   cbrdll1_scan_pass2
++    mov   r1, r2, lsr #24
++    add   r1, r1, #0x01
++    bic   r2, r2, #0xFF000000
++    orr   r2, r2, r1, lsl #24
++    cmp   r1, #0x03                              @ check (phase == 0x96) count == 3
++    bicge r2, r2, #0x0000FF00
++    bicge r2, r2, #0x000000FF
++    orrge r2, r2, r3, lsl #8
++    orrge r2, r2, r3
++    str   r2, [r0]
++    bge   cbrdll1_scan_end
++
++cbrdll1_scan_pass2:
++    and   r1, r2, #0xFF                          @ if(dllmin > dll)
++    cmp   r1, r3
++    bicgt r2, r2, #0x000000FF
++    orrgt r2, r2, r3
++
++    mov   r1, r2, lsr #8                         @ if(dllmax < dll)
++    and   r1, r1, #0xFF
++    cmp   r1, r3
++    biclt r2, r2, #0x0000FF00
++    orrlt r2, r2, r3, lsl #8
++
++    bic   r2, r2, #0x00FF0000
++    str   r2, [r0]
++
++cbrdll1_scan_next:
++    add   r3, r3, #0x01
++    b     cbrdll1_scan_start
++
++cbrdll1_scan_end:
++    ldr   r0, =0x1e720200
++    ldr   r1, [r0]
++    mov   r2, r1, lsr #8                         @ get dllmax
++    ands  r2, r2, #0xFF
++    bne   cbrdll1_scan_done                      @ if(dllmax != 0)
++    ldr   r0, =0x1e6e0064
++    ldr   r3, [r0]
++    bic   r1, r3, #0x000C0000
++    str   r1, [r0]
++    add   r0, r0, #0x04
++    mov   r1, #0x0
++    str   r1, [r0]
++
++    /* Delay about 10us */
++    ldr r2, =0x0000000A                          @ Set Timer3 Reload = 10 us
++    init_delay_timer
++delay0_1:
++    check_delay_timer
++    bne delay0_1
++    clear_delay_timer
++    /* end delay 10us */
++
++    ldr   r0, =0x1e6e0064
++    str   r3, [r0]
++
++    /* Delay about 10us */
++    ldr r2, =0x0000000A                          @ Set Timer3 Reload = 10 us
++    init_delay_timer
++delay0_2:
++    check_delay_timer
++    bne delay0_2
++    clear_delay_timer
++    /* end delay 10us */
++
++    b     CBRDLL1_2300_Start
++
++cbrdll1_scan_done:
++    and   r1, r1, #0xFF
++    add   r1, r1, r2
++    mov   r6, r1, lsr #1                         @ dll1.0 = (dllmin + dllmax) >> 1
++    cmp   r6, r5
++    subge r6, r6, r5
++    add   r3, r6, r5, lsr #2                     @ dll1.1 = dll1.0 + (MADJ >> 2)
++
++    ldr   r0, =0x1e6e0004
++    ldr   r1, [r0]
++    mov   r1, r1, lsr #10
++    tst   r1, #0x1
++    bne   cbrdll1_scan_set_2400
++    cmp   r3, r5
++    subge r3, r3, r5
++    mov   r2, #0x0
++    tst   r3, #0x08
++    beq   cbrdll1_scan_set_2300_2                @ if !(dll & 8)
++cbrdll1_scan_set_2300_1:                         @ if  (dll & 8)
++    mov   r1, #0x0
++    tst   r3, #0x08
++    addeq r1, r1, #0x01
++    cmp   r2, #0x05
++    addge r1, r1, #0x01
++    cmp   r1, #0x02
++    beq   cbrdll1_scan_set
++    add   r2, r2, #0x01
++    add   r3, r3, #0x01
++    cmp   r3, r5
++    subge r3, r3, r5
++    b     cbrdll1_scan_set_2300_1
++
++cbrdll1_scan_set_2300_2:
++    and   r1, r3, #0x07
++    cmp   r1, #0x07
++    beq   cbrdll1_scan_set
++    cmp   r2, #0x05
++    bge   cbrdll1_scan_set
++    add   r2, r2, #0x01
++    add   r3, r3, #0x01
++    cmp   r3, r5
++    subge r3, r3, r5
++    b     cbrdll1_scan_set_2300_2
++
++cbrdll1_scan_set_2400:
++    add   r3, r3, #0x05                          @ dll1.1 = dll1.0 + (MADJ >> 2) + 5
++    cmp   r3, r5
++    subge r3, r3, r5
++
++cbrdll1_scan_set:
++    orr   r1, r6, r3, lsl #8
++    ldr   r0, =0x1e6e0068
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0120
++    ldr   r1, [r0]
++    cmp   r1, #0x0
++    beq   MCLK2X_Phase_CBR_Done_DDR3
++    cmp   r1, #0x1
++    beq   MCLK2X_Phase_CBR_Done_DDR2
++    b     CBRDLL1_2400_Call
++
++.LTORG
++
++/******************************************************************************
++ Calibration Code Start
++    SRAM buffer definition
++    0x1E720000 : Pass 1, DLLI MIN value range
++    0x1E720008 : DQS0 DLL valid range, 2nd time CBR
++    0x1E72000C : DQS1 DLL valid range, 2nd time CBR
++    0x1E720010 : DQ0  DLL valid range, Pass 1
++    0x1E720014 : DQ1  DLL valid range, Pass 1
++    ....
++    0x1E720048 : DQ14 DLL valid range, Pass 1
++    0x1E72004C : DQ15 DLL valid range, Pass 1
++    0x1E720090 : DLL1 SAdj record
++    0x1E720094 : DQL  Pass1 finetune result
++    0x1E720098 : DQH  Pass1 finetune result
++    0x1E72009C : DRAM initial time, (us)
++    0x1E7200A0 : CBR3 retry counter
++    0x1E7200A4 : DRAM initial time, (us)
++    0x1E7200A8 : Released date
++    0x1E7200AC : Released SDK version
++    0x1E7200B0 : DQS input mask window for MCR18[4] = 0
++    0x1E7200B4 : DQS input mask window for MCR18[4] = 1
++    0x1E720100 : DQIDLY=00, DLL valid range
++    0x1E720104 : DQIDLY=01, DLL valid range
++    ....
++    0x1E720178 : DQIDLY=30, DLL valid range
++    0x1E72017C : DQIDLY=31, DLL valid range
++    0x1E720180 : DQSI-MCLK2X P-phase pass record DLL2= 0-31
++    0x1E720184 : DQSI-MCLK2X P-phase pass record DLL2=32-63
++    0x1E720188 : DQSI-MCLK2X N-phase pass record DLL2= 0-31
++    0x1E72018C : DQSI-MCLK2X N-phase pass record DLL2=32-63
++ ******************************************************************************/
++Calibration_Start_pre:                           @ Toggle DQSI mask delay
++    ldr r0, =0x1e6e0018
++    ldr r1, [r0]
++    eor r1, r1, #0x10
++    str r1, [r0]
++
++Calibration_Start:
++/* Init SRAM buffer */
++    ldr r1, =0x000000ff
++    ldr r0, =0x1e720000
++    ldr r2, =0x1e720100
++init_sram_start:
++    str r1, [r0]
++    add r0, r0, #4
++    cmp r0, r2
++    blt init_sram_start
++
++    ldr r1, =0x00ff00ff
++    ldr r0, =0x1e720100
++    ldr r2, =0x1e720180
++init_sram_start2:
++    str r1, [r0]
++    add r0, r0, #4
++    cmp r0, r2
++    blt init_sram_start2
++
++    ldr r1, =0x00000000
++    ldr r0, =0x1e720180
++    ldr r2, =0x1e720200
++init_sram_start3:
++    str r1, [r0]
++    add r0, r0, #4
++    cmp r0, r2
++    blt init_sram_start3
++
++    ldr r0, =0x1e6e0068                          @ save the DLL1 SAdj initial value
++    ldr r1, [r0]
++    ldr r0, =0x1e720090
++    str r1, [r0]
++
++/* Start
++  r0 = free
++  r1 = free
++  r2 = free
++  r3 = free
++  r4 = record the return pc value, do not use
++  r5 = pattern table index
++  r6 = pass count
++  r7 = dram DLL2 parameter index (0x1e6e0068), max is 0x4C
++*/
++/******************************************************************************
++ Fine DQI delay and DQSI-MCLK phase
++  r8  = DQIDLY count
++  r9  = DQSI-MCLK2X phase count
++  r10 = pattern fail retry counter, initialize to 2 (fail 2 times)
++  r11 = passcnt accumulator for each DQIDLY
++ *****************************************************************************/
++CBR0_START:
++/* Debug - UART console message */
++    ldr r0, =0x1e784000
++    mov r1, #0x43                                @ 'C'
++    str r1, [r0]
++    mov r1, #0x42                                @ 'B'
++    str r1, [r0]
++    mov r1, #0x52                                @ 'R'
++    str r1, [r0]
++    mov r1, #0x30                                @ '0'
++    str r1, [r0]
++    mov r1, #0x2D                                @ '-'
++    str r1, [r0]
++/* Debug - UART console message */
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, [r0]
++    bic   r1, r1, #0xFF000000
++    bic   r1, r1, #0x00FF0000
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0074                        @ set the testing DRAM size = 1KB
++    ldr   r1, =0x000003FF
++    str   r1, [r0]
++
++    mov   r8, #0x00                              @ init DQIDLY
++    mov   r9, #0x00                              @ init DQSI-MCLK2X phase
++    mov   r11, #0x01                             @ init passcnt accumulator
++
++cbr0_next_dqidly:
++    cmp   r9, #0x00
++    bne   cbr0_next_dqsiphase
++    cmp   r11, #0x00
++    addeq r8, r8, #0x01                          @ jump 1 stage if no pass at previous stage
++    mov   r11, #0x00
++    add   r8, r8, #0x01
++    cmp   r8, #0x1F                              @ max DQIDLY = 31
++    bgt   CBR0_END
++
++/* Debug - UART console message */
++    ldr   r0, =0x1e784000
++    and   r1, r8, #0x07
++    add   r1, r1, #0x30                          @ '0-7'
++    str   r1, [r0]
++/* Debug - UART console message */
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, [r0]
++    bic   r1, r1, #0x00FF0000
++    orr   r1, r1, r8, lsl #16
++    str   r1, [r0]
++    mov   r9, #0x01                              @ '1':p_phase, '0':n_phase
++
++    /* Delay about 3us */                        @ wait DQIDLY load
++    ldr r2, =0x00000003                          @ Set Timer4 Reload = 3 us
++    init_delay_timer
++delay_4:
++    check_delay_timer
++    bne delay_4
++    clear_delay_timer
++    /* end delay 3us */
++
++    b     cbr0_dll2_scan_start
++
++cbr0_next_dqsiphase:
++    ldr   r0, =0x1e6e0018
++    ldr   r1, [r0]
++    orr   r1, r1, r9, lsl #23                    @ set DQSI-MCLK2X phase
++    str   r1, [r0]
++    mov   r9, #0x00
++
++cbr0_dll2_scan_start:
++    mov   r6, #0x00                              @ init pass count
++    mov   r7, #0x00                              @ init DLL2 parameter index
++
++/****************************
++ DLL2 delay margin test loop
++ ***************************/
++cbr0_next_dll2_parameter:
++    ldr   r0, =0x1e6e0068                        @ load DLL2 parameter
++    ldr   r1, [r0]
++    bic   r1, r1, #0x00FF0000
++    bic   r1, r1, #0xFF000000
++    orr   r1, r1, r7, lsl #16
++    str   r1, [r0]
++    ldr   r2, =0x40404040                        @ DLL2 max is 0x40404040
++    cmp   r7, r2
++    bge   cbr0_next_dqidly
++    ldr   r2, =0x01010101
++    add   r7, r7, r2
++
++/* CBRScan3() start */
++    adrl  r5, PATTERN_TABLE                      @ init pattern table index
++/****************************
++ Test pattern iteration loop
++ ***************************/
++cbr0_next_test_pattern:
++    mov   r10, #2                                @ set the retry loop = 2 of each pattern
++    ldr   r1, [r5]                               @ load test pattern
++    ldr   r0, =0x1e6e007c
++    str   r1, [r0]
++    cmp   r1, #0x00                              @ the last data in pattern is 0x00
++    bne   cbr0_test_burst
++
++    and   r3, r7, #0xFF
++    sub   r3, r3, #0x01                          @ we add 1 after loop check so we need to decrease 1
++    cmp   r3, #0x00
++    beq   cbr0_next_dqidly                       @ pass at dlli = 0, invalid
++    add   r6, r6, #0x01                          @ increment pass count
++    add   r11, r11, #0x01                        @ increment pass count
++
++    ldr   r0, =0x1e720180                        @ record DLL2 pass window
++    cmp   r9, #0x00                              @ DQSI-MCLK2X phase check
++    addeq r0, r0, #0x08
++    cmp   r3, #32
++    addge r0, r0, #0x4
++    and   r1, r3, #0x1F
++    mov   r2, #0x1
++    mov   r2, r2, lsl r1
++    ldr   r1, [r0]
++    orr   r1, r1, r2
++    str   r1, [r0]
++
++    ldr   r0, =0x1e720100                        @ record DLL2 min:max value for each DQIDLY
++    add   r0, r0, r8, lsl #2
++    cmp   r9, #0x00                              @ DQSI-MCLK2X phase check
++    beq   cbr0_test_pass_dqsin
++    record_dll2_pass_range
++    b     cbr0_next_dll2_parameter
++
++cbr0_test_pass_dqsin:
++    record_dll2_pass_range_h
++    b     cbr0_next_dll2_parameter
++
++cbr0_test_pattern_fail:
++    cmp   r6, #5                                 @ passcnt >= 5
++    bge   cbr0_next_dqidly
++    ldr   r0, =0x1e720100                        @ reset DLL2 min:max value
++    add   r0, r0, r8, lsl #2
++    ldr   r1, [r0]
++    ldr   r2, =0xFFFF0000
++    ldr   r3, =0x000000FF
++    cmp   r9, #0x00
++    moveq r2, r2, lsr #16
++    moveq r3, r3, lsl #16
++    and   r1, r1, r2
++    orr   r1, r1, r3
++    str   r1, [r0]
++    b     cbr0_next_dll2_parameter               @ CBRScan3() end and test result fail, go to next step
++
++/****************************
++ Test fail retry loop
++ ***************************/
++cbr0_pattern_fail_retry:
++
++/* CBRTest3() start */
++cbr0_test_burst:
++    ldr   r0, =0x1e6e0070
++    ldr   r1, =0x00000000
++    str   r1, [r0]
++    ldr   r1, =0x000000C1
++    str   r1, [r0]
++    ldr   r3, =0x3000
++cbr0_wait_engine_idle_0:
++    ldr   r2, [r0]
++    tst   r2, r3                                 @ D[12] = idle bit
++    beq   cbr0_wait_engine_idle_0
++
++    ldr   r2, [r0]                               @ read fail bit status
++    mov   r1, #0x0
++    str   r1, [r0]
++    mov   r2, r2, lsr #13                        @ D[13] = fail bit
++    cmp   r2, #0x00
++    bne   cbr0_test_fail
++
++cbr0_test_single:
++    ldr   r0, =0x1e6e0070
++    ldr   r1, =0x00000000
++    str   r1, [r0]
++    ldr   r1, =0x00000085
++    str   r1, [r0]
++    ldr   r3, =0x3000
++cbr0_wait_engine_idle_1:
++    ldr   r2, [r0]
++    tst   r2, r3                                 @ D[12] = idle bit
++    beq   cbr0_wait_engine_idle_1
++
++    ldr   r2, [r0]                               @ read fail bit status
++    mov   r1, #0x0
++    str   r1, [r0]
++    mov   r2, r2, lsr #13                        @ D[13] = fail bit
++    cmp   r2, #0x00
++    beq   cbr0_test_pass
++
++/* CBRTest3() end */
++
++cbr0_test_fail:
++    subs  r10, r10, #1
++    bne   cbr0_pattern_fail_retry
++    b     cbr0_test_pattern_fail                 @ CBRScan3() return(0)
++
++cbr0_test_pass:
++    add   r5, r5, #0x04                          @ increase the test pattern index
++    b     cbr0_next_test_pattern
++
++CBR0_END:
++    mov   r5, #0x0                               @ init DQIDLY search count
++    mov   r6, #0x0                               @ init max_margin:g_margin
++    mov   r8, #0x0                               @ init g_side
++    mov   r7, #0x0                               @ init maximum margin DQIDLY,DQSI-MCLK2X phase
++cbr0_search_dll_margin_s:
++    ldr   r0, =0x1e720100
++    add   r0, r0, r5, lsl #2
++    ldr   r1, [r0]
++    and   r2, r1, #0xFF                          @ get dllmin_p
++    mov   r1, r1, lsr #8
++    and   r3, r1, #0xFF                          @ get dllmax_p
++    subs  r2, r3, r2                             @ get margin-P
++    movmi r2, #0x0
++    mov   r1, r1, lsr #8
++    and   r3, r1, #0xFF                          @ get dllmin_n
++    mov   r1, r1, lsr #8
++    and   r1, r1, #0xFF                          @ get dllmax_n
++    subs  r3, r1, r3                             @ get margin-N
++    movmi r3, #0x0
++    add   r1, r2, r3
++    cmp   r1, #0x0
++    beq   cbr0_search_dll_margin_e               @ if margin-P = 0 && margin-N = 0
++
++    ldr   r9, [r0]
++    ldr   r0, =0x1e720180
++    cmp   r2, r3
++    orrlt r5, r5, #0x80                          @ margin-N > margin-P
++    addlt r0, r0, #0x08
++    movlt r9, r9, lsr #16
++    movge r3, r2                                 @ max(margin-P/N)
++    add   r2, r3, #0x2                           @ define +/- 2 steps of variation
++    mov   r1, r6, lsr #16
++    cmp   r2, r1
++    blt   cbr0_search_dll_margin_e               @ if max(margin-P/N) + 2 < max_margin
++
++    and   r1, r9, #0xFF                          @ r1 = dlli counter
++    cmp   r1, #32
++    ldrge r2, [r0, #0x4]                         @ load pass window
++    ldrlt r2, [r0]
++    and   r1, r1, #0x1F
++    mov   r10, #0x1                              @ init test bit mask
++    mov   r10, r10, lsl r1
++    and   r1, r9, #0xFF
++cbr0_search_dllmin_margin_s:
++    tst   r2, r10
++    beq   cbr0_search_dllmin_margin_e
++    mov   r10, r10, lsr #1
++    cmp   r1, #32
++    ldreq r2, [r0]
++    ldreq r10, =0x80000000
++    subs  r1, r1, #0x1
++    bne   cbr0_search_dllmin_margin_s
++
++cbr0_search_dllmin_margin_e:
++    and   r2, r9, #0xFF
++    sub   r11, r2, r1                            @ get dllmin side margin
++
++    mov   r9, r9, lsr #8
++    and   r1, r9, #0xFF                          @ r1 = dlli counter
++    cmp   r1, #32
++    ldrge r2, [r0, #0x4]                         @ load pass window
++    ldrlt r2, [r0]
++    and   r1, r1, #0x1F
++    mov   r10, #0x1                              @ init test bit mask
++    mov   r10, r10, lsl r1
++    and   r1, r9, #0xFF
++cbr0_search_dllmax_margin_s:
++    tst   r2, r10
++    beq   cbr0_search_dllmax_margin_e
++    mov   r10, r10, lsl #1
++    cmp   r1, #31
++    ldreq r2, [r0, #0x4]
++    ldreq r10, =0x00000001
++    add   r1, r1, #0x1
++    cmp   r1, #64
++    bne   cbr0_search_dllmax_margin_s
++
++cbr0_search_dllmax_margin_e:
++    and   r2, r9, #0xFF
++    sub   r1, r1, r2                             @ get dllmax side margin
++    cmp   r1, r11
++    movlt r11, r1                                @ get side_margin
++
++cbr0_check_dll_margin:                           @ if max(margin-P/N) > g_margin && side_margin >= g_side && dqidly <= 20
++    cmp   r5, #20
++    bgt   cbr0_check_dll_margin2
++    and   r1, r6, #0xFF
++    cmp   r3, r1
++    ble   cbr0_check_dll_margin3
++    cmp   r11, r8
++    bge   cbr0_set_dll_margin
++
++cbr0_check_dll_margin2:                          @ if max(margin-P/N) > g_margin+1 && side_margin >= g_side)
++    and   r1, r6, #0xFF
++    add   r2, r1, #0x1
++    cmp   r3, r2
++    ble   cbr0_check_dll_margin3
++    cmp   r11, r8
++    bge   cbr0_set_dll_margin
++
++cbr0_check_dll_margin3:                          @ if side_margin > g_side && g_side < 8
++    cmp   r8, #8
++    bge   cbr0_search_dll_margin_e
++    cmp   r11, r8
++    ble   cbr0_search_dll_margin_e
++
++cbr0_set_dll_margin:
++    mov   r1, r6, lsr #16
++    cmp   r3, r1
++    bicgt r6, r6, #0x00FF0000
++    orrgt r6, r6, r3, lsl #16
++    bic   r6, r6, #0x000000FF
++    orr   r6, r6, r3
++    mov   r7, r5
++    mov   r8, r11
++
++cbr0_search_dll_margin_e:
++    and   r5, r5, #0x7F
++    add   r5, r5, #0x01
++    cmp   r5, #0x20                              @ last DQIDLY
++    blt   cbr0_search_dll_margin_s
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, [r0]
++    bic   r1, r1, #0x00FF0000
++    orr   r1, r1, r7, lsl #16
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0068
++    ldr   r1, [r0]
++    bic   r1, r1, #0x00FF0000
++    bic   r1, r1, #0xFF000000
++    str   r1, [r0]
++
++    /* Delay about 5us */
++    ldr r2, =0x00000005                          @ Set Timer5 Reload = 5 us
++    init_delay_timer
++delay_5:
++    check_delay_timer
++    bne delay_5
++    clear_delay_timer
++    /* end delay 5us */
++
++    ldr r0, =0x1e6e000c                          @ Set refresh cycle
++    ldr r1, =0x00005C01
++    str r1, [r0]
++
++/******************************************************************************
++ Fine tune per bit DQ input delay -- Pass 1, left edge align
++  r8  = free
++  r9  = DQ fail bit accumulator
++  r10 = pattern fail counter, initialize to 5 (fail 5 times)
++  r11 = free
++ *****************************************************************************/
++CBR1_START:
++/* Debug - UART console message */
++    ldr r0, =0x1e784000
++    mov r1, #0x0D                                @ '\r'
++    str r1, [r0]
++    mov r1, #0x0A                                @ '\n'
++    str r1, [r0]
++    mov r1, #0x43                                @ 'C'
++    str r1, [r0]
++    mov r1, #0x42                                @ 'B'
++    str r1, [r0]
++    mov r1, #0x52                                @ 'R'
++    str r1, [r0]
++    mov r1, #0x31                                @ '1'
++    str r1, [r0]
++/* Debug - UART console message */
++
++    mov   r6, #0x00                              @ init pass count
++    mov   r7, #0x00                              @ init DLL2 parameter index
++
++/****************************
++ DLL2 delay margin test loop
++ ***************************/
++cbr1_next_dll2_parameter:
++    ldr   r0, =0x1e6e0068                        @ load DLL2 parameter
++    ldr   r1, [r0]
++    bic   r1, r1, #0x00FF0000
++    bic   r1, r1, #0xFF000000
++    orr   r1, r1, r7, lsl #16
++    str   r1, [r0]
++    ldr   r2, =0x40404040                        @ parameter's max is to 0x40404040
++    cmp   r7, r2
++    bge   CBR1_END
++    ldr   r2, =0x01010101
++    add   r7, r7, r2
++
++    ldr   r0, =0x1e6e0074                        @ set the testing DRAM size = 4KB
++    ldr   r1, =0x00000FFF
++    str   r1, [r0]
++
++/* CBRScan2() start */
++    ldr   r9, =0xFFFF                            @ init test status
++    adrl  r5, PATTERN_TABLE                      @ init pattern table index
++/****************************
++ Test pattern iteration loop
++ ***************************/
++cbr1_next_test_pattern:
++    mov   r10, #5                                @ set the retry loop of each pattern
++    ldr   r1, [r5]                               @ load test pattern
++    ldr   r0, =0x1e6e007c
++    str   r1, [r0]
++    cmp   r1, #0x00                              @ the last data in pattern is 0x00
++    bne   cbr1_test_single
++
++cbr1_test_pattern_end:
++    cmp   r9, #0x00
++    bne   cbr1_test_pass_dqi
++    cmp   r6, #10
++    bge   CBR1_END
++    b     cbr1_next_dll2_parameter               @ CBRScan2() end and test result fail, go to next step
++
++cbr1_test_pass_dqi:
++    and   r3, r7, #0xFF
++    sub   r3, r3, #0x01                          @ we add 1 after loop check so we need to decrease 1
++    add   r6, r6, #0x01                          @ increment pass count
++    ldr   r0, =0x1e720010
++    mov   r8, #0x01
++cbr1_test_pass_dqi_loop_s:
++    tst   r9, r8
++    beq   cbr1_test_pass_dqi_loop_e
++    record_dll2_pass_range
++
++cbr1_test_pass_dqi_loop_e:
++    add   r0, r0, #0x04
++    mov   r8, r8, lsl #1
++    ldr   r1, =0xFFFF
++    tst   r8, r1
++    bne   cbr1_test_pass_dqi_loop_s
++    b     cbr1_next_dll2_parameter
++
++/****************************
++ Test fail retry loop
++ ***************************/
++cbr1_pattern_fail_retry:
++
++/* CBRTest2() start */
++cbr1_test_single:
++    ldr   r0, =0x1e6e0070
++    ldr   r1, =0x00000000
++    str   r1, [r0]
++    ldr   r1, =0x00000005
++    str   r1, [r0]
++    ldr   r3, =0x1000
++    ldr   r1, =0x1000
++cbr1_wait_engine_idle_0:
++    subs  r1, r1, #1
++    beq   cbr1_test_single_end
++    ldr   r2, [r0]
++    tst   r2, r3                                 @ D[12] = idle bit
++    beq   cbr1_wait_engine_idle_0
++
++cbr1_test_single_end:
++    ldr   r0, =0x1e6e0078                        @ read fail bit status
++    ldr   r11, [r0]
++    orr   r11, r11, r11, lsr #16
++    bic   r11, r11, #0xFF000000
++    bic   r11, r11, #0x00FF0000
++
++    ldr   r1, =0xFFFF
++    cmp   r11, r1
++    beq   cbr1_test_fail
++
++cbr1_test_burst:
++    ldr   r0, =0x1e6e0070
++    ldr   r2, =0x00000000
++    str   r2, [r0]
++    ldr   r2, =0x00000041
++    str   r2, [r0]
++    ldr   r3, =0x1000
++    ldr   r1, =0x1000
++cbr1_wait_engine_idle_1:
++    subs  r1, r1, #1
++    beq   cbr1_test_burst_end
++    ldr   r2, [r0]
++    tst   r2, r3                                 @ D[12] = idle bit
++    beq   cbr1_wait_engine_idle_1
++
++cbr1_test_burst_end:
++    ldr   r0, =0x1e6e0078                        @ read fail bit status
++    ldr   r2, [r0]
++    orr   r2, r2, r2, lsr #16
++    bic   r2, r2, #0xFF000000
++    bic   r2, r2, #0x00FF0000
++    orr   r11, r11, r2
++
++    ldr   r2, =0xFFFF
++    cmp   r11, r2
++    bne   cbr1_test_pass
++/* CBRTest2() end */
++
++cbr1_test_fail:
++    subs  r10, r10, #1
++    bne   cbr1_pattern_fail_retry
++    mov   r9, #0x00
++    b     cbr1_test_pattern_end                  @ CBRScan2() return(0)
++
++cbr1_test_pass:
++    ldr   r1, =0xFFFF                            @ record the pass bit
++    eor   r11, r11, r1
++    and   r9, r9, r11                            @ DQ pass bit
++    cmp   r9, #0x00
++    beq   cbr1_test_pattern_end                  @ CBRScan2() return(0)
++
++    add   r5, r5, #0x04                          @ increase the test pattern index
++    b     cbr1_next_test_pattern
++
++CBR1_END:
++    mov   r5, #0x0                               @ init DQ DLL_min sum
++    mov   r6, #0x0                               @ init DQ DLL_min valid count
++    ldr   r0, =0x1e72000c
++    ldr   r3, =0x1e720050
++cbr1_search_dllmin_s:
++    add   r0, r0, #0x04
++    cmp   r0, r3
++    beq   cbr1_search_dllmin_e
++    ldr   r1, [r0]
++    mov   r2, r1, lsr #8
++    and   r2, r2, #0xFF                          @ get dllmax
++    and   r1, r1, #0xFF                          @ get dllmin
++    subs  r2, r2, r1                             @ dllmax - dllmin
++    bmi   cbr1_search_dllmin_s                   @ no valid margin found, bypass fine tune
++    cmp   r2, #10                                @ (dllmax - dllmin) < 10
++    blt   cbr1_search_dllmin_s                   @ no enough margin found, bypass fine tune
++    add   r5, r5, r1
++    add   r6, r6, #1
++    b     cbr1_search_dllmin_s
++
++cbr1_search_dllmin_e:
++    cmp   r6, #16
++    bne   Calibration_Start_pre                  @ not all bits valid, retry again
++
++    mov   r5, r5, lsr #4
++    ldr   r0, =0x1e720000
++    str   r5, [r0]
++
++    mov   r6, #0x00                              @ init DQL CBR value
++    ldr   r0, =0x1e720030
++    ldr   r7, =0x1e72000c
++cbr1_set_result_dql:
++    sub   r0, r0, #4
++    cmp   r0, r7
++    beq   cbr1_set_result_next
++    mov   r6, r6, lsl #3
++    ldr   r1, [r0]
++    mov   r2, r1, lsr #8
++    and   r2, r2, #0xFF                          @ get dllmax
++    and   r1, r1, #0xFF                          @ get dllmin
++    mov   r3, r1                                 @ dll = dllmin
++    cmp   r5, r3
++    blt   cbr1_set_result_dql_neg
++    sub   r1, r5, r3
++    mov   r2, #19
++    mul   r1, r2, r1
++    mov   r1, r1, lsr #5                         @ dqi_tune = ((gold_dll - dll) * 19) >> 5
++    cmp   r1, #2                                 @ dqi_tune max = 2
++    movgt r1, #2
++    orr   r6, r6, r1
++    b     cbr1_set_result_dql
++
++cbr1_set_result_dql_neg:
++    sub   r1, r3, r5
++    mov   r2, #19
++    mul   r1, r2, r1
++    mov   r1, r1, lsr #5                         @ dqi_tune = ((gold_dll - dll) * 19) >> 5
++    cmp   r1, #2                                 @ dqi_tune max = -2
++    movgt r1, #2
++    mov   r2, #8
++    sub   r1, r2, r1
++    and   r1, r1, #7
++    orr   r6, r6, r1
++    b     cbr1_set_result_dql
++
++cbr1_set_result_next:
++    ldr   r0, =0x1e6e0080                        @ save DQL fine tune result
++    str   r6, [r0]
++    ldr   r0, =0x1e720094
++    str   r6, [r0]
++
++    mov   r6, #0x00                              @ init DQH CBR value
++    ldr   r0, =0x1e720050
++    ldr   r7, =0x1e72002c
++cbr1_set_result_dqh:
++    sub   r0, r0, #4
++    cmp   r0, r7
++    beq   cbr1_set_result_end
++    mov   r6, r6, lsl #3
++    ldr   r1, [r0]
++    mov   r2, r1, lsr #8
++    and   r2, r2, #0xFF                          @ get dllmax
++    and   r1, r1, #0xFF                          @ get dllmin
++    mov   r3, r1                                 @ dll = dllmin
++    cmp   r5, r3
++    blt   cbr1_set_result_dqh_neg
++    sub   r1, r5, r3
++    mov   r2, #19
++    mul   r1, r2, r1
++    mov   r1, r1, lsr #5                         @ dqi_tune = ((gold_dll - dll) * 19) >> 5
++    cmp   r1, #3                                 @ dqi_tune max = 2
++    movgt r1, #3
++    subs  r1, r1, #1
++    movmi r1, #7
++    orr   r6, r6, r1
++    b     cbr1_set_result_dqh
++
++cbr1_set_result_dqh_neg:
++    sub   r1, r3, r5
++    mov   r2, #19
++    mul   r1, r2, r1
++    mov   r1, r1, lsr #5                         @ dqi_tune = ((gold_dll - dll) * 19) >> 5
++    add   r1, r1, #1
++    cmp   r1, #2                                 @ dqi_tune max = -2
++    movgt r1, #2
++    mov   r2, #8
++    sub   r1, r2, r1
++    and   r1, r1, #7
++    orr   r6, r6, r1
++    b     cbr1_set_result_dqh
++
++cbr1_set_result_end:
++    ldr   r0, =0x1e6e0084                        @ save DQH fine tune result
++    str   r6, [r0]
++    ldr   r0, =0x1e720098
++    str   r6, [r0]
++
++/******************************************************************************
++ Search the DLL2 detail margin
++ *****************************************************************************/
++    ldr   r0, =0x1e7200a0
++    mov   r1, #0
++    str   r1, [r0]
++
++CBR3_START:
++/* Debug - UART console message */
++    ldr r0, =0x1e784000
++    mov r1, #0x33                                @ '3'
++    str r1, [r0]
++/* Debug - UART console message */
++
++    mov   r6, #0x00                              @ init pass count
++    mov   r7, #0x00                              @ init DLL2 parameter index
++    ldr   r1, =0x000000ff
++    ldr   r0, =0x1e720008                        @ init DQL dllmax,dllmin
++    str   r1, [r0]
++    ldr   r0, =0x1e72000c                        @ init DQH dllmax,dllmin
++    str   r1, [r0]
++
++    ldr   r0, =0x1e7200a0                        @ CBR3 iteration counter
++    ldr   r1, [r0]
++    add   r1, r1, #1
++    str   r1, [r0]
++
++/****************************
++ DLL2 delay margin test loop
++ ***************************/
++cbr3_next_dll2_parameter:
++    ldr   r0, =0x1e6e0068                        @ load DLL2 parameter
++    ldr   r1, [r0]
++    bic   r1, r1, #0x00FF0000
++    bic   r1, r1, #0xFF000000
++    orr   r1, r1, r7, lsl #16
++    str   r1, [r0]
++    ldr   r2, =0x40404040                        @ parameter's max is to 0x40404040
++    cmp   r7, r2
++    bge   CBR3_END
++    ldr   r2, =0x01010101
++    add   r7, r7, r2
++
++    ldr   r0, =0x1e6e0074                        @ set the testing DRAM size = 64KB
++    ldr   r1, =0x0000FFFF
++    str   r1, [r0]
++
++/* CBRScan() start */
++    mov   r9, #0x03                              @ init test status
++    adrl  r5, PATTERN_TABLE                      @ init pattern table index
++/****************************
++ Test pattern iteration loop
++ ***************************/
++cbr3_next_test_pattern:
++    mov   r10, #5                                @ set the retry loop of each pattern
++    ldr   r1, [r5]                               @ load test pattern
++    ldr   r0, =0x1e6e007c
++    str   r1, [r0]
++    cmp   r1, #0x00                              @ the last data in pattern is 0x00
++    bne   cbr3_test_single
++
++cbr3_test_pattern_end:
++    cmp   r9, #0x00
++    bne   cbr3_test_pass_dql
++    cmp   r6, #10
++    bge   CBR3_END
++    b     cbr3_next_dll2_parameter               @ CBRScan() end and test result fail, go to next step
++
++cbr3_test_pass_dql:
++    and   r3, r7, #0xFF
++    sub   r3, r3, #0x01                          @ we add one after loop check so we need to decrease 1
++    add   r6, r6, #0x01                          @ increment pass count
++    tst   r9, #0x01
++    beq   cbr3_test_pass_dqh
++
++    ldr   r0, =0x1E720008
++    record_dll2_pass_range
++
++cbr3_test_pass_dqh:
++    tst   r9, #0x02
++    beq   cbr3_next_dll2_parameter
++    ldr   r0, =0x1E72000c
++    record_dll2_pass_range
++    b     cbr3_next_dll2_parameter
++
++/****************************
++ Test fail retry loop
++ ***************************/
++cbr3_pattern_fail_retry:
++
++/* CBRTest() start */
++cbr3_test_single:
++    ldr   r0, =0x1e6e0070
++    ldr   r1, =0x00000000
++    str   r1, [r0]
++    ldr   r1, =0x00000005
++    str   r1, [r0]
++    ldr   r3, =0x1000
++    ldr   r8, =0x10000
++cbr3_wait_engine_idle_0:
++    subs  r8, r8, #1
++    beq   cbr3_test_single_end
++    ldr   r2, [r0]
++    tst   r2, r3                                 @ D[12] = idle bit
++    beq   cbr3_wait_engine_idle_0
++
++cbr3_test_single_end:
++    ldr   r0, =0x1e6e0078                        @ read fail bit status
++    ldr   r11, [r0]
++    orr   r11, r11, r11, lsr #16
++    bic   r11, r11, #0xFF000000
++    bic   r11, r11, #0x00FF0000
++
++    ldr   r1, =0xFF
++    tst   r11, r1
++    beq   cbr3_test_burst
++    tst   r11, r1, lsl #8
++    bne   cbr3_test_fail
++
++cbr3_test_burst:
++    mov   r1, #0x00                              @ initialize loop index, r1 is loop's index
++cbr3_test_burst_loop:
++    ldr   r0, =0x1e6e0070
++    ldr   r2, =0x00000000
++    str   r2, [r0]
++    mov   r2, r1, lsl #3
++    orr   r2, r2, #0x41                          @ test command = 0x41 | (datagen << 3)
++    str   r2, [r0]
++    ldr   r3, =0x1000
++    ldr   r8, =0x10000
++cbr3_wait_engine_idle_1:
++    subs  r8, r8, #1
++    beq   cbr3_test_burst_end
++    ldr   r2, [r0]
++    tst   r2, r3                                 @ D[12] = idle bit
++    beq   cbr3_wait_engine_idle_1
++
++cbr3_test_burst_end:
++    ldr   r0, =0x1e6e0078                        @ read fail bit status
++    ldr   r2, [r0]
++    orr   r2, r2, r2, lsr #16
++    bic   r2, r2, #0xFF000000
++    bic   r2, r2, #0x00FF0000
++    orr   r11, r11, r2
++
++    ldr   r2, =0xFF
++    tst   r11, r2
++    beq   cbr3_next_test_burst_mode
++    tst   r11, r2, lsl #8
++    beq   cbr3_next_test_burst_mode
++/* CBRTest() end */
++
++cbr3_test_fail:
++    subs  r10, r10, #1
++    bne   cbr3_pattern_fail_retry
++    mov   r9, #0x00
++    b     cbr3_test_pattern_end                  @ CBRScan() return(0)
++
++cbr3_next_test_burst_mode:
++    add   r1, r1, #1                             @ increase the test mode index
++    cmp   r1, #0x08                              @ there are 8 modes
++    bne   cbr3_test_burst_loop
++
++    ldr   r1, =0xFF                              @ record the pass byte
++    tst   r11, r1
++    andne r9, r9, #0x02                          @ DQL fail
++    tst   r11, r1, lsl #8
++    andne r9, r9, #0x01                          @ DQH fail
++    cmp   r9, #0x00
++    beq   cbr3_test_pattern_end                  @ CBRScan() return(0)
++
++    add   r5, r5, #0x04                          @ increase the test pattern index
++    b     cbr3_next_test_pattern
++
++CBR3_END:
++    ldr   r0, =0x1e72000c                        @ check DQH margin
++    ldr   r1, [r0]
++    mov   r2, r1, lsr #8
++    and   r2, r2, #0xFF                          @ get dllmax
++    and   r1, r1, #0xFF                          @ get dllmin
++    subs  r5, r2, r1                             @ dllmax - dllmin
++    bmi   CBR3_START                             @ no valid margin found, retry again
++    cmp   r5, #10                                @ (dllmax - dllmin) < 10
++    blt   CBR3_START                             @ no enough margin found, retry again
++    add   r2, r1, r2                             @ (dllmin[1] + dllmax[1] + 1) >> 1
++    add   r2, r2, #0x01
++    mov   r1, r2, lsr #1
++    mov   r3, r1, lsl #8
++    ldr   r1, [r0]                               @ store the dll search result
++    bic   r1, r1, #0xFF000000
++    bic   r1, r1, #0x00FF0000
++    orr   r1, r1, r3, lsl #8
++    str   r1, [r0]
++
++    ldr   r0, =0x1e720008                        @ check DQL margin
++    ldr   r1, [r0]
++    mov   r2, r1, lsr #8
++    and   r2, r2, #0xFF                          @ get dllmax
++    and   r1, r1, #0xFF                          @ get dllmin
++    subs  r5, r2, r1                             @ dllmax - dllmin
++    bmi   CBR3_START                             @ no valid margin found, retry again
++    cmp   r5, #10                                @ (dllmax - dllmin) < 10
++    blt   CBR3_START                             @ no enough margin found, retry again
++    add   r2, r1, r2                             @ (dllmin[0] + dllmax[0] + 1) >> 1
++    add   r2, r2, #0x01
++    mov   r1, r2, lsr #1
++    ldr   r2, [r0]                               @ store the dll search result
++    bic   r2, r2, #0xFF000000
++    bic   r2, r2, #0x00FF0000
++    orr   r2, r2, r1, lsl #16
++    str   r2, [r0]
++    orr   r3, r3, r1
++
++    ldr   r0, =0x1e6e0068                        @ save the result dll value
++    ldr   r1, [r0]
++    bic   r1, r1, #0xFF000000
++    bic   r1, r1, #0x00FF0000
++    orr   r1, r1, r3, lsl #16
++    str   r1, [r0]
++    b     CBR4_START
++
++.LTORG
++
++/******************************************************************************
++ Search the DQS input mask margin
++ *****************************************************************************/
++CBR4_START:
++/* Debug - UART console message */
++    ldr r0, =0x1e784000
++    mov r1, #0x34                                @ '4'
++    str r1, [r0]
++/* Debug - UART console message */
++
++    ldr   r0, =0x1e6e0074                        @ set the testing DRAM size = 4KB
++    ldr   r1, =0x00000FFF
++    str   r1, [r0]
++
++    mov   r8, #0x00                              @ init MCR18[4]
++    ldr   r1, =0x000000ff
++    ldr   r0, =0x1e7200b0                        @ init MCR18[4]=0 max,min
++    str   r1, [r0]
++    ldr   r0, =0x1e7200b4                        @ init MCR18[4]=1 max,min
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0018
++    ldr   r1, [r0]
++    bic   r1, r1, #0x0000001F
++    str   r1, [r0]
++
++    b     cbr4_scan_start
++
++cbr4_next_maskdly:
++    add   r8, r8, #0x01
++    and   r2, r8, #0x01
++    ldr   r0, =0x1e6e0018
++    ldr   r1, [r0]
++    bic   r1, r1, #0x0000001F
++    orr   r1, r1, r2, lsl #4
++    str   r1, [r0]
++    cmp   r8, #0x02
++    bge   CBR4_END
++
++cbr4_scan_start:
++    mov   r6, #0x00                              @ init pass count
++    mov   r7, #0x00                              @ init mask delay
++
++/****************************
++ DQS Mask delay margin test loop
++ ***************************/
++cbr4_next_parameter:
++    cmp   r7, #0x10                              @ max delay = 0xF
++    bge   cbr4_next_maskdly
++    ldr   r0, =0x1e6e0018                        @ load MCR18 parameter
++    ldr   r1, [r0]
++    bic   r1, r1, #0x0000000F
++    orr   r1, r1, r7
++    str   r1, [r0]
++    add   r7, r7, #0x01
++
++/* CBRScan3() start */
++    adrl  r5, PATTERN_TABLE                      @ init pattern table index
++/****************************
++ Test pattern iteration loop
++ ***************************/
++cbr4_next_test_pattern:
++    mov   r10, #2                                @ set the retry loop = 2 of each pattern
++    ldr   r1, [r5]                               @ load test pattern
++    ldr   r0, =0x1e6e007c
++    str   r1, [r0]
++    cmp   r1, #0x00                              @ the last data in pattern is 0x00
++    bne   cbr4_test_burst
++
++    and   r3, r7, #0xFF
++    sub   r3, r3, #0x01                          @ we add 1 after loop check so we need to decrease 1
++    add   r6, r6, #0x01                          @ increment pass count
++
++    ldr   r0, =0x1e7200b0                        @ record pass window
++    add   r0, r0, r8, lsl #2
++    record_dll2_pass_range
++    mov   r2, #0x01
++    add   r1, r1, r2, lsl #16
++    str   r1, [r0]
++    b     cbr4_next_parameter
++
++cbr4_test_pattern_fail:
++    cmp   r6, #5                                 @ passcnt >= 5
++    bge   cbr4_next_maskdly
++    b     cbr4_next_parameter
++
++/****************************
++ Test fail retry loop
++ ***************************/
++cbr4_pattern_fail_retry:
++
++/* CBRTest3() start */
++cbr4_test_burst:
++    ldr   r0, =0x1e6e0070
++    ldr   r1, =0x00000000
++    str   r1, [r0]
++    ldr   r1, =0x000000C1
++    str   r1, [r0]
++    ldr   r3, =0x3000
++cbr4_wait_engine_idle_0:
++    ldr   r2, [r0]
++    tst   r2, r3                                 @ D[12] = idle bit
++    beq   cbr4_wait_engine_idle_0
++
++    ldr   r2, [r0]                               @ read fail bit status
++    mov   r1, #0x0
++    str   r1, [r0]
++    mov   r2, r2, lsr #13                        @ D[13] = fail bit
++    cmp   r2, #0x00
++    bne   cbr4_test_fail
++
++cbr4_test_single:
++    ldr   r0, =0x1e6e0070
++    ldr   r1, =0x00000000
++    str   r1, [r0]
++    ldr   r1, =0x00000085
++    str   r1, [r0]
++    ldr   r3, =0x3000
++cbr4_wait_engine_idle_1:
++    ldr   r2, [r0]
++    tst   r2, r3                                 @ D[12] = idle bit
++    beq   cbr4_wait_engine_idle_1
++
++    ldr   r2, [r0]                               @ read fail bit status
++    mov   r1, #0x0
++    str   r1, [r0]
++    mov   r2, r2, lsr #13                        @ D[13] = fail bit
++    cmp   r2, #0x00
++    beq   cbr4_test_pass
++
++/* CBRTest3() end */
++
++cbr4_test_fail:
++    subs  r10, r10, #1
++    bne   cbr4_pattern_fail_retry
++    b     cbr4_test_pattern_fail                 @ CBRScan3() return(0)
++
++cbr4_test_pass:
++    add   r5, r5, #0x04                          @ increase the test pattern index
++    b     cbr4_next_test_pattern
++
++CBR4_END:
++    ldr   r0, =0x1e7200b0                        @ check mask margin
++    ldr   r1, [r0]
++    add   r0, r0, #0x04
++    ldr   r2, [r0]
++    ands  r6, r2, #0xFF                          @ get min of MCR18[4] = 1
++    bne   cbr4_noset_delay
++    ands  r5, r1, #0xFF                          @ get min of MCR18[4] = 0
++    bne   cbr4_set_delay
++    mov   r1, r1, lsr #8                         @ get max of MCR18[4] = 0
++    and   r1, r1, #0xFF
++    mov   r2, r2, lsr #8                         @ get max of MCR18[4] = 1
++    and   r2, r2, #0xFF
++    sub   r1, r1, r5
++    sub   r2, r2, r6
++    cmp   r1, r2
++    bge   cbr4_noset_delay
++
++cbr4_set_delay:
++    ldr   r0, =0x1e6e0018
++    ldr   r1, [r0]
++    orr   r1, r1, #0x10
++    str   r1, [r0]
++
++cbr4_noset_delay:
++    ldr   r0, =0x1e6e0070
++    ldr   r1, =0x00000000
++    str   r1, [r0]
++
++/******************************************************************************
++ CBR Finish
++ *****************************************************************************/
++/******************************************************************************
++ Check DRAM Size
++ *****************************************************************************/
++    ldr   r0, =0x1e6e2070
++    ldr   r1, [r0]
++    bic   r1, r1, #0xFEFFFFFF                    @ bit[24]=1 => DDR2
++    mov   r2, r1, lsr #24
++    cmp   r2, #0x01
++    beq   check_ddr2_size
++
++    ldr   r0, =0x1e6e0004
++    ldr   r5, [r0]
++    bic   r5, r5, #0x00000003                    @ record MCR04
++    orr   r1, r5, #0x3
++    str   r1, [r0]                               @ set to 4Gbit
++    ldr   r6, =0x003F2217
++#if defined(CONFIG_DRAM_336)
++    ldr   r6, =0x00361C13
++#endif
++    b     check_dram_size
++
++check_ddr2_size:
++    ldr   r0, =0x1e6e0004
++    ldr   r5, [r0]
++    bic   r5, r5, #0x00000023                    @ record MCR04
++    orr   r1, r5, #0x23
++    str   r1, [r0]                               @ set to 4Gbit
++    ldr   r6, =0x3F2B1B16
++#if defined(CONFIG_DRAM_336)
++    ldr   r6, =0x3B231612
++#endif
++
++    ldr   r0, =0x40000000
++    ldr   r1, =0x1817191A
++    str   r1, [r0]
++    ldr   r0, =0x40002000
++    ldr   r1, =0x73616532
++    str   r1, [r0]
++    ldr   r0, =0x40000000
++    ldr   r1, =0x1817191A
++    ldr   r2, [r0]
++    cmp   r1, r2
++    bne   check_dram_size_end                    @ == 512Mbit
++    orr   r5, r5, #0x20                          @ >= 1Gbit
++    mov   r6, r6, lsr #8
++
++check_dram_size:
++    ldr   r0, =0x50100000
++    ldr   r1, =0x41424344
++    str   r1, [r0]
++    ldr   r0, =0x48100000
++    ldr   r1, =0x25262728
++    str   r1, [r0]
++    ldr   r0, =0x40100000
++    ldr   r1, =0x191A1B1C
++    str   r1, [r0]
++    ldr   r0, =0x50100000
++    ldr   r1, =0x41424344
++    ldr   r2, [r0]
++    cmp   r2, r1                                 @ == 4Gbit
++    orreq r5, r5, #0x03
++    moveq r6, r6, lsr #16
++    beq   check_dram_size_end
++    ldr   r0, =0x48100000
++    ldr   r1, =0x25262728
++    ldr   r2, [r0]
++    cmp   r2, r1                                 @ == 2Gbit
++    orreq r5, r5, #0x02
++    moveq r6, r6, lsr #8
++    beq   check_dram_size_end
++    orr   r5, r5, #0x01                          @ == 1Gbit
++
++check_dram_size_end:
++    ldr   r0, =0x1e6e0004
++    str   r5, [r0]
++    ldr   r0, =0x1e6e0014
++    ldr   r1, [r0]
++    bic   r1, r1, #0x000000FF
++    and   r6, r6, #0xFF
++    orr   r1, r1, r6
++    str   r1, [r0]
++
++    ldr   r0, =0x1e6e0120                        @ VGA Compatible Mode
++    ldr   r1, =0x000050C0                        @ 408 MHz
++#if defined(CONFIG_DRAM_336)
++    ldr   r1, =0x00004DC0
++#endif
++    str   r1, [r0]
++
++/******************************************************************************
++ Version Number
++ *****************************************************************************/
++    ldr   r0, =0x1e7200a8
++    ldr   r1, =0x20141229                        @ released date
++    str   r1, [r0]
++
++    add   r0, r0, #4
++    ldr   r1, =0x00000060                        @ released SDK version
++    str   r1, [r0]
++
++/******************************************************************************
++ Calibration Code End
++ ******************************************************************************/
++
++set_scratch:
++    /*Set Scratch register Bit 6 after ddr initial finished */
++    ldr r0, =0x1e6e2040
++    ldr r1, [r0]
++    orr r1, r1, #0x40
++    str r1, [r0]
++
++/* Debug - UART console message */
++    ldr r0, =0x1e784000
++    mov r1, #0x44                                @ 'D'
++    str r1, [r0]
++    mov r1, #0x6F                                @ 'o'
++    str r1, [r0]
++    mov r1, #0x6E                                @ 'n'
++    str r1, [r0]
++    mov r1, #0x65                                @ 'e'
++    str r1, [r0]
++    mov r1, #0x0D                                @ '\r'
++    str r1, [r0]
++    mov r1, #0x0A                                @ '\n'
++    str r1, [r0]
++/* Debug - UART console message */
++
++/******************************************************************************
++ Solve PCIe ASPM issue, only applied to AST2300 series
++ ******************************************************************************/
++    ldr r0, =0x1e6e207c                          @ Check bounding for AST1150 existence
++    ldr r1, [r0]
++    mov r2, r1, lsr #24
++    cmp r2, #0x01
++    bne platform_exit                            @ not match AST2300
++    bic r1, r1, #0xFFFFFCFF
++    mov r1, r1, lsr #8
++    cmp r1, #0x02
++    beq platform_exit                            @ match AST1050
++
++    ldr r0, =0x1e6e2004                          @ Disable I2C controller reset
++    ldr r1, [r0]
++    orr r1, r1, #0x04
++    str r1, [r0]
++    bic r1, r1, #0x04
++    str r1, [r0]
++
++    ldr r0, =0x1e78a054                          @ Check I2C bus state, if busy then quit
++    ldr r1, [r0]
++    mov r1, r1, lsr #17
++    and r1, r1, #0x03
++    cmp r1, #0x03
++    bne platform_exit
++
++    ldr r0, =0x1e78a040                          @ Init I2C1 controller
++    mov r1, #0x01
++    orr r1, r1, r1, lsl #16
++    str r1, [r0]
++
++    ldr r0, =0x1e78a044
++    ldr r1, =0x77776704
++    str r1, [r0]
++
++    mov r1, #0x0
++    ldr r0, =0x1e78a048
++    str r1, [r0]
++    ldr r0, =0x1e78a04c
++    str r1, [r0]
++
++    ldr r0, =0x1e78a050
++    ldr r1, =0xFFFFFFFF
++    str r1, [r0]
++
++    ldr r0, =0x1e78a200                          @ Set AST1150 I2C password
++    ldr r1, =0x00A88FA8
++    str r1, [r0]
++
++    ldr r0, =0x1e78a05c
++    ldr r1, =0x00000200                          @ Enable buffer mode transfering 3 bytes
++    str r1, [r0]
++
++    ldr r0, =0x1e78a054
++    ldr r1, =0x00000063                          @ Fire commmand
++    str r1, [r0]
++
++    ldr r0, =0x1e78a050
++i2c_wait_cmddone_1:
++    ldr r1, [r0]
++    tst r1, #0x38
++    beq i2c_wait_cmddone_1
++    tst r1, #0x2A                                @ transmit error
++    bne platform_exit2
++    ldr r1, =0xFFFFFFFF
++    str r1, [r0]
++
++    ldr r0, =0x1e78a200                          @ Disable ASPM capability
++    ldr r1, =0x04005DA8
++    str r1, [r0]
++
++    ldr r0, =0x1e78a204
++    ldr r1, =0x00000024
++    str r1, [r0]
++
++    ldr r0, =0x1e78a05c
++    ldr r1, =0x00000200                          @ Enable buffer mode transfering 3 bytes
++    str r1, [r0]
++
++    ldr r0, =0x1e78a054
++    ldr r1, =0x00000063                          @ Fire commmand
++    str r1, [r0]
++
++    ldr r0, =0x1e78a050
++i2c_wait_cmddone_2:
++    ldr r1, [r0]
++    tst r1, #0x38
++    beq i2c_wait_cmddone_2
++    tst r1, #0x2A                                @ transmit error
++    bne platform_exit2
++    ldr r1, =0xFFFFFFFF
++    str r1, [r0]
++
++platform_exit2:
++    ldr r0, =0x1e78a040                          @ Disable I2C1 controller
++    mov r1, #0x00
++    str r1, [r0]
++
++    b   platform_exit
++.LTORG
++
++platform_exit:
++#ifdef      CONFIG_DRAM_ECC
++    ldr r0, =0x1e6e0004
++    ldr r1, [r0]
++    orr r1, r1, #0x80
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0054
++    ldr r1, =0x05000000                          /* ECC protected memory size, default set at 80M   */
++    str r1, [r0]
++
++    ldr r0, =0x1e6e007C
++    ldr r1, =0x00000000
++    str r1, [r0]
++    ldr r0, =0x1e6e0074
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0070
++    ldr r1, =0x00000221
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0070
++    ldr r2, =0x00001000
++ECC_Init_Flag:
++    ldr r1, [r0]
++    tst r1, r2                                   @ D[12] = 1, Done
++    beq ECC_Init_Flag
++
++    ldr r0, =0x1e6e0070
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0050
++    ldr r1, =0x80000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0050
++    ldr r1, =0x00000000
++    str r1, [r0]
++
++    ldr r0, =0x1e6e0070
++    ldr r1, =0x00000400
++    str r1, [r0]
++#endif
++    ldr r0, =0x1e6e2008                          @ Set Video ECLK phase
++    ldr r1, [r0]
++    ldr r2, =0xfffffff3
++    and r1, r1, r2
++    orr r1, r1, #0x08
++    str r1, [r0]
++
++    ldr r0, =0x1e6e2004
++    ldr r1, [r0]
++    ldr r2, =0xFFBFFFFF                          @ Enable JTAG Master, solve ARM stucked by JTAG issue
++    and r1, r1, r2
++    str r1, [r0]
++
++    ldr r0, =0x1e6e2048                          @ Set MAC interface delay timing
++    ldr r1, =0x2255
++    str r1, [r0]
++
++    ldr r0, =0x1e6e2070                          @ Set MAC AHB bus clock
++    ldr r1, [r0]
++    mov r2, #0x04                                @ Default RMII, set MHCLK = HPLL/10
++    tst r1, #0xC0
++    movne r2, #0x02                              @ if RGMII,     set MHCLK = HPLL/6
++    ldr r0, =0x1e6e2008
++    ldr r1, [r0]
++    bic r1, r1, #0x00070000
++    orr r1, r1, r2, lsl #16
++    str r1, [r0]
++
++/* Test - DRAM initial time */
++    ldr r0, =0x1e782040
++    ldr r1, [r0]
++    ldr r0, =0xFFFFFFFF
++    sub r1, r0, r1
++    ldr r0, =0x1e72009c
++    str r1, [r0]
++    ldr r0, =0x1e7200a4
++    str r1, [r0]
++    ldr r0, =0x1e782030
++    ldr r1, [r0]
++    bic r1, r1, #0x0000F000
++    str r1, [r0]
++/* Test - DRAM initial time */
++
++/******************************************************************************
++ Reset GPIO registers when watchdog reset
++ ******************************************************************************/
++    ldr r0, =0x1e6e207c                          @ Check Revision ID
++    ldr r1, [r0]
++    mov r1, r1, lsr #24
++    cmp r1, #0x02
++    bne platform_exit3                           @ not match AST2400
++
++    ldr r0, =0x1e6e203c                          @ Check watchdog reset event
++    ldr r1, [r0]
++    and r1, r1, #0x06
++    cmp r1, #0x0
++    beq platform_exit3                           @ no watchdog reset event
++
++    ldr r0, =0x1e6e209c                          @ Check watchdog GPIO selection
++    ldr r1, [r0]
++    mov r1, r1, lsr #21
++    tst r1, #0x01
++    beq platform_exit3                           @ no watchdog reset selection
++
++    ldr r1, =0x00000000                          @ clear GPIO register reset by PRST_N
++    ldr r2, =0xFFFFFFFF
++    ldr r0, =0x1e780008
++    str r1, [r0]
++    ldr r0, =0x1e78000c
++    str r1, [r0]
++    ldr r0, =0x1e780010
++    str r1, [r0]
++    ldr r0, =0x1e780014
++    str r1, [r0]
++    ldr r0, =0x1e780018
++    str r2, [r0]
++    ldr r0, =0x1e780028
++    str r1, [r0]
++    ldr r0, =0x1e78002c
++    str r1, [r0]
++    ldr r0, =0x1e780030
++    str r1, [r0]
++    ldr r0, =0x1e780034
++    str r1, [r0]
++    ldr r0, =0x1e780038
++    str r2, [r0]
++    ldr r0, =0x1e780040
++    str r1, [r0]
++    ldr r0, =0x1e780044
++    str r1, [r0]
++    ldr r0, =0x1e780048
++    str r1, [r0]
++    ldr r0, =0x1e78004c
++    str r1, [r0]
++    ldr r0, =0x1e780050
++    str r1, [r0]
++    ldr r0, =0x1e780054
++    str r1, [r0]
++    ldr r0, =0x1e780058
++    str r1, [r0]
++    ldr r0, =0x1e780060
++    str r1, [r0]
++    ldr r0, =0x1e780064
++    str r1, [r0]
++    ldr r0, =0x1e780068
++    str r1, [r0]
++    ldr r0, =0x1e78006c
++    str r1, [r0]
++    ldr r0, =0x1e780090
++    str r1, [r0]
++    ldr r0, =0x1e780094
++    str r1, [r0]
++    ldr r0, =0x1e780098
++    str r1, [r0]
++    ldr r0, =0x1e78009c
++    str r1, [r0]
++    ldr r0, =0x1e7800a0
++    str r1, [r0]
++    ldr r0, =0x1e7800a4
++    str r1, [r0]
++    ldr r0, =0x1e7800a8
++    str r2, [r0]
++    ldr r0, =0x1e7800b0
++    str r1, [r0]
++    ldr r0, =0x1e7800b4
++    str r1, [r0]
++    ldr r0, =0x1e7800b8
++    str r1, [r0]
++    ldr r0, =0x1e7800e0
++    str r1, [r0]
++    ldr r0, =0x1e7800e4
++    str r1, [r0]
++    ldr r0, =0x1e7800e8
++    str r1, [r0]
++    ldr r0, =0x1e7800ec
++    str r1, [r0]
++    ldr r0, =0x1e7800f0
++    str r1, [r0]
++    ldr r0, =0x1e7800f4
++    str r1, [r0]
++    ldr r0, =0x1e7800f8
++    str r2, [r0]
++    ldr r0, =0x1e780100
++    str r1, [r0]
++    ldr r0, =0x1e780104
++    str r1, [r0]
++    ldr r0, =0x1e780108
++    str r1, [r0]
++    ldr r0, =0x1e780110
++    str r1, [r0]
++    ldr r0, =0x1e780114
++    str r1, [r0]
++    ldr r0, =0x1e780118
++    str r1, [r0]
++    ldr r0, =0x1e78011c
++    str r1, [r0]
++    ldr r0, =0x1e780120
++    str r1, [r0]
++    ldr r0, =0x1e780124
++    str r1, [r0]
++    ldr r0, =0x1e780128
++    str r2, [r0]
++    ldr r0, =0x1e780130
++    str r1, [r0]
++    ldr r0, =0x1e780134
++    str r1, [r0]
++    ldr r0, =0x1e780138
++    str r1, [r0]
++    ldr r0, =0x1e780140
++    str r1, [r0]
++    ldr r0, =0x1e780144
++    str r1, [r0]
++    ldr r0, =0x1e780148
++    str r1, [r0]
++    ldr r0, =0x1e78014c
++    str r1, [r0]
++    ldr r0, =0x1e780150
++    str r1, [r0]
++    ldr r0, =0x1e780154
++    str r1, [r0]
++    ldr r0, =0x1e780158
++    str r2, [r0]
++    ldr r0, =0x1e780160
++    str r1, [r0]
++    ldr r0, =0x1e780164
++    str r1, [r0]
++    ldr r0, =0x1e780168
++    str r1, [r0]
++    ldr r0, =0x1e780170
++    str r1, [r0]
++    ldr r0, =0x1e780174
++    str r1, [r0]
++    ldr r0, =0x1e780178
++    str r1, [r0]
++    ldr r0, =0x1e78017c
++    str r1, [r0]
++    ldr r0, =0x1e780180
++    str r1, [r0]
++    ldr r0, =0x1e780184
++    str r1, [r0]
++    ldr r0, =0x1e780188
++    str r2, [r0]
++    ldr r0, =0x1e780190
++    str r1, [r0]
++    ldr r0, =0x1e780194
++    str r1, [r0]
++    ldr r0, =0x1e780198
++    str r1, [r0]
++    ldr r0, =0x1e7801d0
++    str r1, [r0]
++    ldr r0, =0x1e7801d4
++    str r1, [r0]
++
++    ldr r0, =0x1e780204                          @ clear SGPIOM register reset by PRST_N
++    str r1, [r0]
++    ldr r0, =0x1e780208
++    str r1, [r0]
++    ldr r0, =0x1e78020c
++    str r1, [r0]
++    ldr r0, =0x1e780210
++    str r1, [r0]
++    ldr r0, =0x1e780214
++    str r2, [r0]
++    ldr r0, =0x1e780220
++    str r1, [r0]
++    ldr r0, =0x1e780224
++    str r1, [r0]
++    ldr r0, =0x1e780228
++    str r1, [r0]
++    ldr r0, =0x1e78022c
++    str r1, [r0]
++    ldr r0, =0x1e780230
++    str r2, [r0]
++    ldr r0, =0x1e78023c
++    str r1, [r0]
++    ldr r0, =0x1e780240
++    str r1, [r0]
++    ldr r0, =0x1e780244
++    str r1, [r0]
++    ldr r0, =0x1e780248
++    str r1, [r0]
++    ldr r0, =0x1e78024c
++    str r2, [r0]
++    ldr r0, =0x1e780254
++    ldr r3, =0x01000040
++    str r3, [r0]
++    ldr r0, =0x1e780258
++    str r1, [r0]
++    ldr r0, =0x1e78025c
++    str r1, [r0]
++    ldr r0, =0x1e780260
++    str r1, [r0]
++
++    ldr r0, =0x1e780300                          @ clear SGPIOS register reset by PRST_N
++    str r1, [r0]
++    ldr r0, =0x1e780304
++    str r1, [r0]
++    ldr r0, =0x1e780308
++    str r1, [r0]
++    ldr r0, =0x1e78030c
++    str r1, [r0]
++    ldr r0, =0x1e780310
++    str r1, [r0]
++    ldr r0, =0x1e780314
++    str r1, [r0]
++    ldr r0, =0x1e780318
++    str r2, [r0]
++    ldr r0, =0x1e78031c
++    str r2, [r0]
++    ldr r0, =0x1e780320
++    str r2, [r0]
++
++platform_exit3:
++
++/******************************************************************************
++ SPI Timing Calibration, not applicable to AST2300 series
++ ******************************************************************************/
++    ldr r0, =0x1e6e207c                          @ Check Revision ID
++    ldr r1, [r0]
++    mov r1, r1, lsr #24
++    cmp r1, #0x02
++    blt platform_exit4                           @ not match AST2400 or later
++
++    ldr r0, =0x1e6e2070                          @ Check SPI flash
++    ldr r1, [r0]
++    and r1, r1, #0x03
++    cmp r1, #0x02
++    bne platform_exit4
++
++    mov r2, #0x0
++    mov r6, #0x0
++    mov r7, #0x0
++    init_spi_checksum
++spi_checksum_wait_0:
++    ldr r1, [r0]
++    tst r1, r2
++    beq spi_checksum_wait_0
++    ldr r0, =0x1e620090
++    ldr r5, [r0]                                 @ record golden checksum
++    ldr r0, =0x1e620080
++    mov r1, #0x0
++    str r1, [r0]
++
++    ldr r0, =0x1e620010                          @ set to fast read mode
++    ldr r1, =0x000B0041
++    str r1, [r0]
++
++    ldr r6, =0x00F7E6D0                          @ Init spiclk loop
++    mov r8, #0x0                                 @ Init delay record
++
++spi_cbr_next_clkrate:
++    mov r6, r6, lsr #0x4
++    cmp r6, #0x0
++    beq spi_cbr_end
++
++    mov r7, #0x0                                 @ Init delay loop
++    mov r8, r8, lsl #4
++
++spi_cbr_next_delay_s:
++    mov r2, #0x8
++    init_spi_checksum
++spi_checksum_wait_1:
++    ldr r1, [r0]
++    tst r1, r2
++    beq spi_checksum_wait_1
++    ldr r0, =0x1e620090
++    ldr r2, [r0]                                 @ read checksum
++    ldr r0, =0x1e620080
++    mov r1, #0x0
++    str r1, [r0]
++    cmp r2, r5
++    bne spi_cbr_next_delay_e
++
++    mov r2, #0x0
++    init_spi_checksum
++spi_checksum_wait_2:
++    ldr r1, [r0]
++    tst r1, r2
++    beq spi_checksum_wait_2
++    ldr r0, =0x1e620090
++    ldr r2, [r0]                                 @ read checksum
++    ldr r0, =0x1e620080
++    mov r1, #0x0
++    str r1, [r0]
++    cmp r2, r5
++    bne spi_cbr_next_delay_e
++
++    orr r8, r8, r7                               @ record passed delay
++    b   spi_cbr_next_clkrate
++
++spi_cbr_next_delay_e:
++    add r7, r7, #0x1
++    cmp r7, #0x6
++    blt spi_cbr_next_delay_s
++    b   spi_cbr_next_clkrate
++
++spi_cbr_end:
++    ldr r0, =0x1e620094
++    str r8, [r0]
++    ldr r0, =0x1e620010
++    mov r1, #0x0
++    str r1, [r0]
++
++platform_exit4:
++
++    /* restore lr */
++    mov lr, r4
++
++    /* back to arch calling code */
++    mov pc, lr
+diff --git a/board/aspeed/ast2400/rc4.c b/board/aspeed/ast2400/rc4.c
+new file mode 100755
+index 0000000..32e0ffa
+--- /dev/null
++++ b/board/aspeed/ast2400/rc4.c
+@@ -0,0 +1,68 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++struct rc4_state
++{
++    int x, y, m[256];
++};
++
++void rc4_setup( struct rc4_state *s, unsigned char *key,  int length )
++{
++    int i, j, k, *m, a;
++
++    s->x = 0;
++    s->y = 0;
++    m = s->m;
++
++    for( i = 0; i < 256; i++ )
++    {
++        m[i] = i;
++    }
++
++    j = k = 0;
++
++    for( i = 0; i < 256; i++ )
++    {
++        a = m[i];
++        j = (unsigned char) ( j + a + key[k] );
++        m[i] = m[j]; m[j] = a;
++        if( ++k >= length ) k = 0;
++    }
++}
++
++void rc4_crypt( struct rc4_state *s, unsigned char *data, int length )
++{ 
++    int i, x, y, *m, a, b;
++
++    x = s->x;
++    y = s->y;
++    m = s->m;
++
++    for( i = 0; i < length; i++ )
++    {
++        x = (unsigned char) ( x + 1 ); a = m[x];
++        y = (unsigned char) ( y + a );
++        m[x] = b = m[y];
++        m[y] = a;
++        data[i] ^= m[(unsigned char) ( a + b )];
++    }
++
++    s->x = x;
++    s->y = y;
++}
++
++void rc4_crypt_sw(unsigned char *data, int ulMsgLength, unsigned char *rc4_key, unsigned long ulKeyLength )
++{
++    struct rc4_state s;
++    
++    rc4_setup( &s, rc4_key, ulKeyLength );
++                                    
++    rc4_crypt( &s, data, ulMsgLength );    
++}
+diff --git a/board/aspeed/ast2400/regtest.c b/board/aspeed/ast2400/regtest.c
+new file mode 100755
+index 0000000..1cd75ae
+--- /dev/null
++++ b/board/aspeed/ast2400/regtest.c
+@@ -0,0 +1,91 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++/*
++ * Diagnostics support
++ */
++#include <common.h>
++#include <command.h>
++#include <post.h>
++#include "slt.h"
++
++#if ((CFG_CMD_SLT & CFG_CMD_REGTEST) && defined(CONFIG_SLT))
++#include "regtest.h"
++
++int do_regtest (void)
++{
++	_SOCRegTestInfo	*pjSOCRegInfo;
++	_SOCRegTestTbl *pjRegTable;
++	unsigned long ulRegBase;
++        unsigned long ulIndex, ulBack, ulAND, ulMask, ulData, ulTemp;
++        unsigned long Flags = 0;
++	
++	/* unlock reg */
++        *(unsigned long *) (0x1e600000) = 0xaeed1a03;	/* AHBC */
++        *(unsigned long *) (0x1e6e0000) = 0xfc600309;	/* MMC */
++        *(unsigned long *) (0x1e6e2000) = 0x1688a8a8;	/* SCU */
++
++        /* SCU */
++
++        /* do test */	
++        pjSOCRegInfo = SOCRegTestInfo;
++        while (strcmp(pjSOCRegInfo->jName, "END"))
++        {
++            /* Reg. Test Start */
++            ulRegBase = pjSOCRegInfo->ulRegOffset;
++            pjRegTable = pjSOCRegInfo->pjTblIndex;
++            
++            while (pjRegTable->ulIndex != 0xFFFFFFFF)
++            {
++                ulIndex = ulRegBase + pjRegTable->ulIndex;	
++
++                ulBack = *(unsigned long *) (ulIndex);
++
++                ulMask  = pjRegTable->ulMask;
++                ulAND  = ~pjRegTable->ulMask;
++       	        	    	
++                ulData  = 0xFFFFFFFF & pjRegTable->ulMask;
++                *(unsigned long *) (ulIndex) = ulData;                
++                ulTemp = *(volatile unsigned long *) (ulIndex) & pjRegTable->ulMask;
++                if (ulData != ulTemp)
++                {
++                    Flags |= pjSOCRegInfo->ulFlags;
++                    printf("[DBG] RegTest: Failed Index:%x, Data:%x, Temp:%x \n", ulIndex, ulData, ulTemp);
++                }
++                
++                ulData  = 0x00000000 & pjRegTable->ulMask;
++                *(unsigned long *) (ulIndex) = ulData;                
++                ulTemp = *(volatile unsigned long *) (ulIndex) & pjRegTable->ulMask;
++                if (ulData != ulTemp)
++                {
++                    Flags |= pjSOCRegInfo->ulFlags;
++                    printf("[DBG] RegTest: Failed Index:%x, Data:%x, Temp:%x \n", ulIndex, ulData, ulTemp);
++                }
++                             
++                *(unsigned long *) (ulIndex) = ulBack;
++       
++                pjRegTable++;
++          	
++           } /* Individual Reg. Test */
++
++           if (Flags & pjSOCRegInfo->ulFlags)
++               printf("[INFO] RegTest: %s Failed \n", pjSOCRegInfo->jName);
++           
++           pjSOCRegInfo++;
++           
++        } /* Reg. Test */
++
++	return Flags;
++	
++}
++
++#endif /* CONFIG_SLT */
+diff --git a/board/aspeed/ast2400/regtest.h b/board/aspeed/ast2400/regtest.h
+new file mode 100755
+index 0000000..49a360e
+--- /dev/null
++++ b/board/aspeed/ast2400/regtest.h
+@@ -0,0 +1,255 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++typedef struct {
++    unsigned long ulIndex;
++    unsigned long ulMask;
++} _SOCRegTestTbl;
++
++typedef struct {
++    unsigned char jName[10];
++    unsigned long ulRegOffset;
++    _SOCRegTestTbl *pjTblIndex;
++    unsigned long ulFlags;
++} _SOCRegTestInfo;
++
++_SOCRegTestTbl SMCRegTestTbl[] = {
++    {0x00000000, 0x00001FF3},
++    {0x00000004, 0xFFFFFFFF},
++    {0x00000008, 0x0FFF17FF},
++    {0x0000000C, 0xFFFFFFFF},
++    {0x00000010, 0xFF5FFFF3},
++    {0x00000018, 0x0FFFFFFF},
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl AHBCRegTestTbl[] = {
++    {0x00000080, 0x0000FFFE},        	
++    {0x00000088, 0x01000000},
++    {0x0000008c, 0x00000031},	
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl MICRegTestTbl[] = {
++/*	
++    {0x00000000, 0x0FFFFFF8},
++    {0x00000004, 0x0FFFFFF8},
++    {0x00000008, 0x0000FFFF},
++    {0x0000000C, 0x0FFFF000},
++    {0x00000010, 0xFFFFFFFF},
++*/
++    {0xFFFFFFFF, 0xFFFFFFFF},
++};
++
++_SOCRegTestTbl MAC1RegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl MAC2RegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl USB2RegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl VICRegTestTbl[] = {
++    {0x0000000C, 0xFFFFFFFF},
++    {0x00000024, 0xFFFFFFFF},
++    {0x00000028, 0xFFFFFFFF},
++    {0x0000002C, 0xFFFFFFFF},
++    {0xFFFFFFFF, 0xFFFFFFFF},
++};
++
++_SOCRegTestTbl MMCRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl USB11RegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl SCURegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl HASERegTestTbl[] = {
++    {0x00000000, 0x0FFFFFF8},
++    {0x00000004, 0x0FFFFFF8},
++    {0x00000008, 0x0FFFFFF8},
++    {0x0000000C, 0x0FFFFFF8},
++    //{0x00000010, 0x00001FFF},
++    {0x00000020, 0x0FFFFFF8},
++    {0x00000024, 0x0FFFFFF8},
++    {0x00000028, 0x0FFFFFc0},
++    {0x0000002C, 0x0FFFFFFF},
++    //{0x00000030, 0x000003FF},
++    {0xFFFFFFFF, 0xFFFFFFFF},
++};
++
++_SOCRegTestTbl I2SRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl CRTRegTestTbl[] = {
++/*	
++    {0x00000000, 0x001F3703},
++    {0x00000004, 0x0000FFC1},
++*/    
++    {0x00000010, 0x0FFF0FFF},
++    {0x00000014, 0x0FFF0FFF},
++    {0x00000018, 0x07FF07FF},
++    {0x0000001C, 0x07FF07FF},
++    {0x00000020, 0x0FFFFFF8},
++    {0x00000024, 0x07FF3FF8},
++/*    
++    {0x00000028, 0x003F003F},
++    {0x00000030, 0x003F003F},
++    {0x00000034, 0x0FFF0FFF},
++    {0x00000038, 0x0FFFFFF8},
++*/    
++    {0x00000040, 0x0FFF0FFF},
++    {0x00000044, 0x07FF07FF},
++    {0x00000048, 0x0FFFFFF8},
++    {0x0000004C, 0x00FF07F8},
++    {0x00000050, 0x000F0F0F},
++/*    
++    {0x00000060, 0x001F3703},
++    {0x00000064, 0x0000FFC1},
++*/    
++    {0x00000070, 0x0FFF0FFF},
++    {0x00000074, 0x0FFF0FFF},
++    {0x00000078, 0x07FF07FF},
++    {0x0000007C, 0x07FF07FF},
++    {0x00000080, 0x0FFFFFF8},
++    {0x00000084, 0x07FF3FF8},
++/*    
++    {0x00000088, 0x003F003F},
++    {0x00000090, 0x003F003F},
++    {0x00000094, 0x0FFF0FFF},
++    {0x00000098, 0x0FFFFFF8},
++*/    
++    {0x000000A0, 0x0FFF0FFF},
++    {0x000000A4, 0x07FF07FF},
++    {0x000000A8, 0x0FFFFFF8},
++    {0x000000AC, 0x00FF07F8},
++    {0x000000B0, 0x000F0F0F},
++    {0xFFFFFFFF, 0xFFFFFFFF},
++};
++
++_SOCRegTestTbl VIDEORegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl A2PRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl MDMARegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl M2DRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl GPIORegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl RTCRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl TIMERRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl UART1RegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl UART2RegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl WDTRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl PWMRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl VUART1RegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl VUART2RegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl LPCRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl I2CRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl PECIRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl PCIARegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++_SOCRegTestTbl PCIRegTestTbl[] = {
++    {0xFFFFFFFF, 0xFFFFFFFF},        	
++};
++
++
++/* Test List */
++_SOCRegTestInfo SOCRegTestInfo[] = {
++    /* Test Name, Reg. Offset,      Test Table, Error Code  */
++    {   "SMCREG", 0x16000000,    SMCRegTestTbl, 0x00000001},
++    {  "AHBCREG", 0x1e600000,   AHBCRegTestTbl, 0x00000002},
++    {   "MICREG", 0x1e640000,    MICRegTestTbl, 0x00000004},
++    {  "MAC1REG", 0x1e660000,   MAC1RegTestTbl, 0x00000008},
++    {  "MAC2REG", 0x1e680000,   MAC2RegTestTbl, 0x00000010},
++    {  "USB2REG", 0x1e6a0000,   USB2RegTestTbl, 0x00000020},
++    {   "VICREG", 0x1e6c0000,    VICRegTestTbl, 0x00000040},
++    {   "MMCREG", 0x1e6e0000,    MMCRegTestTbl, 0x00000080},
++    { "USB11REG", 0x1e6e1000,  USB11RegTestTbl, 0x00000100},
++    {   "SCUREG", 0x1e6e2000,    SCURegTestTbl, 0x00000200},
++    {  "HASEREG", 0x1e6e3000,   HASERegTestTbl, 0x00000400},
++    {   "I2SREG", 0x1e6e5000,    I2SRegTestTbl, 0x00000800},
++    {   "CRTREG", 0x1e6e6000,    CRTRegTestTbl, 0x00001000},
++    { "VIDEOREG", 0x1e700000,  VIDEORegTestTbl, 0x00002000},
++    {   "A2PREG", 0x1e720000,    A2PRegTestTbl, 0x00004000},
++    {  "MDMAREG", 0x1e740000,   MDMARegTestTbl, 0x00008000},
++    {    "2DREG", 0x1e760000,    M2DRegTestTbl, 0x00010000},
++    {  "GPIOREG", 0x1e780000,   GPIORegTestTbl, 0x00020000},
++    {   "RTCREG", 0x1e781000,    RTCRegTestTbl, 0x00040000},
++    { "TIMERREG", 0x1e782000,  TIMERRegTestTbl, 0x00080000},
++    { "UART1REG", 0x1e783000,  UART1RegTestTbl, 0x00100000},
++    { "UART2REG", 0x1e784000,  UART2RegTestTbl, 0x00200000},
++    {   "WDTREG", 0x1e785000,    WDTRegTestTbl, 0x00400000},
++    {   "PWMREG", 0x1e786000,    PWMRegTestTbl, 0x00800000},
++    {"VUART1REG", 0x1e787000, VUART1RegTestTbl, 0x01000000},
++    {"VUART2REG", 0x1e788000, VUART2RegTestTbl, 0x02000000},
++    {   "LPCREG", 0x1e789000,    LPCRegTestTbl, 0x04000000},
++    {   "I2CREG", 0x1e78A000,    I2CRegTestTbl, 0x08000000},
++    {  "PECIREG", 0x1e78B000,   PECIRegTestTbl, 0x10000000},
++    {  "PCIAREG", 0x1e78C000,   PCIARegTestTbl, 0x20000000},
++    {   "PCIREG", 0x60000000,    PCIRegTestTbl, 0x40000000},        
++    {      "END", 0xffffffff,             NULL, 0xffffffff}
++};
+diff --git a/board/aspeed/ast2400/slt.c b/board/aspeed/ast2400/slt.c
+new file mode 100755
+index 0000000..3283d34
+--- /dev/null
++++ b/board/aspeed/ast2400/slt.c
+@@ -0,0 +1,105 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++/*
++ * Diagnostics support
++ */
++#include <common.h>
++#include <command.h>
++#include <post.h>
++#include "slt.h"
++
++#if defined (CONFIG_SLT)
++
++int do_slt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
++{
++    int flags = 0;
++    int loop  = 1;
++	
++    if (argc > 1) {
++        loop = simple_strtoul(argv[1], NULL, 10);
++    }
++	
++    do {
++
++do_slt_start:
++	/* Reg. Test */
++#if (CFG_CMD_SLT & CFG_CMD_REGTEST)
++	if (do_regtest())
++	{
++	    flags |= FLAG_REGTEST_FAIL;	
++            printf("[INFO] RegTest Failed \n");
++	}    
++	else
++            printf("[INFO] RegTest Passed \n");
++#endif
++#if (CFG_CMD_SLT & CFG_CMD_MACTEST)
++	if (do_mactest())
++	{
++	    flags |= FLAG_MACTEST_FAIL;	
++            printf("[INFO] MACTest Failed \n");
++	}    
++	else
++            printf("[INFO] MACTest Passed \n");
++#endif
++#if (CFG_CMD_SLT & CFG_CMD_VIDEOTEST)
++	if (do_videotest())
++	{
++	    flags |= FLAG_VIDEOTEST_FAIL;	
++            printf("[INFO] VideoTest Failed \n");
++	}    
++	else
++            printf("[INFO] VideoTest Passed \n");
++#endif
++#if (CFG_CMD_SLT & CFG_CMD_HACTEST)
++	if (do_hactest())
++	{
++	    flags |= FLAG_HACTEST_FAIL;	
++            printf("[INFO] HACTest Failed \n");
++	}    
++	else
++            printf("[INFO] HACTest Passed \n");
++#endif
++#if (CFG_CMD_SLT & CFG_CMD_MICTEST)
++	if (do_mictest())
++	{
++	    flags |= FLAG_MICTEST_FAIL;	
++            printf("[INFO] MICTest Failed \n");
++	}    
++	else
++            printf("[INFO] MICTest Passed \n");
++#endif
++	
++	/* Summary */
++	if (flags)
++            printf ("[INFO] SLT Test Failed!! \n");
++        else
++            printf ("[INFO] SLT Test Passed!! \n");    
++       
++        if (loop == 0)			/* infinite */
++            goto do_slt_start;
++        else
++            loop--;    
++            
++    } while (loop);
++
++    return 0;
++}
++/***************************************************/
++
++U_BOOT_CMD(
++	slt,	CONFIG_SYS_MAXARGS,	0,	do_slt,
++	"slt - slt test program \n",
++	NULL
++);
++
++#endif /* CONFIG_SLT */
+diff --git a/board/aspeed/ast2400/slt.h b/board/aspeed/ast2400/slt.h
+new file mode 100755
+index 0000000..4e650bc
+--- /dev/null
++++ b/board/aspeed/ast2400/slt.h
+@@ -0,0 +1,29 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#define CFG_CMD_REGTEST		0x00000001
++#define CFG_CMD_MACTEST		0x00000002
++#define CFG_CMD_VIDEOTEST	0x00000004
++#define CFG_CMD_HACTEST		0x00000008
++#define CFG_CMD_MICTEST		0x00000010
++#define CFG_CMD_OSDTEST		0x00000020
++#define CFG_CMD_2DTEST  	0x00000040
++#define CFG_CMD_HWCTEST  	0x00000080
++
++#define FLAG_REGTEST_FAIL  	0x00000001
++#define FLAG_MACTEST_FAIL  	0x00000002
++#define FLAG_VIDEOTEST_FAIL  	0x00000004
++#define FLAG_HACTEST_FAIL  	0x00000008
++#define FLAG_MICTEST_FAIL  	0x00000010
++#define FLAG_OSDTEST_FAIL  	0x00000020
++#define FLAG_2DTEST_FAIL  	0x00000040
++#define FLAG_HWCTEST_FAIL  	0x00000080
++
++
+diff --git a/board/aspeed/ast2400/type.h b/board/aspeed/ast2400/type.h
+new file mode 100755
+index 0000000..f57ee5a
+--- /dev/null
++++ b/board/aspeed/ast2400/type.h
+@@ -0,0 +1,116 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef _TYPE_H_
++#define _TYPE_H_
++
++	typedef unsigned char               BOOL;
++	typedef unsigned char               UINT8;
++	typedef unsigned short              UINT16;
++	typedef unsigned int                UINT32;
++
++	#define  FLONG                    unsigned long
++	#define  BYTE                     unsigned char
++	#define  INT                      int
++	#define  VOID                     void
++	#define  BOOLEAN                  unsigned short
++	#define  ULONG                    unsigned long
++	#define  USHORT                   unsigned short
++	#define  UCHAR                    unsigned char
++	#define  CHAR                     char
++	#define  LONG                     long
++	#define  PUCHAR                   UCHAR *
++	#define  PULONG                   ULONG *
++
++	#define  FAIL                     1
++
++	#define  intfunc      int386
++
++	#define  outdwport         outpd
++	#define  indwport          inpd
++	#define  outport           outp
++	#define  inport            inp
++
++	//#define     NULL    ((void *)0)
++	#define     FALSE   0
++	#define     TRUE    1
++
++	#define ReadMemoryBYTE(baseaddress,offset)        *(BYTE *)((ULONG)(baseaddress)+(ULONG)(offset))
++	#define ReadMemoryLong(baseaddress,offset)        *(ULONG *)((ULONG)(baseaddress)+(ULONG)(offset))
++	#define ReadMemoryShort(baseaddress,offset)       *(USHORT *)((ULONG)(baseaddress)+(ULONG)(offset))
++	#define WriteMemoryBYTE(baseaddress,offset,data)  *(BYTE *)((ULONG)(baseaddress)+(ULONG)(offset)) = (BYTE)(data)
++	#define WriteMemoryLong(baseaddress,offset,data)  *(ULONG *)((ULONG)(baseaddress)+(ULONG)(offset))=(ULONG)(data)
++	#define WriteMemoryShort(baseaddress,offset,data) *(USHORT *)((ULONG)(baseaddress)+(ULONG)(offset))=(USHORT)(data)
++	#define WriteMemoryLongWithANDData(baseaddress, offset, anddata, data)  *(ULONG *)((ULONG)(baseaddress)+(ULONG)(offset)) = *(ULONG *)((ULONG)(baseaddress)+(ULONG)(offset)) & (ULONG)(anddata) | (ULONG)(data)
++
++	#define WriteMemoryLongWithMASK(baseaddress, offset, data, mask) \
++	*(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset)) = *(volatile ULONG *)(((ULONG)(baseaddress)+(ULONG)(offset)) & (ULONG)(~(mask))) | ((ULONG)(data) & (ULONG)(mask))
++
++	#define ReadMemoryLongHost(baseaddress,offset)        *(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset))
++	#define WriteMemoryLongHost(baseaddress,offset,data)  *(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset))=(ULONG)(data)
++	#define WriteMemoryBYTEHost(baseaddress,offset,data)  *(volatile BYTE *)((ULONG)(baseaddress)+(ULONG)(offset)) = (BYTE)(data)    
++#define WriteMemoryLongWithMASKHost(baseaddress, offset, data, mask)  *(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset)) = (((*(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset)))&(~mask)) | (ULONG)((data)&(mask)))
++    
++	#define ReadMemoryLongClient(baseaddress,offset)        *(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset))
++	#define WriteMemoryLongClient(baseaddress,offset,data)  *(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset))=(ULONG)(data)
++	#define WriteMemoryBYTEClient(baseaddress,offset,data)  *(volatile BYTE *)((ULONG)(baseaddress)+(ULONG)(offset)) = (BYTE)(data)    
++#define WriteMemoryLongWithMASKClient(baseaddress, offset, data, mask)  *(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset)) = (((*(volatile ULONG *)((ULONG)(baseaddress)+(ULONG)(offset)))&(~mask)) | (ULONG)((data)&(mask)))
++
++#ifdef BUF_GLOBALS
++#define BUF_EXT
++#else
++#define BUF_EXT extern
++#endif
++
++BUF_EXT ULONG    g_CAPTURE_VIDEO1_BUF1_ADDR; /* VIDEO1_BUF_1_ADDR*/ 
++BUF_EXT ULONG    g_CAPTURE_VIDEO1_BUF2_ADDR; /* VIDEO1_BUF_2_ADDR*/
++BUF_EXT ULONG    g_VIDEO1_COMPRESS_BUF_ADDR; /* Encode destination address */
++BUF_EXT ULONG    g_VIDEO1_CRC_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEO1_FLAG_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEO1_RC4_BUF_ADDR;
++
++
++BUF_EXT ULONG    g_CAPTURE_VIDEO2_BUF1_ADDR; 
++BUF_EXT ULONG    g_CAPTURE_VIDEO2_BUF2_ADDR; 
++BUF_EXT ULONG    g_VIDEO2_COMPRESS_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEO2_CRC_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEO2_FLAG_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEO2_RC4_BUF_ADDR;
++
++BUF_EXT ULONG    g_VIDEO1_DECODE_BUF_1_ADDR;
++BUF_EXT ULONG    g_VIDEO1_DECODE_BUF_2_ADDR;
++BUF_EXT ULONG    g_VIDEO1_DECOMPRESS_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEO1_DECODE_RC4_BUF_ADDR;
++
++BUF_EXT ULONG    g_VIDEO2_DECODE_BUF_1_ADDR;
++BUF_EXT ULONG    g_VIDEO2_DECODE_BUF_2_ADDR;
++BUF_EXT ULONG    g_VIDEO2_DECOMPRESS_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEO2_DECODE_RC4_BUF_ADDR;
++
++BUF_EXT ULONG    g_CAPTURE_VIDEOM_BUF1_ADDR; 
++BUF_EXT ULONG    g_CAPTURE_VIDEOM_BUF2_ADDR; 
++BUF_EXT ULONG    g_VIDEOM_COMPRESS_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEOM_FLAG_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEOM_RC4_BUF_ADDR;
++
++BUF_EXT ULONG    g_VIDEOM_DECODE_BUF_1_ADDR;
++BUF_EXT ULONG    g_VIDEOM_DECODE_BUF_2_ADDR;
++BUF_EXT ULONG    g_VIDEOM_DECOMPRESS_BUF_ADDR;
++BUF_EXT ULONG    g_VIDEOM_DECODE_RC4_BUF_ADDR;
++
++#ifdef WIN_GLOBALS
++#define WIN_EXT
++#else
++#define WIN_EXT extern
++#endif
++
++WIN_EXT USHORT	g_DefWidth, g_DefHeight;
++   
++#endif
+diff --git a/board/aspeed/ast2400/u-boot.lds b/board/aspeed/ast2400/u-boot.lds
+new file mode 100755
+index 0000000..ff0fe22
+--- /dev/null
++++ b/board/aspeed/ast2400/u-boot.lds
+@@ -0,0 +1,56 @@
++/*
++ * (C) Copyright 2004
++ * Wolfgang Denk, DENX Software Engineering, <wg@denx.de>
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
++/*OUTPUT_FORMAT("elf32-arm", "elf32-arm", "elf32-arm")*/
++OUTPUT_ARCH(arm)
++ENTRY(_start)
++SECTIONS
++{
++	. = 0x00000000;
++
++	. = ALIGN(4);
++	.text	   :
++	{
++	  cpu/arm926ejs/start.o	(.text)
++	  *(.text)
++	}
++
++	. = ALIGN(4);
++	.rodata : { *(.rodata) }
++
++	. = ALIGN(4);
++	.data : { *(.data) }
++
++	. = ALIGN(4);
++	.got : { *(.got) }
++
++	__u_boot_cmd_start = .;
++	.u_boot_cmd : { *(.u_boot_cmd) }
++	__u_boot_cmd_end = .;
++
++	. = ALIGN(4);
++	__bss_start = .;
++	.bss : { *(.bss) }
++	_end = .;
++}
+diff --git a/board/aspeed/ast2400/vdef.h b/board/aspeed/ast2400/vdef.h
+new file mode 100755
+index 0000000..3c99b7e
+--- /dev/null
++++ b/board/aspeed/ast2400/vdef.h
+@@ -0,0 +1,500 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef _VDEF_H_
++#define _VDEF_H_
++
++#define     VIDEO1                              0
++#define     VIDEO1_ON                           0x01
++#define     VIDEO2                              1
++#define     VIDEO2_ON                           0x02
++
++#define		VIDEOM_ON							0x04
++#define     VIDEOM                              2
++
++#define		CRT_1								0
++#define		CRT_1_ON							0x01
++#define		CRT_2								1
++#define		CRT_2_ON							0x02
++
++#define		SINGLE_CODEC_SINGLE_CAPTURE			0
++#define     AUTO_CODEC_SINGLE_CAPTURE			2
++#define		AUTO_CODEC_AUTO_CAPTURE				3
++
++#define		MAC1_BASE							0x1E660000
++#define     APB_BRIDGE_1_BASE                   0x1E6E0000
++#define     VIDEO_REG_BASE                      0x1E700000
++#define     APB_BRIDGE_2_BASE                   0x1E780000
++
++#define		DRAM_INIT_BASE						0x1E6E0000
++
++#define		SDRAM_PROTECT_REG					0x00
++    #define     SDRAM_WRITE_DISABLE             0
++    #define     SDRAM_WRITE_ENABLE              1
++
++#define		SCU_BASE							0x1E6E0000
++#define		SCU_OFFSET							0x2000
++
++#define		VIC_BASE							0x1E6C0000
++	#define		VIDEO_INT_BIT				7
++
++#define		IRQ_STATUS_REG						0x00
++#define		RAW_INT_STATUS_REG					0x08
++#define		INT_SEL_REG							0x0C
++	#define		FIQ_INT							1
++	#define		IRQ_INT							0	
++#define		INT_EN_REG							0x10
++#define		INT_EN_CLEAR_REG					0x14
++#define		INT_SOFT_REG						0x18
++#define		INT_SOFT_CLEAR_REG					0x1C
++#define		INT_SENSE_REG						0x24
++	#define		LEVEL_SENSE						1
++	#define		EDGE_SENSE						0
++#define		INT_EVENT_REG						0x2C
++	#define		HIGH_LEVEL_SENSE				1
++	#define		LOW_LEVEL_SENSE					0
++
++#define		SCU_HW_TRAPPING_REG					0x70 + SCU_OFFSET
++	#define		CLIENT_MODE_EN_BIT				18
++	#define		CLIENT_MODE_EN_MASK				0x00040000
++		#define		BE_HOST_CHIP				0
++		#define		BE_CLIENT_CHIP				1
++
++#define     SCU_ULOCK_KEY                       0x1688A8A8
++    
++#define     SCU_PROTECT_REG                     0x00 + SCU_OFFSET
++    #define     SCU_WRITE_DISABLE               0
++    #define     SCU_WRITE_ENABLE                1
++
++#define     SCU_CONTROL_REG                     0x04 + SCU_OFFSET    
++	#define     VIDEO_ENGINE_RESET				0x00000040
++		#define     VIDEO_ENGINE_RESET_BIT      6
++		#define     VIDEO_ENGINE_RESET_MASK     0x00000040
++        #define     VIDEO_RESET_EN              1
++        #define     VIDEO_RESET_OFF             0
++
++#define     SCU_CLOCK_SELECTION_REG             0x08 + SCU_OFFSET
++	#define		PORTA_CLOCK_DELAY_MASK			7 << 8	//Video port A output clcok selection
++		#define	PORTA_CLOCK_INV_DELAY_1NS		5 << 8	//Clock inversed and delay ~ 2ns
++		#define	PORTA_CLOCK_INV_DELAY_2NS		6 << 8	//Clock inversed and delay ~ 3ns
++	#define		PORTB_CLOCK_DELAY_MASK			7 << 12	//Video port B output clock delay
++		#define	PORTB_CLOCK_INV_DELAY_1NS		5 << 12	//Clock inversed and delay ~ 3ns
++		#define	PORTB_CLOCK_INV_DELAY_2NS		6 << 12	//Clock inversed and delay ~ 3ns
++	#define		PORTB_CLOCK_SEL					1 << 15 //Video port B clock selection
++		#define	PORTB_FROM_D1CLK				0 << 15
++		#define PORTB_FROM_D2CLK				1 << 15
++	#define		ECLK_CLK_SEL_MASK				(3 << 2)
++		#define	ECLK_FROM_HPLL					(1 << 2)
++
++	#define     D2CLK_CLOCK_SELECTION			0x00020000
++		#define     D2CLK_CLOCK_SELECTION_BIT   17
++		#define     D2CLK_CLOCK_SELECTION_MASK  0x00060000
++		#define		NORMAL_CRT1					0
++        #define     V1CLK_VIDEO1				2
++        #define     V1CLK_VIDEO2				3
++
++#define     SCU_CLOCK_STOP_REG					0x0C + SCU_OFFSET    
++	#define		EN_ECLK							0 << 0	//Enable ECLK (For Video Engine)
++	#define		STOP_ECLK_BIT					0
++	#define		STOP_ECLK_MASK					1 << 0
++	#define		EN_V1CLK						0 << 3  //Enable V1CLK (For Video Capture #1)
++	#define		STOP_V1CLK_BIT					3
++	#define		STOP_V1CLK_MASK					1 << 3
++	#define		EN_D1CLK						0 << 10 //Enable D1CLK (For CRT1)
++	#define		STOP_D1CLK_BIT					10
++	#define		STOP_D1CLK_MASK					1 << 10
++	#define		EN_D2CLK						0 << 11 //Stop D2CLK (For CRT2)
++	#define		STOP_D2CLK						(1 << 11)
++	#define		STOP_D2CLK_BIT					11
++	#define		STOP_D2CLK_MASK					1 << 11
++	#define		EN_V2CLK						0 << 12 //Stop V2CLK (For Video Capture #2)
++	#define		STOP_V2CLK_BIT					12
++	#define		STOP_V2CLK_MASK					1 << 12
++	#define		STOP_HACE_BIT					13
++	#define		EN_HACE							(0 << 13)
++	#define		STOP_HACE_MASK					(1 << 13)
++	#define     EN_I2SCLK						0 << 18
++	#define     STOP_I2SCLK_MASK				1 << 18
++
++#define     SCU_PIN_CTRL1_REG					0x74 + SCU_OFFSET
++	#define		I2C_5_PIN_EN					1 << 12	//Enable I2C #5 PIN
++	#define		I2C_5_PIN_OFF					0 << 12	//Disable I2C #5 PIN
++	#define		I2C_5_PIN_MASK					1 << 12
++	#define		VGA_PIN_OFF						0 << 15 //Enable VGA pins
++	#define		VGA_PIN_MASK					1 << 15
++	#define		VIDEO_PORTA_EN					1 << 16 //Enable Video port A control pins
++	#define		VIDEO_PORTA_MASK				1 << 16
++	#define		VIDEO_PORTB_EN					1 << 17 //Enable Video port B control pins
++	#define		VIDEO_PORTB_MASK				1 << 17
++	#define		VIDEO_VP1_EN					1 << 22 //Enable VP[11:0]
++	#define		VIDEO_VP1_MASK					1 << 22 
++	#define		VIDEO_VP2_EN					1 << 23 //Enable VP[23:12]
++	#define		VIDEO_VP2_MASK					1 << 23
++	#define		I2S_PIN_EN						1 << 29 //Enable I2S function pins
++	#define		I2S_PIN_MASK					1 << 29
++
++#define     SCU_PIN_CTRL2_REG					0x78 + SCU_OFFSET
++	#define		VIDEO_PORTA_SINGLE_EDGE_MASK	1 << 0
++		#define		VIDEO_PORTA_SINGLE_EDGE		1 << 0	//Enable Video port A single mode
++		#define		VIDEO_PORTA_DUAL_EDGE		0 << 0
++	#define		VIDEO_PORTB_SINGLE_EDGE_MASK	1 << 1
++		#define		VIDEO_PORTB_DUAL_EDGE		0 << 1
++		#define		VIDEO_PORTB_SINGLE_EDGE		1 << 1	//Enable Video port B single mode
++
++#define		SCU_M_PLL_PARAM_REG					0x20 + SCU_OFFSET
++
++#define		DRAM_BASE							0x40000000
++
++#define     INPUT_BITCOUNT_YUV444				4
++#define		INPUT_BITCOUNT_YUV420				2
++
++/* HW comment value */
++//PASSWORD
++#define     VIDEO_UNLOCK_KEY                    0x1A038AA8
++#define		SCU_UNLOCK_KEY						0x1688A8A8
++#define		SDRAM_UNLOCK_KEY					0xFC600309
++
++
++//#define     SAMPLE_RATE                                 12000000.0
++#ifdef OSC_NEW
++    #define     SAMPLE_RATE                                 24576000.0
++#else
++    #define     SAMPLE_RATE                                 24000000.0
++#endif
++
++#define     MODEDETECTION_VERTICAL_STABLE_MAXIMUM       0x4
++#define     MODEDETECTION_HORIZONTAL_STABLE_MAXIMUM     0x4
++#define     MODEDETECTION_VERTICAL_STABLE_THRESHOLD     0x4
++#define     MODEDETECTION_HORIZONTAL_STABLE_THRESHOLD   0x8
++
++#define     MODEDETECTION_EDGE_PIXEL_THRES_DIGITAL      2
++#define     MODEDETECTION_EDGE_PIXEL_THRES_ANALOGE      0x0A
++
++#define		MODEDETECTION_OK							0
++#define		MODEDETECTION_ERROR							1
++#define		JUDGE_MODE_ERROR							2
++
++//I2C Loop Count
++#define    LOOP_COUNT                                  1000
++#define    CAN_NOT_FIND_DEVICE                         1
++#define    SET_I2C_DONE                                0
++#define	   I2C_BASE									   0xA000
++#define    AC_TIMING                                   0x77743355
++
++//I2C channel and Devices
++#define     I2C_VIDEO1_EEPROM                           0x2
++#define     I2C_VIDEO2_EEPROM                           0x5
++#define     I2C_VIDEO2_9883                             0x4
++/*
++ULONG    CAPTURE1_ADDRESS =                     0x1000000;
++ULONG    CAPTURE2_ADDRESS =                     0x3000000;
++ULONG    PASS1_ENCODE_SOURCE_ADDRESS =          0x1000000;
++ULONG    PASS1_ENCODE_DESTINATION_ADDRESS =     0x2000000;
++ULONG    Buffer1_DECODE_SOURCE_ADDRESS =        0x1000000;
++ULONG    Buffer2_DECODE_SOURCE_ADDRESS =        0x1400000;
++ULONG    PASS1_DECODE_DESTINATION_ADDRESS =     0x600000;
++ULONG    CAPTURE_2ND_ADDRESS =                  0x1800000;
++ULONG    PASS1_2ND_ENCODE_SOURCE_ADDRESS =      0x1800000;
++ULONG    PASS1_2ND_ENCODE_DESTINATION_ADDRESS = 0x2800000;
++ULONG    PASS1_2ND_DECODE_SOURCE_ADDRESS =      0x1000000;
++ULONG    PASS1_2ND_DECODE_DESTINATION_ADDRESS = 0x600000;
++ULONG    PASS2_ENCODE_SOURCE_ADDRESS =          0x000000;
++ULONG    PASS2_ENCODE_DESTINATION_ADDRESS =     0xC00000;
++ULONG    PASS2_DECODE_SOURCE_ADDRESS =          0xC00000;
++ULONG    PASS2_DECODE_DESTINATION_ADDRESS =     0x600000;
++ULNG    PASS2_DECODE_REFERENCE_ADDRESS =       0x600000;
++*/
++
++typedef struct _CTL_REG_G {
++    ULONG   CompressMode:1;
++    ULONG   SkipEmptyFrame:1;
++    ULONG   MemBurstLen:2;
++    ULONG   LineBufEn:2;
++    ULONG   Unused:26;
++} CTL_REG_G;
++
++
++typedef union _U_CTL_G {
++    ULONG       Value;
++    CTL_REG_G   CtlReg;
++} U_CTL_G;
++
++typedef struct _MODE_DETECTION_PARAM_REG {
++    ULONG   Unused1:8;
++    ULONG   EdgePixelThres:8;
++    ULONG   VerStableMax:4;
++    ULONG   HorStableMax:4;
++    ULONG   VerDiffMax:4;
++    ULONG   HorDiffMax:4;
++} MODE_DETECTION_PARAM_REG;
++
++typedef struct _CRC_PRI_PARAM_REG {
++    ULONG   Enable:1;
++    ULONG   HighBitOnly:1;
++    ULONG   SkipCountMax:6;
++    ULONG   PolyLow:8;
++    ULONG   PolyHigh:16;
++} CRC_PRI_PARAM_REG;
++
++typedef union _U_CRC_PRI_PARAM {
++    ULONG               Value;
++    CRC_PRI_PARAM_REG   CRCPriParam;
++} U_CRC_PRI_PARAM;
++
++typedef struct _CRC_SEC_PARAM_REG {
++    ULONG   Unused1:8;
++    ULONG   PolyLow:8;
++    ULONG   PolyHigh:16;
++} CRC_SEC_PARAM_REG;
++
++typedef union _U_CRC_SEC_PARAM {
++    ULONG               Value;
++    CRC_SEC_PARAM_REG   CRCSecParam;
++} U_CRC_SEC_PARAM;
++
++typedef struct _GENERAL_INFO {
++    BYTE                EnableVideoM;
++    BYTE                CenterMode;
++	BYTE				RC4NoResetFrame;
++	BYTE				RC4TestMode;
++    U_CTL_G             uCtlReg;
++    U_CRC_PRI_PARAM     uCRCPriParam;
++    U_CRC_SEC_PARAM     uCRCSecParam;
++} GENERAL_INFO, *PGENERAL_INFO;
++
++typedef struct _SEQ_CTL_REG {
++    ULONG   Unused1:1;
++    ULONG   Unused2:1;
++    ULONG   Unused3:1;
++    ULONG   CaptureAutoMode:1;
++    ULONG   Unused4:1;
++    ULONG   CodecAutoMode:1;
++    ULONG   Unused5:1;
++    ULONG   WatchDog:1;
++    ULONG   CRTSel:1;
++    ULONG   AntiTearing:1;
++    ULONG   DataType:2;
++    ULONG   Unused6:20;
++} SEQ_CTL_REG;
++
++typedef union _U_SEQ_CTL {
++    ULONG               Value;
++    SEQ_CTL_REG   SeqCtlReg;
++} U_SEQ_CTL;
++
++typedef struct _CTL_REG {
++    ULONG   SrcHsync:1;
++    ULONG   SrcVsync:1;
++    ULONG   ExtSrc:1;
++    ULONG   AnalongExtSrc:1;
++    ULONG   IntTimingGen:1;
++    ULONG   IntDataFrom:1;
++    ULONG   WriteFmt:2;
++    ULONG   VGACursor:1;
++    ULONG   LinearMode:1;
++    ULONG   ClockDelay:2;
++    ULONG   CCIR656Src:1;
++    ULONG   PortClock:1;
++    ULONG   ExtPort:1;        
++    ULONG   Unused1:1;
++    ULONG   FrameRate:8;
++    ULONG   Unused2:8;
++} CTL_REG;
++
++typedef union _U_CTL {
++    ULONG       Value;
++    CTL_REG     CtlReg;
++} U_CTL_REG;
++
++typedef struct _TIMING_GEN_SETTING_H {
++    ULONG   HDEEnd:13;
++    ULONG   Unused1:3;
++    ULONG   HDEStart:13;
++    ULONG   Unused2:3;
++} TIMING_GEN_SETTING_H;
++
++typedef struct _TIMING_GEN_SETTING_V {
++    ULONG   VDEEnd:13;
++    ULONG   Unused1:3;
++    ULONG   VDEStart:13;
++    ULONG   Unused2:3;
++} TIMING_GEN_SETTING_V;
++
++typedef struct _BCD_CTL_REG {
++    ULONG   Enable:1;
++    ULONG   Unused1:15;
++    ULONG   Tolerance:8;
++    ULONG   Unused2:8;
++} BCD_CTL_REG;
++
++typedef union _U_BCD_CTL {
++    ULONG           Value;
++    BCD_CTL_REG     BCDCtlReg;
++} U_BCD_CTL;
++
++typedef struct _COMPRESS_WINDOW_REG {
++    ULONG   VerLine:13;
++    ULONG   Unused1:3;
++    ULONG   HorPixel:13;
++    ULONG   Unused2:3;
++} COMPRESS_WINDOW_REG;
++
++typedef struct _STREAM_BUF_SIZE {
++    ULONG   PacketSize:3;
++    ULONG   RingBufNum:2;
++    ULONG   Unused1:11;
++    ULONG   SkipHighMBThres:7;
++    ULONG   SkipTestMode:2;
++    ULONG   Unused2:7;
++} STREAM_BUF_SIZE;
++
++typedef union _U_STREAM_BUF {
++    ULONG               Value;
++    STREAM_BUF_SIZE     StreamBufSize;
++} U_STREAM_BUF;
++
++
++typedef struct _COMPRESS_CTL_REG {
++    ULONG   JPEGOnly:1; /* True: Jpeg Only mode(Disable VQ), False:Jpeg and VQ mix mode */
++    ULONG   En4VQ:1; /* True: 1, 2, 4 color mode, False: 1,2 color mode */
++    ULONG   CodecMode:1; /* High and best Quantization encoding/decoding setting*/
++    ULONG   DualQuality:1;
++    ULONG   EnBest:1;
++    ULONG   EnRC4:1;
++    ULONG   NorChromaDCTTable:5;
++    ULONG   NorLumaDCTTable:5;
++    ULONG   EnHigh:1;
++    ULONG   TestCtl:2;
++    ULONG   UVFmt:1;
++    ULONG   HufTable:2;
++    ULONG   AlterValue1:5;
++    ULONG   AlterValue2:5;
++} COMPRESS_CTL_REG;
++
++typedef union _U_COMPRESS_CTL {
++    ULONG               Value;
++    COMPRESS_CTL_REG    CompressCtlReg;
++} U_COMPRESS_CTL;
++
++typedef struct _QUANTI_TABLE_LOW_REG {
++    ULONG   ChromaTable:5;
++    ULONG   LumaTable:5;
++    ULONG   Unused1:22;
++} QUANTI_TABLE_LOW_REG;
++
++typedef union _U_CQUANTI_TABLE_LOW {
++    ULONG                   Value;
++    QUANTI_TABLE_LOW_REG    QTableLowReg;
++} U_QUANTI_TABLE_LOW;
++
++typedef struct _QUANTI_VALUE_REG {
++    ULONG   High:15;
++	ULONG	Unused1:1;
++    ULONG   Best:15;
++    ULONG   Unused2:1;
++} QUANTI_VALUE_REG;
++
++typedef union _U_QUANTI_VALUE {
++    ULONG               Value;
++    QUANTI_VALUE_REG    QValueReg;
++} U_QUANTI_VALUE;
++
++typedef struct _BSD_PARAM_REG {
++    ULONG   HighThres:8;
++    ULONG   LowThres:8;
++    ULONG   HighCount:6;
++    ULONG   Unused1:2;
++    ULONG   LowCount:6;
++    ULONG   Unused2:2;
++} BSD_PARAM_REG;
++
++typedef union _U_BSD_PARAM {
++    ULONG           Value;
++    BSD_PARAM_REG   BSDParamReg;
++} U_BSD_PARAM;
++
++typedef struct _VIDEO_INFO {
++    BYTE      ExtADCAct;    /* read from modection register */
++	BYTE	  EnableRC4;
++    BYTE      DownScalingMethod;
++    USHORT    AnalogDifferentialThreshold; /* BCD tolerance */
++    USHORT    DigitalDifferentialThreshold; /* BCD tolerance */
++    USHORT    DstWidth;
++    USHORT    DstHeight;
++    USHORT    SrcWidth;
++    USHORT    SrcHeight;
++    BYTE      HighLumaTable; /* if High and best Jpeg codec enable, use HighLumaTable and HighChromaTable, otherwise HighDeQuantiValue and BestDequantiValue*/
++    BYTE      HighChromaTable;
++    BYTE      HighDeQuantiValue;
++    BYTE      BestDequantiValue;
++    U_SEQ_CTL               uSeqCtlReg;
++    U_CTL_REG               uCtlReg;
++    U_BCD_CTL               uBCDCtlReg;
++    U_STREAM_BUF            uStreamBufSize;
++    U_COMPRESS_CTL          uCompressCtlReg;
++    U_QUANTI_TABLE_LOW      uQTableLowReg;
++    U_QUANTI_VALUE          uQValueReg;
++    U_BSD_PARAM             uBSDParamReg;
++} VIDEO_INFO, *PVIDEO_INFO ;
++
++typedef struct _VIDEOM_SEQ_CTL_REG {
++    ULONG   Unused1:1;  //Bit 0
++    ULONG   Unused2:1;	//Bit 1
++    ULONG   Unused3:1;		//Bit 2
++    ULONG   StreamMode:1;	//Bit 3
++    ULONG   Unused4:1;	//Bit 4
++    ULONG   CodecAutoMode:1;	//Bit 5
++	ULONG	Unused6:1;	//Bit 6
++    ULONG   Unused7:1;	//Bit 7
++    ULONG   SrcSel:1;	//Bit 8
++    ULONG   Unused9:1;	//Bit 9
++    ULONG   DataType:2;  //Bit[11:10]
++    ULONG   Unused12:20;
++} VIDEOM_SEQ_CTL_REG;
++
++typedef union _U_VIDEOM_SEQ_CTL {
++    ULONG					Value;
++    VIDEOM_SEQ_CTL_REG		SeqCtlReg;
++} U_VIDEOM_SEQ_CTL;
++
++typedef struct _VIDEOM_INFO {
++    BYTE      DownScalingMethod;
++    USHORT    AnalogDifferentialThreshold; /* BCD tolerance */
++    USHORT    DigitalDifferentialThreshold; /* BCD tolerance */
++    USHORT    DstWidth;
++    USHORT    DstHeight;
++    USHORT    SrcWidth;
++    USHORT    SrcHeight;
++    BYTE      HighLumaTable; /* if High and best Jpeg codec enable, use HighLumaTable and HighChromaTable, otherwise HighDeQuantiValue and BestDequantiValue*/
++    BYTE      HighChromaTable;
++    BYTE      HighDeQuantiValue;
++    BYTE      BestDequantiValue;
++    BYTE      PacketSize;   //the same as video1 & video2
++    BYTE      RingBufNum;
++	BYTE	  EnableRC4;
++    U_VIDEOM_SEQ_CTL        uSeqCtlReg;
++    U_BCD_CTL               uBCDCtlReg;
++    U_COMPRESS_CTL          uCompressCtlReg;
++    U_QUANTI_TABLE_LOW      uQTableLowReg;
++    U_QUANTI_VALUE          uQValueReg;
++    U_BSD_PARAM             uBSDParamReg;
++} VIDEOM_INFO, *PVIDEOM_INFO ;
++
++typedef struct _VIDEO_MODE_INFO
++{
++    USHORT    X;
++    USHORT    Y;
++    USHORT    ColorDepth;
++    USHORT    RefreshRate;
++    BYTE      ModeIndex;
++} VIDEO_MODE_INFO, *PVIDEO_MODE_INFO;
++
++#endif
++
+diff --git a/board/aspeed/ast2400/vesa.h b/board/aspeed/ast2400/vesa.h
+new file mode 100755
+index 0000000..69aba90
+--- /dev/null
++++ b/board/aspeed/ast2400/vesa.h
+@@ -0,0 +1,163 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef _VESA_H_
++#define _VESA_H_
++
++typedef enum 
++{
++	VCLK25_175	= 0x00,
++	VCLK28_322	= 0x01,
++	VCLK31_5	= 0x02,
++	VCLK31_574	= 0x03,
++	VCLK32_76	= 0x04,
++	VCLK33_154	= 0x05,
++	VCLK36		= 0x06,
++	VCLK40		= 0x07,
++	VCLK45_978	= 0x08,
++	VCLK49_5	= 0x09,
++	VCLK50		= 0x0A,
++	VCLK52_95	= 0x0B,
++	VCLK56_25	= 0x0C,
++	VCLK65		= 0x0D,
++	VCLK74_48	= 0x0E,
++	VCLK75		= 0x0F,
++	VCLK78_75	= 0x10,
++	VCLK79_373	= 0x11,
++	VCLK81_624	= 0x12,
++	VCLK83_462	= 0x13,
++	VCLK84_715	= 0x14,
++	VCLK94_5	= 0x15,
++	VCLK106_5	= 0x16,
++	VCLK108		= 0x17,
++	VCLK119		= 0x18,
++	VCLK135		= 0x19,
++	VCLK136_358 = 0x1A,
++	VCLK146_25	= 0x1B,
++	VCLK154		= 0x1C,
++	VCLK157_5	= 0x1D,
++	VCLK162		= 0x1E
++} ePIXEL_CLOCK;
++
++typedef struct {
++    USHORT    HorizontalTotal;
++    USHORT    VerticalTotal;
++    USHORT    HorizontalActive;
++    USHORT    VerticalActive;
++    BYTE      RefreshRate;
++    double    HorizontalFrequency;
++    USHORT    HSyncTime;
++    USHORT    HBackPorch;
++    USHORT    VSyncTime;
++    USHORT    VBackPorch;
++    USHORT    HLeftBorder;
++    USHORT    HRightBorder;
++    USHORT    VBottomBorder;
++    USHORT	  VTopBorder;
++	USHORT	  PixelClock;
++	BOOL	  HorPolarity;
++	BOOL	  VerPolarity;
++    BYTE      ADCIndex1;
++    BYTE      ADCIndex2;
++    BYTE      ADCIndex3;
++    BYTE      ADCIndex5;
++    BYTE      ADCIndex6;
++    BYTE      ADCIndex7;
++    BYTE      ADCIndex8;
++    BYTE      ADCIndex9;
++    BYTE      ADCIndexA;
++    BYTE      ADCIndexF;
++    BYTE      ADCIndex15;
++    int       HorizontalShift;
++    int       VerticalShift;
++} VESA_MODE;
++
++#define HOR_POSITIVE 0
++#define HOR_NEGATIVE 1
++#define VER_POSITIVE 0
++#define VER_NEGATIVE 1
++
++#ifdef VESA_GLOBALS
++
++//  Note: Modified for modes which have border issue
++VESA_MODE vModeTable[] = {
++////////////////////////// 60Hz mode
++// 720x480 done
++  {1056, 497,  720,  480,  60, 29.900, 88,  104, 3, 13, 0, 0, 0, 0,	VCLK31_574,  HOR_NEGATIVE, VER_NEGATIVE, 0x41,	0xF0, 0x48, 0x05, 0x20, 0x58, 0x60, 0x60, 0x60,	0x5E, 0xFE,  6,	2},
++// 848x480 done                                                                               
++  {1064, 517,  848,  480,  60, 31.160, 88,  91,  3, 26, 0, 0, 0, 0,	VCLK33_154,  HOR_NEGATIVE, VER_NEGATIVE, 0x42,	0x70, 0x48, 0x05, 0x20, 0x58, 0x60, 0x60, 0x60,	0x5E, 0xFE,  6,	2},
++  {800,  525,  640,  480,  60, 31.469, 96,  40,  2, 25, 1, 1, 8, 8,	VCLK25_175,  HOR_NEGATIVE, VER_NEGATIVE, 0x31,	0xF0, 0x48, 0x05, 0x20, 0x60, 0x60, 0x60, 0x60,	0x5E, 0xFE,  6,	2},
++// 720x576                                                                                    
++  {912,  597,  720,  576,  60, 35.920, 72,  88,  3, 17, 0, 0, 0, 0,	VCLK32_76,   HOR_NEGATIVE, VER_NEGATIVE, 0x38,	0xF0, 0x48, 0x05, 0x20, 0x48, 0x60, 0x60, 0x60,	0x5E, 0xFE,  6,	2},
++// 960x600 GTF done                                                                           
++  {1232, 622,  960,  600,  60, 37.320, 96,  136, 3, 18, 0, 0, 0, 0,	VCLK45_978,  HOR_NEGATIVE, VER_NEGATIVE, 0x4C,	0xF0, 0x60, 0x05, 0x20, 0x60, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1056, 628,  800,  600,  60, 37.879, 128, 88,  4, 23, 0, 0, 0, 0,	VCLK40,	     HOR_POSITIVE, VER_POSITIVE, 0x41,	0xF0, 0x60, 0x05, 0x20, 0x80, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++// 1088x612 GTF done                                                                          
++  {1392, 634,  1088, 612,  60, 38.04,  112, 152, 3, 18, 0, 0, 0, 0,	VCLK52_95,   HOR_NEGATIVE, VER_NEGATIVE, 0x56,	0xF0, 0x60, 0x05, 0x20, 0x70, 0x60, 0x60, 0x60, 0x5E, 0xFE, -1, 0},
++// 1280x720 GTF done                                                                          
++  {1664, 746,  1280, 720,  60, 44.760, 136, 192, 3, 22, 0, 0, 0, 0,	VCLK74_48,   HOR_NEGATIVE, VER_NEGATIVE, 0x67,	0xF0, 0xA8, 0x05, 0x20, 0x88, 0x60, 0x60, 0x60, 0x5E, 0xFE, -1, 0},
++// 1360x768 GTF done                                                                          
++  {1776, 795,  1360, 768,  60, 47.700, 144, 208, 3, 23, 0, 0, 0, 0,	VCLK84_715,  HOR_NEGATIVE, VER_NEGATIVE, 0x6E,	0xF0, 0xA8, 0x05, 0x20, 0x90, 0x60, 0x60, 0x60, 0x5E, 0xFE,  7, 1},
++// 1280x768 done                                                                              
++  {1664, 798,  1280, 768,  60, 47.700, 128, 184, 7, 20, 0, 0, 0, 0,	VCLK79_373,  HOR_NEGATIVE, VER_NEGATIVE, 0x67,	0xF0, 0xA8, 0x05, 0x20, 0x80, 0x60, 0x60, 0x60, 0x5E, 0xFE,  7, 1},
++  {1344, 806,  1024, 768,  60, 48.363, 136, 160, 6, 29, 0, 0, 0, 0,	VCLK65,	     HOR_NEGATIVE, VER_NEGATIVE, 0x53,	0xF0, 0xA8, 0x05, 0x20, 0x88, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	7},
++// 1280x800 GTF done                                                                          
++  {1680, 828,  1280, 800,  60, 49.680, 136, 200, 3, 24, 0, 0, 0, 0,	VCLK83_462,  HOR_NEGATIVE, VER_NEGATIVE, 0x68,	0xF0, 0xA8, 0x05, 0x20, 0x88, 0x60, 0x60, 0x60, 0x5E, 0xFE, -1, 0},
++// 1152x864 GTF done                                                                          
++  {1520, 895,  1152, 864,  60, 53.700, 120, 184, 3, 27, 0, 0, 0, 0,	VCLK81_624,  HOR_NEGATIVE, VER_NEGATIVE, 0x5E,	0xF0, 0xA8, 0x05, 0x20, 0x78, 0x60, 0x60, 0x60, 0x5E, 0xFE, -1, 0},
++// 1600x900 GTF done                                                                          
++  {2128, 932,  1600, 900,  60, 55.920, 168, 264, 3, 28, 0, 0, 0, 0,	VCLK119,	 HOR_NEGATIVE, VER_NEGATIVE, 0x84,	0xF0, 0xA8, 0x05, 0x20, 0xA8, 0x60, 0x60, 0x60, 0x5E, 0xFE, -1, 0},
++// 1440X900 CVT done                                                                          
++  {1904, 933,  1440, 900,  60, 55.935, 152, 232, 6,	25,	0, 0, 0, 0,	VCLK106_5,   HOR_NEGATIVE, VER_POSITIVE, 0x76,	0xF0, 0xA8, 0x05, 0x20, 0x96, 0x60, 0x60, 0x60, 0x5E, 0xFE, -1, 0},
++  {1800, 1000, 1280, 960,  60, 60.000, 112, 312, 3, 36, 0, 0, 0, 0,	VCLK108,	 HOR_POSITIVE, VER_POSITIVE, 0x70,	0x70, 0xA8, 0x05, 0x20, 0x70, 0x60, 0x60, 0x60, 0x5E, 0xFE, -1, 0},
++// 1600x1024 GTF done                                                                            
++  {2144, 1060, 1600, 1024, 60, 63.600, 168, 272, 3, 32, 0, 0, 0, 0,	VCLK136_358, HOR_NEGATIVE, VER_NEGATIVE, 0x85,	0xF0, 0xE8, 0x05, 0x20, 0xA8, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1688, 1066, 1280, 1024, 60, 63.981, 112, 248, 3, 38, 0, 0, 0, 0,	VCLK108,	 HOR_POSITIVE, VER_POSITIVE, 0x69,	0x70, 0xA8, 0x05, 0x20, 0x70, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++// 1680X1050 CVT done Reduced Blanking                                                          
++  {1840, 1080, 1680, 1050, 60, 64.674, 32,  80,	 6,	21,	0, 0, 0, 0,	VCLK119,	 HOR_POSITIVE, VER_NEGATIVE, 0x72,	0xF0, 0xA8, 0x05, 0x20, 0x20, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++// 1920X1200 CVT done Reduced Blanking                           
++  {2080, 1235, 1920, 1200, 60, 74.038, 32,  80,  6, 26, 0, 0, 0, 0, VCLK154,     HOR_POSITIVE, VER_NEGATIVE, 0x81,	0xF0, 0xA8, 0x05, 0x20, 0x20, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  //{2160,           1250,           1600,           1200, 60,75.000,           192,        304,         3,          46,          0,            0,             0,              0,			VCLK162,		HOR_POSITIVE,	VER_POSITIVE},
++  {2160, 1248, 1600, 1200, 60, 75.000, 192, 304, 3, 46, 0, 0, 0, 0,	VCLK162,	 HOR_POSITIVE, VER_POSITIVE, 0x86,	0xF0, 0xE8, 0x05, 0x20, 0xC0, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++                                                              
++//////////////////////  Not 60Hz mode                                                                                                                  
++  {900,  449,  720,  400,  70, 31.469, 108, 45,  2, 25, 1, 1, 8, 8,	0,			 HOR_NEGATIVE, VER_NEGATIVE, 0x38,	0x30, 0x48, 0x05, 0x20, 0x6C, 0x60, 0x60, 0x60,	0x5E, 0xFE,  6,	1},
++  {832,  520,  640,  480,  72, 37.861, 40,  120, 3, 20, 1, 1, 8, 8,	0,			 HOR_NEGATIVE, VER_NEGATIVE, 0x33,	0xF0, 0x48, 0x05, 0x20, 0x28, 0x60, 0x60, 0x60,	0x5E, 0xFE,  6,	3},
++  {840,  500,  640,  480,  75, 37.500, 64,  120, 3, 16, 0, 0, 0, 0,	0,			 HOR_NEGATIVE, VER_NEGATIVE, 0x34,	0x70, 0x48, 0x05, 0x20, 0x40, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	3},                                         
++  {832,  509,  640,  480,  85, 43.269, 56,  80,  3, 25, 0, 0, 0, 0,	0,			 HOR_NEGATIVE, VER_NEGATIVE, 0x33,	0xF0, 0x48, 0x05, 0x20, 0x38, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	3},
++  {1024, 625,  800,  600,  56, 35.156, 72,  128, 2, 22, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x3F,	0xF0, 0x60, 0x05, 0x20, 0x48, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1040, 666,  800,  600,  72, 48.077, 120, 64,  6, 23, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x40,	0xF0, 0x60, 0x05, 0x20, 0x78, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1056, 625,  800,  600,  75, 46.875, 80,  160, 3, 21, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x41,	0xF0, 0x60, 0x05, 0x20, 0x50, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1048, 631,  800,  600,  85, 53.674, 64,  152, 3, 27, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x41,	0x70, 0x60, 0x05, 0x20, 0x40, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1328, 806,  1024, 768,  70, 56.476, 136, 144, 6, 29, 0, 0, 0, 0,	0,			 HOR_NEGATIVE, VER_NEGATIVE, 0x52,	0xF0, 0xA8, 0x05, 0x20, 0x88, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	7},
++  {1312, 800,  1024, 768,  75, 60.023, 96,  176, 3, 28, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x51,	0xF0, 0xA8, 0x05, 0x20, 0x60, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	1},
++  {1376, 808,  1024, 768,  85, 68.677, 96,  208, 3, 36, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x55,	0xF0, 0xA8, 0x05, 0x20, 0x60, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	1},
++  {1600, 900,  1152, 864,  75, 67.500, 128, 256, 3, 32, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x63,	0xF0, 0xA8, 0x05, 0x20, 0x80, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1728, 1011, 1280, 960,  85, 85.938, 160, 224, 3, 47, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x6B,	0xF0, 0xA8, 0x05, 0x20, 0xA0, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1688, 1066, 1280, 1024, 75, 79.976, 144, 248, 3, 38, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x69,	0x70, 0xE8, 0x05, 0x20, 0x90, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {1728, 1072, 1280, 1024, 85, 91.146, 160, 224, 3, 44, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x6B,	0xF0, 0xA8, 0x05, 0x20, 0xA0, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {2160, 1250, 1600, 1200, 65, 81.250, 192, 304, 3, 46, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x86,	0xF0, 0xA8, 0x05, 0x20, 0xC0, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {2160, 1250, 1600, 1200, 70, 87.500, 192, 304, 3, 46, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x86,	0xF0, 0xA8, 0x05, 0x20, 0xC0, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {2160, 1250, 1600, 1200, 75, 93.750, 192, 304, 3, 46, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x86,	0xF0, 0xA8, 0x05, 0x20, 0xC0, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0},
++  {2160, 1250, 1600, 1200, 85, 106.250,192, 304, 3, 46, 0, 0, 0, 0,	0,			 HOR_POSITIVE, VER_POSITIVE, 0x86,	0xF0, 0xA8, 0x05, 0x20, 0xC0, 0x60, 0x60, 0x60,	0x5E, 0xFE, -1,	0}
++};
++
++USHORT  ModeNumberCount = sizeof (vModeTable) / sizeof (VESA_MODE);
++USHORT  Mode60HZCount = 21;
++
++#else  /* NOT VESA_GLOBALS */
++extern VESA_MODE vModeTable[];
++extern USHORT  ModeNumberCount;
++extern USHORT  Mode60HZCount;
++#endif
++
++#endif /* _VESA_H_ */
++
++
+diff --git a/board/aspeed/ast2400/vfun.c b/board/aspeed/ast2400/vfun.c
+new file mode 100755
+index 0000000..f707e80
+--- /dev/null
++++ b/board/aspeed/ast2400/vfun.c
+@@ -0,0 +1,545 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#define BUF_GLOBALS
++#include "type.h"
++#include "vdef.h"
++#include "vreg.h"
++#include "crt.h"
++#include "vfun.h"
++
++ULONG UnlockSCURegHost(ULONG   MMIOBase, ULONG Key)
++{
++    WriteMemoryLongHost(SCU_BASE, SCU_PROTECT_REG, Key);
++    return ReadMemoryLongHost(SCU_BASE,SCU_PROTECT_REG);
++}
++
++void ResetVideoHost(void)
++{
++	WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CONTROL_REG, VIDEO_RESET_EN << VIDEO_ENGINE_RESET_BIT, VIDEO_ENGINE_RESET_MASK);
++	WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CONTROL_REG, VIDEO_RESET_OFF << VIDEO_ENGINE_RESET_BIT, VIDEO_ENGINE_RESET_MASK);
++}
++
++void StartModeDetectionTriggerHost(ULONG   MMIOBase, ULONG offset)
++{
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, offset, 0, MODE_DETECTION_TRIGGER);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, offset, MODE_DETECTION_TRIGGER, MODE_DETECTION_TRIGGER);
++}
++
++BOOL ReadVideoInterruptHost(ULONG   MMIOBase, ULONG value)
++{
++    return ((ReadMemoryLongHost(VIDEO_REG_BASE, VIDEO_INT_CONTROL_READ_REG) & value) ? TRUE : FALSE);
++}
++
++ULONG UnlockVideoRegHost(ULONG   MMIOBase, ULONG Key)
++{
++    WriteMemoryLongHost(VIDEO_REG_BASE, KEY_CONTROL_REG, Key);
++    return ReadMemoryLongHost(VIDEO_REG_BASE,KEY_CONTROL_REG);
++}
++
++void StartVideoCaptureTriggerHost(ULONG   MMIOBase, ULONG offset)
++{
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, offset, 0, VIDEO_CAPTURE_TRIGGER);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, offset, VIDEO_CAPTURE_TRIGGER, VIDEO_CAPTURE_TRIGGER);
++}
++
++void StartVideoCodecTriggerHost(ULONG   MMIOBase, ULONG offset)
++{
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, offset, 0, VIDEO_CODEC_TRIGGER);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, offset, VIDEO_CODEC_TRIGGER, VIDEO_CODEC_TRIGGER);
++}
++
++void StopModeDetectionTriggerHost(ULONG   MMIOBase, ULONG offset)
++{
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, offset, 0, MODE_DETECTION_TRIGGER);
++}
++
++void ClearVideoInterruptHost(ULONG   MMIOBase, ULONG value)
++{
++    //WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO_INT_CONTROL_CLEAR_REG, value, value);
++	WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO_INT_CONTROL_CLEAR_REG, value);
++}
++
++/* UnLock SCU Host and Reset Engine */
++BOOL CheckOnStartHost(void)
++{
++    int i=0, dwValue=0;
++    
++    do
++    {
++	dwValue = UnlockSCURegHost(0, SCU_UNLOCK_KEY);
++	i++;
++    }
++    while ((SCU_WRITE_ENABLE != dwValue) && (i<10));
++
++    //Clear SCU Reset Register
++    WriteMemoryLongHost(SCU_BASE, SCU_CONTROL_REG, 0);
++
++    WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_STOP_REG, (EN_ECLK | EN_V1CLK | EN_V2CLK), (STOP_ECLK_MASK | STOP_V1CLK_MASK | STOP_V2CLK_MASK));
++
++#if	defined(CONFIG_AST2300)
++    WriteMemoryLongWithMASKHost(SCU_BASE, (0x90 + SCU_OFFSET), 0x00000020, 0x00000030);	//enable 24bits
++    WriteMemoryLongWithMASKHost(SCU_BASE, (0x88 + SCU_OFFSET), 0x000fff00, 0x000fff00);	//enable video multi-pins    
++#else	//AST2100 
++    //WriteMemoryLongWithMASKHost(SCU_BASE, SCU_PIN_CTRL1_REG, (VIDEO_PORTA_EN | VIDEO_PORTB_EN | VIDEO_VP1_EN | VIDEO_VP2_EN) , 
++    //							(VIDEO_PORTA_MASK | VIDEO_PORTB_MASK | VIDEO_VP1_MASK | VIDEO_VP2_MASK));
++    WriteMemoryLongWithMASKHost(SCU_BASE, SCU_PIN_CTRL2_REG, (VIDEO_PORTA_SINGLE_EDGE | VIDEO_PORTB_SINGLE_EDGE) , 
++	      						     (VIDEO_PORTA_SINGLE_EDGE_MASK | VIDEO_PORTB_SINGLE_EDGE_MASK));
++#endif	      						     
++
++    ResetVideoHost();
++
++    return TRUE;
++}
++
++BOOL CheckOnStartClient(void)
++{
++	int i=0, dwValue=0;
++    
++	do
++	{
++		dwValue = UnlockSCURegHost(0, SCU_UNLOCK_KEY);
++		i++;
++	}
++	while ((SCU_WRITE_ENABLE != dwValue) && (i<10));
++
++	//Clear SCU Reset Register
++	WriteMemoryLongClient(SCU_BASE, SCU_CONTROL_REG, 0);
++
++	WriteMemoryLongWithMASKClient(SCU_BASE, SCU_CLOCK_STOP_REG, (EN_ECLK | EN_V1CLK | EN_D1CLK | EN_D2CLK | EN_V2CLK), 
++								  (STOP_ECLK_MASK | STOP_D1CLK_MASK | STOP_D2CLK_MASK | STOP_V1CLK_MASK | STOP_V2CLK_MASK));
++
++	//WriteMemoryLongWithMASKClient(SCU_BASE, SCU_CLOCK_SELECTION_REG, PORTB_FROM_D2CLK | PORTB_CLOCK_INV_DELAY_3NS | PORTA_CLOCK_INV_DELAY_3NS, PORTB_CLOCK_SEL | PORTB_CLOCK_DELAY_MASK | PORTA_CLOCK_DELAY_MASK);
++	//A1EVA
++	WriteMemoryLongWithMASKClient(SCU_BASE, SCU_CLOCK_SELECTION_REG, (PORTB_FROM_D2CLK | PORTB_CLOCK_INV_DELAY_1NS | PORTA_CLOCK_INV_DELAY_1NS), (PORTB_CLOCK_SEL | PORTB_CLOCK_DELAY_MASK | PORTA_CLOCK_DELAY_MASK));
++	WriteMemoryLongWithMASKClient(SCU_BASE, 0x202C, (0x03<<9), (0x03<<9));
++
++	WriteMemoryLongWithMASKClient(SCU_BASE, SCU_PIN_CTRL1_REG, (VIDEO_PORTA_EN | VIDEO_PORTB_EN | VIDEO_VP1_EN | VIDEO_VP2_EN), 
++								  (VIDEO_PORTA_MASK | VIDEO_PORTB_MASK | VIDEO_VP1_MASK | VIDEO_VP2_MASK));
++
++#if CONFIG_AST3000
++	WriteMemoryLongWithMASKClient(SCU_BASE, SCU_PIN_CTRL2_REG, (VIDEO_PORTA_DUAL_EDGE | VIDEO_PORTB_DUAL_EDGE), 
++								  (VIDEO_PORTA_SINGLE_EDGE_MASK | VIDEO_PORTB_SINGLE_EDGE_MASK));
++#else
++	//2100 is single edge
++	WriteMemoryLongWithMASKClient(SCU_BASE, SCU_PIN_CTRL2_REG, (VIDEO_PORTA_SINGLE_EDGE | VIDEO_PORTB_SINGLE_EDGE), 
++								  (VIDEO_PORTA_SINGLE_EDGE_MASK | VIDEO_PORTB_SINGLE_EDGE_MASK));
++#endif
++
++	WriteMemoryLongWithMASKClient(SCU_BASE, SCU_CLOCK_STOP_REG, (EN_D1CLK | EN_D2CLK), (STOP_D1CLK_MASK | STOP_D2CLK_MASK));
++	WriteMemoryLongWithMASKClient(SCU_BASE, SCU_PIN_CTRL1_REG, VGA_PIN_OFF, VGA_PIN_MASK);
++
++    //ResetVideoHost();
++
++	return TRUE;
++}
++
++ULONG  InitializeVideoEngineHost (ULONG                MMIOBase,
++                               int                  nVideo,
++							   BOOL					HorPolarity,
++							   BOOL					VerPolarity)
++{
++    //ULONG   temp, temp1, temp2; 
++    ULONG   dwRegOffset = nVideo * 0x100;
++    ULONG   dwValue;
++    int     i;
++
++
++    /* General Video Control */
++    //LineBufEn 0
++    //dwValue = (COMPRESS_MODE << CODEC_DECOMPRESS_MODE_BIT) | DELAY_VSYNC_EN;
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO_CONTROL_REG, dwValue);
++    //Video Data Truncation Register
++	WriteMemoryLongHost(VIDEO_REG_BASE, 0x328, 0);
++
++	//D2CLK clock must config according to video's line buffer
++	if (VIDEO1 == nVideo)
++	    dwValue = LINE_BUFFER_VIDEO1;
++    else
++        dwValue = LINE_BUFFER_VIDEO2;
++    
++	//D2CLK clock must config according to video's line buffer
++	switch (dwValue)
++	{
++	case LINE_BUFFER_OFF:
++		WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_SELECTION_REG, NORMAL_CRT1, D2CLK_CLOCK_SELECTION_MASK);
++		WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_STOP_REG, STOP_D2CLK, STOP_D2CLK_MASK);
++		break;
++	case LINE_BUFFER_VIDEO1:
++		WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_SELECTION_REG, V1CLK_VIDEO1 << D2CLK_CLOCK_SELECTION_BIT, D2CLK_CLOCK_SELECTION_MASK);
++		WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_STOP_REG, EN_D2CLK, STOP_D2CLK_MASK);
++		break;
++	case LINE_BUFFER_VIDEO2:
++		WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_SELECTION_REG, V1CLK_VIDEO2 << D2CLK_CLOCK_SELECTION_BIT, D2CLK_CLOCK_SELECTION_MASK);
++		WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_STOP_REG, EN_D2CLK, STOP_D2CLK_MASK);
++		break;
++	case LINE_BUFFER_VIDEOM:
++		//If select this option, it will config at videoM INIT
++		break;
++	default:
++		break;
++	}
++
++    dwValue = 0;
++    //VR30 now is capture window in the compression
++    dwValue = g_DefHeight << CAPTURE_VER_LINE_BIT |
++    g_DefWidth << CAPTURE_HOR_PIXEL_BIT;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_CAPTURE_WINDOWS_REG + dwRegOffset, dwValue);        
++
++    dwValue = 0;
++    //VR34 now is destionation window in the compression
++	dwValue = g_DefHeight << COMPRESS_VER_LINE_BIT |
++	g_DefWidth << COMPRESS_HOR_PIXEL_BIT;
++
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_WINDOWS_REG + dwRegOffset, dwValue);        
++
++    //BitCOUNT according compress data format
++    dwValue = YUV444_MODE;
++	if (YUV444_MODE == dwValue)
++		WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_LINE_OFFSET_REG + dwRegOffset, g_DefWidth * INPUT_BITCOUNT_YUV444, BUF_LINE_OFFSET_MASK);
++	else
++		WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_LINE_OFFSET_REG + dwRegOffset, g_DefWidth * INPUT_BITCOUNT_YUV420, BUF_LINE_OFFSET_MASK);
++              
++    //  CRC
++    //Disable
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO_CRC_PRIMARY_REG, 0x0);    
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO_CRC_SECOND_REG, 0x0);
++    
++    /* Sequence Control register */
++	//Oonly Encoder need to set
++	/* Engine Sequence Contol Register */
++	dwValue = (WATCH_DOG_EN << WATCH_DOG_ENABLE_BIT) |
++	            VIDEO_CAPTURE_AUTO_MODE |
++	            VIDEO_CODEC_AUTO_MODE;
++    
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG + dwRegOffset, dwValue);
++    
++    /* Control register */
++	dwValue = (HOR_NEGATIVE == HorPolarity) ? NO_INVERSE_POL : INVERSE_POL;
++	dwValue = (((VER_NEGATIVE == VerPolarity) ? NO_INVERSE_POL : INVERSE_POL) << VIDEO_VSYNC_POLARITY_BIT) | dwValue;
++    
++	/* HW Recommand*/
++	//dwValue = (TILE_MODE << 9) | dwValue;
++	dwValue = (EXTERNAL_VGA_SOURCE << EXTERNAL_SOURCE_BIT) | dwValue;
++    
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_CONTROL_REG + dwRegOffset, dwValue);
++        
++    /* BCD register */
++    //NO BCD
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_BCD_CONTROL_REG + dwRegOffset, dwValue);
++
++    /* Stream Buffer Size register */
++    dwValue = (YUV_TEST << SKIP_TEST_MODE_BIT) |
++                (PACKET_SIZE_32KB << STREAM_PACKET_SIZE_BIT) |
++                (PACKETS_8 << RING_BUF_PACKET_NUM_BIT);
++    /* the same with Video1, Video2, and VideoM*/
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_STREAM_BUF_SIZE, dwValue);
++
++    /* Comression control register */
++    dwValue = (USE_UV_CIR656 << UV_CIR656_FORMAT_BIT)|
++                (JPEG_MIX_MODE << JPEG_ONLY_BIT)|
++                (VQ_4_COLOR_MODE << VQ_4_COLOR_BIT)|
++                (QUANTI_CODEC_MODE << QUALITY_CODEC_SETTING_BIT)|
++                (7 << NORMAL_QUANTI_CHROMI_TABLE_BIT) |
++                (23 << NORMAL_QUANTI_LUMI_TABLE_BIT);
++   
++    //Video2 have same value as video1
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_CONTROL_REG, dwValue);
++
++    /* JPEG Quantization Table register */
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_QUANTI_TABLE_LOW_REG, dwValue);
++    
++    /* Quantization value register */
++    //Video2 have same value as video1
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_QUANTI_VALUE_REG, dwValue);
++
++    //Video BSD Parameter Register
++    //Video2 have same value as video1
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_BSD_PARA_REG, dwValue);
++
++    //no scale
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_SCALE_FACTOR_REG,  0x10001000);
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_SCALE_FACTOR_PARAMETER0_REG, 0x00200000);
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_SCALE_FACTOR_PARAMETER1_REG, 0x00200000);
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_SCALE_FACTOR_PARAMETER2_REG, 0x00200000);
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_SCALE_FACTOR_PARAMETER3_REG, 0x00200000);
++    return TRUE;
++}
++
++ULONG  InitializeVideoEngineClient (ULONG                MMIOBase,
++                               int                  nVideo)
++{
++    //ULONG   temp, temp1, temp2; 
++    ULONG   dwRegOffset = nVideo * 0x100;
++    ULONG   dwValue;
++    int     i;
++
++
++    /* General Video Control */
++    //LineBufEn 0
++    dwValue = (DECOMPRESS_MODE << CODEC_DECOMPRESS_MODE_BIT);
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO_CONTROL_REG, dwValue);
++    //Video Data Truncation Register
++	WriteMemoryLongHost(VIDEO_REG_BASE, 0x328, 0);
++
++    //VR30 now is capture window in the compression
++    dwValue = g_DefHeight << CAPTURE_VER_LINE_BIT |
++    g_DefWidth << CAPTURE_HOR_PIXEL_BIT;
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_CAPTURE_WINDOWS_REG + dwRegOffset, dwValue, CAPTURE_VER_LINE_MASK | CAPTURE_HOR_PIXEL_MASK);        
++
++    //VR34 now is destionation window in the compression
++	dwValue = g_DefHeight << COMPRESS_VER_LINE_BIT |
++	g_DefWidth << COMPRESS_HOR_PIXEL_BIT;
++
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_WINDOWS_REG + dwRegOffset, dwValue, COMPRESS_VER_LINE_MASK | COMPRESS_HOR_PIXEL_MASK);        
++
++    //BitCOUNT according compress data format
++    dwValue = YUV444_MODE;
++	if (YUV444_MODE == dwValue)
++		WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_LINE_OFFSET_REG + dwRegOffset, g_DefWidth * INPUT_BITCOUNT_YUV444, BUF_LINE_OFFSET_MASK);
++	else
++		WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_LINE_OFFSET_REG + dwRegOffset, g_DefWidth * INPUT_BITCOUNT_YUV420, BUF_LINE_OFFSET_MASK);
++              
++    //  CRC
++    //Disable
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO_CRC_PRIMARY_REG, 0x0);    
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO_CRC_SECOND_REG, 0x0);
++    
++    /* Sequence Control register */
++	//Oonly Encoder need to set
++	/* Engine Sequence Contol Register */
++    dwValue = VIDEO_CAPTURE_AUTO_MODE |
++        VIDEO_CODEC_AUTO_MODE;
++    
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG + dwRegOffset, dwValue);
++    
++    /* Control register */
++	/* HW Recommand*/
++	dwValue = (TILE_MODE << 9); 	
++    
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_CONTROL_REG + dwRegOffset, dwValue);
++        
++    /* BCD register */
++    //NO BCD
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_BCD_CONTROL_REG + dwRegOffset, dwValue);
++
++    /* Stream Buffer Size register */
++    dwValue = (YUV_TEST << SKIP_TEST_MODE_BIT) |
++                (PACKET_SIZE_32KB << STREAM_PACKET_SIZE_BIT) |
++                (PACKETS_8 << RING_BUF_PACKET_NUM_BIT);
++    /* the same with Video1, Video2, and VideoM*/
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_STREAM_BUF_SIZE, dwValue);
++        
++
++    /* Comression control register */
++    dwValue = (USE_UV_CIR656 << UV_CIR656_FORMAT_BIT)|
++                (JPEG_MIX_MODE << JPEG_ONLY_BIT)|
++                (VQ_4_COLOR_MODE << VQ_4_COLOR_BIT)|
++                (QUANTI_CODEC_MODE << QUALITY_CODEC_SETTING_BIT)|
++                (7 << NORMAL_QUANTI_CHROMI_TABLE_BIT) |
++                (23 << NORMAL_QUANTI_LUMI_TABLE_BIT);
++   
++    //Video2 have same value as video1
++    if (VIDEO1 == nVideo)
++    {
++        WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_CONTROL_REG, dwValue);
++    }
++    else
++    {
++        WriteMemoryLongHost(VIDEO_REG_BASE, VIDEOM_COMPRESS_CONTROL_REG, dwValue);
++    }
++
++    /* JPEG Quantization Table register */
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_QUANTI_TABLE_LOW_REG, dwValue);
++    
++    /* Quantization value register */
++    //Video2 have same value as video1
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_QUANTI_VALUE_REG, dwValue);
++
++    //Video BSD Parameter Register
++    //Video2 have same value as video1
++    dwValue = 0;
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_BSD_PARA_REG, dwValue);
++
++    return TRUE;
++}
++
++BYTE  GetI2CRegClient(ULONG  MMIOBase, 
++				 BYTE DeviceSelect, 
++				 BYTE DeviceAddress, 
++				 BYTE RegisterIndex)
++{
++    BYTE    Data;
++    ULONG   Status;
++
++//  Reset
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x00, 0);
++//  Set AC Timing and Speed
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x04, AC_TIMING);
++//  Lower Speed
++//    WriteMemoryLongWithANDData (VideoEngineInfo->VGAPCIInfo.ulMMIOBaseAddress, I2C_BASE + DeviceSelect * 0x40 + 0x04, 0, 0x33317805);
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x08, 0);
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++//  Enable Master Mode
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x00, 1);
++//  Enable Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x0C, 0xAF);
++//  BYTE I2C Mode
++//  Start and Send Device Address
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x20, DeviceAddress);
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x3);
++//  Wait TX ACK
++    do {
++        Status = ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10) & 0x03;
++    } while (Status != 1);
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++//  Send Device Register Index
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x20, RegisterIndex);
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x2);
++//  Wait Tx ACK
++    do {
++        Status = ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10) & 0x03;
++    } while (Status != 1);
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++//  Start, Send Device Address + 1(Read Mode), Receive Data
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x20, DeviceAddress + 1);
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x1B);
++//  Wait Rx Done
++    do {
++        Status = (ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10) & 0x04) >> 2;
++    } while (Status != 1);
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++
++//  Enable STOP Interrupt
++    WriteMemoryLongWithMASKClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x0C, 0x10, 0x10);
++//  Issue STOP Command
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x20);
++//  Wait STOP
++    do {
++        Status = (ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10) & 0x10) >> 4;
++    } while (Status != 1);
++//  Disable STOP Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x0C, 0x10);
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++//  Read Received Data
++    Data = (BYTE)((ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x20) & 0xFF00) >> 8);
++
++    return    Data;
++}
++
++ULONG  SetI2CRegClient(ULONG  MMIOBase, 
++                 BYTE   DeviceSelect, 
++                 BYTE   DeviceAddress, 
++                 BYTE   RegisterIndex, 
++                 BYTE   RegisterValue)
++{
++    ULONG   Status; 
++	ULONG   Count = 0;
++
++//  Reset
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x00, 0);
++//  Set Speed
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x04, AC_TIMING);
++//  Lower Speed
++//    WriteMemoryLongWithANDData (VideoEngineInfo->VGAPCIInfo.ulMMIOBaseAddress, I2C_BASE + DeviceSelect * 0x40 + 0x04, 0, 0x33317805);
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x08, 0);
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++//  Enable Master Mode
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x00, 1);
++//  Enable Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x0C, 0xAF);
++//  BYTE I2C Mode
++//  Start and Send Device Address
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x20, DeviceAddress);
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x3);
++//  Wait Tx ACK
++    do {
++        Count++;
++        Status = ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10) & 0x03;
++
++		if (2 == Status)
++		{
++			//Clear Interrupt
++			WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++			//Re-Send Start and Send Device Address while NACK return
++			WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x20, DeviceAddress);
++			WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x3);
++		}
++		//else
++		{
++			if (Count > LOOP_COUNT) {
++				return CAN_NOT_FIND_DEVICE;
++			}
++		}
++    } while (Status != 1);
++    Count = 0;
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++//  Send Device Register Index
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x20, RegisterIndex);
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x2);
++//  Wait Tx ACK
++    do {
++        Count++;
++        Status = ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10) & 0x03;
++        if (Count > LOOP_COUNT) {
++            return CAN_NOT_FIND_DEVICE;
++        }
++    } while (Status != 1);
++    Count = 0;
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++//  Send Device Register Value and Stop
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x20, RegisterValue);
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x2);
++//  Wait Tx ACK
++    do {
++        Count++;
++        Status = ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10) & 0x03;
++        if (Count > LOOP_COUNT) {
++            return CAN_NOT_FIND_DEVICE;
++        }
++    } while (Status != 1);
++    Count = 0;
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++//  Enable STOP Interrupt
++    WriteMemoryLongWithMASKClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x0C, 0x10, 0x10);
++//  Issue STOP Command
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x14, 0x20);
++//  Wait STOP
++    do {
++        Count++;
++        Status = (ReadMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10) & 0x10) >> 4;
++        if (Count > LOOP_COUNT) {
++            return CAN_NOT_FIND_DEVICE;
++        }
++    } while (Status != 1);
++//  Disable STOP Interrupt
++    WriteMemoryLongWithMASKClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x0C, 0, 0x10);
++//  Clear Interrupt
++    WriteMemoryLongClient(APB_BRIDGE_2_BASE, I2C_BASE + DeviceSelect * 0x40 + 0x10, 0xFFFFFFFF);
++
++    return SET_I2C_DONE;
++}
+diff --git a/board/aspeed/ast2400/vfun.h b/board/aspeed/ast2400/vfun.h
+new file mode 100755
+index 0000000..90f9ec4
+--- /dev/null
++++ b/board/aspeed/ast2400/vfun.h
+@@ -0,0 +1,79 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef _VFUN_H_
++#define _VFUN_H_
++
++//#define vBufAlign(x)		    ((x + 0x0000007F) & 0xFFFFFF80) //128 byte alignment
++#define vBufAlign(x)		    ((x + 0x000003FF) & 0xFFFFFC00) //128 byte alignment
++#define vBufAlign2(x)		    ((x + 0x0000FFFF) & 0xFFFF0000) //128 byte alignment
++#define v16byteAlign(x)		    ((x + 0x0000000F) & 0xFFFFFFF0)
++#define vBuf_ALIGNMENT			128
++
++#define HOST_TOTAL_SIZE         0x8000000   /* 128M */
++#define STATION_TOTAL_SIZE      0xF800000   /* 120M */
++
++#define VIDEO_SOURCE_SIZE       0x200000    /* 800X600X4 = 0x1D4C00 */
++#define VIDEO_MAX_STREAM_SIZE   0x400000    /* 32X128K = 0x400000 */
++#define VIDEO_FLAG_SIZE         0x5000      /* 1920X1200/128 = 0x4650*/ 
++#define VIDEO_CRC_SIZE          0x50000     /* 1920/64X1200X8 = 0x46500*/
++
++#define VIDEO1_EN_TOTAL_SIZE    (VIDEO_SOURCE_SIZE*2+VIDEO_MAX_STREAM_SIZE+VIDEO_FLAG_SIZE+VIDEO_CRC_SIZE) /* 0x1655000 =  about 23M*/
++#define VIDEO2_EN_TOTAL_SIZE    VIDEO1_EN_TOTAL_SIZE
++//#define VIDEOM_EN_TOTAL_SIZE    (VIDEO_SOURCE_SIZE*2+VIDEO_MAX_STREAM_SIZE+VIDEO_FLAG_SIZE) /* 0x1605000 = about 22.7M */
++//#define VIDEO_HOST_SIZE         (VIDEO1_EN_TOTAL_SIZE + VIDEO2_EN_TOTAL_SIZE + VIDEOM_EN_TOTAL_SIZE) /* 0x69922816 = about 70M */
++#define VIDEO_HOST_SIZE         (VIDEO1_EN_TOTAL_SIZE + VIDEO2_EN_TOTAL_SIZE) /* NOT NEED VIDEOM */
++
++#define VIDEO1_EN_BASE          0x100000
++#define VIDEO2_EN_BASE          (VIDEO1_EN_BASE + VIDEO1_EN_TOTAL_SIZE)
++#define VIDEOM_EN_BASE          (VIDEO2_EN_BASE + VIDEO2_EN_TOTAL_SIZE)
++
++#define VIDEO1_DE_TOTAL_SIZE    (VIDEO_MAX_STREAM_SIZE + VIDEO_SOURCE_SIZE) /* 0xD00000 = 13M*/
++#define VIDEO2_DE_TOTAL_SIZE    (VIDEO1_DE_TOTAL_SIZE)
++#define VIDEO_STATION_SIZE      (VIDEO1_DE_TOTAL_SIZE + VIDEO2_DE_TOTAL_SIZE) /* 26M */
++
++#define VIDEO1_DE_BASE          VIDEO_HOST_SIZE
++#define VIDEO2_DE_BASE          (VIDEO1_DE_BASE + VIDEO1_DE_TOTAL_SIZE)
++#define VIDEO_ALL_SIZE          (VIDEO_HOST_SIZE + VIDEO_STATION_SIZE) //Host and Station
++
++#define OutdwmBankModeHost(offset,data)         WriteMemoryLongHost(DRAM_BASE,offset,data)
++#define IndwmBankModeHost(offset)               ReadMemoryLongHost(DRAM_BASE,offset)      
++
++ULONG UnlockVideoRegHost(ULONG   MMIOBase, ULONG Key);
++BOOL CheckOnStartHost(void);
++BOOL CheckOnStartClient(void);
++void StartVideoCaptureTriggerHost(ULONG   MMIOBase, ULONG offset);
++void StartVideoCaptureTriggerHost(ULONG   MMIOBase, ULONG offset);
++void StartVideoCodecTriggerHost(ULONG   MMIOBase, ULONG offset);
++ULONG UnlockSCURegHost(ULONG   MMIOBase, ULONG Key);
++ULONG UnlockSCURegHost(ULONG   MMIOBase, ULONG Key);
++void StartModeDetectionTriggerHost(ULONG   MMIOBase, ULONG offset);
++void ClearVideoInterruptHost(ULONG   MMIOBase, ULONG value);
++BOOL ReadVideoInterruptHost(ULONG   MMIOBase, ULONG value);
++void StopModeDetectionTriggerHost(ULONG   MMIOBase, ULONG offset);
++void ResetVideoHost(void);
++ULONG  InitializeVideoEngineHost (ULONG                MMIOBase,
++                               int                  nVideo,
++							   BOOL					HorPolarity,
++				  BOOL					VerPolarity);
++ULONG  InitializeVideoEngineClient (ULONG                MMIOBase,
++				    int                  nVideo);
++BYTE  GetI2CRegClient(ULONG  MMIOBase, 
++				 BYTE DeviceSelect, 
++				 BYTE DeviceAddress, 
++				 BYTE RegisterIndex);
++
++ULONG  SetI2CRegClient(ULONG  MMIOBase, 
++                 BYTE   DeviceSelect, 
++                 BYTE   DeviceAddress, 
++                 BYTE   RegisterIndex, 
++				 BYTE   RegisterValue);
++#endif //_VFUN_H_
++
+diff --git a/board/aspeed/ast2400/vgahw.h b/board/aspeed/ast2400/vgahw.h
+new file mode 100755
+index 0000000..7cbba0d
+--- /dev/null
++++ b/board/aspeed/ast2400/vgahw.h
+@@ -0,0 +1,175 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++/******************************************************************************
++ * Mode Stuff
++ ******************************************************************************/
++/* Default Settings */
++#define CRT_LOW_THRESHOLD_VALUE         0x12
++#define CRT_HIGH_THRESHOLD_VALUE        0x1E
++
++/* Output Selection */
++#define CRT1				0x00
++#define CRT2				0x01
++#define DVI1				0x10
++#define DVI2				0x11
++#define LVDS1				0x20
++#define LVDS2				0x21
++
++/* Mode Limitation */
++#define MAX_HResolution		1600
++#define MAX_VResolution		1200
++ 
++/* Std. Table Index Definition */
++#define TextModeIndex 		0
++#define EGAModeIndex 		1
++#define VGAModeIndex 		2
++#define HiCModeIndex 		3
++#define TrueCModeIndex 		4
++
++/* DCLK Index */
++#define VCLK25_175     		0x00
++#define VCLK28_322     		0x01
++#define VCLK31_5       		0x02
++#define VCLK36         		0x03
++#define VCLK40         		0x04
++#define VCLK49_5       		0x05
++#define VCLK50         		0x06
++#define VCLK56_25      		0x07
++#define VCLK65		 	0x08
++#define VCLK75	        	0x09
++#define VCLK78_75      		0x0A
++#define VCLK94_5       		0x0B
++#define VCLK108        		0x0C
++#define VCLK135        		0x0D
++#define VCLK157_5      		0x0E
++#define VCLK162        		0x0F
++#define VCLK119        		0x10
++
++/* Flags Definition */
++#define Charx8Dot               0x00000001
++#define HalfDCLK                0x00000002
++#define DoubleScanMode          0x00000004
++#define LineCompareOff          0x00000008
++#define SyncPP                  0x00000000
++#define SyncPN                  0x00000040
++#define SyncNP                  0x00000080
++#define SyncNN                  0x000000C0
++#define HBorder                 0x00000020
++#define VBorder                 0x00000010
++#define COLORINDEX		0x00000000
++#define MONOINDEX		0x00000100
++
++/* DAC Definition */
++#define DAC_NUM_TEXT		64
++#define DAC_NUM_EGA		64
++#define DAC_NUM_VGA		256
++
++/* AST3000 Reg. Definition */
++#define	AST3000_VGAREG_BASE	0x1e6e6000
++#define AST3000_VGA1_CTLREG	0x00
++#define AST3000_VGA1_CTLREG2	0x04
++#define AST3000_VGA1_STATUSREG	0x08 
++#define AST3000_VGA1_PLL	0x0C
++#define AST3000_VGA1_HTREG	0x10
++#define AST3000_VGA1_HRREG	0x14
++#define AST3000_VGA1_VTREG	0x18
++#define AST3000_VGA1_VRREG	0x1C
++#define AST3000_VGA1_STARTADDR	0x20
++#define AST3000_VGA1_OFFSETREG	0x24
++#define AST3000_VGA1_THRESHOLD	0x28
++#define AST3000_HWC1_OFFSET     0x30
++#define AST3000_HWC1_XY		0x34
++#define AST3000_HWC1_PBase      0x38
++#define AST3000_OSD1_H          0x40
++#define AST3000_OSD1_V          0x44
++#define AST3000_OSD1_PBase      0x48
++#define AST3000_OSD1_Offset     0x4C
++#define AST3000_OSD1_THRESHOLD  0x50
++
++#define AST3000_VGA2_CTLREG	0x60
++#define AST3000_VGA2_CTLREG2	0x64
++#define AST3000_VGA2_STATUSREG	0x68 
++#define AST3000_VGA2_PLL	0x6C
++#define AST3000_VGA2_HTREG	0x70
++#define AST3000_VGA2_HRREG	0x74
++#define AST3000_VGA2_VTREG	0x78
++#define AST3000_VGA2_VRREG	0x7C
++#define AST3000_VGA2_STARTADDR	0x80
++#define AST3000_VGA2_OFFSETREG	0x84
++#define AST3000_VGA2_THRESHOLD	0x88
++#define AST3000_HWC2_OFFSET     0x90
++#define AST3000_HWC2_XY		0x94
++#define AST3000_HWC2_PBase      0x98
++#define AST3000_OSD2_H          0xA0
++#define AST3000_OSD2_V          0xA4
++#define AST3000_OSD2_PBase      0xA8
++#define AST3000_OSD2_Offset     0xAC
++#define AST3000_OSD2_THRESHOLD  0xB0
++
++/* Data Structure */
++typedef struct {
++    UCHAR ModeName[20];
++    USHORT usModeIndex;
++    USHORT usModeID;
++    USHORT usColorIndex;
++    USHORT usRefreshRateIndex;
++    USHORT usWidth;
++    USHORT usHeight;
++    USHORT usBitsPerPlane;
++    USHORT usRefreshRate;    
++} ModeInfoStruct;
++
++typedef struct {
++	
++    UCHAR MISC;	
++    UCHAR SEQ[4];
++    UCHAR CRTC[25];
++    UCHAR AR[20];	    
++    UCHAR GR[9];
++    
++} VBIOS_STDTABLE_STRUCT, *PVBIOS_STDTABLE_STRUCT;
++
++typedef struct {
++	
++    ULONG HT;
++    ULONG HDE;
++    ULONG HFP;
++    ULONG HSYNC;
++    ULONG VT;
++    ULONG VDE;
++    ULONG VFP;
++    ULONG VSYNC;
++    ULONG DCLKIndex;        
++    ULONG Flags;
++
++    ULONG ulRefreshRate;
++    ULONG ulRefreshRateIndex;
++    ULONG ulModeID;
++        
++} VBIOS_ENHTABLE_STRUCT, *PVBIOS_ENHTABLE_STRUCT;
++
++typedef struct {
++    UCHAR Param1;
++    UCHAR Param2;
++    UCHAR Param3;	
++} VBIOS_DCLK_INFO, *PVBIOS_DCLK_INFO;
++
++typedef struct {
++    UCHAR DACR;
++    UCHAR DACG;
++    UCHAR DACB;	
++} VBIOS_DAC_INFO, *PVBIOS_DAC_INFO;
++
++typedef struct {
++    PVBIOS_STDTABLE_STRUCT pStdTableEntry;
++    PVBIOS_ENHTABLE_STRUCT pEnhTableEntry;
++    	
++} VBIOS_MODE_INFO, *PVBIOS_MODE_INFO;
+diff --git a/board/aspeed/ast2400/vhace.c b/board/aspeed/ast2400/vhace.c
+new file mode 100755
+index 0000000..d045cbd
+--- /dev/null
++++ b/board/aspeed/ast2400/vhace.c
+@@ -0,0 +1,66 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#define HASH_GLOBALS
++#include "type.h"
++#include "vdef.h"
++#include "vhace.h"
++#include "vfun.h"
++
++void HashAst3000(ULONG ulLength, ULONG *output, ULONG ulHashMode)
++{
++	ULONG i, ulTemp, ulCommand, ulDigestLength;
++	ULONG ulValue;
++   
++	/* Get Info */
++	switch (ulHashMode)
++	{
++	case VHASHMODE_MD5:
++		ulCommand = VHASH_ALG_SELECT_MD5;
++		ulDigestLength = 16;
++		break;
++	case VHASHMODE_SHA1:
++		ulCommand = VHASH_ALG_SELECT_SHA1;
++		ulDigestLength = 20;
++		break;
++	case VHASHMODE_SHA256:
++		ulCommand = VHASH_ALG_SELECT_SHA256;
++		ulDigestLength = 32;
++		break;
++	case VHASHMODE_SHA224:
++		ulCommand = VHASH_ALG_SELECT_SHA224;
++		ulDigestLength = 28;
++		break;       	
++	}
++   	
++	/* Init. HW */
++	WriteMemoryLongHost(VHAC_REG_BASE, VREG_HASH_SRC_BASE_OFFSET, g_HashSrcBuffer);
++	WriteMemoryLongHost(VHAC_REG_BASE, VREG_HASH_DST_BASE_OFFSET, g_HashDstBuffer);
++	WriteMemoryLongHost(VHAC_REG_BASE, VREG_HASH_LEN_OFFSET, ulLength);
++        
++    /* write src */
++	//already fill in g_VIDEO1_COMPRESS_BUF_ADDR
++
++    /* fire cmd */
++	WriteMemoryLongHost(VHAC_REG_BASE, VREG_HASH_CMD_OFFSET, ulCommand);
++    
++    /* get digest */
++    do {
++    	ulTemp = ReadMemoryLongHost(VHAC_REG_BASE, VREG_HASH_STATUS_OFFSET);
++    } while (ulTemp & VHASH_BUSY);	
++    	
++    for (i=0; i<ulDigestLength/4; i++)
++    {
++                ulValue = *(((ULONG *)g_HashDstBuffer) + i); 
++
++		//output is ULONG pointer
++		*(output + i) = ulValue;    
++    }        
++}
+diff --git a/board/aspeed/ast2400/vhace.h b/board/aspeed/ast2400/vhace.h
+new file mode 100755
+index 0000000..460989b
+--- /dev/null
++++ b/board/aspeed/ast2400/vhace.h
+@@ -0,0 +1,58 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef _VHACE_H_
++#define _VHACE_H_
++
++#define VHASHMODE_MD5			0x00
++#define VHASHMODE_SHA1			0x01
++#define VHASHMODE_SHA256			0x02
++#define VHASHMODE_SHA224			0x03
++
++#define VHASH_ALG_SELECT_MASK		0x70
++#define VHASH_ALG_SELECT_MD5			0x00
++#define VHASH_ALG_SELECT_SHA1		0x20
++#define VHASH_ALG_SELECT_SHA224		0x40
++#define VHASH_ALG_SELECT_SHA256		0x50
++
++#define VHASH_BUSY			0x01
++
++#define VHAC_REG_BASE 			0x1e6e0000
++#define	VHAC_REG_OFFSET			0x3000
++
++#define VREG_HASH_SRC_BASE_OFFSET	(0x20+VHAC_REG_OFFSET)
++#define VREG_HASH_DST_BASE_OFFSET	(0x24+VHAC_REG_OFFSET)
++#define VREG_HASH_KEY_BASE_OFFSET	(0x28+VHAC_REG_OFFSET)
++#define VREG_HASH_LEN_OFFSET			(0x2C+VHAC_REG_OFFSET)
++#define VREG_HASH_CMD_OFFSET			(0x30+VHAC_REG_OFFSET)
++
++#define VREG_HASH_STATUS_OFFSET		(0x1C+VHAC_REG_OFFSET)
++
++typedef struct
++{
++	int HashMode;
++	int DigestLen;
++} HASH_METHOD;
++
++
++#ifdef HASH_GLOBALS
++#define HASH_EXT
++#else
++#define HASH_EXT extern
++#endif
++
++HASH_EXT HASH_METHOD	g_HashMethod;
++HASH_EXT BYTE			g_DigestBuf[32];
++HASH_EXT ULONG			g_HashSrcBuffer;
++HASH_EXT ULONG			g_HashDstBuffer;
++
++void HashAst3000(ULONG ulLength, ULONG *output, ULONG ulHashMode);
++#endif
++
+diff --git a/board/aspeed/ast2400/videotest.c b/board/aspeed/ast2400/videotest.c
+new file mode 100755
+index 0000000..f2e4953
+--- /dev/null
++++ b/board/aspeed/ast2400/videotest.c
+@@ -0,0 +1,779 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++/*
++ * Diagnostics support
++ */
++#include <common.h>
++#include <command.h>
++#include <malloc.h>
++#include <post.h>
++
++#include "slt.h"
++#define WIN_GLOBALS
++#include "type.h"
++#include "vreg.h"
++#define VESA_GLOBALS
++#include "vesa.h"
++#include "vfun.h"
++#include "vdef.h"
++#include "vhace.h"
++#include "crt.h"
++#include "videotest.h"
++
++#define VHASH_ALIGNMENT			16
++#define VHASH_MAX_DST			(32+VHASH_ALIGNMENT)
++
++
++#if ((CFG_CMD_SLT & CFG_CMD_VIDEOTEST) && defined(CONFIG_SLT))
++#include "videotest.h"
++
++#define RAND_MAX 32767 //2^16-1
++
++ULONG randSeed = 1;
++
++void srand(ULONG seed)
++{
++  randSeed = seed;
++}
++
++int rand(void)
++{
++  randSeed = randSeed * 214013 + 2531011;
++  return (int)(randSeed >> 17); //32 -15 = 17
++}
++
++//static unsigned char CaptureVideo1Buf1Addr[VIDEO_SOURCE_SIZE], CaptureVideo1Buf2Addr[VIDEO_SOURCE_SIZE], Video1CompressBufAddr[CRYPTO_MAX_CONTEXT];
++ULONG pCaptureVideo1Buf1Addr[VIDEO_SOURCE_SIZE/4], pCaptureVideo1Buf2Addr[VIDEO_SOURCE_SIZE/4], pVideo1CompressBufAddr[VIDEO_MAX_STREAM_SIZE/4], pVideo1FlagBufAddr[VIDEO_FLAG_SIZE];
++ULONG pCaptureVideo2Buf1Addr[VIDEO_SOURCE_SIZE/4], pCaptureVideo2Buf2Addr[VIDEO_SOURCE_SIZE/4], pVideo2CompressBufAddr[VIDEO_MAX_STREAM_SIZE/4], pVideo2FlagBufAddr[VIDEO_FLAG_SIZE];
++
++ULONG pVHashDstBuffer[VHASH_MAX_DST/4];
++
++ULONG pVideo1DecAddr[VIDEO_SOURCE_SIZE/4];
++ULONG pCrt1Addr[VIDEO_SOURCE_SIZE/4];
++//ULONG pCap1Addr[VIDEO_SOURCE_SIZE/4];
++
++BOOL AllocateEncodeBufHost(ULONG MMIOBase, int nVideo)
++{
++    //ULONG     Addr;
++    //ULONG     dwRegOffset = nVideo * 0x100;
++
++    if (VIDEO1 == nVideo)
++    {
++        
++        //Addr = (ULONG)malloc(pVideoInfo->SrcWidth * pVideoInfo->SrcHeight * 4);
++        //pCaptureVideo1Buf1Addr = malloc(VIDEO_SOURCE_SIZE);
++
++        g_CAPTURE_VIDEO1_BUF1_ADDR = vBufAlign((ULONG)pCaptureVideo1Buf1Addr);
++        WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_1_ADDR_REG, g_CAPTURE_VIDEO1_BUF1_ADDR, BUF_1_ADDR_MASK);
++        
++        //Addr = (ULONG)malloc(pVideoInfo->SrcWidth * pVideoInfo->SrcHeight * 4);
++        //pCaptureVideo1Buf2Addr = malloc(VIDEO_SOURCE_SIZE);
++
++        g_CAPTURE_VIDEO1_BUF2_ADDR = vBufAlign((ULONG)pCaptureVideo1Buf2Addr);
++        WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_2_ADDR_REG, g_CAPTURE_VIDEO1_BUF2_ADDR, BUF_2_ADDR_MASK);
++        
++        //Addr = (ULONG)malloc(pVideoInfo->uStreamBufSize.StreamBufSize.RingBufNum * pVideoInfo->uStreamBufSize.StreamBufSize.PacketSize)
++        //pVideo1CompressBufAddr = malloc(VIDEO_MAX_STREAM_SIZE);
++        g_VIDEO1_COMPRESS_BUF_ADDR = vBufAlign((ULONG)pVideo1CompressBufAddr);
++        WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_BUF_ADDR_REG, g_VIDEO1_COMPRESS_BUF_ADDR, BUF_2_ADDR_MASK);
++        
++        //Addr = (ULONG)malloc((pVideoInfo->SrcHeigh/64) * pVideoInfo->SrcWidth * 8);
++        //g_VIDEO1_CRC_BUF_ADDR = vBufAlign((ULONG)malloc(VIDEO_MAX_STREAM_SIZE));
++        //WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_CRC_BUF_ADDR_REG, g_VIDEO1_CRC_BUF_ADDR, BUF_2_ADDR_MASK);
++        
++
++        //Addr = (ULONG)malloc(pVideoInfo->SrcHeigh * pVideoInfo->SrcWidth  / 128 (/64*4/8));
++        //pVideo1FlagBufAddr = malloc(VIDEO_FLAG_SIZE);
++        g_VIDEO1_FLAG_BUF_ADDR = vBufAlign((ULONG)pVideo1FlagBufAddr);
++        WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_FLAG_BUF_ADDR_REG, g_VIDEO1_FLAG_BUF_ADDR, BUF_2_ADDR_MASK);
++    }
++    else if (VIDEO2 == nVideo)
++    {
++        //Addr = (ULONG)malloc(pVideoInfo->SrcWidth * pVideoInfo->SrcHeight * 4);
++        //pCaptureVideo2Buf1Addr = malloc(VIDEO_SOURCE_SIZE);
++        g_CAPTURE_VIDEO2_BUF1_ADDR = vBufAlign((ULONG)pCaptureVideo2Buf1Addr);
++        WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO2_BUF_1_ADDR_REG, g_CAPTURE_VIDEO2_BUF1_ADDR, BUF_1_ADDR_MASK);
++        
++        //Addr = (ULONG)malloc(pVideoInfo->SrcWidth * pVideoInfo->SrcHeight * 4);
++        //pCaptureVideo2Buf2Addr = malloc(VIDEO_SOURCE_SIZE);
++        g_CAPTURE_VIDEO2_BUF2_ADDR = vBufAlign((ULONG)pCaptureVideo2Buf2Addr);
++        WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO2_BUF_2_ADDR_REG, g_CAPTURE_VIDEO2_BUF2_ADDR, BUF_2_ADDR_MASK);
++        
++        //Addr = (ULONG)malloc(pVideoInfo->uStreamBufSize.StreamBufSize.RingBufNum * pVideoInfo->uStreamBufSize.StreamBufSize.PacketSize)
++        //pVideo2CompressBufAddr = malloc(VIDEO_MAX_STREAM_SIZE);
++        g_VIDEO2_COMPRESS_BUF_ADDR = vBufAlign((ULONG)pVideo2CompressBufAddr);
++        WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO2_COMPRESS_BUF_ADDR_REG, g_VIDEO2_COMPRESS_BUF_ADDR, BUF_2_ADDR_MASK);
++        
++        //Addr = (ULONG)malloc((pVideoInfo->SrcHeigh/64) * pVideoInfo->SrcWidth * 8);
++        //g_VIDEO1_CRC_BUF_ADDR = vBufAlign((ULONG)malloc(VIDEO_MAX_STREAM_SIZE));
++        //WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_CRC_BUF_ADDR_REG, g_VIDEO1_CRC_BUF_ADDR, BUF_2_ADDR_MASK);
++        
++
++        //Addr = (ULONG)malloc(pVideoInfo->SrcHeigh * pVideoInfo->SrcWidth  / 128 (/64*4/8));
++        //pVideo2FlagBufAddr = malloc(VIDEO_FLAG_SIZE);
++        g_VIDEO2_FLAG_BUF_ADDR = vBufAlign((ULONG)pVideo2FlagBufAddr);
++        WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO2_FLAG_BUF_ADDR_REG, g_VIDEO2_FLAG_BUF_ADDR, BUF_2_ADDR_MASK);
++    }
++  
++}
++
++/********************************************************/
++/* 1. product random data to encode                     */
++/* 2. use hash to verify encode function                */
++/* 3. use encode stream to decompress original data     */
++/********************************************************/
++int CodecTest(void)
++{
++    int	  num, i=0, j=0;
++    ULONG ulTemp = 0, ulTemp2;
++    int   dwValue;
++    ULONG ulHWWp;
++    ULONG ulHWPt;
++
++    //max size
++    ULONG tArray[32/4];
++    
++    //mode detection
++    BOOL	bExternal = TRUE;
++    BOOL	bAnalog = TRUE;
++    ULONG	Status;	    
++
++#if defined(CONFIG_AST2300)
++    ULONG ulHashSha1[5]  = {0x3f0c2ad6,0xc8eb7074,0xa9929352,0xfcd5b8b0,0x76fa8461};
++    ULONG aHashDecode[5] = {0xb23b62bb,0xd22a602b,0x113038a0,0x7217c6ab,0xcb156f06};
++#else
++    ULONG ulHashSha1[5] = {0x2a19e99f,0x99b1bb2d,0x9ac82862,0x49205e43,0x6bc4b4d7};
++    ULONG aHashDecode[5] = {0x2907a827,0xaf337079,0x47817f1f,0xb0b7cd68,0x8d33bd2};
++#endif
++
++    //Load pattern to src1 & src2 buffer
++    srand(1);
++
++    //Total size : DefWidth*DeHeight*4
++    //rand function: 16 bits one time is equal to 2 bytes
++    //OutdwmBankMode: 32 bits one time is equal to 4 bytes
++    for (i=0; i<g_DefWidth*g_DefHeight*2; i++)
++    {
++	if (i%2)
++	{
++	    ulTemp2 = rand();
++	    ulTemp = (ulTemp2 << 16) | ulTemp;
++	    //WriteMemoryLongHost(DRAM_BASE, g_CAPTURE_VIDEO1_BUF1_ADDR + ((i-1)/2)*4, ulTemp);
++	    *(((ULONG *)g_CAPTURE_VIDEO1_BUF1_ADDR) + (i-1)/2) = ulTemp;
++	    ulTemp = 0;
++	}
++	else
++	{
++	    ulTemp = rand();
++	}
++    }
++
++    /* init encoder engine */
++    InitializeVideoEngineHost (0,
++			       VIDEO1,
++			       vModeTable[2].HorPolarity,
++			       vModeTable[2].VerPolarity);
++
++    /* reset offset pointer register*/    
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG, 0, VIDEO_CODEC_TRIGGER | VIDEO_CAPTURE_TRIGGER);
++
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_BUF_READ_OFFSET_REG, 0, COMPRESS_BUF_READ_OFFSET_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_CODEC_OFFSET_READ, 0, BUF_CODEC_OFFSET_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_BUF_PROCESS_OFFSET_REG, 0, COMPRESS_BUF_PROCESS_OFFSET_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_FRAME_END_READ, 0, COMPRESS_FRAME_END_READ_MASK);
++
++    /* start compress stream */
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG, MODE_DETECTION_TRIGGER, MODE_DETECTION_TRIGGER);
++    //Stream mode: set CODEC trigger first
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG, VIDEO_CODEC_TRIGGER, VIDEO_CODEC_TRIGGER);
++
++    //Stream mode: start trigger (only trigger capture bit)
++    StartVideoCaptureTriggerHost(0, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG);
++
++    //stop engine
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG, 0, 0xFF);    
++#if defined(CONFIG_AST2300)
++    do {	/* wait compress engine idle */
++	ulTemp = ReadMemoryLongHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG);    	
++    } while (!(ulTemp & 0x40000));	
++#endif
++
++    //read 30 times to get HW write pointer
++    for (i=0; i<30000; i++)
++	ulHWWp = ReadMemoryLongHost(VIDEO_REG_BASE, VIDEO1_BUF_CODEC_OFFSET_READ);
++
++    g_HashSrcBuffer = g_VIDEO1_COMPRESS_BUF_ADDR + 128; //skip encode data 128 byte	
++    g_HashDstBuffer = v16byteAlign((unsigned long)pVHashDstBuffer);
++    ulTemp = 300;
++
++    //Enable hash clock
++    WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_STOP_REG, EN_HACE, STOP_HACE_MASK);
++    g_HashMethod.HashMode = VHASHMODE_SHA1;
++    g_HashMethod.DigestLen = 20;
++    HashAst3000(ulTemp, tArray, g_HashMethod.HashMode);
++
++    if (strncmp((const char *)tArray, (const char *)ulHashSha1, g_HashMethod.DigestLen))
++    {
++	printf("[VIDEO] Encoder Test: Wrong\n");
++        //ExitVideoTest();
++        return VIDEO_ENCODE_FAIL;
++    }
++    else
++    {    
++	printf("[VIDEO] Encoder Test: Pass\n");
++    }
++
++#if 0
++    /******** prepare for next decoding test at the same chip ***********/
++    ResetVideoHost();
++
++    dwValue=0;
++
++    do
++    {
++	dwValue = UnlockVideoRegHost(0, VIDEO_UNLOCK_KEY);
++	i++;
++    }
++    while ((VIDEO_UNLOCK != dwValue) && (i<10));
++
++    if (VIDEO_UNLOCK != dwValue)
++    {
++	printf("[VIDEO] Video register is locked");
++	return VIDEO_UNLOCK_FAIL;
++    }
++
++    // allocate decoding buffer
++    //Use Compress buffer last time, and Don't need to allocate
++    g_VIDEO1_DECODE_BUF_1_ADDR = g_VIDEO1_COMPRESS_BUF_ADDR;
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_1_ADDR_REG, g_VIDEO1_DECODE_BUF_1_ADDR, BUF_1_ADDR_MASK);
++    
++    //	pVideo1DecAddr = malloc(VIDEO_SOURCE_SIZE);
++    g_VIDEO1_DECOMPRESS_BUF_ADDR = vBufAlign((unsigned long)pVideo1DecAddr);    
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_BUF_ADDR_REG, g_VIDEO1_DECOMPRESS_BUF_ADDR, COMPRESS_BUF_ADDR_MASK);
++    
++    //Addr = (ULONG)malloc(256);
++    //g_VIDEO1_RC4_BUF_ADDR = Addr;
++    //g_VIDEO1_DECODE_RC4_BUF_ADDR = g_VIDEO1_DECOMPRESS_BUF_ADDR + 0x800000; //assume video size is 8MB for umcompressed buf;
++    //WriteMemoryLongWithMASKClient(VIDEO_REG_BASE, VIDEO1_RC4_TABLE_ADDR, g_VIDEO1_DECODE_RC4_BUF_ADDR, RC4_TABLE_ADDR_MASK);
++
++    //HW recommanded value
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_2_ADDR_REG, g_VIDEO1_DECOMPRESS_BUF_ADDR, BUF_2_ADDR_MASK);
++    //WriteMemoryLongWithMASKClient(VIDEO_REG_BASE, VIDEO1_BUF_2_ADDR_REG, 0, BUF_2_ADDR_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_CRC_BUF_ADDR_REG, 0, BUF_2_ADDR_MASK);            
++
++    /* init encoder engine */
++    InitializeVideoEngineClient (0, VIDEO1);
++
++    /* reset offset pointer register*/    
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG, 0, VIDEO_CODEC_TRIGGER | VIDEO_CAPTURE_TRIGGER);
++
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_BUF_READ_OFFSET_REG, 0, COMPRESS_BUF_READ_OFFSET_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_CODEC_OFFSET_READ, 0, BUF_CODEC_OFFSET_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_BUF_PROCESS_OFFSET_REG, 0, COMPRESS_BUF_PROCESS_OFFSET_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_COMPRESS_FRAME_END_READ, 0, COMPRESS_FRAME_END_READ_MASK);
++
++    StartVideoCodecTriggerHost(0, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG);
++
++    //wrtie SW write pointer
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_DECOMPRESS_BUF_PROCESS_OFFSET_REG, ulHWWp, COMPRESS_BUF_READ_OFFSET_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_DECOMPRESS_BUF_WRITE_OFFSET_REG, ulHWWp, COMPRESS_BUF_READ_OFFSET_MASK);
++
++    i = 0;
++
++    do
++    {
++        ulHWPt = ReadMemoryLongHost(VIDEO_REG_BASE, VIDEO1_BUF_CODEC_OFFSET_READ);
++        i++;
++    }while((ulHWPt != ulHWWp) && (i<10000));
++
++    if (10000 > i)
++    {
++ 	printf("[VIDEO] Decoder Pointer cannot move!!! /n");
++        //ExitVideoTest();
++	return VIDEO_DECODE_FAIL;       
++    }
++        
++    //8*8 YUVA block
++    for (i=24; i<g_DefWidth*g_DefHeight; i=i+32)
++    {
++        *(((ULONG *)g_VIDEO1_DECOMPRESS_BUF_ADDR) + i) = 0x0;
++	*(((ULONG *)g_VIDEO1_DECOMPRESS_BUF_ADDR) + i+1) = 0x0;
++    }
++
++    g_HashSrcBuffer = g_VIDEO1_DECOMPRESS_BUF_ADDR;
++    //g_HashDstBuffer = VIDEO1_EN_BASE + VIDEO_ALL_SIZE; //config forward
++
++    ulTemp = 300;
++
++    //Enable hash clock
++    WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_STOP_REG, EN_HACE, STOP_HACE_MASK);
++    g_HashMethod.HashMode = VHASHMODE_SHA1;
++    g_HashMethod.DigestLen = 20;
++    HashAst3000(ulTemp, tArray, g_HashMethod.HashMode);
++
++    if (strncmp((const char *)tArray, (const char *)aHashDecode, g_HashMethod.DigestLen))
++    {
++	printf("[VIDEO] Decoder Test: Wrong\n");
++        //ExitVideoTest();
++        return VIDEO_DECODE_FAIL;
++    }
++    else
++    {
++	printf("[VIDEO] Decoder Test: Pass\n");
++    }
++#endif
++
++    return VIDEO_TEST_OK;
++}
++
++/********************************************************/
++/*  Only used in the host                               */
++/*  test function: Mode detection and Capture pattern   */
++/********************************************************/
++int CapTest(void)
++{
++    ULONG   dwValue, Status;
++    int     i;
++    BOOL    bAnalog;
++    ULONG	HStart, HEnd, VStart, VEnd;
++    USHORT	usCRTHor, usCRTVer;
++    ULONG   ulHor, ulVer;
++    ULONG   ulVGABaseAddr, ulCapAddr;
++    ULONG   ulFlag;
++    
++    printf("\n --------- Mode Detection Test --------- \n");
++    //clear clear register
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_CONTROL_REG, 0);
++    dwValue = ReadMemoryLongHost(VIDEO_REG_BASE, VIDEO1_CONTROL_REG);
++
++    //  Note: Current mode detection procedure has to set signal input 1st
++    //Note: Clear and enable interrupt Encode
++    ClearVideoInterruptHost(0, VIDEO1_MODE_DETECTION_READY_CLEAR);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO_INT_CONTROL_EN_REG, VIDEO1_MODE_DETECTION_READY_INT_EN, VIDEO1_MODE_DETECTION_READY_INT_EN);
++    //  Set input signal
++    dwValue |= EXTERNAL_VGA_SOURCE;
++    
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_CONTROL_REG, (dwValue <<EXTERNAL_SOURCE_BIT), EXTERNAL_SOURCE_MASK);
++
++//  Set H/V stable maximum
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO_MODE_DETECTION_PARAM_REG, (MODEDETECTION_VERTICAL_STABLE_MAXIMUM << VER_STABLE_MAX_BIT), 0x000F0000);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO_MODE_DETECTION_PARAM_REG, (MODEDETECTION_HORIZONTAL_STABLE_MAXIMUM << HOR_STABLE_MAX_BIT), HOR_STABLE_MAX_BIT_MASK);
++//  Set H/V stable threshold
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO_MODE_DETECTION_PARAM_REG, (MODEDETECTION_VERTICAL_STABLE_THRESHOLD << VER_STABLE_THRES_BIT), VER_STABLE_THRES_BIT_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO_MODE_DETECTION_PARAM_REG, (MODEDETECTION_HORIZONTAL_STABLE_THRESHOLD << HOR_STABLE_THRES_BIT), HOR_STABLE_THRES_BIT_MASK);
++    
++    //Trigger mode detection
++    // turn off WATCH_DOG first
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG, (WATCH_DOG_OFF << WATCH_DOG_ENABLE_BIT), WATCH_DOG_EN_MASK);
++        
++    //  Note: Clear mode detection ready interrupt
++    //ClearVideoInterrupt(MMIOBase, MODE_DETECTION_READY_CLEAR);
++    StartModeDetectionTriggerHost(0, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG);
++
++
++//  Note: Polling mode detection ready interrupt
++    //it sometime take a long time, especially during change mode, 
++    //so the loop count must be big, or you can't pull it by timer
++    i = 0;
++    do {
++
++		Status = ReadVideoInterruptHost(0, VIDEO1_MODE_DETECTION_READY_READ);
++		i++;
++    } while ((!Status) & (i<500000));
++
++    if (!Status)
++    {
++	printf("[VIDEO] Mode detection error\n");
++        //ExitVideoTest();
++	return VIDEO_TEST_FAIL;
++    }
++
++    HStart	= (ReadMemoryLongHost(VIDEO_REG_BASE, VIDE1_MODE_DETECTION_EDGE_H_REG) & LEFT_EDGE_LOCATION_MASK) >> LEFT_EDGE_LOCATION_BIT;
++    HEnd	= (ReadMemoryLongHost(VIDEO_REG_BASE, VIDE1_MODE_DETECTION_EDGE_H_REG) & RIGHT_EDGE_LOCATION_MASK) >> RIGHT_EDGE_LOCATION_BIT;
++
++    VStart	= (ReadMemoryLongHost(VIDEO_REG_BASE, VIDE1_MODE_DETECTION_EDGE_V_REG) & TOP_EDGE_LOCATION_MASK) >> TOP_EDGE_LOCATION_BIT;
++    VEnd	= (ReadMemoryLongHost(VIDEO_REG_BASE, VIDE1_MODE_DETECTION_EDGE_V_REG) & BOTTOM_EDGE_LOCATION_MASK) >> BOTTOM_EDGE_LOCATION_BIT;
++
++    ulHor = HEnd-HStart+1;
++    ulVer = VEnd-VStart+1;
++
++    printf("[VIDEO] Resolution: H[%d] * V[%d]\n", ulHor, ulVer);
++
++    if ((g_DefWidth == ulHor) & (g_DefHeight == ulVer))
++    {
++    	printf("[VIDEO] Mode detection PASS\n");
++    }
++    else
++    {
++	printf("[VIDEO] Mode detection FAIL\n");
++	return VIDEO_TEST_FAIL;
++    }
++
++    if(!((ReadMemoryLongHost(VIDEO_REG_BASE, VIDEO1_MODE_DETECTION_STATUS_READ_REG) & ANALONG_DIGITAL_READ) >> ANALONG_DIGITAL_READ_BIT))
++	bAnalog = FALSE;
++    else
++	bAnalog = TRUE;
++
++    //  Note: Clear mode detection ready interrupt
++    ClearVideoInterruptHost(0, VIDEO1_MODE_DETECTION_READY_CLEAR);
++
++    printf("\n --------- Capture Test --------- \n");
++
++    //capture engine
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_TIMEING_GEN_HOR_REG, (HEnd << VIDEO_HDE_END_BIT), VIDEO_HDE_END_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_TIMEING_GEN_HOR_REG, (HStart << VIDEO_HDE_START_BIT), VIDEO_HDE_START_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_TIMEING_GEN_V_REG, (VEnd << VIDEO_VDE_END_BIT), VIDEO_VDE_END_MASK);
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_TIMEING_GEN_V_REG, (VStart << VIDEO_VDE_START_BIT), VIDEO_VDE_START_MASK);
++	
++    ulCapAddr = vBufAlign2((ULONG)pCaptureVideo1Buf1Addr);    
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_1_ADDR_REG, ulCapAddr, BUF_1_ADDR_MASK);
++    
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_BUF_2_ADDR_REG, 0, BUF_2_ADDR_MASK);
++
++    InitializeVideoEngineHost (0,
++			       VIDEO1,
++		               vModeTable[2].HorPolarity,
++			       vModeTable[2].VerPolarity);
++
++    WriteMemoryLongHost(VIDEO_REG_BASE, 0x04, 0x01);
++    WriteMemoryLongHost(VIDEO_REG_BASE, 0x300, 0x0);
++#if defined(CONFIG_AST2300)
++	WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, 0x8, 0x0880, 0x0ec0);
++#elif defined(CONFIG_AST3000)
++	WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, 0x8, 0x2800, 0x2800);	
++#else
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, 0x8, 0xa00, 0x2a80); //tile mode
++#endif
++
++    WriteMemoryLongWithMASKHost(VIDEO_REG_BASE, VIDEO1_TIMEING_GEN_HOR_REG, 0xa0000000, 0xa0000000);
++   
++    //only trigger capture, in source buffer (vr44), the front of data is correct.
++    //StartVideoCaptureTriggerHost(0, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG);
++    WriteMemoryLongHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG, VIDEO_CAPTURE_TRIGGER);
++
++    i = 0;
++    do {
++        Status = ReadMemoryLongHost(VIDEO_REG_BASE, VIDEO1_ENGINE_SEQUENCE_CONTROL_REG) & CAPTURE_READY_MASK;
++	i++;
++    } while ((!Status) & (i<500000));
++
++    if (!Status)
++    {
++	printf("[VIDEO] Capture is not READY\n");
++	return VIDEO_TEST_FAIL;
++    }  
++
++#if !defined(CONFIG_AST2300)	
++    ulVGABaseAddr = ulCapAddr + 0x1000;
++
++    /* check pattern */
++    ulFlag = 0; //no 0 is error
++
++    for (i=0; i<100; i++)
++    {
++        dwValue = *(ULONG *)(ulVGABaseAddr + i*32);
++	if (0x32323232 != dwValue)
++	{
++	    printf("[VIDEO] Capture Test fail -- capture data doesn't match source \n");
++	    printf("[VIDEO]1 i=%d value=%x\n", i, dwValue);
++            ulFlag = 1;
++            break;
++	}
++
++	dwValue = *(ULONG *)(ulVGABaseAddr + i*32 + 4);
++	if (0x32323232 != dwValue)
++	{
++	    printf("[VIDEO] Capture Test fail -- capture data doesn't match source \n");
++	    printf("[VIDEO]2 i=%d value=%x\n", i, dwValue);
++	    ulFlag = 1;
++	    break;
++	}
++
++	dwValue = *(ULONG *)(ulVGABaseAddr + i*32 + 8);
++	if (0x80808080 != dwValue)
++	{
++	    printf("[VIDEO] Capture Test fail -- capture data doesn't match source \n");
++	    printf("[VIDEO]3 i=%d value=%x\n", i, dwValue);
++	    ulFlag = 1;
++	    break;
++	}
++
++	dwValue = *(ULONG *)(ulVGABaseAddr + i*32 + 12);
++	if (0x80808080 != dwValue)
++	{
++	    printf("[VIDEO] Capture Test fail -- capture data doesn't match source \n");
++	    printf("4 i=%d value=%x\n", i, dwValue);
++	    ulFlag = 1;
++	    break;
++	}
++
++	dwValue = *(ULONG *)(ulVGABaseAddr + i*32 + 16);
++	if (0x80808080 != dwValue)
++	{
++	   printf("[VIDEO] Capture Test fail -- capture data doesn't match source \n");
++	   printf("5 i=%d value=%x\n", i, dwValue);
++	   ulFlag = 1;
++	   break;
++	}
++
++	dwValue = *(ULONG *)(ulVGABaseAddr + i*32 + 20);
++	if (0x80808080 != dwValue)
++	{
++	   printf("[VIDEO] Capture Test fail -- capture data doesn't match source \n");
++	   printf("6 i=%d value=%x\n", i, dwValue);
++	   ulFlag = 1;
++	   break;
++	  }
++    }
++#endif
++
++    if (!ulFlag)
++    {
++        printf("[VIDEO] Capture Test OK\n");
++    }
++    else
++    {
++	printf("[VIDEO] Capture Test FAIL\n");
++	return VIDEO_TEST_FAIL;
++    }
++	
++    return VIDEO_TEST_OK;
++}
++
++/********************************************************/
++/*  Only used in the station                            */
++/********************************************************/
++int CRTTest(void)
++{
++    ULONG   ulVGABaseAddr;
++    BYTE    btCRTCenterMode, btCRTColorFmt;
++    USHORT  usCRTHor, usCRTVer;
++    ULONG   ulData;
++
++    int i,j;
++
++    //printf("\n --------- Turn on CRT --------- \n");
++    
++    //Enable CRT1 first
++    ulVGABaseAddr = vBufAlign((unsigned long)pCrt1Addr);
++    
++    btCRTCenterMode     = 0;
++    btCRTColorFmt	= YUV_444;
++    usCRTHor		= g_DefWidth;
++    usCRTVer		= g_DefHeight;	
++
++    CheckOnStartClient();
++
++    /* Fill Pattern */
++    for (i=0; i<usCRTHor; i++)
++    {
++	for (j=0; j<usCRTVer/8; j++)
++	{
++	    //Y
++	    //ulData = 0x10101010;
++	    ulData = 0x32323232;
++	    *(ULONG *)(ulVGABaseAddr + (i*usCRTVer*4+j*32)) = ulData;
++	    //ulData = 0x10101010;
++	    ulData = 0x32323232;
++	    *(ULONG *)(ulVGABaseAddr + (i*usCRTVer*4+j*32) +4) = ulData;
++	    //U
++	    ulData = 0x80808080;
++	    //ulData = 0x77777777;
++	    *(ULONG *)(ulVGABaseAddr + (i*usCRTVer*4+j*32) +8) = ulData;
++	    ulData = 0x80808080;
++	    //ulData = 0x77777777;
++	    *(ULONG *)(ulVGABaseAddr + (i*usCRTVer*4+j*32) +12) = ulData;
++	    //V
++	    ulData = 0x80808080;
++	    //ulData = 0x11111111;
++	    *(ULONG *)(ulVGABaseAddr + (i*usCRTVer*4+j*32) +16) = ulData;
++	    ulData = 0x80808080;
++	    //ulData = 0x11111111;
++	    *(ULONG *)(ulVGABaseAddr + (i*usCRTVer*4+j*32) +20) = ulData;
++	    //A
++	    ulData = 0xFFFFFFFFF;
++	    *(ULONG *)(ulVGABaseAddr + (i*usCRTVer*4+j*32) +24) = ulData;
++	    ulData = 0xFFFFFFFFF;
++	    *(ULONG *)(ulVGABaseAddr + (i*usCRTVer*4+j*32) +28) = ulData;
++	}
++    }  /* ~Fill Pattern */
++
++#if defined(CONFIG_AST2300)       
++    if(!ASTSetModeV (0, CRT_2, ulVGABaseAddr, usCRTHor, usCRTVer, btCRTColorFmt, btCRTCenterMode))
++#else
++    if(!ASTSetModeV (0, CRT_1, ulVGABaseAddr, usCRTHor, usCRTVer, btCRTColorFmt, btCRTCenterMode))
++#endif    
++    {   
++        printf("[VIDEO] The resolution is not in mode table list\n");
++        return CRT_FAIL;
++    }
++    
++    //printf("[VIDEO] CRT turn on\n");
++
++    return VIDEO_TEST_OK;
++}
++
++int do_videotest (void)
++{
++    int dwValue=0;
++    int i = 0;
++    int iRet;    
++    ULONG   ulRestore1, ulTemp;
++    BOOL    bClient;
++
++
++    //InitVideoTest();
++    g_DefWidth = 640; 
++    g_DefHeight= 480;
++
++    printf("\n --------- Codec Test --------- \n");
++
++#if defined(CONFIG_AST2300)
++    WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CONTROL_REG, 0x00002000, 0x00002000);
++#endif
++
++    CheckOnStartHost();
++    
++    do
++    {
++        dwValue = UnlockVideoRegHost(0, VIDEO_UNLOCK_KEY);
++	i++;
++    }
++    while ((VIDEO_UNLOCK != dwValue) && (i<1000));
++
++    if (VIDEO_UNLOCK != dwValue)
++    {
++	printf("[VIDEO] Video register is locked \n");
++	return VIDEO_TEST_FAIL;
++    }
++    AllocateEncodeBufHost(0, VIDEO1);
++
++    iRet = CodecTest();	
++    if (iRet)
++        return VIDEO_TEST_FAIL;
++
++#if defined(CONFIG_AST2300)
++    /* Init SCU */ 
++    WriteMemoryLongWithMASKHost(SCU_BASE, (0x2c + SCU_OFFSET), 0x00040000, 0x00040010);	/* Enable D2-PLL */
++    WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CLOCK_STOP_REG, 0, 0x00000400);		/* Enable D2CLK */
++    udelay(10);
++    WriteMemoryLongWithMASKHost(SCU_BASE, SCU_CONTROL_REG, 0, 0x00002000);
++    
++    WriteMemoryLongWithMASKHost(SCU_BASE, (0x90 + SCU_OFFSET), 0x20, 0x00000030); 	/* enable video mode single edge */
++    WriteMemoryLongWithMASKHost(SCU_BASE, (0x84 + SCU_OFFSET), 0xfffe0000, 0xfffe0000); /* multi-pins */
++    WriteMemoryLongWithMASKHost(SCU_BASE, (0x88 + SCU_OFFSET), 0x000fffff, 0x000fffff); /* multi-pins */    
++    
++    iRet = CRTTest();
++    if (iRet)
++    {
++    	printf("[VIDEO] CRT Test Failed \n");
++        return VIDEO_TEST_FAIL;
++    }
++
++    iRet = CapTest();		
++    if (iRet)
++    {
++    	printf("[VIDEO] Capture Test Failed \n");
++        return VIDEO_TEST_FAIL;
++    }
++#else
++    //Host or Client
++    bClient = ((ReadMemoryLong(SCU_BASE, SCU_HW_TRAPPING_REG) & CLIENT_MODE_EN_MASK)?TRUE:FALSE);
++    //reset video for another testing
++    ResetVideoHost();
++    dwValue=0;
++    i = 0;
++    do
++    {
++	dwValue = UnlockVideoRegHost(0, VIDEO_UNLOCK_KEY);
++	i++;
++    }
++    while ((VIDEO_UNLOCK != dwValue) && (i<10));
++
++    if (VIDEO_UNLOCK != dwValue)
++    {
++	printf("[VIDEO] Video register is locked");
++	return VIDEO_UNLOCK_FAIL;
++    }
++
++    //check if 1e6e0008[3,0] is 0
++    ulRestore1 = ReadMemoryLongHost(0x1e6e0000, 8);
++    dwValue = ReadMemoryLongHost(0x1e6e0000, 8)&0xF;
++
++    //set 1e6e0008[3,0] to 0
++    if (dwValue)
++    {
++        WriteMemoryLongHost(0x1e6e0000, 0, 0xfc600309);
++        
++        i=0;
++        do
++        {
++            i++;
++            dwValue = ReadMemoryLongHost(0x1e6e0000,0);
++        }while((1 != dwValue)&& (i<10));
++        
++        if (1 != dwValue)
++    	{
++    		printf("0x1e6e0000 is locked");
++    		return VIDEO_UNLOCK_FAIL;
++    	}
++    }
++
++    //only clear 1e6e0008[3,0]
++    WriteMemoryLongWithMASKHost(0x1e6e0000, 8, 0, 0xf);
++    
++    bClient = 0;
++    if (!bClient)
++    {
++        //To turn on crt, must be the client mode
++        WriteMemoryLongWithMASKHost(SCU_BASE, SCU_HW_TRAPPING_REG, (BE_CLIENT_CHIP << CLIENT_MODE_EN_BIT), CLIENT_MODE_EN_MASK);
++            
++        iRet = CRTTest();
++
++        if (iRet)
++        {
++            //trapping to host, the Vsync of CRT can't output and the host doesn't have video sync input
++            WriteMemoryLongWithMASKHost(SCU_BASE, SCU_HW_TRAPPING_REG, (BE_HOST_CHIP << CLIENT_MODE_EN_BIT), CLIENT_MODE_EN_MASK);
++            //restore value
++            WriteMemoryLongHost(0x1e6e0000, 8, ulRestore1);
++            //lock register
++            WriteMemoryLongHost(0x1e6e0000, 0, 0x12345678); 
++            return VIDEO_TEST_FAIL;
++        }
++        
++        iRet = CapTest();
++		
++        if (iRet)
++        {
++            //trapping to host, the Vsync of CRT can't output and the host doesn't have video sync input
++            WriteMemoryLongWithMASKHost(SCU_BASE, SCU_HW_TRAPPING_REG, (BE_HOST_CHIP << CLIENT_MODE_EN_BIT), CLIENT_MODE_EN_MASK);
++            //restore value
++            WriteMemoryLongHost(0x1e6e0000, 8, ulRestore1);
++            //lock register
++            WriteMemoryLongHost(0x1e6e0000, 0, 0x12345678); 
++
++            return VIDEO_TEST_FAIL;
++        }
++		//WriteMemoryLongWithMASKHost(SCU_BASE, SCU_HW_TRAPPING_REG, (BE_HOST_CHIP << CLIENT_MODE_EN_BIT), CLIENT_MODE_EN_MASK);
++    }
++    //trapping to host, the Vsync of CRT can't output and the host doesn't have video sync input
++    WriteMemoryLongWithMASKHost(SCU_BASE, SCU_HW_TRAPPING_REG, (BE_HOST_CHIP << CLIENT_MODE_EN_BIT), CLIENT_MODE_EN_MASK);
++    //restore value
++    WriteMemoryLongHost(0x1e6e0000, 8, ulRestore1);
++    //lock register
++    WriteMemoryLongHost(0x1e6e0000, 0, 0x12345678); 
++#endif
++
++    return VIDEO_TEST_OK;	
++}
++#endif /* CONFIG_SLT */
+diff --git a/board/aspeed/ast2400/videotest.h b/board/aspeed/ast2400/videotest.h
+new file mode 100755
+index 0000000..79b8dd9
+--- /dev/null
++++ b/board/aspeed/ast2400/videotest.h
+@@ -0,0 +1,24 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++/* VideoTest.h */
++#ifndef _VIDEOTEST_H_
++#define _VIDEOTEST_H_
++
++#define VIDEO_TEST_OK       0
++#define VIDEO_TEST_FAIL     1
++
++#define VIDEO_UNLOCK_FAIL   1
++#define VIDEO_ENCODE_FAIL   2
++#define VIDEO_DECODE_FAIL   3
++#define CRT_FAIL            4
++
++#endif /* _VIDEOTEST_H_ */
++
+diff --git a/board/aspeed/ast2400/vreg.h b/board/aspeed/ast2400/vreg.h
+new file mode 100755
+index 0000000..9738548
+--- /dev/null
++++ b/board/aspeed/ast2400/vreg.h
+@@ -0,0 +1,845 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#ifndef _VREG_H_
++#define _VREG_H_
++
++/********************************************************/
++/*    CRT register                                      */
++/********************************************************/
++#define    CRT_BASE_ADDRESS                    0x000400
++#define    VGA_GRAPH_BASE_ADDRESS              0x600000
++#define    VGA_CURSOR_BASE_ADDRESS             0x300000
++#define    VGA_OSD_BASE_ADDRESS                0x300000
++#define    RGB_565                             0x0
++#define    RGB_888                             0x1
++#define    YUV_444                             0x2
++#define	   NO_SUPPORTED_CRT_FMT				   0x3
++#define    CRT_LOW_THRESHOLD_VALUE             0x12
++#define    CRT_HIGH_THRESHOLD_VALUE            0x1E
++
++// AST3000's Registers 
++#ifdef Watcom
++#define     VIDEOBASE_OFFSET                            0x10000
++#else
++#define     VIDEOBASE_OFFSET                            0x0
++#endif
++
++#define     KEY_CONTROL_REG                             0x00 + VIDEOBASE_OFFSET
++    #define     VIDEO_LOCKED                            0
++    #define     VIDEO_UNLOCK                            1
++
++// Registers for video1 and video2
++#define     VIDEO1_ENGINE_SEQUENCE_CONTROL_REG          0x04 + VIDEOBASE_OFFSET
++#define     VIDEO2_ENGINE_SEQUENCE_CONTROL_REG          0x104 + VIDEOBASE_OFFSET
++    #define     MODE_DETECTION_TRIGGER                  0x00000001  //Bit[0] trigger HW auto mode detection
++    #define     VIDEO_CAPTURE_TRIGGER                   0x00000002  //Bit[1] trigger HW to capture video
++	#define		FORCE_HW_IDLE_MASK						(1<<2)		//Bit[2] Force engine into ready(idle) state
++		#define		ENGINE_RESET						(0<<2)
++		#define		ENGINE_IDLE							(1<<2)
++    #define     VIDEO_CAPTURE_AUTO_MODE                 0x00000008  //Bit[3]
++        #define     CAPTURE_FRAME_MODE                  0
++        #define     CAPTURE_AUTO_MODE                   1
++		#define		CAPTURE_AUTO_MODE_BIT				3
++		#define		CAPTURE_AUTO_MODE_MASK				0x00000008
++    #define     VIDEO_CODEC_TRIGGER                     0x00000010  //Bit[4] trigger HW to compress or decompress video
++        #define     CODEC_TRIGGER_BIT                   4
++        #define     CODEC_TRIGGER_MASK                  0x00000010
++        #define     CLEAR_CODEC_TRIGGER                 0
++        #define     EN_CODEC_TRIGGER                    1
++    #define     VIDEO_CODEC_AUTO_MODE                   0x00000020  //Bit[5]
++        #define     CODEC_FRAME_MODE                    0
++        #define     CODEC_AUTO_MODE                     1
++		#define		CODEC_AUTO_MODE_BIT					5
++        #define     CODEC_AUTO_MODE_MASK                0x00000020
++	#define		INSERT_FULL_FRAME_MASK					(1<<6)		//Bit[6] Insert full frame compression
++		#define		INSERT_FULL_FRAME_EN				(1<<6)
++		#define		INSERT_FULL_FRAME_OFF				(0<<6)
++    #define     WATCH_DOG_ENABLE                        0x00000080  //Bit[7] Video Enable watch dog for mode change detection
++        #define     WATCH_DOG_ENABLE_BIT                7
++        #define     WATCH_DOG_OFF                       0
++        #define     WATCH_DOG_EN                        1
++        #define     WATCH_DOG_EN_MASK                   0x00000080
++    #define     VIDEO_CRT_SELECTION                     0x00000100  //Bit[8]
++        #define     CRT1                                0
++        #define     CRT2                                1
++    #define     ANTI_TEARING_ENABLE                     0x00000200  //Bit[9] Anti-tearing mode enable for decoding
++        #define     ANTI_TEARING_EN                     1
++    #define     STREAM_DATA_MODE                        0x00000400  //Bit[11:10] Buffer and Stream Data type
++        #define     STREAM_DATA_MODE_BIT                10
++        #define     STREAM_DATA_MODE_MASK               0x00000C00
++        #define     YUV444_MODE                         0
++        #define     YUV420_MODE                         1
++        #define     YUV420_MODE_WITH_AST2000            2 //AST2000 compatible
++    #define     VIDEO_CAPTURE_READY                     0x00010000  //Bit[16] Video capture ready status read back(read only)
++		#define		CAPTURE_READY_MASK                  0x00010000  
++        #define     HW_BUSY                             0
++        #define     HW_IDLE                             1
++    #define     VIDEO_CODEC_READY                       0x00040000  //Bit[18] Video codec ready status read back(read only)
++		#define		CODEC_READY_MASK					0x00040000
++        //#define     HW_BUSY                             0
++        //#define     HW_IDLE                             1
++    
++#define    VIDEO1_CONTROL_REG                           0x08 + VIDEOBASE_OFFSET
++#define    VIDEO2_CONTROL_REG                           0x108 + VIDEOBASE_OFFSET
++    #define     VIDEO_HSYNC_POLARITY                    0x00000001  //Bit[0] Video source hsync polarity
++        #define     VIDEO_HSYNC_POLARITY_BIT            0
++        #define     NO_INVERSE_POL                      0
++        #define     INVERSE_POL							1
++    #define     VIDEO_VSYNC_POLARITY                    0x00000002  //Bit[1] Video source vsync polarity
++        #define     VIDEO_VSYNC_POLARITY_BIT            1        
++        //Setting defination the same as VIDEO_HSYNC_POLARITY
++    #define     VIDEO_EXTERNAL_SOURCE                   0x00000004  //Bit[2] Video external source
++        #define     EXTERNAL_SOURCE_BIT                 2
++        #define     INTERNAL_VGA_SOURCE                 0
++        #define     EXTERNAL_VGA_SOURCE                 1
++        #define     EXTERNAL_SOURCE_MASK                0x00000004                     
++    #define     VIDEO_ANALONG_EXTERNAL_SOURCE           0x00000008  //Bit[3] Video Analog external source
++        #define     ANALONG_EXTERNAL_SOURCE_BIT         3
++        #define     DVI_SOURCE                          0
++        #define     ANALOG_RGB_SOURCE                   1
++    #define     VIDEO_INTERNAL_TIMING_GEN               0x00000010  //Bit[4] Video Use internal timing generator
++        #define     INTERNAL_TIMING_GEN_BIT             4
++        #define     EXTERNAL_DE_SIGNAL                  0 //DVI only
++        #define     VR0C_VR10_DE_SINGAL                 1 //use VR0C and VR10 for generate VDE signal
++    /******     Video2 Only from DAC    ******/        
++    #define     VIDEO1_CAPTURE_FROM                     0x00000020  //Bit[5] Video1 capture data direct from VGA frame buffer(internal VGA only)  
++        #define     FROM_DAC_PORT                       0
++        #define     FROM_FRAME_BUFFER                   1     
++    #define     WRITE_DATA_FORMAT                       0x00000040  //Bit[7:6] Write data format
++        #define     WRITE_DATA_FORMAT_BIT               6
++        #define     WRTIE_DATA_FORMAT_MASK              0x000000C0
++        #define     CCIR601_2_YUV_FORMAT                0
++        #define     FULL_YUV_FORMAT                     1
++        #define     RGB_FORMAT                          2
++		#define     VGA_CURSOR_DISABLE                      0x00000100  //Bit[8] External video port slection
++        #define     VGA_CURSOR_NORMAL                   0
++        #define     VGA_CURSOR_OFF                      1    
++    #define     VIDEO_CAPTURE_LINEAR_MODE               0x00000200  //Bit[9] VIDEO_CAPTURE_LINEAR_MODE
++        #define     LINEAR_MODE                         0
++        #define     TILE_MODE		                    1		
++    #define     VIDEO_CLOCK_DELAY                       0x00000400  //Bit[11:10] Video clock delay control
++        #define     VIDEO_CLOCK_DELAY_BIT               10
++        #define     VIDEO_CLOCK_DELAY_MASK              0x00000C00
++        #define     DELAY_0_NS                          0
++        #define     DELAY_1_NS                          1
++        #define     INV_AND_DELAY_0_NS                  2
++        #define     INV_AND_DELAY_1_NS                  3
++    #define     VIDEO_CCIR656_SOURCE_MODE               0x00001000  //Bit[12] Video CCIR656 source mode
++        #define     RGB_SOURCE_MODE                     0
++        #define     CCIR656_SOURCE_MODE                 1
++    #define     SOURCE_PORT_CLOCK_MODE                  0x00002000  //Bit[13] Video Source port clock mode
++        #define     SINGLE_EDGE_MODE                    0
++        #define     DUAL_EDGE_MODE                      1
++    #define     EXTERNAL_PORT_SELECTION                 0x00004000  //Bit[14] External video port slection
++        #define     VIDEO_PORT_A                        0
++        #define     VIDEO_PORT_B                        1
++    #define     VIDEO_CAPTURE_FRAME_RATE                0x00010000  //Bit[23:16] Video capture frame rate control
++        #define     VIDEO_CAPTURE_FRAME_RATE_BIT        16
++        #define     VIDEO_CAPTURE_FRAME_RATE_MASK       0x00FF0000  //Maximum frame rate = XX * SourceFPS / 60
++
++#define    VIDEO1_TIMEING_GEN_HOR_REG                   0x0C + VIDEOBASE_OFFSET
++#define    VIDEO2_TIMEING_GEN_HOR_REG                   0x10C + VIDEOBASE_OFFSET
++    #define     VIDEO_HDE_END                           0x00000000  //Bit[12:0] Video HDE End timing generator
++    #define     VIDEO_HDE_END_BIT                       0  //Number of pixels from rising edge of Hsync for first active pixel
++    #define     VIDEO_HDE_END_MASK                      0x00001FFF
++    #define     VIDEO_HDE_START                         0x00010000  //Bit[28:16] Video HDE Start timing generator
++    #define     VIDEO_HDE_START_BIT                     16 //Number of pixels from rising edge of Hsync for last active pixel
++    #define     VIDEO_HDE_START_MASK                    0x1FFF0000
++        #define     FRAME_RATE_OFF                      0    
++    
++#define    VIDEO1_TIMEING_GEN_V_REG                     0x10 + VIDEOBASE_OFFSET
++#define    VIDEO2_TIMEING_GEN_V_REG                     0x110 + VIDEOBASE_OFFSET
++    #define     VIDEO_VDE_END                           0x00000001  //Bit[11:0] Video VDE End timing generator
++    #define     VIDEO_VDE_END_BIT                       0  //Number of pixels from rising edge of Vsync for first active pixel
++    #define     VIDEO_VDE_END_MASK                      0x00000FFF
++    #define     VIDEO_VDE_START                         0x00010000  //Bit[27:16] Video VDE Start timing generator
++    #define     VIDEO_VDE_START_BIT                     16 //Number of pixels from rising edge of Vsync for last active pixel
++    #define     VIDEO_VDE_START_MASK                    0x0FFF0000
++
++#define    VIDEO1_SCALE_FACTOR_REG                      0x14 + VIDEOBASE_OFFSET
++#define    VIDEO2_SCALE_FACTOR_REG                      0x114 + VIDEOBASE_OFFSET
++    #define     HOR_SCALING_FACTOR                      0x00000001  //Bit[15:0] Video Horizontal scaling factor
++    #define     HOR_SCALING_FACTOR_BIT                  0   //The formula=4096/(Horizontal scaling facotr)
++    #define     HOR_SCALING_FACTOR_MASK                 0x0000FFFF
++    #define     VER_SCALING_FACTOR                      0x00000000  //Bit[31:16] Video Vertical scaling factor
++    #define     VER_SCALING_FACTOR_BIT                  16   //The formula=4096/(Vertical scaling facotr)
++    #define     VER_SCALING_FACTOR_MASK                 0xFFFF0000
++
++#define    VIDEO1_SCALE_FACTOR_PARAMETER0_REG           0x18 + VIDEOBASE_OFFSET  //Scaling Parameters F00, F01, F02, F03
++#define    VIDEO2_SCALE_FACTOR_PARAMETER0_REG           0x118 + VIDEOBASE_OFFSET   
++
++#define    VIDEO1_SCALE_FACTOR_PARAMETER1_REG           0x1C + VIDEOBASE_OFFSET  //Scaling Parameters F10, F11, F12, F13
++#define    VIDEO2_SCALE_FACTOR_PARAMETER1_REG           0x11C + VIDEOBASE_OFFSET   
++
++#define    VIDEO1_SCALE_FACTOR_PARAMETER2_REG           0x20 + VIDEOBASE_OFFSET  //Scaling Parameters F20, F21, F22, F23
++#define    VIDEO2_SCALE_FACTOR_PARAMETER2_REG           0x120 + VIDEOBASE_OFFSET   
++
++#define    VIDEO1_SCALE_FACTOR_PARAMETER3_REG           0x24 + VIDEOBASE_OFFSET  //Scaling Parameters F30, F31, F32, F33
++#define    VIDEO2_SCALE_FACTOR_PARAMETER3_REG           0x124 + VIDEOBASE_OFFSET
++
++#define    VIDEO1_BCD_CONTROL_REG                       0x2C + VIDEOBASE_OFFSET
++#define    VIDEO2_BCD_CONTROL_REG                       0x12C + VIDEOBASE_OFFSET
++    #define     BCD_ENABLE                              0x00000001  //Bit[0] Enable block change detection(BCD)
++        #define     BCD_ENABLE_BIT                      0
++        #define     BCD_ENABLE_MASK                     0x00000001
++    #define     BCD_TOLERANCE                           0x00010000  //Bit[23:16]
++        #define     BCD_TOLERANCE_BIT                   16 //flag as changed block when the video data difference greater
++        #define     BCD_TOLERANCE_MASK                  0x00FF0000
++
++#define     VIDEO1_CAPTURE_WINDOWS_REG                  0x30 + VIDEOBASE_OFFSET
++#define     VIDEO2_CAPTURE_WINDOWS_REG                  0x130 + VIDEOBASE_OFFSET
++    #define     CAPTURE_VER_LINE						0x00000001  //Bit[10:0] Video compression vertical line total
++    #define     CAPTURE_VER_LINE_BIT					0
++    #define     CAPTURE_VER_LINE_MASK					0x000007FF
++    #define     CAPTURE_HOR_PIXEL						0x00010000  //Bit[26:16] Video compression vertical line total
++    #define     CAPTURE_HOR_PIXEL_BIT					16
++    #define     CAPTURE_HOR_PIXEL_MASK					0x07FF0000
++
++#define     VIDEO1_COMPRESS_WINDOWS_REG                 0x34 + VIDEOBASE_OFFSET
++#define     VIDEO2_COMPRESS_WINDOWS_REG                 0x134 + VIDEOBASE_OFFSET
++    #define     COMPRESS_VER_LINE                       0x00000001  //Bit[10:0] Video compression vertical line total
++    #define     COMPRESS_VER_LINE_BIT                   0
++    #define     COMPRESS_VER_LINE_MASK                  0x000007FF
++    #define     COMPRESS_HOR_PIXEL                      0x00010000  //Bit[26:16] Video compression vertical line total
++    #define     COMPRESS_HOR_PIXEL_BIT                  16
++    #define     COMPRESS_HOR_PIXEL_MASK                 0x07FF0000
++
++#define     VIDEO1_COMPRESS_BUF_PROCESS_OFFSET_REG      0x38
++#define     VIDEO2_COMPRESS_BUF_PROCESS_OFFSET_REG      0x138
++    #define     COMPRESS_BUF_PROCESS_OFFSET_ALIGN       127 //128 byte alignment
++    #define     COMPRESS_BUF_PROCESS_OFFSET_MASK        0xFFFFFF
++
++#define     VIDEO1_DECOMPRESS_BUF_PROCESS_OFFSET_REG    0x38
++#define     VIDEO2_DECOMPRESS_BUF_PROCESS_OFFSET_REG    0x138
++    #define     DECOMPRESS_BUF_PROCESS_OFFSET_ALIGN     127 //128 byte alignment
++    #define     DECOMPRESS_BUF_PROCESS_OFFSET_MASK      0xFFFFFF
++
++
++//For Compression
++#define     VIDEO1_COMPRESS_BUF_READ_OFFSET_REG         0x3C + VIDEOBASE_OFFSET     //For stream mode
++#define     VIDEO2_COMPRESS_BUF_READ_OFFSET_REG         0x13C + VIDEOBASE_OFFSET
++    #define     COMPRESS_BUF_READ_OFFSET_ALIGN          127 //128 byte alignment
++    #define     COMPRESS_BUF_READ_OFFSET_MASK           0x00FFFFFF
++//For Decompression
++#define     VIDEO1_DECOMPRESS_BUF_WRITE_OFFSET_REG      0x3C + VIDEOBASE_OFFSET     //For stream mode 
++#define     VIDEO2_DECOMPRESS_BUF_WRITE_OFFSET_REG      0x13C + VIDEOBASE_OFFSET
++    #define     DECOMPRESS_BUF_WRITE_OFFSET_ALIGN       127 //128 byte alignment
++    #define     DECOMPRESS_BUF_WRITE_OFFSET_MASK        0x00FFFFFF
++
++#define     VIDEO1_CRC_BUF_ADDR_REG                     0x40 + VIDEOBASE_OFFSET
++#define     VIDEO2_CRC_BUF_ADDR_REG                     0x140 + VIDEOBASE_OFFSET
++    #define     CRC_BUF_ADDR_ALIGN                      7   //8 byte alignment
++    #define     CRC_BUF_ADDR_MASK                       0x0FFFFFFF
++
++#define     VIDEO1_BUF_1_ADDR_REG                       0x44 + VIDEOBASE_OFFSET     //For Source Buffer in frame mode
++#define     VIDEO2_BUF_1_ADDR_REG                       0x144 + VIDEOBASE_OFFSET
++    #define     BUF_1_ADDR_ALIGN                        255 //256 byte alignment
++    #define     BUF_1_ADDR_MASK                         0x1FFFFFFF
++
++#define     VIDEO1_BUF_LINE_OFFSET_REG                  0x48 + VIDEOBASE_OFFSET     //Must set both in Frame/Stream mode
++#define     VIDEO2_BUF_LINE_OFFSET_REG                  0x148 + VIDEOBASE_OFFSET
++    #define     BUF_LINE_OFFSET_ALIGN                   7 //8 byte alignment
++    #define     BUF_LINE_OFFSET_MASK                    0x00003FFF
++
++#define     VIDEO1_BUF_2_ADDR_REG                       0x4C + VIDEOBASE_OFFSET     //For BCD Buffer in frame mode
++#define     VIDEO2_BUF_2_ADDR_REG                       0x14C + VIDEOBASE_OFFSET     
++    #define     BUF_2_ADDR_ALIGN                        255 //256 byte alignment
++    #define     BUF_2_ADDR_MASK                         0x1FFFFFFF
++
++#define     VIDEO1_FLAG_BUF_ADDR_REG                    0x50 + VIDEOBASE_OFFSET     //For block change flag buffer
++#define     VIDEO2_FLAG_BUF_ADDR_REG                    0x150 + VIDEOBASE_OFFSET     
++    #define     FLAG_BUF_ADDR_ALIGN                     7 //8 byte alignment
++    #define     FLAG_BUF_ADDR_MASK                      0x1FFFFFFF
++
++#define     VIDEO1_COMPRESS_BUF_ADDR_REG                0x54 + VIDEOBASE_OFFSET     //For stream mode
++#define     VIDEO2_COMPRESS_BUF_ADDR_REG                0x154 + VIDEOBASE_OFFSET     
++    #define     COMPRESS_BUF_ADDR_ALIGN                 127 //128 byte alignment
++    #define     COMPRESS_BUF_ADDR_MASK                  0x1FFFFFFF
++
++#define     VIDEO1_STREAM_BUF_SIZE                      0x58 + VIDEOBASE_OFFSET     //For stream mode 
++#define     VIDEO2_STREAM_BUF_SIZE                      0x158 + VIDEOBASE_OFFSET
++    #define     STREAM_PACKET_SIZE                      0x00000001
++        #define     STREAM_PACKET_SIZE_BIT              0
++        #define     STREAM_PACKET_SIZE_MASK             0x00000007
++        #define     PACKET_SIZE_1KB                     0
++        #define     PACKET_SIZE_2KB                     1
++        #define     PACKET_SIZE_4KB                     2
++        #define     PACKET_SIZE_8KB                     3
++        #define     PACKET_SIZE_16KB                    4
++        #define     PACKET_SIZE_32KB                    5
++        #define     PACKET_SIZE_64KB                    6
++        #define     PACKET_SIZE_128KB                   7
++    #define     RING_BUF_PACKET_NUM                     0x00000008
++        #define     RING_BUF_PACKET_NUM_BIT             3
++        #define     RING_BUF_PACKET_NUM_MASK            0x00000018
++        #define     PACKETS_4                           0
++        #define     PACKETS_8                           1
++        #define     PACKETS_16                          2
++        #define     PACKETS_32                          3
++    #define     SKIP_HIGH_MB_THRES                      0x00010000  //Bit[22:16] Skip high quality macro block threshold
++        #define     SKIP_HIGH_MB_THRES_BIT              16
++        #define     SKIP_HIGH_MB_THRES_MASK             0x007F0000
++    #define     SKIP_TEST_MODE                          0x00800000  //Bit[24:23] Skip test mode
++        #define     SKIP_TEST_MODE_BIT                  23
++        #define     SKIP_TEST_MODE_MASK                 0x01800000
++        #define     YUV_TEST                            2   //recommend
++
++#define     VIDEO1_BUF_CODEC_OFFSET_READ                0x5C + VIDEOBASE_OFFSET     //For stream mode,         
++#define     VIDEO2_BUF_CODEC_OFFSET_READ                0x15C + VIDEOBASE_OFFSET    //Video stream buffer offset read back(HW)
++    #define     BUF_CODEC_OFFSET_ALIGN                  255 //256 byte alignment
++    #define     BUF_CODEC_OFFSET_MASK                   0x00FFFFFF
++
++#define     VIDEO1_COMPRESS_CONTROL_REG                 0x60 + VIDEOBASE_OFFSET
++#define     VIDEO2_COMPRESS_CONTROL_REG                 0x160 + VIDEOBASE_OFFSET
++    #define     JPEG_ONLY_ENCODE                        0x00000001  //Bit[0] JPEG only encoding
++        #define     JPEG_ONLY_BIT                       0
++        #define     JPEG_MIX_MODE                       0   //Enable JPEG/VQ mix mode encoding
++        #define     JPEG_ONLY_MODE                      1   //JPEG encoding mode only
++    #define     VQ_4_COLOR_ENCODE                       0x00000002  //Bit[1] Enable 4 color VQ encoding
++        #define     VQ_4_COLOR_BIT                      1
++        #define     VQ_1_2_COLOR_MODE                   0   //1 and 2 color mode VQ encoding
++        #define     VQ_4_COLOR_MODE                     1   //1, 2 and 4 color VQ encoding
++    #define     QUALITY_CODEC_SETTING                   0x00000004  //Bit[2] High and best video quality codec mode setting
++        #define     QUALITY_CODEC_SETTING_BIT           2
++        #define     JPEG_CODEC_MODE                     0   //not supported in best video quality mode
++        #define     QUANTI_CODEC_MODE                   1
++    #define     JPEG_DUAL_QUALITY_EN                    0x00000008  //Bit[3] JPEG dual quality mode
++        #define     EN_JPEG_DUAL_QUALITY                1   //enable(only for normal video quality mode)
++    #define     BEST_QUALITY_EN                         0x00000010  //Bit[4] Best quality video mode enable
++        #define     BEST_QUALITY_EN_BIT                 4
++        #define     EN_BEST_QUALITY                     1   //enable(only for quantization codec mode)
++    #define     RC4_CRYPT_EN                            0x00000020  //Bit[5] Enable RC4 encryption/decryption
++		#define		RC4_CRYPT_EN_BIT					5
++		#define     RC4_CRYPT_EN_MASK                   0x00000020
++        #define     RC4_CRYPT_ON                        1   //enable
++    #define     NORMAL_QUANTI_CHROMI_TABLE              0x00000040  //Bit[10:6] Normal video quality mode JPEG DCT chromi quantination table
++        #define     NORMAL_QUANTI_CHROMI_TABLE_BIT      6
++        #define     NORMAL_QUANTI_CHROMI_TABLE_MASK     0x000007C0
++    #define     NORMAL_QUANTI_LUMI_TABLE                0x00000800  //Bit[15:11] Normal video quality mode JPEG DCT lumi quantination table
++        #define     NORMAL_QUANTI_LUMI_TABLE_BIT        11
++        #define     NORMAL_QUANTI_LUMI_TABLE_MASK       0x0000F800
++    #define     HIGH_QUALITY_EN                         0x00010000  //Bit[16] High video quality mode enable
++        #define     HIGH_QUALITY_EN_BIT                 16
++        #define     EN_HIGH_QUALITY                     1   //Enable
++    #define     UV_CIR656_FORMAT                        0x00080000  //Bit[19] UV fromat
++        #define     UV_CIR656_FORMAT_BIT                19
++        #define     USE_UV_CIR656                       1   //recommand
++    #define     HUFFMAN_TABLE_SELECT                    0x00100000  //Bit[20] JPEG Huffman table combination
++        #define     DUAL_TABLE                          0   //Dual Y, UV table
++        #define     SINGLE_TABLE                        1   //Single Y table
++        #define     SINGLE_UV_TABLE                     0x00200000  //1x: Single UV table
++    #define     HIGH_QUANTI_CHROMI_TABLE                0x00400000  //Bit[26:22] High quality JPEG DCT chromi quantization table
++        #define     HIGH_QUANTI_CHROMI_TABLE_BIT        22
++        #define     HIGH_QUANTI_CHROMI_TABLE_MASK       0x07C00000                
++    #define     HIGH_DEQUANTI_VALUE                     0x00400000  //Bit[26:22] High quality de-quantization value
++        #define     HIGH_DEQUANTI_VALUE_BIT             22
++        #define     HIGH_DEQUANTI_VALUE_MASK            0x07C00000        
++    #define     HIGH_QUANTI_LUMI_TABLE                  0x08000000  //Bit[31:27] High quality JPEG DCT lumi quantization table
++        #define     HIGH_QUANTI_LUMI_TABLE_BIT          27
++        #define     HIGH_QUANTI_LUMI_TABLE_MASK         0xF8000000
++    #define     BEST_DEQUANTI_VALUE                     0x08000000  //Bit[31:27] Best quality de-quantization value
++        #define     BEST_DEQUANTI_VALUE_BIT             27
++        #define     BEST_DEQUANTI_VALUE_MASK            0xF8000000
++        
++
++#define     VIDEO1_QUANTI_TABLE_LOW_REG                 0x64 + VIDEOBASE_OFFSET     //Match with 0x60 Bit[10:6], Bit[15:11]
++#define     VIDEO2_QUANTI_TABLE_LOW_REG                 0x164 + VIDEOBASE_OFFSET
++    #define     QUANTI_CHROMI_TABLE_LOW                 0x00000001  //Bit[4:0] Normal video low quality block chromi quantization table
++        #define     QUANTI_CHROMI_TABLE_LOW_BIT         0
++        #define     QUANTI_CHROMI_TABLE_LOW_MASK        0x0000001F
++    #define     QUANTI_LUMI_TABLE_LOW                   0x00000020  //Bit[9:5] Normal video low quality block lumi quantization table
++        #define     QUANTI_LUMI_TABLE_LOW_BIT           5
++        #define     QUANTI_LUMI_TABLE_LOW_MASK          0x000003E0
++
++#define     VIDEO1_QUANTI_VALUE_REG                     0x68 + VIDEOBASE_OFFSET     //Match with 0x60 Bit[26:22],Bit[31:27]
++#define     VIDEO2_QUANTI_VALUE_REG                     0x168 + VIDEOBASE_OFFSET
++    #define     HIGH_QUANTI_VALUE                       0x00000001  //Bit[14:0] High quality quantization value. Format is 1.14
++        #define     HIGH_QUANTI_VALUE_BIT               0
++        #define     HIGH_QUANTI_VALUE_MASK              0x00007FFF
++    #define     BEST_QUANTI_VALUE                       0x00010000  //Bit[30:16] Best quality quantization value. Format is 1.14
++        #define     BEST_QUANTI_VALUE_BIT               16
++        #define     BEST_QUANTI_VALUE_MASK              0x7FFF0000
++    
++#define     VIDEO1_BSD_PARA_REG                         0x6C + VIDEOBASE_OFFSET    //Video BSD Parameters Register    
++#define     VIDEO2_BSD_PARA_REG                         0x16C + VIDEOBASE_OFFSET
++    #define     BSD_HIGH_THRES                          0x00000001  //Bit[7:0] Block sharpness detection high threshold
++    #define     BSD_HIGH_THRES_BIT                      0
++    #define     BSD_HIGH_THRES_MASK                     0x000000FF
++    #define     BSD_LOW_THRES                           0x00000100  //Bit[15:8] Block shaprpness detection low threshold
++    #define     BSD_LOW_THRES_BIT                       8
++    #define     BSD_LOW_THRES_MASK                      0x0000FF00
++    #define     BSD_HIGH_COUNTS                         0x00010000  //Bit[21:16] Block sharpness detection high counts threshold
++    #define     BSD_HIGH_COUNTS_BIT                     16
++    #define     BSD_HIGH_COUNTS_MASK                    0x003F0000
++    #define     BSD_LOW_COUNTS                          0x00400000  //Bit[27:22] Block sharpness detection low counts threshold
++    #define     BSD_LOW_COUNTS_BIT                      22
++    #define     BSD_LOW_COUNTS_MASK                     0x0FC00000
++
++#define VIDEO1_COMPRESS_FRAME_SIZE_REG                  0x70 + VIDEOBASE_OFFSET
++#define VIDEO2_COMPRESS_FRAME_SIZE_REG                  0x170 + VIDEOBASE_OFFSET
++    #define     COMPRESS_FRAME_SIZE_READ                0x00000001  //Bit[19:0] Video compression frame size read back(number of DW)
++    #define     COMPRESS_FRAME_SIZE_READ_BIT            0
++    #define     COMPRESS_FRAME_SIZE_READ_MASK           0x003FFFFF
++
++#define     VIDEO1_COMPRESS_BLOCK_COUNT_REG             0x74 + VIDEOBASE_OFFSET
++#define     VIDEO2_COMPRESS_BLOCK_COUNT_REG             0x174 + VIDEOBASE_OFFSET
++    #define     PROCESS_BLOCK_COUNT_READ_BIT            0
++    #define     PROCESS_BLOCK_COUNT_READ_MASK			0x00003FFF	//Bit[13:0] Video processed total block counter read back(number of blocks)
++    #define     COMPRESS_BLOCK_COUNT_READ_BIT           16
++    #define     COMPRESS_BLOCK_COUNT_READ_MASK          0xFFFF0000	//Bit[29:16] Video processed total block counter read back(number of blocks)
++
++#define     VIDEO1_COMPRESS_FRAME_END_READ              0x78 + VIDEOBASE_OFFSET     //Video compression stream frame end pointer    
++#define     VIDEO2_COMPRESS_FRAME_END_READ              0x178 + VIDEOBASE_OFFSET
++    #define     COMPRESS_FRAME_END_READ_ALIGN           7
++    #define     COMPRESS_FRAME_END_READ_MASK            0x00FFFFFF
++
++#define     VIDEO1_COMPRESS_FRAME_COUNT_READ            0x7C + VIDEOBASE_OFFSET     
++#define     VIDEO2_COMPRESS_FRAME_COUNT_READ            0x17C + VIDEOBASE_OFFSET 
++    #define     COMPRESS_FRAME_COUNT_READ               0x00000001  //Bit[15:0] Video compression frame count read back(number of frame)
++    #define     COMPRESS_FRAME_COUNT_READ_BIT           0
++    #define     COMPRESS_FRAME_COUNT_READ_MASK          0xFFFFFFFF
++
++#define     VIDEO1_USER_DEFINE_HEADER                   0x80 + VIDEOBASE_OFFSET
++#define     VIDEO2_USER_DEFINE_HEADER                   0x180 + VIDEOBASE_OFFSET
++    #define     USER_DEFINE_HEADER                      0x00000001  //Bit[15:0] Video user defined header parameter
++    #define     USER_DEFINE_HEADER_BIT                  0
++    #define     USER_DEFINE_HEADER_MASK                 0x0000FFFF
++    
++#define     VIDE1_MODE_DETECTION_EDGE_H_REG             0x90 + VIDEOBASE_OFFSET
++#define     VIDE2_MODE_DETECTION_EDGE_H_REG             0x190 + VIDEOBASE_OFFSET
++    #define     LEFT_EDGE_LOCATION                      0x00000001  //Bit[11:0] Video source left edge location from sync rising edge
++    #define     LEFT_EDGE_LOCATION_BIT                  0
++    #define     LEFT_EDGE_LOCATION_MASK                 0x00000FFF
++	#define		NO_VER_SYNC								(1 << 12)		//Bit[12] No Vertical sync detected
++	#define		NO_HOR_SYNC								(1 << 13)		//Bit[13] No horizontal sync detected
++	#define		NO_ACTIVE_DISP							(1 << 14)		//Bit[14] No active display detected
++	#define		NO_DISP_CLOCK							(1 << 15)		
++    #define     RIGHT_EDGE_LOCATION                     0x00010000  //Bit[27:16] Video source right edge location from sync rising edge
++    #define     RIGHT_EDGE_LOCATION_BIT                 16
++    #define     RIGHT_EDGE_LOCATION_MASK                0x0FFF0000
++
++#define     VIDE1_MODE_DETECTION_EDGE_V_REG             0x94 + VIDEOBASE_OFFSET
++#define     VIDE2_MODE_DETECTION_EDGE_V_REG             0x194 + VIDEOBASE_OFFSET
++    #define     TOP_EDGE_LOCATION                       0x00000001  //Bit[11:0] Video source top edge location from sync rising edge
++    #define     TOP_EDGE_LOCATION_BIT                   0
++    #define     TOP_EDGE_LOCATION_MASK                  0x00000FFF
++    #define     BOTTOM_EDGE_LOCATION                    0x00010000  //Bit[27:16] Video source bottom edge location from sync rising edge
++    #define     BOTTOM_EDGE_LOCATION_BIT                16
++    #define     BOTTOM_EDGE_LOCATION_MASK               0x0FFF0000
++
++#define VIDEO1_MODE_DETECTION_STATUS_READ_REG           0x98 + VIDEOBASE_OFFSET
++#define VIDEO2_MODE_DETECTION_STATUS_READ_REG           0x198 + VIDEOBASE_OFFSET    
++    #define     MODE_DETECTION_HOR_TIME_READ            0x00000001  //Bit[11:0] Mode detection Horizontal time read back (read only)
++    #define     MODE_DETECTION_HOR_TIME_READ_BIT        0
++    #define     MODE_DETECTION_HOR_TIME_READ_MASK       0x00000FFF
++    #define     ANALONG_DIGITAL_READ                    0x00001000  //Bit[12] Auto detection for external analog or digital source read back
++        #define     ANALONG_DIGITAL_READ_BIT            12
++        #define     DVI_SIGNAL                          0
++        #define     ADC_SIGNAL                          1
++    #define     MODE_DETECTION_HOR_STABLE_READ          0x00002000  //Bit[13] Mode detection horizontal stable read back
++        #define     HOR_STABLE                          1
++    #define     MODE_DETECTION_VER_STABLE_READ          0x00004000  //Bit[14] Mode detection vertical stable read back
++        #define     VER_STABLE                          1
++    #define     OUT_LOCK_READ                           0x00008000  //Bit[15] Mode detection out of lock read back
++        #define     SIGNAL_OUT_LOCK                     1
++    #define     MODE_DETECTION_VER_LINE_READ            0x00010000  //Bit[27:16] Mode detection Vertical lines read back
++    #define     MODE_DETECTION_VER_LINE_READ_BIT        16
++    #define     MODE_DETECTION_VER_LINE_READ_MASK       0x0FFF0000
++    #define     VSYNC_POLARITY_READ                     0x10000000  //Bit[28] Vsync polarity read back
++    #define     HSYNC_POLARITY_READ                     0x20000000  //Bit[29] Hsync polarity read back
++    #define     MODE_DETECTION_VSYNC_READY              0x40000000  //Bit[30] Mode detection Vsync ready
++    #define     MODE_DETECTION_HSYNC_READY              0x80000000  //Bit[31] Mode detection Hsync ready
++
++/******     VIDEO MEMAGER SETTING               ******/
++#define     VIDEOM_ENGINE_SEQUENCE_CONTROL_REG          0x204 + VIDEOBASE_OFFSET
++    #define     VIDEOM_CAPTURE_TRIGGER                  0x00000002  //Bit[1] trigger HW to capture video
++    #define     VIDEOM_AUTO_MODE						0x00000008  //Bit[3]
++        #define     DISABLE_AUTO_MODE                   0
++        #define     AUTO_COMPRESS						1
++    #define     VIDEOM_CODEC_TRIGGER                    0x00000010  //Bit[4] trigger HW to compress or decompress video
++    #define     VIDEOM_SOURCE_SELECTION                 0x00000100  //Bit[8]
++        #define     VIDEO1                              0
++        #define     VIDEO2                              1
++    //#define     STREAM_DATA_MODE                        0x00000400  //Bit[11:10] Buffer and Stream Data type
++    //    #define     STREAM_DATA_MODE_BIT                10
++    //    #define     STREAM_DATA_MODE_MASK               0x00000C00
++    //    #define     YUV444_MODE                         0
++    //    #define     YUV420_MODE                         1
++    //    #define     YUV420_MODE_WITH_AST2000            2 //AST2000 compatible
++    #define     VIDEOM_CAPTURE_READY                    0x00010000  //Bit[16] Video capture ready status read back(read only)
++        //#define     HW_BUSY                             0
++        //#define     HW_IDLE                             1
++    #define     VIDEOM_CODEC_READY                      0x00040000  //Bit[18] Video codec ready status read back(read only)
++        //#define     HW_BUSY                             0
++        //#define     HW_IDLE                             1
++
++#define    VIDEOM_SCALE_FACTOR_REG                      0x214 + VIDEOBASE_OFFSET
++//    #define     HOR_SCALING_FACTOR                      0x00000001  //Bit[15:0] Video Horizontal scaling factor
++//    #define     HOR_SCALING_FACTOR_BIT                  0   //The formula=4096/(Horizontal scaling facotr)
++//    #define     HOR_SCALING_FACTOR_MASK                 0x0000FFFF
++//    #define     VER_SCALING_FACTOR                      0x00000000  //Bit[31:16] Video Vertical scaling factor
++//    #define     VER_SCALING_FACTOR_BIT                  16   //The formula=4096/(Vertical scaling facotr)
++//    #define     VER_SCALING_FACTOR_MASK                 0xFFFF0000
++
++#define    VIDEOM_SCALE_FACTOR_PARAMETER0_REG           0x218 + VIDEOBASE_OFFSET  //Scaling Parameters F00, F01, F02, F03
++
++#define    VIDEOM_SCALE_FACTOR_PARAMETER1_REG           0x21C + VIDEOBASE_OFFSET  //Scaling Parameters F10, F11, F12, F13
++
++#define    VIDEOM_SCALE_FACTOR_PARAMETER2_REG           0x220 + VIDEOBASE_OFFSET  //Scaling Parameters F20, F21, F22, F23
++
++#define    VIDEOM_SCALE_FACTOR_PARAMETER3_REG           0x224 + VIDEOBASE_OFFSET  //Scaling Parameters F30, F31, F32, F33
++
++#define    VIDEOM_BCD_CONTROL_REG                       0x22C + VIDEOBASE_OFFSET
++    //#define     BCD_ENABLE                              0x00000001  //Bit[0] Enable block change detection(BCD)
++    //#define     BCD_TOLERANCE                           0x00010000  //Bit[23:16]
++    //    #define     BCD_TOLERANCE_BIT                   16 //flag as changed block when the video data difference greater
++    //    #define     BCD_TOLERANCE_MASK                  0x00FF0000
++
++#define     VIDEOM_CAPTURE_WINDOWS_REG                  0x230 + VIDEOBASE_OFFSET
++    //#define     RC4_TABLE_ADDR_ALIGN                    7   //8 byte alignment
++    //#define     RC4_TABLE_ADDR_MASK                     0x0FFFFFFF
++
++#define     VIDEOM_COMPRESS_WINDOWS_REG                 0x234 + VIDEOBASE_OFFSET
++    //#define     COMPRESS_VER_LINE                       0x00000001  //Bit[12:0] Video compression vertical line total
++    //#define     COMPRESS_VER_LINE_BIT                   0
++    //#define     COMPRESS_VER_LINE_MASK                  0x00001FFF
++    //#define     COMPRESS_HOR_PIXEL                      0x00010000  //Bit[12:0] Video compression vertical line total
++    //#define     COMPRESS_HOR_PIXEL_BIT                  16
++    //#define     COMPRESS_HOR_PIXEL_MASK                 0x1FFF0000
++
++#define     VIDEOM_COMPRESS_BUF_PROCESS_OFFSET_REG      0x238
++    //#define     COMPRESS_BUF_PROCESS_OFFSET_ALIGN       127 //128 byte alignment
++    //#define     COMPRESS_BUF_PROCESS_OFFSET_MASK        0x3FFFFF
++
++
++//For Compression
++#define     VIDEOM_COMPRESS_BUF_READ_OFFSET_REG         0x23C + VIDEOBASE_OFFSET     //For stream mode
++    //#define     COMPRESS_BUF_READ_OFFSET_ALIGN          127 //128 byte alignment
++    //#define     COMPRESS_BUF_READ_OFFSET_MASK           0x003FFFFF
++//For Decompression
++#define     VIDEOM_DECOMPRESS_BUF_WRITE_OFFSET_REG      0x23C + VIDEOBASE_OFFSET     //For stream mode 
++    //#define     DECOMPRESS_BUF_WRITE_OFFSET_ALIGN       127 //128 byte alignment
++    //#define     DECOMPRESS_BUF_WRITE_OFFSET_MASK        0x003FFFFF
++    
++#define     VIDEOM_BUF_1_ADDR_REG                       0x244 + VIDEOBASE_OFFSET     //For Source Buffer in frame mode
++    //#define     BUF_1_ADDR_ALIGN                        255 //256 byte alignment
++    //#define     BUF_1_ADDR_MASK                         0x0FFFFFFF
++
++#define     VIDEOM_BUF_LINE_OFFSET_REG                  0x248 + VIDEOBASE_OFFSET     //Must set both in Frame/Stream mode
++    //#define     BUF_LINE_OFFSET_ALIGN                   7 //8 byte alignment
++    //#define     BUF_LINE_OFFSET_MASK                    0x00003FFF
++
++#define     VIDEOM_BUF_2_ADDR_REG                       0x24C + VIDEOBASE_OFFSET     //For BCD Buffer in frame mode
++    //#define     BUF_2_ADDR_ALIGN                        255 //256 byte alignment
++    //#define     BUF_2_ADDR_MASK                         0x0FFFFFFF
++
++#define     VIDEOM_FLAG_BUF_ADDR_REG                    0x250 + VIDEOBASE_OFFSET     //For block change flag buffer
++    //#define     FLAG_BUF_ADDR_ALIGN                     7 //8 byte alignment
++    //#define     FLAG_BUF_ADDR_MASK                      0x0FFFFFFF
++
++#define     VIDEOM_COMPRESS_BUF_ADDR_REG                0x254 + VIDEOBASE_OFFSET     //For stream mode
++    //#define     FLAG_BUF_ADDR_ALIGN                     7 //8 byte alignment
++    //#define     FLAG_BUF_ADDR_MASK                      0x0FFFFFFF
++    
++#define     VIDEOM_BUF_CODEC_OFFSET_READ                0x25C + VIDEOBASE_OFFSET     //For stream mode,         
++    //#define     BUF_CODEC_OFFSET_ALIGN                  255 //256 byte alignment
++    //#define     BUF_CODEC_OFFSET_MASK                   0x003FFFFF
++    
++#define     VIDEOM_COMPRESS_CONTROL_REG                 0x260 + VIDEOBASE_OFFSET
++    //#define     JPEG_ONLY_ENCODE                        0x00000001  //Bit[0] JPEG only encoding
++    //    #define     JPEG_MIX_MODE                       0   //Enable JPEG/VQ mix mode encoding
++    //    #define     JPEG_ONLY_MODE                      1   //JPEG encoding mode only
++    //#define     VQ_4_COLOR_ENCODE                       0x00000002  //Bit[1] Enable 4 color VQ encoding
++    //    #define     VQ_1_2_COLOR_MODE                   0   //1 and 2 color mode VQ encoding
++    //    #define     VQ_4_COLOR_MODE                     1   //1, 2 and 4 color VQ encoding
++    //#define     QUALITY_CODEC_SETTING                   0x00000004  //Bit[2] High and best video quality codec mode setting
++    //    #define     JPEG_CODEC_MODE                     0   //not supported in best video quality mode
++    //    #define     QUANTI_CODEC_MODE                   1
++    //#define     JPEG_DUAL_QUALITY_EN                    0x00000008  //Bit[3] JPEG dual quality mode
++    //    #define     EN_JPEG_DUAL_QUALITY                1   //enable(only for normal video quality mode)
++    //#define     BEST_QUALITY_EN                         0x00000010  //Bit[4] Best quality video mode enable
++    //    #define     EN_BEST_QUALITY                     1   //enable(only for quantization codec mode)
++    //#define     RC4_CRYPT_EN                            0x00000020  //Bit[5] Enable RC4 encryption/decryption
++    //    #define     EN_RC4_CRYPT                        1   //enable
++    //#define     NORMAL_QUANTI_CHROMI_TABLE              0x00000040  //Bit[10:6] Normal video quality mode JPEG DCT chromi quantination table
++    //    #define     NORMAL_QUANTI_CHROMI_TABLE_BIT      6
++    //    #define     NORMAL_QUANTI_CHROMI_TABLE_MASK     0x000007C0
++    //#define     NORMAL_QUANTI_LUMI_TABLE                0x00000800  //Bit[15:11] Normal video quality mode JPEG DCT lumi quantination table
++    //    #define     NORMAL_QUANTI_LUMI_TABLE_BIT        11
++    //    #define     NORMAL_QUANTI_LUMI_TABLE_MASK       0x0000F800
++    //#define     HIGH_QUALITY_EN                         0x00010000  //Bit[16] High video quality mode enable
++    //    #define     EN_HIGH_QUALITY                     1   //Enable
++    //#define     UV_CIR656_FORMAT                        0x00080000  //Bit[19] UV fromat
++    //    #define     USE_UV_CIR656                       1   //recommand
++    //#define     HUFFMAN_TABLE_SELECT                    0x00100000  //Bit[20] JPEG Huffman table combination
++    //    #define     DUAL_TABLE                          0   //Dual Y, UV table
++    //    #define     SINGLE_TABLE                        1   //Single Y table
++    //    #define     SINGLE_UV_TABLE                     0x00200000  //1x: Single UV table
++    //#define     HIGH_QUANTI_CHROMI_TABLE                0x00400000  //Bit[26:22] High quality JPEG DCT chromi quantization table
++    //    #define     HIGH_QUANTI_CHROMI_TABLE_BIT        22
++    //    #define     HIGH_QUANTI_CHROMI_TABLE_MASK       0x07C00000                
++    //#define     HIGH_DEQUANTI_VALUE                     0x00400000  //Bit[26:22] High quality de-quantization value
++    //    #define     HIGH_DEQUANTI_VALUE_BIT             22
++    //    #define     HIGH_DEQUANTI_VALUE_MASK            0x07C00000        
++    //#define     HIGH_QUANTI_LUMI_TABLE                  0x08000000  //Bit[31:27] High quality JPEG DCT lumi quantization table
++    //    #define     HIGH_QUANTI_LUMI_TABLE_BIT          27
++    //    #define     HIGH_QUANTI_LUMI_TABLE_MASK         0xF8000000
++    //#define     BEST_DEQUANTI_VALUE                     0x08000000  //Bit[31:27] Best quality de-quantization value
++    //    #define     BEST_QUANTI_VALUE_BIT               27
++    //    #define     BEST_QUANTI_VALUE_MASK              0xF8000000
++    
++#define     VIDEOM_QUANTI_TABLE_LOW_REG                 0x264 + VIDEOBASE_OFFSET     //Match with 0x60 Bit[10:6], Bit[15:11]
++//    #define     QUANTI_CHROMI_TABLE_LOW                 0x00000001  //Bit[4:0] Normal video low quality block chromi quantization table
++//        #define     QUANTI_CHROMI_TABLE_LOW_BIT         0
++//        #define     QUANTI_CHROMI_TABLE_LOW_MASK        0x0000001F
++//    #define     QUANTI_LUMI_TABLE_LOW                   0x00000020  //Bit[9:5] Normal video low quality block lumi quantization table
++//        #define     QUANTI_CHROMI_TABLE_LOW_BIT         5
++//        #define     QUANTI_CHROMI_TABLE_LOW_MASK        0x000003E0
++
++#define     VIDEOM_QUANTI_VALUE_REG                     0x268 + VIDEOBASE_OFFSET     //Match with 0x60 Bit[26:22],Bit[31:27]
++//    #define     HIGH_QUANTI_VALUE                       0x00000001  //Bit[14:0] High quality quantization value. Format is 1.14
++//        #define     HIGH_QUANTI_VALUE_BIT               0
++//        #define     HIGH_QUANTI_VALUE_MASK              0x00007FFF
++//    #define     BEST_QUANTI_VALUE                       0x00010000  //Bit[30:16] Best quality quantization value. Format is 1.14
++//        #define     BEST_QUANTI_VALUE_BIT               16
++//        #define     BEST_QUANTI_VALUE_MASK              0x7FFF0000
++    
++#define     VIDEOM_BSD_PARA_REG                         0x26C + VIDEOBASE_OFFSET    //Video BSD Parameters Register    
++//    #define     BSD_HIGH_THRES                          0x00000001  //Bit[7:0] Block sharpness detection high threshold
++//    #define     BSD_HIGH_THRES_BIT                      0
++//    #define     BSD_HIGH_THRES_MASK                     0x000000FF
++//    #define     BSD_LOW_THRES                           0x00000100  //Bit[15:8] Block shaprpness detection low threshold
++//    #define     BSD_LOW_THRES_BIT                       8
++//    #define     BSD_LOW_THRES_MASK                      0x0000FF00
++//    #define     BSD_HIGH_COUNTS                         0x00010000  //Bit[21:16] Block sharpness detection high counts threshold
++//    #define     BSD_HIGH_COUNTS_BIT                     16
++//    #define     BSD_HIGH_COUNTS_MASK                    0x003F0000
++//    #define     BSD_LOW_COUNTS                          0x01000000  //Bit[27:24] Block sharpness detection low counts threshold
++//    #define     BSD_LOW_COUNTS_BIT                      24
++//    #define     BSD_LOW_COUNTS_MASK                     0x3F000000
++
++#define VIDEOM_COMPRESS_FRAME_SIZE_REG					  0x270 + VIDEOBASE_OFFSET
++//    #define     COMPRESS_FRAME_SIZE_READ                0x00000001  //Bit[19:0] Video compression frame size read back(number of DW)
++//    #define     COMPRESS_FRAME_SIZE_READ_BIT            0
++//    #define     COMPRESS_FRAME_SIZE_READ_MASK           0x000FFFFF
++
++#define     VIDEOM_COMPRESS_BLOCK_COUNT_REG				  0x274 + VIDEOBASE_OFFSET
++//    #define     COMPRESS_BLOCK_COUNT_READ               0x00000001  //Bit[15:0] Video compress block counter read back(number of blocks)
++//    #define     COMPRESS_BLOCK_COUNT_READ_BIT           0
++//    #define     COMPRESS_BLOCK_COUNT_READ_MASK          0x0000FFFF
++
++#define     VIDEOM_COMPRESS_FRAME_END_READ              0x278 + VIDEOBASE_OFFSET     //Video compression stream frame end pointer    
++    //#define     COMPRESS_FRAME_END_READ_ALIGN           7
++    //#define     COMPRESS_FRAME_END_READ_MASK            0x003FFFFF
++    
++#define     VIDEOM_USER_DEFINE_HEADER_REG			      0x280 + VIDEOBASE_OFFSET
++//    #define     USER_DEFINE_HEADER                      0x00000001  //Bit[15:0] Video user defined header parameter
++//    #define     USER_DEFINE_HEADER_BIT                  0
++//    #define     USER_DEFINE_HEADER_MASK                 0x0000FFFF
++
++/******  VR300-VR3FC: General Control registers  *****/
++#define     VIDEO_CONTROL_REG                           0x300 + VIDEOBASE_OFFSET
++    #define     CODEC_DECOMPRESS_MODE                   0x00000001  //Bit[0] Codec in de-compression mode
++        #define     CODEC_DECOMPRESS_MODE_BIT           0
++        #define     CODEC_DECOMPRESS_MODE_MASK          0x00000001 
++        #define     COMPRESS_MODE                       0
++        #define     DECOMPRESS_MODE                     1
++    #define     VIDEO_SAFE_MODE							0x00000002  //Bit[1] VIDEO SAFE MODE
++		#define     VIDEO_SAFE_MODE_BIT					1
++		#define     VIDEO_SAFE_MODE_OFF		            0
++        #define     VIDEO_SAFE_MODE_ON		            1
++    #define     DELAY_VSYNC								0x00000004  //Bit[2] Delay Internal VSYNC
++        #define     DELAY_VSYNC_BIT                     2
++        #define     DELAY_VSYNC_MASK                    (1<<2)
++		#define		DELAY_VSYNC_OFF						(0<<2)
++		#define		DELAY_VSYNC_EN						(1<<2)
++    #define     VER_DOWNSCALING_LINE_BUFFER_EN          0x00000010  //Bit[5:4] Video vertical downscaling line buffer enable
++		#define		VER_LINE_BUFFER_MASK				(3<<4)
++        #define     LINE_BUFFER_OFF                     (0<<4)
++        #define     LINE_BUFFER_VIDEO1                  1
++        #define     LINE_BUFFER_VIDEO2                  2
++        #define     LINE_BUFFER_VIDEOM                  3
++    #define     RC4_KEY_BUFFER_SELECTION				(1UL<<6)  //Bit[7:6] RC4 Key Buffer Selection
++		#define		RC4_KEY_BUFFER_SELECTION_BIT		6
++		#define		RC4_KEY_BUFFER_SELECTION_MASK		(3UL<<6)
++        #define     RC4_KEY_BUFFER_VIDEO1               0
++        #define     RC4_KEY_BUFFER_VIDEO2               1
++        #define     RC4_KEY_BUFFER_VIDEOM               2
++    #define     RC4_INIT_RESET							(1UL<<8)  //Bit[8] RC4 initial reset
++		#define     RC4_INIT_RESET_BIT					8
++		#define     RC4_INIT_RESET_MASK					(1UL<<8)
++		#define     RC4_NORMAL_MODE						0
++		#define     RC4_RESET_COUNTER					1
++    #define     RC4_TEST_MODE							(1UL<<9)  //Bit[9] RC4 test mode
++		#define     RC4_TEST_MODE_BIT					9
++		#define     RC4_TEST_OFF						0
++		#define     RC4_TEST_ON							1
++    #define     RC4_SAVE_MODE							(1UL<<14)  //Bit[14] RC4 save mode
++		#define     RC4_SAVE_MODE_BIT					14
++		#define     RC4_SAVE_MODE_MASK					(1UL<<14)
++		#define     RC4_SAVE_MODE_OFF					0
++		#define     RC4_SAVE_MODE_ON					1
++    #define     RC4_NO_RESET_FRAME						(1UL<<15)  //Bit[15] RC4 no reset when frame completed
++		#define     RC4_NO_RESET_FRAME_BIT				15
++		#define     RC4_NO_RESET_FRAME_MASK				(1UL<<15)
++		#define     RC4_NO_RESET_FRAME_OFF				0		//Always reset
++		#define     RC4_NO_RESET_FRAME_ON				1
++
++#define VIDEO_INT_CONTROL_EN_REG                        0x304 + VIDEOBASE_OFFSET
++    #define     VIDEO1_WATCH_DOG_INT_EN                 0x00000001  //Bit[0] Enable Video1 mode detection watch dog out of lock interrupt
++    #define     VIDEO1_INPUT_COMPLETE_INT_EN            0x00000002  //Bit[1] Enable Video1 video input complete interrupt  (frame complete only for frame mode)
++    #define     VIDEO1_PACKET_READY_INT_EN              0x00000004  //Bit[2] Enable Video1 packet ready interrupt
++    #define     VIDEO1_COMPRESS_COMPLETE_INT_EN         0x00000008  //Bit[3] Enable Video1 compression complete interrupt
++    #define     VIDEO1_MODE_DETECTION_READY_INT_EN      0x00000010  //Bit[4] Enable video1 mode detection ready interrupt
++    #define     VIDEO1_FRAME_COMPLETE_INT_EN            0x00000020  //Bit[5] Enable Video1 frame complete interrupt     (only for stream mode)
++    #define     VIDEO1_STREAM_ERR_INT_EN                0x00000040  //Bit[6] Enable Video1 decode stream error interrupt
++    #define     VIDEO2_WATCH_DOG_INT_EN                 0x00000100  //Bit[8] Enable Video2 mode detection watch dog out of lock interrupt
++    #define     VIDEO2_INPUT_COMPLETE_INT_EN            0x00000200  //Bit[9] Enable Video2 video input complete interrupt  (frame complete only for frame mode)
++    #define     VIDEO2_PACKET_READY_INT_EN              0x00000400  //Bit[10] Enable Video2 packet ready interrupt
++    #define     VIDEO2_COMPRESS_COMPLETE_INT_EN         0x00000800  //Bit[11] Enable Video2 compression complete interrupt
++    #define     VIDEO2_MODE_DETECTION_READY_INT_EN      0x00001000  //Bit[12] Enable video2 mode detection ready interrupt
++    #define     VIDEO2_FRAME_COMPLETE_INT_EN            0x00002000  //Bit[13] Enable Video2 frame complete interrupt    (only for stream mode)
++    #define     VIDEO2_STREAM_ERR_INT_EN                0x00004000  //Bit[14] Enable Video2 decode stream error interrupt
++    #define     VIDEOM_INPUT_COMPLETE_INT_EN            0x00010000  //Bit[16] Enable VideoM video input complete interrupt
++    #define     VIDEOM_COMPRESS_COMPLETE_INT_EN         0x00020000  //Bit[17] Enable VideoM compression complete interrupt
++	#define     VIDEOM_PACKET_READY_INT_EN				0x00040000  //Bit[18] Enable VideoM packet ready interrupt
++	#define     VIDEOM_FRAME_COMPLETE_INT_EN            0x00080000  //Bit[19] Enable VideoM frame complete interrupt    (only for stream mode)
++    
++#define VIDEO_INT_CONTROL_READ_REG                      0x308 + VIDEOBASE_OFFSET //Clear when write 1
++    #define     VIDEO1_WATCH_DOG_READ                   0x00000001  //Bit[0] Video1 mode detection watch dog out of lock interrupt status read back
++        #define     VIDEO1_WATCH_DOG_BIT				0
++        #define     VIDEO1_WATCH_DOG_MASK				0x00000001
++    #define     VIDEO1_INPUT_COMPLETE_READ              0x00000002  //Bit[1] Video1 video input complete interrupt status read back (frame complete only for frame mode)
++        #define     VIDEO1_INPUT_COMPLETE_BIT			1
++        #define     VIDEO1_INPUT_COMPLETE_MASK			0x00000002
++    #define     VIDEO1_PACKET_READY_READ                0x00000004  //Bit[2] Video1 packet ready interrupt status read back
++        #define     VIDEO1_PACKET_READY_BIT		        2
++        #define     VIDEO1_PACKET_READY_MASK		    0x00000004
++    #define     VIDEO1_COMPRESS_COMPLETE_READ           0x00000008  //Bit[3] Video1 compression complete interrupt status read back
++        #define     VIDEO1_COMPRESS_COMPLETE_BIT		3
++        #define     VIDEO1_COMPRESS_COMPLETE_MASK		0x00000008
++    #define     VIDEO1_MODE_DETECTION_READY_READ        0x00000010  //Bit[4] Video1 mode detection ready interrupt status read back
++        #define     VIDEO1_MODE_DETECTION_READY_BIT     4
++    #define     VIDEO1_FRAME_COMPLETE_READ              0x00000020  //Bit[5] Video1 frame complete interrupt status read back
++        #define     VIDEO1_FRAME_COMPLETE_BIT			5
++        #define     VIDEO1_FRAME_COMPLETE_MASK			0x00000020
++    #define     VIDEO1_STREAM_ERR_READ                  0x00000040  //Bit[6] Video1 decode stream error interrupt status read back
++        #define     VIDEO1_STREAM_ERR_BIT				6
++        #define     VIDEO1_STREAM_ERR_MASK				0x00000040
++    #define     VIDEO2_WATCH_DOG_READ                   0x00000100  //Bit[8] Video2 mode detection watch dog out of lock interrupt status read back
++        #define     VIDEO2_WATCH_DOG_BIT				8
++        #define     VIDEO2_WATCH_DOG_MASK				0x00000100
++    #define     VIDEO2_INPUT_COMPLETE_READ              0x00000200  //Bit[9] Video2 video input complete interrupt status read back (frame complete only for frame mode)
++        #define     VIDEO2_INPUT_COMPLETE_BIT			9
++        #define     VIDEO2_INPUT_COMPLETE_MASK			0x00000200
++    #define     VIDEO2_PACKET_READY_READ                0x00000400  //Bit[10] Video2 packet ready interrupt status read back
++        #define     VIDEO2_PACKET_READY_BIT		        10
++        #define     VIDEO2_PACKET_READY_MASK		    0x00000400
++    #define     VIDEO2_COMPRESS_COMPLETE_READ           0x00000800  //Bit[11] Video2 compression complete interrupt status read back 
++        #define     VIDEO2_COMPRESS_COMPLETE_BIT		11
++        #define     VIDEO2_COMPRESS_COMPLETE_MASK		0x00000800      
++		#define     VIDEO2_MODE_DETECTION_READY_READ    0x00001000  //Bit[12] Video2 mode detection ready interrupt status read back
++        #define     VIDEO2_MODE_DETECTION_READY_BIT     12              
++    #define     VIDEO2_FRAME_COMPLETE_READ              0x00002000  //Bit[13] Video2 frame complete interrupt status read back
++        #define     VIDEO2_FRAME_COMPLETE_BIT		    13
++        #define     VIDEO2_FRAME_COMPLETE_MASK			0x00002000
++    #define     VIDEO2_STREAM_ERR_READ                  0x00004000  //Bit[14] Video2 decode stream error interrupt status read back
++        #define     VIDEO2_STREAM_ERR_BIT				14
++        #define     VIDEO2_STREAM_ERR_MASK				0x00004000
++    //need check spec
++    #define     VIDEOM_INPUT_COMPLETE_READ              0x00010000  //Bit[16] VideoM video input complete interrupt status read back
++        #define     VIDEOM_INPUT_COMPLETE_BIT			16
++        #define     VIDEOM_INPUT_COMPLETE_MASK			0x00010000
++    #define     VIDEOM_COMPRESS_COMPLETE_READ           0x00020000  //Bit[17] VideoM compression complete interrupt status read back
++        #define     VIDEOM_COMPRESS_COMPLETE_BIT		17
++        #define     VIDEOM_COMPRESS_COMPLETE_MASK		0x00020000
++    #define     VIDEOM_PACKET_READY_READ                0x00040000  //Bit[18] Clear Packet ready interrupt when write 1
++        #define     VIDEOM_PACKET_READY_BIT             18
++        #define     VIDEOM_PACKET_READY_MASK            0x00040000    
++    #define     VIDEOM_FRAME_COMPLETE_READ              0x00080000  //Bit[19] Clear Frame complete interrupt when write 1
++        #define     VIDEOM_FRAME_COMPLETE_BIT           19
++        #define     VIDEOM_FRAME_COMPLETE_MASK          0x00080000
++   
++#define VIDEO_INT_CONTROL_CLEAR_REG                     0x308 + VIDEOBASE_OFFSET //Clear when write 1
++    //Clear when write 1
++    #define     VIDEO1_WATCH_DOG_CLEAR                  0x00000001  //Bit[0] Clear mode detection watch dog out of lock interrupt when write 1
++    #define     VIDEO1_INPUT_COMPLETE_CLEAR             0x00000002  //Bit[1] Clear video input complete interrupt when write 1 (frame complete only for frame mode)
++    #define     VIDEO1_PACKET_READY_CLEAR               0x00000004  //Bit[2] Clear Packet ready interrupt when write 1
++        #define     VIDEO1_PACKET_READY_CLEAR_BIT       2
++        #define     VIDEO1_PACKET_READY_CLEAR_MASK      0x00000004
++    #define     VIDEO1_COMPRESS_COMPLETE_CLEAR          0x00000008  //Bit[3] Clear video compression interrupt when write 1
++    #define     VIDEO1_MODE_DETECTION_READY_CLEAR       0x00000010  //Bit[4] Clear Video1 Mode detection ready interrupt when write 1
++    #define     VIDEO1_FRAME_COMPLETE_CLEAR             0x00000020  //Bit[5] Clear Frame complete interrupt when write 1
++        #define     VIDEO1_FRAME_COMPLETE_CLEAR_BIT     5
++        #define     VIDEO1_FRAME_COMPLETE_CLEAR_MASK    0x00000020
++    #define     VIDEO1_STREAM_ERR_CLEAR                 0x00000040  //Bit[6] Clear decode stream error interrupt when write 1
++    #define     VIDEO2_WATCH_DOG_CLEAR                  0x00000100  //Bit[8] Clear Mode detection interrupt when write 1
++    #define     VIDEO2_INPUT_COMPLETE_CLEAR             0x00000200  //Bit[9] Clear video input complete interrupt when write 1
++    #define     VIDEO2_PACKET_READY_CLEAR               0x00000400  //Bit[10] Clear packet ready interrupt when write 1
++    #define     VIDEO2_COMPRESS_COMPLETE_CLEAR          0x00000800  //Bit[11] Clear video compression complete interrupt when write 1
++    #define     VIDEO2_MODE_DETECTION_READY_CLEAR       0x00001000  //Bit[12] Clear Video2 Mode detection ready interrupt when write 1
++    #define     VIDEO2_FRAME_COMPLETE_CLEAR             0x00002000  //Bit[13] Clear Frame complete interrupt when write 1 (frame complete only for frame mode)
++    #define     VIDEO2_STREAM_ERR_CLEAR                 0x00004000  //Bit[14] Clear Decode stream error interrupt when write 1
++    //need check spec
++    #define     VIDEOM_INPUT_COMPLETE_CLEAR             0x00010000  //Bit[16] Clear video input complete interrupt when write 1
++    #define     VIDEOM_COMPRESS_COMPLETE_CLEAR          0x00020000  //Bit[17] Clear compression complete interrupt when write 1
++        #define     VIDEOM_COMPRESS_COMPLETE_CLEAR_BIT  17
++        #define     VIDEOM_COMPRESS_COMPLETE_CLEAR_MASK 0x00020000    
++	#define     VIDEOM_PACKET_READY_CLEAR				0x00040000  //Bit[18] Clear compression complete interrupt when write 1
++        #define     VIDEOM_PACKET_READY_CLEAR_BIT       18
++        #define     VIDEOM_PACKET_READY_CLEAR_MASK      0x00040000    
++    #define     VIDEOM_FRAME_COMPLETE_CLEAR             0x00100000  //Bit[20] Clear Frame complete interrupt when write 1
++        #define     VIDEOM_FRAME_COMPLETE_CLEAR_BIT     20
++        #define     VIDEOM_FRAME_COMPLETE_CLEAR_MASK    0x00100000
++    #define     VIDEOM_STREAM_ERR_CLEAR                 0x00200000  //Bit[21] Clear decode stream error interrupt when write 1
++    
++#define VIDEO_MODE_DETECTION_PARAM_REG                  0x30C + VIDEOBASE_OFFSET
++    #define     EDGE_PIXEL_THRES_BIT                    8           //Bit[15:8] Mode detection edge pixel threshold
++    #define     EDGE_PIXEL_THRES_MASK                   0x0000FF00  
++    #define     VER_STABLE_MAX_BIT                      16          //Bit[19:16] Mode detection vertical stable maximum
++    #define     VER_STABLE_MAX_BIT_MASK                 0x000F0000  
++    #define     HOR_STABLE_MAX_BIT                      20          //Bit[23:20] Mode detection horizontal stable maximum
++    #define     HOR_STABLE_MAX_BIT_MASK                 0x00F00000
++    #define     VER_STABLE_THRES_BIT                    24          //Bit[27:24] Mode detection vertical stable threshold
++    #define     VER_STABLE_THRES_BIT_MASK               0x0F000000  
++    #define     HOR_STABLE_THRES_BIT                    28          //Bit[31:28] Mode detection horizontal stable threshold
++    #define     HOR_STABLE_THRES_BIT_MASK               0xF0000000
++    
++#define VIDEO_CRC_PRIMARY_REG                           0x320 + VIDEOBASE_OFFSET
++    #define     CRC_CHECK_EN                            0x00000001  //Bit[0] Video port 1/2 Enable video capture write CRC check
++        #define     CRC_CHECK_EN_BIT                    0
++    #define     CRC_CHECK_HIGH                          0x00000002  //Bit[1] Video port 1/2 CRC check high bit only
++        #define     CRC_CHECK_HIGH_BIT                  1
++    #define     SKIP_COUNT_MAX                          0x00000004  //Bit[7:2] Video port 1/2 Max capture write skip count
++        #define     SKIP_COUNT_MAX_BIT                  2
++        #define     SKIP_COUNT_MAX_MASK                 0x000000FC
++    #define     CRC_PRIMARY_POLY_LOW                    0x00000100  //Bit[15:8] Primary CRC low 8-bit polynomial
++        #define     CRC_RIMARY_POLY_LOW_BIT             8
++        #define     CRC_RIMARY_POLY_LOW_MASK            0x0000FF00
++    #define     CRC_PRIMARY_POLY_HIGH                   0x00010000  //Bit[31:16] Primary CRC high 8-bit polynomial
++        #define     CRC_RIMARY_POLY_HIGH_BIT            16
++        #define     CRC_RIMARY_POLY_HIGH_MASK           0xFFFF0000
++        
++
++#define VIDEO_CRC_SECOND_REG                            0x324 + VIDEOBASE_OFFSET
++    #define     CRC_SECOND_POLY_LOW                     0x00000100  //Bit[15:8] Secondary CRC low 8-bit polynomial
++        #define     CRC_SECOND_POLY_LOW_BIT             8
++        #define     CRC_SECOND_POLY_LOW_MASK            0x0000FF00
++    #define     CRC_SECOND_POLY_HIGH                    0x00010000  //Bit[31:16] Secondary CRC high 8-bit polynomial
++        #define     CRC_SECOND_POLY_HIGH_BIT            16
++        #define     CRC_SECOND_POLY_HIGH_MASK           0xFFFF0000
++
++#define VIDEO1_RC4_KEYS_REG                              0x400 + VIDEOBASE_OFFSET //Total Video1 RC4 Keys     
++#define VIDEO2_RC4_KEYS_REG                              0x500 + VIDEOBASE_OFFSET //Total Video2 RC4 Keys     
++#define VIDEOM_RC4_KEYS_REG                              0x600 + VIDEOBASE_OFFSET //Total VideoM RC4 Keys     
++
++#endif /* end of _VREG_H_ */
++
+diff --git a/boards.cfg b/boards.cfg
+index 6a368de..674896b 100644
+--- a/boards.cfg
++++ b/boards.cfg
+@@ -72,6 +72,7 @@ mini2440                     arm         arm920t     mini2440            friendl
+ VCMA9                        arm         arm920t     vcma9               mpl            s3c24x0
+ smdk2410                     arm         arm920t     -                   samsung        s3c24x0
+ omap1510inn                  arm         arm925t     -                   ti
++ast2400                      arm         arm926ejs   ast2400             aspeed         aspeed
+ integratorap_cm926ejs        arm         arm926ejs   integrator          armltd         -           integratorap:CM926EJ_S
+ integratorcp_cm926ejs        arm         arm926ejs   integrator          armltd         -           integratorcp:CM924EJ_S
+ aspenite                     arm         arm926ejs   -                   Marvell        armada100
+diff --git a/common/Makefile b/common/Makefile
+index 53c92ef..6ba5f38 100644
+--- a/common/Makefile
++++ b/common/Makefile
+@@ -190,6 +190,8 @@ COBJS-$(CONFIG_CMD_ZIP) += cmd_zip.o
+ COBJS-$(CONFIG_CMD_ZFS) += cmd_zfs.o
+ 
+ # others
++OBJS-$(CONFIG_CMD_NETTEST) += cmd_nettest.o
++COBJS-$(CONFIG_CMD_SLT) += cmd_slt.o
+ COBJS-$(CONFIG_BOOTSTAGE) += bootstage.o
+ COBJS-$(CONFIG_CONSOLE_MUX) += iomux.o
+ COBJS-y += flash.o
+diff --git a/common/cmd_nettest.c b/common/cmd_nettest.c
+new file mode 100644
+index 0000000..249d7b6
+--- /dev/null
++++ b/common/cmd_nettest.c
+@@ -0,0 +1,214 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++*/
++
++#include <common.h>
++#include <command.h>
++#include <COMMINF.H>
++
++#ifdef SLT_UBOOT
++extern int main_function(int argc, char *argv[]);
++
++int do_mactest (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
++{
++    ModeSwitch = MODE_DEDICATED;
++    return main_function( argc, argv);
++}
++
++int do_ncsitest (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
++{
++    ModeSwitch = MODE_NSCI;
++    return main_function( argc, argv);
++}
++
++U_BOOT_CMD(
++    mactest,    CONFIG_SYS_MAXARGS, 0,  do_mactest,
++    "mactest - Dedicated LAN test program \n",
++    NULL
++);
++U_BOOT_CMD(
++    ncsitest,    CONFIG_SYS_MAXARGS, 0,  do_ncsitest,
++    "ncsitest- Share LAN (NC-SI) test program \n",
++    NULL
++);
++
++// ------------------------------------------------------------------------------
++int do_phyread (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
++{
++    int     MACnum;
++    int     PHYreg;
++    ULONG   result_data;
++    int     ret = 0;
++    int     PHYaddr;
++    int     timeout = 0;    
++
++    do {
++        if ( argc != 4 ) {
++            printf(" Wrong parameter number.\n" );
++            printf(" phyr mac addr reg\n"  );
++            printf("   mac     : 0 or 1.   [hex]\n"  );
++            printf("   PHY addr: 0 to 31.  [hex]\n"  );
++            printf("   register: 0 to 0xFF.[hex]\n"  );
++            printf(" example: phyr 0 0 1\n"  );
++            ret = -1;
++            break;
++        }
++
++        MACnum  = strtoul(argv[1], NULL, 16);
++        PHYaddr = strtoul(argv[2], NULL, 16);
++        PHYreg  = strtoul(argv[3], NULL, 16);
++        
++        if ( MACnum == 0 ) {
++            // Set MAC 0
++            H_MAC_BASE  = MAC_BASE1;
++        }
++        else if ( MACnum == 1 ) {
++                // Set MAC 1
++                H_MAC_BASE  = MAC_BASE2;
++        }
++        else {
++            printf("wrong parameter (mac number)\n");
++            ret = -1;
++            break;
++        }
++        MAC_PHYBASE = H_MAC_BASE;
++        
++        if ( ( PHYaddr < 0 ) || ( PHYaddr > 31 ) ) {
++            printf("wrong parameter (PHY address)\n");
++            ret = -1;
++            break;
++        }
++            
++        MAC_40h_old = ReadSOC_DD( H_MAC_BASE + 0x40 );
++        AST2300_NewMDIO = (MAC_40h_old & 0x80000000) ? 1 : 0;
++        
++        if ( AST2300_NewMDIO ) {
++            WriteSOC_DD( MAC_PHYBASE + 0x60, MAC_PHYRd_New | (PHYaddr << 5) | ( PHYreg & 0x1f ) );
++            while ( ReadSOC_DD( MAC_PHYBASE + 0x60 ) & MAC_PHYBusy_New ) {
++                if ( ++timeout > TIME_OUT_PHY_RW ) {
++                    ret = -1;
++                    break;
++                }
++            }
++            DELAY(Delay_PHYRd);
++            result_data = ReadSOC_DD( MAC_PHYBASE + 0x64 ) & 0xffff;  
++        } 
++        else {
++            WriteSOC_DD( MAC_PHYBASE + 0x60, MDC_Thres | MAC_PHYRd | (PHYaddr << 16) | ((PHYreg & 0x1f) << 21) );
++            while ( ReadSOC_DD( MAC_PHYBASE + 0x60 ) & MAC_PHYRd ) {
++                if ( ++timeout > TIME_OUT_PHY_RW ) {
++                    ret = -1;
++                    break;
++                }
++            }
++            DELAY( Delay_PHYRd );
++            result_data = ReadSOC_DD( MAC_PHYBASE + 0x64 ) >> 16;
++        }
++        printf(" PHY[%d] reg[%2X] = %08lX\n", PHYaddr, PHYreg, result_data ); 
++    } while ( 0 );
++    
++    return ret;
++}
++
++
++int do_phywrite (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
++{
++    int     MACnum;
++    int     PHYreg;
++    int     PHYaddr;
++    ULONG   reg_data;
++    int     ret     = 0;
++    int     timeout = 0;    
++    
++    do {
++        if ( argc != 5 )
++        {
++            printf(" Wrong parameter number.\n" );
++            printf(" phyw mac addr reg data\n"  );
++            printf("   mac     : 0 or 1.     [hex]\n"  );
++            printf("   PHY addr: 0 to 31.    [hex]\n"  );
++            printf("   register: 0 to 0xFF.  [hex]\n"  );
++            printf("   data    : 0 to 0xFFFF.[hex]\n"  );
++            printf(" example: phyw 0 0 0 610\n"  );
++            ret = -1;
++            break;
++        }
++        
++        MACnum   = strtoul(argv[1], NULL, 16);
++        PHYaddr  = strtoul(argv[2], NULL, 16);
++        PHYreg   = strtoul(argv[3], NULL, 16);
++        reg_data = strtoul(argv[4], NULL, 16);
++        
++        if ( MACnum == 0 ) {
++            // Set MAC 0
++            H_MAC_BASE  = MAC_BASE1;
++        }
++        else if ( MACnum == 1 ) {
++                // Set MAC 1
++                H_MAC_BASE  = MAC_BASE2;
++        }
++        else {
++            printf("wrong parameter (mac number)\n");
++            ret = -1;
++            break;
++        }
++        MAC_PHYBASE = H_MAC_BASE;
++        
++        if ( ( PHYaddr < 0 ) || ( PHYaddr > 31 ) ) {
++            printf("wrong parameter (PHY address)\n");
++            ret = -1;
++            break;
++        }
++        
++        MAC_40h_old = ReadSOC_DD( H_MAC_BASE + 0x40 );
++        AST2300_NewMDIO = (MAC_40h_old & 0x80000000) ? 1 : 0;
++        
++        if (AST2300_NewMDIO) {
++            WriteSOC_DD( MAC_PHYBASE + 0x60, ( reg_data << 16 ) | MAC_PHYWr_New | (PHYaddr<<5) | (PHYreg & 0x1f));
++
++            while ( ReadSOC_DD( MAC_PHYBASE + 0x60 ) & MAC_PHYBusy_New ) {
++                if ( ++timeout > TIME_OUT_PHY_RW ) {
++                    ret = -1;
++                    break;
++                }
++            }
++        } 
++        else {
++            WriteSOC_DD( MAC_PHYBASE + 0x64, reg_data );
++            WriteSOC_DD( MAC_PHYBASE + 0x60, MDC_Thres | MAC_PHYWr | (PHYaddr<<16) | ((PHYreg & 0x1f) << 21));
++
++            while ( ReadSOC_DD( MAC_PHYBASE + 0x60 ) & MAC_PHYWr ) {
++                if ( ++timeout > TIME_OUT_PHY_RW ) {
++                    ret = -1;
++                    break;
++                }
++            }
++        } // End if (AST2300_NewMDIO)
++        
++        printf("Write: PHY[%d] reg[%2X] = %08lX\n", PHYaddr, PHYreg, reg_data );     
++    } while ( 0 );
++
++    return ret;
++}
++
++U_BOOT_CMD(
++    phyr,    CONFIG_SYS_MAXARGS, 0,  do_phyread,
++    "phyr    - Read PHY register.  (phyr mac addr reg)\n",
++    NULL
++);
++
++U_BOOT_CMD(
++    phyw,    CONFIG_SYS_MAXARGS, 0,  do_phywrite,
++    "phyw    - Write PHY register. (phyw mac addr reg data)\n",
++    NULL
++);
++
++#endif // End SLT_UBOOT
++
+diff --git a/common/cmd_slt.c b/common/cmd_slt.c
+new file mode 100644
+index 0000000..9763692
+--- /dev/null
++++ b/common/cmd_slt.c
+@@ -0,0 +1,49 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++*/
++
++#include <command.h>
++
++extern int pll_function(int argc, char *argv[]);
++extern int trap_function(int argc, char *argv[]);
++extern int dram_stress_function(int argc, char *argv[]);
++
++int do_plltest (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
++{
++    return pll_function( argc, argv);
++}
++
++U_BOOT_CMD(
++    plltest,   CONFIG_SYS_MAXARGS, 0,  do_plltest,
++    "plltest - PLLTest [pll mode] [err rate] \n",
++    NULL
++);
++
++int do_traptest (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
++{
++    return trap_function( argc, argv);
++}
++
++U_BOOT_CMD(
++    traptest,   CONFIG_SYS_MAXARGS, 0,  do_traptest,
++    "traptest- Check hardware trap for CPU clock and CPU\\AHB ratio.\n",
++    NULL
++);
++
++int do_dramtest (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
++{
++    return dram_stress_function( argc, argv);
++}
++
++U_BOOT_CMD(
++    dramtest,   CONFIG_SYS_MAXARGS, 0,  do_dramtest,
++    "dramtest- Stress DRAM.\n",
++    NULL
++);
+diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
+index 72e85a3..2b35587 100644
+--- a/drivers/i2c/Makefile
++++ b/drivers/i2c/Makefile
+@@ -43,6 +43,7 @@ COBJS-$(CONFIG_S3C44B0_I2C) += s3c44b0_i2c.o
+ COBJS-$(CONFIG_SOFT_I2C) += soft_i2c.o
+ COBJS-$(CONFIG_TEGRA_I2C) += tegra_i2c.o
+ COBJS-$(CONFIG_TSI108_I2C) += tsi108_i2c.o
++COBJS-$(CONFIG_DRIVER_ASPEED_I2C) += aspeed_i2c.o
+ COBJS-$(CONFIG_U8500_I2C) += u8500_i2c.o
+ COBJS-$(CONFIG_SH_I2C) += sh_i2c.o
+ COBJS-$(CONFIG_SH_SH7734_I2C) += sh_sh7734_i2c.o
+diff --git a/drivers/i2c/aspeed_i2c.c b/drivers/i2c/aspeed_i2c.c
+new file mode 100755
+index 0000000..ff6c756
+--- /dev/null
++++ b/drivers/i2c/aspeed_i2c.c
+@@ -0,0 +1,286 @@
++/*
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++#include <common.h>
++#include <asm/arch/aspeed_i2c.h>
++
++#ifdef CONFIG_DRIVER_ASPEED_I2C
++
++void i2c_init (int speed, int slaveadd)
++{
++	unsigned long SCURegister;
++//I2C Reset
++        SCURegister = inl (SCU_BASE + SCU_RESET_CONTROL);
++        outl (SCURegister & ~(0x04), SCU_BASE + SCU_RESET_CONTROL);
++//I2C Multi-Pin
++        SCURegister = inl (SCU_BASE + SCU_MULTIFUNCTION_PIN_CTL5_REG);
++        outl ((SCURegister | 0x30000), SCU_BASE + SCU_MULTIFUNCTION_PIN_CTL5_REG);
++//Reset
++	outl (0, I2C_FUNCTION_CONTROL_REGISTER);
++//Set AC Timing, we use fix AC timing for eeprom in u-boot
++	outl (AC_TIMING, I2C_AC_TIMING_REGISTER_1);
++	outl (0, I2C_AC_TIMING_REGISTER_2);
++//Clear Interrupt
++	outl (ALL_CLEAR, I2C_INTERRUPT_STATUS_REGISTER);
++//Enable Master Mode
++	outl (MASTER_ENABLE, I2C_FUNCTION_CONTROL_REGISTER);
++//Enable Interrupt, STOP Interrupt has bug in AST2000
++	outl (0xAF, I2C_INTERRUPT_CONTROL_REGISTER);
++//Set Slave address, should not use for eeprom
++	outl (slaveadd, I2C_DEVICE_ADDRESS_REGISTER);
++}
++
++static int i2c_read_byte (u8 devaddr, u16 regoffset, u8 * value, int alen)
++{
++	int i2c_error = 0;
++	u32 status, count = 0;
++
++//Start and Send Device Address
++	outl (devaddr, I2C_BYTE_BUFFER_REGISTER);
++	outl (MASTER_START_COMMAND | MASTER_TX_COMMAND, I2C_COMMAND_REGISTER);
++//Wait Tx ACK
++        do {
++            status = (inl (I2C_INTERRUPT_STATUS_REGISTER) & (TX_ACK | TX_NACK));
++            count++;
++            if (count == LOOP_COUNT) {
++                i2c_error = 1;
++                printf ("Start and Send Device Address can't get ACK back\n");
++                return i2c_error;
++            }
++        } while (status != TX_ACK);
++        count = 0;
++//Clear Interrupt
++	outl (ALL_CLEAR, I2C_INTERRUPT_STATUS_REGISTER);
++//Check if address length equals to 16bits
++        if (alen != 1) {
++//Send Device Register Offset (HIGH BYTE)
++	    outl ((regoffset & 0xFF00) >> 8, I2C_BYTE_BUFFER_REGISTER);
++	    outl (MASTER_TX_COMMAND, I2C_COMMAND_REGISTER);
++//Wait Tx ACK
++            do {
++                status = (inl (I2C_INTERRUPT_STATUS_REGISTER) & (TX_ACK | TX_NACK));
++                count++;
++                if (count == LOOP_COUNT) {
++                    i2c_error = 1;
++                    printf ("Send Device Register Offset can't get ACK back\n");
++                    return i2c_error;
++                }
++            } while (status != TX_ACK);
++            count = 0;
++//Clear Interrupt
++	    outl (ALL_CLEAR, I2C_INTERRUPT_STATUS_REGISTER);
++	}
++//Send Device Register Offset(LOW)
++	outl (regoffset & 0xFF, I2C_BYTE_BUFFER_REGISTER);
++	outl (MASTER_TX_COMMAND, I2C_COMMAND_REGISTER);
++//Wait Tx ACK
++        do {
++            status = (inl (I2C_INTERRUPT_STATUS_REGISTER) & (TX_ACK | TX_NACK));
++            count++;
++            if (count == LOOP_COUNT) {
++                i2c_error = 1;
++                printf ("Send Device Register Offset can't get ACK back\n");
++                return i2c_error;
++            }
++        } while (status != TX_ACK);
++        count = 0;
++//Clear Interrupt
++	outl (ALL_CLEAR, I2C_INTERRUPT_STATUS_REGISTER);
++//Start, Send Device Address + 1 (Read Mode), Receive Data
++	outl (devaddr + 1, I2C_BYTE_BUFFER_REGISTER);
++	outl (MASTER_START_COMMAND | MASTER_TX_COMMAND | MASTER_RX_COMMAND | RX_COMMAND_LIST, I2C_COMMAND_REGISTER);
++//Wait Rx Done
++        do {
++            status = (inl (I2C_INTERRUPT_STATUS_REGISTER) & RX_DONE);
++            count++;
++            if (count == LOOP_COUNT) {
++                i2c_error = 1;
++                printf ("Can't get RX_DONE back\n");
++                return i2c_error;
++            }
++        } while (status != RX_DONE);
++        count = 0;
++//Clear Interrupt
++	outl (ALL_CLEAR, I2C_INTERRUPT_STATUS_REGISTER);
++//Enable Interrupt + Stop Interrupt
++	outl (0xBF, I2C_INTERRUPT_CONTROL_REGISTER);
++//Issue Stop Command
++	outl (MASTER_STOP_COMMAND, I2C_COMMAND_REGISTER);
++//Wait Stop
++        do {
++            status = (inl (I2C_INTERRUPT_STATUS_REGISTER) & STOP_DONE);
++            count++;
++            if (count == LOOP_COUNT) {
++                i2c_error = 1;
++                printf ("Can't get STOP back\n");
++                return i2c_error;
++            }
++        } while (status != STOP_DONE);
++//Disable Stop Interrupt
++	outl (0xAF, I2C_INTERRUPT_CONTROL_REGISTER);
++//Clear Interrupt
++	outl (ALL_CLEAR, I2C_INTERRUPT_STATUS_REGISTER);
++//Read Received Data
++        *value = ((inl (I2C_BYTE_BUFFER_REGISTER) & 0xFF00) >> 8);
++
++	return i2c_error;
++}
++
++static int i2c_write_byte (u8 devaddr, u16 regoffset, u8 value, int alen)
++{
++	int i2c_error = 0;
++        u32 status, count = 0;
++
++//Start and Send Device Address
++	outl (devaddr, I2C_BYTE_BUFFER_REGISTER);
++	outl (MASTER_START_COMMAND | MASTER_TX_COMMAND, I2C_COMMAND_REGISTER);
++//Wait Tx ACK
++        do {
++            status = (inl (I2C_INTERRUPT_STATUS_REGISTER) & (TX_ACK | TX_NACK));
++            count++;
++            if (status == TX_NACK) {
++//Clear Interrupt
++   	        outl (ALL_CLEAR, I2C_INTERRUPT_STATUS_REGISTER);
++//Re-send Start and Send Device Address while NACK return
++	        outl (devaddr, I2C_BYTE_BUFFER_REGISTER);
++        	outl (MASTER_START_COMMAND | MASTER_TX_COMMAND, I2C_COMMAND_REGISTER);
++            }
++            else {
++            	if (count == LOOP_COUNT) {
++            	    i2c_error = 1;
++                    printf ("Start and Send Device Address can't get ACK back\n");
++                    return i2c_error;
++            	}
++            }
++        } while (status != TX_ACK);
++        count = 0;
++//Clear Interrupt
++	outl (ALL_CLEAR, I2C_INTERRUPT_STATUS_REGISTER);
++//Check if address length equals to 16bits
++        if (alen != 1) {
++//Send Device Register Offset (HIGH BYTE)
++	    outl ((regoffset & 0xFF00) >> 8, I2C_BYTE_BUFFER_REGISTER);
++	    outl (MASTER_TX_COMMAND, I2C_COMMAND_REGISTER);
++//Wait Tx ACK
++            do {
++                status = (inl (I2C_INTERRUPT_STATUS_REGISTER) & (TX_ACK | TX_NACK));
++                count++;
++                if (count == LOOP_COUNT) {
++                    i2c_error = 1;
++                    printf ("Send Device Register Offset can't get ACK back\n");
++                    return i2c_error;
++                }
++            } while (status != TX_ACK);
++            count = 0;
++//Clear Interrupt
++	    outl (ALL_CLEAR, I2C_INTERRUPT_STATUS_REGISTER);
++	}
++//Send Device Register Offset
++	outl (regoffset & 0xFF, I2C_BYTE_BUFFER_REGISTER);
++	outl (MASTER_TX_COMMAND, I2C_COMMAND_REGISTER);
++//Wait Tx ACK
++        do {
++            status = (inl (I2C_INTERRUPT_STATUS_REGISTER) & (TX_ACK | TX_NACK));
++            count++;
++            if (count == LOOP_COUNT) {
++                i2c_error = 1;
++                printf ("Send Device Register Offset can't get ACK back\n");
++                return i2c_error;
++            }
++        } while (status != TX_ACK);
++        count = 0;
++//Clear Interrupt
++	outl (ALL_CLEAR, I2C_INTERRUPT_STATUS_REGISTER);
++//Send Device Register Value
++	outl (value, I2C_BYTE_BUFFER_REGISTER);
++	outl (MASTER_TX_COMMAND, I2C_COMMAND_REGISTER);
++//Wait Tx ACK
++        do {
++            status = (inl (I2C_INTERRUPT_STATUS_REGISTER) & (TX_ACK | TX_NACK));
++            count++;
++            if (count == LOOP_COUNT) {
++                i2c_error = 1;
++                printf ("Send Device Register Value can't get ACK back\n");
++                return i2c_error;
++            }
++        } while (status != TX_ACK);
++        count = 0;
++//Clear Interrupt
++	outl (ALL_CLEAR, I2C_INTERRUPT_STATUS_REGISTER);
++//Enable Interrupt + Stop Interrupt
++	outl (0xBF, I2C_INTERRUPT_CONTROL_REGISTER);
++//Issue Stop Command
++	outl (MASTER_STOP_COMMAND, I2C_COMMAND_REGISTER);
++//Wait Stop
++        do {
++            status = (inl (I2C_INTERRUPT_STATUS_REGISTER) & STOP_DONE);
++            count++;
++            if (count == LOOP_COUNT) {
++                i2c_error = 1;
++                printf ("Can't get STOP back\n");
++                return i2c_error;
++            }
++        } while (status != STOP_DONE);
++//Disable Stop Interrupt
++	outl (0xAF, I2C_INTERRUPT_CONTROL_REGISTER);
++//Clear Interrupt
++	outl (ALL_CLEAR, I2C_INTERRUPT_STATUS_REGISTER);
++
++	return i2c_error;
++}
++
++int i2c_probe (uchar chip)
++{
++//Suppose IP is always on chip
++	int res = 0;
++	
++	return res;
++}
++
++int i2c_read (uchar device_addr, uint register_offset, int alen, uchar * buffer, int len)
++{
++	int i;
++
++        if ((alen == 1) && ((register_offset + len) > 256)) {
++        	printf ("Register index overflow\n");
++        }
++        
++        for (i = 0; i < len; i++) {
++	        if (i2c_read_byte (device_addr, register_offset + i, &buffer[i], alen)) {
++		        printf ("I2C read: I/O error\n");
++			i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
++			return 1;
++		}
++	}
++
++	return 0;
++}
++
++int i2c_write (uchar device_addr, uint register_offset, int alen, uchar * buffer, int len)
++{
++	int i;
++
++        if ((alen == 1) && ((register_offset + len) > 256)) {
++        	printf ("Register index overflow\n");
++        }
++
++        for (i = 0; i < len; i++) {
++	        if (i2c_write_byte (device_addr, register_offset + i, buffer[i], alen)) {
++		        printf ("I2C read: I/O error\n");
++			i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
++			return 1;
++   	        }
++	}
++
++	return 0;
++}
++
++#endif /* CONFIG_DRIVER_ASPEED_I2C */
+diff --git a/drivers/net/Makefile b/drivers/net/Makefile
+index 9cf2983..a1d19ca 100644
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -68,6 +68,7 @@ COBJS-$(CONFIG_PLB2800_ETHER) += plb2800_eth.o
+ COBJS-$(CONFIG_RTL8139) += rtl8139.o
+ COBJS-$(CONFIG_RTL8169) += rtl8169.o
+ COBJS-$(CONFIG_SH_ETHER) += sh_eth.o
++COBJS-$(CONFIG_ASPEEDNIC) += aspeednic.o
+ COBJS-$(CONFIG_SMC91111) += smc91111.o
+ COBJS-$(CONFIG_SMC911X) += smc911x.o
+ COBJS-$(CONFIG_SUNXI_WEMAC) += sunxi_wemac.o
+diff --git a/drivers/net/aspeednic.c b/drivers/net/aspeednic.c
+new file mode 100644
+index 0000000..6b1ce05
+--- /dev/null
++++ b/drivers/net/aspeednic.c
+@@ -0,0 +1,1528 @@
++/*
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++#include <common.h>
++
++#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && defined(CONFIG_ASPEEDNIC)
++
++#include <malloc.h>
++#include <net.h>
++#include <pci.h>
++
++
++/*
++  SCU88 D[31]: MAC1 MDIO
++  SCU88 D[30]: MAC1 MDC
++  SCU90 D[2]:  MAC2 MDC/MDIO
++  SCU80 D[0]:  MAC1 Link
++  SCU80 D[1]:  MAC2 Link
++*/
++#define pci_find_devices         NULL
++#define pci_read_config_dword    NULL
++#if defined(CONFIG_AST1300)
++#define SCU_BASE                 CONFIG_SCUREG_BASE
++#else
++#define SCU_BASE                 0x1E6E2000
++#endif
++#define SCU_RESET_CONTROL        0x04
++#define SCU_CLOCK_SELECTION      0x08
++#define SCU_CLOCK_CONTROL        0x0C
++#define SCU_MAC_CLOCK_DELAY      0x48
++#define SCU_SCRATCH_REGISTER     0x40
++#define SCU_HARDWARE_TRAPPING    0x70
++#define SCU_PIN_MUX              0x74
++#define SCU_MULTIFUNCTION_PIN_CTL1_REG     0x80
++#define SCU_MULTIFUNCTION_PIN_CTL3_REG     0x88
++#define SCU_MULTIFUNCTION_PIN_CTL5_REG     0x90
++#define MAC_INTERFACE            0x1C0
++#define GMII                     0x0
++#define MII                      0x40
++#define MAC1_CLOCK_ENABLE        (1 << 20)
++#define MAC2_CLOCK_ENABLE        (1 << 21)
++#define MAC_AHB_CLOCK_DIVIDER    (0x07 << 16)
++#if defined(CONFIG_AST2300_FPGA_2) || defined(CONFIG_AST2300) || defined(CONFIG_AST3100) || defined(CONFIG_AST2400)
++#define MAC1_MDIO                (1 << 31)
++#define MAC1_MDC                 (1 << 30)
++#define MAC1_PHY_LINK            (1 << 0)
++#define MAC2_MDC_MDIO            (1 << 2)
++#define MAC1_PHY_LINK            (1 << 0)
++#define MAC2_PHY_LINK            (1 << 1)
++#else
++#define MAC2_MDC_MDIO            (1 << 20)
++#define MAC2_MII                 (1 << 21)
++#define MAC1_PHY_LINK            (1 << 25)
++#define MAC2_PHY_LINK            (1 << 26)
++#endif
++
++#if defined(CONFIG_AST1300)
++unsigned int aspeednic_iobase[1] = {CONFIG_MACREG_BASE};
++#else
++unsigned int aspeednic_iobase[CONFIG_ASPEED_MAC_NUMBER] = {
++  0x1E660000, 0x1E680000};
++#endif
++
++#undef DEBUG_SROM
++#undef DEBUG_SROM2
++
++#undef UPDATE_SROM
++
++/* PCI Registers.
++ */
++#define PCI_CFDA_PSM    0x43
++
++#define CFRV_RN   0x000000f0  /* Revision Number */
++
++#define WAKEUP    0x00    /* Power Saving Wakeup */
++#define SLEEP   0x80    /* Power Saving Sleep Mode */
++
++#define DC2114x_BRK 0x0020    /* CFRV break between DC21142 & DC21143 */
++
++/* MAC chip register */
++#define ISR_REG       0x00        // interrups status register
++#define IER_REG       0x04        // interrupt maks register
++#define MAC_MADR_REG            0x08        // MAC address (Most significant)
++#define MAC_LADR_REG            0x0c        // MAC address (Least significant)
++
++#define MAHT0_REG     0x10        // Multicast Address Hash Table 0 register
++#define MAHT1_REG     0x14        // Multicast Address Hash Table 1 register
++#define TXPD_REG      0x18        // Transmit Poll Demand register
++#define RXPD_REG      0x1c        // Receive Poll Demand register
++#define TXR_BADR_REG            0x20        // Transmit Ring Base Address register
++#define RXR_BADR_REG            0x24        // Receive Ring Base Address register
++
++#define HPTXPD_REG      0x28  //
++#define HPTXR_BADR_REG            0x2c  //
++
++#define ITC_REG       0x30        // interrupt timer control register
++#define APTC_REG      0x34        // Automatic Polling Timer control register
++#define DBLAC_REG     0x38        // DMA Burst Length and Arbitration control register
++
++#define DMAFIFOS_REG            0x3c  //
++#define FEAR_REG      0x44  //
++#define TPAFCR_REG      0x48  //
++#define RBSR_REG      0x4c  //for NC Body
++#define MACCR_REG     0x50        // MAC control register
++#define MACSR_REG     0x54        // MAC status register
++#define PHYCR_REG     0x60        // PHY control register
++#define PHYDATA_REG     0x64        // PHY Write Data register
++#define FCR_REG       0x68        // Flow Control register
++#define BPR_REG       0x6c        // back pressure register
++#define WOLCR_REG     0x70        // Wake-On-Lan control register
++#define WOLSR_REG     0x74        // Wake-On-Lan status register
++#define WFCRC_REG     0x78        // Wake-up Frame CRC register
++#define WFBM1_REG     0x80        // wake-up frame byte mask 1st double word register
++#define WFBM2_REG     0x84        // wake-up frame byte mask 2nd double word register
++#define WFBM3_REG     0x88        // wake-up frame byte mask 3rd double word register
++#define WFBM4_REG     0x8c        // wake-up frame byte mask 4th double word register
++
++
++// --------------------------------------------------------------------
++//    MACCR_REG
++// --------------------------------------------------------------------
++
++#define SW_RST_bit      (1UL<<31)       // software reset/
++#define DIRPATH_bit     (1UL<<21)
++#define RX_IPCS_FAIL_bit  (1UL<<20) //
++#define RX_TCPCS_FAIL_bit (1UL<<19) //
++#define SPEED_100M_MODE_bit     (1UL<<19)
++#define RX_UDPCS_FAIL_bit (1UL<<18) //
++#define RX_BROADPKT_bit   (1UL<<17)       // Receiving broadcast packet
++#define RX_MULTIPKT_bit   (1UL<<16)       // receiving multicast packet
++#define RX_HT_EN_bit    (1UL<<15)
++#define RX_ALLADR_bit   (1UL<<14)       // not check incoming packet's destination address
++#define JUMBO_LF_bit    (1UL<<13) //
++#define RX_RUNT_bit     (1UL<<12)       // Store incoming packet even its length is les than 64 byte
++#define CRC_CHK_bit     (1UL<<11) //
++#define CRC_APD_bit     (1UL<<10)       // append crc to transmit packet
++#define GMAC_MODE_bit   (1UL<<9)  //
++#define FULLDUP_bit     (1UL<<8)        // full duplex
++#define ENRX_IN_HALFTX_bit  (1UL<<7)  //
++#define LOOP_EN_bit     (1UL<<6)        // Internal loop-back
++#define HPTXR_EN_bit    (1UL<<5)  //
++#define REMOVE_VLAN_bit   (1UL<<4)  //
++#define RXMAC_EN_bit    (1UL<<3)        // receiver enable
++#define TXMAC_EN_bit    (1UL<<2)        // transmitter enable
++#define RXDMA_EN_bit    (1UL<<1)        // enable DMA receiving channel
++#define TXDMA_EN_bit    (1UL<<0)        // enable DMA transmitting channel
++
++//---------------------------------------------------
++//  PHY R/W Register Bit
++//---------------------------------------------------
++#define MIIWR                   (1UL<<27)
++#define MIIRD                   (1UL<<26)
++#define MDC_CYCTHR              0x34
++#define PHY_SPEED_MASK          0xC000
++#define PHY_DUPLEX_MASK         0x2000
++#define SPEED_1000M             0x02
++#define SPEED_100M              0x01
++#define SPEED_10M               0x00
++#define DUPLEX_FULL             0x01
++#define DUPLEX_HALF             0x00
++#define RESOLVED_BIT            0x800
++
++#define PHY_SPEED_DUPLEX_MASK   0x01E0
++#define PHY_100M_DUPLEX         0x0100
++#define PHY_100M_HALF           0x0080
++#define PHY_10M_DUPLEX          0x0040
++#define PHY_10M_HALF            0x0020
++
++
++
++/* Descriptor bits.
++ */
++#define TXDMA_OWN 0x80000000  /* Own Bit */
++#define RXPKT_RDY       0x00000000
++#define RXPKT_STATUS    0x80000000
++//#define EDORR   0x00008000  /* Receive End Of Ring */
++#define EDORR   0x40000000  /* Receive End Of Ring */
++#define LRS   0x10000000  /* Last Descriptor */
++#define RD_ES   0x00008000  /* Error Summary */
++//#define EDOTR   0x00008000  /* Transmit End Of Ring */
++#define EDOTR   0x40000000  /* Transmit End Of Ring */
++#define T_OWN   0x80000000  /* Own Bit */
++#define LTS   0x10000000  /* Last Segment */
++#define FTS   0x20000000  /* First Segment */
++#define CRC_ERR         0x00080000
++#define TD_ES   0x00008000  /* Error Summary */
++#define TD_SET    0x08000000  /* Setup Packet */
++#define RX_ERR          0x00040000
++#define FTL             0x00100000
++#define RUNT            0x00200000
++#define RX_ODD_NB       0x00400000
++
++#define POLL_DEMAND 1
++#define RESET_DE4X5(dev) {                                              \
++    int i;                                                              \
++    i=INL(dev, MACCR_REG);                                              \
++    udelay(1000);                                                       \
++    OUTL(dev, i | SW_RST_bit, MACCR_REG);                               \
++    for (; (INL(dev, MACCR_REG ) & SW_RST_bit) != 0; ) {udelay(1000);}  \
++    OUTL(dev, 0, IER_REG );                                             \
++  }
++
++#define START_MAC(dev) {                                              \
++    s32 omr;                                                          \
++    omr = INL(dev, MACCR_REG);                                        \
++    omr |= RXMAC_EN_bit | TXMAC_EN_bit | RXDMA_EN_bit | TXDMA_EN_bit; \
++    OUTL(dev, omr, MACCR_REG);    /* Enable the TX and/or RX */       \
++  }
++
++#define STOP_MAC(dev) {                                                 \
++    s32 omr;                                                            \
++    omr = INL(dev, MACCR_REG);                                          \
++    omr &= ~(RXMAC_EN_bit | TXMAC_EN_bit | RXDMA_EN_bit | TXDMA_EN_bit); \
++    OUTL(dev, omr, MACCR_REG);    /* Disable the TX and/or RX */        \
++  }
++
++#define NUM_RX_DESC PKTBUFSRX
++#define NUM_TX_DESC 1     /* Number of TX descriptors   */
++#define RX_BUFF_SZ  PKTSIZE_ALIGN
++#define TX_BUFF_SZ  1514
++
++#define TOUT_LOOP   1000000
++#define PHY_LOOP    250
++#define ETH_ALEN  6
++#define NCSI_LOOP   1500000
++#define RETRY_COUNT     1
++
++struct de4x5_desc {
++  volatile s32 status;
++  u32 des1;
++  u32 reserved;
++  u32 buf;
++};
++
++//PHY Information
++#define PHYID_VENDOR_MASK   0xfffffc00
++#define PHYID_VENDOR_MODEL_MASK   0xfffffff0
++#define PHYID_VENDOR_MARVELL    0x01410c00
++#define PHYID_VENDOR_BROADCOM   0x00406000
++#define PHYID_VENDOR_REALTEK    0x001cc800
++#define PHYID_RTL8201EL     0x001cc810
++#define PHYID_RTL8211         0x001cc910
++#define PHYID_BCM54612E             0x03625E6A
++
++//NCSI define & structure
++//NC-SI Command Packet
++typedef struct {
++//Ethernet Header
++  unsigned char  DA[6];
++  unsigned char  SA[6];
++  unsigned short EtherType;           //DMTF NC-SI
++//NC-SI Control Packet
++  unsigned char  MC_ID;           //Management Controller should set this field to 0x00
++  unsigned char  Header_Revision;         //For NC-SI 1.0 spec, this field has to set 0x01
++  unsigned char  Reserved_1;            //Reserved has to set to 0x00
++  unsigned char  IID;             //Instance ID
++  unsigned char  Command;
++  unsigned char  Channel_ID;
++  unsigned short Payload_Length;          //Payload Length = 12 bits, 4 bits are reserved
++  unsigned long  Reserved_2;
++  unsigned long  Reserved_3;
++}  NCSI_Command_Packet;
++
++unsigned char  Payload_Data[16];
++unsigned char  Payload_Pad[4] = {0x00, 0x00, 0x00, 0x00};
++unsigned long  Payload_Checksum = 0x00000000;
++
++
++//Command and Response Type
++#define CLEAR_INITIAL_STATE     0x00      //M
++#define SELECT_PACKAGE        0x01      //M
++#define DESELECT_PACKAGE      0x02      //M
++#define ENABLE_CHANNEL        0x03      //M
++#define DISABLE_CHANNEL       0x04      //M
++#define RESET_CHANNEL       0x05      //M
++#define ENABLE_CHANNEL_NETWORK_TX   0x06      //M
++#define DISABLE_CHANNEL_NETWORK_TX    0x07      //M
++#define AEN_ENABLE        0x08
++#define SET_LINK        0x09      //M
++#define GET_LINK_STATUS       0x0A      //M
++#define SET_VLAN_FILTER       0x0B      //M
++#define ENABLE_VLAN       0x0C      //M
++#define DISABLE_VLAN        0x0D      //M
++#define SET_MAC_ADDRESS       0x0E      //M
++#define ENABLE_BROADCAST_FILTERING    0x10      //M
++#define DISABLE_BROADCAST_FILTERING   0x11      //M
++#define ENABLE_GLOBAL_MULTICAST_FILTERING 0x12
++#define DISABLE_GLOBAL_MULTICAST_FILTERING  0x13
++#define SET_NCSI_FLOW_CONTROL     0x14
++#define GET_VERSION_ID        0x15      //M
++#define GET_CAPABILITIES      0x16      //M
++#define GET_PARAMETERS        0x17      //M
++#define GET_CONTROLLER_PACKET_STATISTICS  0x18
++#define GET_NCSI_STATISTICS     0x19
++#define GET_NCSI_PASS_THROUGH_STATISTICS  0x1A
++
++//NC-SI Response Packet
++typedef struct {
++  unsigned char  DA[6];
++  unsigned char  SA[6];
++  unsigned short EtherType;           //DMTF NC-SI
++//NC-SI Control Packet
++  unsigned char  MC_ID;           //Management Controller should set this field to 0x00
++  unsigned char  Header_Revision;         //For NC-SI 1.0 spec, this field has to set 0x01
++  unsigned char  Reserved_1;            //Reserved has to set to 0x00
++  unsigned char  IID;             //Instance ID
++  unsigned char  Command;
++  unsigned char  Channel_ID;
++  unsigned short Payload_Length;          //Payload Length = 12 bits, 4 bits are reserved
++  unsigned short  Reserved_2;
++  unsigned short  Reserved_3;
++  unsigned short  Reserved_4;
++  unsigned short  Reserved_5;
++  unsigned short  Response_Code;
++  unsigned short  Reason_Code;
++  unsigned char   Payload_Data[64];
++}  NCSI_Response_Packet;
++
++NCSI_Command_Packet NCSI_Request;
++NCSI_Response_Packet NCSI_Respond;
++
++//Standard Response Code
++#define COMMAND_COMPLETED     0x00
++#define COMMAND_FAILED        0x01
++#define COMMAND_UNAVAILABLE     0x02
++#define COMMAND_UNSUPPORTED     0x03
++
++//Standard Reason Code
++#define NO_ERROR        0x0000
++#define INTERFACE_INITIALIZATION_REQUIRED 0x0001
++#define PARAMETER_IS_INVALID      0x0002
++#define CHANNEL_NOT_READY     0x0003
++#define PACKAGE_NOT_READY     0x0004
++#define INVALID_PAYLOAD_LENGTH      0x0005
++#define UNKNOWN_COMMAND_TYPE      0x7FFF
++
++
++struct AEN_Packet {
++//Ethernet Header
++  unsigned char  DA[6];
++  unsigned char  SA[6];           //Network Controller SA = FF:FF:FF:FF:FF:FF
++  unsigned short EtherType;           //DMTF NC-SI
++//AEN Packet Format
++  unsigned char  MC_ID;           //Network Controller should set this field to 0x00
++  unsigned char  Header_Revision;         //For NC-SI 1.0 spec, this field has to set 0x01
++  unsigned char  Reserved_1;            //Reserved has to set to 0x00
++//    unsigned char  IID = 0x00;            //Instance ID = 0 in Network Controller
++//    unsigned char  Command = 0xFF;          //AEN = 0xFF
++  unsigned char  Channel_ID;
++//    unsigned short Payload_Length = 0x04;       //Payload Length = 4 in Network Controller AEN Packet
++  unsigned long  Reserved_2;
++  unsigned long  Reserved_3;
++  unsigned char  AEN_Type;
++//    unsigned char  Reserved_4[3] = {0x00, 0x00, 0x00};
++  unsigned long  Optional_AEN_Data;
++  unsigned long  Payload_Checksum;
++};
++
++//AEN Type
++#define LINK_STATUS_CHANGE      0x0
++#define CONFIGURATION_REQUIRED      0x1
++#define HOST_NC_DRIVER_STATUS_CHANGE    0x2
++
++typedef struct {
++  unsigned char Package_ID;
++  unsigned char Channel_ID;
++  unsigned long Capabilities_Flags;
++  unsigned long Broadcast_Packet_Filter_Capabilities;
++  unsigned long Multicast_Packet_Filter_Capabilities;
++  unsigned long Buffering_Capabilities;
++  unsigned long AEN_Control_Support;
++} NCSI_Capability;
++NCSI_Capability NCSI_Cap;
++
++//SET_MAC_ADDRESS
++#define UNICAST   (0x00 << 5)
++#define MULTICAST (0x01 << 5)
++#define DISABLE_MAC_ADDRESS_FILTER  0x00
++#define ENABLE_MAC_ADDRESS_FILTER 0x01
++
++//GET_LINK_STATUS
++#define LINK_DOWN 0
++#define LINK_UP   1
++
++static struct de4x5_desc rx_ring[NUM_RX_DESC] __attribute__ ((aligned(32))); /* RX descriptor ring         */
++static struct de4x5_desc tx_ring[NUM_TX_DESC] __attribute__ ((aligned(32))); /* TX descriptor ring         */
++static int rx_new;                             /* RX descriptor ring pointer */
++static int tx_new;                             /* TX descriptor ring pointer */
++static unsigned char tx_buffer[NUM_TX_DESC][TX_BUFF_SZ] __attribute__ ((aligned(32)));
++static unsigned char rx_buffer[NUM_RX_DESC][RX_BUFF_SZ] __attribute__ ((aligned(32)));
++
++
++static char rxRingSize;
++static char txRingSize;
++static unsigned int InstanceID = 0;
++static int Retry = 0;
++
++static int   aspeednic_init(struct eth_device* dev, bd_t* bis);
++static int   aspeednic_send(struct eth_device* dev, volatile void *packet, int length);
++static int   aspeednic_recv(struct eth_device* dev);
++static void  aspeednic_halt(struct eth_device* dev);
++static void  set_mac_address (struct eth_device* dev, bd_t* bis);
++static void  phy_write_register (struct eth_device* dev, u8 PHY_Register, u8 PHY_Address, u16 PHY_Data);
++static u16   phy_read_register (struct eth_device* dev, u8 PHY_Register, u8 PHY_Address);
++static void  set_mac_control_register(struct eth_device* dev);
++
++#if defined(CONFIG_E500)
++#define phys_to_bus(a) (a)
++#else
++#define phys_to_bus(a)  pci_phys_to_mem((pci_dev_t)dev->priv, a)
++#endif
++
++static int INL(struct eth_device* dev, u_long addr)
++{
++  return le32_to_cpu(*(volatile u_long *)(addr + dev->iobase));
++}
++
++static void OUTL(struct eth_device* dev, int command, u_long addr)
++{
++  *(volatile u_long *)(addr + dev->iobase) = cpu_to_le32(command);
++}
++
++
++struct eth_device aspeednic_device[CONFIG_ASPEED_MAC_NUMBER];
++
++void NCSI_Struct_Initialize(void)
++{
++  unsigned long i;
++
++  for (i = 0; i < 6; i++) {
++    NCSI_Request.DA[i] = 0xFF;
++    NCSI_Respond.DA[i] = 0xFF;
++    NCSI_Respond.SA[i] = 0xFF;
++  }
++  NCSI_Request.EtherType = 0xF888;
++  NCSI_Request.MC_ID = 0;
++  NCSI_Request.Header_Revision = 0x01;
++  NCSI_Request.Reserved_1 = 0;
++  NCSI_Request.Reserved_2 = 0;
++  NCSI_Request.Reserved_3 = 0;
++  NCSI_Respond.EtherType = 0xF888;
++  NCSI_Respond.MC_ID = 0;
++  NCSI_Respond.Header_Revision = 0x01;
++  NCSI_Respond.Reserved_1 = 0;
++  NCSI_Respond.Reserved_2 = 0;
++  NCSI_Respond.Reserved_3 = 0;
++}
++
++int aspeednic_initialize(bd_t *bis)
++{
++  int               card_number = 0;
++  unsigned int    iobase, SCURegister;
++  struct eth_device*  dev;
++
++#if defined(CONFIG_AST2300_FPGA_2) || defined(CONFIG_AST2300) || defined(CONFIG_AST3100) || defined(CONFIG_AST2400)
++//AST2300
++//MAC1 CLOCK/RESET/PHY_LINK/MDC_MDIO in SCU
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_RESET_CONTROL));
++  *(volatile u_long *)(SCU_BASE + SCU_RESET_CONTROL) = cpu_to_le32(SCURegister | 0x800);
++  udelay(100);
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_CLOCK_CONTROL));
++  *(volatile u_long *)(SCU_BASE + SCU_CLOCK_CONTROL) = cpu_to_le32(SCURegister & ~(MAC1_CLOCK_ENABLE));
++  udelay(10000);
++//Add Clock Selection in AST2300 A1, Please check the datasheet for more detail
++//The current sample code uses 0: H-PLL/2 because all EVBs have RGMII interface
++//        SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_CLOCK_SELECTION));
++//  *(volatile u_long *)(SCU_BASE + SCU_CLOCK_SELECTION) = cpu_to_le32(SCURegister & ~(MAC_AHB_CLOCK_DIVIDER));
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_RESET_CONTROL));
++  *(volatile u_long *)(SCU_BASE + SCU_RESET_CONTROL) = cpu_to_le32(SCURegister & ~(0x800));
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_MULTIFUNCTION_PIN_CTL3_REG));
++  *(volatile u_long *)(SCU_BASE + SCU_MULTIFUNCTION_PIN_CTL3_REG) = cpu_to_le32(SCURegister | (MAC1_MDIO | MAC1_MDC));
++//        SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_MAC_CLOCK_DELAY));
++//Currently we use fix value in MAC timing on EVB
++//  *(volatile u_long *)(SCU_BASE + SCU_MAC_CLOCK_DELAY) = CONFIG_MAC_INTERFACE_CLOCK_DELAY;
++#ifdef CONFIG_MAC1_PHY_LINK_INTERRUPT
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_MULTIFUNCTION_PIN_CTL1_REG));
++  *(volatile u_long *)(SCU_BASE + SCU_MULTIFUNCTION_PIN_CTL1_REG) = cpu_to_le32(SCURegister | (MAC1_PHY_LINK));
++#endif
++
++//MAC2 CLOCK/RESET/PHY_LINK/MDC_MDIO
++#ifdef CONFIG_MAC2_ENABLE
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_RESET_CONTROL));
++  *(volatile u_long *)(SCU_BASE + SCU_RESET_CONTROL) = cpu_to_le32(SCURegister | 0x1000);
++  udelay(10);
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_CLOCK_CONTROL));
++  *(volatile u_long *)(SCU_BASE + SCU_CLOCK_CONTROL) = cpu_to_le32(SCURegister & ~(MAC2_CLOCK_ENABLE));
++  udelay(10000);
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_RESET_CONTROL));
++  *(volatile u_long *)(SCU_BASE + SCU_RESET_CONTROL) = cpu_to_le32(SCURegister & ~(0x1000));
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_MULTIFUNCTION_PIN_CTL5_REG));
++  *(volatile u_long *)(SCU_BASE + SCU_MULTIFUNCTION_PIN_CTL5_REG) = cpu_to_le32(SCURegister | (MAC2_MDC_MDIO));
++#endif
++#ifdef CONFIG_MAC2_PHY_LINK_INTERRUPT
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_MULTIFUNCTION_PIN_CTL1_REG));
++  *(volatile u_long *)(SCU_BASE + SCU_MULTIFUNCTION_PIN_CTL1_REG) = cpu_to_le32(SCURegister | (MAC2_PHY_LINK));
++#endif
++#else
++//AST1100/AST2050/AST2100
++//MAC1 RESET/PHY_LINK in SCU
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_RESET_CONTROL));
++  *(volatile u_long *)(SCU_BASE + SCU_RESET_CONTROL) = cpu_to_le32(SCURegister & ~(0x800));
++#ifdef CONFIG_MAC1_PHY_LINK_INTERRUPT
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_PIN_MUX));
++  *(volatile u_long *)(SCU_BASE + SCU_PIN_MUX) = cpu_to_le32(SCURegister | (MAC1_PHY_LINK));
++#endif
++
++//MAC2
++#ifdef CONFIG_MAC2_ENABLE
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_RESET_CONTROL));
++  *(volatile u_long *)(SCU_BASE + SCU_RESET_CONTROL) = cpu_to_le32(SCURegister & ~(0x1000));
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_PIN_MUX));
++  *(volatile u_long *)(SCU_BASE + SCU_PIN_MUX) = cpu_to_le32(SCURegister | (MAC2_MDC_MDIO));
++#endif
++#ifdef CONFIG_MAC2_MII_ENABLE
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_PIN_MUX));
++  *(volatile u_long *)(SCU_BASE + SCU_PIN_MUX) = cpu_to_le32(SCURegister | (MAC2_MII));
++#endif
++#ifdef CONFIG_MAC2_PHY_LINK_INTERRUPT
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_PIN_MUX));
++  *(volatile u_long *)(SCU_BASE + SCU_PIN_MUX) = cpu_to_le32(SCURegister | (MAC2_PHY_LINK));
++#endif
++#endif
++
++  iobase = aspeednic_iobase[card_number];
++
++  dev = &aspeednic_device[card_number];
++
++
++  sprintf(dev->name, "aspeednic#%d", card_number);
++
++  dev->iobase = iobase;
++
++  if (CONFIG_MAC1_PHY_SETTING >= 1) {
++//NCSI Struct Initialize
++    NCSI_Struct_Initialize();
++  }
++//Set Scratch register (0x1E6E2040 D[15:14])(0x1E6E2041 D[7:6]) to inform kernel MAC1 driver
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_SCRATCH_REGISTER));
++  *(volatile u_long *)(SCU_BASE + SCU_SCRATCH_REGISTER) = cpu_to_le32((SCURegister & ~(0xc000)) | (CONFIG_MAC1_PHY_SETTING << 14));
++//Set Scratch register (0x1E6E2040 D[13:12])(0x1E6E2041 D[5:4]) to inform kernel MAC2 driver
++  SCURegister = le32_to_cpu(*(volatile u_long *)(SCU_BASE + SCU_SCRATCH_REGISTER));
++  *(volatile u_long *)(SCU_BASE + SCU_SCRATCH_REGISTER) = cpu_to_le32((SCURegister & ~(0x3000)) | (CONFIG_MAC2_PHY_SETTING << 12));
++
++
++  dev->init   = aspeednic_init;
++  dev->halt   = aspeednic_halt;
++  dev->send   = aspeednic_send;
++  dev->recv   = aspeednic_recv;
++
++  /* Ensure we're not sleeping. */
++  if (CONFIG_MAC1_PHY_SETTING >= 1) {
++    udelay(2000000); //2.0 sec
++  }
++  else {
++    udelay(10 * 1000);
++  }
++
++
++  dev->init(dev, bis);
++
++  eth_register(dev);
++
++
++  return card_number;
++}
++
++void Calculate_Checksum(unsigned char *buffer_base, int Length)
++{
++  unsigned int i, CheckSum = 0;
++  unsigned int Data, Data1;
++
++  for (i = 0; i < ((Length - 14) / 2); i++) {
++    Data = buffer_base[i * 2];
++    Data1 = buffer_base[i * 2 + 1];
++    CheckSum += ((Data << 8) + Data1);
++  }
++  Payload_Checksum = (~(CheckSum) + 1); //2's complement
++//Inverse for insert into buffer
++  Data = (Payload_Checksum & 0xFF000000) >> 24;
++  Data1 = (Payload_Checksum & 0x000000FF) << 24;
++  Payload_Checksum = (Payload_Checksum & 0x00FFFF00) + Data + Data1;
++  Data = (Payload_Checksum & 0x00FF0000) >> 8;
++  Data1 = (Payload_Checksum & 0x0000FF00) << 8;
++  Payload_Checksum = (Payload_Checksum & 0xFF0000FF) + Data + Data1;
++}
++
++void copy_data (int Length)
++{
++  memcpy ((unsigned char *)(tx_ring[tx_new].buf + 30), &Payload_Data, Length);
++  Calculate_Checksum((unsigned char *)(tx_ring[tx_new].buf + 14), 30 + Length);
++  memcpy ((unsigned char *)(tx_ring[tx_new].buf + 30 + Length), &Payload_Checksum, 4);
++}
++
++void NCSI_Rx (void)
++{
++  unsigned long status, length, i = 0;
++
++  do {
++    status = (s32)le32_to_cpu(rx_ring[rx_new].status);
++    i++;
++  } while (!(((status & RXPKT_STATUS) != 0) || (i >= NCSI_LOOP)));
++
++  if (i < NCSI_LOOP) {
++    if (status & LRS) {
++      length = (le32_to_cpu(rx_ring[rx_new].status) & 0x3FFF);
++      memcpy (&NCSI_Respond, (unsigned char *)rx_ring[rx_new].buf, length);
++    }
++    rx_ring[rx_new].status &= cpu_to_le32(0x7FFFFFFF);
++    rx_new = (rx_new + 1) % rxRingSize;
++  }
++}
++
++void DeSelect_Package (struct eth_device* dev, int Package_ID)
++{
++  unsigned long Combined_Channel_ID;
++
++//TX
++  do {
++    InstanceID++;
++    NCSI_Request.IID = InstanceID;
++    NCSI_Request.Command = DESELECT_PACKAGE;
++    Combined_Channel_ID = (Package_ID << 5) + 0x1F; //Internal Channel ID = 0x1F, 0x1F means all channel
++    NCSI_Request.Channel_ID = Combined_Channel_ID;
++    NCSI_Request.Payload_Length = 0;
++    memcpy ((unsigned char *)tx_ring[tx_new].buf, &NCSI_Request, 30);
++    copy_data (NCSI_Request.Payload_Length);
++    aspeednic_send (dev, (void *)tx_ring[tx_new].buf, 30 + NCSI_Request.Payload_Length + 4);
++//RX
++    NCSI_Rx();
++    if ((NCSI_Respond.IID != InstanceID) || (NCSI_Respond.Command != (DESELECT_PACKAGE | 0x80)) || (NCSI_Respond.Response_Code != COMMAND_COMPLETED)) {
++      printf ("Retry: Command = %x, Response_Code = %x\n", NCSI_Request.Command, NCSI_Respond.Response_Code);
++      Retry++;
++      InstanceID--;
++    }
++    else {
++      Retry = 0;
++    }
++  } while ((Retry != 0) && (Retry <= RETRY_COUNT));
++  Retry = 0;
++}
++
++int Select_Package (struct eth_device* dev, int Package_ID)
++{
++  unsigned long Combined_Channel_ID, Found = 0;
++
++//TX
++  do {
++    InstanceID++;
++    NCSI_Request.IID = InstanceID;
++    NCSI_Request.Command = SELECT_PACKAGE;
++    Combined_Channel_ID = (Package_ID << 5) + 0x1F; //Internal Channel ID = 0x1F
++    NCSI_Request.Channel_ID = Combined_Channel_ID;
++    NCSI_Request.Payload_Length = (4 << 8);
++    memcpy ((unsigned char *)tx_ring[tx_new].buf, &NCSI_Request, 30);
++    NCSI_Request.Payload_Length = 4;
++    memset ((void *)Payload_Data, 0, 4);
++    Payload_Data[3] = 1; //Arbitration Disable
++    copy_data (NCSI_Request.Payload_Length);
++    aspeednic_send (dev, (void *)tx_ring[tx_new].buf, 30 + NCSI_Request.Payload_Length + 4);
++//RX
++    NCSI_Rx();
++    if ((NCSI_Respond.IID != InstanceID) || (NCSI_Respond.Command != (SELECT_PACKAGE | 0x80)) || (NCSI_Respond.Response_Code != COMMAND_COMPLETED)) {
++      printf ("Retry: Command = %x, Response_Code = %x\n", NCSI_Request.Command, NCSI_Respond.Response_Code);
++      Retry++;
++      Found = 0;
++      InstanceID--;
++    }
++    else {
++      Retry = 0;
++      Found = 1;
++    }
++  } while ((Retry != 0) && (Retry <= RETRY_COUNT));
++  Retry = 0;
++
++  return Found;
++}
++
++void DeSelect_Active_Package (struct eth_device* dev)
++{
++  unsigned long Combined_Channel_ID;
++//TX
++  do {
++    InstanceID++;
++    NCSI_Request.IID = InstanceID;
++    NCSI_Request.Command = DESELECT_PACKAGE;
++    Combined_Channel_ID = (NCSI_Cap.Package_ID << 5) + 0x1F; //Internal Channel ID = 0x1F, 0x1F means all channel
++    NCSI_Request.Channel_ID = Combined_Channel_ID;
++    NCSI_Request.Payload_Length = 0;
++    memcpy ((unsigned char *)tx_ring[tx_new].buf, &NCSI_Request, 30);
++    copy_data (NCSI_Request.Payload_Length);
++    aspeednic_send (dev, (void *)tx_ring[tx_new].buf, 30 + NCSI_Request.Payload_Length + 4);
++//RX
++    NCSI_Rx();
++    if ((NCSI_Respond.IID != InstanceID) || (NCSI_Respond.Command != (DESELECT_PACKAGE | 0x80)) || (NCSI_Respond.Response_Code != COMMAND_COMPLETED)) {
++      printf ("Retry: Command = %x, Response_Code = %x\n", NCSI_Request.Command, NCSI_Respond.Response_Code);
++      Retry++;
++      InstanceID--;
++    }
++    else {
++      Retry = 0;
++    }
++  } while ((Retry != 0) && (Retry <= RETRY_COUNT));
++  Retry = 0;
++}
++
++int Select_Active_Package (struct eth_device* dev)
++{
++  unsigned long Combined_Channel_ID, Found = 0;
++//TX
++  do {
++    InstanceID++;
++    NCSI_Request.IID = InstanceID;
++    NCSI_Request.Command = SELECT_PACKAGE;
++    Combined_Channel_ID = (NCSI_Cap.Package_ID << 5) + 0x1F; //Internal Channel ID = 0x1F
++    NCSI_Request.Channel_ID = Combined_Channel_ID;
++    NCSI_Request.Payload_Length = (4 << 8);
++    memcpy ((unsigned char *)tx_ring[tx_new].buf, &NCSI_Request, 30);
++    NCSI_Request.Payload_Length = 4;
++    memset ((void *)Payload_Data, 0, 4);
++    Payload_Data[3] = 1; //Arbitration Disable
++    copy_data (NCSI_Request.Payload_Length);
++    aspeednic_send (dev, (void *)tx_ring[tx_new].buf, 30 + NCSI_Request.Payload_Length + 4);
++//RX
++    NCSI_Rx();
++    if ((NCSI_Respond.IID != InstanceID) || (NCSI_Respond.Command != (SELECT_PACKAGE | 0x80)) || (NCSI_Respond.Response_Code != COMMAND_COMPLETED)) {
++      printf ("Retry: Command = %x, Response_Code = %x\n", NCSI_Request.Command, NCSI_Respond.Response_Code);
++      Retry++;
++      Found = 0;
++      InstanceID--;
++    }
++    else {
++      Retry = 0;
++      Found = 1;
++    }
++  } while ((Retry != 0) && (Retry <= RETRY_COUNT));
++  Retry = 0;
++
++  return Found;
++}
++
++int Clear_Initial_State (struct eth_device* dev, int Channel_ID)
++{
++  unsigned long Combined_Channel_ID, Found = 0;
++//TX
++  do {
++    InstanceID++;
++    NCSI_Request.IID = InstanceID;
++    NCSI_Request.Command = CLEAR_INITIAL_STATE;
++    Combined_Channel_ID = (NCSI_Cap.Package_ID << 5) + Channel_ID; //Internal Channel ID = 0
++    NCSI_Request.Channel_ID = Combined_Channel_ID;
++    NCSI_Request.Payload_Length = 0;
++    memcpy ((unsigned char *)tx_ring[tx_new].buf, &NCSI_Request, 30);
++    copy_data (NCSI_Request.Payload_Length);
++    aspeednic_send (dev, (void *)tx_ring[tx_new].buf, 30 + NCSI_Request.Payload_Length + 4);
++//RX
++    NCSI_Rx();
++    if ((NCSI_Respond.IID != InstanceID) || (NCSI_Respond.Command != (CLEAR_INITIAL_STATE | 0x80)) || (NCSI_Respond.Response_Code != COMMAND_COMPLETED)) {
++      printf ("Retry: Command = %x, Response_Code = %x\n", NCSI_Request.Command, NCSI_Respond.Response_Code);
++      Retry++;
++      Found = 0;
++      InstanceID--;
++    }
++    else {
++      Retry = 0;
++      Found = 1;
++    }
++  } while ((Retry != 0) && (Retry <= RETRY_COUNT));
++  Retry = 0;
++
++  return Found;
++}
++
++void Get_Version_ID (struct eth_device* dev)
++{
++  unsigned long Combined_Channel_ID;
++//TX
++  do {
++    InstanceID++;
++    NCSI_Request.IID = InstanceID;
++    NCSI_Request.Command = GET_VERSION_ID;
++    Combined_Channel_ID = (NCSI_Cap.Package_ID << 5) + NCSI_Cap.Channel_ID;
++    NCSI_Request.Channel_ID = Combined_Channel_ID;
++    NCSI_Request.Payload_Length = 0;
++    memcpy ((unsigned char *)tx_ring[tx_new].buf, &NCSI_Request, 30);
++    copy_data (NCSI_Request.Payload_Length);
++    aspeednic_send (dev, (void *)tx_ring[tx_new].buf, 30 + NCSI_Request.Payload_Length + 4);
++//RX
++    NCSI_Rx();
++    if ((NCSI_Respond.IID != InstanceID) || (NCSI_Respond.Command != (GET_VERSION_ID | 0x80)) || (NCSI_Respond.Response_Code != COMMAND_COMPLETED)) {
++      printf ("Retry: Command = %x, Response_Code = %x\n", NCSI_Request.Command, NCSI_Respond.Response_Code);
++      Retry++;
++      InstanceID--;
++    }
++    else {
++      Retry = 0;
++    }
++  } while ((Retry != 0) && (Retry <= RETRY_COUNT));
++  Retry = 0;
++}
++
++void Get_Capabilities (struct eth_device* dev)
++{
++  unsigned long Combined_Channel_ID;
++//TX
++  do {
++    InstanceID++;
++    NCSI_Request.IID = InstanceID;
++    NCSI_Request.Command = GET_CAPABILITIES;
++    Combined_Channel_ID = (NCSI_Cap.Package_ID << 5) + NCSI_Cap.Channel_ID;
++    NCSI_Request.Channel_ID = Combined_Channel_ID;
++    NCSI_Request.Payload_Length = 0;
++    memcpy ((unsigned char *)tx_ring[tx_new].buf, &NCSI_Request, 30);
++    copy_data (NCSI_Request.Payload_Length);
++    aspeednic_send (dev, (void *)tx_ring[tx_new].buf, 30 + NCSI_Request.Payload_Length + 4);
++//RX
++    NCSI_Rx();
++    if ((NCSI_Respond.IID != InstanceID) || (NCSI_Respond.Command != (GET_CAPABILITIES | 0x80)) || (NCSI_Respond.Response_Code != COMMAND_COMPLETED)) {
++      printf ("Retry: Command = %x, Response_Code = %x\n", NCSI_Request.Command, NCSI_Respond.Response_Code);
++      Retry++;
++      InstanceID--;
++    }
++    else {
++      Retry = 0;
++      NCSI_Cap.Capabilities_Flags = NCSI_Respond.Payload_Data[0];
++      NCSI_Cap.Broadcast_Packet_Filter_Capabilities = NCSI_Respond.Payload_Data[1];
++      NCSI_Cap.Multicast_Packet_Filter_Capabilities = NCSI_Respond.Payload_Data[2];
++      NCSI_Cap.Buffering_Capabilities = NCSI_Respond.Payload_Data[3];
++      NCSI_Cap.AEN_Control_Support = NCSI_Respond.Payload_Data[4];
++    }
++  } while ((Retry != 0) && (Retry <= RETRY_COUNT));
++  Retry = 0;
++}
++
++void Enable_Set_MAC_Address (struct eth_device* dev)
++{
++  unsigned long Combined_Channel_ID, i;
++//TX
++  do {
++    InstanceID++;
++    NCSI_Request.IID = InstanceID;
++    NCSI_Request.Command = SET_MAC_ADDRESS;
++    Combined_Channel_ID = (NCSI_Cap.Package_ID << 5) + NCSI_Cap.Channel_ID;
++    NCSI_Request.Channel_ID = Combined_Channel_ID;
++    NCSI_Request.Payload_Length = (8 << 8);
++    memcpy ((unsigned char *)tx_ring[tx_new].buf, &NCSI_Request, 30);
++    NCSI_Request.Payload_Length = 8;
++    for (i = 0; i < 6; i++) {
++      Payload_Data[i] = NCSI_Request.SA[i];
++    }
++    Payload_Data[6] = 1; //MAC Address Num = 1 --> address filter 1, fixed in sample code
++    Payload_Data[7] = UNICAST + 0 + ENABLE_MAC_ADDRESS_FILTER; //AT + Reserved + E
++    copy_data (NCSI_Request.Payload_Length);
++    aspeednic_send (dev, (void *)tx_ring[tx_new].buf, 30 + NCSI_Request.Payload_Length + 4);
++//RX
++    NCSI_Rx();
++    if ((NCSI_Respond.IID != InstanceID) || (NCSI_Respond.Command != (SET_MAC_ADDRESS | 0x80)) || (NCSI_Respond.Response_Code != COMMAND_COMPLETED)) {
++      printf ("Retry: Command = %x, Response_Code = %x\n", NCSI_Request.Command, NCSI_Respond.Response_Code);
++      Retry++;
++      InstanceID--;
++    }
++  } while ((Retry != 0) && (Retry <= RETRY_COUNT));
++  Retry = 0;
++}
++
++void Enable_Broadcast_Filter (struct eth_device* dev)
++{
++  unsigned long Combined_Channel_ID;
++//TX
++  do {
++    InstanceID++;
++    NCSI_Request.IID = InstanceID;
++    NCSI_Request.Command = ENABLE_BROADCAST_FILTERING;
++    Combined_Channel_ID = (NCSI_Cap.Package_ID << 5) + NCSI_Cap.Channel_ID;
++    NCSI_Request.Channel_ID = Combined_Channel_ID;
++    NCSI_Request.Payload_Length = (4 << 8);
++    memcpy ((unsigned char *)tx_ring[tx_new].buf, &NCSI_Request, 30);
++    NCSI_Request.Payload_Length = 4;
++    memset ((void *)Payload_Data, 0, 4);
++    Payload_Data[3] = 0xF; //ARP, DHCP, NetBIOS
++    copy_data (NCSI_Request.Payload_Length);
++    aspeednic_send (dev, (void *)tx_ring[tx_new].buf, 30 + NCSI_Request.Payload_Length + 4);
++//RX
++    NCSI_Rx();
++    if ((NCSI_Respond.IID != InstanceID) || (NCSI_Respond.Command != (ENABLE_BROADCAST_FILTERING | 0x80)) || (NCSI_Respond.Response_Code != COMMAND_COMPLETED)) {
++      printf ("Retry: Command = %x, Response_Code = %x\n", NCSI_Request.Command, NCSI_Respond.Response_Code);
++      Retry++;
++      InstanceID--;
++    }
++    else {
++      Retry = 0;
++    }
++  } while ((Retry != 0) && (Retry <= RETRY_COUNT));
++  Retry = 0;
++}
++
++void Enable_AEN (struct eth_device* dev)
++{
++  unsigned long Combined_Channel_ID;
++//TX
++  do {
++    InstanceID++;
++    NCSI_Request.IID = InstanceID;
++    NCSI_Request.Command = AEN_ENABLE;
++    Combined_Channel_ID = (NCSI_Cap.Package_ID << 5) + NCSI_Cap.Channel_ID;
++    NCSI_Request.Channel_ID = Combined_Channel_ID;
++    NCSI_Request.Payload_Length = (8 << 8);
++    memcpy ((unsigned char *)tx_ring[tx_new].buf, &NCSI_Request, 30);
++    NCSI_Request.Payload_Length = 8;
++    memset ((void *)Payload_Data, 0, 8);
++    Payload_Data[3] = 0x00; //MC ID
++    Payload_Data[7] = 0x01; //Link Status only
++    copy_data (NCSI_Request.Payload_Length);
++    aspeednic_send (dev, (void *)tx_ring[tx_new].buf, 30 + NCSI_Request.Payload_Length + 4);
++//RX
++    NCSI_Rx();
++    if ((NCSI_Respond.IID != InstanceID) || (NCSI_Respond.Command != (AEN_ENABLE | 0x80)) || (NCSI_Respond.Response_Code != COMMAND_COMPLETED)) {
++      printf ("Retry: Command = %x, Response_Code = %x\n", NCSI_Request.Command, NCSI_Respond.Response_Code);
++      Retry++;
++      InstanceID--;
++    }
++    else {
++      Retry = 0;
++    }
++  } while ((Retry != 0) && (Retry <= RETRY_COUNT));
++  Retry = 0;
++}
++
++void Enable_Network_TX (struct eth_device* dev)
++{
++  unsigned long Combined_Channel_ID;
++//TX
++  do {
++    InstanceID++;
++    NCSI_Request.IID = InstanceID;
++    NCSI_Request.Command = ENABLE_CHANNEL_NETWORK_TX;
++    Combined_Channel_ID = (NCSI_Cap.Package_ID << 5) + NCSI_Cap.Channel_ID;
++    NCSI_Request.Channel_ID = Combined_Channel_ID;
++    NCSI_Request.Payload_Length = 0;
++    memcpy ((unsigned char *)tx_ring[tx_new].buf, &NCSI_Request, 30);
++    copy_data (NCSI_Request.Payload_Length);
++    aspeednic_send (dev, (void *)tx_ring[tx_new].buf, 30 + NCSI_Request.Payload_Length + 4);
++//RX
++    NCSI_Rx();
++    if ((NCSI_Respond.IID != InstanceID) || (NCSI_Respond.Command != (ENABLE_CHANNEL_NETWORK_TX | 0x80)) || (NCSI_Respond.Response_Code != COMMAND_COMPLETED)) {
++      printf ("Retry: Command = %x, Response_Code = %x\n", NCSI_Request.Command, NCSI_Respond.Response_Code);
++      Retry++;
++      InstanceID--;
++    }
++    else {
++      Retry = 0;
++    }
++  } while ((Retry != 0) && (Retry <= RETRY_COUNT));
++  Retry = 0;
++}
++
++void Disable_Network_TX (struct eth_device* dev)
++{
++  unsigned long Combined_Channel_ID;
++//TX
++  do {
++    InstanceID++;
++    NCSI_Request.IID = InstanceID;
++    NCSI_Request.Command = DISABLE_CHANNEL_NETWORK_TX;
++    Combined_Channel_ID = (NCSI_Cap.Package_ID << 5) + NCSI_Cap.Channel_ID;
++    NCSI_Request.Channel_ID = Combined_Channel_ID;
++    NCSI_Request.Payload_Length = 0;
++    memcpy ((unsigned char *)tx_ring[tx_new].buf, &NCSI_Request, 30);
++    copy_data (NCSI_Request.Payload_Length);
++    aspeednic_send (dev, (void *)tx_ring[tx_new].buf, 30 + NCSI_Request.Payload_Length + 4);
++//RX
++    NCSI_Rx();
++    if ((NCSI_Respond.IID != InstanceID) || (NCSI_Respond.Command != (DISABLE_CHANNEL_NETWORK_TX | 0x80)) || (NCSI_Respond.Response_Code != COMMAND_COMPLETED)) {
++      printf ("Retry: Command = %x, Response_Code = %x\n", NCSI_Request.Command, NCSI_Respond.Response_Code);
++      Retry++;
++      InstanceID--;
++    }
++    else {
++      Retry = 0;
++    }
++  } while ((Retry != 0) && (Retry <= RETRY_COUNT));
++  Retry = 0;
++}
++
++void Enable_Channel (struct eth_device* dev)
++{
++  unsigned long Combined_Channel_ID;
++//TX
++  do {
++    InstanceID++;
++    NCSI_Request.IID = InstanceID;
++    NCSI_Request.Command = ENABLE_CHANNEL;
++    Combined_Channel_ID = (NCSI_Cap.Package_ID << 5) + NCSI_Cap.Channel_ID;
++    NCSI_Request.Channel_ID = Combined_Channel_ID;
++    NCSI_Request.Payload_Length = 0;
++    memcpy ((unsigned char *)tx_ring[tx_new].buf, &NCSI_Request, 30);
++    copy_data (NCSI_Request.Payload_Length);
++    aspeednic_send (dev, (void *)tx_ring[tx_new].buf, 30 + NCSI_Request.Payload_Length + 4);
++//RX
++    NCSI_Rx();
++    if ((NCSI_Respond.IID != InstanceID) || (NCSI_Respond.Command != (ENABLE_CHANNEL | 0x80)) || (NCSI_Respond.Response_Code != COMMAND_COMPLETED)) {
++      printf ("Retry: Command = %x, Response_Code = %x\n", NCSI_Request.Command, NCSI_Respond.Response_Code);
++      Retry++;
++      InstanceID--;
++    }
++    else {
++      Retry = 0;
++    }
++  } while ((Retry != 0) && (Retry <= RETRY_COUNT));
++  Retry = 0;
++}
++
++void Disable_Channel (struct eth_device* dev)
++{
++  unsigned long Combined_Channel_ID;
++//TX
++  do {
++    InstanceID++;
++    NCSI_Request.IID = InstanceID;
++    NCSI_Request.Command = DISABLE_CHANNEL;
++    Combined_Channel_ID = (NCSI_Cap.Package_ID << 5) + NCSI_Cap.Channel_ID;
++    NCSI_Request.Channel_ID = Combined_Channel_ID;
++    NCSI_Request.Payload_Length = (4 << 8);
++    memcpy ((unsigned char *)tx_ring[tx_new].buf, &NCSI_Request, 30);
++    NCSI_Request.Payload_Length = 4;
++    memset ((void *)Payload_Data, 0, 4);
++    Payload_Data[3] = 0x1; //ALD
++    copy_data (NCSI_Request.Payload_Length);
++    aspeednic_send (dev, (void *)tx_ring[tx_new].buf, 30 + NCSI_Request.Payload_Length + 4);
++//RX
++    NCSI_Rx();
++    if ((NCSI_Respond.IID != InstanceID) || (NCSI_Respond.Command != (DISABLE_CHANNEL | 0x80)) || (NCSI_Respond.Response_Code != COMMAND_COMPLETED)) {
++      printf ("Retry: Command = %x, Response_Code = %x\n", NCSI_Request.Command, NCSI_Respond.Response_Code);
++      Retry++;
++      InstanceID--;
++    }
++    else {
++      Retry = 0;
++    }
++  } while ((Retry != 0) && (Retry <= RETRY_COUNT));
++  Retry = 0;
++}
++
++int Get_Link_Status (struct eth_device* dev)
++{
++  unsigned long Combined_Channel_ID;
++//TX
++  do {
++    InstanceID++;
++    NCSI_Request.IID = InstanceID;
++    NCSI_Request.Command = GET_LINK_STATUS;
++    Combined_Channel_ID = (NCSI_Cap.Package_ID << 5) + NCSI_Cap.Channel_ID;
++    NCSI_Request.Channel_ID = Combined_Channel_ID;
++    NCSI_Request.Payload_Length = 0;
++    memcpy ((unsigned char *)tx_ring[tx_new].buf, &NCSI_Request, 30);
++    copy_data (NCSI_Request.Payload_Length);
++    aspeednic_send (dev, (void *)tx_ring[tx_new].buf, 30 + NCSI_Request.Payload_Length + 4);
++//RX
++    NCSI_Rx();
++    if ((NCSI_Respond.IID != InstanceID) || (NCSI_Respond.Command != (GET_LINK_STATUS | 0x80)) || (NCSI_Respond.Response_Code != COMMAND_COMPLETED)) {
++      printf ("Retry: Command = %x, Response_Code = %x\n", NCSI_Request.Command, NCSI_Respond.Response_Code);
++      Retry++;
++      InstanceID--;
++    }
++    else {
++      Retry = 0;
++    }
++  } while ((Retry != 0) && (Retry <= RETRY_COUNT));
++  Retry = 0;
++  if (NCSI_Respond.Payload_Data[3] & 0x40) {
++    return (NCSI_Respond.Payload_Data[3] & 0x01); //Link Up or Not
++  }
++  else {
++    return 0; //Auto Negotiate did not finish
++  }
++}
++
++void Set_Link (struct eth_device* dev)
++{
++  unsigned long Combined_Channel_ID;
++//TX
++  do {
++    InstanceID++;
++    NCSI_Request.IID = InstanceID;
++    NCSI_Request.Command = SET_LINK;
++    Combined_Channel_ID = (NCSI_Cap.Package_ID << 5) + NCSI_Cap.Channel_ID;
++    NCSI_Request.Channel_ID = Combined_Channel_ID;
++    NCSI_Request.Payload_Length = (8 << 8);
++    memcpy ((unsigned char *)tx_ring[tx_new].buf, &NCSI_Request, 30);
++    NCSI_Request.Payload_Length = 8;
++    memset ((void *)Payload_Data, 0, 8);
++    Payload_Data[2] = 0x02; //full duplex
++    Payload_Data[3] = 0x04; //100M, auto-disable
++    copy_data (NCSI_Request.Payload_Length);
++    aspeednic_send (dev, (void *)tx_ring[tx_new].buf, 30 + NCSI_Request.Payload_Length + 4);
++//RX
++    NCSI_Rx();
++    if ((NCSI_Respond.IID != InstanceID) || (NCSI_Respond.Command != (SET_LINK | 0x80)) || (NCSI_Respond.Response_Code != COMMAND_COMPLETED)) {
++      printf ("Retry: Command = %x, Response_Code = %x\n", NCSI_Request.Command, NCSI_Respond.Response_Code);
++      Retry++;
++      InstanceID--;
++    }
++    else {
++      Retry = 0;
++    }
++  } while ((Retry != 0) && (Retry <= RETRY_COUNT));
++  Retry = 0;
++}
++
++static int aspeednic_init(struct eth_device* dev, bd_t* bis)
++{
++  unsigned long i, Package_Found = 0, Channel_Found = 0, Re_Send = 0, Link_Status;
++
++  RESET_DE4X5(dev);
++  set_mac_address (dev, bis);
++  set_mac_control_register (dev);
++
++  for (i = 0; i < NUM_RX_DESC; i++) {
++    rx_ring[i].status = cpu_to_le32(RXPKT_RDY + RX_BUFF_SZ);
++    rx_ring[i].buf = (u32)(&rx_buffer[i]);
++    rx_ring[i].reserved = 0;
++  }
++
++  for (i=0; i < NUM_TX_DESC; i++) {
++    tx_ring[i].status = 0;
++    tx_ring[i].des1 = 0;
++    tx_ring[i].buf = (u32)(&tx_buffer[i]);
++    tx_ring[i].reserved = 0;
++  }
++
++  rxRingSize = NUM_RX_DESC;
++  txRingSize = NUM_TX_DESC;
++
++  rx_ring[rxRingSize - 1].status |= cpu_to_le32(EDORR);
++  tx_ring[txRingSize - 1].status |= cpu_to_le32(EDOTR);
++
++  OUTL(dev, ((u32) &tx_ring), TXR_BADR_REG);
++  OUTL(dev, ((u32) &rx_ring), RXR_BADR_REG);
++
++  START_MAC(dev);
++
++  tx_new = 0;
++  rx_new = 0;
++
++  if (CONFIG_MAC1_PHY_SETTING >= 1) {
++//NCSI Start
++//DeSelect Package/ Select Package
++    for (i = 0; i < 4; i++) {
++      DeSelect_Package (dev, i);
++      Package_Found = Select_Package (dev, i);
++      if (Package_Found == 1) {
++//AST2100/AST2050/AST1100 supports 1 package only in current firmware version
++        NCSI_Cap.Package_ID = i;
++//        Package_Found = 0;
++        break;
++      }
++    }
++    if (Package_Found != 0) {
++//Initiali State
++      for (i = 0; i < 2; i++) { //Suppose 2 channels in current version, You could modify it to 0x1F to support 31 channels
++        Channel_Found = Clear_Initial_State(dev, i);
++        if (Channel_Found == 1) {
++          NCSI_Cap.Channel_ID = i;
++          printf ("Found NCSI Network Controller at (%d, %d)\n", NCSI_Cap.Package_ID, NCSI_Cap.Channel_ID);
++//Get Version and Capabilities
++          Get_Version_ID(dev);
++          Get_Capabilities(dev);
++          Select_Active_Package(dev);
++//Configuration
++          Enable_Set_MAC_Address(dev);
++          Enable_Broadcast_Filter(dev);
++//Enable TX
++          Enable_Network_TX(dev);
++//Enable Channel
++          Enable_Channel(dev);
++//Get Link Status
++          Re_Get_Link_Status:
++          Link_Status = Get_Link_Status(dev);
++          if (Link_Status == LINK_UP) {
++            printf ("Using NCSI Network Controller (%d, %d)\n", NCSI_Cap.Package_ID, NCSI_Cap.Channel_ID);
++            break;
++          }
++          else if ((Link_Status == LINK_DOWN) && (Re_Send < 2)) {
++            Re_Send++;
++            goto Re_Get_Link_Status;
++          }
++//Disable TX
++          Disable_Network_TX(dev);
++//Disable Channel
++//          Disable_Channel(dev);
++          Re_Send = 0;
++          Channel_Found = 0;
++        }
++      }
++    }
++  }
++  return 1;
++}
++
++static int aspeednic_send(struct eth_device* dev, volatile void *packet, int length)
++{
++  int   status = -1, oldlength = 0, fail = 0;
++  int   i;
++
++  if (length <= 0) {
++    printf("%s: bad packet size: %d\n", dev->name, length);
++    goto Done;
++  }
++
++
++  for(i = 0; (tx_ring[tx_new].status & cpu_to_le32(TXDMA_OWN)) == 0x80000000; i++) {
++    if (i >= TOUT_LOOP) {
++      printf("%s: tx error buffer not ready\n", dev->name);
++      fail = 1;
++      goto Done;
++    }
++  }
++
++
++  if (length < 60) {
++    oldlength = length;
++//            memset ((void *)cpu_to_le32((u32) (packet + length)), 0, 60 - length);
++    length = 60;
++  }
++  tx_ring[tx_new].buf    = cpu_to_le32(((u32) packet));
++  tx_ring[tx_new].status   &= (~(0x3FFF));
++  tx_ring[tx_new].status   |= cpu_to_le32(LTS | FTS | length);
++  tx_ring[tx_new].status |= cpu_to_le32(TXDMA_OWN);
++
++  OUTL(dev, POLL_DEMAND, TXPD_REG);
++
++  for (i = 0; (tx_ring[tx_new].status & cpu_to_le32(TXDMA_OWN)) == 0x80000000; i++)
++  {
++    if (i >= TOUT_LOOP)
++    {
++      printf(".%s: tx buffer not ready\n", dev->name);
++      fail = 1;
++      goto Done;
++    }
++  }
++
++  if (fail != 1) {
++    status = oldlength;
++  }
++
++  Done:
++  tx_new = (tx_new+1) % NUM_TX_DESC;
++
++  return status;
++}
++
++static int aspeednic_recv(struct eth_device* dev)
++{
++  s32   status;
++  int   length    = 0;
++
++  for ( ; ; )
++  {
++    status = (s32)le32_to_cpu(rx_ring[rx_new].status);
++
++    if ((status & RXPKT_STATUS) == 0) {
++      break;
++    }
++
++    if (status & LRS) {
++      /* Valid frame status.
++       */
++      if (status & (RX_ERR | CRC_ERR | FTL | RUNT | RX_ODD_NB)) {
++
++        /* There was an error.
++         */
++        printf("RX error status = 0x%08X\n", status);
++      } else {
++        /* A valid frame received.
++         */
++        length = (le32_to_cpu(rx_ring[rx_new].status) & 0x3FFF);
++        debug("%s(): RX buffer %d, %x received\n",
++              __func__, rx_new, length);
++
++
++        /* Pass the packet up to the protocol
++         * layers.
++         */
++        NetReceive(rx_buffer[rx_new], length - 4);
++      }
++
++      /* Change buffer ownership for this frame, back
++       * to the adapter.
++       */
++      rx_ring[rx_new].status &= cpu_to_le32(0x7FFFFFFF);
++//      rx_ring[rx_new].status = cpu_to_le32(RXPKT_RDY);
++    }
++
++    /* Update entry information.
++     */
++    rx_new = (rx_new + 1) % rxRingSize;
++  }
++
++  return length;
++}
++
++static void aspeednic_halt(struct eth_device* dev)
++{
++  STOP_MAC(dev);
++}
++
++static void set_mac_address (struct eth_device* dev, bd_t* bis)
++{
++  unsigned char  mac_address[6]; // 6 bytes mac address
++  unsigned char  ethaddress[20]; // string for setenv function
++  char *s;
++  int i, env;                // env variable 0: eeprom, 1: environment parameters
++
++  s = getenv ("eeprom");
++  env = (s && (*s == 'y')) ? 0 : 1;
++
++  if (env == 0) {
++    env = 1;
++    eeprom_init ();
++    eeprom_read (0xA0, 0, mac_address, 6);
++
++    for (i = 0; i < 6; i++) {
++      if (mac_address[i] != 0xFF) {
++        env = 0;  //Suppose not all 0xFF is valid
++      }
++    }
++  }
++
++  if (env == 0) { // EEPROM
++    sprintf (ethaddress, "%02X:%02X:%02X:%02X:%02X:%02X", mac_address[0], mac_address[1], mac_address[2], mac_address[3], mac_address[4], mac_address[5]);
++    setenv ("ethaddr", ethaddress);
++    OUTL(dev, ((mac_address[2] << 24) | (mac_address[3] << 16) | (mac_address[4] << 8) | mac_address[5]), MAC_LADR_REG);
++    OUTL(dev, ((mac_address[0] << 8) | mac_address[1]), MAC_MADR_REG);
++    if (CONFIG_MAC1_PHY_SETTING >= 1) {
++      for (i = 0; i < 6; i++) {
++        NCSI_Request.SA[i] = mac_address[i];
++      }
++    }
++  }
++  else { // Environment Parameters
++    OUTL(dev, ((bis->bi_enetaddr[2] << 24) | (bis->bi_enetaddr[3] << 16) | (bis->bi_enetaddr[4] << 8) | bis->bi_enetaddr[5]), MAC_LADR_REG);
++    OUTL(dev, ((bis->bi_enetaddr[0] << 8) | bis->bi_enetaddr[1]), MAC_MADR_REG);
++    if (CONFIG_MAC1_PHY_SETTING >= 1) {
++      for (i = 0; i < 6; i++) {
++        NCSI_Request.SA[i] = bis->bi_enetaddr[i];
++      }
++    }
++  }
++
++}
++
++
++static u16 phy_read_register (struct eth_device* dev, u8 PHY_Register, u8 PHY_Address)
++{
++  u32 Data, Status = 0, Loop_Count = 0, PHY_Ready = 1;
++  u16 Return_Data;
++
++#ifdef  REALTEK_PHY_SUPPORT
++  PHY_Address = 0x01;
++#endif
++//20us * 100 = 2ms > (1 / 2.5Mhz) * 0x34
++  OUTL(dev, (PHY_Register << 21) + (PHY_Address << 16) + MIIRD + MDC_CYCTHR, PHYCR_REG);
++  do {
++    udelay(20);
++    Status = (INL (dev, PHYCR_REG) & MIIRD);
++    Loop_Count++;
++    if (Loop_Count >= 100) {
++      PHY_Ready = 0;
++      break;
++    }
++  } while (Status == MIIRD);
++
++  if (PHY_Ready == 0) {
++    printf ("PHY NOT REDAY ");
++    return 0;
++  }
++  Data = INL (dev, PHYDATA_REG);
++  Return_Data = (Data >> 16);
++
++  return Return_Data;
++}
++
++
++static void phy_write_register (struct eth_device* dev, u8 PHY_Register, u8 PHY_Address, u16 PHY_Data)
++{
++  u32 Status = 0, Loop_Count = 0, PHY_Ready = 1;
++
++#ifdef  REALTEK_PHY_SUPPORT
++  PHY_Address = 0x01;
++#endif
++//20us * 100 = 2ms > (1 / 2.5Mhz) * 0x34
++  OUTL(dev, PHY_Data, PHYDATA_REG);
++  OUTL(dev, (PHY_Register << 21) + (PHY_Address << 16) + MIIWR + MDC_CYCTHR, PHYCR_REG);
++  do {
++    udelay(20);
++    Status = (INL (dev, PHYCR_REG) & MIIWR);
++    Loop_Count++;
++    if (Loop_Count >= 100) {
++      PHY_Ready = 0;
++      break;
++    }
++  } while (Status == MIIWR);
++  if (PHY_Ready == 0) {
++    printf ("PHY NOT REDAY ");
++  }
++}
++
++static void set_mac_control_register (struct eth_device* dev)
++{
++  unsigned long MAC_CR_Register = 0;
++  unsigned long   Loop_Count = 0, PHY_Ready = 1, Chip_ID;
++  u16    PHY_Status, PHY_Speed, PHY_Duplex, Resolved_Status = 0, Advertise, Link_Partner;
++
++  if (CONFIG_MAC1_PHY_SETTING >= 1) {
++    MAC_CR_Register = SPEED_100M_MODE_bit | RX_BROADPKT_bit | FULLDUP_bit | RXMAC_EN_bit | RXDMA_EN_bit | TXMAC_EN_bit | TXDMA_EN_bit | CRC_APD_bit;
++  }
++  else {
++    MAC_CR_Register = SPEED_100M_MODE_bit | FULLDUP_bit | RXMAC_EN_bit | RXDMA_EN_bit | TXMAC_EN_bit | TXDMA_EN_bit | CRC_APD_bit;
++  }
++
++  if (CONFIG_MAC1_PHY_SETTING != 2) {
++    Chip_ID = ((phy_read_register (dev, 0x02, 0)) << 16);
++    Chip_ID |= (phy_read_register (dev, 0x03, 0) & 0xffff);
++    if (((Chip_ID & PHYID_VENDOR_MASK) == PHYID_VENDOR_BROADCOM) ||
++        ((Chip_ID & PHYID_VENDOR_MODEL_MASK) == PHYID_RTL8201EL)) {
++      Advertise = phy_read_register (dev, 0x04, 0);
++      Link_Partner = phy_read_register (dev, 0x05, 0);
++      Advertise = (Advertise & PHY_SPEED_DUPLEX_MASK);
++      Link_Partner = (Link_Partner & PHY_SPEED_DUPLEX_MASK);
++      if ((Advertise & Link_Partner) & PHY_100M_DUPLEX) {
++        MAC_CR_Register |= SPEED_100M_MODE_bit;
++        MAC_CR_Register |= FULLDUP_bit;
++      }
++      else if ((Advertise & Link_Partner) & PHY_100M_HALF) {
++        MAC_CR_Register |= SPEED_100M_MODE_bit;
++        MAC_CR_Register &= ~FULLDUP_bit;
++      }
++      else if ((Advertise & Link_Partner) & PHY_10M_DUPLEX) {
++        MAC_CR_Register &= ~SPEED_100M_MODE_bit;
++        MAC_CR_Register |= FULLDUP_bit;
++      }
++      else if ((Advertise & Link_Partner) & PHY_10M_HALF) {
++        MAC_CR_Register &= ~SPEED_100M_MODE_bit;
++        MAC_CR_Register &= ~FULLDUP_bit;
++      }
++    }
++    else if (((Chip_ID & PHYID_VENDOR_MASK) == PHYID_VENDOR_MARVELL) ||
++             ((Chip_ID & PHYID_VENDOR_MODEL_MASK) == PHYID_RTL8211)) {
++//Max waiting time = (20 + 2)ms * 250(PHY_LOOP) = 5.5s
++      do {
++        udelay (20000);
++        Resolved_Status = (phy_read_register (dev, 0x11, 0) & RESOLVED_BIT);
++        Loop_Count++;
++        if (Loop_Count >= PHY_LOOP) {
++          PHY_Ready = 0;
++          printf ("PHY NOT READY ");
++          break;
++        }
++      } while (Resolved_Status != RESOLVED_BIT);
++
++      if (PHY_Ready == 1) {
++        PHY_Status = phy_read_register (dev, 0x11, 0);
++        PHY_Speed = (PHY_Status & PHY_SPEED_MASK) >> 14;
++        PHY_Duplex = (PHY_Status & PHY_DUPLEX_MASK) >> 13;
++
++        if (PHY_Speed == SPEED_1000M) {
++          MAC_CR_Register |= GMAC_MODE_bit;
++        }
++        else {
++          MAC_CR_Register &= ~GMAC_MODE_bit;
++          if (PHY_Speed == SPEED_10M) {
++            MAC_CR_Register &= ~SPEED_100M_MODE_bit;
++          }
++        }
++        if (PHY_Duplex == DUPLEX_HALF) {
++          MAC_CR_Register &= ~FULLDUP_bit;
++        }
++      }
++//LED Control
++//              if (Chip_ID == 0x1C) {
++//                  PHY_Status = phy_read_register (dev, 0x18, 0);
++//                phy_write_register (dev, 0x18, 0, (PHY_Status | 0x09));
++//              }
++//LED Control D[0], D[6]
++//              if (Chip_ID == 0x141) {
++//                  PHY_Status = phy_read_register (dev, 0x18, 0);
++//                phy_write_register (dev, 0x18, 0, ((PHY_Status & ~(0x41)) | 0x01));
++//              }
++    }
++    else if (Chip_ID == PHYID_BCM54612E )  {
++      phy_write_register ( dev, 0x1C, 1, 0x8C00 ); // Disable GTXCLK Clock Delay Enable
++      phy_write_register ( dev, 0x18, 1, 0xF0E7 ); // Disable RGMII RXD to RXC Skew
++
++      Advertise = phy_read_register (dev, 0x04, 1);
++      Link_Partner = phy_read_register (dev, 0x05, 1);
++      Advertise = (Advertise & PHY_SPEED_DUPLEX_MASK);
++      Link_Partner = (Link_Partner & PHY_SPEED_DUPLEX_MASK);
++      if ((Advertise & Link_Partner) & PHY_100M_DUPLEX) {
++        MAC_CR_Register |= SPEED_100M_MODE_bit;
++        MAC_CR_Register |= FULLDUP_bit;
++      }
++      else if ((Advertise & Link_Partner) & PHY_100M_HALF) {
++        MAC_CR_Register |= SPEED_100M_MODE_bit;
++        MAC_CR_Register &= ~FULLDUP_bit;
++      }
++      else if ((Advertise & Link_Partner) & PHY_10M_DUPLEX) {
++        MAC_CR_Register &= ~SPEED_100M_MODE_bit;
++        MAC_CR_Register |= FULLDUP_bit;
++      }
++      else if ((Advertise & Link_Partner) & PHY_10M_HALF) {
++        MAC_CR_Register &= ~SPEED_100M_MODE_bit;
++        MAC_CR_Register &= ~FULLDUP_bit;
++      }
++    }else {
++      printf("Unknow Chip_ID %x\n",Chip_ID);
++    }
++  }
++  OUTL(dev, MAC_CR_Register, MACCR_REG);
++}
++
++#endif  /* CFG_CMD_NET && CONFIG_NET_MULTI && CONFIG_ASPEEDMAC */
+diff --git a/include/configs/ast1100.h b/include/configs/ast1100.h
+new file mode 100755
+index 0000000..dbd656e
+--- /dev/null
++++ b/include/configs/ast1100.h
+@@ -0,0 +1,257 @@
++/*
++ * (C) Copyright 2004
++ * Peter Chen <peterc@socle-tech.com.tw>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * Version Identity 
++ */
++#define CONFIG_IDENT_STRING	" ASPEED (v.0.12) "
++
++/*
++ * High Level Configuration Options
++ * (easy to change)
++ */
++//#define CONFIG_INIT_CRITICAL			/* define for U-BOOT 1.1.1 */
++#undef  CONFIG_INIT_CRITICAL			/* undef for  U-BOOT 1.1.4 */ 
++#define CONFIG_ARM926EJS	1		/* This is an arm926ejs CPU */
++#define	CONFIG_ASPEED		1
++#define CONFIG_AST1100		1
++//#define CONFIG_AST1100_FPGA
++#undef CONFIG_AST1100_FPGA			/* undef if real chip */
++//#define CONFIG_AST1100A2_PATCH
++#undef CONFIG_AST1100A2_PATCH
++//#define CONFIG_2SPIFLASH			/* Boot SPI: CS2, 2nd SPI: CS0 */ /* Not ready */
++#undef CONFIG_2SPIFLASH
++#undef CONFIG_DDR512_200
++#define CONFIG_DDRII1G_200	1
++#undef CONFIG_ASPEED_SLT
++
++//#define CONFIG_USE_IRQ				/* we don't need IRQ/FIQ stuff */
++#define CONFIG_MISC_INIT_R 
++
++/* 
++ * Environment Config
++ */
++#define CONFIG_CMDLINE_TAG	 1		/* enable passing of ATAGs	*/
++#define CONFIG_SETUP_MEMORY_TAGS 1
++#define CONFIG_INITRD_TAG	 1
++#define	CONFIG_BOOTARGS 	"debug console=ttyS1,115200n8 ramdisk_size=16384 root=/dev/ram rw init=/linuxrc mem=80M"
++#ifdef  CONFIG_ASPEED_SLT
++#define CONFIG_BOOTDELAY	1		/* autoboot after 3 seconds	*/
++#else
++#define CONFIG_BOOTDELAY	3		/* autoboot after 3 seconds	*/
++#endif
++#define CONFIG_BOOTCOMMAND	"bootm 14080000 14300000"
++#define CONFIG_BOOTFILE		"all.bin"
++#define CONFIG_ENV_OVERWRITE
++
++/*
++ * Command line configuration.
++ */
++#include <config_cmd_default.h>
++
++#define CONFIG_CMD_DFL
++#define CONFIG_CMD_ENV
++#define CONFIG_CMD_FLASH
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_I2C
++#define CONFIG_CMD_EEPROM
++
++/* 
++ * CPU Setting
++ */
++#define CPU_CLOCK_RATE		18000000	/* 16.5 MHz clock for the ARM core */
++
++/*
++ * Size of malloc() pool
++ */
++#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128*1024)
++#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
++
++/*
++ * Stack sizes,  The stack sizes are set up in start.S using the settings below
++ */
++#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
++#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
++#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
++
++/*
++ * Memory Configuration
++ */
++#define CONFIG_NR_DRAM_BANKS	1	   	/* we have 1 bank of DRAM */
++#define PHYS_SDRAM_1		0x40000000 	/* SDRAM Bank #1 */
++#define PHYS_SDRAM_1_SIZE	0x4000000 	/* 64 MB */
++
++#define CONFIG_SYS_SDRAM_BASE	0x40000000
++
++/*
++ * FLASH Configuration
++ */
++#define PHYS_FLASH_1		0x14000000 	/* Flash Bank #1 */
++#define PHYS_FLASH_2		0x14800000 	/* Flash Bank #2 */
++#define PHYS_FLASH_2_BASE	0x10000000
++
++#ifdef CONFIG_2SPIFLASH
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_2_BASE
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1, PHYS_FLASH_2 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	2
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#else
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#endif
++
++#define __LITTLE_ENDIAN
++#define CONFIG_FLASH_SPI
++
++#define CONFIG_MONITOR_BASE		TEXT_BASE
++#define CONFIG_MONITOR_LEN		(192 << 10)
++
++/* timeout values are in ticks */
++#define CONFIG_SYS_FLASH_ERASE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Erase */
++#define CONFIG_SYS_FLASH_WRITE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Write */
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
++
++#define CONFIG_SYS_PROMPT		"boot# " 	/* Monitor Command Prompt	*/
++#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
++#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
++#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
++
++#define CONFIG_SYS_MEMTEST_START	0x40000000	/* memtest works on	*/
++#define CONFIG_SYS_MEMTEST_END		0x44FFFFFF	/* 256 MB in DRAM	*/
++
++#define	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++#undef	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++
++#define CONFIG_SYS_LOAD_ADDR		0x43000000	/* default load address */
++
++#define CONFIG_SYS_TIMERBASE		0x1E782000	/* use timer 1 */
++#define CONFIG_SYS_HZ			(1*1000*1000)	/* use external clk (1M) */
++
++/*
++ * Serial Configuration
++ */
++#define CONFIG_SYS_NS16550
++#define CONFIG_SYS_NS16550_SERIAL
++#define CONFIG_SYS_NS16550_REG_SIZE	4
++#define CONFIG_SYS_NS16550_CLK		24000000
++#define CONFIG_SYS_NS16550_COM1		0x1e783000
++#define CONFIG_SYS_NS16550_COM2		0x1e784000
++#define	CONFIG_SYS_LOADS_BAUD_CHANGE
++#define CONFIG_SERIAL1			1
++#define CONFIG_CONS_INDEX		2
++#define CONFIG_BAUDRATE			115200
++#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
++
++/*
++ * USB device configuration
++ */
++/*
++#define CONFIG_USB_DEVICE		1
++#define CONFIG_USB_TTY			1
++
++#define CONFIG_USBD_VENDORID		0x1234
++#define CONFIG_USBD_PRODUCTID		0x5678
++#define CONFIG_USBD_MANUFACTURER	"Siemens"
++#define CONFIG_USBD_PRODUCT_NAME	"SX1"
++*/
++
++/*
++ * I2C configuration
++ */
++#define CONFIG_HARD_I2C
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_SYS_I2C_SLAVE		1
++#define CONFIG_DRIVER_ASPEED_I2C
++
++/*
++* EEPROM configuration
++*/
++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 	2
++#define CONFIG_SYS_I2C_EEPROM_ADDR 	0xa0
++
++/*
++ * NIC configuration
++ */
++#define __BYTE_ORDER __LITTLE_ENDIAN
++#define __LITTLE_ENDIAN_BITFIELD
++#define CONFIG_MAC_PARTITION
++#define CONFIG_ASPEEDNIC
++//#define CONFIG_MAC1_PHY_LINK_INTERRUPT
++//#define CONFIG_MAC2_ENABLE
++//#define CONFIG_MAC2_MII_ENABLE
++//#define CONFIG_MAC2_PHY_LINK_INTERRUPT
++
++/*
++*-------------------------------------------------------------------------------
++* NOTICE: MAC1 and MAC2 now have their own seperate PHY configuration.
++* We use 2 bits for each MAC in the scratch register(D[15:11] in 0x1E6E2040) to
++* inform kernel driver.
++* The meanings of the 2 bits are:
++* 00(0): Dedicated PHY
++* 01(1): ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 10(2): ASPEED's MAC is connected to NC-SI PHY chip directly
++* 11: Reserved
++*
++* We use CONFIG_MAC1_PHY_SETTING and CONFIG_MAC2_PHY_SETTING in U-Boot
++* 0: Dedicated PHY
++* 1: ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 2: ASPEED's MAC is connected to NC-SI PHY chip directly
++* 3: Reserved
++*-------------------------------------------------------------------------------
++*/
++#define CONFIG_MAC1_PHY_SETTING		0
++#define CONFIG_MAC2_PHY_SETTING		0
++#define CONFIG_NET_MULTI
++#define CONFIG_ETHACT			aspeednic#0
++#define CONFIG_GATEWAYIP		192.168.0.1
++#define CONFIG_NETMASK			255.255.255.0
++#define CONFIG_IPADDR			192.168.0.188
++#define CONFIG_SERVERIP			192.168.0.126
++#define CONFIG_ETHADDR			00:C0:A8:12:34:56
++#define CONFIG_ETH1ADDR			00:C0:A8:12:34:57
++
++/*
++ * SLT
++ */
++/* 
++#define CONFIG_SLT
++#define CFG_CMD_SLT		(CFG_CMD_REGTEST | CFG_CMD_MACTEST | CFG_CMD_VIDEOTEST | CFG_CMD_HACTEST | CFG_CMD_MICTEST)
++*/
++
++#endif	/* __CONFIG_H */
+diff --git a/include/configs/ast2100.h b/include/configs/ast2100.h
+new file mode 100644
+index 0000000..07733b9
+--- /dev/null
++++ b/include/configs/ast2100.h
+@@ -0,0 +1,272 @@
++/*
++ * (C) Copyright 2004
++ * Peter Chen <peterc@socle-tech.com.tw>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * High Level Configuration Options
++ * (easy to change)
++ */
++//#define CONFIG_INIT_CRITICAL			/* define for U-BOOT 1.1.1 */
++#undef  CONFIG_INIT_CRITICAL			/* undef for  U-BOOT 1.1.4 */ 
++#define CONFIG_ARM926EJS	1		/* This is an arm926ejs CPU */
++#define	CONFIG_ASPEED		1
++#define CONFIG_AST2100		1
++//#define CONFIG_AST2100_FPGA
++#undef CONFIG_AST2100_FPGA			/* undef if real chip */
++//#define CONFIG_AST2100A2_PATCH
++#undef CONFIG_AST2100A2_PATCH
++#define CONFIG_SYS_FLASH_CFI				/* CONFIG_FLASH_CFI, CONFIG_FLASH_SPI is exclusive*/
++//#define CONFIG_FLASH_SPI
++//#define CONFIG_2SPIFLASH			/* Boot SPI: CS2, 2nd SPI: CS0 */
++#undef CONFIG_DDRII1G_266
++#undef CONFIG_2SPIFLASH
++#undef CONFIG_ASPEED_SLT
++
++//#define CONFIG_USE_IRQ				/* we don't need IRQ/FIQ stuff */
++#define CONFIG_MISC_INIT_R 
++
++/* 
++ * Environment Config
++ */
++#define CONFIG_CMDLINE_TAG	 1		/* enable passing of ATAGs	*/
++#define CONFIG_SETUP_MEMORY_TAGS 1
++#define CONFIG_INITRD_TAG	 1
++#define	CONFIG_BOOTARGS 	"debug console=ttyS1,115200n8 ramdisk_size=16384 root=/dev/ram rw init=/linuxrc mem=80M"
++#define CONFIG_BOOTDELAY	3		/* autoboot after 3 seconds	*/
++#ifdef	CONFIG_SYS_FLASH_CFI 
++#define CONFIG_BOOTCOMMAND	"bootm 10080000 10300000"
++#else
++#define CONFIG_BOOTCOMMAND	"bootm 14080000 14300000"
++#endif
++#define CONFIG_BOOTFILE		"all.bin"
++#define CONFIG_ENV_OVERWRITE
++
++/*
++ * Command line configuration.
++ */
++#include <config_cmd_default.h>
++
++#define CONFIG_CMD_DFL
++#define CONFIG_CMD_ENV
++#define CONFIG_CMD_FLASH
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_I2C
++#define CONFIG_CMD_EEPROM
++
++/* 
++ * CPU Setting
++ */
++#define CPU_CLOCK_RATE		18000000	/* 16.5 MHz clock for the ARM core */
++
++/*
++ * Size of malloc() pool
++ */
++#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128*1024)
++#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
++
++/*
++ * Stack sizes,  The stack sizes are set up in start.S using the settings below
++ */
++#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
++#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
++#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
++
++/*
++ * Memory Configuration
++ */
++#define CONFIG_NR_DRAM_BANKS	1	   	/* we have 1 bank of DRAM */
++#define PHYS_SDRAM_1		0x40000000 	/* SDRAM Bank #1 */
++#define PHYS_SDRAM_1_SIZE	0x4000000 	/* 64 MB */
++
++#define CONFIG_SYS_SDRAM_BASE	0x40000000
++
++/*
++ * FLASH Configuration
++ */
++#ifdef CONFIG_SYS_FLASH_CFI				/* NOR Flash */
++
++#define PHYS_FLASH_1		0x10000000 	/* Flash Bank #1 */
++
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH	1
++#define CONFIG_ENV_OFFSET		0x60000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE		0x20000 	/* Total Size of Environment Sector */
++
++#define CONFIG_SYS_FLASH_CFI_AMD_RESET
++#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++
++#else						/* SPI Flash */
++
++#define PHYS_FLASH_1		0x14000000 	/* Flash Bank #1 */
++#define PHYS_FLASH_2		0x14800000 	/* Flash Bank #2 */
++#define PHYS_FLASH_2_BASE	0x10000000
++
++#ifdef CONFIG_2SPIFLASH
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_2_BASE
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1, PHYS_FLASH_2 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	2
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#else
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#endif
++
++#endif
++
++#define __LITTLE_ENDIAN
++
++#define CONFIG_MONITOR_BASE		TEXT_BASE
++#define CONFIG_MONITOR_LEN		(192 << 10)
++
++/* timeout values are in ticks */
++#define CONFIG_SYS_FLASH_ERASE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Erase */
++#define CONFIG_SYS_FLASH_WRITE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Write */
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
++
++#define CONFIG_SYS_PROMPT		"boot# " 	/* Monitor Command Prompt	*/
++#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
++#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
++#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
++
++#define CONFIG_SYS_MEMTEST_START	0x40000000	/* memtest works on	*/
++#define CONFIG_SYS_MEMTEST_END		0x44FFFFFF	/* 256 MB in DRAM	*/
++
++#define	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++#undef	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++
++#define CONFIG_SYS_LOAD_ADDR		0x43000000	/* default load address */
++
++#define CONFIG_SYS_TIMERBASE		0x1E782000	/* use timer 1 */
++#define CONFIG_SYS_HZ			(1*1000*1000)	/* use external clk (1M) */
++
++/*
++ * Serial Configuration
++ */
++#define CONFIG_SYS_NS16550
++#define CONFIG_SYS_NS16550_SERIAL
++#define CONFIG_SYS_NS16550_REG_SIZE	4
++#define CONFIG_SYS_NS16550_CLK		24000000
++#define CONFIG_SYS_NS16550_COM1		0x1e783000
++#define CONFIG_SYS_NS16550_COM2		0x1e784000
++#define	CONFIG_SYS_LOADS_BAUD_CHANGE
++#define CONFIG_SERIAL1			1
++#define CONFIG_CONS_INDEX		2
++#define CONFIG_BAUDRATE			115200
++#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
++
++/*
++ * USB device configuration
++ */
++/*
++#define CONFIG_USB_DEVICE		1
++#define CONFIG_USB_TTY			1
++
++#define CONFIG_USBD_VENDORID		0x1234
++#define CONFIG_USBD_PRODUCTID		0x5678
++#define CONFIG_USBD_MANUFACTURER	"Siemens"
++#define CONFIG_USBD_PRODUCT_NAME	"SX1"
++*/
++
++/*
++ * I2C configuration
++ */
++#define CONFIG_HARD_I2C
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_SYS_I2C_SLAVE		1
++#define CONFIG_DRIVER_ASPEED_I2C
++
++/*
++* EEPROM configuration
++*/
++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 	2
++#define CONFIG_SYS_I2C_EEPROM_ADDR 	0xa0
++
++/*
++ * NIC configuration
++ */
++#define __BYTE_ORDER __LITTLE_ENDIAN
++#define __LITTLE_ENDIAN_BITFIELD
++#define CONFIG_MAC_PARTITION
++#define CONFIG_ASPEEDNIC
++#define CONFIG_MAC1_PHY_LINK_INTERRUPT
++#define CONFIG_MAC2_ENABLE
++#define CONFIG_MAC2_MII_ENABLE
++//#define CONFIG_MAC2_PHY_LINK_INTERRUPT
++/*
++*-------------------------------------------------------------------------------
++* NOTICE: MAC1 and MAC2 now have their own seperate PHY configuration.
++* We use 2 bits for each MAC in the scratch register(D[15:11] in 0x1E6E2040) to
++* inform kernel driver.
++* The meanings of the 2 bits are:
++* 00(0): Dedicated PHY
++* 01(1): ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 10(2): ASPEED's MAC is connected to NC-SI PHY chip directly
++* 11: Reserved
++*
++* We use CONFIG_MAC1_PHY_SETTING and CONFIG_MAC2_PHY_SETTING in U-Boot
++* 0: Dedicated PHY
++* 1: ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 2: ASPEED's MAC is connected to NC-SI PHY chip directly
++* 3: Reserved
++*-------------------------------------------------------------------------------
++*/
++#define CONFIG_MAC1_PHY_SETTING		0
++#define CONFIG_MAC2_PHY_SETTING		0
++#define CONFIG_NET_MULTI
++#define CONFIG_ETHACT			aspeednic#0
++#define CONFIG_GATEWAYIP		192.168.0.1
++#define CONFIG_NETMASK			255.255.255.0
++#define CONFIG_IPADDR			192.168.0.188
++#define CONFIG_SERVERIP			192.168.0.106
++#define CONFIG_ETHADDR			00:C0:A8:12:34:56
++#define CONFIG_ETH1ADDR			00:C0:A8:12:34:57
++
++/*
++ * SLT
++ */
++/*
++#define CONFIG_SLT
++#define CONFIG_CMD_SLT		(CONFIG_CMD_REGTEST | CONFIG_CMD_MACTEST | CONFIG_CMD_VIDEOTEST | CONFIG_CMD_HACTEST | CONFIG_CMD_MICTEST)
++*/
++
++#endif	/* __CONFIG_H */
+diff --git a/include/configs/ast2300.h b/include/configs/ast2300.h
+new file mode 100644
+index 0000000..678e7c3
+--- /dev/null
++++ b/include/configs/ast2300.h
+@@ -0,0 +1,325 @@
++/*
++ * (C) Copyright 2004
++ * Peter Chen <peterc@socle-tech.com.tw>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * High Level Configuration Options
++ * (easy to change)
++ */
++//#define CONFIG_INIT_CRITICAL			/* define for U-BOOT 1.1.1 */
++#undef  CONFIG_INIT_CRITICAL			/* undef for  U-BOOT 1.1.4 */ 
++#define CONFIG_ARM926EJS	1		/* This is an arm926ejs CPU */
++#define	CONFIG_ASPEED		1
++#define CONFIG_AST2300		1
++//#define CONFIG_AST1070		1
++//#define CONFIG_SYS_FLASH_CFI			/* CONFIG_FLASH_CFI, CONFIG_FLASH_SPI is exclusive*/
++#define CONFIG_FLASH_SPI
++//#define CONFIG_2SPIFLASH			/* Boot SPI: CS2, 2nd SPI: CS0 */
++#undef CONFIG_2SPIFLASH
++#undef CONFIG_ASPEED_SLT
++#define CONFIG_FLASH_AST2300
++#define CONFIG_FLASH_AST2300_DMA
++//#define CONFIG_FLASH_SPIx2_Dummy
++//#define CONFIG_FLASH_SPIx4_Dummy
++#define CONFIG_CRT_DISPLAY	1		/* undef if not support CRT */
++
++//#define CONFIG_USE_IRQ				/* we don't need IRQ/FIQ stuff */
++#define CONFIG_MISC_INIT_R 
++
++/*
++ * DRAM Config
++ *
++ * 1. DRAM Size              //
++ *    CONFIG_DRAM_512MBIT    // 512M bit
++ *    CONFIG_DRAM_1GBIT      // 1G   bit (default)
++ *    CONFIG_DRAM_2GBIT      // 2G   bit
++ *    CONFIG_DRAM_4GBIT      // 4G   bit 
++ * 2. DRAM Speed             //
++ *    CONFIG_DRAM_336        // 336MHz (DDR-667)
++ *    CONFIG_DRAM_408        // 408MHz (DDR-800) (default)
++ * 3. VGA Mode
++ *    CONFIG_CRT_DISPLAY     // define to disable VGA function
++ * 4. ECC Function enable
++ *    CONFIG_DRAM_ECC        // define to enable ECC function
++ * 5. UART Debug Message
++ *    CONFIG_DRAM_UART_OUT   // enable output message at UART5
++ *    CONFIG_DRAM_UART_38400 // set the UART baud rate to 38400, default is 115200
++ */
++ 
++//1. DRAM Size
++//#define    CONFIG_DRAM_512MBIT
++#define    CONFIG_DRAM_1GBIT
++//#define    CONFIG_DRAM_2GBIT
++//#define    CONFIG_DRAM_4GBIT
++//2. DRAM Speed
++//#define    CONFIG_DRAM_336
++#define    CONFIG_DRAM_408
++//3. VGA Mode
++//#define    CONFIG_CRT_DISPLAY
++//4. ECC Function enable
++//#define    CONFIG_DRAM_ECC
++//5. UART Debug Message
++#define    CONFIG_DRAM_UART_OUT
++//#define    CONFIG_DRAM_UART_38400
++
++
++
++/* 
++ * Environment Config
++ */
++#define CONFIG_CMDLINE_TAG	 1		/* enable passing of ATAGs	*/
++#define CONFIG_SETUP_MEMORY_TAGS 1
++#define CONFIG_INITRD_TAG	 1
++#define	CONFIG_BOOTARGS 	"debug console=ttyS0,115200n8 ramdisk_size=16384 root=/dev/ram rw init=/linuxrc mem=80M"
++#define CONFIG_UPDATE           "tftp 40800000 ast2300.scr; so 40800000'"
++
++#define CONFIG_BOOTDELAY	3		/* autoboot after 3 seconds	*/
++#ifdef CONFIG_FLASH_AST2300
++#define CONFIG_BOOTCOMMAND	"bootm 20080000 20300000"
++#else
++#ifdef	CONFIG_SYS_FLASH_CFI 
++#define CONFIG_BOOTCOMMAND	"bootm 10080000 10300000"
++#else
++#define CONFIG_BOOTCOMMAND	"bootm 14080000 14300000"
++#endif
++#endif
++#define CONFIG_BOOTFILE		"all.bin"
++#define CONFIG_ENV_OVERWRITE
++
++/*
++ * Command line configuration.
++ */
++#include <config_cmd_default.h>
++
++#define CONFIG_CMD_DFL
++#define CONFIG_CMD_ENV
++#define CONFIG_CMD_FLASH
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_I2C
++#define CONFIG_CMD_EEPROM
++
++/* 
++ * CPU Setting
++ */
++#define CPU_CLOCK_RATE		18000000	/* 16.5 MHz clock for the ARM core */
++
++/*
++ * Size of malloc() pool
++ */
++#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 768*1024)
++#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
++
++/*
++ * Stack sizes,  The stack sizes are set up in start.S using the settings below
++ */
++#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
++#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
++#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
++
++/*
++ * Memory Configuration
++ */
++#define CONFIG_NR_DRAM_BANKS	1	   	/* we have 1 bank of DRAM */
++#define PHYS_SDRAM_1		0x40000000 	/* SDRAM Bank #1 */
++#define PHYS_SDRAM_1_SIZE	0x4000000 	/* 64 MB */
++
++#define CONFIG_SYS_SDRAM_BASE	0x40000000
++
++/*
++ * FLASH Configuration
++ */
++#ifdef CONFIG_SYS_FLASH_CFI				/* NOR Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1			0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1			0x10000000 	/* Flash Bank #1 */
++#endif
++
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH	1
++#define CONFIG_ENV_OFFSET			0x60000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x20000 	/* Total Size of Environment Sector */
++
++#define CONFIG_SYS_FLASH_CFI_AMD_RESET
++#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++
++#else						/* SPI Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1		0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1		0x14000000 	/* Flash Bank #1 */
++#define PHYS_FLASH_2		0x14800000 	/* Flash Bank #2 */
++#define PHYS_FLASH_2_BASE	0x10000000
++#endif
++
++#ifdef CONFIG_2SPIFLASH
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_2_BASE
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1, PHYS_FLASH_2 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	2
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#else
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#endif
++
++#endif
++
++#define __LITTLE_ENDIAN
++
++#define CONFIG_MONITOR_BASE		TEXT_BASE
++#define CONFIG_MONITOR_LEN		(192 << 10)
++
++/* timeout values are in ticks */
++#define CONFIG_SYS_FLASH_ERASE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Erase */
++#define CONFIG_SYS_FLASH_WRITE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Write */
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
++
++#define CONFIG_SYS_PROMPT		"boot# " 	/* Monitor Command Prompt	*/
++#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
++#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
++#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
++
++#define CONFIG_SYS_MEMTEST_START	0x40000000	/* memtest works on	*/
++#define CONFIG_SYS_MEMTEST_END		0x44FFFFFF	/* 256 MB in DRAM	*/
++
++#define	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++#undef	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++
++#define CONFIG_SYS_LOAD_ADDR		0x43000000	/* default load address */
++
++#define CONFIG_SYS_TIMERBASE		0x1E782000	/* use timer 1 */
++#define CONFIG_SYS_HZ			(1*1000*1000)	/* use external clk (1M) */
++
++/*
++ * Serial Configuration
++ */
++#define CONFIG_SYS_NS16550
++#define CONFIG_SYS_NS16550_SERIAL
++#define CONFIG_SYS_NS16550_REG_SIZE	4
++#define CONFIG_SYS_NS16550_CLK		24000000
++#define CONFIG_SYS_NS16550_COM1		0x1e783000
++#define CONFIG_SYS_NS16550_COM2		0x1e784000
++#define	CONFIG_SYS_LOADS_BAUD_CHANGE
++#define CONFIG_SERIAL1			1
++#define CONFIG_CONS_INDEX		2
++#define CONFIG_BAUDRATE			115200
++#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
++
++/*
++ * USB device configuration
++ */
++/*
++#define CONFIG_USB_DEVICE		1
++#define CONFIG_USB_TTY			1
++
++#define CONFIG_USBD_VENDORID		0x1234
++#define CONFIG_USBD_PRODUCTID		0x5678
++#define CONFIG_USBD_MANUFACTURER	"Siemens"
++#define CONFIG_USBD_PRODUCT_NAME	"SX1"
++*/
++
++/*
++ * I2C configuration
++ */
++#define CONFIG_HARD_I2C
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_SYS_I2C_SLAVE		1
++#define CONFIG_DRIVER_ASPEED_I2C
++
++/*
++* EEPROM configuration
++*/
++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 	2
++#define CONFIG_SYS_I2C_EEPROM_ADDR 	0xa0
++
++/*
++ * NIC configuration
++ */
++#define __BYTE_ORDER __LITTLE_ENDIAN
++#define __LITTLE_ENDIAN_BITFIELD
++#define CONFIG_MAC_PARTITION
++#define CONFIG_ASPEEDNIC
++//#define CONFIG_MAC1_PHY_LINK_INTERRUPT
++#define CONFIG_MAC2_ENABLE
++#define CONFIG_MAC2_PHY_LINK_INTERRUPT
++/*
++*-------------------------------------------------------------------------------
++* NOTICE: MAC1 and MAC2 now have their own seperate PHY configuration.
++* We use 2 bits for each MAC in the scratch register(D[15:11] in 0x1E6E2040) to
++* inform kernel driver.
++* The meanings of the 2 bits are:
++* 00(0): Dedicated PHY
++* 01(1): ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 10(2): ASPEED's MAC is connected to NC-SI PHY chip directly
++* 11: Reserved
++*
++* We use CONFIG_MAC1_PHY_SETTING and CONFIG_MAC2_PHY_SETTING in U-Boot
++* 0: Dedicated PHY
++* 1: ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 2: ASPEED's MAC is connected to NC-SI PHY chip directly
++* 3: Reserved
++*-------------------------------------------------------------------------------
++*/
++#define CONFIG_MAC1_PHY_SETTING		2
++#define CONFIG_MAC2_PHY_SETTING		0
++#define CONFIG_MAC_INTERFACE_CLOCK_DELAY	0x2255
++#define CONFIG_NET_MULTI
++#define CONFIG_ETHACT			aspeednic#0
++#define CONFIG_GATEWAYIP		192.168.0.1
++#define CONFIG_NETMASK			255.255.255.0
++#define CONFIG_IPADDR			192.168.0.45
++#define CONFIG_SERVERIP			192.168.0.81
++#define CONFIG_ETHADDR			00:C0:A8:12:34:56
++#define CONFIG_ETH1ADDR			00:C0:A8:12:34:57
++
++/*
++ * SLT
++ */
++/*
++#define CONFIG_SLT
++#define CFG_CMD_SLT		(CFG_CMD_VIDEOTEST | CFG_CMD_MACTEST | CFG_CMD_HACTEST | CFG_CMD_MICTEST)
++*/
++
++#endif	/* __CONFIG_H */
+diff --git a/include/configs/ast2300_ast1070.h b/include/configs/ast2300_ast1070.h
+new file mode 100644
+index 0000000..a7abdf5
+--- /dev/null
++++ b/include/configs/ast2300_ast1070.h
+@@ -0,0 +1,323 @@
++/*
++ * (C) Copyright 2004
++ * Peter Chen <peterc@socle-tech.com.tw>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * High Level Configuration Options
++ * (easy to change)
++ */
++//#define CONFIG_INIT_CRITICAL			/* define for U-BOOT 1.1.1 */
++#undef  CONFIG_INIT_CRITICAL			/* undef for  U-BOOT 1.1.4 */ 
++#define CONFIG_ARM926EJS	1		/* This is an arm926ejs CPU */
++#define	CONFIG_ASPEED		1
++#define CONFIG_AST2300		1
++#define CONFIG_AST1070		1
++//#define CONFIG_SYS_FLASH_CFI			/* CONFIG_FLASH_CFI, CONFIG_FLASH_SPI is exclusive*/
++#define CONFIG_FLASH_SPI
++//#define CONFIG_2SPIFLASH			/* Boot SPI: CS2, 2nd SPI: CS0 */
++#undef CONFIG_2SPIFLASH
++#undef CONFIG_ASPEED_SLT
++#define CONFIG_FLASH_AST2300
++#define CONFIG_FLASH_AST2300_DMA
++//#define CONFIG_FLASH_SPIx2_Dummy
++//#define CONFIG_FLASH_SPIx4_Dummy
++#define CONFIG_CRT_DISPLAY	1		/* undef if not support CRT */
++
++//#define CONFIG_USE_IRQ				/* we don't need IRQ/FIQ stuff */
++#define CONFIG_MISC_INIT_R 
++
++/*
++ * DRAM Config
++ *
++ * 1. DRAM Size              //
++ *    CONFIG_DRAM_512MBIT    // 512M bit
++ *    CONFIG_DRAM_1GBIT      // 1G   bit (default)
++ *    CONFIG_DRAM_2GBIT      // 2G   bit
++ *    CONFIG_DRAM_4GBIT      // 4G   bit 
++ * 2. DRAM Speed             //
++ *    CONFIG_DRAM_336        // 336MHz (DDR-667)
++ *    CONFIG_DRAM_408        // 408MHz (DDR-800) (default)
++ * 3. VGA Mode
++ *    CONFIG_CRT_DISPLAY     // define to disable VGA function
++ * 4. ECC Function enable
++ *    CONFIG_DRAM_ECC        // define to enable ECC function
++ * 5. UART Debug Message
++ *    CONFIG_DRAM_UART_OUT   // enable output message at UART5
++ *    CONFIG_DRAM_UART_38400 // set the UART baud rate to 38400, default is 115200
++ */
++ 
++//1. DRAM Size
++//#define    CONFIG_DRAM_512MBIT
++#define    CONFIG_DRAM_1GBIT
++//#define    CONFIG_DRAM_2GBIT
++//#define    CONFIG_DRAM_4GBIT
++//2. DRAM Speed
++//#define    CONFIG_DRAM_336
++#define    CONFIG_DRAM_408
++//3. VGA Mode
++//#define    CONFIG_CRT_DISPLAY
++//4. ECC Function enable
++//#define    CONFIG_DRAM_ECC
++//5. UART Debug Message
++#define    CONFIG_DRAM_UART_OUT
++//#define    CONFIG_DRAM_UART_38400
++
++
++
++/* 
++ * Environment Config
++ */
++#define CONFIG_CMDLINE_TAG	 1		/* enable passing of ATAGs	*/
++#define CONFIG_SETUP_MEMORY_TAGS 1
++#define CONFIG_INITRD_TAG	 1
++#define	CONFIG_BOOTARGS 	"debug console=ttyS0,115200n8 ramdisk_size=16384 root=/dev/ram rw init=/linuxrc mem=80M"
++#define CONFIG_BOOTDELAY	3		/* autoboot after 3 seconds	*/
++#ifdef CONFIG_FLASH_AST2300
++#define CONFIG_BOOTCOMMAND	"bootm 20080000 20300000"
++#else
++#ifdef	CONFIG_SYS_FLASH_CFI 
++#define CONFIG_BOOTCOMMAND	"bootm 10080000 10300000"
++#else
++#define CONFIG_BOOTCOMMAND	"bootm 14080000 14300000"
++#endif
++#endif
++#define CONFIG_BOOTFILE		"all.bin"
++#define CONFIG_ENV_OVERWRITE
++
++/*
++ * Command line configuration.
++ */
++#include <config_cmd_default.h>
++
++#define CONFIG_CMD_DFL
++#define CONFIG_CMD_ENV
++#define CONFIG_CMD_FLASH
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_I2C
++#define CONFIG_CMD_EEPROM
++
++/* 
++ * CPU Setting
++ */
++#define CPU_CLOCK_RATE		18000000	/* 16.5 MHz clock for the ARM core */
++
++/*
++ * Size of malloc() pool
++ */
++#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 768*1024)
++#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
++
++/*
++ * Stack sizes,  The stack sizes are set up in start.S using the settings below
++ */
++#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
++#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
++#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
++
++/*
++ * Memory Configuration
++ */
++#define CONFIG_NR_DRAM_BANKS	1	   	/* we have 1 bank of DRAM */
++#define PHYS_SDRAM_1		0x40000000 	/* SDRAM Bank #1 */
++#define PHYS_SDRAM_1_SIZE	0x4000000 	/* 64 MB */
++
++#define CONFIG_SYS_SDRAM_BASE	0x40000000
++
++/*
++ * FLASH Configuration
++ */
++#ifdef CONFIG_SYS_FLASH_CFI				/* NOR Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1			0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1			0x10000000 	/* Flash Bank #1 */
++#endif
++
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH	1
++#define CONFIG_ENV_OFFSET			0x60000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x20000 	/* Total Size of Environment Sector */
++
++#define CONFIG_SYS_FLASH_CFI_AMD_RESET
++#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++
++#else						/* SPI Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1		0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1		0x14000000 	/* Flash Bank #1 */
++#define PHYS_FLASH_2		0x14800000 	/* Flash Bank #2 */
++#define PHYS_FLASH_2_BASE	0x10000000
++#endif
++
++#ifdef CONFIG_2SPIFLASH
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_2_BASE
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1, PHYS_FLASH_2 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	2
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#else
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#endif
++
++#endif
++
++#define __LITTLE_ENDIAN
++
++#define CONFIG_MONITOR_BASE		TEXT_BASE
++#define CONFIG_MONITOR_LEN		(192 << 10)
++
++/* timeout values are in ticks */
++#define CONFIG_SYS_FLASH_ERASE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Erase */
++#define CONFIG_SYS_FLASH_WRITE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Write */
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
++
++#define CONFIG_SYS_PROMPT		"boot# " 	/* Monitor Command Prompt	*/
++#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
++#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
++#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
++
++#define CONFIG_SYS_MEMTEST_START	0x40000000	/* memtest works on	*/
++#define CONFIG_SYS_MEMTEST_END		0x44FFFFFF	/* 256 MB in DRAM	*/
++
++#define	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++#undef	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++
++#define CONFIG_SYS_LOAD_ADDR		0x43000000	/* default load address */
++
++#define CONFIG_SYS_TIMERBASE		0x1E782000	/* use timer 1 */
++#define CONFIG_SYS_HZ			(1*1000*1000)	/* use external clk (1M) */
++
++/*
++ * Serial Configuration
++ */
++#define CONFIG_SYS_NS16550
++#define CONFIG_SYS_NS16550_SERIAL
++#define CONFIG_SYS_NS16550_REG_SIZE	4
++#define CONFIG_SYS_NS16550_CLK		24000000
++#define CONFIG_SYS_NS16550_COM1		0x1e783000
++#define CONFIG_SYS_NS16550_COM2		0x1e784000
++#define	CONFIG_SYS_LOADS_BAUD_CHANGE
++#define CONFIG_SERIAL1			1
++#define CONFIG_CONS_INDEX		2
++#define CONFIG_BAUDRATE			115200
++#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
++
++/*
++ * USB device configuration
++ */
++/*
++#define CONFIG_USB_DEVICE		1
++#define CONFIG_USB_TTY			1
++
++#define CONFIG_USBD_VENDORID		0x1234
++#define CONFIG_USBD_PRODUCTID		0x5678
++#define CONFIG_USBD_MANUFACTURER	"Siemens"
++#define CONFIG_USBD_PRODUCT_NAME	"SX1"
++*/
++
++/*
++ * I2C configuration
++ */
++#define CONFIG_HARD_I2C
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_SYS_I2C_SLAVE		1
++#define CONFIG_DRIVER_ASPEED_I2C
++
++/*
++* EEPROM configuration
++*/
++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 	2
++#define CONFIG_SYS_I2C_EEPROM_ADDR 	0xa0
++
++/*
++ * NIC configuration
++ */
++#define __BYTE_ORDER __LITTLE_ENDIAN
++#define __LITTLE_ENDIAN_BITFIELD
++#define CONFIG_MAC_PARTITION
++#define CONFIG_ASPEEDNIC
++//#define CONFIG_MAC1_PHY_LINK_INTERRUPT
++#define CONFIG_MAC2_ENABLE
++#define CONFIG_MAC2_PHY_LINK_INTERRUPT
++/*
++*-------------------------------------------------------------------------------
++* NOTICE: MAC1 and MAC2 now have their own seperate PHY configuration.
++* We use 2 bits for each MAC in the scratch register(D[15:11] in 0x1E6E2040) to
++* inform kernel driver.
++* The meanings of the 2 bits are:
++* 00(0): Dedicated PHY
++* 01(1): ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 10(2): ASPEED's MAC is connected to NC-SI PHY chip directly
++* 11: Reserved
++*
++* We use CONFIG_MAC1_PHY_SETTING and CONFIG_MAC2_PHY_SETTING in U-Boot
++* 0: Dedicated PHY
++* 1: ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 2: ASPEED's MAC is connected to NC-SI PHY chip directly
++* 3: Reserved
++*-------------------------------------------------------------------------------
++*/
++#define CONFIG_MAC1_PHY_SETTING		0
++#define CONFIG_MAC2_PHY_SETTING		0
++#define CONFIG_MAC_INTERFACE_CLOCK_DELAY	0x2255
++#define CONFIG_NET_MULTI
++#define CONFIG_ETHACT			aspeednic#0
++#define CONFIG_GATEWAYIP		192.168.0.1
++#define CONFIG_NETMASK			255.255.255.0
++#define CONFIG_IPADDR			192.168.0.45
++#define CONFIG_SERVERIP			192.168.0.81
++#define CONFIG_ETHADDR			00:C0:A8:12:34:56
++#define CONFIG_ETH1ADDR			00:C0:A8:12:34:57
++
++/*
++ * SLT
++ */
++/*
++#define CONFIG_SLT
++#define CFG_CMD_SLT		(CFG_CMD_VIDEOTEST | CFG_CMD_MACTEST | CFG_CMD_HACTEST | CFG_CMD_MICTEST)
++*/
++
++#endif	/* __CONFIG_H */
+diff --git a/include/configs/ast2300_nor.h b/include/configs/ast2300_nor.h
+new file mode 100644
+index 0000000..77b8fe3
+--- /dev/null
++++ b/include/configs/ast2300_nor.h
+@@ -0,0 +1,322 @@
++/*
++ * (C) Copyright 2004
++ * Peter Chen <peterc@socle-tech.com.tw>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * High Level Configuration Options
++ * (easy to change)
++ */
++//#define CONFIG_INIT_CRITICAL			/* define for U-BOOT 1.1.1 */
++#undef  CONFIG_INIT_CRITICAL			/* undef for  U-BOOT 1.1.4 */ 
++#define CONFIG_ARM926EJS	1		/* This is an arm926ejs CPU */
++#define	CONFIG_ASPEED		1
++#define CONFIG_AST2300		1
++#define CONFIG_SYS_FLASH_CFI			/* CONFIG_FLASH_CFI, CONFIG_FLASH_SPI is exclusive*/
++//#define CONFIG_FLASH_SPI
++//#define CONFIG_2SPIFLASH			/* Boot SPI: CS2, 2nd SPI: CS0 */
++#undef CONFIG_2SPIFLASH
++#undef CONFIG_ASPEED_SLT
++#define CONFIG_FLASH_AST2300
++#define CONFIG_FLASH_AST2300_DMA
++//#define CONFIG_FLASH_SPIx2_Dummy
++//#define CONFIG_FLASH_SPIx4_Dummy
++#define CONFIG_CRT_DISPLAY	1		/* undef if not support CRT */
++
++//#define CONFIG_USE_IRQ				/* we don't need IRQ/FIQ stuff */
++#define CONFIG_MISC_INIT_R 
++
++/*
++ * DRAM Config
++ *
++ * 1. DRAM Size              //
++ *    CONFIG_DRAM_512MBIT    // 512M bit
++ *    CONFIG_DRAM_1GBIT      // 1G   bit (default)
++ *    CONFIG_DRAM_2GBIT      // 2G   bit
++ *    CONFIG_DRAM_4GBIT      // 4G   bit 
++ * 2. DRAM Speed             //
++ *    CONFIG_DRAM_336        // 336MHz (DDR-667)
++ *    CONFIG_DRAM_408        // 408MHz (DDR-800) (default)
++ * 3. VGA Mode
++ *    CONFIG_CRT_DISPLAY     // define to disable VGA function
++ * 4. ECC Function enable
++ *    CONFIG_DRAM_ECC        // define to enable ECC function
++ * 5. UART Debug Message
++ *    CONFIG_DRAM_UART_OUT   // enable output message at UART5
++ *    CONFIG_DRAM_UART_38400 // set the UART baud rate to 38400, default is 115200
++ */
++ 
++//1. DRAM Size
++//#define    CONFIG_DRAM_512MBIT
++#define    CONFIG_DRAM_1GBIT
++//#define    CONFIG_DRAM_2GBIT
++//#define    CONFIG_DRAM_4GBIT
++//2. DRAM Speed
++//#define    CONFIG_DRAM_336
++#define    CONFIG_DRAM_408
++//3. VGA Mode
++//#define    CONFIG_CRT_DISPLAY
++//4. ECC Function enable
++//#define    CONFIG_DRAM_ECC
++//5. UART Debug Message
++#define    CONFIG_DRAM_UART_OUT
++//#define    CONFIG_DRAM_UART_38400
++
++
++
++/* 
++ * Environment Config
++ */
++#define CONFIG_CMDLINE_TAG	 1		/* enable passing of ATAGs	*/
++#define CONFIG_SETUP_MEMORY_TAGS 1
++#define CONFIG_INITRD_TAG	 1
++#define	CONFIG_BOOTARGS 	"debug console=ttyS0,115200n8 ramdisk_size=16384 root=/dev/ram rw init=/linuxrc mem=80M"
++#define CONFIG_BOOTDELAY	3		/* autoboot after 3 seconds	*/
++#ifdef CONFIG_FLASH_AST2300
++#define CONFIG_BOOTCOMMAND	"bootm 20080000 20300000"
++#else
++#ifdef	CONFIG_SYS_FLASH_CFI 
++#define CONFIG_BOOTCOMMAND	"bootm 10080000 10300000"
++#else
++#define CONFIG_BOOTCOMMAND	"bootm 14080000 14300000"
++#endif
++#endif
++#define CONFIG_BOOTFILE		"all.bin"
++#define CONFIG_ENV_OVERWRITE
++
++/*
++ * Command line configuration.
++ */
++#include <config_cmd_default.h>
++
++#define CONFIG_CMD_DFL
++#define CONFIG_CMD_ENV
++#define CONFIG_CMD_FLASH
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_I2C
++#define CONFIG_CMD_EEPROM
++
++/* 
++ * CPU Setting
++ */
++#define CPU_CLOCK_RATE		18000000	/* 16.5 MHz clock for the ARM core */
++
++/*
++ * Size of malloc() pool
++ */
++#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 768*1024)
++#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
++
++/*
++ * Stack sizes,  The stack sizes are set up in start.S using the settings below
++ */
++#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
++#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
++#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
++
++/*
++ * Memory Configuration
++ */
++#define CONFIG_NR_DRAM_BANKS	1	   	/* we have 1 bank of DRAM */
++#define PHYS_SDRAM_1		0x40000000 	/* SDRAM Bank #1 */
++#define PHYS_SDRAM_1_SIZE	0x4000000 	/* 64 MB */
++
++#define CONFIG_SYS_SDRAM_BASE	0x40000000
++
++/*
++ * FLASH Configuration
++ */
++#ifdef CONFIG_SYS_FLASH_CFI				/* NOR Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1			0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1			0x10000000 	/* Flash Bank #1 */
++#endif
++
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH	1
++#define CONFIG_ENV_OFFSET			0x60000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x20000 	/* Total Size of Environment Sector */
++
++#define CONFIG_SYS_FLASH_CFI_AMD_RESET
++#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++
++#else						/* SPI Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1		0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1		0x14000000 	/* Flash Bank #1 */
++#define PHYS_FLASH_2		0x14800000 	/* Flash Bank #2 */
++#define PHYS_FLASH_2_BASE	0x10000000
++#endif
++
++#ifdef CONFIG_2SPIFLASH
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_2_BASE
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1, PHYS_FLASH_2 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	2
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#else
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#endif
++
++#endif
++
++#define __LITTLE_ENDIAN
++
++#define CONFIG_MONITOR_BASE		TEXT_BASE
++#define CONFIG_MONITOR_LEN		(192 << 10)
++
++/* timeout values are in ticks */
++#define CONFIG_SYS_FLASH_ERASE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Erase */
++#define CONFIG_SYS_FLASH_WRITE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Write */
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
++
++#define CONFIG_SYS_PROMPT		"boot# " 	/* Monitor Command Prompt	*/
++#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
++#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
++#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
++
++#define CONFIG_SYS_MEMTEST_START	0x40000000	/* memtest works on	*/
++#define CONFIG_SYS_MEMTEST_END		0x44FFFFFF	/* 256 MB in DRAM	*/
++
++#define	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++#undef	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++
++#define CONFIG_SYS_LOAD_ADDR		0x43000000	/* default load address */
++
++#define CONFIG_SYS_TIMERBASE		0x1E782000	/* use timer 1 */
++#define CONFIG_SYS_HZ			(1*1000*1000)	/* use external clk (1M) */
++
++/*
++ * Serial Configuration
++ */
++#define CONFIG_SYS_NS16550
++#define CONFIG_SYS_NS16550_SERIAL
++#define CONFIG_SYS_NS16550_REG_SIZE	4
++#define CONFIG_SYS_NS16550_CLK		24000000
++#define CONFIG_SYS_NS16550_COM1		0x1e783000
++#define CONFIG_SYS_NS16550_COM2		0x1e784000
++#define	CONFIG_SYS_LOADS_BAUD_CHANGE
++#define CONFIG_SERIAL1			1
++#define CONFIG_CONS_INDEX		2
++#define CONFIG_BAUDRATE			115200
++#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
++
++/*
++ * USB device configuration
++ */
++/*
++#define CONFIG_USB_DEVICE		1
++#define CONFIG_USB_TTY			1
++
++#define CONFIG_USBD_VENDORID		0x1234
++#define CONFIG_USBD_PRODUCTID		0x5678
++#define CONFIG_USBD_MANUFACTURER	"Siemens"
++#define CONFIG_USBD_PRODUCT_NAME	"SX1"
++*/
++
++/*
++ * I2C configuration
++ */
++#define CONFIG_HARD_I2C
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_SYS_I2C_SLAVE		1
++#define CONFIG_DRIVER_ASPEED_I2C
++
++/*
++* EEPROM configuration
++*/
++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 	2
++#define CONFIG_SYS_I2C_EEPROM_ADDR 	0xa0
++
++/*
++ * NIC configuration
++ */
++#define __BYTE_ORDER __LITTLE_ENDIAN
++#define __LITTLE_ENDIAN_BITFIELD
++#define CONFIG_MAC_PARTITION
++#define CONFIG_ASPEEDNIC
++//#define CONFIG_MAC1_PHY_LINK_INTERRUPT
++#define CONFIG_MAC2_ENABLE
++#define CONFIG_MAC2_PHY_LINK_INTERRUPT
++/*
++*-------------------------------------------------------------------------------
++* NOTICE: MAC1 and MAC2 now have their own seperate PHY configuration.
++* We use 2 bits for each MAC in the scratch register(D[15:11] in 0x1E6E2040) to
++* inform kernel driver.
++* The meanings of the 2 bits are:
++* 00(0): Dedicated PHY
++* 01(1): ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 10(2): ASPEED's MAC is connected to NC-SI PHY chip directly
++* 11: Reserved
++*
++* We use CONFIG_MAC1_PHY_SETTING and CONFIG_MAC2_PHY_SETTING in U-Boot
++* 0: Dedicated PHY
++* 1: ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 2: ASPEED's MAC is connected to NC-SI PHY chip directly
++* 3: Reserved
++*-------------------------------------------------------------------------------
++*/
++#define CONFIG_MAC1_PHY_SETTING		0
++#define CONFIG_MAC2_PHY_SETTING		0
++#define CONFIG_MAC_INTERFACE_CLOCK_DELAY	0x2255
++#define CONFIG_NET_MULTI
++#define CONFIG_ETHACT			aspeednic#0
++#define CONFIG_GATEWAYIP		192.168.0.1
++#define CONFIG_NETMASK			255.255.255.0
++#define CONFIG_IPADDR			192.168.0.188
++#define CONFIG_SERVERIP			192.168.0.106
++#define CONFIG_ETHADDR			00:C0:A8:12:34:56
++#define CONFIG_ETH1ADDR			00:C0:A8:12:34:57
++
++/*
++ * SLT
++ */
++/*
++#define CONFIG_SLT
++#define CFG_CMD_SLT		(CFG_CMD_VIDEOTEST | CFG_CMD_MACTEST | CFG_CMD_HACTEST | CFG_CMD_MICTEST)
++*/
++
++#endif	/* __CONFIG_H */
+diff --git a/include/configs/ast2300_spi.h b/include/configs/ast2300_spi.h
+new file mode 100644
+index 0000000..bc65530
+--- /dev/null
++++ b/include/configs/ast2300_spi.h
+@@ -0,0 +1,322 @@
++/*
++ * (C) Copyright 2004
++ * Peter Chen <peterc@socle-tech.com.tw>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * High Level Configuration Options
++ * (easy to change)
++ */
++//#define CONFIG_INIT_CRITICAL			/* define for U-BOOT 1.1.1 */
++#undef  CONFIG_INIT_CRITICAL			/* undef for  U-BOOT 1.1.4 */ 
++#define CONFIG_ARM926EJS	1		/* This is an arm926ejs CPU */
++#define	CONFIG_ASPEED		1
++#define CONFIG_AST2300		1
++//#define CONFIG_SYS_FLASH_CFI			/* CONFIG_FLASH_CFI, CONFIG_FLASH_SPI is exclusive*/
++#define CONFIG_FLASH_SPI
++//#define CONFIG_2SPIFLASH			/* Boot SPI: CS2, 2nd SPI: CS0 */
++#undef CONFIG_2SPIFLASH
++#undef CONFIG_ASPEED_SLT
++#define CONFIG_FLASH_AST2300
++#define CONFIG_FLASH_AST2300_DMA
++//#define CONFIG_FLASH_SPIx2_Dummy
++//#define CONFIG_FLASH_SPIx4_Dummy
++#define CONFIG_CRT_DISPLAY	1		/* undef if not support CRT */
++
++//#define CONFIG_USE_IRQ				/* we don't need IRQ/FIQ stuff */
++#define CONFIG_MISC_INIT_R 
++
++/*
++ * DRAM Config
++ *
++ * 1. DRAM Size              //
++ *    CONFIG_DRAM_512MBIT    // 512M bit
++ *    CONFIG_DRAM_1GBIT      // 1G   bit (default)
++ *    CONFIG_DRAM_2GBIT      // 2G   bit
++ *    CONFIG_DRAM_4GBIT      // 4G   bit 
++ * 2. DRAM Speed             //
++ *    CONFIG_DRAM_336        // 336MHz (DDR-667)
++ *    CONFIG_DRAM_408        // 408MHz (DDR-800) (default)
++ * 3. VGA Mode
++ *    CONFIG_CRT_DISPLAY     // define to disable VGA function
++ * 4. ECC Function enable
++ *    CONFIG_DRAM_ECC        // define to enable ECC function
++ * 5. UART Debug Message
++ *    CONFIG_DRAM_UART_OUT   // enable output message at UART5
++ *    CONFIG_DRAM_UART_38400 // set the UART baud rate to 38400, default is 115200
++ */
++ 
++//1. DRAM Size
++//#define    CONFIG_DRAM_512MBIT
++#define    CONFIG_DRAM_1GBIT
++//#define    CONFIG_DRAM_2GBIT
++//#define    CONFIG_DRAM_4GBIT
++//2. DRAM Speed
++//#define    CONFIG_DRAM_336
++#define    CONFIG_DRAM_408
++//3. VGA Mode
++//#define    CONFIG_CRT_DISPLAY
++//4. ECC Function enable
++//#define    CONFIG_DRAM_ECC
++//5. UART Debug Message
++#define    CONFIG_DRAM_UART_OUT
++//#define    CONFIG_DRAM_UART_38400
++
++
++
++/* 
++ * Environment Config
++ */
++#define CONFIG_CMDLINE_TAG	 1		/* enable passing of ATAGs	*/
++#define CONFIG_SETUP_MEMORY_TAGS 1
++#define CONFIG_INITRD_TAG	 1
++#define	CONFIG_BOOTARGS 	"debug console=ttyS0,115200n8 ramdisk_size=16384 root=/dev/ram rw init=/linuxrc mem=80M"
++#define CONFIG_BOOTDELAY	3		/* autoboot after 3 seconds	*/
++#ifdef CONFIG_FLASH_AST2300
++#define CONFIG_BOOTCOMMAND	"bootm 20080000 20300000"
++#else
++#ifdef	CONFIG_SYS_FLASH_CFI 
++#define CONFIG_BOOTCOMMAND	"bootm 10080000 10300000"
++#else
++#define CONFIG_BOOTCOMMAND	"bootm 14080000 14300000"
++#endif
++#endif
++#define CONFIG_BOOTFILE		"all.bin"
++#define CONFIG_ENV_OVERWRITE
++
++/*
++ * Command line configuration.
++ */
++#include <config_cmd_default.h>
++
++#define CONFIG_CMD_DFL
++#define CONFIG_CMD_ENV
++#define CONFIG_CMD_FLASH
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_I2C
++#define CONFIG_CMD_EEPROM
++
++/* 
++ * CPU Setting
++ */
++#define CPU_CLOCK_RATE		18000000	/* 16.5 MHz clock for the ARM core */
++
++/*
++ * Size of malloc() pool
++ */
++#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 768*1024)
++#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
++
++/*
++ * Stack sizes,  The stack sizes are set up in start.S using the settings below
++ */
++#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
++#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
++#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
++
++/*
++ * Memory Configuration
++ */
++#define CONFIG_NR_DRAM_BANKS	1	   	/* we have 1 bank of DRAM */
++#define PHYS_SDRAM_1		0x40000000 	/* SDRAM Bank #1 */
++#define PHYS_SDRAM_1_SIZE	0x4000000 	/* 64 MB */
++
++#define CONFIG_SYS_SDRAM_BASE	0x40000000
++
++/*
++ * FLASH Configuration
++ */
++#ifdef CONFIG_SYS_FLASH_CFI				/* NOR Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1			0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1			0x10000000 	/* Flash Bank #1 */
++#endif
++
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH	1
++#define CONFIG_ENV_OFFSET			0x60000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x20000 	/* Total Size of Environment Sector */
++
++#define CONFIG_SYS_FLASH_CFI_AMD_RESET
++#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++
++#else						/* SPI Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1		0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1		0x14000000 	/* Flash Bank #1 */
++#define PHYS_FLASH_2		0x14800000 	/* Flash Bank #2 */
++#define PHYS_FLASH_2_BASE	0x10000000
++#endif
++
++#ifdef CONFIG_2SPIFLASH
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_2_BASE
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1, PHYS_FLASH_2 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	2
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#else
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#endif
++
++#endif
++
++#define __LITTLE_ENDIAN
++
++#define CONFIG_MONITOR_BASE		TEXT_BASE
++#define CONFIG_MONITOR_LEN		(192 << 10)
++
++/* timeout values are in ticks */
++#define CONFIG_SYS_FLASH_ERASE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Erase */
++#define CONFIG_SYS_FLASH_WRITE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Write */
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
++
++#define CONFIG_SYS_PROMPT		"boot# " 	/* Monitor Command Prompt	*/
++#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
++#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
++#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
++
++#define CONFIG_SYS_MEMTEST_START	0x40000000	/* memtest works on	*/
++#define CONFIG_SYS_MEMTEST_END		0x44FFFFFF	/* 256 MB in DRAM	*/
++
++#define	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++#undef	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++
++#define CONFIG_SYS_LOAD_ADDR		0x43000000	/* default load address */
++
++#define CONFIG_SYS_TIMERBASE		0x1E782000	/* use timer 1 */
++#define CONFIG_SYS_HZ			(1*1000*1000)	/* use external clk (1M) */
++
++/*
++ * Serial Configuration
++ */
++#define CONFIG_SYS_NS16550
++#define CONFIG_SYS_NS16550_SERIAL
++#define CONFIG_SYS_NS16550_REG_SIZE	4
++#define CONFIG_SYS_NS16550_CLK		24000000
++#define CONFIG_SYS_NS16550_COM1		0x1e783000
++#define CONFIG_SYS_NS16550_COM2		0x1e784000
++#define	CONFIG_SYS_LOADS_BAUD_CHANGE
++#define CONFIG_SERIAL1			1
++#define CONFIG_CONS_INDEX		2
++#define CONFIG_BAUDRATE			115200
++#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
++
++/*
++ * USB device configuration
++ */
++/*
++#define CONFIG_USB_DEVICE		1
++#define CONFIG_USB_TTY			1
++
++#define CONFIG_USBD_VENDORID		0x1234
++#define CONFIG_USBD_PRODUCTID		0x5678
++#define CONFIG_USBD_MANUFACTURER	"Siemens"
++#define CONFIG_USBD_PRODUCT_NAME	"SX1"
++*/
++
++/*
++ * I2C configuration
++ */
++#define CONFIG_HARD_I2C
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_SYS_I2C_SLAVE		1
++#define CONFIG_DRIVER_ASPEED_I2C
++
++/*
++* EEPROM configuration
++*/
++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 	2
++#define CONFIG_SYS_I2C_EEPROM_ADDR 	0xa0
++
++/*
++ * NIC configuration
++ */
++#define __BYTE_ORDER __LITTLE_ENDIAN
++#define __LITTLE_ENDIAN_BITFIELD
++#define CONFIG_MAC_PARTITION
++#define CONFIG_ASPEEDNIC
++//#define CONFIG_MAC1_PHY_LINK_INTERRUPT
++#define CONFIG_MAC2_ENABLE
++#define CONFIG_MAC2_PHY_LINK_INTERRUPT
++/*
++*-------------------------------------------------------------------------------
++* NOTICE: MAC1 and MAC2 now have their own seperate PHY configuration.
++* We use 2 bits for each MAC in the scratch register(D[15:11] in 0x1E6E2040) to
++* inform kernel driver.
++* The meanings of the 2 bits are:
++* 00(0): Dedicated PHY
++* 01(1): ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 10(2): ASPEED's MAC is connected to NC-SI PHY chip directly
++* 11: Reserved
++*
++* We use CONFIG_MAC1_PHY_SETTING and CONFIG_MAC2_PHY_SETTING in U-Boot
++* 0: Dedicated PHY
++* 1: ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 2: ASPEED's MAC is connected to NC-SI PHY chip directly
++* 3: Reserved
++*-------------------------------------------------------------------------------
++*/
++#define CONFIG_MAC1_PHY_SETTING		0
++#define CONFIG_MAC2_PHY_SETTING		0
++#define CONFIG_MAC_INTERFACE_CLOCK_DELAY	0x2255
++#define CONFIG_NET_MULTI
++#define CONFIG_ETHACT			aspeednic#0
++#define CONFIG_GATEWAYIP		192.168.0.1
++#define CONFIG_NETMASK			255.255.255.0
++#define CONFIG_IPADDR			192.168.0.188
++#define CONFIG_SERVERIP			192.168.0.106
++#define CONFIG_ETHADDR			00:C0:A8:12:34:56
++#define CONFIG_ETH1ADDR			00:C0:A8:12:34:57
++
++/*
++ * SLT
++ */
++/*
++#define CONFIG_SLT
++#define CFG_CMD_SLT		(CFG_CMD_VIDEOTEST | CFG_CMD_MACTEST | CFG_CMD_HACTEST | CFG_CMD_MICTEST)
++*/
++
++#endif	/* __CONFIG_H */
+diff --git a/include/configs/ast2400.h b/include/configs/ast2400.h
+new file mode 100644
+index 0000000..670fcfd
+--- /dev/null
++++ b/include/configs/ast2400.h
+@@ -0,0 +1,328 @@
++/*
++ * (C) Copyright 2004
++ * Peter Chen <peterc@socle-tech.com.tw>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * High Level Configuration Options
++ * (easy to change)
++ */
++//#define CONFIG_INIT_CRITICAL			/* define for U-BOOT 1.1.1 */
++#undef  CONFIG_INIT_CRITICAL			/* undef for  U-BOOT 1.1.4 */ 
++//#define CONFIG_FPGA_ASPEED	1
++#define CONFIG_ARM926EJS	1		/* This is an arm926ejs CPU */
++#define	CONFIG_ASPEED		1
++#define CONFIG_AST2400		1
++//#define CONFIG_AST1070		1
++//#define CONFIG_SYS_FLASH_CFI			/* CONFIG_FLASH_CFI, CONFIG_FLASH_SPI is exclusive*/
++#define CONFIG_FLASH_SPI
++//#define CONFIG_2SPIFLASH			/* Boot SPI: CS2, 2nd SPI: CS0 */
++#undef CONFIG_2SPIFLASH
++#undef CONFIG_ASPEED_SLT
++#define CONFIG_FLASH_AST2300
++//#define CONFIG_FLASH_AST2300_DMA
++//#define CONFIG_FLASH_SPIx2_Dummy
++//#define CONFIG_FLASH_SPIx4_Dummy
++#define CONFIG_CRT_DISPLAY	1		/* undef if not support CRT */
++
++//#define CONFIG_USE_IRQ				/* we don't need IRQ/FIQ stuff */
++#define CONFIG_MISC_INIT_R 
++
++/*
++ * DRAM Config
++ *
++ * 1. DRAM Size              //
++ *    CONFIG_DRAM_512MBIT    // 512M bit
++ *    CONFIG_DRAM_1GBIT      // 1G   bit (default)
++ *    CONFIG_DRAM_2GBIT      // 2G   bit
++ *    CONFIG_DRAM_4GBIT      // 4G   bit 
++ * 2. DRAM Speed             //
++ *    CONFIG_DRAM_336        // 336MHz (DDR-667)
++ *    CONFIG_DRAM_408        // 408MHz (DDR-800) (default)
++ * 3. VGA Mode
++ *    CONFIG_CRT_DISPLAY     // define to disable VGA function
++ * 4. ECC Function enable
++ *    CONFIG_DRAM_ECC        // define to enable ECC function
++ * 5. UART Debug Message
++ *    CONFIG_DRAM_UART_OUT   // enable output message at UART5
++ *    CONFIG_DRAM_UART_38400 // set the UART baud rate to 38400, default is 115200
++ */
++ 
++//1. DRAM Size
++//#define    CONFIG_DRAM_512MBIT
++#define    CONFIG_DRAM_1GBIT
++//#define    CONFIG_DRAM_2GBIT
++//#define    CONFIG_DRAM_4GBIT
++//2. DRAM Speed
++//#define    CONFIG_DRAM_336
++#define    CONFIG_DRAM_408
++//3. VGA Mode
++//#define    CONFIG_CRT_DISPLAY
++//4. ECC Function enable
++//#define    CONFIG_DRAM_ECC
++//5. UART Debug Message
++#define    CONFIG_DRAM_UART_OUT
++//#define    CONFIG_DRAM_UART_38400
++
++
++
++/* 
++ * Environment Config
++ */
++#define CONFIG_CMDLINE_TAG	 1		/* enable passing of ATAGs	*/
++#define CONFIG_SETUP_MEMORY_TAGS 1
++#define CONFIG_INITRD_TAG	 1
++#define	CONFIG_BOOTARGS 	"debug console=ttyS0,115200n8 ramdisk_size=16384 root=/dev/ram rw init=/linuxrc mem=80M"
++#define CONFIG_UPDATE           "tftp 40800000 ast2400.scr; so 40800000'"
++
++#define CONFIG_BOOTDELAY	3		/* autoboot after 3 seconds	*/
++#ifdef CONFIG_FLASH_AST2300
++#define CONFIG_BOOTCOMMAND	"bootm 20080000 20300000"
++#else
++#ifdef	CONFIG_SYS_FLASH_CFI 
++#define CONFIG_BOOTCOMMAND	"bootm 10080000 10300000"
++#else
++#define CONFIG_BOOTCOMMAND	"bootm 14080000 14300000"
++#endif
++#endif
++#define CONFIG_BOOTFILE		"all.bin"
++#define CONFIG_ENV_OVERWRITE
++
++/*
++ * Command line configuration.
++ */
++#include <config_cmd_default.h>
++
++#define CONFIG_CMD_DFL
++#define CONFIG_CMD_ENV
++#define CONFIG_CMD_FLASH
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_I2C
++#define CONFIG_CMD_EEPROM
++#define CONFIG_CMD_NETTEST
++#define CONFIG_CMD_SLT
++
++/* 
++ * CPU Setting
++ */
++#define CPU_CLOCK_RATE		18000000	/* 16.5 MHz clock for the ARM core */
++
++/*
++ * Size of malloc() pool
++ */
++#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 768*1024)
++#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
++
++/*
++ * Stack sizes,  The stack sizes are set up in start.S using the settings below
++ */
++#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
++#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
++#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
++
++/*
++ * Memory Configuration
++ */
++#define CONFIG_NR_DRAM_BANKS	1	   	/* we have 1 bank of DRAM */
++#define PHYS_SDRAM_1		0x40000000 	/* SDRAM Bank #1 */
++#define PHYS_SDRAM_1_SIZE	0x4000000 	/* 64 MB */
++
++#define CONFIG_SYS_SDRAM_BASE	0x40000000
++
++/*
++ * FLASH Configuration
++ */
++#ifdef CONFIG_SYS_FLASH_CFI				/* NOR Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1			0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1			0x10000000 	/* Flash Bank #1 */
++#endif
++
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH	1
++#define CONFIG_ENV_OFFSET					0x60000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE					0x20000 	/* Total Size of Environment Sector */
++
++#define CONFIG_SYS_FLASH_CFI_AMD_RESET
++#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++
++#else						/* SPI Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1		0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1		0x14000000 	/* Flash Bank #1 */
++#define PHYS_FLASH_2		0x14800000 	/* Flash Bank #2 */
++#define PHYS_FLASH_2_BASE	0x10000000
++#endif
++
++#ifdef CONFIG_2SPIFLASH
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_2_BASE
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1, PHYS_FLASH_2 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	2
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#else
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#endif
++
++#endif
++
++#define __LITTLE_ENDIAN
++
++#define CONFIG_MONITOR_BASE		TEXT_BASE
++#define CONFIG_MONITOR_LEN		(192 << 10)
++
++/* timeout values are in ticks */
++#define CONFIG_SYS_FLASH_ERASE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Erase */
++#define CONFIG_SYS_FLASH_WRITE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Write */
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
++
++#define CONFIG_SYS_PROMPT		"boot# " 	/* Monitor Command Prompt	*/
++#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
++#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
++#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
++
++#define CONFIG_SYS_MEMTEST_START	0x40000000	/* memtest works on	*/
++#define CONFIG_SYS_MEMTEST_END		0x44FFFFFF	/* 256 MB in DRAM	*/
++
++#define	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++#undef	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++
++#define CONFIG_SYS_LOAD_ADDR		0x43000000	/* default load address */
++
++#define CONFIG_SYS_TIMERBASE		0x1E782000	/* use timer 1 */
++#define CONFIG_SYS_HZ			(1*1000*1000)	/* use external clk (1M) */
++
++/*
++ * Serial Configuration
++ */
++#define CONFIG_SYS_NS16550
++#define CONFIG_SYS_NS16550_SERIAL
++#define CONFIG_SYS_NS16550_REG_SIZE	4
++#define CONFIG_SYS_NS16550_CLK		24000000
++#define CONFIG_SYS_NS16550_COM1		0x1e783000
++#define CONFIG_SYS_NS16550_COM2		0x1e784000
++#define	CONFIG_SYS_LOADS_BAUD_CHANGE
++#define CONFIG_SERIAL1			1
++#define CONFIG_CONS_INDEX		2
++#define CONFIG_BAUDRATE			115200
++#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
++
++/*
++ * USB device configuration
++ */
++/*
++#define CONFIG_USB_DEVICE		1
++#define CONFIG_USB_TTY			1
++
++#define CONFIG_USBD_VENDORID		0x1234
++#define CONFIG_USBD_PRODUCTID		0x5678
++#define CONFIG_USBD_MANUFACTURER	"Siemens"
++#define CONFIG_USBD_PRODUCT_NAME	"SX1"
++*/
++
++/*
++ * I2C configuration
++ */
++#define CONFIG_HARD_I2C
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_SYS_I2C_SLAVE		1
++#define CONFIG_DRIVER_ASPEED_I2C
++
++/*
++* EEPROM configuration
++*/
++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 	2
++#define CONFIG_SYS_I2C_EEPROM_ADDR 	0xa0
++
++/*
++ * NIC configuration
++ */
++#define __BYTE_ORDER __LITTLE_ENDIAN
++#define __LITTLE_ENDIAN_BITFIELD
++#define CONFIG_MAC_PARTITION
++#define CONFIG_ASPEEDNIC
++#define CONFIG_MAC1_PHY_LINK_INTERRUPT
++#define CONFIG_MAC2_ENABLE
++#define CONFIG_MAC2_PHY_LINK_INTERRUPT
++/*
++*-------------------------------------------------------------------------------
++* NOTICE: MAC1 and MAC2 now have their own seperate PHY configuration.
++* We use 2 bits for each MAC in the scratch register(D[15:11] in 0x1E6E2040) to
++* inform kernel driver.
++* The meanings of the 2 bits are:
++* 00(0): Dedicated PHY
++* 01(1): ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 10(2): ASPEED's MAC is connected to NC-SI PHY chip directly
++* 11: Reserved
++*
++* We use CONFIG_MAC1_PHY_SETTING and CONFIG_MAC2_PHY_SETTING in U-Boot
++* 0: Dedicated PHY
++* 1: ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 2: ASPEED's MAC is connected to NC-SI PHY chip directly
++* 3: Reserved
++*-------------------------------------------------------------------------------
++*/
++#define CONFIG_MAC1_PHY_SETTING		0
++#define CONFIG_MAC2_PHY_SETTING		0
++#define CONFIG_MAC_INTERFACE_CLOCK_DELAY	0x2255
++#define CONFIG_NET_MULTI
++#define CONFIG_ETHACT			aspeednic#0
++#define CONFIG_GATEWAYIP		192.168.0.1
++#define CONFIG_NETMASK			255.255.255.0
++#define CONFIG_IPADDR			192.168.0.45
++#define CONFIG_SERVERIP			192.168.0.81
++#define CONFIG_ETHADDR			00:C0:A8:12:34:56
++#define CONFIG_ETH1ADDR			00:C0:A8:12:34:57
++
++/*
++ * SLT
++ */
++/*
++#define CONFIG_SLT
++#define CFG_CMD_SLT		(CFG_CMD_VIDEOTEST | CFG_CMD_MACTEST | CFG_CMD_HACTEST | CFG_CMD_MICTEST)
++*/
++
++#endif	/* __CONFIG_H */
+diff --git a/include/configs/ast2400_ast1070.h b/include/configs/ast2400_ast1070.h
+new file mode 100644
+index 0000000..df6c44b
+--- /dev/null
++++ b/include/configs/ast2400_ast1070.h
+@@ -0,0 +1,326 @@
++/*
++ * (C) Copyright 2004
++ * Peter Chen <peterc@socle-tech.com.tw>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * High Level Configuration Options
++ * (easy to change)
++ */
++//#define CONFIG_INIT_CRITICAL			/* define for U-BOOT 1.1.1 */
++#undef  CONFIG_INIT_CRITICAL			/* undef for  U-BOOT 1.1.4 */ 
++//#define CONFIG_FPGA_ASPEED	1
++#define CONFIG_ARM926EJS	1		/* This is an arm926ejs CPU */
++#define	CONFIG_ASPEED		1
++#define CONFIG_AST2400		1
++#define CONFIG_AST1070		1
++//#define CONFIG_CALIBRATION	1
++//#define CONFIG_SYS_FLASH_CFI			/* CONFIG_FLASH_CFI, CONFIG_FLASH_SPI is exclusive*/
++#define CONFIG_FLASH_SPI
++//#define CONFIG_2SPIFLASH			/* Boot SPI: CS2, 2nd SPI: CS0 */
++#undef CONFIG_2SPIFLASH
++#undef CONFIG_ASPEED_SLT
++#define CONFIG_FLASH_AST2300
++#define CONFIG_FLASH_AST2300_DMA
++//#define CONFIG_FLASH_SPIx2_Dummy
++//#define CONFIG_FLASH_SPIx4_Dummy
++#define CONFIG_CRT_DISPLAY	1		/* undef if not support CRT */
++
++//#define CONFIG_USE_IRQ				/* we don't need IRQ/FIQ stuff */
++#define CONFIG_MISC_INIT_R 
++
++/*
++ * DRAM Config
++ *
++ * 1. DRAM Size              //
++ *    CONFIG_DRAM_512MBIT    // 512M bit
++ *    CONFIG_DRAM_1GBIT      // 1G   bit (default)
++ *    CONFIG_DRAM_2GBIT      // 2G   bit
++ *    CONFIG_DRAM_4GBIT      // 4G   bit 
++ * 2. DRAM Speed             //
++ *    CONFIG_DRAM_336        // 336MHz (DDR-667)
++ *    CONFIG_DRAM_408        // 408MHz (DDR-800) (default)
++ * 3. VGA Mode
++ *    CONFIG_CRT_DISPLAY     // define to disable VGA function
++ * 4. ECC Function enable
++ *    CONFIG_DRAM_ECC        // define to enable ECC function
++ * 5. UART Debug Message
++ *    CONFIG_DRAM_UART_OUT   // enable output message at UART5
++ *    CONFIG_DRAM_UART_38400 // set the UART baud rate to 38400, default is 115200
++ */
++ 
++//1. DRAM Size
++//#define    CONFIG_DRAM_512MBIT
++#define    CONFIG_DRAM_1GBIT
++//#define    CONFIG_DRAM_2GBIT
++//#define    CONFIG_DRAM_4GBIT
++//2. DRAM Speed
++//#define    CONFIG_DRAM_336
++#define    CONFIG_DRAM_408
++//3. VGA Mode
++//#define    CONFIG_CRT_DISPLAY
++//4. ECC Function enable
++//#define    CONFIG_DRAM_ECC
++//5. UART Debug Message
++#define    CONFIG_DRAM_UART_OUT
++//#define    CONFIG_DRAM_UART_38400
++
++
++
++/* 
++ * Environment Config
++ */
++#define CONFIG_CMDLINE_TAG	 1		/* enable passing of ATAGs	*/
++#define CONFIG_SETUP_MEMORY_TAGS 1
++#define CONFIG_INITRD_TAG	 1
++#define	CONFIG_BOOTARGS 	"debug console=ttyS0,115200n8 ramdisk_size=16384 root=/dev/ram rw init=/linuxrc mem=80M"
++#define CONFIG_BOOTDELAY	3		/* autoboot after 3 seconds	*/
++#ifdef CONFIG_FLASH_AST2300
++#define CONFIG_BOOTCOMMAND	"bootm 20080000 20300000"
++#else
++#ifdef	CONFIG_SYS_FLASH_CFI 
++#define CONFIG_BOOTCOMMAND	"bootm 10080000 10300000"
++#else
++#define CONFIG_BOOTCOMMAND	"bootm 14080000 14300000"
++#endif
++#endif
++#define CONFIG_BOOTFILE		"all.bin"
++#define CONFIG_ENV_OVERWRITE
++
++/*
++ * Command line configuration.
++ */
++#include <config_cmd_default.h>
++
++#define CONFIG_CMD_DFL
++#define CONFIG_CMD_ENV
++#define CONFIG_CMD_FLASH
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_I2C
++#define CONFIG_CMD_EEPROM
++#define CONFIG_CMD_NETTEST
++
++/* 
++ * CPU Setting
++ */
++#define CPU_CLOCK_RATE		18000000	/* 16.5 MHz clock for the ARM core */
++
++/*
++ * Size of malloc() pool
++ */
++#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 768*1024)
++#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
++
++/*
++ * Stack sizes,  The stack sizes are set up in start.S using the settings below
++ */
++#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
++#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
++#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
++
++/*
++ * Memory Configuration
++ */
++#define CONFIG_NR_DRAM_BANKS	1	   	/* we have 1 bank of DRAM */
++#define PHYS_SDRAM_1		0x40000000 	/* SDRAM Bank #1 */
++#define PHYS_SDRAM_1_SIZE	0x4000000 	/* 64 MB */
++
++#define CONFIG_SYS_SDRAM_BASE	0x40000000
++
++/*
++ * FLASH Configuration
++ */
++#ifdef CONFIG_SYS_FLASH_CFI				/* NOR Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1			0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1			0x10000000 	/* Flash Bank #1 */
++#endif
++
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH	1
++#define CONFIG_ENV_OFFSET			0x60000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x20000 	/* Total Size of Environment Sector */
++
++#define CONFIG_SYS_FLASH_CFI_AMD_RESET
++#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++
++#else						/* SPI Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1		0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1		0x14000000 	/* Flash Bank #1 */
++#define PHYS_FLASH_2		0x14800000 	/* Flash Bank #2 */
++#define PHYS_FLASH_2_BASE	0x10000000
++#endif
++
++#ifdef CONFIG_2SPIFLASH
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_2_BASE
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1, PHYS_FLASH_2 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	2
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#else
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#endif
++
++#endif
++
++#define __LITTLE_ENDIAN
++
++#define CONFIG_MONITOR_BASE		TEXT_BASE
++#define CONFIG_MONITOR_LEN		(192 << 10)
++
++/* timeout values are in ticks */
++#define CONFIG_SYS_FLASH_ERASE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Erase */
++#define CONFIG_SYS_FLASH_WRITE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Write */
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
++
++#define CONFIG_SYS_PROMPT		"boot# " 	/* Monitor Command Prompt	*/
++#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
++#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
++#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
++
++#define CONFIG_SYS_MEMTEST_START	0x40000000	/* memtest works on	*/
++#define CONFIG_SYS_MEMTEST_END		0x44FFFFFF	/* 256 MB in DRAM	*/
++
++#define	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++#undef	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++
++#define CONFIG_SYS_LOAD_ADDR		0x43000000	/* default load address */
++
++#define CONFIG_SYS_TIMERBASE		0x1E782000	/* use timer 1 */
++#define CONFIG_SYS_HZ			(1*1000*1000)	/* use external clk (1M) */
++
++/*
++ * Serial Configuration
++ */
++#define CONFIG_SYS_NS16550
++#define CONFIG_SYS_NS16550_SERIAL
++#define CONFIG_SYS_NS16550_REG_SIZE	4
++#define CONFIG_SYS_NS16550_CLK		24000000
++#define CONFIG_SYS_NS16550_COM1		0x1e783000
++#define CONFIG_SYS_NS16550_COM2		0x1e784000
++#define	CONFIG_SYS_LOADS_BAUD_CHANGE
++#define CONFIG_SERIAL1			1
++#define CONFIG_CONS_INDEX		2
++#define CONFIG_BAUDRATE			115200
++#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
++
++/*
++ * USB device configuration
++ */
++/*
++#define CONFIG_USB_DEVICE		1
++#define CONFIG_USB_TTY			1
++
++#define CONFIG_USBD_VENDORID		0x1234
++#define CONFIG_USBD_PRODUCTID		0x5678
++#define CONFIG_USBD_MANUFACTURER	"Siemens"
++#define CONFIG_USBD_PRODUCT_NAME	"SX1"
++*/
++
++/*
++ * I2C configuration
++ */
++#define CONFIG_HARD_I2C
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_SYS_I2C_SLAVE		1
++#define CONFIG_DRIVER_ASPEED_I2C
++
++/*
++* EEPROM configuration
++*/
++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 	2
++#define CONFIG_SYS_I2C_EEPROM_ADDR 	0xa0
++
++/*
++ * NIC configuration
++ */
++#define __BYTE_ORDER __LITTLE_ENDIAN
++#define __LITTLE_ENDIAN_BITFIELD
++#define CONFIG_MAC_PARTITION
++#define CONFIG_ASPEEDNIC
++#define CONFIG_MAC1_PHY_LINK_INTERRUPT
++#define CONFIG_MAC2_ENABLE
++#define CONFIG_MAC2_PHY_LINK_INTERRUPT
++/*
++*-------------------------------------------------------------------------------
++* NOTICE: MAC1 and MAC2 now have their own seperate PHY configuration.
++* We use 2 bits for each MAC in the scratch register(D[15:11] in 0x1E6E2040) to
++* inform kernel driver.
++* The meanings of the 2 bits are:
++* 00(0): Dedicated PHY
++* 01(1): ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 10(2): ASPEED's MAC is connected to NC-SI PHY chip directly
++* 11: Reserved
++*
++* We use CONFIG_MAC1_PHY_SETTING and CONFIG_MAC2_PHY_SETTING in U-Boot
++* 0: Dedicated PHY
++* 1: ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 2: ASPEED's MAC is connected to NC-SI PHY chip directly
++* 3: Reserved
++*-------------------------------------------------------------------------------
++*/
++#define CONFIG_MAC1_PHY_SETTING		0
++#define CONFIG_MAC2_PHY_SETTING		0
++#define CONFIG_MAC_INTERFACE_CLOCK_DELAY	0x2255
++#define CONFIG_NET_MULTI
++#define CONFIG_ETHACT			aspeednic#0
++#define CONFIG_GATEWAYIP		192.168.0.1
++#define CONFIG_NETMASK			255.255.255.0
++#define CONFIG_IPADDR			192.168.0.41
++#define CONFIG_SERVERIP			192.168.0.81
++#define CONFIG_ETHADDR			00:C0:A8:12:34:56
++#define CONFIG_ETH1ADDR			00:C0:A8:12:34:57
++
++/*
++ * SLT
++ */
++/*
++#define CONFIG_SLT
++#define CFG_CMD_SLT		(CFG_CMD_VIDEOTEST | CFG_CMD_MACTEST | CFG_CMD_HACTEST | CFG_CMD_MICTEST)
++*/
++
++#endif	/* __CONFIG_H */
+diff --git a/include/configs/ast2400_ast10701.h b/include/configs/ast2400_ast10701.h
+new file mode 100644
+index 0000000..4553535
+--- /dev/null
++++ b/include/configs/ast2400_ast10701.h
+@@ -0,0 +1,327 @@
++/*
++ * (C) Copyright 2004
++ * Peter Chen <peterc@socle-tech.com.tw>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * High Level Configuration Options
++ * (easy to change)
++ */
++//#define CONFIG_INIT_CRITICAL			/* define for U-BOOT 1.1.1 */
++#undef  CONFIG_INIT_CRITICAL			/* undef for  U-BOOT 1.1.4 */ 
++//#define CONFIG_FPGA_ASPEED	1
++#define CONFIG_ARM926EJS	1		/* This is an arm926ejs CPU */
++#define	CONFIG_ASPEED		1
++#define CONFIG_AST2400		1
++#define CONFIG_AST1070		1
++#define CONFIG_LPC_PLUS		1
++//#define CONFIG_CALIBRATION	1
++//#define CONFIG_SYS_FLASH_CFI			/* CONFIG_FLASH_CFI, CONFIG_FLASH_SPI is exclusive*/
++#define CONFIG_FLASH_SPI
++//#define CONFIG_2SPIFLASH			/* Boot SPI: CS2, 2nd SPI: CS0 */
++#undef CONFIG_2SPIFLASH
++#undef CONFIG_ASPEED_SLT
++#define CONFIG_FLASH_AST2300
++#define CONFIG_FLASH_AST2300_DMA
++//#define CONFIG_FLASH_SPIx2_Dummy
++//#define CONFIG_FLASH_SPIx4_Dummy
++#define CONFIG_CRT_DISPLAY	1		/* undef if not support CRT */
++
++//#define CONFIG_USE_IRQ				/* we don't need IRQ/FIQ stuff */
++#define CONFIG_MISC_INIT_R 
++
++/*
++ * DRAM Config
++ *
++ * 1. DRAM Size              //
++ *    CONFIG_DRAM_512MBIT    // 512M bit
++ *    CONFIG_DRAM_1GBIT      // 1G   bit (default)
++ *    CONFIG_DRAM_2GBIT      // 2G   bit
++ *    CONFIG_DRAM_4GBIT      // 4G   bit 
++ * 2. DRAM Speed             //
++ *    CONFIG_DRAM_336        // 336MHz (DDR-667)
++ *    CONFIG_DRAM_408        // 408MHz (DDR-800) (default)
++ * 3. VGA Mode
++ *    CONFIG_CRT_DISPLAY     // define to disable VGA function
++ * 4. ECC Function enable
++ *    CONFIG_DRAM_ECC        // define to enable ECC function
++ * 5. UART Debug Message
++ *    CONFIG_DRAM_UART_OUT   // enable output message at UART5
++ *    CONFIG_DRAM_UART_38400 // set the UART baud rate to 38400, default is 115200
++ */
++ 
++//1. DRAM Size
++//#define    CONFIG_DRAM_512MBIT
++#define    CONFIG_DRAM_1GBIT
++//#define    CONFIG_DRAM_2GBIT
++//#define    CONFIG_DRAM_4GBIT
++//2. DRAM Speed
++//#define    CONFIG_DRAM_336
++#define    CONFIG_DRAM_408
++//3. VGA Mode
++//#define    CONFIG_CRT_DISPLAY
++//4. ECC Function enable
++//#define    CONFIG_DRAM_ECC
++//5. UART Debug Message
++#define    CONFIG_DRAM_UART_OUT
++//#define    CONFIG_DRAM_UART_38400
++
++
++
++/* 
++ * Environment Config
++ */
++#define CONFIG_CMDLINE_TAG	 1		/* enable passing of ATAGs	*/
++#define CONFIG_SETUP_MEMORY_TAGS 1
++#define CONFIG_INITRD_TAG	 1
++#define	CONFIG_BOOTARGS 	"debug console=ttyS0,115200n8 ramdisk_size=16384 root=/dev/ram rw init=/linuxrc mem=80M"
++#define CONFIG_BOOTDELAY	3		/* autoboot after 3 seconds	*/
++#ifdef CONFIG_FLASH_AST2300
++#define CONFIG_BOOTCOMMAND	"bootm 20080000 20300000"
++#else
++#ifdef	CONFIG_SYS_FLASH_CFI 
++#define CONFIG_BOOTCOMMAND	"bootm 10080000 10300000"
++#else
++#define CONFIG_BOOTCOMMAND	"bootm 14080000 14300000"
++#endif
++#endif
++#define CONFIG_BOOTFILE		"all.bin"
++#define CONFIG_ENV_OVERWRITE
++
++/*
++ * Command line configuration.
++ */
++#include <config_cmd_default.h>
++
++#define CONFIG_CMD_DFL
++#define CONFIG_CMD_ENV
++#define CONFIG_CMD_FLASH
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_I2C
++#define CONFIG_CMD_EEPROM
++#define CONFIG_CMD_NETTEST
++
++/* 
++ * CPU Setting
++ */
++#define CPU_CLOCK_RATE		18000000	/* 16.5 MHz clock for the ARM core */
++
++/*
++ * Size of malloc() pool
++ */
++#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 768*1024)
++#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
++
++/*
++ * Stack sizes,  The stack sizes are set up in start.S using the settings below
++ */
++#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
++#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
++#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
++
++/*
++ * Memory Configuration
++ */
++#define CONFIG_NR_DRAM_BANKS	1	   	/* we have 1 bank of DRAM */
++#define PHYS_SDRAM_1		0x40000000 	/* SDRAM Bank #1 */
++#define PHYS_SDRAM_1_SIZE	0x4000000 	/* 64 MB */
++
++#define CONFIG_SYS_SDRAM_BASE	0x40000000
++
++/*
++ * FLASH Configuration
++ */
++#ifdef CONFIG_SYS_FLASH_CFI				/* NOR Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1			0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1			0x10000000 	/* Flash Bank #1 */
++#endif
++
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH	1
++#define CONFIG_ENV_OFFSET		0xFE0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x020000 	/* Total Size of Environment Sector */
++
++#define CONFIG_SYS_FLASH_CFI_AMD_RESET
++#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++
++#else						/* SPI Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1		0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1		0x14000000 	/* Flash Bank #1 */
++#define PHYS_FLASH_2		0x14800000 	/* Flash Bank #2 */
++#define PHYS_FLASH_2_BASE	0x10000000
++#endif
++
++#ifdef CONFIG_2SPIFLASH
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_2_BASE
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1, PHYS_FLASH_2 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	2
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#else
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#endif
++
++#endif
++
++#define __LITTLE_ENDIAN
++
++#define CONFIG_MONITOR_BASE		TEXT_BASE
++#define CONFIG_MONITOR_LEN		(192 << 10)
++
++/* timeout values are in ticks */
++#define CONFIG_SYS_FLASH_ERASE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Erase */
++#define CONFIG_SYS_FLASH_WRITE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Write */
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
++
++#define CONFIG_SYS_PROMPT		"boot# " 	/* Monitor Command Prompt	*/
++#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
++#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
++#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
++
++#define CONFIG_SYS_MEMTEST_START	0x40000000	/* memtest works on	*/
++#define CONFIG_SYS_MEMTEST_END		0x44FFFFFF	/* 256 MB in DRAM	*/
++
++#define	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++#undef	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++
++#define CONFIG_SYS_LOAD_ADDR		0x43000000	/* default load address */
++
++#define CONFIG_SYS_TIMERBASE		0x1E782000	/* use timer 1 */
++#define CONFIG_SYS_HZ			(1*1000*1000)	/* use external clk (1M) */
++
++/*
++ * Serial Configuration
++ */
++#define CONFIG_SYS_NS16550
++#define CONFIG_SYS_NS16550_SERIAL
++#define CONFIG_SYS_NS16550_REG_SIZE	4
++#define CONFIG_SYS_NS16550_CLK		24000000
++#define CONFIG_SYS_NS16550_COM1		0x1e783000
++#define CONFIG_SYS_NS16550_COM2		0x1e784000
++#define	CONFIG_SYS_LOADS_BAUD_CHANGE
++#define CONFIG_SERIAL1			1
++#define CONFIG_CONS_INDEX		2
++#define CONFIG_BAUDRATE			115200
++#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
++
++/*
++ * USB device configuration
++ */
++/*
++#define CONFIG_USB_DEVICE		1
++#define CONFIG_USB_TTY			1
++
++#define CONFIG_USBD_VENDORID		0x1234
++#define CONFIG_USBD_PRODUCTID		0x5678
++#define CONFIG_USBD_MANUFACTURER	"Siemens"
++#define CONFIG_USBD_PRODUCT_NAME	"SX1"
++*/
++
++/*
++ * I2C configuration
++ */
++#define CONFIG_HARD_I2C
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_SYS_I2C_SLAVE		1
++#define CONFIG_DRIVER_ASPEED_I2C
++
++/*
++* EEPROM configuration
++*/
++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 	2
++#define CONFIG_SYS_I2C_EEPROM_ADDR 	0xa0
++
++/*
++ * NIC configuration
++ */
++#define __BYTE_ORDER __LITTLE_ENDIAN
++#define __LITTLE_ENDIAN_BITFIELD
++#define CONFIG_MAC_PARTITION
++#define CONFIG_ASPEEDNIC
++#define CONFIG_MAC1_PHY_LINK_INTERRUPT
++#define CONFIG_MAC2_ENABLE
++#define CONFIG_MAC2_PHY_LINK_INTERRUPT
++/*
++*-------------------------------------------------------------------------------
++* NOTICE: MAC1 and MAC2 now have their own seperate PHY configuration.
++* We use 2 bits for each MAC in the scratch register(D[15:11] in 0x1E6E2040) to
++* inform kernel driver.
++* The meanings of the 2 bits are:
++* 00(0): Dedicated PHY
++* 01(1): ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 10(2): ASPEED's MAC is connected to NC-SI PHY chip directly
++* 11: Reserved
++*
++* We use CONFIG_MAC1_PHY_SETTING and CONFIG_MAC2_PHY_SETTING in U-Boot
++* 0: Dedicated PHY
++* 1: ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 2: ASPEED's MAC is connected to NC-SI PHY chip directly
++* 3: Reserved
++*-------------------------------------------------------------------------------
++*/
++#define CONFIG_MAC1_PHY_SETTING		0
++#define CONFIG_MAC2_PHY_SETTING		0
++#define CONFIG_MAC_INTERFACE_CLOCK_DELAY	0x2255
++#define CONFIG_NET_MULTI
++#define CONFIG_ETHACT			aspeednic#0
++#define CONFIG_GATEWAYIP		192.168.0.1
++#define CONFIG_NETMASK			255.255.255.0
++#define CONFIG_IPADDR			192.168.0.45
++#define CONFIG_SERVERIP			192.168.0.53
++#define CONFIG_ETHADDR			00:C0:A8:12:34:56
++#define CONFIG_ETH1ADDR			00:C0:A8:12:34:57
++
++/*
++ * SLT
++ */
++/*
++#define CONFIG_SLT
++#define CFG_CMD_SLT		(CFG_CMD_VIDEOTEST | CFG_CMD_MACTEST | CFG_CMD_HACTEST | CFG_CMD_MICTEST)
++*/
++
++#endif	/* __CONFIG_H */
+diff --git a/include/configs/ast2400_nor.h b/include/configs/ast2400_nor.h
+new file mode 100644
+index 0000000..5b10b36
+--- /dev/null
++++ b/include/configs/ast2400_nor.h
+@@ -0,0 +1,322 @@
++/*
++ * (C) Copyright 2004
++ * Peter Chen <peterc@socle-tech.com.tw>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * High Level Configuration Options
++ * (easy to change)
++ */
++//#define CONFIG_INIT_CRITICAL			/* define for U-BOOT 1.1.1 */
++#undef  CONFIG_INIT_CRITICAL			/* undef for  U-BOOT 1.1.4 */ 
++#define CONFIG_ARM926EJS	1		/* This is an arm926ejs CPU */
++#define	CONFIG_ASPEED		1
++#define CONFIG_AST2400		1
++#define CONFIG_SYS_FLASH_CFI			/* CONFIG_FLASH_CFI, CONFIG_FLASH_SPI is exclusive*/
++//#define CONFIG_FLASH_SPI
++//#define CONFIG_2SPIFLASH			/* Boot SPI: CS2, 2nd SPI: CS0 */
++#undef CONFIG_2SPIFLASH
++#undef CONFIG_ASPEED_SLT
++#define CONFIG_FLASH_AST2300
++#define CONFIG_FLASH_AST2300_DMA
++//#define CONFIG_FLASH_SPIx2_Dummy
++//#define CONFIG_FLASH_SPIx4_Dummy
++#define CONFIG_CRT_DISPLAY	1		/* undef if not support CRT */
++
++//#define CONFIG_USE_IRQ				/* we don't need IRQ/FIQ stuff */
++#define CONFIG_MISC_INIT_R 
++
++/*
++ * DRAM Config
++ *
++ * 1. DRAM Size              //
++ *    CONFIG_DRAM_512MBIT    // 512M bit
++ *    CONFIG_DRAM_1GBIT      // 1G   bit (default)
++ *    CONFIG_DRAM_2GBIT      // 2G   bit
++ *    CONFIG_DRAM_4GBIT      // 4G   bit 
++ * 2. DRAM Speed             //
++ *    CONFIG_DRAM_336        // 336MHz (DDR-667)
++ *    CONFIG_DRAM_408        // 408MHz (DDR-800) (default)
++ * 3. VGA Mode
++ *    CONFIG_CRT_DISPLAY     // define to disable VGA function
++ * 4. ECC Function enable
++ *    CONFIG_DRAM_ECC        // define to enable ECC function
++ * 5. UART Debug Message
++ *    CONFIG_DRAM_UART_OUT   // enable output message at UART5
++ *    CONFIG_DRAM_UART_38400 // set the UART baud rate to 38400, default is 115200
++ */
++ 
++//1. DRAM Size
++//#define    CONFIG_DRAM_512MBIT
++#define    CONFIG_DRAM_1GBIT
++//#define    CONFIG_DRAM_2GBIT
++//#define    CONFIG_DRAM_4GBIT
++//2. DRAM Speed
++//#define    CONFIG_DRAM_336
++#define    CONFIG_DRAM_408
++//3. VGA Mode
++//#define    CONFIG_CRT_DISPLAY
++//4. ECC Function enable
++//#define    CONFIG_DRAM_ECC
++//5. UART Debug Message
++#define    CONFIG_DRAM_UART_OUT
++//#define    CONFIG_DRAM_UART_38400
++
++
++
++/* 
++ * Environment Config
++ */
++#define CONFIG_CMDLINE_TAG	 1		/* enable passing of ATAGs	*/
++#define CONFIG_SETUP_MEMORY_TAGS 1
++#define CONFIG_INITRD_TAG	 1
++#define	CONFIG_BOOTARGS 	"debug console=ttyS0,115200n8 ramdisk_size=16384 root=/dev/ram rw init=/linuxrc mem=80M"
++#define CONFIG_BOOTDELAY	3		/* autoboot after 3 seconds	*/
++#ifdef CONFIG_FLASH_AST2300
++#define CONFIG_BOOTCOMMAND	"bootm 20080000 20300000"
++#else
++#ifdef	CONFIG_SYS_FLASH_CFI 
++#define CONFIG_BOOTCOMMAND	"bootm 10080000 10300000"
++#else
++#define CONFIG_BOOTCOMMAND	"bootm 14080000 14300000"
++#endif
++#endif
++#define CONFIG_BOOTFILE		"all.bin"
++#define CONFIG_ENV_OVERWRITE
++
++/*
++ * Command line configuration.
++ */
++#include <config_cmd_default.h>
++
++#define CONFIG_CMD_DFL
++#define CONFIG_CMD_ENV
++#define CONFIG_CMD_FLASH
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_I2C
++#define CONFIG_CMD_EEPROM
++
++/* 
++ * CPU Setting
++ */
++#define CPU_CLOCK_RATE		18000000	/* 16.5 MHz clock for the ARM core */
++
++/*
++ * Size of malloc() pool
++ */
++#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 768*1024)
++#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
++
++/*
++ * Stack sizes,  The stack sizes are set up in start.S using the settings below
++ */
++#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
++#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
++#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
++
++/*
++ * Memory Configuration
++ */
++#define CONFIG_NR_DRAM_BANKS	1	   	/* we have 1 bank of DRAM */
++#define PHYS_SDRAM_1		0x40000000 	/* SDRAM Bank #1 */
++#define PHYS_SDRAM_1_SIZE	0x4000000 	/* 64 MB */
++
++#define CONFIG_SYS_SDRAM_BASE	0x40000000
++
++/*
++ * FLASH Configuration
++ */
++#ifdef CONFIG_SYS_FLASH_CFI				/* NOR Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1			0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1			0x10000000 	/* Flash Bank #1 */
++#endif
++
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH	1
++#define CONFIG_ENV_OFFSET			0x60000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x20000 	/* Total Size of Environment Sector */
++
++#define CONFIG_SYS_FLASH_CFI_AMD_RESET
++#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++
++#else						/* SPI Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1		0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1		0x14000000 	/* Flash Bank #1 */
++#define PHYS_FLASH_2		0x14800000 	/* Flash Bank #2 */
++#define PHYS_FLASH_2_BASE	0x10000000
++#endif
++
++#ifdef CONFIG_2SPIFLASH
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_2_BASE
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1, PHYS_FLASH_2 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	2
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#else
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#endif
++
++#endif
++
++#define __LITTLE_ENDIAN
++
++#define CONFIG_MONITOR_BASE		TEXT_BASE
++#define CONFIG_MONITOR_LEN		(192 << 10)
++
++/* timeout values are in ticks */
++#define CONFIG_SYS_FLASH_ERASE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Erase */
++#define CONFIG_SYS_FLASH_WRITE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Write */
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
++
++#define CONFIG_SYS_PROMPT		"boot# " 	/* Monitor Command Prompt	*/
++#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
++#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
++#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
++
++#define CONFIG_SYS_MEMTEST_START	0x40000000	/* memtest works on	*/
++#define CONFIG_SYS_MEMTEST_END		0x44FFFFFF	/* 256 MB in DRAM	*/
++
++#define	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++#undef	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++
++#define CONFIG_SYS_LOAD_ADDR		0x43000000	/* default load address */
++
++#define CONFIG_SYS_TIMERBASE		0x1E782000	/* use timer 1 */
++#define CONFIG_SYS_HZ			(1*1000*1000)	/* use external clk (1M) */
++
++/*
++ * Serial Configuration
++ */
++#define CONFIG_SYS_NS16550
++#define CONFIG_SYS_NS16550_SERIAL
++#define CONFIG_SYS_NS16550_REG_SIZE	4
++#define CONFIG_SYS_NS16550_CLK		24000000
++#define CONFIG_SYS_NS16550_COM1		0x1e783000
++#define CONFIG_SYS_NS16550_COM2		0x1e784000
++#define	CONFIG_SYS_LOADS_BAUD_CHANGE
++#define CONFIG_SERIAL1			1
++#define CONFIG_CONS_INDEX		2
++#define CONFIG_BAUDRATE			115200
++#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
++
++/*
++ * USB device configuration
++ */
++/*
++#define CONFIG_USB_DEVICE		1
++#define CONFIG_USB_TTY			1
++
++#define CONFIG_USBD_VENDORID		0x1234
++#define CONFIG_USBD_PRODUCTID		0x5678
++#define CONFIG_USBD_MANUFACTURER	"Siemens"
++#define CONFIG_USBD_PRODUCT_NAME	"SX1"
++*/
++
++/*
++ * I2C configuration
++ */
++#define CONFIG_HARD_I2C
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_SYS_I2C_SLAVE		1
++#define CONFIG_DRIVER_ASPEED_I2C
++
++/*
++* EEPROM configuration
++*/
++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 	2
++#define CONFIG_SYS_I2C_EEPROM_ADDR 	0xa0
++
++/*
++ * NIC configuration
++ */
++#define __BYTE_ORDER __LITTLE_ENDIAN
++#define __LITTLE_ENDIAN_BITFIELD
++#define CONFIG_MAC_PARTITION
++#define CONFIG_ASPEEDNIC
++#define CONFIG_MAC1_PHY_LINK_INTERRUPT
++#define CONFIG_MAC2_ENABLE
++#define CONFIG_MAC2_PHY_LINK_INTERRUPT
++/*
++*-------------------------------------------------------------------------------
++* NOTICE: MAC1 and MAC2 now have their own seperate PHY configuration.
++* We use 2 bits for each MAC in the scratch register(D[15:11] in 0x1E6E2040) to
++* inform kernel driver.
++* The meanings of the 2 bits are:
++* 00(0): Dedicated PHY
++* 01(1): ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 10(2): ASPEED's MAC is connected to NC-SI PHY chip directly
++* 11: Reserved
++*
++* We use CONFIG_MAC1_PHY_SETTING and CONFIG_MAC2_PHY_SETTING in U-Boot
++* 0: Dedicated PHY
++* 1: ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 2: ASPEED's MAC is connected to NC-SI PHY chip directly
++* 3: Reserved
++*-------------------------------------------------------------------------------
++*/
++#define CONFIG_MAC1_PHY_SETTING		0
++#define CONFIG_MAC2_PHY_SETTING		0
++#define CONFIG_MAC_INTERFACE_CLOCK_DELAY	0x2255
++#define CONFIG_NET_MULTI
++#define CONFIG_ETHACT			aspeednic#0
++#define CONFIG_GATEWAYIP		192.168.0.1
++#define CONFIG_NETMASK			255.255.255.0
++#define CONFIG_IPADDR			192.168.0.188
++#define CONFIG_SERVERIP			192.168.0.106
++#define CONFIG_ETHADDR			00:C0:A8:12:34:56
++#define CONFIG_ETH1ADDR			00:C0:A8:12:34:57
++
++/*
++ * SLT
++ */
++/*
++#define CONFIG_SLT
++#define CFG_CMD_SLT		(CFG_CMD_VIDEOTEST | CFG_CMD_MACTEST | CFG_CMD_HACTEST | CFG_CMD_MICTEST)
++*/
++
++#endif	/* __CONFIG_H */
+diff --git a/include/configs/ast2400_slt.h b/include/configs/ast2400_slt.h
+new file mode 100644
+index 0000000..cfa1c31
+--- /dev/null
++++ b/include/configs/ast2400_slt.h
+@@ -0,0 +1,329 @@
++/*
++ * (C) Copyright 2004
++ * Peter Chen <peterc@socle-tech.com.tw>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * High Level Configuration Options
++ * (easy to change)
++ */
++//#define CONFIG_INIT_CRITICAL			/* define for U-BOOT 1.1.1 */
++#undef  CONFIG_INIT_CRITICAL			/* undef for  U-BOOT 1.1.4 */ 
++//#define CONFIG_FPGA_ASPEED	1
++#define CONFIG_ARM926EJS	1		/* This is an arm926ejs CPU */
++#define	CONFIG_ASPEED		1
++#define CONFIG_AST2400		1
++#define CONFIG_SLT_ASPEED	1
++//#define CONFIG_AST1070		1
++//#define CONFIG_SYS_FLASH_CFI			/* CONFIG_FLASH_CFI, CONFIG_FLASH_SPI is exclusive*/
++#define CONFIG_FLASH_SPI
++//#define CONFIG_2SPIFLASH			/* Boot SPI: CS2, 2nd SPI: CS0 */
++#undef CONFIG_2SPIFLASH
++#undef CONFIG_ASPEED_SLT
++#define CONFIG_FLASH_AST2300
++//#define CONFIG_FLASH_AST2300_DMA
++//#define CONFIG_FLASH_SPIx2_Dummy
++//#define CONFIG_FLASH_SPIx4_Dummy
++#define CONFIG_CRT_DISPLAY	1		/* undef if not support CRT */
++
++//#define CONFIG_USE_IRQ				/* we don't need IRQ/FIQ stuff */
++#define CONFIG_MISC_INIT_R 
++
++/*
++ * DRAM Config
++ *
++ * 1. DRAM Size              //
++ *    CONFIG_DRAM_512MBIT    // 512M bit
++ *    CONFIG_DRAM_1GBIT      // 1G   bit (default)
++ *    CONFIG_DRAM_2GBIT      // 2G   bit
++ *    CONFIG_DRAM_4GBIT      // 4G   bit 
++ * 2. DRAM Speed             //
++ *    CONFIG_DRAM_336        // 336MHz (DDR-667)
++ *    CONFIG_DRAM_408        // 408MHz (DDR-800) (default)
++ * 3. VGA Mode
++ *    CONFIG_CRT_DISPLAY     // define to disable VGA function
++ * 4. ECC Function enable
++ *    CONFIG_DRAM_ECC        // define to enable ECC function
++ * 5. UART Debug Message
++ *    CONFIG_DRAM_UART_OUT   // enable output message at UART5
++ *    CONFIG_DRAM_UART_38400 // set the UART baud rate to 38400, default is 115200
++ */
++ 
++//1. DRAM Size
++//#define    CONFIG_DRAM_512MBIT
++#define    CONFIG_DRAM_1GBIT
++//#define    CONFIG_DRAM_2GBIT
++//#define    CONFIG_DRAM_4GBIT
++//2. DRAM Speed
++//#define    CONFIG_DRAM_336
++#define    CONFIG_DRAM_408
++//3. VGA Mode
++//#define    CONFIG_CRT_DISPLAY
++//4. ECC Function enable
++//#define    CONFIG_DRAM_ECC
++//5. UART Debug Message
++#define    CONFIG_DRAM_UART_OUT
++//#define    CONFIG_DRAM_UART_38400
++
++
++
++/* 
++ * Environment Config
++ */
++#define CONFIG_CMDLINE_TAG	 1		/* enable passing of ATAGs	*/
++#define CONFIG_SETUP_MEMORY_TAGS 1
++#define CONFIG_INITRD_TAG	 1
++#define	CONFIG_BOOTARGS 	"debug console=ttyS0,115200n8 ramdisk_size=16384 root=/dev/ram rw init=/linuxrc mem=32M"
++#define CONFIG_UPDATE           "tftp 40800000 ast2400.scr; so 40800000'"
++
++#define CONFIG_BOOTDELAY	0		/* autoboot after 3 seconds	*/
++#ifdef CONFIG_FLASH_AST2300
++#define CONFIG_BOOTCOMMAND	"mactest 0 0 24 2 0 0 0; mactest 1 0 24 2 0 0 0; bootm 20080000 20300000"
++#else
++#ifdef	CONFIG_SYS_FLASH_CFI 
++#define CONFIG_BOOTCOMMAND	"bootm 10080000 10300000"
++#else
++#define CONFIG_BOOTCOMMAND	"bootm 14080000 14300000"
++#endif
++#endif
++#define CONFIG_BOOTFILE		"all.bin"
++#define CONFIG_ENV_OVERWRITE
++
++/*
++ * Command line configuration.
++ */
++#include <config_cmd_default.h>
++
++#define CONFIG_CMD_DFL
++#define CONFIG_CMD_ENV
++#define CONFIG_CMD_FLASH
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_I2C
++#define CONFIG_CMD_EEPROM
++#define CONFIG_CMD_NETTEST
++#define CONFIG_CMD_SLT
++
++/* 
++ * CPU Setting
++ */
++#define CPU_CLOCK_RATE		18000000	/* 16.5 MHz clock for the ARM core */
++
++/*
++ * Size of malloc() pool
++ */
++#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 768*1024)
++#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
++
++/*
++ * Stack sizes,  The stack sizes are set up in start.S using the settings below
++ */
++#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
++#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
++#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
++
++/*
++ * Memory Configuration
++ */
++#define CONFIG_NR_DRAM_BANKS	1	   	/* we have 1 bank of DRAM */
++#define PHYS_SDRAM_1		0x40000000 	/* SDRAM Bank #1 */
++#define PHYS_SDRAM_1_SIZE	0x4000000 	/* 64 MB */
++
++#define CONFIG_SYS_SDRAM_BASE	0x40000000
++
++/*
++ * FLASH Configuration
++ */
++#ifdef CONFIG_SYS_FLASH_CFI				/* NOR Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1			0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1			0x10000000 	/* Flash Bank #1 */
++#endif
++
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH	1
++#define CONFIG_ENV_OFFSET		0xFE0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x020000 	/* Total Size of Environment Sector */
++
++#define CONFIG_SYS_FLASH_CFI_AMD_RESET
++#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++
++#else						/* SPI Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1		0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1		0x14000000 	/* Flash Bank #1 */
++#define PHYS_FLASH_2		0x14800000 	/* Flash Bank #2 */
++#define PHYS_FLASH_2_BASE	0x10000000
++#endif
++
++#ifdef CONFIG_2SPIFLASH
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_2_BASE
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1, PHYS_FLASH_2 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	2
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#else
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#endif
++
++#endif
++
++#define __LITTLE_ENDIAN
++
++#define CONFIG_MONITOR_BASE		TEXT_BASE
++#define CONFIG_MONITOR_LEN		(192 << 10)
++
++/* timeout values are in ticks */
++#define CONFIG_SYS_FLASH_ERASE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Erase */
++#define CONFIG_SYS_FLASH_WRITE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Write */
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
++
++#define CONFIG_SYS_PROMPT		"boot# " 	/* Monitor Command Prompt	*/
++#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
++#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
++#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
++
++#define CONFIG_SYS_MEMTEST_START	0x40000000	/* memtest works on	*/
++#define CONFIG_SYS_MEMTEST_END		0x44FFFFFF	/* 256 MB in DRAM	*/
++
++#define	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++#undef	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++
++#define CONFIG_SYS_LOAD_ADDR		0x43000000	/* default load address */
++
++#define CONFIG_SYS_TIMERBASE		0x1E782000	/* use timer 1 */
++#define CONFIG_SYS_HZ			(1*1000*1000)	/* use external clk (1M) */
++
++/*
++ * Serial Configuration
++ */
++#define CONFIG_SYS_NS16550
++#define CONFIG_SYS_NS16550_SERIAL
++#define CONFIG_SYS_NS16550_REG_SIZE	4
++#define CONFIG_SYS_NS16550_CLK		24000000
++#define CONFIG_SYS_NS16550_COM1		0x1e783000
++#define CONFIG_SYS_NS16550_COM2		0x1e784000
++#define	CONFIG_SYS_LOADS_BAUD_CHANGE
++#define CONFIG_SERIAL1			1
++#define CONFIG_CONS_INDEX		2
++#define CONFIG_BAUDRATE			115200
++#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
++
++/*
++ * USB device configuration
++ */
++/*
++#define CONFIG_USB_DEVICE		1
++#define CONFIG_USB_TTY			1
++
++#define CONFIG_USBD_VENDORID		0x1234
++#define CONFIG_USBD_PRODUCTID		0x5678
++#define CONFIG_USBD_MANUFACTURER	"Siemens"
++#define CONFIG_USBD_PRODUCT_NAME	"SX1"
++*/
++
++/*
++ * I2C configuration
++ */
++#define CONFIG_HARD_I2C
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_SYS_I2C_SLAVE		1
++#define CONFIG_DRIVER_ASPEED_I2C
++
++/*
++* EEPROM configuration
++*/
++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 	2
++#define CONFIG_SYS_I2C_EEPROM_ADDR 	0xa0
++
++/*
++ * NIC configuration
++ */
++#define __BYTE_ORDER __LITTLE_ENDIAN
++#define __LITTLE_ENDIAN_BITFIELD
++#define CONFIG_MAC_PARTITION
++/*#define CONFIG_ASPEEDNIC*/
++#define CONFIG_MAC1_PHY_LINK_INTERRUPT
++#define CONFIG_MAC2_ENABLE
++#define CONFIG_MAC2_PHY_LINK_INTERRUPT
++/*
++*-------------------------------------------------------------------------------
++* NOTICE: MAC1 and MAC2 now have their own seperate PHY configuration.
++* We use 2 bits for each MAC in the scratch register(D[15:11] in 0x1E6E2040) to
++* inform kernel driver.
++* The meanings of the 2 bits are:
++* 00(0): Dedicated PHY
++* 01(1): ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 10(2): ASPEED's MAC is connected to NC-SI PHY chip directly
++* 11: Reserved
++*
++* We use CONFIG_MAC1_PHY_SETTING and CONFIG_MAC2_PHY_SETTING in U-Boot
++* 0: Dedicated PHY
++* 1: ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 2: ASPEED's MAC is connected to NC-SI PHY chip directly
++* 3: Reserved
++*-------------------------------------------------------------------------------
++*/
++#define CONFIG_MAC1_PHY_SETTING		0
++#define CONFIG_MAC2_PHY_SETTING		0
++#define CONFIG_MAC_INTERFACE_CLOCK_DELAY	0x2255
++#define CONFIG_NET_MULTI
++#define CONFIG_ETHACT			aspeednic#0
++#define CONFIG_GATEWAYIP		192.168.0.1
++#define CONFIG_NETMASK			255.255.255.0
++#define CONFIG_IPADDR			192.168.0.45
++#define CONFIG_SERVERIP			192.168.0.81
++#define CONFIG_ETHADDR			00:C0:A8:12:34:56
++#define CONFIG_ETH1ADDR			00:C0:A8:12:34:57
++
++/*
++ * SLT
++ */
++/*
++#define CONFIG_SLT
++#define CFG_CMD_SLT		(CFG_CMD_VIDEOTEST | CFG_CMD_MACTEST | CFG_CMD_HACTEST | CFG_CMD_MICTEST)
++*/
++
++#endif	/* __CONFIG_H */
+diff --git a/include/configs/ast2400_spi.h b/include/configs/ast2400_spi.h
+new file mode 100644
+index 0000000..398e168
+--- /dev/null
++++ b/include/configs/ast2400_spi.h
+@@ -0,0 +1,322 @@
++/*
++ * (C) Copyright 2004
++ * Peter Chen <peterc@socle-tech.com.tw>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * High Level Configuration Options
++ * (easy to change)
++ */
++//#define CONFIG_INIT_CRITICAL			/* define for U-BOOT 1.1.1 */
++#undef  CONFIG_INIT_CRITICAL			/* undef for  U-BOOT 1.1.4 */ 
++#define CONFIG_ARM926EJS	1		/* This is an arm926ejs CPU */
++#define	CONFIG_ASPEED		1
++#define CONFIG_AST2400		1
++//#define CONFIG_SYS_FLASH_CFI			/* CONFIG_FLASH_CFI, CONFIG_FLASH_SPI is exclusive*/
++#define CONFIG_FLASH_SPI
++//#define CONFIG_2SPIFLASH			/* Boot SPI: CS2, 2nd SPI: CS0 */
++#undef CONFIG_2SPIFLASH
++#undef CONFIG_ASPEED_SLT
++#define CONFIG_FLASH_AST2300
++#define CONFIG_FLASH_AST2300_DMA
++//#define CONFIG_FLASH_SPIx2_Dummy
++//#define CONFIG_FLASH_SPIx4_Dummy
++#define CONFIG_CRT_DISPLAY	1		/* undef if not support CRT */
++
++//#define CONFIG_USE_IRQ				/* we don't need IRQ/FIQ stuff */
++#define CONFIG_MISC_INIT_R 
++
++/*
++ * DRAM Config
++ *
++ * 1. DRAM Size              //
++ *    CONFIG_DRAM_512MBIT    // 512M bit
++ *    CONFIG_DRAM_1GBIT      // 1G   bit (default)
++ *    CONFIG_DRAM_2GBIT      // 2G   bit
++ *    CONFIG_DRAM_4GBIT      // 4G   bit 
++ * 2. DRAM Speed             //
++ *    CONFIG_DRAM_336        // 336MHz (DDR-667)
++ *    CONFIG_DRAM_408        // 408MHz (DDR-800) (default)
++ * 3. VGA Mode
++ *    CONFIG_CRT_DISPLAY     // define to disable VGA function
++ * 4. ECC Function enable
++ *    CONFIG_DRAM_ECC        // define to enable ECC function
++ * 5. UART Debug Message
++ *    CONFIG_DRAM_UART_OUT   // enable output message at UART5
++ *    CONFIG_DRAM_UART_38400 // set the UART baud rate to 38400, default is 115200
++ */
++ 
++//1. DRAM Size
++//#define    CONFIG_DRAM_512MBIT
++#define    CONFIG_DRAM_1GBIT
++//#define    CONFIG_DRAM_2GBIT
++//#define    CONFIG_DRAM_4GBIT
++//2. DRAM Speed
++//#define    CONFIG_DRAM_336
++#define    CONFIG_DRAM_408
++//3. VGA Mode
++//#define    CONFIG_CRT_DISPLAY
++//4. ECC Function enable
++//#define    CONFIG_DRAM_ECC
++//5. UART Debug Message
++#define    CONFIG_DRAM_UART_OUT
++//#define    CONFIG_DRAM_UART_38400
++
++
++
++/* 
++ * Environment Config
++ */
++#define CONFIG_CMDLINE_TAG	 1		/* enable passing of ATAGs	*/
++#define CONFIG_SETUP_MEMORY_TAGS 1
++#define CONFIG_INITRD_TAG	 1
++#define	CONFIG_BOOTARGS 	"debug console=ttyS0,115200n8 ramdisk_size=16384 root=/dev/ram rw init=/linuxrc mem=80M"
++#define CONFIG_BOOTDELAY	3		/* autoboot after 3 seconds	*/
++#ifdef CONFIG_FLASH_AST2300
++#define CONFIG_BOOTCOMMAND	"bootm 20080000 20300000"
++#else
++#ifdef	CONFIG_SYS_FLASH_CFI 
++#define CONFIG_BOOTCOMMAND	"bootm 10080000 10300000"
++#else
++#define CONFIG_BOOTCOMMAND	"bootm 14080000 14300000"
++#endif
++#endif
++#define CONFIG_BOOTFILE		"all.bin"
++#define CONFIG_ENV_OVERWRITE
++
++/*
++ * Command line configuration.
++ */
++#include <config_cmd_default.h>
++
++#define CONFIG_CMD_DFL
++#define CONFIG_CMD_ENV
++#define CONFIG_CMD_FLASH
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_I2C
++#define CONFIG_CMD_EEPROM
++
++/* 
++ * CPU Setting
++ */
++#define CPU_CLOCK_RATE		18000000	/* 16.5 MHz clock for the ARM core */
++
++/*
++ * Size of malloc() pool
++ */
++#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 768*1024)
++#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
++
++/*
++ * Stack sizes,  The stack sizes are set up in start.S using the settings below
++ */
++#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
++#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
++#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
++
++/*
++ * Memory Configuration
++ */
++#define CONFIG_NR_DRAM_BANKS	1	   	/* we have 1 bank of DRAM */
++#define PHYS_SDRAM_1		0x40000000 	/* SDRAM Bank #1 */
++#define PHYS_SDRAM_1_SIZE	0x4000000 	/* 64 MB */
++
++#define CONFIG_SYS_SDRAM_BASE	0x40000000
++
++/*
++ * FLASH Configuration
++ */
++#ifdef CONFIG_SYS_FLASH_CFI				/* NOR Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1			0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1			0x10000000 	/* Flash Bank #1 */
++#endif
++
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH	1
++#define CONFIG_ENV_OFFSET			0x60000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x20000 	/* Total Size of Environment Sector */
++
++#define CONFIG_SYS_FLASH_CFI_AMD_RESET
++#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++
++#else						/* SPI Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1		0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1		0x14000000 	/* Flash Bank #1 */
++#define PHYS_FLASH_2		0x14800000 	/* Flash Bank #2 */
++#define PHYS_FLASH_2_BASE	0x10000000
++#endif
++
++#ifdef CONFIG_2SPIFLASH
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_2_BASE
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1, PHYS_FLASH_2 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	2
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#else
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#endif
++
++#endif
++
++#define __LITTLE_ENDIAN
++
++#define CONFIG_MONITOR_BASE		TEXT_BASE
++#define CONFIG_MONITOR_LEN		(192 << 10)
++
++/* timeout values are in ticks */
++#define CONFIG_SYS_FLASH_ERASE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Erase */
++#define CONFIG_SYS_FLASH_WRITE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Write */
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
++
++#define CONFIG_SYS_PROMPT		"boot# " 	/* Monitor Command Prompt	*/
++#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
++#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
++#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
++
++#define CONFIG_SYS_MEMTEST_START	0x40000000	/* memtest works on	*/
++#define CONFIG_SYS_MEMTEST_END		0x44FFFFFF	/* 256 MB in DRAM	*/
++
++#define	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++#undef	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++
++#define CONFIG_SYS_LOAD_ADDR		0x43000000	/* default load address */
++
++#define CONFIG_SYS_TIMERBASE		0x1E782000	/* use timer 1 */
++#define CONFIG_SYS_HZ			(1*1000*1000)	/* use external clk (1M) */
++
++/*
++ * Serial Configuration
++ */
++#define CONFIG_SYS_NS16550
++#define CONFIG_SYS_NS16550_SERIAL
++#define CONFIG_SYS_NS16550_REG_SIZE	4
++#define CONFIG_SYS_NS16550_CLK		24000000
++#define CONFIG_SYS_NS16550_COM1		0x1e783000
++#define CONFIG_SYS_NS16550_COM2		0x1e784000
++#define	CONFIG_SYS_LOADS_BAUD_CHANGE
++#define CONFIG_SERIAL1			1
++#define CONFIG_CONS_INDEX		2
++#define CONFIG_BAUDRATE			115200
++#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
++
++/*
++ * USB device configuration
++ */
++/*
++#define CONFIG_USB_DEVICE		1
++#define CONFIG_USB_TTY			1
++
++#define CONFIG_USBD_VENDORID		0x1234
++#define CONFIG_USBD_PRODUCTID		0x5678
++#define CONFIG_USBD_MANUFACTURER	"Siemens"
++#define CONFIG_USBD_PRODUCT_NAME	"SX1"
++*/
++
++/*
++ * I2C configuration
++ */
++#define CONFIG_HARD_I2C
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_SYS_I2C_SLAVE		1
++#define CONFIG_DRIVER_ASPEED_I2C
++
++/*
++* EEPROM configuration
++*/
++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 	2
++#define CONFIG_SYS_I2C_EEPROM_ADDR 	0xa0
++
++/*
++ * NIC configuration
++ */
++#define __BYTE_ORDER __LITTLE_ENDIAN
++#define __LITTLE_ENDIAN_BITFIELD
++#define CONFIG_MAC_PARTITION
++#define CONFIG_ASPEEDNIC
++#define CONFIG_MAC1_PHY_LINK_INTERRUPT
++#define CONFIG_MAC2_ENABLE
++#define CONFIG_MAC2_PHY_LINK_INTERRUPT
++/*
++*-------------------------------------------------------------------------------
++* NOTICE: MAC1 and MAC2 now have their own seperate PHY configuration.
++* We use 2 bits for each MAC in the scratch register(D[15:11] in 0x1E6E2040) to
++* inform kernel driver.
++* The meanings of the 2 bits are:
++* 00(0): Dedicated PHY
++* 01(1): ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 10(2): ASPEED's MAC is connected to NC-SI PHY chip directly
++* 11: Reserved
++*
++* We use CONFIG_MAC1_PHY_SETTING and CONFIG_MAC2_PHY_SETTING in U-Boot
++* 0: Dedicated PHY
++* 1: ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 2: ASPEED's MAC is connected to NC-SI PHY chip directly
++* 3: Reserved
++*-------------------------------------------------------------------------------
++*/
++#define CONFIG_MAC1_PHY_SETTING		0
++#define CONFIG_MAC2_PHY_SETTING		0
++#define CONFIG_MAC_INTERFACE_CLOCK_DELAY	0x2255
++#define CONFIG_NET_MULTI
++#define CONFIG_ETHACT			aspeednic#0
++#define CONFIG_GATEWAYIP		192.168.0.1
++#define CONFIG_NETMASK			255.255.255.0
++#define CONFIG_IPADDR			192.168.0.45
++#define CONFIG_SERVERIP			192.168.0.81
++#define CONFIG_ETHADDR			00:C0:A8:12:34:56
++#define CONFIG_ETH1ADDR			00:C0:A8:12:34:57
++
++/*
++ * SLT
++ */
++/*
++#define CONFIG_SLT
++#define CFG_CMD_SLT		(CFG_CMD_VIDEOTEST | CFG_CMD_MACTEST | CFG_CMD_HACTEST | CFG_CMD_MICTEST)
++*/
++
++#endif	/* __CONFIG_H */
+diff --git a/include/configs/ast3100.h b/include/configs/ast3100.h
+new file mode 100644
+index 0000000..f2a2aed
+--- /dev/null
++++ b/include/configs/ast3100.h
+@@ -0,0 +1,325 @@
++/*
++ * (C) Copyright 2004
++ * Peter Chen <peterc@socle-tech.com.tw>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * High Level Configuration Options
++ * (easy to change)
++ */
++//#define CONFIG_INIT_CRITICAL			/* define for U-BOOT 1.1.1 */
++#undef  CONFIG_INIT_CRITICAL			/* undef for  U-BOOT 1.1.4 */ 
++#define CONFIG_ARM926EJS	1		/* This is an arm926ejs CPU */
++#define	CONFIG_ASPEED		1
++//#define CONFIG_AST2300		    1
++#define CONFIG_AST3100	1
++#define CONFIG_AST3100_D200         1   /* Clientron D200*/
++//#define CONFIG_SYS_FLASH_CFI			/* CONFIG_FLASH_CFI, CONFIG_FLASH_SPI is exclusive*/
++#define CONFIG_FLASH_SPI
++//#define CONFIG_2SPIFLASH			/* Boot SPI: CS2, 2nd SPI: CS0 */
++#undef CONFIG_2SPIFLASH
++#undef CONFIG_ASPEED_SLT
++#define CONFIG_FLASH_AST2300
++//#define CONFIG_FLASH_AST2300_DMA
++//#define CONFIG_FLASH_SPIx2_Dummy
++//#define CONFIG_FLASH_SPIx4_Dummy
++#define CONFIG_CRT_DISPLAY	1		/* undef if not support CRT */
++
++//#define CONFIG_USE_IRQ				/* we don't need IRQ/FIQ stuff */
++#define CONFIG_MISC_INIT_R 
++
++/* 
++ * DRAM Config
++ *
++ * 1. DRAM Size              //
++ *    CONFIG_DRAM_512MBIT    // 512M bit
++ *    CONFIG_DRAM_1GBIT      // 1G   bit (default)
++ *    CONFIG_DRAM_2GBIT      // 2G   bit
++ *    CONFIG_DRAM_4GBIT      // 4G   bit 
++ * 2. DRAM Speed             //
++ *    CONFIG_DRAM_336        // 336MHz (DDR-667)
++ *    CONFIG_DRAM_408        // 408MHz (DDR-800) (default)
++ * 3. VGA Mode
++ *    CONFIG_CRT_DISPLAY     // define to disable VGA function
++ * 4. ECC Function enable
++ *    CONFIG_DRAM_ECC        // define to enable ECC function
++ * 5. UART Debug Message
++ *    CONFIG_DRAM_UART_OUT   // enable output message at UART5
++ *    CONFIG_DRAM_UART_38400 // set the UART baud rate to 38400, default is 115200
++ */
++ 
++//1. DRAM Size
++//#define    CONFIG_DRAM_512MBIT
++#define    CONFIG_DRAM_1GBIT
++//#define    CONFIG_DRAM_2GBIT
++//#define    CONFIG_DRAM_4GBIT
++//2. DRAM Speed
++//#define    CONFIG_DRAM_336
++#define    CONFIG_DRAM_408
++//3. VGA Mode
++//#define    CONFIG_CRT_DISPLAY
++//4. ECC Function enable
++//#define    CONFIG_DRAM_ECC
++//5. UART Debug Message
++#define    CONFIG_DRAM_UART_OUT
++//#define    CONFIG_DRAM_UART_38400
++
++
++
++/* 
++ * Environment Config
++ */
++#define CONFIG_CMDLINE_TAG	 1		/* enable passing of ATAGs	*/
++#define CONFIG_SETUP_MEMORY_TAGS 1
++#define CONFIG_INITRD_TAG	 1
++#define	CONFIG_BOOTARGS 	"debug console=ttyS1,115200n8 ramdisk_size=16384 root=/dev/ram rw init=/linuxrc mem=80M"
++#define CONFIG_BOOTDELAY	4		/* autoboot after 4 seconds	*/
++#ifdef CONFIG_FLASH_AST2300
++#define CONFIG_BOOTCOMMAND	"bootm 20080000 20300000"
++#else
++#ifdef	CONFIG_SYS_FLASH_CFI 
++#define CONFIG_BOOTCOMMAND	"bootm 10080000 10300000"
++#else
++#define CONFIG_BOOTCOMMAND	"bootm 14080000 14300000"
++#endif
++#endif
++#define CONFIG_BOOTFILE		"allc.bin"
++#define CONFIG_ENV_OVERWRITE
++
++/*
++ * Command line configuration.
++ */
++#include <config_cmd_default.h>
++
++#define CONFIG_CMD_DFL
++#define CONFIG_CMD_ENV
++#define CONFIG_CMD_FLASH
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_I2C
++#define CONFIG_CMD_EEPROM
++
++/* 
++ * CPU Setting
++ */
++#define CPU_CLOCK_RATE		18000000	/* 16.5 MHz clock for the ARM core */
++
++/*
++ * Size of malloc() pool
++ */
++#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 768*1024)
++#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
++
++/*
++ * Stack sizes,  The stack sizes are set up in start.S using the settings below
++ */
++#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
++#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
++#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
++
++/*
++ * Memory Configuration
++ */
++#define CONFIG_DRAM_528 
++#define CONFIG_NR_DRAM_BANKS	1	   	/* we have 1 bank of DRAM */
++#define PHYS_SDRAM_1		0x40000000 	/* SDRAM Bank #1 */
++#define PHYS_SDRAM_1_SIZE	0x4000000 	/* 64 MB */
++
++#define CONFIG_SYS_SDRAM_BASE	0x40000000
++
++/*
++ * FLASH Configuration
++ */
++#ifdef CONFIG_SYS_FLASH_CFI				/* NOR Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1			0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1			0x10000000 	/* Flash Bank #1 */
++#endif
++
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH	1
++#define CONFIG_ENV_OFFSET			0x60000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x20000 	/* Total Size of Environment Sector */
++
++#define CONFIG_SYS_FLASH_CFI_AMD_RESET
++#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++
++#else						/* SPI Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1		0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1		0x14000000 	/* Flash Bank #1 */
++#define PHYS_FLASH_2		0x14800000 	/* Flash Bank #2 */
++#define PHYS_FLASH_2_BASE	0x10000000
++#endif
++
++#ifdef CONFIG_2SPIFLASH
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_2_BASE
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1, PHYS_FLASH_2 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	2
++#define CONFIG_SYS_MAX_FLASH_SECT	(512)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#else
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(512)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#endif
++
++#endif
++
++#define __LITTLE_ENDIAN
++
++#define CONFIG_MONITOR_BASE		TEXT_BASE
++#define CONFIG_MONITOR_LEN		(192 << 10)
++
++/* timeout values are in ticks */
++#define CONFIG_SYS_FLASH_ERASE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Erase */
++#define CONFIG_SYS_FLASH_WRITE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Write */
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
++
++#define CONFIG_SYS_PROMPT		"boot# " 	/* Monitor Command Prompt	*/
++#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
++#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
++#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
++
++#define CONFIG_SYS_MEMTEST_START	0x40000000	/* memtest works on	*/
++#define CONFIG_SYS_MEMTEST_END		0x44FFFFFF	/* 256 MB in DRAM	*/
++
++#define	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++#undef	CONFIG_SYS_CLKS_IN_HZ		/* everything, incl board info, in Hz */
++
++#define CONFIG_SYS_LOAD_ADDR		0x43000000	/* default load address */
++
++#define CONFIG_SYS_TIMERBASE		0x1E782000	/* use timer 1 */
++#define CONFIG_SYS_HZ			(1*1000*1000)	/* use external clk (1M) */
++
++/*
++ * Serial Configuration
++ */
++#define CONFIG_SYS_NS16550
++#define CONFIG_SYS_NS16550_SERIAL
++#define CONFIG_SYS_NS16550_REG_SIZE	4
++#define CONFIG_SYS_NS16550_CLK		24000000
++#define CONFIG_SYS_NS16550_COM1		0x1e783000
++#define CONFIG_SYS_NS16550_COM2		0x1e784000
++#define	CONFIG_SYS_LOADS_BAUD_CHANGE
++#define CONFIG_SERIAL1			1
++#define CONFIG_CONS_INDEX		2
++#define CONFIG_BAUDRATE			115200
++#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
++
++/*
++ * USB device configuration
++ */
++/*
++#define CONFIG_USB_DEVICE		1
++#define CONFIG_USB_TTY			1
++
++#define CONFIG_USBD_VENDORID		0x1234
++#define CONFIG_USBD_PRODUCTID		0x5678
++#define CONFIG_USBD_MANUFACTURER	"Siemens"
++#define CONFIG_USBD_PRODUCT_NAME	"SX1"
++*/
++
++/*
++ * I2C configuration
++ */
++#define CONFIG_HARD_I2C
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_SYS_I2C_SLAVE		1
++#define CONFIG_DRIVER_ASPEED_I2C
++
++/*
++* EEPROM configuration
++*/
++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 	2
++#define CONFIG_SYS_I2C_EEPROM_ADDR 	0xa0
++
++/*
++ * NIC configuration
++ */
++#define __BYTE_ORDER __LITTLE_ENDIAN
++#define __LITTLE_ENDIAN_BITFIELD
++#define CONFIG_MAC_PARTITION
++#define CONFIG_ASPEEDNIC
++//#define CONFIG_MAC1_PHY_LINK_INTERRUPT
++#define CONFIG_MAC2_ENABLE
++#define CONFIG_MAC2_PHY_LINK_INTERRUPT
++/*
++*-------------------------------------------------------------------------------
++* NOTICE: MAC1 and MAC2 now have their own seperate PHY configuration.
++* We use 2 bits for each MAC in the scratch register(D[15:11] in 0x1E6E2040) to
++* inform kernel driver.
++* The meanings of the 2 bits are:
++* 00(0): Dedicated PHY
++* 01(1): ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 10(2): ASPEED's MAC is connected to NC-SI PHY chip directly
++* 11: Reserved
++*
++* We use CONFIG_MAC1_PHY_SETTING and CONFIG_MAC2_PHY_SETTING in U-Boot
++* 0: Dedicated PHY
++* 1: ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 2: ASPEED's MAC is connected to NC-SI PHY chip directly
++* 3: Reserved
++*-------------------------------------------------------------------------------
++*/
++#define CONFIG_MAC1_PHY_SETTING		0
++#define CONFIG_MAC2_PHY_SETTING		0
++#define CONFIG_MAC_INTERFACE_CLOCK_DELAY	0x2255
++#define CONFIG_NET_MULTI
++#define CONFIG_ETHACT			aspeednic#0
++#define CONFIG_GATEWAYIP		192.168.0.1
++#define CONFIG_NETMASK			255.255.255.0
++#define CONFIG_IPADDR			192.168.0.249
++#define CONFIG_SERVERIP			192.168.0.156
++#define CONFIG_ETHADDR			00:D0:A8:12:34:58
++#define CONFIG_ETH1ADDR			00:D0:A8:12:34:59
++
++/*
++ * SLT
++ */
++/*
++#define CONFIG_SLT
++#define CFG_CMD_SLT		(CFG_CMD_VIDEOTEST | CFG_CMD_MACTEST | CFG_CMD_HACTEST | CFG_CMD_MICTEST)
++*/
++
++#endif	/* __CONFIG_H */
+diff --git a/include/flash.h b/include/flash.h
+index c7acc97..e77be1f 100644
+--- a/include/flash.h
++++ b/include/flash.h
+@@ -57,6 +57,21 @@ typedef struct {
+ 	ulong   addr_unlock2;		/* unlock address 2 for AMD flash roms  */
+ 	const char *name;		/* human-readable name	                */
+ #endif
++#ifdef CONFIG_FLASH_SPI
++  ulong   readcmd;
++  ulong   dualport;
++  ulong   dummybyte;
++  ulong   tCK_Write;
++  ulong   tCK_Erase;
++  ulong   tCK_Read;
++  ulong   CE;
++  ulong   iomode;
++  ulong   address32;
++  ulong   quadport;
++  ulong   dummydata;
++  ulong   buffersize;
++  ulong   specificspi;
++#endif
+ } flash_info_t;
+ 
+ extern flash_info_t flash_info[]; /* info for FLASH chips	*/
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/patch-2013.07/0001-u-boot-openbmc.patch b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/patch-2013.07/0001-u-boot-openbmc.patch
new file mode 100644
index 000000000..f34ef2201
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/patch-2013.07/0001-u-boot-openbmc.patch
@@ -0,0 +1,1937 @@
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/IO.c b/arch/arm/cpu/arm926ejs/aspeed/IO.c
+index 86e9918..b06fdba 100644
+--- a/arch/arm/cpu/arm926ejs/aspeed/IO.c
++++ b/arch/arm/cpu/arm926ejs/aspeed/IO.c
+@@ -31,7 +31,7 @@ static const char ThisFile[] = "IO.c";
+   #include <post.h>

+   #include <malloc.h>

+   #include <net.h>

+-  #include <COMMINF.H>

++  #include "COMMINF.H"

+ #endif

+ #ifdef SLT_DOS

+   #include <stdlib.h>

+@@ -353,4 +353,3 @@ ULONG ReadSOC_DD(ULONG addr)
+ #endif

+     return 0;

+ }

+-

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/LAN9303.c b/arch/arm/cpu/arm926ejs/aspeed/LAN9303.c
+index 498d4fd..fdabd45 100644
+--- a/arch/arm/cpu/arm926ejs/aspeed/LAN9303.c
++++ b/arch/arm/cpu/arm926ejs/aspeed/LAN9303.c
+@@ -13,9 +13,9 @@ static const char ThisFile[] = "LAN9303.c";
+ 

+ #include "SWFUNC.H"
+ #ifdef SLT_UBOOT

+-  #include <COMMINF.H>

+-  #include <MAC.H>

+-  #include <IO.H>

++  #include "COMMINF.H"
++  #include "MAC.H"
++  #include "IO.H"

+ #endif

+ 

+ #ifdef SLT_DOS

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/MAC.c b/arch/arm/cpu/arm926ejs/aspeed/MAC.c
+index 829da92..b4182f5 100644
+--- a/arch/arm/cpu/arm926ejs/aspeed/MAC.c
++++ b/arch/arm/cpu/arm926ejs/aspeed/MAC.c
+@@ -16,7 +16,7 @@ static const char ThisFile[] = "MAC.c";
+ #ifdef SLT_UBOOT

+   #include <common.h>

+   #include <command.h>

+-  #include <COMMINF.H>

++  #include "COMMINF.H"

+   #include "STDUBOOT.H"

+ #endif

+ #ifdef SLT_DOS

+@@ -2081,5 +2081,3 @@ char TestingLoop (ULONG loop_checknum) {
+ 	

+ 	return(0);

+ } // End char TestingLoop (ULONG loop_checknum)

+-

+-

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/Makefile b/arch/arm/cpu/arm926ejs/aspeed/Makefile
+index 378745e..4c4e239 100644
+--- a/arch/arm/cpu/arm926ejs/aspeed/Makefile
++++ b/arch/arm/cpu/arm926ejs/aspeed/Makefile
+@@ -16,7 +16,7 @@
+ 
+ include $(TOPDIR)/config.mk
+ 
+-LIB	= $(obj)lib$(SOC).a
++LIB	= $(obj)lib$(SOC).o
+ 
+ COBJS	= timer.o
+ COBJS	+= reset.o
+@@ -41,7 +41,7 @@ START	:= $(addprefix $(obj),$(START))
+ all:	$(obj).depend $(LIB)
+ 
+ $(LIB):	$(OBJS)
+-	$(AR) $(ARFLAGS) $@ $(OBJS)
++	$(call cmd_link_o_target, $(OBJS))
+ 
+ #########################################################################
+ 
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/NCSI.c b/arch/arm/cpu/arm926ejs/aspeed/NCSI.c
+index 7de06c3..7e86fb6 100644
+--- a/arch/arm/cpu/arm926ejs/aspeed/NCSI.c
++++ b/arch/arm/cpu/arm926ejs/aspeed/NCSI.c
+@@ -16,9 +16,9 @@ static const char ThisFile[] = "NCSI.c";
+ #ifdef SLT_UBOOT
+   #include <common.h>
+   #include <command.h>
+-  #include <COMMINF.H>
+-  #include <NCSI.H>
+-  #include <IO.H>
++  #include "COMMINF.H"
++  #include "NCSI.H"
++  #include "IO.H"
+ #endif
+ #ifdef SLT_DOS
+   #include <stdio.h>
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/PHY.c b/arch/arm/cpu/arm926ejs/aspeed/PHY.c
+index 6afed9d..db73a70 100644
+--- a/arch/arm/cpu/arm926ejs/aspeed/PHY.c
++++ b/arch/arm/cpu/arm926ejs/aspeed/PHY.c
+@@ -16,7 +16,7 @@ static const char ThisFile[] = "PHY.c";
+ #ifdef SLT_UBOOT

+   #include <common.h>

+   #include <command.h>

+-  #include <COMMINF.H>

++  #include "COMMINF.H"

+   #include "STDUBOOT.H"

+ #endif

+ #ifdef SLT_DOS

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/PLLTESTU.c b/arch/arm/cpu/arm926ejs/aspeed/PLLTESTU.c
+index 95958b0..2414d57 100644
+--- a/arch/arm/cpu/arm926ejs/aspeed/PLLTESTU.c
++++ b/arch/arm/cpu/arm926ejs/aspeed/PLLTESTU.c
+@@ -13,11 +13,11 @@ static const char ThisFile[] = "PLLTEST.c";
+ 
+ #include "SWFUNC.H"
+ 
+-#include <COMMINF.H>
+-#include <STDUBOOT.H>
+-#include <TYPEDEF.H>
+-#include <IO.H>
+-#include <PLLTESTU.H>
++#include "COMMINF.H"
++#include "STDUBOOT.H"
++#include "TYPEDEF.H"
++#include "IO.H"
++#include "PLLTESTU.H"
+ 
+ /*
+  * static
+@@ -407,5 +407,3 @@ int pll_function(int argc, char *argv[])
+         return (ERR_FATAL);
+     }
+ }
+-
+-
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/STDUBOOT.H b/arch/arm/cpu/arm926ejs/aspeed/STDUBOOT.H
+index 7fbf590..4e0adf6 100644
+--- a/arch/arm/cpu/arm926ejs/aspeed/STDUBOOT.H
++++ b/arch/arm/cpu/arm926ejs/aspeed/STDUBOOT.H
+@@ -13,6 +13,5 @@
+ 
+ unsigned long int strtoul(char *string, char **endPtr, int base);
+ int atoi( char s[] );
+-int rand(void);
+ 
+ #endif // End STDUBOOT_H
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/STDUBOOT.c b/arch/arm/cpu/arm926ejs/aspeed/STDUBOOT.c
+index 90e2997..4b1f439 100644
+--- a/arch/arm/cpu/arm926ejs/aspeed/STDUBOOT.c
++++ b/arch/arm/cpu/arm926ejs/aspeed/STDUBOOT.c
+@@ -19,11 +19,11 @@ int isspace ( char c )
+ {
+     if ( ( c == ' ' ) || ( c == 9 ) || ( c == 13 ) )
+         return 1;
+-    
++
+     return 0;
+ }
+ 
+-/* 
++/*
+  * strtoul.c --
+  *
+  *  Source code for the "strtoul" library procedure.
+@@ -111,7 +111,7 @@ strtoul(char *string, char **endPtr, int base)
+      * If no base was provided, pick one from the leading characters
+      * of the string.
+      */
+-    
++
+     if (base == 0)
+     {
+     if (*p == '0') {
+@@ -219,17 +219,6 @@ int atoi( char s[] )
+         ans = ( 10 * ans ) + ( s[i] - '0' );
+ 
+     return ans;
+-} 
+-
+-// -----------------------------------------------------------------------------
+-/* rand:return pseudo-random integer on 0...32767 */
+-int rand(void)
+-{
+-    static unsigned long int next = 1;
+-    
+-    next = next * 1103515245 + 12345; 
+-
+-    return (unsigned int) ( next / 65536 ) % 32768;
+ }
+ 
+ #endif // End SLT_UBOOT
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/STRESS.c b/arch/arm/cpu/arm926ejs/aspeed/STRESS.c
+index dffd64f..e86685e 100644
+--- a/arch/arm/cpu/arm926ejs/aspeed/STRESS.c
++++ b/arch/arm/cpu/arm926ejs/aspeed/STRESS.c
+@@ -12,8 +12,8 @@
+ static const char ThisFile[] = "STRESS.c";

+ 

+ #include "SWFUNC.H"

+-#include <COMMINF.H>

+-#include <IO.H>

++#include "COMMINF.H"

++#include "IO.H"

+ 

+ #define TIMEOUT_DRAM              5000000

+ 

+@@ -142,4 +142,3 @@ int dram_stress_function(int argc, char *argv[])
+      

+      return( ret );

+ }

+-

+diff --git a/arch/arm/cpu/arm926ejs/aspeed/TRAPTEST.c b/arch/arm/cpu/arm926ejs/aspeed/TRAPTEST.c
+index 72936c0..24ec0c5 100644
+--- a/arch/arm/cpu/arm926ejs/aspeed/TRAPTEST.c
++++ b/arch/arm/cpu/arm926ejs/aspeed/TRAPTEST.c
+@@ -13,9 +13,9 @@ static const char ThisFile[] = "PLLTEST.c";
+ 
+ #include "SWFUNC.H"
+ 
+-#include <COMMINF.H>
+-#include <TYPEDEF.H>
+-#include <IO.H>
++#include "COMMINF.H"
++#include "TYPEDEF.H"
++#include "IO.H"
+ 
+ #define ASTCHIP_2400    0
+ #define ASTCHIP_2300    1
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/mactest.c b/arch/arm/cpu/arm926ejs/aspeed/mactest.c
+index 95bd560..62a696d 100644
+--- a/arch/arm/cpu/arm926ejs/aspeed/mactest.c
++++ b/arch/arm/cpu/arm926ejs/aspeed/mactest.c
+@@ -19,9 +19,9 @@ static const char ThisFile[] = "MACTEST.c";
+   #include <post.h>
+   #include <malloc.h>
+   #include <net.h>
+-  #include <COMMINF.H>
+-  #include <STDUBOOT.H>
+-  #include <IO.H>
++  #include "COMMINF.H"
++  #include "STDUBOOT.H"
++  #include "IO.H"
+ #else
+   #include <stdlib.h>
+   #include <string.h>
+@@ -1212,4 +1212,3 @@ Find_Err_IOMargin:;
+     return(Finish_Check(0));
+    
+ }
+-
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/reset.c b/arch/arm/cpu/arm926ejs/aspeed/reset.c
+index e0a57f9..ce8dba1 100644
+--- a/arch/arm/cpu/arm926ejs/aspeed/reset.c
++++ b/arch/arm/cpu/arm926ejs/aspeed/reset.c
+@@ -17,7 +17,7 @@ void reset_cpu(ulong addr)
+ {
+ 	__raw_writel(0x10 , AST_WDT_BASE+0x04);
+ 	__raw_writel(0x4755, AST_WDT_BASE+0x08);
+-	__raw_writel(0x3, AST_WDT_BASE+0x0c);
++	__raw_writel(0x23, AST_WDT_BASE+0x0c); /* reset the full chip */
+ 
+ 	while (1)
+ 	/*nothing*/;
+diff --git a/arch/arm/cpu/arm926ejs/aspeed/timer.c b/arch/arm/cpu/arm926ejs/aspeed/timer.c
+index 4bba5c5..add4c0e 100644
+--- a/arch/arm/cpu/arm926ejs/aspeed/timer.c
++++ b/arch/arm/cpu/arm926ejs/aspeed/timer.c
+@@ -16,12 +16,17 @@
+  */
+ 
+ #include <common.h>
+-#include <arm926ejs.h>
++
++#if CONFIG_ASPEED_TIMER_CLK < CONFIG_SYS_HZ
++#error "CONFIG_ASPEED_TIMER_CLK must be as large as CONFIG_SYS_HZ"
++#endif
+ 
+ #define TIMER_LOAD_VAL 0xffffffff
++#define CLK_PER_HZ (CONFIG_ASPEED_TIMER_CLK / CONFIG_SYS_HZ)
+ 
+ /* macro to read the 32 bit timer */
+-#define READ_TIMER (*(volatile ulong *)(CONFIG_SYS_TIMERBASE+0))
++#define READ_CLK (*(volatile ulong *)(CONFIG_SYS_TIMERBASE + 0))
++#define READ_TIMER (READ_CLK / CLK_PER_HZ)
+ 
+ static ulong timestamp;
+ static ulong lastdec;
+@@ -57,27 +62,25 @@ void set_timer (ulong t)
+ }
+ 
+ /* delay x useconds AND perserve advance timstamp value */
+-void udelay (unsigned long usec)
++void __udelay (unsigned long usec)
+ {
+-	ulong tmo, tmp;
+-
+-	if(usec >= 1000){		/* if "big" number, spread normalization to seconds */
+-		tmo = usec / 1000;	/* start to normalize for usec to ticks per sec */
+-		tmo *= CONFIG_SYS_HZ;		/* find number of "ticks" to wait to achieve target */
+-		tmo /= 1000;		/* finish normalize. */
+-	}else{				/* else small number, don't kill it prior to HZ multiply */
+-		tmo = usec * CONFIG_SYS_HZ;
+-		tmo /= (1000*1000);
+-	}
+-
+-	tmp = get_timer (0);		/* get current timestamp */
+-	if( (tmo + tmp + 1) < tmp )	/* if setting this fordward will roll time stamp */
+-		reset_timer_masked ();	/* reset "advancing" timestamp to 0, set lastdec value */
+-	else
+-		tmo += tmp;		/* else, set advancing stamp wake up time */
+-
+-	while (get_timer_masked () < tmo)/* loop till event */
+-		/*NOP*/;
++  ulong last = READ_CLK;
++  ulong clks;
++  ulong elapsed = 0;
++
++  /* translate usec to clocks */
++  clks = (usec / 1000) * CLK_PER_HZ;
++  clks += (usec % 1000) * CLK_PER_HZ / 1000;
++
++  while (clks > elapsed) {
++    ulong now = READ_CLK;
++    if (now <= last) {
++      elapsed += last - now;
++    } else {
++      elapsed += TIMER_LOAD_VAL - (now - last);
++    }
++    last = now;
++  }
+ }
+ 
+ void reset_timer_masked (void)
+@@ -100,7 +103,7 @@ ulong get_timer_masked (void)
+ 		 * (TLV-now) amount of time after passing though -1
+ 		 * nts = new "advancing time stamp"...it could also roll and cause problems.
+ 		 */
+-		timestamp += lastdec + TIMER_LOAD_VAL - now;
++		timestamp += lastdec + (TIMER_LOAD_VAL / CLK_PER_HZ) - now;
+ 	}
+ 	lastdec = now;
+ 
+@@ -110,25 +113,7 @@ ulong get_timer_masked (void)
+ /* waits specified delay value and resets timestamp */
+ void udelay_masked (unsigned long usec)
+ {
+-	ulong tmo;
+-	ulong endtime;
+-	signed long diff;
+-
+-	if (usec >= 1000) {		/* if "big" number, spread normalization to seconds */
+-		tmo = usec / 1000;	/* start to normalize for usec to ticks per sec */
+-		tmo *= CONFIG_SYS_HZ;		/* find number of "ticks" to wait to achieve target */
+-		tmo /= 1000;		/* finish normalize. */
+-	} else {			/* else small number, don't kill it prior to HZ multiply */
+-		tmo = usec * CONFIG_SYS_HZ;
+-		tmo /= (1000*1000);
+-	}
+-
+-	endtime = get_timer_masked () + tmo;
+-
+-	do {
+-		ulong now = get_timer_masked ();
+-		diff = endtime - now;
+-	} while (diff >= 0);
++  __udelay(usec);
+ }
+ 
+ /*
+@@ -146,8 +131,5 @@ unsigned long long get_ticks(void)
+  */
+ ulong get_tbclk (void)
+ {
+-	ulong tbclk;
+-
+-	tbclk = CONFIG_SYS_HZ;
+-	return tbclk;
++	return CONFIG_SYS_HZ;
+ }
+diff --git a/board/aspeed/ast2400/Makefile b/board/aspeed/ast2400/Makefile
+index 1970ea1..fb77fc9 100644
+--- a/board/aspeed/ast2400/Makefile
++++ b/board/aspeed/ast2400/Makefile
+@@ -11,7 +11,7 @@
+ 
+ include $(TOPDIR)/config.mk
+ 
+-LIB	= $(obj)lib$(BOARD).a
++LIB	= $(obj)lib$(BOARD).o
+ 
+ COBJS   := ast2400.o flash.o flash_spi.o pci.o crc32.o slt.o regtest.o vfun.o vhace.o crt.o videotest.o mactest.o hactest.o mictest.o
+ 
+@@ -28,17 +28,13 @@ OBJS    := $(addprefix $(obj),$(COBJS))
+ SOBJS   := $(addprefix $(obj),$(SOBJS))
+ 
+ $(LIB): $(obj).depend $(OBJS) $(SOBJS)
+-	$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
++	$(call cmd_link_o_target, $(OBJS) $(SOBJS))
+ 
+-clean:
+-	rm -f $(SOBJS) $(OBJS)
+-
+-distclean:	clean
+-	rm -f $(LIB) core *.bak $(obj).depend
++#########################################################################
+ 
+ # defines $(obj).depend target
+ include $(SRCTREE)/rules.mk
+ 
+-sinclude .depend
++sinclude $(obj).depend
+ 
+ #########################################################################
+diff --git a/board/aspeed/ast2400/ast2400.c b/board/aspeed/ast2400/ast2400.c
+index 65bccbe..55ed6b7 100644
+--- a/board/aspeed/ast2400/ast2400.c
++++ b/board/aspeed/ast2400/ast2400.c
+@@ -10,6 +10,7 @@
+  */
+ 
+ #include <common.h>
++#include <asm/io.h>
+ #include <command.h>
+ #include <pci.h>
+ 
+@@ -105,8 +106,8 @@ int dram_init (void)
+ {
+     DECLARE_GLOBAL_DATA_PTR;
+ 
+-    gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
+-    gd->bd->bi_dram[0].size  = PHYS_SDRAM_1_SIZE;
++    /* dram_init must store complete ramsize in gd->ram_size */
++    gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
+ 
+     return 0;
+ }
+@@ -190,6 +191,22 @@ int ast1070_calibration()
+ 	return 0;
+ }
+ 
++static void watchdog_init()
++{
++#ifdef CONFIG_ASPEED_ENABLE_WATCHDOG
++#define AST_WDT_BASE 0x1e785000
++#define AST_WDT_CLK (1*1000*1000) /* 1M clock source */
++  u32 reload = AST_WDT_CLK * CONFIG_ASPEED_WATCHDOG_TIMEOUT;
++  /* set the reload value */
++  __raw_writel(reload, AST_WDT_BASE + 0x04);
++  /* magic word to reload */
++  __raw_writel(0x4755, AST_WDT_BASE + 0x08);
++  /* start the watchdog with 1M clk src and reset whole chip */
++  __raw_writel(0x33, AST_WDT_BASE + 0x0c);
++  printf("Watchdog: %us\n", CONFIG_ASPEED_WATCHDOG_TIMEOUT);
++#endif
++}
++
+ int misc_init_r(void)
+ {
+     unsigned int reg, reg1, revision, chip_id, lpc_plus;
+@@ -290,6 +307,8 @@ int misc_init_r(void)
+     if (getenv ("eeprom") == NULL) {
+ 	setenv ("eeprom", "y");
+     }
++
++    watchdog_init();
+ }
+ 
+ #ifdef	CONFIG_PCI
+@@ -302,3 +321,15 @@ void pci_init_board(void)
+     aspeed_init_pci(&hose);
+ }
+ #endif
++
++int board_eth_init(bd_t *bis)
++{
++  int ret = -1;
++#if defined(CONFIG_ASPEEDNIC)
++  ret = aspeednic_initialize(bis);
++#else
++  printf("No ETH, ");
++#endif
++
++  return ret;
++}
+diff --git a/board/aspeed/ast2400/config.mk b/board/aspeed/ast2400/config.mk
+index 24ca09b..eddc3bf 100755
+--- a/board/aspeed/ast2400/config.mk
++++ b/board/aspeed/ast2400/config.mk
+@@ -9,10 +9,5 @@
+ # MA 02111-1307 USA
+ #
+ 
+-# ROM version
+-#TEXT_BASE = 0xBFC00000
+-
+-# RAM version
+-TEXT_BASE = 0x40500000
+-#TEXT_BASE = 0x00000000
+-#TEXT_BASE = 0x00400000
++# SPI flash is mapped to 0x00000000 initially
++CONFIG_SYS_TEXT_BASE = 0x00000000
+diff --git a/board/aspeed/ast2400/flash_spi.c b/board/aspeed/ast2400/flash_spi.c
+index ad89254..339e531 100755
+--- a/board/aspeed/ast2400/flash_spi.c
++++ b/board/aspeed/ast2400/flash_spi.c
+@@ -23,7 +23,7 @@
+  */
+ 
+ /* The DEBUG define must be before common to enable debugging */
+-/* #define DEBUG	*/
++/* #define DEBUG */
+ 
+ #include <common.h>
+ #include <asm/processor.h>
+@@ -68,6 +68,7 @@ flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];		/* FLASH chips info */
+ /* Support Flash ID */
+ #define STM25P64		0x172020
+ #define STM25P128		0x182020
++#define N25Q128			0x18ba20
+ #define N25Q256			0x19ba20
+ #define N25Q512			0x20ba20
+ #define S25FL064A		0x160201
+@@ -581,7 +582,7 @@ static ulong flash_get_size (ulong base, int banknum)
+         ulID = ((ulong)ch[0]) | ((ulong)ch[1] << 8) | ((ulong)ch[2] << 16) ;        
+         info->flash_id = ulID;
+         
+-        //printf("SPI Flash ID: %x \n", ulID);
++        printf("SPI Flash ID: %x \n", ulID);
+ 
+         /* init default */        
+         info->iomode = IOMODEx1;
+@@ -617,6 +618,19 @@ static ulong flash_get_size (ulong base, int banknum)
+             ReadClk  = 50;
+             break;
+             
++        case N25Q128:
++	    info->sector_count = 256;
++	    info->size = 0x1000000;        	
++            erase_region_size  = 0x10000;
++            info->readcmd = 0x0b;            
++            info->dualport = 0;
++            info->dummybyte = 1;
++            info->buffersize = 256;            
++            WriteClk = 50;
++            EraseClk = 20;
++            ReadClk  = 50;
++	    break;
++
+         case N25Q256:
+ 	    info->sector_count = 256;
+ 	    info->size = 0x1000000;        	
+@@ -1051,8 +1065,7 @@ AST2300 A0 SPI can't run faster than 50Mhz
+             } /* JDEC */        
+         }
+         				
+-        debug ("erase_region_count = %d erase_region_size = %d\n",
+-		erase_region_count, erase_region_size);
++        debug ("erase_region_size = %d\n", erase_region_size);
+ 
+ 	sector = base;			
+ 	for (j = 0; j < info->sector_count; j++) {
+diff --git a/board/aspeed/ast2400/platform.S b/board/aspeed/ast2400/platform.S
+index 27e8f26..dd94da0 100644
+--- a/board/aspeed/ast2400/platform.S
++++ b/board/aspeed/ast2400/platform.S
+@@ -334,7 +334,11 @@ set_MPLL:
+     str r1, [r0]
+ 
+ /* Debug - UART console message */
+-    ldr r0, =0x1e78400c
++    ldr r0, =0x1e6e2080
++    ldr r1, =0xFFFF0000                          @ enable UART3 and UART4
++    str r1, [r0]
++
++    ldr r0, =CONFIG_ASPEED_COM_LCR
+     mov r1, #0x83
+     str r1, [r0]
+ 
+@@ -342,28 +346,38 @@ set_MPLL:
+     ldr r2, [r0]
+     mov r2, r2, lsr #12
+     tst r2, #0x01
+-    ldr r0, =0x1e784000
++    ldr r0, =CONFIG_ASPEED_COM
++#if CONFIG_BAUDRATE == 115200
+     moveq r1, #0x0D                              @ Baudrate 115200
+     movne r1, #0x01                              @ Baudrate 115200, div13
+-#if defined(CONFIG_DRAM_UART_38400)
++#endif
++#if CONFIG_BAUDRATE == 57600
++    moveq r1, #0x1A                              @ Baudrate 57600
++    movne r1, #0x02                              @ Baudrate 57600, div13
++#endif
++#if CONFIG_BAUDRATE == 38400
+     moveq r1, #0x27                              @ Baudrate 38400
+     movne r1, #0x03                              @ Baudrate 38400 , div13
+ #endif
++#if CONFIG_BAUDRATE == 9600
++    moveq r1, #0x9c                              @ Baudrate 9600
++    movne r1, #0x0C                              @ Baudrate 9600 , div13
++#endif
+     str r1, [r0]
+ 
+-    ldr r0, =0x1e784004
++    ldr r0, =CONFIG_ASPEED_COM_IER
+     mov r1, #0x00
+     str r1, [r0]
+ 
+-    ldr r0, =0x1e78400c
++    ldr r0, =CONFIG_ASPEED_COM_LCR
+     mov r1, #0x03
+     str r1, [r0]
+ 
+-    ldr r0, =0x1e784008
++    ldr r0, =CONFIG_ASPEED_COM_IIR
+     mov r1, #0x07
+     str r1, [r0]
+ 
+-    ldr r0, =0x1e784000
++    ldr r0, =CONFIG_ASPEED_COM
+     mov r1, #0x0D                                @ '\r'
+     str r1, [r0]
+     mov r1, #0x0A                                @ '\n'
+@@ -575,7 +589,7 @@ delay_2:
+  ******************************************************************************/
+ ddr3_init:
+ /* Debug - UART console message */
+-    ldr r0, =0x1e784000
++    ldr r0, =CONFIG_ASPEED_COM
+     mov r1, #0x33                                @ '3'
+     str r1, [r0]
+     mov r1, #0x0D                                @ '\r'
+@@ -764,7 +778,7 @@ delay3_4:
+  ******************************************************************************/
+ ddr2_init:
+ /* Debug - UART console message */
+-    ldr r0, =0x1e784000
++    ldr r0, =CONFIG_ASPEED_COM
+     mov r1, #0x32                                @ '2'
+     str r1, [r0]
+     mov r1, #0x0D                                @ '\r'
+@@ -1416,7 +1430,7 @@ init_sram_start3:
+  *****************************************************************************/
+ CBR0_START:
+ /* Debug - UART console message */
+-    ldr r0, =0x1e784000
++    ldr r0, =CONFIG_ASPEED_COM
+     mov r1, #0x43                                @ 'C'
+     str r1, [r0]
+     mov r1, #0x42                                @ 'B'
+@@ -1454,7 +1468,7 @@ cbr0_next_dqidly:
+     bgt   CBR0_END
+ 
+ /* Debug - UART console message */
+-    ldr   r0, =0x1e784000
++    ldr   r0, =CONFIG_ASPEED_COM
+     and   r1, r8, #0x07
+     add   r1, r1, #0x30                          @ '0-7'
+     str   r1, [r0]
+@@ -1776,7 +1790,7 @@ delay_5:
+  *****************************************************************************/
+ CBR1_START:
+ /* Debug - UART console message */
+-    ldr r0, =0x1e784000
++    ldr r0, =CONFIG_ASPEED_COM
+     mov r1, #0x0D                                @ '\r'
+     str r1, [r0]
+     mov r1, #0x0A                                @ '\n'
+@@ -2057,7 +2071,7 @@ cbr1_set_result_end:
+ 
+ CBR3_START:
+ /* Debug - UART console message */
+-    ldr r0, =0x1e784000
++    ldr r0, =CONFIG_ASPEED_COM
+     mov r1, #0x33                                @ '3'
+     str r1, [r0]
+ /* Debug - UART console message */
+@@ -2276,7 +2290,7 @@ CBR3_END:
+  *****************************************************************************/
+ CBR4_START:
+ /* Debug - UART console message */
+-    ldr r0, =0x1e784000
++    ldr r0, =CONFIG_ASPEED_COM
+     mov r1, #0x34                                @ '4'
+     str r1, [r0]
+ /* Debug - UART console message */
+@@ -2556,7 +2570,7 @@ set_scratch:
+     str r1, [r0]
+ 
+ /* Debug - UART console message */
+-    ldr r0, =0x1e784000
++    ldr r0, =CONFIG_ASPEED_COM
+     mov r1, #0x44                                @ 'D'
+     str r1, [r0]
+     mov r1, #0x6F                                @ 'o'
+@@ -2724,11 +2738,13 @@ ECC_Init_Flag:
+     orr r1, r1, #0x08
+     str r1, [r0]
+ 
++#ifndef CONFIG_ASPEED_ENABLE_JTAG
+     ldr r0, =0x1e6e2004
+     ldr r1, [r0]
+     ldr r2, =0xFFBFFFFF                          @ Enable JTAG Master, solve ARM stucked by JTAG issue
+     and r1, r1, r2
+     str r1, [r0]
++#endif
+ 
+     ldr r0, =0x1e6e2048                          @ Set MAC interface delay timing
+     ldr r1, =0x2255
+diff --git a/board/aspeed/ast2400/u-boot.lds b/board/aspeed/ast2400/u-boot.lds
+deleted file mode 100755
+index ff0fe22..0000000
+--- a/board/aspeed/ast2400/u-boot.lds
++++ /dev/null
+@@ -1,56 +0,0 @@
+-/*
+- * (C) Copyright 2004
+- * Wolfgang Denk, DENX Software Engineering, <wg@denx.de>
+- *
+- * See file CREDITS for list of people who contributed to this
+- * project.
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License as
+- * published by the Free Software Foundation; either version 2 of
+- * the License, or (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307 USA
+- */
+-
+-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+-/*OUTPUT_FORMAT("elf32-arm", "elf32-arm", "elf32-arm")*/
+-OUTPUT_ARCH(arm)
+-ENTRY(_start)
+-SECTIONS
+-{
+-	. = 0x00000000;
+-
+-	. = ALIGN(4);
+-	.text	   :
+-	{
+-	  cpu/arm926ejs/start.o	(.text)
+-	  *(.text)
+-	}
+-
+-	. = ALIGN(4);
+-	.rodata : { *(.rodata) }
+-
+-	. = ALIGN(4);
+-	.data : { *(.data) }
+-
+-	. = ALIGN(4);
+-	.got : { *(.got) }
+-
+-	__u_boot_cmd_start = .;
+-	.u_boot_cmd : { *(.u_boot_cmd) }
+-	__u_boot_cmd_end = .;
+-
+-	. = ALIGN(4);
+-	__bss_start = .;
+-	.bss : { *(.bss) }
+-	_end = .;
+-}
+diff --git a/boards.cfg b/boards.cfg
+index 674896b..ce6bff1 100644
+--- a/boards.cfg
++++ b/boards.cfg
+@@ -72,7 +72,8 @@ mini2440                     arm         arm920t     mini2440            friendl
+ VCMA9                        arm         arm920t     vcma9               mpl            s3c24x0
+ smdk2410                     arm         arm920t     -                   samsung        s3c24x0
+ omap1510inn                  arm         arm925t     -                   ti
+-ast2400                      arm         arm926ejs   ast2400             aspeed         aspeed
++wedge                        arm         arm926ejs   ast2400             aspeed         aspeed
++palmetto                     arm         arm926ejs   ast2400             aspeed         aspeed
+ integratorap_cm926ejs        arm         arm926ejs   integrator          armltd         -           integratorap:CM926EJ_S
+ integratorcp_cm926ejs        arm         arm926ejs   integrator          armltd         -           integratorcp:CM924EJ_S
+ aspenite                     arm         arm926ejs   -                   Marvell        armada100
+diff --git a/common/cmd_slt.c b/common/cmd_slt.c
+index 9763692..6296416 100644
+--- a/common/cmd_slt.c
++++ b/common/cmd_slt.c
+@@ -9,6 +9,7 @@
+  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++#include <common.h>
+ #include <command.h>
+ 
+ extern int pll_function(int argc, char *argv[]);
+diff --git a/common/env_common.c b/common/env_common.c
+index 906b41f..f5af537 100644
+--- a/common/env_common.c
++++ b/common/env_common.c
+@@ -203,6 +203,9 @@ void env_relocate(void)
+ #else
+ 		bootstage_error(BOOTSTAGE_ID_NET_CHECKSUM);
+ 		set_default_env("!bad CRC");
++#ifdef CONFIG_ASPEED_WRITE_DEFAULT_ENV
++    saveenv();
++#endif
+ #endif
+ 	} else {
+ 		env_relocate_spec();
+diff --git a/common/image.c b/common/image.c
+index f5ad097..2fc071b 100644
+--- a/common/image.c
++++ b/common/image.c
+@@ -902,6 +902,11 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
+ 			rd_data = image_get_data(rd_hdr);
+ 			rd_len = image_get_data_size(rd_hdr);
+ 			rd_load = image_get_load(rd_hdr);
++#ifdef CONFIG_ASPEED
++			/* Need to copy the initrd into RAM */
++			memmove_wd((void *)rd_load, (void *)rd_data, rd_len, CHUNKSZ);
++			rd_data = rd_load;
++#endif
+ 			break;
+ #if defined(CONFIG_FIT)
+ 		case IMAGE_FORMAT_FIT:
+diff --git a/drivers/net/aspeednic.c b/drivers/net/aspeednic.c
+index 6b1ce05..d75ef67 100644
+--- a/drivers/net/aspeednic.c
++++ b/drivers/net/aspeednic.c
+@@ -16,6 +16,7 @@
+ #include <malloc.h>
+ #include <net.h>
+ #include <pci.h>
++#include <linux/mii.h>
+ 
+ 
+ /*
+@@ -53,7 +54,6 @@
+ #define MAC1_MDC                 (1 << 30)
+ #define MAC1_PHY_LINK            (1 << 0)
+ #define MAC2_MDC_MDIO            (1 << 2)
+-#define MAC1_PHY_LINK            (1 << 0)
+ #define MAC2_PHY_LINK            (1 << 1)
+ #else
+ #define MAC2_MDC_MDIO            (1 << 20)
+@@ -69,6 +69,9 @@ unsigned int aspeednic_iobase[CONFIG_ASPEED_MAC_NUMBER] = {
+   0x1E660000, 0x1E680000};
+ #endif
+ 
++/* PHY address */
++static u8 g_phy_addr = 0;
++
+ #undef DEBUG_SROM
+ #undef DEBUG_SROM2
+ 
+@@ -249,6 +252,7 @@ struct de4x5_desc {
+ #define PHYID_RTL8201EL     0x001cc810
+ #define PHYID_RTL8211         0x001cc910
+ #define PHYID_BCM54612E             0x03625E6A
++#define PHYID_BCM54616S             0x03625D12
+ 
+ //NCSI define & structure
+ //NC-SI Command Packet
+@@ -410,6 +414,12 @@ static void  aspeednic_halt(struct eth_device* dev);
+ static void  set_mac_address (struct eth_device* dev, bd_t* bis);
+ static void  phy_write_register (struct eth_device* dev, u8 PHY_Register, u8 PHY_Address, u16 PHY_Data);
+ static u16   phy_read_register (struct eth_device* dev, u8 PHY_Register, u8 PHY_Address);
++#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
++static int faraday_mdio_read(const char *devname, uint8_t addr, uint8_t reg,
++                             uint16_t *value);
++static int faraday_mdio_write(const char *devname, uint8_t addr, uint8_t reg,
++                              uint16_t value);
++#endif
+ static void  set_mac_control_register(struct eth_device* dev);
+ 
+ #if defined(CONFIG_E500)
+@@ -456,7 +466,7 @@ void NCSI_Struct_Initialize(void)
+ 
+ int aspeednic_initialize(bd_t *bis)
+ {
+-  int               card_number = 0;
++  int               card_number = CONFIG_ASPEED_MAC_CONFIG - 1;
+   unsigned int    iobase, SCURegister;
+   struct eth_device*  dev;
+ 
+@@ -538,7 +548,7 @@ int aspeednic_initialize(bd_t *bis)
+ 
+   dev->iobase = iobase;
+ 
+-  if (CONFIG_MAC1_PHY_SETTING >= 1) {
++  if (CONFIG_ASPEED_MAC_PHY_SETTING >= 1) {
+ //NCSI Struct Initialize
+     NCSI_Struct_Initialize();
+   }
+@@ -556,20 +566,22 @@ int aspeednic_initialize(bd_t *bis)
+   dev->recv   = aspeednic_recv;
+ 
+   /* Ensure we're not sleeping. */
+-  if (CONFIG_MAC1_PHY_SETTING >= 1) {
++  if (CONFIG_ASPEED_MAC_PHY_SETTING >= 1) {
+     udelay(2000000); //2.0 sec
+   }
+   else {
+     udelay(10 * 1000);
+   }
+ 
+-
+   dev->init(dev, bis);
+ 
+   eth_register(dev);
+ 
++#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
++  miiphy_register(dev->name, faraday_mdio_read, faraday_mdio_write);
++#endif
+ 
+-  return card_number;
++  return 1;
+ }
+ 
+ void Calculate_Checksum(unsigned char *buffer_base, int Length)
+@@ -1114,11 +1126,37 @@ void Set_Link (struct eth_device* dev)
+   Retry = 0;
+ }
+ 
++static void aspeednic_probe_phy(struct eth_device *dev)
++{
++  u8 phy_addr;
++  u16 phy_id;
++
++  /* assume it as 0 */
++  g_phy_addr = 0;
++
++  /* Check if the PHY is up to snuff..., max phy addr is 0x1f */
++  for (phy_addr = 0; phy_addr <= 0x1f; phy_addr++) {
++    phy_id = phy_read_register(dev, MII_PHYSID1, phy_addr);
++    /*
++     * When it is unable to found PHY,
++     * the interface usually return 0xffff or 0x0000
++     */
++    if (phy_id != 0xffff && phy_id != 0x0) {
++      g_phy_addr = phy_addr;
++      break;
++    }
++  }
++  printf("%s: PHY at 0x%02x\n", dev->name, phy_addr);
++}
++
+ static int aspeednic_init(struct eth_device* dev, bd_t* bis)
+ {
+   unsigned long i, Package_Found = 0, Channel_Found = 0, Re_Send = 0, Link_Status;
+ 
+   RESET_DE4X5(dev);
++
++  aspeednic_probe_phy(dev);
++
+   set_mac_address (dev, bis);
+   set_mac_control_register (dev);
+ 
+@@ -1149,7 +1187,7 @@ static int aspeednic_init(struct eth_device* dev, bd_t* bis)
+   tx_new = 0;
+   rx_new = 0;
+ 
+-  if (CONFIG_MAC1_PHY_SETTING >= 1) {
++  if (CONFIG_ASPEED_MAC_PHY_SETTING >= 1) {
+ //NCSI Start
+ //DeSelect Package/ Select Package
+     for (i = 0; i < 4; i++) {
+@@ -1313,58 +1351,23 @@ static void aspeednic_halt(struct eth_device* dev)
+ 
+ static void set_mac_address (struct eth_device* dev, bd_t* bis)
+ {
+-  unsigned char  mac_address[6]; // 6 bytes mac address
+-  unsigned char  ethaddress[20]; // string for setenv function
+-  char *s;
+-  int i, env;                // env variable 0: eeprom, 1: environment parameters
+-
+-  s = getenv ("eeprom");
+-  env = (s && (*s == 'y')) ? 0 : 1;
+-
+-  if (env == 0) {
+-    env = 1;
+-    eeprom_init ();
+-    eeprom_read (0xA0, 0, mac_address, 6);
+-
+-    for (i = 0; i < 6; i++) {
+-      if (mac_address[i] != 0xFF) {
+-        env = 0;  //Suppose not all 0xFF is valid
+-      }
+-    }
++  if (!eth_getenv_enetaddr_by_index("eth", 0, dev->enetaddr)) {
++    eth_random_enetaddr(dev->enetaddr);
+   }
+ 
+-  if (env == 0) { // EEPROM
+-    sprintf (ethaddress, "%02X:%02X:%02X:%02X:%02X:%02X", mac_address[0], mac_address[1], mac_address[2], mac_address[3], mac_address[4], mac_address[5]);
+-    setenv ("ethaddr", ethaddress);
+-    OUTL(dev, ((mac_address[2] << 24) | (mac_address[3] << 16) | (mac_address[4] << 8) | mac_address[5]), MAC_LADR_REG);
+-    OUTL(dev, ((mac_address[0] << 8) | mac_address[1]), MAC_MADR_REG);
+-    if (CONFIG_MAC1_PHY_SETTING >= 1) {
+-      for (i = 0; i < 6; i++) {
+-        NCSI_Request.SA[i] = mac_address[i];
+-      }
+-    }
+-  }
+-  else { // Environment Parameters
+-    OUTL(dev, ((bis->bi_enetaddr[2] << 24) | (bis->bi_enetaddr[3] << 16) | (bis->bi_enetaddr[4] << 8) | bis->bi_enetaddr[5]), MAC_LADR_REG);
+-    OUTL(dev, ((bis->bi_enetaddr[0] << 8) | bis->bi_enetaddr[1]), MAC_MADR_REG);
+-    if (CONFIG_MAC1_PHY_SETTING >= 1) {
+-      for (i = 0; i < 6; i++) {
+-        NCSI_Request.SA[i] = bis->bi_enetaddr[i];
+-      }
+-    }
++  OUTL(dev, ((dev->enetaddr[2] << 24) | (dev->enetaddr[3] << 16)
++             | (dev->enetaddr[4] << 8) | dev->enetaddr[5]), MAC_LADR_REG);
++  OUTL(dev, ((dev->enetaddr[0] << 8) | dev->enetaddr[1]), MAC_MADR_REG);
++  if (CONFIG_ASPEED_MAC_PHY_SETTING >= 1) {
++    memcpy(NCSI_Request.SA, dev->enetaddr, 6);
+   }
+-
+ }
+ 
+-
+ static u16 phy_read_register (struct eth_device* dev, u8 PHY_Register, u8 PHY_Address)
+ {
+   u32 Data, Status = 0, Loop_Count = 0, PHY_Ready = 1;
+   u16 Return_Data;
+ 
+-#ifdef  REALTEK_PHY_SUPPORT
+-  PHY_Address = 0x01;
+-#endif
+ //20us * 100 = 2ms > (1 / 2.5Mhz) * 0x34
+   OUTL(dev, (PHY_Register << 21) + (PHY_Address << 16) + MIIRD + MDC_CYCTHR, PHYCR_REG);
+   do {
+@@ -1378,7 +1381,6 @@ static u16 phy_read_register (struct eth_device* dev, u8 PHY_Register, u8 PHY_Ad
+   } while (Status == MIIRD);
+ 
+   if (PHY_Ready == 0) {
+-    printf ("PHY NOT REDAY ");
+     return 0;
+   }
+   Data = INL (dev, PHYDATA_REG);
+@@ -1392,9 +1394,6 @@ static void phy_write_register (struct eth_device* dev, u8 PHY_Register, u8 PHY_
+ {
+   u32 Status = 0, Loop_Count = 0, PHY_Ready = 1;
+ 
+-#ifdef  REALTEK_PHY_SUPPORT
+-  PHY_Address = 0x01;
+-#endif
+ //20us * 100 = 2ms > (1 / 2.5Mhz) * 0x34
+   OUTL(dev, PHY_Data, PHYDATA_REG);
+   OUTL(dev, (PHY_Register << 21) + (PHY_Address << 16) + MIIWR + MDC_CYCTHR, PHYCR_REG);
+@@ -1407,31 +1406,66 @@ static void phy_write_register (struct eth_device* dev, u8 PHY_Register, u8 PHY_
+       break;
+     }
+   } while (Status == MIIWR);
+-  if (PHY_Ready == 0) {
+-    printf ("PHY NOT REDAY ");
++}
++
++#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
++
++static int faraday_mdio_read(
++  const char *devname, uint8_t addr, uint8_t reg, uint16_t *value)
++{
++  int ret = 0;
++  struct eth_device *dev;
++
++  dev = eth_get_dev_by_name(devname);
++  if (dev == NULL) {
++    printf("%s: no such device\n", devname);
++    ret = -1;
++  } else {
++    *value = phy_read_register(dev, reg, addr);
++  }
++
++  return ret;
++}
++
++static int faraday_mdio_write(
++  const char *devname, uint8_t addr, uint8_t reg, uint16_t value)
++{
++  int ret = 0;
++  struct eth_device *dev;
++
++  dev = eth_get_dev_by_name(devname);
++  if (dev == NULL) {
++    printf("%s: no such device\n", devname);
++    ret = -1;
++  } else {
++    phy_write_register(dev, reg, addr, value);
+   }
++
++  return ret;
+ }
+ 
++#endif    /* #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) */
++
+ static void set_mac_control_register (struct eth_device* dev)
+ {
+   unsigned long MAC_CR_Register = 0;
+-  unsigned long   Loop_Count = 0, PHY_Ready = 1, Chip_ID;
++  unsigned int   Loop_Count = 0, PHY_Ready = 1, Chip_ID;
+   u16    PHY_Status, PHY_Speed, PHY_Duplex, Resolved_Status = 0, Advertise, Link_Partner;
+ 
+-  if (CONFIG_MAC1_PHY_SETTING >= 1) {
++  if (CONFIG_ASPEED_MAC_PHY_SETTING >= 1) {
+     MAC_CR_Register = SPEED_100M_MODE_bit | RX_BROADPKT_bit | FULLDUP_bit | RXMAC_EN_bit | RXDMA_EN_bit | TXMAC_EN_bit | TXDMA_EN_bit | CRC_APD_bit;
+   }
+   else {
+     MAC_CR_Register = SPEED_100M_MODE_bit | FULLDUP_bit | RXMAC_EN_bit | RXDMA_EN_bit | TXMAC_EN_bit | TXDMA_EN_bit | CRC_APD_bit;
+   }
+ 
+-  if (CONFIG_MAC1_PHY_SETTING != 2) {
+-    Chip_ID = ((phy_read_register (dev, 0x02, 0)) << 16);
+-    Chip_ID |= (phy_read_register (dev, 0x03, 0) & 0xffff);
++  if (CONFIG_ASPEED_MAC_PHY_SETTING != 2) {
++    Chip_ID = ((phy_read_register (dev, 0x02, g_phy_addr)) << 16);
++    Chip_ID |= (phy_read_register (dev, 0x03, g_phy_addr) & 0xffff);
+     if (((Chip_ID & PHYID_VENDOR_MASK) == PHYID_VENDOR_BROADCOM) ||
+         ((Chip_ID & PHYID_VENDOR_MODEL_MASK) == PHYID_RTL8201EL)) {
+-      Advertise = phy_read_register (dev, 0x04, 0);
+-      Link_Partner = phy_read_register (dev, 0x05, 0);
++      Advertise = phy_read_register (dev, 0x04, g_phy_addr);
++      Link_Partner = phy_read_register (dev, 0x05, g_phy_addr);
+       Advertise = (Advertise & PHY_SPEED_DUPLEX_MASK);
+       Link_Partner = (Link_Partner & PHY_SPEED_DUPLEX_MASK);
+       if ((Advertise & Link_Partner) & PHY_100M_DUPLEX) {
+@@ -1456,7 +1490,8 @@ static void set_mac_control_register (struct eth_device* dev)
+ //Max waiting time = (20 + 2)ms * 250(PHY_LOOP) = 5.5s
+       do {
+         udelay (20000);
+-        Resolved_Status = (phy_read_register (dev, 0x11, 0) & RESOLVED_BIT);
++        Resolved_Status = (phy_read_register (dev, 0x11, g_phy_addr)
++                           & RESOLVED_BIT);
+         Loop_Count++;
+         if (Loop_Count >= PHY_LOOP) {
+           PHY_Ready = 0;
+@@ -1466,7 +1501,7 @@ static void set_mac_control_register (struct eth_device* dev)
+       } while (Resolved_Status != RESOLVED_BIT);
+ 
+       if (PHY_Ready == 1) {
+-        PHY_Status = phy_read_register (dev, 0x11, 0);
++        PHY_Status = phy_read_register (dev, 0x11, g_phy_addr);
+         PHY_Speed = (PHY_Status & PHY_SPEED_MASK) >> 14;
+         PHY_Duplex = (PHY_Status & PHY_DUPLEX_MASK) >> 13;
+ 
+@@ -1485,40 +1520,54 @@ static void set_mac_control_register (struct eth_device* dev)
+       }
+ //LED Control
+ //              if (Chip_ID == 0x1C) {
+-//                  PHY_Status = phy_read_register (dev, 0x18, 0);
+-//                phy_write_register (dev, 0x18, 0, (PHY_Status | 0x09));
++//                  PHY_Status = phy_read_register (dev, 0x18, g_phy_addr);
++//                phy_write_register (dev, 0x18, g_phy_addr, (PHY_Status | 0x09));
+ //              }
+ //LED Control D[0], D[6]
+ //              if (Chip_ID == 0x141) {
+-//                  PHY_Status = phy_read_register (dev, 0x18, 0);
+-//                phy_write_register (dev, 0x18, 0, ((PHY_Status & ~(0x41)) | 0x01));
++//                  PHY_Status = phy_read_register (dev, 0x18, g_phy_addr);
++//                phy_write_register (dev, 0x18, g_phy_addr, ((PHY_Status & ~(0x41)) | 0x01));
+ //              }
+     }
+-    else if (Chip_ID == PHYID_BCM54612E )  {
+-      phy_write_register ( dev, 0x1C, 1, 0x8C00 ); // Disable GTXCLK Clock Delay Enable
+-      phy_write_register ( dev, 0x18, 1, 0xF0E7 ); // Disable RGMII RXD to RXC Skew
+-
+-      Advertise = phy_read_register (dev, 0x04, 1);
+-      Link_Partner = phy_read_register (dev, 0x05, 1);
+-      Advertise = (Advertise & PHY_SPEED_DUPLEX_MASK);
+-      Link_Partner = (Link_Partner & PHY_SPEED_DUPLEX_MASK);
+-      if ((Advertise & Link_Partner) & PHY_100M_DUPLEX) {
+-        MAC_CR_Register |= SPEED_100M_MODE_bit;
+-        MAC_CR_Register |= FULLDUP_bit;
++    else if (Chip_ID == PHYID_BCM54612E || Chip_ID == PHYID_BCM54616S) {
++      // Disable GTXCLK Clock Delay Enable
++      phy_write_register( dev, 0x1C, g_phy_addr, 0x8C00);
++      // Disable RGMII RXD to RXC Skew
++      phy_write_register( dev, 0x18, g_phy_addr, 0xF0E7);
++      // First Switch shadow register selector
++      phy_write_register(dev, 0x1C, g_phy_addr, 0x2000);
++      PHY_Status = phy_read_register(dev, 0x1C, g_phy_addr);
++      PHY_Duplex = (PHY_Status & 0x0080);
++      switch (PHY_Status & 0x0018) {
++      case 0x0000:
++        PHY_Speed = SPEED_1000M;
++        break;
++      case 0x0008:
++        PHY_Speed = SPEED_100M;
++        break;
++      case 0x0010:
++        PHY_Speed = SPEED_10M;
++        break;
++      default:
++        PHY_Speed = SPEED_100M;
++        break;
+       }
+-      else if ((Advertise & Link_Partner) & PHY_100M_HALF) {
+-        MAC_CR_Register |= SPEED_100M_MODE_bit;
+-        MAC_CR_Register &= ~FULLDUP_bit;
++      if (PHY_Speed == SPEED_1000M) {
++        MAC_CR_Register |= GMAC_MODE_bit;
++      } else {
++        MAC_CR_Register &= ~GMAC_MODE_bit;
++        if (PHY_Speed == SPEED_100M) {
++          MAC_CR_Register |= SPEED_100M_MODE_bit;
++        } else {
++          MAC_CR_Register &= ~SPEED_100M_MODE_bit;
++        }
+       }
+-      else if ((Advertise & Link_Partner) & PHY_10M_DUPLEX) {
+-        MAC_CR_Register &= ~SPEED_100M_MODE_bit;
++      if (PHY_Duplex) {
+         MAC_CR_Register |= FULLDUP_bit;
+-      }
+-      else if ((Advertise & Link_Partner) & PHY_10M_HALF) {
+-        MAC_CR_Register &= ~SPEED_100M_MODE_bit;
++      } else {
+         MAC_CR_Register &= ~FULLDUP_bit;
+       }
+-    }else {
++    } else {
+       printf("Unknow Chip_ID %x\n",Chip_ID);
+     }
+   }
+diff --git a/include/configs/wedge.h b/include/configs/wedge.h
+new file mode 100644
+index 0000000..6bb7639
+--- /dev/null
++++ b/include/configs/wedge.h
+@@ -0,0 +1,350 @@
++/*
++ * Copyright 2004-present Facebook. All Rights Reserved.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/* Uncommit the following line to enable JTAG in u-boot */
++//#define CONFIG_ASPEED_ENABLE_JTAG
++
++/*
++ * High Level Configuration Options
++ * (easy to change)
++ */
++//#define CONFIG_INIT_CRITICAL			/* define for U-BOOT 1.1.1 */
++#undef  CONFIG_INIT_CRITICAL			/* undef for  U-BOOT 1.1.4 */
++//#define CONFIG_FPGA_ASPEED	1
++#define CONFIG_ARM926EJS	1		/* This is an arm926ejs CPU */
++#define	CONFIG_ASPEED		1
++#define CONFIG_AST2400		1
++//#define CONFIG_AST1070		1
++//#define CONFIG_SYS_FLASH_CFI			/* CONFIG_FLASH_CFI, CONFIG_FLASH_SPI is exclusive*/
++#define CONFIG_FLASH_SPI
++//#define CONFIG_2SPIFLASH			/* Boot SPI: CS2, 2nd SPI: CS0 */
++#undef CONFIG_2SPIFLASH
++#undef CONFIG_ASPEED_SLT
++#define CONFIG_FLASH_AST2300
++//#define CONFIG_FLASH_AST2300_DMA
++//#define CONFIG_FLASH_SPIx2_Dummy
++//#define CONFIG_FLASH_SPIx4_Dummy
++#define CONFIG_CRT_DISPLAY	1		/* undef if not support CRT */
++
++//#define CONFIG_USE_IRQ				/* we don't need IRQ/FIQ stuff */
++#define CONFIG_MISC_INIT_R
++
++/*
++ * DRAM Config
++ *
++ * 1. DRAM Size              //
++ *    CONFIG_DRAM_512MBIT    // 512M bit
++ *    CONFIG_DRAM_1GBIT      // 1G   bit (default)
++ *    CONFIG_DRAM_2GBIT      // 2G   bit
++ *    CONFIG_DRAM_4GBIT      // 4G   bit
++ * 2. DRAM Speed             //
++ *    CONFIG_DRAM_336        // 336MHz (DDR-667)
++ *    CONFIG_DRAM_408        // 408MHz (DDR-800) (default)
++ * 3. VGA Mode
++ *    CONFIG_CRT_DISPLAY     // define to disable VGA function
++ * 4. ECC Function enable
++ *    CONFIG_DRAM_ECC        // define to enable ECC function
++ * 5. UART Debug Message
++ *    CONFIG_DRAM_UART_OUT   // enable output message at UART5
++ *    CONFIG_DRAM_UART_38400 // set the UART baud rate to 38400, default is 115200
++ */
++
++//1. DRAM Size
++//#define    CONFIG_DRAM_512MBIT
++#define    CONFIG_DRAM_1GBIT
++//#define    CONFIG_DRAM_2GBIT
++//#define    CONFIG_DRAM_4GBIT
++//2. DRAM Speed
++//#define    CONFIG_DRAM_336
++#define    CONFIG_DRAM_408
++//3. VGA Mode
++//#define    CONFIG_CRT_DISPLAY
++//4. ECC Function enable
++//#define    CONFIG_DRAM_ECC
++//5. UART Debug Message
++#define    CONFIG_DRAM_UART_OUT
++//#define    CONFIG_DRAM_UART_38400
++
++
++
++/*
++ * Environment Config
++ */
++#define CONFIG_CMDLINE_TAG	 1		/* enable passing of ATAGs	*/
++#define CONFIG_SETUP_MEMORY_TAGS 1
++#define CONFIG_INITRD_TAG	 1
++#define	CONFIG_BOOTARGS 	"debug console=ttyS2,9600n8 root=/dev/ram rw"
++#define CONFIG_UPDATE           "tftp 40800000 ast2400.scr; so 40800000'"
++
++#define CONFIG_BOOTDELAY	3		/* autoboot after 3 seconds	*/
++#define CONFIG_AUTOBOOT_KEYED
++#define CONFIG_AUTOBOOT_PROMPT		\
++	"autoboot in %d seconds (stop with 'Delete' key)...\n", bootdelay
++#define CONFIG_AUTOBOOT_STOP_STR	"\x1b\x5b\x33\x7e" /* 'Delete', ESC[3~ */
++#define CONFIG_ZERO_BOOTDELAY_CHECK
++
++#ifdef CONFIG_FLASH_AST2300
++#define CONFIG_BOOTCOMMAND	"bootm 20080000 20300000"
++#else
++#ifdef	CONFIG_SYS_FLASH_CFI
++#define CONFIG_BOOTCOMMAND	"bootm 10080000 10300000"
++#else
++#define CONFIG_BOOTCOMMAND	"bootm 14080000 14300000"
++#endif
++#endif
++#define CONFIG_BOOTFILE		"all.bin"
++#define CONFIG_ENV_OVERWRITE
++
++/*
++ * Command line configuration.
++ */
++#include <config_cmd_default.h>
++
++#define CONFIG_CMD_DFL
++#define CONFIG_CMD_ENV
++#define CONFIG_CMD_FLASH
++#define CONFIG_CMD_MII
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_I2C
++#define CONFIG_CMD_EEPROM
++#define CONFIG_CMD_NETTEST
++#define CONFIG_CMD_SLT
++
++/*
++ * CPU Setting
++ */
++#define CPU_CLOCK_RATE		18000000	/* 16.5 MHz clock for the ARM core */
++
++/*
++ * Size of malloc() pool
++ */
++#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 768*1024)
++#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
++
++/*
++ * Stack sizes,  The stack sizes are set up in start.S using the settings below
++ */
++#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
++#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
++#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
++
++/*
++ * Memory Configuration
++ */
++#define CONFIG_NR_DRAM_BANKS	1	   	/* we have 1 bank of DRAM */
++#define PHYS_SDRAM_1		  0x40000000 	/* SDRAM Bank #1 */
++#define PHYS_SDRAM_1_SIZE	0x10000000 	/* 256 MB */
++
++#define CONFIG_SYS_SDRAM_BASE	0x40000000
++
++/*
++ * FLASH Configuration
++ */
++#ifdef CONFIG_SYS_FLASH_CFI				/* NOR Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1			0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1			0x10000000 	/* Flash Bank #1 */
++#endif
++
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH	1
++#define CONFIG_ENV_OFFSET					0x60000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE					0x20000 	/* Total Size of Environment Sector */
++
++#define CONFIG_SYS_FLASH_CFI_AMD_RESET
++#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++
++#else						/* SPI Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1		0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1		0x14000000 	/* Flash Bank #1 */
++#define PHYS_FLASH_2		0x14800000 	/* Flash Bank #2 */
++#define PHYS_FLASH_2_BASE	0x10000000
++#endif
++
++#ifdef CONFIG_2SPIFLASH
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_2_BASE
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1, PHYS_FLASH_2 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	2
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#else
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x60000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x20000 	/* Total Size of Environment Sector */
++#define CONFIG_ASPEED_WRITE_DEFAULT_ENV
++#endif
++
++#endif
++
++#define __LITTLE_ENDIAN                 1
++
++#define CONFIG_MONITOR_BASE		TEXT_BASE
++#define CONFIG_MONITOR_LEN		(192 << 10)
++
++/* timeout values are in ticks */
++#define CONFIG_SYS_FLASH_ERASE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Erase */
++#define CONFIG_SYS_FLASH_WRITE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Write */
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
++
++#define CONFIG_SYS_PROMPT		"boot# " 	/* Monitor Command Prompt	*/
++#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
++#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
++#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
++
++#define CONFIG_SYS_MEMTEST_START	0x40000000	/* memtest works on	*/
++#define CONFIG_SYS_MEMTEST_END		0x44FFFFFF	/* 256 MB in DRAM	*/
++
++#define CONFIG_SYS_LOAD_ADDR		0x43000000	/* default load address */
++
++#define CONFIG_SYS_TIMERBASE		0x1E782000	/* use timer 1 */
++#define CONFIG_SYS_HZ			      1000
++#define CONFIG_ASPEED_TIMER_CLK (1*1000*1000) /* use external clk (1M) */
++
++/*
++ * Serial Configuration
++ */
++#define CONFIG_SYS_NS16550
++#define CONFIG_SYS_NS16550_SERIAL
++#define CONFIG_SYS_NS16550_MEM32
++#define CONFIG_SYS_NS16550_REG_SIZE	-4
++#define CONFIG_SYS_NS16550_CLK		24000000
++#define CONFIG_SYS_NS16550_COM1		0x1e783000
++#define CONFIG_SYS_NS16550_COM2		0x1e784000
++#define CONFIG_SYS_NS16550_COM3		0x1e78e000
++#define	CONFIG_SYS_LOADS_BAUD_CHANGE
++#define CONFIG_CONS_INDEX		2
++#define CONFIG_BAUDRATE			9600
++#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
++#define CONFIG_ASPEED_COM 0x1e78e000 // COM3
++#define CONFIG_ASPEED_COM_IER (CONFIG_ASPEED_COM + 0x4)
++#define CONFIG_ASPEED_COM_IIR (CONFIG_ASPEED_COM + 0x8)
++#define CONFIG_ASPEED_COM_LCR (CONFIG_ASPEED_COM + 0xc)
++
++/*
++ * USB device configuration
++ */
++/*
++#define CONFIG_USB_DEVICE		1
++#define CONFIG_USB_TTY			1
++
++#define CONFIG_USBD_VENDORID		0x1234
++#define CONFIG_USBD_PRODUCTID		0x5678
++#define CONFIG_USBD_MANUFACTURER	"Siemens"
++#define CONFIG_USBD_PRODUCT_NAME	"SX1"
++*/
++
++/*
++ * I2C configuration
++ */
++#define CONFIG_HARD_I2C
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_SYS_I2C_SLAVE		1
++#define CONFIG_DRIVER_ASPEED_I2C
++
++/*
++* EEPROM configuration
++*/
++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 	2
++#define CONFIG_SYS_I2C_EEPROM_ADDR 	0xa0
++
++#define __BYTE_ORDER __LITTLE_ENDIAN
++#define __LITTLE_ENDIAN_BITFIELD
++
++/*
++ * NIC configuration
++ */
++#define CONFIG_ASPEEDNIC
++#define CONFIG_NET_MULTI
++#define CONFIG_MAC1_PHY_LINK_INTERRUPT
++#define CONFIG_MAC2_ENABLE
++#define CONFIG_MAC2_PHY_LINK_INTERRUPT
++/*
++*-------------------------------------------------------------------------------
++* NOTICE: MAC1 and MAC2 now have their own seperate PHY configuration.
++* We use 2 bits for each MAC in the scratch register(D[15:11] in 0x1E6E2040) to
++* inform kernel driver.
++* The meanings of the 2 bits are:
++* 00(0): Dedicated PHY
++* 01(1): ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 10(2): ASPEED's MAC is connected to NC-SI PHY chip directly
++* 11: Reserved
++*
++* We use CONFIG_MAC1_PHY_SETTING and CONFIG_MAC2_PHY_SETTING in U-Boot
++* 0: Dedicated PHY
++* 1: ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 2: ASPEED's MAC is connected to NC-SI PHY chip directly
++* 3: Reserved
++*-------------------------------------------------------------------------------
++*/
++#define CONFIG_MAC1_PHY_SETTING		0
++#define CONFIG_MAC2_PHY_SETTING		0
++#define CONFIG_ASPEED_MAC_NUMBER  2
++#define CONFIG_ASPEED_MAC_CONFIG  2 // config MAC2
++#define _PHY_SETTING_CONCAT(mac) CONFIG_MAC##mac##_PHY_SETTING
++#define _GET_MAC_PHY_SETTING(mac) _PHY_SETTING_CONCAT(mac)
++#define CONFIG_ASPEED_MAC_PHY_SETTING \
++  _GET_MAC_PHY_SETTING(CONFIG_ASPEED_MAC_CONFIG)
++#define CONFIG_MAC_INTERFACE_CLOCK_DELAY	0x2255
++#define CONFIG_RANDOM_MACADDR
++//#define CONFIG_GATEWAYIP 192.168.0.1
++//#define CONFIG_NETMASK   255.255.255.0
++//#define CONFIG_IPADDR    192.168.0.45
++//#define CONFIG_SERVERIP  192.168.0.81
++
++/*
++ * SLT
++ */
++/*
++#define CONFIG_SLT
++#define CFG_CMD_SLT		(CFG_CMD_VIDEOTEST | CFG_CMD_MACTEST | CFG_CMD_HACTEST | CFG_CMD_MICTEST)
++*/
++
++#define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE)
++
++#define CONFIG_ASPEED_ENABLE_WATCHDOG
++#define CONFIG_ASPEED_WATCHDOG_TIMEOUT (5*60) // 5m
++
++#endif	/* __CONFIG_H */
+diff --git a/include/configs/palmetto.h b/include/configs/palmetto.h
+new file mode 100644
+index 0000000..6bb7639
+--- /dev/null
++++ b/include/configs/palmetto.h
+@@ -0,0 +1,350 @@
++/*
++ * Copyright 2004-present Facebook. All Rights Reserved.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/* Uncommit the following line to enable JTAG in u-boot */
++//#define CONFIG_ASPEED_ENABLE_JTAG
++
++/*
++ * High Level Configuration Options
++ * (easy to change)
++ */
++//#define CONFIG_INIT_CRITICAL			/* define for U-BOOT 1.1.1 */
++#undef  CONFIG_INIT_CRITICAL			/* undef for  U-BOOT 1.1.4 */
++//#define CONFIG_FPGA_ASPEED	1
++#define CONFIG_ARM926EJS	1		/* This is an arm926ejs CPU */
++#define	CONFIG_ASPEED		1
++#define CONFIG_AST2400		1
++//#define CONFIG_AST1070		1
++//#define CONFIG_SYS_FLASH_CFI			/* CONFIG_FLASH_CFI, CONFIG_FLASH_SPI is exclusive*/
++#define CONFIG_FLASH_SPI
++//#define CONFIG_2SPIFLASH			/* Boot SPI: CS2, 2nd SPI: CS0 */
++#undef CONFIG_2SPIFLASH
++#undef CONFIG_ASPEED_SLT
++#define CONFIG_FLASH_AST2300
++//#define CONFIG_FLASH_AST2300_DMA
++//#define CONFIG_FLASH_SPIx2_Dummy
++//#define CONFIG_FLASH_SPIx4_Dummy
++#define CONFIG_CRT_DISPLAY	1		/* undef if not support CRT */
++
++//#define CONFIG_USE_IRQ				/* we don't need IRQ/FIQ stuff */
++#define CONFIG_MISC_INIT_R
++
++/*
++ * DRAM Config
++ *
++ * 1. DRAM Size              //
++ *    CONFIG_DRAM_512MBIT    // 512M bit
++ *    CONFIG_DRAM_1GBIT      // 1G   bit (default)
++ *    CONFIG_DRAM_2GBIT      // 2G   bit
++ *    CONFIG_DRAM_4GBIT      // 4G   bit
++ * 2. DRAM Speed             //
++ *    CONFIG_DRAM_336        // 336MHz (DDR-667)
++ *    CONFIG_DRAM_408        // 408MHz (DDR-800) (default)
++ * 3. VGA Mode
++ *    CONFIG_CRT_DISPLAY     // define to disable VGA function
++ * 4. ECC Function enable
++ *    CONFIG_DRAM_ECC        // define to enable ECC function
++ * 5. UART Debug Message
++ *    CONFIG_DRAM_UART_OUT   // enable output message at UART5
++ *    CONFIG_DRAM_UART_38400 // set the UART baud rate to 38400, default is 115200
++ */
++
++//1. DRAM Size
++//#define    CONFIG_DRAM_512MBIT
++#define    CONFIG_DRAM_1GBIT
++//#define    CONFIG_DRAM_2GBIT
++//#define    CONFIG_DRAM_4GBIT
++//2. DRAM Speed
++//#define    CONFIG_DRAM_336
++#define    CONFIG_DRAM_408
++//3. VGA Mode
++//#define    CONFIG_CRT_DISPLAY
++//4. ECC Function enable
++//#define    CONFIG_DRAM_ECC
++//5. UART Debug Message
++#define    CONFIG_DRAM_UART_OUT
++//#define    CONFIG_DRAM_UART_38400
++
++
++
++/*
++ * Environment Config
++ */
++#define CONFIG_CMDLINE_TAG	 1		/* enable passing of ATAGs	*/
++#define CONFIG_SETUP_MEMORY_TAGS 1
++#define CONFIG_INITRD_TAG	 1
++#define	CONFIG_BOOTARGS 	"console=ttyS4,38400n8 root=/dev/ram rw"
++#define CONFIG_UPDATE           "tftp 40800000 ast2400.scr; so 40800000'"
++
++#define CONFIG_BOOTDELAY	3		/* autoboot after 3 seconds	*/
++#define CONFIG_AUTOBOOT_KEYED
++#define CONFIG_AUTOBOOT_PROMPT		\
++	"autoboot in %d seconds (stop with 'Delete' key)...\n", bootdelay
++#define CONFIG_AUTOBOOT_STOP_STR	"\x1b\x5b\x33\x7e" /* 'Delete', ESC[3~ */
++#define CONFIG_ZERO_BOOTDELAY_CHECK
++
++#ifdef CONFIG_FLASH_AST2300
++#define CONFIG_BOOTCOMMAND	"bootm 20080000 20300000"
++#else
++#ifdef	CONFIG_SYS_FLASH_CFI
++#define CONFIG_BOOTCOMMAND	"bootm 10080000 10300000"
++#else
++#define CONFIG_BOOTCOMMAND	"bootm 14080000 14300000"
++#endif
++#endif
++#define CONFIG_BOOTFILE		"all.bin"
++#define CONFIG_ENV_OVERWRITE
++
++/*
++ * Command line configuration.
++ */
++#include <config_cmd_default.h>
++
++#define CONFIG_CMD_DFL
++#define CONFIG_CMD_ENV
++#define CONFIG_CMD_FLASH
++#define CONFIG_CMD_MII
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_I2C
++#define CONFIG_CMD_EEPROM
++#define CONFIG_CMD_NETTEST
++#define CONFIG_CMD_SLT
++
++/*
++ * CPU Setting
++ */
++#define CPU_CLOCK_RATE		18000000	/* 16.5 MHz clock for the ARM core */
++
++/*
++ * Size of malloc() pool
++ */
++#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 768*1024)
++#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
++
++/*
++ * Stack sizes,  The stack sizes are set up in start.S using the settings below
++ */
++#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
++#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
++#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
++
++/*
++ * Memory Configuration
++ */
++#define CONFIG_NR_DRAM_BANKS	1	   	/* we have 1 bank of DRAM */
++#define PHYS_SDRAM_1		  0x40000000 	/* SDRAM Bank #1 */
++#define PHYS_SDRAM_1_SIZE	0x10000000 	/* 256 MB */
++
++#define CONFIG_SYS_SDRAM_BASE	0x40000000
++
++/*
++ * FLASH Configuration
++ */
++#ifdef CONFIG_SYS_FLASH_CFI				/* NOR Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1			0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1			0x10000000 	/* Flash Bank #1 */
++#endif
++
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(256)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH	1
++#define CONFIG_ENV_OFFSET					0x60000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE					0x20000 	/* Total Size of Environment Sector */
++
++#define CONFIG_SYS_FLASH_CFI_AMD_RESET
++#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
++
++#else						/* SPI Flash */
++
++#ifdef CONFIG_FLASH_AST2300
++#define PHYS_FLASH_1		0x20000000 	/* Flash Bank #1 */
++#else
++#define PHYS_FLASH_1		0x14000000 	/* Flash Bank #1 */
++#define PHYS_FLASH_2		0x14800000 	/* Flash Bank #2 */
++#define PHYS_FLASH_2_BASE	0x10000000
++#endif
++
++#ifdef CONFIG_2SPIFLASH
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_2_BASE
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1, PHYS_FLASH_2 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	2
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x7F0000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x010000 	/* Total Size of Environment Sector */
++#else
++#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
++#define CONFIG_FLASH_BANKS_LIST 	{ PHYS_FLASH_1 }
++#define CONFIG_SYS_MAX_FLASH_BANKS 	1
++#define CONFIG_SYS_MAX_FLASH_SECT	(1024)		/* max number of sectors on one chip */
++
++#define CONFIG_ENV_IS_IN_FLASH		1
++#define CONFIG_ENV_OFFSET		0x60000 	/* environment starts here  */
++#define CONFIG_ENV_SIZE			0x20000 	/* Total Size of Environment Sector */
++#define CONFIG_ASPEED_WRITE_DEFAULT_ENV
++#endif
++
++#endif
++
++#define __LITTLE_ENDIAN                 1
++
++#define CONFIG_MONITOR_BASE		TEXT_BASE
++#define CONFIG_MONITOR_LEN		(192 << 10)
++
++/* timeout values are in ticks */
++#define CONFIG_SYS_FLASH_ERASE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Erase */
++#define CONFIG_SYS_FLASH_WRITE_TOUT	(20*CONFIG_SYS_HZ) 	/* Timeout for Flash Write */
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
++
++#define CONFIG_SYS_PROMPT		"boot# " 	/* Monitor Command Prompt	*/
++#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
++#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
++#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
++
++#define CONFIG_SYS_MEMTEST_START	0x40000000	/* memtest works on	*/
++#define CONFIG_SYS_MEMTEST_END		0x44FFFFFF	/* 256 MB in DRAM	*/
++
++#define CONFIG_SYS_LOAD_ADDR		0x43000000	/* default load address */
++
++#define CONFIG_SYS_TIMERBASE		0x1E782000	/* use timer 1 */
++#define CONFIG_SYS_HZ			      1000
++#define CONFIG_ASPEED_TIMER_CLK (1*1000*1000) /* use external clk (1M) */
++
++/*
++ * Serial Configuration
++ */
++#define CONFIG_SYS_NS16550
++#define CONFIG_SYS_NS16550_SERIAL
++#define CONFIG_SYS_NS16550_MEM32
++#define CONFIG_SYS_NS16550_REG_SIZE	-4
++#define CONFIG_SYS_NS16550_CLK		24000000
++#define CONFIG_SYS_NS16550_COM1		0x1e783000
++#define CONFIG_SYS_NS16550_COM2		0x1e784000
++#define CONFIG_SYS_NS16550_COM3		0x1e78e000
++#define	CONFIG_SYS_LOADS_BAUD_CHANGE
++#define CONFIG_CONS_INDEX		2
++#define CONFIG_BAUDRATE			38400
++#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
++#define CONFIG_ASPEED_COM 0x1e784000 // UART5
++#define CONFIG_ASPEED_COM_IER (CONFIG_ASPEED_COM + 0x4)
++#define CONFIG_ASPEED_COM_IIR (CONFIG_ASPEED_COM + 0x8)
++#define CONFIG_ASPEED_COM_LCR (CONFIG_ASPEED_COM + 0xc)
++
++/*
++ * USB device configuration
++ */
++/*
++#define CONFIG_USB_DEVICE		1
++#define CONFIG_USB_TTY			1
++
++#define CONFIG_USBD_VENDORID		0x1234
++#define CONFIG_USBD_PRODUCTID		0x5678
++#define CONFIG_USBD_MANUFACTURER	"Siemens"
++#define CONFIG_USBD_PRODUCT_NAME	"SX1"
++*/
++
++/*
++ * I2C configuration
++ */
++#define CONFIG_HARD_I2C
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_SYS_I2C_SLAVE		1
++#define CONFIG_DRIVER_ASPEED_I2C
++
++/*
++* EEPROM configuration
++*/
++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 	2
++#define CONFIG_SYS_I2C_EEPROM_ADDR 	0xa0
++
++#define __BYTE_ORDER __LITTLE_ENDIAN
++#define __LITTLE_ENDIAN_BITFIELD
++
++/*
++ * NIC configuration
++ */
++#define CONFIG_ASPEEDNIC
++#define CONFIG_NET_MULTI
++#define CONFIG_MAC1_PHY_LINK_INTERRUPT
++#define CONFIG_MAC2_ENABLE
++#define CONFIG_MAC2_PHY_LINK_INTERRUPT
++/*
++*-------------------------------------------------------------------------------
++* NOTICE: MAC1 and MAC2 now have their own seperate PHY configuration.
++* We use 2 bits for each MAC in the scratch register(D[15:11] in 0x1E6E2040) to
++* inform kernel driver.
++* The meanings of the 2 bits are:
++* 00(0): Dedicated PHY
++* 01(1): ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 10(2): ASPEED's MAC is connected to NC-SI PHY chip directly
++* 11: Reserved
++*
++* We use CONFIG_MAC1_PHY_SETTING and CONFIG_MAC2_PHY_SETTING in U-Boot
++* 0: Dedicated PHY
++* 1: ASPEED's EVA + INTEL's NC-SI PHY chip EVA
++* 2: ASPEED's MAC is connected to NC-SI PHY chip directly
++* 3: Reserved
++*-------------------------------------------------------------------------------
++*/
++#define CONFIG_MAC1_PHY_SETTING		2
++#define CONFIG_MAC2_PHY_SETTING		0
++#define CONFIG_ASPEED_MAC_NUMBER  1
++#define CONFIG_ASPEED_MAC_CONFIG  1 // config MAC1
++#define _PHY_SETTING_CONCAT(mac) CONFIG_MAC##mac##_PHY_SETTING
++#define _GET_MAC_PHY_SETTING(mac) _PHY_SETTING_CONCAT(mac)
++#define CONFIG_ASPEED_MAC_PHY_SETTING \
++  _GET_MAC_PHY_SETTING(CONFIG_ASPEED_MAC_CONFIG)
++#define CONFIG_MAC_INTERFACE_CLOCK_DELAY	0x2255
++#define CONFIG_RANDOM_MACADDR
++//#define CONFIG_GATEWAYIP 192.168.0.1
++//#define CONFIG_NETMASK   255.255.255.0
++//#define CONFIG_IPADDR    192.168.0.45
++//#define CONFIG_SERVERIP  192.168.0.81
++
++/*
++ * SLT
++ */
++/*
++#define CONFIG_SLT
++#define CFG_CMD_SLT		(CFG_CMD_VIDEOTEST | CFG_CMD_MACTEST | CFG_CMD_HACTEST | CFG_CMD_MICTEST)
++*/
++
++#define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE)
++
++#define CONFIG_ASPEED_ENABLE_WATCHDOG
++#define CONFIG_ASPEED_WATCHDOG_TIMEOUT (5*60) // 5m
++
++#endif	/* __CONFIG_H */
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend
new file mode 100644
index 000000000..40206967c
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend
@@ -0,0 +1,13 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://fw_env.config"
+SRC_URI += "file://config.patch"
+
+do_install_append() {
+    if [ -e ${WORKDIR}/fw_env.config ] ; then
+        install -d ${D}${sysconfdir}
+        install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
+    fi
+}
+
+BBCLASSEXTEND += "native"
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_2013.07%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_2013.07%.bbappend
new file mode 100644
index 000000000..50adb9fdd
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_2013.07%.bbappend
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://fw_env.config"
+SRC_URI += "file://config.patch"
+
+# Do not install u-boot in rootfs
+#do_install[postfuncs] += "remove_uboot_from_rootfs"
+#remove_uboot_from_rootfs() {
+#    rm -rf ${D}/boot/u-boot*
+#}
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
new file mode 100644
index 000000000..2b7d6e85d
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
@@ -0,0 +1,209 @@
+CONFIG_CROSS_COMPILE="arm-linux-"
+CONFIG_KERNEL_XZ=y
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_FHANDLE=y
+CONFIG_IRQ_DOMAIN_DEBUG=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_CGROUPS=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_EMBEDDED=y
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_LBDAF is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_ARCH_MULTI_V7 is not set
+CONFIG_ARCH_ASPEED=y
+CONFIG_MACH_OPP_PALMETTO_BMC=y
+CONFIG_AEABI=y
+CONFIG_UACCESS_WITH_MEMCPY=y
+# CONFIG_ATAGS is not set
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
+CONFIG_KEXEC=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_NET_NCSI=y
+# CONFIG_WIRELESS is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_PARTITIONED_MASTER=y
+CONFIG_MTD_DATAFLASH=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_GLUEBI=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_ASPEED_FLASH_SPI=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=4
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_ASPEED_BT_IPMI_HOST=y
+CONFIG_EEPROM_93CX6=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_CADENCE is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_EZCHIP is not set
+CONFIG_FTMAC100=y
+CONFIG_FTGMAC100=y
+# CONFIG_NET_VENDOR_HISILICON is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RENESAS is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_MARVELL_PHY=y
+CONFIG_DAVICOM_PHY=y
+CONFIG_BROADCOM_PHY=y
+CONFIG_MICREL_PHY=y
+# CONFIG_USB_NET_DRIVERS is not set
+# CONFIG_WLAN is not set
+# CONFIG_INPUT_LEDS is not set
+CONFIG_INPUT_POLLDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=272
+CONFIG_INPUT_JOYDEV=y
+CONFIG_INPUT_EVDEV=y
+# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_QT1070=y
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=y
+# CONFIG_SERIO is not set
+# CONFIG_VT is not set
+CONFIG_LEGACY_PTY_COUNT=4
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_DMA is not set
+CONFIG_SERIAL_8250_NR_UARTS=6
+CONFIG_SERIAL_8250_RUNTIME_UARTS=6
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_ASPEED_VUART=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_HW_RANDOM=y
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_SLAVE_EEPROM=y
+CONFIG_SPI=y
+CONFIG_DEBUG_PINCTRL=y
+CONFIG_GPIO_ASPEED=y
+CONFIG_SENSORS_POWER8_OCC_I2C=y
+CONFIG_WATCHDOG=y
+CONFIG_ASPEED_24xx_WATCHDOG=y
+CONFIG_SSB=y
+CONFIG_FB=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_LOGO=y
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_ACM=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_G_SERIAL=y
+CONFIG_MMC=y
+CONFIG_MMC_SPI=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_PWM=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_RV3029C2=y
+CONFIG_DMADEVICES=y
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_MEMORY=y
+CONFIG_PWM=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_EXT4_FS=y
+CONFIG_FANOTIFY=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_OVERLAY_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_NFS_FS=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_UTF8=y
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_FTRACE is not set
+CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_LL=y
+CONFIG_DEBUG_LL_UART_8250=y
+CONFIG_DEBUG_UART_PHYS=0x1e784000
+CONFIG_DEBUG_UART_VIRT=0xe8784000
+# CONFIG_CRYPTO_ECHAINIV is not set
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_GHASH=y
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_CCITT=y
+CONFIG_AVERAGE=y
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/hwmon.cfg b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/hwmon.cfg
new file mode 100644
index 000000000..053fea32c
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/hwmon.cfg
@@ -0,0 +1,4 @@
+CONFIG_HWMON=y
+CONFIG_SENSORS_NCT7904=y
+CONFIG_SENSORS_LM75=y
+CONFIG_EEPROM_AT24=y
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend
new file mode 100644
index 000000000..bb6f06cf3
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://defconfig file://hwmon.cfg"
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes.txt b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes.txt
new file mode 100644
index 000000000..149509f3e
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes.txt
@@ -0,0 +1,2 @@
+recipes-bsp          - Anything with links to specific hardware or hardware configuration information
+recipes-kernel       - The kernel and generic applications/libraries with strong kernel dependencies
diff --git a/meta/COPYING.MIT b/meta-openbmc-machines/meta-openpower/COPYING.MIT
index fb950dc69..fb950dc69 100644
--- a/meta/COPYING.MIT
+++ b/meta-openbmc-machines/meta-openpower/COPYING.MIT
diff --git a/meta-openbmc-machines/meta-openpower/COPYING.apache-2.0 b/meta-openbmc-machines/meta-openpower/COPYING.apache-2.0
new file mode 100644
index 000000000..67db85882
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/COPYING.apache-2.0
@@ -0,0 +1,175 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
diff --git a/meta-openbmc-machines/meta-openpower/LICENSE b/meta-openbmc-machines/meta-openpower/LICENSE
new file mode 100644
index 000000000..2bf823dc4
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/LICENSE
@@ -0,0 +1,12 @@
+Different components of Phosphor OpenBMC are under different licenses (a mix
+of MIT and Apache-2.0). Please see:
+
+COPYING.Apache-2.0
+COPYING.MIT (MIT)
+
+All metadata is MIT licensed unless otherwise stated. Source code
+included in tree for individual recipes is under the LICENSE stated in
+the associated recipe (.bb file) unless otherwise stated.
+
+License information for any other files is either explicitly stated 
+or defaults to Apache-2.0.
diff --git a/meta-openbmc-machines/meta-openpower/conf/layer.conf b/meta-openbmc-machines/meta-openpower/conf/layer.conf
new file mode 100644
index 000000000..a902796bd
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/conf/layer.conf
@@ -0,0 +1,5 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+BBFILE_COLLECTIONS += "openpower"
+BBFILE_PATTERN_openpower = ""
diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
new file mode 100644
index 000000000..fe2b44a9e
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
@@ -0,0 +1,33 @@
+OBMC_MACHINE_FEATURES += "\
+        obmc-phosphor-fan-mgmt \
+        obmc-phosphor-chassis-mgmt \
+        obmc-phosphor-sensor-mgmt \
+        obmc-phosphor-flash-mgmt \
+        obmc-phosphor-event-mgmt \
+        "
+
+VIRTUAL-RUNTIME_obmc-phosphor-fan-ctl = " \
+       skeleton \
+       "
+VIRTUAL-RUNTIME_obmc-phosphor-sensor-ctl = " \
+       skeleton \
+       "
+VIRTUAL-RUNTIME_obmc-phosphor-chassis-ctl = " \
+       skeleton \
+       "
+VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl = " \
+       skeleton \
+       "
+VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers = " \
+        host-ipmid-oem \
+        host-ipmid-fru \
+       "
+PREFERRED_PROVIDER_virtual/obmc-phosphor-host-ipmi-hw = "btbridged"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-chassis-mgmt = "skeleton"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-event-mgmt = "obmc-phosphor-event"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-fan-mgmt = "skeleton"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-flash-mgmt = "skeleton"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-policy-mgmt = "skeleton"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-sensor-mgmt = "skeleton"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-system-mgmt = "skeleton"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-user-mgmt = "obmc-phosphor-user"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/conf/layer.conf
new file mode 100644
index 000000000..ff9bd6f9f
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/conf/layer.conf
@@ -0,0 +1,5 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+BBFILE_COLLECTIONS += "ibm"
+BBFILE_PATTERN_ibm = ""
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/conf/machine/include/ibm.inc b/meta-openbmc-machines/meta-openpower/meta-ibm/conf/machine/include/ibm.inc
new file mode 100644
index 000000000..c79ddd777
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/conf/machine/include/ibm.inc
@@ -0,0 +1 @@
+require conf/machine/include/openpower.inc
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
new file mode 100644
index 000000000..d0e021953
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
@@ -0,0 +1,27 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "6"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-yocto \
+  ##OEROOT##/meta-phosphor \
+  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto \
+  "
+BBLAYERS_NON_REMOVABLE ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-yocto \
+  ##OEROOT##/meta-phosphor \
+  ##OEROOT##/meta-aspeed \
+  ##OEROOT##/meta-aspeed/meta-ast2400 \
+  ##OEROOT##/meta-openpower \
+  ##OEROOT##/meta-openpower/meta-ibm \
+  ##OEROOT##/meta-openpower/meta-ibm/meta-palmetto \
+  "
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/conf-notes.txt b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/conf-notes.txt
new file mode 100644
index 000000000..9b3c01a55
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/conf-notes.txt
@@ -0,0 +1,2 @@
+Common targets are:
+     obmc-phosphor-image
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/layer.conf
new file mode 100644
index 000000000..71cad6dbf
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/layer.conf
@@ -0,0 +1,9 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "palmetto"
+BBFILE_PATTERN_palmetto = ""
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/local.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/local.conf.sample
new file mode 100644
index 000000000..c55cd0006
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/local.conf.sample
@@ -0,0 +1,245 @@
+#
+# This file is your local configuration file and is where all local user settings
+# are placed. The comments in this file give some guide to the options a new user
+# to the system might want to change but pretty much any configuration option can
+# be set in this file. More adventurous users can look at local.conf.extended 
+# which contains other examples of configuration which can be placed in this file
+# but new users likely won't need any of them initially.
+#
+# Lines starting with the '#' character are commented out and in some cases the 
+# default values are provided as comments to show people example syntax. Enabling
+# the option is a question of removing the # character and making any change to the
+# variable as required.
+
+#
+# Machine Selection
+#
+# You need to select a specific machine to target the build with. There are a selection
+# of emulated machines available which can boot and run in the QEMU emulator:
+#
+#MACHINE ?= "qemuarm"
+#MACHINE ?= "qemuarm64"
+#MACHINE ?= "qemumips"
+#MACHINE ?= "qemuppc"
+#MACHINE ?= "qemux86"
+#MACHINE ?= "qemux86-64"
+#
+# There are also the following hardware board target machines included for 
+# demonstration purposes:
+#
+#MACHINE ?= "beaglebone"
+#MACHINE ?= "genericx86"
+#MACHINE ?= "genericx86-64"
+#MACHINE ?= "mpc8315e-rdb"
+#MACHINE ?= "edgerouter"
+#
+# This sets the default machine to be qemux86 if no other machine is selected:
+MACHINE ??= "palmetto"
+
+#
+# Where to place downloads
+#
+# During a first build the system will download many different source code tarballs
+# from various upstream projects. This can take a while, particularly if your network
+# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you
+# can preserve this directory to speed up this part of subsequent builds. This directory
+# is safe to share between multiple builds on the same machine too.
+#
+# The default is a downloads directory under TOPDIR which is the build directory.
+#
+#DL_DIR ?= "${TOPDIR}/downloads"
+
+#
+# Where to place shared-state files
+#
+# BitBake has the capability to accelerate builds based on previously built output.
+# This is done using "shared state" files which can be thought of as cache objects
+# and this option determines where those files are placed.
+#
+# You can wipe out TMPDIR leaving this directory intact and the build would regenerate
+# from these files if no changes were made to the configuration. If changes were made
+# to the configuration, only shared state files where the state was still valid would
+# be used (done using checksums).
+#
+# The default is a sstate-cache directory under TOPDIR.
+#
+#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
+
+#
+# Where to place the build output
+#
+# This option specifies where the bulk of the building work should be done and
+# where BitBake should place its temporary files and output. Keep in mind that
+# this includes the extraction and compilation of many applications and the toolchain
+# which can use Gigabytes of hard disk space.
+#
+# The default is a tmp directory under TOPDIR.
+#
+#TMPDIR = "${TOPDIR}/tmp"
+
+#
+# Default policy config
+#
+# The distribution setting controls which policy settings are used as defaults.
+# The default value is fine for general Yocto project use, at least initially.
+# Ultimately when creating custom policy, people will likely end up subclassing 
+# these defaults.
+#
+DISTRO ?= "openbmc-phosphor"
+# As an example of a subclass there is a "bleeding" edge policy configuration
+# where many versions are set to the absolute latest code from the upstream 
+# source control systems. This is just mentioned here as an example, its not
+# useful to most new users.
+# DISTRO ?= "poky-bleeding"
+
+#
+# Package Management configuration
+#
+# This variable lists which packaging formats to enable. Multiple package backends 
+# can be enabled at once and the first item listed in the variable will be used 
+# to generate the root filesystems.
+# Options are:
+#  - 'package_deb' for debian style deb files
+#  - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
+#  - 'package_rpm' for rpm style packages
+# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
+# We default to rpm:
+PACKAGE_CLASSES ?= "package_rpm"
+
+#
+# SDK/ADT target architecture
+#
+# This variable specifies the architecture to build SDK/ADT items for and means
+# you can build the SDK packages for architectures other than the machine you are 
+# running the build on (i.e. building i686 packages on an x86_64 host).
+# Supported values are i686 and x86_64
+#SDKMACHINE ?= "i686"
+
+SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*"
+
+#
+# Extra image configuration defaults
+#
+# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated 
+# images. Some of these options are added to certain image types automatically. The
+# variable can contain the following options:
+#  "dbg-pkgs"       - add -dbg packages for all installed packages
+#                     (adds symbol information for debugging/profiling)
+#  "dev-pkgs"       - add -dev packages for all installed packages
+#                     (useful if you want to develop against libs in the image)
+#  "ptest-pkgs"     - add -ptest packages for all ptest-enabled packages
+#                     (useful if you want to run the package test suites)
+#  "tools-sdk"      - add development tools (gcc, make, pkgconfig etc.)
+#  "tools-debug"    - add debugging tools (gdb, strace)
+#  "eclipse-debug"  - add Eclipse remote debugging support
+#  "tools-profile"  - add profiling tools (oprofile, exmap, lttng, valgrind)
+#  "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
+#  "debug-tweaks"   - make an image suitable for development
+#                     e.g. ssh root access has a blank password
+# There are other application targets that can be used here too, see
+# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
+# We default to enabling the debugging tweaks.
+EXTRA_IMAGE_FEATURES = "debug-tweaks"
+
+#
+# Additional image features
+#
+# The following is a list of additional classes to use when building images which
+# enable extra features. Some available options which can be included in this variable 
+# are:
+#   - 'buildstats' collect build statistics
+#   - 'image-mklibs' to reduce shared library files size for an image
+#   - 'image-prelink' in order to prelink the filesystem image
+#   - 'image-swab' to perform host system intrusion detection
+# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
+# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+
+#
+# Runtime testing of images
+#
+# The build system can test booting virtual machine images under qemu (an emulator)
+# after any root filesystems are created and run tests against those images. To
+# enable this uncomment this line. See classes/testimage(-auto).bbclass for
+# further details.
+#TEST_IMAGE = "1"
+#
+# Interactive shell configuration
+#
+# Under certain circumstances the system may need input from you and to do this it 
+# can launch an interactive shell. It needs to do this since the build is 
+# multithreaded and needs to be able to handle the case where more than one parallel
+# process may require the user's attention. The default is iterate over the available
+# terminal types to find one that works.
+#
+# Examples of the occasions this may happen are when resolving patches which cannot
+# be applied, to use the devshell or the kernel menuconfig
+#
+# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none
+# Note: currently, Konsole support only works for KDE 3.x due to the way
+# newer Konsole versions behave
+#OE_TERMINAL = "auto"
+# By default disable interactive patch resolution (tasks will just fail instead):
+PATCHRESOLVE = "noop"
+
+#
+# Disk Space Monitoring during the build
+#
+# Monitor the disk space during the build. If there is less that 1GB of space or less
+# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
+# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort
+# of the build. The reason for this is that running completely out of space can corrupt
+# files and damages the build in ways which may not be easily recoverable.
+# It's necesary to monitor /tmp, if there is no space left the build will fail
+# with very exotic errors.
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+
+#
+# Shared-state files from other locations
+#
+# As mentioned above, shared state files are prebuilt cache data objects which can 
+# used to accelerate build time. This variable can be used to configure the system
+# to search other mirror locations for these objects before it builds the data itself.
+#
+# This can be a filesystem directory, or a remote url such as http or ftp. These
+# would contain the sstate-cache results from previous builds (possibly from other 
+# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the 
+# cache locations to check for the shared objects.
+# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH
+# at the end as shown in the examples below. This will be substituted with the
+# correct path within the directory structure.
+#SSTATE_MIRRORS ?= "\
+#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
+#file://.* file:///some/local/dir/sstate/PATH"
+
+
+#
+# Qemu configuration
+#
+# By default qemu will build with a builtin VNC server where graphical output can be
+# seen. The two lines below enable the SDL backend too. This assumes there is a
+# libsdl library available on your build system.
+PACKAGECONFIG_append_pn-qemu-native = " sdl"
+PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
+ASSUME_PROVIDED += "libsdl-native"
+
+
+# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
+# track the version of this file when it was generated. This can safely be ignored if
+# this doesn't mean anything to you.
+CONF_VERSION = "1"
+
+# Set the root password to '0penBmc'
+INHERIT += "extrausers"
+
+EXTRA_USERS_PARAMS = " \
+  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
+  "
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
new file mode 100644
index 000000000..f6256a771
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
@@ -0,0 +1,12 @@
+KMACHINE = "aspeed"
+KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+
+require conf/machine/include/ast2400.inc
+require conf/machine/include/obmc-bsp-common.inc
+require conf/machine/include/ibm.inc
+
+UBOOT_MACHINE_palmetto = "palmetto_config"
+UBOOT_ENTRYPOINT = "0x40008000"
+UBOOT_LOADADDRESS = "0x40008000"
+
+FLASH_SIZE = "32768"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc/palmetto.cfg b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc/palmetto.cfg
new file mode 100644
index 000000000..2594dec05
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc/palmetto.cfg
@@ -0,0 +1,4 @@
+CONFIG_HWMON=y
+CONFIG_SENSORS_NCT7904=y
+CONFIG_EEPROM_AT24=y
+CONFIG_SENSORS_TMP421=y
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc/palmetto.dts b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc/palmetto.dts
new file mode 100644
index 000000000..3b5e0f1b1
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc/palmetto.dts
@@ -0,0 +1 @@
+# use in-tree devtree
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc_%.bbappend
new file mode 100644
index 000000000..a49c23910
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-obmc:"
+SRC_URI += "file://palmetto.cfg"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes.txt b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes.txt
new file mode 100644
index 000000000..db84c6f88
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes.txt
@@ -0,0 +1 @@
+recipes-kernel       - The kernel and generic applications/libraries with strong kernel dependencies
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/layer.conf
new file mode 100644
index 000000000..9bc3e9395
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/layer.conf
@@ -0,0 +1,5 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+BBFILE_COLLECTIONS += "rackspace"
+BBFILE_PATTERN_rackspace = ""
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/machine/include/rackspace.inc b/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/machine/include/rackspace.inc
new file mode 100644
index 000000000..c79ddd777
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/machine/include/rackspace.inc
@@ -0,0 +1 @@
+require conf/machine/include/openpower.inc
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
new file mode 100644
index 000000000..a261b26ce
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
@@ -0,0 +1,27 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "6"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-yocto \
+  ##OEROOT##/meta-phosphor \
+  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
+  ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye \
+  "
+BBLAYERS_NON_REMOVABLE ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-yocto \
+  ##OEROOT##/meta-phosphor \
+  ##OEROOT##/meta-aspeed \
+  ##OEROOT##/meta-aspeed/meta-ast2400 \
+  ##OEROOT##/meta-openpower \
+  ##OEROOT##/meta-openpower/meta-rackspace \
+  ##OEROOT##/meta-openpower/meta-rackspace/meta-barreleye \
+  "
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/conf-notes.txt b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/conf-notes.txt
new file mode 100644
index 000000000..9b3c01a55
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/conf-notes.txt
@@ -0,0 +1,2 @@
+Common targets are:
+     obmc-phosphor-image
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/layer.conf
new file mode 100644
index 000000000..7d1dd1792
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/layer.conf
@@ -0,0 +1,9 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "barreleye"
+BBFILE_PATTERN_barreleye = ""
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/local.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/local.conf.sample
new file mode 100644
index 000000000..8799d8dd0
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/local.conf.sample
@@ -0,0 +1,245 @@
+#
+# This file is your local configuration file and is where all local user settings
+# are placed. The comments in this file give some guide to the options a new user
+# to the system might want to change but pretty much any configuration option can
+# be set in this file. More adventurous users can look at local.conf.extended 
+# which contains other examples of configuration which can be placed in this file
+# but new users likely won't need any of them initially.
+#
+# Lines starting with the '#' character are commented out and in some cases the 
+# default values are provided as comments to show people example syntax. Enabling
+# the option is a question of removing the # character and making any change to the
+# variable as required.
+
+#
+# Machine Selection
+#
+# You need to select a specific machine to target the build with. There are a selection
+# of emulated machines available which can boot and run in the QEMU emulator:
+#
+#MACHINE ?= "qemuarm"
+#MACHINE ?= "qemuarm64"
+#MACHINE ?= "qemumips"
+#MACHINE ?= "qemuppc"
+#MACHINE ?= "qemux86"
+#MACHINE ?= "qemux86-64"
+#
+# There are also the following hardware board target machines included for 
+# demonstration purposes:
+#
+#MACHINE ?= "beaglebone"
+#MACHINE ?= "genericx86"
+#MACHINE ?= "genericx86-64"
+#MACHINE ?= "mpc8315e-rdb"
+#MACHINE ?= "edgerouter"
+#
+# This sets the default machine to be qemux86 if no other machine is selected:
+MACHINE ??= "barreleye"
+
+#
+# Where to place downloads
+#
+# During a first build the system will download many different source code tarballs
+# from various upstream projects. This can take a while, particularly if your network
+# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you
+# can preserve this directory to speed up this part of subsequent builds. This directory
+# is safe to share between multiple builds on the same machine too.
+#
+# The default is a downloads directory under TOPDIR which is the build directory.
+#
+#DL_DIR ?= "${TOPDIR}/downloads"
+
+#
+# Where to place shared-state files
+#
+# BitBake has the capability to accelerate builds based on previously built output.
+# This is done using "shared state" files which can be thought of as cache objects
+# and this option determines where those files are placed.
+#
+# You can wipe out TMPDIR leaving this directory intact and the build would regenerate
+# from these files if no changes were made to the configuration. If changes were made
+# to the configuration, only shared state files where the state was still valid would
+# be used (done using checksums).
+#
+# The default is a sstate-cache directory under TOPDIR.
+#
+#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
+
+#
+# Where to place the build output
+#
+# This option specifies where the bulk of the building work should be done and
+# where BitBake should place its temporary files and output. Keep in mind that
+# this includes the extraction and compilation of many applications and the toolchain
+# which can use Gigabytes of hard disk space.
+#
+# The default is a tmp directory under TOPDIR.
+#
+#TMPDIR = "${TOPDIR}/tmp"
+
+#
+# Default policy config
+#
+# The distribution setting controls which policy settings are used as defaults.
+# The default value is fine for general Yocto project use, at least initially.
+# Ultimately when creating custom policy, people will likely end up subclassing 
+# these defaults.
+#
+DISTRO ?= "openbmc-phosphor"
+# As an example of a subclass there is a "bleeding" edge policy configuration
+# where many versions are set to the absolute latest code from the upstream 
+# source control systems. This is just mentioned here as an example, its not
+# useful to most new users.
+# DISTRO ?= "poky-bleeding"
+
+#
+# Package Management configuration
+#
+# This variable lists which packaging formats to enable. Multiple package backends 
+# can be enabled at once and the first item listed in the variable will be used 
+# to generate the root filesystems.
+# Options are:
+#  - 'package_deb' for debian style deb files
+#  - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
+#  - 'package_rpm' for rpm style packages
+# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
+# We default to rpm:
+PACKAGE_CLASSES ?= "package_rpm"
+
+#
+# SDK/ADT target architecture
+#
+# This variable specifies the architecture to build SDK/ADT items for and means
+# you can build the SDK packages for architectures other than the machine you are 
+# running the build on (i.e. building i686 packages on an x86_64 host).
+# Supported values are i686 and x86_64
+#SDKMACHINE ?= "i686"
+
+SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*"
+
+#
+# Extra image configuration defaults
+#
+# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated 
+# images. Some of these options are added to certain image types automatically. The
+# variable can contain the following options:
+#  "dbg-pkgs"       - add -dbg packages for all installed packages
+#                     (adds symbol information for debugging/profiling)
+#  "dev-pkgs"       - add -dev packages for all installed packages
+#                     (useful if you want to develop against libs in the image)
+#  "ptest-pkgs"     - add -ptest packages for all ptest-enabled packages
+#                     (useful if you want to run the package test suites)
+#  "tools-sdk"      - add development tools (gcc, make, pkgconfig etc.)
+#  "tools-debug"    - add debugging tools (gdb, strace)
+#  "eclipse-debug"  - add Eclipse remote debugging support
+#  "tools-profile"  - add profiling tools (oprofile, exmap, lttng, valgrind)
+#  "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
+#  "debug-tweaks"   - make an image suitable for development
+#                     e.g. ssh root access has a blank password
+# There are other application targets that can be used here too, see
+# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
+# We default to enabling the debugging tweaks.
+EXTRA_IMAGE_FEATURES = "debug-tweaks"
+
+#
+# Additional image features
+#
+# The following is a list of additional classes to use when building images which
+# enable extra features. Some available options which can be included in this variable 
+# are:
+#   - 'buildstats' collect build statistics
+#   - 'image-mklibs' to reduce shared library files size for an image
+#   - 'image-prelink' in order to prelink the filesystem image
+#   - 'image-swab' to perform host system intrusion detection
+# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
+# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+
+#
+# Runtime testing of images
+#
+# The build system can test booting virtual machine images under qemu (an emulator)
+# after any root filesystems are created and run tests against those images. To
+# enable this uncomment this line. See classes/testimage(-auto).bbclass for
+# further details.
+#TEST_IMAGE = "1"
+#
+# Interactive shell configuration
+#
+# Under certain circumstances the system may need input from you and to do this it 
+# can launch an interactive shell. It needs to do this since the build is 
+# multithreaded and needs to be able to handle the case where more than one parallel
+# process may require the user's attention. The default is iterate over the available
+# terminal types to find one that works.
+#
+# Examples of the occasions this may happen are when resolving patches which cannot
+# be applied, to use the devshell or the kernel menuconfig
+#
+# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none
+# Note: currently, Konsole support only works for KDE 3.x due to the way
+# newer Konsole versions behave
+#OE_TERMINAL = "auto"
+# By default disable interactive patch resolution (tasks will just fail instead):
+PATCHRESOLVE = "noop"
+
+#
+# Disk Space Monitoring during the build
+#
+# Monitor the disk space during the build. If there is less that 1GB of space or less
+# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
+# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort
+# of the build. The reason for this is that running completely out of space can corrupt
+# files and damages the build in ways which may not be easily recoverable.
+# It's necesary to monitor /tmp, if there is no space left the build will fail
+# with very exotic errors.
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+
+#
+# Shared-state files from other locations
+#
+# As mentioned above, shared state files are prebuilt cache data objects which can 
+# used to accelerate build time. This variable can be used to configure the system
+# to search other mirror locations for these objects before it builds the data itself.
+#
+# This can be a filesystem directory, or a remote url such as http or ftp. These
+# would contain the sstate-cache results from previous builds (possibly from other 
+# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the 
+# cache locations to check for the shared objects.
+# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH
+# at the end as shown in the examples below. This will be substituted with the
+# correct path within the directory structure.
+#SSTATE_MIRRORS ?= "\
+#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
+#file://.* file:///some/local/dir/sstate/PATH"
+
+
+#
+# Qemu configuration
+#
+# By default qemu will build with a builtin VNC server where graphical output can be
+# seen. The two lines below enable the SDL backend too. This assumes there is a
+# libsdl library available on your build system.
+PACKAGECONFIG_append_pn-qemu-native = " sdl"
+PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
+ASSUME_PROVIDED += "libsdl-native"
+
+
+# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
+# track the version of this file when it was generated. This can safely be ignored if
+# this doesn't mean anything to you.
+CONF_VERSION = "1"
+
+# Set the root password to '0penBmc'
+INHERIT += "extrausers"
+
+EXTRA_USERS_PARAMS = " \
+  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
+  "
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
new file mode 100644
index 000000000..f9d31f1f8
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
@@ -0,0 +1,12 @@
+KMACHINE = "aspeed"
+KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+
+require conf/machine/include/ast2400.inc
+require conf/machine/include/obmc-bsp-common.inc
+require conf/machine/include/rackspace.inc
+
+UBOOT_MACHINE_barreleye = "palmetto_config"
+UBOOT_ENTRYPOINT = "0x40008000"
+UBOOT_LOADADDRESS = "0x40008000"
+
+FLASH_SIZE = "32768"
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/files/u-boot-barreleye.patch b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/files/u-boot-barreleye.patch
new file mode 100644
index 000000000..dab24f6ce
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/files/u-boot-barreleye.patch
@@ -0,0 +1,13 @@
+Index: git/drivers/net/aspeednic.c
+===================================================================
+--- git.orig/drivers/net/aspeednic.c	2015-10-29 13:23:42.225712001 -0500
++++ git/drivers/net/aspeednic.c	2015-10-29 13:26:52.205712001 -0500
+@@ -1155,7 +1155,7 @@
+ 
+   RESET_DE4X5(dev);
+ 
+-  aspeednic_probe_phy(dev);
++  //aspeednic_probe_phy(dev);
+ 
+   set_mac_address (dev, bis);
+   set_mac_control_register (dev);
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/u-boot_2013.07%.bbappend b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/u-boot_2013.07%.bbappend
new file mode 100644
index 000000000..1eeec2e5e
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/u-boot_2013.07%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_append := "${THISDIR}/files:"
+
+SRC_URI += "file://u-boot-barreleye.patch"
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/barreleye.cfg b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/barreleye.cfg
new file mode 100644
index 000000000..086f191de
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/barreleye.cfg
@@ -0,0 +1,3 @@
+CONFIG_PMBUS=y
+CONFIG_SENSORS_PMBUS=y
+CONFIG_SENSORS_ADM1275=y
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/hwmon_adm1278.patch b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/hwmon_adm1278.patch
new file mode 100644
index 000000000..074d39f22
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/hwmon_adm1278.patch
@@ -0,0 +1,165 @@
+diff --git a/drivers/hwmon/pmbus/adm1275.c b/drivers/hwmon/pmbus/adm1275.c
+index 188af4c..a45075d 100644
+--- a/drivers/hwmon/pmbus/adm1275.c
++++ b/drivers/hwmon/pmbus/adm1275.c
+@@ -24,7 +24,7 @@
+ #include <linux/bitops.h>
+ #include "pmbus.h"
+ 
+-enum chips { adm1075, adm1275, adm1276, adm1293, adm1294 };
++enum chips { adm1075, adm1275, adm1276, adm1278, adm1293, adm1294 };
+ 
+ #define ADM1275_MFR_STATUS_IOUT_WARN2	BIT(0)
+ #define ADM1293_MFR_STATUS_VAUX_UV_WARN	BIT(5)
+@@ -70,6 +70,22 @@ enum chips { adm1075, adm1275, adm1276, adm1293, adm1294 };
+ #define ADM1075_VAUX_OV_WARN		BIT(7)
+ #define ADM1075_VAUX_UV_WARN		BIT(6)
+ 
++#define ADM1278_PMON_CONTROL		0xd3
++#define ADM1278_PMON_CONFIG		0xd4
++#define ADM1278_CFG_TSFLT		BIT(15)
++#define ADM1278_CFG_SIMULTANEOUS	BIT(14)
++#define ADM1278_CFG_PMON_MODE		BIT(4)
++#define ADM1278_CFG_TEMP1_EN		BIT(3)
++#define ADM1278_CFG_VIN_EN		BIT(2)
++#define ADM1278_CFG_VOUT_EN		BIT(1)
++#define ADM1278_PEAK_TEMPERATURE	0xd7
++
++#define ADM1278_R_SENSE	1000	/* R_sense resistor value in microohmsi */
++
++static int r_sense = ADM1278_R_SENSE;
++module_param(r_sense, int, 0644);
++MODULE_PARM_DESC(r_sense, "Rsense resistor value in microohms");
++
+ struct adm1275_data {
+ 	int id;
+ 	bool have_oc_fault;
+@@ -186,6 +202,11 @@ static int adm1275_read_word_data(struct i2c_client *client, int page, int reg)
+ 	case PMBUS_VIRT_READ_VIN_MAX:
+ 		ret = pmbus_read_word_data(client, 0, ADM1275_PEAK_VIN);
+ 		break;
++	case PMBUS_VIRT_READ_TEMP_MAX:
++		if (data->id != adm1278)
++			return -ENODATA;
++		ret = pmbus_read_word_data(client, 0, ADM1278_PEAK_TEMPERATURE);
++		break;
+ 	case PMBUS_VIRT_READ_PIN_MIN:
+ 		if (!data->have_pin_min)
+ 			return -ENXIO;
+@@ -199,6 +220,7 @@ static int adm1275_read_word_data(struct i2c_client *client, int page, int reg)
+ 	case PMBUS_VIRT_RESET_IOUT_HISTORY:
+ 	case PMBUS_VIRT_RESET_VOUT_HISTORY:
+ 	case PMBUS_VIRT_RESET_VIN_HISTORY:
++	case PMBUS_VIRT_RESET_TEMP_HISTORY:
+ 		break;
+ 	case PMBUS_VIRT_RESET_PIN_HISTORY:
+ 		if (!data->have_pin_max)
+@@ -239,6 +261,9 @@ static int adm1275_write_word_data(struct i2c_client *client, int page, int reg,
+ 	case PMBUS_VIRT_RESET_VIN_HISTORY:
+ 		ret = pmbus_write_word_data(client, 0, ADM1275_PEAK_VIN, 0);
+ 		break;
++	case PMBUS_VIRT_RESET_TEMP_HISTORY:
++		ret = pmbus_write_word_data(client, 0, ADM1278_PEAK_TEMPERATURE, 0);
++		break;
+ 	case PMBUS_VIRT_RESET_PIN_HISTORY:
+ 		ret = pmbus_write_word_data(client, 0, ADM1276_PEAK_PIN, 0);
+ 		if (!ret && data->have_pin_min)
+@@ -312,6 +337,7 @@ static const struct i2c_device_id adm1275_id[] = {
+ 	{ "adm1075", adm1075 },
+ 	{ "adm1275", adm1275 },
+ 	{ "adm1276", adm1276 },
++	{ "adm1278", adm1278 },
+ 	{ "adm1293", adm1293 },
+ 	{ "adm1294", adm1294 },
+ 	{ }
+@@ -335,6 +361,8 @@ static int adm1275_probe(struct i2c_client *client,
+ 				     | I2C_FUNC_SMBUS_BLOCK_DATA))
+ 		return -ENODEV;
+ 
++	/* i2c_aspeed driver does not handle i2c_smbus_read_block_data correctly */
++#if 0
+ 	ret = i2c_smbus_read_block_data(client, PMBUS_MFR_ID, block_buffer);
+ 	if (ret < 0) {
+ 		dev_err(&client->dev, "Failed to read Manufacturer ID\n");
+@@ -363,6 +391,7 @@ static int adm1275_probe(struct i2c_client *client,
+ 		dev_notice(&client->dev,
+ 			   "Device mismatch: Configured %s, detected %s\n",
+ 			   id->name, mid->name);
++#endif
+ 
+ 	config = i2c_smbus_read_byte_data(client, ADM1275_PMON_CONFIG);
+ 	if (config < 0)
+@@ -377,7 +406,9 @@ static int adm1275_probe(struct i2c_client *client,
+ 	if (!data)
+ 		return -ENOMEM;
+ 
+-	data->id = mid->driver_data;
++	/* i2c_aspeed driver does not handle i2c_smbus_read_block_data correctly */
++	//data->id = mid->driver_data;
++	data->id = adm1278;
+ 
+ 	info = &data->info;
+ 
+@@ -460,6 +491,62 @@ static int adm1275_probe(struct i2c_client *client,
+ 			info->func[0] |=
+ 			  PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT;
+ 		break;
++	case adm1278:
++		/* Configure monitoring */
++		ret = i2c_smbus_write_byte_data(client,
++			ADM1278_PMON_CONTROL, 0);
++		if (ret < 0)
++			return ret;
++		ret = i2c_smbus_read_word_data(client, ADM1275_PMON_CONFIG);
++		ret = i2c_smbus_write_word_data(client, ADM1275_PMON_CONFIG,
++						ADM1278_CFG_PMON_MODE |
++						ADM1278_CFG_TEMP1_EN |
++						ADM1278_CFG_VIN_EN |
++						ADM1278_CFG_VOUT_EN);
++		if (ret < 0)
++			return ret;
++		ret = i2c_smbus_read_word_data(client, ADM1275_PMON_CONFIG);
++		dev_info(&client->dev, "adm1278 config: 0x%x\n", ret);
++		ret = i2c_smbus_write_byte_data(client, ADM1278_PMON_CONTROL,1);
++		if (ret < 0)
++			return ret;
++
++		info->func[0] |= PMBUS_HAVE_VIN
++			| PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT
++			| PMBUS_HAVE_PIN
++			| PMBUS_HAVE_STATUS_INPUT
++			| PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP;
++
++		data->have_oc_fault = false;
++		data->have_uc_fault = false;
++		data->have_vout = true;
++		data->have_vaux_status = false;
++		data->have_mfr_vaux_status = false;
++		data->have_iout_min = false;
++		data->have_pin_min = false;
++		data->have_pin_max = true;
++
++		info->m[PSC_VOLTAGE_IN] = 19599;
++		info->b[PSC_VOLTAGE_IN] = 0;
++		info->R[PSC_VOLTAGE_IN] = -2;
++
++		info->m[PSC_VOLTAGE_OUT] = 19599;
++		info->b[PSC_VOLTAGE_OUT] = 0;
++		info->R[PSC_VOLTAGE_OUT] = -2;
++
++		info->m[PSC_CURRENT_OUT] = 800 * r_sense / 1000;
++		info->b[PSC_CURRENT_OUT] = 20475;
++		info->R[PSC_CURRENT_OUT] = -1;
++
++		info->m[PSC_POWER] = 6123 * r_sense / 1000;
++		info->b[PSC_POWER] = 0;
++		info->R[PSC_POWER] = -2;
++
++		info->format[PSC_TEMPERATURE] = direct;
++		info->m[PSC_TEMPERATURE] = 42;
++		info->b[PSC_TEMPERATURE] = 31880;
++		info->R[PSC_TEMPERATURE] = -1;
++		break;
+ 	case adm1293:
+ 	case adm1294:
+ 		data->have_iout_min = true;
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/readme_adm1278.txt b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/readme_adm1278.txt
new file mode 100644
index 000000000..e86d97744
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/readme_adm1278.txt
@@ -0,0 +1,78 @@
+README for adm1278 hwmon driver
+==================================
+Yi Li <shliyi@cn.ibm.com>
+
+
+This is a temporary kernel patch to enable hwmon driver for adm1278 chip on Barreleye.
+When this patch is merged into linux kernel, this patch will be removed from openbmc.
+
+The adm1278 driver is created according to datasheet:
+http://www.analog.com/media/en/technical-documentation/data-sheets/ADM1278.pdf
+
+The patch heavily re-used adm1278 enabling code from: https://github.com/facebook/openbmc/blob/master/meta-aspeed/recipes-kernel/linux/files/patch-2.6.28.9/0000-linux-openbmc.patch.
+
+This patch has been tested on barreleye, by following these steps:
+
+1) There are 3 adm1278 devices on Barreleye
+
+I2C5: P12v_a for CPU0
+I2C6: P12v_b for CPU1
+I2C7: P12v_c for HDD and IO Board
+
+2) adm1278 driver is based on adm1275.c, which depends on pmbus. This patch builds
+adm1275 and pmbus into kernel.
+
+3) When kernel booted, initialize the adm1278 devices:
+
+root@barreleye:~# echo adm1278 0x10 > /sys/class/i2c-adapter/i2c-4/new_device
+root@barreleye:~# echo adm1278 0x10 > /sys/class/i2c-adapter/i2c-5/new_device
+root@barreleye:~# echo adm1278 0x10 > /sys/class/i2c-adapter/i2c-6/new_device
+
+There will be three new hwmon sysfs entries created:
+
+root@barreleye:~# ls /sys/class/hwmon/hwmon3/
+curr1_highest         in1_highest           in1_reset_history     in2_min_alarm         power1_label          temp1_input
+curr1_input           in1_input             in2_highest           in2_reset_history     power1_max            temp1_max
+curr1_label           in1_label             in2_input             name                  power1_reset_history  temp1_max_alarm
+curr1_max             in1_max               in2_label             power/                subsystem/            temp1_reset_history
+curr1_max_alarm       in1_max_alarm         in2_max               power1_alarm          temp1_crit            uevent
+curr1_reset_history   in1_min               in2_max_alarm         power1_input          temp1_crit_alarm
+device/               in1_min_alarm         in2_min               power1_input_highest  temp1_highest
+root@barreleye:~# ls /sys/class/hwmon/hwmon4/
+curr1_highest         in1_highest           in1_reset_history     in2_min_alarm         power1_label          temp1_input
+curr1_input           in1_input             in2_highest           in2_reset_history     power1_max            temp1_max
+curr1_label           in1_label             in2_input             name                  power1_reset_history  temp1_max_alarm
+curr1_max             in1_max               in2_label             power/                subsystem/            temp1_reset_history
+curr1_max_alarm       in1_max_alarm         in2_max               power1_alarm          temp1_crit            uevent
+curr1_reset_history   in1_min               in2_max_alarm         power1_input          temp1_crit_alarm
+device/               in1_min_alarm         in2_min               power1_input_highest  temp1_highest
+root@barreleye:~# ls /sys/class/hwmon/hwmon5/
+curr1_highest         in1_highest           in1_reset_history     in2_min_alarm         power1_label          temp1_input
+curr1_input           in1_input             in2_highest           in2_reset_history     power1_max            temp1_max
+curr1_label           in1_label             in2_input             name                  power1_reset_history  temp1_max_alarm
+curr1_max             in1_max               in2_label             power/                subsystem/            temp1_reset_history
+curr1_max_alarm       in1_max_alarm         in2_max               power1_alarm          temp1_crit            uevent
+curr1_reset_history   in1_min               in2_max_alarm         power1_input          temp1_crit_alarm
+device/               in1_min_alarm         in2_min               power1_input_highest  temp1_highest
+
+4) For details of what each hwmon sysfs attributes mean, please refer to:
+https://www.kernel.org/doc/Documentation/hwmon/pmbus
+For short, 'curr1_*' refers to 'IOUT', 'in1_*' refers to 'vin', 'in2_*' refers to 'vout', 'power1_*' refers to 'input power',
+'temp1_*' for 'temperature'.
+
+5) Remaining issue:
+
+5.1) Currently, i2c_aspeed driver does not handle "i2c_smbus_read_block_data()" correctly. So this patch has to bypass some detection code.
+We need to fix this issue when the patch is merged to kernel.
+5.2) According to adm1278 datasheet, there is a sense resistor used to measure power and current. The resistor will affect conversion between
+adm1278 register value to real-world value for current and power. I am not very sure about the resistor value. So using 1 mili-ohms (or 1000 micro-ohms) as default value. When build the adm1275 driver as kernel module, we can set this resistor value by:
+
+# insmod adm1275.ko r_sense=500
+
+This will set the 'sense resistor' to 500 micro-ohms.
+5.3) Some of the sensor value, e.g, 'temp1_input' seems not reasonable, e.g:
+
+root@barreleye:~# cat /sys/class/hwmon/hwmon4/temp1_input
+-270952
+
+Need further check on that.
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc_%.bbappend
new file mode 100644
index 000000000..b6e8e1623
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-obmc:"
+SRC_URI += "file://barreleye.cfg"
+SRC_URI += "file://hwmon_adm1278.patch"
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/skeleton/skeleton.bbappend b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/skeleton/skeleton.bbappend
new file mode 100644
index 000000000..c3aad866f
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/skeleton/skeleton.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += "file://skeleton.patch"
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/skeleton/skeleton/skeleton.patch b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/skeleton/skeleton/skeleton.patch
new file mode 100644
index 000000000..b4e90145a
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/skeleton/skeleton/skeleton.patch
@@ -0,0 +1,11 @@
+--- a/skeleton.service	2015-10-28 07:47:55.337712001 -0500
++++ b/skeleton.service	2015-10-28 07:34:05.277712001 -0500
+@@ -2,7 +2,7 @@
+ Description=Temp placeholder for skeleton function
+ 
+ [Service]
+-ExecStart=/usr/sbin/system_manager.py Palmetto
++ExecStart=/usr/sbin/system_manager.py Barreleye
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes.txt b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes.txt
new file mode 100644
index 000000000..2f89155c3
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes.txt
@@ -0,0 +1,3 @@
+recipes-bsp          - Anything with links to specific hardware or hardware configuration information
+recipes-kernel       - The kernel and generic applications/libraries with strong kernel dependencies
+recipes-phosphor     - Phosphor OpenBMC applications and configuration
diff --git a/scripts/lib/bsp/substrate/target/arch/common/COPYING.MIT b/meta-phosphor/COPYING.MIT
index fb950dc69..fb950dc69 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/COPYING.MIT
+++ b/meta-phosphor/COPYING.MIT
diff --git a/meta-phosphor/COPYING.apache-2.0 b/meta-phosphor/COPYING.apache-2.0
new file mode 100644
index 000000000..67db85882
--- /dev/null
+++ b/meta-phosphor/COPYING.apache-2.0
@@ -0,0 +1,175 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
diff --git a/meta-phosphor/LICENSE b/meta-phosphor/LICENSE
new file mode 100644
index 000000000..2bf823dc4
--- /dev/null
+++ b/meta-phosphor/LICENSE
@@ -0,0 +1,12 @@
+Different components of Phosphor OpenBMC are under different licenses (a mix
+of MIT and Apache-2.0). Please see:
+
+COPYING.Apache-2.0
+COPYING.MIT (MIT)
+
+All metadata is MIT licensed unless otherwise stated. Source code
+included in tree for individual recipes is under the LICENSE stated in
+the associated recipe (.bb file) unless otherwise stated.
+
+License information for any other files is either explicitly stated 
+or defaults to Apache-2.0.
diff --git a/meta-phosphor/classes/image-overlay.bbclass b/meta-phosphor/classes/image-overlay.bbclass
new file mode 100644
index 000000000..71768a628
--- /dev/null
+++ b/meta-phosphor/classes/image-overlay.bbclass
@@ -0,0 +1,20 @@
+PACKAGES = " "
+EXCLUDE_FROM_WORLD = "1"
+
+INITRD_IMAGE ?= "core-image-minimal-initramfs"
+INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.${INITRD_CTYPE}${uboot}"
+
+IMAGE_BASETYPE ?= "squashfs-xz"
+OVERLAY_BASETYPE ?= "jffs2"
+
+IMAGE_TYPES += "overlay"
+
+IMAGE_TYPEDEP_overlay = "${IMAGE_BASETYPE}"
+IMAGE_TYPES_MASKED += "overlay"
+
+ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.${IMAGE_BASETYPE}"
+
+do_generate_flash[depends] += "${INITRD_IMAGE}:do_rootfs"
+do_generate_flash[depends] += "${PN}:do_rootfs"
+
+addtask generate_flash before do_build
diff --git a/meta-phosphor/classes/kernel-cuimage.bbclass b/meta-phosphor/classes/kernel-cuimage.bbclass
new file mode 100644
index 000000000..ef77d3450
--- /dev/null
+++ b/meta-phosphor/classes/kernel-cuimage.bbclass
@@ -0,0 +1,45 @@
+# Essentially kernel-uimage, but for cuImage.
+
+inherit kernel-uboot
+
+KBUILD_HAS_CUIMAGE ?= "no"
+
+python __anonymous () {
+    kerneltype = d.getVar('KERNEL_IMAGETYPE', True)
+    if kerneltype == 'cuImage':
+        depends = d.getVar("DEPENDS", True)
+        depends = "%s u-boot-mkimage-native" % depends
+        d.setVar("DEPENDS", depends)
+
+	# Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal
+	# to kernel.bbclass . We override the variable here, since we need
+	# to build cuImage using the kernel build system if and only if
+	# KBUILD_HAS_CUIMAGE == yes. Otherwise, we pack compressed vmlinux into
+	# the cuImage .
+	if d.getVar("KBUILD_HAS_CUIMAGE", True) != 'yes':
+            d.setVar("KERNEL_IMAGETYPE_FOR_MAKE", "zImage")
+}
+
+do_uboot_mkcimage() {
+        dt="arch/${ARCH}/boot/dts/${KERNEL_DEVICETREE}"
+        if ! test -r $dt; then
+		dt=""
+        fi
+
+	if test "x${KERNEL_IMAGETYPE}" = "xcuImage" ; then
+		if test "x${KBUILD_HAS_CUIMAGE}" != "xyes" ; then
+			uboot_prep_kimage
+                        cat linux.bin $dt > linux-dts.bin
+			ENTRYPOINT=${UBOOT_ENTRYPOINT}
+			if test -n "${UBOOT_ENTRYSYMBOL}"; then
+				ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
+					awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
+			fi
+
+			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C "${linux_comp}" -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux-dts.bin arch/${ARCH}/boot/cuImage
+			rm -f linux.bin linux-dts.bin
+		fi
+	fi
+}
+
+addtask uboot_mkcimage before do_install after do_compile
diff --git a/meta-phosphor/classes/obmc-phosphor-c-daemon.bbclass b/meta-phosphor/classes/obmc-phosphor-c-daemon.bbclass
new file mode 100644
index 000000000..0ceed960e
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-c-daemon.bbclass
@@ -0,0 +1,15 @@
+# Common code for dbus applications using c.
+
+inherit obmc-phosphor-systemd
+inherit obmc-phosphor-license
+
+DEPENDS += "glib-2.0"
+
+INSTALL_NAME ?= "${PN}"
+BIN_NAME ?= "${INSTALL_NAME}"
+
+do_install_append() {
+        # install the binary
+        install -d ${D}${sbindir}
+        install -m 0755 ${S}/${BIN_NAME} ${D}${sbindir}/${INSTALL_NAME}
+}
diff --git a/meta-phosphor/classes/obmc-phosphor-chassis-mgmt.bbclass b/meta-phosphor/classes/obmc-phosphor-chassis-mgmt.bbclass
new file mode 100644
index 000000000..edf18c03f
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-chassis-mgmt.bbclass
@@ -0,0 +1,4 @@
+# Common code for recipes that implement Phosphor OpenBMC chassis management.
+
+RPROVIDES_${PN} += "virtual/obmc-phosphor-chassis-mgmt"
+PROVIDES += "virtual/obmc-phosphor-chassis-mgmt"
diff --git a/meta-phosphor/classes/obmc-phosphor-dbus-service.bbclass b/meta-phosphor/classes/obmc-phosphor-dbus-service.bbclass
new file mode 100644
index 000000000..e6132faa7
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-dbus-service.bbclass
@@ -0,0 +1,20 @@
+# Common code for applications providing a D-Bus service.
+
+# Class users should define DBUS_SERVICES prior to including.
+
+RDEPENDS_${PN} += "dbus-perms"
+
+python() {
+        services = d.getVar('DBUS_SERVICES', True)
+        if services:
+                uris = " ".join( [ 'file://' + s + '.conf' for s in services.split() ] )
+                d.appendVar('SRC_URI', ' ' + uris + ' ')
+}
+
+do_install_append() {
+        # install the service configuration files
+        install -d ${D}${sysconfdir}/dbus-1/system.d
+        for s in ${DBUS_SERVICES}; do
+                install ${WORKDIR}/$s.conf ${D}${sysconfdir}/dbus-1/system.d/$s.conf
+        done
+}
diff --git a/meta-phosphor/classes/obmc-phosphor-event-mgmt.bbclass b/meta-phosphor/classes/obmc-phosphor-event-mgmt.bbclass
new file mode 100644
index 000000000..afab38f23
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-event-mgmt.bbclass
@@ -0,0 +1,4 @@
+# Common code for recipes that implement Phosphor OpenBMC event management.
+
+RPROVIDES_${PN} += "virtual/obmc-phosphor-event-mgmt"
+PROVIDES += "virtual/obmc-phosphor-event-mgmt"
diff --git a/meta-phosphor/classes/obmc-phosphor-fan-mgmt.bbclass b/meta-phosphor/classes/obmc-phosphor-fan-mgmt.bbclass
new file mode 100644
index 000000000..2e64773b5
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-fan-mgmt.bbclass
@@ -0,0 +1,4 @@
+# Common code for recipes that implement Phosphor OpenBMC fan management.
+
+RPROVIDES_${PN} += "virtual/obmc-phosphor-fan-mgmt"
+PROVIDES += "virtual/obmc-phosphor-fan-mgmt"
diff --git a/meta-phosphor/classes/obmc-phosphor-flash-mgmt.bbclass b/meta-phosphor/classes/obmc-phosphor-flash-mgmt.bbclass
new file mode 100644
index 000000000..4898c2051
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-flash-mgmt.bbclass
@@ -0,0 +1,4 @@
+# Common code for recipes that implement Phosphor OpenBMC flash management.
+
+RPROVIDES_${PN} += "virtual/obmc-phosphor-flash-mgmt"
+PROVIDES += "virtual/obmc-phosphor-flash-mgmt"
diff --git a/meta-phosphor/classes/obmc-phosphor-host-ipmi-hw.bbclass b/meta-phosphor/classes/obmc-phosphor-host-ipmi-hw.bbclass
new file mode 100644
index 000000000..974c01026
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-host-ipmi-hw.bbclass
@@ -0,0 +1,4 @@
+# Common code for recipes that implement Phosphor OpenBMC IPMI HW to DBUS translation.
+
+RPROVIDES_${PN} += "virtual/obmc-phosphor-host-ipmi-hw"
+PROVIDES += "virtual/obmc-phosphor-host-ipmi-hw"
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass
new file mode 100644
index 000000000..164da3318
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass
@@ -0,0 +1,52 @@
+# Common code for generating Phosphor OpenBMC images.
+
+# Additional IMAGE_FEATURES available with Phosphor OpenBMC:
+#
+# - obmc-phosphor-fan-mgmt            - Phosphor OpenBMC fan management
+# - obmc-phosphor-chassis-mgmt        - Phosphor OpenBMC chassis management
+# - obmc-phosphor-sensor-mgmt         - Phosphor OpenBMC sensor management
+# - obmc-phosphor-flash-mgmt          - Phosphor OpenBMC flash management
+# - obmc-phosphor-event-mgmt          - Phosphor OpenBMC event management
+# - obmc-phosphor-policy-mgmt         - Phosphor OpenBMC policy management
+# - obmc-phosphor-user-mgmt           - Phosphor OpenBMC user management
+# - obmc-phosphor-system-mgmt         - Phosphor OpenBMC system management
+
+inherit core-image
+inherit obmc-phosphor-license
+
+FEATURE_PACKAGES_obmc-phosphor-fan-mgmt ?= "packagegroup-obmc-phosphor-apps-fan-mgmt"
+FEATURE_PACKAGES_obmc-phosphor-chassis-mgmt ?= "packagegroup-obmc-phosphor-apps-chassis-mgmt"
+FEATURE_PACKAGES_obmc-phosphor-sensor-mgmt ?= "packagegroup-obmc-phosphor-apps-sensor-mgmt"
+FEATURE_PACKAGES_obmc-phosphor-flash-mgmt ?= "packagegroup-obmc-phosphor-apps-flash-mgmt"
+FEATURE_PACKAGES_obmc-phosphor-event-mgmt ?= "packagegroup-obmc-phosphor-apps-event-mgmt"
+FEATURE_PACKAGES_obmc-phosphor-policy-mgmt ?= "packagegroup-obmc-phosphor-apps-policy-mgmt"
+FEATURE_PACKAGES_obmc-phosphor-user-mgmt ?= "packagegroup-obmc-phosphor-apps-user-mgmt"
+FEATURE_PACKAGES_obmc-phosphor-system-mgmt ?= "packagegroup-obmc-phosphor-apps-system-mgmt"
+
+# Install entire Phosphor application stack by default
+IMAGE_FEATURES += " \
+        obmc-phosphor-fan-mgmt \
+        obmc-phosphor-chassis-mgmt \
+        obmc-phosphor-sensor-mgmt \
+        obmc-phosphor-flash-mgmt \
+        obmc-phosphor-event-mgmt \
+        obmc-phosphor-policy-mgmt \
+        obmc-phosphor-user-mgmt \
+        obmc-phosphor-system-mgmt \
+        ssh-server-dropbear \
+        "
+
+IMAGE_INSTALL += " \
+        bash \
+        packagegroup-obmc-phosphor-apps-extras \
+        i2c-tools \
+        screen \
+        inarp \
+        "
+
+def build_overlay(d):
+        if bb.utils.contains("IMAGE_FSTYPES", "overlay", "overlay", "0", d) != "0":
+                return "image-overlay"
+        return ""
+
+inherit ${@build_overlay(d)}
diff --git a/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass b/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass
new file mode 100644
index 000000000..adb86e06d
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass
@@ -0,0 +1,97 @@
+inherit image_types_uboot
+
+# oe_mkimage() was defined in image_types_uboot. Howver, it does not consider
+# the image load address and entry point. Override it here.
+
+oe_mkimage () {
+       mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_BASENAME} \
+              -a ${INITRD_IMAGE_LOADADDRESS} -e ${INITRD_IMAGE_ENTRYPOINT} \
+              -d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot
+}
+
+INITRD_IMAGE_ENTRYPOINT ?= "0x40800000"
+INITRD_IMAGE_LOADADDRESS ?= "${INITRD_IMAGE_ENTRYPOINT}"
+INITRD_LINK_NAME = "${INITRD_IMAGE}-${MACHINE}${INITRAMFS_FSTYPE}"
+
+FLASH_IMAGE_NAME ?= "flash-${MACHINE}-${DATETIME}"
+FLASH_IMAGE_LINK ?= "flash-${MACHINE}"
+
+FLASH_UBOOT_OFFSET ?= "0"
+FLASH_KERNEL_OFFSET ?= "512"
+FLASH_INITRD_OFFSET ?= "3072"
+FLASH_ROFS_OFFSET ?= "4864"
+FLASH_RWFS_OFFSET ?= "28672"
+RWFS_SIZE ?= "4096"
+
+# Allow rwfs mkfs configuration through OVERLAY_MKFS_OPTS and OVERRIDES. However,
+# avoid setting 'ext4' or 'jffs2' in OVERRIDES as such raw filesystem types are
+# reserved for the primary image (and setting them currently breaks the build).
+# Instead, prefix the overlay override value with 'rwfs-' to avoid collisions.
+DISTROOVERRIDES .= ":rwfs-${OVERLAY_BASETYPE}"
+
+OVERLAY_MKFS_OPTS_rwfs-ext4 = "-b 4096 -F -O^huge_file"
+
+# $(( ${FLASH_SIZE} - ${FLASH_RWFS_OFFSET} ))
+
+# IMAGE_POSTPROCESS_COMMAND += "do_generate_flash"
+
+mk_nor_image() {
+       image_dst="$1"
+       image_size_kb=$2
+       dd if=/dev/zero bs=1k count=${image_size_kb} \
+              | tr '\000' '\377' > ${image_dst}
+}
+
+do_generate_flash() {
+       INITRD_CTYPE=${INITRAMFS_CTYPE}
+       ddir="${DEPLOY_DIR_IMAGE}"
+       kernel="${KERNEL_IMAGETYPE}"
+       uboot="u-boot.${UBOOT_SUFFIX}"
+       initrd="${INITRD_LINK_NAME}.cpio.${INITRD_CTYPE}"
+       uinitrd="${initrd}.u-boot"
+       rootfs="${IMAGE_LINK_NAME}.${IMAGE_BASETYPE}"
+       rwfs="rwfs.${OVERLAY_BASETYPE}"
+
+       if [ ! -f $ddir/$kernel ]; then
+              bbfatal "Kernel file ${ddir}/${kernel} does not exist"
+       fi
+       if [ ! -f $ddir/$uboot ]; then
+              bbfatal "U-boot file ${ddir}/${uboot} does not exist"
+       fi
+       if [ ! -f $ddir/$initrd ]; then
+              bbfatal "initrd file ${ddir}/${initrd} does not exist"
+       fi
+       if [ ! -f $ddir/$rootfs ]; then
+              bbfatal "Rootfs file ${ddir}/${rootfs} does not exist"
+       fi
+
+       oe_mkimage  "${initrd}" "${INITRD_CTYPE}" || bbfatal "oe_mkimage initrd"
+
+       mk_nor_image ${ddir}/${rwfs} ${RWFS_SIZE}
+       if [ "${OVERLAY_BASETYPE}" != jffs2 ]; then
+              mkfs.${OVERLAY_BASETYPE} ${OVERLAY_MKFS_OPTS} ${ddir}/${rwfs} || \
+                     bbfatal "mkfs rwfs"
+       fi
+
+       dst="${ddir}/${FLASH_IMAGE_NAME}"
+       rm -rf $dst
+       mk_nor_image ${dst} ${FLASH_SIZE}
+       dd if=${ddir}/${uboot} of=${dst} bs=1k seek=${FLASH_UBOOT_OFFSET}
+       dd if=${ddir}/${kernel} of=${dst} bs=1k seek=${FLASH_KERNEL_OFFSET}
+       dd if=${ddir}/${uinitrd} of=${dst} bs=1k seek=${FLASH_INITRD_OFFSET}
+       dd if=${ddir}/${rootfs} of=${dst} bs=1k seek=${FLASH_ROFS_OFFSET}
+       dd if=${ddir}/${rwfs} of=${dst} bs=1k seek=${FLASH_RWFS_OFFSET}
+       dstlink="${ddir}/${FLASH_IMAGE_LINK}"
+       rm -rf $dstlink
+       ln -sf ${FLASH_IMAGE_NAME} $dstlink
+
+       ln -sf ${FLASH_IMAGE_NAME} ${ddir}/image-bmc
+       ln -sf ${uboot} ${ddir}/image-u-boot
+       ln -sf ${kernel} ${ddir}/image-kernel
+       ln -sf ${uinitrd} ${ddir}/image-initramfs
+       ln -sf ${rootfs} ${ddir}/image-rofs
+       ln -sf ${rwfs} ${ddir}/image-rwfs
+
+       tar -h -cvf ${ddir}/${MACHINE}-${DATETIME}.all.tar -C ${ddir} image-bmc
+       tar -h -cvf ${ddir}/${MACHINE}-${DATETIME}.tar -C ${ddir} image-u-boot image-kernel image-initramfs image-rofs image-rwfs
+}
diff --git a/meta-phosphor/classes/obmc-phosphor-initfs.bbclass b/meta-phosphor/classes/obmc-phosphor-initfs.bbclass
new file mode 100644
index 000000000..de7923e82
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-initfs.bbclass
@@ -0,0 +1,4 @@
+# Common code for recipes that implement Phosphor OpenBMC filesystem
+
+RPROVIDES_${PN} += "obmc-phosphor-initfs"
+PROVIDES += "obmc-phosphor-initfs"
diff --git a/meta-phosphor/classes/obmc-phosphor-license.bbclass b/meta-phosphor/classes/obmc-phosphor-license.bbclass
new file mode 100644
index 000000000..9694f7fa2
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-license.bbclass
@@ -0,0 +1,4 @@
+# Common code for packages distributed without a license that want Apache-2.0.
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
diff --git a/meta-phosphor/classes/obmc-phosphor-policy-mgmt.bbclass b/meta-phosphor/classes/obmc-phosphor-policy-mgmt.bbclass
new file mode 100644
index 000000000..35397b849
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-policy-mgmt.bbclass
@@ -0,0 +1,4 @@
+# Common code for recipes that implement Phosphor OpenBMC policy management.
+
+RPROVIDES_${PN} += "virtual/obmc-phosphor-policy-mgmt"
+PROVIDES += "virtual/obmc-phosphor-policy-mgmt"
diff --git a/meta-phosphor/classes/obmc-phosphor-py-daemon.bbclass b/meta-phosphor/classes/obmc-phosphor-py-daemon.bbclass
new file mode 100644
index 000000000..9cb8bfdba
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-py-daemon.bbclass
@@ -0,0 +1,15 @@
+# Common code for dbus applications using python.
+
+inherit allarch
+inherit obmc-phosphor-systemd
+inherit obmc-phosphor-license
+
+RDEPENDS_${PN} += "python-dbus python-pygobject"
+INSTALL_NAME ?= "${PN}"
+SCRIPT_NAME ?= "${INSTALL_NAME}.py"
+
+do_install_append() {
+        # install the script
+        install -d ${D}${sbindir}
+        install -m 0755 ${S}/${SCRIPT_NAME} ${D}${sbindir}/${INSTALL_NAME}
+}
diff --git a/meta-phosphor/classes/obmc-phosphor-pydbus-service.bbclass b/meta-phosphor/classes/obmc-phosphor-pydbus-service.bbclass
new file mode 100644
index 000000000..dc6f9e5ed
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-pydbus-service.bbclass
@@ -0,0 +1,6 @@
+# Common code for applications providing a D-Bus service using python-dbus bindings.
+
+# Class users should define DBUS_SERVICES prior to including.
+
+inherit obmc-phosphor-dbus-service
+inherit obmc-phosphor-py-daemon
diff --git a/meta-phosphor/classes/obmc-phosphor-sdbus-service.bbclass b/meta-phosphor/classes/obmc-phosphor-sdbus-service.bbclass
new file mode 100644
index 000000000..bc190d416
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-sdbus-service.bbclass
@@ -0,0 +1,8 @@
+# Common code for applications providing a D-Bus service using sd-bus bindings.
+
+# Class users should define DBUS_SERVICES prior to including.
+
+DEPENDS += "systemd"
+RDEPENDS_${PN} += "libsystemd"
+
+inherit obmc-phosphor-dbus-service
diff --git a/meta-phosphor/classes/obmc-phosphor-sensor-mgmt.bbclass b/meta-phosphor/classes/obmc-phosphor-sensor-mgmt.bbclass
new file mode 100644
index 000000000..0d9982e77
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-sensor-mgmt.bbclass
@@ -0,0 +1,4 @@
+# Common code for recipes that implement Phosphor OpenBMC sensor management.
+
+RPROVIDES_${PN} += "virtual/obmc-phosphor-sensor-mgmt"
+PROVIDES += "virtual/obmc-phosphor-sensor-mgmt"
diff --git a/meta-phosphor/classes/obmc-phosphor-system-mgmt.bbclass b/meta-phosphor/classes/obmc-phosphor-system-mgmt.bbclass
new file mode 100644
index 000000000..07c89c472
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-system-mgmt.bbclass
@@ -0,0 +1,4 @@
+# Common code for recipes that implement Phosphor OpenBMC system management.
+
+RPROVIDES_${PN} += "virtual/obmc-phosphor-system-mgmt"
+PROVIDES += "virtual/obmc-phosphor-system-mgmt"
diff --git a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass
new file mode 100644
index 000000000..12e0bc168
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass
@@ -0,0 +1,14 @@
+# Common code for Phosphor OpenBMC systemd services.
+
+inherit systemd
+
+SYSTEMD_SERVICE_${PN} = "${BPN}.service"
+SRC_URI += " \
+        file://${BPN}.service \
+        "
+
+do_install_append() {
+        # install systemd unit files
+        install -d ${D}${systemd_unitdir}/system
+        install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_unitdir}/system
+}
diff --git a/meta-phosphor/classes/obmc-phosphor-user-mgmt.bbclass b/meta-phosphor/classes/obmc-phosphor-user-mgmt.bbclass
new file mode 100644
index 000000000..4b82f60b4
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-user-mgmt.bbclass
@@ -0,0 +1,4 @@
+# Common code for recipes that implement Phosphor OpenBMC user management.
+
+RPROVIDES_${PN} += "virtual/obmc-phosphor-user-mgmt"
+PROVIDES += "virtual/obmc-phosphor-user-mgmt"
diff --git a/meta-phosphor/classes/obmc-phosphor-utils.bbclass b/meta-phosphor/classes/obmc-phosphor-utils.bbclass
new file mode 100644
index 000000000..4f556294b
--- /dev/null
+++ b/meta-phosphor/classes/obmc-phosphor-utils.bbclass
@@ -0,0 +1,14 @@
+# Helper functions for checking feature variables.
+
+inherit utils
+
+def df_enabled(feature, value, d):
+        return base_contains("DISTRO_FEATURES", feature, value, "", d)
+
+def mf_enabled(feature, value, d):
+        return base_contains("MACHINE_FEATURES", feature, value, "", d)
+
+def cf_enabled(feature, value, d):
+        return value if df_enabled(feature, value, d) \
+                and mf_enabled(feature, value, d) \
+                        else ""
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
new file mode 100644
index 000000000..bfbdcf6f9
--- /dev/null
+++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
@@ -0,0 +1,55 @@
+#require recipes-bsp/u-boot/u-boot.inc
+
+SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
+SECTION = "bootloader"
+DEPENDS = "mtd-utils"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
+                    file://README;beginline=1;endline=22;md5=78b195c11cb6ef63e6985140db7d7bab"
+
+# This revision corresponds to the tag "v2013.07"
+# We use the revision in order to avoid having to fetch it from the
+# repo during parse
+# SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c"
+SRCREV="4b44678c11ac82c7c797bb115e276181752ad54d"
+
+PV = "v2013.07+git${SRCPV}"
+
+UBRANCH = "v2013.07-aspeed-openbmc"
+SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https"
+S = "${WORKDIR}/git"
+
+#INSANE_SKIP_${PN} = "already-stripped"
+#EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
+#EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
+EXTRA_OEMAKE = 'HOSTCC="${CC}" CC="${CC}" HOSTSTRIP="true"'
+
+inherit uboot-config
+
+do_compile () {
+	oe_runmake ${UBOOT_MACHINE}
+	oe_runmake env
+}
+
+do_install () {
+	install -d ${D}${base_sbindir}
+	install -d ${D}${sysconfdir}
+	install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
+	ln -sf fw_printenv ${D}${base_sbindir}/fw_setenv
+	install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config
+}
+
+#do_install_class-cross () {
+#	install -d ${D}${bindir_cross}
+#	install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
+#	install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
+#}
+
+#SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross"
+#uboot_fw_utils_cross() {
+#	sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
+#}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+#BBCLASSEXTEND = "cross native"
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2013.07.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2013.07.bb
new file mode 100644
index 000000000..6070fbf9c
--- /dev/null
+++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2013.07.bb
@@ -0,0 +1,24 @@
+require recipes-bsp/u-boot/u-boot.inc
+
+# To build u-boot for your machine, provide the following lines in your machine
+# config, replacing the assignments as appropriate for your machine.
+# UBOOT_MACHINE = "omap3_beagle_config"
+# UBOOT_ENTRYPOINT = "0x80008000"
+# UBOOT_LOADADDRESS = "0x80008000"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
+                    file://README;beginline=1;endline=22;md5=78b195c11cb6ef63e6985140db7d7bab"
+
+# This revision corresponds to the tag "v2013.07"
+# We use the revision in order to avoid having to fetch it from the repo during parse
+SRCREV = "4b44678c11ac82c7c797bb115e276181752ad54d"
+
+PV = "v2013.07+git${SRCPV}"
+
+UBRANCH = "v2013.07-aspeed-openbmc"
+SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https"
+
+S = "${WORKDIR}/git"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-phosphor/common/recipes-connectivity/openssl/openssl_%.bbappend b/meta-phosphor/common/recipes-connectivity/openssl/openssl_%.bbappend
new file mode 100644
index 000000000..a18a55228
--- /dev/null
+++ b/meta-phosphor/common/recipes-connectivity/openssl/openssl_%.bbappend
@@ -0,0 +1,11 @@
+
+# General config settings.
+EXTRA_OECONF_append = " shared no-hw no-err no-psk no-srp no-engines "
+
+# Disable SSL (keep TLS only).
+EXTRA_OECONF_append = " no-ssl2 no-ssl3 "
+
+# Disable various algorithms.
+EXTRA_OECONF_append = " no-idea no-md2 no-mdc2 no-rc5 no-md4 \
+        no-ripemd160 no-rmd160 no-whirlpool no-sha0 no-camellia \
+        no-rc2 no-rc4 no-bf no-cast no-seed no-gost "
diff --git a/meta-phosphor/common/recipes-core/busybox/busybox/busybox.cfg b/meta-phosphor/common/recipes-core/busybox/busybox/busybox.cfg
new file mode 100644
index 000000000..174a3f203
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/busybox/busybox/busybox.cfg
@@ -0,0 +1 @@
+CONFIG_DEVMEM=y
diff --git a/meta-phosphor/common/recipes-core/busybox/busybox/flash.cfg b/meta-phosphor/common/recipes-core/busybox/busybox/flash.cfg
new file mode 100644
index 000000000..39ba10d74
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/busybox/busybox/flash.cfg
@@ -0,0 +1,4 @@
+CONFIG_FLASHCP=y
+CONFIG_FLASH_LOCK=y
+CONFIG_FLASH_UNLOCK=y
+CONFIG_FLASH_ERASEALL=y
diff --git a/meta-phosphor/common/recipes-core/busybox/busybox_%.bbappend b/meta-phosphor/common/recipes-core/busybox/busybox_%.bbappend
new file mode 100644
index 000000000..3c4f2b61f
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/busybox/busybox_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://busybox.cfg"
+SRC_URI += "file://flash.cfg"
diff --git a/meta-phosphor/common/recipes-core/dropbear/dropbear/dropbearkey.service b/meta-phosphor/common/recipes-core/dropbear/dropbear/dropbearkey.service
new file mode 100644
index 000000000..623f73e42
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/dropbear/dropbear/dropbearkey.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=SSH Key Generation
+ConditionPathExists=|!/etc/dropbear/dropbear_rsa_host_key
+
+[Service]
+Type=oneshot
+ExecStart=@SBINDIR@/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-core/dropbear/dropbear_%.bbappend b/meta-phosphor/common/recipes-core/dropbear/dropbear_%.bbappend
new file mode 100644
index 000000000..36c0dcd12
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/dropbear/dropbear_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://dropbearkey.service"
diff --git a/meta-phosphor/common/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch b/meta-phosphor/common/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch
new file mode 100644
index 000000000..5b8c240e3
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch
@@ -0,0 +1,26 @@
+From bc89a1d5329cf8f8a67a5e8c2b7ed53aa6611183 Mon Sep 17 00:00:00 2001
+From: Chris Austen <austenc@us.ibm.com>
+Date: Thu, 24 Sep 2015 14:49:24 -0500
+Subject: [PATCH 1/1] add support for Power8 LE mode
+
+---
+ config.guess | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/localedef/config.guess b/localedef/config.guess
+index 61f2e4c..c77ec22 100644
+--- a/localedef/config.guess
++++ b/localedef/config.guess
+@@ -876,6 +876,9 @@ EOF
+     ppc64:Linux:*:*)
+ 	echo powerpc64-unknown-linux-gnu
+ 	exit 0 ;;
++    ppc64le:Linux:*:*)
++       echo powerpc64le-unknown-linux-gnu
++       exit 0 ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ 	  EV5)   UNAME_MACHINE=alphaev5 ;;
+-- 
+1.9.1
+
diff --git a/meta-phosphor/common/recipes-core/glibc/cross-localedef-native_2.22.bbappend b/meta-phosphor/common/recipes-core/glibc/cross-localedef-native_2.22.bbappend
new file mode 100644
index 000000000..f065ed73f
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/glibc/cross-localedef-native_2.22.bbappend
@@ -0,0 +1,2 @@
+SRC_URI += "file://0001-add-support-for-Power8-LE-mode.patch"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-phosphor/common/recipes-core/images/core-image-minimal-initramfs.bbappend b/meta-phosphor/common/recipes-core/images/core-image-minimal-initramfs.bbappend
new file mode 100644
index 000000000..90a1c3f6c
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/images/core-image-minimal-initramfs.bbappend
@@ -0,0 +1,3 @@
+PACKAGE_INSTALL_remove = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi"
+PACKAGE_INSTALL += "obmc-phosphor-initfs"
+INITRAMFS_FSTYPES = "cpio.${INITRAMFS_CTYPE}"
diff --git a/meta-phosphor/common/recipes-core/os-release/os-release.bbappend b/meta-phosphor/common/recipes-core/os-release/os-release.bbappend
new file mode 100644
index 000000000..b112c50d9
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/os-release/os-release.bbappend
@@ -0,0 +1,19 @@
+def run_git(d, cmd):
+        try:
+                oeroot = d.getVar('COREBASE', True)
+                return bb.process.run("git --git-dir %s/.git %s" %(oeroot, cmd))[0].strip('\n')
+        except:
+                pass
+
+python() {
+        version_id = run_git(d, 'describe --abbrev=0')
+        if version_id:
+                d.setVar('VERSION_ID', version_id)
+
+        build_id = run_git(d, 'describe --dirty')
+        if build_id:
+                d.setVar('BUILD_ID', build_id)
+}
+
+OS_RELEASE_FIELDS_append = " BUILD_ID"
+do_compile[nostamp] = "1"
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/0100-systemd_networkd_dbus_setaddress.patch b/meta-phosphor/common/recipes-core/systemd/systemd/0100-systemd_networkd_dbus_setaddress.patch
new file mode 100644
index 000000000..e105dddcb
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/systemd/systemd/0100-systemd_networkd_dbus_setaddress.patch
@@ -0,0 +1,1209 @@
+From 4bdb01553409269f992cd3ae76f06aeebf498ade Mon Sep 17 00:00:00 2001
+From: Hariharasubramanian R <hramasub@in.ibm.com>
+Date: Thu, 4 Feb 2016 09:52:48 -0600
+Subject: [PATCH] Sprint 5 : DBus API for network address configuration
+
+---
+ src/network/networkd-link-bus.c           | 375 +++++++++++++++++++
+ src/network/networkd-network-bus.c        | 601 ++++++++++++++++++++++++++++++
+ src/network/networkd-network.c            | 108 ++++++
+ src/network/org.freedesktop.network1.conf |  20 +
+ 4 files changed, 1104 insertions(+)
+
+diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
+index 1a1524d..5af57e1 100644
+--- a/src/network/networkd-link-bus.c
++++ b/src/network/networkd-link-bus.c
+@@ -25,15 +25,69 @@
+ #include "networkd.h"
+ #include "networkd-link.h"
+ 
++#define SYSTEMD_NETWORKD_DBUS 1
++#define SYSTEMD_NETWORKD_DBUS_SETMAC_NETLINK 1
++
++#ifdef SYSTEMD_NETWORKD_DBUS
++/*
++#include "hostname-util.h"
++#include "network-internal.h"
++#include "networkd-link.h"
++#include "bus-util.h"
++*/
++#include <stdio.h>
++#include <linux/filter.h>
++#include <netinet/if_ether.h>
++
++#include <linux/sockios.h>
++#include <sys/socket.h>
++#include <net/if.h>
++#include <sys/types.h>
++#include <sys/wait.h>
++
++#if 0
++#include "util.h" /* bus/util.h */
++#include "sparse-endian.h" /* bus/util.h */
++#endif
++
++#include "sd-network.h"
++#include "sd-netlink.h"
++#include "socket-util.h"
++#include "ether-addr-util.h"
++#include "netlink-internal.h"
++/*
++#include "local-addresses.h"
++*/
++#endif
++
+ static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_operational_state, link_operstate, LinkOperationalState);
+ static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_administrative_state, link_state, LinkState);
+ 
++#ifdef SYSTEMD_NETWORKD_DBUS
++static int method_get_address (sd_bus_message *m, void* userdata, sd_bus_error *error);
++static int method_set_address (sd_bus_message *m, void* userdata, sd_bus_error *error);
++#endif
++
++#if defined (SYSTEMD_NETWORKD_DBUS_SETMAC_IPV4LL)
++static int link_arp_network_bind_raw_socket(int index, union sockaddr_union *link);
++static int link_arp_network_send_raw_socket(int fd, const union sockaddr_union *link, const struct ether_arp *arp);
++#elif defined (SYSTEMD_NETWORKD_DBUS_SETMAC_NETLINK)
++static int link_if_updown(sd_netlink* rtnl, sd_netlink_message** req, sd_netlink_message** rep, int ifindex, int cmd);
++static int link_if_setaddr(sd_netlink* rtnl, sd_netlink_message** req, sd_netlink_message** rep, int ifindex, const char* ea);
++#endif
++
+ const sd_bus_vtable link_vtable[] = {
+         SD_BUS_VTABLE_START(0),
+ 
+         SD_BUS_PROPERTY("OperationalState", "s", property_get_operational_state, offsetof(Link, operstate), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+         SD_BUS_PROPERTY("AdministrativeState", "s", property_get_administrative_state, offsetof(Link, state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ 
++#ifdef SYSTEMD_NETWORKD_DBUS
++	    /* device name */
++    	SD_BUS_METHOD("GetAddress", "s", "s", method_get_address, SD_BUS_VTABLE_UNPRIVILEGED),
++	    /* device name, mac addr */
++    	SD_BUS_METHOD("SetAddress", "ss", "s", method_set_address, SD_BUS_VTABLE_UNPRIVILEGED),
++#endif
+         SD_BUS_VTABLE_END
+ };
+ 
+@@ -136,3 +190,324 @@ int link_send_changed(Link *link, const char *property, ...) {
+                         "org.freedesktop.network1.Link",
+                         l);
+ }
++
++static int method_set_address (sd_bus_message *m, void* userdata, sd_bus_error *error)
++{
++    _cleanup_netlink_unref_ sd_netlink                  *rtnl   = NULL;
++    _cleanup_netlink_message_unref_ sd_netlink_message  *req    = NULL;
++    _cleanup_netlink_message_unref_ sd_netlink_message  *reply  = NULL;
++    _cleanup_bus_message_unref_ sd_bus_message          *resp   = NULL;
++    Manager                                             *mgr    = userdata;
++
++    struct udev*        udev               = NULL;
++    struct udev_device* udev_eth           = NULL;
++    const char*         device             = NULL;
++    const char*         ea                  = NULL;
++    char                devpath [32]       = "/sys/class/net/"; 
++
++    int                 r;
++    int                 pid=0;
++    unsigned char       ifindex;
++
++#if defined(SYSTEMD_NETWORKD_DBUS_SETMAC_IPV4LL)
++        bool                have_mac;
++        struct ether_addr   e;
++        struct ether_addr*  ep = NULL;
++        union sockaddr_union link;
++        uint8_t             seed[8];
++        uint8_t             i=0;
++
++        struct ifreq        dev;
++        int                 sock;
++#endif
++
++
++    assert(m);
++    assert(mgr);
++
++    r = sd_bus_message_read (m, "ss", &device, &ea);
++    if (r < 0)
++        return r;
++
++/*
++    if (isempty (device))
++        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid Device Name.");
++
++    if (isempty (ea))
++        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid MAC Address.");
++*/
++
++    udev = udev_new();
++    udev_eth = udev_device_new_from_syspath(udev, strcat (devpath, device));
++    if (!udev_eth)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Could not find udev device");
++
++    ifindex = udev_device_get_ifindex(udev_eth);
++
++#if defined (SYSTEMD_NETWORKD_DBUS_SETMAC_IPV4LL)
++    r = link_arp_network_bind_raw_socket(ifindex, &link);
++    if (r < 0)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unable to bind ARP Raw socket.");
++#elif defined (SYSTEMD_NETWORKD_DBUS_SETMAC_IOCTL)
++    sock = socket (AF_INET, SOCK_DGRAM, 0);
++    if (sock < 0)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unable to bind socket.");
++
++    strcpy (dev.ifr_name, device);
++    if (ioctl(sock, SIOCGIFHWADDR, &dev) < 0)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unable to bind socket.");
++#elif defined (SYSTEMD_NETWORKD_DBUS_SETMAC_NETLINK)
++    r = link_if_updown (rtnl, &req, &reply, ifindex, 0); /* i/f down */
++    if (r < 0)
++        /*return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error shutting down interface");*/
++        sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error shutting down interface");
++
++    r = link_if_setaddr(rtnl, &req, &reply, ifindex, ea);
++    if (r < 0)
++        /*return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error setting MAC addr on interface");*/
++        sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error setting MAC addr on interface");
++
++    r = link_if_updown (rtnl, &req, &reply, ifindex, 1); /* i/f up */
++    if (r < 0)
++        /*return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error starting up interface");*/
++        sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error starting up interface");
++
++    /* Set U-Boot environment variable.*/
++    pid = fork (); 
++    if (!pid)
++    {
++        char* argv [] = {"/sbin/fw_setenv", "ethaddr", ea, NULL};
++        execv (argv[0], argv);
++        exit (1);
++    }
++    else
++    {
++        int childerror = 0;
++
++        waitpid (pid, &childerror, 0);
++        if (childerror)        
++        {
++            sd_bus_error_setf(error, SD_BUS_ERROR_NO_MEMORY, "Error setting u-boot env");
++        }
++    }
++#endif
++
++    r = sd_bus_message_new_method_return(m, &resp);
++    if (r < 0)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_NO_MEMORY, "Error allocating reply messgage");
++
++    r = sd_bus_message_append(resp, "s", ea);
++    if (r < 0)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error appending to reply messgage");
++
++    r = sd_bus_send(mgr->bus, resp, NULL);
++
++    /*return sd_bus_reply_method_return(m, "s", "Setting IFLA address ...");*/
++    return sd_bus_reply_method_return(m, "s", ea);
++
++}
++
++static int method_get_address (sd_bus_message *m, void* userdata, sd_bus_error *error)
++{
++    _cleanup_netlink_unref_ sd_netlink                  *rtnl   = NULL;
++    _cleanup_netlink_message_unref_ sd_netlink_message  *req    = NULL;
++    _cleanup_netlink_message_unref_ sd_netlink_message  *reply  = NULL;
++    _cleanup_bus_message_unref_ sd_bus_message          *resp   = NULL;
++    Manager                                             *mgr    = userdata;
++
++    struct udev*        udev               = NULL;
++    struct udev_device* udev_eth           = NULL;
++    const char*         device             = NULL;
++    char                devpath [32]       = "/sys/class/net/"; 
++
++    int                 r;
++    unsigned char       ifindex;
++    bool                have_mac;
++    struct ether_addr   e;
++    char                ea[ETHER_ADDR_TO_STRING_MAX];
++
++    assert(m);
++    assert(mgr);
++
++    r = sd_bus_message_read (m, "s", &device);
++    if (r < 0)
++        return r;
++
++    if (isempty (device))
++        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid Device Name.");
++
++    udev = udev_new();
++    udev_eth = udev_device_new_from_syspath(udev, strcat (devpath, device));
++    if (!udev_eth)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Could not find udev device");
++
++    ifindex = udev_device_get_ifindex(udev_eth);
++
++    r = sd_netlink_open(&rtnl);
++    if (r < 0)
++            return log_error_errno(r, "Failed to connect to netlink:"); /* fixme */
++
++    r = sd_rtnl_message_new_link(rtnl, &req, RTM_GETLINK, ifindex);
++    if (r < 0)
++            return r;
++
++    r = sd_netlink_call(rtnl, req, 0, &reply); /* fixme */
++    if (r < 0)
++            return r;
++
++    have_mac = sd_netlink_message_read_ether_addr(reply, IFLA_ADDRESS, &e) >= 0;
++    if (!have_mac)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error reading IFLA address");
++
++    ether_addr_to_string(&e, ea);
++
++    r = sd_bus_message_new_method_return(m, &resp);
++    if (r < 0)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_NO_MEMORY, "Error allocating reply messgage");
++
++    r = sd_bus_message_append(resp, "s", ea);
++    if (r < 0)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error appending to reply messgage");
++
++    r = sd_bus_send(mgr->bus, resp, NULL);
++
++    /*return sd_bus_reply_method_return(m, "s", "Getting IFLA address ...");*/
++    return sd_bus_reply_method_return(m, "s", ea);
++}
++
++#if defined (SYSTEMD_NETWORKD_DBUS_SETMAC_IPV4LL)
++/*----------------------------------------------------------------------------*/
++/* ARP helper routines copied from ipv4ll-network.c                           */
++/*----------------------------------------------------------------------------*/
++static int link_arp_network_bind_raw_socket(int ifindex, union sockaddr_union *link) {
++
++        static const struct sock_filter filter[] = {
++                BPF_STMT(BPF_LD + BPF_W + BPF_LEN, 0),                                         /* A <- packet length */
++                BPF_JUMP(BPF_JMP + BPF_JGE + BPF_K, sizeof(struct ether_arp), 1, 0),           /* packet >= arp packet ? */
++                BPF_STMT(BPF_RET + BPF_K, 0),                                                  /* ignore */
++                BPF_STMT(BPF_LD + BPF_H + BPF_ABS, offsetof(struct ether_arp, ea_hdr.ar_hrd)), /* A <- header */
++                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, ARPHRD_ETHER, 1, 0),                       /* header == ethernet ? */
++                BPF_STMT(BPF_RET + BPF_K, 0),                                                  /* ignore */
++                BPF_STMT(BPF_LD + BPF_H + BPF_ABS, offsetof(struct ether_arp, ea_hdr.ar_pro)), /* A <- protocol */
++                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, ETHERTYPE_IP, 1, 0),                       /* protocol == IP ? */
++                BPF_STMT(BPF_RET + BPF_K, 0),                                                  /* ignore */
++                BPF_STMT(BPF_LD + BPF_H + BPF_ABS, offsetof(struct ether_arp, ea_hdr.ar_op)),  /* A <- operation */
++                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, ARPOP_REQUEST, 0, 1),                      /* protocol == request ? */
++                BPF_STMT(BPF_RET + BPF_K, 65535),                                              /* return all */
++                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, ARPOP_REPLY, 0, 1),                        /* protocol == reply ? */
++                BPF_STMT(BPF_RET + BPF_K, 65535),                                              /* return all */
++                BPF_STMT(BPF_RET + BPF_K, 0),                                                  /* ignore */
++        };
++        struct sock_fprog fprog = {
++                .len = ELEMENTSOF(filter),
++                .filter = (struct sock_filter*) filter
++        };
++        _cleanup_close_ int s = -1;
++        int r;
++
++        assert(ifindex > 0);
++        assert(link);
++
++        s = socket(PF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
++        if (s < 0)
++                return -errno;
++
++        r = setsockopt(s, SOL_SOCKET, SO_ATTACH_FILTER, &fprog, sizeof(fprog));
++        if (r < 0)
++                return -errno;
++
++        link->ll.sll_family = AF_PACKET;
++        link->ll.sll_protocol = htons(ETH_P_ARP);
++        link->ll.sll_ifindex = ifindex;
++        link->ll.sll_halen = ETH_ALEN;
++        memset(link->ll.sll_addr, 0xff, ETH_ALEN);
++
++        r = bind(s, &link->sa, sizeof(link->ll));
++        if (r < 0)
++                return -errno;
++
++        r = s;
++        s = -1;
++
++        return r;
++}
++static int arp_network_send_raw_socket(int fd, const union sockaddr_union *link,
++                                        const struct ether_arp *arp) {
++        int r;
++
++        assert(arp);
++        assert(link);
++        assert(fd >= 0);
++
++        r = sendto(fd, arp, sizeof(struct ether_arp), 0, &link->sa, sizeof(link->ll));
++        if (r < 0)
++                return -errno;
++
++        return 0;
++}
++#endif
++
++#if defined (SYSTEMD_NETWORKD_DBUS_SETMAC_NETLINK)
++/* */
++/* Bring interface up/down */
++int link_if_updown(sd_netlink* rtnl, sd_netlink_message** req, sd_netlink_message** rep, int ifindex, int cmd)
++{
++    int r=0;
++    struct ifinfomsg *ifi;
++
++    r = message_new(rtnl, req, RTM_NEWLINK);
++    if (r < 0)
++            return r;
++
++    (*req)->hdr->nlmsg_len = NLMSG_LENGTH(sizeof (struct ifinfomsg));
++    (*req)->hdr->nlmsg_flags = NLM_F_REQUEST;
++    (*req)->hdr->nlmsg_type = RTM_NEWLINK;
++
++    ifi = NLMSG_DATA((*req)->hdr);
++
++    ifi->ifi_family = AF_UNSPEC;
++    ifi->ifi_change |= IFF_UP;
++    ifi->ifi_index = index;
++
++    /* when IFF_UP flag is set i/f will be active, otherwise i/f is shut down */
++    if (cmd)
++        ifi->ifi_flags |= IFF_UP;
++
++    return sd_netlink_call(rtnl, *req, 0, rep);
++}
++
++/* Set interface MAC address */
++int link_if_setaddr(sd_netlink* rtnl, sd_netlink_message** req, sd_netlink_message** rep, int ifindex, const char* ea)
++{
++    int r=0;
++    int i=0;
++
++    struct ifinfomsg *ifi;
++    struct ether_addr   e;
++    struct ether_addr*  ep;
++
++    r = message_new(rtnl, req, RTM_NEWLINK);
++    if (r < 0)
++            return r;
++
++    (*req)->hdr->nlmsg_len = NLMSG_LENGTH(sizeof (struct ifinfomsg));
++    (*req)->hdr->nlmsg_flags = NLM_F_REQUEST;
++    (*req)->hdr->nlmsg_type = RTM_NEWLINK;
++
++    ifi = NLMSG_DATA((*req)->hdr);
++
++    ifi->ifi_family = AF_UNSPEC;
++    ifi->ifi_index = ifindex;
++
++    ep = ether_aton (ea);
++    if (!ep)
++        return -1;
++
++    for (i=0; i<6; i++)
++        e.ether_addr_octet[i] = ep->ether_addr_octet[i];
++
++    r = sd_netlink_message_append_ether_addr(*req, IFLA_ADDRESS, &e);
++
++    return sd_netlink_call(rtnl, *req, 0, rep);
++}
++#endif
+diff --git a/src/network/networkd-network-bus.c b/src/network/networkd-network-bus.c
+index 5717a15..0a4cdd6 100644
+--- a/src/network/networkd-network-bus.c
++++ b/src/network/networkd-network-bus.c
+@@ -19,10 +19,39 @@
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
+ 
++#define SYSTEMD_NETWORKD_DBUS 1
++
++#ifdef SYSTEMD_NETWORKD_DBUS
++#include <stdio.h>
++#include <stdlib.h>
++#include <errno.h>
++#include <string.h>
++#include <netinet/ether.h>
++#include <linux/if.h>
++#endif
++
+ #include "strv.h"
+ 
+ #include "networkd.h"
+ 
++#ifdef SYSTEMD_NETWORKD_DBUS
++#include "hostname-util.h"
++#include "network-internal.h"
++#include "networkd-link.h"
++#include "bus-util.h"
++
++#include "sd-network.h"
++#include "sd-netlink.h"
++#include "local-addresses.h"
++#endif
++
++#ifdef SYSTEMD_NETWORKD_DBUS
++int network_address_added_handler (sd_netlink* rtnl, sd_netlink_message* m, void* userdata);
++int network_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message, void *userdata, Address* address); /* fixme */
++static int method_get_address (sd_bus_message *m, void* userdata, sd_bus_error *error); /* fixme */
++int network_save_static (int cmd, const char* device, const char* ipaddr, int prefixlen, const char* gwaddr);
++#endif
++
+ static int property_get_ether_addrs(
+                 sd_bus *bus,
+                 const char *path,
+@@ -56,6 +85,11 @@ static int property_get_ether_addrs(
+         return sd_bus_message_close_container(reply);
+ }
+ 
++#ifdef SYSTEMD_NETWORKD_DBUS
++static int method_add_address (sd_bus_message *m, void* userdata, sd_bus_error *error);
++static int method_del_address (sd_bus_message *m, void* userdata, sd_bus_error *error);
++#endif
++
+ const sd_bus_vtable network_vtable[] = {
+         SD_BUS_VTABLE_START(0),
+ 
+@@ -67,6 +101,13 @@ const sd_bus_vtable network_vtable[] = {
+         SD_BUS_PROPERTY("MatchType", "as", NULL, offsetof(Network, match_type), SD_BUS_VTABLE_PROPERTY_CONST),
+         SD_BUS_PROPERTY("MatchName", "as", NULL, offsetof(Network, match_name), SD_BUS_VTABLE_PROPERTY_CONST),
+ 
++#ifdef SYSTEMD_NETWORKD_DBUS
++	    /* device, IP, netmask, family, flags, scope, gateway */
++    	SD_BUS_METHOD("AddAddress", "sssyyys", "x", method_add_address, SD_BUS_VTABLE_UNPRIVILEGED),
++    	SD_BUS_METHOD("DelAddress", "sssyyys", "x", method_del_address, SD_BUS_VTABLE_UNPRIVILEGED),
++	    /* (family, prefixlen, flags, scope, IP)+ gateway */
++    	SD_BUS_METHOD("GetAddress", "s", "a(iyyus)s", method_get_address, SD_BUS_VTABLE_UNPRIVILEGED),
++#endif
+         SD_BUS_VTABLE_END
+ };
+ 
+@@ -152,3 +193,563 @@ int network_object_find(sd_bus *bus, const char *path, const char *interface, vo
+ 
+         return 1;
+ }
++
++#ifdef SYSTEMD_NETWORKD_DBUS
++
++static int method_add_address (sd_bus_message *m, void* userdata, sd_bus_error *error)
++{
++    _cleanup_bus_message_unref_ sd_bus_message*         resp    = NULL;
++    _cleanup_netlink_unref_ sd_netlink*                 rtnl    = NULL;
++    _cleanup_netlink_message_unref_ sd_netlink_message* req     = NULL;
++    _cleanup_netlink_message_unref_ sd_netlink_message* reply   = NULL;
++    _cleanup_address_free_ Address *addr                        = NULL;
++    _cleanup_route_free_ Route *rt                              = NULL;
++    Manager *mgr                                                = userdata;
++    Link*               link               = NULL;
++    struct udev*        udev               = NULL;
++    struct udev_device* udev_eth           = NULL;
++
++    const char*         device             = NULL;
++    const char*         ipaddr             = NULL;
++    const char*         netmask            = NULL;
++    const char*         gateway            = NULL;
++    char                devpath [32]       = "/sys/class/net/"; 
++
++    unsigned char       family;
++    unsigned char       prefixlen;
++    unsigned char       flags;
++    unsigned char       scope;
++    unsigned char       ifindex;
++
++    struct in_addr      nm;
++    struct in_addr      ip;
++    struct in_addr      gw;
++    int r;
++
++    assert(m);
++    assert(mgr);
++
++    r = sd_bus_message_read (m, "sssyyys", &device, &ipaddr, &netmask, &family, &flags, &scope, &gateway);
++    if (r < 0)
++        return r;
++
++    if (isempty (device))
++        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid Device Name.");
++
++    if (isempty (ipaddr))
++        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid IP Address.");
++
++    if (isempty (netmask))
++        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid IP Netmask.");
++
++    assert(family == AF_INET || family == AF_INET6);
++
++    udev = udev_new();
++    udev_eth = udev_device_new_from_syspath(udev, strcat (devpath, device));
++    if (!udev_eth)
++            return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Could not find udev device");
++
++    ifindex = udev_device_get_ifindex(udev_eth);
++
++    inet_aton (netmask, &nm);
++    inet_aton (ipaddr, &ip);
++    if (!isempty (gateway)) inet_aton (gateway, &gw);
++
++    prefixlen = in_addr_netmask_to_prefixlen(&nm);
++    assert(prefixlen > 0);
++
++#if 0
++    r = network_save_static (1, device, ipaddr, prefixlen, gateway); /* persist config - add */
++    if (r)
++            return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, strerror(r));
++#endif
++
++    r = address_new_dynamic(&addr);
++    if (r < 0)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_NO_MEMORY, "Error allocating new address");
++
++    r = sd_netlink_open(&rtnl);
++    if (r < 0)
++            return sd_bus_error_setf(error, SD_BUS_ERROR_IO_ERROR, "Failed to connect to netlink");
++
++    link = new0(Link, 1);
++    if (!link)
++            return -ENOMEM;
++
++    link->network = new0(Network, 1);
++    if (!link->network)
++            return sd_bus_error_setf(error, SD_BUS_ERROR_NO_MEMORY, "Could not alloc memory for Network");
++
++    link->n_ref                 = 1;
++    link->manager               = mgr;
++    link->manager->rtnl         = rtnl;
++    link->state                 = LINK_STATE_PENDING;
++    link->rtnl_extended_attrs   = true;
++    link->ifindex               = ifindex;
++    link->ifname                = strdup(device); /*FIXME:*/
++    if (!link->ifname)
++            return -ENOMEM;
++
++    addr->family                = family;
++    addr->in_addr.in.s_addr     = ip.s_addr;
++    addr->prefixlen             = prefixlen;
++    addr->broadcast.s_addr      = ip.s_addr | ~nm.s_addr;
++
++    LIST_PREPEND(addresses, link->network->static_addresses, addr);
++
++    if (!isempty (gateway))
++    {
++        r = route_new_dynamic(&rt, RTPROT_STATIC);
++        if (r < 0)
++            return r;
++
++        rt->protocol        = RTPROT_STATIC;
++        rt->network         = link->network;
++        rt->family          = family;
++        rt->scope           = RT_SCOPE_LINK;            /* FIXME: */
++        rt->dst_prefixlen   = prefixlen;                /* FIXME: AF_INET assumed */
++/*
++        rt->dst_addr.in     = gw;
++        rt->in_addr.in      = ip.s_addr & nm.s_addr;
++*/
++        rt->dst_addr.in.s_addr      = ip.s_addr & nm.s_addr;
++        rt->in_addr.in              = gw;
++
++        LIST_PREPEND(routes, link->network->static_routes, rt);
++    }
++
++    /* send an nlmsg (RTM_NEWADDR) and append address to link address list */
++    r = address_update (addr, link, network_address_added_handler);
++    if (r < 0)
++        return r;
++
++    r = sd_bus_message_new_method_return(m, &resp);
++    if (r < 0)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_NO_MEMORY, "Error allocating reply messgage");
++
++    r = sd_bus_message_append(resp, "x", 0);
++    if (r < 0)
++            return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error appending to reply messgage");
++
++    /*r = sd_bus_send(mgr->bus, resp, NULL);*/
++    r = sd_bus_send(NULL, resp, NULL);
++    if (r < 0)
++            return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error sending reply messgage");
++
++
++    return sd_bus_reply_method_return(m, "s", "Adding IP address...");
++}
++
++static int method_del_address (sd_bus_message *m, void* userdata, sd_bus_error *error)
++{
++    _cleanup_bus_message_unref_ sd_bus_message*         resp    = NULL;
++    _cleanup_netlink_unref_ sd_netlink*                 rtnl    = NULL;
++    _cleanup_netlink_message_unref_ sd_netlink_message* req     = NULL;
++    _cleanup_netlink_message_unref_ sd_netlink_message* reply   = NULL;
++    _cleanup_address_free_ Address *addr                        = NULL;
++    _cleanup_route_free_ Route *rt                              = NULL;
++    Manager *mgr                                                = userdata;
++    Link*               link               = NULL;
++    struct udev*        udev               = NULL;
++    struct udev_device* udev_eth           = NULL;
++
++    const char*         device             = NULL;
++    const char*         ipaddr             = NULL;
++    const char*         netmask            = NULL;
++    const char*         gateway            = NULL;
++    char                devpath [32]       = "/sys/class/net/"; 
++
++    unsigned char       family;
++    unsigned char       prefixlen;
++    unsigned char       flags;
++    unsigned char       scope;
++    unsigned char       ifindex;
++
++    struct in_addr      nm;
++    struct in_addr      ip;
++    struct in_addr      gw;
++    int r;
++
++    assert(m);
++    assert(mgr);
++
++    r = sd_bus_message_read (m, "sssyyys", &device, &ipaddr, &netmask, &family, &flags, &scope, &gateway);
++    if (r < 0)
++        return r;
++
++    if (isempty (device))
++        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid Device Name.");
++
++    if (isempty (ipaddr))
++        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid IP Address.");
++
++    if (isempty (netmask))
++        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid IP Netmask.");
++
++    assert(family == AF_INET || family == AF_INET6);
++
++    udev = udev_new();
++    udev_eth = udev_device_new_from_syspath(udev, strcat (devpath, device));
++    if (!udev_eth)
++            return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Could not find udev device");
++
++    ifindex = udev_device_get_ifindex(udev_eth);
++
++    inet_aton (netmask, &nm);
++    inet_aton (ipaddr, &ip);
++    if (!isempty (gateway)) inet_aton (gateway, &gw);
++
++    prefixlen = in_addr_netmask_to_prefixlen(&nm);
++    assert(prefixlen > 0);
++
++    r = address_new_dynamic(&addr);
++    if (r < 0)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_NO_MEMORY, "Error allocating new address");
++
++    r = sd_netlink_open(&rtnl);
++    if (r < 0)
++            return sd_bus_error_setf(error, SD_BUS_ERROR_IO_ERROR, "Failed to connect to netlink");
++
++    link = new0(Link, 1);
++    if (!link)
++            return -ENOMEM;
++
++    link->network = new0(Network, 1);
++    if (!link->network)
++            return sd_bus_error_setf(error, SD_BUS_ERROR_NO_MEMORY, "Could not alloc memory for Network");
++
++    link->n_ref                 = 1;
++    link->manager               = mgr;
++    link->manager->rtnl         = rtnl;
++    link->state                 = LINK_STATE_PENDING;
++    link->rtnl_extended_attrs   = true;
++    link->ifindex               = ifindex;
++    link->ifname                = strdup(device);
++    if (!link->ifname)
++            return -ENOMEM;
++
++    addr->family                = family;
++    addr->in_addr.in.s_addr     = ip.s_addr;
++    addr->prefixlen             = prefixlen;
++    addr->broadcast.s_addr      = ip.s_addr | ~nm.s_addr;
++
++    if (!isempty (gateway))
++    {
++        r = route_new_dynamic(&rt, RTPROT_STATIC);
++        if (r < 0)
++            return r;
++
++        rt->network         = link->network;
++        rt->family          = family;
++        rt->scope           = RT_SCOPE_LINK;            /* FIXME: */
++        rt->dst_prefixlen   = 32;                       /* FIXME: AF_INET assumed */
++        rt->dst_addr.in     = gw;
++
++        /*LIST_PREPEND(routes, link->network->static_routes, rt);*/
++        /* Drop the Gateway */
++        route_drop (rt, link, link_route_drop_handler);
++    }
++
++    /* send an nlmsg to delete address from address list */
++    r = address_drop(addr, link, link_address_drop_handler);
++    if (r < 0)
++        return r;
++
++    r = sd_bus_message_new_method_return(m, &resp);
++    if (r < 0)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_NO_MEMORY, "Error allocating reply messgage");
++
++    r = sd_bus_message_append(resp, "x", 0);
++    if (r < 0)
++            return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error appending to reply messgage");
++
++    /*r = sd_bus_send(mgr->bus, resp, NULL);*/
++    r = sd_bus_send(NULL, resp, NULL);
++    if (r < 0)
++            return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error sending reply messgage");
++
++#if 0
++    r = network_save_static (0, device, ipaddr, prefixlen, gateway); /* persist config - del */
++    if (r)
++            return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, strerror(r));
++#endif
++
++    return sd_bus_reply_method_return(m, "s", "Deleted IP address...");
++}
++
++static int method_get_address (sd_bus_message *m, void* userdata, sd_bus_error *error)
++{
++    _cleanup_netlink_unref_ sd_netlink  *rtnl   = NULL;
++    _cleanup_address_free_ Address      *addr   = NULL;
++    _cleanup_route_free_ Route          *rt     = NULL;
++    Manager                             *mgr    = userdata;
++    struct udev*        udev               = NULL;
++    struct udev_device* udev_eth           = NULL;
++    const char*         device             = NULL;
++    char                devpath [32]       = "/sys/class/net/"; 
++    unsigned char       ifindex;
++    int                 r;
++
++    sd_netlink_message* maddr;
++
++    _cleanup_netlink_message_unref_ sd_netlink_message  *req    = NULL;
++    _cleanup_netlink_message_unref_ sd_netlink_message  *reply    = NULL;
++    _cleanup_bus_message_unref_ sd_bus_message  *resp   = NULL;
++    _cleanup_address_free_ Address              *address = NULL;
++    _cleanup_free_ struct local_address         *local   = NULL;
++    _cleanup_free_ char                         *ipr     = NULL;
++    _cleanup_free_ char                         *gwr     = NULL;
++    int                 n;
++    int                 i;
++
++    assert(m);
++    assert(mgr);
++
++    r = sd_bus_message_read (m, "s", &device);
++    if (r < 0)
++        return r;
++
++    if (isempty (device))
++        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid Device Name.");
++
++    udev = udev_new();
++    udev_eth = udev_device_new_from_syspath(udev, strcat (devpath, device));
++    if (!udev_eth)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Could not find udev device");
++
++    ifindex = udev_device_get_ifindex(udev_eth);
++
++    r = sd_netlink_open(&rtnl);
++    if (r < 0)
++            return log_error_errno(r, "Failed to connect to netlink:"); /* fixme */
++
++    r = sd_rtnl_message_new_addr(rtnl, &req, RTM_GETADDR, 0, 0);
++    if (r < 0)
++            return r;
++
++    r = sd_netlink_message_request_dump(req, true);
++    if (r < 0)
++            return r;
++
++    r = sd_netlink_call(rtnl, req, 0, &reply); /* fixme */
++    if (r < 0)
++            return r;
++
++    r = sd_bus_message_new_method_return(m, &resp);
++    if (r < 0)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_NO_MEMORY, "Error allocating reply messgage");
++
++    r = sd_bus_message_open_container(resp, 'a', "(iyyus)"); /*family,prefixlen,scope,flags,addr*/
++    if (r < 0)
++        return sd_bus_error_setf(error, SD_BUS_ERROR_NO_MEMORY, "Error opening a container for reply message");
++
++    for (maddr = reply; maddr; maddr = sd_netlink_message_next(maddr)) {
++            int k;
++
++            r = address_new_dynamic(&address);
++            if (r < 0)
++                    return r;
++
++            k = network_rtnl_process_address(rtnl, maddr, mgr, address);
++            if (k) {
++                r = in_addr_to_string(address->family, &address->in_addr, &ipr); /* fixme */
++                if (r < 0)
++                        return r;
++
++                r = sd_bus_message_append (resp, "(iyyus)",
++                                                    address->family,
++                                                    address->prefixlen,
++                                                    address->scope,
++                                                    address->flags, 
++                                                    ipr);
++                if (r < 0)
++                        return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error appending to reply messgage");
++#if 0
++                r = sd_bus_message_open_container(resp, 'r', "iyyus");
++                if (r < 0)
++                        return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error opening struct in reply messgage");
++
++                r = sd_bus_message_append(resp, "i", address->family);
++                if (r < 0)
++                        return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error appending to reply messgage");
++
++                r = sd_bus_message_append(resp, "y", address->prefixlen);
++                if (r < 0)
++                        return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error appending to reply messgage");
++
++                r = sd_bus_message_append(resp, "y", address->scope);
++                if (r < 0)
++                        return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error appending to reply messgage");
++
++                r = sd_bus_message_append(resp, "u", address->flags);
++                if (r < 0)
++                        return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error appending to reply messgage");
++
++                r = in_addr_to_string(address->family, &address->in_addr, &ipr); /* fixme */
++                if (r < 0)
++                        return r;
++
++                r = sd_bus_message_append(resp, "s", ipr);
++                if (r < 0)
++                        return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error appending to reply messgage");
++
++                r = sd_bus_message_close_container(resp);
++                if (r < 0)
++                        return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error closing struct in reply messgage");
++#endif
++            }
++    }
++
++    r = sd_bus_message_close_container(resp);
++    if (r < 0)
++            return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error closing reply container");
++
++    n = local_gateways(rtnl, ifindex, AF_UNSPEC, &local);
++    if (n < 0)
++            return n;
++
++    for (i = 0; i < n; i++) {
++
++            r = in_addr_to_string(local[i].family, &local[i].address, &gwr);
++            if (r < 0)
++                    return r;
++    }
++
++    r = sd_bus_message_append(resp, "s", gwr);
++    if (r < 0)
++            return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error appending to reply messgage");
++
++    /*r = sd_bus_send(mgr->bus, resp, NULL);*/
++    r = sd_bus_send(NULL, resp, NULL);
++    if (r < 0)
++            return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Error sending reply messgage");
++
++    return sd_bus_reply_method_return(m, "s", "Getting IP configuration...");
++}
++
++
++int network_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message, void *userdata, Address* address) {
++        Manager*        m       = (Manager*) userdata; /* fixme */
++        uint16_t        type;
++        unsigned char   flags;
++        char            buf[INET6_ADDRSTRLEN]; 
++        int             ifindex;
++        int             r; 
++        sd_bus_error err    = SD_BUS_ERROR_NULL; /* fixme */
++        sd_bus_error* error = &err;             /* fixme */
++
++        assert(rtnl);
++        assert(message);
++        assert(m);
++        assert(address);
++
++        if (sd_netlink_message_is_error(message)) {
++                r = sd_netlink_message_get_errno(message);
++                if (r < 0)
++                        sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "rtnl: failed to receive address: ");
++
++                return 0;
++        }
++
++        r = sd_netlink_message_get_type(message, &type);
++        if (r < 0) {
++                sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "rtnl: could not get message type: ");
++                return 0;
++        } else if (type != RTM_NEWADDR && type != RTM_DELADDR) {
++                sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "rtnl: received unexpected message type when processing address");
++                return 0;
++        }
++
++        r = sd_rtnl_message_addr_get_ifindex(message, &ifindex);
++        if (r < 0) {
++                sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "rtnl: could not get ifindex from address: %m");
++                return 0;
++        } else if (ifindex <= 0) {
++                sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "rtnl: received address message with invalid ifindex: %d", ifindex);
++                return 0;
++        } 
++
++        r = sd_rtnl_message_addr_get_family(message, &address->family); /* int : i*/
++        if (r < 0 || !IN_SET(address->family, AF_INET, AF_INET6)) {
++                sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "rtnl: received address with invalid family, ignoring.");
++                return 0;
++        }
++
++        r = sd_rtnl_message_addr_get_prefixlen(message, &address->prefixlen); /* uchar : byte : y */
++        if (r < 0) {
++                sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "rtnl: received address with invalid prefixlen, ignoring: ");
++                return 0;
++        }
++
++        r = sd_rtnl_message_addr_get_scope(message, &address->scope); /* uchar : byte : y*/
++        if (r < 0) {
++                sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "rtnl: received address with invalid scope, ignoring: ");
++                return 0;
++        }
++
++        r = sd_rtnl_message_addr_get_flags(message, &flags); /* uint32 : u*/
++        if (r < 0) {
++                sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "rtnl: received address with invalid flags, ignoring: ");
++                return 0;
++        }
++        address->flags = flags;
++
++        switch (address->family) {
++        case AF_INET:
++                r = sd_netlink_message_read_in_addr(message, IFA_LOCAL, &address->in_addr.in); /* ulong : uint64 : t */
++                if (r < 0) {
++                        sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "rtnl: received address without valid address, ignoring: ");
++                        return 0;
++                }
++
++                break;
++
++        case AF_INET6:
++                r = sd_netlink_message_read_in6_addr(message, IFA_ADDRESS, &address->in_addr.in6); /* ulong : uint64 : t */
++                if (r < 0) {
++                        sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "rtnl: received address without valid address, ignoring: ");
++                        return 0;
++                }
++
++                break;
++
++        default:
++                assert_not_reached("invalid address family");
++        }
++
++        if (!inet_ntop(address->family, &address->in_addr, buf, INET6_ADDRSTRLEN)) { /* string : s */
++                sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Could not print address");
++                return 0;
++        }
++
++        return 1;
++}
++
++int network_save_static (int cmd, const char* device, const char* ipaddr, int prefixlen, const char* gwaddr)
++{
++#define NETWORKD_CONFIG_FILE_NAME_LEN_MAX 64
++    char    ncfn [NETWORKD_CONFIG_FILE_NAME_LEN_MAX];
++    FILE*   ncfp = NULL;
++    int     r=0;
++
++    /* /usr/lib/systemd/network/10-bmc-ethx-192.168.255.255.32.network */
++    snprintf (ncfn, NETWORKD_CONFIG_FILE_NAME_LEN_MAX, "/usr/lib/systemd/network/10-bmc-%s-%s.%d.network", device, ipaddr, prefixlen);
++
++    if (cmd) /* add */
++    {
++        ncfp = fopen (ncfn, "w+");
++        if (!ncfp) {
++            r = errno;
++        }
++
++        fprintf (ncfp, "[Match]\nName=%s\n\n[Network]\nAddress=%s/%d\nGateway=%s\n", device, ipaddr, prefixlen, gwaddr);
++        fclose (ncfp);
++    }
++    else /* del */
++    {
++        r = remove (ncfn); 
++    }
++
++    return r;
++}
++#endif
+diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
+index 6587ea9..f773936 100644
+--- a/src/network/networkd-network.c
++++ b/src/network/networkd-network.c
+@@ -20,6 +20,9 @@
+ ***/
+ 
+ #include <ctype.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <net/if.h>
+ 
+ #include "conf-files.h"
+@@ -32,6 +35,15 @@
+ #include "network-internal.h"
+ #include "dns-domain.h"
+ 
++#define SYSTEMD_NETWORKD_DBUS 1
++
++#ifdef SYSTEMD_NETWORKD_DBUS
++int network_address_added_handler (sd_netlink* rtnl, sd_netlink_message* m, void* userdata);
++int network_set_gateway (Link* link);
++static int route_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata);
++int network_save_static (int cmd, const char* device, const char* ipaddr, int prefixlen, const char* gwaddr);
++#endif
++
+ static int network_load_one(Manager *manager, const char *filename) {
+         _cleanup_network_free_ Network *network = NULL;
+         _cleanup_fclose_ FILE *file = NULL;
+@@ -850,3 +862,99 @@ int config_parse_hostname(const char *unit,
+ 
+         return 0;
+ }
++
++#ifdef SYSTEMD_NETWORKD_DBUS
++int network_address_added_handler (sd_netlink* rtnl, sd_netlink_message* m, void* userdata)
++{
++        _cleanup_link_unref_ Link *link = userdata;
++        int r;
++
++        assert(link);
++
++        r = sd_netlink_message_get_errno(m);
++        if (r < 0 && r != -EEXIST) {
++                log_debug("Error in set IP address!");
++                link_enter_failed(link);
++                return r;
++        } else if (r >= 0)
++                link_rtnl_process_address(rtnl, m, link->manager);
++
++	network_set_gateway (link);
++
++	return 0;
++}
++
++/* link_enter_set_routes */
++int network_set_gateway (Link* link)
++{
++        _cleanup_address_free_ Address* addr = NULL;
++        const char*                     device = NULL;
++        const char*                     ipaddr = NULL;
++        const char*                     gwaddr = NULL;
++        Route*                          rt;
++        unsigned char                   prefixlen;
++        int                             r=0;
++
++        assert(link);
++        assert(link->network);
++        assert(link->state == LINK_STATE_SETTING_ADDRESSES);
++
++        link->state = LINK_STATE_SETTING_ROUTES;
++
++        LIST_FOREACH(routes, rt, link->network->static_routes) {
++                gwaddr = inet_ntoa (rt->dst_addr.in);
++                r = route_configure(rt, link, &route_handler);
++                if (r < 0) {
++                        log_debug ("Could not set Gateway!");
++                        link_enter_failed(link);
++                        return r;
++                }
++
++                link->link_messages ++;
++        }
++
++        if (link->link_messages == 0) {
++                link->static_configured = true;
++
++                /*link_enter_configured (link);*/
++                log_link_info(link, "Configured");
++                link->state = LINK_STATE_CONFIGURED;
++                link_save(link);
++        } 
++        else
++        { 
++                log_debug("Setting Gateway");
++        } 
++
++        LIST_FOREACH(addresses, addr, link->network->static_addresses) {
++            device = strdup (link->ifname);
++            ipaddr = inet_ntoa (addr->in_addr.in);
++            prefixlen = addr->prefixlen;
++#if 1
++            r = network_save_static (1, device, ipaddr, prefixlen, gwaddr); /* persist config - add */
++            if (r)
++            {
++                log_debug(strerror(r));
++            }
++#endif
++        }
++
++        return r;
++}
++
++static int route_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {
++        _cleanup_link_unref_ Link *link = userdata;
++        int r;
++
++        assert(link);
++
++        r = sd_netlink_message_get_errno(m);
++        if (r < 0 && r != -EEXIST) {
++                log_debug ("Could not set route! ");
++                link_enter_failed(link);
++        }
++
++        return 1;
++}
++
++#endif
+diff --git a/src/network/org.freedesktop.network1.conf b/src/network/org.freedesktop.network1.conf
+index 52dad33..3db7a90 100644
+--- a/src/network/org.freedesktop.network1.conf
++++ b/src/network/org.freedesktop.network1.conf
+@@ -36,6 +36,26 @@
+                        send_interface="org.freedesktop.DBus.Properties"
+                        send_member="GetAll"/>
+ 
++                <allow send_destination="org.freedesktop.network1"
++                       send_interface="org.freedesktop.network1.Network"
++                       send_member="AddAddress"/>
++
++                <allow send_destination="org.freedesktop.network1"
++                       send_interface="org.freedesktop.network1.Network"
++                       send_member="DelAddress"/>
++
++                <allow send_destination="org.freedesktop.network1"
++                       send_interface="org.freedesktop.network1.Network"
++                       send_member="GetAddress"/>
++
++                <allow send_destination="org.freedesktop.network1"
++                       send_interface="org.freedesktop.network1.Link"
++                       send_member="GetAddress"/>
++
++                <allow send_destination="org.freedesktop.network1"
++                       send_interface="org.freedesktop.network1.Link"
++                       send_member="SetAddress"/>
++
+                 <allow receive_sender="org.freedesktop.network1"/>
+         </policy>
+ 
+-- 
+1.8.2.2
+
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/default.network b/meta-phosphor/common/recipes-core/systemd/systemd/default.network
new file mode 100644
index 000000000..c75c3d60d
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/systemd/systemd/default.network
@@ -0,0 +1,4 @@
+[Match]
+Name=eth*
+[Network]
+DHCP=ipv4
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend
new file mode 100644
index 000000000..222be49ed
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend
@@ -0,0 +1,14 @@
+PACKAGECONFIG += "networkd"
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += "file://default.network"
+SRC_URI += "file://0100-systemd_networkd_dbus_setaddress.patch"
+
+FILES_${PN} += "${libdir}/systemd/network/default.network"
+
+do_install_append() {
+        install -m 644 ${WORKDIR}/default.network ${D}${libdir}/systemd/network/
+
+        #TODO Remove after this issue is resolved
+        #https://github.com/openbmc/openbmc/issues/152
+        ln -s /dev/null ${D}/etc/systemd/system/systemd-hwdb-update.service
+}
diff --git a/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools_%.bbappend b/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools_%.bbappend
new file mode 100644
index 000000000..bdbdc672f
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools_%.bbappend
@@ -0,0 +1,4 @@
+SRC_URI_remove = "http://dl.lm-sensors.org/i2c-tools/releases/${BP}.tar.bz2"
+SRC_URI_prepend = "http://downloads.yoctoproject.org/mirror/sources/${BP}.tar.bz2"
+
+RDEPENDS_${PN}_remove = "${PN}-misc"
diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle.inc b/meta-phosphor/common/recipes-devtools/python/python-bottle.inc
new file mode 100644
index 000000000..cc9599877
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/python/python-bottle.inc
@@ -0,0 +1,25 @@
+SUMMARY = "Fast and simple WSGI-framework for small web-applications."
+DESCRIPTION = "Bottle is a fast and simple micro-framework for small web \
+applications. It offers request dispatching (Routes) with url parameter \
+support, templates, a built-in HTTP Server and adapters for many third \
+party WSGI/HTTP-server and template engines - all in a single file and \
+with no dependencies other than the Python Standard Library."
+HOMEPAGE = "http://bottlepy.org/"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=94b9b2cc7e46ccea87e00af8970826b5"
+
+inherit allarch
+inherit setuptools
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+RDEPENDS_${PN} += "python-email-utils"
+
+PROVIDES += "${PN}-app"
+PACKAGES += "${PN}-app"
+
+SUMMARY_${PN}-app = "${SRCNAME} app"
+RDEPENDS_${PN}-app = "${PN}"
+FILES_${PN}-app = "${bindir}/bottle.py"
+
+BBCLASSEXTEND = "nativesdk"
diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle/LICENSE b/meta-phosphor/common/recipes-devtools/python/python-bottle/LICENSE
new file mode 100644
index 000000000..5f3e8de3a
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/python/python-bottle/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2014, Marcel Hellkamp.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle/json-format.patch b/meta-phosphor/common/recipes-devtools/python/python-bottle/json-format.patch
new file mode 100644
index 000000000..9e754a996
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/python/python-bottle/json-format.patch
@@ -0,0 +1,31 @@
+Index: bottle-0.12.9/bottle.py
+===================================================================
+--- bottle-0.12.9.orig/bottle.py
++++ bottle-0.12.9/bottle.py
+@@ -1721,8 +1721,10 @@ class JSONPlugin(object):
+     name = 'json'
+     api  = 2
+ 
+-    def __init__(self, json_dumps=json_dumps):
++    def __init__(self, json_dumps=json_dumps, **kw):
+         self.json_dumps = json_dumps
++        self.json_kw = { x:y for x,y in kw.iteritems() \
++                     if x in ['indent','sort_keys'] }
+ 
+     def apply(self, callback, route):
+         dumps = self.json_dumps
+@@ -1735,12 +1737,12 @@ class JSONPlugin(object):
+ 
+             if isinstance(rv, dict):
+                 #Attempt to serialize, raises exception on failure
+-                json_response = dumps(rv)
++                json_response = dumps(rv, **self.json_kw)
+                 #Set content type only if serialization succesful
+                 response.content_type = 'application/json'
+                 return json_response
+             elif isinstance(rv, HTTPResponse) and isinstance(rv.body, dict):
+-                rv.body = dumps(rv.body)
++                rv.body = dumps(rv.body, **self.json_kw)
+                 rv.content_type = 'application/json'
+             return rv
+ 
diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle_0.12.9.bb b/meta-phosphor/common/recipes-devtools/python/python-bottle_0.12.9.bb
new file mode 100644
index 000000000..4c620450b
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/python/python-bottle_0.12.9.bb
@@ -0,0 +1,5 @@
+SRCNAME = "bottle"
+SRC_URI = "https://pypi.python.org/packages/source/b/${SRCNAME}/${SRCNAME}-${PV}.tar.gz;name=tarball file://LICENSE file://json-format.patch"
+SRC_URI[tarball.sha256sum] = "fe0a24b59385596d02df7ae7845fe7d7135eea73799d03348aeb9f3771500051"
+SRC_URI[tarball.md5sum] = "f5850258a86224a791171e8ecbb66d99"
+require python-bottle.inc
diff --git a/meta-phosphor/common/recipes-devtools/python/python-dbus/bytes.patch b/meta-phosphor/common/recipes-devtools/python/python-dbus/bytes.patch
new file mode 100644
index 000000000..d8a10a063
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/python/python-dbus/bytes.patch
@@ -0,0 +1,37 @@
+Index: dbus-python-1.2.0/_dbus_bindings/bytes.c
+===================================================================
+--- dbus-python-1.2.0.orig/_dbus_bindings/bytes.c
++++ dbus-python-1.2.0/_dbus_bindings/bytes.c
+@@ -138,23 +138,6 @@ bad_range:
+     return NULL;
+ }
+ 
+-static PyObject *
+-Byte_tp_str(PyObject *self)
+-{
+-    long i = NATIVEINT_ASLONG(self);
+-    unsigned char str[2] = { 0, 0 };
+-
+-    if (i == -1 && PyErr_Occurred())
+-        return NULL;
+-    if (i < 0 || i > 255) {
+-        PyErr_SetString(PyExc_RuntimeError, "Integer outside range 0-255");
+-        return NULL;
+-    }
+-
+-    str[0] = (unsigned char)i;
+-    return PyUnicode_FromStringAndSize((char *)str, 1);
+-}
+-
+ PyTypeObject DBusPyByte_Type = {
+         PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
+         "dbus.Byte",
+@@ -171,7 +154,7 @@ PyTypeObject DBusPyByte_Type = {
+         0,                                      /* tp_as_mapping */
+         0,                                      /* tp_hash */
+         0,                                      /* tp_call */
+-        Byte_tp_str,                            /* tp_str */
++        0,                                      /* tp_str */
+         0,                                      /* tp_getattro */
+         0,                                      /* tp_setattro */
+         0,                                      /* tp_as_buffer */
diff --git a/meta-phosphor/common/recipes-devtools/python/python-dbus_1.2.0.bbappend b/meta-phosphor/common/recipes-devtools/python/python-dbus_1.2.0.bbappend
new file mode 100644
index 000000000..57d5ef46e
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/python/python-dbus_1.2.0.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://bytes.patch"
diff --git a/meta-phosphor/common/recipes-devtools/python/python-rocket.inc b/meta-phosphor/common/recipes-devtools/python/python-rocket.inc
new file mode 100644
index 000000000..73e7d1d38
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/python/python-rocket.inc
@@ -0,0 +1,23 @@
+SUMMARY = "Modern, multi-threaded and extensible web server."
+DESCRIPTION = "The Rocket web server is a server designed to handle the increased \
+needs of modern web applications implemented in pure Python. It can serve WSGI \
+applications and static files. Rocket has the ability to be extended to handle \
+different types of networked request-response jobs. Rocket runs on cPython 2.5- 3.x \
+and Jython 2.5 (without the need to run through the 2to3 translation tool). Rocket \
+is similar in purpose to Cherrypy’s Wsgiserver but with added flexibility and concurrency."
+HOMEPAGE = "http://launchpad.net/rocket"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=b364bdf3116b1cbc1e30a6aff3224019"
+
+inherit allarch
+inherit setuptools
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+RDEPENDS_${PN} += "\
+        python-wsgiref-util \
+        python-wsgiref-headers \
+        python-email-utils \
+	"
+
+BBCLASSEXTEND = "nativesdk"
diff --git a/meta-phosphor/common/recipes-devtools/python/python-rocket/LICENSE b/meta-phosphor/common/recipes-devtools/python/python-rocket/LICENSE
new file mode 100644
index 000000000..29b8ae951
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/python/python-rocket/LICENSE
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2011 Timothy Farrell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/meta-phosphor/common/recipes-devtools/python/python-rocket/setup.patch b/meta-phosphor/common/recipes-devtools/python/python-rocket/setup.patch
new file mode 100644
index 000000000..7affb2f7e
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/python/python-rocket/setup.patch
@@ -0,0 +1,13 @@
+Index: Rocket-1.2.4/setup.py
+===================================================================
+--- Rocket-1.2.4.orig/setup.py
++++ Rocket-1.2.4/setup.py
+@@ -4,8 +4,6 @@
+ # This file is part of the Rocket Web Server
+ # Copyright (c) 2009 Timothy Farrell
+ 
+-from distribute_setup import use_setuptools
+-use_setuptools()
+ from setuptools import setup, find_packages
+ 
+ import os
diff --git a/meta-phosphor/common/recipes-devtools/python/python-rocket_1.2.4.bb b/meta-phosphor/common/recipes-devtools/python/python-rocket_1.2.4.bb
new file mode 100644
index 000000000..8d8008ae9
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/python/python-rocket_1.2.4.bb
@@ -0,0 +1,5 @@
+SRCNAME = "Rocket"
+SRC_URI = "https://pypi.python.org/packages/source/r/rocket/${SRCNAME}-${PV}.zip;name=tarball file://LICENSE file://setup.patch"
+SRC_URI[tarball.sha256sum] = "7b7a3df4d9257e369d85bcc2013351704ffe364ff45d4710e6a30b2efc63a731"
+SRC_URI[tarball.md5sum] = "fa611955154b486bb91e632a43e90f4b"
+require python-rocket.inc
diff --git a/meta-phosphor/common/recipes-devtools/python/python-tftpy.bb b/meta-phosphor/common/recipes-devtools/python/python-tftpy.bb
new file mode 100644
index 000000000..32f788b23
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/python/python-tftpy.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Python is a TFTP library for the Python programming language."
+DESCRIPTION = "Tftpy is a TFTP library for the Python programming language. It includes \
+client and server classes, with sample implementations. Hooks are included for \
+easy inclusion in a UI for populating progress indicators. It supports RFCs \
+1350, 2347, 2348 and the tsize option from RFC 2349."
+HOMEPAGE = "https://github.com/msoulier/tftpy"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=22770e72ae03c61f5bcc4e333b61368d"
+
+SRC_URI = "git://github.com/msoulier/tftpy.git"
+SRCREV = "${AUTOREV}"
+
+S = "${WORKDIR}/git"
+
+inherit allarch
+inherit setuptools
+
+BBCLASSEXTEND = "nativesdk"
diff --git a/meta-phosphor/common/recipes-devtools/python/python/__init__.email_min.py b/meta-phosphor/common/recipes-devtools/python/python/__init__.email_min.py
new file mode 100644
index 000000000..6c8aef147
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/python/python/__init__.email_min.py
@@ -0,0 +1,7 @@
+try:
+	import email_full
+
+except ImportError:
+	import sys
+	import email.utils
+	sys.modules['email.Utils'] = sys.modules['email.utils']
diff --git a/meta-phosphor/common/recipes-devtools/python/python_2.7.9.bbappend b/meta-phosphor/common/recipes-devtools/python/python_2.7.9.bbappend
new file mode 100644
index 000000000..a4df15b9f
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/python/python_2.7.9.bbappend
@@ -0,0 +1,33 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://__init__.email_min.py"
+
+do_install_append() {
+	dir=${libdir}/python${PYTHON_MAJMIN}/email
+        mv ${D}/$dir/__init__.py \
+                ${D}/$dir/email_full.py
+        install -m644 ${WORKDIR}/__init__.email_min.py \
+                ${D}/$dir/__init__.py
+}
+
+require wsgiref-${PYTHON_MAJMIN}-manifest.inc
+
+PROVIDES_prepend = "${PN}-spwd ${PN}-email-utils "
+PACKAGES_prepend = "${PN}-spwd ${PN}-email-utils "
+
+SUMMARY_${PN}-spwd = "Shadow database support"
+RDEPENDS_${PN}-spwd = "${PN}-core"
+FILES_${PN}-spwd= " \
+        ${libdir}/python${PYTHON_MAJMIN}/lib-dynload/spwd.so \
+        ${libdir}/python${PYTHON_MAJMIN}/lib-dynload/grp.so \
+        "
+
+SUMMARY_${PN}-email-utils = "Utils from the email package"
+RDEPENDS_${PN}-email-utils = "${PN}-core"
+FILES_${PN}-email-utils = " \
+        ${libdir}/python${PYTHON_MAJMIN}/email/__init__.py* \
+        ${libdir}/python${PYTHON_MAJMIN}/email/utils.py* \
+        ${libdir}/python${PYTHON_MAJMIN}/email/_parseaddr.py* \
+        ${libdir}/python${PYTHON_MAJMIN}/email/encoders.py* \
+        "
+RDEPENDS_${PN}-email += "${PN}-email-utils"
+FILES_${PN}-email += "${libdir}/python${PYTHON_MAJMIN}/email/email_full.py"
diff --git a/meta-phosphor/common/recipes-devtools/python/wsgiref-2.7-manifest.inc b/meta-phosphor/common/recipes-devtools/python/wsgiref-2.7-manifest.inc
new file mode 100644
index 000000000..a21d05ee2
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/python/wsgiref-2.7-manifest.inc
@@ -0,0 +1,33 @@
+NAME = "wsgiref"
+
+PROVIDES_prepend = "${PN}-${NAME} ${PN}-${NAME}-headers ${PN}-${NAME}-handlers ${PN}-${NAME}-validate ${PN}-${NAME}-simple_server ${PN}-${NAME}-util "
+PACKAGES_prepend = "${PN}-${NAME} ${PN}-${NAME}-headers ${PN}-${NAME}-handlers ${PN}-${NAME}-validate ${PN}-${NAME}-simple_server ${PN}-${NAME}-util "
+
+package_dir = "${libdir}/python${PYTHON_MAJMIN}/${NAME}"
+
+SUMMARY_${PN}-${NAME}-handlers = "${NAME} handlers"
+RDEPENDS_${PN}-${NAME}-handlers = "${PN}-${NAME}-util ${PN}-${NAME}-headers"
+FILES_${PN}-${NAME}-handlers = "${package_dir}/handlers.py*"
+
+SUMMARY_${PN}-${NAME}-headers = "${NAME} headers"
+RDEPENDS_${PN}-${NAME}-headers = "${PN}-${NAME}"
+FILES_${PN}-${NAME}-headers = "${package_dir}/headers.py*"
+
+SUMMARY_${PN}-${NAME}-simple_server = "${NAME} simple server"
+RDEPENDS_${PN}-${NAME}-simple_server = "${PN}-${NAME}-handlers"
+FILES_${PN}-${NAME}-simple_server = "${package_dir}/simple_server.py*"
+
+SUMMARY_${PN}-${NAME}-util = "${NAME} util"
+RDEPENDS_${PN}-${NAME}-util = "${PN}-${NAME}"
+FILES_${PN}-${NAME}-util = "${package_dir}/util.py*"
+
+SUMMARY_${PN}-${NAME}-validate = "${NAME} validate"
+RDEPENDS_${PN}-${NAME}-validate = "${PN}-${NAME}"
+FILES_${PN}-${NAME}-validate = "${package_dir}/validate.py*"
+
+SUMMARY_${PN}-${NAME} = "WSGI (PEP 333) Reference Library"
+RDEPENDS_${PN}-${NAME} = "${PN}-core"
+FILES_${PN}-${NAME} = " \
+        ${package_dir}/__init__.py* \
+        ${package_dir}.egg-info \
+        "
diff --git a/meta-phosphor/common/recipes-extended/shadow/shadow-securetty/securetty.patch b/meta-phosphor/common/recipes-extended/shadow/shadow-securetty/securetty.patch
new file mode 100644
index 000000000..6533e4a25
--- /dev/null
+++ b/meta-phosphor/common/recipes-extended/shadow/shadow-securetty/securetty.patch
@@ -0,0 +1,10 @@
+--- a/securetty
++++ b/securetty
+@@ -7,6 +7,7 @@ ttyS0
+ ttyS1
+ ttyS2
+ ttyS3
++ttyS4
+ 
+ # ARM AMBA SoCs
+ ttyAM0
diff --git a/meta-phosphor/common/recipes-extended/shadow/shadow-securetty_%.bbappend b/meta-phosphor/common/recipes-extended/shadow/shadow-securetty_%.bbappend
new file mode 100644
index 000000000..70ab435c2
--- /dev/null
+++ b/meta-phosphor/common/recipes-extended/shadow/shadow-securetty_%.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://securetty.patch"
+
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.3.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.3.bb
new file mode 100644
index 000000000..3e74f7cc1
--- /dev/null
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.3.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Linux kernel for OpenBMC"
+SECTION = "kernel"
+LICENSE = "GPLv2"
+
+KBRANCH ?= "dev-4.3"
+KCONFIG_MODE="--alldefconfig"
+
+SRC_URI = "git://github.com/openbmc/linux;protocol=git;branch=${KBRANCH}"
+
+LINUX_VERSION ?= "4.3"
+LINUX_VERSION_EXTENSION ?= "-${SRCREV}"
+
+SRCREV="openbmc-20160222-1"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+COMPATIBLE_MACHINE_${MACHINE} = "openbmc"
+
+inherit kernel
+require recipes-kernel/linux/linux-yocto.inc
+
+do_patch_append() {
+        for DTB in "${KERNEL_DEVICETREE}"; do
+		DT=`basename ${DTB} .dtb`
+                if [ -r "${WORKDIR}/${DT}.dts" ]; then
+                        cp ${WORKDIR}/${DT}.dts \
+                                ${STAGING_KERNEL_DIR}/arch/${ARCH}/boot/dts
+		fi
+	done
+}
diff --git a/meta-phosphor/common/recipes-phosphor/clear-once/clear-once.bb b/meta-phosphor/common/recipes-phosphor/clear-once/clear-once.bb
new file mode 100644
index 000000000..61e3c20cf
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/clear-once/clear-once.bb
@@ -0,0 +1,8 @@
+
+SUMMARY = "Clear boot-once variables"
+DESCRIPTION = "Clear u-boot variables used for one-time boot flow"
+
+RPROVIDES_${PN} += "clear-once"
+
+inherit obmc-phosphor-systemd
+inherit obmc-phosphor-license
diff --git a/meta-phosphor/common/recipes-phosphor/clear-once/clear-once/clear-once.service b/meta-phosphor/common/recipes-phosphor/clear-once/clear-once/clear-once.service
new file mode 100644
index 000000000..a7641e661
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/clear-once/clear-once/clear-once.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Clear one time boot overrides
+
+ConditionFileNotEmpty=/etc/fw_env.config
+RequiresMountsFor=/run /sbin /etc
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+
+# It took 7 seconds to erase and write flash, be conservative
+TimeoutStartSec=60
+Restart=no
+
+ExecStart=/sbin/fw_setenv openbmconce
diff --git a/meta-phosphor/common/recipes-phosphor/dbus-perms/dbus-perms.bb b/meta-phosphor/common/recipes-phosphor/dbus-perms/dbus-perms.bb
new file mode 100644
index 000000000..c7b788426
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/dbus-perms/dbus-perms.bb
@@ -0,0 +1,12 @@
+SUMMARY = "Phosphor OpenBMC DBUS Permissions"
+DESCRIPTION = "Phosphor OpenBMC DBUS Permissions."
+HOMEPAGE = "http://github.com/openbmc/"
+PR = "r1"
+
+inherit allarch
+inherit obmc-phosphor-license
+inherit obmc-phosphor-dbus-service
+
+DBUS_SERVICES += " \
+        org.openbmc \
+        "
diff --git a/meta-phosphor/common/recipes-phosphor/dbus-perms/files/org.openbmc.conf b/meta-phosphor/common/recipes-phosphor/dbus-perms/files/org.openbmc.conf
new file mode 100644
index 000000000..b51293b19
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/dbus-perms/files/org.openbmc.conf
@@ -0,0 +1,8 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <policy context="default">
+    <allow own="*"/>
+    <allow send_destination="*"/>
+  </policy>
+</busconfig>
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper.bb b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper.bb
new file mode 100644
index 000000000..ab6dc98f7
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Phosphor DBUS Object Manager"
+DESCRIPTION = "Phosphor DBUS object manager."
+HOMEPAGE = "http://github.com/openbmc/phosphor-objmgr"
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
+
+inherit allarch
+inherit obmc-phosphor-dbus-service
+inherit obmc-phosphor-systemd
+inherit setuptools
+
+DBUS_SERVICES += "org.openbmc.ObjectMapper"
+RDEPENDS_${PN} += " \
+        python-xml \
+        python-dbus \
+        python-pygobject \
+        "
+SRC_URI += "git://github.com/openbmc/phosphor-objmgr"
+
+SRCREV = "956dd44fe5c8377ec90cef393f65033d59e082b0"
+
+S = "${WORKDIR}/git"
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service
new file mode 100644
index 000000000..773eaa594
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Phosphor OpenBMC DBus service management daemon
+
+[Service]
+Type=dbus
+ExecStart=/usr/sbin/phosphor-mapper
+BusName=org.openbmc.objectmapper
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.conf b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.conf
new file mode 100644
index 000000000..9a26ab9ff
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.conf
@@ -0,0 +1,8 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <policy user="root">
+    <allow own="org.openbmc.ObjectMapper"/>
+    <allow send_destination="org.openbmc.ObjectMapper"/>
+  </policy>
+</busconfig>
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb b/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb
new file mode 100644
index 000000000..f66dd26e6
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Phosphor DBUS REST Server"
+DESCRIPTION = "Phosphor DBUS REST manager."
+HOMEPAGE = "http://github.com/openbmc/phosphor-rest-server"
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
+
+inherit allarch
+inherit obmc-phosphor-systemd
+inherit setuptools
+
+RDEPENDS_${PN} += " \
+        python-xml \
+        python-dbus \
+        python-pygobject \
+	obmc-mapper \
+	python-rocket \
+	python-bottle \
+	python-spwd \
+        "
+SRC_URI += "git://github.com/openbmc/phosphor-rest-server"
+
+SRCREV = "fe90e0c579edbc19699e5aa7abbe4dd29b4dd112"
+
+S = "${WORKDIR}/git"
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service b/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service
new file mode 100644
index 000000000..9ef9b2142
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Phosphor OpenBMC DBus REST daemon
+Requires=obmc-mapper.service
+After=obmc-mapper.service
+
+[Service]
+ExecStart=/usr/sbin/obmc-rest
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb
new file mode 100644
index 000000000..a1a32d953
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Phosphor OpenBMC BT to DBUS"
+DESCRIPTION = "Phosphor OpenBMC BT to DBUS."
+PR = "r1"
+
+inherit obmc-phosphor-sdbus-service
+inherit obmc-phosphor-c-daemon
+
+SYSTEMD_SERVICE_${PN} = "btbridged.service"
+
+inherit obmc-phosphor-host-ipmi-hw
+
+S = "${WORKDIR}/git"
+SRC_URI += "git://github.com/openbmc/btbridge"
+SRCREV="39b3700766d851009258544aa0f75365f024c597"
+
+# This is how linux-libc-headers says to include custom uapi headers
+EXTRA_OEMAKE_append = "CFLAGS=-I${STAGING_KERNEL_DIR}/include/uapi"
+DEPENDS += "virtual/kernel"
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/btbridged.service b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/btbridged.service
new file mode 100644
index 000000000..185119ac0
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/btbridged.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Phosphor OpenBMC BT to DBUS
+
+[Service]
+ExecStart=/usr/sbin/btbridged
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-bt.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-bt.bb
new file mode 100644
index 000000000..830f75436
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-bt.bb
@@ -0,0 +1,17 @@
+SUMMARY = "Phosphor OpenBMC BT to DBUS"
+DESCRIPTION = "Phosphor OpenBMC BT to DBUS."
+PR = "r1"
+
+RDEPENDS_${PN} += "python-subprocess"
+
+SYSTEMD_SERVICE_${PN} = "host-ipmi-bt.service"
+
+inherit obmc-phosphor-pydbus-service
+inherit obmc-phosphor-host-ipmi-hw
+
+S = "${WORKDIR}/git"
+SRC_URI += "git://github.com/openbmc/skeleton.git;subpath=bin;destsuffix=git"
+SRCREV="${AUTOREV}"
+
+SCRIPT_NAME = "ipmid.py"
+INSTALL_NAME = "host-ipmi-bt"
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-bt/host-ipmi-bt.service b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-bt/host-ipmi-bt.service
new file mode 100644
index 000000000..dfc0416e9
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-bt/host-ipmi-bt.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Phosphor OpenBMC BT to DBUS 
+
+[Service]
+ExecStart=/usr/sbin/host-ipmi-bt
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb
new file mode 100644
index 000000000..ac901d359
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb
@@ -0,0 +1,17 @@
+SUMMARY = "Phosphor OpenBMC host IPMI to DBUS Example"
+DESCRIPTION = "Phosphor OpenBMC host IPMI to DBUS example implementation."
+PR = "r1"
+
+RDEPENDS_${PN} += "python-subprocess"
+
+SYSTEMD_SERVICE_${PN} = "host-ipmi-hw.service"
+
+inherit obmc-phosphor-pydbus-service
+inherit obmc-phosphor-host-ipmi-hw
+
+S = "${WORKDIR}/git"
+SRC_URI += "git://github.com/openbmc/skeleton.git;subpath=bin;destsuffix=git"
+SRCREV="${AUTOREV}"
+
+SCRIPT_NAME = "ipmi_debug.py"
+INSTALL_NAME = "host-ipmi-hw"
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example/host-ipmi-hw-example.service b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example/host-ipmi-hw-example.service
new file mode 100644
index 000000000..b6baa6ffd
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example/host-ipmi-hw-example.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Phosphor OpenBMC host IPMI to DBUS example implementation
+
+[Service]
+ExecStart=/usr/sbin/host-ipmi-hw
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
new file mode 100644
index 000000000..06ee00e66
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
@@ -0,0 +1,34 @@
+SUMMARY = "Phosphor OpenBMC WriteFRU for OpenPOWER systems"
+DESCRIPTION = "Phosphor OpenBMC WriteFRU for  OpenPOWER based systems"
+HOMEPAGE = "https://github.com/openbmc/ipmi-fru-parser"
+PR = "r1"
+
+RRECOMMENDS_${PN} = "virtual/obmc-phosphor-host-ipmi-hw"
+
+inherit obmc-phosphor-license
+
+DEPENDS += "systemd    \
+		 	host-ipmid \
+		 	"
+
+
+RDEPENDS_${PN} += "libsystemd"
+
+TARGET_CFLAGS += " -fpic -std=gnu++14"
+
+SRC_URI += "git://github.com/openbmc/ipmi-fru-parser"
+
+SRCREV = "a14239a201443222906864273449a39cfa84118e"
+
+FILES_${PN} += "${libdir}/host-ipmid/*.so"
+FILES_${PN}-dbg += "${libdir}/host-ipmid/.debug"
+
+S = "${WORKDIR}/git"
+
+do_install() {
+	oe_runmake install DESTDIR=${D} LIBDIR=${libdir} BINDIR=${sbindir}
+}
+
+
+#        install -m 0755 -d ${D}${libdir}/host-ipmid
+#        install -m 0755 ${S}/*.so ${D}${libdir}/host-ipmid/
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb
new file mode 100644
index 000000000..1a6959a4c
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb
@@ -0,0 +1,32 @@
+SUMMARY = "Phosphor OpenBMC OEM Commands for OpenPOWER systems"
+DESCRIPTION = "Phosphor OpenBMC IPMI OEM commands for OpenPOWER based systems"
+HOMEPAGE = "https://github.com/openbmc/openpower-host-ipmi-oem"
+PR = "r1"
+
+RRECOMMENDS_${PN} = "virtual/obmc-phosphor-host-ipmi-hw"
+
+inherit obmc-phosphor-license
+
+DEPENDS += "systemd    \
+		 	host-ipmid \
+		 	"
+TARGET_CFLAGS += "-fpic"
+
+
+RDEPENDS_${PN} += "libsystemd"
+
+
+
+SRC_URI += "git://github.com/openbmc/openpower-host-ipmi-oem"
+
+SRCREV = "345932324ce63d42fd88e762cb539c864167b008"
+
+FILES_${PN} += "${libdir}/host-ipmid/*.so"
+FILES_${PN}-dbg += "${libdir}/host-ipmid/.debug"
+
+S = "${WORKDIR}/git"
+
+do_install() {  
+        install -m 0755 -d ${D}${libdir}/host-ipmid
+        install -m 0755 ${S}/*.so ${D}${libdir}/host-ipmid/
+}
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb
new file mode 100644
index 000000000..2a4d670da
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Phosphor ipmi tool for injecting ipmi commands"
+DESCRIPTION = "IPMI Tool with dbus capabilities"
+HOMEPAGE = "https://github.com/openbmc/ipmitool"
+PR = "r1"
+
+
+RRECOMMENDS_${PN} = "virtual/obmc-phosphor-host-ipmi-hw"
+
+inherit obmc-phosphor-license
+
+DEPENDS += "systemd    \
+		 	host-ipmid \
+		 	"
+
+RDEPENDS_${PN} += "libsystemd	\
+                   libcrypto	\
+                   "
+
+
+SRC_URI += "git://github.com/openbmc/ipmitool"
+
+SRCREV = "e9b9c1a9677a3de19726d036cfb07d8d61bbccd8"
+
+
+S = "${WORKDIR}/git"
+
+
+do_compile() {
+	${S}/bootstrap --enable-intf-dbus
+	${S}/configure --host x86_64
+	make
+}
+
+do_install() {  
+	install -m 0755 -d ${D}${sbindir}
+	install -m 0755 ${S}/src/ipmitool ${D}${sbindir}
+}
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb
new file mode 100644
index 000000000..ba1eaaf97
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb
@@ -0,0 +1,33 @@
+SUMMARY = "Phosphor OpenBMC IPMI daemon"
+DESCRIPTION = "Phosphor OpenBMC IPMI router and plugin libraries"
+HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid"
+PR = "r1"
+
+RRECOMMENDS_${PN} += "virtual/obmc-phosphor-host-ipmi-hw"
+
+RRECOMMENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers}"
+
+
+inherit obmc-phosphor-license
+inherit obmc-phosphor-sdbus-service
+inherit obmc-phosphor-c-daemon
+
+TARGET_CFLAGS   += "-fpic"
+
+RDEPENDS_${PN} += "clear-once"
+RDEPENDS_${PN} += "settings"
+RDEPENDS_${PN} += "network"
+SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid"
+
+SRCREV = "b7e01a16951e868b076f3d68ecb0688a5209aa5b"
+
+S = "${WORKDIR}/git"
+INSTALL_NAME = "ipmid"
+
+do_install() {
+        install -m 0755 -d ${D}${libdir}/host-ipmid
+        install -m 0755 ${S}/*.so ${D}${libdir}/host-ipmid/
+
+        install -m 0755 -d ${D}${includedir}/host-ipmid
+        install -m 0644 ${S}/ipmid-api.h ${D}${includedir}/host-ipmid/
+}
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid/host-ipmid.service b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid/host-ipmid.service
new file mode 100644
index 000000000..ce96dbc9b
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid/host-ipmid.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Phosphor OpenBMC IPMI daemon
+Wants=clear-once.service
+After=clear-once.service
+
+[Service]
+ExecStart=/usr/sbin/ipmid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-image-no-sysmgr.bb b/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-image-no-sysmgr.bb
new file mode 100644
index 000000000..519db4a45
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-image-no-sysmgr.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Sample image recipe using Phosphor, an OpenBMC \
+framework, illustrating the removal of a default image feature."
+
+require obmc-phosphor-image.bb
+
+IMAGE_FEATURES_remove = " \
+        obmc-phosphor-system-mgmt \
+        "
diff --git a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-image.bb
new file mode 100644
index 000000000..8e481a1bd
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-image.bb
@@ -0,0 +1,3 @@
+DESCRIPTION = "Image with Phosphor, an OpenBMC framework."
+
+inherit obmc-phosphor-image
diff --git a/meta-phosphor/common/recipes-phosphor/inarp/inarp.bb b/meta-phosphor/common/recipes-phosphor/inarp/inarp.bb
new file mode 100644
index 000000000..d7d96c080
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/inarp/inarp.bb
@@ -0,0 +1,17 @@
+SUMMARY = "Inverse ARP daemon"
+DESCRIPTION = "Daemon to respond to Inverse-ARP requests"
+HOMEPAGE = "http://github.com/openbmc/inarp"
+PR = "r1"
+
+inherit obmc-phosphor-license
+inherit obmc-phosphor-c-daemon
+
+TARGET_CFLAGS   += "-fpic -O2"
+
+RDEPENDS_${PN} += "network"
+SRC_URI += "git://github.com/openbmc/inarp"
+
+SRCREV = "e3f27cf06cc2ca93ae9746ba705a0d9fc307cec2"
+
+S = "${WORKDIR}/git"
+INSTALL_NAME = "inarp"
diff --git a/meta-phosphor/common/recipes-phosphor/inarp/inarp/inarp.service b/meta-phosphor/common/recipes-phosphor/inarp/inarp/inarp.service
new file mode 100644
index 000000000..55517ab0c
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/inarp/inarp/inarp.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Phosphor Inverse ARP daemon
+
+[Service]
+ExecStart=/usr/sbin/inarp
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/network/network.bb b/meta-phosphor/common/recipes-phosphor/network/network.bb
new file mode 100644
index 000000000..1c48c0547
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/network/network.bb
@@ -0,0 +1,21 @@
+SUMMARY = "Network DBUS object"
+DESCRIPTION = "Network DBUS object"
+HOMEPAGE = "http://github.com/openbmc/phosphor-networkd"
+PR = "r1"
+
+inherit obmc-phosphor-license
+inherit obmc-phosphor-systemd
+
+RDEPENDS_${PN} += "python-dbus python-pygobject"
+
+SRC_URI += "git://github.com/openbmc/phosphor-networkd"
+
+SRCREV = "448e8d839d37532d2667b9a38bb3aadb6c804e2e"
+
+S = "${WORKDIR}/git"
+
+do_install() {
+        install -d ${D}/${sbindir}
+        install ${S}/netman.py ${D}/${sbindir}
+}
+
diff --git a/meta-phosphor/common/recipes-phosphor/network/network/network.service b/meta-phosphor/common/recipes-phosphor/network/network/network.service
new file mode 100644
index 000000000..85a44bb95
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/network/network/network.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Network DBUS object
+Requires=skeleton.service
+After=skeleton.service
+
+[Service]
+ExecStart=/usr/sbin/netman.py
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/files/obmc-phosphor-chassisd.py b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/files/obmc-phosphor-chassisd.py
new file mode 100644
index 000000000..a68f2e511
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/files/obmc-phosphor-chassisd.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+
+# Contributors Listed Below - COPYRIGHT 2015
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+import time
+import sys
+import dbus
+import dbus.service
+import dbus.mainloop.glib
+
+if __name__ == '__main__':
+	print "obmc-phosphor-chassisd starting..."
+
+	while 1:
+		time.sleep(5)
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/files/obmc-phosphor-chassisd.service b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/files/obmc-phosphor-chassisd.service
new file mode 100644
index 000000000..771151199
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/files/obmc-phosphor-chassisd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Phosphor OpenBMC chassis management daemon
+
+[Service]
+ExecStart=/usr/sbin/obmc-phosphor-chassisd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb
new file mode 100644
index 000000000..d7a8ed998
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb
@@ -0,0 +1,9 @@
+SUMMARY = "Phosphor OpenBMC Chassis Management"
+DESCRIPTION = "Phosphor OpenBMC chassis management reference implementation."
+PR = "r1"
+
+inherit obmc-phosphor-chassis-mgmt
+inherit obmc-phosphor-pydbus-service
+
+S = "${WORKDIR}"
+SRC_URI += "file://${PN}.py"
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-event.service b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-event.service
new file mode 100644
index 000000000..8e0266bf4
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-event.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Phosphor OpenBMC event management daemon
+
+[Service]
+ExecStart=/usr/sbin/obmc-phosphor-eventd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb
new file mode 100644
index 000000000..5ce5818c5
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb
@@ -0,0 +1,29 @@
+SUMMARY = "Phosphor OpenBMC Event Management"
+DESCRIPTION = "Phosphor OpenBMC event management reference implementation."
+HOMEPAGE = "https://github.com/openbmc/phosphor-event"
+PR = "r1"
+
+
+inherit obmc-phosphor-license
+inherit obmc-phosphor-event-mgmt
+inherit obmc-phosphor-sdbus-service
+inherit obmc-phosphor-c-daemon
+
+TARGET_CPPFLAGS += "-std=c++11 -fpic"
+
+SRC_URI += "git://github.com/openbmc/phosphor-event"
+
+SRCREV = "127c8cf513ba9ed6bcc460fbea29b36eb8d23bac"
+
+RDEPENDS_${PN} += "libsystemd"
+DEPENDS += "systemd"
+
+
+S = "${WORKDIR}/git"
+INSTALL_NAME = "event_messaged"
+
+do_install() {
+        install -d ${D}/var/lib/obmc/events/
+        install -m 0755 -d ${D}${sbindir}
+        install -m 0755 ${S}/${INSTALL_NAME} ${D}/${sbindir}/obmc-phosphor-eventd
+}
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/obmc-phosphor-example-pydbus.py b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/obmc-phosphor-example-pydbus.py
new file mode 100644
index 000000000..2b59b5887
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/obmc-phosphor-example-pydbus.py
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+
+# Contributors Listed Below - COPYRIGHT 2015
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+import sys
+import dbus
+import dbus.service
+import dbus.mainloop.glib
+import gobject
+
+SERVICE_PREFIX = 'org.openbmc.examples'
+IFACE_PREFIX = 'org.openbmc.examples'
+BASE_OBJ_PATH = '/org/openbmc/examples/'
+
+class SampleObjectOne(dbus.service.Object):
+	def __init__(self, bus, name):
+		super(SampleObjectOne, self).__init__(bus, name)
+
+	@dbus.service.method(IFACE_PREFIX + '.Echo', 's', 's')
+	def Echo(self, val):
+		self.MethodInvoked("Echo method was invoked", self._object_path)
+		return self._object_path + " says " + val
+	
+	@dbus.service.signal(IFACE_PREFIX + '.Echo', 'ss')
+	def MethodInvoked(self, message, path):
+		pass
+
+class SampleObjectTwo(SampleObjectOne):
+	def __init__(self, bus, name):
+		super(SampleObjectTwo, self).__init__(bus, name)
+		self.map = { 'empty' : 'add values to me' }
+
+	@dbus.service.signal(IFACE_PREFIX + '.Dict', 'sss')
+	def DictMethodCalled(self, message, key, value):
+		pass
+
+	@dbus.service.method(IFACE_PREFIX + '.Dict', 'ss', '')
+	def SetAValueInTheDict(self, key, value):
+		self.DictMethodCalled("Dict method was invoked", key, value)
+		self.map[key] = value
+
+	@dbus.service.method(IFACE_PREFIX + '.Dict', 's', 's')
+	def GetAValueFromTheDict(self, key):
+		return self.map.get(key, "set a value first")
+
+	@dbus.service.method(IFACE_PREFIX + '.Dict', '', 's')
+	def GetAllValuesFromTheDict(self):
+		return " ".join( [ x+ ':' + self.map[x] for x in self.map.keys() ] )
+
+	@dbus.service.method(dbus.PROPERTIES_IFACE, 'ss', 'v')
+	def Get(self, interface, prop):
+		return self.GetAll(interface)[prop]
+
+	@dbus.service.method(dbus.PROPERTIES_IFACE, 's', 'a{sv}')
+	def GetAll(self, interface):
+		if interface == IFACE_PREFIX + '.Dict':
+			return { 'Dict': self.map }
+
+	@dbus.service.method(dbus.PROPERTIES_IFACE, 'ssv')
+	def Set(self, interface, prop, value):
+		if prop == 'Dict':
+			self.map = value
+			self.PropertiesChanged(interface, { prop : value }, [])
+
+	@dbus.service.signal(dbus.PROPERTIES_IFACE, 'sa{sv}as')
+	def PropertiesChanged(self, interface, properties, invalidated_properties):
+		pass
+
+if __name__ == '__main__':
+	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+	bus = dbus.SystemBus()
+
+	services = []
+	services.append(dbus.service.BusName(SERVICE_PREFIX + '.PythonService0', bus))
+	services.append(dbus.service.BusName(SERVICE_PREFIX + '.PythonService1', bus))
+
+	objs = []
+	objs.append(SampleObjectOne(bus, BASE_OBJ_PATH + 'path0/PythonObj'))
+	objs.append(SampleObjectTwo(bus, BASE_OBJ_PATH + 'path1/PythonObj'))
+
+	mainloop = gobject.MainLoop()
+
+	print "obmc-phosphor-example-pydbus starting..."
+	mainloop.run()
+
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/obmc-phosphor-example-pydbus.service b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/obmc-phosphor-example-pydbus.service
new file mode 100644
index 000000000..d39395f40
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/obmc-phosphor-example-pydbus.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Phosphor OpenBMC QEMU application example
+
+[Service]
+ExecStart=/usr/sbin/obmc-phosphor-example-pydbus
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService0.conf b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService0.conf
new file mode 100644
index 000000000..fad0b81fb
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService0.conf
@@ -0,0 +1,8 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <policy user="root">
+    <allow own="org.openbmc.examples.PythonService0"/>
+    <allow send_destination="org.openbmc.examples.PythonService0"/>
+  </policy>
+</busconfig>
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService1.conf b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService1.conf
new file mode 100644
index 000000000..0f7114e48
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService1.conf
@@ -0,0 +1,8 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <policy user="root">
+    <allow own="org.openbmc.examples.PythonService1"/>
+    <allow send_destination="org.openbmc.examples.PythonService1"/>
+  </policy>
+</busconfig>
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/pyclient-sample.py b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/pyclient-sample.py
new file mode 100644
index 000000000..e1010a542
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/pyclient-sample.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+
+# Contributors Listed Below - COPYRIGHT 2015
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+import dbus
+import dbus.service
+import dbus.mainloop.glib
+import gobject
+
+SERVICE_PREFIX = 'org.openbmc.examples'
+IFACE_PREFIX = 'org.openbmc.examples'
+BASE_OBJ_PATH = '/org/openbmc/examples/'
+
+def signal_callback(*a, **kw):
+	print "Got signal:"
+	print "intf: " + kw.get('intf', 'none')
+	print "path: " + kw.get('path', 'none')
+	print "member: " + kw.get('member', 'none')
+
+if __name__ == '__main__':
+	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+	bus = dbus.SystemBus()
+
+	obj0 = bus.get_object(SERVICE_PREFIX + '.PythonService0',
+		                      BASE_OBJ_PATH + 'path0/PythonObj')
+	obj1 = bus.get_object(SERVICE_PREFIX + '.PythonService1',
+		                      BASE_OBJ_PATH + 'path1/PythonObj')
+	echo0= dbus.Interface(obj0,
+		    dbus_interface=IFACE_PREFIX + '.Echo')
+	echo1= dbus.Interface(obj0,
+		    dbus_interface=IFACE_PREFIX + '.Echo')
+
+	print "Invoking Echo methods...."
+	print(echo0.Echo("hello"))
+	print(echo1.Echo("there"))
+	
+	bus.add_signal_receiver(signal_callback, interface_keyword = 'intf', 
+			path_keyword = 'path',
+			member_keyword = 'member')
+
+	print "Waiting for signals... (call a sample method to see something here)"
+	print "Press Ctrl^C to quit"
+	mainloop = gobject.MainLoop()
+
+	mainloop.run()
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb
new file mode 100644
index 000000000..1446a7313
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Phosphor OpenBMC BSP Example Application"
+DESCRIPTION = "Phosphor OpenBMC QEMU BSP example implementation."
+PR = "r1"
+
+DBUS_SERVICES = " \
+        org.openbmc.examples.PythonService0 \
+        org.openbmc.examples.PythonService1 \
+        "
+
+inherit obmc-phosphor-pydbus-service
+
+client = "pyclient-sample"
+SRC_URI += "file://${client}.py"
+SRC_URI += "file://${PN}.py"
+S = "${WORKDIR}"
+
+do_install_append() {
+        install -d ${D}${bindir}
+        install -m 0755 ${S}/${client}.py ${D}${bindir}/${client}
+}
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/Makefile b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/Makefile
new file mode 100644
index 000000000..0aaeb5341
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/Makefile
@@ -0,0 +1,15 @@
+EXE     = obmc-phosphor-example-sdbus
+OBJS    = $(EXE).o
+DEPPKGS = libsystemd
+CC      ?= $(CROSS_COMPILE)gcc
+INCLUDES += $(shell pkg-config --cflags $(DEPPKGS))
+LIBS += $(shell pkg-config --libs $(DEPPKGS))
+
+%.o : %.c
+	$(CC) -c $< $(CFLAGS) $(INCLUDES) -o $@
+$(EXE): $(OBJS)
+	$(CC) $^ $(LDFLAGS) $(LIBS) -o $@
+clean:
+	rm -f $(OBJS) $(EXE) *.o *.d
+distclean: clean
+	rm -f *.c~ *.h~ *.sh~ Makefile~ config.mk~
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.c b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.c
new file mode 100644
index 000000000..a66bb555c
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.c
@@ -0,0 +1,117 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <systemd/sd-bus.h>
+
+static int method_echo(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
+	char *str;
+	const char *intf = sd_bus_message_get_interface(m),
+	      *path = sd_bus_message_get_path(m);
+	sd_bus *bus = sd_bus_message_get_bus(m);
+
+	char response[512] = {0};
+	int r;
+
+	/* Read the parameters */
+	r = sd_bus_message_read(m, "s", &str);
+	if (r < 0) {
+		fprintf(stderr, "Failed to parse parameters: %s\n", strerror(-r));
+		return r;
+	}
+
+	r = sd_bus_emit_signal(bus, path, intf, "MethodInvoked", "ss",
+			"Echo method was invoked", path);
+	if (r < 0) {
+		fprintf(stderr, "Failed to emit signal: %s\n", strerror(-r));
+		return r;
+	}
+
+	strncat(response, path, 128);
+	strcat(response, " says ");
+	strncat(response, str, 128);
+
+	/* Reply with the response */
+	return sd_bus_reply_method_return(m, "s", &response);
+}
+
+static const sd_bus_vtable echo_vtable[] = {
+	SD_BUS_VTABLE_START(0),
+	SD_BUS_METHOD("Echo", "s", "s", method_echo, SD_BUS_VTABLE_UNPRIVILEGED),
+	SD_BUS_SIGNAL("MethodInvoked", "s", 0),
+	SD_BUS_VTABLE_END
+};
+
+int main(int argc, char *argv[]) {
+	sd_bus_slot *slot = NULL;
+	sd_bus *bus = NULL;
+	int r;
+	char **acquired = NULL, **activatable = NULL, **i;
+
+	/* Connect to the user bus this time */
+	r = sd_bus_open_system(&bus);
+	if (r < 0) {
+		fprintf(stderr, "Failed to connect to system bus: %s\n", strerror(-r));
+		goto finish;
+	}
+
+	/* Install an object */
+	r = sd_bus_add_object_vtable(bus,
+			&slot,
+			"/org/openbmc/examples/path0/SDBusObj",  /* object path */
+			"org.openbmc.examples.Echo",   /* interface name */
+			echo_vtable,
+			NULL);
+	if (r < 0) {
+		fprintf(stderr, "Failed to issue method call: %s\n", strerror(-r));
+		goto finish;
+	}
+
+	/* Install an object */
+	r = sd_bus_add_object_vtable(bus,
+			&slot,
+			"/org/openbmc/examples/path1/SDBusObj",  /* object path */
+			"org.openbmc.examples.Echo",   /* interface name */
+			echo_vtable,
+			NULL);
+	if (r < 0) {
+		fprintf(stderr, "Failed to issue method call: %s\n", strerror(-r));
+		goto finish;
+	}
+
+	/* Take a well-known service name so that clients can find us */
+	r = sd_bus_request_name(bus, "org.openbmc.examples.SDBusService0", 0);
+	if (r < 0) {
+		fprintf(stderr, "Failed to acquire service name: %s\n", strerror(-r));
+		goto finish;
+	}
+
+	r = sd_bus_request_name(bus, "org.openbmc.examples.SDBusService1", 0);
+	if (r < 0) {
+		fprintf(stderr, "Failed to acquire service name: %s\n", strerror(-r));
+		goto finish;
+	}
+
+	for (;;) {
+		/* Process requests */
+		r = sd_bus_process(bus, NULL);
+		if (r < 0) {
+			fprintf(stderr, "Failed to process bus: %s\n", strerror(-r));
+			goto finish;
+		}
+		if (r > 0) /* we processed a request, try to process another one, right-away */
+			continue;
+
+		/* Wait for the next request to process */
+		r = sd_bus_wait(bus, (uint64_t) -1);
+		if (r < 0) {
+			fprintf(stderr, "Failed to wait on bus: %s\n", strerror(-r));
+			goto finish;
+		}
+	}
+
+finish:
+	sd_bus_slot_unref(slot);
+	sd_bus_unref(bus);
+
+	return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+}
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.service b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.service
new file mode 100644
index 000000000..dcce7326b
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Phosphor OpenBMC QEMU application example
+
+[Service]
+ExecStart=/usr/sbin/obmc-phosphor-example-sdbus
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService0.conf b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService0.conf
new file mode 100644
index 000000000..45af4f4b6
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService0.conf
@@ -0,0 +1,8 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <policy user="root">
+    <allow own="org.openbmc.examples.SDBusService0"/>
+    <allow send_destination="org.openbmc.examples.SDBusService0"/>
+  </policy>
+</busconfig>
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService1.conf b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService1.conf
new file mode 100644
index 000000000..5a7bfb84e
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService1.conf
@@ -0,0 +1,8 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <policy user="root">
+    <allow own="org.openbmc.examples.SDBusService1"/>
+    <allow send_destination="org.openbmc.examples.SDBusService1"/>
+  </policy>
+</busconfig>
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb
new file mode 100644
index 000000000..f1a9eb962
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Phosphor OpenBMC BSP Example Application"
+DESCRIPTION = "Phosphor OpenBMC QEMU BSP example implementation."
+PR = "r1"
+
+DBUS_SERVICES = " \
+        org.openbmc.examples.SDBusService0 \
+        org.openbmc.examples.SDBusService1 \
+        "
+
+S = "${WORKDIR}"
+SRC_URI += "file://Makefile \
+           file://obmc-phosphor-example-sdbus.c \
+           "
+inherit obmc-phosphor-sdbus-service
+inherit obmc-phosphor-c-daemon
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/files/Makefile b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/files/Makefile
new file mode 100644
index 000000000..10e3fa2ae
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/files/Makefile
@@ -0,0 +1,15 @@
+EXE     = obmc-phosphor-fand
+OBJS    = $(EXE).o
+DEPPKGS = gio-unix-2.0 glib-2.0
+CC      ?= $(CROSS_COMPILE)gcc
+INCLUDES += $(shell pkg-config --cflags $(DEPPKGS))
+LIBS += $(shell pkg-config --libs $(DEPPKGS))
+
+%.o : %.c
+	$(CC) -c $^ $(CFLAGS) $(INCLUDES) -o $@
+$(EXE): $(OBJS)
+	$(CC) $^ $(LDFLAGS) $(LDFLAGS) -o $@
+clean:
+	rm -f $(OBJS) $(EXE) *.o *.d
+distclean: clean
+	rm -f *.c~ *.h~ *.sh~ Makefile~ config.mk~
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/files/obmc-phosphor-fand.c b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/files/obmc-phosphor-fand.c
new file mode 100644
index 000000000..558ba10bc
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/files/obmc-phosphor-fand.c
@@ -0,0 +1,29 @@
+/* Contributors Listed Below - COPYRIGHT 2015                             */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <gio/gio.h>
+
+int main(int argc, char *argv[])
+{
+	printf("obmc-phosphor-fand starting...\n");
+
+	while(1)
+		sleep(5);
+
+	exit(EXIT_SUCCESS);
+}
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/files/obmc-phosphor-fand.service b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/files/obmc-phosphor-fand.service
new file mode 100644
index 000000000..0dc2b026a
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/files/obmc-phosphor-fand.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Phosphor OpenBMC fan management daemon
+
+[Service]
+ExecStart=/usr/sbin/obmc-phosphor-fand
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb
new file mode 100644
index 000000000..8c937c6ed
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb
@@ -0,0 +1,12 @@
+SUMMARY = "Phosphor OpenBMC Fan Management."
+DESCRIPTION = "Phosphor OpenBMC fan management reference implementation."
+PR = "r1"
+
+inherit obmc-phosphor-fan-mgmt
+inherit obmc-phosphor-sdbus-service
+inherit obmc-phosphor-c-daemon
+
+S = "${WORKDIR}"
+SRC_URI += "file://Makefile \
+           file://obmc-phosphor-fand.c \
+           "
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/files/obmc-phosphor-flashd.py b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/files/obmc-phosphor-flashd.py
new file mode 100644
index 000000000..5e5dd8f36
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/files/obmc-phosphor-flashd.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+
+# Contributors Listed Below - COPYRIGHT 2015
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+import time
+import sys
+import dbus
+import dbus.service
+import dbus.mainloop.glib
+
+if __name__ == '__main__':
+	print "obmc-phosphor-flashd starting..."
+
+	while 1:
+		time.sleep(5)
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/files/obmc-phosphor-flashd.service b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/files/obmc-phosphor-flashd.service
new file mode 100644
index 000000000..2f518f368
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/files/obmc-phosphor-flashd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Phosphor OpenBMC flash management daemon
+
+[Service]
+ExecStart=/usr/sbin/obmc-phosphor-flashd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb
new file mode 100644
index 000000000..6e4c04a25
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb
@@ -0,0 +1,9 @@
+SUMMARY = "Phosphor OpenBMC Flash Management"
+DESCRIPTION = "Phosphor OpenBMC flash management reference implementation."
+PR = "r1"
+
+inherit obmc-phosphor-flash-mgmt
+inherit obmc-phosphor-pydbus-service
+
+S = "${WORKDIR}"
+SRC_URI += "file://${PN}.py"
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh
new file mode 100644
index 000000000..c37b3d53d
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh
@@ -0,0 +1,407 @@
+#!/bin/sh
+
+fslist="proc sys dev run"
+rodir=run/initramfs/ro
+rwdir=run/initramfs/rw
+upper=$rwdir/cow
+work=$rwdir/work
+
+cd /
+mkdir -p $fslist
+mount dev dev -tdevtmpfs
+mount sys sys -tsysfs
+mount proc proc -tproc
+if ! grep run proc/mounts
+then
+	mount tmpfs run -t tmpfs -o mode=755,nodev
+fi
+
+mkdir -p $rodir $rwdir
+
+cp -rp init shutdown update whitelist bin sbin usr lib etc var run/initramfs
+
+# To start a interactive shell with job control at this point, run
+# getty 38400 ttyS4
+
+findmtd() {
+	m=$(grep -xl "$1" /sys/class/mtd/*/name)
+	m=${m%/name}
+	m=${m##*/}
+	echo $m
+}
+
+blkid_fs_type() {
+	# Emulate util-linux's `blkid -s TYPE -o value $1`
+	# Example busybox blkid output:
+	#    # blkid /dev/mtdblock5
+	#    /dev/mtdblock5: TYPE="squashfs"
+	# Process output to extract TYPE value "squashfs".
+	blkid $1 | sed -e 's/^.*TYPE="//' -e 's/".*$//'
+}
+
+probe_fs_type() {
+	fst=$(blkid_fs_type $1)
+	echo ${fst:=jffs2}
+}
+
+# This fw_get_env_var is a possibly broken version of fw_printenv that
+# does not check the crc or flag byte.
+# The u-boot environemnt starts with a crc32, followed by a flag byte
+# when a redundannt environment is configured, followed by var=value\0 sets.
+# The flag byte for nand is a 1 byte counter; for nor it is a 1 or 0 byte.
+
+get_fw_env_var() {
+	# do we have 1 or 2 copies of the environment?
+	# count non-blank non-comment lines
+	# copies=$(grep -v ^# /etc/fw_env.config | grep -c [::alnum::])
+	# ... we could if we had the fw_env.config in the initramfs
+	copies=1
+
+	# * Change \n to \r and \0 to \n
+	# * Skip to the 5th byte to skip over crc
+	# * then skip to the first or 2nd byte to skip over flag if it exists
+	# * stop parsing at first empty line corresponding to the
+	#   double \0 at the end of the environment.
+	# * print the value of the variable name passed as argument
+
+	cat /run/fw_env | 
+	tr '\n\000' '\r\n' |
+	tail -c +5 | tail -c +${copies-1} | 
+	sed -ne '/^$/,$d' -e "s/^$1=//p"
+}
+
+setup_resolv() {
+	runresolv=/run/systemd/resolve/resolv.conf
+	etcresolv=/etc/resolv.conf
+
+	if test ! -e $etcresolv -a ! -L $etcresolv
+	then
+		mkdir -p ${runresolv%/*}
+		ln -s $runresolv $etcresolv
+	fi
+	if test ! -f $runresolv
+	then
+		cat  /proc/net/pnp > $runresolv
+	fi
+
+	return 0
+}
+
+try_tftp() {
+	# split into  tftp:// host:port/ path/on/remote
+	# then spilt off / and then :port from the end of host:port/
+	# and : from the beginning of port
+
+	rest="${1#tftp://}"
+	path=${rest#*/}
+	host=${rest%$path}
+	host="${host%/}"
+	port="${host#${host%:*}}"
+	host="${host%$port}"
+	port="${port#:}"
+
+	setup_resolv
+
+	if test -z "$host" -o -z "$path"
+	then
+		debug_takeover "Invalid tftp download url '$url'."
+	elif echo "Downloading '$url' from $host ..."  &&
+		! tftp -g -r "$path" -l /run/image-rofs "$host" ${port+"$port"}
+	then
+		debug_takeover "Download of '$url' failed."
+	fi
+}
+
+try_wget() {
+	setup_resolv
+
+	echo "Downloading '$1' ..."
+	if ! wget -O /run/image-rofs "$1"
+	then
+		debug_takeover "Download of '$url' failed."
+	fi
+}
+
+debug_takeover() {
+	echo "$@"
+	test -n "$@" && echo Enter password to try to manually fix.
+	cat << HERE
+After fixing run exit to continue this script, or reboot -f to retry, or
+touch /takeover and exit to become PID 1 allowing editing of this script.
+HERE
+
+	while ! sulogin && ! test -f /takeover
+	do
+		echo getty failed, retrying
+	done
+
+	# Touch /takeover in the above getty to become pid 1
+	if test -e /takeover
+	then
+		cat << HERE
+
+Takeover of init requested.  Executing /bin/sh as PID 1.
+When finished exec new init or cleanup and run reboot -f.
+
+Warning: No job control!  Shell exit will panic the system!
+HERE
+		export PS1=init#\ 
+		exec /bin/sh
+	fi
+}
+
+env=$(findmtd u-boot-env)
+if test -n $env
+then
+	ln -s /dev/$env /run/mtd:u-boot-env
+	cp /run/mtd:u-boot-env /run/fw_env
+fi
+
+rofs=$(findmtd rofs)
+rwfs=$(findmtd rwfs)
+
+rodev=/dev/mtdblock${rofs#mtd}
+rwdev=/dev/mtdblock${rwfs#mtd}
+
+# Set to y for yes, anything else for no.
+force_rwfst_jffs2=y
+flash_images_before_init=n
+consider_download_files=y
+consider_download_tftp=y
+consider_download_http=y
+consider_download_ftp=y
+
+rofst=squashfs
+rwfst=$(probe_fs_type $rwdev)
+roopts=ro
+rwopts=rw
+
+image=/run/initramfs/image-
+trigger=${image}rwfs
+
+init=/sbin/init
+fsckbase=/sbin/fsck.
+fsck=$fsckbase$rwfst
+fsckopts=-a
+optfile=/run/initramfs/init-options
+urlfile=/run/initramfs/init-download-url
+update=/run/initramfs/update
+
+if test -e /${optfile##*/}
+then
+	cp /${optfile##*/} $optfile
+fi
+
+if test ! -f $optfile
+then
+	cat /proc/cmdline > $optfile
+	get_fw_env_var openbmcinit >> $optfile
+	get_fw_env_var openbmconce >> $optfile
+fi
+
+echo rofs = $rofs $rofst   rwfs = $rwfs $rwfst
+
+if grep -w debug-init-sh $optfile
+then
+	debug_takeover "Debug initial shell requested by command line."
+fi
+
+if test "x$consider_download_files" = xy &&
+	grep -w openbmc-init-download-files $optfile
+then
+	if test -f ${urlfile##*/}
+	then
+		cp ${urlfile##*/} $urlfile
+	fi
+	if test ! -f $urlfile
+	then
+		get_fw_env_var openbmcinitdownloadurl > $urlfile
+	fi
+	url="$(cat $urlfile)"
+	rest="${url#*://}"
+	proto="${url%$rest}"
+
+	if test -z "$url"
+	then
+		echo "Download url empty.  Ignoring download request."
+	elif test -z "$proto"
+	then
+		echo "Download failed."
+	elif test "$proto" = tftp://
+	then
+		if test "x$consider_download_tftp" = xy
+		then
+			try_tftp "$url"
+		else
+			echo "Download failed."
+		fi
+	elif test "$proto" = http://
+	then
+		if test "x$consider_download_http" = xy
+		then
+			try_wget "$url"
+		else
+			echo "Download failed."
+		fi
+	elif test "$proto" = ftp://
+	then
+		if test "x$consider_download_ftp" = xy
+		then
+			try_wget "$url"
+		else
+			echo "Download failed."
+		fi
+	else
+		echo "Download failed."
+	fi
+fi
+
+# If there are images in root move them to /run/initramfs/ or /run/ now.
+imagebasename=${image##*/}
+if test -n "${imagebasename}" && ls /${imagebasename}* > /dev/null 2>&1
+then
+	if test "x$flash_images_before_init" = xy
+	then
+		echo "Flash images found, will update before starting init."
+		mv /${imagebasename}* ${image%$imagebasename}
+	else
+		echo "Flash images found, will use but deferring flash update."
+		mv /${imagebasename}* /run/
+	fi
+fi
+
+if grep -w clean-rwfs-filesystem $optfile
+then
+	echo "Cleaning of read-write overlay filesystem requested."
+	touch $trigger
+fi
+
+if test "x$force_rwfst_jffs2" = xy -a $rwfst != jffs2 -a ! -f $trigger
+then
+	echo "Converting read-write overlay filesystem to jffs2 forced."
+	touch $trigger
+fi
+
+if ls $image* > /dev/null 2>&1
+then
+	if ! test -x $update
+	then
+		debug_takeover "Flash update requested but $update missing!"
+	elif test -f $trigger -a ! -s $trigger
+	then
+		echo "Saving selected files from read-write overlay filesystem."
+		$update --no-restore-files
+		echo "Clearing read-write overlay filesystem."
+		flash_eraseall /dev/$rwfs
+		echo "Restoring saved files to read-write overlay filesystem."
+		touch $trigger
+		$update --no-save-files --clean-saved-files
+	else
+		$update --clean-saved-files
+	fi
+
+	rwfst=$(probe_fs_type $rwdev)
+	fsck=$fsckbase$rwfst
+fi
+
+if grep -w overlay-filesystem-in-ram $optfile
+then
+	rwfst=none
+fi
+
+copyfiles=
+if grep -w copy-files-to-ram $optfile
+then
+	rwfst=none
+	copyfiles=y
+fi
+
+# It would be nice to do this after fsck but that mean rofs is mounted
+# which triggers the mtd is mounted check
+if test "$rwfst$copyfiles" = noney
+then
+	touch $trigger
+	$update --copy-files --clean-saved-files --no-restore-files
+fi
+
+if grep -w copy-base-filesystem-to-ram $optfile &&
+	test ! -e /run/image-rofs && ! cp $rodev /run/image-rofs
+then
+	# Remove any partial copy to avoid attempted usage later
+	if test -e  /run/image-rofs
+	then
+		ls -l /run/image-rofs
+		rm -f /run/image-rofs
+	fi
+	debug_takeover "Copying $rodev to /run/image-rofs failed."
+fi
+
+if test -s /run/image-rofs
+then
+	rodev=/run/image-rofs
+	roopts=$roopts,loop
+fi
+
+mount $rodev $rodir -t $rofst -o $roopts
+
+if test -x $rodir$fsck
+then
+	for fs in $fslist
+	do
+		mount --bind $fs $rodir/$fs
+	done
+	chroot $rodir $fsck $fsckopts $rwdev
+	rc=$?
+	for fs in $fslist
+	do
+		umount $rodir/$fs
+	done
+	if test $rc -gt 1
+	then
+		debug_takeover "fsck of read-write fs on $rwdev failed (rc=$rc)"
+	fi
+elif test "$rwfst" != jffs2 -a "$rwfst" != none
+then
+	echo "No '$fsck' in read only fs, skipping fsck."
+fi
+
+if test "$rwfst" = none
+then
+	echo "Running with read-write overlay in RAM for this boot."
+	echo "No state will be preserved unless flash update performed."
+elif ! mount $rwdev $rwdir -t $rwfst -o $rwopts
+then
+	msg="$(cat)" << HERE
+
+Mounting read-write $rwdev filesystem failed.  Please fix and run
+	mount $rwdev $rwdir -t $rwfst -o $rwopts
+to to continue, or do change nothing to run from RAM for this boot.
+HERE
+	debug_takeover "$msg"
+fi
+
+rm -rf $work
+mkdir -p $upper $work
+
+mount -t overlay -o lowerdir=$rodir,upperdir=$upper,workdir=$work cow /root
+
+while ! chroot /root /bin/sh -c "test -x '$init' -a -s '$init'"
+do
+	msg="$(cat)" << HERE
+
+Unable to confirm /sbin/init is an executable non-empty file
+in merged file system mounted at /root.
+
+Change Root test failed!  Invoking emergency shell.
+HERE
+	debug_takeover "$msg"
+done
+
+for f in $fslist
+do
+	mount --move $f root/$f
+done
+
+# switch_root /root $init
+exec chroot /root $init
+
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-shutdown.sh b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-shutdown.sh
new file mode 100644
index 000000000..8d5d0c983
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-shutdown.sh
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+echo shutdown: "$@"
+
+export PS1=shutdown-sh#\ 
+# exec bin/sh
+
+cd /
+if [ ! -e /proc/mounts ]
+then
+	mkdir -p /proc
+	mount  proc /proc -tproc
+	umount_proc=1
+else
+	umount_proc=
+fi
+
+# Remove an empty oldroot, that means we are not invoked from systemd-shutdown
+rmdir /oldroot 2>/dev/null
+
+# Move /oldroot/run to /mnt in case it has the underlying rofs loop mounted.
+# Ordered before /oldroot the overlay is unmounted before the loop mount
+mkdir -p /mnt
+mount --move /oldroot/run /mnt
+
+set -x
+for f in $( awk '/oldroot|mnt/ { print $2 }' < /proc/mounts | sort -r )
+do
+	umount $f
+done
+set +x
+
+update=/run/initramfs/update
+image=/run/initramfs/image-
+
+if test -s /run/fw_env -a -c /run/mtd:u-boot-env -a ! -e ${image}u-boot-env &&
+	! cmp /run/mtd:u-boot-env /run/fw_env
+then
+	ln -sn /run/fw_env ${image}u-boot-env
+fi
+
+if ls $image* > /dev/null 2>&1
+then
+	if test -x $update
+	then
+		$update --clean-saved-files
+	else
+		echo 1>&2 "Flash update requested but $update program missing!"
+	fi
+fi
+
+echo Remaining mounts:
+cat /proc/mounts
+
+test "$umount_proc" && umount /proc && rmdir /proc
+
+# tcsattr(tty, TIOCDRAIN, mode) to drain tty messages to console
+test -t 1 && stty cooked 0<&1
+
+# Execute the command systemd told us to ...
+if test -d /oldroot  && test "$1"
+then
+	if test "$1" = kexec
+	then
+		$1 -f -e
+	else
+		$1 -f
+	fi
+fi
+
+
+echo "Execute ${1-reboot} -f if all unounted ok, or exec /init"
+
+export PS1=shutdown-sh#\ 
+exec /bin/sh
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh
new file mode 100755
index 000000000..aa8fd8934
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh
@@ -0,0 +1,183 @@
+#!/bin/sh
+
+echo update: "$@"
+
+export PS1=update-sh#\ 
+# exec /bin/sh
+
+cd /
+if ! test -r /proc/mounts || ! test -f /proc/mounts
+then
+	mkdir -p /proc
+	mount -t proc proc proc
+fi
+if ! test -d /sys/class
+then
+	mkdir -p /sys
+	mount -t sysfs sys sys
+fi
+if ! test -c /dev/null
+then
+	mkdir -p /dev
+	mount -t devtmpfs dev dev
+fi
+while grep mtd /proc/mounts
+do
+	echo 1>&2 "Error: A mtd device is mounted."
+	sulogin
+	# exec /bin/sh
+done
+
+findmtd() {
+	m=$(grep -xl "$1" /sys/class/mtd/*/name)
+	m=${m%/name}
+	m=${m##*/}
+	echo $m
+}
+
+blkid_fs_type() {
+	# Emulate util-linux's `blkid -s TYPE -o value $1`
+	# Example busybox blkid output:
+	#    # blkid /dev/mtdblock5
+	#    /dev/mtdblock5: TYPE="squashfs"
+	# Process output to extract TYPE value "squashfs".
+	blkid $1 | sed -e 's/^.*TYPE="//' -e 's/".*$//'
+}
+
+probe_fs_type() {
+	fst=$(blkid_fs_type $1)
+	echo ${fst:=jffs2}
+}
+
+rwfs=$(findmtd rwfs)
+
+rwdev=/dev/mtdblock${rwfs#mtd}
+rwopts=rw
+rorwopts=ro${rwopts#rw}
+
+rwdir=/run/initramfs/rw
+upper=$rwdir/cow
+save=/run/save/${upper##*/}
+
+mounted=
+doclean=
+dosave=y
+dorestore=y
+toram=
+
+whitelist=/run/initramfs/whitelist
+image=/run/initramfs/image-
+
+while test "$1" != "${1#-}"
+do
+	case "$1" in
+	--no-clean-saved-files)
+		doclean=
+		shift ;;
+	--clean-saved-files)
+		doclean=y
+		shift ;;
+	--no-save-files)
+		dosave=
+		shift ;;
+	--save-files)
+		dosave=y
+		shift ;;
+	--no-restore-files)
+		dorestore=
+		shift ;;
+	--restore-files)
+		dorestore=y
+		shift ;;
+	--copy-files)
+		toram=y
+		shift ;;
+	*)
+		echo 2>&1 "Unknown option $1"
+		exit 1 ;;
+	esac
+done
+
+if test "x$dosave" = xy
+then
+	if test ! -d $upper -a -n "$rwfs"
+	then
+		mkdir -p $rwdir
+		mount $rwdev $rwdir -t $(probe_fs_type $rwdev) -o $rorwopts
+		mounted=$rwdir
+	fi
+
+	while read f
+	do
+		if ! test -e $upper/$f
+		then
+			continue
+		fi
+		d="$save/$f"
+		mkdir -p "${d%/*}"
+		cp -rp $upper/$f "${d%/*}/"
+	done < $whitelist
+
+	if test -n "$mounted"
+	then
+		umount $mounted
+	fi
+fi
+
+for f in $image*
+do
+	m=$(findmtd ${f#$image})
+	if test -z "$m"
+	then
+		echo 1>&2  "Unable to find mtd partiton for ${f##*/}."
+		exec /bin/sh
+	fi
+done
+
+for f in $image*
+do
+	if test ! -s $f
+	then
+		echo "Skipping empty update of ${f#$image}."
+		rm $f
+		continue
+	fi
+	m=$(findmtd ${f#$image})
+	echo "Updating ${f#$image}..."
+	flashcp -v $f /dev/$m && rm $f
+done
+
+if test "x$toram" = xy
+then
+	mkdir -p $upper
+	cp -rp $save/. $upper/
+fi
+
+if test -d $save -a "x$dorestore" = xy
+then
+	odir=$rwdir
+	rwdir=/run/rw
+	upper=$rwdir${upper#$odir}
+
+	mkdir -p $rwdir
+	mount $rwdev $rwdir -t $(probe_fs_type $rwdev) -o $rwopts
+	mkdir -p $upper
+	cp -rp $save/. $upper/
+	umount $rwdir
+	rmdir $rwdir
+fi
+
+if test "x$doclean" = xy
+then
+	rm -rf $save
+fi
+
+exit
+
+# NOT REACHED without edit
+# NOT REACHED without edit
+
+echo "Flash completed.  Inspect, cleanup and reboot -f to continue."
+
+export PS1=update-sh#\ 
+exec /bin/sh
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/whitelist b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/whitelist
new file mode 100644
index 000000000..603cec7e4
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/whitelist
@@ -0,0 +1,9 @@
+/etc/dropbear/dropbear_rsa_host_key
+/etc/systemd/network
+/etc/resolv.conf
+/etc/machine-id
+/etc/passwd
+/etc/group
+/etc/shadow
+/etc/gshadow
+/var/lib/obmc/events/
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/obmc-phosphor-init.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/obmc-phosphor-init.bb
new file mode 100644
index 000000000..3fa88c9e6
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/obmc-phosphor-init.bb
@@ -0,0 +1,31 @@
+SUMMARY = "Phosphor OpenBMC pre-init scripts"
+DESCRIPTION = "Phosphor OpenBMC filesytem mount reference implementation."
+PR = "r1"
+
+inherit obmc-phosphor-license
+inherit obmc-phosphor-initfs
+
+S = "${WORKDIR}"
+SRC_URI += "file://obmc-init.sh"
+SRC_URI += "file://obmc-shutdown.sh"
+SRC_URI += "file://obmc-update.sh"
+SRC_URI += "file://whitelist"
+
+do_install() {
+	for f in init-download-url init-options
+	do
+		if test -e $f
+		then
+			install -m 0755 ${WORKDIR}/$f ${D}/$f
+		fi
+	done
+        install -m 0755 ${WORKDIR}/obmc-init.sh ${D}/init
+        install -m 0755 ${WORKDIR}/obmc-shutdown.sh ${D}/shutdown
+        install -m 0755 ${WORKDIR}/obmc-update.sh ${D}/update
+        install -m 0644 ${WORKDIR}/whitelist ${D}/whitelist
+        install -d ${D}/dev
+        mknod -m 622 ${D}/dev/console c 5 1
+}
+
+FILES_${PN} += " /init /shutdown /update /whitelist /dev "
+FILES_${PN} += " /init-options /init-download-url "
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/files/obmc-phosphor-policyd.py b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/files/obmc-phosphor-policyd.py
new file mode 100644
index 000000000..48f19d46c
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/files/obmc-phosphor-policyd.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+
+# Contributors Listed Below - COPYRIGHT 2015
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+import time
+import sys
+import dbus
+import dbus.service
+import dbus.mainloop.glib
+
+if __name__ == '__main__':
+	print "obmc-phosphor-policyd starting..."
+
+	while 1:
+		time.sleep(5)
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/files/obmc-phosphor-policyd.service b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/files/obmc-phosphor-policyd.service
new file mode 100644
index 000000000..9a1f6fe10
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/files/obmc-phosphor-policyd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Phosphor OpenBMC policy management daemon
+
+[Service]
+ExecStart=/usr/sbin/obmc-phosphor-policyd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb
new file mode 100644
index 000000000..05471d52f
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb
@@ -0,0 +1,9 @@
+SUMMARY = "Phosphor OpenBMC Policy Management"
+DESCRIPTION = "Phosphor OpenBMC policy management reference implementation."
+PR = "r1"
+
+inherit obmc-phosphor-policy-mgmt
+inherit obmc-phosphor-pydbus-service
+
+S = "${WORKDIR}"
+SRC_URI += "file://${PN}.py"
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/files/obmc-phosphor-sensord.py b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/files/obmc-phosphor-sensord.py
new file mode 100644
index 000000000..c9771acb4
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/files/obmc-phosphor-sensord.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+
+# Contributors Listed Below - COPYRIGHT 2015
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+import time
+import sys
+import dbus
+import dbus.service
+import dbus.mainloop.glib
+
+if __name__ == '__main__':
+	print "obmc-phosphor-sensord starting..."
+
+	while 1:
+		time.sleep(5)
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/files/obmc-phosphor-sensord.service b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/files/obmc-phosphor-sensord.service
new file mode 100644
index 000000000..233ca4709
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/files/obmc-phosphor-sensord.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Phosphor OpenBMC sensor management daemon
+
+[Service]
+ExecStart=/usr/sbin/obmc-phosphor-sensord
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb
new file mode 100644
index 000000000..7a82fb5bc
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb
@@ -0,0 +1,9 @@
+SUMMARY = "Phosphor OpenBMC Sensor Management"
+DESCRIPTION = "Phosphor OpenBMC sensor management reference implementation."
+PR = "r1"
+
+inherit obmc-phosphor-sensor-mgmt
+inherit obmc-phosphor-pydbus-service
+
+S = "${WORKDIR}"
+SRC_URI += "file://${PN}.py"
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/files/obmc-phosphor-sysd.py b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/files/obmc-phosphor-sysd.py
new file mode 100644
index 000000000..c8080ac2c
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/files/obmc-phosphor-sysd.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+
+# Contributors Listed Below - COPYRIGHT 2015
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+import time
+import sys
+import dbus
+import dbus.service
+import dbus.mainloop.glib
+
+if __name__ == '__main__':
+	print "obmc-phosphor-watchdogd starting..."
+
+	while 1:
+		time.sleep(5)
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/files/obmc-phosphor-sysd.service b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/files/obmc-phosphor-sysd.service
new file mode 100644
index 000000000..d3d954dfb
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/files/obmc-phosphor-sysd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Phosphor OpenBMC system management daemon
+
+[Service]
+ExecStart=/usr/sbin/obmc-phosphor-sysd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb
new file mode 100644
index 000000000..bcb5d32ad
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb
@@ -0,0 +1,9 @@
+SUMMARY = "Phosphor OpenBMC System Management"
+DESCRIPTION = "Phosphor OpenBMC system management reference implementation."
+PR = "r1"
+
+inherit obmc-phosphor-system-mgmt
+inherit obmc-phosphor-pydbus-service
+
+S = "${WORKDIR}"
+SRC_URI += "file://${PN}.py"
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-user/files/obmc-phosphor-user.service b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-user/files/obmc-phosphor-user.service
new file mode 100644
index 000000000..fecf8352f
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-user/files/obmc-phosphor-user.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Phosphor OpenBMC user management daemon
+
+[Service]
+ExecStart=/usr/sbin/obmc-phosphor-userd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-user/obmc-phosphor-user.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-user/obmc-phosphor-user.bb
new file mode 100644
index 000000000..b0328cd77
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-user/obmc-phosphor-user.bb
@@ -0,0 +1,24 @@
+SUMMARY = "User DBUS object"
+DESCRIPTION = "User DBUS object"
+HOMEPAGE = "http://github.com/openbmc/phosphor-networkd"
+PR = "r1"
+
+inherit obmc-phosphor-license
+inherit obmc-phosphor-user-mgmt
+inherit obmc-phosphor-systemd
+
+RDEPENDS_${PN} += "python-dbus python-pygobject python-pexpect"
+
+SRC_URI += "git://github.com/openbmc/phosphor-networkd"
+
+SRCREV = "448e8d839d37532d2667b9a38bb3aadb6c804e2e"
+
+S = "${WORKDIR}/git"
+INSTALL_NAME = "userman.py"
+
+do_install() {
+echo "***installing $INSTALL_NAME"
+        install -d ${D}/${sbindir}
+        install ${S}/${INSTALL_NAME} ${D}/${sbindir}/obmc-phosphor-userd
+}
+
diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
new file mode 100644
index 000000000..21b4a2d80
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
@@ -0,0 +1,83 @@
+SUMMARY = "Phosphor OpenBMC - Applications"
+PR = "r1"
+
+inherit packagegroup
+inherit obmc-phosphor-utils
+inherit obmc-phosphor-license
+
+VIRTUAL-RUNTIME_obmc-phosphor-fan-ctl ?= "virtual/obmc-phosphor-fan-ctl"
+VIRTUAL-RUNTIME_obmc-phosphor-sensor-ctl ?= "virtual/obmc-phosphor-sensor-ctl"
+VIRTUAL-RUNTIME_obmc-phosphor-chassis-ctl ?= "virtual/obmc-phosphor-chassis-ctl"
+VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl ?= "virtual/obmc-phosphor-flash-ctl"
+
+PROVIDES = "${PACKAGES}"
+PACKAGES = " \
+        packagegroup-obmc-phosphor-apps-extras \
+        ${@mf_enabled("obmc-phosphor-fan-mgmt", "packagegroup-obmc-phosphor-apps-fan-mgmt", d)} \
+        ${@mf_enabled("obmc-phosphor-chassis-mgmt", "packagegroup-obmc-phosphor-apps-chassis-mgmt", d)} \
+        ${@mf_enabled("obmc-phosphor-sensor-mgmt", "packagegroup-obmc-phosphor-apps-sensor-mgmt", d)} \
+        ${@mf_enabled("obmc-phosphor-flash-mgmt", "packagegroup-obmc-phosphor-apps-flash-mgmt", d)} \
+        ${@df_enabled("obmc-phosphor-event-mgmt", "packagegroup-obmc-phosphor-apps-event-mgmt", d)} \
+        ${@df_enabled("obmc-phosphor-policy-mgmt", "packagegroup-obmc-phosphor-apps-policy-mgmt", d)} \
+        ${@df_enabled("obmc-phosphor-user-mgmt", "packagegroup-obmc-phosphor-apps-user-mgmt", d)} \
+        ${@df_enabled("obmc-phosphor-system-mgmt", "packagegroup-obmc-phosphor-apps-system-mgmt", d)} \
+        "
+
+SUMMARY_packagegroup-obmc-phosphor-apps-extras = "Extra features"
+RDEPENDS_packagegroup-obmc-phosphor-apps-extras = " \
+        rest-dbus \
+	obmc-rest \
+        host-ipmid \
+        "
+
+SUMMARY_packagegroup-obmc-phosphor-apps-fan-mgmt = "Fan management support"
+RDEPENDS_packagegroup-obmc-phosphor-apps-fan-mgmt = \
+        "${@cf_enabled("obmc-phosphor-fan-mgmt", " \
+                virtual/obmc-phosphor-fan-mgmt \
+                ${VIRTUAL-RUNTIME_obmc-phosphor-fan-ctl} \
+        ", d)}"
+
+SUMMARY_packagegroup-obmc-phosphor-apps-chassis-mgmt = "Chassis management support"
+RDEPENDS_packagegroup-obmc-phosphor-apps-chassis-mgmt = "\
+        ${@cf_enabled("obmc-phosphor-chassis-mgmt", " \
+                virtual/obmc-phosphor-chassis-mgmt \
+                ${VIRTUAL-RUNTIME_obmc-phosphor-chassis-ctl} \
+        ", d)}"
+
+SUMMARY_packagegroup-obmc-phosphor-apps-sensor-mgmt = "Sensor management support"
+RDEPENDS_packagegroup-obmc-phosphor-apps-sensor-mgmt = "\
+        ${@cf_enabled("obmc-phosphor-sensor-mgmt", " \
+                virtual/obmc-phosphor-sensor-mgmt \
+                ${VIRTUAL-RUNTIME_obmc-phosphor-sensor-ctl} \
+        ", d)}"
+
+SUMMARY_packagegroup-obmc-phosphor-apps-flash-mgmt = "Flash management support"
+RDEPENDS_packagegroup-obmc-phosphor-apps-flash-mgmt = "\
+        ${@cf_enabled("obmc-phosphor-flash-mgmt", " \
+                virtual/obmc-phosphor-flash-mgmt \
+                ${VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl} \
+        ", d)}"
+
+SUMMARY_packagegroup-obmc-phosphor-apps-event-mgmt = "Event management support"
+RDEPENDS_packagegroup-obmc-phosphor-apps-event-mgmt = " \
+        ${@df_enabled("obmc-phosphor-event-mgmt", " \
+                virtual/obmc-phosphor-event-mgmt \
+        ", d)}"
+
+SUMMARY_packagegroup-obmc-phosphor-apps-policy-mgmt = "Policy management support"
+RDEPENDS_packagegroup-obmc-phosphor-apps-policy-mgmt = " \
+        ${@df_enabled("obmc-phosphor-policy-mgmt", " \
+                virtual/obmc-phosphor-policy-mgmt \
+        ", d)}"
+
+SUMMARY_packagegroup-obmc-phosphor-apps-user-mgmt = "User management support"
+RDEPENDS_packagegroup-obmc-phosphor-apps-user-mgmt = " \
+        ${@df_enabled("obmc-phosphor-user-mgmt", " \
+                virtual/obmc-phosphor-user-mgmt \
+        ", d)}"
+
+SUMMARY_packagegroup-obmc-phosphor-apps-system-mgmt = "System management support"
+RDEPENDS_packagegroup-obmc-phosphor-apps-system-mgmt = " \
+        ${@df_enabled("obmc-phosphor-system-mgmt", " \
+                virtual/obmc-phosphor-system-mgmt \
+        ", d)}"
diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
new file mode 100644
index 000000000..b6f9b978d
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=DBUS introspecting REST server.
+
+[Service]
+ExecStart=/usr/sbin/rest-dbus
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb b/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb
new file mode 100644
index 000000000..fa551f553
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb
@@ -0,0 +1,26 @@
+SUMMARY = "Phosphor OpenBMC REST framework"
+DESCRIPTION = "Phosphor OpenBMC REST to DBUS daemon."
+HOMEPAGE = "http://github.com/openbmc/rest-dbus"
+PR = "r1"
+
+inherit allarch
+inherit obmc-phosphor-license
+inherit obmc-phosphor-systemd
+inherit setuptools
+
+RDEPENDS_${PN} += " \
+        python-netserver \
+        python-json \
+        python-dbus \
+        python-xml \
+        obmc-mapper \
+        "
+
+SRC_URI += " \
+        git://github.com/openbmc/rest-dbus.git \
+        file://rest-dbus.service \
+        "
+
+SRCREV = "b10a57e2f34e94b13697328cc22f876f738feb0e"
+
+S = "${WORKDIR}/git"
diff --git a/meta-phosphor/common/recipes-phosphor/settings/settings.bb b/meta-phosphor/common/recipes-phosphor/settings/settings.bb
new file mode 100644
index 000000000..d1fa6396d
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/settings/settings.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Settings DBUS object"
+DESCRIPTION = "Settings DBUS object"
+HOMEPAGE = "http://github.com/openbmc/phosphor-settingsd"
+PR = "r1"
+
+inherit obmc-phosphor-license
+inherit obmc-phosphor-systemd
+
+RDEPENDS_${PN} += "python-dbus python-pygobject"
+
+SRC_URI += "git://github.com/openbmc/phosphor-settingsd"
+
+SRCREV = "3bda531d94f4c93473bbedd7d7e5c44d4d9da93b"
+
+S = "${WORKDIR}/git"
+
+do_install() {
+        install -d ${D}/${sbindir}
+        install ${S}/settings_file.py ${D}/${sbindir}
+        install ${S}/settings_manager.py ${D}/${sbindir}
+}
+
diff --git a/meta-phosphor/common/recipes-phosphor/settings/settings/settings.service b/meta-phosphor/common/recipes-phosphor/settings/settings/settings.service
new file mode 100755
index 000000000..24c4a5a31
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/settings/settings/settings.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Settings DBUS Object
+Requires=skeleton.service
+After=skeleton.service
+
+[Service]
+ExecStart=/usr/sbin/settings_manager.py
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
new file mode 100644
index 000000000..08e4d33a3
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Temp placeholder for skeleton function"
+DESCRIPTION = "Temp placeholder for skeleton repository"
+HOMEPAGE = "http://github.com/openbmc/skeleton"
+PR = "r1"
+
+inherit obmc-phosphor-license
+inherit obmc-phosphor-systemd
+inherit obmc-phosphor-chassis-mgmt
+inherit obmc-phosphor-fan-mgmt
+inherit obmc-phosphor-flash-mgmt
+inherit obmc-phosphor-policy-mgmt
+inherit obmc-phosphor-sensor-mgmt
+inherit obmc-phosphor-system-mgmt
+
+DEPENDS += "glib-2.0 systemd"
+RDEPENDS_${PN} += "python-subprocess python-compression libsystemd"
+SRC_URI += "git://github.com/openbmc/skeleton"
+
+SRCREV = "27ca44ad1a96f90d42dcb50183700e5ca5358642"
+
+S = "${WORKDIR}"
+
+do_compile() {
+        oe_runmake -C git
+}
+
+do_install() {
+        source=${S}/git
+
+        install -d ${D}/${sbindir} ${D}${libdir}
+        for i in ${source}/bin/*; do
+                install $i ${D}/${sbindir}
+        done
+        for i in ${source}/lib/*; do
+                install $i ${D}/${libdir}
+        done
+}
diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton/skeleton.service b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton/skeleton.service
new file mode 100755
index 000000000..53be092b6
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton/skeleton.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Temp placeholder for skeleton function
+
+[Service]
+ExecStart=/usr/sbin/system_manager.py Palmetto
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes.txt b/meta-phosphor/common/recipes.txt
new file mode 100644
index 000000000..ccd19b2f7
--- /dev/null
+++ b/meta-phosphor/common/recipes.txt
@@ -0,0 +1,7 @@
+recipes-connectivity - Libraries and applications related to communication with other devices 
+recipes-core         - What's needed to build a basic working Linux image including commonly used dependencies
+recipes-devtools     - Tools primarily used by the build system (but can also be used on targets)
+recipes-extended     - Applications which whilst not essential add features compared to the alternatives in
+                       core. May be needed for full tool functionality or LSB compliance.
+recipes-kernel       - The kernel and generic applications/libraries with strong kernel dependencies
+recipes-phosphor     - Phosphor OpenBMC applications and configuration
diff --git a/meta-phosphor/conf/bblayers.conf.sample b/meta-phosphor/conf/bblayers.conf.sample
new file mode 100644
index 000000000..2f0321f1b
--- /dev/null
+++ b/meta-phosphor/conf/bblayers.conf.sample
@@ -0,0 +1,16 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "6"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-yocto \
+  ##OEROOT##/meta-phosphor \
+  "
+BBLAYERS_NON_REMOVABLE ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-yocto \
+  "
diff --git a/meta-phosphor/conf/conf-notes.txt b/meta-phosphor/conf/conf-notes.txt
new file mode 100644
index 000000000..f2db15fcb
--- /dev/null
+++ b/meta-phosphor/conf/conf-notes.txt
@@ -0,0 +1,5 @@
+Common targets are:
+     obmc-phosphor-image
+
+You can also run generated qemu images with a command like:
+     runqemu qemuarm
diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf
new file mode 100644
index 000000000..4af4a4b64
--- /dev/null
+++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf
@@ -0,0 +1,38 @@
+require conf/distro/poky.conf
+
+DISTRO = "openbmc-phosphor"
+DISTRO_NAME = "Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro)"
+DISTRO_VERSION = "0.1.0"
+TARGET_VENDOR="-openbmc"
+
+GCCVERSION ?= "4.9.3"
+IMAGE_FSTYPES += "cpio.gz"
+IMAGE_FSTYPES += "squashfs-xz"
+IMAGE_LINGUAS = "en-us"
+
+VIRTUAL-RUNTIME_keymaps = ""
+
+# Phosphor OpenBMC uses systemd and udev
+DISTRO_FEATURES_append = " systemd"
+VIRTUAL-RUNTIME_init_manager = "systemd"
+DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
+VIRTUAL-RUNTIME_initscripts = ""
+
+DISTRO_FEATURES = "\
+        ipv6 \
+        obmc-phosphor-fan-mgmt \
+        obmc-phosphor-chassis-mgmt \
+        obmc-phosphor-sensor-mgmt \
+        obmc-phosphor-flash-mgmt \
+        obmc-phosphor-event-mgmt \
+        obmc-phosphor-policy-mgmt \
+        obmc-phosphor-user-mgmt \
+        obmc-phosphor-system-mgmt \
+        ${DISTRO_FEATURES_LIBC} \
+        "
+
+MACHINE_FEATURES += " \
+        ${OBMC_MACHINE_FEATURES} \
+        "
+
+DISTRO_EXTRA_RDEPENDS_remove_qemuarm = "packagegroup-core-device-devel"
diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf
new file mode 100644
index 000000000..ffccec013
--- /dev/null
+++ b/meta-phosphor/conf/layer.conf
@@ -0,0 +1,13 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \
+            ${LAYERDIR}/common/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "obmc-phosphor"
+BBFILE_PATTERN_obmc-phosphor = "^${LAYERDIR}/"
+LAYERVERSION_obmc-phosphor = "1"
+
+# Provide a variable that points the base of the phosphor layer.
+PHOSPHORBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-phosphor/conf/local.conf.sample b/meta-phosphor/conf/local.conf.sample
new file mode 100644
index 000000000..9a9dedb8e
--- /dev/null
+++ b/meta-phosphor/conf/local.conf.sample
@@ -0,0 +1,247 @@
+#
+# This file is your local configuration file and is where all local user settings
+# are placed. The comments in this file give some guide to the options a new user
+# to the system might want to change but pretty much any configuration option can
+# be set in this file. More adventurous users can look at local.conf.extended 
+# which contains other examples of configuration which can be placed in this file
+# but new users likely won't need any of them initially.
+#
+# Lines starting with the '#' character are commented out and in some cases the 
+# default values are provided as comments to show people example syntax. Enabling
+# the option is a question of removing the # character and making any change to the
+# variable as required.
+
+#
+# Machine Selection
+#
+# You need to select a specific machine to target the build with. There are a selection
+# of emulated machines available which can boot and run in the QEMU emulator:
+#
+#MACHINE ?= "qemuarm"
+#MACHINE ?= "qemuarm64"
+#MACHINE ?= "qemumips"
+#MACHINE ?= "qemuppc"
+#MACHINE ?= "qemux86"
+#MACHINE ?= "qemux86-64"
+#
+# There are also the following hardware board target machines included for 
+# demonstration purposes:
+#
+#MACHINE ?= "beaglebone"
+#MACHINE ?= "genericx86"
+#MACHINE ?= "genericx86-64"
+#MACHINE ?= "mpc8315e-rdb"
+#MACHINE ?= "edgerouter"
+#
+# This sets the default machine to be qemux86 if no other machine is selected:
+MACHINE ??= "qemuarm"
+
+#
+# Where to place downloads
+#
+# During a first build the system will download many different source code tarballs
+# from various upstream projects. This can take a while, particularly if your network
+# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you
+# can preserve this directory to speed up this part of subsequent builds. This directory
+# is safe to share between multiple builds on the same machine too.
+#
+# The default is a downloads directory under TOPDIR which is the build directory.
+#
+#DL_DIR ?= "${TOPDIR}/downloads"
+
+#
+# Where to place shared-state files
+#
+# BitBake has the capability to accelerate builds based on previously built output.
+# This is done using "shared state" files which can be thought of as cache objects
+# and this option determines where those files are placed.
+#
+# You can wipe out TMPDIR leaving this directory intact and the build would regenerate
+# from these files if no changes were made to the configuration. If changes were made
+# to the configuration, only shared state files where the state was still valid would
+# be used (done using checksums).
+#
+# The default is a sstate-cache directory under TOPDIR.
+#
+#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
+
+#
+# Where to place the build output
+#
+# This option specifies where the bulk of the building work should be done and
+# where BitBake should place its temporary files and output. Keep in mind that
+# this includes the extraction and compilation of many applications and the toolchain
+# which can use Gigabytes of hard disk space.
+#
+# The default is a tmp directory under TOPDIR.
+#
+#TMPDIR = "${TOPDIR}/tmp"
+
+#
+# Default policy config
+#
+# The distribution setting controls which policy settings are used as defaults.
+# The default value is fine for general Yocto project use, at least initially.
+# Ultimately when creating custom policy, people will likely end up subclassing 
+# these defaults.
+#
+DISTRO ?= "openbmc-phosphor"
+# As an example of a subclass there is a "bleeding" edge policy configuration
+# where many versions are set to the absolute latest code from the upstream 
+# source control systems. This is just mentioned here as an example, its not
+# useful to most new users.
+# DISTRO ?= "poky-bleeding"
+
+#
+# Package Management configuration
+#
+# This variable lists which packaging formats to enable. Multiple package backends 
+# can be enabled at once and the first item listed in the variable will be used 
+# to generate the root filesystems.
+# Options are:
+#  - 'package_deb' for debian style deb files
+#  - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
+#  - 'package_rpm' for rpm style packages
+# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
+# We default to rpm:
+PACKAGE_CLASSES ?= "package_rpm"
+
+#
+# SDK/ADT target architecture
+#
+# This variable specifies the architecture to build SDK/ADT items for and means
+# you can build the SDK packages for architectures other than the machine you are 
+# running the build on (i.e. building i686 packages on an x86_64 host).
+# Supported values are i686 and x86_64
+#SDKMACHINE ?= "i686"
+
+SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*"
+
+#
+# Extra image configuration defaults
+#
+# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated 
+# images. Some of these options are added to certain image types automatically. The
+# variable can contain the following options:
+#  "dbg-pkgs"       - add -dbg packages for all installed packages
+#                     (adds symbol information for debugging/profiling)
+#  "dev-pkgs"       - add -dev packages for all installed packages
+#                     (useful if you want to develop against libs in the image)
+#  "ptest-pkgs"     - add -ptest packages for all ptest-enabled packages
+#                     (useful if you want to run the package test suites)
+#  "tools-sdk"      - add development tools (gcc, make, pkgconfig etc.)
+#  "tools-debug"    - add debugging tools (gdb, strace)
+#  "eclipse-debug"  - add Eclipse remote debugging support
+#  "tools-profile"  - add profiling tools (oprofile, exmap, lttng, valgrind)
+#  "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
+#  "debug-tweaks"   - make an image suitable for development
+#                     e.g. ssh root access has a blank password
+# There are other application targets that can be used here too, see
+# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
+# We default to enabling the debugging tweaks.
+EXTRA_IMAGE_FEATURES = "debug-tweaks"
+
+#
+# Additional image features
+#
+# The following is a list of additional classes to use when building images which
+# enable extra features. Some available options which can be included in this variable 
+# are:
+#   - 'buildstats' collect build statistics
+#   - 'image-mklibs' to reduce shared library files size for an image
+#   - 'image-prelink' in order to prelink the filesystem image
+#   - 'image-swab' to perform host system intrusion detection
+# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
+# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+
+#
+# Runtime testing of images
+#
+# The build system can test booting virtual machine images under qemu (an emulator)
+# after any root filesystems are created and run tests against those images. To
+# enable this uncomment this line. See classes/testimage(-auto).bbclass for
+# further details.
+#TEST_IMAGE = "1"
+#
+# Interactive shell configuration
+#
+# Under certain circumstances the system may need input from you and to do this it 
+# can launch an interactive shell. It needs to do this since the build is 
+# multithreaded and needs to be able to handle the case where more than one parallel
+# process may require the user's attention. The default is iterate over the available
+# terminal types to find one that works.
+#
+# Examples of the occasions this may happen are when resolving patches which cannot
+# be applied, to use the devshell or the kernel menuconfig
+#
+# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none
+# Note: currently, Konsole support only works for KDE 3.x due to the way
+# newer Konsole versions behave
+#OE_TERMINAL = "auto"
+# By default disable interactive patch resolution (tasks will just fail instead):
+PATCHRESOLVE = "noop"
+
+#
+# Disk Space Monitoring during the build
+#
+# Monitor the disk space during the build. If there is less that 1GB of space or less
+# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
+# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort
+# of the build. The reason for this is that running completely out of space can corrupt
+# files and damages the build in ways which may not be easily recoverable.
+# It's necesary to monitor /tmp, if there is no space left the build will fail
+# with very exotic errors.
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+
+#
+# Shared-state files from other locations
+#
+# As mentioned above, shared state files are prebuilt cache data objects which can 
+# used to accelerate build time. This variable can be used to configure the system
+# to search other mirror locations for these objects before it builds the data itself.
+#
+# This can be a filesystem directory, or a remote url such as http or ftp. These
+# would contain the sstate-cache results from previous builds (possibly from other 
+# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the 
+# cache locations to check for the shared objects.
+# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH
+# at the end as shown in the examples below. This will be substituted with the
+# correct path within the directory structure.
+#SSTATE_MIRRORS ?= "\
+#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
+#file://.* file:///some/local/dir/sstate/PATH"
+
+
+#
+# Qemu configuration
+#
+# By default qemu will build with a builtin VNC server where graphical output can be
+# seen. The two lines below enable the SDL backend too. This assumes there is a
+# libsdl library available on your build system.
+PACKAGECONFIG_append_pn-qemu-native = " sdl"
+PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
+ASSUME_PROVIDED += "libsdl-native"
+
+
+# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
+# track the version of this file when it was generated. This can safely be ignored if
+# this doesn't mean anything to you.
+CONF_VERSION = "1"
+
+# Set the root password to '0penBmc'
+INHERIT += "extrausers"
+
+EXTRA_USERS_PARAMS = " \
+  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
+  "
+
+require conf/machine/include/sample.inc
diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
new file mode 100644
index 000000000..60ed0888a
--- /dev/null
+++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@NAME: OpenBMC
+#@DESCRIPTION: Common machine configuration for OpenBMC chips
+
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+EXTRA_IMAGEDEPENDS += "u-boot"
+
+KERNEL_CLASSES ?= "kernel-uimage kernel-cuimage"
+KERNEL_IMAGETYPE ?= "cuImage"
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+
+UBOOT_SUFFIX ?= "bin"
+
+MACHINEOVERRIDES =. "openbmc:"
+
+IMAGE_FSTYPES += "overlay"
+IMAGE_INSTALL += "u-boot-fw-utils"
+
+IMAGE_CLASSES += "obmc-phosphor-image_types_uboot"
+
+INITRAMFS_CTYPE ?= "lzma"
+INITRAMFS_FSTYPES += "cpio.${INITRAMFS_CTYPE}"
+
+
diff --git a/meta-phosphor/conf/machine/include/sample.inc b/meta-phosphor/conf/machine/include/sample.inc
new file mode 100644
index 000000000..e66dc77ea
--- /dev/null
+++ b/meta-phosphor/conf/machine/include/sample.inc
@@ -0,0 +1,33 @@
+OBMC_MACHINE_FEATURES += "\
+        obmc-phosphor-fan-mgmt \
+        obmc-phosphor-chassis-mgmt \
+        obmc-phosphor-sensor-mgmt \
+        obmc-phosphor-flash-mgmt \
+        "
+
+VIRTUAL-RUNTIME_obmc-phosphor-fan-ctl = " \
+       obmc-phosphor-example-sdbus \
+       "
+VIRTUAL-RUNTIME_obmc-phosphor-sensor-ctl = " \
+       obmc-phosphor-example-sdbus \
+       "
+VIRTUAL-RUNTIME_obmc-phosphor-chassis-ctl = " \
+       obmc-phosphor-example-pydbus \
+       "
+VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl = " \
+       obmc-phosphor-example-pydbus \
+       "
+VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers = " \
+        host-ipmid-oem \
+        host-ipmid-fru \
+        host-ipmid-tool \
+       "
+PREFERRED_PROVIDER_virtual/obmc-phosphor-host-ipmi-hw = "host-ipmi-hw-example"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-chassis-mgmt = "obmc-phosphor-chassisd"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-event-mgmt = "obmc-phosphor-eventd"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-fan-mgmt = "obmc-phosphor-fand"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-flash-mgmt = "obmc-phosphor-flashd"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-policy-mgmt = "obmc-phosphor-policyd"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-sensor-mgmt = "obmc-phosphor-sensord"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-system-mgmt = "obmc-phosphor-sysd"
+PREFERRED_PROVIDER_virtual/obmc-phosphor-user-mgmt = "obmc-phosphor-userd"
diff --git a/meta-selftest b/meta-selftest
new file mode 120000
index 000000000..ce3fd93cb
--- /dev/null
+++ b/meta-selftest
@@ -0,0 +1 @@
+yocto-poky/meta-selftest
\ No newline at end of file
diff --git a/meta-skeleton b/meta-skeleton
new file mode 120000
index 000000000..f47702e7c
--- /dev/null
+++ b/meta-skeleton
@@ -0,0 +1 @@
+yocto-poky/meta-skeleton
\ No newline at end of file
diff --git a/meta-yocto b/meta-yocto
new file mode 120000
index 000000000..c3841b0aa
--- /dev/null
+++ b/meta-yocto
@@ -0,0 +1 @@
+yocto-poky/meta-yocto
\ No newline at end of file
diff --git a/meta-yocto-bsp b/meta-yocto-bsp
new file mode 120000
index 000000000..5aed1ec51
--- /dev/null
+++ b/meta-yocto-bsp
@@ -0,0 +1 @@
+yocto-poky/meta-yocto-bsp
\ No newline at end of file
diff --git a/meta/recipes-core/dropbear/dropbear_2015.68.bb b/meta/recipes-core/dropbear/dropbear_2015.68.bb
deleted file mode 100644
index 1b749d703..000000000
--- a/meta/recipes-core/dropbear/dropbear_2015.68.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require dropbear.inc
-
-SRC_URI[md5sum] = "7664ac10f7cc2301c530eb80c756fc5d"
-SRC_URI[sha256sum] = "55ea7c1e904ffe4b1cdbe1addca8291a2533d7d285fd22ac33608e9502a62446"
diff --git a/oe-init-build-env b/oe-init-build-env
index 6fee5f72a..fc6348b5d 100755..120000
--- a/oe-init-build-env
+++ b/oe-init-build-env
@@ -1,62 +1 @@
-#!/bin/sh
-
-# OE Build Environment Setup Script
-#
-# Copyright (C) 2006-2011 Linux Foundation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-#
-# Normally this is called as '. ./oe-init-build-env builddir'
-#
-# This works in most shells (not dash), but not all of them pass arg1 when
-# being sourced.   To workaround the shell limitation use "set arg1" prior 
-# to sourcing this script.
-#
-if [ -n "$BASH_SOURCE" ]; then
-   OEROOT="`dirname $BASH_SOURCE`"
-elif [ -n "$ZSH_NAME" ]; then
-   OEROOT="`dirname $0`"
-else
-   OEROOT="`pwd`"
-fi
-if [ -n "$BBSERVER" ]; then
-   unset BBSERVER
-fi
-THIS_SCRIPT=$OEROOT/oe-init-build-env
-
-if [ -z "$ZSH_NAME" ] && [ "$0" = "$THIS_SCRIPT" ]; then
-   echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'"
-   exit 1
-fi
-
-OEROOT=`readlink -f "$OEROOT"`
-export OEROOT
-. $OEROOT/scripts/oe-buildenv-internal && \
-     $OEROOT/scripts/oe-setup-builddir && \
-     [ -n "$BUILDDIR" ] && cd "$BUILDDIR"
-unset OEROOT
-unset BBPATH
-unset THIS_SCRIPT
-
-# Shutdown any bitbake server if the BBSERVER variable is not set
-if [ -z "$BBSERVER" ] && [ -f bitbake.lock ] ; then
-    grep ":" bitbake.lock > /dev/null && BBSERVER=`cat bitbake.lock` bitbake --status-only
-    if [ $? = 0 ] ; then
-	echo "Shutting down bitbake memory resident server with bitbake -m"
-	BBSERVER=`cat bitbake.lock` bitbake -m
-    fi
-fi
-
+yocto-poky/oe-init-build-env
\ No newline at end of file
diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres
index c1dc4fe3e..17ecfe08c 100755..120000
--- a/oe-init-build-env-memres
+++ b/oe-init-build-env-memres
@@ -1,84 +1 @@
-#!/bin/sh
-
-# OE Build Environment Setup Script
-#
-# Copyright (C) 2006-2011 Linux Foundation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-#
-# Normally this is called as '. ./oe-init-build-env builddir <portnumber> <builddir>'
-#
-# This works in most shells (not dash), but not all of them pass arg1 when
-# being sourced.   To workaround the shell limitation use "set arg1" prior 
-# to sourcing this script.
-#
-if [ -z "$1" ]; then
-    echo "No port specified, using dynamically selected port"
-    port=-1
-else
-    port=$1
-    shift
-fi
-
-if [ -n "$BASH_SOURCE" ]; then
-  OEROOT="`dirname $BASH_SOURCE`"
-elif [ -n "$ZSH_NAME" ]; then
-  OEROOT="`dirname $0`"
-else
-  OEROOT="`pwd`"
-fi
-if [ -n "$BBSERVER" ]; then
-  unset BBSERVER
-fi
-
-THIS_SCRIPT=$OEROOT/oe-init-build-env-memres
-if [ -z "$ZSH_NAME" ] && [ "x$0" = "x$THIS_SCRIPT" ]; then
-   echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'"
-   exit 1
-fi
-
-OEROOT=`readlink -f "$OEROOT"`
-export OEROOT
-. $OEROOT/scripts/oe-buildenv-internal && \
-    $OEROOT/scripts/oe-setup-builddir && \
-    [ -n "$BUILDDIR" ] && cd $BUILDDIR
-unset OEROOT
-unset BBPATH
-unset THIS_SCRIPT
-
-res=1
-if [ -e bitbake.lock ] && grep : bitbake.lock > /dev/null ; then
-    BBSERVER=`cat bitbake.lock` bitbake --status-only
-    res=$?
-fi
-
-if [ $res != 0 ] ; then
-    bitbake --server-only -t xmlrpc -B localhost:$port
-fi
-
-if [ $port = -1 ] ; then
-    export BBSERVER=localhost:-1
-    echo "Bitbake server started on demand as needed, use bitbake -m to shut it down"
-else
-    export BBSERVER=`cat bitbake.lock`
-
-    if [ $res = 0 ] ; then
-	echo "Using existing bitbake server at: $BBSERVER, use bitbake -m to shut it down"
-    else
-	echo "Bitbake server started at: $BBSERVER, use bitbake -m to shut it down"
-    fi
-    unset res
-fi
+yocto-poky/oe-init-build-env-memres
\ No newline at end of file
diff --git a/openbmc-env b/openbmc-env
new file mode 100644
index 000000000..03e8628e1
--- /dev/null
+++ b/openbmc-env
@@ -0,0 +1,16 @@
+if [ -n "$BASH_SOURCE" ]; then
+   OBMCROOT="`dirname $BASH_SOURCE`"
+elif [ -n "$ZSH_NAME" ]; then
+   OBMCROOT="`dirname $0`"
+else
+   OBMCROOT="`pwd`"
+fi
+
+if [ -f $OBMCROOT/customrc ]; then
+    echo "### Sourcing customrc ###"
+    . $OBMCROOT/customrc
+fi
+
+echo "### Initializing OE build env ###"
+. $OBMCROOT/oe-init-build-env
+
diff --git a/scripts b/scripts
new file mode 120000
index 000000000..b80307a69
--- /dev/null
+++ b/scripts
@@ -0,0 +1 @@
+yocto-poky/scripts
\ No newline at end of file
diff --git a/yocto-poky/.gitignore b/yocto-poky/.gitignore
new file mode 100644
index 000000000..42358310b
--- /dev/null
+++ b/yocto-poky/.gitignore
@@ -0,0 +1,26 @@
+*.pyc
+*.pyo
+/*.patch
+build*/
+pyshtables.py
+pstage/
+scripts/oe-git-proxy-socks
+sources/
+meta-*/
+!meta-skeleton
+!meta-selftest
+hob-image-*.bb
+*.swp
+*.orig
+*.rej
+*~
+!meta-yocto
+!meta-yocto-bsp
+!meta-yocto-imported
+documentation/user-manual/user-manual.html
+documentation/user-manual/user-manual.pdf
+documentation/user-manual/user-manual.tgz
+pull-*/
+bitbake/lib/toaster/contrib/tts/backlog.txt
+bitbake/lib/toaster/contrib/tts/log/*
+bitbake/lib/toaster/contrib/tts/.cache/*
\ No newline at end of file
diff --git a/yocto-poky/.templateconf b/yocto-poky/.templateconf
new file mode 100644
index 000000000..0650a4662
--- /dev/null
+++ b/yocto-poky/.templateconf
@@ -0,0 +1,2 @@
+# Template settings
+TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf}
diff --git a/yocto-poky/LICENSE b/yocto-poky/LICENSE
new file mode 100644
index 000000000..21fa6e6bd
--- /dev/null
+++ b/yocto-poky/LICENSE
@@ -0,0 +1,14 @@
+Different components of OpenEmbedded are under different licenses (a mix
+of MIT and GPLv2). Please see:
+
+meta/COPYING.GPLv2 (GPLv2)
+meta/COPYING.MIT (MIT)
+meta-selftest/COPYING.MIT (MIT)
+meta-skeleton/COPYING.MIT (MIT)
+
+All metadata is MIT licensed unless otherwise stated. Source code
+included in tree for individual recipes is under the LICENSE stated in
+the associated recipe (.bb file) unless otherwise stated.
+
+License information for any other files is either explicitly stated 
+or defaults to GPL version 2.
diff --git a/README b/yocto-poky/README
index 244930944..244930944 100644
--- a/README
+++ b/yocto-poky/README
diff --git a/README.hardware b/yocto-poky/README.hardware
index 9c74c5d3c..9c74c5d3c 100644
--- a/README.hardware
+++ b/yocto-poky/README.hardware
diff --git a/bitbake/AUTHORS b/yocto-poky/bitbake/AUTHORS
index 91fd78fd2..91fd78fd2 100644
--- a/bitbake/AUTHORS
+++ b/yocto-poky/bitbake/AUTHORS
diff --git a/bitbake/COPYING b/yocto-poky/bitbake/COPYING
index d511905c1..d511905c1 100644
--- a/bitbake/COPYING
+++ b/yocto-poky/bitbake/COPYING
diff --git a/bitbake/ChangeLog b/yocto-poky/bitbake/ChangeLog
index 4ac2a6446..4ac2a6446 100644
--- a/bitbake/ChangeLog
+++ b/yocto-poky/bitbake/ChangeLog
diff --git a/bitbake/HEADER b/yocto-poky/bitbake/HEADER
index 9859255df..9859255df 100644
--- a/bitbake/HEADER
+++ b/yocto-poky/bitbake/HEADER
diff --git a/bitbake/LICENSE b/yocto-poky/bitbake/LICENSE
index 350140c93..350140c93 100644
--- a/bitbake/LICENSE
+++ b/yocto-poky/bitbake/LICENSE
diff --git a/bitbake/bin/bitbake b/yocto-poky/bitbake/bin/bitbake
index 981b2c0de..981b2c0de 100755
--- a/bitbake/bin/bitbake
+++ b/yocto-poky/bitbake/bin/bitbake
diff --git a/bitbake/bin/bitbake-diffsigs b/yocto-poky/bitbake/bin/bitbake-diffsigs
index 196f0b73e..196f0b73e 100755
--- a/bitbake/bin/bitbake-diffsigs
+++ b/yocto-poky/bitbake/bin/bitbake-diffsigs
diff --git a/bitbake/bin/bitbake-dumpsig b/yocto-poky/bitbake/bin/bitbake-dumpsig
index 656d93a5a..656d93a5a 100755
--- a/bitbake/bin/bitbake-dumpsig
+++ b/yocto-poky/bitbake/bin/bitbake-dumpsig
diff --git a/bitbake/bin/bitbake-layers b/yocto-poky/bitbake/bin/bitbake-layers
index fb130444b..fb130444b 100755
--- a/bitbake/bin/bitbake-layers
+++ b/yocto-poky/bitbake/bin/bitbake-layers
diff --git a/bitbake/bin/bitbake-prserv b/yocto-poky/bitbake/bin/bitbake-prserv
index a8d7acb4c..a8d7acb4c 100755
--- a/bitbake/bin/bitbake-prserv
+++ b/yocto-poky/bitbake/bin/bitbake-prserv
diff --git a/bitbake/bin/bitbake-selftest b/yocto-poky/bitbake/bin/bitbake-selftest
index 462eb1b2b..462eb1b2b 100755
--- a/bitbake/bin/bitbake-selftest
+++ b/yocto-poky/bitbake/bin/bitbake-selftest
diff --git a/bitbake/bin/bitbake-worker b/yocto-poky/bitbake/bin/bitbake-worker
index 3390f637e..3390f637e 100755
--- a/bitbake/bin/bitbake-worker
+++ b/yocto-poky/bitbake/bin/bitbake-worker
diff --git a/bitbake/bin/bitdoc b/yocto-poky/bitbake/bin/bitdoc
index 576d88b57..576d88b57 100755
--- a/bitbake/bin/bitdoc
+++ b/yocto-poky/bitbake/bin/bitdoc
diff --git a/bitbake/bin/image-writer b/yocto-poky/bitbake/bin/image-writer
index 7d7116780..7d7116780 100755
--- a/bitbake/bin/image-writer
+++ b/yocto-poky/bitbake/bin/image-writer
diff --git a/bitbake/bin/toaster b/yocto-poky/bitbake/bin/toaster
index 2c3432c24..2c3432c24 100755
--- a/bitbake/bin/toaster
+++ b/yocto-poky/bitbake/bin/toaster
diff --git a/bitbake/bin/toaster-eventreplay b/yocto-poky/bitbake/bin/toaster-eventreplay
index 615a7aed1..615a7aed1 100755
--- a/bitbake/bin/toaster-eventreplay
+++ b/yocto-poky/bitbake/bin/toaster-eventreplay
diff --git a/bitbake/contrib/README b/yocto-poky/bitbake/contrib/README
index 25e515661..25e515661 100644
--- a/bitbake/contrib/README
+++ b/yocto-poky/bitbake/contrib/README
diff --git a/bitbake/contrib/bbdev.sh b/yocto-poky/bitbake/contrib/bbdev.sh
index 33a78531e..33a78531e 100644
--- a/bitbake/contrib/bbdev.sh
+++ b/yocto-poky/bitbake/contrib/bbdev.sh
diff --git a/bitbake/contrib/dump_cache.py b/yocto-poky/bitbake/contrib/dump_cache.py
index e1f23090b..e1f23090b 100755
--- a/bitbake/contrib/dump_cache.py
+++ b/yocto-poky/bitbake/contrib/dump_cache.py
diff --git a/bitbake/contrib/vim/ftdetect/bitbake.vim b/yocto-poky/bitbake/contrib/vim/ftdetect/bitbake.vim
index 200f8ae49..200f8ae49 100644
--- a/bitbake/contrib/vim/ftdetect/bitbake.vim
+++ b/yocto-poky/bitbake/contrib/vim/ftdetect/bitbake.vim
diff --git a/bitbake/contrib/vim/ftplugin/bitbake.vim b/yocto-poky/bitbake/contrib/vim/ftplugin/bitbake.vim
index db0d75319..db0d75319 100644
--- a/bitbake/contrib/vim/ftplugin/bitbake.vim
+++ b/yocto-poky/bitbake/contrib/vim/ftplugin/bitbake.vim
diff --git a/bitbake/contrib/vim/plugin/newbb.vim b/yocto-poky/bitbake/contrib/vim/plugin/newbb.vim
index 874e33805..874e33805 100755
--- a/bitbake/contrib/vim/plugin/newbb.vim
+++ b/yocto-poky/bitbake/contrib/vim/plugin/newbb.vim
diff --git a/bitbake/contrib/vim/syntax/bitbake.vim b/yocto-poky/bitbake/contrib/vim/syntax/bitbake.vim
index fb55f9102..fb55f9102 100644
--- a/bitbake/contrib/vim/syntax/bitbake.vim
+++ b/yocto-poky/bitbake/contrib/vim/syntax/bitbake.vim
diff --git a/bitbake/doc/COPYING.GPL b/yocto-poky/bitbake/doc/COPYING.GPL
index d511905c1..d511905c1 100644
--- a/bitbake/doc/COPYING.GPL
+++ b/yocto-poky/bitbake/doc/COPYING.GPL
diff --git a/bitbake/doc/COPYING.MIT b/yocto-poky/bitbake/doc/COPYING.MIT
index 7e7d57413..7e7d57413 100644
--- a/bitbake/doc/COPYING.MIT
+++ b/yocto-poky/bitbake/doc/COPYING.MIT
diff --git a/bitbake/doc/Makefile b/yocto-poky/bitbake/doc/Makefile
index 3c28f4b22..3c28f4b22 100644
--- a/bitbake/doc/Makefile
+++ b/yocto-poky/bitbake/doc/Makefile
diff --git a/bitbake/doc/README b/yocto-poky/bitbake/doc/README
index 303cf8eec..303cf8eec 100644
--- a/bitbake/doc/README
+++ b/yocto-poky/bitbake/doc/README
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-customization.xsl b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-customization.xsl
index 5985ea783..5985ea783 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-customization.xsl
+++ b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-customization.xsl
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml
index fa52e2989..fa52e2989 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml
+++ b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
index f168cfa68..f168cfa68 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
+++ b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-hello.xml b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-hello.xml
index f3628cf6b..f3628cf6b 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-hello.xml
+++ b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-hello.xml
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml
index 2188655de..2188655de 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml
+++ b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
index 1b9d80010..1b9d80010 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
+++ b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml
index e5aeffcff..e5aeffcff 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml
+++ b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-style.css b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-style.css
index 65da2a4e3..65da2a4e3 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-style.css
+++ b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-style.css
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual.xml b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual.xml
index 7fff933be..7fff933be 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual.xml
+++ b/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual.xml
diff --git a/bitbake/doc/bitbake-user-manual/figures/bitbake-title.png b/yocto-poky/bitbake/doc/bitbake-user-manual/figures/bitbake-title.png
index cb290154d..cb290154d 100644
--- a/bitbake/doc/bitbake-user-manual/figures/bitbake-title.png
+++ b/yocto-poky/bitbake/doc/bitbake-user-manual/figures/bitbake-title.png
diff --git a/bitbake/doc/bitbake-user-manual/html.css b/yocto-poky/bitbake/doc/bitbake-user-manual/html.css
index 6eedfd318..6eedfd318 100644
--- a/bitbake/doc/bitbake-user-manual/html.css
+++ b/yocto-poky/bitbake/doc/bitbake-user-manual/html.css
diff --git a/bitbake/doc/bitbake.1 b/yocto-poky/bitbake/doc/bitbake.1
index a6c8d9727..a6c8d9727 100644
--- a/bitbake/doc/bitbake.1
+++ b/yocto-poky/bitbake/doc/bitbake.1
diff --git a/bitbake/doc/poky.ent b/yocto-poky/bitbake/doc/poky.ent
index c032e1418..c032e1418 100644
--- a/bitbake/doc/poky.ent
+++ b/yocto-poky/bitbake/doc/poky.ent
diff --git a/bitbake/doc/template/Vera.ttf b/yocto-poky/bitbake/doc/template/Vera.ttf
index 58cd6b5e6..58cd6b5e6 100644
--- a/bitbake/doc/template/Vera.ttf
+++ b/yocto-poky/bitbake/doc/template/Vera.ttf
diff --git a/bitbake/doc/template/Vera.xml b/yocto-poky/bitbake/doc/template/Vera.xml
index 3c82043e3..3c82043e3 100644
--- a/bitbake/doc/template/Vera.xml
+++ b/yocto-poky/bitbake/doc/template/Vera.xml
diff --git a/bitbake/doc/template/VeraMoBd.ttf b/yocto-poky/bitbake/doc/template/VeraMoBd.ttf
index 9be6547ed..9be6547ed 100644
--- a/bitbake/doc/template/VeraMoBd.ttf
+++ b/yocto-poky/bitbake/doc/template/VeraMoBd.ttf
diff --git a/bitbake/doc/template/VeraMoBd.xml b/yocto-poky/bitbake/doc/template/VeraMoBd.xml
index 9b33107a4..9b33107a4 100644
--- a/bitbake/doc/template/VeraMoBd.xml
+++ b/yocto-poky/bitbake/doc/template/VeraMoBd.xml
diff --git a/bitbake/doc/template/VeraMono.ttf b/yocto-poky/bitbake/doc/template/VeraMono.ttf
index 139f0b431..139f0b431 100644
--- a/bitbake/doc/template/VeraMono.ttf
+++ b/yocto-poky/bitbake/doc/template/VeraMono.ttf
diff --git a/bitbake/doc/template/VeraMono.xml b/yocto-poky/bitbake/doc/template/VeraMono.xml
index 3a0a86659..3a0a86659 100644
--- a/bitbake/doc/template/VeraMono.xml
+++ b/yocto-poky/bitbake/doc/template/VeraMono.xml
diff --git a/bitbake/doc/template/component.title.xsl b/yocto-poky/bitbake/doc/template/component.title.xsl
index faef04326..faef04326 100644
--- a/bitbake/doc/template/component.title.xsl
+++ b/yocto-poky/bitbake/doc/template/component.title.xsl
diff --git a/bitbake/doc/template/db-pdf.xsl b/yocto-poky/bitbake/doc/template/db-pdf.xsl
index 3dd065a57..3dd065a57 100644
--- a/bitbake/doc/template/db-pdf.xsl
+++ b/yocto-poky/bitbake/doc/template/db-pdf.xsl
diff --git a/bitbake/doc/template/division.title.xsl b/yocto-poky/bitbake/doc/template/division.title.xsl
index 9c843bc7c..9c843bc7c 100644
--- a/bitbake/doc/template/division.title.xsl
+++ b/yocto-poky/bitbake/doc/template/division.title.xsl
diff --git a/bitbake/doc/template/draft.png b/yocto-poky/bitbake/doc/template/draft.png
index 53051a9dd..53051a9dd 100644
--- a/bitbake/doc/template/draft.png
+++ b/yocto-poky/bitbake/doc/template/draft.png
diff --git a/bitbake/doc/template/fop-config.xml b/yocto-poky/bitbake/doc/template/fop-config.xml
index 09cc5ca0f..09cc5ca0f 100644
--- a/bitbake/doc/template/fop-config.xml
+++ b/yocto-poky/bitbake/doc/template/fop-config.xml
diff --git a/bitbake/doc/template/formal.object.heading.xsl b/yocto-poky/bitbake/doc/template/formal.object.heading.xsl
index 4f3900d16..4f3900d16 100644
--- a/bitbake/doc/template/formal.object.heading.xsl
+++ b/yocto-poky/bitbake/doc/template/formal.object.heading.xsl
diff --git a/bitbake/doc/template/gloss-permalinks.xsl b/yocto-poky/bitbake/doc/template/gloss-permalinks.xsl
index 6bf58116f..6bf58116f 100644
--- a/bitbake/doc/template/gloss-permalinks.xsl
+++ b/yocto-poky/bitbake/doc/template/gloss-permalinks.xsl
diff --git a/bitbake/doc/template/permalinks.xsl b/yocto-poky/bitbake/doc/template/permalinks.xsl
index d2a1c1452..d2a1c1452 100644
--- a/bitbake/doc/template/permalinks.xsl
+++ b/yocto-poky/bitbake/doc/template/permalinks.xsl
diff --git a/bitbake/doc/template/section.title.xsl b/yocto-poky/bitbake/doc/template/section.title.xsl
index 5c6ff9a96..5c6ff9a96 100644
--- a/bitbake/doc/template/section.title.xsl
+++ b/yocto-poky/bitbake/doc/template/section.title.xsl
diff --git a/bitbake/doc/template/titlepage.templates.xml b/yocto-poky/bitbake/doc/template/titlepage.templates.xml
index 38ec11a4c..38ec11a4c 100644
--- a/bitbake/doc/template/titlepage.templates.xml
+++ b/yocto-poky/bitbake/doc/template/titlepage.templates.xml
diff --git a/bitbake/doc/tools/docbook-to-pdf b/yocto-poky/bitbake/doc/tools/docbook-to-pdf
index 558ded9e0..558ded9e0 100755
--- a/bitbake/doc/tools/docbook-to-pdf
+++ b/yocto-poky/bitbake/doc/tools/docbook-to-pdf
diff --git a/bitbake/lib/bb/COW.py b/yocto-poky/bitbake/lib/bb/COW.py
index 6917ec378..6917ec378 100644
--- a/bitbake/lib/bb/COW.py
+++ b/yocto-poky/bitbake/lib/bb/COW.py
diff --git a/bitbake/lib/bb/__init__.py b/yocto-poky/bitbake/lib/bb/__init__.py
index ac62d262c..ac62d262c 100644
--- a/bitbake/lib/bb/__init__.py
+++ b/yocto-poky/bitbake/lib/bb/__init__.py
diff --git a/bitbake/lib/bb/build.py b/yocto-poky/bitbake/lib/bb/build.py
index 22428a649..22428a649 100644
--- a/bitbake/lib/bb/build.py
+++ b/yocto-poky/bitbake/lib/bb/build.py
diff --git a/bitbake/lib/bb/cache.py b/yocto-poky/bitbake/lib/bb/cache.py
index ab09b08b5..ab09b08b5 100644
--- a/bitbake/lib/bb/cache.py
+++ b/yocto-poky/bitbake/lib/bb/cache.py
diff --git a/bitbake/lib/bb/cache_extra.py b/yocto-poky/bitbake/lib/bb/cache_extra.py
index 83f4959d6..83f4959d6 100644
--- a/bitbake/lib/bb/cache_extra.py
+++ b/yocto-poky/bitbake/lib/bb/cache_extra.py
diff --git a/bitbake/lib/bb/checksum.py b/yocto-poky/bitbake/lib/bb/checksum.py
index 514ff0b1e..514ff0b1e 100644
--- a/bitbake/lib/bb/checksum.py
+++ b/yocto-poky/bitbake/lib/bb/checksum.py
diff --git a/bitbake/lib/bb/codeparser.py b/yocto-poky/bitbake/lib/bb/codeparser.py
index 82a3af4e0..82a3af4e0 100644
--- a/bitbake/lib/bb/codeparser.py
+++ b/yocto-poky/bitbake/lib/bb/codeparser.py
diff --git a/bitbake/lib/bb/command.py b/yocto-poky/bitbake/lib/bb/command.py
index 74106d143..74106d143 100644
--- a/bitbake/lib/bb/command.py
+++ b/yocto-poky/bitbake/lib/bb/command.py
diff --git a/bitbake/lib/bb/compat.py b/yocto-poky/bitbake/lib/bb/compat.py
index de1923d28..de1923d28 100644
--- a/bitbake/lib/bb/compat.py
+++ b/yocto-poky/bitbake/lib/bb/compat.py
diff --git a/bitbake/lib/bb/cooker.py b/yocto-poky/bitbake/lib/bb/cooker.py
index 4df88818f..4df88818f 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/yocto-poky/bitbake/lib/bb/cooker.py
diff --git a/bitbake/lib/bb/cookerdata.py b/yocto-poky/bitbake/lib/bb/cookerdata.py
index 671c0cb0e..671c0cb0e 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/yocto-poky/bitbake/lib/bb/cookerdata.py
diff --git a/bitbake/lib/bb/daemonize.py b/yocto-poky/bitbake/lib/bb/daemonize.py
index 346a61858..346a61858 100644
--- a/bitbake/lib/bb/daemonize.py
+++ b/yocto-poky/bitbake/lib/bb/daemonize.py
diff --git a/bitbake/lib/bb/data.py b/yocto-poky/bitbake/lib/bb/data.py
index f6415a467..f6415a467 100644
--- a/bitbake/lib/bb/data.py
+++ b/yocto-poky/bitbake/lib/bb/data.py
diff --git a/bitbake/lib/bb/data_smart.py b/yocto-poky/bitbake/lib/bb/data_smart.py
index 70558c15a..70558c15a 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/yocto-poky/bitbake/lib/bb/data_smart.py
diff --git a/bitbake/lib/bb/event.py b/yocto-poky/bitbake/lib/bb/event.py
index 366bc4188..366bc4188 100644
--- a/bitbake/lib/bb/event.py
+++ b/yocto-poky/bitbake/lib/bb/event.py
diff --git a/bitbake/lib/bb/exceptions.py b/yocto-poky/bitbake/lib/bb/exceptions.py
index f182c8fd6..f182c8fd6 100644
--- a/bitbake/lib/bb/exceptions.py
+++ b/yocto-poky/bitbake/lib/bb/exceptions.py
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/yocto-poky/bitbake/lib/bb/fetch2/__init__.py
index a9c044b6a..a9c044b6a 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/yocto-poky/bitbake/lib/bb/fetch2/__init__.py
diff --git a/bitbake/lib/bb/fetch2/bzr.py b/yocto-poky/bitbake/lib/bb/fetch2/bzr.py
index 03e9ac461..03e9ac461 100644
--- a/bitbake/lib/bb/fetch2/bzr.py
+++ b/yocto-poky/bitbake/lib/bb/fetch2/bzr.py
diff --git a/bitbake/lib/bb/fetch2/clearcase.py b/yocto-poky/bitbake/lib/bb/fetch2/clearcase.py
index ba83e7cb6..ba83e7cb6 100644
--- a/bitbake/lib/bb/fetch2/clearcase.py
+++ b/yocto-poky/bitbake/lib/bb/fetch2/clearcase.py
diff --git a/bitbake/lib/bb/fetch2/cvs.py b/yocto-poky/bitbake/lib/bb/fetch2/cvs.py
index d27d96f68..d27d96f68 100644
--- a/bitbake/lib/bb/fetch2/cvs.py
+++ b/yocto-poky/bitbake/lib/bb/fetch2/cvs.py
diff --git a/bitbake/lib/bb/fetch2/git.py b/yocto-poky/bitbake/lib/bb/fetch2/git.py
index 9bd87ad25..9bd87ad25 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/yocto-poky/bitbake/lib/bb/fetch2/git.py
diff --git a/bitbake/lib/bb/fetch2/gitannex.py b/yocto-poky/bitbake/lib/bb/fetch2/gitannex.py
index 0f3789745..0f3789745 100644
--- a/bitbake/lib/bb/fetch2/gitannex.py
+++ b/yocto-poky/bitbake/lib/bb/fetch2/gitannex.py
diff --git a/bitbake/lib/bb/fetch2/gitsm.py b/yocto-poky/bitbake/lib/bb/fetch2/gitsm.py
index 0392e48d1..0392e48d1 100644
--- a/bitbake/lib/bb/fetch2/gitsm.py
+++ b/yocto-poky/bitbake/lib/bb/fetch2/gitsm.py
diff --git a/bitbake/lib/bb/fetch2/hg.py b/yocto-poky/bitbake/lib/bb/fetch2/hg.py
index 3b743ff51..3b743ff51 100644
--- a/bitbake/lib/bb/fetch2/hg.py
+++ b/yocto-poky/bitbake/lib/bb/fetch2/hg.py
diff --git a/bitbake/lib/bb/fetch2/local.py b/yocto-poky/bitbake/lib/bb/fetch2/local.py
index 2d921f7e5..2d921f7e5 100644
--- a/bitbake/lib/bb/fetch2/local.py
+++ b/yocto-poky/bitbake/lib/bb/fetch2/local.py
diff --git a/bitbake/lib/bb/fetch2/osc.py b/yocto-poky/bitbake/lib/bb/fetch2/osc.py
index 3d8779682..3d8779682 100644
--- a/bitbake/lib/bb/fetch2/osc.py
+++ b/yocto-poky/bitbake/lib/bb/fetch2/osc.py
diff --git a/bitbake/lib/bb/fetch2/perforce.py b/yocto-poky/bitbake/lib/bb/fetch2/perforce.py
index 3a10c7ca3..3a10c7ca3 100644
--- a/bitbake/lib/bb/fetch2/perforce.py
+++ b/yocto-poky/bitbake/lib/bb/fetch2/perforce.py
diff --git a/bitbake/lib/bb/fetch2/repo.py b/yocto-poky/bitbake/lib/bb/fetch2/repo.py
index 21678eb7d..21678eb7d 100644
--- a/bitbake/lib/bb/fetch2/repo.py
+++ b/yocto-poky/bitbake/lib/bb/fetch2/repo.py
diff --git a/bitbake/lib/bb/fetch2/sftp.py b/yocto-poky/bitbake/lib/bb/fetch2/sftp.py
index cb2f753a8..cb2f753a8 100644
--- a/bitbake/lib/bb/fetch2/sftp.py
+++ b/yocto-poky/bitbake/lib/bb/fetch2/sftp.py
diff --git a/bitbake/lib/bb/fetch2/ssh.py b/yocto-poky/bitbake/lib/bb/fetch2/ssh.py
index 635578a71..635578a71 100644
--- a/bitbake/lib/bb/fetch2/ssh.py
+++ b/yocto-poky/bitbake/lib/bb/fetch2/ssh.py
diff --git a/bitbake/lib/bb/fetch2/svn.py b/yocto-poky/bitbake/lib/bb/fetch2/svn.py
index 8a291935c..8a291935c 100644
--- a/bitbake/lib/bb/fetch2/svn.py
+++ b/yocto-poky/bitbake/lib/bb/fetch2/svn.py
diff --git a/bitbake/lib/bb/fetch2/wget.py b/yocto-poky/bitbake/lib/bb/fetch2/wget.py
index bd2a8972a..bd2a8972a 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/yocto-poky/bitbake/lib/bb/fetch2/wget.py
diff --git a/bitbake/lib/bb/main.py b/yocto-poky/bitbake/lib/bb/main.py
index c8530fc3d..c8530fc3d 100755
--- a/bitbake/lib/bb/main.py
+++ b/yocto-poky/bitbake/lib/bb/main.py
diff --git a/bitbake/lib/bb/methodpool.py b/yocto-poky/bitbake/lib/bb/methodpool.py
index bf2e9f554..bf2e9f554 100644
--- a/bitbake/lib/bb/methodpool.py
+++ b/yocto-poky/bitbake/lib/bb/methodpool.py
diff --git a/bitbake/lib/bb/monitordisk.py b/yocto-poky/bitbake/lib/bb/monitordisk.py
index 466523c6e..466523c6e 100644
--- a/bitbake/lib/bb/monitordisk.py
+++ b/yocto-poky/bitbake/lib/bb/monitordisk.py
diff --git a/bitbake/lib/bb/msg.py b/yocto-poky/bitbake/lib/bb/msg.py
index 786b5aef4..786b5aef4 100644
--- a/bitbake/lib/bb/msg.py
+++ b/yocto-poky/bitbake/lib/bb/msg.py
diff --git a/bitbake/lib/bb/namedtuple_with_abc.py b/yocto-poky/bitbake/lib/bb/namedtuple_with_abc.py
index 32f2fc642..32f2fc642 100644
--- a/bitbake/lib/bb/namedtuple_with_abc.py
+++ b/yocto-poky/bitbake/lib/bb/namedtuple_with_abc.py
diff --git a/bitbake/lib/bb/parse/__init__.py b/yocto-poky/bitbake/lib/bb/parse/__init__.py
index 67ec71f86..67ec71f86 100644
--- a/bitbake/lib/bb/parse/__init__.py
+++ b/yocto-poky/bitbake/lib/bb/parse/__init__.py
diff --git a/bitbake/lib/bb/parse/ast.py b/yocto-poky/bitbake/lib/bb/parse/ast.py
index 11db1801b..11db1801b 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/yocto-poky/bitbake/lib/bb/parse/ast.py
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/yocto-poky/bitbake/lib/bb/parse/parse_py/BBHandler.py
index ec097baf7..ec097baf7 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/yocto-poky/bitbake/lib/bb/parse/parse_py/BBHandler.py
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/yocto-poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index fbd75b14a..fbd75b14a 100644
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/yocto-poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py
diff --git a/bitbake/lib/bb/parse/parse_py/__init__.py b/yocto-poky/bitbake/lib/bb/parse/parse_py/__init__.py
index 3e658d0de..3e658d0de 100644
--- a/bitbake/lib/bb/parse/parse_py/__init__.py
+++ b/yocto-poky/bitbake/lib/bb/parse/parse_py/__init__.py
diff --git a/bitbake/lib/bb/persist_data.py b/yocto-poky/bitbake/lib/bb/persist_data.py
index 5795bc835..5795bc835 100644
--- a/bitbake/lib/bb/persist_data.py
+++ b/yocto-poky/bitbake/lib/bb/persist_data.py
diff --git a/bitbake/lib/bb/process.py b/yocto-poky/bitbake/lib/bb/process.py
index 1c07f2d9b..1c07f2d9b 100644
--- a/bitbake/lib/bb/process.py
+++ b/yocto-poky/bitbake/lib/bb/process.py
diff --git a/bitbake/lib/bb/providers.py b/yocto-poky/bitbake/lib/bb/providers.py
index 637e1fab9..637e1fab9 100644
--- a/bitbake/lib/bb/providers.py
+++ b/yocto-poky/bitbake/lib/bb/providers.py
diff --git a/bitbake/lib/bb/pysh/__init__.py b/yocto-poky/bitbake/lib/bb/pysh/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/bb/pysh/__init__.py
+++ b/yocto-poky/bitbake/lib/bb/pysh/__init__.py
diff --git a/bitbake/lib/bb/pysh/builtin.py b/yocto-poky/bitbake/lib/bb/pysh/builtin.py
index b748e4a4f..b748e4a4f 100644
--- a/bitbake/lib/bb/pysh/builtin.py
+++ b/yocto-poky/bitbake/lib/bb/pysh/builtin.py
diff --git a/bitbake/lib/bb/pysh/interp.py b/yocto-poky/bitbake/lib/bb/pysh/interp.py
index 25d8c92ec..25d8c92ec 100644
--- a/bitbake/lib/bb/pysh/interp.py
+++ b/yocto-poky/bitbake/lib/bb/pysh/interp.py
diff --git a/bitbake/lib/bb/pysh/lsprof.py b/yocto-poky/bitbake/lib/bb/pysh/lsprof.py
index b1831c22a..b1831c22a 100644
--- a/bitbake/lib/bb/pysh/lsprof.py
+++ b/yocto-poky/bitbake/lib/bb/pysh/lsprof.py
diff --git a/bitbake/lib/bb/pysh/pysh.py b/yocto-poky/bitbake/lib/bb/pysh/pysh.py
index b4e6145b5..b4e6145b5 100644
--- a/bitbake/lib/bb/pysh/pysh.py
+++ b/yocto-poky/bitbake/lib/bb/pysh/pysh.py
diff --git a/bitbake/lib/bb/pysh/pyshlex.py b/yocto-poky/bitbake/lib/bb/pysh/pyshlex.py
index b30123675..b30123675 100644
--- a/bitbake/lib/bb/pysh/pyshlex.py
+++ b/yocto-poky/bitbake/lib/bb/pysh/pyshlex.py
diff --git a/bitbake/lib/bb/pysh/pyshyacc.py b/yocto-poky/bitbake/lib/bb/pysh/pyshyacc.py
index e8e80aac4..e8e80aac4 100644
--- a/bitbake/lib/bb/pysh/pyshyacc.py
+++ b/yocto-poky/bitbake/lib/bb/pysh/pyshyacc.py
diff --git a/bitbake/lib/bb/pysh/sherrors.py b/yocto-poky/bitbake/lib/bb/pysh/sherrors.py
index 49d0533de..49d0533de 100644
--- a/bitbake/lib/bb/pysh/sherrors.py
+++ b/yocto-poky/bitbake/lib/bb/pysh/sherrors.py
diff --git a/bitbake/lib/bb/pysh/subprocess_fix.py b/yocto-poky/bitbake/lib/bb/pysh/subprocess_fix.py
index 46eca2280..46eca2280 100644
--- a/bitbake/lib/bb/pysh/subprocess_fix.py
+++ b/yocto-poky/bitbake/lib/bb/pysh/subprocess_fix.py
diff --git a/bitbake/lib/bb/runqueue.py b/yocto-poky/bitbake/lib/bb/runqueue.py
index 878028aa9..878028aa9 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/yocto-poky/bitbake/lib/bb/runqueue.py
diff --git a/bitbake/lib/bb/server/__init__.py b/yocto-poky/bitbake/lib/bb/server/__init__.py
index da5e48074..da5e48074 100644
--- a/bitbake/lib/bb/server/__init__.py
+++ b/yocto-poky/bitbake/lib/bb/server/__init__.py
diff --git a/bitbake/lib/bb/server/process.py b/yocto-poky/bitbake/lib/bb/server/process.py
index 5fca3508b..5fca3508b 100644
--- a/bitbake/lib/bb/server/process.py
+++ b/yocto-poky/bitbake/lib/bb/server/process.py
diff --git a/bitbake/lib/bb/server/xmlrpc.py b/yocto-poky/bitbake/lib/bb/server/xmlrpc.py
index b7647c198..b7647c198 100644
--- a/bitbake/lib/bb/server/xmlrpc.py
+++ b/yocto-poky/bitbake/lib/bb/server/xmlrpc.py
diff --git a/bitbake/lib/bb/shell.py b/yocto-poky/bitbake/lib/bb/shell.py
index 1dd8d54bd..1dd8d54bd 100644
--- a/bitbake/lib/bb/shell.py
+++ b/yocto-poky/bitbake/lib/bb/shell.py
diff --git a/bitbake/lib/bb/siggen.py b/yocto-poky/bitbake/lib/bb/siggen.py
index 0352e4523..0352e4523 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/yocto-poky/bitbake/lib/bb/siggen.py
diff --git a/bitbake/lib/bb/taskdata.py b/yocto-poky/bitbake/lib/bb/taskdata.py
index 4d12b3325..4d12b3325 100644
--- a/bitbake/lib/bb/taskdata.py
+++ b/yocto-poky/bitbake/lib/bb/taskdata.py
diff --git a/bitbake/lib/bb/tests/__init__.py b/yocto-poky/bitbake/lib/bb/tests/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/bb/tests/__init__.py
+++ b/yocto-poky/bitbake/lib/bb/tests/__init__.py
diff --git a/bitbake/lib/bb/tests/codeparser.py b/yocto-poky/bitbake/lib/bb/tests/codeparser.py
index 4454bc51e..4454bc51e 100644
--- a/bitbake/lib/bb/tests/codeparser.py
+++ b/yocto-poky/bitbake/lib/bb/tests/codeparser.py
diff --git a/bitbake/lib/bb/tests/cow.py b/yocto-poky/bitbake/lib/bb/tests/cow.py
index 35c5841f3..35c5841f3 100644
--- a/bitbake/lib/bb/tests/cow.py
+++ b/yocto-poky/bitbake/lib/bb/tests/cow.py
diff --git a/bitbake/lib/bb/tests/data.py b/yocto-poky/bitbake/lib/bb/tests/data.py
index e9aab577f..e9aab577f 100644
--- a/bitbake/lib/bb/tests/data.py
+++ b/yocto-poky/bitbake/lib/bb/tests/data.py
diff --git a/bitbake/lib/bb/tests/fetch.py b/yocto-poky/bitbake/lib/bb/tests/fetch.py
index 94173c14a..94173c14a 100644
--- a/bitbake/lib/bb/tests/fetch.py
+++ b/yocto-poky/bitbake/lib/bb/tests/fetch.py
diff --git a/bitbake/lib/bb/tests/parse.py b/yocto-poky/bitbake/lib/bb/tests/parse.py
index 6beb76a48..6beb76a48 100644
--- a/bitbake/lib/bb/tests/parse.py
+++ b/yocto-poky/bitbake/lib/bb/tests/parse.py
diff --git a/bitbake/lib/bb/tests/utils.py b/yocto-poky/bitbake/lib/bb/tests/utils.py
index a035ccf17..a035ccf17 100644
--- a/bitbake/lib/bb/tests/utils.py
+++ b/yocto-poky/bitbake/lib/bb/tests/utils.py
diff --git a/bitbake/lib/bb/tinfoil.py b/yocto-poky/bitbake/lib/bb/tinfoil.py
index 7aa653f1a..7aa653f1a 100644
--- a/bitbake/lib/bb/tinfoil.py
+++ b/yocto-poky/bitbake/lib/bb/tinfoil.py
diff --git a/bitbake/lib/bb/ui/__init__.py b/yocto-poky/bitbake/lib/bb/ui/__init__.py
index a4805ed02..a4805ed02 100644
--- a/bitbake/lib/bb/ui/__init__.py
+++ b/yocto-poky/bitbake/lib/bb/ui/__init__.py
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/yocto-poky/bitbake/lib/bb/ui/buildinfohelper.py
index 78f1e9274..78f1e9274 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/yocto-poky/bitbake/lib/bb/ui/buildinfohelper.py
diff --git a/bitbake/lib/bb/ui/crumbs/__init__.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/__init__.py
index b7cbe1a4f..b7cbe1a4f 100644
--- a/bitbake/lib/bb/ui/crumbs/__init__.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/__init__.py
diff --git a/bitbake/lib/bb/ui/crumbs/builddetailspage.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/builddetailspage.py
index 7fc690e2f..7fc690e2f 100755
--- a/bitbake/lib/bb/ui/crumbs/builddetailspage.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/builddetailspage.py
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/builder.py
index dcc410426..dcc410426 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/builder.py
diff --git a/bitbake/lib/bb/ui/crumbs/buildmanager.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/buildmanager.py
index e858d75e4..e858d75e4 100644
--- a/bitbake/lib/bb/ui/crumbs/buildmanager.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/buildmanager.py
diff --git a/bitbake/lib/bb/ui/crumbs/hig/__init__.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/__init__.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/__init__.py
diff --git a/bitbake/lib/bb/ui/crumbs/hig/advancedsettingsdialog.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/advancedsettingsdialog.py
index e0b3553c2..e0b3553c2 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/advancedsettingsdialog.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/advancedsettingsdialog.py
diff --git a/bitbake/lib/bb/ui/crumbs/hig/crumbsdialog.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/crumbsdialog.py
index c679f9a07..c679f9a07 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/crumbsdialog.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/crumbsdialog.py
diff --git a/bitbake/lib/bb/ui/crumbs/hig/crumbsmessagedialog.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/crumbsmessagedialog.py
index 3b998e463..3b998e463 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/crumbsmessagedialog.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/crumbsmessagedialog.py
diff --git a/bitbake/lib/bb/ui/crumbs/hig/deployimagedialog.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/deployimagedialog.py
index a13fff906..a13fff906 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/deployimagedialog.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/deployimagedialog.py
diff --git a/bitbake/lib/bb/ui/crumbs/hig/imageselectiondialog.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/imageselectiondialog.py
index 21216adc9..21216adc9 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/imageselectiondialog.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/imageselectiondialog.py
diff --git a/bitbake/lib/bb/ui/crumbs/hig/layerselectiondialog.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/layerselectiondialog.py
index 52d57b673..52d57b673 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/layerselectiondialog.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/layerselectiondialog.py
diff --git a/bitbake/lib/bb/ui/crumbs/hig/parsingwarningsdialog.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/parsingwarningsdialog.py
index 33bac39db..33bac39db 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/parsingwarningsdialog.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/parsingwarningsdialog.py
diff --git a/bitbake/lib/bb/ui/crumbs/hig/propertydialog.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/propertydialog.py
index 09b9ce6de..09b9ce6de 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/propertydialog.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/propertydialog.py
diff --git a/bitbake/lib/bb/ui/crumbs/hig/proxydetailsdialog.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/proxydetailsdialog.py
index 69e7dffb6..69e7dffb6 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/proxydetailsdialog.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/proxydetailsdialog.py
diff --git a/bitbake/lib/bb/ui/crumbs/hig/retrieveimagedialog.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/retrieveimagedialog.py
index 901713985..901713985 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/retrieveimagedialog.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/retrieveimagedialog.py
diff --git a/bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py
index 4195f70e1..4195f70e1 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py
diff --git a/bitbake/lib/bb/ui/crumbs/hig/settingsuihelper.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/settingsuihelper.py
index e0285c93c..e0285c93c 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/settingsuihelper.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/settingsuihelper.py
diff --git a/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py
index b5eb3d873..b5eb3d873 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py
diff --git a/bitbake/lib/bb/ui/crumbs/hobcolor.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hobcolor.py
index 3316542a2..3316542a2 100644
--- a/bitbake/lib/bb/ui/crumbs/hobcolor.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hobcolor.py
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index b71fb33d3..b71fb33d3 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
diff --git a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
index 50df156f4..50df156f4 100644
--- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
diff --git a/bitbake/lib/bb/ui/crumbs/hobpages.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hobpages.py
index 0fd3598c3..0fd3598c3 100755
--- a/bitbake/lib/bb/ui/crumbs/hobpages.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hobpages.py
diff --git a/bitbake/lib/bb/ui/crumbs/hobwidget.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/hobwidget.py
index 2b969c146..2b969c146 100644
--- a/bitbake/lib/bb/ui/crumbs/hobwidget.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/hobwidget.py
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index 2766bea8c..2766bea8c 100644
--- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
diff --git a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/imagedetailspage.py
index 352e9489f..352e9489f 100755
--- a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/imagedetailspage.py
diff --git a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
index 7c62b36e6..7c62b36e6 100755
--- a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
diff --git a/bitbake/lib/bb/ui/crumbs/persistenttooltip.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/persistenttooltip.py
index 927c19429..927c19429 100644
--- a/bitbake/lib/bb/ui/crumbs/persistenttooltip.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/persistenttooltip.py
diff --git a/bitbake/lib/bb/ui/crumbs/progress.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/progress.py
index 1d28a111b..1d28a111b 100644
--- a/bitbake/lib/bb/ui/crumbs/progress.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/progress.py
diff --git a/bitbake/lib/bb/ui/crumbs/progressbar.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/progressbar.py
index 3e2c660e4..3e2c660e4 100644
--- a/bitbake/lib/bb/ui/crumbs/progressbar.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/progressbar.py
diff --git a/bitbake/lib/bb/ui/crumbs/puccho.glade b/yocto-poky/bitbake/lib/bb/ui/crumbs/puccho.glade
index d7553a6e1..d7553a6e1 100644
--- a/bitbake/lib/bb/ui/crumbs/puccho.glade
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/puccho.glade
diff --git a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
index 58db43f70..58db43f70 100755
--- a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
diff --git a/bitbake/lib/bb/ui/crumbs/runningbuild.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/runningbuild.py
index 16a955d2b..16a955d2b 100644
--- a/bitbake/lib/bb/ui/crumbs/runningbuild.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/runningbuild.py
diff --git a/bitbake/lib/bb/ui/crumbs/sanitycheckpage.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/sanitycheckpage.py
index 76ce2ecc2..76ce2ecc2 100644
--- a/bitbake/lib/bb/ui/crumbs/sanitycheckpage.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/sanitycheckpage.py
diff --git a/bitbake/lib/bb/ui/crumbs/utils.py b/yocto-poky/bitbake/lib/bb/ui/crumbs/utils.py
index 939864fa6..939864fa6 100644
--- a/bitbake/lib/bb/ui/crumbs/utils.py
+++ b/yocto-poky/bitbake/lib/bb/ui/crumbs/utils.py
diff --git a/bitbake/lib/bb/ui/depexp.py b/yocto-poky/bitbake/lib/bb/ui/depexp.py
index 240aafc3e..240aafc3e 100644
--- a/bitbake/lib/bb/ui/depexp.py
+++ b/yocto-poky/bitbake/lib/bb/ui/depexp.py
diff --git a/bitbake/lib/bb/ui/goggle.py b/yocto-poky/bitbake/lib/bb/ui/goggle.py
index f4ee7b41a..f4ee7b41a 100644
--- a/bitbake/lib/bb/ui/goggle.py
+++ b/yocto-poky/bitbake/lib/bb/ui/goggle.py
diff --git a/bitbake/lib/bb/ui/hob.py b/yocto-poky/bitbake/lib/bb/ui/hob.py
index da5b41189..da5b41189 100755
--- a/bitbake/lib/bb/ui/hob.py
+++ b/yocto-poky/bitbake/lib/bb/ui/hob.py
diff --git a/bitbake/lib/bb/ui/icons/images/images_display.png b/yocto-poky/bitbake/lib/bb/ui/icons/images/images_display.png
index a7f87101a..a7f87101a 100644
--- a/bitbake/lib/bb/ui/icons/images/images_display.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/images/images_display.png
diff --git a/bitbake/lib/bb/ui/icons/images/images_hover.png b/yocto-poky/bitbake/lib/bb/ui/icons/images/images_hover.png
index 2d9cd99b8..2d9cd99b8 100644
--- a/bitbake/lib/bb/ui/icons/images/images_hover.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/images/images_hover.png
diff --git a/bitbake/lib/bb/ui/icons/indicators/add-hover.png b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/add-hover.png
index 526df770d..526df770d 100644
--- a/bitbake/lib/bb/ui/icons/indicators/add-hover.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/add-hover.png
diff --git a/bitbake/lib/bb/ui/icons/indicators/add.png b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/add.png
index 31e7090d6..31e7090d6 100644
--- a/bitbake/lib/bb/ui/icons/indicators/add.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/add.png
diff --git a/bitbake/lib/bb/ui/icons/indicators/alert.png b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/alert.png
index d1c6f55a2..d1c6f55a2 100644
--- a/bitbake/lib/bb/ui/icons/indicators/alert.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/alert.png
diff --git a/bitbake/lib/bb/ui/icons/indicators/confirmation.png b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/confirmation.png
index 3a5402d1e..3a5402d1e 100644
--- a/bitbake/lib/bb/ui/icons/indicators/confirmation.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/confirmation.png
diff --git a/bitbake/lib/bb/ui/icons/indicators/denied.png b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/denied.png
index ee35c7def..ee35c7def 100644
--- a/bitbake/lib/bb/ui/icons/indicators/denied.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/denied.png
diff --git a/bitbake/lib/bb/ui/icons/indicators/error.png b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/error.png
index d06a8c151..d06a8c151 100644
--- a/bitbake/lib/bb/ui/icons/indicators/error.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/error.png
diff --git a/bitbake/lib/bb/ui/icons/indicators/info.png b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/info.png
index ee8e8d846..ee8e8d846 100644
--- a/bitbake/lib/bb/ui/icons/indicators/info.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/info.png
diff --git a/bitbake/lib/bb/ui/icons/indicators/issues.png b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/issues.png
index b0c746133..b0c746133 100644
--- a/bitbake/lib/bb/ui/icons/indicators/issues.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/issues.png
diff --git a/bitbake/lib/bb/ui/icons/indicators/refresh.png b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/refresh.png
index eb6c419db..eb6c419db 100644
--- a/bitbake/lib/bb/ui/icons/indicators/refresh.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/refresh.png
diff --git a/bitbake/lib/bb/ui/icons/indicators/remove-hover.png b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/remove-hover.png
index aa57c6998..aa57c6998 100644
--- a/bitbake/lib/bb/ui/icons/indicators/remove-hover.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/remove-hover.png
diff --git a/bitbake/lib/bb/ui/icons/indicators/remove.png b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/remove.png
index 05c3c293d..05c3c293d 100644
--- a/bitbake/lib/bb/ui/icons/indicators/remove.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/remove.png
diff --git a/bitbake/lib/bb/ui/icons/indicators/tick.png b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/tick.png
index beaad361c..beaad361c 100644
--- a/bitbake/lib/bb/ui/icons/indicators/tick.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/indicators/tick.png
diff --git a/bitbake/lib/bb/ui/icons/info/info_display.png b/yocto-poky/bitbake/lib/bb/ui/icons/info/info_display.png
index 5afbba29f..5afbba29f 100644
--- a/bitbake/lib/bb/ui/icons/info/info_display.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/info/info_display.png
diff --git a/bitbake/lib/bb/ui/icons/info/info_hover.png b/yocto-poky/bitbake/lib/bb/ui/icons/info/info_hover.png
index f9d294dfa..f9d294dfa 100644
--- a/bitbake/lib/bb/ui/icons/info/info_hover.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/info/info_hover.png
diff --git a/bitbake/lib/bb/ui/icons/layers/layers_display.png b/yocto-poky/bitbake/lib/bb/ui/icons/layers/layers_display.png
index b7f9053a9..b7f9053a9 100644
--- a/bitbake/lib/bb/ui/icons/layers/layers_display.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/layers/layers_display.png
diff --git a/bitbake/lib/bb/ui/icons/layers/layers_hover.png b/yocto-poky/bitbake/lib/bb/ui/icons/layers/layers_hover.png
index 0bf3ce0db..0bf3ce0db 100644
--- a/bitbake/lib/bb/ui/icons/layers/layers_hover.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/layers/layers_hover.png
diff --git a/bitbake/lib/bb/ui/icons/packages/packages_display.png b/yocto-poky/bitbake/lib/bb/ui/icons/packages/packages_display.png
index f5d0a5064..f5d0a5064 100644
--- a/bitbake/lib/bb/ui/icons/packages/packages_display.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/packages/packages_display.png
diff --git a/bitbake/lib/bb/ui/icons/packages/packages_hover.png b/yocto-poky/bitbake/lib/bb/ui/icons/packages/packages_hover.png
index c081165f3..c081165f3 100644
--- a/bitbake/lib/bb/ui/icons/packages/packages_hover.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/packages/packages_hover.png
diff --git a/bitbake/lib/bb/ui/icons/recipe/recipe_display.png b/yocto-poky/bitbake/lib/bb/ui/icons/recipe/recipe_display.png
index e9809bc7d..e9809bc7d 100644
--- a/bitbake/lib/bb/ui/icons/recipe/recipe_display.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/recipe/recipe_display.png
diff --git a/bitbake/lib/bb/ui/icons/recipe/recipe_hover.png b/yocto-poky/bitbake/lib/bb/ui/icons/recipe/recipe_hover.png
index 7e48da9af..7e48da9af 100644
--- a/bitbake/lib/bb/ui/icons/recipe/recipe_hover.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/recipe/recipe_hover.png
diff --git a/bitbake/lib/bb/ui/icons/settings/settings_display.png b/yocto-poky/bitbake/lib/bb/ui/icons/settings/settings_display.png
index 88c464db0..88c464db0 100644
--- a/bitbake/lib/bb/ui/icons/settings/settings_display.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/settings/settings_display.png
diff --git a/bitbake/lib/bb/ui/icons/settings/settings_hover.png b/yocto-poky/bitbake/lib/bb/ui/icons/settings/settings_hover.png
index d92a0bf2c..d92a0bf2c 100644
--- a/bitbake/lib/bb/ui/icons/settings/settings_hover.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/settings/settings_hover.png
diff --git a/bitbake/lib/bb/ui/icons/templates/templates_display.png b/yocto-poky/bitbake/lib/bb/ui/icons/templates/templates_display.png
index 153c7afb6..153c7afb6 100644
--- a/bitbake/lib/bb/ui/icons/templates/templates_display.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/templates/templates_display.png
diff --git a/bitbake/lib/bb/ui/icons/templates/templates_hover.png b/yocto-poky/bitbake/lib/bb/ui/icons/templates/templates_hover.png
index afb7165fe..afb7165fe 100644
--- a/bitbake/lib/bb/ui/icons/templates/templates_hover.png
+++ b/yocto-poky/bitbake/lib/bb/ui/icons/templates/templates_hover.png
diff --git a/bitbake/lib/bb/ui/knotty.py b/yocto-poky/bitbake/lib/bb/ui/knotty.py
index 90c318376..90c318376 100644
--- a/bitbake/lib/bb/ui/knotty.py
+++ b/yocto-poky/bitbake/lib/bb/ui/knotty.py
diff --git a/bitbake/lib/bb/ui/ncurses.py b/yocto-poky/bitbake/lib/bb/ui/ncurses.py
index 9589a77d7..9589a77d7 100644
--- a/bitbake/lib/bb/ui/ncurses.py
+++ b/yocto-poky/bitbake/lib/bb/ui/ncurses.py
diff --git a/bitbake/lib/bb/ui/puccho.py b/yocto-poky/bitbake/lib/bb/ui/puccho.py
index 3ce4590c1..3ce4590c1 100644
--- a/bitbake/lib/bb/ui/puccho.py
+++ b/yocto-poky/bitbake/lib/bb/ui/puccho.py
diff --git a/bitbake/lib/bb/ui/toasterui.py b/yocto-poky/bitbake/lib/bb/ui/toasterui.py
index 3d261503e..3d261503e 100644
--- a/bitbake/lib/bb/ui/toasterui.py
+++ b/yocto-poky/bitbake/lib/bb/ui/toasterui.py
diff --git a/bitbake/lib/bb/ui/uievent.py b/yocto-poky/bitbake/lib/bb/ui/uievent.py
index 7fc50c759..7fc50c759 100644
--- a/bitbake/lib/bb/ui/uievent.py
+++ b/yocto-poky/bitbake/lib/bb/ui/uievent.py
diff --git a/bitbake/lib/bb/ui/uihelper.py b/yocto-poky/bitbake/lib/bb/ui/uihelper.py
index a703387fb..a703387fb 100644
--- a/bitbake/lib/bb/ui/uihelper.py
+++ b/yocto-poky/bitbake/lib/bb/ui/uihelper.py
diff --git a/bitbake/lib/bb/utils.py b/yocto-poky/bitbake/lib/bb/utils.py
index 31ec2b7c9..31ec2b7c9 100644
--- a/bitbake/lib/bb/utils.py
+++ b/yocto-poky/bitbake/lib/bb/utils.py
diff --git a/bitbake/lib/bs4/AUTHORS.txt b/yocto-poky/bitbake/lib/bs4/AUTHORS.txt
index 2ac8fcc8c..2ac8fcc8c 100644
--- a/bitbake/lib/bs4/AUTHORS.txt
+++ b/yocto-poky/bitbake/lib/bs4/AUTHORS.txt
diff --git a/bitbake/lib/bs4/COPYING.txt b/yocto-poky/bitbake/lib/bs4/COPYING.txt
index d668d13f0..d668d13f0 100644
--- a/bitbake/lib/bs4/COPYING.txt
+++ b/yocto-poky/bitbake/lib/bs4/COPYING.txt
diff --git a/bitbake/lib/bs4/NEWS.txt b/yocto-poky/bitbake/lib/bs4/NEWS.txt
index 88a60a245..88a60a245 100644
--- a/bitbake/lib/bs4/NEWS.txt
+++ b/yocto-poky/bitbake/lib/bs4/NEWS.txt
diff --git a/bitbake/lib/bs4/__init__.py b/yocto-poky/bitbake/lib/bs4/__init__.py
index 7ba34269a..7ba34269a 100644
--- a/bitbake/lib/bs4/__init__.py
+++ b/yocto-poky/bitbake/lib/bs4/__init__.py
diff --git a/bitbake/lib/bs4/builder/__init__.py b/yocto-poky/bitbake/lib/bs4/builder/__init__.py
index 740f5f29c..740f5f29c 100644
--- a/bitbake/lib/bs4/builder/__init__.py
+++ b/yocto-poky/bitbake/lib/bs4/builder/__init__.py
diff --git a/bitbake/lib/bs4/builder/_html5lib.py b/yocto-poky/bitbake/lib/bs4/builder/_html5lib.py
index 7de36ae75..7de36ae75 100644
--- a/bitbake/lib/bs4/builder/_html5lib.py
+++ b/yocto-poky/bitbake/lib/bs4/builder/_html5lib.py
diff --git a/bitbake/lib/bs4/builder/_htmlparser.py b/yocto-poky/bitbake/lib/bs4/builder/_htmlparser.py
index ca8d8b892..ca8d8b892 100644
--- a/bitbake/lib/bs4/builder/_htmlparser.py
+++ b/yocto-poky/bitbake/lib/bs4/builder/_htmlparser.py
diff --git a/bitbake/lib/bs4/builder/_lxml.py b/yocto-poky/bitbake/lib/bs4/builder/_lxml.py
index fa5d49875..fa5d49875 100644
--- a/bitbake/lib/bs4/builder/_lxml.py
+++ b/yocto-poky/bitbake/lib/bs4/builder/_lxml.py
diff --git a/bitbake/lib/bs4/dammit.py b/yocto-poky/bitbake/lib/bs4/dammit.py
index 59640b7ce..59640b7ce 100644
--- a/bitbake/lib/bs4/dammit.py
+++ b/yocto-poky/bitbake/lib/bs4/dammit.py
diff --git a/bitbake/lib/bs4/diagnose.py b/yocto-poky/bitbake/lib/bs4/diagnose.py
index 4d0b00afa..4d0b00afa 100644
--- a/bitbake/lib/bs4/diagnose.py
+++ b/yocto-poky/bitbake/lib/bs4/diagnose.py
diff --git a/bitbake/lib/bs4/element.py b/yocto-poky/bitbake/lib/bs4/element.py
index da9afdf48..da9afdf48 100644
--- a/bitbake/lib/bs4/element.py
+++ b/yocto-poky/bitbake/lib/bs4/element.py
diff --git a/bitbake/lib/bs4/testing.py b/yocto-poky/bitbake/lib/bs4/testing.py
index fd4495ac5..fd4495ac5 100644
--- a/bitbake/lib/bs4/testing.py
+++ b/yocto-poky/bitbake/lib/bs4/testing.py
diff --git a/bitbake/lib/bs4/tests/__init__.py b/yocto-poky/bitbake/lib/bs4/tests/__init__.py
index 142c8cc3f..142c8cc3f 100644
--- a/bitbake/lib/bs4/tests/__init__.py
+++ b/yocto-poky/bitbake/lib/bs4/tests/__init__.py
diff --git a/bitbake/lib/bs4/tests/test_builder_registry.py b/yocto-poky/bitbake/lib/bs4/tests/test_builder_registry.py
index 92ad10fb0..92ad10fb0 100644
--- a/bitbake/lib/bs4/tests/test_builder_registry.py
+++ b/yocto-poky/bitbake/lib/bs4/tests/test_builder_registry.py
diff --git a/bitbake/lib/bs4/tests/test_docs.py b/yocto-poky/bitbake/lib/bs4/tests/test_docs.py
index 5b9f67709..5b9f67709 100644
--- a/bitbake/lib/bs4/tests/test_docs.py
+++ b/yocto-poky/bitbake/lib/bs4/tests/test_docs.py
diff --git a/bitbake/lib/bs4/tests/test_html5lib.py b/yocto-poky/bitbake/lib/bs4/tests/test_html5lib.py
index 594c3e1f2..594c3e1f2 100644
--- a/bitbake/lib/bs4/tests/test_html5lib.py
+++ b/yocto-poky/bitbake/lib/bs4/tests/test_html5lib.py
diff --git a/bitbake/lib/bs4/tests/test_htmlparser.py b/yocto-poky/bitbake/lib/bs4/tests/test_htmlparser.py
index bcb5ed232..bcb5ed232 100644
--- a/bitbake/lib/bs4/tests/test_htmlparser.py
+++ b/yocto-poky/bitbake/lib/bs4/tests/test_htmlparser.py
diff --git a/bitbake/lib/bs4/tests/test_lxml.py b/yocto-poky/bitbake/lib/bs4/tests/test_lxml.py
index 2b2e9b7e7..2b2e9b7e7 100644
--- a/bitbake/lib/bs4/tests/test_lxml.py
+++ b/yocto-poky/bitbake/lib/bs4/tests/test_lxml.py
diff --git a/bitbake/lib/bs4/tests/test_soup.py b/yocto-poky/bitbake/lib/bs4/tests/test_soup.py
index 47ac245f9..47ac245f9 100644
--- a/bitbake/lib/bs4/tests/test_soup.py
+++ b/yocto-poky/bitbake/lib/bs4/tests/test_soup.py
diff --git a/bitbake/lib/bs4/tests/test_tree.py b/yocto-poky/bitbake/lib/bs4/tests/test_tree.py
index f8515c0ea..f8515c0ea 100644
--- a/bitbake/lib/bs4/tests/test_tree.py
+++ b/yocto-poky/bitbake/lib/bs4/tests/test_tree.py
diff --git a/bitbake/lib/codegen.py b/yocto-poky/bitbake/lib/codegen.py
index be772d510..be772d510 100644
--- a/bitbake/lib/codegen.py
+++ b/yocto-poky/bitbake/lib/codegen.py
diff --git a/bitbake/lib/ply/__init__.py b/yocto-poky/bitbake/lib/ply/__init__.py
index 853a98554..853a98554 100644
--- a/bitbake/lib/ply/__init__.py
+++ b/yocto-poky/bitbake/lib/ply/__init__.py
diff --git a/bitbake/lib/ply/lex.py b/yocto-poky/bitbake/lib/ply/lex.py
index 267ec100f..267ec100f 100644
--- a/bitbake/lib/ply/lex.py
+++ b/yocto-poky/bitbake/lib/ply/lex.py
diff --git a/bitbake/lib/ply/yacc.py b/yocto-poky/bitbake/lib/ply/yacc.py
index 6168fd9a0..6168fd9a0 100644
--- a/bitbake/lib/ply/yacc.py
+++ b/yocto-poky/bitbake/lib/ply/yacc.py
diff --git a/bitbake/lib/progressbar.py b/yocto-poky/bitbake/lib/progressbar.py
index 114cdc16b..114cdc16b 100644
--- a/bitbake/lib/progressbar.py
+++ b/yocto-poky/bitbake/lib/progressbar.py
diff --git a/bitbake/lib/prserv/__init__.py b/yocto-poky/bitbake/lib/prserv/__init__.py
index c3cb73ad9..c3cb73ad9 100644
--- a/bitbake/lib/prserv/__init__.py
+++ b/yocto-poky/bitbake/lib/prserv/__init__.py
diff --git a/bitbake/lib/prserv/db.py b/yocto-poky/bitbake/lib/prserv/db.py
index 36c9f7b63..36c9f7b63 100644
--- a/bitbake/lib/prserv/db.py
+++ b/yocto-poky/bitbake/lib/prserv/db.py
diff --git a/bitbake/lib/prserv/serv.py b/yocto-poky/bitbake/lib/prserv/serv.py
index eafc3aab7..eafc3aab7 100644
--- a/bitbake/lib/prserv/serv.py
+++ b/yocto-poky/bitbake/lib/prserv/serv.py
diff --git a/bitbake/lib/pyinotify.py b/yocto-poky/bitbake/lib/pyinotify.py
index 2dae00211..2dae00211 100644
--- a/bitbake/lib/pyinotify.py
+++ b/yocto-poky/bitbake/lib/pyinotify.py
diff --git a/bitbake/lib/toaster/__init__.py b/yocto-poky/bitbake/lib/toaster/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/toaster/__init__.py
+++ b/yocto-poky/bitbake/lib/toaster/__init__.py
diff --git a/bitbake/lib/toaster/bldcollector/__init__.py b/yocto-poky/bitbake/lib/toaster/bldcollector/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/toaster/bldcollector/__init__.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcollector/__init__.py
diff --git a/bitbake/lib/toaster/bldcollector/admin.py b/yocto-poky/bitbake/lib/toaster/bldcollector/admin.py
index c1f85d73d..c1f85d73d 100644
--- a/bitbake/lib/toaster/bldcollector/admin.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcollector/admin.py
diff --git a/bitbake/lib/toaster/bldcollector/urls.py b/yocto-poky/bitbake/lib/toaster/bldcollector/urls.py
index 144387b56..144387b56 100644
--- a/bitbake/lib/toaster/bldcollector/urls.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcollector/urls.py
diff --git a/bitbake/lib/toaster/bldcollector/views.py b/yocto-poky/bitbake/lib/toaster/bldcollector/views.py
index f32fa4d22..f32fa4d22 100644
--- a/bitbake/lib/toaster/bldcollector/views.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcollector/views.py
diff --git a/bitbake/lib/toaster/bldcontrol/__init__.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/toaster/bldcontrol/__init__.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/__init__.py
diff --git a/bitbake/lib/toaster/bldcontrol/admin.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/admin.py
index fcbe5f593..fcbe5f593 100644
--- a/bitbake/lib/toaster/bldcontrol/admin.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/admin.py
diff --git a/bitbake/lib/toaster/bldcontrol/bbcontroller.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/bbcontroller.py
index ad70ac8b5..ad70ac8b5 100644
--- a/bitbake/lib/toaster/bldcontrol/bbcontroller.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/bbcontroller.py
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index b5cf5591f..b5cf5591f 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
diff --git a/bitbake/lib/toaster/bldcontrol/management/__init__.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/management/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/toaster/bldcontrol/management/__init__.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/management/__init__.py
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/__init__.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/management/commands/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/toaster/bldcontrol/management/commands/__init__.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/management/commands/__init__.py
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
index 5e70437b2..5e70437b2 100644
--- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py
index 5022b5940..5022b5940 100644
--- a/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
index 48dc618bc..48dc618bc 100644
--- a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0001_initial.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0001_initial.py
index a7e6350a6..a7e6350a6 100644
--- a/bitbake/lib/toaster/bldcontrol/migrations/0001_initial.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0001_initial.py
diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0002_auto__add_field_buildenvironment_sourcedir__add_field_buildenvironment.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0002_auto__add_field_buildenvironment_sourcedir__add_field_buildenvironment.py
index f522a500b..f522a500b 100644
--- a/bitbake/lib/toaster/bldcontrol/migrations/0002_auto__add_field_buildenvironment_sourcedir__add_field_buildenvironment.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0002_auto__add_field_buildenvironment_sourcedir__add_field_buildenvironment.py
diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0003_auto__add_field_brlayer_dirpath.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0003_auto__add_field_brlayer_dirpath.py
index b9ba838d9..b9ba838d9 100644
--- a/bitbake/lib/toaster/bldcontrol/migrations/0003_auto__add_field_brlayer_dirpath.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0003_auto__add_field_brlayer_dirpath.py
diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0004_loadinitialdata.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0004_loadinitialdata.py
index d90857813..d90857813 100644
--- a/bitbake/lib/toaster/bldcontrol/migrations/0004_loadinitialdata.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0004_loadinitialdata.py
diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0005_auto__add_brerror.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0005_auto__add_brerror.py
index 98aeb41ce..98aeb41ce 100644
--- a/bitbake/lib/toaster/bldcontrol/migrations/0005_auto__add_brerror.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0005_auto__add_brerror.py
diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0006_auto__add_brbitbake.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0006_auto__add_brbitbake.py
index 74388f843..74388f843 100644
--- a/bitbake/lib/toaster/bldcontrol/migrations/0006_auto__add_brbitbake.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0006_auto__add_brbitbake.py
diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0007_auto__add_field_buildrequest_environment__chg_field_buildrequest_build.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0007_auto__add_field_buildrequest_environment__chg_field_buildrequest_build.py
index 70677a294..70677a294 100644
--- a/bitbake/lib/toaster/bldcontrol/migrations/0007_auto__add_field_buildrequest_environment__chg_field_buildrequest_build.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0007_auto__add_field_buildrequest_environment__chg_field_buildrequest_build.py
diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0008_brarchive.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0008_brarchive.py
index f5469607f..f5469607f 100644
--- a/bitbake/lib/toaster/bldcontrol/migrations/0008_brarchive.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0008_brarchive.py
diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0009_auto__add_field_brlayer_layer_version.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0009_auto__add_field_brlayer_layer_version.py
index 9b50bc1c0..9b50bc1c0 100644
--- a/bitbake/lib/toaster/bldcontrol/migrations/0009_auto__add_field_brlayer_layer_version.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0009_auto__add_field_brlayer_layer_version.py
diff --git a/bitbake/lib/toaster/bldcontrol/migrations/__init__.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/toaster/bldcontrol/migrations/__init__.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/__init__.py
diff --git a/bitbake/lib/toaster/bldcontrol/models.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/models.py
index ab4110530..ab4110530 100644
--- a/bitbake/lib/toaster/bldcontrol/models.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/models.py
diff --git a/bitbake/lib/toaster/bldcontrol/sshbecontroller.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/sshbecontroller.py
index 8ef434baf..8ef434baf 100644
--- a/bitbake/lib/toaster/bldcontrol/sshbecontroller.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/sshbecontroller.py
diff --git a/bitbake/lib/toaster/bldcontrol/tests.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/tests.py
index 5dbc77fda..5dbc77fda 100644
--- a/bitbake/lib/toaster/bldcontrol/tests.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/tests.py
diff --git a/bitbake/lib/toaster/bldcontrol/views.py b/yocto-poky/bitbake/lib/toaster/bldcontrol/views.py
index 60f00ef0e..60f00ef0e 100644
--- a/bitbake/lib/toaster/bldcontrol/views.py
+++ b/yocto-poky/bitbake/lib/toaster/bldcontrol/views.py
diff --git a/bitbake/lib/toaster/contrib/README b/yocto-poky/bitbake/lib/toaster/contrib/README
index 46d0ff008..46d0ff008 100644
--- a/bitbake/lib/toaster/contrib/README
+++ b/yocto-poky/bitbake/lib/toaster/contrib/README
diff --git a/bitbake/lib/toaster/contrib/django-aggregate-if-master/.gitignore b/yocto-poky/bitbake/lib/toaster/contrib/django-aggregate-if-master/.gitignore
index c45652d29..c45652d29 100644
--- a/bitbake/lib/toaster/contrib/django-aggregate-if-master/.gitignore
+++ b/yocto-poky/bitbake/lib/toaster/contrib/django-aggregate-if-master/.gitignore
diff --git a/bitbake/lib/toaster/contrib/django-aggregate-if-master/.travis.yml b/yocto-poky/bitbake/lib/toaster/contrib/django-aggregate-if-master/.travis.yml
index a920f3945..a920f3945 100644
--- a/bitbake/lib/toaster/contrib/django-aggregate-if-master/.travis.yml
+++ b/yocto-poky/bitbake/lib/toaster/contrib/django-aggregate-if-master/.travis.yml
diff --git a/bitbake/lib/toaster/contrib/django-aggregate-if-master/LICENSE b/yocto-poky/bitbake/lib/toaster/contrib/django-aggregate-if-master/LICENSE
index 6b7c3b174..6b7c3b174 100644
--- a/bitbake/lib/toaster/contrib/django-aggregate-if-master/LICENSE
+++ b/yocto-poky/bitbake/lib/toaster/contrib/django-aggregate-if-master/LICENSE
diff --git a/bitbake/lib/toaster/contrib/django-aggregate-if-master/README.rst b/yocto-poky/bitbake/lib/toaster/contrib/django-aggregate-if-master/README.rst
index 739d4dacc..739d4dacc 100644
--- a/bitbake/lib/toaster/contrib/django-aggregate-if-master/README.rst
+++ b/yocto-poky/bitbake/lib/toaster/contrib/django-aggregate-if-master/README.rst
diff --git a/bitbake/lib/toaster/contrib/django-aggregate-if-master/aggregate_if.py b/yocto-poky/bitbake/lib/toaster/contrib/django-aggregate-if-master/aggregate_if.py
index d5f342717..d5f342717 100644
--- a/bitbake/lib/toaster/contrib/django-aggregate-if-master/aggregate_if.py
+++ b/yocto-poky/bitbake/lib/toaster/contrib/django-aggregate-if-master/aggregate_if.py
diff --git a/bitbake/lib/toaster/contrib/django-aggregate-if-master/runtests.py b/yocto-poky/bitbake/lib/toaster/contrib/django-aggregate-if-master/runtests.py
index 2e55864e3..2e55864e3 100755
--- a/bitbake/lib/toaster/contrib/django-aggregate-if-master/runtests.py
+++ b/yocto-poky/bitbake/lib/toaster/contrib/django-aggregate-if-master/runtests.py
diff --git a/bitbake/lib/toaster/contrib/django-aggregate-if-master/setup.py b/yocto-poky/bitbake/lib/toaster/contrib/django-aggregate-if-master/setup.py
index aed3db14d..aed3db14d 100644
--- a/bitbake/lib/toaster/contrib/django-aggregate-if-master/setup.py
+++ b/yocto-poky/bitbake/lib/toaster/contrib/django-aggregate-if-master/setup.py
diff --git a/bitbake/lib/toaster/contrib/django-aggregate-if-master/tox.ini b/yocto-poky/bitbake/lib/toaster/contrib/django-aggregate-if-master/tox.ini
index 78beb148a..78beb148a 100644
--- a/bitbake/lib/toaster/contrib/django-aggregate-if-master/tox.ini
+++ b/yocto-poky/bitbake/lib/toaster/contrib/django-aggregate-if-master/tox.ini
diff --git a/bitbake/lib/toaster/contrib/tts/README b/yocto-poky/bitbake/lib/toaster/contrib/tts/README
index 22fa5673b..22fa5673b 100644
--- a/bitbake/lib/toaster/contrib/tts/README
+++ b/yocto-poky/bitbake/lib/toaster/contrib/tts/README
diff --git a/bitbake/lib/toaster/contrib/tts/TODO b/yocto-poky/bitbake/lib/toaster/contrib/tts/TODO
index 117192106..117192106 100644
--- a/bitbake/lib/toaster/contrib/tts/TODO
+++ b/yocto-poky/bitbake/lib/toaster/contrib/tts/TODO
diff --git a/bitbake/lib/toaster/contrib/tts/config.py b/yocto-poky/bitbake/lib/toaster/contrib/tts/config.py
index 40d45f3b7..40d45f3b7 100644
--- a/bitbake/lib/toaster/contrib/tts/config.py
+++ b/yocto-poky/bitbake/lib/toaster/contrib/tts/config.py
diff --git a/bitbake/lib/toaster/contrib/tts/launcher.py b/yocto-poky/bitbake/lib/toaster/contrib/tts/launcher.py
index e5794c1c5..e5794c1c5 100755
--- a/bitbake/lib/toaster/contrib/tts/launcher.py
+++ b/yocto-poky/bitbake/lib/toaster/contrib/tts/launcher.py
diff --git a/bitbake/lib/toaster/contrib/tts/log/.create b/yocto-poky/bitbake/lib/toaster/contrib/tts/log/.create
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/toaster/contrib/tts/log/.create
+++ b/yocto-poky/bitbake/lib/toaster/contrib/tts/log/.create
diff --git a/bitbake/lib/toaster/contrib/tts/recv.py b/yocto-poky/bitbake/lib/toaster/contrib/tts/recv.py
index 07efdac44..07efdac44 100755
--- a/bitbake/lib/toaster/contrib/tts/recv.py
+++ b/yocto-poky/bitbake/lib/toaster/contrib/tts/recv.py
diff --git a/bitbake/lib/toaster/contrib/tts/runner.py b/yocto-poky/bitbake/lib/toaster/contrib/tts/runner.py
index bed665196..bed665196 100755
--- a/bitbake/lib/toaster/contrib/tts/runner.py
+++ b/yocto-poky/bitbake/lib/toaster/contrib/tts/runner.py
diff --git a/bitbake/lib/toaster/contrib/tts/settings.json b/yocto-poky/bitbake/lib/toaster/contrib/tts/settings.json
index bb671eaf2..bb671eaf2 100644
--- a/bitbake/lib/toaster/contrib/tts/settings.json
+++ b/yocto-poky/bitbake/lib/toaster/contrib/tts/settings.json
diff --git a/bitbake/lib/toaster/contrib/tts/shellutils.py b/yocto-poky/bitbake/lib/toaster/contrib/tts/shellutils.py
index c2012edf8..c2012edf8 100644
--- a/bitbake/lib/toaster/contrib/tts/shellutils.py
+++ b/yocto-poky/bitbake/lib/toaster/contrib/tts/shellutils.py
diff --git a/bitbake/lib/toaster/contrib/tts/tests.py b/yocto-poky/bitbake/lib/toaster/contrib/tts/tests.py
index c510ebb10..c510ebb10 100644
--- a/bitbake/lib/toaster/contrib/tts/tests.py
+++ b/yocto-poky/bitbake/lib/toaster/contrib/tts/tests.py
diff --git a/bitbake/lib/toaster/contrib/tts/toasteruitest/run_toastertests.py b/yocto-poky/bitbake/lib/toaster/contrib/tts/toasteruitest/run_toastertests.py
index 880487cb6..880487cb6 100755
--- a/bitbake/lib/toaster/contrib/tts/toasteruitest/run_toastertests.py
+++ b/yocto-poky/bitbake/lib/toaster/contrib/tts/toasteruitest/run_toastertests.py
diff --git a/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_automation_test.py b/yocto-poky/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_automation_test.py
index eac167b2e..eac167b2e 100755
--- a/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_automation_test.py
+++ b/yocto-poky/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_automation_test.py
diff --git a/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_test.cfg b/yocto-poky/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_test.cfg
index 685a9ee6a..685a9ee6a 100644
--- a/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_test.cfg
+++ b/yocto-poky/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_test.cfg
diff --git a/bitbake/lib/toaster/contrib/tts/urlcheck.py b/yocto-poky/bitbake/lib/toaster/contrib/tts/urlcheck.py
index 0820f82e2..0820f82e2 100644
--- a/bitbake/lib/toaster/contrib/tts/urlcheck.py
+++ b/yocto-poky/bitbake/lib/toaster/contrib/tts/urlcheck.py
diff --git a/bitbake/lib/toaster/contrib/tts/urllist.py b/yocto-poky/bitbake/lib/toaster/contrib/tts/urllist.py
index 6db9ffc7b..6db9ffc7b 100644
--- a/bitbake/lib/toaster/contrib/tts/urllist.py
+++ b/yocto-poky/bitbake/lib/toaster/contrib/tts/urllist.py
diff --git a/bitbake/lib/toaster/manage.py b/yocto-poky/bitbake/lib/toaster/manage.py
index ceaa11bfc..ceaa11bfc 100755
--- a/bitbake/lib/toaster/manage.py
+++ b/yocto-poky/bitbake/lib/toaster/manage.py
diff --git a/bitbake/lib/toaster/orm/__init__.py b/yocto-poky/bitbake/lib/toaster/orm/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/toaster/orm/__init__.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/__init__.py
diff --git a/bitbake/lib/toaster/orm/management/__init__.py b/yocto-poky/bitbake/lib/toaster/orm/management/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/toaster/orm/management/__init__.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/management/__init__.py
diff --git a/bitbake/lib/toaster/orm/management/commands/__init__.py b/yocto-poky/bitbake/lib/toaster/orm/management/commands/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/toaster/orm/management/commands/__init__.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/management/commands/__init__.py
diff --git a/bitbake/lib/toaster/orm/management/commands/lsupdates.py b/yocto-poky/bitbake/lib/toaster/orm/management/commands/lsupdates.py
index 75e9513fc..75e9513fc 100644
--- a/bitbake/lib/toaster/orm/management/commands/lsupdates.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/management/commands/lsupdates.py
diff --git a/bitbake/lib/toaster/orm/migrations/0001_initial.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0001_initial.py
index dedeef8bf..dedeef8bf 100644
--- a/bitbake/lib/toaster/orm/migrations/0001_initial.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0001_initial.py
diff --git a/bitbake/lib/toaster/orm/migrations/0002_auto__add_field_build_timespent.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0002_auto__add_field_build_timespent.py
index 61421cacd..61421cacd 100644
--- a/bitbake/lib/toaster/orm/migrations/0002_auto__add_field_build_timespent.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0002_auto__add_field_build_timespent.py
diff --git a/bitbake/lib/toaster/orm/migrations/0003_timespent.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0003_timespent.py
index 9600f9e29..9600f9e29 100644
--- a/bitbake/lib/toaster/orm/migrations/0003_timespent.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0003_timespent.py
diff --git a/bitbake/lib/toaster/orm/migrations/0004_auto__add_field_package_installed_name.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0004_auto__add_field_package_installed_name.py
index 134445b56..134445b56 100644
--- a/bitbake/lib/toaster/orm/migrations/0004_auto__add_field_package_installed_name.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0004_auto__add_field_package_installed_name.py
diff --git a/bitbake/lib/toaster/orm/migrations/0005_auto__add_target_image_file__add_target_file__add_field_variablehistor.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0005_auto__add_target_image_file__add_target_file__add_field_variablehistor.py
index 7be7ac3be..7be7ac3be 100644
--- a/bitbake/lib/toaster/orm/migrations/0005_auto__add_target_image_file__add_target_file__add_field_variablehistor.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0005_auto__add_target_image_file__add_target_file__add_field_variablehistor.py
diff --git a/bitbake/lib/toaster/orm/migrations/0006_auto__add_field_target_image_size__add_field_target_license_manifest_p.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0006_auto__add_field_target_image_size__add_field_target_license_manifest_p.py
index b2be30a4a..b2be30a4a 100644
--- a/bitbake/lib/toaster/orm/migrations/0006_auto__add_field_target_image_size__add_field_target_license_manifest_p.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0006_auto__add_field_target_image_size__add_field_target_license_manifest_p.py
diff --git a/bitbake/lib/toaster/orm/migrations/0007_auto__add_helptext.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0007_auto__add_helptext.py
index 1e4c5369d..1e4c5369d 100644
--- a/bitbake/lib/toaster/orm/migrations/0007_auto__add_helptext.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0007_auto__add_helptext.py
diff --git a/bitbake/lib/toaster/orm/migrations/0008_auto__chg_field_variablehistory_operation__chg_field_recipe_descriptio.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0008_auto__chg_field_variablehistory_operation__chg_field_recipe_descriptio.py
index ece408a3c..ece408a3c 100644
--- a/bitbake/lib/toaster/orm/migrations/0008_auto__chg_field_variablehistory_operation__chg_field_recipe_descriptio.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0008_auto__chg_field_variablehistory_operation__chg_field_recipe_descriptio.py
diff --git a/bitbake/lib/toaster/orm/migrations/0009_auto__add_projectvariable__add_projectlayer__add_projecttarget__add_pr.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0009_auto__add_projectvariable__add_projectlayer__add_projecttarget__add_pr.py
index 7a58dc2e6..7a58dc2e6 100644
--- a/bitbake/lib/toaster/orm/migrations/0009_auto__add_projectvariable__add_projectlayer__add_projecttarget__add_pr.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0009_auto__add_projectvariable__add_projectlayer__add_projecttarget__add_pr.py
diff --git a/bitbake/lib/toaster/orm/migrations/0010_auto__add_field_project_branch__add_field_project_short_description__a.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0010_auto__add_field_project_branch__add_field_project_short_description__a.py
index aa1ce1f4a..aa1ce1f4a 100644
--- a/bitbake/lib/toaster/orm/migrations/0010_auto__add_field_project_branch__add_field_project_short_description__a.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0010_auto__add_field_project_branch__add_field_project_short_description__a.py
diff --git a/bitbake/lib/toaster/orm/migrations/0011_auto__add_field_projectlayer_dirpath.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0011_auto__add_field_projectlayer_dirpath.py
index 8a6522159..8a6522159 100644
--- a/bitbake/lib/toaster/orm/migrations/0011_auto__add_field_projectlayer_dirpath.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0011_auto__add_field_projectlayer_dirpath.py
diff --git a/bitbake/lib/toaster/orm/migrations/0012_auto__add_field_projectlayer_optional__add_field_projecttarget_task.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0012_auto__add_field_projectlayer_optional__add_field_projecttarget_task.py
index 9e483f5da..9e483f5da 100644
--- a/bitbake/lib/toaster/orm/migrations/0012_auto__add_field_projectlayer_optional__add_field_projecttarget_task.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0012_auto__add_field_projectlayer_optional__add_field_projecttarget_task.py
diff --git a/bitbake/lib/toaster/orm/migrations/0013_auto__add_release__add_layerversiondependency__add_unique_layerversion.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0013_auto__add_release__add_layerversiondependency__add_unique_layerversion.py
index 7c954e6be..7c954e6be 100644
--- a/bitbake/lib/toaster/orm/migrations/0013_auto__add_release__add_layerversiondependency__add_unique_layerversion.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0013_auto__add_release__add_layerversiondependency__add_unique_layerversion.py
diff --git a/bitbake/lib/toaster/orm/migrations/0014_auto__chg_field_package_summary__chg_field_layer_summary__chg_field_re.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0014_auto__chg_field_package_summary__chg_field_layer_summary__chg_field_re.py
index 7945f15a1..7945f15a1 100644
--- a/bitbake/lib/toaster/orm/migrations/0014_auto__chg_field_package_summary__chg_field_layer_summary__chg_field_re.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0014_auto__chg_field_package_summary__chg_field_layer_summary__chg_field_re.py
diff --git a/bitbake/lib/toaster/orm/migrations/0015_auto__add_field_layer_vcs_web_url__add_field_layer_vcs_web_tree_base_u.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0015_auto__add_field_layer_vcs_web_url__add_field_layer_vcs_web_tree_base_u.py
index 6e664c9fc..6e664c9fc 100644
--- a/bitbake/lib/toaster/orm/migrations/0015_auto__add_field_layer_vcs_web_url__add_field_layer_vcs_web_tree_base_u.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0015_auto__add_field_layer_vcs_web_url__add_field_layer_vcs_web_tree_base_u.py
diff --git a/bitbake/lib/toaster/orm/migrations/0016_auto__add_field_release_helptext__chg_field_release_branch__add_index_.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0016_auto__add_field_release_helptext__chg_field_release_branch__add_index_.py
index 545c0ba58..545c0ba58 100644
--- a/bitbake/lib/toaster/orm/migrations/0016_auto__add_field_release_helptext__chg_field_release_branch__add_index_.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0016_auto__add_field_release_helptext__chg_field_release_branch__add_index_.py
diff --git a/bitbake/lib/toaster/orm/migrations/0017_auto__del_toastersettingdefaultlayer__add_releaselayersourcepriority__.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0017_auto__del_toastersettingdefaultlayer__add_releaselayersourcepriority__.py
index 6685b5564..6685b5564 100644
--- a/bitbake/lib/toaster/orm/migrations/0017_auto__del_toastersettingdefaultlayer__add_releaselayersourcepriority__.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0017_auto__del_toastersettingdefaultlayer__add_releaselayersourcepriority__.py
diff --git a/bitbake/lib/toaster/orm/migrations/0018_auto__add_field_layer_version_project.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0018_auto__add_field_layer_version_project.py
index 7284bb842..7284bb842 100644
--- a/bitbake/lib/toaster/orm/migrations/0018_auto__add_field_layer_version_project.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0018_auto__add_field_layer_version_project.py
diff --git a/bitbake/lib/toaster/orm/migrations/0019_auto__add_buildartifact.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0019_auto__add_buildartifact.py
index 0dce9ead2..0dce9ead2 100644
--- a/bitbake/lib/toaster/orm/migrations/0019_auto__add_buildartifact.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0019_auto__add_buildartifact.py
diff --git a/bitbake/lib/toaster/orm/migrations/0020_auto__add_field_layer_version_local_path__add_field_recipe_pathflags__.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0020_auto__add_field_layer_version_local_path__add_field_recipe_pathflags__.py
index 0ec579597..0ec579597 100644
--- a/bitbake/lib/toaster/orm/migrations/0020_auto__add_field_layer_version_local_path__add_field_recipe_pathflags__.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0020_auto__add_field_layer_version_local_path__add_field_recipe_pathflags__.py
diff --git a/bitbake/lib/toaster/orm/migrations/0021_auto__chg_field_build_project__chg_field_project_bitbake_version__chg_.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0021_auto__chg_field_build_project__chg_field_project_bitbake_version__chg_.py
index a62ddb7ee..a62ddb7ee 100644
--- a/bitbake/lib/toaster/orm/migrations/0021_auto__chg_field_build_project__chg_field_project_bitbake_version__chg_.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0021_auto__chg_field_build_project__chg_field_project_bitbake_version__chg_.py
diff --git a/bitbake/lib/toaster/orm/migrations/0022_auto__add_field_target_task__add_field_layer_version_local_path__del_f.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0022_auto__add_field_target_task__add_field_layer_version_local_path__del_f.py
index 3dec3912e..3dec3912e 100644
--- a/bitbake/lib/toaster/orm/migrations/0022_auto__add_field_target_task__add_field_layer_version_local_path__del_f.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0022_auto__add_field_target_task__add_field_layer_version_local_path__del_f.py
diff --git a/bitbake/lib/toaster/orm/migrations/0023_auto__del_field_build_warnings_no__del_field_build_errors_no__del_fiel.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0023_auto__del_field_build_warnings_no__del_field_build_errors_no__del_fiel.py
index b5b200cdd..b5b200cdd 100644
--- a/bitbake/lib/toaster/orm/migrations/0023_auto__del_field_build_warnings_no__del_field_build_errors_no__del_fiel.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0023_auto__del_field_build_warnings_no__del_field_build_errors_no__del_fiel.py
diff --git a/bitbake/lib/toaster/orm/migrations/0024_auto__add_field_recipe_is_image.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0024_auto__add_field_recipe_is_image.py
index 88f60a946..88f60a946 100644
--- a/bitbake/lib/toaster/orm/migrations/0024_auto__add_field_recipe_is_image.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0024_auto__add_field_recipe_is_image.py
diff --git a/bitbake/lib/toaster/orm/migrations/0025_auto__add_field_project_is_default.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0025_auto__add_field_project_is_default.py
index e76990d7a..e76990d7a 100644
--- a/bitbake/lib/toaster/orm/migrations/0025_auto__add_field_project_is_default.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0025_auto__add_field_project_is_default.py
diff --git a/bitbake/lib/toaster/orm/migrations/0026_set_default_project.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0026_set_default_project.py
index 6240abd85..6240abd85 100644
--- a/bitbake/lib/toaster/orm/migrations/0026_set_default_project.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0026_set_default_project.py
diff --git a/bitbake/lib/toaster/orm/migrations/0027_auto__add_customimagerecipe__add_unique_customimagerecipe_name_project.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0027_auto__add_customimagerecipe__add_unique_customimagerecipe_name_project.py
index 603060514..603060514 100644
--- a/bitbake/lib/toaster/orm/migrations/0027_auto__add_customimagerecipe__add_unique_customimagerecipe_name_project.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0027_auto__add_customimagerecipe__add_unique_customimagerecipe_name_project.py
diff --git a/bitbake/lib/toaster/orm/migrations/0028_auto__chg_field_logmessage_message.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/0028_auto__chg_field_logmessage_message.py
index a2f8661af..a2f8661af 100644
--- a/bitbake/lib/toaster/orm/migrations/0028_auto__chg_field_logmessage_message.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/0028_auto__chg_field_logmessage_message.py
diff --git a/bitbake/lib/toaster/orm/migrations/__init__.py b/yocto-poky/bitbake/lib/toaster/orm/migrations/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/toaster/orm/migrations/__init__.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/migrations/__init__.py
diff --git a/bitbake/lib/toaster/orm/models.py b/yocto-poky/bitbake/lib/toaster/orm/models.py
index 383290583..383290583 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/models.py
diff --git a/bitbake/lib/toaster/orm/tests.py b/yocto-poky/bitbake/lib/toaster/orm/tests.py
index 719266e6d..719266e6d 100644
--- a/bitbake/lib/toaster/orm/tests.py
+++ b/yocto-poky/bitbake/lib/toaster/orm/tests.py
diff --git a/bitbake/lib/toaster/toastergui/__init__.py b/yocto-poky/bitbake/lib/toaster/toastergui/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/toaster/toastergui/__init__.py
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/__init__.py
diff --git a/bitbake/lib/toaster/toastergui/static/css/bootstrap-responsive.min.css b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/bootstrap-responsive.min.css
index 059786010..059786010 100755
--- a/bitbake/lib/toaster/toastergui/static/css/bootstrap-responsive.min.css
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/bootstrap-responsive.min.css
diff --git a/bitbake/lib/toaster/toastergui/static/css/bootstrap.min.css b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.min.css
index 2b927f84e..2b927f84e 100755
--- a/bitbake/lib/toaster/toastergui/static/css/bootstrap.min.css
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.min.css
diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/default.css
index bc8a97bed..bc8a97bed 100644
--- a/bitbake/lib/toaster/toastergui/static/css/default.css
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/default.css
diff --git a/bitbake/lib/toaster/toastergui/static/css/font-awesome.min.css b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/font-awesome.min.css
index fa15fd528..fa15fd528 100755
--- a/bitbake/lib/toaster/toastergui/static/css/font-awesome.min.css
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/font-awesome.min.css
diff --git a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
index d5d78a3cf..d5d78a3cf 100755
--- a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
diff --git a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_diagonals-thick_20_666666_40x40.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
index 1b0a045e4..1b0a045e4 100755
--- a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
diff --git a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_flat_10_000000_40x100.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_flat_10_000000_40x100.png
index c55f8ef7b..c55f8ef7b 100755
--- a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_flat_10_000000_40x100.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_flat_10_000000_40x100.png
diff --git a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_100_f6f6f6_1x400.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_100_f6f6f6_1x400.png
index ea4fa0fc4..ea4fa0fc4 100755
--- a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_100_f6f6f6_1x400.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_100_f6f6f6_1x400.png
diff --git a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_100_fdf5ce_1x400.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_100_fdf5ce_1x400.png
index 2f59e2d8c..2f59e2d8c 100755
--- a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_100_fdf5ce_1x400.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_100_fdf5ce_1x400.png
diff --git a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_65_ffffff_1x400.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_65_ffffff_1x400.png
index f172b302f..f172b302f 100755
--- a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
index 1039d548c..1039d548c 100644
--- a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
diff --git a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
index 1089b70c7..1089b70c7 100755
--- a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
diff --git a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
index 561b7f842..561b7f842 100755
--- a/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
diff --git a/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_222222_256x240.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_222222_256x240.png
index e9c8e16ac..e9c8e16ac 100644
--- a/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_222222_256x240.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_222222_256x240.png
diff --git a/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_228ef1_256x240.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_228ef1_256x240.png
index 8d68c543e..8d68c543e 100644
--- a/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_228ef1_256x240.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_228ef1_256x240.png
diff --git a/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ef8c08_256x240.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ef8c08_256x240.png
index 18bbfe821..18bbfe821 100644
--- a/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ef8c08_256x240.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ef8c08_256x240.png
diff --git a/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ffd27a_256x240.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ffd27a_256x240.png
index 4435b497e..4435b497e 100644
--- a/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ffd27a_256x240.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ffd27a_256x240.png
diff --git a/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ffffff_256x240.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ffffff_256x240.png
index 4d66f596e..4d66f596e 100644
--- a/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ffffff_256x240.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ffffff_256x240.png
diff --git a/bitbake/lib/toaster/toastergui/static/css/jquery-ui.min.css b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.min.css
index c486ec045..c486ec045 100755
--- a/bitbake/lib/toaster/toastergui/static/css/jquery-ui.min.css
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.min.css
diff --git a/bitbake/lib/toaster/toastergui/static/css/jquery-ui.structure.min.css b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.structure.min.css
index d1578a4e9..d1578a4e9 100755
--- a/bitbake/lib/toaster/toastergui/static/css/jquery-ui.structure.min.css
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.structure.min.css
diff --git a/bitbake/lib/toaster/toastergui/static/css/jquery-ui.theme.min.css b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.theme.min.css
index 34543111e..34543111e 100755
--- a/bitbake/lib/toaster/toastergui/static/css/jquery-ui.theme.min.css
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.theme.min.css
diff --git a/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.css b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.css
index 4e95bfd3a..4e95bfd3a 100644
--- a/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.css
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.css
diff --git a/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.theme.default.css b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.theme.default.css
index 48289baad..48289baad 100644
--- a/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.theme.default.css
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.theme.default.css
diff --git a/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.theme.toaster.css b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.theme.toaster.css
index d8552e581..d8552e581 100644
--- a/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.theme.toaster.css
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.theme.toaster.css
diff --git a/bitbake/lib/toaster/toastergui/static/css/prettify.css b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/prettify.css
index b317a7cda..b317a7cda 100755
--- a/bitbake/lib/toaster/toastergui/static/css/prettify.css
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/prettify.css
diff --git a/bitbake/lib/toaster/toastergui/static/css/screen.css b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/screen.css
index e233ef6ae..e233ef6ae 100644
--- a/bitbake/lib/toaster/toastergui/static/css/screen.css
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/css/screen.css
diff --git a/bitbake/lib/toaster/toastergui/static/fonts/FontAwesome.otf b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/FontAwesome.otf
index 64049bf2e..64049bf2e 100644
--- a/bitbake/lib/toaster/toastergui/static/fonts/FontAwesome.otf
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/FontAwesome.otf
diff --git a/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.eot b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.eot
index 7d81019e4..7d81019e4 100644
--- a/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.eot
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.eot
diff --git a/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.svg b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.svg
index ba0afe5ef..ba0afe5ef 100644
--- a/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.svg
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.svg
diff --git a/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.ttf b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.ttf
index d46172476..d46172476 100644
--- a/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.ttf
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.ttf
diff --git a/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.woff b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.woff
index 3c89ae09b..3c89ae09b 100644
--- a/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.woff
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.woff
diff --git a/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.eot b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.eot
index 423bd5d3a..423bd5d3a 100644
--- a/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.eot
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.eot
diff --git a/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.svg b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.svg
index 446948874..446948874 100644
--- a/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.svg
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.svg
diff --git a/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.ttf b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.ttf
index a498ef4e7..a498ef4e7 100644
--- a/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.ttf
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.ttf
diff --git a/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.woff b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.woff
index d83c539b8..d83c539b8 100644
--- a/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.woff
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.woff
diff --git a/bitbake/lib/toaster/toastergui/static/html/layer_deps_modal.html b/yocto-poky/bitbake/lib/toaster/toastergui/static/html/layer_deps_modal.html
index e1dba4358..e1dba4358 100644
--- a/bitbake/lib/toaster/toastergui/static/html/layer_deps_modal.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/html/layer_deps_modal.html
diff --git a/bitbake/lib/toaster/toastergui/static/img/glyphicons-halflings-white.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/img/glyphicons-halflings-white.png
index 3bf6484a2..3bf6484a2 100644
--- a/bitbake/lib/toaster/toastergui/static/img/glyphicons-halflings-white.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/img/glyphicons-halflings-white.png
diff --git a/bitbake/lib/toaster/toastergui/static/img/glyphicons-halflings.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/img/glyphicons-halflings.png
index a99699932..a99699932 100644
--- a/bitbake/lib/toaster/toastergui/static/img/glyphicons-halflings.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/img/glyphicons-halflings.png
diff --git a/bitbake/lib/toaster/toastergui/static/img/logo.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/img/logo.png
index 35ad733ed..35ad733ed 100644
--- a/bitbake/lib/toaster/toastergui/static/img/logo.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/img/logo.png
diff --git a/bitbake/lib/toaster/toastergui/static/img/toaster_bw.png b/yocto-poky/bitbake/lib/toaster/toastergui/static/img/toaster_bw.png
index b46590793..b46590793 100644
--- a/bitbake/lib/toaster/toastergui/static/img/toaster_bw.png
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/img/toaster_bw.png
diff --git a/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/GPL-LICENSE.txt b/yocto-poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/GPL-LICENSE.txt
index 76927f581..76927f581 100644
--- a/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/GPL-LICENSE.txt
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/GPL-LICENSE.txt
diff --git a/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/MIT-LICENSE.txt b/yocto-poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/MIT-LICENSE.txt
index c2e824fb0..c2e824fb0 100644
--- a/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/MIT-LICENSE.txt
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/MIT-LICENSE.txt
diff --git a/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/README.md b/yocto-poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/README.md
index ece7afb58..ece7afb58 100644
--- a/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/README.md
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/README.md
diff --git a/bitbake/lib/toaster/toastergui/static/jquery.treetable.theme.toaster.css b/yocto-poky/bitbake/lib/toaster/toastergui/static/jquery.treetable.theme.toaster.css
index 5194b234d..5194b234d 100644
--- a/bitbake/lib/toaster/toastergui/static/jquery.treetable.theme.toaster.css
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/jquery.treetable.theme.toaster.css
diff --git a/bitbake/lib/toaster/toastergui/static/js/.jshintrc b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/.jshintrc
index b02f3efa1..b02f3efa1 100644
--- a/bitbake/lib/toaster/toastergui/static/js/.jshintrc
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/.jshintrc
diff --git a/bitbake/lib/toaster/toastergui/static/js/base.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/base.js
index ed22a4ebc..ed22a4ebc 100644
--- a/bitbake/lib/toaster/toastergui/static/js/base.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/base.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/bootstrap.min.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/bootstrap.min.js
index 848258d38..848258d38 100644
--- a/bitbake/lib/toaster/toastergui/static/js/bootstrap.min.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/bootstrap.min.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/customrecipe.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/customrecipe.js
index 4f6b304dd..4f6b304dd 100644
--- a/bitbake/lib/toaster/toastergui/static/js/customrecipe.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/customrecipe.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/filtersnippet.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/filtersnippet.js
index 2b84c546c..2b84c546c 100755
--- a/bitbake/lib/toaster/toastergui/static/js/filtersnippet.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/filtersnippet.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/importlayer.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/importlayer.js
index c68f3669f..c68f3669f 100644
--- a/bitbake/lib/toaster/toastergui/static/js/importlayer.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/importlayer.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/jquery-2.0.3.min.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery-2.0.3.min.js
index 2be209dd2..2be209dd2 100644
--- a/bitbake/lib/toaster/toastergui/static/js/jquery-2.0.3.min.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery-2.0.3.min.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/jquery-2.0.3.min.map b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery-2.0.3.min.map
index 1edecd1ae..1edecd1ae 100644
--- a/bitbake/lib/toaster/toastergui/static/js/jquery-2.0.3.min.map
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery-2.0.3.min.map
diff --git a/bitbake/lib/toaster/toastergui/static/js/jquery-ui.min.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery-ui.min.js
index 4e6396b21..4e6396b21 100755
--- a/bitbake/lib/toaster/toastergui/static/js/jquery-ui.min.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery-ui.min.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/jquery.cookie.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery.cookie.js
index 927190008..927190008 100644
--- a/bitbake/lib/toaster/toastergui/static/js/jquery.cookie.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery.cookie.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/jquery.treetable.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery.treetable.js
index 794b902c5..794b902c5 100644
--- a/bitbake/lib/toaster/toastergui/static/js/jquery.treetable.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery.treetable.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/layerBtn.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/layerBtn.js
index 7318b3f50..7318b3f50 100644
--- a/bitbake/lib/toaster/toastergui/static/js/layerBtn.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/layerBtn.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/layerDepsModal.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/layerDepsModal.js
index 825f9dccd..825f9dccd 100644
--- a/bitbake/lib/toaster/toastergui/static/js/layerDepsModal.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/layerDepsModal.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
index 8c2ec4cdd..8c2ec4cdd 100644
--- a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
index c04f7aba2..c04f7aba2 100644
--- a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/newcustomimage.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/newcustomimage.js
index 935b21ede..935b21ede 100644
--- a/bitbake/lib/toaster/toastergui/static/js/newcustomimage.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/newcustomimage.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/prettify.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/prettify.js
index eef5ad7e6..eef5ad7e6 100755
--- a/bitbake/lib/toaster/toastergui/static/js/prettify.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/prettify.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/projectpage.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/projectpage.js
index e742ef291..e742ef291 100644
--- a/bitbake/lib/toaster/toastergui/static/js/projectpage.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/projectpage.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/table.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/table.js
index 40b5022de..40b5022de 100644
--- a/bitbake/lib/toaster/toastergui/static/js/table.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/table.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/tests/test.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/tests/test.js
index aac0ba60a..aac0ba60a 100644
--- a/bitbake/lib/toaster/toastergui/static/js/tests/test.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/tests/test.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/ui-bootstrap-tpls-0.11.0.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/ui-bootstrap-tpls-0.11.0.js
index fa6a86131..fa6a86131 100644
--- a/bitbake/lib/toaster/toastergui/static/js/ui-bootstrap-tpls-0.11.0.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/ui-bootstrap-tpls-0.11.0.js
diff --git a/bitbake/lib/toaster/toastergui/static/js/ui-bootstrap-tpls-0.11.0.min.js b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/ui-bootstrap-tpls-0.11.0.min.js
index fa6a86131..fa6a86131 100644
--- a/bitbake/lib/toaster/toastergui/static/js/ui-bootstrap-tpls-0.11.0.min.js
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/static/js/ui-bootstrap-tpls-0.11.0.min.js
diff --git a/bitbake/lib/toaster/toastergui/tables.py b/yocto-poky/bitbake/lib/toaster/toastergui/tables.py
index 9c9cda4e9..9c9cda4e9 100644
--- a/bitbake/lib/toaster/toastergui/tables.py
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/tables.py
diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/base.html
index 11ac2a035..11ac2a035 100644
--- a/bitbake/lib/toaster/toastergui/templates/base.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/base.html
diff --git a/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html
index 22ca50c0c..22ca50c0c 100644
--- a/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html
diff --git a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/basebuildpage.html
index d441df84e..d441df84e 100644
--- a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/basebuildpage.html
diff --git a/bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html
index 229cd17ba..229cd17ba 100644
--- a/bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html
diff --git a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
index 1f45be462..1f45be462 100644
--- a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html
index ce023f51a..ce023f51a 100644
--- a/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html
diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_top.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/basetable_top.html
index 33ede6687..33ede6687 100644
--- a/bitbake/lib/toaster/toastergui/templates/basetable_top.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/basetable_top.html
diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_top_layers.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/basetable_top_layers.html
index 722091b2d..722091b2d 100644
--- a/bitbake/lib/toaster/toastergui/templates/basetable_top_layers.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/basetable_top_layers.html
diff --git a/bitbake/lib/toaster/toastergui/templates/bfile.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/bfile.html
index c7f59434a..c7f59434a 100644
--- a/bitbake/lib/toaster/toastergui/templates/bfile.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/bfile.html
diff --git a/bitbake/lib/toaster/toastergui/templates/bpackage.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/bpackage.html
index 81973cbc6..81973cbc6 100644
--- a/bitbake/lib/toaster/toastergui/templates/bpackage.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/bpackage.html
diff --git a/bitbake/lib/toaster/toastergui/templates/brtargets.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/brtargets.html
index 4ebd05879..4ebd05879 100644
--- a/bitbake/lib/toaster/toastergui/templates/brtargets.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/brtargets.html
diff --git a/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/builddashboard.html
index 323bbbb6e..323bbbb6e 100644
--- a/bitbake/lib/toaster/toastergui/templates/builddashboard.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/builddashboard.html
diff --git a/bitbake/lib/toaster/toastergui/templates/buildrequestdetails.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/buildrequestdetails.html
index 70fa1fb9a..70fa1fb9a 100644
--- a/bitbake/lib/toaster/toastergui/templates/buildrequestdetails.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/buildrequestdetails.html
diff --git a/bitbake/lib/toaster/toastergui/templates/builds.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/builds.html
index a27a12191..a27a12191 100644
--- a/bitbake/lib/toaster/toastergui/templates/builds.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/builds.html
diff --git a/bitbake/lib/toaster/toastergui/templates/buildtime.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/buildtime.html
index ea84ae797..ea84ae797 100644
--- a/bitbake/lib/toaster/toastergui/templates/buildtime.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/buildtime.html
diff --git a/bitbake/lib/toaster/toastergui/templates/configuration.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/configuration.html
index 85d6a622a..85d6a622a 100644
--- a/bitbake/lib/toaster/toastergui/templates/configuration.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/configuration.html
diff --git a/bitbake/lib/toaster/toastergui/templates/configvars.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/configvars.html
index e40c225a3..e40c225a3 100644
--- a/bitbake/lib/toaster/toastergui/templates/configvars.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/configvars.html
diff --git a/bitbake/lib/toaster/toastergui/templates/cpuusage.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/cpuusage.html
index 02f07b760..02f07b760 100644
--- a/bitbake/lib/toaster/toastergui/templates/cpuusage.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/cpuusage.html
diff --git a/bitbake/lib/toaster/toastergui/templates/customise_btn.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/customise_btn.html
index 54d05f9ea..54d05f9ea 100644
--- a/bitbake/lib/toaster/toastergui/templates/customise_btn.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/customise_btn.html
diff --git a/bitbake/lib/toaster/toastergui/templates/customrecipe.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/customrecipe.html
index 823bbd8a1..823bbd8a1 100644
--- a/bitbake/lib/toaster/toastergui/templates/customrecipe.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/customrecipe.html
diff --git a/bitbake/lib/toaster/toastergui/templates/detail_pagination_bottom.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/detail_pagination_bottom.html
index f40c21d99..f40c21d99 100644
--- a/bitbake/lib/toaster/toastergui/templates/detail_pagination_bottom.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/detail_pagination_bottom.html
diff --git a/bitbake/lib/toaster/toastergui/templates/detail_search_header.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/detail_search_header.html
index 7bea3f47f..7bea3f47f 100644
--- a/bitbake/lib/toaster/toastergui/templates/detail_search_header.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/detail_search_header.html
diff --git a/bitbake/lib/toaster/toastergui/templates/detail_sorted_header.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/detail_sorted_header.html
index 6ce292e5a..6ce292e5a 100644
--- a/bitbake/lib/toaster/toastergui/templates/detail_sorted_header.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/detail_sorted_header.html
diff --git a/bitbake/lib/toaster/toastergui/templates/dirinfo.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/dirinfo.html
index ecb46bf7a..ecb46bf7a 100644
--- a/bitbake/lib/toaster/toastergui/templates/dirinfo.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/dirinfo.html
diff --git a/bitbake/lib/toaster/toastergui/templates/diskio.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/diskio.html
index c5cef6f38..c5cef6f38 100644
--- a/bitbake/lib/toaster/toastergui/templates/diskio.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/diskio.html
diff --git a/bitbake/lib/toaster/toastergui/templates/filtersnippet.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/filtersnippet.html
index 1101aa810..1101aa810 100644
--- a/bitbake/lib/toaster/toastergui/templates/filtersnippet.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/filtersnippet.html
diff --git a/bitbake/lib/toaster/toastergui/templates/generic-toastertable-page.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/generic-toastertable-page.html
index 33aa8ce0d..33aa8ce0d 100644
--- a/bitbake/lib/toaster/toastergui/templates/generic-toastertable-page.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/generic-toastertable-page.html
diff --git a/bitbake/lib/toaster/toastergui/templates/importlayer.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/importlayer.html
index 033f0aede..033f0aede 100644
--- a/bitbake/lib/toaster/toastergui/templates/importlayer.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/importlayer.html
diff --git a/bitbake/lib/toaster/toastergui/templates/js-unit-tests.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/js-unit-tests.html
index 8d65f33cb..8d65f33cb 100644
--- a/bitbake/lib/toaster/toastergui/templates/js-unit-tests.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/js-unit-tests.html
diff --git a/bitbake/lib/toaster/toastergui/templates/landing.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/landing.html
index cafaa1afa..cafaa1afa 100644
--- a/bitbake/lib/toaster/toastergui/templates/landing.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/landing.html
diff --git a/bitbake/lib/toaster/toastergui/templates/landing_not_managed.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/landing_not_managed.html
index 9b37f5530..9b37f5530 100644
--- a/bitbake/lib/toaster/toastergui/templates/landing_not_managed.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/landing_not_managed.html
diff --git a/bitbake/lib/toaster/toastergui/templates/layer_btn.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/layer_btn.html
index 314eec7cf..314eec7cf 100644
--- a/bitbake/lib/toaster/toastergui/templates/layer_btn.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/layer_btn.html
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/layerdetails.html
index 7fe365da3..7fe365da3 100644
--- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/layerdetails.html
diff --git a/bitbake/lib/toaster/toastergui/templates/machine_btn.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/machine_btn.html
index d2cb55bab..d2cb55bab 100644
--- a/bitbake/lib/toaster/toastergui/templates/machine_btn.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/machine_btn.html
diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/mrb_section.html
index bd8f99178..bd8f99178 100644
--- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/mrb_section.html
diff --git a/bitbake/lib/toaster/toastergui/templates/newcustomimage.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/newcustomimage.html
index 4487b3ea0..4487b3ea0 100644
--- a/bitbake/lib/toaster/toastergui/templates/newcustomimage.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/newcustomimage.html
diff --git a/bitbake/lib/toaster/toastergui/templates/newproject.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/newproject.html
index e83b2bea6..e83b2bea6 100644
--- a/bitbake/lib/toaster/toastergui/templates/newproject.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/newproject.html
diff --git a/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html
index e6f20c330..e6f20c330 100644
--- a/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html
diff --git a/bitbake/lib/toaster/toastergui/templates/package_built_detail.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_built_detail.html
index 9be8ccb85..9be8ccb85 100644
--- a/bitbake/lib/toaster/toastergui/templates/package_built_detail.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_built_detail.html
diff --git a/bitbake/lib/toaster/toastergui/templates/package_detail_base.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_detail_base.html
index 9fa28a8f8..9fa28a8f8 100644
--- a/bitbake/lib/toaster/toastergui/templates/package_detail_base.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_detail_base.html
diff --git a/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html
index 8a0508e70..8a0508e70 100644
--- a/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html
diff --git a/bitbake/lib/toaster/toastergui/templates/package_included_detail.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_included_detail.html
index 568e2f235..568e2f235 100644
--- a/bitbake/lib/toaster/toastergui/templates/package_included_detail.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_included_detail.html
diff --git a/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html
index fb310c7fc..fb310c7fc 100644
--- a/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html
diff --git a/bitbake/lib/toaster/toastergui/templates/package_included_tabs.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_included_tabs.html
index 958aa8827..958aa8827 100644
--- a/bitbake/lib/toaster/toastergui/templates/package_included_tabs.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_included_tabs.html
diff --git a/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html
index b766aeac9..b766aeac9 100644
--- a/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html
diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/project.html
index 4e83981f8..4e83981f8 100644
--- a/bitbake/lib/toaster/toastergui/templates/project.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/project.html
diff --git a/bitbake/lib/toaster/toastergui/templates/projectbuilds.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/projectbuilds.html
index bb38284aa..bb38284aa 100644
--- a/bitbake/lib/toaster/toastergui/templates/projectbuilds.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/projectbuilds.html
diff --git a/bitbake/lib/toaster/toastergui/templates/projectconf.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/projectconf.html
index 30fd03e32..30fd03e32 100644
--- a/bitbake/lib/toaster/toastergui/templates/projectconf.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/projectconf.html
diff --git a/bitbake/lib/toaster/toastergui/templates/projects.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/projects.html
index 678a7963b..678a7963b 100644
--- a/bitbake/lib/toaster/toastergui/templates/projects.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/projects.html
diff --git a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/projecttopbar.html
index ee86b5481..ee86b5481 100644
--- a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/projecttopbar.html
diff --git a/bitbake/lib/toaster/toastergui/templates/recipe.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/recipe.html
index c6ae2f380..c6ae2f380 100644
--- a/bitbake/lib/toaster/toastergui/templates/recipe.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/recipe.html
diff --git a/bitbake/lib/toaster/toastergui/templates/recipe_btn.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/recipe_btn.html
index baab06eb5..baab06eb5 100644
--- a/bitbake/lib/toaster/toastergui/templates/recipe_btn.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/recipe_btn.html
diff --git a/bitbake/lib/toaster/toastergui/templates/recipe_packages.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/recipe_packages.html
index d25847bc0..d25847bc0 100644
--- a/bitbake/lib/toaster/toastergui/templates/recipe_packages.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/recipe_packages.html
diff --git a/bitbake/lib/toaster/toastergui/templates/recipes.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/recipes.html
index d14489346..d14489346 100644
--- a/bitbake/lib/toaster/toastergui/templates/recipes.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/recipes.html
diff --git a/bitbake/lib/toaster/toastergui/templates/tablesort.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/tablesort.html
index 362474293..362474293 100644
--- a/bitbake/lib/toaster/toastergui/templates/tablesort.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/tablesort.html
diff --git a/bitbake/lib/toaster/toastergui/templates/target.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/target.html
index 4c33eaa84..4c33eaa84 100644
--- a/bitbake/lib/toaster/toastergui/templates/target.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/target.html
diff --git a/bitbake/lib/toaster/toastergui/templates/task.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/task.html
index ef628d9f9..ef628d9f9 100644
--- a/bitbake/lib/toaster/toastergui/templates/task.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/task.html
diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/tasks.html
index 353410f92..353410f92 100644
--- a/bitbake/lib/toaster/toastergui/templates/tasks.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/tasks.html
diff --git a/bitbake/lib/toaster/toastergui/templates/toastertable-filter.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/toastertable-filter.html
index 7c8dc49b3..7c8dc49b3 100644
--- a/bitbake/lib/toaster/toastergui/templates/toastertable-filter.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/toastertable-filter.html
diff --git a/bitbake/lib/toaster/toastergui/templates/toastertable-simple.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/toastertable-simple.html
index 212318bc5..212318bc5 100644
--- a/bitbake/lib/toaster/toastergui/templates/toastertable-simple.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/toastertable-simple.html
diff --git a/bitbake/lib/toaster/toastergui/templates/toastertable.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/toastertable.html
index 98a715f27..98a715f27 100644
--- a/bitbake/lib/toaster/toastergui/templates/toastertable.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/toastertable.html
diff --git a/bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html b/yocto-poky/bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html
index 0301a6c60..0301a6c60 100644
--- a/bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html
diff --git a/bitbake/lib/toaster/toastergui/templatetags/__init__.py b/yocto-poky/bitbake/lib/toaster/toastergui/templatetags/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/toaster/toastergui/templatetags/__init__.py
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templatetags/__init__.py
diff --git a/bitbake/lib/toaster/toastergui/templatetags/project_url_tag.py b/yocto-poky/bitbake/lib/toaster/toastergui/templatetags/project_url_tag.py
index 04770ac6a..04770ac6a 100644
--- a/bitbake/lib/toaster/toastergui/templatetags/project_url_tag.py
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templatetags/project_url_tag.py
diff --git a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py b/yocto-poky/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
index 75f2261be..75f2261be 100644
--- a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
diff --git a/bitbake/lib/toaster/toastergui/tests.py b/yocto-poky/bitbake/lib/toaster/toastergui/tests.py
index 9e6c46a25..9e6c46a25 100644
--- a/bitbake/lib/toaster/toastergui/tests.py
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/tests.py
diff --git a/bitbake/lib/toaster/toastergui/typeaheads.py b/yocto-poky/bitbake/lib/toaster/toastergui/typeaheads.py
index dd4b7f505..dd4b7f505 100644
--- a/bitbake/lib/toaster/toastergui/typeaheads.py
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/typeaheads.py
diff --git a/bitbake/lib/toaster/toastergui/urls.py b/yocto-poky/bitbake/lib/toaster/toastergui/urls.py
index a1adbb7be..a1adbb7be 100644
--- a/bitbake/lib/toaster/toastergui/urls.py
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/urls.py
diff --git a/bitbake/lib/toaster/toastergui/views.py b/yocto-poky/bitbake/lib/toaster/toastergui/views.py
index 0e255f1b8..0e255f1b8 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/views.py
diff --git a/bitbake/lib/toaster/toastergui/widgets.py b/yocto-poky/bitbake/lib/toaster/toastergui/widgets.py
index 6bb388936..6bb388936 100644
--- a/bitbake/lib/toaster/toastergui/widgets.py
+++ b/yocto-poky/bitbake/lib/toaster/toastergui/widgets.py
diff --git a/bitbake/lib/toaster/toastermain/__init__.py b/yocto-poky/bitbake/lib/toaster/toastermain/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/toaster/toastermain/__init__.py
+++ b/yocto-poky/bitbake/lib/toaster/toastermain/__init__.py
diff --git a/bitbake/lib/toaster/toastermain/management/__init__.py b/yocto-poky/bitbake/lib/toaster/toastermain/management/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/toaster/toastermain/management/__init__.py
+++ b/yocto-poky/bitbake/lib/toaster/toastermain/management/__init__.py
diff --git a/bitbake/lib/toaster/toastermain/management/commands/__init__.py b/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/__init__.py
index e69de29bb..e69de29bb 100644
--- a/bitbake/lib/toaster/toastermain/management/commands/__init__.py
+++ b/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/__init__.py
diff --git a/bitbake/lib/toaster/toastermain/management/commands/builddelete.py b/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/builddelete.py
index ff93e549d..ff93e549d 100644
--- a/bitbake/lib/toaster/toastermain/management/commands/builddelete.py
+++ b/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/builddelete.py
diff --git a/bitbake/lib/toaster/toastermain/management/commands/buildslist.py b/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/buildslist.py
index cad987fd9..cad987fd9 100644
--- a/bitbake/lib/toaster/toastermain/management/commands/buildslist.py
+++ b/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/buildslist.py
diff --git a/bitbake/lib/toaster/toastermain/management/commands/perf.py b/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/perf.py
index 71a48e95d..71a48e95d 100644
--- a/bitbake/lib/toaster/toastermain/management/commands/perf.py
+++ b/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/perf.py
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/yocto-poky/bitbake/lib/toaster/toastermain/settings.py
index b28ddb2b0..b28ddb2b0 100644
--- a/bitbake/lib/toaster/toastermain/settings.py
+++ b/yocto-poky/bitbake/lib/toaster/toastermain/settings.py
diff --git a/bitbake/lib/toaster/toastermain/urls.py b/yocto-poky/bitbake/lib/toaster/toastermain/urls.py
index 6c4a953b4..6c4a953b4 100644
--- a/bitbake/lib/toaster/toastermain/urls.py
+++ b/yocto-poky/bitbake/lib/toaster/toastermain/urls.py
diff --git a/bitbake/lib/toaster/toastermain/wsgi.py b/yocto-poky/bitbake/lib/toaster/toastermain/wsgi.py
index 031b314b1..031b314b1 100644
--- a/bitbake/lib/toaster/toastermain/wsgi.py
+++ b/yocto-poky/bitbake/lib/toaster/toastermain/wsgi.py
diff --git a/bitbake/toaster-requirements.txt b/yocto-poky/bitbake/toaster-requirements.txt
index 1d7d21b33..1d7d21b33 100644
--- a/bitbake/toaster-requirements.txt
+++ b/yocto-poky/bitbake/toaster-requirements.txt
diff --git a/documentation/Makefile b/yocto-poky/documentation/Makefile
index 99adea2fe..99adea2fe 100644
--- a/documentation/Makefile
+++ b/yocto-poky/documentation/Makefile
diff --git a/documentation/README b/yocto-poky/documentation/README
index d01678d4f..d01678d4f 100644
--- a/documentation/README
+++ b/yocto-poky/documentation/README
diff --git a/documentation/adt-manual/adt-command.xml b/yocto-poky/documentation/adt-manual/adt-command.xml
index c78d18a16..c78d18a16 100644
--- a/documentation/adt-manual/adt-command.xml
+++ b/yocto-poky/documentation/adt-manual/adt-command.xml
diff --git a/documentation/adt-manual/adt-intro.xml b/yocto-poky/documentation/adt-manual/adt-intro.xml
index 597c7120b..597c7120b 100644
--- a/documentation/adt-manual/adt-intro.xml
+++ b/yocto-poky/documentation/adt-manual/adt-intro.xml
diff --git a/documentation/adt-manual/adt-manual-customization.xsl b/yocto-poky/documentation/adt-manual/adt-manual-customization.xsl
index b86be519b..b86be519b 100644
--- a/documentation/adt-manual/adt-manual-customization.xsl
+++ b/yocto-poky/documentation/adt-manual/adt-manual-customization.xsl
diff --git a/documentation/adt-manual/adt-manual-eclipse-customization.xsl b/yocto-poky/documentation/adt-manual/adt-manual-eclipse-customization.xsl
index 77ba5f571..77ba5f571 100644
--- a/documentation/adt-manual/adt-manual-eclipse-customization.xsl
+++ b/yocto-poky/documentation/adt-manual/adt-manual-eclipse-customization.xsl
diff --git a/documentation/adt-manual/adt-manual-intro.xml b/yocto-poky/documentation/adt-manual/adt-manual-intro.xml
index 034fdff60..034fdff60 100644
--- a/documentation/adt-manual/adt-manual-intro.xml
+++ b/yocto-poky/documentation/adt-manual/adt-manual-intro.xml
diff --git a/documentation/adt-manual/adt-manual.xml b/yocto-poky/documentation/adt-manual/adt-manual.xml
index 67b330a53..67b330a53 100644
--- a/documentation/adt-manual/adt-manual.xml
+++ b/yocto-poky/documentation/adt-manual/adt-manual.xml
diff --git a/documentation/adt-manual/adt-package.xml b/yocto-poky/documentation/adt-manual/adt-package.xml
index 68eee9b38..68eee9b38 100644
--- a/documentation/adt-manual/adt-package.xml
+++ b/yocto-poky/documentation/adt-manual/adt-package.xml
diff --git a/documentation/adt-manual/adt-prepare.xml b/yocto-poky/documentation/adt-manual/adt-prepare.xml
index 65df1d03e..65df1d03e 100644
--- a/documentation/adt-manual/adt-prepare.xml
+++ b/yocto-poky/documentation/adt-manual/adt-prepare.xml
diff --git a/documentation/adt-manual/adt-style.css b/yocto-poky/documentation/adt-manual/adt-style.css
index d722ad4b7..d722ad4b7 100644
--- a/documentation/adt-manual/adt-style.css
+++ b/yocto-poky/documentation/adt-manual/adt-style.css
diff --git a/documentation/adt-manual/figures/adt-title.png b/yocto-poky/documentation/adt-manual/figures/adt-title.png
index 6e71e41f1..6e71e41f1 100644
--- a/documentation/adt-manual/figures/adt-title.png
+++ b/yocto-poky/documentation/adt-manual/figures/adt-title.png
diff --git a/documentation/adt-manual/figures/using-a-pre-built-image.png b/yocto-poky/documentation/adt-manual/figures/using-a-pre-built-image.png
index b03130d12..b03130d12 100644
--- a/documentation/adt-manual/figures/using-a-pre-built-image.png
+++ b/yocto-poky/documentation/adt-manual/figures/using-a-pre-built-image.png
diff --git a/documentation/bsp-guide/bsp-guide-customization.xsl b/yocto-poky/documentation/bsp-guide/bsp-guide-customization.xsl
index de674a0ae..de674a0ae 100644
--- a/documentation/bsp-guide/bsp-guide-customization.xsl
+++ b/yocto-poky/documentation/bsp-guide/bsp-guide-customization.xsl
diff --git a/documentation/bsp-guide/bsp-guide-eclipse-customization.xsl b/yocto-poky/documentation/bsp-guide/bsp-guide-eclipse-customization.xsl
index 35346effc..35346effc 100644
--- a/documentation/bsp-guide/bsp-guide-eclipse-customization.xsl
+++ b/yocto-poky/documentation/bsp-guide/bsp-guide-eclipse-customization.xsl
diff --git a/documentation/bsp-guide/bsp-guide.xml b/yocto-poky/documentation/bsp-guide/bsp-guide.xml
index d9bcc3f03..d9bcc3f03 100644
--- a/documentation/bsp-guide/bsp-guide.xml
+++ b/yocto-poky/documentation/bsp-guide/bsp-guide.xml
diff --git a/documentation/bsp-guide/bsp-style.css b/yocto-poky/documentation/bsp-guide/bsp-style.css
index e407ca4a7..e407ca4a7 100644
--- a/documentation/bsp-guide/bsp-style.css
+++ b/yocto-poky/documentation/bsp-guide/bsp-style.css
diff --git a/documentation/bsp-guide/bsp.xml b/yocto-poky/documentation/bsp-guide/bsp.xml
index ec39ec9b3..ec39ec9b3 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/yocto-poky/documentation/bsp-guide/bsp.xml
diff --git a/documentation/bsp-guide/figures/bsp-title.png b/yocto-poky/documentation/bsp-guide/figures/bsp-title.png
index f624dd4f9..f624dd4f9 100644
--- a/documentation/bsp-guide/figures/bsp-title.png
+++ b/yocto-poky/documentation/bsp-guide/figures/bsp-title.png
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/yocto-poky/documentation/dev-manual/dev-manual-common-tasks.xml
index f0836e8b1..f0836e8b1 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/yocto-poky/documentation/dev-manual/dev-manual-common-tasks.xml
diff --git a/documentation/dev-manual/dev-manual-customization.xsl b/yocto-poky/documentation/dev-manual/dev-manual-customization.xsl
index 523ea3c5e..523ea3c5e 100644
--- a/documentation/dev-manual/dev-manual-customization.xsl
+++ b/yocto-poky/documentation/dev-manual/dev-manual-customization.xsl
diff --git a/documentation/dev-manual/dev-manual-eclipse-customization.xsl b/yocto-poky/documentation/dev-manual/dev-manual-eclipse-customization.xsl
index 6d7b5fbb6..6d7b5fbb6 100644
--- a/documentation/dev-manual/dev-manual-eclipse-customization.xsl
+++ b/yocto-poky/documentation/dev-manual/dev-manual-eclipse-customization.xsl
diff --git a/documentation/dev-manual/dev-manual-intro.xml b/yocto-poky/documentation/dev-manual/dev-manual-intro.xml
index e350882a3..e350882a3 100644
--- a/documentation/dev-manual/dev-manual-intro.xml
+++ b/yocto-poky/documentation/dev-manual/dev-manual-intro.xml
diff --git a/documentation/dev-manual/dev-manual-model.xml b/yocto-poky/documentation/dev-manual/dev-manual-model.xml
index 6e42c7b39..6e42c7b39 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/yocto-poky/documentation/dev-manual/dev-manual-model.xml
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/yocto-poky/documentation/dev-manual/dev-manual-newbie.xml
index 70fa96975..70fa96975 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/yocto-poky/documentation/dev-manual/dev-manual-newbie.xml
diff --git a/documentation/dev-manual/dev-manual-qemu.xml b/yocto-poky/documentation/dev-manual/dev-manual-qemu.xml
index 903028f5c..903028f5c 100644
--- a/documentation/dev-manual/dev-manual-qemu.xml
+++ b/yocto-poky/documentation/dev-manual/dev-manual-qemu.xml
diff --git a/documentation/dev-manual/dev-manual-start.xml b/yocto-poky/documentation/dev-manual/dev-manual-start.xml
index db989b7bf..db989b7bf 100644
--- a/documentation/dev-manual/dev-manual-start.xml
+++ b/yocto-poky/documentation/dev-manual/dev-manual-start.xml
diff --git a/documentation/dev-manual/dev-manual.xml b/yocto-poky/documentation/dev-manual/dev-manual.xml
index 3ddd01fde..3ddd01fde 100644
--- a/documentation/dev-manual/dev-manual.xml
+++ b/yocto-poky/documentation/dev-manual/dev-manual.xml
diff --git a/documentation/dev-manual/dev-style.css b/yocto-poky/documentation/dev-manual/dev-style.css
index b900ffc9b..b900ffc9b 100644
--- a/documentation/dev-manual/dev-style.css
+++ b/yocto-poky/documentation/dev-manual/dev-style.css
diff --git a/documentation/dev-manual/figures/app-dev-flow.png b/yocto-poky/documentation/dev-manual/figures/app-dev-flow.png
index ec93374ee..ec93374ee 100644
--- a/documentation/dev-manual/figures/app-dev-flow.png
+++ b/yocto-poky/documentation/dev-manual/figures/app-dev-flow.png
diff --git a/documentation/dev-manual/figures/bsp-dev-flow.png b/yocto-poky/documentation/dev-manual/figures/bsp-dev-flow.png
index 540b0abb9..540b0abb9 100644
--- a/documentation/dev-manual/figures/bsp-dev-flow.png
+++ b/yocto-poky/documentation/dev-manual/figures/bsp-dev-flow.png
diff --git a/documentation/dev-manual/figures/build-workspace-directory.png b/yocto-poky/documentation/dev-manual/figures/build-workspace-directory.png
index f561f8fee..f561f8fee 100644
--- a/documentation/dev-manual/figures/build-workspace-directory.png
+++ b/yocto-poky/documentation/dev-manual/figures/build-workspace-directory.png
diff --git a/documentation/dev-manual/figures/dev-title.png b/yocto-poky/documentation/dev-manual/figures/dev-title.png
index d3cac4a7e..d3cac4a7e 100644
--- a/documentation/dev-manual/figures/dev-title.png
+++ b/yocto-poky/documentation/dev-manual/figures/dev-title.png
diff --git a/documentation/dev-manual/figures/git-workflow.png b/yocto-poky/documentation/dev-manual/figures/git-workflow.png
index e401330a1..e401330a1 100644
--- a/documentation/dev-manual/figures/git-workflow.png
+++ b/yocto-poky/documentation/dev-manual/figures/git-workflow.png
diff --git a/documentation/dev-manual/figures/index-downloads.png b/yocto-poky/documentation/dev-manual/figures/index-downloads.png
index 41251d5d1..41251d5d1 100644
--- a/documentation/dev-manual/figures/index-downloads.png
+++ b/yocto-poky/documentation/dev-manual/figures/index-downloads.png
diff --git a/documentation/dev-manual/figures/kernel-dev-flow.png b/yocto-poky/documentation/dev-manual/figures/kernel-dev-flow.png
index 009105d12..009105d12 100644
--- a/documentation/dev-manual/figures/kernel-dev-flow.png
+++ b/yocto-poky/documentation/dev-manual/figures/kernel-dev-flow.png
diff --git a/documentation/dev-manual/figures/kernel-overview-1.png b/yocto-poky/documentation/dev-manual/figures/kernel-overview-1.png
index 116c0b9bd..116c0b9bd 100644
--- a/documentation/dev-manual/figures/kernel-overview-1.png
+++ b/yocto-poky/documentation/dev-manual/figures/kernel-overview-1.png
diff --git a/documentation/dev-manual/figures/kernel-overview-2-generic.png b/yocto-poky/documentation/dev-manual/figures/kernel-overview-2-generic.png
index cb970eae7..cb970eae7 100644
--- a/documentation/dev-manual/figures/kernel-overview-2-generic.png
+++ b/yocto-poky/documentation/dev-manual/figures/kernel-overview-2-generic.png
diff --git a/documentation/dev-manual/figures/recipe-workflow.png b/yocto-poky/documentation/dev-manual/figures/recipe-workflow.png
index c0e960b13..c0e960b13 100644
--- a/documentation/dev-manual/figures/recipe-workflow.png
+++ b/yocto-poky/documentation/dev-manual/figures/recipe-workflow.png
diff --git a/documentation/dev-manual/figures/source-repos.png b/yocto-poky/documentation/dev-manual/figures/source-repos.png
index 65c5f29a4..65c5f29a4 100644
--- a/documentation/dev-manual/figures/source-repos.png
+++ b/yocto-poky/documentation/dev-manual/figures/source-repos.png
diff --git a/documentation/dev-manual/figures/yp-download.png b/yocto-poky/documentation/dev-manual/figures/yp-download.png
index 5770be688..5770be688 100644
--- a/documentation/dev-manual/figures/yp-download.png
+++ b/yocto-poky/documentation/dev-manual/figures/yp-download.png
diff --git a/documentation/kernel-dev/figures/kernel-architecture-overview.png b/yocto-poky/documentation/kernel-dev/figures/kernel-architecture-overview.png
index 2aad172db..2aad172db 100755
--- a/documentation/kernel-dev/figures/kernel-architecture-overview.png
+++ b/yocto-poky/documentation/kernel-dev/figures/kernel-architecture-overview.png
diff --git a/documentation/kernel-dev/figures/kernel-dev-title.png b/yocto-poky/documentation/kernel-dev/figures/kernel-dev-title.png
index 7a8dd5437..7a8dd5437 100644
--- a/documentation/kernel-dev/figures/kernel-dev-title.png
+++ b/yocto-poky/documentation/kernel-dev/figures/kernel-dev-title.png
diff --git a/documentation/kernel-dev/kernel-dev-advanced.xml b/yocto-poky/documentation/kernel-dev/kernel-dev-advanced.xml
index 4fdb853f9..4fdb853f9 100644
--- a/documentation/kernel-dev/kernel-dev-advanced.xml
+++ b/yocto-poky/documentation/kernel-dev/kernel-dev-advanced.xml
diff --git a/documentation/kernel-dev/kernel-dev-common.xml b/yocto-poky/documentation/kernel-dev/kernel-dev-common.xml
index ab7f80fbe..ab7f80fbe 100644
--- a/documentation/kernel-dev/kernel-dev-common.xml
+++ b/yocto-poky/documentation/kernel-dev/kernel-dev-common.xml
diff --git a/documentation/kernel-dev/kernel-dev-concepts-appx.xml b/yocto-poky/documentation/kernel-dev/kernel-dev-concepts-appx.xml
index ac91749cd..ac91749cd 100644
--- a/documentation/kernel-dev/kernel-dev-concepts-appx.xml
+++ b/yocto-poky/documentation/kernel-dev/kernel-dev-concepts-appx.xml
diff --git a/documentation/kernel-dev/kernel-dev-customization.xsl b/yocto-poky/documentation/kernel-dev/kernel-dev-customization.xsl
index 325b738e9..325b738e9 100644
--- a/documentation/kernel-dev/kernel-dev-customization.xsl
+++ b/yocto-poky/documentation/kernel-dev/kernel-dev-customization.xsl
diff --git a/documentation/kernel-dev/kernel-dev-eclipse-customization.xsl b/yocto-poky/documentation/kernel-dev/kernel-dev-eclipse-customization.xsl
index 3c56a5a9e..3c56a5a9e 100644
--- a/documentation/kernel-dev/kernel-dev-eclipse-customization.xsl
+++ b/yocto-poky/documentation/kernel-dev/kernel-dev-eclipse-customization.xsl
diff --git a/documentation/kernel-dev/kernel-dev-examples.xml b/yocto-poky/documentation/kernel-dev/kernel-dev-examples.xml
index 9d9aef6d0..9d9aef6d0 100644
--- a/documentation/kernel-dev/kernel-dev-examples.xml
+++ b/yocto-poky/documentation/kernel-dev/kernel-dev-examples.xml
diff --git a/documentation/kernel-dev/kernel-dev-faq.xml b/yocto-poky/documentation/kernel-dev/kernel-dev-faq.xml
index 2b99ad2dd..2b99ad2dd 100644
--- a/documentation/kernel-dev/kernel-dev-faq.xml
+++ b/yocto-poky/documentation/kernel-dev/kernel-dev-faq.xml
diff --git a/documentation/kernel-dev/kernel-dev-intro.xml b/yocto-poky/documentation/kernel-dev/kernel-dev-intro.xml
index 263e50098..263e50098 100644
--- a/documentation/kernel-dev/kernel-dev-intro.xml
+++ b/yocto-poky/documentation/kernel-dev/kernel-dev-intro.xml
diff --git a/documentation/kernel-dev/kernel-dev-maint-appx.xml b/yocto-poky/documentation/kernel-dev/kernel-dev-maint-appx.xml
index 6bb0cf6fd..6bb0cf6fd 100644
--- a/documentation/kernel-dev/kernel-dev-maint-appx.xml
+++ b/yocto-poky/documentation/kernel-dev/kernel-dev-maint-appx.xml
diff --git a/documentation/kernel-dev/kernel-dev-style.css b/yocto-poky/documentation/kernel-dev/kernel-dev-style.css
index 6e0c1c7fc..6e0c1c7fc 100644
--- a/documentation/kernel-dev/kernel-dev-style.css
+++ b/yocto-poky/documentation/kernel-dev/kernel-dev-style.css
diff --git a/documentation/kernel-dev/kernel-dev.xml b/yocto-poky/documentation/kernel-dev/kernel-dev.xml
index 38850fa3c..38850fa3c 100644
--- a/documentation/kernel-dev/kernel-dev.xml
+++ b/yocto-poky/documentation/kernel-dev/kernel-dev.xml
diff --git a/documentation/mega-manual/figures/add-variable.png b/yocto-poky/documentation/mega-manual/figures/add-variable.png
index 6bdcca705..6bdcca705 100644
--- a/documentation/mega-manual/figures/add-variable.png
+++ b/yocto-poky/documentation/mega-manual/figures/add-variable.png
diff --git a/documentation/mega-manual/figures/adt-title.png b/yocto-poky/documentation/mega-manual/figures/adt-title.png
index 6e71e41f1..6e71e41f1 100644
--- a/documentation/mega-manual/figures/adt-title.png
+++ b/yocto-poky/documentation/mega-manual/figures/adt-title.png
diff --git a/documentation/mega-manual/figures/analysis-for-package-splitting.png b/yocto-poky/documentation/mega-manual/figures/analysis-for-package-splitting.png
index 04f2794ea..04f2794ea 100644
--- a/documentation/mega-manual/figures/analysis-for-package-splitting.png
+++ b/yocto-poky/documentation/mega-manual/figures/analysis-for-package-splitting.png
diff --git a/documentation/mega-manual/figures/app-dev-flow.png b/yocto-poky/documentation/mega-manual/figures/app-dev-flow.png
index 4927b93d6..4927b93d6 100644
--- a/documentation/mega-manual/figures/app-dev-flow.png
+++ b/yocto-poky/documentation/mega-manual/figures/app-dev-flow.png
diff --git a/documentation/mega-manual/figures/bash-oecore.png b/yocto-poky/documentation/mega-manual/figures/bash-oecore.png
index 801a5d911..801a5d911 100644
--- a/documentation/mega-manual/figures/bash-oecore.png
+++ b/yocto-poky/documentation/mega-manual/figures/bash-oecore.png
diff --git a/documentation/mega-manual/figures/bsp-dev-flow.png b/yocto-poky/documentation/mega-manual/figures/bsp-dev-flow.png
index 540b0abb9..540b0abb9 100644
--- a/documentation/mega-manual/figures/bsp-dev-flow.png
+++ b/yocto-poky/documentation/mega-manual/figures/bsp-dev-flow.png
diff --git a/documentation/mega-manual/figures/bsp-title.png b/yocto-poky/documentation/mega-manual/figures/bsp-title.png
index f624dd4f9..f624dd4f9 100644
--- a/documentation/mega-manual/figures/bsp-title.png
+++ b/yocto-poky/documentation/mega-manual/figures/bsp-title.png
diff --git a/documentation/mega-manual/figures/build-workspace-directory.png b/yocto-poky/documentation/mega-manual/figures/build-workspace-directory.png
index f561f8fee..f561f8fee 100644
--- a/documentation/mega-manual/figures/build-workspace-directory.png
+++ b/yocto-poky/documentation/mega-manual/figures/build-workspace-directory.png
diff --git a/documentation/mega-manual/figures/buildhistory-web.png b/yocto-poky/documentation/mega-manual/figures/buildhistory-web.png
index f6db86c97..f6db86c97 100644
--- a/documentation/mega-manual/figures/buildhistory-web.png
+++ b/yocto-poky/documentation/mega-manual/figures/buildhistory-web.png
diff --git a/documentation/mega-manual/figures/buildhistory.png b/yocto-poky/documentation/mega-manual/figures/buildhistory.png
index bd5f8a490..bd5f8a490 100644
--- a/documentation/mega-manual/figures/buildhistory.png
+++ b/yocto-poky/documentation/mega-manual/figures/buildhistory.png
diff --git a/documentation/mega-manual/figures/building-an-image.png b/yocto-poky/documentation/mega-manual/figures/building-an-image.png
index 1fbea5ab0..1fbea5ab0 100755
--- a/documentation/mega-manual/figures/building-an-image.png
+++ b/yocto-poky/documentation/mega-manual/figures/building-an-image.png
diff --git a/documentation/mega-manual/figures/configuration-compile-autoreconf.png b/yocto-poky/documentation/mega-manual/figures/configuration-compile-autoreconf.png
index a07464f04..a07464f04 100644
--- a/documentation/mega-manual/figures/configuration-compile-autoreconf.png
+++ b/yocto-poky/documentation/mega-manual/figures/configuration-compile-autoreconf.png
diff --git a/documentation/mega-manual/figures/cross-development-toolchains.png b/yocto-poky/documentation/mega-manual/figures/cross-development-toolchains.png
index d36670a19..d36670a19 100644
--- a/documentation/mega-manual/figures/cross-development-toolchains.png
+++ b/yocto-poky/documentation/mega-manual/figures/cross-development-toolchains.png
diff --git a/documentation/mega-manual/figures/define-generic.png b/yocto-poky/documentation/mega-manual/figures/define-generic.png
index bd22718a5..bd22718a5 100644
--- a/documentation/mega-manual/figures/define-generic.png
+++ b/yocto-poky/documentation/mega-manual/figures/define-generic.png
diff --git a/documentation/mega-manual/figures/dev-title.png b/yocto-poky/documentation/mega-manual/figures/dev-title.png
index d3cac4a7e..d3cac4a7e 100644
--- a/documentation/mega-manual/figures/dev-title.png
+++ b/yocto-poky/documentation/mega-manual/figures/dev-title.png
diff --git a/documentation/mega-manual/figures/git-workflow.png b/yocto-poky/documentation/mega-manual/figures/git-workflow.png
index e401330a1..e401330a1 100644
--- a/documentation/mega-manual/figures/git-workflow.png
+++ b/yocto-poky/documentation/mega-manual/figures/git-workflow.png
diff --git a/documentation/mega-manual/figures/hosted-service.png b/yocto-poky/documentation/mega-manual/figures/hosted-service.png
index 01fea7b24..01fea7b24 100644
--- a/documentation/mega-manual/figures/hosted-service.png
+++ b/yocto-poky/documentation/mega-manual/figures/hosted-service.png
diff --git a/documentation/mega-manual/figures/image-generation.png b/yocto-poky/documentation/mega-manual/figures/image-generation.png
index ab962580c..ab962580c 100644
--- a/documentation/mega-manual/figures/image-generation.png
+++ b/yocto-poky/documentation/mega-manual/figures/image-generation.png
diff --git a/documentation/mega-manual/figures/images.png b/yocto-poky/documentation/mega-manual/figures/images.png
index d99eac1fb..d99eac1fb 100644
--- a/documentation/mega-manual/figures/images.png
+++ b/yocto-poky/documentation/mega-manual/figures/images.png
diff --git a/documentation/mega-manual/figures/index-downloads.png b/yocto-poky/documentation/mega-manual/figures/index-downloads.png
index c907997db..c907997db 100644
--- a/documentation/mega-manual/figures/index-downloads.png
+++ b/yocto-poky/documentation/mega-manual/figures/index-downloads.png
diff --git a/documentation/mega-manual/figures/kernel-architecture-overview.png b/yocto-poky/documentation/mega-manual/figures/kernel-architecture-overview.png
index 2aad172db..2aad172db 100755
--- a/documentation/mega-manual/figures/kernel-architecture-overview.png
+++ b/yocto-poky/documentation/mega-manual/figures/kernel-architecture-overview.png
diff --git a/documentation/mega-manual/figures/kernel-dev-flow.png b/yocto-poky/documentation/mega-manual/figures/kernel-dev-flow.png
index 009105d12..009105d12 100644
--- a/documentation/mega-manual/figures/kernel-dev-flow.png
+++ b/yocto-poky/documentation/mega-manual/figures/kernel-dev-flow.png
diff --git a/documentation/mega-manual/figures/kernel-dev-title.png b/yocto-poky/documentation/mega-manual/figures/kernel-dev-title.png
index 7a8dd5437..7a8dd5437 100644
--- a/documentation/mega-manual/figures/kernel-dev-title.png
+++ b/yocto-poky/documentation/mega-manual/figures/kernel-dev-title.png
diff --git a/documentation/mega-manual/figures/kernel-overview-1.png b/yocto-poky/documentation/mega-manual/figures/kernel-overview-1.png
index 116c0b9bd..116c0b9bd 100644
--- a/documentation/mega-manual/figures/kernel-overview-1.png
+++ b/yocto-poky/documentation/mega-manual/figures/kernel-overview-1.png
diff --git a/documentation/mega-manual/figures/kernel-overview-2-generic.png b/yocto-poky/documentation/mega-manual/figures/kernel-overview-2-generic.png
index cb970eae7..cb970eae7 100644
--- a/documentation/mega-manual/figures/kernel-overview-2-generic.png
+++ b/yocto-poky/documentation/mega-manual/figures/kernel-overview-2-generic.png
diff --git a/documentation/mega-manual/figures/kernel-title.png b/yocto-poky/documentation/mega-manual/figures/kernel-title.png
index 59d86c00d..59d86c00d 100644
--- a/documentation/mega-manual/figures/kernel-title.png
+++ b/yocto-poky/documentation/mega-manual/figures/kernel-title.png
diff --git a/documentation/mega-manual/figures/kernelshark-all.png b/yocto-poky/documentation/mega-manual/figures/kernelshark-all.png
index 99b40bafe..99b40bafe 100644
--- a/documentation/mega-manual/figures/kernelshark-all.png
+++ b/yocto-poky/documentation/mega-manual/figures/kernelshark-all.png
diff --git a/documentation/mega-manual/figures/kernelshark-choose-events.png b/yocto-poky/documentation/mega-manual/figures/kernelshark-choose-events.png
index e8dd62a57..e8dd62a57 100644
--- a/documentation/mega-manual/figures/kernelshark-choose-events.png
+++ b/yocto-poky/documentation/mega-manual/figures/kernelshark-choose-events.png
diff --git a/documentation/mega-manual/figures/kernelshark-i915-display.png b/yocto-poky/documentation/mega-manual/figures/kernelshark-i915-display.png
index bb0edfb7f..bb0edfb7f 100644
--- a/documentation/mega-manual/figures/kernelshark-i915-display.png
+++ b/yocto-poky/documentation/mega-manual/figures/kernelshark-i915-display.png
diff --git a/documentation/mega-manual/figures/kernelshark-output-display.png b/yocto-poky/documentation/mega-manual/figures/kernelshark-output-display.png
index ae2d0e573..ae2d0e573 100644
--- a/documentation/mega-manual/figures/kernelshark-output-display.png
+++ b/yocto-poky/documentation/mega-manual/figures/kernelshark-output-display.png
diff --git a/documentation/mega-manual/figures/layer-input.png b/yocto-poky/documentation/mega-manual/figures/layer-input.png
index 0a4f2e74f..0a4f2e74f 100644
--- a/documentation/mega-manual/figures/layer-input.png
+++ b/yocto-poky/documentation/mega-manual/figures/layer-input.png
diff --git a/documentation/mega-manual/figures/lttngmain0.png b/yocto-poky/documentation/mega-manual/figures/lttngmain0.png
index 5f60113cc..5f60113cc 100644
--- a/documentation/mega-manual/figures/lttngmain0.png
+++ b/yocto-poky/documentation/mega-manual/figures/lttngmain0.png
diff --git a/documentation/mega-manual/figures/mega-title.png b/yocto-poky/documentation/mega-manual/figures/mega-title.png
index cde0b89a4..cde0b89a4 100644
--- a/documentation/mega-manual/figures/mega-title.png
+++ b/yocto-poky/documentation/mega-manual/figures/mega-title.png
diff --git a/documentation/mega-manual/figures/oprofileui-busybox.png b/yocto-poky/documentation/mega-manual/figures/oprofileui-busybox.png
index a8275c65d..a8275c65d 100644
--- a/documentation/mega-manual/figures/oprofileui-busybox.png
+++ b/yocto-poky/documentation/mega-manual/figures/oprofileui-busybox.png
diff --git a/documentation/mega-manual/figures/oprofileui-copy-to-user.png b/yocto-poky/documentation/mega-manual/figures/oprofileui-copy-to-user.png
index deb647020..deb647020 100644
--- a/documentation/mega-manual/figures/oprofileui-copy-to-user.png
+++ b/yocto-poky/documentation/mega-manual/figures/oprofileui-copy-to-user.png
diff --git a/documentation/mega-manual/figures/oprofileui-downloading.png b/yocto-poky/documentation/mega-manual/figures/oprofileui-downloading.png
index 57742d672..57742d672 100644
--- a/documentation/mega-manual/figures/oprofileui-downloading.png
+++ b/yocto-poky/documentation/mega-manual/figures/oprofileui-downloading.png
diff --git a/documentation/mega-manual/figures/oprofileui-processes.png b/yocto-poky/documentation/mega-manual/figures/oprofileui-processes.png
index ae547028f..ae547028f 100644
--- a/documentation/mega-manual/figures/oprofileui-processes.png
+++ b/yocto-poky/documentation/mega-manual/figures/oprofileui-processes.png
diff --git a/documentation/mega-manual/figures/package-feeds.png b/yocto-poky/documentation/mega-manual/figures/package-feeds.png
index 37c9c3250..37c9c3250 100644
--- a/documentation/mega-manual/figures/package-feeds.png
+++ b/yocto-poky/documentation/mega-manual/figures/package-feeds.png
diff --git a/documentation/mega-manual/figures/patching.png b/yocto-poky/documentation/mega-manual/figures/patching.png
index 8ecd01850..8ecd01850 100644
--- a/documentation/mega-manual/figures/patching.png
+++ b/yocto-poky/documentation/mega-manual/figures/patching.png
diff --git a/documentation/mega-manual/figures/perf-probe-do_fork-profile.png b/yocto-poky/documentation/mega-manual/figures/perf-probe-do_fork-profile.png
index 1a1070deb..1a1070deb 100644
--- a/documentation/mega-manual/figures/perf-probe-do_fork-profile.png
+++ b/yocto-poky/documentation/mega-manual/figures/perf-probe-do_fork-profile.png
diff --git a/documentation/mega-manual/figures/perf-report-cycles-u.png b/yocto-poky/documentation/mega-manual/figures/perf-report-cycles-u.png
index 68ec6af80..68ec6af80 100644
--- a/documentation/mega-manual/figures/perf-report-cycles-u.png
+++ b/yocto-poky/documentation/mega-manual/figures/perf-report-cycles-u.png
diff --git a/documentation/mega-manual/figures/perf-systemwide-libc.png b/yocto-poky/documentation/mega-manual/figures/perf-systemwide-libc.png
index 2b72869c7..2b72869c7 100644
--- a/documentation/mega-manual/figures/perf-systemwide-libc.png
+++ b/yocto-poky/documentation/mega-manual/figures/perf-systemwide-libc.png
diff --git a/documentation/mega-manual/figures/perf-systemwide.png b/yocto-poky/documentation/mega-manual/figures/perf-systemwide.png
index 12ce2444a..12ce2444a 100644
--- a/documentation/mega-manual/figures/perf-systemwide.png
+++ b/yocto-poky/documentation/mega-manual/figures/perf-systemwide.png
diff --git a/documentation/mega-manual/figures/perf-wget-busybox-annotate-menu.png b/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-annotate-menu.png
index ceb34eaea..ceb34eaea 100644
--- a/documentation/mega-manual/figures/perf-wget-busybox-annotate-menu.png
+++ b/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-annotate-menu.png
diff --git a/documentation/mega-manual/figures/perf-wget-busybox-annotate-udhcpc.png b/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-annotate-udhcpc.png
index 3581e9daa..3581e9daa 100644
--- a/documentation/mega-manual/figures/perf-wget-busybox-annotate-udhcpc.png
+++ b/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-annotate-udhcpc.png
diff --git a/documentation/mega-manual/figures/perf-wget-busybox-debuginfo.png b/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-debuginfo.png
index c317b49a4..c317b49a4 100644
--- a/documentation/mega-manual/figures/perf-wget-busybox-debuginfo.png
+++ b/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-debuginfo.png
diff --git a/documentation/mega-manual/figures/perf-wget-busybox-dso-zoom-menu.png b/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-dso-zoom-menu.png
index 1913c867d..1913c867d 100644
--- a/documentation/mega-manual/figures/perf-wget-busybox-dso-zoom-menu.png
+++ b/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-dso-zoom-menu.png
diff --git a/documentation/mega-manual/figures/perf-wget-busybox-dso-zoom.png b/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-dso-zoom.png
index a1962c437..a1962c437 100644
--- a/documentation/mega-manual/figures/perf-wget-busybox-dso-zoom.png
+++ b/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-dso-zoom.png
diff --git a/documentation/mega-manual/figures/perf-wget-busybox-expanded-stripped.png b/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-expanded-stripped.png
index b642d06c8..b642d06c8 100644
--- a/documentation/mega-manual/figures/perf-wget-busybox-expanded-stripped.png
+++ b/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-expanded-stripped.png
diff --git a/documentation/mega-manual/figures/perf-wget-flat-stripped.png b/yocto-poky/documentation/mega-manual/figures/perf-wget-flat-stripped.png
index c8f395ab5..c8f395ab5 100644
--- a/documentation/mega-manual/figures/perf-wget-flat-stripped.png
+++ b/yocto-poky/documentation/mega-manual/figures/perf-wget-flat-stripped.png
diff --git a/documentation/mega-manual/figures/perf-wget-g-copy-from-user-expanded-stripped.png b/yocto-poky/documentation/mega-manual/figures/perf-wget-g-copy-from-user-expanded-stripped.png
index bb7c764ce..bb7c764ce 100644
--- a/documentation/mega-manual/figures/perf-wget-g-copy-from-user-expanded-stripped.png
+++ b/yocto-poky/documentation/mega-manual/figures/perf-wget-g-copy-from-user-expanded-stripped.png
diff --git a/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-debuginfo.png b/yocto-poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-debuginfo.png
index a799af512..a799af512 100644
--- a/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-debuginfo.png
+++ b/yocto-poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-debuginfo.png
diff --git a/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png b/yocto-poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png
index e91808ae4..e91808ae4 100644
--- a/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png
+++ b/yocto-poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png
diff --git a/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-stripped.png b/yocto-poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-stripped.png
index 812302d0a..812302d0a 100644
--- a/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-stripped.png
+++ b/yocto-poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-stripped.png
diff --git a/documentation/mega-manual/figures/poky-title.png b/yocto-poky/documentation/mega-manual/figures/poky-title.png
index 2893d8462..2893d8462 100644
--- a/documentation/mega-manual/figures/poky-title.png
+++ b/yocto-poky/documentation/mega-manual/figures/poky-title.png
diff --git a/documentation/mega-manual/figures/profile-title.png b/yocto-poky/documentation/mega-manual/figures/profile-title.png
index ce5c682b5..ce5c682b5 100644
--- a/documentation/mega-manual/figures/profile-title.png
+++ b/yocto-poky/documentation/mega-manual/figures/profile-title.png
diff --git a/documentation/mega-manual/figures/pybootchartgui-linux-yocto.png b/yocto-poky/documentation/mega-manual/figures/pybootchartgui-linux-yocto.png
index 2b6bfdacf..2b6bfdacf 100644
--- a/documentation/mega-manual/figures/pybootchartgui-linux-yocto.png
+++ b/yocto-poky/documentation/mega-manual/figures/pybootchartgui-linux-yocto.png
diff --git a/documentation/mega-manual/figures/pychart-linux-yocto-rpm-nostrip.png b/yocto-poky/documentation/mega-manual/figures/pychart-linux-yocto-rpm-nostrip.png
index 444675c54..444675c54 100644
--- a/documentation/mega-manual/figures/pychart-linux-yocto-rpm-nostrip.png
+++ b/yocto-poky/documentation/mega-manual/figures/pychart-linux-yocto-rpm-nostrip.png
diff --git a/documentation/mega-manual/figures/pychart-linux-yocto-rpm.png b/yocto-poky/documentation/mega-manual/figures/pychart-linux-yocto-rpm.png
index 8ee35352d..8ee35352d 100644
--- a/documentation/mega-manual/figures/pychart-linux-yocto-rpm.png
+++ b/yocto-poky/documentation/mega-manual/figures/pychart-linux-yocto-rpm.png
diff --git a/documentation/mega-manual/figures/recipe-workflow.png b/yocto-poky/documentation/mega-manual/figures/recipe-workflow.png
index c0e960b13..c0e960b13 100644
--- a/documentation/mega-manual/figures/recipe-workflow.png
+++ b/yocto-poky/documentation/mega-manual/figures/recipe-workflow.png
diff --git a/documentation/mega-manual/figures/sched-wakeup-profile.png b/yocto-poky/documentation/mega-manual/figures/sched-wakeup-profile.png
index 2f2581188..2f2581188 100644
--- a/documentation/mega-manual/figures/sched-wakeup-profile.png
+++ b/yocto-poky/documentation/mega-manual/figures/sched-wakeup-profile.png
diff --git a/documentation/mega-manual/figures/sdk-generation.png b/yocto-poky/documentation/mega-manual/figures/sdk-generation.png
index c37e2748c..c37e2748c 100644
--- a/documentation/mega-manual/figures/sdk-generation.png
+++ b/yocto-poky/documentation/mega-manual/figures/sdk-generation.png
diff --git a/documentation/mega-manual/figures/sdk.png b/yocto-poky/documentation/mega-manual/figures/sdk.png
index a539cc52f..a539cc52f 100644
--- a/documentation/mega-manual/figures/sdk.png
+++ b/yocto-poky/documentation/mega-manual/figures/sdk.png
diff --git a/documentation/mega-manual/figures/set-variable.png b/yocto-poky/documentation/mega-manual/figures/set-variable.png
index d36b52754..d36b52754 100644
--- a/documentation/mega-manual/figures/set-variable.png
+++ b/yocto-poky/documentation/mega-manual/figures/set-variable.png
diff --git a/documentation/mega-manual/figures/simple-configuration.png b/yocto-poky/documentation/mega-manual/figures/simple-configuration.png
index e8fce2bf1..e8fce2bf1 100644
--- a/documentation/mega-manual/figures/simple-configuration.png
+++ b/yocto-poky/documentation/mega-manual/figures/simple-configuration.png
diff --git a/documentation/mega-manual/figures/source-fetching.png b/yocto-poky/documentation/mega-manual/figures/source-fetching.png
index 26aefb50c..26aefb50c 100644
--- a/documentation/mega-manual/figures/source-fetching.png
+++ b/yocto-poky/documentation/mega-manual/figures/source-fetching.png
diff --git a/documentation/mega-manual/figures/source-input.png b/yocto-poky/documentation/mega-manual/figures/source-input.png
index f7515058e..f7515058e 100644
--- a/documentation/mega-manual/figures/source-input.png
+++ b/yocto-poky/documentation/mega-manual/figures/source-input.png
diff --git a/documentation/mega-manual/figures/source-repos.png b/yocto-poky/documentation/mega-manual/figures/source-repos.png
index 65c5f29a4..65c5f29a4 100644
--- a/documentation/mega-manual/figures/source-repos.png
+++ b/yocto-poky/documentation/mega-manual/figures/source-repos.png
diff --git a/documentation/mega-manual/figures/sysprof-callers.png b/yocto-poky/documentation/mega-manual/figures/sysprof-callers.png
index 640c8d914..640c8d914 100644
--- a/documentation/mega-manual/figures/sysprof-callers.png
+++ b/yocto-poky/documentation/mega-manual/figures/sysprof-callers.png
diff --git a/documentation/mega-manual/figures/sysprof-copy-from-user.png b/yocto-poky/documentation/mega-manual/figures/sysprof-copy-from-user.png
index 8d3142782..8d3142782 100644
--- a/documentation/mega-manual/figures/sysprof-copy-from-user.png
+++ b/yocto-poky/documentation/mega-manual/figures/sysprof-copy-from-user.png
diff --git a/documentation/mega-manual/figures/sysprof-copy-to-user.png b/yocto-poky/documentation/mega-manual/figures/sysprof-copy-to-user.png
index 7a5bab799..7a5bab799 100644
--- a/documentation/mega-manual/figures/sysprof-copy-to-user.png
+++ b/yocto-poky/documentation/mega-manual/figures/sysprof-copy-to-user.png
diff --git a/documentation/mega-manual/figures/toaster-title.png b/yocto-poky/documentation/mega-manual/figures/toaster-title.png
index b7ea39cd8..b7ea39cd8 100644
--- a/documentation/mega-manual/figures/toaster-title.png
+++ b/yocto-poky/documentation/mega-manual/figures/toaster-title.png
diff --git a/documentation/mega-manual/figures/user-configuration.png b/yocto-poky/documentation/mega-manual/figures/user-configuration.png
index f2b3f8e7f..f2b3f8e7f 100644
--- a/documentation/mega-manual/figures/user-configuration.png
+++ b/yocto-poky/documentation/mega-manual/figures/user-configuration.png
diff --git a/documentation/mega-manual/figures/using-a-pre-built-image.png b/yocto-poky/documentation/mega-manual/figures/using-a-pre-built-image.png
index b03130d12..b03130d12 100644
--- a/documentation/mega-manual/figures/using-a-pre-built-image.png
+++ b/yocto-poky/documentation/mega-manual/figures/using-a-pre-built-image.png
diff --git a/documentation/mega-manual/figures/variable-added.png b/yocto-poky/documentation/mega-manual/figures/variable-added.png
index 518f25fa1..518f25fa1 100644
--- a/documentation/mega-manual/figures/variable-added.png
+++ b/yocto-poky/documentation/mega-manual/figures/variable-added.png
diff --git a/documentation/mega-manual/figures/yocto-environment-ref.png b/yocto-poky/documentation/mega-manual/figures/yocto-environment-ref.png
index 650c6c803..650c6c803 100644
--- a/documentation/mega-manual/figures/yocto-environment-ref.png
+++ b/yocto-poky/documentation/mega-manual/figures/yocto-environment-ref.png
diff --git a/documentation/mega-manual/figures/yocto-environment.png b/yocto-poky/documentation/mega-manual/figures/yocto-environment.png
index 82b7a55a3..82b7a55a3 100644
--- a/documentation/mega-manual/figures/yocto-environment.png
+++ b/yocto-poky/documentation/mega-manual/figures/yocto-environment.png
diff --git a/documentation/mega-manual/figures/yocto-project-transp.png b/yocto-poky/documentation/mega-manual/figures/yocto-project-transp.png
index 31d2b147f..31d2b147f 100755
--- a/documentation/mega-manual/figures/yocto-project-transp.png
+++ b/yocto-poky/documentation/mega-manual/figures/yocto-project-transp.png
diff --git a/documentation/mega-manual/figures/yp-download.png b/yocto-poky/documentation/mega-manual/figures/yp-download.png
index 5770be688..5770be688 100644
--- a/documentation/mega-manual/figures/yp-download.png
+++ b/yocto-poky/documentation/mega-manual/figures/yp-download.png
diff --git a/documentation/mega-manual/mega-manual-customization.xsl b/yocto-poky/documentation/mega-manual/mega-manual-customization.xsl
index b52b5b2aa..b52b5b2aa 100644
--- a/documentation/mega-manual/mega-manual-customization.xsl
+++ b/yocto-poky/documentation/mega-manual/mega-manual-customization.xsl
diff --git a/documentation/mega-manual/mega-manual.xml b/yocto-poky/documentation/mega-manual/mega-manual.xml
index 5c1faec7a..5c1faec7a 100644
--- a/documentation/mega-manual/mega-manual.xml
+++ b/yocto-poky/documentation/mega-manual/mega-manual.xml
diff --git a/documentation/mega-manual/mega-style.css b/yocto-poky/documentation/mega-manual/mega-style.css
index df71a20a0..df71a20a0 100644
--- a/documentation/mega-manual/mega-style.css
+++ b/yocto-poky/documentation/mega-manual/mega-style.css
diff --git a/documentation/poky.ent b/yocto-poky/documentation/poky.ent
index 33d52c04b..33d52c04b 100644
--- a/documentation/poky.ent
+++ b/yocto-poky/documentation/poky.ent
diff --git a/documentation/profile-manual/figures/kernelshark-all.png b/yocto-poky/documentation/profile-manual/figures/kernelshark-all.png
index 99b40bafe..99b40bafe 100644
--- a/documentation/profile-manual/figures/kernelshark-all.png
+++ b/yocto-poky/documentation/profile-manual/figures/kernelshark-all.png
diff --git a/documentation/profile-manual/figures/kernelshark-choose-events.png b/yocto-poky/documentation/profile-manual/figures/kernelshark-choose-events.png
index e8dd62a57..e8dd62a57 100644
--- a/documentation/profile-manual/figures/kernelshark-choose-events.png
+++ b/yocto-poky/documentation/profile-manual/figures/kernelshark-choose-events.png
diff --git a/documentation/profile-manual/figures/kernelshark-i915-display.png b/yocto-poky/documentation/profile-manual/figures/kernelshark-i915-display.png
index bb0edfb7f..bb0edfb7f 100644
--- a/documentation/profile-manual/figures/kernelshark-i915-display.png
+++ b/yocto-poky/documentation/profile-manual/figures/kernelshark-i915-display.png
diff --git a/documentation/profile-manual/figures/kernelshark-output-display.png b/yocto-poky/documentation/profile-manual/figures/kernelshark-output-display.png
index ae2d0e573..ae2d0e573 100644
--- a/documentation/profile-manual/figures/kernelshark-output-display.png
+++ b/yocto-poky/documentation/profile-manual/figures/kernelshark-output-display.png
diff --git a/documentation/profile-manual/figures/lttngmain0.png b/yocto-poky/documentation/profile-manual/figures/lttngmain0.png
index 5f60113cc..5f60113cc 100644
--- a/documentation/profile-manual/figures/lttngmain0.png
+++ b/yocto-poky/documentation/profile-manual/figures/lttngmain0.png
diff --git a/documentation/profile-manual/figures/oprofileui-busybox.png b/yocto-poky/documentation/profile-manual/figures/oprofileui-busybox.png
index a8275c65d..a8275c65d 100644
--- a/documentation/profile-manual/figures/oprofileui-busybox.png
+++ b/yocto-poky/documentation/profile-manual/figures/oprofileui-busybox.png
diff --git a/documentation/profile-manual/figures/oprofileui-copy-to-user.png b/yocto-poky/documentation/profile-manual/figures/oprofileui-copy-to-user.png
index deb647020..deb647020 100644
--- a/documentation/profile-manual/figures/oprofileui-copy-to-user.png
+++ b/yocto-poky/documentation/profile-manual/figures/oprofileui-copy-to-user.png
diff --git a/documentation/profile-manual/figures/oprofileui-downloading.png b/yocto-poky/documentation/profile-manual/figures/oprofileui-downloading.png
index 57742d672..57742d672 100644
--- a/documentation/profile-manual/figures/oprofileui-downloading.png
+++ b/yocto-poky/documentation/profile-manual/figures/oprofileui-downloading.png
diff --git a/documentation/profile-manual/figures/oprofileui-processes.png b/yocto-poky/documentation/profile-manual/figures/oprofileui-processes.png
index ae547028f..ae547028f 100644
--- a/documentation/profile-manual/figures/oprofileui-processes.png
+++ b/yocto-poky/documentation/profile-manual/figures/oprofileui-processes.png
diff --git a/documentation/profile-manual/figures/perf-probe-do_fork-profile.png b/yocto-poky/documentation/profile-manual/figures/perf-probe-do_fork-profile.png
index 1a1070deb..1a1070deb 100644
--- a/documentation/profile-manual/figures/perf-probe-do_fork-profile.png
+++ b/yocto-poky/documentation/profile-manual/figures/perf-probe-do_fork-profile.png
diff --git a/documentation/profile-manual/figures/perf-report-cycles-u.png b/yocto-poky/documentation/profile-manual/figures/perf-report-cycles-u.png
index 68ec6af80..68ec6af80 100644
--- a/documentation/profile-manual/figures/perf-report-cycles-u.png
+++ b/yocto-poky/documentation/profile-manual/figures/perf-report-cycles-u.png
diff --git a/documentation/profile-manual/figures/perf-systemwide-libc.png b/yocto-poky/documentation/profile-manual/figures/perf-systemwide-libc.png
index 2b72869c7..2b72869c7 100644
--- a/documentation/profile-manual/figures/perf-systemwide-libc.png
+++ b/yocto-poky/documentation/profile-manual/figures/perf-systemwide-libc.png
diff --git a/documentation/profile-manual/figures/perf-systemwide.png b/yocto-poky/documentation/profile-manual/figures/perf-systemwide.png
index 12ce2444a..12ce2444a 100644
--- a/documentation/profile-manual/figures/perf-systemwide.png
+++ b/yocto-poky/documentation/profile-manual/figures/perf-systemwide.png
diff --git a/documentation/profile-manual/figures/perf-wget-busybox-annotate-menu.png b/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-annotate-menu.png
index ceb34eaea..ceb34eaea 100644
--- a/documentation/profile-manual/figures/perf-wget-busybox-annotate-menu.png
+++ b/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-annotate-menu.png
diff --git a/documentation/profile-manual/figures/perf-wget-busybox-annotate-udhcpc.png b/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-annotate-udhcpc.png
index 3581e9daa..3581e9daa 100644
--- a/documentation/profile-manual/figures/perf-wget-busybox-annotate-udhcpc.png
+++ b/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-annotate-udhcpc.png
diff --git a/documentation/profile-manual/figures/perf-wget-busybox-debuginfo.png b/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-debuginfo.png
index c317b49a4..c317b49a4 100644
--- a/documentation/profile-manual/figures/perf-wget-busybox-debuginfo.png
+++ b/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-debuginfo.png
diff --git a/documentation/profile-manual/figures/perf-wget-busybox-dso-zoom-menu.png b/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-dso-zoom-menu.png
index 1913c867d..1913c867d 100644
--- a/documentation/profile-manual/figures/perf-wget-busybox-dso-zoom-menu.png
+++ b/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-dso-zoom-menu.png
diff --git a/documentation/profile-manual/figures/perf-wget-busybox-dso-zoom.png b/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-dso-zoom.png
index a1962c437..a1962c437 100644
--- a/documentation/profile-manual/figures/perf-wget-busybox-dso-zoom.png
+++ b/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-dso-zoom.png
diff --git a/documentation/profile-manual/figures/perf-wget-busybox-expanded-stripped.png b/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-expanded-stripped.png
index b642d06c8..b642d06c8 100644
--- a/documentation/profile-manual/figures/perf-wget-busybox-expanded-stripped.png
+++ b/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-expanded-stripped.png
diff --git a/documentation/profile-manual/figures/perf-wget-flat-stripped.png b/yocto-poky/documentation/profile-manual/figures/perf-wget-flat-stripped.png
index c8f395ab5..c8f395ab5 100644
--- a/documentation/profile-manual/figures/perf-wget-flat-stripped.png
+++ b/yocto-poky/documentation/profile-manual/figures/perf-wget-flat-stripped.png
diff --git a/documentation/profile-manual/figures/perf-wget-g-copy-from-user-expanded-stripped.png b/yocto-poky/documentation/profile-manual/figures/perf-wget-g-copy-from-user-expanded-stripped.png
index bb7c764ce..bb7c764ce 100644
--- a/documentation/profile-manual/figures/perf-wget-g-copy-from-user-expanded-stripped.png
+++ b/yocto-poky/documentation/profile-manual/figures/perf-wget-g-copy-from-user-expanded-stripped.png
diff --git a/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-debuginfo.png b/yocto-poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-debuginfo.png
index a799af512..a799af512 100644
--- a/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-debuginfo.png
+++ b/yocto-poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-debuginfo.png
diff --git a/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png b/yocto-poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png
index e91808ae4..e91808ae4 100644
--- a/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png
+++ b/yocto-poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png
diff --git a/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-stripped.png b/yocto-poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-stripped.png
index 812302d0a..812302d0a 100644
--- a/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-stripped.png
+++ b/yocto-poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-stripped.png
diff --git a/documentation/profile-manual/figures/profile-title.png b/yocto-poky/documentation/profile-manual/figures/profile-title.png
index ce5c682b5..ce5c682b5 100644
--- a/documentation/profile-manual/figures/profile-title.png
+++ b/yocto-poky/documentation/profile-manual/figures/profile-title.png
diff --git a/documentation/profile-manual/figures/pybootchartgui-linux-yocto.png b/yocto-poky/documentation/profile-manual/figures/pybootchartgui-linux-yocto.png
index 2b6bfdacf..2b6bfdacf 100644
--- a/documentation/profile-manual/figures/pybootchartgui-linux-yocto.png
+++ b/yocto-poky/documentation/profile-manual/figures/pybootchartgui-linux-yocto.png
diff --git a/documentation/profile-manual/figures/pychart-linux-yocto-rpm-nostrip.png b/yocto-poky/documentation/profile-manual/figures/pychart-linux-yocto-rpm-nostrip.png
index 444675c54..444675c54 100644
--- a/documentation/profile-manual/figures/pychart-linux-yocto-rpm-nostrip.png
+++ b/yocto-poky/documentation/profile-manual/figures/pychart-linux-yocto-rpm-nostrip.png
diff --git a/documentation/profile-manual/figures/pychart-linux-yocto-rpm.png b/yocto-poky/documentation/profile-manual/figures/pychart-linux-yocto-rpm.png
index 8ee35352d..8ee35352d 100644
--- a/documentation/profile-manual/figures/pychart-linux-yocto-rpm.png
+++ b/yocto-poky/documentation/profile-manual/figures/pychart-linux-yocto-rpm.png
diff --git a/documentation/profile-manual/figures/sched-wakeup-profile.png b/yocto-poky/documentation/profile-manual/figures/sched-wakeup-profile.png
index 2f2581188..2f2581188 100644
--- a/documentation/profile-manual/figures/sched-wakeup-profile.png
+++ b/yocto-poky/documentation/profile-manual/figures/sched-wakeup-profile.png
diff --git a/documentation/profile-manual/figures/sysprof-callers.png b/yocto-poky/documentation/profile-manual/figures/sysprof-callers.png
index 640c8d914..640c8d914 100644
--- a/documentation/profile-manual/figures/sysprof-callers.png
+++ b/yocto-poky/documentation/profile-manual/figures/sysprof-callers.png
diff --git a/documentation/profile-manual/figures/sysprof-copy-from-user.png b/yocto-poky/documentation/profile-manual/figures/sysprof-copy-from-user.png
index 8d3142782..8d3142782 100644
--- a/documentation/profile-manual/figures/sysprof-copy-from-user.png
+++ b/yocto-poky/documentation/profile-manual/figures/sysprof-copy-from-user.png
diff --git a/documentation/profile-manual/figures/sysprof-copy-to-user.png b/yocto-poky/documentation/profile-manual/figures/sysprof-copy-to-user.png
index 7a5bab799..7a5bab799 100644
--- a/documentation/profile-manual/figures/sysprof-copy-to-user.png
+++ b/yocto-poky/documentation/profile-manual/figures/sysprof-copy-to-user.png
diff --git a/documentation/profile-manual/profile-manual-arch.xml b/yocto-poky/documentation/profile-manual/profile-manual-arch.xml
index 19d115522..19d115522 100644
--- a/documentation/profile-manual/profile-manual-arch.xml
+++ b/yocto-poky/documentation/profile-manual/profile-manual-arch.xml
diff --git a/documentation/profile-manual/profile-manual-customization.xsl b/yocto-poky/documentation/profile-manual/profile-manual-customization.xsl
index caa57ef34..caa57ef34 100644
--- a/documentation/profile-manual/profile-manual-customization.xsl
+++ b/yocto-poky/documentation/profile-manual/profile-manual-customization.xsl
diff --git a/documentation/profile-manual/profile-manual-eclipse-customization.xsl b/yocto-poky/documentation/profile-manual/profile-manual-eclipse-customization.xsl
index a898281ff..a898281ff 100644
--- a/documentation/profile-manual/profile-manual-eclipse-customization.xsl
+++ b/yocto-poky/documentation/profile-manual/profile-manual-eclipse-customization.xsl
diff --git a/documentation/profile-manual/profile-manual-examples.xml b/yocto-poky/documentation/profile-manual/profile-manual-examples.xml
index 9630c6c30..9630c6c30 100644
--- a/documentation/profile-manual/profile-manual-examples.xml
+++ b/yocto-poky/documentation/profile-manual/profile-manual-examples.xml
diff --git a/documentation/profile-manual/profile-manual-intro.xml b/yocto-poky/documentation/profile-manual/profile-manual-intro.xml
index cc47f5267..cc47f5267 100644
--- a/documentation/profile-manual/profile-manual-intro.xml
+++ b/yocto-poky/documentation/profile-manual/profile-manual-intro.xml
diff --git a/documentation/profile-manual/profile-manual-style.css b/yocto-poky/documentation/profile-manual/profile-manual-style.css
index f3cca8536..f3cca8536 100644
--- a/documentation/profile-manual/profile-manual-style.css
+++ b/yocto-poky/documentation/profile-manual/profile-manual-style.css
diff --git a/documentation/profile-manual/profile-manual-usage.xml b/yocto-poky/documentation/profile-manual/profile-manual-usage.xml
index 95ad73909..95ad73909 100644
--- a/documentation/profile-manual/profile-manual-usage.xml
+++ b/yocto-poky/documentation/profile-manual/profile-manual-usage.xml
diff --git a/documentation/profile-manual/profile-manual.xml b/yocto-poky/documentation/profile-manual/profile-manual.xml
index 7f9b2c43b..7f9b2c43b 100644
--- a/documentation/profile-manual/profile-manual.xml
+++ b/yocto-poky/documentation/profile-manual/profile-manual.xml
diff --git a/documentation/ref-manual/TODO b/yocto-poky/documentation/ref-manual/TODO
index ee0db977c..ee0db977c 100644
--- a/documentation/ref-manual/TODO
+++ b/yocto-poky/documentation/ref-manual/TODO
diff --git a/documentation/ref-manual/closer-look.xml b/yocto-poky/documentation/ref-manual/closer-look.xml
index 45dcd9b3c..45dcd9b3c 100644
--- a/documentation/ref-manual/closer-look.xml
+++ b/yocto-poky/documentation/ref-manual/closer-look.xml
diff --git a/documentation/ref-manual/examples/hello-autotools/hello_2.3.bb b/yocto-poky/documentation/ref-manual/examples/hello-autotools/hello_2.3.bb
index 5dfb0b30c..5dfb0b30c 100644
--- a/documentation/ref-manual/examples/hello-autotools/hello_2.3.bb
+++ b/yocto-poky/documentation/ref-manual/examples/hello-autotools/hello_2.3.bb
diff --git a/documentation/ref-manual/examples/hello-single/files/helloworld.c b/yocto-poky/documentation/ref-manual/examples/hello-single/files/helloworld.c
index fc7169b7b..fc7169b7b 100644
--- a/documentation/ref-manual/examples/hello-single/files/helloworld.c
+++ b/yocto-poky/documentation/ref-manual/examples/hello-single/files/helloworld.c
diff --git a/documentation/ref-manual/examples/hello-single/hello.bb b/yocto-poky/documentation/ref-manual/examples/hello-single/hello.bb
index 0812743e3..0812743e3 100644
--- a/documentation/ref-manual/examples/hello-single/hello.bb
+++ b/yocto-poky/documentation/ref-manual/examples/hello-single/hello.bb
diff --git a/documentation/ref-manual/examples/libxpm/libxpm_3.5.6.bb b/yocto-poky/documentation/ref-manual/examples/libxpm/libxpm_3.5.6.bb
index b58d4d7bd..b58d4d7bd 100644
--- a/documentation/ref-manual/examples/libxpm/libxpm_3.5.6.bb
+++ b/yocto-poky/documentation/ref-manual/examples/libxpm/libxpm_3.5.6.bb
diff --git a/documentation/ref-manual/examples/mtd-makefile/mtd-utils_1.0.0.bb b/yocto-poky/documentation/ref-manual/examples/mtd-makefile/mtd-utils_1.0.0.bb
index 5d05a437a..5d05a437a 100644
--- a/documentation/ref-manual/examples/mtd-makefile/mtd-utils_1.0.0.bb
+++ b/yocto-poky/documentation/ref-manual/examples/mtd-makefile/mtd-utils_1.0.0.bb
diff --git a/documentation/ref-manual/faq.xml b/yocto-poky/documentation/ref-manual/faq.xml
index 197d49074..197d49074 100644
--- a/documentation/ref-manual/faq.xml
+++ b/yocto-poky/documentation/ref-manual/faq.xml
diff --git a/documentation/ref-manual/figures/analysis-for-package-splitting.png b/yocto-poky/documentation/ref-manual/figures/analysis-for-package-splitting.png
index 04f2794ea..04f2794ea 100644
--- a/documentation/ref-manual/figures/analysis-for-package-splitting.png
+++ b/yocto-poky/documentation/ref-manual/figures/analysis-for-package-splitting.png
diff --git a/documentation/ref-manual/figures/buildhistory-web.png b/yocto-poky/documentation/ref-manual/figures/buildhistory-web.png
index f6db86c97..f6db86c97 100644
--- a/documentation/ref-manual/figures/buildhistory-web.png
+++ b/yocto-poky/documentation/ref-manual/figures/buildhistory-web.png
diff --git a/documentation/ref-manual/figures/buildhistory.png b/yocto-poky/documentation/ref-manual/figures/buildhistory.png
index bd5f8a490..bd5f8a490 100644
--- a/documentation/ref-manual/figures/buildhistory.png
+++ b/yocto-poky/documentation/ref-manual/figures/buildhistory.png
diff --git a/documentation/ref-manual/figures/building-an-image.png b/yocto-poky/documentation/ref-manual/figures/building-an-image.png
index 1fbea5ab0..1fbea5ab0 100755
--- a/documentation/ref-manual/figures/building-an-image.png
+++ b/yocto-poky/documentation/ref-manual/figures/building-an-image.png
diff --git a/documentation/ref-manual/figures/configuration-compile-autoreconf.png b/yocto-poky/documentation/ref-manual/figures/configuration-compile-autoreconf.png
index a07464f04..a07464f04 100644
--- a/documentation/ref-manual/figures/configuration-compile-autoreconf.png
+++ b/yocto-poky/documentation/ref-manual/figures/configuration-compile-autoreconf.png
diff --git a/documentation/ref-manual/figures/cross-development-toolchains.png b/yocto-poky/documentation/ref-manual/figures/cross-development-toolchains.png
index d36670a19..d36670a19 100644
--- a/documentation/ref-manual/figures/cross-development-toolchains.png
+++ b/yocto-poky/documentation/ref-manual/figures/cross-development-toolchains.png
diff --git a/documentation/ref-manual/figures/define-generic.png b/yocto-poky/documentation/ref-manual/figures/define-generic.png
index bd22718a5..bd22718a5 100644
--- a/documentation/ref-manual/figures/define-generic.png
+++ b/yocto-poky/documentation/ref-manual/figures/define-generic.png
diff --git a/documentation/ref-manual/figures/image-generation.png b/yocto-poky/documentation/ref-manual/figures/image-generation.png
index ab962580c..ab962580c 100644
--- a/documentation/ref-manual/figures/image-generation.png
+++ b/yocto-poky/documentation/ref-manual/figures/image-generation.png
diff --git a/documentation/ref-manual/figures/images.png b/yocto-poky/documentation/ref-manual/figures/images.png
index d99eac1fb..d99eac1fb 100644
--- a/documentation/ref-manual/figures/images.png
+++ b/yocto-poky/documentation/ref-manual/figures/images.png
diff --git a/documentation/ref-manual/figures/layer-input.png b/yocto-poky/documentation/ref-manual/figures/layer-input.png
index 0a4f2e74f..0a4f2e74f 100644
--- a/documentation/ref-manual/figures/layer-input.png
+++ b/yocto-poky/documentation/ref-manual/figures/layer-input.png
diff --git a/documentation/ref-manual/figures/package-feeds.png b/yocto-poky/documentation/ref-manual/figures/package-feeds.png
index 37c9c3250..37c9c3250 100644
--- a/documentation/ref-manual/figures/package-feeds.png
+++ b/yocto-poky/documentation/ref-manual/figures/package-feeds.png
diff --git a/documentation/ref-manual/figures/patching.png b/yocto-poky/documentation/ref-manual/figures/patching.png
index 8ecd01850..8ecd01850 100644
--- a/documentation/ref-manual/figures/patching.png
+++ b/yocto-poky/documentation/ref-manual/figures/patching.png
diff --git a/documentation/ref-manual/figures/poky-title.png b/yocto-poky/documentation/ref-manual/figures/poky-title.png
index 2893d8462..2893d8462 100644
--- a/documentation/ref-manual/figures/poky-title.png
+++ b/yocto-poky/documentation/ref-manual/figures/poky-title.png
diff --git a/documentation/ref-manual/figures/sdk-generation.png b/yocto-poky/documentation/ref-manual/figures/sdk-generation.png
index c37e2748c..c37e2748c 100644
--- a/documentation/ref-manual/figures/sdk-generation.png
+++ b/yocto-poky/documentation/ref-manual/figures/sdk-generation.png
diff --git a/documentation/ref-manual/figures/sdk.png b/yocto-poky/documentation/ref-manual/figures/sdk.png
index a539cc52f..a539cc52f 100644
--- a/documentation/ref-manual/figures/sdk.png
+++ b/yocto-poky/documentation/ref-manual/figures/sdk.png
diff --git a/documentation/ref-manual/figures/source-fetching.png b/yocto-poky/documentation/ref-manual/figures/source-fetching.png
index 26aefb50c..26aefb50c 100644
--- a/documentation/ref-manual/figures/source-fetching.png
+++ b/yocto-poky/documentation/ref-manual/figures/source-fetching.png
diff --git a/documentation/ref-manual/figures/source-input.png b/yocto-poky/documentation/ref-manual/figures/source-input.png
index f7515058e..f7515058e 100644
--- a/documentation/ref-manual/figures/source-input.png
+++ b/yocto-poky/documentation/ref-manual/figures/source-input.png
diff --git a/documentation/ref-manual/figures/user-configuration.png b/yocto-poky/documentation/ref-manual/figures/user-configuration.png
index f2b3f8e7f..f2b3f8e7f 100644
--- a/documentation/ref-manual/figures/user-configuration.png
+++ b/yocto-poky/documentation/ref-manual/figures/user-configuration.png
diff --git a/documentation/ref-manual/figures/yocto-environment-ref.png b/yocto-poky/documentation/ref-manual/figures/yocto-environment-ref.png
index 650c6c803..650c6c803 100644
--- a/documentation/ref-manual/figures/yocto-environment-ref.png
+++ b/yocto-poky/documentation/ref-manual/figures/yocto-environment-ref.png
diff --git a/documentation/ref-manual/introduction.xml b/yocto-poky/documentation/ref-manual/introduction.xml
index 0b165443f..0b165443f 100644
--- a/documentation/ref-manual/introduction.xml
+++ b/yocto-poky/documentation/ref-manual/introduction.xml
diff --git a/documentation/ref-manual/migration.xml b/yocto-poky/documentation/ref-manual/migration.xml
index 21763e3a4..21763e3a4 100644
--- a/documentation/ref-manual/migration.xml
+++ b/yocto-poky/documentation/ref-manual/migration.xml
diff --git a/documentation/ref-manual/ref-bitbake.xml b/yocto-poky/documentation/ref-manual/ref-bitbake.xml
index dc402dbff..dc402dbff 100644
--- a/documentation/ref-manual/ref-bitbake.xml
+++ b/yocto-poky/documentation/ref-manual/ref-bitbake.xml
diff --git a/documentation/ref-manual/ref-classes.xml b/yocto-poky/documentation/ref-manual/ref-classes.xml
index b2941b8bf..b2941b8bf 100644
--- a/documentation/ref-manual/ref-classes.xml
+++ b/yocto-poky/documentation/ref-manual/ref-classes.xml
diff --git a/documentation/ref-manual/ref-features.xml b/yocto-poky/documentation/ref-manual/ref-features.xml
index 798e0a2a1..798e0a2a1 100644
--- a/documentation/ref-manual/ref-features.xml
+++ b/yocto-poky/documentation/ref-manual/ref-features.xml
diff --git a/documentation/ref-manual/ref-images.xml b/yocto-poky/documentation/ref-manual/ref-images.xml
index d15ca5b93..d15ca5b93 100644
--- a/documentation/ref-manual/ref-images.xml
+++ b/yocto-poky/documentation/ref-manual/ref-images.xml
diff --git a/documentation/ref-manual/ref-manual-customization.xsl b/yocto-poky/documentation/ref-manual/ref-manual-customization.xsl
index c58dd905b..c58dd905b 100644
--- a/documentation/ref-manual/ref-manual-customization.xsl
+++ b/yocto-poky/documentation/ref-manual/ref-manual-customization.xsl
diff --git a/documentation/ref-manual/ref-manual-eclipse-customization.xsl b/yocto-poky/documentation/ref-manual/ref-manual-eclipse-customization.xsl
index f3b752155..f3b752155 100644
--- a/documentation/ref-manual/ref-manual-eclipse-customization.xsl
+++ b/yocto-poky/documentation/ref-manual/ref-manual-eclipse-customization.xsl
diff --git a/documentation/ref-manual/ref-manual.xml b/yocto-poky/documentation/ref-manual/ref-manual.xml
index a296b9bc3..a296b9bc3 100644
--- a/documentation/ref-manual/ref-manual.xml
+++ b/yocto-poky/documentation/ref-manual/ref-manual.xml
diff --git a/documentation/ref-manual/ref-qa-checks.xml b/yocto-poky/documentation/ref-manual/ref-qa-checks.xml
index 38689b992..38689b992 100644
--- a/documentation/ref-manual/ref-qa-checks.xml
+++ b/yocto-poky/documentation/ref-manual/ref-qa-checks.xml
diff --git a/documentation/ref-manual/ref-structure.xml b/yocto-poky/documentation/ref-manual/ref-structure.xml
index 48e39212a..48e39212a 100644
--- a/documentation/ref-manual/ref-structure.xml
+++ b/yocto-poky/documentation/ref-manual/ref-structure.xml
diff --git a/documentation/ref-manual/ref-style.css b/yocto-poky/documentation/ref-manual/ref-style.css
index 8ea8dac73..8ea8dac73 100644
--- a/documentation/ref-manual/ref-style.css
+++ b/yocto-poky/documentation/ref-manual/ref-style.css
diff --git a/documentation/ref-manual/ref-tasks.xml b/yocto-poky/documentation/ref-manual/ref-tasks.xml
index 21403c072..21403c072 100644
--- a/documentation/ref-manual/ref-tasks.xml
+++ b/yocto-poky/documentation/ref-manual/ref-tasks.xml
diff --git a/documentation/ref-manual/ref-variables.xml b/yocto-poky/documentation/ref-manual/ref-variables.xml
index 0b2c426b6..0b2c426b6 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/yocto-poky/documentation/ref-manual/ref-variables.xml
diff --git a/documentation/ref-manual/ref-varlocality.xml b/yocto-poky/documentation/ref-manual/ref-varlocality.xml
index d3f873298..d3f873298 100644
--- a/documentation/ref-manual/ref-varlocality.xml
+++ b/yocto-poky/documentation/ref-manual/ref-varlocality.xml
diff --git a/documentation/ref-manual/resources.xml b/yocto-poky/documentation/ref-manual/resources.xml
index 8299f9f3c..8299f9f3c 100644
--- a/documentation/ref-manual/resources.xml
+++ b/yocto-poky/documentation/ref-manual/resources.xml
diff --git a/documentation/ref-manual/technical-details.xml b/yocto-poky/documentation/ref-manual/technical-details.xml
index 2df36521c..2df36521c 100644
--- a/documentation/ref-manual/technical-details.xml
+++ b/yocto-poky/documentation/ref-manual/technical-details.xml
diff --git a/documentation/ref-manual/usingpoky.xml b/yocto-poky/documentation/ref-manual/usingpoky.xml
index ca87962e2..ca87962e2 100644
--- a/documentation/ref-manual/usingpoky.xml
+++ b/yocto-poky/documentation/ref-manual/usingpoky.xml
diff --git a/documentation/template/Vera.ttf b/yocto-poky/documentation/template/Vera.ttf
index 58cd6b5e6..58cd6b5e6 100644
--- a/documentation/template/Vera.ttf
+++ b/yocto-poky/documentation/template/Vera.ttf
diff --git a/documentation/template/Vera.xml b/yocto-poky/documentation/template/Vera.xml
index 3c82043e3..3c82043e3 100644
--- a/documentation/template/Vera.xml
+++ b/yocto-poky/documentation/template/Vera.xml
diff --git a/documentation/template/VeraMoBd.ttf b/yocto-poky/documentation/template/VeraMoBd.ttf
index 9be6547ed..9be6547ed 100644
--- a/documentation/template/VeraMoBd.ttf
+++ b/yocto-poky/documentation/template/VeraMoBd.ttf
diff --git a/documentation/template/VeraMoBd.xml b/yocto-poky/documentation/template/VeraMoBd.xml
index 9b33107a4..9b33107a4 100644
--- a/documentation/template/VeraMoBd.xml
+++ b/yocto-poky/documentation/template/VeraMoBd.xml
diff --git a/documentation/template/VeraMono.ttf b/yocto-poky/documentation/template/VeraMono.ttf
index 139f0b431..139f0b431 100644
--- a/documentation/template/VeraMono.ttf
+++ b/yocto-poky/documentation/template/VeraMono.ttf
diff --git a/documentation/template/VeraMono.xml b/yocto-poky/documentation/template/VeraMono.xml
index 3a0a86659..3a0a86659 100644
--- a/documentation/template/VeraMono.xml
+++ b/yocto-poky/documentation/template/VeraMono.xml
diff --git a/documentation/template/component.title.xsl b/yocto-poky/documentation/template/component.title.xsl
index ee21d59ad..ee21d59ad 100644
--- a/documentation/template/component.title.xsl
+++ b/yocto-poky/documentation/template/component.title.xsl
diff --git a/documentation/template/division.title.xsl b/yocto-poky/documentation/template/division.title.xsl
index 6c265970d..6c265970d 100644
--- a/documentation/template/division.title.xsl
+++ b/yocto-poky/documentation/template/division.title.xsl
diff --git a/documentation/template/draft.png b/yocto-poky/documentation/template/draft.png
index 53051a9dd..53051a9dd 100644
--- a/documentation/template/draft.png
+++ b/yocto-poky/documentation/template/draft.png
diff --git a/documentation/template/embedded_video.xsl b/yocto-poky/documentation/template/embedded_video.xsl
index dfb33c344..dfb33c344 100644
--- a/documentation/template/embedded_video.xsl
+++ b/yocto-poky/documentation/template/embedded_video.xsl
diff --git a/documentation/template/fop-config.xml b/yocto-poky/documentation/template/fop-config.xml
index 09cc5ca0f..09cc5ca0f 100644
--- a/documentation/template/fop-config.xml
+++ b/yocto-poky/documentation/template/fop-config.xml
diff --git a/documentation/template/formal.object.heading.xsl b/yocto-poky/documentation/template/formal.object.heading.xsl
index 1a5e69780..1a5e69780 100644
--- a/documentation/template/formal.object.heading.xsl
+++ b/yocto-poky/documentation/template/formal.object.heading.xsl
diff --git a/documentation/template/gloss-permalinks.xsl b/yocto-poky/documentation/template/gloss-permalinks.xsl
index 6bf58116f..6bf58116f 100644
--- a/documentation/template/gloss-permalinks.xsl
+++ b/yocto-poky/documentation/template/gloss-permalinks.xsl
diff --git a/documentation/template/ohand-color.svg b/yocto-poky/documentation/template/ohand-color.svg
index e42ff9c6f..e42ff9c6f 100644
--- a/documentation/template/ohand-color.svg
+++ b/yocto-poky/documentation/template/ohand-color.svg
diff --git a/documentation/template/permalinks.xsl b/yocto-poky/documentation/template/permalinks.xsl
index d2a1c1452..d2a1c1452 100644
--- a/documentation/template/permalinks.xsl
+++ b/yocto-poky/documentation/template/permalinks.xsl
diff --git a/documentation/template/poky-db-pdf.xsl b/yocto-poky/documentation/template/poky-db-pdf.xsl
index f8a3df103..f8a3df103 100644
--- a/documentation/template/poky-db-pdf.xsl
+++ b/yocto-poky/documentation/template/poky-db-pdf.xsl
diff --git a/documentation/template/poky-ref-manual.png b/yocto-poky/documentation/template/poky-ref-manual.png
index 2085edb46..2085edb46 100644
--- a/documentation/template/poky-ref-manual.png
+++ b/yocto-poky/documentation/template/poky-ref-manual.png
diff --git a/documentation/template/poky.svg b/yocto-poky/documentation/template/poky.svg
index a4ea5e2f4..a4ea5e2f4 100644
--- a/documentation/template/poky.svg
+++ b/yocto-poky/documentation/template/poky.svg
diff --git a/documentation/template/qa-code-permalinks.xsl b/yocto-poky/documentation/template/qa-code-permalinks.xsl
index a309095c6..a309095c6 100644
--- a/documentation/template/qa-code-permalinks.xsl
+++ b/yocto-poky/documentation/template/qa-code-permalinks.xsl
diff --git a/documentation/template/section.title.xsl b/yocto-poky/documentation/template/section.title.xsl
index 5c6ff9a96..5c6ff9a96 100644
--- a/documentation/template/section.title.xsl
+++ b/yocto-poky/documentation/template/section.title.xsl
diff --git a/documentation/template/titlepage.templates.xml b/yocto-poky/documentation/template/titlepage.templates.xml
index f53f14700..f53f14700 100644
--- a/documentation/template/titlepage.templates.xml
+++ b/yocto-poky/documentation/template/titlepage.templates.xml
diff --git a/documentation/template/yocto-project-qs.png b/yocto-poky/documentation/template/yocto-project-qs.png
index 333442e0d..333442e0d 100644
--- a/documentation/template/yocto-project-qs.png
+++ b/yocto-poky/documentation/template/yocto-project-qs.png
diff --git a/documentation/toaster-manual/figures/add-variable.png b/yocto-poky/documentation/toaster-manual/figures/add-variable.png
index 6bdcca705..6bdcca705 100644
--- a/documentation/toaster-manual/figures/add-variable.png
+++ b/yocto-poky/documentation/toaster-manual/figures/add-variable.png
diff --git a/documentation/toaster-manual/figures/bash-oecore.png b/yocto-poky/documentation/toaster-manual/figures/bash-oecore.png
index 801a5d911..801a5d911 100644
--- a/documentation/toaster-manual/figures/bash-oecore.png
+++ b/yocto-poky/documentation/toaster-manual/figures/bash-oecore.png
diff --git a/documentation/toaster-manual/figures/hosted-service.png b/yocto-poky/documentation/toaster-manual/figures/hosted-service.png
index 01fea7b24..01fea7b24 100644
--- a/documentation/toaster-manual/figures/hosted-service.png
+++ b/yocto-poky/documentation/toaster-manual/figures/hosted-service.png
diff --git a/documentation/toaster-manual/figures/set-variable.png b/yocto-poky/documentation/toaster-manual/figures/set-variable.png
index d36b52754..d36b52754 100644
--- a/documentation/toaster-manual/figures/set-variable.png
+++ b/yocto-poky/documentation/toaster-manual/figures/set-variable.png
diff --git a/documentation/toaster-manual/figures/simple-configuration.png b/yocto-poky/documentation/toaster-manual/figures/simple-configuration.png
index e8fce2bf1..e8fce2bf1 100644
--- a/documentation/toaster-manual/figures/simple-configuration.png
+++ b/yocto-poky/documentation/toaster-manual/figures/simple-configuration.png
diff --git a/documentation/toaster-manual/figures/toaster-title.png b/yocto-poky/documentation/toaster-manual/figures/toaster-title.png
index b7ea39cd8..b7ea39cd8 100644
--- a/documentation/toaster-manual/figures/toaster-title.png
+++ b/yocto-poky/documentation/toaster-manual/figures/toaster-title.png
diff --git a/documentation/toaster-manual/figures/variable-added.png b/yocto-poky/documentation/toaster-manual/figures/variable-added.png
index 518f25fa1..518f25fa1 100644
--- a/documentation/toaster-manual/figures/variable-added.png
+++ b/yocto-poky/documentation/toaster-manual/figures/variable-added.png
diff --git a/documentation/toaster-manual/toaster-manual-customization.xsl b/yocto-poky/documentation/toaster-manual/toaster-manual-customization.xsl
index d78694ac1..d78694ac1 100644
--- a/documentation/toaster-manual/toaster-manual-customization.xsl
+++ b/yocto-poky/documentation/toaster-manual/toaster-manual-customization.xsl
diff --git a/documentation/toaster-manual/toaster-manual-intro.xml b/yocto-poky/documentation/toaster-manual/toaster-manual-intro.xml
index 9f4c38b2d..9f4c38b2d 100644
--- a/documentation/toaster-manual/toaster-manual-intro.xml
+++ b/yocto-poky/documentation/toaster-manual/toaster-manual-intro.xml
diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/yocto-poky/documentation/toaster-manual/toaster-manual-reference.xml
index faca4ca73..faca4ca73 100644
--- a/documentation/toaster-manual/toaster-manual-reference.xml
+++ b/yocto-poky/documentation/toaster-manual/toaster-manual-reference.xml
diff --git a/documentation/toaster-manual/toaster-manual-setup-and-use.xml b/yocto-poky/documentation/toaster-manual/toaster-manual-setup-and-use.xml
index 269356990..269356990 100644
--- a/documentation/toaster-manual/toaster-manual-setup-and-use.xml
+++ b/yocto-poky/documentation/toaster-manual/toaster-manual-setup-and-use.xml
diff --git a/documentation/toaster-manual/toaster-manual-start.xml b/yocto-poky/documentation/toaster-manual/toaster-manual-start.xml
index daefa7909..daefa7909 100644
--- a/documentation/toaster-manual/toaster-manual-start.xml
+++ b/yocto-poky/documentation/toaster-manual/toaster-manual-start.xml
diff --git a/documentation/toaster-manual/toaster-manual-style.css b/yocto-poky/documentation/toaster-manual/toaster-manual-style.css
index 6d6b9fb65..6d6b9fb65 100644
--- a/documentation/toaster-manual/toaster-manual-style.css
+++ b/yocto-poky/documentation/toaster-manual/toaster-manual-style.css
diff --git a/documentation/toaster-manual/toaster-manual.xml b/yocto-poky/documentation/toaster-manual/toaster-manual.xml
index 59dca8f62..59dca8f62 100644
--- a/documentation/toaster-manual/toaster-manual.xml
+++ b/yocto-poky/documentation/toaster-manual/toaster-manual.xml
diff --git a/documentation/tools/eclipse-help.sed b/yocto-poky/documentation/tools/eclipse-help.sed
index 38690bc93..38690bc93 100644
--- a/documentation/tools/eclipse-help.sed
+++ b/yocto-poky/documentation/tools/eclipse-help.sed
diff --git a/documentation/tools/mega-manual.sed b/yocto-poky/documentation/tools/mega-manual.sed
index 088a99b34..088a99b34 100644
--- a/documentation/tools/mega-manual.sed
+++ b/yocto-poky/documentation/tools/mega-manual.sed
diff --git a/documentation/tools/poky-docbook-to-pdf b/yocto-poky/documentation/tools/poky-docbook-to-pdf
index f55fd278a..f55fd278a 100755
--- a/documentation/tools/poky-docbook-to-pdf
+++ b/yocto-poky/documentation/tools/poky-docbook-to-pdf
diff --git a/documentation/tools/update-documentation-conf b/yocto-poky/documentation/tools/update-documentation-conf
index 3f8d28009..3f8d28009 100644
--- a/documentation/tools/update-documentation-conf
+++ b/yocto-poky/documentation/tools/update-documentation-conf
diff --git a/documentation/yocto-project-qs/figures/yocto-environment.png b/yocto-poky/documentation/yocto-project-qs/figures/yocto-environment.png
index 82b7a55a3..82b7a55a3 100644
--- a/documentation/yocto-project-qs/figures/yocto-environment.png
+++ b/yocto-poky/documentation/yocto-project-qs/figures/yocto-environment.png
diff --git a/documentation/yocto-project-qs/figures/yocto-project-transp.png b/yocto-poky/documentation/yocto-project-qs/figures/yocto-project-transp.png
index 31d2b147f..31d2b147f 100755
--- a/documentation/yocto-project-qs/figures/yocto-project-transp.png
+++ b/yocto-poky/documentation/yocto-project-qs/figures/yocto-project-transp.png
diff --git a/documentation/yocto-project-qs/qs-style.css b/yocto-poky/documentation/yocto-project-qs/qs-style.css
index 235c85a1b..235c85a1b 100644
--- a/documentation/yocto-project-qs/qs-style.css
+++ b/yocto-poky/documentation/yocto-project-qs/qs-style.css
diff --git a/documentation/yocto-project-qs/yocto-project-qs-customization.xsl b/yocto-poky/documentation/yocto-project-qs/yocto-project-qs-customization.xsl
index dcc02dd37..dcc02dd37 100644
--- a/documentation/yocto-project-qs/yocto-project-qs-customization.xsl
+++ b/yocto-poky/documentation/yocto-project-qs/yocto-project-qs-customization.xsl
diff --git a/documentation/yocto-project-qs/yocto-project-qs-eclipse-customization.xsl b/yocto-poky/documentation/yocto-project-qs/yocto-project-qs-eclipse-customization.xsl
index 50e6830dd..50e6830dd 100644
--- a/documentation/yocto-project-qs/yocto-project-qs-eclipse-customization.xsl
+++ b/yocto-poky/documentation/yocto-project-qs/yocto-project-qs-eclipse-customization.xsl
diff --git a/documentation/yocto-project-qs/yocto-project-qs-titlepage.xsl b/yocto-poky/documentation/yocto-project-qs/yocto-project-qs-titlepage.xsl
index a435ac77a..a435ac77a 100644
--- a/documentation/yocto-project-qs/yocto-project-qs-titlepage.xsl
+++ b/yocto-poky/documentation/yocto-project-qs/yocto-project-qs-titlepage.xsl
diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/yocto-poky/documentation/yocto-project-qs/yocto-project-qs.xml
index 5315dfec6..5315dfec6 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/yocto-poky/documentation/yocto-project-qs/yocto-project-qs.xml
diff --git a/meta-selftest/COPYING.MIT b/yocto-poky/meta-selftest/COPYING.MIT
index 89de35479..89de35479 100644
--- a/meta-selftest/COPYING.MIT
+++ b/yocto-poky/meta-selftest/COPYING.MIT
diff --git a/meta-selftest/README b/yocto-poky/meta-selftest/README
index 11a6fee2d..11a6fee2d 100644
--- a/meta-selftest/README
+++ b/yocto-poky/meta-selftest/README
diff --git a/meta-selftest/classes/test_events.bbclass b/yocto-poky/meta-selftest/classes/test_events.bbclass
index 35324eb40..35324eb40 100644
--- a/meta-selftest/classes/test_events.bbclass
+++ b/yocto-poky/meta-selftest/classes/test_events.bbclass
diff --git a/meta-selftest/conf/layer.conf b/yocto-poky/meta-selftest/conf/layer.conf
index a847b78a2..a847b78a2 100644
--- a/meta-selftest/conf/layer.conf
+++ b/yocto-poky/meta-selftest/conf/layer.conf
diff --git a/meta-selftest/conf/machine/qemux86copy.conf b/yocto-poky/meta-selftest/conf/machine/qemux86copy.conf
index 76c13fdcb..76c13fdcb 100644
--- a/meta-selftest/conf/machine/qemux86copy.conf
+++ b/yocto-poky/meta-selftest/conf/machine/qemux86copy.conf
diff --git a/meta-selftest/lib/devtool/__init__.py b/yocto-poky/meta-selftest/lib/devtool/__init__.py
index e69de29bb..e69de29bb 100644
--- a/meta-selftest/lib/devtool/__init__.py
+++ b/yocto-poky/meta-selftest/lib/devtool/__init__.py
diff --git a/meta-selftest/lib/devtool/test.py b/yocto-poky/meta-selftest/lib/devtool/test.py
index b7474b5ee..b7474b5ee 100644
--- a/meta-selftest/lib/devtool/test.py
+++ b/yocto-poky/meta-selftest/lib/devtool/test.py
diff --git a/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb b/yocto-poky/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb
index 20a0ab7d3..20a0ab7d3 100644
--- a/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb
+++ b/yocto-poky/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb
diff --git a/meta-selftest/recipes-test/aspell/aspell_0.60.6.1.bbappend b/yocto-poky/meta-selftest/recipes-test/aspell/aspell_0.60.6.1.bbappend
index 205720982..205720982 100644
--- a/meta-selftest/recipes-test/aspell/aspell_0.60.6.1.bbappend
+++ b/yocto-poky/meta-selftest/recipes-test/aspell/aspell_0.60.6.1.bbappend
diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade_0.1.bb b/yocto-poky/meta-selftest/recipes-test/devtool/devtool-upgrade_0.1.bb
index 33ffc8803..33ffc8803 100644
--- a/meta-selftest/recipes-test/devtool/devtool-upgrade_0.1.bb
+++ b/yocto-poky/meta-selftest/recipes-test/devtool/devtool-upgrade_0.1.bb
diff --git a/meta-selftest/recipes-test/devtool/files/0001-helloword.c-exit-with-EXIT_SUCCESS-instead-of-a-magi.patch b/yocto-poky/meta-selftest/recipes-test/devtool/files/0001-helloword.c-exit-with-EXIT_SUCCESS-instead-of-a-magi.patch
index 2294a094b..2294a094b 100644
--- a/meta-selftest/recipes-test/devtool/files/0001-helloword.c-exit-with-EXIT_SUCCESS-instead-of-a-magi.patch
+++ b/yocto-poky/meta-selftest/recipes-test/devtool/files/0001-helloword.c-exit-with-EXIT_SUCCESS-instead-of-a-magi.patch
diff --git a/meta-selftest/recipes-test/devtool/files/devtool-upgrade-0.1.tar.gz b/yocto-poky/meta-selftest/recipes-test/devtool/files/devtool-upgrade-0.1.tar.gz
index 06a1c49cd..06a1c49cd 100644
--- a/meta-selftest/recipes-test/devtool/files/devtool-upgrade-0.1.tar.gz
+++ b/yocto-poky/meta-selftest/recipes-test/devtool/files/devtool-upgrade-0.1.tar.gz
diff --git a/meta-selftest/recipes-test/devtool/files/devtool-upgrade-0.2.tar.gz b/yocto-poky/meta-selftest/recipes-test/devtool/files/devtool-upgrade-0.2.tar.gz
index 9b0dcf4b6..9b0dcf4b6 100644
--- a/meta-selftest/recipes-test/devtool/files/devtool-upgrade-0.2.tar.gz
+++ b/yocto-poky/meta-selftest/recipes-test/devtool/files/devtool-upgrade-0.2.tar.gz
diff --git a/meta-selftest/recipes-test/emptytest/emptytest.bb b/yocto-poky/meta-selftest/recipes-test/emptytest/emptytest.bb
index e87f4d754..e87f4d754 100644
--- a/meta-selftest/recipes-test/emptytest/emptytest.bb
+++ b/yocto-poky/meta-selftest/recipes-test/emptytest/emptytest.bb
diff --git a/meta-selftest/recipes-test/error/error.bb b/yocto-poky/meta-selftest/recipes-test/error/error.bb
index a7bdecf29..a7bdecf29 100644
--- a/meta-selftest/recipes-test/error/error.bb
+++ b/yocto-poky/meta-selftest/recipes-test/error/error.bb
diff --git a/meta-selftest/recipes-test/images/error-image.bb b/yocto-poky/meta-selftest/recipes-test/images/error-image.bb
index 13d9cc010..13d9cc010 100644
--- a/meta-selftest/recipes-test/images/error-image.bb
+++ b/yocto-poky/meta-selftest/recipes-test/images/error-image.bb
diff --git a/meta-selftest/recipes-test/images/oe-selftest-image.bb b/yocto-poky/meta-selftest/recipes-test/images/oe-selftest-image.bb
index f17094c5d..f17094c5d 100644
--- a/meta-selftest/recipes-test/images/oe-selftest-image.bb
+++ b/yocto-poky/meta-selftest/recipes-test/images/oe-selftest-image.bb
diff --git a/meta-selftest/recipes-test/images/test-empty-image.bb b/yocto-poky/meta-selftest/recipes-test/images/test-empty-image.bb
index 88d8d612e..88d8d612e 100644
--- a/meta-selftest/recipes-test/images/test-empty-image.bb
+++ b/yocto-poky/meta-selftest/recipes-test/images/test-empty-image.bb
diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.bb b/yocto-poky/meta-selftest/recipes-test/images/wic-image-minimal.bb
index 89451bd20..89451bd20 100644
--- a/meta-selftest/recipes-test/images/wic-image-minimal.bb
+++ b/yocto-poky/meta-selftest/recipes-test/images/wic-image-minimal.bb
diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.wks b/yocto-poky/meta-selftest/recipes-test/images/wic-image-minimal.wks
index 8f9be09a7..8f9be09a7 100644
--- a/meta-selftest/recipes-test/images/wic-image-minimal.wks
+++ b/yocto-poky/meta-selftest/recipes-test/images/wic-image-minimal.wks
diff --git a/meta-selftest/recipes-test/m4/m4_1.4.17.bbappend b/yocto-poky/meta-selftest/recipes-test/m4/m4_1.4.17.bbappend
index 205720982..205720982 100644
--- a/meta-selftest/recipes-test/m4/m4_1.4.17.bbappend
+++ b/yocto-poky/meta-selftest/recipes-test/m4/m4_1.4.17.bbappend
diff --git a/meta-selftest/recipes-test/man/man/man-1.5h1-make.patch b/yocto-poky/meta-selftest/recipes-test/man/man/man-1.5h1-make.patch
index a0d59b78c..a0d59b78c 100644
--- a/meta-selftest/recipes-test/man/man/man-1.5h1-make.patch
+++ b/yocto-poky/meta-selftest/recipes-test/man/man/man-1.5h1-make.patch
diff --git a/meta-selftest/recipes-test/man/man_1.6g.bbappend b/yocto-poky/meta-selftest/recipes-test/man/man_1.6g.bbappend
index 205720982..205720982 100644
--- a/meta-selftest/recipes-test/man/man_1.6g.bbappend
+++ b/yocto-poky/meta-selftest/recipes-test/man/man_1.6g.bbappend
diff --git a/meta-selftest/recipes-test/recipetool/files/add-file.patch b/yocto-poky/meta-selftest/recipes-test/recipetool/files/add-file.patch
index bdc99c94f..bdc99c94f 100644
--- a/meta-selftest/recipes-test/recipetool/files/add-file.patch
+++ b/yocto-poky/meta-selftest/recipes-test/recipetool/files/add-file.patch
diff --git a/meta-selftest/recipes-test/recipetool/files/file1 b/yocto-poky/meta-selftest/recipes-test/recipetool/files/file1
index 7571aa7a8..7571aa7a8 100644
--- a/meta-selftest/recipes-test/recipetool/files/file1
+++ b/yocto-poky/meta-selftest/recipes-test/recipetool/files/file1
diff --git a/meta-selftest/recipes-test/recipetool/files/installscript.sh b/yocto-poky/meta-selftest/recipes-test/recipetool/files/installscript.sh
index 9de30d69c..9de30d69c 100644
--- a/meta-selftest/recipes-test/recipetool/files/installscript.sh
+++ b/yocto-poky/meta-selftest/recipes-test/recipetool/files/installscript.sh
diff --git a/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-func b/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-func
index 2802bb348..2802bb348 100644
--- a/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-func
+++ b/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-func
diff --git a/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-globfile b/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-globfile
index 996298bf1..996298bf1 100644
--- a/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-globfile
+++ b/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-globfile
diff --git a/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-todir-globfile b/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-todir-globfile
index 585ae3e9b..585ae3e9b 100644
--- a/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-todir-globfile
+++ b/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-todir-globfile
diff --git a/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-orig b/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-orig
index 593d6a0bb..593d6a0bb 100644
--- a/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-orig
+++ b/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-orig
diff --git a/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-src-globfile b/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-src-globfile
index 1e20a2b03..1e20a2b03 100644
--- a/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-src-globfile
+++ b/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-src-globfile
diff --git a/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-todir b/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-todir
index 85bd5eba4..85bd5eba4 100644
--- a/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-todir
+++ b/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-todir
diff --git a/meta-selftest/recipes-test/recipetool/files/subdir/fileinsubdir b/yocto-poky/meta-selftest/recipes-test/recipetool/files/subdir/fileinsubdir
index d516b4951..d516b4951 100644
--- a/meta-selftest/recipes-test/recipetool/files/subdir/fileinsubdir
+++ b/yocto-poky/meta-selftest/recipes-test/recipetool/files/subdir/fileinsubdir
diff --git a/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb b/yocto-poky/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb
index 7d0a040be..7d0a040be 100644
--- a/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb
+++ b/yocto-poky/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb
diff --git a/meta-selftest/recipes-test/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bbappend b/yocto-poky/meta-selftest/recipes-test/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bbappend
index 205720982..205720982 100644
--- a/meta-selftest/recipes-test/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bbappend
+++ b/yocto-poky/meta-selftest/recipes-test/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bbappend
diff --git a/yocto-poky/meta-skeleton/COPYING.MIT b/yocto-poky/meta-skeleton/COPYING.MIT
new file mode 100644
index 000000000..fb950dc69
--- /dev/null
+++ b/yocto-poky/meta-skeleton/COPYING.MIT
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.
diff --git a/meta-skeleton/conf/layer.conf b/yocto-poky/meta-skeleton/conf/layer.conf
index aca163342..aca163342 100644
--- a/meta-skeleton/conf/layer.conf
+++ b/yocto-poky/meta-skeleton/conf/layer.conf
diff --git a/meta-skeleton/conf/multilib-example.conf b/yocto-poky/meta-skeleton/conf/multilib-example.conf
index da6da7f1f..da6da7f1f 100644
--- a/meta-skeleton/conf/multilib-example.conf
+++ b/yocto-poky/meta-skeleton/conf/multilib-example.conf
diff --git a/meta-skeleton/conf/multilib-example2.conf b/yocto-poky/meta-skeleton/conf/multilib-example2.conf
index 2596f61d9..2596f61d9 100644
--- a/meta-skeleton/conf/multilib-example2.conf
+++ b/yocto-poky/meta-skeleton/conf/multilib-example2.conf
diff --git a/meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg b/yocto-poky/meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg
index f840ecd26..f840ecd26 100644
--- a/meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg
+++ b/yocto-poky/meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg
diff --git a/meta-skeleton/recipes-core/busybox/busybox_%.bbappend b/yocto-poky/meta-skeleton/recipes-core/busybox/busybox_%.bbappend
index 64cdefc76..64cdefc76 100644
--- a/meta-skeleton/recipes-core/busybox/busybox_%.bbappend
+++ b/yocto-poky/meta-skeleton/recipes-core/busybox/busybox_%.bbappend
diff --git a/meta-skeleton/recipes-kernel/hello-mod/files/COPYING b/yocto-poky/meta-skeleton/recipes-kernel/hello-mod/files/COPYING
index 6d45519c8..6d45519c8 100644
--- a/meta-skeleton/recipes-kernel/hello-mod/files/COPYING
+++ b/yocto-poky/meta-skeleton/recipes-kernel/hello-mod/files/COPYING
diff --git a/meta-skeleton/recipes-kernel/hello-mod/files/Makefile b/yocto-poky/meta-skeleton/recipes-kernel/hello-mod/files/Makefile
index 4ded35fbc..4ded35fbc 100644
--- a/meta-skeleton/recipes-kernel/hello-mod/files/Makefile
+++ b/yocto-poky/meta-skeleton/recipes-kernel/hello-mod/files/Makefile
diff --git a/meta-skeleton/recipes-kernel/hello-mod/files/hello.c b/yocto-poky/meta-skeleton/recipes-kernel/hello-mod/files/hello.c
index f3c0d372e..f3c0d372e 100644
--- a/meta-skeleton/recipes-kernel/hello-mod/files/hello.c
+++ b/yocto-poky/meta-skeleton/recipes-kernel/hello-mod/files/hello.c
diff --git a/meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb b/yocto-poky/meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb
index b140b0ac8..b140b0ac8 100644
--- a/meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb
+++ b/yocto-poky/meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb
diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb b/yocto-poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
index 6194d4f8d..6194d4f8d 100644
--- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
+++ b/yocto-poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/0001-linux-version-tweak.patch b/yocto-poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/0001-linux-version-tweak.patch
index 1c88315cd..1c88315cd 100644
--- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/0001-linux-version-tweak.patch
+++ b/yocto-poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/0001-linux-version-tweak.patch
diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/feature.scc b/yocto-poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/feature.scc
index aad5af49f..aad5af49f 100644
--- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/feature.scc
+++ b/yocto-poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/feature.scc
diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/smp.cfg b/yocto-poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/smp.cfg
index 0c26a8626..0c26a8626 100644
--- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/smp.cfg
+++ b/yocto-poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/smp.cfg
diff --git a/meta-skeleton/recipes-multilib/images/core-image-multilib-example.bb b/yocto-poky/meta-skeleton/recipes-multilib/images/core-image-multilib-example.bb
index f13186f93..f13186f93 100644
--- a/meta-skeleton/recipes-multilib/images/core-image-multilib-example.bb
+++ b/yocto-poky/meta-skeleton/recipes-multilib/images/core-image-multilib-example.bb
diff --git a/meta-skeleton/recipes-skeleton/service/service/COPYRIGHT b/yocto-poky/meta-skeleton/recipes-skeleton/service/service/COPYRIGHT
index ec3e17113..ec3e17113 100644
--- a/meta-skeleton/recipes-skeleton/service/service/COPYRIGHT
+++ b/yocto-poky/meta-skeleton/recipes-skeleton/service/service/COPYRIGHT
diff --git a/meta-skeleton/recipes-skeleton/service/service/skeleton b/yocto-poky/meta-skeleton/recipes-skeleton/service/service/skeleton
index a3edc9d08..a3edc9d08 100644
--- a/meta-skeleton/recipes-skeleton/service/service/skeleton
+++ b/yocto-poky/meta-skeleton/recipes-skeleton/service/service/skeleton
diff --git a/meta-skeleton/recipes-skeleton/service/service/skeleton_test.c b/yocto-poky/meta-skeleton/recipes-skeleton/service/service/skeleton_test.c
index 96c67ac11..96c67ac11 100644
--- a/meta-skeleton/recipes-skeleton/service/service/skeleton_test.c
+++ b/yocto-poky/meta-skeleton/recipes-skeleton/service/service/skeleton_test.c
diff --git a/meta-skeleton/recipes-skeleton/service/service_0.1.bb b/yocto-poky/meta-skeleton/recipes-skeleton/service/service_0.1.bb
index c5cd7a97b..c5cd7a97b 100644
--- a/meta-skeleton/recipes-skeleton/service/service_0.1.bb
+++ b/yocto-poky/meta-skeleton/recipes-skeleton/service/service_0.1.bb
diff --git a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb b/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb
index d3c02d5d6..d3c02d5d6 100644
--- a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb
+++ b/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb
diff --git a/meta-skeleton/recipes-skeleton/useradd/useradd-example/file1 b/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file1
index e69de29bb..e69de29bb 100644
--- a/meta-skeleton/recipes-skeleton/useradd/useradd-example/file1
+++ b/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file1
diff --git a/meta-skeleton/recipes-skeleton/useradd/useradd-example/file2 b/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file2
index e69de29bb..e69de29bb 100644
--- a/meta-skeleton/recipes-skeleton/useradd/useradd-example/file2
+++ b/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file2
diff --git a/meta-skeleton/recipes-skeleton/useradd/useradd-example/file3 b/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file3
index e69de29bb..e69de29bb 100644
--- a/meta-skeleton/recipes-skeleton/useradd/useradd-example/file3
+++ b/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file3
diff --git a/meta-skeleton/recipes-skeleton/useradd/useradd-example/file4 b/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file4
index e69de29bb..e69de29bb 100644
--- a/meta-skeleton/recipes-skeleton/useradd/useradd-example/file4
+++ b/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file4
diff --git a/meta-yocto-bsp/conf/layer.conf b/yocto-poky/meta-yocto-bsp/conf/layer.conf
index 44dbca60f..44dbca60f 100644
--- a/meta-yocto-bsp/conf/layer.conf
+++ b/yocto-poky/meta-yocto-bsp/conf/layer.conf
diff --git a/meta-yocto-bsp/conf/machine/beaglebone.conf b/yocto-poky/meta-yocto-bsp/conf/machine/beaglebone.conf
index ff46fb2bf..ff46fb2bf 100644
--- a/meta-yocto-bsp/conf/machine/beaglebone.conf
+++ b/yocto-poky/meta-yocto-bsp/conf/machine/beaglebone.conf
diff --git a/meta-yocto-bsp/conf/machine/edgerouter.conf b/yocto-poky/meta-yocto-bsp/conf/machine/edgerouter.conf
index 476e690e2..476e690e2 100644
--- a/meta-yocto-bsp/conf/machine/edgerouter.conf
+++ b/yocto-poky/meta-yocto-bsp/conf/machine/edgerouter.conf
diff --git a/meta-yocto-bsp/conf/machine/genericx86-64.conf b/yocto-poky/meta-yocto-bsp/conf/machine/genericx86-64.conf
index f76e35af6..f76e35af6 100644
--- a/meta-yocto-bsp/conf/machine/genericx86-64.conf
+++ b/yocto-poky/meta-yocto-bsp/conf/machine/genericx86-64.conf
diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/yocto-poky/meta-yocto-bsp/conf/machine/genericx86.conf
index 2642caba5..2642caba5 100644
--- a/meta-yocto-bsp/conf/machine/genericx86.conf
+++ b/yocto-poky/meta-yocto-bsp/conf/machine/genericx86.conf
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/yocto-poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
index 15885568b..15885568b 100644
--- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
+++ b/yocto-poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
diff --git a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/yocto-poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
index 036b05f87..036b05f87 100644
--- a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
+++ b/yocto-poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/__init__.py b/yocto-poky/meta-yocto-bsp/lib/oeqa/controllers/__init__.py
index e69de29bb..e69de29bb 100644
--- a/meta-yocto-bsp/lib/oeqa/controllers/__init__.py
+++ b/yocto-poky/meta-yocto-bsp/lib/oeqa/controllers/__init__.py
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py b/yocto-poky/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
index 0f1aeb398..0f1aeb398 100644
--- a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
+++ b/yocto-poky/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py b/yocto-poky/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py
index b3338ca85..b3338ca85 100644
--- a/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py
+++ b/yocto-poky/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py b/yocto-poky/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py
index 7bc807d2b..7bc807d2b 100644
--- a/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py
+++ b/yocto-poky/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py
diff --git a/meta-yocto-bsp/lib/oeqa/selftest/__init__.py b/yocto-poky/meta-yocto-bsp/lib/oeqa/selftest/__init__.py
index e69de29bb..e69de29bb 100644
--- a/meta-yocto-bsp/lib/oeqa/selftest/__init__.py
+++ b/yocto-poky/meta-yocto-bsp/lib/oeqa/selftest/__init__.py
diff --git a/meta-yocto-bsp/lib/oeqa/selftest/gummiboot.py b/yocto-poky/meta-yocto-bsp/lib/oeqa/selftest/gummiboot.py
index 00aa36f60..00aa36f60 100644
--- a/meta-yocto-bsp/lib/oeqa/selftest/gummiboot.py
+++ b/yocto-poky/meta-yocto-bsp/lib/oeqa/selftest/gummiboot.py
diff --git a/meta-yocto-bsp/lib/oeqa/yoctobsp.py b/yocto-poky/meta-yocto-bsp/lib/oeqa/yoctobsp.py
index 4c539a1f3..4c539a1f3 100644
--- a/meta-yocto-bsp/lib/oeqa/yoctobsp.py
+++ b/yocto-poky/meta-yocto-bsp/lib/oeqa/yoctobsp.py
diff --git a/meta-yocto-bsp/recipes-bsp/alsa-state/alsa-state.bbappend b/yocto-poky/meta-yocto-bsp/recipes-bsp/alsa-state/alsa-state.bbappend
index 72d991c7e..72d991c7e 100644
--- a/meta-yocto-bsp/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/yocto-poky/meta-yocto-bsp/recipes-bsp/alsa-state/alsa-state.bbappend
diff --git a/meta-yocto-bsp/recipes-bsp/alsa-state/alsa-state/beagleboard/asound.state b/yocto-poky/meta-yocto-bsp/recipes-bsp/alsa-state/alsa-state/beagleboard/asound.state
index f92449152..f92449152 100644
--- a/meta-yocto-bsp/recipes-bsp/alsa-state/alsa-state/beagleboard/asound.state
+++ b/yocto-poky/meta-yocto-bsp/recipes-bsp/alsa-state/alsa-state/beagleboard/asound.state
diff --git a/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beagleboard/machconfig b/yocto-poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beagleboard/machconfig
index a46859f13..a46859f13 100755
--- a/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beagleboard/machconfig
+++ b/yocto-poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beagleboard/machconfig
diff --git a/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86-64/machconfig b/yocto-poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86-64/machconfig
index a81a23bf5..a81a23bf5 100644
--- a/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86-64/machconfig
+++ b/yocto-poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86-64/machconfig
diff --git a/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86/machconfig b/yocto-poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86/machconfig
index a81a23bf5..a81a23bf5 100644
--- a/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86/machconfig
+++ b/yocto-poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86/machconfig
diff --git a/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend b/yocto-poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 72d991c7e..72d991c7e 100644
--- a/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/yocto-poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend
diff --git a/meta-yocto-bsp/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend b/yocto-poky/meta-yocto-bsp/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
index f86595c00..f86595c00 100644
--- a/meta-yocto-bsp/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
+++ b/yocto-poky/meta-yocto-bsp/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
diff --git a/meta-yocto-bsp/recipes-core/uclibc/uclibc/genericx86-64/uClibc.machine b/yocto-poky/meta-yocto-bsp/recipes-core/uclibc/uclibc/genericx86-64/uClibc.machine
index 305dc64de..305dc64de 100644
--- a/meta-yocto-bsp/recipes-core/uclibc/uclibc/genericx86-64/uClibc.machine
+++ b/yocto-poky/meta-yocto-bsp/recipes-core/uclibc/uclibc/genericx86-64/uClibc.machine
diff --git a/meta-yocto-bsp/recipes-core/uclibc/uclibc/genericx86/uClibc.machine b/yocto-poky/meta-yocto-bsp/recipes-core/uclibc/uclibc/genericx86/uClibc.machine
index 5df15f94c..5df15f94c 100644
--- a/meta-yocto-bsp/recipes-core/uclibc/uclibc/genericx86/uClibc.machine
+++ b/yocto-poky/meta-yocto-bsp/recipes-core/uclibc/uclibc/genericx86/uClibc.machine
diff --git a/meta-yocto-bsp/recipes-core/uclibc/uclibc_git.bbappend b/yocto-poky/meta-yocto-bsp/recipes-core/uclibc/uclibc_git.bbappend
index 72d991c7e..72d991c7e 100644
--- a/meta-yocto-bsp/recipes-core/uclibc/uclibc_git.bbappend
+++ b/yocto-poky/meta-yocto-bsp/recipes-core/uclibc/uclibc_git.bbappend
diff --git a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86-64/xorg.conf b/yocto-poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86-64/xorg.conf
index e69de29bb..e69de29bb 100644
--- a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86-64/xorg.conf
+++ b/yocto-poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86-64/xorg.conf
diff --git a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86/xorg.conf b/yocto-poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86/xorg.conf
index e69de29bb..e69de29bb 100644
--- a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86/xorg.conf
+++ b/yocto-poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86/xorg.conf
diff --git a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/yocto-poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 72d991c7e..72d991c7e 100644
--- a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/yocto-poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend b/yocto-poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
index 52fd07fd5..52fd07fd5 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
+++ b/yocto-poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.14.bbappend b/yocto-poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 310aeb8a7..310aeb8a7 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/yocto-poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.14.bbappend
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.19.bbappend b/yocto-poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.19.bbappend
index 396af14c6..396af14c6 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.19.bbappend
+++ b/yocto-poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.19.bbappend
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend b/yocto-poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend
index 571da3928..571da3928 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/yocto-poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend
diff --git a/meta-yocto/classes/poky-sanity.bbclass b/yocto-poky/meta-yocto/classes/poky-sanity.bbclass
index 77c266e94..77c266e94 100644
--- a/meta-yocto/classes/poky-sanity.bbclass
+++ b/yocto-poky/meta-yocto/classes/poky-sanity.bbclass
diff --git a/meta-yocto/conf/bblayers.conf.sample b/yocto-poky/meta-yocto/conf/bblayers.conf.sample
index 0eda565f9..0eda565f9 100644
--- a/meta-yocto/conf/bblayers.conf.sample
+++ b/yocto-poky/meta-yocto/conf/bblayers.conf.sample
diff --git a/meta-yocto/conf/conf-notes.txt b/yocto-poky/meta-yocto/conf/conf-notes.txt
index 66e6319e7..66e6319e7 100644
--- a/meta-yocto/conf/conf-notes.txt
+++ b/yocto-poky/meta-yocto/conf/conf-notes.txt
diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/yocto-poky/meta-yocto/conf/distro/include/maintainers.inc
index df8b64759..df8b64759 100644
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/yocto-poky/meta-yocto/conf/distro/include/maintainers.inc
diff --git a/meta-yocto/conf/distro/include/poky-floating-revisions.inc b/yocto-poky/meta-yocto/conf/distro/include/poky-floating-revisions.inc
index b11f2cda8..b11f2cda8 100644
--- a/meta-yocto/conf/distro/include/poky-floating-revisions.inc
+++ b/yocto-poky/meta-yocto/conf/distro/include/poky-floating-revisions.inc
diff --git a/meta-yocto/conf/distro/poky-bleeding.conf b/yocto-poky/meta-yocto/conf/distro/poky-bleeding.conf
index 2d3e046a4..2d3e046a4 100644
--- a/meta-yocto/conf/distro/poky-bleeding.conf
+++ b/yocto-poky/meta-yocto/conf/distro/poky-bleeding.conf
diff --git a/meta-yocto/conf/distro/poky-lsb.conf b/yocto-poky/meta-yocto/conf/distro/poky-lsb.conf
index 6f2be808e..6f2be808e 100644
--- a/meta-yocto/conf/distro/poky-lsb.conf
+++ b/yocto-poky/meta-yocto/conf/distro/poky-lsb.conf
diff --git a/meta-yocto/conf/distro/poky-tiny.conf b/yocto-poky/meta-yocto/conf/distro/poky-tiny.conf
index b0227dedf..b0227dedf 100644
--- a/meta-yocto/conf/distro/poky-tiny.conf
+++ b/yocto-poky/meta-yocto/conf/distro/poky-tiny.conf
diff --git a/meta-yocto/conf/distro/poky.conf b/yocto-poky/meta-yocto/conf/distro/poky.conf
index f654f9eac..f654f9eac 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/yocto-poky/meta-yocto/conf/distro/poky.conf
diff --git a/meta-yocto/conf/layer.conf b/yocto-poky/meta-yocto/conf/layer.conf
index 9942b518e..9942b518e 100644
--- a/meta-yocto/conf/layer.conf
+++ b/yocto-poky/meta-yocto/conf/layer.conf
diff --git a/meta-yocto/conf/local.conf.sample b/yocto-poky/meta-yocto/conf/local.conf.sample
index bf6dd90cc..bf6dd90cc 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/yocto-poky/meta-yocto/conf/local.conf.sample
diff --git a/meta-yocto/conf/local.conf.sample.extended b/yocto-poky/meta-yocto/conf/local.conf.sample.extended
index bc765a100..bc765a100 100644
--- a/meta-yocto/conf/local.conf.sample.extended
+++ b/yocto-poky/meta-yocto/conf/local.conf.sample.extended
diff --git a/meta-yocto/conf/site.conf.sample b/yocto-poky/meta-yocto/conf/site.conf.sample
index c551e8fb0..c551e8fb0 100644
--- a/meta-yocto/conf/site.conf.sample
+++ b/yocto-poky/meta-yocto/conf/site.conf.sample
diff --git a/meta-yocto/conf/toasterconf.json b/yocto-poky/meta-yocto/conf/toasterconf.json
index 3df170306..3df170306 100644
--- a/meta-yocto/conf/toasterconf.json
+++ b/yocto-poky/meta-yocto/conf/toasterconf.json
diff --git a/meta-yocto/recipes-core/busybox/busybox/poky-tiny/defconfig b/yocto-poky/meta-yocto/recipes-core/busybox/busybox/poky-tiny/defconfig
index 0a5d5c918..0a5d5c918 100644
--- a/meta-yocto/recipes-core/busybox/busybox/poky-tiny/defconfig
+++ b/yocto-poky/meta-yocto/recipes-core/busybox/busybox/poky-tiny/defconfig
diff --git a/meta-yocto/recipes-core/busybox/busybox_%.bbappend b/yocto-poky/meta-yocto/recipes-core/busybox/busybox_%.bbappend
index 000578744..000578744 100644
--- a/meta-yocto/recipes-core/busybox/busybox_%.bbappend
+++ b/yocto-poky/meta-yocto/recipes-core/busybox/busybox_%.bbappend
diff --git a/meta-yocto/recipes-core/psplash/files/psplash-poky-img.h b/yocto-poky/meta-yocto/recipes-core/psplash/files/psplash-poky-img.h
index e84dac933..e84dac933 100644
--- a/meta-yocto/recipes-core/psplash/files/psplash-poky-img.h
+++ b/yocto-poky/meta-yocto/recipes-core/psplash/files/psplash-poky-img.h
diff --git a/meta-yocto/recipes-core/psplash/psplash_git.bbappend b/yocto-poky/meta-yocto/recipes-core/psplash/psplash_git.bbappend
index 433ef6697..433ef6697 100644
--- a/meta-yocto/recipes-core/psplash/psplash_git.bbappend
+++ b/yocto-poky/meta-yocto/recipes-core/psplash/psplash_git.bbappend
diff --git a/meta-yocto/recipes-core/tiny-init/files/init b/yocto-poky/meta-yocto/recipes-core/tiny-init/files/init
index 9140e9558..9140e9558 100644
--- a/meta-yocto/recipes-core/tiny-init/files/init
+++ b/yocto-poky/meta-yocto/recipes-core/tiny-init/files/init
diff --git a/meta-yocto/recipes-core/tiny-init/files/rc.local.sample b/yocto-poky/meta-yocto/recipes-core/tiny-init/files/rc.local.sample
index d9e198a20..d9e198a20 100644
--- a/meta-yocto/recipes-core/tiny-init/files/rc.local.sample
+++ b/yocto-poky/meta-yocto/recipes-core/tiny-init/files/rc.local.sample
diff --git a/meta-yocto/recipes-core/tiny-init/tiny-init.bb b/yocto-poky/meta-yocto/recipes-core/tiny-init/tiny-init.bb
index 4d4e34dc8..4d4e34dc8 100644
--- a/meta-yocto/recipes-core/tiny-init/tiny-init.bb
+++ b/yocto-poky/meta-yocto/recipes-core/tiny-init/tiny-init.bb
diff --git a/meta/COPYING.GPLv2 b/yocto-poky/meta/COPYING.GPLv2
index d511905c1..d511905c1 100644
--- a/meta/COPYING.GPLv2
+++ b/yocto-poky/meta/COPYING.GPLv2
diff --git a/yocto-poky/meta/COPYING.MIT b/yocto-poky/meta/COPYING.MIT
new file mode 100644
index 000000000..fb950dc69
--- /dev/null
+++ b/yocto-poky/meta/COPYING.MIT
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.
diff --git a/meta/classes/allarch.bbclass b/yocto-poky/meta/classes/allarch.bbclass
index 4af38d7f7..4af38d7f7 100644
--- a/meta/classes/allarch.bbclass
+++ b/yocto-poky/meta/classes/allarch.bbclass
diff --git a/meta/classes/archiver.bbclass b/yocto-poky/meta/classes/archiver.bbclass
index 41a552c76..41a552c76 100644
--- a/meta/classes/archiver.bbclass
+++ b/yocto-poky/meta/classes/archiver.bbclass
diff --git a/meta/classes/autotools-brokensep.bbclass b/yocto-poky/meta/classes/autotools-brokensep.bbclass
index 71cf97a39..71cf97a39 100644
--- a/meta/classes/autotools-brokensep.bbclass
+++ b/yocto-poky/meta/classes/autotools-brokensep.bbclass
diff --git a/meta/classes/autotools.bbclass b/yocto-poky/meta/classes/autotools.bbclass
index d546a5c02..d546a5c02 100644
--- a/meta/classes/autotools.bbclass
+++ b/yocto-poky/meta/classes/autotools.bbclass
diff --git a/meta/classes/autotools_stage.bbclass b/yocto-poky/meta/classes/autotools_stage.bbclass
index b3c41e4b4..b3c41e4b4 100644
--- a/meta/classes/autotools_stage.bbclass
+++ b/yocto-poky/meta/classes/autotools_stage.bbclass
diff --git a/meta/classes/base.bbclass b/yocto-poky/meta/classes/base.bbclass
index 9bd5499a1..9bd5499a1 100644
--- a/meta/classes/base.bbclass
+++ b/yocto-poky/meta/classes/base.bbclass
diff --git a/meta/classes/bin_package.bbclass b/yocto-poky/meta/classes/bin_package.bbclass
index a52b75be5..a52b75be5 100644
--- a/meta/classes/bin_package.bbclass
+++ b/yocto-poky/meta/classes/bin_package.bbclass
diff --git a/meta/classes/binconfig-disabled.bbclass b/yocto-poky/meta/classes/binconfig-disabled.bbclass
index 602a669aa..602a669aa 100644
--- a/meta/classes/binconfig-disabled.bbclass
+++ b/yocto-poky/meta/classes/binconfig-disabled.bbclass
diff --git a/meta/classes/binconfig.bbclass b/yocto-poky/meta/classes/binconfig.bbclass
index cbc417360..cbc417360 100644
--- a/meta/classes/binconfig.bbclass
+++ b/yocto-poky/meta/classes/binconfig.bbclass
diff --git a/meta/classes/blacklist.bbclass b/yocto-poky/meta/classes/blacklist.bbclass
index a0141a82c..a0141a82c 100644
--- a/meta/classes/blacklist.bbclass
+++ b/yocto-poky/meta/classes/blacklist.bbclass
diff --git a/meta/classes/bluetooth.bbclass b/yocto-poky/meta/classes/bluetooth.bbclass
index f88b4ae5b..f88b4ae5b 100644
--- a/meta/classes/bluetooth.bbclass
+++ b/yocto-poky/meta/classes/bluetooth.bbclass
diff --git a/meta/classes/boot-directdisk.bbclass b/yocto-poky/meta/classes/boot-directdisk.bbclass
index 600e21abc..600e21abc 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/yocto-poky/meta/classes/boot-directdisk.bbclass
diff --git a/meta/classes/bootimg.bbclass b/yocto-poky/meta/classes/bootimg.bbclass
index ec9d0b7d5..ec9d0b7d5 100644
--- a/meta/classes/bootimg.bbclass
+++ b/yocto-poky/meta/classes/bootimg.bbclass
diff --git a/meta/classes/bugzilla.bbclass b/yocto-poky/meta/classes/bugzilla.bbclass
index 3fc895642..3fc895642 100644
--- a/meta/classes/bugzilla.bbclass
+++ b/yocto-poky/meta/classes/bugzilla.bbclass
diff --git a/meta/classes/buildhistory.bbclass b/yocto-poky/meta/classes/buildhistory.bbclass
index 5e2581f88..5e2581f88 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/yocto-poky/meta/classes/buildhistory.bbclass
diff --git a/meta/classes/buildstats-summary.bbclass b/yocto-poky/meta/classes/buildstats-summary.bbclass
index 05ead9fdb..05ead9fdb 100644
--- a/meta/classes/buildstats-summary.bbclass
+++ b/yocto-poky/meta/classes/buildstats-summary.bbclass
diff --git a/meta/classes/buildstats.bbclass b/yocto-poky/meta/classes/buildstats.bbclass
index 22ec571b8..22ec571b8 100644
--- a/meta/classes/buildstats.bbclass
+++ b/yocto-poky/meta/classes/buildstats.bbclass
diff --git a/meta/classes/ccache.bbclass b/yocto-poky/meta/classes/ccache.bbclass
index 2cdce4693..2cdce4693 100644
--- a/meta/classes/ccache.bbclass
+++ b/yocto-poky/meta/classes/ccache.bbclass
diff --git a/meta/classes/chrpath.bbclass b/yocto-poky/meta/classes/chrpath.bbclass
index e9160af6b..e9160af6b 100644
--- a/meta/classes/chrpath.bbclass
+++ b/yocto-poky/meta/classes/chrpath.bbclass
diff --git a/meta/classes/clutter.bbclass b/yocto-poky/meta/classes/clutter.bbclass
index 167407dfd..167407dfd 100644
--- a/meta/classes/clutter.bbclass
+++ b/yocto-poky/meta/classes/clutter.bbclass
diff --git a/meta/classes/cmake.bbclass b/yocto-poky/meta/classes/cmake.bbclass
index ae3cc025e..ae3cc025e 100644
--- a/meta/classes/cmake.bbclass
+++ b/yocto-poky/meta/classes/cmake.bbclass
diff --git a/meta/classes/cml1.bbclass b/yocto-poky/meta/classes/cml1.bbclass
index 95cf584ad..95cf584ad 100644
--- a/meta/classes/cml1.bbclass
+++ b/yocto-poky/meta/classes/cml1.bbclass
diff --git a/meta/classes/compress_doc.bbclass b/yocto-poky/meta/classes/compress_doc.bbclass
index 9b58d82ce..9b58d82ce 100644
--- a/meta/classes/compress_doc.bbclass
+++ b/yocto-poky/meta/classes/compress_doc.bbclass
diff --git a/meta/classes/copyleft_compliance.bbclass b/yocto-poky/meta/classes/copyleft_compliance.bbclass
index 907c1836b..907c1836b 100644
--- a/meta/classes/copyleft_compliance.bbclass
+++ b/yocto-poky/meta/classes/copyleft_compliance.bbclass
diff --git a/meta/classes/copyleft_filter.bbclass b/yocto-poky/meta/classes/copyleft_filter.bbclass
index 46be7f7d2..46be7f7d2 100644
--- a/meta/classes/copyleft_filter.bbclass
+++ b/yocto-poky/meta/classes/copyleft_filter.bbclass
diff --git a/meta/classes/core-image.bbclass b/yocto-poky/meta/classes/core-image.bbclass
index 8e340d9f5..8e340d9f5 100644
--- a/meta/classes/core-image.bbclass
+++ b/yocto-poky/meta/classes/core-image.bbclass
diff --git a/meta/classes/cpan-base.bbclass b/yocto-poky/meta/classes/cpan-base.bbclass
index 7810a4dc6..7810a4dc6 100644
--- a/meta/classes/cpan-base.bbclass
+++ b/yocto-poky/meta/classes/cpan-base.bbclass
diff --git a/meta/classes/cpan.bbclass b/yocto-poky/meta/classes/cpan.bbclass
index 8e079e0d5..8e079e0d5 100644
--- a/meta/classes/cpan.bbclass
+++ b/yocto-poky/meta/classes/cpan.bbclass
diff --git a/meta/classes/cpan_build.bbclass b/yocto-poky/meta/classes/cpan_build.bbclass
index fac074d61..fac074d61 100644
--- a/meta/classes/cpan_build.bbclass
+++ b/yocto-poky/meta/classes/cpan_build.bbclass
diff --git a/meta/classes/cross-canadian.bbclass b/yocto-poky/meta/classes/cross-canadian.bbclass
index ea17f09bc..ea17f09bc 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/yocto-poky/meta/classes/cross-canadian.bbclass
diff --git a/meta/classes/cross.bbclass b/yocto-poky/meta/classes/cross.bbclass
index 3eab5b907..3eab5b907 100644
--- a/meta/classes/cross.bbclass
+++ b/yocto-poky/meta/classes/cross.bbclass
diff --git a/meta/classes/crosssdk.bbclass b/yocto-poky/meta/classes/crosssdk.bbclass
index 87d5cf5d3..87d5cf5d3 100644
--- a/meta/classes/crosssdk.bbclass
+++ b/yocto-poky/meta/classes/crosssdk.bbclass
diff --git a/meta/classes/debian.bbclass b/yocto-poky/meta/classes/debian.bbclass
index 1b6979a28..1b6979a28 100644
--- a/meta/classes/debian.bbclass
+++ b/yocto-poky/meta/classes/debian.bbclass
diff --git a/meta/classes/deploy.bbclass b/yocto-poky/meta/classes/deploy.bbclass
index 8ad07da01..8ad07da01 100644
--- a/meta/classes/deploy.bbclass
+++ b/yocto-poky/meta/classes/deploy.bbclass
diff --git a/meta/classes/devshell.bbclass b/yocto-poky/meta/classes/devshell.bbclass
index 445143647..445143647 100644
--- a/meta/classes/devshell.bbclass
+++ b/yocto-poky/meta/classes/devshell.bbclass
diff --git a/meta/classes/distro_features_check.bbclass b/yocto-poky/meta/classes/distro_features_check.bbclass
index 7e91dbcf4..7e91dbcf4 100644
--- a/meta/classes/distro_features_check.bbclass
+++ b/yocto-poky/meta/classes/distro_features_check.bbclass
diff --git a/meta/classes/distrodata.bbclass b/yocto-poky/meta/classes/distrodata.bbclass
index 44c06e148..44c06e148 100644
--- a/meta/classes/distrodata.bbclass
+++ b/yocto-poky/meta/classes/distrodata.bbclass
diff --git a/meta/classes/distutils-base.bbclass b/yocto-poky/meta/classes/distutils-base.bbclass
index aa18e8b29..aa18e8b29 100644
--- a/meta/classes/distutils-base.bbclass
+++ b/yocto-poky/meta/classes/distutils-base.bbclass
diff --git a/meta/classes/distutils-common-base.bbclass b/yocto-poky/meta/classes/distutils-common-base.bbclass
index 427275b40..427275b40 100644
--- a/meta/classes/distutils-common-base.bbclass
+++ b/yocto-poky/meta/classes/distutils-common-base.bbclass
diff --git a/meta/classes/distutils-native-base.bbclass b/yocto-poky/meta/classes/distutils-native-base.bbclass
index 509cb9551..509cb9551 100644
--- a/meta/classes/distutils-native-base.bbclass
+++ b/yocto-poky/meta/classes/distutils-native-base.bbclass
diff --git a/meta/classes/distutils-tools.bbclass b/yocto-poky/meta/classes/distutils-tools.bbclass
index f43450e56..f43450e56 100644
--- a/meta/classes/distutils-tools.bbclass
+++ b/yocto-poky/meta/classes/distutils-tools.bbclass
diff --git a/meta/classes/distutils.bbclass b/yocto-poky/meta/classes/distutils.bbclass
index cd0671388..cd0671388 100644
--- a/meta/classes/distutils.bbclass
+++ b/yocto-poky/meta/classes/distutils.bbclass
diff --git a/meta/classes/distutils3-base.bbclass b/yocto-poky/meta/classes/distutils3-base.bbclass
index af3aa006f..af3aa006f 100644
--- a/meta/classes/distutils3-base.bbclass
+++ b/yocto-poky/meta/classes/distutils3-base.bbclass
diff --git a/meta/classes/distutils3-native-base.bbclass b/yocto-poky/meta/classes/distutils3-native-base.bbclass
index 11171014f..11171014f 100644
--- a/meta/classes/distutils3-native-base.bbclass
+++ b/yocto-poky/meta/classes/distutils3-native-base.bbclass
diff --git a/meta/classes/distutils3.bbclass b/yocto-poky/meta/classes/distutils3.bbclass
index 443bf3ac4..443bf3ac4 100644
--- a/meta/classes/distutils3.bbclass
+++ b/yocto-poky/meta/classes/distutils3.bbclass
diff --git a/meta/classes/externalsrc.bbclass b/yocto-poky/meta/classes/externalsrc.bbclass
index f7ed66d8c..f7ed66d8c 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/yocto-poky/meta/classes/externalsrc.bbclass
diff --git a/meta/classes/extrausers.bbclass b/yocto-poky/meta/classes/extrausers.bbclass
index faf57b108..faf57b108 100644
--- a/meta/classes/extrausers.bbclass
+++ b/yocto-poky/meta/classes/extrausers.bbclass
diff --git a/meta/classes/fontcache.bbclass b/yocto-poky/meta/classes/fontcache.bbclass
index 8ebdfc4f5..8ebdfc4f5 100644
--- a/meta/classes/fontcache.bbclass
+++ b/yocto-poky/meta/classes/fontcache.bbclass
diff --git a/meta/classes/fs-uuid.bbclass b/yocto-poky/meta/classes/fs-uuid.bbclass
index bd2613cf1..bd2613cf1 100644
--- a/meta/classes/fs-uuid.bbclass
+++ b/yocto-poky/meta/classes/fs-uuid.bbclass
diff --git a/meta/classes/gconf.bbclass b/yocto-poky/meta/classes/gconf.bbclass
index d7afa7282..d7afa7282 100644
--- a/meta/classes/gconf.bbclass
+++ b/yocto-poky/meta/classes/gconf.bbclass
diff --git a/meta/classes/gettext.bbclass b/yocto-poky/meta/classes/gettext.bbclass
index 03b89b245..03b89b245 100644
--- a/meta/classes/gettext.bbclass
+++ b/yocto-poky/meta/classes/gettext.bbclass
diff --git a/meta/classes/gnome.bbclass b/yocto-poky/meta/classes/gnome.bbclass
index c6202bbb7..c6202bbb7 100644
--- a/meta/classes/gnome.bbclass
+++ b/yocto-poky/meta/classes/gnome.bbclass
diff --git a/meta/classes/gnomebase.bbclass b/yocto-poky/meta/classes/gnomebase.bbclass
index d22ba5a5c..d22ba5a5c 100644
--- a/meta/classes/gnomebase.bbclass
+++ b/yocto-poky/meta/classes/gnomebase.bbclass
diff --git a/meta/classes/grub-efi.bbclass b/yocto-poky/meta/classes/grub-efi.bbclass
index 9a4220abd..9a4220abd 100644
--- a/meta/classes/grub-efi.bbclass
+++ b/yocto-poky/meta/classes/grub-efi.bbclass
diff --git a/meta/classes/gsettings.bbclass b/yocto-poky/meta/classes/gsettings.bbclass
index dec5abc02..dec5abc02 100644
--- a/meta/classes/gsettings.bbclass
+++ b/yocto-poky/meta/classes/gsettings.bbclass
diff --git a/meta/classes/gtk-doc.bbclass b/yocto-poky/meta/classes/gtk-doc.bbclass
index e32f98dcf..e32f98dcf 100644
--- a/meta/classes/gtk-doc.bbclass
+++ b/yocto-poky/meta/classes/gtk-doc.bbclass
diff --git a/meta/classes/gtk-icon-cache.bbclass b/yocto-poky/meta/classes/gtk-icon-cache.bbclass
index 0f1052b08..0f1052b08 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/yocto-poky/meta/classes/gtk-icon-cache.bbclass
diff --git a/meta/classes/gtk-immodules-cache.bbclass b/yocto-poky/meta/classes/gtk-immodules-cache.bbclass
index 0a6316da4..0a6316da4 100644
--- a/meta/classes/gtk-immodules-cache.bbclass
+++ b/yocto-poky/meta/classes/gtk-immodules-cache.bbclass
diff --git a/meta/classes/gummiboot.bbclass b/yocto-poky/meta/classes/gummiboot.bbclass
index 9a97ac175..9a97ac175 100644
--- a/meta/classes/gummiboot.bbclass
+++ b/yocto-poky/meta/classes/gummiboot.bbclass
diff --git a/meta/classes/gzipnative.bbclass b/yocto-poky/meta/classes/gzipnative.bbclass
index 326cbbb6f..326cbbb6f 100644
--- a/meta/classes/gzipnative.bbclass
+++ b/yocto-poky/meta/classes/gzipnative.bbclass
diff --git a/meta/classes/icecc.bbclass b/yocto-poky/meta/classes/icecc.bbclass
index 61b8bb1a1..61b8bb1a1 100644
--- a/meta/classes/icecc.bbclass
+++ b/yocto-poky/meta/classes/icecc.bbclass
diff --git a/meta/classes/image-buildinfo.bbclass b/yocto-poky/meta/classes/image-buildinfo.bbclass
index aa17cc8f9..aa17cc8f9 100644
--- a/meta/classes/image-buildinfo.bbclass
+++ b/yocto-poky/meta/classes/image-buildinfo.bbclass
diff --git a/meta/classes/image-live.bbclass b/yocto-poky/meta/classes/image-live.bbclass
index 23e4a5cef..23e4a5cef 100644
--- a/meta/classes/image-live.bbclass
+++ b/yocto-poky/meta/classes/image-live.bbclass
diff --git a/meta/classes/image-mklibs.bbclass b/yocto-poky/meta/classes/image-mklibs.bbclass
index cfb3ffc91..cfb3ffc91 100644
--- a/meta/classes/image-mklibs.bbclass
+++ b/yocto-poky/meta/classes/image-mklibs.bbclass
diff --git a/meta/classes/image-prelink.bbclass b/yocto-poky/meta/classes/image-prelink.bbclass
index d4bb3aec3..d4bb3aec3 100644
--- a/meta/classes/image-prelink.bbclass
+++ b/yocto-poky/meta/classes/image-prelink.bbclass
diff --git a/meta/classes/image-swab.bbclass b/yocto-poky/meta/classes/image-swab.bbclass
index 89318560d..89318560d 100644
--- a/meta/classes/image-swab.bbclass
+++ b/yocto-poky/meta/classes/image-swab.bbclass
diff --git a/meta/classes/image-vm.bbclass b/yocto-poky/meta/classes/image-vm.bbclass
index 5ddd1cb27..5ddd1cb27 100644
--- a/meta/classes/image-vm.bbclass
+++ b/yocto-poky/meta/classes/image-vm.bbclass
diff --git a/meta/classes/image.bbclass b/yocto-poky/meta/classes/image.bbclass
index d2f8105f1..d2f8105f1 100644
--- a/meta/classes/image.bbclass
+++ b/yocto-poky/meta/classes/image.bbclass
diff --git a/meta/classes/image_types.bbclass b/yocto-poky/meta/classes/image_types.bbclass
index 50369197c..50369197c 100644
--- a/meta/classes/image_types.bbclass
+++ b/yocto-poky/meta/classes/image_types.bbclass
diff --git a/meta/classes/image_types_uboot.bbclass b/yocto-poky/meta/classes/image_types_uboot.bbclass
index 081bca2cc..081bca2cc 100644
--- a/meta/classes/image_types_uboot.bbclass
+++ b/yocto-poky/meta/classes/image_types_uboot.bbclass
diff --git a/meta/classes/insane.bbclass b/yocto-poky/meta/classes/insane.bbclass
index a77438db5..a77438db5 100644
--- a/meta/classes/insane.bbclass
+++ b/yocto-poky/meta/classes/insane.bbclass
diff --git a/meta/classes/kernel-arch.bbclass b/yocto-poky/meta/classes/kernel-arch.bbclass
index d8b180ec4..d8b180ec4 100644
--- a/meta/classes/kernel-arch.bbclass
+++ b/yocto-poky/meta/classes/kernel-arch.bbclass
diff --git a/meta/classes/kernel-fitimage.bbclass b/yocto-poky/meta/classes/kernel-fitimage.bbclass
index 2a56a5451..2a56a5451 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/yocto-poky/meta/classes/kernel-fitimage.bbclass
diff --git a/meta/classes/kernel-grub.bbclass b/yocto-poky/meta/classes/kernel-grub.bbclass
index a63f482a9..a63f482a9 100644
--- a/meta/classes/kernel-grub.bbclass
+++ b/yocto-poky/meta/classes/kernel-grub.bbclass
diff --git a/meta/classes/kernel-module-split.bbclass b/yocto-poky/meta/classes/kernel-module-split.bbclass
index e1a70e621..e1a70e621 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/yocto-poky/meta/classes/kernel-module-split.bbclass
diff --git a/meta/classes/kernel-uboot.bbclass b/yocto-poky/meta/classes/kernel-uboot.bbclass
index 345e7f5f3..345e7f5f3 100644
--- a/meta/classes/kernel-uboot.bbclass
+++ b/yocto-poky/meta/classes/kernel-uboot.bbclass
diff --git a/meta/classes/kernel-uimage.bbclass b/yocto-poky/meta/classes/kernel-uimage.bbclass
index f73965b13..f73965b13 100644
--- a/meta/classes/kernel-uimage.bbclass
+++ b/yocto-poky/meta/classes/kernel-uimage.bbclass
diff --git a/meta/classes/kernel-yocto.bbclass b/yocto-poky/meta/classes/kernel-yocto.bbclass
index c2d0d3076..c2d0d3076 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/yocto-poky/meta/classes/kernel-yocto.bbclass
diff --git a/meta/classes/kernel.bbclass b/yocto-poky/meta/classes/kernel.bbclass
index ee3e9a0d9..ee3e9a0d9 100644
--- a/meta/classes/kernel.bbclass
+++ b/yocto-poky/meta/classes/kernel.bbclass
diff --git a/meta/classes/kernelsrc.bbclass b/yocto-poky/meta/classes/kernelsrc.bbclass
index 9efd46a92..9efd46a92 100644
--- a/meta/classes/kernelsrc.bbclass
+++ b/yocto-poky/meta/classes/kernelsrc.bbclass
diff --git a/meta/classes/lib_package.bbclass b/yocto-poky/meta/classes/lib_package.bbclass
index 8849f5904..8849f5904 100644
--- a/meta/classes/lib_package.bbclass
+++ b/yocto-poky/meta/classes/lib_package.bbclass
diff --git a/meta/classes/libc-common.bbclass b/yocto-poky/meta/classes/libc-common.bbclass
index bbc80167d..bbc80167d 100644
--- a/meta/classes/libc-common.bbclass
+++ b/yocto-poky/meta/classes/libc-common.bbclass
diff --git a/meta/classes/libc-package.bbclass b/yocto-poky/meta/classes/libc-package.bbclass
index adb423034..adb423034 100644
--- a/meta/classes/libc-package.bbclass
+++ b/yocto-poky/meta/classes/libc-package.bbclass
diff --git a/meta/classes/license.bbclass b/yocto-poky/meta/classes/license.bbclass
index 8ad4614d6..8ad4614d6 100644
--- a/meta/classes/license.bbclass
+++ b/yocto-poky/meta/classes/license.bbclass
diff --git a/meta/classes/linux-kernel-base.bbclass b/yocto-poky/meta/classes/linux-kernel-base.bbclass
index 89ce71605..89ce71605 100644
--- a/meta/classes/linux-kernel-base.bbclass
+++ b/yocto-poky/meta/classes/linux-kernel-base.bbclass
diff --git a/meta/classes/logging.bbclass b/yocto-poky/meta/classes/logging.bbclass
index 06c7c31c3..06c7c31c3 100644
--- a/meta/classes/logging.bbclass
+++ b/yocto-poky/meta/classes/logging.bbclass
diff --git a/meta/classes/meta.bbclass b/yocto-poky/meta/classes/meta.bbclass
index 5e6890238..5e6890238 100644
--- a/meta/classes/meta.bbclass
+++ b/yocto-poky/meta/classes/meta.bbclass
diff --git a/meta/classes/metadata_scm.bbclass b/yocto-poky/meta/classes/metadata_scm.bbclass
index 0f7f4235a..0f7f4235a 100644
--- a/meta/classes/metadata_scm.bbclass
+++ b/yocto-poky/meta/classes/metadata_scm.bbclass
diff --git a/meta/classes/migrate_localcount.bbclass b/yocto-poky/meta/classes/migrate_localcount.bbclass
index aa0df8bb7..aa0df8bb7 100644
--- a/meta/classes/migrate_localcount.bbclass
+++ b/yocto-poky/meta/classes/migrate_localcount.bbclass
diff --git a/meta/classes/mime.bbclass b/yocto-poky/meta/classes/mime.bbclass
index 721c73fcf..721c73fcf 100644
--- a/meta/classes/mime.bbclass
+++ b/yocto-poky/meta/classes/mime.bbclass
diff --git a/meta/classes/mirrors.bbclass b/yocto-poky/meta/classes/mirrors.bbclass
index b96c071f6..b96c071f6 100644
--- a/meta/classes/mirrors.bbclass
+++ b/yocto-poky/meta/classes/mirrors.bbclass
diff --git a/meta/classes/module-base.bbclass b/yocto-poky/meta/classes/module-base.bbclass
index 8be26c4f5..8be26c4f5 100644
--- a/meta/classes/module-base.bbclass
+++ b/yocto-poky/meta/classes/module-base.bbclass
diff --git a/meta/classes/module.bbclass b/yocto-poky/meta/classes/module.bbclass
index 0952c0cca..0952c0cca 100644
--- a/meta/classes/module.bbclass
+++ b/yocto-poky/meta/classes/module.bbclass
diff --git a/meta/classes/multilib.bbclass b/yocto-poky/meta/classes/multilib.bbclass
index 052f911ac..052f911ac 100644
--- a/meta/classes/multilib.bbclass
+++ b/yocto-poky/meta/classes/multilib.bbclass
diff --git a/meta/classes/multilib_global.bbclass b/yocto-poky/meta/classes/multilib_global.bbclass
index 67dc72b76..67dc72b76 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/yocto-poky/meta/classes/multilib_global.bbclass
diff --git a/meta/classes/multilib_header.bbclass b/yocto-poky/meta/classes/multilib_header.bbclass
index 5ee0a2d56..5ee0a2d56 100644
--- a/meta/classes/multilib_header.bbclass
+++ b/yocto-poky/meta/classes/multilib_header.bbclass
diff --git a/meta/classes/native.bbclass b/yocto-poky/meta/classes/native.bbclass
index bcbcd61e0..bcbcd61e0 100644
--- a/meta/classes/native.bbclass
+++ b/yocto-poky/meta/classes/native.bbclass
diff --git a/meta/classes/nativesdk.bbclass b/yocto-poky/meta/classes/nativesdk.bbclass
index f74da6267..f74da6267 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/yocto-poky/meta/classes/nativesdk.bbclass
diff --git a/meta/classes/oelint.bbclass b/yocto-poky/meta/classes/oelint.bbclass
index 1b051ca22..1b051ca22 100644
--- a/meta/classes/oelint.bbclass
+++ b/yocto-poky/meta/classes/oelint.bbclass
diff --git a/meta/classes/own-mirrors.bbclass b/yocto-poky/meta/classes/own-mirrors.bbclass
index e235227ec..e235227ec 100644
--- a/meta/classes/own-mirrors.bbclass
+++ b/yocto-poky/meta/classes/own-mirrors.bbclass
diff --git a/meta/classes/package.bbclass b/yocto-poky/meta/classes/package.bbclass
index a86b68016..a86b68016 100644
--- a/meta/classes/package.bbclass
+++ b/yocto-poky/meta/classes/package.bbclass
diff --git a/meta/classes/package_deb.bbclass b/yocto-poky/meta/classes/package_deb.bbclass
index d2fea4fcc..d2fea4fcc 100644
--- a/meta/classes/package_deb.bbclass
+++ b/yocto-poky/meta/classes/package_deb.bbclass
diff --git a/meta/classes/package_ipk.bbclass b/yocto-poky/meta/classes/package_ipk.bbclass
index 4dd7a7e5c..4dd7a7e5c 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/yocto-poky/meta/classes/package_ipk.bbclass
diff --git a/meta/classes/package_rpm.bbclass b/yocto-poky/meta/classes/package_rpm.bbclass
index 1fa1634d2..1fa1634d2 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/yocto-poky/meta/classes/package_rpm.bbclass
diff --git a/meta/classes/package_tar.bbclass b/yocto-poky/meta/classes/package_tar.bbclass
index f9e2292de..f9e2292de 100644
--- a/meta/classes/package_tar.bbclass
+++ b/yocto-poky/meta/classes/package_tar.bbclass
diff --git a/meta/classes/packagedata.bbclass b/yocto-poky/meta/classes/packagedata.bbclass
index 3397f1e36..3397f1e36 100644
--- a/meta/classes/packagedata.bbclass
+++ b/yocto-poky/meta/classes/packagedata.bbclass
diff --git a/meta/classes/packagegroup.bbclass b/yocto-poky/meta/classes/packagegroup.bbclass
index 56cfead82..56cfead82 100644
--- a/meta/classes/packagegroup.bbclass
+++ b/yocto-poky/meta/classes/packagegroup.bbclass
diff --git a/meta/classes/packageinfo.bbclass b/yocto-poky/meta/classes/packageinfo.bbclass
index 7d60ace1d..7d60ace1d 100644
--- a/meta/classes/packageinfo.bbclass
+++ b/yocto-poky/meta/classes/packageinfo.bbclass
diff --git a/meta/classes/patch.bbclass b/yocto-poky/meta/classes/patch.bbclass
index 1e2aab041..1e2aab041 100644
--- a/meta/classes/patch.bbclass
+++ b/yocto-poky/meta/classes/patch.bbclass
diff --git a/meta/classes/perlnative.bbclass b/yocto-poky/meta/classes/perlnative.bbclass
index cc8de8b38..cc8de8b38 100644
--- a/meta/classes/perlnative.bbclass
+++ b/yocto-poky/meta/classes/perlnative.bbclass
diff --git a/meta/classes/pixbufcache.bbclass b/yocto-poky/meta/classes/pixbufcache.bbclass
index dbe11e12d..dbe11e12d 100644
--- a/meta/classes/pixbufcache.bbclass
+++ b/yocto-poky/meta/classes/pixbufcache.bbclass
diff --git a/meta/classes/pkgconfig.bbclass b/yocto-poky/meta/classes/pkgconfig.bbclass
index ad1f84f50..ad1f84f50 100644
--- a/meta/classes/pkgconfig.bbclass
+++ b/yocto-poky/meta/classes/pkgconfig.bbclass
diff --git a/meta/classes/populate_sdk.bbclass b/yocto-poky/meta/classes/populate_sdk.bbclass
index f64a911b7..f64a911b7 100644
--- a/meta/classes/populate_sdk.bbclass
+++ b/yocto-poky/meta/classes/populate_sdk.bbclass
diff --git a/meta/classes/populate_sdk_base.bbclass b/yocto-poky/meta/classes/populate_sdk_base.bbclass
index 35e129b06..35e129b06 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/yocto-poky/meta/classes/populate_sdk_base.bbclass
diff --git a/meta/classes/populate_sdk_ext.bbclass b/yocto-poky/meta/classes/populate_sdk_ext.bbclass
index b9808bb8e..b9808bb8e 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/yocto-poky/meta/classes/populate_sdk_ext.bbclass
diff --git a/meta/classes/prexport.bbclass b/yocto-poky/meta/classes/prexport.bbclass
index 5a1cb33c6..5a1cb33c6 100644
--- a/meta/classes/prexport.bbclass
+++ b/yocto-poky/meta/classes/prexport.bbclass
diff --git a/meta/classes/primport.bbclass b/yocto-poky/meta/classes/primport.bbclass
index 8ed45f03f..8ed45f03f 100644
--- a/meta/classes/primport.bbclass
+++ b/yocto-poky/meta/classes/primport.bbclass
diff --git a/meta/classes/ptest-gnome.bbclass b/yocto-poky/meta/classes/ptest-gnome.bbclass
index b2949af9b..b2949af9b 100644
--- a/meta/classes/ptest-gnome.bbclass
+++ b/yocto-poky/meta/classes/ptest-gnome.bbclass
diff --git a/meta/classes/ptest.bbclass b/yocto-poky/meta/classes/ptest.bbclass
index 4dc5dbe9e..4dc5dbe9e 100644
--- a/meta/classes/ptest.bbclass
+++ b/yocto-poky/meta/classes/ptest.bbclass
diff --git a/meta/classes/python-dir.bbclass b/yocto-poky/meta/classes/python-dir.bbclass
index ebfa4b30f..ebfa4b30f 100644
--- a/meta/classes/python-dir.bbclass
+++ b/yocto-poky/meta/classes/python-dir.bbclass
diff --git a/meta/classes/python3native.bbclass b/yocto-poky/meta/classes/python3native.bbclass
index cf8301767..cf8301767 100644
--- a/meta/classes/python3native.bbclass
+++ b/yocto-poky/meta/classes/python3native.bbclass
diff --git a/meta/classes/pythonnative.bbclass b/yocto-poky/meta/classes/pythonnative.bbclass
index 97029dc52..97029dc52 100644
--- a/meta/classes/pythonnative.bbclass
+++ b/yocto-poky/meta/classes/pythonnative.bbclass
diff --git a/meta/classes/qemu.bbclass b/yocto-poky/meta/classes/qemu.bbclass
index 601f58753..601f58753 100644
--- a/meta/classes/qemu.bbclass
+++ b/yocto-poky/meta/classes/qemu.bbclass
diff --git a/meta/classes/qmake2.bbclass b/yocto-poky/meta/classes/qmake2.bbclass
index 6e73ad2d1..6e73ad2d1 100644
--- a/meta/classes/qmake2.bbclass
+++ b/yocto-poky/meta/classes/qmake2.bbclass
diff --git a/meta/classes/qmake_base.bbclass b/yocto-poky/meta/classes/qmake_base.bbclass
index dc98713fd..dc98713fd 100644
--- a/meta/classes/qmake_base.bbclass
+++ b/yocto-poky/meta/classes/qmake_base.bbclass
diff --git a/meta/classes/qt4e.bbclass b/yocto-poky/meta/classes/qt4e.bbclass
index 13b1050aa..13b1050aa 100644
--- a/meta/classes/qt4e.bbclass
+++ b/yocto-poky/meta/classes/qt4e.bbclass
diff --git a/meta/classes/qt4x11.bbclass b/yocto-poky/meta/classes/qt4x11.bbclass
index 6f06d3475..6f06d3475 100644
--- a/meta/classes/qt4x11.bbclass
+++ b/yocto-poky/meta/classes/qt4x11.bbclass
diff --git a/meta/classes/recipe_sanity.bbclass b/yocto-poky/meta/classes/recipe_sanity.bbclass
index ee04e333d..ee04e333d 100644
--- a/meta/classes/recipe_sanity.bbclass
+++ b/yocto-poky/meta/classes/recipe_sanity.bbclass
diff --git a/meta/classes/relocatable.bbclass b/yocto-poky/meta/classes/relocatable.bbclass
index 4ca9981f4..4ca9981f4 100644
--- a/meta/classes/relocatable.bbclass
+++ b/yocto-poky/meta/classes/relocatable.bbclass
diff --git a/meta/classes/report-error.bbclass b/yocto-poky/meta/classes/report-error.bbclass
index 82b5bcd69..82b5bcd69 100644
--- a/meta/classes/report-error.bbclass
+++ b/yocto-poky/meta/classes/report-error.bbclass
diff --git a/meta/classes/rm_work.bbclass b/yocto-poky/meta/classes/rm_work.bbclass
index 5e9efc1d0..5e9efc1d0 100644
--- a/meta/classes/rm_work.bbclass
+++ b/yocto-poky/meta/classes/rm_work.bbclass
diff --git a/meta/classes/rootfs_deb.bbclass b/yocto-poky/meta/classes/rootfs_deb.bbclass
index d51b4582d..d51b4582d 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/yocto-poky/meta/classes/rootfs_deb.bbclass
diff --git a/meta/classes/rootfs_ipk.bbclass b/yocto-poky/meta/classes/rootfs_ipk.bbclass
index dd144e49e..dd144e49e 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/yocto-poky/meta/classes/rootfs_ipk.bbclass
diff --git a/meta/classes/rootfs_rpm.bbclass b/yocto-poky/meta/classes/rootfs_rpm.bbclass
index d85d001a6..d85d001a6 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/yocto-poky/meta/classes/rootfs_rpm.bbclass
diff --git a/meta/classes/rootfsdebugfiles.bbclass b/yocto-poky/meta/classes/rootfsdebugfiles.bbclass
index a558871e9..a558871e9 100644
--- a/meta/classes/rootfsdebugfiles.bbclass
+++ b/yocto-poky/meta/classes/rootfsdebugfiles.bbclass
diff --git a/meta/classes/sanity.bbclass b/yocto-poky/meta/classes/sanity.bbclass
index ae86d261e..ae86d261e 100644
--- a/meta/classes/sanity.bbclass
+++ b/yocto-poky/meta/classes/sanity.bbclass
diff --git a/meta/classes/scons.bbclass b/yocto-poky/meta/classes/scons.bbclass
index b8de822ff..b8de822ff 100644
--- a/meta/classes/scons.bbclass
+++ b/yocto-poky/meta/classes/scons.bbclass
diff --git a/meta/classes/sdl.bbclass b/yocto-poky/meta/classes/sdl.bbclass
index cc31288f6..cc31288f6 100644
--- a/meta/classes/sdl.bbclass
+++ b/yocto-poky/meta/classes/sdl.bbclass
diff --git a/meta/classes/setuptools.bbclass b/yocto-poky/meta/classes/setuptools.bbclass
index 56343b1c7..56343b1c7 100644
--- a/meta/classes/setuptools.bbclass
+++ b/yocto-poky/meta/classes/setuptools.bbclass
diff --git a/meta/classes/setuptools3.bbclass b/yocto-poky/meta/classes/setuptools3.bbclass
index de6dd9440..de6dd9440 100644
--- a/meta/classes/setuptools3.bbclass
+++ b/yocto-poky/meta/classes/setuptools3.bbclass
diff --git a/meta/classes/sign_package_feed.bbclass b/yocto-poky/meta/classes/sign_package_feed.bbclass
index 426381002..426381002 100644
--- a/meta/classes/sign_package_feed.bbclass
+++ b/yocto-poky/meta/classes/sign_package_feed.bbclass
diff --git a/meta/classes/sign_rpm.bbclass b/yocto-poky/meta/classes/sign_rpm.bbclass
index f0c3dc9be..f0c3dc9be 100644
--- a/meta/classes/sign_rpm.bbclass
+++ b/yocto-poky/meta/classes/sign_rpm.bbclass
diff --git a/meta/classes/sip.bbclass b/yocto-poky/meta/classes/sip.bbclass
index 6ed2a13bd..6ed2a13bd 100644
--- a/meta/classes/sip.bbclass
+++ b/yocto-poky/meta/classes/sip.bbclass
diff --git a/meta/classes/siteconfig.bbclass b/yocto-poky/meta/classes/siteconfig.bbclass
index 45dce489d..45dce489d 100644
--- a/meta/classes/siteconfig.bbclass
+++ b/yocto-poky/meta/classes/siteconfig.bbclass
diff --git a/meta/classes/siteinfo.bbclass b/yocto-poky/meta/classes/siteinfo.bbclass
index 9f6eac4e1..3b562eead 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/yocto-poky/meta/classes/siteinfo.bbclass
@@ -42,6 +42,7 @@ def siteinfo_data(d):
         "powerpc64": "endian-big bit-64 powerpc-common",
         "ppc": "endian-big bit-32 powerpc-common",
         "ppc64": "endian-big bit-64 powerpc-common",
+        "ppc64le": "endian-little bit-64 powerpc-common",
         "sh3": "endian-little bit-32 sh-common",
         "sh4": "endian-little bit-32 sh-common",
         "sparc": "endian-big bit-32",
diff --git a/meta/classes/spdx.bbclass b/yocto-poky/meta/classes/spdx.bbclass
index 454c53e96..454c53e96 100644
--- a/meta/classes/spdx.bbclass
+++ b/yocto-poky/meta/classes/spdx.bbclass
diff --git a/meta/classes/sstate.bbclass b/yocto-poky/meta/classes/sstate.bbclass
index d09e27aee..d09e27aee 100644
--- a/meta/classes/sstate.bbclass
+++ b/yocto-poky/meta/classes/sstate.bbclass
diff --git a/meta/classes/staging.bbclass b/yocto-poky/meta/classes/staging.bbclass
index 967eddd60..967eddd60 100644
--- a/meta/classes/staging.bbclass
+++ b/yocto-poky/meta/classes/staging.bbclass
diff --git a/meta/classes/syslinux.bbclass b/yocto-poky/meta/classes/syslinux.bbclass
index 44ef9a917..44ef9a917 100644
--- a/meta/classes/syslinux.bbclass
+++ b/yocto-poky/meta/classes/syslinux.bbclass
diff --git a/meta/classes/systemd.bbclass b/yocto-poky/meta/classes/systemd.bbclass
index 46e72c7a4..46e72c7a4 100644
--- a/meta/classes/systemd.bbclass
+++ b/yocto-poky/meta/classes/systemd.bbclass
diff --git a/meta/classes/terminal.bbclass b/yocto-poky/meta/classes/terminal.bbclass
index e577c6d59..e577c6d59 100644
--- a/meta/classes/terminal.bbclass
+++ b/yocto-poky/meta/classes/terminal.bbclass
diff --git a/meta/classes/testimage-auto.bbclass b/yocto-poky/meta/classes/testimage-auto.bbclass
index 860599d2b..860599d2b 100644
--- a/meta/classes/testimage-auto.bbclass
+++ b/yocto-poky/meta/classes/testimage-auto.bbclass
diff --git a/meta/classes/testimage.bbclass b/yocto-poky/meta/classes/testimage.bbclass
index b4d4a69b0..b4d4a69b0 100644
--- a/meta/classes/testimage.bbclass
+++ b/yocto-poky/meta/classes/testimage.bbclass
diff --git a/meta/classes/texinfo.bbclass b/yocto-poky/meta/classes/texinfo.bbclass
index 92efbccdd..92efbccdd 100644
--- a/meta/classes/texinfo.bbclass
+++ b/yocto-poky/meta/classes/texinfo.bbclass
diff --git a/meta/classes/tinderclient.bbclass b/yocto-poky/meta/classes/tinderclient.bbclass
index 6984efd1b..6984efd1b 100644
--- a/meta/classes/tinderclient.bbclass
+++ b/yocto-poky/meta/classes/tinderclient.bbclass
diff --git a/meta/classes/toaster.bbclass b/yocto-poky/meta/classes/toaster.bbclass
index d63cff532..d63cff532 100644
--- a/meta/classes/toaster.bbclass
+++ b/yocto-poky/meta/classes/toaster.bbclass
diff --git a/meta/classes/toolchain-scripts.bbclass b/yocto-poky/meta/classes/toolchain-scripts.bbclass
index ab4feb083..ab4feb083 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/yocto-poky/meta/classes/toolchain-scripts.bbclass
diff --git a/meta/classes/typecheck.bbclass b/yocto-poky/meta/classes/typecheck.bbclass
index 72da93223..72da93223 100644
--- a/meta/classes/typecheck.bbclass
+++ b/yocto-poky/meta/classes/typecheck.bbclass
diff --git a/meta/classes/uboot-config.bbclass b/yocto-poky/meta/classes/uboot-config.bbclass
index cb061af34..cb061af34 100644
--- a/meta/classes/uboot-config.bbclass
+++ b/yocto-poky/meta/classes/uboot-config.bbclass
diff --git a/meta/classes/uninative.bbclass b/yocto-poky/meta/classes/uninative.bbclass
index 0cd27db85..0cd27db85 100644
--- a/meta/classes/uninative.bbclass
+++ b/yocto-poky/meta/classes/uninative.bbclass
diff --git a/meta/classes/update-alternatives.bbclass b/yocto-poky/meta/classes/update-alternatives.bbclass
index a3c1657fa..a3c1657fa 100644
--- a/meta/classes/update-alternatives.bbclass
+++ b/yocto-poky/meta/classes/update-alternatives.bbclass
diff --git a/meta/classes/update-rc.d.bbclass b/yocto-poky/meta/classes/update-rc.d.bbclass
index 2a0a74a5f..2a0a74a5f 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/yocto-poky/meta/classes/update-rc.d.bbclass
diff --git a/meta/classes/useradd-staticids.bbclass b/yocto-poky/meta/classes/useradd-staticids.bbclass
index 924d6eae6..924d6eae6 100644
--- a/meta/classes/useradd-staticids.bbclass
+++ b/yocto-poky/meta/classes/useradd-staticids.bbclass
diff --git a/meta/classes/useradd.bbclass b/yocto-poky/meta/classes/useradd.bbclass
index 4577e56f5..4577e56f5 100644
--- a/meta/classes/useradd.bbclass
+++ b/yocto-poky/meta/classes/useradd.bbclass
diff --git a/meta/classes/useradd_base.bbclass b/yocto-poky/meta/classes/useradd_base.bbclass
index ab3cd353f..ab3cd353f 100644
--- a/meta/classes/useradd_base.bbclass
+++ b/yocto-poky/meta/classes/useradd_base.bbclass
diff --git a/meta/classes/utility-tasks.bbclass b/yocto-poky/meta/classes/utility-tasks.bbclass
index e817b899a..e817b899a 100644
--- a/meta/classes/utility-tasks.bbclass
+++ b/yocto-poky/meta/classes/utility-tasks.bbclass
diff --git a/meta/classes/utils.bbclass b/yocto-poky/meta/classes/utils.bbclass
index 81b92cb5e..81b92cb5e 100644
--- a/meta/classes/utils.bbclass
+++ b/yocto-poky/meta/classes/utils.bbclass
diff --git a/meta/classes/vala.bbclass b/yocto-poky/meta/classes/vala.bbclass
index 9ff664ac4..9ff664ac4 100644
--- a/meta/classes/vala.bbclass
+++ b/yocto-poky/meta/classes/vala.bbclass
diff --git a/meta/classes/waf.bbclass b/yocto-poky/meta/classes/waf.bbclass
index 3a221e708..3a221e708 100644
--- a/meta/classes/waf.bbclass
+++ b/yocto-poky/meta/classes/waf.bbclass
diff --git a/meta/conf/abi_version.conf b/yocto-poky/meta/conf/abi_version.conf
index a82968778..a82968778 100644
--- a/meta/conf/abi_version.conf
+++ b/yocto-poky/meta/conf/abi_version.conf
diff --git a/meta/conf/bitbake.conf b/yocto-poky/meta/conf/bitbake.conf
index 06971da81..06971da81 100644
--- a/meta/conf/bitbake.conf
+++ b/yocto-poky/meta/conf/bitbake.conf
diff --git a/meta/conf/conf-notes.txt b/yocto-poky/meta/conf/conf-notes.txt
index 66e6319e7..66e6319e7 100644
--- a/meta/conf/conf-notes.txt
+++ b/yocto-poky/meta/conf/conf-notes.txt
diff --git a/meta/conf/distro/defaultsetup.conf b/yocto-poky/meta/conf/distro/defaultsetup.conf
index 71c65b146..71c65b146 100644
--- a/meta/conf/distro/defaultsetup.conf
+++ b/yocto-poky/meta/conf/distro/defaultsetup.conf
diff --git a/meta/conf/distro/include/as-needed.inc b/yocto-poky/meta/conf/distro/include/as-needed.inc
index 4f249fd3e..4f249fd3e 100644
--- a/meta/conf/distro/include/as-needed.inc
+++ b/yocto-poky/meta/conf/distro/include/as-needed.inc
diff --git a/meta/conf/distro/include/default-distrovars.inc b/yocto-poky/meta/conf/distro/include/default-distrovars.inc
index 836690492..836690492 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/yocto-poky/meta/conf/distro/include/default-distrovars.inc
diff --git a/meta/conf/distro/include/default-providers.inc b/yocto-poky/meta/conf/distro/include/default-providers.inc
index 9f84d5ced..9f84d5ced 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/yocto-poky/meta/conf/distro/include/default-providers.inc
diff --git a/meta/conf/distro/include/default-versions.inc b/yocto-poky/meta/conf/distro/include/default-versions.inc
index 573063edf..573063edf 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/yocto-poky/meta/conf/distro/include/default-versions.inc
diff --git a/meta/conf/distro/include/distro_alias.inc b/yocto-poky/meta/conf/distro/include/distro_alias.inc
index ca333c88c..ca333c88c 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/yocto-poky/meta/conf/distro/include/distro_alias.inc
diff --git a/meta/conf/distro/include/package_regex.inc b/yocto-poky/meta/conf/distro/include/package_regex.inc
index d12999b15..d12999b15 100644
--- a/meta/conf/distro/include/package_regex.inc
+++ b/yocto-poky/meta/conf/distro/include/package_regex.inc
diff --git a/meta/conf/distro/include/security_flags.inc b/yocto-poky/meta/conf/distro/include/security_flags.inc
index 14ac0bf32..14ac0bf32 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/yocto-poky/meta/conf/distro/include/security_flags.inc
diff --git a/meta/conf/distro/include/tclibc-baremetal.inc b/yocto-poky/meta/conf/distro/include/tclibc-baremetal.inc
index a8ce6d3ac..a8ce6d3ac 100644
--- a/meta/conf/distro/include/tclibc-baremetal.inc
+++ b/yocto-poky/meta/conf/distro/include/tclibc-baremetal.inc
diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/yocto-poky/meta/conf/distro/include/tclibc-glibc.inc
index 649918fd2..649918fd2 100644
--- a/meta/conf/distro/include/tclibc-glibc.inc
+++ b/yocto-poky/meta/conf/distro/include/tclibc-glibc.inc
diff --git a/meta/conf/distro/include/tclibc-musl.inc b/yocto-poky/meta/conf/distro/include/tclibc-musl.inc
index 1ddd58ed5..1ddd58ed5 100644
--- a/meta/conf/distro/include/tclibc-musl.inc
+++ b/yocto-poky/meta/conf/distro/include/tclibc-musl.inc
diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/yocto-poky/meta/conf/distro/include/tclibc-uclibc.inc
index 14c3cdbb8..14c3cdbb8 100644
--- a/meta/conf/distro/include/tclibc-uclibc.inc
+++ b/yocto-poky/meta/conf/distro/include/tclibc-uclibc.inc
diff --git a/meta/conf/distro/include/tcmode-default.inc b/yocto-poky/meta/conf/distro/include/tcmode-default.inc
index f20552494..f20552494 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/yocto-poky/meta/conf/distro/include/tcmode-default.inc
diff --git a/meta/conf/distro/include/upstream_tracking.inc b/yocto-poky/meta/conf/distro/include/upstream_tracking.inc
index e2a5e6ce4..e2a5e6ce4 100644
--- a/meta/conf/distro/include/upstream_tracking.inc
+++ b/yocto-poky/meta/conf/distro/include/upstream_tracking.inc
diff --git a/meta/conf/distro/include/world-broken.inc b/yocto-poky/meta/conf/distro/include/world-broken.inc
index ab0c2dc86..ab0c2dc86 100644
--- a/meta/conf/distro/include/world-broken.inc
+++ b/yocto-poky/meta/conf/distro/include/world-broken.inc
diff --git a/meta/conf/documentation.conf b/yocto-poky/meta/conf/documentation.conf
index 845559a5e..845559a5e 100644
--- a/meta/conf/documentation.conf
+++ b/yocto-poky/meta/conf/documentation.conf
diff --git a/meta/conf/layer.conf b/yocto-poky/meta/conf/layer.conf
index 977363225..977363225 100644
--- a/meta/conf/layer.conf
+++ b/yocto-poky/meta/conf/layer.conf
diff --git a/meta/conf/licenses.conf b/yocto-poky/meta/conf/licenses.conf
index 9917c40e1..9917c40e1 100644
--- a/meta/conf/licenses.conf
+++ b/yocto-poky/meta/conf/licenses.conf
diff --git a/meta/conf/machine-sdk/i586.conf b/yocto-poky/meta/conf/machine-sdk/i586.conf
index baacce70a..baacce70a 100644
--- a/meta/conf/machine-sdk/i586.conf
+++ b/yocto-poky/meta/conf/machine-sdk/i586.conf
diff --git a/meta/conf/machine-sdk/i686.conf b/yocto-poky/meta/conf/machine-sdk/i686.conf
index ffdb46131..ffdb46131 100644
--- a/meta/conf/machine-sdk/i686.conf
+++ b/yocto-poky/meta/conf/machine-sdk/i686.conf
diff --git a/meta/conf/machine-sdk/x86_64.conf b/yocto-poky/meta/conf/machine-sdk/x86_64.conf
index 812d67c8d..812d67c8d 100644
--- a/meta/conf/machine-sdk/x86_64.conf
+++ b/yocto-poky/meta/conf/machine-sdk/x86_64.conf
diff --git a/meta/conf/machine/include/README b/yocto-poky/meta/conf/machine/include/README
index d66130acb..d66130acb 100644
--- a/meta/conf/machine/include/README
+++ b/yocto-poky/meta/conf/machine/include/README
diff --git a/meta/conf/machine/include/arm/README b/yocto-poky/meta/conf/machine/include/arm/README
index a1beb75fd..a1beb75fd 100644
--- a/meta/conf/machine/include/arm/README
+++ b/yocto-poky/meta/conf/machine/include/arm/README
diff --git a/meta/conf/machine/include/arm/arch-arm.inc b/yocto-poky/meta/conf/machine/include/arm/arch-arm.inc
index 90b80c4c3..90b80c4c3 100644
--- a/meta/conf/machine/include/arm/arch-arm.inc
+++ b/yocto-poky/meta/conf/machine/include/arm/arch-arm.inc
diff --git a/meta/conf/machine/include/arm/arch-arm64.inc b/yocto-poky/meta/conf/machine/include/arm/arch-arm64.inc
index 5376b87dd..5376b87dd 100644
--- a/meta/conf/machine/include/arm/arch-arm64.inc
+++ b/yocto-poky/meta/conf/machine/include/arm/arch-arm64.inc
diff --git a/meta/conf/machine/include/arm/arch-armv4.inc b/yocto-poky/meta/conf/machine/include/arm/arch-armv4.inc
index 52c07a83c..52c07a83c 100644
--- a/meta/conf/machine/include/arm/arch-armv4.inc
+++ b/yocto-poky/meta/conf/machine/include/arm/arch-armv4.inc
diff --git a/meta/conf/machine/include/arm/arch-armv5-dsp.inc b/yocto-poky/meta/conf/machine/include/arm/arch-armv5-dsp.inc
index 524a62aec..524a62aec 100644
--- a/meta/conf/machine/include/arm/arch-armv5-dsp.inc
+++ b/yocto-poky/meta/conf/machine/include/arm/arch-armv5-dsp.inc
diff --git a/meta/conf/machine/include/arm/arch-armv5.inc b/yocto-poky/meta/conf/machine/include/arm/arch-armv5.inc
index 5cceafa06..5cceafa06 100644
--- a/meta/conf/machine/include/arm/arch-armv5.inc
+++ b/yocto-poky/meta/conf/machine/include/arm/arch-armv5.inc
diff --git a/meta/conf/machine/include/arm/arch-armv6.inc b/yocto-poky/meta/conf/machine/include/arm/arch-armv6.inc
index 4b0c5bf2d..4b0c5bf2d 100644
--- a/meta/conf/machine/include/arm/arch-armv6.inc
+++ b/yocto-poky/meta/conf/machine/include/arm/arch-armv6.inc
diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/yocto-poky/meta/conf/machine/include/arm/arch-armv7a.inc
index d3b6f643a..d3b6f643a 100644
--- a/meta/conf/machine/include/arm/arch-armv7a.inc
+++ b/yocto-poky/meta/conf/machine/include/arm/arch-armv7a.inc
diff --git a/meta/conf/machine/include/arm/arch-armv8.inc b/yocto-poky/meta/conf/machine/include/arm/arch-armv8.inc
index 5e832fae6..5e832fae6 100644
--- a/meta/conf/machine/include/arm/arch-armv8.inc
+++ b/yocto-poky/meta/conf/machine/include/arm/arch-armv8.inc
diff --git a/meta/conf/machine/include/arm/feature-arm-neon.inc b/yocto-poky/meta/conf/machine/include/arm/feature-arm-neon.inc
index e8b2b85d5..e8b2b85d5 100644
--- a/meta/conf/machine/include/arm/feature-arm-neon.inc
+++ b/yocto-poky/meta/conf/machine/include/arm/feature-arm-neon.inc
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/yocto-poky/meta/conf/machine/include/arm/feature-arm-thumb.inc
index 563217186..563217186 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/yocto-poky/meta/conf/machine/include/arm/feature-arm-thumb.inc
diff --git a/meta/conf/machine/include/arm/feature-arm-vfp.inc b/yocto-poky/meta/conf/machine/include/arm/feature-arm-vfp.inc
index 3dfbeac55..3dfbeac55 100644
--- a/meta/conf/machine/include/arm/feature-arm-vfp.inc
+++ b/yocto-poky/meta/conf/machine/include/arm/feature-arm-vfp.inc
diff --git a/meta/conf/machine/include/mips/README b/yocto-poky/meta/conf/machine/include/mips/README
index c375f316d..c375f316d 100644
--- a/meta/conf/machine/include/mips/README
+++ b/yocto-poky/meta/conf/machine/include/mips/README
diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/yocto-poky/meta/conf/machine/include/mips/arch-mips.inc
index 02626d300..02626d300 100644
--- a/meta/conf/machine/include/mips/arch-mips.inc
+++ b/yocto-poky/meta/conf/machine/include/mips/arch-mips.inc
diff --git a/meta/conf/machine/include/powerpc/README b/yocto-poky/meta/conf/machine/include/powerpc/README
index e87fb5082..e87fb5082 100644
--- a/meta/conf/machine/include/powerpc/README
+++ b/yocto-poky/meta/conf/machine/include/powerpc/README
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/yocto-poky/meta/conf/machine/include/powerpc/arch-powerpc.inc
index 036ca3c97..036ca3c97 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
+++ b/yocto-poky/meta/conf/machine/include/powerpc/arch-powerpc.inc
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/yocto-poky/meta/conf/machine/include/powerpc/arch-powerpc64.inc
index 8476dec8a..8476dec8a 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
+++ b/yocto-poky/meta/conf/machine/include/powerpc/arch-powerpc64.inc
diff --git a/meta/conf/machine/include/qemu.inc b/yocto-poky/meta/conf/machine/include/qemu.inc
index 16e94691d..16e94691d 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/yocto-poky/meta/conf/machine/include/qemu.inc
diff --git a/meta/conf/machine/include/sh/README b/yocto-poky/meta/conf/machine/include/sh/README
index b351acdd2..b351acdd2 100644
--- a/meta/conf/machine/include/sh/README
+++ b/yocto-poky/meta/conf/machine/include/sh/README
diff --git a/meta/conf/machine/include/sh/arch-sh.inc b/yocto-poky/meta/conf/machine/include/sh/arch-sh.inc
index 64d4cac82..64d4cac82 100644
--- a/meta/conf/machine/include/sh/arch-sh.inc
+++ b/yocto-poky/meta/conf/machine/include/sh/arch-sh.inc
diff --git a/meta/conf/machine/include/soc-family.inc b/yocto-poky/meta/conf/machine/include/soc-family.inc
index 1ff089981..1ff089981 100644
--- a/meta/conf/machine/include/soc-family.inc
+++ b/yocto-poky/meta/conf/machine/include/soc-family.inc
diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/yocto-poky/meta/conf/machine/include/tune-arm1136jf-s.inc
index 4a131b64c..4a131b64c 100644
--- a/meta/conf/machine/include/tune-arm1136jf-s.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-arm1136jf-s.inc
diff --git a/meta/conf/machine/include/tune-arm920t.inc b/yocto-poky/meta/conf/machine/include/tune-arm920t.inc
index 0a2eae6cb..0a2eae6cb 100644
--- a/meta/conf/machine/include/tune-arm920t.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-arm920t.inc
diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/yocto-poky/meta/conf/machine/include/tune-arm926ejs.inc
index 335e4e020..335e4e020 100644
--- a/meta/conf/machine/include/tune-arm926ejs.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-arm926ejs.inc
diff --git a/meta/conf/machine/include/tune-arm9tdmi.inc b/yocto-poky/meta/conf/machine/include/tune-arm9tdmi.inc
index dee57c985..dee57c985 100644
--- a/meta/conf/machine/include/tune-arm9tdmi.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-arm9tdmi.inc
diff --git a/meta/conf/machine/include/tune-atom.inc b/yocto-poky/meta/conf/machine/include/tune-atom.inc
index 5e1bb74c6..5e1bb74c6 100644
--- a/meta/conf/machine/include/tune-atom.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-atom.inc
diff --git a/meta/conf/machine/include/tune-c3.inc b/yocto-poky/meta/conf/machine/include/tune-c3.inc
index fafc28ada..fafc28ada 100644
--- a/meta/conf/machine/include/tune-c3.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-c3.inc
diff --git a/meta/conf/machine/include/tune-core2.inc b/yocto-poky/meta/conf/machine/include/tune-core2.inc
index 9a4cb7017..9a4cb7017 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-core2.inc
diff --git a/meta/conf/machine/include/tune-corei7.inc b/yocto-poky/meta/conf/machine/include/tune-corei7.inc
index 42cf93261..42cf93261 100644
--- a/meta/conf/machine/include/tune-corei7.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-corei7.inc
diff --git a/meta/conf/machine/include/tune-cortexa15.inc b/yocto-poky/meta/conf/machine/include/tune-cortexa15.inc
index 552977722..552977722 100644
--- a/meta/conf/machine/include/tune-cortexa15.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-cortexa15.inc
diff --git a/meta/conf/machine/include/tune-cortexa17.inc b/yocto-poky/meta/conf/machine/include/tune-cortexa17.inc
index bfc7126cb..bfc7126cb 100644
--- a/meta/conf/machine/include/tune-cortexa17.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-cortexa17.inc
diff --git a/meta/conf/machine/include/tune-cortexa5.inc b/yocto-poky/meta/conf/machine/include/tune-cortexa5.inc
index 139e65c82..139e65c82 100644
--- a/meta/conf/machine/include/tune-cortexa5.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-cortexa5.inc
diff --git a/meta/conf/machine/include/tune-cortexa7.inc b/yocto-poky/meta/conf/machine/include/tune-cortexa7.inc
index 9d069100f..9d069100f 100644
--- a/meta/conf/machine/include/tune-cortexa7.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-cortexa7.inc
diff --git a/meta/conf/machine/include/tune-cortexa8.inc b/yocto-poky/meta/conf/machine/include/tune-cortexa8.inc
index 771537ff8..771537ff8 100644
--- a/meta/conf/machine/include/tune-cortexa8.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-cortexa8.inc
diff --git a/meta/conf/machine/include/tune-cortexa9.inc b/yocto-poky/meta/conf/machine/include/tune-cortexa9.inc
index 700394b82..700394b82 100644
--- a/meta/conf/machine/include/tune-cortexa9.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-cortexa9.inc
diff --git a/meta/conf/machine/include/tune-cortexm1.inc b/yocto-poky/meta/conf/machine/include/tune-cortexm1.inc
index 3b652796d..3b652796d 100644
--- a/meta/conf/machine/include/tune-cortexm1.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-cortexm1.inc
diff --git a/meta/conf/machine/include/tune-cortexm3.inc b/yocto-poky/meta/conf/machine/include/tune-cortexm3.inc
index cbc4c0dd4..cbc4c0dd4 100644
--- a/meta/conf/machine/include/tune-cortexm3.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-cortexm3.inc
diff --git a/meta/conf/machine/include/tune-cortexr4.inc b/yocto-poky/meta/conf/machine/include/tune-cortexr4.inc
index bde649f09..bde649f09 100644
--- a/meta/conf/machine/include/tune-cortexr4.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-cortexr4.inc
diff --git a/meta/conf/machine/include/tune-ep9312.inc b/yocto-poky/meta/conf/machine/include/tune-ep9312.inc
index b19b43812..b19b43812 100644
--- a/meta/conf/machine/include/tune-ep9312.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-ep9312.inc
diff --git a/meta/conf/machine/include/tune-i586-nlp.inc b/yocto-poky/meta/conf/machine/include/tune-i586-nlp.inc
index e30602bd3..e30602bd3 100644
--- a/meta/conf/machine/include/tune-i586-nlp.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-i586-nlp.inc
diff --git a/meta/conf/machine/include/tune-i586.inc b/yocto-poky/meta/conf/machine/include/tune-i586.inc
index 5fbb3c74d..5fbb3c74d 100644
--- a/meta/conf/machine/include/tune-i586.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-i586.inc
diff --git a/meta/conf/machine/include/tune-iwmmxt.inc b/yocto-poky/meta/conf/machine/include/tune-iwmmxt.inc
index 748ca0d0a..748ca0d0a 100644
--- a/meta/conf/machine/include/tune-iwmmxt.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-iwmmxt.inc
diff --git a/meta/conf/machine/include/tune-mips32.inc b/yocto-poky/meta/conf/machine/include/tune-mips32.inc
index ae326cedf..ae326cedf 100644
--- a/meta/conf/machine/include/tune-mips32.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-mips32.inc
diff --git a/meta/conf/machine/include/tune-mips32r2.inc b/yocto-poky/meta/conf/machine/include/tune-mips32r2.inc
index c9deff84e..c9deff84e 100644
--- a/meta/conf/machine/include/tune-mips32r2.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-mips32r2.inc
diff --git a/meta/conf/machine/include/tune-mips64.inc b/yocto-poky/meta/conf/machine/include/tune-mips64.inc
index 9be0e0f8d..9be0e0f8d 100644
--- a/meta/conf/machine/include/tune-mips64.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-mips64.inc
diff --git a/meta/conf/machine/include/tune-octeon.inc b/yocto-poky/meta/conf/machine/include/tune-octeon.inc
index f24d9dbb5..f24d9dbb5 100644
--- a/meta/conf/machine/include/tune-octeon.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-octeon.inc
diff --git a/meta/conf/machine/include/tune-power5.inc b/yocto-poky/meta/conf/machine/include/tune-power5.inc
index 30be86941..30be86941 100644
--- a/meta/conf/machine/include/tune-power5.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-power5.inc
diff --git a/meta/conf/machine/include/tune-power6.inc b/yocto-poky/meta/conf/machine/include/tune-power6.inc
index 756379812..756379812 100644
--- a/meta/conf/machine/include/tune-power6.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-power6.inc
diff --git a/meta/conf/machine/include/tune-power7.inc b/yocto-poky/meta/conf/machine/include/tune-power7.inc
index 7069e7502..7069e7502 100644
--- a/meta/conf/machine/include/tune-power7.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-power7.inc
diff --git a/meta/conf/machine/include/tune-ppc476.inc b/yocto-poky/meta/conf/machine/include/tune-ppc476.inc
index 4ed185d2e..4ed185d2e 100644
--- a/meta/conf/machine/include/tune-ppc476.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-ppc476.inc
diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/yocto-poky/meta/conf/machine/include/tune-ppc603e.inc
index d744a0053..d744a0053 100644
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-ppc603e.inc
diff --git a/meta/conf/machine/include/tune-ppc7400.inc b/yocto-poky/meta/conf/machine/include/tune-ppc7400.inc
index 4ac0403e1..4ac0403e1 100644
--- a/meta/conf/machine/include/tune-ppc7400.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-ppc7400.inc
diff --git a/meta/conf/machine/include/tune-ppce300c2.inc b/yocto-poky/meta/conf/machine/include/tune-ppce300c2.inc
index 05a9505f7..05a9505f7 100644
--- a/meta/conf/machine/include/tune-ppce300c2.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-ppce300c2.inc
diff --git a/meta/conf/machine/include/tune-ppce300c3.inc b/yocto-poky/meta/conf/machine/include/tune-ppce300c3.inc
index b19cf220b..b19cf220b 100644
--- a/meta/conf/machine/include/tune-ppce300c3.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-ppce300c3.inc
diff --git a/meta/conf/machine/include/tune-ppce500.inc b/yocto-poky/meta/conf/machine/include/tune-ppce500.inc
index 70c1f8b25..70c1f8b25 100644
--- a/meta/conf/machine/include/tune-ppce500.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-ppce500.inc
diff --git a/meta/conf/machine/include/tune-ppce500mc.inc b/yocto-poky/meta/conf/machine/include/tune-ppce500mc.inc
index 744d8e55e..744d8e55e 100644
--- a/meta/conf/machine/include/tune-ppce500mc.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-ppce500mc.inc
diff --git a/meta/conf/machine/include/tune-ppce500v2.inc b/yocto-poky/meta/conf/machine/include/tune-ppce500v2.inc
index d014d70a6..d014d70a6 100644
--- a/meta/conf/machine/include/tune-ppce500v2.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-ppce500v2.inc
diff --git a/meta/conf/machine/include/tune-ppce5500.inc b/yocto-poky/meta/conf/machine/include/tune-ppce5500.inc
index 25231ef4f..25231ef4f 100644
--- a/meta/conf/machine/include/tune-ppce5500.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-ppce5500.inc
diff --git a/meta/conf/machine/include/tune-ppce6500.inc b/yocto-poky/meta/conf/machine/include/tune-ppce6500.inc
index ea743a3ed..ea743a3ed 100644
--- a/meta/conf/machine/include/tune-ppce6500.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-ppce6500.inc
diff --git a/meta/conf/machine/include/tune-sh3.inc b/yocto-poky/meta/conf/machine/include/tune-sh3.inc
index c5ed7bab9..c5ed7bab9 100644
--- a/meta/conf/machine/include/tune-sh3.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-sh3.inc
diff --git a/meta/conf/machine/include/tune-sh4.inc b/yocto-poky/meta/conf/machine/include/tune-sh4.inc
index 56e23b936..56e23b936 100644
--- a/meta/conf/machine/include/tune-sh4.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-sh4.inc
diff --git a/meta/conf/machine/include/tune-strongarm1100.inc b/yocto-poky/meta/conf/machine/include/tune-strongarm1100.inc
index ea2fba89f..ea2fba89f 100644
--- a/meta/conf/machine/include/tune-strongarm1100.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-strongarm1100.inc
diff --git a/meta/conf/machine/include/tune-supersparc.inc b/yocto-poky/meta/conf/machine/include/tune-supersparc.inc
index 0faa361f1..0faa361f1 100644
--- a/meta/conf/machine/include/tune-supersparc.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-supersparc.inc
diff --git a/meta/conf/machine/include/tune-thunderx.inc b/yocto-poky/meta/conf/machine/include/tune-thunderx.inc
index 40de61dc2..40de61dc2 100644
--- a/meta/conf/machine/include/tune-thunderx.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-thunderx.inc
diff --git a/meta/conf/machine/include/tune-xscale.inc b/yocto-poky/meta/conf/machine/include/tune-xscale.inc
index 0c5ca8d17..0c5ca8d17 100644
--- a/meta/conf/machine/include/tune-xscale.inc
+++ b/yocto-poky/meta/conf/machine/include/tune-xscale.inc
diff --git a/meta/conf/machine/include/x86-base.inc b/yocto-poky/meta/conf/machine/include/x86-base.inc
index f7c8a45fa..f7c8a45fa 100644
--- a/meta/conf/machine/include/x86-base.inc
+++ b/yocto-poky/meta/conf/machine/include/x86-base.inc
diff --git a/meta/conf/machine/include/x86/README b/yocto-poky/meta/conf/machine/include/x86/README
index 2b6c46c7e..2b6c46c7e 100644
--- a/meta/conf/machine/include/x86/README
+++ b/yocto-poky/meta/conf/machine/include/x86/README
diff --git a/meta/conf/machine/include/x86/arch-x86.inc b/yocto-poky/meta/conf/machine/include/x86/arch-x86.inc
index 298bddc6a..298bddc6a 100644
--- a/meta/conf/machine/include/x86/arch-x86.inc
+++ b/yocto-poky/meta/conf/machine/include/x86/arch-x86.inc
diff --git a/meta/conf/machine/qemuarm.conf b/yocto-poky/meta/conf/machine/qemuarm.conf
index cdad03fc4..cdad03fc4 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/yocto-poky/meta/conf/machine/qemuarm.conf
diff --git a/meta/conf/machine/qemuarm64.conf b/yocto-poky/meta/conf/machine/qemuarm64.conf
index 8459d0f3c..8459d0f3c 100644
--- a/meta/conf/machine/qemuarm64.conf
+++ b/yocto-poky/meta/conf/machine/qemuarm64.conf
diff --git a/meta/conf/machine/qemumips.conf b/yocto-poky/meta/conf/machine/qemumips.conf
index fbf813740..fbf813740 100644
--- a/meta/conf/machine/qemumips.conf
+++ b/yocto-poky/meta/conf/machine/qemumips.conf
diff --git a/meta/conf/machine/qemumips64.conf b/yocto-poky/meta/conf/machine/qemumips64.conf
index 8c3f1fe28..8c3f1fe28 100644
--- a/meta/conf/machine/qemumips64.conf
+++ b/yocto-poky/meta/conf/machine/qemumips64.conf
diff --git a/meta/conf/machine/qemuppc.conf b/yocto-poky/meta/conf/machine/qemuppc.conf
index 85cbbf798..85cbbf798 100644
--- a/meta/conf/machine/qemuppc.conf
+++ b/yocto-poky/meta/conf/machine/qemuppc.conf
diff --git a/meta/conf/machine/qemux86-64.conf b/yocto-poky/meta/conf/machine/qemux86-64.conf
index 489194aa6..489194aa6 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/yocto-poky/meta/conf/machine/qemux86-64.conf
diff --git a/meta/conf/machine/qemux86.conf b/yocto-poky/meta/conf/machine/qemux86.conf
index 3cc809158..3cc809158 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/yocto-poky/meta/conf/machine/qemux86.conf
diff --git a/meta/conf/migrate_localcount.conf b/yocto-poky/meta/conf/migrate_localcount.conf
index e486e03e5..e486e03e5 100644
--- a/meta/conf/migrate_localcount.conf
+++ b/yocto-poky/meta/conf/migrate_localcount.conf
diff --git a/meta/conf/multilib.conf b/yocto-poky/meta/conf/multilib.conf
index 50303fb5d..50303fb5d 100644
--- a/meta/conf/multilib.conf
+++ b/yocto-poky/meta/conf/multilib.conf
diff --git a/meta/conf/prexport.conf b/yocto-poky/meta/conf/prexport.conf
index 12f3acb2d..12f3acb2d 100644
--- a/meta/conf/prexport.conf
+++ b/yocto-poky/meta/conf/prexport.conf
diff --git a/meta/conf/primport.conf b/yocto-poky/meta/conf/primport.conf
index d94ea1b1e..d94ea1b1e 100644
--- a/meta/conf/primport.conf
+++ b/yocto-poky/meta/conf/primport.conf
diff --git a/meta/conf/sanity.conf b/yocto-poky/meta/conf/sanity.conf
index dd156d282..dd156d282 100644
--- a/meta/conf/sanity.conf
+++ b/yocto-poky/meta/conf/sanity.conf
diff --git a/meta/conf/swabber/Ubuntu-10.04.1-64/blacklist b/yocto-poky/meta/conf/swabber/Ubuntu-10.04.1-64/blacklist
index 5fdb8f2b9..5fdb8f2b9 100644
--- a/meta/conf/swabber/Ubuntu-10.04.1-64/blacklist
+++ b/yocto-poky/meta/conf/swabber/Ubuntu-10.04.1-64/blacklist
diff --git a/meta/conf/swabber/Ubuntu-10.04.1-64/filters b/yocto-poky/meta/conf/swabber/Ubuntu-10.04.1-64/filters
index a447f70e9..a447f70e9 100644
--- a/meta/conf/swabber/Ubuntu-10.04.1-64/filters
+++ b/yocto-poky/meta/conf/swabber/Ubuntu-10.04.1-64/filters
diff --git a/meta/conf/swabber/Ubuntu-10.04.1-64/whitelist b/yocto-poky/meta/conf/swabber/Ubuntu-10.04.1-64/whitelist
index f0fe9633d..f0fe9633d 100644
--- a/meta/conf/swabber/Ubuntu-10.04.1-64/whitelist
+++ b/yocto-poky/meta/conf/swabber/Ubuntu-10.04.1-64/whitelist
diff --git a/meta/conf/swabber/generic/blacklist b/yocto-poky/meta/conf/swabber/generic/blacklist
index 396bcb4bf..396bcb4bf 100644
--- a/meta/conf/swabber/generic/blacklist
+++ b/yocto-poky/meta/conf/swabber/generic/blacklist
diff --git a/meta/conf/swabber/generic/filters b/yocto-poky/meta/conf/swabber/generic/filters
index 3b10fcb37..3b10fcb37 100644
--- a/meta/conf/swabber/generic/filters
+++ b/yocto-poky/meta/conf/swabber/generic/filters
diff --git a/meta/conf/swabber/generic/whitelist b/yocto-poky/meta/conf/swabber/generic/whitelist
index 48ec2af2c..48ec2af2c 100644
--- a/meta/conf/swabber/generic/whitelist
+++ b/yocto-poky/meta/conf/swabber/generic/whitelist
diff --git a/meta/conf/toasterconf.json b/yocto-poky/meta/conf/toasterconf.json
index c8e42efad..c8e42efad 100644
--- a/meta/conf/toasterconf.json
+++ b/yocto-poky/meta/conf/toasterconf.json
diff --git a/meta/files/common-licenses/AAL b/yocto-poky/meta/files/common-licenses/AAL
index 54842265f..54842265f 100644
--- a/meta/files/common-licenses/AAL
+++ b/yocto-poky/meta/files/common-licenses/AAL
diff --git a/meta/files/common-licenses/AFL-1.2 b/yocto-poky/meta/files/common-licenses/AFL-1.2
index e8131e722..e8131e722 100644
--- a/meta/files/common-licenses/AFL-1.2
+++ b/yocto-poky/meta/files/common-licenses/AFL-1.2
diff --git a/meta/files/common-licenses/AFL-2.0 b/yocto-poky/meta/files/common-licenses/AFL-2.0
index ad27a28d1..ad27a28d1 100644
--- a/meta/files/common-licenses/AFL-2.0
+++ b/yocto-poky/meta/files/common-licenses/AFL-2.0
diff --git a/meta/files/common-licenses/AFL-2.1 b/yocto-poky/meta/files/common-licenses/AFL-2.1
index 0284e4f5d..0284e4f5d 100644
--- a/meta/files/common-licenses/AFL-2.1
+++ b/yocto-poky/meta/files/common-licenses/AFL-2.1
diff --git a/meta/files/common-licenses/AFL-3.0 b/yocto-poky/meta/files/common-licenses/AFL-3.0
index 126c259e4..126c259e4 100644
--- a/meta/files/common-licenses/AFL-3.0
+++ b/yocto-poky/meta/files/common-licenses/AFL-3.0
diff --git a/meta/files/common-licenses/AGPL-3.0 b/yocto-poky/meta/files/common-licenses/AGPL-3.0
index dba13ed2d..dba13ed2d 100644
--- a/meta/files/common-licenses/AGPL-3.0
+++ b/yocto-poky/meta/files/common-licenses/AGPL-3.0
diff --git a/meta/files/common-licenses/ANTLR-PD b/yocto-poky/meta/files/common-licenses/ANTLR-PD
index 8b02a8c13..8b02a8c13 100644
--- a/meta/files/common-licenses/ANTLR-PD
+++ b/yocto-poky/meta/files/common-licenses/ANTLR-PD
diff --git a/meta/files/common-licenses/APL-1.0 b/yocto-poky/meta/files/common-licenses/APL-1.0
index 4805b1cb6..4805b1cb6 100644
--- a/meta/files/common-licenses/APL-1.0
+++ b/yocto-poky/meta/files/common-licenses/APL-1.0
diff --git a/meta/files/common-licenses/APSL-1.0 b/yocto-poky/meta/files/common-licenses/APSL-1.0
index 024f8228a..024f8228a 100644
--- a/meta/files/common-licenses/APSL-1.0
+++ b/yocto-poky/meta/files/common-licenses/APSL-1.0
diff --git a/meta/files/common-licenses/APSL-1.1 b/yocto-poky/meta/files/common-licenses/APSL-1.1
index 425e46e21..425e46e21 100644
--- a/meta/files/common-licenses/APSL-1.1
+++ b/yocto-poky/meta/files/common-licenses/APSL-1.1
diff --git a/meta/files/common-licenses/APSL-1.2 b/yocto-poky/meta/files/common-licenses/APSL-1.2
index 58e3530b8..58e3530b8 100644
--- a/meta/files/common-licenses/APSL-1.2
+++ b/yocto-poky/meta/files/common-licenses/APSL-1.2
diff --git a/meta/files/common-licenses/APSL-2.0 b/yocto-poky/meta/files/common-licenses/APSL-2.0
index d12e8b47f..d12e8b47f 100644
--- a/meta/files/common-licenses/APSL-2.0
+++ b/yocto-poky/meta/files/common-licenses/APSL-2.0
diff --git a/meta/files/common-licenses/Adobe b/yocto-poky/meta/files/common-licenses/Adobe
index 64779da1d..64779da1d 100644
--- a/meta/files/common-licenses/Adobe
+++ b/yocto-poky/meta/files/common-licenses/Adobe
diff --git a/meta/files/common-licenses/Apache-1.0 b/yocto-poky/meta/files/common-licenses/Apache-1.0
index 26e90892f..26e90892f 100644
--- a/meta/files/common-licenses/Apache-1.0
+++ b/yocto-poky/meta/files/common-licenses/Apache-1.0
diff --git a/meta/files/common-licenses/Apache-1.1 b/yocto-poky/meta/files/common-licenses/Apache-1.1
index c25ec0056..c25ec0056 100644
--- a/meta/files/common-licenses/Apache-1.1
+++ b/yocto-poky/meta/files/common-licenses/Apache-1.1
diff --git a/meta/files/common-licenses/Apache-2.0 b/yocto-poky/meta/files/common-licenses/Apache-2.0
index b3201abff..b3201abff 100644
--- a/meta/files/common-licenses/Apache-2.0
+++ b/yocto-poky/meta/files/common-licenses/Apache-2.0
diff --git a/meta/files/common-licenses/Artistic-1.0 b/yocto-poky/meta/files/common-licenses/Artistic-1.0
index 807e4d258..807e4d258 100644
--- a/meta/files/common-licenses/Artistic-1.0
+++ b/yocto-poky/meta/files/common-licenses/Artistic-1.0
diff --git a/meta/files/common-licenses/Artistic-2.0 b/yocto-poky/meta/files/common-licenses/Artistic-2.0
index c0f8d19db..c0f8d19db 100644
--- a/meta/files/common-licenses/Artistic-2.0
+++ b/yocto-poky/meta/files/common-licenses/Artistic-2.0
diff --git a/meta/files/common-licenses/BSD b/yocto-poky/meta/files/common-licenses/BSD
index c7a0aa4f9..c7a0aa4f9 100644
--- a/meta/files/common-licenses/BSD
+++ b/yocto-poky/meta/files/common-licenses/BSD
diff --git a/meta/files/common-licenses/BSD-0-Clause b/yocto-poky/meta/files/common-licenses/BSD-0-Clause
index 328bdd6ae..328bdd6ae 100644
--- a/meta/files/common-licenses/BSD-0-Clause
+++ b/yocto-poky/meta/files/common-licenses/BSD-0-Clause
diff --git a/meta/files/common-licenses/BSD-2-Clause b/yocto-poky/meta/files/common-licenses/BSD-2-Clause
index ade0f34d5..ade0f34d5 100644
--- a/meta/files/common-licenses/BSD-2-Clause
+++ b/yocto-poky/meta/files/common-licenses/BSD-2-Clause
diff --git a/meta/files/common-licenses/BSD-3-Clause b/yocto-poky/meta/files/common-licenses/BSD-3-Clause
index d13865eba..d13865eba 100644
--- a/meta/files/common-licenses/BSD-3-Clause
+++ b/yocto-poky/meta/files/common-licenses/BSD-3-Clause
diff --git a/meta/files/common-licenses/BSD-4-Clause b/yocto-poky/meta/files/common-licenses/BSD-4-Clause
index 7b162dec0..7b162dec0 100644
--- a/meta/files/common-licenses/BSD-4-Clause
+++ b/yocto-poky/meta/files/common-licenses/BSD-4-Clause
diff --git a/meta/files/common-licenses/BSL-1.0 b/yocto-poky/meta/files/common-licenses/BSL-1.0
index 8ea8eae49..8ea8eae49 100644
--- a/meta/files/common-licenses/BSL-1.0
+++ b/yocto-poky/meta/files/common-licenses/BSL-1.0
diff --git a/meta/files/common-licenses/BitstreamVera b/yocto-poky/meta/files/common-licenses/BitstreamVera
index e6f03aa57..e6f03aa57 100644
--- a/meta/files/common-licenses/BitstreamVera
+++ b/yocto-poky/meta/files/common-licenses/BitstreamVera
diff --git a/meta/files/common-licenses/CATOSL-1.1 b/yocto-poky/meta/files/common-licenses/CATOSL-1.1
index 63e8a56b6..63e8a56b6 100644
--- a/meta/files/common-licenses/CATOSL-1.1
+++ b/yocto-poky/meta/files/common-licenses/CATOSL-1.1
diff --git a/meta/files/common-licenses/CC-BY-1.0 b/yocto-poky/meta/files/common-licenses/CC-BY-1.0
index ca0b75207..ca0b75207 100644
--- a/meta/files/common-licenses/CC-BY-1.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-1.0
diff --git a/meta/files/common-licenses/CC-BY-2.0 b/yocto-poky/meta/files/common-licenses/CC-BY-2.0
index 0e17a453e..0e17a453e 100644
--- a/meta/files/common-licenses/CC-BY-2.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-2.0
diff --git a/meta/files/common-licenses/CC-BY-2.5 b/yocto-poky/meta/files/common-licenses/CC-BY-2.5
index 2e3d1932f..2e3d1932f 100644
--- a/meta/files/common-licenses/CC-BY-2.5
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-2.5
diff --git a/meta/files/common-licenses/CC-BY-3.0 b/yocto-poky/meta/files/common-licenses/CC-BY-3.0
index 593d56291..593d56291 100644
--- a/meta/files/common-licenses/CC-BY-3.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-3.0
diff --git a/meta/files/common-licenses/CC-BY-NC-1.0 b/yocto-poky/meta/files/common-licenses/CC-BY-NC-1.0
index 6c5d22995..6c5d22995 100644
--- a/meta/files/common-licenses/CC-BY-NC-1.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-NC-1.0
diff --git a/meta/files/common-licenses/CC-BY-NC-2.0 b/yocto-poky/meta/files/common-licenses/CC-BY-NC-2.0
index 4dc517691..4dc517691 100644
--- a/meta/files/common-licenses/CC-BY-NC-2.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-NC-2.0
diff --git a/meta/files/common-licenses/CC-BY-NC-2.5 b/yocto-poky/meta/files/common-licenses/CC-BY-NC-2.5
index 98e61e1f3..98e61e1f3 100644
--- a/meta/files/common-licenses/CC-BY-NC-2.5
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-NC-2.5
diff --git a/meta/files/common-licenses/CC-BY-NC-3.0 b/yocto-poky/meta/files/common-licenses/CC-BY-NC-3.0
index cf3425dcb..cf3425dcb 100644
--- a/meta/files/common-licenses/CC-BY-NC-3.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-NC-3.0
diff --git a/meta/files/common-licenses/CC-BY-NC-ND-1.0 b/yocto-poky/meta/files/common-licenses/CC-BY-NC-ND-1.0
index b17d84e6d..b17d84e6d 100644
--- a/meta/files/common-licenses/CC-BY-NC-ND-1.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-NC-ND-1.0
diff --git a/meta/files/common-licenses/CC-BY-NC-ND-2.0 b/yocto-poky/meta/files/common-licenses/CC-BY-NC-ND-2.0
index f46c17033..f46c17033 100644
--- a/meta/files/common-licenses/CC-BY-NC-ND-2.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-NC-ND-2.0
diff --git a/meta/files/common-licenses/CC-BY-NC-ND-2.5 b/yocto-poky/meta/files/common-licenses/CC-BY-NC-ND-2.5
index cb7aa599a..cb7aa599a 100644
--- a/meta/files/common-licenses/CC-BY-NC-ND-2.5
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-NC-ND-2.5
diff --git a/meta/files/common-licenses/CC-BY-NC-ND-3.0 b/yocto-poky/meta/files/common-licenses/CC-BY-NC-ND-3.0
index 3c954dbf1..3c954dbf1 100644
--- a/meta/files/common-licenses/CC-BY-NC-ND-3.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-NC-ND-3.0
diff --git a/meta/files/common-licenses/CC-BY-NC-SA-1.0 b/yocto-poky/meta/files/common-licenses/CC-BY-NC-SA-1.0
index 239fd6a07..239fd6a07 100644
--- a/meta/files/common-licenses/CC-BY-NC-SA-1.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-NC-SA-1.0
diff --git a/meta/files/common-licenses/CC-BY-NC-SA-2.0 b/yocto-poky/meta/files/common-licenses/CC-BY-NC-SA-2.0
index 9f07f8124..9f07f8124 100644
--- a/meta/files/common-licenses/CC-BY-NC-SA-2.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-NC-SA-2.0
diff --git a/meta/files/common-licenses/CC-BY-NC-SA-2.5 b/yocto-poky/meta/files/common-licenses/CC-BY-NC-SA-2.5
index 025cccab6..025cccab6 100644
--- a/meta/files/common-licenses/CC-BY-NC-SA-2.5
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-NC-SA-2.5
diff --git a/meta/files/common-licenses/CC-BY-NC-SA-3.0 b/yocto-poky/meta/files/common-licenses/CC-BY-NC-SA-3.0
index d0cb1c557..d0cb1c557 100644
--- a/meta/files/common-licenses/CC-BY-NC-SA-3.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-NC-SA-3.0
diff --git a/meta/files/common-licenses/CC-BY-ND-1.0 b/yocto-poky/meta/files/common-licenses/CC-BY-ND-1.0
index 7358186f6..7358186f6 100644
--- a/meta/files/common-licenses/CC-BY-ND-1.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-ND-1.0
diff --git a/meta/files/common-licenses/CC-BY-ND-2.0 b/yocto-poky/meta/files/common-licenses/CC-BY-ND-2.0
index d2c974b1a..d2c974b1a 100644
--- a/meta/files/common-licenses/CC-BY-ND-2.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-ND-2.0
diff --git a/meta/files/common-licenses/CC-BY-ND-2.5 b/yocto-poky/meta/files/common-licenses/CC-BY-ND-2.5
index b5e4546d7..b5e4546d7 100644
--- a/meta/files/common-licenses/CC-BY-ND-2.5
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-ND-2.5
diff --git a/meta/files/common-licenses/CC-BY-ND-3.0 b/yocto-poky/meta/files/common-licenses/CC-BY-ND-3.0
index 4f64e30dc..4f64e30dc 100644
--- a/meta/files/common-licenses/CC-BY-ND-3.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-ND-3.0
diff --git a/meta/files/common-licenses/CC-BY-SA-1.0 b/yocto-poky/meta/files/common-licenses/CC-BY-SA-1.0
index 9f1394b02..9f1394b02 100644
--- a/meta/files/common-licenses/CC-BY-SA-1.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-SA-1.0
diff --git a/meta/files/common-licenses/CC-BY-SA-2.0 b/yocto-poky/meta/files/common-licenses/CC-BY-SA-2.0
index a82434afc..a82434afc 100644
--- a/meta/files/common-licenses/CC-BY-SA-2.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-SA-2.0
diff --git a/meta/files/common-licenses/CC-BY-SA-2.5 b/yocto-poky/meta/files/common-licenses/CC-BY-SA-2.5
index 7f8dd5c10..7f8dd5c10 100644
--- a/meta/files/common-licenses/CC-BY-SA-2.5
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-SA-2.5
diff --git a/meta/files/common-licenses/CC-BY-SA-3.0 b/yocto-poky/meta/files/common-licenses/CC-BY-SA-3.0
index 70bbd6c90..70bbd6c90 100644
--- a/meta/files/common-licenses/CC-BY-SA-3.0
+++ b/yocto-poky/meta/files/common-licenses/CC-BY-SA-3.0
diff --git a/meta/files/common-licenses/CC0-1.0 b/yocto-poky/meta/files/common-licenses/CC0-1.0
index 52cf88b9b..52cf88b9b 100644
--- a/meta/files/common-licenses/CC0-1.0
+++ b/yocto-poky/meta/files/common-licenses/CC0-1.0
diff --git a/meta/files/common-licenses/CDDL-1.0 b/yocto-poky/meta/files/common-licenses/CDDL-1.0
index 74198e7c5..74198e7c5 100644
--- a/meta/files/common-licenses/CDDL-1.0
+++ b/yocto-poky/meta/files/common-licenses/CDDL-1.0
diff --git a/meta/files/common-licenses/CECILL-1.0 b/yocto-poky/meta/files/common-licenses/CECILL-1.0
index 3d31745ba..3d31745ba 100644
--- a/meta/files/common-licenses/CECILL-1.0
+++ b/yocto-poky/meta/files/common-licenses/CECILL-1.0
diff --git a/meta/files/common-licenses/CECILL-2.0 b/yocto-poky/meta/files/common-licenses/CECILL-2.0
index 7bc14a6a8..7bc14a6a8 100644
--- a/meta/files/common-licenses/CECILL-2.0
+++ b/yocto-poky/meta/files/common-licenses/CECILL-2.0
diff --git a/meta/files/common-licenses/CECILL-B b/yocto-poky/meta/files/common-licenses/CECILL-B
index 1cc244f4c..1cc244f4c 100644
--- a/meta/files/common-licenses/CECILL-B
+++ b/yocto-poky/meta/files/common-licenses/CECILL-B
diff --git a/meta/files/common-licenses/CECILL-C b/yocto-poky/meta/files/common-licenses/CECILL-C
index 7e8ef86e8..7e8ef86e8 100644
--- a/meta/files/common-licenses/CECILL-C
+++ b/yocto-poky/meta/files/common-licenses/CECILL-C
diff --git a/meta/files/common-licenses/CPAL-1.0 b/yocto-poky/meta/files/common-licenses/CPAL-1.0
index aafb0e24a..aafb0e24a 100644
--- a/meta/files/common-licenses/CPAL-1.0
+++ b/yocto-poky/meta/files/common-licenses/CPAL-1.0
diff --git a/meta/files/common-licenses/CPL-1.0 b/yocto-poky/meta/files/common-licenses/CPL-1.0
index 517c20fb4..517c20fb4 100644
--- a/meta/files/common-licenses/CPL-1.0
+++ b/yocto-poky/meta/files/common-licenses/CPL-1.0
diff --git a/meta/files/common-licenses/CUA-OPL-1.0 b/yocto-poky/meta/files/common-licenses/CUA-OPL-1.0
index 1ff59eb42..1ff59eb42 100644
--- a/meta/files/common-licenses/CUA-OPL-1.0
+++ b/yocto-poky/meta/files/common-licenses/CUA-OPL-1.0
diff --git a/meta/files/common-licenses/ClArtistic b/yocto-poky/meta/files/common-licenses/ClArtistic
index 8d5a4aad8..8d5a4aad8 100644
--- a/meta/files/common-licenses/ClArtistic
+++ b/yocto-poky/meta/files/common-licenses/ClArtistic
diff --git a/meta/files/common-licenses/DSSSL b/yocto-poky/meta/files/common-licenses/DSSSL
index 7159dfbd6..7159dfbd6 100644
--- a/meta/files/common-licenses/DSSSL
+++ b/yocto-poky/meta/files/common-licenses/DSSSL
diff --git a/meta/files/common-licenses/ECL-1.0 b/yocto-poky/meta/files/common-licenses/ECL-1.0
index bbc8be107..bbc8be107 100644
--- a/meta/files/common-licenses/ECL-1.0
+++ b/yocto-poky/meta/files/common-licenses/ECL-1.0
diff --git a/meta/files/common-licenses/ECL-2.0 b/yocto-poky/meta/files/common-licenses/ECL-2.0
index 54c99e7ed..54c99e7ed 100644
--- a/meta/files/common-licenses/ECL-2.0
+++ b/yocto-poky/meta/files/common-licenses/ECL-2.0
diff --git a/meta/files/common-licenses/EDL-1.0 b/yocto-poky/meta/files/common-licenses/EDL-1.0
index 53b1eb045..53b1eb045 100644
--- a/meta/files/common-licenses/EDL-1.0
+++ b/yocto-poky/meta/files/common-licenses/EDL-1.0
diff --git a/meta/files/common-licenses/EFL-1.0 b/yocto-poky/meta/files/common-licenses/EFL-1.0
index c39960513..c39960513 100644
--- a/meta/files/common-licenses/EFL-1.0
+++ b/yocto-poky/meta/files/common-licenses/EFL-1.0
diff --git a/meta/files/common-licenses/EFL-2.0 b/yocto-poky/meta/files/common-licenses/EFL-2.0
index be37f904a..be37f904a 100644
--- a/meta/files/common-licenses/EFL-2.0
+++ b/yocto-poky/meta/files/common-licenses/EFL-2.0
diff --git a/meta/files/common-licenses/EPL-1.0 b/yocto-poky/meta/files/common-licenses/EPL-1.0
index 1d76e57b9..1d76e57b9 100644
--- a/meta/files/common-licenses/EPL-1.0
+++ b/yocto-poky/meta/files/common-licenses/EPL-1.0
diff --git a/meta/files/common-licenses/EUDatagrid b/yocto-poky/meta/files/common-licenses/EUDatagrid
index d96e50441..d96e50441 100644
--- a/meta/files/common-licenses/EUDatagrid
+++ b/yocto-poky/meta/files/common-licenses/EUDatagrid
diff --git a/meta/files/common-licenses/EUPL-1.0 b/yocto-poky/meta/files/common-licenses/EUPL-1.0
index 40ecbfe23..40ecbfe23 100644
--- a/meta/files/common-licenses/EUPL-1.0
+++ b/yocto-poky/meta/files/common-licenses/EUPL-1.0
diff --git a/meta/files/common-licenses/EUPL-1.1 b/yocto-poky/meta/files/common-licenses/EUPL-1.1
index 6e1d84f77..6e1d84f77 100644
--- a/meta/files/common-licenses/EUPL-1.1
+++ b/yocto-poky/meta/files/common-licenses/EUPL-1.1
diff --git a/meta/files/common-licenses/Elfutils-Exception b/yocto-poky/meta/files/common-licenses/Elfutils-Exception
index 627d76912..627d76912 100644
--- a/meta/files/common-licenses/Elfutils-Exception
+++ b/yocto-poky/meta/files/common-licenses/Elfutils-Exception
diff --git a/meta/files/common-licenses/Entessa b/yocto-poky/meta/files/common-licenses/Entessa
index d4dadd226..d4dadd226 100644
--- a/meta/files/common-licenses/Entessa
+++ b/yocto-poky/meta/files/common-licenses/Entessa
diff --git a/meta/files/common-licenses/ErlPL-1.1 b/yocto-poky/meta/files/common-licenses/ErlPL-1.1
index 5961ccf4d..5961ccf4d 100644
--- a/meta/files/common-licenses/ErlPL-1.1
+++ b/yocto-poky/meta/files/common-licenses/ErlPL-1.1
diff --git a/meta/files/common-licenses/FSF-Unlimited b/yocto-poky/meta/files/common-licenses/FSF-Unlimited
index 010a981af..010a981af 100644
--- a/meta/files/common-licenses/FSF-Unlimited
+++ b/yocto-poky/meta/files/common-licenses/FSF-Unlimited
diff --git a/meta/files/common-licenses/Fair b/yocto-poky/meta/files/common-licenses/Fair
index 475b01db9..475b01db9 100644
--- a/meta/files/common-licenses/Fair
+++ b/yocto-poky/meta/files/common-licenses/Fair
diff --git a/meta/files/common-licenses/Frameworx-1.0 b/yocto-poky/meta/files/common-licenses/Frameworx-1.0
index 2abb1845a..2abb1845a 100644
--- a/meta/files/common-licenses/Frameworx-1.0
+++ b/yocto-poky/meta/files/common-licenses/Frameworx-1.0
diff --git a/meta/files/common-licenses/FreeType b/yocto-poky/meta/files/common-licenses/FreeType
index b7d4d11c0..b7d4d11c0 100644
--- a/meta/files/common-licenses/FreeType
+++ b/yocto-poky/meta/files/common-licenses/FreeType
diff --git a/meta/files/common-licenses/GFDL-1.1 b/yocto-poky/meta/files/common-licenses/GFDL-1.1
index 1d7422315..1d7422315 100644
--- a/meta/files/common-licenses/GFDL-1.1
+++ b/yocto-poky/meta/files/common-licenses/GFDL-1.1
diff --git a/meta/files/common-licenses/GFDL-1.2 b/yocto-poky/meta/files/common-licenses/GFDL-1.2
index ec872c6b8..ec872c6b8 100644
--- a/meta/files/common-licenses/GFDL-1.2
+++ b/yocto-poky/meta/files/common-licenses/GFDL-1.2
diff --git a/meta/files/common-licenses/GFDL-1.3 b/yocto-poky/meta/files/common-licenses/GFDL-1.3
index ab11a44a6..ab11a44a6 100644
--- a/meta/files/common-licenses/GFDL-1.3
+++ b/yocto-poky/meta/files/common-licenses/GFDL-1.3
diff --git a/meta/files/common-licenses/GPL-1.0 b/yocto-poky/meta/files/common-licenses/GPL-1.0
index 9d4ef93ae..9d4ef93ae 100644
--- a/meta/files/common-licenses/GPL-1.0
+++ b/yocto-poky/meta/files/common-licenses/GPL-1.0
diff --git a/meta/files/common-licenses/GPL-2-with-bison-exception b/yocto-poky/meta/files/common-licenses/GPL-2-with-bison-exception
index dd3427397..dd3427397 100644
--- a/meta/files/common-licenses/GPL-2-with-bison-exception
+++ b/yocto-poky/meta/files/common-licenses/GPL-2-with-bison-exception
diff --git a/meta/files/common-licenses/GPL-2.0 b/yocto-poky/meta/files/common-licenses/GPL-2.0
index 7f5abbce2..7f5abbce2 100644
--- a/meta/files/common-licenses/GPL-2.0
+++ b/yocto-poky/meta/files/common-licenses/GPL-2.0
diff --git a/meta/files/common-licenses/GPL-2.0-with-GCC-exception b/yocto-poky/meta/files/common-licenses/GPL-2.0-with-GCC-exception
index ff8de09dc..ff8de09dc 100644
--- a/meta/files/common-licenses/GPL-2.0-with-GCC-exception
+++ b/yocto-poky/meta/files/common-licenses/GPL-2.0-with-GCC-exception
diff --git a/meta/files/common-licenses/GPL-2.0-with-OpenSSL-exception b/yocto-poky/meta/files/common-licenses/GPL-2.0-with-OpenSSL-exception
index 7586c6225..7586c6225 100644
--- a/meta/files/common-licenses/GPL-2.0-with-OpenSSL-exception
+++ b/yocto-poky/meta/files/common-licenses/GPL-2.0-with-OpenSSL-exception
diff --git a/meta/files/common-licenses/GPL-2.0-with-autoconf-exception b/yocto-poky/meta/files/common-licenses/GPL-2.0-with-autoconf-exception
index a22aad7ed..a22aad7ed 100644
--- a/meta/files/common-licenses/GPL-2.0-with-autoconf-exception
+++ b/yocto-poky/meta/files/common-licenses/GPL-2.0-with-autoconf-exception
diff --git a/meta/files/common-licenses/GPL-2.0-with-classpath-exception b/yocto-poky/meta/files/common-licenses/GPL-2.0-with-classpath-exception
index 8d3e9cdbd..8d3e9cdbd 100644
--- a/meta/files/common-licenses/GPL-2.0-with-classpath-exception
+++ b/yocto-poky/meta/files/common-licenses/GPL-2.0-with-classpath-exception
diff --git a/meta/files/common-licenses/GPL-2.0-with-font-exception b/yocto-poky/meta/files/common-licenses/GPL-2.0-with-font-exception
index abb42f9f9..abb42f9f9 100644
--- a/meta/files/common-licenses/GPL-2.0-with-font-exception
+++ b/yocto-poky/meta/files/common-licenses/GPL-2.0-with-font-exception
diff --git a/meta/files/common-licenses/GPL-3.0 b/yocto-poky/meta/files/common-licenses/GPL-3.0
index e0665a64a..e0665a64a 100644
--- a/meta/files/common-licenses/GPL-3.0
+++ b/yocto-poky/meta/files/common-licenses/GPL-3.0
diff --git a/meta/files/common-licenses/GPL-3.0-with-GCC-exception b/yocto-poky/meta/files/common-licenses/GPL-3.0-with-GCC-exception
index 6c968b67e..6c968b67e 100644
--- a/meta/files/common-licenses/GPL-3.0-with-GCC-exception
+++ b/yocto-poky/meta/files/common-licenses/GPL-3.0-with-GCC-exception
diff --git a/meta/files/common-licenses/GPL-3.0-with-autoconf-exception b/yocto-poky/meta/files/common-licenses/GPL-3.0-with-autoconf-exception
index a86f0d7c8..a86f0d7c8 100644
--- a/meta/files/common-licenses/GPL-3.0-with-autoconf-exception
+++ b/yocto-poky/meta/files/common-licenses/GPL-3.0-with-autoconf-exception
diff --git a/meta/files/common-licenses/HPND b/yocto-poky/meta/files/common-licenses/HPND
index 274bbdb8f..274bbdb8f 100644
--- a/meta/files/common-licenses/HPND
+++ b/yocto-poky/meta/files/common-licenses/HPND
diff --git a/meta/files/common-licenses/ICU b/yocto-poky/meta/files/common-licenses/ICU
index a29b6fb50..a29b6fb50 100644
--- a/meta/files/common-licenses/ICU
+++ b/yocto-poky/meta/files/common-licenses/ICU
diff --git a/meta/files/common-licenses/IPA b/yocto-poky/meta/files/common-licenses/IPA
index d465b1c58..d465b1c58 100644
--- a/meta/files/common-licenses/IPA
+++ b/yocto-poky/meta/files/common-licenses/IPA
diff --git a/meta/files/common-licenses/IPL-1.0 b/yocto-poky/meta/files/common-licenses/IPL-1.0
index 2b136c9b3..2b136c9b3 100644
--- a/meta/files/common-licenses/IPL-1.0
+++ b/yocto-poky/meta/files/common-licenses/IPL-1.0
diff --git a/meta/files/common-licenses/ISC b/yocto-poky/meta/files/common-licenses/ISC
index 97af105b0..97af105b0 100644
--- a/meta/files/common-licenses/ISC
+++ b/yocto-poky/meta/files/common-licenses/ISC
diff --git a/meta/files/common-licenses/LGPL-2.0 b/yocto-poky/meta/files/common-licenses/LGPL-2.0
index 5931d439b..5931d439b 100644
--- a/meta/files/common-licenses/LGPL-2.0
+++ b/yocto-poky/meta/files/common-licenses/LGPL-2.0
diff --git a/meta/files/common-licenses/LGPL-2.1 b/yocto-poky/meta/files/common-licenses/LGPL-2.1
index a0e735a98..a0e735a98 100644
--- a/meta/files/common-licenses/LGPL-2.1
+++ b/yocto-poky/meta/files/common-licenses/LGPL-2.1
diff --git a/meta/files/common-licenses/LGPL-3.0 b/yocto-poky/meta/files/common-licenses/LGPL-3.0
index 6be29bf20..6be29bf20 100644
--- a/meta/files/common-licenses/LGPL-3.0
+++ b/yocto-poky/meta/files/common-licenses/LGPL-3.0
diff --git a/meta/files/common-licenses/LPL-1.02 b/yocto-poky/meta/files/common-licenses/LPL-1.02
index e933748a6..e933748a6 100644
--- a/meta/files/common-licenses/LPL-1.02
+++ b/yocto-poky/meta/files/common-licenses/LPL-1.02
diff --git a/meta/files/common-licenses/LPPL-1.0 b/yocto-poky/meta/files/common-licenses/LPPL-1.0
index f9ef35d79..f9ef35d79 100644
--- a/meta/files/common-licenses/LPPL-1.0
+++ b/yocto-poky/meta/files/common-licenses/LPPL-1.0
diff --git a/meta/files/common-licenses/LPPL-1.1 b/yocto-poky/meta/files/common-licenses/LPPL-1.1
index 808331998..808331998 100644
--- a/meta/files/common-licenses/LPPL-1.1
+++ b/yocto-poky/meta/files/common-licenses/LPPL-1.1
diff --git a/meta/files/common-licenses/LPPL-1.2 b/yocto-poky/meta/files/common-licenses/LPPL-1.2
index c391a47ef..c391a47ef 100644
--- a/meta/files/common-licenses/LPPL-1.2
+++ b/yocto-poky/meta/files/common-licenses/LPPL-1.2
diff --git a/meta/files/common-licenses/LPPL-1.3c b/yocto-poky/meta/files/common-licenses/LPPL-1.3c
index 755e3bb12..755e3bb12 100644
--- a/meta/files/common-licenses/LPPL-1.3c
+++ b/yocto-poky/meta/files/common-licenses/LPPL-1.3c
diff --git a/meta/files/common-licenses/Libpng b/yocto-poky/meta/files/common-licenses/Libpng
index a9d5b031b..a9d5b031b 100644
--- a/meta/files/common-licenses/Libpng
+++ b/yocto-poky/meta/files/common-licenses/Libpng
diff --git a/meta/files/common-licenses/MIT b/yocto-poky/meta/files/common-licenses/MIT
index 33f8bef43..33f8bef43 100644
--- a/meta/files/common-licenses/MIT
+++ b/yocto-poky/meta/files/common-licenses/MIT
diff --git a/meta/files/common-licenses/MPL-1.0 b/yocto-poky/meta/files/common-licenses/MPL-1.0
index 83dc3f624..83dc3f624 100644
--- a/meta/files/common-licenses/MPL-1.0
+++ b/yocto-poky/meta/files/common-licenses/MPL-1.0
diff --git a/meta/files/common-licenses/MPL-1.1 b/yocto-poky/meta/files/common-licenses/MPL-1.1
index 6aa8c4edc..6aa8c4edc 100644
--- a/meta/files/common-licenses/MPL-1.1
+++ b/yocto-poky/meta/files/common-licenses/MPL-1.1
diff --git a/meta/files/common-licenses/MPL-2.0 b/yocto-poky/meta/files/common-licenses/MPL-2.0
index 14e2f777f..14e2f777f 100644
--- a/meta/files/common-licenses/MPL-2.0
+++ b/yocto-poky/meta/files/common-licenses/MPL-2.0
diff --git a/meta/files/common-licenses/MS-PL b/yocto-poky/meta/files/common-licenses/MS-PL
index e90d6b4fd..e90d6b4fd 100644
--- a/meta/files/common-licenses/MS-PL
+++ b/yocto-poky/meta/files/common-licenses/MS-PL
diff --git a/meta/files/common-licenses/MS-RL b/yocto-poky/meta/files/common-licenses/MS-RL
index f703c0d3d..f703c0d3d 100644
--- a/meta/files/common-licenses/MS-RL
+++ b/yocto-poky/meta/files/common-licenses/MS-RL
diff --git a/meta/files/common-licenses/MirOS b/yocto-poky/meta/files/common-licenses/MirOS
index 146768e28..146768e28 100644
--- a/meta/files/common-licenses/MirOS
+++ b/yocto-poky/meta/files/common-licenses/MirOS
diff --git a/meta/files/common-licenses/Motosoto b/yocto-poky/meta/files/common-licenses/Motosoto
index 7a524f62b..7a524f62b 100644
--- a/meta/files/common-licenses/Motosoto
+++ b/yocto-poky/meta/files/common-licenses/Motosoto
diff --git a/meta/files/common-licenses/Multics b/yocto-poky/meta/files/common-licenses/Multics
index a487645d8..a487645d8 100644
--- a/meta/files/common-licenses/Multics
+++ b/yocto-poky/meta/files/common-licenses/Multics
diff --git a/meta/files/common-licenses/NASA-1.3 b/yocto-poky/meta/files/common-licenses/NASA-1.3
index 123182d89..123182d89 100644
--- a/meta/files/common-licenses/NASA-1.3
+++ b/yocto-poky/meta/files/common-licenses/NASA-1.3
diff --git a/meta/files/common-licenses/NCSA b/yocto-poky/meta/files/common-licenses/NCSA
index d0ddc9b07..d0ddc9b07 100644
--- a/meta/files/common-licenses/NCSA
+++ b/yocto-poky/meta/files/common-licenses/NCSA
diff --git a/meta/files/common-licenses/NGPL b/yocto-poky/meta/files/common-licenses/NGPL
index 2096eab0f..2096eab0f 100644
--- a/meta/files/common-licenses/NGPL
+++ b/yocto-poky/meta/files/common-licenses/NGPL
diff --git a/meta/files/common-licenses/NPOSL-3.0 b/yocto-poky/meta/files/common-licenses/NPOSL-3.0
index 3a2a66237..3a2a66237 100644
--- a/meta/files/common-licenses/NPOSL-3.0
+++ b/yocto-poky/meta/files/common-licenses/NPOSL-3.0
diff --git a/meta/files/common-licenses/NTP b/yocto-poky/meta/files/common-licenses/NTP
index b3572b0b4..b3572b0b4 100644
--- a/meta/files/common-licenses/NTP
+++ b/yocto-poky/meta/files/common-licenses/NTP
diff --git a/meta/files/common-licenses/Nauman b/yocto-poky/meta/files/common-licenses/Nauman
index 69ce785ff..69ce785ff 100644
--- a/meta/files/common-licenses/Nauman
+++ b/yocto-poky/meta/files/common-licenses/Nauman
diff --git a/meta/files/common-licenses/Nokia b/yocto-poky/meta/files/common-licenses/Nokia
index 0037716df..0037716df 100644
--- a/meta/files/common-licenses/Nokia
+++ b/yocto-poky/meta/files/common-licenses/Nokia
diff --git a/meta/files/common-licenses/OASIS b/yocto-poky/meta/files/common-licenses/OASIS
index f93df7af2..f93df7af2 100644
--- a/meta/files/common-licenses/OASIS
+++ b/yocto-poky/meta/files/common-licenses/OASIS
diff --git a/meta/files/common-licenses/OCLC-2.0 b/yocto-poky/meta/files/common-licenses/OCLC-2.0
index 139e3f7e0..139e3f7e0 100644
--- a/meta/files/common-licenses/OCLC-2.0
+++ b/yocto-poky/meta/files/common-licenses/OCLC-2.0
diff --git a/meta/files/common-licenses/ODbL-1.0 b/yocto-poky/meta/files/common-licenses/ODbL-1.0
index c9f144eb2..c9f144eb2 100644
--- a/meta/files/common-licenses/ODbL-1.0
+++ b/yocto-poky/meta/files/common-licenses/ODbL-1.0
diff --git a/meta/files/common-licenses/OFL-1.1 b/yocto-poky/meta/files/common-licenses/OFL-1.1
index e644bce64..e644bce64 100644
--- a/meta/files/common-licenses/OFL-1.1
+++ b/yocto-poky/meta/files/common-licenses/OFL-1.1
diff --git a/meta/files/common-licenses/OGTSL b/yocto-poky/meta/files/common-licenses/OGTSL
index 8a0cad7e0..8a0cad7e0 100644
--- a/meta/files/common-licenses/OGTSL
+++ b/yocto-poky/meta/files/common-licenses/OGTSL
diff --git a/meta/files/common-licenses/OLDAP-2.8 b/yocto-poky/meta/files/common-licenses/OLDAP-2.8
index be253da41..be253da41 100644
--- a/meta/files/common-licenses/OLDAP-2.8
+++ b/yocto-poky/meta/files/common-licenses/OLDAP-2.8
diff --git a/meta/files/common-licenses/OSL-1.0 b/yocto-poky/meta/files/common-licenses/OSL-1.0
index 85ad0dadb..85ad0dadb 100644
--- a/meta/files/common-licenses/OSL-1.0
+++ b/yocto-poky/meta/files/common-licenses/OSL-1.0
diff --git a/meta/files/common-licenses/OSL-2.0 b/yocto-poky/meta/files/common-licenses/OSL-2.0
index 9fe5c9eda..9fe5c9eda 100644
--- a/meta/files/common-licenses/OSL-2.0
+++ b/yocto-poky/meta/files/common-licenses/OSL-2.0
diff --git a/meta/files/common-licenses/OSL-3.0 b/yocto-poky/meta/files/common-licenses/OSL-3.0
index 1557749e7..1557749e7 100644
--- a/meta/files/common-licenses/OSL-3.0
+++ b/yocto-poky/meta/files/common-licenses/OSL-3.0
diff --git a/meta/files/common-licenses/OpenSSL b/yocto-poky/meta/files/common-licenses/OpenSSL
index d4270a332..d4270a332 100644
--- a/meta/files/common-licenses/OpenSSL
+++ b/yocto-poky/meta/files/common-licenses/OpenSSL
diff --git a/meta/files/common-licenses/PD b/yocto-poky/meta/files/common-licenses/PD
index 21fb878e6..21fb878e6 100644
--- a/meta/files/common-licenses/PD
+++ b/yocto-poky/meta/files/common-licenses/PD
diff --git a/meta/files/common-licenses/PHP-3.0 b/yocto-poky/meta/files/common-licenses/PHP-3.0
index ef0b20306..ef0b20306 100644
--- a/meta/files/common-licenses/PHP-3.0
+++ b/yocto-poky/meta/files/common-licenses/PHP-3.0
diff --git a/meta/files/common-licenses/PostgreSQL b/yocto-poky/meta/files/common-licenses/PostgreSQL
index ae658dc12..ae658dc12 100644
--- a/meta/files/common-licenses/PostgreSQL
+++ b/yocto-poky/meta/files/common-licenses/PostgreSQL
diff --git a/meta/files/common-licenses/Proprietary b/yocto-poky/meta/files/common-licenses/Proprietary
index 661875810..661875810 100644
--- a/meta/files/common-licenses/Proprietary
+++ b/yocto-poky/meta/files/common-licenses/Proprietary
diff --git a/meta/files/common-licenses/Python-2.0 b/yocto-poky/meta/files/common-licenses/Python-2.0
index 9d3e86215..9d3e86215 100644
--- a/meta/files/common-licenses/Python-2.0
+++ b/yocto-poky/meta/files/common-licenses/Python-2.0
diff --git a/meta/files/common-licenses/QPL-1.0 b/yocto-poky/meta/files/common-licenses/QPL-1.0
index 7d433ab26..7d433ab26 100644
--- a/meta/files/common-licenses/QPL-1.0
+++ b/yocto-poky/meta/files/common-licenses/QPL-1.0
diff --git a/meta/files/common-licenses/RHeCos-1 b/yocto-poky/meta/files/common-licenses/RHeCos-1
index 2ab40b77d..2ab40b77d 100644
--- a/meta/files/common-licenses/RHeCos-1
+++ b/yocto-poky/meta/files/common-licenses/RHeCos-1
diff --git a/meta/files/common-licenses/RHeCos-1.1 b/yocto-poky/meta/files/common-licenses/RHeCos-1.1
index f98900abf..f98900abf 100644
--- a/meta/files/common-licenses/RHeCos-1.1
+++ b/yocto-poky/meta/files/common-licenses/RHeCos-1.1
diff --git a/meta/files/common-licenses/RPL-1.5 b/yocto-poky/meta/files/common-licenses/RPL-1.5
index 21908751e..21908751e 100644
--- a/meta/files/common-licenses/RPL-1.5
+++ b/yocto-poky/meta/files/common-licenses/RPL-1.5
diff --git a/meta/files/common-licenses/RPSL-1.0 b/yocto-poky/meta/files/common-licenses/RPSL-1.0
index 80814f95d..80814f95d 100644
--- a/meta/files/common-licenses/RPSL-1.0
+++ b/yocto-poky/meta/files/common-licenses/RPSL-1.0
diff --git a/meta/files/common-licenses/RSCPL b/yocto-poky/meta/files/common-licenses/RSCPL
index bedbbc1e8..bedbbc1e8 100644
--- a/meta/files/common-licenses/RSCPL
+++ b/yocto-poky/meta/files/common-licenses/RSCPL
diff --git a/meta/files/common-licenses/Ruby b/yocto-poky/meta/files/common-licenses/Ruby
index bc2e57f89..bc2e57f89 100644
--- a/meta/files/common-licenses/Ruby
+++ b/yocto-poky/meta/files/common-licenses/Ruby
diff --git a/meta/files/common-licenses/SAX-PD b/yocto-poky/meta/files/common-licenses/SAX-PD
index a1fd1130f..a1fd1130f 100644
--- a/meta/files/common-licenses/SAX-PD
+++ b/yocto-poky/meta/files/common-licenses/SAX-PD
diff --git a/meta/files/common-licenses/SGI-1 b/yocto-poky/meta/files/common-licenses/SGI-1
index e3998567e..e3998567e 100644
--- a/meta/files/common-licenses/SGI-1
+++ b/yocto-poky/meta/files/common-licenses/SGI-1
diff --git a/meta/files/common-licenses/SMAIL_GPL b/yocto-poky/meta/files/common-licenses/SMAIL_GPL
index dfc3fd16c..dfc3fd16c 100644
--- a/meta/files/common-licenses/SMAIL_GPL
+++ b/yocto-poky/meta/files/common-licenses/SMAIL_GPL
diff --git a/meta/files/common-licenses/SPL-1.0 b/yocto-poky/meta/files/common-licenses/SPL-1.0
index 2848b3621..2848b3621 100644
--- a/meta/files/common-licenses/SPL-1.0
+++ b/yocto-poky/meta/files/common-licenses/SPL-1.0
diff --git a/meta/files/common-licenses/Simple-2.0 b/yocto-poky/meta/files/common-licenses/Simple-2.0
index d28357d5f..d28357d5f 100644
--- a/meta/files/common-licenses/Simple-2.0
+++ b/yocto-poky/meta/files/common-licenses/Simple-2.0
diff --git a/meta/files/common-licenses/Sleepycat b/yocto-poky/meta/files/common-licenses/Sleepycat
index 02e9d84f7..02e9d84f7 100644
--- a/meta/files/common-licenses/Sleepycat
+++ b/yocto-poky/meta/files/common-licenses/Sleepycat
diff --git a/meta/files/common-licenses/SugarCRM-1 b/yocto-poky/meta/files/common-licenses/SugarCRM-1
index acbb4e0bd..acbb4e0bd 100644
--- a/meta/files/common-licenses/SugarCRM-1
+++ b/yocto-poky/meta/files/common-licenses/SugarCRM-1
diff --git a/meta/files/common-licenses/SugarCRM-1.1.3 b/yocto-poky/meta/files/common-licenses/SugarCRM-1.1.3
index 509681a8c..509681a8c 100644
--- a/meta/files/common-licenses/SugarCRM-1.1.3
+++ b/yocto-poky/meta/files/common-licenses/SugarCRM-1.1.3
diff --git a/meta/files/common-licenses/UCB b/yocto-poky/meta/files/common-licenses/UCB
index 79a757af9..79a757af9 100644
--- a/meta/files/common-licenses/UCB
+++ b/yocto-poky/meta/files/common-licenses/UCB
diff --git a/meta/files/common-licenses/VSL-1.0 b/yocto-poky/meta/files/common-licenses/VSL-1.0
index 36bae5c63..36bae5c63 100644
--- a/meta/files/common-licenses/VSL-1.0
+++ b/yocto-poky/meta/files/common-licenses/VSL-1.0
diff --git a/meta/files/common-licenses/W3C b/yocto-poky/meta/files/common-licenses/W3C
index e4b8c4683..e4b8c4683 100644
--- a/meta/files/common-licenses/W3C
+++ b/yocto-poky/meta/files/common-licenses/W3C
diff --git a/meta/files/common-licenses/WXwindows b/yocto-poky/meta/files/common-licenses/WXwindows
index 1fe09482d..1fe09482d 100644
--- a/meta/files/common-licenses/WXwindows
+++ b/yocto-poky/meta/files/common-licenses/WXwindows
diff --git a/meta/files/common-licenses/Watcom-1.0 b/yocto-poky/meta/files/common-licenses/Watcom-1.0
index 6bb619a9d..6bb619a9d 100644
--- a/meta/files/common-licenses/Watcom-1.0
+++ b/yocto-poky/meta/files/common-licenses/Watcom-1.0
diff --git a/meta/files/common-licenses/XFree86-1.0 b/yocto-poky/meta/files/common-licenses/XFree86-1.0
index b1f3bf45b..b1f3bf45b 100644
--- a/meta/files/common-licenses/XFree86-1.0
+++ b/yocto-poky/meta/files/common-licenses/XFree86-1.0
diff --git a/meta/files/common-licenses/XFree86-1.1 b/yocto-poky/meta/files/common-licenses/XFree86-1.1
index c2a5cb202..c2a5cb202 100644
--- a/meta/files/common-licenses/XFree86-1.1
+++ b/yocto-poky/meta/files/common-licenses/XFree86-1.1
diff --git a/meta/files/common-licenses/XSL b/yocto-poky/meta/files/common-licenses/XSL
index 0a82d60c1..0a82d60c1 100644
--- a/meta/files/common-licenses/XSL
+++ b/yocto-poky/meta/files/common-licenses/XSL
diff --git a/meta/files/common-licenses/Xnet b/yocto-poky/meta/files/common-licenses/Xnet
index 0444edf2c..0444edf2c 100644
--- a/meta/files/common-licenses/Xnet
+++ b/yocto-poky/meta/files/common-licenses/Xnet
diff --git a/meta/files/common-licenses/YPL-1.1 b/yocto-poky/meta/files/common-licenses/YPL-1.1
index 4a1880aa1..4a1880aa1 100644
--- a/meta/files/common-licenses/YPL-1.1
+++ b/yocto-poky/meta/files/common-licenses/YPL-1.1
diff --git a/meta/files/common-licenses/ZPL-1.1 b/yocto-poky/meta/files/common-licenses/ZPL-1.1
index a6aabec3a..a6aabec3a 100644
--- a/meta/files/common-licenses/ZPL-1.1
+++ b/yocto-poky/meta/files/common-licenses/ZPL-1.1
diff --git a/meta/files/common-licenses/ZPL-2.0 b/yocto-poky/meta/files/common-licenses/ZPL-2.0
index 3ae208313..3ae208313 100644
--- a/meta/files/common-licenses/ZPL-2.0
+++ b/yocto-poky/meta/files/common-licenses/ZPL-2.0
diff --git a/meta/files/common-licenses/ZPL-2.1 b/yocto-poky/meta/files/common-licenses/ZPL-2.1
index 2d9d43f03..2d9d43f03 100644
--- a/meta/files/common-licenses/ZPL-2.1
+++ b/yocto-poky/meta/files/common-licenses/ZPL-2.1
diff --git a/meta/files/common-licenses/Zimbra-1.3 b/yocto-poky/meta/files/common-licenses/Zimbra-1.3
index 79b7b346d..79b7b346d 100644
--- a/meta/files/common-licenses/Zimbra-1.3
+++ b/yocto-poky/meta/files/common-licenses/Zimbra-1.3
diff --git a/meta/files/common-licenses/Zlib b/yocto-poky/meta/files/common-licenses/Zlib
index f8b388494..f8b388494 100644
--- a/meta/files/common-licenses/Zlib
+++ b/yocto-poky/meta/files/common-licenses/Zlib
diff --git a/meta/files/common-licenses/bzip2 b/yocto-poky/meta/files/common-licenses/bzip2
index 8ec599dc3..8ec599dc3 100644
--- a/meta/files/common-licenses/bzip2
+++ b/yocto-poky/meta/files/common-licenses/bzip2
diff --git a/meta/files/common-licenses/eCos-2.0 b/yocto-poky/meta/files/common-licenses/eCos-2.0
index 39b5d6351..39b5d6351 100644
--- a/meta/files/common-licenses/eCos-2.0
+++ b/yocto-poky/meta/files/common-licenses/eCos-2.0
diff --git a/meta/files/common-licenses/gSOAP-1 b/yocto-poky/meta/files/common-licenses/gSOAP-1
index 3f8638add..3f8638add 100644
--- a/meta/files/common-licenses/gSOAP-1
+++ b/yocto-poky/meta/files/common-licenses/gSOAP-1
diff --git a/meta/files/common-licenses/gSOAP-1.3b b/yocto-poky/meta/files/common-licenses/gSOAP-1.3b
index 68c942bb5..68c942bb5 100644
--- a/meta/files/common-licenses/gSOAP-1.3b
+++ b/yocto-poky/meta/files/common-licenses/gSOAP-1.3b
diff --git a/meta/files/common-licenses/tcl b/yocto-poky/meta/files/common-licenses/tcl
index d8049cd9e..d8049cd9e 100644
--- a/meta/files/common-licenses/tcl
+++ b/yocto-poky/meta/files/common-licenses/tcl
diff --git a/meta/files/common-licenses/unfs3 b/yocto-poky/meta/files/common-licenses/unfs3
index 7f2b53f16..7f2b53f16 100644
--- a/meta/files/common-licenses/unfs3
+++ b/yocto-poky/meta/files/common-licenses/unfs3
diff --git a/meta/files/deploydir_readme.txt b/yocto-poky/meta/files/deploydir_readme.txt
index 97ec1855f..97ec1855f 100644
--- a/meta/files/deploydir_readme.txt
+++ b/yocto-poky/meta/files/deploydir_readme.txt
diff --git a/meta/files/device_table-minimal.txt b/yocto-poky/meta/files/device_table-minimal.txt
index e4891ccb4..e4891ccb4 100644
--- a/meta/files/device_table-minimal.txt
+++ b/yocto-poky/meta/files/device_table-minimal.txt
diff --git a/meta/files/ext-sdk-prepare.sh b/yocto-poky/meta/files/ext-sdk-prepare.sh
index 160c71e97..160c71e97 100644
--- a/meta/files/ext-sdk-prepare.sh
+++ b/yocto-poky/meta/files/ext-sdk-prepare.sh
diff --git a/meta/files/fs-perms.txt b/yocto-poky/meta/files/fs-perms.txt
index 109cbe553..109cbe553 100644
--- a/meta/files/fs-perms.txt
+++ b/yocto-poky/meta/files/fs-perms.txt
diff --git a/meta/files/toolchain-shar-extract.sh b/yocto-poky/meta/files/toolchain-shar-extract.sh
index 35d3c7550..35d3c7550 100644
--- a/meta/files/toolchain-shar-extract.sh
+++ b/yocto-poky/meta/files/toolchain-shar-extract.sh
diff --git a/meta/files/toolchain-shar-relocate.sh b/yocto-poky/meta/files/toolchain-shar-relocate.sh
index 4ef292717..4ef292717 100644
--- a/meta/files/toolchain-shar-relocate.sh
+++ b/yocto-poky/meta/files/toolchain-shar-relocate.sh
diff --git a/meta/lib/oe/__init__.py b/yocto-poky/meta/lib/oe/__init__.py
index 3ad9513f4..3ad9513f4 100644
--- a/meta/lib/oe/__init__.py
+++ b/yocto-poky/meta/lib/oe/__init__.py
diff --git a/meta/lib/oe/buildhistory_analysis.py b/yocto-poky/meta/lib/oe/buildhistory_analysis.py
index 5395c768a..5395c768a 100644
--- a/meta/lib/oe/buildhistory_analysis.py
+++ b/yocto-poky/meta/lib/oe/buildhistory_analysis.py
diff --git a/meta/lib/oe/cachedpath.py b/yocto-poky/meta/lib/oe/cachedpath.py
index 0840cc4c3..0840cc4c3 100644
--- a/meta/lib/oe/cachedpath.py
+++ b/yocto-poky/meta/lib/oe/cachedpath.py
diff --git a/meta/lib/oe/classextend.py b/yocto-poky/meta/lib/oe/classextend.py
index 5107ecde2..5107ecde2 100644
--- a/meta/lib/oe/classextend.py
+++ b/yocto-poky/meta/lib/oe/classextend.py
diff --git a/meta/lib/oe/classutils.py b/yocto-poky/meta/lib/oe/classutils.py
index 58188fdd6..58188fdd6 100644
--- a/meta/lib/oe/classutils.py
+++ b/yocto-poky/meta/lib/oe/classutils.py
diff --git a/meta/lib/oe/copy_buildsystem.py b/yocto-poky/meta/lib/oe/copy_buildsystem.py
index c0e7541c0..c0e7541c0 100644
--- a/meta/lib/oe/copy_buildsystem.py
+++ b/yocto-poky/meta/lib/oe/copy_buildsystem.py
diff --git a/meta/lib/oe/data.py b/yocto-poky/meta/lib/oe/data.py
index 4cc0e0296..4cc0e0296 100644
--- a/meta/lib/oe/data.py
+++ b/yocto-poky/meta/lib/oe/data.py
diff --git a/meta/lib/oe/distro_check.py b/yocto-poky/meta/lib/oe/distro_check.py
index f92cd2e42..f92cd2e42 100644
--- a/meta/lib/oe/distro_check.py
+++ b/yocto-poky/meta/lib/oe/distro_check.py
diff --git a/meta/lib/oe/image.py b/yocto-poky/meta/lib/oe/image.py
index b9eb3de5a..b9eb3de5a 100644
--- a/meta/lib/oe/image.py
+++ b/yocto-poky/meta/lib/oe/image.py
diff --git a/meta/lib/oe/license.py b/yocto-poky/meta/lib/oe/license.py
index f0f661c3b..f0f661c3b 100644
--- a/meta/lib/oe/license.py
+++ b/yocto-poky/meta/lib/oe/license.py
diff --git a/meta/lib/oe/lsb.py b/yocto-poky/meta/lib/oe/lsb.py
index ddfe71b6b..ddfe71b6b 100644
--- a/meta/lib/oe/lsb.py
+++ b/yocto-poky/meta/lib/oe/lsb.py
diff --git a/meta/lib/oe/maketype.py b/yocto-poky/meta/lib/oe/maketype.py
index 139f33369..139f33369 100644
--- a/meta/lib/oe/maketype.py
+++ b/yocto-poky/meta/lib/oe/maketype.py
diff --git a/meta/lib/oe/manifest.py b/yocto-poky/meta/lib/oe/manifest.py
index 42832f15d..42832f15d 100644
--- a/meta/lib/oe/manifest.py
+++ b/yocto-poky/meta/lib/oe/manifest.py
diff --git a/meta/lib/oe/package.py b/yocto-poky/meta/lib/oe/package.py
index f176446b8..f176446b8 100644
--- a/meta/lib/oe/package.py
+++ b/yocto-poky/meta/lib/oe/package.py
diff --git a/meta/lib/oe/package_manager.py b/yocto-poky/meta/lib/oe/package_manager.py
index b9fa6d879..b9fa6d879 100644
--- a/meta/lib/oe/package_manager.py
+++ b/yocto-poky/meta/lib/oe/package_manager.py
diff --git a/meta/lib/oe/packagedata.py b/yocto-poky/meta/lib/oe/packagedata.py
index cd5f0445f..cd5f0445f 100644
--- a/meta/lib/oe/packagedata.py
+++ b/yocto-poky/meta/lib/oe/packagedata.py
diff --git a/meta/lib/oe/packagegroup.py b/yocto-poky/meta/lib/oe/packagegroup.py
index 12eb4212f..12eb4212f 100644
--- a/meta/lib/oe/packagegroup.py
+++ b/yocto-poky/meta/lib/oe/packagegroup.py
diff --git a/meta/lib/oe/patch.py b/yocto-poky/meta/lib/oe/patch.py
index 2bf501e9e..2bf501e9e 100644
--- a/meta/lib/oe/patch.py
+++ b/yocto-poky/meta/lib/oe/patch.py
diff --git a/meta/lib/oe/path.py b/yocto-poky/meta/lib/oe/path.py
index 413ebfb39..413ebfb39 100644
--- a/meta/lib/oe/path.py
+++ b/yocto-poky/meta/lib/oe/path.py
diff --git a/meta/lib/oe/prservice.py b/yocto-poky/meta/lib/oe/prservice.py
index b0cbcb1fb..b0cbcb1fb 100644
--- a/meta/lib/oe/prservice.py
+++ b/yocto-poky/meta/lib/oe/prservice.py
diff --git a/meta/lib/oe/qa.py b/yocto-poky/meta/lib/oe/qa.py
index d5cdaa0fc..d5cdaa0fc 100644
--- a/meta/lib/oe/qa.py
+++ b/yocto-poky/meta/lib/oe/qa.py
diff --git a/meta/lib/oe/recipeutils.py b/yocto-poky/meta/lib/oe/recipeutils.py
index 119a68821..119a68821 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/yocto-poky/meta/lib/oe/recipeutils.py
diff --git a/meta/lib/oe/rootfs.py b/yocto-poky/meta/lib/oe/rootfs.py
index 18df22d9a..18df22d9a 100644
--- a/meta/lib/oe/rootfs.py
+++ b/yocto-poky/meta/lib/oe/rootfs.py
diff --git a/meta/lib/oe/sdk.py b/yocto-poky/meta/lib/oe/sdk.py
index 3103f4889..3103f4889 100644
--- a/meta/lib/oe/sdk.py
+++ b/yocto-poky/meta/lib/oe/sdk.py
diff --git a/meta/lib/oe/sstatesig.py b/yocto-poky/meta/lib/oe/sstatesig.py
index 6d1be3e37..6d1be3e37 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/yocto-poky/meta/lib/oe/sstatesig.py
diff --git a/meta/lib/oe/terminal.py b/yocto-poky/meta/lib/oe/terminal.py
index 52a891388..52a891388 100644
--- a/meta/lib/oe/terminal.py
+++ b/yocto-poky/meta/lib/oe/terminal.py
diff --git a/meta/lib/oe/tests/__init__.py b/yocto-poky/meta/lib/oe/tests/__init__.py
index e69de29bb..e69de29bb 100644
--- a/meta/lib/oe/tests/__init__.py
+++ b/yocto-poky/meta/lib/oe/tests/__init__.py
diff --git a/meta/lib/oe/tests/test_license.py b/yocto-poky/meta/lib/oe/tests/test_license.py
index c38888618..c38888618 100644
--- a/meta/lib/oe/tests/test_license.py
+++ b/yocto-poky/meta/lib/oe/tests/test_license.py
diff --git a/meta/lib/oe/tests/test_path.py b/yocto-poky/meta/lib/oe/tests/test_path.py
index 3d41ce157..3d41ce157 100644
--- a/meta/lib/oe/tests/test_path.py
+++ b/yocto-poky/meta/lib/oe/tests/test_path.py
diff --git a/meta/lib/oe/tests/test_types.py b/yocto-poky/meta/lib/oe/tests/test_types.py
index 367cc30e4..367cc30e4 100644
--- a/meta/lib/oe/tests/test_types.py
+++ b/yocto-poky/meta/lib/oe/tests/test_types.py
diff --git a/meta/lib/oe/tests/test_utils.py b/yocto-poky/meta/lib/oe/tests/test_utils.py
index 5d9ac52e7..5d9ac52e7 100644
--- a/meta/lib/oe/tests/test_utils.py
+++ b/yocto-poky/meta/lib/oe/tests/test_utils.py
diff --git a/meta/lib/oe/types.py b/yocto-poky/meta/lib/oe/types.py
index 7f47c17d0..7f47c17d0 100644
--- a/meta/lib/oe/types.py
+++ b/yocto-poky/meta/lib/oe/types.py
diff --git a/meta/lib/oe/utils.py b/yocto-poky/meta/lib/oe/utils.py
index cee087fdf..cee087fdf 100644
--- a/meta/lib/oe/utils.py
+++ b/yocto-poky/meta/lib/oe/utils.py
diff --git a/meta/lib/oeqa/__init__.py b/yocto-poky/meta/lib/oeqa/__init__.py
index e69de29bb..e69de29bb 100644
--- a/meta/lib/oeqa/__init__.py
+++ b/yocto-poky/meta/lib/oeqa/__init__.py
diff --git a/meta/lib/oeqa/controllers/__init__.py b/yocto-poky/meta/lib/oeqa/controllers/__init__.py
index 8eda92763..8eda92763 100644
--- a/meta/lib/oeqa/controllers/__init__.py
+++ b/yocto-poky/meta/lib/oeqa/controllers/__init__.py
diff --git a/meta/lib/oeqa/controllers/masterimage.py b/yocto-poky/meta/lib/oeqa/controllers/masterimage.py
index 522f9ebd7..522f9ebd7 100644
--- a/meta/lib/oeqa/controllers/masterimage.py
+++ b/yocto-poky/meta/lib/oeqa/controllers/masterimage.py
diff --git a/meta/lib/oeqa/controllers/testtargetloader.py b/yocto-poky/meta/lib/oeqa/controllers/testtargetloader.py
index a1b7b1d92..a1b7b1d92 100644
--- a/meta/lib/oeqa/controllers/testtargetloader.py
+++ b/yocto-poky/meta/lib/oeqa/controllers/testtargetloader.py
diff --git a/meta/lib/oeqa/oetest.py b/yocto-poky/meta/lib/oeqa/oetest.py
index 6f9edec58..6f9edec58 100644
--- a/meta/lib/oeqa/oetest.py
+++ b/yocto-poky/meta/lib/oeqa/oetest.py
diff --git a/meta/lib/oeqa/runexported.py b/yocto-poky/meta/lib/oeqa/runexported.py
index dba0d7aec..dba0d7aec 100755
--- a/meta/lib/oeqa/runexported.py
+++ b/yocto-poky/meta/lib/oeqa/runexported.py
diff --git a/meta/lib/oeqa/runtime/__init__.py b/yocto-poky/meta/lib/oeqa/runtime/__init__.py
index 4cf3fa76b..4cf3fa76b 100644
--- a/meta/lib/oeqa/runtime/__init__.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/__init__.py
diff --git a/meta/lib/oeqa/runtime/_ptest.py b/yocto-poky/meta/lib/oeqa/runtime/_ptest.py
index 0621028b8..0621028b8 100644
--- a/meta/lib/oeqa/runtime/_ptest.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/_ptest.py
diff --git a/meta/lib/oeqa/runtime/_qemutiny.py b/yocto-poky/meta/lib/oeqa/runtime/_qemutiny.py
index a3c29f357..a3c29f357 100644
--- a/meta/lib/oeqa/runtime/_qemutiny.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/_qemutiny.py
diff --git a/meta/lib/oeqa/runtime/buildcvs.py b/yocto-poky/meta/lib/oeqa/runtime/buildcvs.py
index fe6cbfbcd..fe6cbfbcd 100644
--- a/meta/lib/oeqa/runtime/buildcvs.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/buildcvs.py
diff --git a/meta/lib/oeqa/runtime/buildiptables.py b/yocto-poky/meta/lib/oeqa/runtime/buildiptables.py
index 09e252df8..09e252df8 100644
--- a/meta/lib/oeqa/runtime/buildiptables.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/buildiptables.py
diff --git a/meta/lib/oeqa/runtime/buildsudoku.py b/yocto-poky/meta/lib/oeqa/runtime/buildsudoku.py
index 802b06001..802b06001 100644
--- a/meta/lib/oeqa/runtime/buildsudoku.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/buildsudoku.py
diff --git a/meta/lib/oeqa/runtime/connman.py b/yocto-poky/meta/lib/oeqa/runtime/connman.py
index bd9dba3bd..bd9dba3bd 100644
--- a/meta/lib/oeqa/runtime/connman.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/connman.py
diff --git a/meta/lib/oeqa/runtime/date.py b/yocto-poky/meta/lib/oeqa/runtime/date.py
index 447987e07..447987e07 100644
--- a/meta/lib/oeqa/runtime/date.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/date.py
diff --git a/meta/lib/oeqa/runtime/df.py b/yocto-poky/meta/lib/oeqa/runtime/df.py
index 09569d5ff..09569d5ff 100644
--- a/meta/lib/oeqa/runtime/df.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/df.py
diff --git a/meta/lib/oeqa/runtime/dmesg.py b/yocto-poky/meta/lib/oeqa/runtime/dmesg.py
index 5831471e5..5831471e5 100644
--- a/meta/lib/oeqa/runtime/dmesg.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/dmesg.py
diff --git a/meta/lib/oeqa/runtime/files/hellomod.c b/yocto-poky/meta/lib/oeqa/runtime/files/hellomod.c
index a383397e9..a383397e9 100644
--- a/meta/lib/oeqa/runtime/files/hellomod.c
+++ b/yocto-poky/meta/lib/oeqa/runtime/files/hellomod.c
diff --git a/meta/lib/oeqa/runtime/files/hellomod_makefile b/yocto-poky/meta/lib/oeqa/runtime/files/hellomod_makefile
index b92d5c8fe..b92d5c8fe 100644
--- a/meta/lib/oeqa/runtime/files/hellomod_makefile
+++ b/yocto-poky/meta/lib/oeqa/runtime/files/hellomod_makefile
diff --git a/meta/lib/oeqa/runtime/files/test.c b/yocto-poky/meta/lib/oeqa/runtime/files/test.c
index 2d8389c92..2d8389c92 100644
--- a/meta/lib/oeqa/runtime/files/test.c
+++ b/yocto-poky/meta/lib/oeqa/runtime/files/test.c
diff --git a/meta/lib/oeqa/runtime/files/test.cpp b/yocto-poky/meta/lib/oeqa/runtime/files/test.cpp
index 9e1a76473..9e1a76473 100644
--- a/meta/lib/oeqa/runtime/files/test.cpp
+++ b/yocto-poky/meta/lib/oeqa/runtime/files/test.cpp
diff --git a/meta/lib/oeqa/runtime/files/test.pl b/yocto-poky/meta/lib/oeqa/runtime/files/test.pl
index 689c8f163..689c8f163 100644
--- a/meta/lib/oeqa/runtime/files/test.pl
+++ b/yocto-poky/meta/lib/oeqa/runtime/files/test.pl
diff --git a/meta/lib/oeqa/runtime/files/test.py b/yocto-poky/meta/lib/oeqa/runtime/files/test.py
index f3a2273c5..f3a2273c5 100644
--- a/meta/lib/oeqa/runtime/files/test.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/files/test.py
diff --git a/meta/lib/oeqa/runtime/files/testmakefile b/yocto-poky/meta/lib/oeqa/runtime/files/testmakefile
index ca1844e93..ca1844e93 100644
--- a/meta/lib/oeqa/runtime/files/testmakefile
+++ b/yocto-poky/meta/lib/oeqa/runtime/files/testmakefile
diff --git a/meta/lib/oeqa/runtime/files/testsdkmakefile b/yocto-poky/meta/lib/oeqa/runtime/files/testsdkmakefile
index fb05f822f..fb05f822f 100644
--- a/meta/lib/oeqa/runtime/files/testsdkmakefile
+++ b/yocto-poky/meta/lib/oeqa/runtime/files/testsdkmakefile
diff --git a/meta/lib/oeqa/runtime/gcc.py b/yocto-poky/meta/lib/oeqa/runtime/gcc.py
index d90cd1799..d90cd1799 100644
--- a/meta/lib/oeqa/runtime/gcc.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/gcc.py
diff --git a/meta/lib/oeqa/runtime/kernelmodule.py b/yocto-poky/meta/lib/oeqa/runtime/kernelmodule.py
index 38ca18454..38ca18454 100644
--- a/meta/lib/oeqa/runtime/kernelmodule.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/kernelmodule.py
diff --git a/meta/lib/oeqa/runtime/ldd.py b/yocto-poky/meta/lib/oeqa/runtime/ldd.py
index 47b3885df..47b3885df 100644
--- a/meta/lib/oeqa/runtime/ldd.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/ldd.py
diff --git a/meta/lib/oeqa/runtime/logrotate.py b/yocto-poky/meta/lib/oeqa/runtime/logrotate.py
index 86d791c30..86d791c30 100644
--- a/meta/lib/oeqa/runtime/logrotate.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/logrotate.py
diff --git a/meta/lib/oeqa/runtime/multilib.py b/yocto-poky/meta/lib/oeqa/runtime/multilib.py
index e1bcc428f..e1bcc428f 100644
--- a/meta/lib/oeqa/runtime/multilib.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/multilib.py
diff --git a/meta/lib/oeqa/runtime/pam.py b/yocto-poky/meta/lib/oeqa/runtime/pam.py
index c8205c9ab..c8205c9ab 100644
--- a/meta/lib/oeqa/runtime/pam.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/pam.py
diff --git a/meta/lib/oeqa/runtime/parselogs.py b/yocto-poky/meta/lib/oeqa/runtime/parselogs.py
index fc2bc3893..fc2bc3893 100644
--- a/meta/lib/oeqa/runtime/parselogs.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/parselogs.py
diff --git a/meta/lib/oeqa/runtime/perl.py b/yocto-poky/meta/lib/oeqa/runtime/perl.py
index e044d0a5f..e044d0a5f 100644
--- a/meta/lib/oeqa/runtime/perl.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/perl.py
diff --git a/meta/lib/oeqa/runtime/ping.py b/yocto-poky/meta/lib/oeqa/runtime/ping.py
index 80c460161..80c460161 100644
--- a/meta/lib/oeqa/runtime/ping.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/ping.py
diff --git a/meta/lib/oeqa/runtime/python.py b/yocto-poky/meta/lib/oeqa/runtime/python.py
index 26edb7a9b..26edb7a9b 100644
--- a/meta/lib/oeqa/runtime/python.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/python.py
diff --git a/meta/lib/oeqa/runtime/rpm.py b/yocto-poky/meta/lib/oeqa/runtime/rpm.py
index 32aae2423..32aae2423 100644
--- a/meta/lib/oeqa/runtime/rpm.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/rpm.py
diff --git a/meta/lib/oeqa/runtime/scanelf.py b/yocto-poky/meta/lib/oeqa/runtime/scanelf.py
index 67e02ff45..67e02ff45 100644
--- a/meta/lib/oeqa/runtime/scanelf.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/scanelf.py
diff --git a/meta/lib/oeqa/runtime/scp.py b/yocto-poky/meta/lib/oeqa/runtime/scp.py
index 48e87d2d0..48e87d2d0 100644
--- a/meta/lib/oeqa/runtime/scp.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/scp.py
diff --git a/meta/lib/oeqa/runtime/skeletoninit.py b/yocto-poky/meta/lib/oeqa/runtime/skeletoninit.py
index cb0cb9b4c..cb0cb9b4c 100644
--- a/meta/lib/oeqa/runtime/skeletoninit.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/skeletoninit.py
diff --git a/meta/lib/oeqa/runtime/smart.py b/yocto-poky/meta/lib/oeqa/runtime/smart.py
index e41668d26..e41668d26 100644
--- a/meta/lib/oeqa/runtime/smart.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/smart.py
diff --git a/meta/lib/oeqa/runtime/ssh.py b/yocto-poky/meta/lib/oeqa/runtime/ssh.py
index 0e76d5d51..0e76d5d51 100644
--- a/meta/lib/oeqa/runtime/ssh.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/ssh.py
diff --git a/meta/lib/oeqa/runtime/syslog.py b/yocto-poky/meta/lib/oeqa/runtime/syslog.py
index 2601dd9ea..2601dd9ea 100644
--- a/meta/lib/oeqa/runtime/syslog.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/syslog.py
diff --git a/meta/lib/oeqa/runtime/systemd.py b/yocto-poky/meta/lib/oeqa/runtime/systemd.py
index c74394ca5..c74394ca5 100644
--- a/meta/lib/oeqa/runtime/systemd.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/systemd.py
diff --git a/meta/lib/oeqa/runtime/vnc.py b/yocto-poky/meta/lib/oeqa/runtime/vnc.py
index f31deff30..f31deff30 100644
--- a/meta/lib/oeqa/runtime/vnc.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/vnc.py
diff --git a/meta/lib/oeqa/runtime/x32lib.py b/yocto-poky/meta/lib/oeqa/runtime/x32lib.py
index ce5e21403..ce5e21403 100644
--- a/meta/lib/oeqa/runtime/x32lib.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/x32lib.py
diff --git a/meta/lib/oeqa/runtime/xorg.py b/yocto-poky/meta/lib/oeqa/runtime/xorg.py
index 12bcd371a..12bcd371a 100644
--- a/meta/lib/oeqa/runtime/xorg.py
+++ b/yocto-poky/meta/lib/oeqa/runtime/xorg.py
diff --git a/meta/lib/oeqa/sdk/__init__.py b/yocto-poky/meta/lib/oeqa/sdk/__init__.py
index 4cf3fa76b..4cf3fa76b 100644
--- a/meta/lib/oeqa/sdk/__init__.py
+++ b/yocto-poky/meta/lib/oeqa/sdk/__init__.py
diff --git a/meta/lib/oeqa/sdk/buildcvs.py b/yocto-poky/meta/lib/oeqa/sdk/buildcvs.py
index c7146fa4a..c7146fa4a 100644
--- a/meta/lib/oeqa/sdk/buildcvs.py
+++ b/yocto-poky/meta/lib/oeqa/sdk/buildcvs.py
diff --git a/meta/lib/oeqa/sdk/buildiptables.py b/yocto-poky/meta/lib/oeqa/sdk/buildiptables.py
index 062e5316e..062e5316e 100644
--- a/meta/lib/oeqa/sdk/buildiptables.py
+++ b/yocto-poky/meta/lib/oeqa/sdk/buildiptables.py
diff --git a/meta/lib/oeqa/sdk/buildsudoku.py b/yocto-poky/meta/lib/oeqa/sdk/buildsudoku.py
index dea77c659..dea77c659 100644
--- a/meta/lib/oeqa/sdk/buildsudoku.py
+++ b/yocto-poky/meta/lib/oeqa/sdk/buildsudoku.py
diff --git a/meta/lib/oeqa/sdk/gcc.py b/yocto-poky/meta/lib/oeqa/sdk/gcc.py
index 8395b9b90..8395b9b90 100644
--- a/meta/lib/oeqa/sdk/gcc.py
+++ b/yocto-poky/meta/lib/oeqa/sdk/gcc.py
diff --git a/meta/lib/oeqa/sdk/perl.py b/yocto-poky/meta/lib/oeqa/sdk/perl.py
index 45f422ef0..45f422ef0 100644
--- a/meta/lib/oeqa/sdk/perl.py
+++ b/yocto-poky/meta/lib/oeqa/sdk/perl.py
diff --git a/meta/lib/oeqa/sdk/python.py b/yocto-poky/meta/lib/oeqa/sdk/python.py
index 896fab4df..896fab4df 100644
--- a/meta/lib/oeqa/sdk/python.py
+++ b/yocto-poky/meta/lib/oeqa/sdk/python.py
diff --git a/meta/lib/oeqa/selftest/__init__.py b/yocto-poky/meta/lib/oeqa/selftest/__init__.py
index 3ad9513f4..3ad9513f4 100644
--- a/meta/lib/oeqa/selftest/__init__.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/__init__.py
diff --git a/meta/lib/oeqa/selftest/_sstatetests_noauto.py b/yocto-poky/meta/lib/oeqa/selftest/_sstatetests_noauto.py
index fc9ae7efb..fc9ae7efb 100644
--- a/meta/lib/oeqa/selftest/_sstatetests_noauto.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/_sstatetests_noauto.py
diff --git a/meta/lib/oeqa/selftest/_toaster.py b/yocto-poky/meta/lib/oeqa/selftest/_toaster.py
index c424659fd..c424659fd 100644
--- a/meta/lib/oeqa/selftest/_toaster.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/_toaster.py
diff --git a/meta/lib/oeqa/selftest/archiver.py b/yocto-poky/meta/lib/oeqa/selftest/archiver.py
index f2030c446..f2030c446 100644
--- a/meta/lib/oeqa/selftest/archiver.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/archiver.py
diff --git a/meta/lib/oeqa/selftest/base.py b/yocto-poky/meta/lib/oeqa/selftest/base.py
index 9bddc23f8..9bddc23f8 100644
--- a/meta/lib/oeqa/selftest/base.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/base.py
diff --git a/meta/lib/oeqa/selftest/bblayers.py b/yocto-poky/meta/lib/oeqa/selftest/bblayers.py
index 20c17e46f..20c17e46f 100644
--- a/meta/lib/oeqa/selftest/bblayers.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/bblayers.py
diff --git a/meta/lib/oeqa/selftest/bbtests.py b/yocto-poky/meta/lib/oeqa/selftest/bbtests.py
index 94ca79c03..94ca79c03 100644
--- a/meta/lib/oeqa/selftest/bbtests.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/bbtests.py
diff --git a/meta/lib/oeqa/selftest/buildhistory.py b/yocto-poky/meta/lib/oeqa/selftest/buildhistory.py
index d8cae4664..d8cae4664 100644
--- a/meta/lib/oeqa/selftest/buildhistory.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/buildhistory.py
diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/yocto-poky/meta/lib/oeqa/selftest/buildoptions.py
index acf481f7b..acf481f7b 100644
--- a/meta/lib/oeqa/selftest/buildoptions.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/buildoptions.py
diff --git a/meta/lib/oeqa/selftest/devtool.py b/yocto-poky/meta/lib/oeqa/selftest/devtool.py
index dcdef5a14..dcdef5a14 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/devtool.py
diff --git a/meta/lib/oeqa/selftest/imagefeatures.py b/yocto-poky/meta/lib/oeqa/selftest/imagefeatures.py
index 4efb0d92a..4efb0d92a 100644
--- a/meta/lib/oeqa/selftest/imagefeatures.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/imagefeatures.py
diff --git a/meta/lib/oeqa/selftest/layerappend.py b/yocto-poky/meta/lib/oeqa/selftest/layerappend.py
index 4de5034a9..4de5034a9 100644
--- a/meta/lib/oeqa/selftest/layerappend.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/layerappend.py
diff --git a/meta/lib/oeqa/selftest/lic-checksum.py b/yocto-poky/meta/lib/oeqa/selftest/lic-checksum.py
index bd3b9a1ba..bd3b9a1ba 100644
--- a/meta/lib/oeqa/selftest/lic-checksum.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/lic-checksum.py
diff --git a/meta/lib/oeqa/selftest/manifest.py b/yocto-poky/meta/lib/oeqa/selftest/manifest.py
index 44d0404c5..44d0404c5 100644
--- a/meta/lib/oeqa/selftest/manifest.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/manifest.py
diff --git a/meta/lib/oeqa/selftest/oescripts.py b/yocto-poky/meta/lib/oeqa/selftest/oescripts.py
index 31cd50809..31cd50809 100644
--- a/meta/lib/oeqa/selftest/oescripts.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/oescripts.py
diff --git a/meta/lib/oeqa/selftest/pkgdata.py b/yocto-poky/meta/lib/oeqa/selftest/pkgdata.py
index 138b03aad..138b03aad 100644
--- a/meta/lib/oeqa/selftest/pkgdata.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/pkgdata.py
diff --git a/meta/lib/oeqa/selftest/prservice.py b/yocto-poky/meta/lib/oeqa/selftest/prservice.py
index 4187fbfee..4187fbfee 100644
--- a/meta/lib/oeqa/selftest/prservice.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/prservice.py
diff --git a/meta/lib/oeqa/selftest/recipetool.py b/yocto-poky/meta/lib/oeqa/selftest/recipetool.py
index b1f1d2ab9..b1f1d2ab9 100644
--- a/meta/lib/oeqa/selftest/recipetool.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/recipetool.py
diff --git a/meta/lib/oeqa/selftest/sstate.py b/yocto-poky/meta/lib/oeqa/selftest/sstate.py
index 598972443..598972443 100644
--- a/meta/lib/oeqa/selftest/sstate.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/sstate.py
diff --git a/meta/lib/oeqa/selftest/sstatetests.py b/yocto-poky/meta/lib/oeqa/selftest/sstatetests.py
index 3c230620e..3c230620e 100644
--- a/meta/lib/oeqa/selftest/sstatetests.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/sstatetests.py
diff --git a/meta/lib/oeqa/selftest/wic.py b/yocto-poky/meta/lib/oeqa/selftest/wic.py
index ea78e2259..ea78e2259 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/yocto-poky/meta/lib/oeqa/selftest/wic.py
diff --git a/meta/lib/oeqa/targetcontrol.py b/yocto-poky/meta/lib/oeqa/targetcontrol.py
index edc0d01c1..edc0d01c1 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/yocto-poky/meta/lib/oeqa/targetcontrol.py
diff --git a/meta/lib/oeqa/utils/__init__.py b/yocto-poky/meta/lib/oeqa/utils/__init__.py
index 226004602..226004602 100644
--- a/meta/lib/oeqa/utils/__init__.py
+++ b/yocto-poky/meta/lib/oeqa/utils/__init__.py
diff --git a/meta/lib/oeqa/utils/commands.py b/yocto-poky/meta/lib/oeqa/utils/commands.py
index 08e2cbb90..08e2cbb90 100644
--- a/meta/lib/oeqa/utils/commands.py
+++ b/yocto-poky/meta/lib/oeqa/utils/commands.py
diff --git a/meta/lib/oeqa/utils/decorators.py b/yocto-poky/meta/lib/oeqa/utils/decorators.py
index 0d79223a2..0d79223a2 100644
--- a/meta/lib/oeqa/utils/decorators.py
+++ b/yocto-poky/meta/lib/oeqa/utils/decorators.py
diff --git a/meta/lib/oeqa/utils/dump.py b/yocto-poky/meta/lib/oeqa/utils/dump.py
index 63a591d36..63a591d36 100644
--- a/meta/lib/oeqa/utils/dump.py
+++ b/yocto-poky/meta/lib/oeqa/utils/dump.py
diff --git a/meta/lib/oeqa/utils/ftools.py b/yocto-poky/meta/lib/oeqa/utils/ftools.py
index 1bd9a30a4..1bd9a30a4 100644
--- a/meta/lib/oeqa/utils/ftools.py
+++ b/yocto-poky/meta/lib/oeqa/utils/ftools.py
diff --git a/meta/lib/oeqa/utils/httpserver.py b/yocto-poky/meta/lib/oeqa/utils/httpserver.py
index 76518d8ef..76518d8ef 100644
--- a/meta/lib/oeqa/utils/httpserver.py
+++ b/yocto-poky/meta/lib/oeqa/utils/httpserver.py
diff --git a/meta/lib/oeqa/utils/logparser.py b/yocto-poky/meta/lib/oeqa/utils/logparser.py
index 87b50354c..87b50354c 100644
--- a/meta/lib/oeqa/utils/logparser.py
+++ b/yocto-poky/meta/lib/oeqa/utils/logparser.py
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/yocto-poky/meta/lib/oeqa/utils/qemurunner.py
index bdc6e0a8f..bdc6e0a8f 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/yocto-poky/meta/lib/oeqa/utils/qemurunner.py
diff --git a/meta/lib/oeqa/utils/qemutinyrunner.py b/yocto-poky/meta/lib/oeqa/utils/qemutinyrunner.py
index 4f95101f3..4f95101f3 100644
--- a/meta/lib/oeqa/utils/qemutinyrunner.py
+++ b/yocto-poky/meta/lib/oeqa/utils/qemutinyrunner.py
diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/yocto-poky/meta/lib/oeqa/utils/sshcontrol.py
index 00f505105..00f505105 100644
--- a/meta/lib/oeqa/utils/sshcontrol.py
+++ b/yocto-poky/meta/lib/oeqa/utils/sshcontrol.py
diff --git a/meta/lib/oeqa/utils/targetbuild.py b/yocto-poky/meta/lib/oeqa/utils/targetbuild.py
index f850d78df..f850d78df 100644
--- a/meta/lib/oeqa/utils/targetbuild.py
+++ b/yocto-poky/meta/lib/oeqa/utils/targetbuild.py
diff --git a/meta/recipes-bsp/acpid/acpid.inc b/yocto-poky/meta/recipes-bsp/acpid/acpid.inc
index e0156192a..e0156192a 100644
--- a/meta/recipes-bsp/acpid/acpid.inc
+++ b/yocto-poky/meta/recipes-bsp/acpid/acpid.inc
diff --git a/meta/recipes-bsp/acpid/acpid/acpid.service b/yocto-poky/meta/recipes-bsp/acpid/acpid/acpid.service
index f70e74096..f70e74096 100644
--- a/meta/recipes-bsp/acpid/acpid/acpid.service
+++ b/yocto-poky/meta/recipes-bsp/acpid/acpid/acpid.service
diff --git a/meta/recipes-bsp/acpid/acpid/init b/yocto-poky/meta/recipes-bsp/acpid/acpid/init
index 40ff385c1..40ff385c1 100755
--- a/meta/recipes-bsp/acpid/acpid/init
+++ b/yocto-poky/meta/recipes-bsp/acpid/acpid/init
diff --git a/meta/recipes-bsp/acpid/acpid_2.0.23.bb b/yocto-poky/meta/recipes-bsp/acpid/acpid_2.0.23.bb
index a5317a4da..a5317a4da 100644
--- a/meta/recipes-bsp/acpid/acpid_2.0.23.bb
+++ b/yocto-poky/meta/recipes-bsp/acpid/acpid_2.0.23.bb
diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/yocto-poky/meta/recipes-bsp/alsa-state/alsa-state.bb
index d0f7bb330..d0f7bb330 100644
--- a/meta/recipes-bsp/alsa-state/alsa-state.bb
+++ b/yocto-poky/meta/recipes-bsp/alsa-state/alsa-state.bb
diff --git a/meta/recipes-bsp/alsa-state/alsa-state/alsa-state-init b/yocto-poky/meta/recipes-bsp/alsa-state/alsa-state/alsa-state-init
index eee59cb32..eee59cb32 100755
--- a/meta/recipes-bsp/alsa-state/alsa-state/alsa-state-init
+++ b/yocto-poky/meta/recipes-bsp/alsa-state/alsa-state/alsa-state-init
diff --git a/meta/recipes-bsp/alsa-state/alsa-state/asound.conf b/yocto-poky/meta/recipes-bsp/alsa-state/alsa-state/asound.conf
index 03653cfb2..03653cfb2 100644
--- a/meta/recipes-bsp/alsa-state/alsa-state/asound.conf
+++ b/yocto-poky/meta/recipes-bsp/alsa-state/alsa-state/asound.conf
diff --git a/meta/recipes-bsp/alsa-state/alsa-state/asound.state b/yocto-poky/meta/recipes-bsp/alsa-state/alsa-state/asound.state
index ddd1cce85..ddd1cce85 100644
--- a/meta/recipes-bsp/alsa-state/alsa-state/asound.state
+++ b/yocto-poky/meta/recipes-bsp/alsa-state/alsa-state/asound.state
diff --git a/meta/recipes-bsp/apmd/apmd/apmd.service b/yocto-poky/meta/recipes-bsp/apmd/apmd/apmd.service
index ffab82334..ffab82334 100644
--- a/meta/recipes-bsp/apmd/apmd/apmd.service
+++ b/yocto-poky/meta/recipes-bsp/apmd/apmd/apmd.service
diff --git a/meta/recipes-bsp/apmd/apmd/apmd_proxy b/yocto-poky/meta/recipes-bsp/apmd/apmd/apmd_proxy
index c48ee4e5d..c48ee4e5d 100644
--- a/meta/recipes-bsp/apmd/apmd/apmd_proxy
+++ b/yocto-poky/meta/recipes-bsp/apmd/apmd/apmd_proxy
diff --git a/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf b/yocto-poky/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf
index 751145c52..751145c52 100644
--- a/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf
+++ b/yocto-poky/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf
diff --git a/meta/recipes-bsp/apmd/apmd/default b/yocto-poky/meta/recipes-bsp/apmd/apmd/default
index 4b7965abf..4b7965abf 100644
--- a/meta/recipes-bsp/apmd/apmd/default
+++ b/yocto-poky/meta/recipes-bsp/apmd/apmd/default
diff --git a/meta/recipes-bsp/apmd/apmd/init b/yocto-poky/meta/recipes-bsp/apmd/apmd/init
index c0b41aa9d..c0b41aa9d 100755
--- a/meta/recipes-bsp/apmd/apmd/init
+++ b/yocto-poky/meta/recipes-bsp/apmd/apmd/init
diff --git a/meta/recipes-bsp/apmd/apmd/legacy.patch b/yocto-poky/meta/recipes-bsp/apmd/apmd/legacy.patch
index 5db895e8f..5db895e8f 100644
--- a/meta/recipes-bsp/apmd/apmd/legacy.patch
+++ b/yocto-poky/meta/recipes-bsp/apmd/apmd/legacy.patch
diff --git a/meta/recipes-bsp/apmd/apmd/libtool.patch b/yocto-poky/meta/recipes-bsp/apmd/apmd/libtool.patch
index 834ee080a..834ee080a 100644
--- a/meta/recipes-bsp/apmd/apmd/libtool.patch
+++ b/yocto-poky/meta/recipes-bsp/apmd/apmd/libtool.patch
diff --git a/meta/recipes-bsp/apmd/apmd/unlinux.patch b/yocto-poky/meta/recipes-bsp/apmd/apmd/unlinux.patch
index ec8206cf1..ec8206cf1 100644
--- a/meta/recipes-bsp/apmd/apmd/unlinux.patch
+++ b/yocto-poky/meta/recipes-bsp/apmd/apmd/unlinux.patch
diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb b/yocto-poky/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
index ea105268a..ea105268a 100644
--- a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
+++ b/yocto-poky/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
diff --git a/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb b/yocto-poky/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
index c2a02aadb..c2a02aadb 100644
--- a/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
+++ b/yocto-poky/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
diff --git a/meta/recipes-bsp/eee-acpi-scripts/files/policy-funcs b/yocto-poky/meta/recipes-bsp/eee-acpi-scripts/files/policy-funcs
index fd099df0d..fd099df0d 100644
--- a/meta/recipes-bsp/eee-acpi-scripts/files/policy-funcs
+++ b/yocto-poky/meta/recipes-bsp/eee-acpi-scripts/files/policy-funcs
diff --git a/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch b/yocto-poky/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch
index 403e5569b..403e5569b 100644
--- a/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch
+++ b/yocto-poky/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch
diff --git a/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch b/yocto-poky/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
index efb3dca7a..efb3dca7a 100644
--- a/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
+++ b/yocto-poky/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
diff --git a/meta/recipes-bsp/formfactor/files/config b/yocto-poky/meta/recipes-bsp/formfactor/files/config
index 41066def9..41066def9 100755
--- a/meta/recipes-bsp/formfactor/files/config
+++ b/yocto-poky/meta/recipes-bsp/formfactor/files/config
diff --git a/meta/recipes-bsp/formfactor/files/machconfig b/yocto-poky/meta/recipes-bsp/formfactor/files/machconfig
index e69de29bb..e69de29bb 100755
--- a/meta/recipes-bsp/formfactor/files/machconfig
+++ b/yocto-poky/meta/recipes-bsp/formfactor/files/machconfig
diff --git a/meta/recipes-bsp/formfactor/files/qemuarm/machconfig b/yocto-poky/meta/recipes-bsp/formfactor/files/qemuarm/machconfig
index 56a2ae2e3..56a2ae2e3 100755
--- a/meta/recipes-bsp/formfactor/files/qemuarm/machconfig
+++ b/yocto-poky/meta/recipes-bsp/formfactor/files/qemuarm/machconfig
diff --git a/meta/recipes-bsp/formfactor/files/qemuarmv6/machconfig b/yocto-poky/meta/recipes-bsp/formfactor/files/qemuarmv6/machconfig
index 56a2ae2e3..56a2ae2e3 100755
--- a/meta/recipes-bsp/formfactor/files/qemuarmv6/machconfig
+++ b/yocto-poky/meta/recipes-bsp/formfactor/files/qemuarmv6/machconfig
diff --git a/meta/recipes-bsp/formfactor/files/qemuarmv7/machconfig b/yocto-poky/meta/recipes-bsp/formfactor/files/qemuarmv7/machconfig
index 56a2ae2e3..56a2ae2e3 100755
--- a/meta/recipes-bsp/formfactor/files/qemuarmv7/machconfig
+++ b/yocto-poky/meta/recipes-bsp/formfactor/files/qemuarmv7/machconfig
diff --git a/meta/recipes-bsp/formfactor/files/qemumips/machconfig b/yocto-poky/meta/recipes-bsp/formfactor/files/qemumips/machconfig
index 56777b6e2..56777b6e2 100755
--- a/meta/recipes-bsp/formfactor/files/qemumips/machconfig
+++ b/yocto-poky/meta/recipes-bsp/formfactor/files/qemumips/machconfig
diff --git a/meta/recipes-bsp/formfactor/files/qemuppc/machconfig b/yocto-poky/meta/recipes-bsp/formfactor/files/qemuppc/machconfig
index 5ea2270cd..5ea2270cd 100755
--- a/meta/recipes-bsp/formfactor/files/qemuppc/machconfig
+++ b/yocto-poky/meta/recipes-bsp/formfactor/files/qemuppc/machconfig
diff --git a/meta/recipes-bsp/formfactor/files/qemux86-64/machconfig b/yocto-poky/meta/recipes-bsp/formfactor/files/qemux86-64/machconfig
index 56a2ae2e3..56a2ae2e3 100755
--- a/meta/recipes-bsp/formfactor/files/qemux86-64/machconfig
+++ b/yocto-poky/meta/recipes-bsp/formfactor/files/qemux86-64/machconfig
diff --git a/meta/recipes-bsp/formfactor/files/qemux86/machconfig b/yocto-poky/meta/recipes-bsp/formfactor/files/qemux86/machconfig
index 56a2ae2e3..56a2ae2e3 100755
--- a/meta/recipes-bsp/formfactor/files/qemux86/machconfig
+++ b/yocto-poky/meta/recipes-bsp/formfactor/files/qemux86/machconfig
diff --git a/meta/recipes-bsp/formfactor/formfactor_0.0.bb b/yocto-poky/meta/recipes-bsp/formfactor/formfactor_0.0.bb
index 5c30bd510..5c30bd510 100644
--- a/meta/recipes-bsp/formfactor/formfactor_0.0.bb
+++ b/yocto-poky/meta/recipes-bsp/formfactor/formfactor_0.0.bb
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch b/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch
index 0ce6d7b0c..0ce6d7b0c 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch
+++ b/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch b/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch
index ced128a31..ced128a31 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch
+++ b/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch b/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch
index 1b2ae1ef0..1b2ae1ef0 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch
+++ b/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch b/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
index e5b47c197..e5b47c197 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
+++ b/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb b/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb
index eca34599c..eca34599c 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb
+++ b/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb
diff --git a/meta/recipes-bsp/grub/files/0001-Fix-build-with-glibc-2.20.patch b/yocto-poky/meta/recipes-bsp/grub/files/0001-Fix-build-with-glibc-2.20.patch
index 46aaa97cf..46aaa97cf 100644
--- a/meta/recipes-bsp/grub/files/0001-Fix-build-with-glibc-2.20.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/0001-Fix-build-with-glibc-2.20.patch
diff --git a/meta/recipes-bsp/grub/files/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-bsp/grub/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
index 67dc11549..67dc11549 100644
--- a/meta/recipes-bsp/grub/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-bsp/grub/files/0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch b/yocto-poky/meta/recipes-bsp/grub/files/0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch
index 255e3eb7d..255e3eb7d 100644
--- a/meta/recipes-bsp/grub/files/0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch
diff --git a/meta/recipes-bsp/grub/files/CVE-2015-8370.patch b/yocto-poky/meta/recipes-bsp/grub/files/CVE-2015-8370.patch
index 78f514e03..78f514e03 100644
--- a/meta/recipes-bsp/grub/files/CVE-2015-8370.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/CVE-2015-8370.patch
diff --git a/meta/recipes-bsp/grub/files/cfg b/yocto-poky/meta/recipes-bsp/grub/files/cfg
index 8ca53d24d..8ca53d24d 100644
--- a/meta/recipes-bsp/grub/files/cfg
+++ b/yocto-poky/meta/recipes-bsp/grub/files/cfg
diff --git a/meta/recipes-bsp/grub/files/check-if-liblzma-is-disabled.patch b/yocto-poky/meta/recipes-bsp/grub/files/check-if-liblzma-is-disabled.patch
index 0eece082f..0eece082f 100644
--- a/meta/recipes-bsp/grub/files/check-if-liblzma-is-disabled.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/check-if-liblzma-is-disabled.patch
diff --git a/meta/recipes-bsp/grub/files/fix-endianness-problem.patch b/yocto-poky/meta/recipes-bsp/grub/files/fix-endianness-problem.patch
index 079992afb..079992afb 100644
--- a/meta/recipes-bsp/grub/files/fix-endianness-problem.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/fix-endianness-problem.patch
diff --git a/meta/recipes-bsp/grub/files/fix-issue-with-flex-2.5.37.patch b/yocto-poky/meta/recipes-bsp/grub/files/fix-issue-with-flex-2.5.37.patch
index 61ae2f537..61ae2f537 100644
--- a/meta/recipes-bsp/grub/files/fix-issue-with-flex-2.5.37.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/fix-issue-with-flex-2.5.37.patch
diff --git a/meta/recipes-bsp/grub/files/grub-2.00-add-oe-kernel.patch b/yocto-poky/meta/recipes-bsp/grub/files/grub-2.00-add-oe-kernel.patch
index eb8916cb7..eb8916cb7 100644
--- a/meta/recipes-bsp/grub/files/grub-2.00-add-oe-kernel.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/grub-2.00-add-oe-kernel.patch
diff --git a/meta/recipes-bsp/grub/files/grub-2.00-fix-enable_execute_stack-check.patch b/yocto-poky/meta/recipes-bsp/grub/files/grub-2.00-fix-enable_execute_stack-check.patch
index 09ef4dbff..09ef4dbff 100644
--- a/meta/recipes-bsp/grub/files/grub-2.00-fix-enable_execute_stack-check.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/grub-2.00-fix-enable_execute_stack-check.patch
diff --git a/meta/recipes-bsp/grub/files/grub-2.00-fpmath-sse-387-fix.patch b/yocto-poky/meta/recipes-bsp/grub/files/grub-2.00-fpmath-sse-387-fix.patch
index c557f13e2..c557f13e2 100644
--- a/meta/recipes-bsp/grub/files/grub-2.00-fpmath-sse-387-fix.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/grub-2.00-fpmath-sse-387-fix.patch
diff --git a/meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch b/yocto-poky/meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch
index 4588fca4b..4588fca4b 100644
--- a/meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch
diff --git a/meta/recipes-bsp/grub/files/grub-efi-fix-with-glibc-2.20.patch b/yocto-poky/meta/recipes-bsp/grub/files/grub-efi-fix-with-glibc-2.20.patch
index 4f12628a4..4f12628a4 100644
--- a/meta/recipes-bsp/grub/files/grub-efi-fix-with-glibc-2.20.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/grub-efi-fix-with-glibc-2.20.patch
diff --git a/meta/recipes-bsp/grub/files/grub-install.in.patch b/yocto-poky/meta/recipes-bsp/grub/files/grub-install.in.patch
index 326951df4..326951df4 100644
--- a/meta/recipes-bsp/grub/files/grub-install.in.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/grub-install.in.patch
diff --git a/meta/recipes-bsp/grub/files/grub-no-unused-result.patch b/yocto-poky/meta/recipes-bsp/grub/files/grub-no-unused-result.patch
index 4cbd0838d..4cbd0838d 100644
--- a/meta/recipes-bsp/grub/files/grub-no-unused-result.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/grub-no-unused-result.patch
diff --git a/meta/recipes-bsp/grub/files/grub2-fix-initrd-size-bug.patch b/yocto-poky/meta/recipes-bsp/grub/files/grub2-fix-initrd-size-bug.patch
index d114f4847..d114f4847 100644
--- a/meta/recipes-bsp/grub/files/grub2-fix-initrd-size-bug.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/grub2-fix-initrd-size-bug.patch
diff --git a/meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch b/yocto-poky/meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch
index 6259a1abe..6259a1abe 100644
--- a/meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch
diff --git a/meta/recipes-bsp/grub/files/remove-gets.patch b/yocto-poky/meta/recipes-bsp/grub/files/remove-gets.patch
index 463f7847a..463f7847a 100644
--- a/meta/recipes-bsp/grub/files/remove-gets.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/files/remove-gets.patch
diff --git a/meta/recipes-bsp/grub/grub-0.97/autohell.patch b/yocto-poky/meta/recipes-bsp/grub/grub-0.97/autohell.patch
index d66207ae6..d66207ae6 100644
--- a/meta/recipes-bsp/grub/grub-0.97/autohell.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/grub-0.97/autohell.patch
diff --git a/meta/recipes-bsp/grub/grub-0.97/grub-support-256byte-inode.patch b/yocto-poky/meta/recipes-bsp/grub/grub-0.97/grub-support-256byte-inode.patch
index d225d13dc..d225d13dc 100644
--- a/meta/recipes-bsp/grub/grub-0.97/grub-support-256byte-inode.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/grub-0.97/grub-support-256byte-inode.patch
diff --git a/meta/recipes-bsp/grub/grub-0.97/grub_fix_for_automake-1.12.patch b/yocto-poky/meta/recipes-bsp/grub/grub-0.97/grub_fix_for_automake-1.12.patch
index 0cf7dc96d..0cf7dc96d 100644
--- a/meta/recipes-bsp/grub/grub-0.97/grub_fix_for_automake-1.12.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/grub-0.97/grub_fix_for_automake-1.12.patch
diff --git a/meta/recipes-bsp/grub/grub-0.97/no-reorder-functions.patch b/yocto-poky/meta/recipes-bsp/grub/grub-0.97/no-reorder-functions.patch
index 70037e47c..70037e47c 100644
--- a/meta/recipes-bsp/grub/grub-0.97/no-reorder-functions.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/grub-0.97/no-reorder-functions.patch
diff --git a/meta/recipes-bsp/grub/grub-0.97/objcopy-absolute.patch b/yocto-poky/meta/recipes-bsp/grub/grub-0.97/objcopy-absolute.patch
index bd8e0a89f..bd8e0a89f 100644
--- a/meta/recipes-bsp/grub/grub-0.97/objcopy-absolute.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/grub-0.97/objcopy-absolute.patch
diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb b/yocto-poky/meta/recipes-bsp/grub/grub-efi_2.00.bb
index 7b44eab8d..7b44eab8d 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.00.bb
+++ b/yocto-poky/meta/recipes-bsp/grub/grub-efi_2.00.bb
diff --git a/meta/recipes-bsp/grub/grub/autogen.sh-exclude-pc.patch b/yocto-poky/meta/recipes-bsp/grub/grub/autogen.sh-exclude-pc.patch
index fc5aa4e31..fc5aa4e31 100644
--- a/meta/recipes-bsp/grub/grub/autogen.sh-exclude-pc.patch
+++ b/yocto-poky/meta/recipes-bsp/grub/grub/autogen.sh-exclude-pc.patch
diff --git a/meta/recipes-bsp/grub/grub2.inc b/yocto-poky/meta/recipes-bsp/grub/grub2.inc
index fe2407cef..fe2407cef 100644
--- a/meta/recipes-bsp/grub/grub2.inc
+++ b/yocto-poky/meta/recipes-bsp/grub/grub2.inc
diff --git a/meta/recipes-bsp/grub/grub_0.97.bb b/yocto-poky/meta/recipes-bsp/grub/grub_0.97.bb
index 997a045b2..997a045b2 100644
--- a/meta/recipes-bsp/grub/grub_0.97.bb
+++ b/yocto-poky/meta/recipes-bsp/grub/grub_0.97.bb
diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/yocto-poky/meta/recipes-bsp/grub/grub_2.00.bb
index 88a709edb..88a709edb 100644
--- a/meta/recipes-bsp/grub/grub_2.00.bb
+++ b/yocto-poky/meta/recipes-bsp/grub/grub_2.00.bb
diff --git a/meta/recipes-bsp/grub/grub_git.bb b/yocto-poky/meta/recipes-bsp/grub/grub_git.bb
index c2760c9ac..c2760c9ac 100644
--- a/meta/recipes-bsp/grub/grub_git.bb
+++ b/yocto-poky/meta/recipes-bsp/grub/grub_git.bb
diff --git a/meta/recipes-bsp/gummiboot/gummiboot/0001-console-Fix-C-syntax-errors-for-function-declaration.patch b/yocto-poky/meta/recipes-bsp/gummiboot/gummiboot/0001-console-Fix-C-syntax-errors-for-function-declaration.patch
index fa50bc4a6..fa50bc4a6 100644
--- a/meta/recipes-bsp/gummiboot/gummiboot/0001-console-Fix-C-syntax-errors-for-function-declaration.patch
+++ b/yocto-poky/meta/recipes-bsp/gummiboot/gummiboot/0001-console-Fix-C-syntax-errors-for-function-declaration.patch
diff --git a/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch b/yocto-poky/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch
index 49f55930d..49f55930d 100644
--- a/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch
+++ b/yocto-poky/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch
diff --git a/meta/recipes-bsp/gummiboot/gummiboot_git.bb b/yocto-poky/meta/recipes-bsp/gummiboot/gummiboot_git.bb
index 376ab542d..376ab542d 100644
--- a/meta/recipes-bsp/gummiboot/gummiboot_git.bb
+++ b/yocto-poky/meta/recipes-bsp/gummiboot/gummiboot_git.bb
diff --git a/meta/recipes-bsp/hostap/files/COPYING.patch b/yocto-poky/meta/recipes-bsp/hostap/files/COPYING.patch
index 05c70c92e..05c70c92e 100644
--- a/meta/recipes-bsp/hostap/files/COPYING.patch
+++ b/yocto-poky/meta/recipes-bsp/hostap/files/COPYING.patch
diff --git a/meta/recipes-bsp/hostap/files/hostap-fw-load.patch b/yocto-poky/meta/recipes-bsp/hostap/files/hostap-fw-load.patch
index 050bdc113..050bdc113 100644
--- a/meta/recipes-bsp/hostap/files/hostap-fw-load.patch
+++ b/yocto-poky/meta/recipes-bsp/hostap/files/hostap-fw-load.patch
diff --git a/meta/recipes-bsp/hostap/files/hostap_cs.conf b/yocto-poky/meta/recipes-bsp/hostap/files/hostap_cs.conf
index 8dda82aad..8dda82aad 100644
--- a/meta/recipes-bsp/hostap/files/hostap_cs.conf
+++ b/yocto-poky/meta/recipes-bsp/hostap/files/hostap_cs.conf
diff --git a/meta/recipes-bsp/hostap/files/hostap_cs.conf-upstream b/yocto-poky/meta/recipes-bsp/hostap/files/hostap_cs.conf-upstream
index 5b7385a7c..5b7385a7c 100644
--- a/meta/recipes-bsp/hostap/files/hostap_cs.conf-upstream
+++ b/yocto-poky/meta/recipes-bsp/hostap/files/hostap_cs.conf-upstream
diff --git a/meta/recipes-bsp/hostap/files/hostap_cs.modalias b/yocto-poky/meta/recipes-bsp/hostap/files/hostap_cs.modalias
index 284835151..284835151 100644
--- a/meta/recipes-bsp/hostap/files/hostap_cs.modalias
+++ b/yocto-poky/meta/recipes-bsp/hostap/files/hostap_cs.modalias
diff --git a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb b/yocto-poky/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
index e1d4c5477..e1d4c5477 100644
--- a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
+++ b/yocto-poky/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
diff --git a/meta/recipes-bsp/hostap/hostap-utils-0.4.7/0001-Define-_u32-__s32-__u16-__s16-__u8-in-terms-of-c99-t.patch b/yocto-poky/meta/recipes-bsp/hostap/hostap-utils-0.4.7/0001-Define-_u32-__s32-__u16-__s16-__u8-in-terms-of-c99-t.patch
index b44dca3ec..b44dca3ec 100644
--- a/meta/recipes-bsp/hostap/hostap-utils-0.4.7/0001-Define-_u32-__s32-__u16-__s16-__u8-in-terms-of-c99-t.patch
+++ b/yocto-poky/meta/recipes-bsp/hostap/hostap-utils-0.4.7/0001-Define-_u32-__s32-__u16-__s16-__u8-in-terms-of-c99-t.patch
diff --git a/meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch b/yocto-poky/meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch
index 3e99d0d92..3e99d0d92 100644
--- a/meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch
+++ b/yocto-poky/meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch
diff --git a/meta/recipes-bsp/hostap/hostap-utils.inc b/yocto-poky/meta/recipes-bsp/hostap/hostap-utils.inc
index 140321d0c..140321d0c 100644
--- a/meta/recipes-bsp/hostap/hostap-utils.inc
+++ b/yocto-poky/meta/recipes-bsp/hostap/hostap-utils.inc
diff --git a/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb b/yocto-poky/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb
index be5481f6f..be5481f6f 100644
--- a/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb
+++ b/yocto-poky/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb
diff --git a/meta/recipes-bsp/keymaps/files/GPLv2.patch b/yocto-poky/meta/recipes-bsp/keymaps/files/GPLv2.patch
index 1ee8181f1..1ee8181f1 100644
--- a/meta/recipes-bsp/keymaps/files/GPLv2.patch
+++ b/yocto-poky/meta/recipes-bsp/keymaps/files/GPLv2.patch
diff --git a/meta/recipes-bsp/keymaps/files/keymap.sh b/yocto-poky/meta/recipes-bsp/keymaps/files/keymap.sh
index 6ebc63426..6ebc63426 100755
--- a/meta/recipes-bsp/keymaps/files/keymap.sh
+++ b/yocto-poky/meta/recipes-bsp/keymaps/files/keymap.sh
diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/yocto-poky/meta/recipes-bsp/keymaps/keymaps_1.0.bb
index 5793a7652..5793a7652 100644
--- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb
+++ b/yocto-poky/meta/recipes-bsp/keymaps/keymaps_1.0.bb
diff --git a/meta/recipes-bsp/libacpi/files/ldflags.patch b/yocto-poky/meta/recipes-bsp/libacpi/files/ldflags.patch
index a7424c39d..a7424c39d 100644
--- a/meta/recipes-bsp/libacpi/files/ldflags.patch
+++ b/yocto-poky/meta/recipes-bsp/libacpi/files/ldflags.patch
diff --git a/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch b/yocto-poky/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
index 2fed344ba..2fed344ba 100644
--- a/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
+++ b/yocto-poky/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
diff --git a/meta/recipes-bsp/libacpi/files/makefile-fix.patch b/yocto-poky/meta/recipes-bsp/libacpi/files/makefile-fix.patch
index c34ef34e0..c34ef34e0 100644
--- a/meta/recipes-bsp/libacpi/files/makefile-fix.patch
+++ b/yocto-poky/meta/recipes-bsp/libacpi/files/makefile-fix.patch
diff --git a/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch b/yocto-poky/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch
index bca75fb47..bca75fb47 100644
--- a/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch
+++ b/yocto-poky/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch
diff --git a/meta/recipes-bsp/libacpi/libacpi_0.2.bb b/yocto-poky/meta/recipes-bsp/libacpi/libacpi_0.2.bb
index bf302f3ce..bf302f3ce 100644
--- a/meta/recipes-bsp/libacpi/libacpi_0.2.bb
+++ b/yocto-poky/meta/recipes-bsp/libacpi/libacpi_0.2.bb
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/acdefine.patch b/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/acdefine.patch
index 682cf416e..682cf416e 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/acdefine.patch
+++ b/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/acdefine.patch
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch b/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch
index 394519855..394519855 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch
+++ b/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch b/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
index 1a24a1f05..1a24a1f05 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
+++ b/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch b/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch
index 9e46dfa07..9e46dfa07 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch
+++ b/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch b/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch
index b4529f4c7..b4529f4c7 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch
+++ b/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch b/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch
index ace592c8f..ace592c8f 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch
+++ b/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch
diff --git a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb b/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
index e0ce57d02..e0ce57d02 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
+++ b/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/yocto-poky/meta/recipes-bsp/pciutils/pciutils/configure.patch
index 66c9f9163..66c9f9163 100644
--- a/meta/recipes-bsp/pciutils/pciutils/configure.patch
+++ b/yocto-poky/meta/recipes-bsp/pciutils/pciutils/configure.patch
diff --git a/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch b/yocto-poky/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch
index 540b4a0d1..540b4a0d1 100644
--- a/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch
+++ b/yocto-poky/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch
diff --git a/meta/recipes-bsp/pciutils/pciutils/makefile.patch b/yocto-poky/meta/recipes-bsp/pciutils/pciutils/makefile.patch
index c3fbc6f9b..c3fbc6f9b 100644
--- a/meta/recipes-bsp/pciutils/pciutils/makefile.patch
+++ b/yocto-poky/meta/recipes-bsp/pciutils/pciutils/makefile.patch
diff --git a/meta/recipes-bsp/pciutils/pciutils_3.3.1.bb b/yocto-poky/meta/recipes-bsp/pciutils/pciutils_3.3.1.bb
index 91a8cd394..91a8cd394 100644
--- a/meta/recipes-bsp/pciutils/pciutils_3.3.1.bb
+++ b/yocto-poky/meta/recipes-bsp/pciutils/pciutils_3.3.1.bb
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch b/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch
index 7b010400f..7b010400f 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch
+++ b/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch b/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch
index 7b0ce2119..7b0ce2119 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch
+++ b/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils.inc
index 9d1c55bba..9d1c55bba 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils.inc
+++ b/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils.inc
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb b/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
index 857bd0753..857bd0753 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
+++ b/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
diff --git a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb b/yocto-poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
index 8d35187d6..8d35187d6 100644
--- a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
+++ b/yocto-poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
diff --git a/meta/recipes-bsp/pointercal/pointercal/COPYING b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/COPYING
index 63f529381..63f529381 100644
--- a/meta/recipes-bsp/pointercal/pointercal/COPYING
+++ b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/COPYING
diff --git a/meta/recipes-bsp/pointercal/pointercal/pointercal b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/pointercal
index e69de29bb..e69de29bb 100644
--- a/meta/recipes-bsp/pointercal/pointercal/pointercal
+++ b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/pointercal
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemuarm/pointercal b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/qemuarm/pointercal
index abd84ca4b..abd84ca4b 100644
--- a/meta/recipes-bsp/pointercal/pointercal/qemuarm/pointercal
+++ b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/qemuarm/pointercal
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal
index abd84ca4b..abd84ca4b 100644
--- a/meta/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal
+++ b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal
index abd84ca4b..abd84ca4b 100644
--- a/meta/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal
+++ b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemumips/pointercal b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/qemumips/pointercal
index abd84ca4b..abd84ca4b 100644
--- a/meta/recipes-bsp/pointercal/pointercal/qemumips/pointercal
+++ b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/qemumips/pointercal
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemuppc/pointercal b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/qemuppc/pointercal
index c2d6e37bf..c2d6e37bf 100644
--- a/meta/recipes-bsp/pointercal/pointercal/qemuppc/pointercal
+++ b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/qemuppc/pointercal
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal
index 640053d39..640053d39 100644
--- a/meta/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal
+++ b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemux86/pointercal b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/qemux86/pointercal
index 640053d39..640053d39 100644
--- a/meta/recipes-bsp/pointercal/pointercal/qemux86/pointercal
+++ b/yocto-poky/meta/recipes-bsp/pointercal/pointercal/qemux86/pointercal
diff --git a/meta/recipes-bsp/pointercal/pointercal_0.0.bb b/yocto-poky/meta/recipes-bsp/pointercal/pointercal_0.0.bb
index df735a59f..df735a59f 100644
--- a/meta/recipes-bsp/pointercal/pointercal_0.0.bb
+++ b/yocto-poky/meta/recipes-bsp/pointercal/pointercal_0.0.bb
diff --git a/meta/recipes-bsp/setserial/setserial/add_stdlib.patch b/yocto-poky/meta/recipes-bsp/setserial/setserial/add_stdlib.patch
index e34f262a8..e34f262a8 100644
--- a/meta/recipes-bsp/setserial/setserial/add_stdlib.patch
+++ b/yocto-poky/meta/recipes-bsp/setserial/setserial/add_stdlib.patch
diff --git a/meta/recipes-bsp/setserial/setserial/ldflags.patch b/yocto-poky/meta/recipes-bsp/setserial/setserial/ldflags.patch
index 174adc89f..174adc89f 100644
--- a/meta/recipes-bsp/setserial/setserial/ldflags.patch
+++ b/yocto-poky/meta/recipes-bsp/setserial/setserial/ldflags.patch
diff --git a/meta/recipes-bsp/setserial/setserial_2.17.bb b/yocto-poky/meta/recipes-bsp/setserial/setserial_2.17.bb
index 8dbddd7dc..8dbddd7dc 100644
--- a/meta/recipes-bsp/setserial/setserial_2.17.bb
+++ b/yocto-poky/meta/recipes-bsp/setserial/setserial_2.17.bb
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.07.bb b/yocto-poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.07.bb
index 0df7a059d..0df7a059d 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.07.bb
+++ b/yocto-poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.07.bb
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.07.bb b/yocto-poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.07.bb
index ba29bbb92..ba29bbb92 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.07.bb
+++ b/yocto-poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.07.bb
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/yocto-poky/meta/recipes-bsp/u-boot/u-boot.inc
index e66ffd145..e66ffd145 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/yocto-poky/meta/recipes-bsp/u-boot/u-boot.inc
diff --git a/meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch b/yocto-poky/meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch
index dfbcd45be..dfbcd45be 100644
--- a/meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch
+++ b/yocto-poky/meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch
diff --git a/meta/recipes-bsp/u-boot/u-boot_2015.07.bb b/yocto-poky/meta/recipes-bsp/u-boot/u-boot_2015.07.bb
index 4746c33ec..4746c33ec 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2015.07.bb
+++ b/yocto-poky/meta/recipes-bsp/u-boot/u-boot_2015.07.bb
diff --git a/meta/recipes-bsp/usbinit/usbinit.bb b/yocto-poky/meta/recipes-bsp/usbinit/usbinit.bb
index aba44b406..aba44b406 100644
--- a/meta/recipes-bsp/usbinit/usbinit.bb
+++ b/yocto-poky/meta/recipes-bsp/usbinit/usbinit.bb
diff --git a/meta/recipes-bsp/usbinit/usbinit/COPYING.GPL b/yocto-poky/meta/recipes-bsp/usbinit/usbinit/COPYING.GPL
index d511905c1..d511905c1 100644
--- a/meta/recipes-bsp/usbinit/usbinit/COPYING.GPL
+++ b/yocto-poky/meta/recipes-bsp/usbinit/usbinit/COPYING.GPL
diff --git a/meta/recipes-bsp/usbinit/usbinit/usb-gether b/yocto-poky/meta/recipes-bsp/usbinit/usbinit/usb-gether
index e80a0bb30..e80a0bb30 100755
--- a/meta/recipes-bsp/usbinit/usbinit/usb-gether
+++ b/yocto-poky/meta/recipes-bsp/usbinit/usbinit/usb-gether
diff --git a/meta/recipes-bsp/usbutils/usbutils-008/iconv.patch b/yocto-poky/meta/recipes-bsp/usbutils/usbutils-008/iconv.patch
index 645556717..645556717 100644
--- a/meta/recipes-bsp/usbutils/usbutils-008/iconv.patch
+++ b/yocto-poky/meta/recipes-bsp/usbutils/usbutils-008/iconv.patch
diff --git a/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch b/yocto-poky/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch
index 0efdc59fc..0efdc59fc 100644
--- a/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch
+++ b/yocto-poky/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch
diff --git a/meta/recipes-bsp/usbutils/usbutils/iconv.patch b/yocto-poky/meta/recipes-bsp/usbutils/usbutils/iconv.patch
index c557334a7..c557334a7 100644
--- a/meta/recipes-bsp/usbutils/usbutils/iconv.patch
+++ b/yocto-poky/meta/recipes-bsp/usbutils/usbutils/iconv.patch
diff --git a/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch b/yocto-poky/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
index a6b241f85..a6b241f85 100644
--- a/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
+++ b/yocto-poky/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
diff --git a/meta/recipes-bsp/usbutils/usbutils_007.bb b/yocto-poky/meta/recipes-bsp/usbutils/usbutils_007.bb
index b93b2bd9e..b93b2bd9e 100644
--- a/meta/recipes-bsp/usbutils/usbutils_007.bb
+++ b/yocto-poky/meta/recipes-bsp/usbutils/usbutils_007.bb
diff --git a/meta/recipes-bsp/usbutils/usbutils_008.bb b/yocto-poky/meta/recipes-bsp/usbutils/usbutils_008.bb
index 0f2d8d47c..0f2d8d47c 100644
--- a/meta/recipes-bsp/usbutils/usbutils_008.bb
+++ b/yocto-poky/meta/recipes-bsp/usbutils/usbutils_008.bb
diff --git a/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch b/yocto-poky/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch
index a09e2a257..a09e2a257 100644
--- a/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch
+++ b/yocto-poky/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch
diff --git a/meta/recipes-bsp/v86d/v86d/ar-from-env.patch b/yocto-poky/meta/recipes-bsp/v86d/v86d/ar-from-env.patch
index 1dcbc71dc..1dcbc71dc 100644
--- a/meta/recipes-bsp/v86d/v86d/ar-from-env.patch
+++ b/yocto-poky/meta/recipes-bsp/v86d/v86d/ar-from-env.patch
diff --git a/meta/recipes-bsp/v86d/v86d/fbsetup b/yocto-poky/meta/recipes-bsp/v86d/v86d/fbsetup
index 2a409cc52..2a409cc52 100755
--- a/meta/recipes-bsp/v86d/v86d/fbsetup
+++ b/yocto-poky/meta/recipes-bsp/v86d/v86d/fbsetup
diff --git a/meta/recipes-bsp/v86d/v86d/uvesafb.conf b/yocto-poky/meta/recipes-bsp/v86d/v86d/uvesafb.conf
index 43789755d..43789755d 100644
--- a/meta/recipes-bsp/v86d/v86d/uvesafb.conf
+++ b/yocto-poky/meta/recipes-bsp/v86d/v86d/uvesafb.conf
diff --git a/meta/recipes-bsp/v86d/v86d_0.1.10.bb b/yocto-poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb
index f50207212..f50207212 100644
--- a/meta/recipes-bsp/v86d/v86d_0.1.10.bb
+++ b/yocto-poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb b/yocto-poky/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
index 0d42b90e7..0d42b90e7 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
+++ b/yocto-poky/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/yocto-poky/meta/recipes-connectivity/avahi/avahi.inc
index 825197d61..825197d61 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/yocto-poky/meta/recipes-connectivity/avahi/avahi.inc
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.31.bb b/yocto-poky/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
index 5d796a202..5d796a202 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
+++ b/yocto-poky/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
diff --git a/meta/recipes-connectivity/avahi/files/0001-avahi-fix-avahi-status-command-error-prompt.patch b/yocto-poky/meta/recipes-connectivity/avahi/files/0001-avahi-fix-avahi-status-command-error-prompt.patch
index 7590df79f..7590df79f 100644
--- a/meta/recipes-connectivity/avahi/files/0001-avahi-fix-avahi-status-command-error-prompt.patch
+++ b/yocto-poky/meta/recipes-connectivity/avahi/files/0001-avahi-fix-avahi-status-command-error-prompt.patch
diff --git a/meta/recipes-connectivity/avahi/files/00avahi-autoipd b/yocto-poky/meta/recipes-connectivity/avahi/files/00avahi-autoipd
index a0ab81460..a0ab81460 100644
--- a/meta/recipes-connectivity/avahi/files/00avahi-autoipd
+++ b/yocto-poky/meta/recipes-connectivity/avahi/files/00avahi-autoipd
diff --git a/meta/recipes-connectivity/avahi/files/99avahi-autoipd b/yocto-poky/meta/recipes-connectivity/avahi/files/99avahi-autoipd
index 234cdaa3e..234cdaa3e 100644
--- a/meta/recipes-connectivity/avahi/files/99avahi-autoipd
+++ b/yocto-poky/meta/recipes-connectivity/avahi/files/99avahi-autoipd
diff --git a/meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch b/yocto-poky/meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch
index 32f20ece4..32f20ece4 100644
--- a/meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch
+++ b/yocto-poky/meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch
diff --git a/meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch b/yocto-poky/meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch
index 0fc4c290c..0fc4c290c 100644
--- a/meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch
+++ b/yocto-poky/meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch
diff --git a/meta/recipes-connectivity/avahi/files/initscript.patch b/yocto-poky/meta/recipes-connectivity/avahi/files/initscript.patch
index 193889eb5..193889eb5 100644
--- a/meta/recipes-connectivity/avahi/files/initscript.patch
+++ b/yocto-poky/meta/recipes-connectivity/avahi/files/initscript.patch
diff --git a/meta/recipes-connectivity/avahi/files/out-of-tree.patch b/yocto-poky/meta/recipes-connectivity/avahi/files/out-of-tree.patch
index 43476cde0..43476cde0 100644
--- a/meta/recipes-connectivity/avahi/files/out-of-tree.patch
+++ b/yocto-poky/meta/recipes-connectivity/avahi/files/out-of-tree.patch
diff --git a/meta/recipes-connectivity/avahi/files/reuseport-check.patch b/yocto-poky/meta/recipes-connectivity/avahi/files/reuseport-check.patch
index bb81c2cb4..bb81c2cb4 100644
--- a/meta/recipes-connectivity/avahi/files/reuseport-check.patch
+++ b/yocto-poky/meta/recipes-connectivity/avahi/files/reuseport-check.patch
diff --git a/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch b/yocto-poky/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch
index cb5251d15..cb5251d15 100644
--- a/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch
diff --git a/meta/recipes-connectivity/bind/bind/0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch b/yocto-poky/meta/recipes-connectivity/bind/bind/0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch
index 121509371..121509371 100644
--- a/meta/recipes-connectivity/bind/bind/0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch
diff --git a/meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch b/yocto-poky/meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch
index 1ed858cd3..1ed858cd3 100644
--- a/meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch
diff --git a/meta/recipes-connectivity/bind/bind/CVE-2015-8000.patch b/yocto-poky/meta/recipes-connectivity/bind/bind/CVE-2015-8000.patch
index e1c805257..e1c805257 100644
--- a/meta/recipes-connectivity/bind/bind/CVE-2015-8000.patch
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/CVE-2015-8000.patch
diff --git a/meta/recipes-connectivity/bind/bind/CVE-2015-8461.patch b/yocto-poky/meta/recipes-connectivity/bind/bind/CVE-2015-8461.patch
index 88e9c8342..88e9c8342 100644
--- a/meta/recipes-connectivity/bind/bind/CVE-2015-8461.patch
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/CVE-2015-8461.patch
diff --git a/meta/recipes-connectivity/bind/bind/CVE-2015-8704.patch b/yocto-poky/meta/recipes-connectivity/bind/bind/CVE-2015-8704.patch
index d5bf740e8..d5bf740e8 100644
--- a/meta/recipes-connectivity/bind/bind/CVE-2015-8704.patch
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/CVE-2015-8704.patch
diff --git a/meta/recipes-connectivity/bind/bind/CVE-2015-8705.patch b/yocto-poky/meta/recipes-connectivity/bind/bind/CVE-2015-8705.patch
index c4a052d7b..c4a052d7b 100644
--- a/meta/recipes-connectivity/bind/bind/CVE-2015-8705.patch
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/CVE-2015-8705.patch
diff --git a/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch b/yocto-poky/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch
index 096d5d84f..096d5d84f 100644
--- a/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch
diff --git a/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch b/yocto-poky/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch
index 13df3bb0e..13df3bb0e 100644
--- a/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch
diff --git a/meta/recipes-connectivity/bind/bind/bind9 b/yocto-poky/meta/recipes-connectivity/bind/bind/bind9
index 968679ff7..968679ff7 100644
--- a/meta/recipes-connectivity/bind/bind/bind9
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/bind9
diff --git a/meta/recipes-connectivity/bind/bind/conf.patch b/yocto-poky/meta/recipes-connectivity/bind/bind/conf.patch
index aad345f9f..aad345f9f 100644
--- a/meta/recipes-connectivity/bind/bind/conf.patch
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/conf.patch
diff --git a/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch b/yocto-poky/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
index 6989d6d4b..6989d6d4b 100644
--- a/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
diff --git a/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh b/yocto-poky/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh
index db201270f..db201270f 100644
--- a/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh
diff --git a/meta/recipes-connectivity/bind/bind/init.d-add-support-for-read-only-rootfs.patch b/yocto-poky/meta/recipes-connectivity/bind/bind/init.d-add-support-for-read-only-rootfs.patch
index 11db95ede..11db95ede 100644
--- a/meta/recipes-connectivity/bind/bind/init.d-add-support-for-read-only-rootfs.patch
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/init.d-add-support-for-read-only-rootfs.patch
diff --git a/meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch b/yocto-poky/meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch
index 146f3e35d..146f3e35d 100644
--- a/meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch
diff --git a/meta/recipes-connectivity/bind/bind/mips1-not-support-opcode.diff b/yocto-poky/meta/recipes-connectivity/bind/bind/mips1-not-support-opcode.diff
index 2930796b6..2930796b6 100644
--- a/meta/recipes-connectivity/bind/bind/mips1-not-support-opcode.diff
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/mips1-not-support-opcode.diff
diff --git a/meta/recipes-connectivity/bind/bind/named.service b/yocto-poky/meta/recipes-connectivity/bind/bind/named.service
index cda56ef01..cda56ef01 100644
--- a/meta/recipes-connectivity/bind/bind/named.service
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind/named.service
diff --git a/meta/recipes-connectivity/bind/bind_9.10.2-P4.bb b/yocto-poky/meta/recipes-connectivity/bind/bind_9.10.2-P4.bb
index 19f87d793..19f87d793 100644
--- a/meta/recipes-connectivity/bind/bind_9.10.2-P4.bb
+++ b/yocto-poky/meta/recipes-connectivity/bind/bind_9.10.2-P4.bb
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/yocto-poky/meta/recipes-connectivity/bluez5/bluez5.inc
index df42c88b9..df42c88b9 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/yocto-poky/meta/recipes-connectivity/bluez5/bluez5.inc
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.33.bb b/yocto-poky/meta/recipes-connectivity/bluez5/bluez5_5.33.bb
index 23c7397e1..23c7397e1 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.33.bb
+++ b/yocto-poky/meta/recipes-connectivity/bluez5/bluez5_5.33.bb
diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/yocto-poky/meta/recipes-connectivity/connman/connman-conf.bb
index 9254ed703..9254ed703 100644
--- a/meta/recipes-connectivity/connman/connman-conf.bb
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman-conf.bb
diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup b/yocto-poky/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup
index c46899ef3..c46899ef3 100644
--- a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup
diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config b/yocto-poky/meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config
index 42998ce89..42998ce89 100644
--- a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config
diff --git a/meta/recipes-connectivity/connman/connman-gnome/0001-Removed-icon-from-connman-gnome-about-applet.patch b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/0001-Removed-icon-from-connman-gnome-about-applet.patch
index 7957500dc..7957500dc 100644
--- a/meta/recipes-connectivity/connman/connman-gnome/0001-Removed-icon-from-connman-gnome-about-applet.patch
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/0001-Removed-icon-from-connman-gnome-about-applet.patch
diff --git a/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch
index f4049fa3e..f4049fa3e 100644
--- a/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch
diff --git a/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-01.png b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-01.png
index 33247c1e2..33247c1e2 100644
--- a/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-01.png
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-01.png
diff --git a/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-02.png b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-02.png
index a94fb952f..a94fb952f 100644
--- a/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-02.png
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-02.png
diff --git a/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-03.png b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-03.png
index b5eb405a9..b5eb405a9 100644
--- a/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-03.png
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-03.png
diff --git a/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-04.png b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-04.png
index be54419fa..be54419fa 100644
--- a/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-04.png
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-04.png
diff --git a/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-05.png b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-05.png
index 1c40ac9a1..1c40ac9a1 100644
--- a/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-05.png
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-05.png
diff --git a/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch
index 0421cda0b..0421cda0b 100644
--- a/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
index 7b875f00f..7b875f00f 100644
--- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
diff --git a/meta/recipes-connectivity/connman/connman.inc b/yocto-poky/meta/recipes-connectivity/connman/connman.inc
index afdb3f2d0..afdb3f2d0 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman.inc
diff --git a/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch b/yocto-poky/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch
index 5dc6fd634..5dc6fd634 100644
--- a/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch
diff --git a/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch b/yocto-poky/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
index e6f03e632..e6f03e632 100644
--- a/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
diff --git a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/yocto-poky/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
index 059342771..059342771 100644
--- a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
diff --git a/meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch b/yocto-poky/meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch
index 6327aa2cb..6327aa2cb 100644
--- a/meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch
diff --git a/meta/recipes-connectivity/connman/connman/connman b/yocto-poky/meta/recipes-connectivity/connman/connman/connman
index c64fa0d71..c64fa0d71 100644
--- a/meta/recipes-connectivity/connman/connman/connman
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman/connman
diff --git a/meta/recipes-connectivity/connman/connman_1.30.bb b/yocto-poky/meta/recipes-connectivity/connman/connman_1.30.bb
index 7d65ac931..7d65ac931 100644
--- a/meta/recipes-connectivity/connman/connman_1.30.bb
+++ b/yocto-poky/meta/recipes-connectivity/connman/connman_1.30.bb
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp.inc
index d883a8df4..d883a8df4 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp.inc
diff --git a/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
index 12d3c9bdb..12d3c9bdb 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch
index 47ea5554b..47ea5554b 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp/dhcp-3.0.3-dhclient-dbus.patch b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/dhcp-3.0.3-dhclient-dbus.patch
index b4a666d10..b4a666d10 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/dhcp-3.0.3-dhclient-dbus.patch
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/dhcp-3.0.3-dhclient-dbus.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch
index a291fdaf5..a291fdaf5 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
index 14e75a37e..14e75a37e 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch
index 57e10b029..57e10b029 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch
index 61dd6a718..61dd6a718 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb
index b4a05fcd9..b4a05fcd9 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb
diff --git a/meta/recipes-connectivity/dhcp/files/default-relay b/yocto-poky/meta/recipes-connectivity/dhcp/files/default-relay
index 7961f014b..7961f014b 100644
--- a/meta/recipes-connectivity/dhcp/files/default-relay
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/files/default-relay
diff --git a/meta/recipes-connectivity/dhcp/files/default-server b/yocto-poky/meta/recipes-connectivity/dhcp/files/default-server
index 0385d1699..0385d1699 100644
--- a/meta/recipes-connectivity/dhcp/files/default-server
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/files/default-server
diff --git a/meta/recipes-connectivity/dhcp/files/dhclient.conf b/yocto-poky/meta/recipes-connectivity/dhcp/files/dhclient.conf
index 0e6dcf96c..0e6dcf96c 100644
--- a/meta/recipes-connectivity/dhcp/files/dhclient.conf
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/files/dhclient.conf
diff --git a/meta/recipes-connectivity/dhcp/files/dhcpd.conf b/yocto-poky/meta/recipes-connectivity/dhcp/files/dhcpd.conf
index 0001c0f00..0001c0f00 100644
--- a/meta/recipes-connectivity/dhcp/files/dhcpd.conf
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/files/dhcpd.conf
diff --git a/meta/recipes-connectivity/dhcp/files/dhcpd.service b/yocto-poky/meta/recipes-connectivity/dhcp/files/dhcpd.service
index ae4f93eca..ae4f93eca 100644
--- a/meta/recipes-connectivity/dhcp/files/dhcpd.service
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/files/dhcpd.service
diff --git a/meta/recipes-connectivity/dhcp/files/dhcpd6.service b/yocto-poky/meta/recipes-connectivity/dhcp/files/dhcpd6.service
index ca96abb83..ca96abb83 100644
--- a/meta/recipes-connectivity/dhcp/files/dhcpd6.service
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/files/dhcpd6.service
diff --git a/meta/recipes-connectivity/dhcp/files/dhcrelay.service b/yocto-poky/meta/recipes-connectivity/dhcp/files/dhcrelay.service
index a2d818917..a2d818917 100644
--- a/meta/recipes-connectivity/dhcp/files/dhcrelay.service
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/files/dhcrelay.service
diff --git a/meta/recipes-connectivity/dhcp/files/init-relay b/yocto-poky/meta/recipes-connectivity/dhcp/files/init-relay
index 019a7e84c..019a7e84c 100644
--- a/meta/recipes-connectivity/dhcp/files/init-relay
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/files/init-relay
diff --git a/meta/recipes-connectivity/dhcp/files/init-server b/yocto-poky/meta/recipes-connectivity/dhcp/files/init-server
index 34c20852b..34c20852b 100644
--- a/meta/recipes-connectivity/dhcp/files/init-server
+++ b/yocto-poky/meta/recipes-connectivity/dhcp/files/init-server
diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/yocto-poky/meta/recipes-connectivity/iproute2/iproute2.inc
index 29f90629a..29f90629a 100644
--- a/meta/recipes-connectivity/iproute2/iproute2.inc
+++ b/yocto-poky/meta/recipes-connectivity/iproute2/iproute2.inc
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch b/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch
index 39c7d4031..39c7d4031 100644
--- a/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch
+++ b/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch
diff --git a/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch b/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch
index 866609ca9..866609ca9 100644
--- a/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch
+++ b/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch
diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.1.1.bb b/yocto-poky/meta/recipes-connectivity/iproute2/iproute2_4.1.1.bb
index 10db0ba5d..10db0ba5d 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_4.1.1.bb
+++ b/yocto-poky/meta/recipes-connectivity/iproute2/iproute2_4.1.1.bb
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init b/yocto-poky/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init
index 6f29e9c6e..6f29e9c6e 100755
--- a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init
+++ b/yocto-poky/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch b/yocto-poky/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
index e95fe35f8..e95fe35f8 100644
--- a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
+++ b/yocto-poky/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb b/yocto-poky/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
index bd2f815cb..bd2f815cb 100644
--- a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
+++ b/yocto-poky/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
diff --git a/meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch b/yocto-poky/meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
index a0a77b2e5..a0a77b2e5 100644
--- a/meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
+++ b/yocto-poky/meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
diff --git a/meta/recipes-connectivity/iw/iw/separate-objdir.patch b/yocto-poky/meta/recipes-connectivity/iw/iw/separate-objdir.patch
index 883f8b2c6..883f8b2c6 100644
--- a/meta/recipes-connectivity/iw/iw/separate-objdir.patch
+++ b/yocto-poky/meta/recipes-connectivity/iw/iw/separate-objdir.patch
diff --git a/meta/recipes-connectivity/iw/iw_4.1.bb b/yocto-poky/meta/recipes-connectivity/iw/iw_4.1.bb
index fafb0e3c9..fafb0e3c9 100644
--- a/meta/recipes-connectivity/iw/iw_4.1.bb
+++ b/yocto-poky/meta/recipes-connectivity/iw/iw_4.1.bb
diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb b/yocto-poky/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
index 0b936ef09..0b936ef09 100644
--- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
+++ b/yocto-poky/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/yocto-poky/meta/recipes-connectivity/libpcap/libpcap.inc
index 0873c248c..0873c248c 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/yocto-poky/meta/recipes-connectivity/libpcap/libpcap.inc
diff --git a/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch b/yocto-poky/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch
index 21519825c..21519825c 100644
--- a/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch
+++ b/yocto-poky/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch
diff --git a/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch b/yocto-poky/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
index b8615135b..b8615135b 100644
--- a/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
+++ b/yocto-poky/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.6.2.bb b/yocto-poky/meta/recipes-connectivity/libpcap/libpcap_1.6.2.bb
index 611543e42..611543e42 100644
--- a/meta/recipes-connectivity/libpcap/libpcap_1.6.2.bb
+++ b/yocto-poky/meta/recipes-connectivity/libpcap/libpcap_1.6.2.bb
diff --git a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb b/yocto-poky/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb
index 31cf2bb5f..31cf2bb5f 100644
--- a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb
+++ b/yocto-poky/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb
diff --git a/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch b/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch
index 16875e054..16875e054 100644
--- a/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch
+++ b/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch
diff --git a/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch b/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch
index 466067693..466067693 100644
--- a/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch
+++ b/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch
diff --git a/meta/recipes-connectivity/neard/neard/neard.in b/yocto-poky/meta/recipes-connectivity/neard/neard/neard.in
index a47d4d96c..a47d4d96c 100644
--- a/meta/recipes-connectivity/neard/neard/neard.in
+++ b/yocto-poky/meta/recipes-connectivity/neard/neard/neard.in
diff --git a/meta/recipes-connectivity/neard/neard_0.15.bb b/yocto-poky/meta/recipes-connectivity/neard/neard_0.15.bb
index 8adf70cc9..8adf70cc9 100644
--- a/meta/recipes-connectivity/neard/neard_0.15.bb
+++ b/yocto-poky/meta/recipes-connectivity/neard/neard_0.15.bb
diff --git a/meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch b/yocto-poky/meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch
index 85002290f..85002290f 100644
--- a/meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch
+++ b/yocto-poky/meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch
diff --git a/meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch b/yocto-poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch
index 4ac529044..4ac529044 100644
--- a/meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch
+++ b/yocto-poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch
diff --git a/meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch b/yocto-poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch
index 4633da919..4633da919 100644
--- a/meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch
+++ b/yocto-poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch
diff --git a/meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch b/yocto-poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch
index d81c7c5f3..d81c7c5f3 100644
--- a/meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch
+++ b/yocto-poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch
diff --git a/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb b/yocto-poky/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
index 5b578e9a1..5b578e9a1 100644
--- a/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
+++ b/yocto-poky/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
index 7025fb555..7025fb555 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
+++ b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
index 613ddc003..613ddc003 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
+++ b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
index 147d7a7b5..147d7a7b5 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
+++ b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
index 746dacf05..746dacf05 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
+++ b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
index d8f818167..d8f818167 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
+++ b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch
index 993f1e5ea..993f1e5ea 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch
+++ b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf
index a1007a7fb..a1007a7fb 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf
+++ b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon
index 992267d5a..992267d5a 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon
+++ b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
index 7ed93a59d..7ed93a59d 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
+++ b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount
index 630801b37..630801b37 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount
+++ b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
index 42101de79..42101de79 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
+++ b/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/yocto-poky/meta/recipes-connectivity/ofono/ofono.inc
index c415a3998..c415a3998 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/yocto-poky/meta/recipes-connectivity/ofono/ofono.inc
diff --git a/meta/recipes-connectivity/ofono/ofono/0001-backtrace-Disable-for-non-glibc-C-libraries.patch b/yocto-poky/meta/recipes-connectivity/ofono/ofono/0001-backtrace-Disable-for-non-glibc-C-libraries.patch
index 306b6da33..306b6da33 100644
--- a/meta/recipes-connectivity/ofono/ofono/0001-backtrace-Disable-for-non-glibc-C-libraries.patch
+++ b/yocto-poky/meta/recipes-connectivity/ofono/ofono/0001-backtrace-Disable-for-non-glibc-C-libraries.patch
diff --git a/meta/recipes-connectivity/ofono/ofono/Revert-test-Convert-to-Python-3.patch b/yocto-poky/meta/recipes-connectivity/ofono/ofono/Revert-test-Convert-to-Python-3.patch
index 5f8ca7710..5f8ca7710 100644
--- a/meta/recipes-connectivity/ofono/ofono/Revert-test-Convert-to-Python-3.patch
+++ b/yocto-poky/meta/recipes-connectivity/ofono/ofono/Revert-test-Convert-to-Python-3.patch
diff --git a/meta/recipes-connectivity/ofono/ofono/ofono b/yocto-poky/meta/recipes-connectivity/ofono/ofono/ofono
index cc9970929..cc9970929 100644
--- a/meta/recipes-connectivity/ofono/ofono/ofono
+++ b/yocto-poky/meta/recipes-connectivity/ofono/ofono/ofono
diff --git a/meta/recipes-connectivity/ofono/ofono_1.16.bb b/yocto-poky/meta/recipes-connectivity/ofono/ofono_1.16.bb
index fbf13e52b..fbf13e52b 100644
--- a/meta/recipes-connectivity/ofono/ofono_1.16.bb
+++ b/yocto-poky/meta/recipes-connectivity/ofono/ofono_1.16.bb
diff --git a/meta/recipes-connectivity/ofono/ofono_git.bb b/yocto-poky/meta/recipes-connectivity/ofono/ofono_git.bb
index beafb775c..beafb775c 100644
--- a/meta/recipes-connectivity/ofono/ofono_git.bb
+++ b/yocto-poky/meta/recipes-connectivity/ofono/ofono_git.bb
diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2016-1907_2.patch b/yocto-poky/meta/recipes-connectivity/openssh/openssh/CVE-2016-1907_2.patch
index 9fac69c3d..9fac69c3d 100644
--- a/meta/recipes-connectivity/openssh/openssh/CVE-2016-1907_2.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssh/openssh/CVE-2016-1907_2.patch
diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2016-1907_3.patch b/yocto-poky/meta/recipes-connectivity/openssh/openssh/CVE-2016-1907_3.patch
index 3dfc51af7..3dfc51af7 100644
--- a/meta/recipes-connectivity/openssh/openssh/CVE-2016-1907_3.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssh/openssh/CVE-2016-1907_3.patch
diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2016-1907_upstream_commit.patch b/yocto-poky/meta/recipes-connectivity/openssh/openssh/CVE-2016-1907_upstream_commit.patch
index f3d132e43..f3d132e43 100644
--- a/meta/recipes-connectivity/openssh/openssh/CVE-2016-1907_upstream_commit.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssh/openssh/CVE-2016-1907_upstream_commit.patch
diff --git a/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch b/yocto-poky/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
index adc25c668..adc25c668 100644
--- a/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
diff --git a/meta/recipes-connectivity/openssh/openssh/init b/yocto-poky/meta/recipes-connectivity/openssh/openssh/init
index 70d4a3465..70d4a3465 100644
--- a/meta/recipes-connectivity/openssh/openssh/init
+++ b/yocto-poky/meta/recipes-connectivity/openssh/openssh/init
diff --git a/meta/recipes-connectivity/openssh/openssh/run-ptest b/yocto-poky/meta/recipes-connectivity/openssh/openssh/run-ptest
index 564c0c825..564c0c825 100755
--- a/meta/recipes-connectivity/openssh/openssh/run-ptest
+++ b/yocto-poky/meta/recipes-connectivity/openssh/openssh/run-ptest
diff --git a/meta/recipes-connectivity/openssh/openssh/ssh_config b/yocto-poky/meta/recipes-connectivity/openssh/openssh/ssh_config
index 9e919156d..9e919156d 100644
--- a/meta/recipes-connectivity/openssh/openssh/ssh_config
+++ b/yocto-poky/meta/recipes-connectivity/openssh/openssh/ssh_config
diff --git a/meta/recipes-connectivity/openssh/openssh/sshd b/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd
index 4882e58b4..4882e58b4 100644
--- a/meta/recipes-connectivity/openssh/openssh/sshd
+++ b/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd
diff --git a/meta/recipes-connectivity/openssh/openssh/sshd.socket b/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd.socket
index 12c39b26b..12c39b26b 100644
--- a/meta/recipes-connectivity/openssh/openssh/sshd.socket
+++ b/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd.socket
diff --git a/meta/recipes-connectivity/openssh/openssh/sshd@.service b/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd@.service
index 9d83dfb2b..9d83dfb2b 100644
--- a/meta/recipes-connectivity/openssh/openssh/sshd@.service
+++ b/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd@.service
diff --git a/meta/recipes-connectivity/openssh/openssh/sshd_config b/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd_config
index d48bd2b98..d48bd2b98 100644
--- a/meta/recipes-connectivity/openssh/openssh/sshd_config
+++ b/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd_config
diff --git a/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service b/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service
index 148e6ad63..148e6ad63 100644
--- a/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service
+++ b/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service
diff --git a/meta/recipes-connectivity/openssh/openssh/volatiles.99_sshd b/yocto-poky/meta/recipes-connectivity/openssh/openssh/volatiles.99_sshd
index a0d2af3c6..a0d2af3c6 100644
--- a/meta/recipes-connectivity/openssh/openssh/volatiles.99_sshd
+++ b/yocto-poky/meta/recipes-connectivity/openssh/openssh/volatiles.99_sshd
diff --git a/meta/recipes-connectivity/openssh/openssh_7.1p2.bb b/yocto-poky/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
index 714c3917c..714c3917c 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
+++ b/yocto-poky/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/yocto-poky/meta/recipes-connectivity/openssl/openssl.inc
index 8af423f1a..8af423f1a 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl.inc
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Add-test-for-CVE-2015-3194.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/0001-Add-test-for-CVE-2015-3194.patch
index 39a2e5a94..39a2e5a94 100644
--- a/meta/recipes-connectivity/openssl/openssl/0001-Add-test-for-CVE-2015-3194.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/0001-Add-test-for-CVE-2015-3194.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2015-3193-bn-asm-x86_64-mont5.pl-fix-carry-propagating-bug-CVE.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/CVE-2015-3193-bn-asm-x86_64-mont5.pl-fix-carry-propagating-bug-CVE.patch
index 125016a23..125016a23 100644
--- a/meta/recipes-connectivity/openssl/openssl/CVE-2015-3193-bn-asm-x86_64-mont5.pl-fix-carry-propagating-bug-CVE.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/CVE-2015-3193-bn-asm-x86_64-mont5.pl-fix-carry-propagating-bug-CVE.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2015-3194-1-Add-PSS-parameter-check.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/CVE-2015-3194-1-Add-PSS-parameter-check.patch
index 13d48913b..13d48913b 100644
--- a/meta/recipes-connectivity/openssl/openssl/CVE-2015-3194-1-Add-PSS-parameter-check.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/CVE-2015-3194-1-Add-PSS-parameter-check.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2015-3195-Fix-leak-with-ASN.1-combine.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/CVE-2015-3195-Fix-leak-with-ASN.1-combine.patch
index 6fc4d0e83..6fc4d0e83 100644
--- a/meta/recipes-connectivity/openssl/openssl/CVE-2015-3195-Fix-leak-with-ASN.1-combine.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/CVE-2015-3195-Fix-leak-with-ASN.1-combine.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2015-3197.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/CVE-2015-3197.patch
index dd288c93f..dd288c93f 100644
--- a/meta/recipes-connectivity/openssl/openssl/CVE-2015-3197.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/CVE-2015-3197.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2016-0701_1.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/CVE-2016-0701_1.patch
index cf2d9a7b0..cf2d9a7b0 100644
--- a/meta/recipes-connectivity/openssl/openssl/CVE-2016-0701_1.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/CVE-2016-0701_1.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2016-0701_2.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/CVE-2016-0701_2.patch
index 05caf0a99..05caf0a99 100644
--- a/meta/recipes-connectivity/openssl/openssl/CVE-2016-0701_2.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/CVE-2016-0701_2.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch
index 249446a5b..249446a5b 100644
--- a/meta/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/configure-targets.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/configure-targets.patch
index 691e74afb..691e74afb 100644
--- a/meta/recipes-connectivity/openssl/openssl/configure-targets.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/configure-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/crypto_use_bigint_in_x86-64_perl.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/crypto_use_bigint_in_x86-64_perl.patch
index c397af2f0..c397af2f0 100644
--- a/meta/recipes-connectivity/openssl/openssl/crypto_use_bigint_in_x86-64_perl.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/crypto_use_bigint_in_x86-64_perl.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch
index 68e54d561..68e54d561 100644
--- a/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/debian/ca.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/ca.patch
index aba4d4298..aba4d4298 100644
--- a/meta/recipes-connectivity/openssl/openssl/debian/ca.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/ca.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/debian/debian-targets.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/debian-targets.patch
index 39d432818..39d432818 100644
--- a/meta/recipes-connectivity/openssl/openssl/debian/debian-targets.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/debian-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/debian/man-dir.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/man-dir.patch
index 4085e3b1d..4085e3b1d 100644
--- a/meta/recipes-connectivity/openssl/openssl/debian/man-dir.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/man-dir.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/debian/man-section.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/man-section.patch
index 21c1d1a4e..21c1d1a4e 100644
--- a/meta/recipes-connectivity/openssl/openssl/debian/man-section.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/man-section.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/debian/no-rpath.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/no-rpath.patch
index 1ccb3b86e..1ccb3b86e 100644
--- a/meta/recipes-connectivity/openssl/openssl/debian/no-rpath.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/no-rpath.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/debian/no-symbolic.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/no-symbolic.patch
index cc4408ab7..cc4408ab7 100644
--- a/meta/recipes-connectivity/openssl/openssl/debian/no-symbolic.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/no-symbolic.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/debian/pic.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/pic.patch
index bfda3888b..bfda3888b 100644
--- a/meta/recipes-connectivity/openssl/openssl/debian/pic.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/pic.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/debian/version-script.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/version-script.patch
index a24918000..a24918000 100644
--- a/meta/recipes-connectivity/openssl/openssl/debian/version-script.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian/version-script.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_digicert_malaysia.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_digicert_malaysia.patch
index c43bcd1c7..c43bcd1c7 100644
--- a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_digicert_malaysia.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_digicert_malaysia.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch
index 0c1a0b651..0c1a0b651 100644
--- a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/engines-install-in-libdir-ssl.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/engines-install-in-libdir-ssl.patch
index a5746483e..a5746483e 100644
--- a/meta/recipes-connectivity/openssl/openssl/engines-install-in-libdir-ssl.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/engines-install-in-libdir-ssl.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/find.pl b/yocto-poky/meta/recipes-connectivity/openssl/openssl/find.pl
index 8e1b42c88..8e1b42c88 100644
--- a/meta/recipes-connectivity/openssl/openssl/find.pl
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/find.pl
diff --git a/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch
index 06d1ea69d..06d1ea69d 100644
--- a/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/oe-ldflags.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/oe-ldflags.patch
index 292e13dc5..292e13dc5 100644
--- a/meta/recipes-connectivity/openssl/openssl/oe-ldflags.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/oe-ldflags.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch
index 1e5bfa17d..1e5bfa17d 100644
--- a/meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
index cebc8cf0d..cebc8cf0d 100644
--- a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-fix-des.pod-error.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/openssl-fix-des.pod-error.patch
index de49729e5..de49729e5 100644
--- a/meta/recipes-connectivity/openssl/openssl/openssl-fix-des.pod-error.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/openssl-fix-des.pod-error.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch
index cbce32c89..cbce32c89 100644
--- a/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch
index ef6d17934..ef6d17934 100644
--- a/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/ptest_makefile_deps.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/ptest_makefile_deps.patch
index 4202e61d1..4202e61d1 100644
--- a/meta/recipes-connectivity/openssl/openssl/ptest_makefile_deps.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/ptest_makefile_deps.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/run-ptest b/yocto-poky/meta/recipes-connectivity/openssl/openssl/run-ptest
index 3b20fce1e..3b20fce1e 100755
--- a/meta/recipes-connectivity/openssl/openssl/run-ptest
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/run-ptest
diff --git a/meta/recipes-connectivity/openssl/openssl/shared-libs.patch b/yocto-poky/meta/recipes-connectivity/openssl/openssl/shared-libs.patch
index a7ca0a307..a7ca0a307 100644
--- a/meta/recipes-connectivity/openssl/openssl/shared-libs.patch
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl/shared-libs.patch
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2d.bb b/yocto-poky/meta/recipes-connectivity/openssl/openssl_1.0.2d.bb
index 8defa5b74..8defa5b74 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2d.bb
+++ b/yocto-poky/meta/recipes-connectivity/openssl/openssl_1.0.2d.bb
diff --git a/meta/recipes-connectivity/portmap/portmap.inc b/yocto-poky/meta/recipes-connectivity/portmap/portmap.inc
index 338af33a3..338af33a3 100644
--- a/meta/recipes-connectivity/portmap/portmap.inc
+++ b/yocto-poky/meta/recipes-connectivity/portmap/portmap.inc
diff --git a/meta/recipes-connectivity/portmap/portmap/destdir-no-strip.patch b/yocto-poky/meta/recipes-connectivity/portmap/portmap/destdir-no-strip.patch
index 2fbf784b7..2fbf784b7 100644
--- a/meta/recipes-connectivity/portmap/portmap/destdir-no-strip.patch
+++ b/yocto-poky/meta/recipes-connectivity/portmap/portmap/destdir-no-strip.patch
diff --git a/meta/recipes-connectivity/portmap/portmap/portmap.init b/yocto-poky/meta/recipes-connectivity/portmap/portmap/portmap.init
index 621aa171a..621aa171a 100755
--- a/meta/recipes-connectivity/portmap/portmap/portmap.init
+++ b/yocto-poky/meta/recipes-connectivity/portmap/portmap/portmap.init
diff --git a/meta/recipes-connectivity/portmap/portmap/portmap.service b/yocto-poky/meta/recipes-connectivity/portmap/portmap/portmap.service
index 7ef9d7b02..7ef9d7b02 100644
--- a/meta/recipes-connectivity/portmap/portmap/portmap.service
+++ b/yocto-poky/meta/recipes-connectivity/portmap/portmap/portmap.service
diff --git a/meta/recipes-connectivity/portmap/portmap/tcpd-config.patch b/yocto-poky/meta/recipes-connectivity/portmap/portmap/tcpd-config.patch
index 2f2505809..2f2505809 100644
--- a/meta/recipes-connectivity/portmap/portmap/tcpd-config.patch
+++ b/yocto-poky/meta/recipes-connectivity/portmap/portmap/tcpd-config.patch
diff --git a/meta/recipes-connectivity/portmap/portmap_6.0.bb b/yocto-poky/meta/recipes-connectivity/portmap/portmap_6.0.bb
index e727fe3cb..e727fe3cb 100644
--- a/meta/recipes-connectivity/portmap/portmap_6.0.bb
+++ b/yocto-poky/meta/recipes-connectivity/portmap/portmap_6.0.bb
diff --git a/meta/recipes-connectivity/ppp-dialin/files/host-peer b/yocto-poky/meta/recipes-connectivity/ppp-dialin/files/host-peer
index e7e2e11d4..e7e2e11d4 100644
--- a/meta/recipes-connectivity/ppp-dialin/files/host-peer
+++ b/yocto-poky/meta/recipes-connectivity/ppp-dialin/files/host-peer
diff --git a/meta/recipes-connectivity/ppp-dialin/files/ppp-dialin b/yocto-poky/meta/recipes-connectivity/ppp-dialin/files/ppp-dialin
index ea2771311..ea2771311 100644
--- a/meta/recipes-connectivity/ppp-dialin/files/ppp-dialin
+++ b/yocto-poky/meta/recipes-connectivity/ppp-dialin/files/ppp-dialin
diff --git a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb b/yocto-poky/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
index 51a76b429..51a76b429 100644
--- a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
+++ b/yocto-poky/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
diff --git a/meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch b/yocto-poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch
index 8aa2d2e67..8aa2d2e67 100644
--- a/meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch
diff --git a/meta/recipes-connectivity/ppp/ppp/08setupdns b/yocto-poky/meta/recipes-connectivity/ppp/ppp/08setupdns
index 998219de9..998219de9 100644
--- a/meta/recipes-connectivity/ppp/ppp/08setupdns
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/08setupdns
diff --git a/meta/recipes-connectivity/ppp/ppp/92removedns b/yocto-poky/meta/recipes-connectivity/ppp/ppp/92removedns
index 2eadec689..2eadec689 100644
--- a/meta/recipes-connectivity/ppp/ppp/92removedns
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/92removedns
diff --git a/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch b/yocto-poky/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch
index db4dbc27a..db4dbc27a 100644
--- a/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch
diff --git a/meta/recipes-connectivity/ppp/ppp/copts.patch b/yocto-poky/meta/recipes-connectivity/ppp/ppp/copts.patch
index 53ff06e03..53ff06e03 100644
--- a/meta/recipes-connectivity/ppp/ppp/copts.patch
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/copts.patch
diff --git a/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch b/yocto-poky/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch
index c9edb3059..c9edb3059 100644
--- a/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch
diff --git a/meta/recipes-connectivity/ppp/ppp/init b/yocto-poky/meta/recipes-connectivity/ppp/ppp/init
index 0c0136049..0c0136049 100755
--- a/meta/recipes-connectivity/ppp/ppp/init
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/init
diff --git a/meta/recipes-connectivity/ppp/ppp/ip-down b/yocto-poky/meta/recipes-connectivity/ppp/ppp/ip-down
index 06d35487a..06d35487a 100755
--- a/meta/recipes-connectivity/ppp/ppp/ip-down
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/ip-down
diff --git a/meta/recipes-connectivity/ppp/ppp/ip-up b/yocto-poky/meta/recipes-connectivity/ppp/ppp/ip-up
index fc2fae9fe..fc2fae9fe 100755
--- a/meta/recipes-connectivity/ppp/ppp/ip-up
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/ip-up
diff --git a/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch b/yocto-poky/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch
index d59717ebd..d59717ebd 100644
--- a/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch
diff --git a/meta/recipes-connectivity/ppp/ppp/makefile.patch b/yocto-poky/meta/recipes-connectivity/ppp/ppp/makefile.patch
index 2d09baf5d..2d09baf5d 100644
--- a/meta/recipes-connectivity/ppp/ppp/makefile.patch
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/makefile.patch
diff --git a/meta/recipes-connectivity/ppp/ppp/pap b/yocto-poky/meta/recipes-connectivity/ppp/ppp/pap
index 093c32607..093c32607 100644
--- a/meta/recipes-connectivity/ppp/ppp/pap
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/pap
diff --git a/meta/recipes-connectivity/ppp/ppp/poff b/yocto-poky/meta/recipes-connectivity/ppp/ppp/poff
index 0521a9406..0521a9406 100644
--- a/meta/recipes-connectivity/ppp/ppp/poff
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/poff
diff --git a/meta/recipes-connectivity/ppp/ppp/pon b/yocto-poky/meta/recipes-connectivity/ppp/ppp/pon
index 91c059501..91c059501 100644
--- a/meta/recipes-connectivity/ppp/ppp/pon
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/pon
diff --git a/meta/recipes-connectivity/ppp/ppp/ppp@.service b/yocto-poky/meta/recipes-connectivity/ppp/ppp/ppp@.service
index 2bf0b5e34..2bf0b5e34 100644
--- a/meta/recipes-connectivity/ppp/ppp/ppp@.service
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/ppp@.service
diff --git a/meta/recipes-connectivity/ppp/ppp/ppp_on_boot b/yocto-poky/meta/recipes-connectivity/ppp/ppp/ppp_on_boot
index 979376184..979376184 100644
--- a/meta/recipes-connectivity/ppp/ppp/ppp_on_boot
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/ppp_on_boot
diff --git a/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch b/yocto-poky/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch
index a72414ff8..a72414ff8 100644
--- a/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch
diff --git a/meta/recipes-connectivity/ppp/ppp/provider b/yocto-poky/meta/recipes-connectivity/ppp/ppp/provider
index e74d71a8e..e74d71a8e 100644
--- a/meta/recipes-connectivity/ppp/ppp/provider
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp/provider
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/yocto-poky/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
index adc38e10b..adc38e10b 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
+++ b/yocto-poky/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf b/yocto-poky/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf
index 3790d774a..3790d774a 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf
+++ b/yocto-poky/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch b/yocto-poky/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
index 1aead0786..1aead0786 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
+++ b/yocto-poky/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.77.bb b/yocto-poky/meta/recipes-connectivity/resolvconf/resolvconf_1.77.bb
index 916b9f2ae..916b9f2ae 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.77.bb
+++ b/yocto-poky/meta/recipes-connectivity/resolvconf/resolvconf_1.77.bb
diff --git a/meta/recipes-connectivity/socat/socat/CVE-2016-2217.patch b/yocto-poky/meta/recipes-connectivity/socat/socat/CVE-2016-2217.patch
index 0cd417944..0cd417944 100644
--- a/meta/recipes-connectivity/socat/socat/CVE-2016-2217.patch
+++ b/yocto-poky/meta/recipes-connectivity/socat/socat/CVE-2016-2217.patch
diff --git a/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch b/yocto-poky/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch
index aa4db65a7..aa4db65a7 100644
--- a/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch
+++ b/yocto-poky/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch
diff --git a/meta/recipes-connectivity/socat/socat_1.7.3.0.bb b/yocto-poky/meta/recipes-connectivity/socat/socat_1.7.3.0.bb
index 6d76d0fd0..6d76d0fd0 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.3.0.bb
+++ b/yocto-poky/meta/recipes-connectivity/socat/socat_1.7.3.0.bb
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch b/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch
index f34e243de..f34e243de 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch
+++ b/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch b/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch
index 6c0d8cbd2..6c0d8cbd2 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch
+++ b/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch b/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
index 6a757dae7..6a757dae7 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
+++ b/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch b/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch
index 3a22c3f1e..3a22c3f1e 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch
+++ b/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/wireless-tools.if-pre-up b/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/wireless-tools.if-pre-up
index 2518a5c83..2518a5c83 100755
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools/wireless-tools.if-pre-up
+++ b/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/wireless-tools.if-pre-up
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/zzz-wireless.if-pre-up b/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/zzz-wireless.if-pre-up
index 4c8e95bf2..4c8e95bf2 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools/zzz-wireless.if-pre-up
+++ b/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/zzz-wireless.if-pre-up
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb b/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb
index 26ecdf3b4..26ecdf3b4 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb
+++ b/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch
index 882674fe5..882674fe5 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch
+++ b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch
index a2bafc8c4..a2bafc8c4 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch
+++ b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
index e108a931c..e108a931c 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
+++ b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch
index 2568ea112..2568ea112 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch
+++ b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch
index c477c2f93..c477c2f93 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch
+++ b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0003-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0003-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch
index e46ce436e..e46ce436e 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0003-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch
+++ b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0003-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0004-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0004-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch
index a4c02b474..a4c02b474 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0004-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch
+++ b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0004-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0005-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0005-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch
index 407360073..407360073 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0005-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch
+++ b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0005-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/99_wpa_supplicant b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/99_wpa_supplicant
index 6ff4dd882..6ff4dd882 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/99_wpa_supplicant
+++ b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/99_wpa_supplicant
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig
index f04e398fd..f04e398fd 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig
+++ b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa-supplicant.sh b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa-supplicant.sh
index 5c9e5d33a..5c9e5d33a 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa-supplicant.sh
+++ b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa-supplicant.sh
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
index 68258f5ee..68258f5ee 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
+++ b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf-sane b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf-sane
index c91ffe0c8..c91ffe0c8 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf-sane
+++ b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf-sane
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.4.bb b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.4.bb
index a124cf21d..a124cf21d 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.4.bb
+++ b/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.4.bb
diff --git a/meta/recipes-core/base-files/base-files/filesystems b/yocto-poky/meta/recipes-core/base-files/base-files/filesystems
index 7e6c41c38..7e6c41c38 100644
--- a/meta/recipes-core/base-files/base-files/filesystems
+++ b/yocto-poky/meta/recipes-core/base-files/base-files/filesystems
diff --git a/meta/recipes-core/base-files/base-files/fstab b/yocto-poky/meta/recipes-core/base-files/base-files/fstab
index d79a01602..d79a01602 100644
--- a/meta/recipes-core/base-files/base-files/fstab
+++ b/yocto-poky/meta/recipes-core/base-files/base-files/fstab
diff --git a/meta/recipes-core/base-files/base-files/host.conf b/yocto-poky/meta/recipes-core/base-files/base-files/host.conf
index 1a8c1e151..1a8c1e151 100644
--- a/meta/recipes-core/base-files/base-files/host.conf
+++ b/yocto-poky/meta/recipes-core/base-files/base-files/host.conf
diff --git a/meta/recipes-core/base-files/base-files/inputrc b/yocto-poky/meta/recipes-core/base-files/base-files/inputrc
index b5c4c8af2..b5c4c8af2 100644
--- a/meta/recipes-core/base-files/base-files/inputrc
+++ b/yocto-poky/meta/recipes-core/base-files/base-files/inputrc
diff --git a/meta/recipes-core/base-files/base-files/issue b/yocto-poky/meta/recipes-core/base-files/base-files/issue
index e69de29bb..e69de29bb 100644
--- a/meta/recipes-core/base-files/base-files/issue
+++ b/yocto-poky/meta/recipes-core/base-files/base-files/issue
diff --git a/meta/recipes-core/base-files/base-files/issue.net b/yocto-poky/meta/recipes-core/base-files/base-files/issue.net
index e69de29bb..e69de29bb 100644
--- a/meta/recipes-core/base-files/base-files/issue.net
+++ b/yocto-poky/meta/recipes-core/base-files/base-files/issue.net
diff --git a/meta/recipes-core/base-files/base-files/licenses/GPL-2 b/yocto-poky/meta/recipes-core/base-files/base-files/licenses/GPL-2
index d60c31a97..d60c31a97 100644
--- a/meta/recipes-core/base-files/base-files/licenses/GPL-2
+++ b/yocto-poky/meta/recipes-core/base-files/base-files/licenses/GPL-2
diff --git a/meta/recipes-core/base-files/base-files/motd b/yocto-poky/meta/recipes-core/base-files/base-files/motd
index e69de29bb..e69de29bb 100644
--- a/meta/recipes-core/base-files/base-files/motd
+++ b/yocto-poky/meta/recipes-core/base-files/base-files/motd
diff --git a/meta/recipes-core/base-files/base-files/nsswitch.conf b/yocto-poky/meta/recipes-core/base-files/base-files/nsswitch.conf
index 06f03d22a..06f03d22a 100644
--- a/meta/recipes-core/base-files/base-files/nsswitch.conf
+++ b/yocto-poky/meta/recipes-core/base-files/base-files/nsswitch.conf
diff --git a/meta/recipes-core/base-files/base-files/profile b/yocto-poky/meta/recipes-core/base-files/base-files/profile
index 53c268040..53c268040 100644
--- a/meta/recipes-core/base-files/base-files/profile
+++ b/yocto-poky/meta/recipes-core/base-files/base-files/profile
diff --git a/meta/recipes-core/base-files/base-files/rotation b/yocto-poky/meta/recipes-core/base-files/base-files/rotation
index c22708346..c22708346 100644
--- a/meta/recipes-core/base-files/base-files/rotation
+++ b/yocto-poky/meta/recipes-core/base-files/base-files/rotation
diff --git a/meta/recipes-core/base-files/base-files/share/dot.bashrc b/yocto-poky/meta/recipes-core/base-files/base-files/share/dot.bashrc
index 4be63686c..4be63686c 100644
--- a/meta/recipes-core/base-files/base-files/share/dot.bashrc
+++ b/yocto-poky/meta/recipes-core/base-files/base-files/share/dot.bashrc
diff --git a/meta/recipes-core/base-files/base-files/share/dot.profile b/yocto-poky/meta/recipes-core/base-files/base-files/share/dot.profile
index 979793e8b..979793e8b 100644
--- a/meta/recipes-core/base-files/base-files/share/dot.profile
+++ b/yocto-poky/meta/recipes-core/base-files/base-files/share/dot.profile
diff --git a/meta/recipes-core/base-files/base-files/shells b/yocto-poky/meta/recipes-core/base-files/base-files/shells
index 3f639874d..3f639874d 100644
--- a/meta/recipes-core/base-files/base-files/shells
+++ b/yocto-poky/meta/recipes-core/base-files/base-files/shells
diff --git a/meta/recipes-core/base-files/base-files/usbd b/yocto-poky/meta/recipes-core/base-files/base-files/usbd
index e69de29bb..e69de29bb 100644
--- a/meta/recipes-core/base-files/base-files/usbd
+++ b/yocto-poky/meta/recipes-core/base-files/base-files/usbd
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/yocto-poky/meta/recipes-core/base-files/base-files_3.0.14.bb
index e16fe722b..e16fe722b 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/yocto-poky/meta/recipes-core/base-files/base-files_3.0.14.bb
diff --git a/meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch b/yocto-poky/meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch
index 5f357d889..5f357d889 100644
--- a/meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch
+++ b/yocto-poky/meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch
diff --git a/meta/recipes-core/base-passwd/base-passwd/disable-docs.patch b/yocto-poky/meta/recipes-core/base-passwd/base-passwd/disable-docs.patch
index 14c08b748..14c08b748 100644
--- a/meta/recipes-core/base-passwd/base-passwd/disable-docs.patch
+++ b/yocto-poky/meta/recipes-core/base-passwd/base-passwd/disable-docs.patch
diff --git a/meta/recipes-core/base-passwd/base-passwd/input.patch b/yocto-poky/meta/recipes-core/base-passwd/base-passwd/input.patch
index 3abbcad5d..3abbcad5d 100644
--- a/meta/recipes-core/base-passwd/base-passwd/input.patch
+++ b/yocto-poky/meta/recipes-core/base-passwd/base-passwd/input.patch
diff --git a/meta/recipes-core/base-passwd/base-passwd/nobash.patch b/yocto-poky/meta/recipes-core/base-passwd/base-passwd/nobash.patch
index b5a692295..b5a692295 100644
--- a/meta/recipes-core/base-passwd/base-passwd/nobash.patch
+++ b/yocto-poky/meta/recipes-core/base-passwd/base-passwd/nobash.patch
diff --git a/meta/recipes-core/base-passwd/base-passwd/noshadow.patch b/yocto-poky/meta/recipes-core/base-passwd/base-passwd/noshadow.patch
index e27bf7d9b..e27bf7d9b 100644
--- a/meta/recipes-core/base-passwd/base-passwd/noshadow.patch
+++ b/yocto-poky/meta/recipes-core/base-passwd/base-passwd/noshadow.patch
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/yocto-poky/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
index ac9bd81d3..ac9bd81d3 100644
--- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
+++ b/yocto-poky/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
diff --git a/meta/recipes-core/busybox/busybox.inc b/yocto-poky/meta/recipes-core/busybox/busybox.inc
index 4d4709a48..4d4709a48 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/yocto-poky/meta/recipes-core/busybox/busybox.inc
diff --git a/meta/recipes-core/busybox/busybox/0001-Switch-to-POSIX-utmpx-API.patch b/yocto-poky/meta/recipes-core/busybox/busybox/0001-Switch-to-POSIX-utmpx-API.patch
index 1d299eec9..1d299eec9 100644
--- a/meta/recipes-core/busybox/busybox/0001-Switch-to-POSIX-utmpx-API.patch
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/0001-Switch-to-POSIX-utmpx-API.patch
diff --git a/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch b/yocto-poky/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
index 2bf2b91c7..2bf2b91c7 100644
--- a/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
diff --git a/meta/recipes-core/busybox/busybox/0001-chown-fix-help-text.patch b/yocto-poky/meta/recipes-core/busybox/busybox/0001-chown-fix-help-text.patch
index 429979966..429979966 100644
--- a/meta/recipes-core/busybox/busybox/0001-chown-fix-help-text.patch
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/0001-chown-fix-help-text.patch
diff --git a/meta/recipes-core/busybox/busybox/0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch b/yocto-poky/meta/recipes-core/busybox/busybox/0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch
index 2d729b1b0..2d729b1b0 100644
--- a/meta/recipes-core/busybox/busybox/0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch
diff --git a/meta/recipes-core/busybox/busybox/0001-randconfig-fix.patch b/yocto-poky/meta/recipes-core/busybox/busybox/0001-randconfig-fix.patch
index 415ec3409..415ec3409 100644
--- a/meta/recipes-core/busybox/busybox/0001-randconfig-fix.patch
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/0001-randconfig-fix.patch
diff --git a/meta/recipes-core/busybox/busybox/0002-Passthrough-r-to-linker.patch b/yocto-poky/meta/recipes-core/busybox/busybox/0002-Passthrough-r-to-linker.patch
index de286fb74..de286fb74 100644
--- a/meta/recipes-core/busybox/busybox/0002-Passthrough-r-to-linker.patch
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/0002-Passthrough-r-to-linker.patch
diff --git a/meta/recipes-core/busybox/busybox/busybox-appletlib-dependency.patch b/yocto-poky/meta/recipes-core/busybox/busybox/busybox-appletlib-dependency.patch
index de2dbcceb..de2dbcceb 100644
--- a/meta/recipes-core/busybox/busybox/busybox-appletlib-dependency.patch
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/busybox-appletlib-dependency.patch
diff --git a/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch b/yocto-poky/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch
index bda86859d..bda86859d 100644
--- a/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch
diff --git a/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch b/yocto-poky/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
index 4c9ce3b71..4c9ce3b71 100644
--- a/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
diff --git a/meta/recipes-core/busybox/busybox/defconfig b/yocto-poky/meta/recipes-core/busybox/busybox/defconfig
index 4f5df9ebe..4f5df9ebe 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/defconfig
diff --git a/meta/recipes-core/busybox/busybox/fail_on_no_media.patch b/yocto-poky/meta/recipes-core/busybox/busybox/fail_on_no_media.patch
index 6745f169f..6745f169f 100644
--- a/meta/recipes-core/busybox/busybox/fail_on_no_media.patch
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/fail_on_no_media.patch
diff --git a/meta/recipes-core/busybox/busybox/get_header_tar.patch b/yocto-poky/meta/recipes-core/busybox/busybox/get_header_tar.patch
index 0e528ff91..0e528ff91 100644
--- a/meta/recipes-core/busybox/busybox/get_header_tar.patch
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/get_header_tar.patch
diff --git a/meta/recipes-core/busybox/busybox/getopts.cfg b/yocto-poky/meta/recipes-core/busybox/busybox/getopts.cfg
index 8db0a4a8f..8db0a4a8f 100644
--- a/meta/recipes-core/busybox/busybox/getopts.cfg
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/getopts.cfg
diff --git a/meta/recipes-core/busybox/busybox/login-utilities.cfg b/yocto-poky/meta/recipes-core/busybox/busybox/login-utilities.cfg
index cc9b2db50..cc9b2db50 100644
--- a/meta/recipes-core/busybox/busybox/login-utilities.cfg
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/login-utilities.cfg
diff --git a/meta/recipes-core/busybox/busybox/mount-via-label.cfg b/yocto-poky/meta/recipes-core/busybox/busybox/mount-via-label.cfg
index 2fe7ab2e5..2fe7ab2e5 100644
--- a/meta/recipes-core/busybox/busybox/mount-via-label.cfg
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/mount-via-label.cfg
diff --git a/meta/recipes-core/busybox/busybox/recognize_connmand.patch b/yocto-poky/meta/recipes-core/busybox/busybox/recognize_connmand.patch
index f42c74caa..f42c74caa 100644
--- a/meta/recipes-core/busybox/busybox/recognize_connmand.patch
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/recognize_connmand.patch
diff --git a/meta/recipes-core/busybox/busybox/sha1sum.cfg b/yocto-poky/meta/recipes-core/busybox/busybox/sha1sum.cfg
index 20e72d926..20e72d926 100644
--- a/meta/recipes-core/busybox/busybox/sha1sum.cfg
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/sha1sum.cfg
diff --git a/meta/recipes-core/busybox/busybox/sha256sum.cfg b/yocto-poky/meta/recipes-core/busybox/busybox/sha256sum.cfg
index ce652ae4c..ce652ae4c 100644
--- a/meta/recipes-core/busybox/busybox/sha256sum.cfg
+++ b/yocto-poky/meta/recipes-core/busybox/busybox/sha256sum.cfg
diff --git a/meta/recipes-core/busybox/busybox_1.23.2.bb b/yocto-poky/meta/recipes-core/busybox/busybox_1.23.2.bb
index 7258df022..7258df022 100644
--- a/meta/recipes-core/busybox/busybox_1.23.2.bb
+++ b/yocto-poky/meta/recipes-core/busybox/busybox_1.23.2.bb
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/yocto-poky/meta/recipes-core/busybox/busybox_git.bb
index ade72f4b7..ade72f4b7 100644
--- a/meta/recipes-core/busybox/busybox_git.bb
+++ b/yocto-poky/meta/recipes-core/busybox/busybox_git.bb
diff --git a/meta/recipes-core/busybox/files/busybox-cron b/yocto-poky/meta/recipes-core/busybox/files/busybox-cron
index f0e6b1562..f0e6b1562 100755
--- a/meta/recipes-core/busybox/files/busybox-cron
+++ b/yocto-poky/meta/recipes-core/busybox/files/busybox-cron
diff --git a/meta/recipes-core/busybox/files/busybox-httpd b/yocto-poky/meta/recipes-core/busybox/files/busybox-httpd
index c8348e54a..c8348e54a 100755
--- a/meta/recipes-core/busybox/files/busybox-httpd
+++ b/yocto-poky/meta/recipes-core/busybox/files/busybox-httpd
diff --git a/meta/recipes-core/busybox/files/busybox-klogd.service.in b/yocto-poky/meta/recipes-core/busybox/files/busybox-klogd.service.in
index d7c77558f..d7c77558f 100644
--- a/meta/recipes-core/busybox/files/busybox-klogd.service.in
+++ b/yocto-poky/meta/recipes-core/busybox/files/busybox-klogd.service.in
diff --git a/meta/recipes-core/busybox/files/busybox-syslog.default b/yocto-poky/meta/recipes-core/busybox/files/busybox-syslog.default
index e516caf51..e516caf51 100644
--- a/meta/recipes-core/busybox/files/busybox-syslog.default
+++ b/yocto-poky/meta/recipes-core/busybox/files/busybox-syslog.default
diff --git a/meta/recipes-core/busybox/files/busybox-syslog.service.in b/yocto-poky/meta/recipes-core/busybox/files/busybox-syslog.service.in
index 2e0432138..2e0432138 100644
--- a/meta/recipes-core/busybox/files/busybox-syslog.service.in
+++ b/yocto-poky/meta/recipes-core/busybox/files/busybox-syslog.service.in
diff --git a/meta/recipes-core/busybox/files/busybox-udhcpd b/yocto-poky/meta/recipes-core/busybox/files/busybox-udhcpd
index c43903e8d..c43903e8d 100755
--- a/meta/recipes-core/busybox/files/busybox-udhcpd
+++ b/yocto-poky/meta/recipes-core/busybox/files/busybox-udhcpd
diff --git a/meta/recipes-core/busybox/files/default.script b/yocto-poky/meta/recipes-core/busybox/files/default.script
index f2ac987a2..f2ac987a2 100644
--- a/meta/recipes-core/busybox/files/default.script
+++ b/yocto-poky/meta/recipes-core/busybox/files/default.script
diff --git a/meta/recipes-core/busybox/files/find-touchscreen.sh b/yocto-poky/meta/recipes-core/busybox/files/find-touchscreen.sh
index 52c5e7a09..52c5e7a09 100644
--- a/meta/recipes-core/busybox/files/find-touchscreen.sh
+++ b/yocto-poky/meta/recipes-core/busybox/files/find-touchscreen.sh
diff --git a/meta/recipes-core/busybox/files/hwclock.sh b/yocto-poky/meta/recipes-core/busybox/files/hwclock.sh
index be5f94d86..be5f94d86 100644
--- a/meta/recipes-core/busybox/files/hwclock.sh
+++ b/yocto-poky/meta/recipes-core/busybox/files/hwclock.sh
diff --git a/meta/recipes-core/busybox/files/inetd b/yocto-poky/meta/recipes-core/busybox/files/inetd
index cf50bcd54..cf50bcd54 100644
--- a/meta/recipes-core/busybox/files/inetd
+++ b/yocto-poky/meta/recipes-core/busybox/files/inetd
diff --git a/meta/recipes-core/busybox/files/inetd.conf b/yocto-poky/meta/recipes-core/busybox/files/inetd.conf
index b02fe850c..b02fe850c 100644
--- a/meta/recipes-core/busybox/files/inetd.conf
+++ b/yocto-poky/meta/recipes-core/busybox/files/inetd.conf
diff --git a/meta/recipes-core/busybox/files/mdev b/yocto-poky/meta/recipes-core/busybox/files/mdev
index 96252477e..96252477e 100755
--- a/meta/recipes-core/busybox/files/mdev
+++ b/yocto-poky/meta/recipes-core/busybox/files/mdev
diff --git a/meta/recipes-core/busybox/files/mdev-mount.sh b/yocto-poky/meta/recipes-core/busybox/files/mdev-mount.sh
index d5d66d66f..d5d66d66f 100644
--- a/meta/recipes-core/busybox/files/mdev-mount.sh
+++ b/yocto-poky/meta/recipes-core/busybox/files/mdev-mount.sh
diff --git a/meta/recipes-core/busybox/files/mdev.conf b/yocto-poky/meta/recipes-core/busybox/files/mdev.conf
index 17e93da7c..17e93da7c 100644
--- a/meta/recipes-core/busybox/files/mdev.conf
+++ b/yocto-poky/meta/recipes-core/busybox/files/mdev.conf
diff --git a/meta/recipes-core/busybox/files/mount.busybox b/yocto-poky/meta/recipes-core/busybox/files/mount.busybox
index fef945b7b..fef945b7b 100755
--- a/meta/recipes-core/busybox/files/mount.busybox
+++ b/yocto-poky/meta/recipes-core/busybox/files/mount.busybox
diff --git a/meta/recipes-core/busybox/files/run-ptest b/yocto-poky/meta/recipes-core/busybox/files/run-ptest
index 3608a8eb6..3608a8eb6 100644
--- a/meta/recipes-core/busybox/files/run-ptest
+++ b/yocto-poky/meta/recipes-core/busybox/files/run-ptest
diff --git a/meta/recipes-core/busybox/files/simple.script b/yocto-poky/meta/recipes-core/busybox/files/simple.script
index 22168b07e..22168b07e 100644
--- a/meta/recipes-core/busybox/files/simple.script
+++ b/yocto-poky/meta/recipes-core/busybox/files/simple.script
diff --git a/meta/recipes-core/busybox/files/syslog b/yocto-poky/meta/recipes-core/busybox/files/syslog
index 89c4d12e9..89c4d12e9 100644
--- a/meta/recipes-core/busybox/files/syslog
+++ b/yocto-poky/meta/recipes-core/busybox/files/syslog
diff --git a/meta/recipes-core/busybox/files/syslog-startup.conf b/yocto-poky/meta/recipes-core/busybox/files/syslog-startup.conf
index fda450aa0..fda450aa0 100644
--- a/meta/recipes-core/busybox/files/syslog-startup.conf
+++ b/yocto-poky/meta/recipes-core/busybox/files/syslog-startup.conf
diff --git a/meta/recipes-core/busybox/files/syslog.conf b/yocto-poky/meta/recipes-core/busybox/files/syslog.conf
index 75bb6309a..75bb6309a 100644
--- a/meta/recipes-core/busybox/files/syslog.conf
+++ b/yocto-poky/meta/recipes-core/busybox/files/syslog.conf
diff --git a/meta/recipes-core/busybox/files/umount.busybox b/yocto-poky/meta/recipes-core/busybox/files/umount.busybox
index f3731626e..f3731626e 100755
--- a/meta/recipes-core/busybox/files/umount.busybox
+++ b/yocto-poky/meta/recipes-core/busybox/files/umount.busybox
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars
index 32692ab4b..32692ab4b 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars
+++ b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch
index c28701476..c28701476 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch
+++ b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch
index c93f51195..c93f51195 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch
+++ b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
index 15c100c90..15c100c90 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
+++ b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch
index be61eb846..be61eb846 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch
+++ b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch
index f370be859..f370be859 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch
+++ b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4 b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4
index 18d47a94f..18d47a94f 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4
+++ b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch
index a6735a53f..a6735a53f 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch
+++ b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch
index 2ed609219..2ed609219 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch
+++ b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch
index 0c95068a3..0c95068a3 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch
+++ b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch
diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/yocto-poky/meta/recipes-core/console-tools/console-tools_0.3.2.bb
index c60a5a05b..c60a5a05b 100644
--- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
+++ b/yocto-poky/meta/recipes-core/console-tools/console-tools_0.3.2.bb
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/coreutils-6.9-cp-i-u.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils-6.9-cp-i-u.patch
index 5452b46bb..5452b46bb 100644
--- a/meta/recipes-core/coreutils/coreutils-6.9/coreutils-6.9-cp-i-u.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils-6.9-cp-i-u.patch
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/coreutils-build-with-acl.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils-build-with-acl.patch
index 8273d78eb..8273d78eb 100644
--- a/meta/recipes-core/coreutils/coreutils-6.9/coreutils-build-with-acl.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils-build-with-acl.patch
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/coreutils-fix-install.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils-fix-install.patch
index 88f61fa10..88f61fa10 100644
--- a/meta/recipes-core/coreutils/coreutils-6.9/coreutils-fix-install.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils-fix-install.patch
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/coreutils-fix-texinfo.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils-fix-texinfo.patch
index 3ae5a2fae..3ae5a2fae 100644
--- a/meta/recipes-core/coreutils/coreutils-6.9/coreutils-fix-texinfo.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils-fix-texinfo.patch
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/coreutils-i18n.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils-i18n.patch
index 653722348..653722348 100644
--- a/meta/recipes-core/coreutils/coreutils-6.9/coreutils-i18n.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils-i18n.patch
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/coreutils-ls-x.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils-ls-x.patch
index aba8742f6..aba8742f6 100644
--- a/meta/recipes-core/coreutils/coreutils-6.9/coreutils-ls-x.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils-ls-x.patch
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/coreutils-overflow.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils-overflow.patch
index 58074c09a..58074c09a 100644
--- a/meta/recipes-core/coreutils/coreutils-6.9/coreutils-overflow.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils-overflow.patch
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/coreutils_fix_for_automake-1.12.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils_fix_for_automake-1.12.patch
index 02730dbbb..02730dbbb 100644
--- a/meta/recipes-core/coreutils/coreutils-6.9/coreutils_fix_for_automake-1.12.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/coreutils_fix_for_automake-1.12.patch
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/fix_for_manpage_building.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/fix_for_manpage_building.patch
index e0d600a39..e0d600a39 100644
--- a/meta/recipes-core/coreutils/coreutils-6.9/fix_for_manpage_building.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/fix_for_manpage_building.patch
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/futimens.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/futimens.patch
index 5ca590bcc..5ca590bcc 100644
--- a/meta/recipes-core/coreutils/coreutils-6.9/futimens.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/futimens.patch
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/gnulib_m4.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/gnulib_m4.patch
index 8f355520b..8f355520b 100644
--- a/meta/recipes-core/coreutils/coreutils-6.9/gnulib_m4.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/gnulib_m4.patch
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/loadavg.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/loadavg.patch
index c72efd4d3..c72efd4d3 100644
--- a/meta/recipes-core/coreutils/coreutils-6.9/loadavg.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/loadavg.patch
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/man-touch.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/man-touch.patch
index c42cb9c05..c42cb9c05 100644
--- a/meta/recipes-core/coreutils/coreutils-6.9/man-touch.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-6.9/man-touch.patch
diff --git a/meta/recipes-core/coreutils/coreutils-8.24/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-8.24/0001-Unset-need_charset_alias-when-building-for-musl.patch
index ba1a4bab4..ba1a4bab4 100644
--- a/meta/recipes-core/coreutils/coreutils-8.24/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-8.24/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-core/coreutils/coreutils-8.24/fix-selinux-flask.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-8.24/fix-selinux-flask.patch
index 9d1ae55d4..9d1ae55d4 100644
--- a/meta/recipes-core/coreutils/coreutils-8.24/fix-selinux-flask.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-8.24/fix-selinux-flask.patch
diff --git a/meta/recipes-core/coreutils/coreutils-8.24/man-decouple-manpages-from-build.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-8.24/man-decouple-manpages-from-build.patch
index 3c896a11b..3c896a11b 100644
--- a/meta/recipes-core/coreutils/coreutils-8.24/man-decouple-manpages-from-build.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-8.24/man-decouple-manpages-from-build.patch
diff --git a/meta/recipes-core/coreutils/coreutils-8.24/remove-usr-local-lib-from-m4.patch b/yocto-poky/meta/recipes-core/coreutils/coreutils-8.24/remove-usr-local-lib-from-m4.patch
index 2ef8a548a..2ef8a548a 100644
--- a/meta/recipes-core/coreutils/coreutils-8.24/remove-usr-local-lib-from-m4.patch
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils-8.24/remove-usr-local-lib-from-m4.patch
diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/yocto-poky/meta/recipes-core/coreutils/coreutils_6.9.bb
index e9f82abc8..e9f82abc8 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils_6.9.bb
diff --git a/meta/recipes-core/coreutils/coreutils_8.24.bb b/yocto-poky/meta/recipes-core/coreutils/coreutils_8.24.bb
index f04234624..f04234624 100644
--- a/meta/recipes-core/coreutils/coreutils_8.24.bb
+++ b/yocto-poky/meta/recipes-core/coreutils/coreutils_8.24.bb
diff --git a/meta/recipes-core/dbus-wait/dbus-wait_git.bb b/yocto-poky/meta/recipes-core/dbus-wait/dbus-wait_git.bb
index 691dc86e9..691dc86e9 100644
--- a/meta/recipes-core/dbus-wait/dbus-wait_git.bb
+++ b/yocto-poky/meta/recipes-core/dbus-wait/dbus-wait_git.bb
diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/yocto-poky/meta/recipes-core/dbus/dbus-glib.inc
index abd013247..abd013247 100644
--- a/meta/recipes-core/dbus/dbus-glib.inc
+++ b/yocto-poky/meta/recipes-core/dbus/dbus-glib.inc
diff --git a/meta/recipes-core/dbus/dbus-glib/no-examples.patch b/yocto-poky/meta/recipes-core/dbus/dbus-glib/no-examples.patch
index fbb496782..fbb496782 100644
--- a/meta/recipes-core/dbus/dbus-glib/no-examples.patch
+++ b/yocto-poky/meta/recipes-core/dbus/dbus-glib/no-examples.patch
diff --git a/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch b/yocto-poky/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch
index 027c82b27..027c82b27 100644
--- a/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch
+++ b/yocto-poky/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch
diff --git a/meta/recipes-core/dbus/dbus-glib_0.104.bb b/yocto-poky/meta/recipes-core/dbus/dbus-glib_0.104.bb
index c1263c0af..c1263c0af 100644
--- a/meta/recipes-core/dbus/dbus-glib_0.104.bb
+++ b/yocto-poky/meta/recipes-core/dbus/dbus-glib_0.104.bb
diff --git a/meta/recipes-core/dbus/dbus-test_1.8.20.bb b/yocto-poky/meta/recipes-core/dbus/dbus-test_1.8.20.bb
index 704070bf2..704070bf2 100644
--- a/meta/recipes-core/dbus/dbus-test_1.8.20.bb
+++ b/yocto-poky/meta/recipes-core/dbus/dbus-test_1.8.20.bb
diff --git a/meta/recipes-core/dbus/dbus.inc b/yocto-poky/meta/recipes-core/dbus/dbus.inc
index 3971081fd..3971081fd 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/yocto-poky/meta/recipes-core/dbus/dbus.inc
diff --git a/meta/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch b/yocto-poky/meta/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch
index 6bb6d9c82..6bb6d9c82 100644
--- a/meta/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch
+++ b/yocto-poky/meta/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch
diff --git a/meta/recipes-core/dbus/dbus/dbus-1.init b/yocto-poky/meta/recipes-core/dbus/dbus/dbus-1.init
index 42c86297c..42c86297c 100644
--- a/meta/recipes-core/dbus/dbus/dbus-1.init
+++ b/yocto-poky/meta/recipes-core/dbus/dbus/dbus-1.init
diff --git a/meta/recipes-core/dbus/dbus/os-test.patch b/yocto-poky/meta/recipes-core/dbus/dbus/os-test.patch
index 54c257f81..54c257f81 100644
--- a/meta/recipes-core/dbus/dbus/os-test.patch
+++ b/yocto-poky/meta/recipes-core/dbus/dbus/os-test.patch
diff --git a/meta/recipes-core/dbus/dbus/python-config.patch b/yocto-poky/meta/recipes-core/dbus/dbus/python-config.patch
index 294400247..294400247 100644
--- a/meta/recipes-core/dbus/dbus/python-config.patch
+++ b/yocto-poky/meta/recipes-core/dbus/dbus/python-config.patch
diff --git a/meta/recipes-core/dbus/dbus/run-ptest b/yocto-poky/meta/recipes-core/dbus/dbus/run-ptest
index c72d083a9..c72d083a9 100755
--- a/meta/recipes-core/dbus/dbus/run-ptest
+++ b/yocto-poky/meta/recipes-core/dbus/dbus/run-ptest
diff --git a/meta/recipes-core/dbus/dbus/tmpdir.patch b/yocto-poky/meta/recipes-core/dbus/dbus/tmpdir.patch
index bf086e178..bf086e178 100644
--- a/meta/recipes-core/dbus/dbus/tmpdir.patch
+++ b/yocto-poky/meta/recipes-core/dbus/dbus/tmpdir.patch
diff --git a/meta/recipes-core/dbus/dbus_1.8.20.bb b/yocto-poky/meta/recipes-core/dbus/dbus_1.8.20.bb
index a8f2094ea..a8f2094ea 100644
--- a/meta/recipes-core/dbus/dbus_1.8.20.bb
+++ b/yocto-poky/meta/recipes-core/dbus/dbus_1.8.20.bb
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/yocto-poky/meta/recipes-core/dropbear/dropbear.inc
index a2c736e17..a2c736e17 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/yocto-poky/meta/recipes-core/dropbear/dropbear.inc
diff --git a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch b/yocto-poky/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
index dc9d5782e..dc9d5782e 100644
--- a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
+++ b/yocto-poky/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
diff --git a/meta/recipes-core/dropbear/dropbear/0003-configure.patch b/yocto-poky/meta/recipes-core/dropbear/dropbear/0003-configure.patch
index c53ab01dd..c53ab01dd 100644
--- a/meta/recipes-core/dropbear/dropbear/0003-configure.patch
+++ b/yocto-poky/meta/recipes-core/dropbear/dropbear/0003-configure.patch
diff --git a/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch b/yocto-poky/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
index 7539d2034..7539d2034 100644
--- a/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
+++ b/yocto-poky/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
diff --git a/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch b/yocto-poky/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
index c408c571e..c408c571e 100644
--- a/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
+++ b/yocto-poky/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
diff --git a/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch b/yocto-poky/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch
index fa4c8d0a6..fa4c8d0a6 100644
--- a/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch
+++ b/yocto-poky/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch
diff --git a/meta/recipes-core/dropbear/dropbear/0007-dropbear-fix-for-x32-abi.patch b/yocto-poky/meta/recipes-core/dropbear/dropbear/0007-dropbear-fix-for-x32-abi.patch
index b4501211c..b4501211c 100644
--- a/meta/recipes-core/dropbear/dropbear/0007-dropbear-fix-for-x32-abi.patch
+++ b/yocto-poky/meta/recipes-core/dropbear/dropbear/0007-dropbear-fix-for-x32-abi.patch
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear b/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear
index 47e787fb1..47e787fb1 100644
--- a/meta/recipes-core/dropbear/dropbear/dropbear
+++ b/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear.socket b/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear.socket
index e5c61b755..e5c61b755 100644
--- a/meta/recipes-core/dropbear/dropbear/dropbear.socket
+++ b/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear.socket
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear@.service b/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear@.service
index b420bcddc..b420bcddc 100644
--- a/meta/recipes-core/dropbear/dropbear/dropbear@.service
+++ b/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear@.service
diff --git a/meta/recipes-core/dropbear/dropbear/dropbearkey.service b/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbearkey.service
index c49053d57..c49053d57 100644
--- a/meta/recipes-core/dropbear/dropbear/dropbearkey.service
+++ b/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbearkey.service
diff --git a/meta/recipes-core/dropbear/dropbear/init b/yocto-poky/meta/recipes-core/dropbear/dropbear/init
index e8fed3f94..e8fed3f94 100755
--- a/meta/recipes-core/dropbear/dropbear/init
+++ b/yocto-poky/meta/recipes-core/dropbear/dropbear/init
diff --git a/yocto-poky/meta/recipes-core/dropbear/dropbear_2015.71.bb b/yocto-poky/meta/recipes-core/dropbear/dropbear_2015.71.bb
new file mode 100644
index 000000000..4dabefa8f
--- /dev/null
+++ b/yocto-poky/meta/recipes-core/dropbear/dropbear_2015.71.bb
@@ -0,0 +1,4 @@
+require dropbear.inc
+
+SRC_URI[md5sum] = "2ccc0a2f3e37ca221db12c5af6a88137"
+SRC_URI[sha256sum] = "376214169c0e187ee9f48ae1a99b3f835016ad5b98ede4bfd1cf581deba783af"
diff --git a/meta/recipes-core/expat/expat-2.1.0/autotools.patch b/yocto-poky/meta/recipes-core/expat/expat-2.1.0/autotools.patch
index 0e599697a..0e599697a 100644
--- a/meta/recipes-core/expat/expat-2.1.0/autotools.patch
+++ b/yocto-poky/meta/recipes-core/expat/expat-2.1.0/autotools.patch
diff --git a/meta/recipes-core/expat/expat.inc b/yocto-poky/meta/recipes-core/expat/expat.inc
index 6dfafe94d..6dfafe94d 100644
--- a/meta/recipes-core/expat/expat.inc
+++ b/yocto-poky/meta/recipes-core/expat/expat.inc
diff --git a/meta/recipes-core/expat/expat_2.1.0.bb b/yocto-poky/meta/recipes-core/expat/expat_2.1.0.bb
index b958742ed..b958742ed 100644
--- a/meta/recipes-core/expat/expat_2.1.0.bb
+++ b/yocto-poky/meta/recipes-core/expat/expat_2.1.0.bb
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch b/yocto-poky/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
index e4c5f1566..e4c5f1566 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
+++ b/yocto-poky/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch b/yocto-poky/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
index 7293f5b08..7293f5b08 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
+++ b/yocto-poky/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch b/yocto-poky/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
index 06861492c..06861492c 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
+++ b/yocto-poky/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch b/yocto-poky/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
index 072fe5ff6..072fe5ff6 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
+++ b/yocto-poky/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch b/yocto-poky/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
index f09e450ef..f09e450ef 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
+++ b/yocto-poky/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch b/yocto-poky/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
index 4da8dd453..4da8dd453 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
+++ b/yocto-poky/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch b/yocto-poky/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
index d92106971..d92106971 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
+++ b/yocto-poky/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
diff --git a/meta/recipes-core/gettext/gettext-0.19.4/parallel.patch b/yocto-poky/meta/recipes-core/gettext/gettext-0.19.4/parallel.patch
index c8e2c94af..c8e2c94af 100644
--- a/meta/recipes-core/gettext/gettext-0.19.4/parallel.patch
+++ b/yocto-poky/meta/recipes-core/gettext/gettext-0.19.4/parallel.patch
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch b/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
index 29ef2a5a6..29ef2a5a6 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
+++ b/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.4/COPYING b/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.4/COPYING
index 8d11d1d8e..8d11d1d8e 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.4/COPYING
+++ b/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.4/COPYING
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.4/Makefile.in.in b/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.4/Makefile.in.in
index 8906ba0ff..8906ba0ff 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.4/Makefile.in.in
+++ b/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.4/Makefile.in.in
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.4/aclocal.tgz b/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.4/aclocal.tgz
index b04ba5503..b04ba5503 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.4/aclocal.tgz
+++ b/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.4/aclocal.tgz
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.4/config.rpath b/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.4/config.rpath
index b625621fa..b625621fa 100755
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.4/config.rpath
+++ b/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.4/config.rpath
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.4/remove-potcdate.sin b/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.4/remove-potcdate.sin
index 2436c49e7..2436c49e7 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.4/remove-potcdate.sin
+++ b/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.4/remove-potcdate.sin
diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb b/yocto-poky/meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb
index 1d4a443b7..1d4a443b7 100644
--- a/meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb
+++ b/yocto-poky/meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb
diff --git a/meta/recipes-core/gettext/gettext_0.16.1.bb b/yocto-poky/meta/recipes-core/gettext/gettext_0.16.1.bb
index f9f7a7f4c..f9f7a7f4c 100644
--- a/meta/recipes-core/gettext/gettext_0.16.1.bb
+++ b/yocto-poky/meta/recipes-core/gettext/gettext_0.16.1.bb
diff --git a/meta/recipes-core/gettext/gettext_0.19.4.bb b/yocto-poky/meta/recipes-core/gettext/gettext_0.19.4.bb
index cebf6c78c..cebf6c78c 100644
--- a/meta/recipes-core/gettext/gettext_0.19.4.bb
+++ b/yocto-poky/meta/recipes-core/gettext/gettext_0.19.4.bb
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
index 41a190edd..41a190edd 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
+++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch
index 0be36316b..0be36316b 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch
+++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/add-march-i486-into-CFLAGS-automatically.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/add-march-i486-into-CFLAGS-automatically.patch
index 3aac35a5d..3aac35a5d 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/add-march-i486-into-CFLAGS-automatically.patch
+++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/add-march-i486-into-CFLAGS-automatically.patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch
index 3d0c008bb..3d0c008bb 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch
+++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
index 1d69a3f29..1d69a3f29 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
+++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch
index 1571112b0..1571112b0 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch
+++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch
index 9759d11e3..9759d11e3 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch
+++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch
index ee435111f..ee435111f 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch
+++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch
index f3be02770..f3be02770 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch
+++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
index 130ae09b6..130ae09b6 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
+++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch
index 2a154fdd4..2a154fdd4 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch
+++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb
index 1e3d36af1..1e3d36af1 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb
+++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/yocto-poky/meta/recipes-core/glib-2.0/glib.inc
index 072f79011..072f79011 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/yocto-poky/meta/recipes-core/glib-2.0/glib.inc
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb b/yocto-poky/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb
index 4f91b76ac..4f91b76ac 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb
+++ b/yocto-poky/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb
diff --git a/meta/recipes-core/glibc/cross-localedef-native/fix_for_centos_5.8.patch b/yocto-poky/meta/recipes-core/glibc/cross-localedef-native/fix_for_centos_5.8.patch
index 186a48045..186a48045 100644
--- a/meta/recipes-core/glibc/cross-localedef-native/fix_for_centos_5.8.patch
+++ b/yocto-poky/meta/recipes-core/glibc/cross-localedef-native/fix_for_centos_5.8.patch
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.22.bb b/yocto-poky/meta/recipes-core/glibc/cross-localedef-native_2.22.bb
index 3aefe748f..3aefe748f 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.22.bb
+++ b/yocto-poky/meta/recipes-core/glibc/cross-localedef-native_2.22.bb
diff --git a/meta/recipes-core/glibc/glibc-collateral.inc b/yocto-poky/meta/recipes-core/glibc/glibc-collateral.inc
index 60655eba3..60655eba3 100644
--- a/meta/recipes-core/glibc/glibc-collateral.inc
+++ b/yocto-poky/meta/recipes-core/glibc/glibc-collateral.inc
diff --git a/meta/recipes-core/glibc/glibc-common.inc b/yocto-poky/meta/recipes-core/glibc/glibc-common.inc
index bba1568ba..bba1568ba 100644
--- a/meta/recipes-core/glibc/glibc-common.inc
+++ b/yocto-poky/meta/recipes-core/glibc/glibc-common.inc
diff --git a/meta/recipes-core/glibc/glibc-initial.inc b/yocto-poky/meta/recipes-core/glibc/glibc-initial.inc
index 35008489e..35008489e 100644
--- a/meta/recipes-core/glibc/glibc-initial.inc
+++ b/yocto-poky/meta/recipes-core/glibc/glibc-initial.inc
diff --git a/meta/recipes-core/glibc/glibc-initial_2.22.bb b/yocto-poky/meta/recipes-core/glibc/glibc-initial_2.22.bb
index 8ab01dc79..8ab01dc79 100644
--- a/meta/recipes-core/glibc/glibc-initial_2.22.bb
+++ b/yocto-poky/meta/recipes-core/glibc/glibc-initial_2.22.bb
diff --git a/meta/recipes-core/glibc/glibc-ld.inc b/yocto-poky/meta/recipes-core/glibc/glibc-ld.inc
index c5f4db229..c5f4db229 100644
--- a/meta/recipes-core/glibc/glibc-ld.inc
+++ b/yocto-poky/meta/recipes-core/glibc/glibc-ld.inc
diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/yocto-poky/meta/recipes-core/glibc/glibc-locale.inc
index 2352bd029..2352bd029 100644
--- a/meta/recipes-core/glibc/glibc-locale.inc
+++ b/yocto-poky/meta/recipes-core/glibc/glibc-locale.inc
diff --git a/meta/recipes-core/glibc/glibc-locale_2.22.bb b/yocto-poky/meta/recipes-core/glibc/glibc-locale_2.22.bb
index f7702e035..f7702e035 100644
--- a/meta/recipes-core/glibc/glibc-locale_2.22.bb
+++ b/yocto-poky/meta/recipes-core/glibc/glibc-locale_2.22.bb
diff --git a/meta/recipes-core/glibc/glibc-mtrace.inc b/yocto-poky/meta/recipes-core/glibc/glibc-mtrace.inc
index e12b079e0..e12b079e0 100644
--- a/meta/recipes-core/glibc/glibc-mtrace.inc
+++ b/yocto-poky/meta/recipes-core/glibc/glibc-mtrace.inc
diff --git a/meta/recipes-core/glibc/glibc-mtrace_2.22.bb b/yocto-poky/meta/recipes-core/glibc/glibc-mtrace_2.22.bb
index 0b69bad46..0b69bad46 100644
--- a/meta/recipes-core/glibc/glibc-mtrace_2.22.bb
+++ b/yocto-poky/meta/recipes-core/glibc/glibc-mtrace_2.22.bb
diff --git a/meta/recipes-core/glibc/glibc-options.inc b/yocto-poky/meta/recipes-core/glibc/glibc-options.inc
index 9fd27f32f..9fd27f32f 100644
--- a/meta/recipes-core/glibc/glibc-options.inc
+++ b/yocto-poky/meta/recipes-core/glibc/glibc-options.inc
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/yocto-poky/meta/recipes-core/glibc/glibc-package.inc
index 5f6036840..5f6036840 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/yocto-poky/meta/recipes-core/glibc/glibc-package.inc
diff --git a/meta/recipes-core/glibc/glibc-scripts.inc b/yocto-poky/meta/recipes-core/glibc/glibc-scripts.inc
index 3a06773d6..3a06773d6 100644
--- a/meta/recipes-core/glibc/glibc-scripts.inc
+++ b/yocto-poky/meta/recipes-core/glibc/glibc-scripts.inc
diff --git a/meta/recipes-core/glibc/glibc-scripts_2.22.bb b/yocto-poky/meta/recipes-core/glibc/glibc-scripts_2.22.bb
index 5a89bd802..5a89bd802 100644
--- a/meta/recipes-core/glibc/glibc-scripts_2.22.bb
+++ b/yocto-poky/meta/recipes-core/glibc/glibc-scripts_2.22.bb
diff --git a/meta/recipes-core/glibc/glibc-testing.inc b/yocto-poky/meta/recipes-core/glibc/glibc-testing.inc
index a9bbf37a1..a9bbf37a1 100644
--- a/meta/recipes-core/glibc/glibc-testing.inc
+++ b/yocto-poky/meta/recipes-core/glibc/glibc-testing.inc
diff --git a/meta/recipes-core/glibc/glibc.inc b/yocto-poky/meta/recipes-core/glibc/glibc.inc
index 17fa2d52a..17fa2d52a 100644
--- a/meta/recipes-core/glibc/glibc.inc
+++ b/yocto-poky/meta/recipes-core/glibc/glibc.inc
diff --git a/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
index 3d6634813..3d6634813 100644
--- a/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
diff --git a/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch
index b568fc6bd..b568fc6bd 100644
--- a/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch
diff --git a/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch
index a681a64e8..a681a64e8 100644
--- a/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch
diff --git a/meta/recipes-core/glibc/glibc/0004-Backport-https-sourceware.org-ml-libc-ports-2007-12-.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0004-Backport-https-sourceware.org-ml-libc-ports-2007-12-.patch
index 748750304..748750304 100644
--- a/meta/recipes-core/glibc/glibc/0004-Backport-https-sourceware.org-ml-libc-ports-2007-12-.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0004-Backport-https-sourceware.org-ml-libc-ports-2007-12-.patch
diff --git a/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
index 8d3f85955..8d3f85955 100644
--- a/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
diff --git a/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
index 65c227ff2..65c227ff2 100644
--- a/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
diff --git a/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
index aec8fbeb9..aec8fbeb9 100644
--- a/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
diff --git a/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
index b3fa931c6..b3fa931c6 100644
--- a/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
diff --git a/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
index 1f5475912..1f5475912 100644
--- a/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
diff --git a/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
index d71e576a6..d71e576a6 100644
--- a/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
diff --git a/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
index 07a112b21..07a112b21 100644
--- a/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
diff --git a/meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch
index 267791393..267791393 100644
--- a/meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch
diff --git a/meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
index c1fda9d43..c1fda9d43 100644
--- a/meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
diff --git a/meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch
index 0ba5d2fba..0ba5d2fba 100644
--- a/meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch
diff --git a/meta/recipes-core/glibc/glibc/0015-When-disabling-SSE-also-make-sure-that-fpmath-is-not.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0015-When-disabling-SSE-also-make-sure-that-fpmath-is-not.patch
index 4b261ca1e..4b261ca1e 100644
--- a/meta/recipes-core/glibc/glibc/0015-When-disabling-SSE-also-make-sure-that-fpmath-is-not.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0015-When-disabling-SSE-also-make-sure-that-fpmath-is-not.patch
diff --git a/meta/recipes-core/glibc/glibc/0016-yes-within-the-path-sets-wrong-config-variables.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0016-yes-within-the-path-sets-wrong-config-variables.patch
index 089e8b1b0..089e8b1b0 100644
--- a/meta/recipes-core/glibc/glibc/0016-yes-within-the-path-sets-wrong-config-variables.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0016-yes-within-the-path-sets-wrong-config-variables.patch
diff --git a/meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch
index 0ce823087..0ce823087 100644
--- a/meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch
diff --git a/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch
index 8eacbc059..8eacbc059 100644
--- a/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch
diff --git a/meta/recipes-core/glibc/glibc/0019-eglibc-Bring-Eglibc-option-group-infrastructure-to-g.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0019-eglibc-Bring-Eglibc-option-group-infrastructure-to-g.patch
index dcb80f9c8..dcb80f9c8 100644
--- a/meta/recipes-core/glibc/glibc/0019-eglibc-Bring-Eglibc-option-group-infrastructure-to-g.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0019-eglibc-Bring-Eglibc-option-group-infrastructure-to-g.patch
diff --git a/meta/recipes-core/glibc/glibc/0020-eglibc-Help-bootstrap-cross-toolchain.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0020-eglibc-Help-bootstrap-cross-toolchain.patch
index df9309454..df9309454 100644
--- a/meta/recipes-core/glibc/glibc/0020-eglibc-Help-bootstrap-cross-toolchain.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0020-eglibc-Help-bootstrap-cross-toolchain.patch
diff --git a/meta/recipes-core/glibc/glibc/0021-eglibc-cherry-picked-from-http-www.eglibc.org-archiv.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0021-eglibc-cherry-picked-from-http-www.eglibc.org-archiv.patch
index 38bb8a15e..38bb8a15e 100644
--- a/meta/recipes-core/glibc/glibc/0021-eglibc-cherry-picked-from-http-www.eglibc.org-archiv.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0021-eglibc-cherry-picked-from-http-www.eglibc.org-archiv.patch
diff --git a/meta/recipes-core/glibc/glibc/0022-eglibc-Clear-cache-lines-on-ppc8xx.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0022-eglibc-Clear-cache-lines-on-ppc8xx.patch
index 8a4c9c3e8..8a4c9c3e8 100644
--- a/meta/recipes-core/glibc/glibc/0022-eglibc-Clear-cache-lines-on-ppc8xx.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0022-eglibc-Clear-cache-lines-on-ppc8xx.patch
diff --git a/meta/recipes-core/glibc/glibc/0023-eglibc-Resolve-__fpscr_values-on-SH4.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0023-eglibc-Resolve-__fpscr_values-on-SH4.patch
index 9f3d753d7..9f3d753d7 100644
--- a/meta/recipes-core/glibc/glibc/0023-eglibc-Resolve-__fpscr_values-on-SH4.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0023-eglibc-Resolve-__fpscr_values-on-SH4.patch
diff --git a/meta/recipes-core/glibc/glibc/0024-eglibc-Forward-port-eglibc-options-groups-support.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0024-eglibc-Forward-port-eglibc-options-groups-support.patch
index 0514e282e..0514e282e 100644
--- a/meta/recipes-core/glibc/glibc/0024-eglibc-Forward-port-eglibc-options-groups-support.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0024-eglibc-Forward-port-eglibc-options-groups-support.patch
diff --git a/meta/recipes-core/glibc/glibc/0025-eglibc-Install-PIC-archives.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0025-eglibc-Install-PIC-archives.patch
index c359cce9c..c359cce9c 100644
--- a/meta/recipes-core/glibc/glibc/0025-eglibc-Install-PIC-archives.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0025-eglibc-Install-PIC-archives.patch
diff --git a/meta/recipes-core/glibc/glibc/0026-eglibc-dl_debug_mask-is-controlled-by-__OPTION_EGLIB.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0026-eglibc-dl_debug_mask-is-controlled-by-__OPTION_EGLIB.patch
index 6b611dbde..6b611dbde 100644
--- a/meta/recipes-core/glibc/glibc/0026-eglibc-dl_debug_mask-is-controlled-by-__OPTION_EGLIB.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0026-eglibc-dl_debug_mask-is-controlled-by-__OPTION_EGLIB.patch
diff --git a/meta/recipes-core/glibc/glibc/0027-eglibc-use-option-groups-Conditionally-exclude-c-tes.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0027-eglibc-use-option-groups-Conditionally-exclude-c-tes.patch
index 4106167df..4106167df 100644
--- a/meta/recipes-core/glibc/glibc/0027-eglibc-use-option-groups-Conditionally-exclude-c-tes.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0027-eglibc-use-option-groups-Conditionally-exclude-c-tes.patch
diff --git a/meta/recipes-core/glibc/glibc/0028-Clear-ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA-for-prel.patch b/yocto-poky/meta/recipes-core/glibc/glibc/0028-Clear-ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA-for-prel.patch
index 3455df1cf..3455df1cf 100644
--- a/meta/recipes-core/glibc/glibc/0028-Clear-ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA-for-prel.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/0028-Clear-ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA-for-prel.patch
diff --git a/meta/recipes-core/glibc/glibc/CVE-2015-7547.patch b/yocto-poky/meta/recipes-core/glibc/glibc/CVE-2015-7547.patch
index 4e539f849..4e539f849 100644
--- a/meta/recipes-core/glibc/glibc/CVE-2015-7547.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/CVE-2015-7547.patch
diff --git a/meta/recipes-core/glibc/glibc/CVE-2015-8776.patch b/yocto-poky/meta/recipes-core/glibc/glibc/CVE-2015-8776.patch
index 684f34417..684f34417 100644
--- a/meta/recipes-core/glibc/glibc/CVE-2015-8776.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/CVE-2015-8776.patch
diff --git a/meta/recipes-core/glibc/glibc/CVE-2015-8777.patch b/yocto-poky/meta/recipes-core/glibc/glibc/CVE-2015-8777.patch
index eeab72d65..eeab72d65 100644
--- a/meta/recipes-core/glibc/glibc/CVE-2015-8777.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/CVE-2015-8777.patch
diff --git a/meta/recipes-core/glibc/glibc/CVE-2015-8779.patch b/yocto-poky/meta/recipes-core/glibc/glibc/CVE-2015-8779.patch
index 4dc93c769..4dc93c769 100644
--- a/meta/recipes-core/glibc/glibc/CVE-2015-8779.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/CVE-2015-8779.patch
diff --git a/meta/recipes-core/glibc/glibc/CVE-2015-9761_1.patch b/yocto-poky/meta/recipes-core/glibc/glibc/CVE-2015-9761_1.patch
index 3aca91331..3aca91331 100644
--- a/meta/recipes-core/glibc/glibc/CVE-2015-9761_1.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/CVE-2015-9761_1.patch
diff --git a/meta/recipes-core/glibc/glibc/CVE-2015-9761_2.patch b/yocto-poky/meta/recipes-core/glibc/glibc/CVE-2015-9761_2.patch
index e30307fbc..e30307fbc 100644
--- a/meta/recipes-core/glibc/glibc/CVE-2015-9761_2.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/CVE-2015-9761_2.patch
diff --git a/meta/recipes-core/glibc/glibc/etc/ld.so.conf b/yocto-poky/meta/recipes-core/glibc/glibc/etc/ld.so.conf
index e69de29bb..e69de29bb 100644
--- a/meta/recipes-core/glibc/glibc/etc/ld.so.conf
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/etc/ld.so.conf
diff --git a/meta/recipes-core/glibc/glibc/generate-supported.mk b/yocto-poky/meta/recipes-core/glibc/glibc/generate-supported.mk
index d2a28c2dc..d2a28c2dc 100644
--- a/meta/recipes-core/glibc/glibc/generate-supported.mk
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/generate-supported.mk
diff --git a/meta/recipes-core/glibc/glibc/nscd-no-bash.patch b/yocto-poky/meta/recipes-core/glibc/glibc/nscd-no-bash.patch
index c306ce6af..c306ce6af 100644
--- a/meta/recipes-core/glibc/glibc/nscd-no-bash.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/nscd-no-bash.patch
diff --git a/meta/recipes-core/glibc/glibc/strcoll-Remove-incorrect-STRDIFF-based-optimization-.patch b/yocto-poky/meta/recipes-core/glibc/glibc/strcoll-Remove-incorrect-STRDIFF-based-optimization-.patch
index 8ce255f11..8ce255f11 100644
--- a/meta/recipes-core/glibc/glibc/strcoll-Remove-incorrect-STRDIFF-based-optimization-.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/strcoll-Remove-incorrect-STRDIFF-based-optimization-.patch
diff --git a/meta/recipes-core/glibc/glibc/use_64bit_atomics.patch b/yocto-poky/meta/recipes-core/glibc/glibc/use_64bit_atomics.patch
index eb7f2b29b..eb7f2b29b 100644
--- a/meta/recipes-core/glibc/glibc/use_64bit_atomics.patch
+++ b/yocto-poky/meta/recipes-core/glibc/glibc/use_64bit_atomics.patch
diff --git a/meta/recipes-core/glibc/glibc_2.22.bb b/yocto-poky/meta/recipes-core/glibc/glibc_2.22.bb
index a13b7f94b..a13b7f94b 100644
--- a/meta/recipes-core/glibc/glibc_2.22.bb
+++ b/yocto-poky/meta/recipes-core/glibc/glibc_2.22.bb
diff --git a/meta/recipes-core/glibc/ldconfig-native-2.12.1/32and64bit.patch b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/32and64bit.patch
index cdfeaeadd..cdfeaeadd 100644
--- a/meta/recipes-core/glibc/ldconfig-native-2.12.1/32and64bit.patch
+++ b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/32and64bit.patch
diff --git a/meta/recipes-core/glibc/ldconfig-native-2.12.1/README b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/README
index 43fb98372..43fb98372 100644
--- a/meta/recipes-core/glibc/ldconfig-native-2.12.1/README
+++ b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/README
diff --git a/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-64-bit-flag-for-ELF64-entries.patch b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-64-bit-flag-for-ELF64-entries.patch
index a9af11062..a9af11062 100644
--- a/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-64-bit-flag-for-ELF64-entries.patch
+++ b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-64-bit-flag-for-ELF64-entries.patch
diff --git a/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling.patch b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling.patch
index 7f8e4db78..7f8e4db78 100644
--- a/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling.patch
+++ b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling.patch
diff --git a/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling_fix.patch b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling_fix.patch
index 6aecfe526..6aecfe526 100644
--- a/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling_fix.patch
+++ b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling_fix.patch
diff --git a/meta/recipes-core/glibc/ldconfig-native-2.12.1/endianess-header.patch b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endianess-header.patch
index a18b2c20d..a18b2c20d 100644
--- a/meta/recipes-core/glibc/ldconfig-native-2.12.1/endianess-header.patch
+++ b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endianess-header.patch
diff --git a/meta/recipes-core/glibc/ldconfig-native-2.12.1/flag_fix.patch b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/flag_fix.patch
index 4e9aab941..4e9aab941 100644
--- a/meta/recipes-core/glibc/ldconfig-native-2.12.1/flag_fix.patch
+++ b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/flag_fix.patch
diff --git a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch
index 5ed4f6ff6..5ed4f6ff6 100644
--- a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch
+++ b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch
diff --git a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-native-2.12.1.tar.bz2 b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-native-2.12.1.tar.bz2
index dc1e79888..dc1e79888 100644
--- a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-native-2.12.1.tar.bz2
+++ b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-native-2.12.1.tar.bz2
diff --git a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig.patch b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig.patch
index 52986e61c..52986e61c 100644
--- a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig.patch
+++ b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig.patch
diff --git a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch
index 27bc41107..27bc41107 100644
--- a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch
+++ b/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch
diff --git a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb b/yocto-poky/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
index 93c0b1867..93c0b1867 100644
--- a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
+++ b/yocto-poky/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
diff --git a/meta/recipes-core/glibc/site_config/funcs b/yocto-poky/meta/recipes-core/glibc/site_config/funcs
index ccc85392d..ccc85392d 100644
--- a/meta/recipes-core/glibc/site_config/funcs
+++ b/yocto-poky/meta/recipes-core/glibc/site_config/funcs
diff --git a/meta/recipes-core/glibc/site_config/headers b/yocto-poky/meta/recipes-core/glibc/site_config/headers
index 609ab5379..609ab5379 100644
--- a/meta/recipes-core/glibc/site_config/headers
+++ b/yocto-poky/meta/recipes-core/glibc/site_config/headers
diff --git a/meta/recipes-core/glibc/site_config/types b/yocto-poky/meta/recipes-core/glibc/site_config/types
index 178bd85a0..178bd85a0 100644
--- a/meta/recipes-core/glibc/site_config/types
+++ b/yocto-poky/meta/recipes-core/glibc/site_config/types
diff --git a/meta/recipes-core/ifupdown/files/99_network b/yocto-poky/meta/recipes-core/ifupdown/files/99_network
index 42d5895d7..42d5895d7 100644
--- a/meta/recipes-core/ifupdown/files/99_network
+++ b/yocto-poky/meta/recipes-core/ifupdown/files/99_network
diff --git a/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch b/yocto-poky/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
index 8c4d953a2..8c4d953a2 100644
--- a/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
+++ b/yocto-poky/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
diff --git a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch b/yocto-poky/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch
index bff352e3a..bff352e3a 100644
--- a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch
+++ b/yocto-poky/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch
diff --git a/meta/recipes-core/ifupdown/ifupdown_0.7.48.1.bb b/yocto-poky/meta/recipes-core/ifupdown/ifupdown_0.7.48.1.bb
index 24eb87baf..24eb87baf 100644
--- a/meta/recipes-core/ifupdown/ifupdown_0.7.48.1.bb
+++ b/yocto-poky/meta/recipes-core/ifupdown/ifupdown_0.7.48.1.bb
diff --git a/meta/recipes-core/images/build-appliance-image/Yocto_Build_Appliance.vmx b/yocto-poky/meta/recipes-core/images/build-appliance-image/Yocto_Build_Appliance.vmx
index 6472e8750..6472e8750 100644
--- a/meta/recipes-core/images/build-appliance-image/Yocto_Build_Appliance.vmx
+++ b/yocto-poky/meta/recipes-core/images/build-appliance-image/Yocto_Build_Appliance.vmx
diff --git a/meta/recipes-core/images/build-appliance-image/Yocto_Build_Appliance.vmxf b/yocto-poky/meta/recipes-core/images/build-appliance-image/Yocto_Build_Appliance.vmxf
index 9e941ff2f..9e941ff2f 100644
--- a/meta/recipes-core/images/build-appliance-image/Yocto_Build_Appliance.vmxf
+++ b/yocto-poky/meta/recipes-core/images/build-appliance-image/Yocto_Build_Appliance.vmxf
diff --git a/meta/recipes-core/images/build-appliance-image_12.0.1.bb b/yocto-poky/meta/recipes-core/images/build-appliance-image_12.0.1.bb
index fdeadb63a..fdeadb63a 100644
--- a/meta/recipes-core/images/build-appliance-image_12.0.1.bb
+++ b/yocto-poky/meta/recipes-core/images/build-appliance-image_12.0.1.bb
diff --git a/meta/recipes-core/images/core-image-base.bb b/yocto-poky/meta/recipes-core/images/core-image-base.bb
index 75a08cfc9..75a08cfc9 100644
--- a/meta/recipes-core/images/core-image-base.bb
+++ b/yocto-poky/meta/recipes-core/images/core-image-base.bb
diff --git a/meta/recipes-core/images/core-image-minimal-dev.bb b/yocto-poky/meta/recipes-core/images/core-image-minimal-dev.bb
index 93ead2055..93ead2055 100644
--- a/meta/recipes-core/images/core-image-minimal-dev.bb
+++ b/yocto-poky/meta/recipes-core/images/core-image-minimal-dev.bb
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/yocto-poky/meta/recipes-core/images/core-image-minimal-initramfs.bb
index 1f0fa9580..1f0fa9580 100644
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/yocto-poky/meta/recipes-core/images/core-image-minimal-initramfs.bb
diff --git a/meta/recipes-core/images/core-image-minimal-mtdutils.bb b/yocto-poky/meta/recipes-core/images/core-image-minimal-mtdutils.bb
index c92234c08..c92234c08 100644
--- a/meta/recipes-core/images/core-image-minimal-mtdutils.bb
+++ b/yocto-poky/meta/recipes-core/images/core-image-minimal-mtdutils.bb
diff --git a/meta/recipes-core/images/core-image-minimal.bb b/yocto-poky/meta/recipes-core/images/core-image-minimal.bb
index 8dd77b347..8dd77b347 100644
--- a/meta/recipes-core/images/core-image-minimal.bb
+++ b/yocto-poky/meta/recipes-core/images/core-image-minimal.bb
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright
index 2a8e0d126..2a8e0d126 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright
+++ b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init
index fb31c635b..fb31c635b 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init
+++ b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces
index 0acf4cf44..0acf4cf44 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces
+++ b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot
index 750c0a98f..750c0a98f 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot
+++ b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces
index 16967763e..16967763e 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces
+++ b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm64/interfaces b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm64/interfaces
index 16967763e..16967763e 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm64/interfaces
+++ b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm64/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces
index 16967763e..16967763e 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces
+++ b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces
index 16967763e..16967763e 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces
+++ b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces
index f62b9a897..f62b9a897 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces
+++ b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces
index f62b9a897..f62b9a897 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces
+++ b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces
index f62b9a897..f62b9a897 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces
+++ b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces
index f62b9a897..f62b9a897 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces
+++ b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces
index f62b9a897..f62b9a897 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces
+++ b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces
index f62b9a897..f62b9a897 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces
+++ b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
index 733ae41f2..733ae41f2 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
+++ b/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
diff --git a/meta/recipes-core/initrdscripts/files/init-boot.sh b/yocto-poky/meta/recipes-core/initrdscripts/files/init-boot.sh
index e82eba025..e82eba025 100644
--- a/meta/recipes-core/initrdscripts/files/init-boot.sh
+++ b/yocto-poky/meta/recipes-core/initrdscripts/files/init-boot.sh
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh b/yocto-poky/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
index 7a0b4d440..7a0b4d440 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
+++ b/yocto-poky/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/yocto-poky/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index 0443a9d11..0443a9d11 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/yocto-poky/meta/recipes-core/initrdscripts/files/init-install-efi.sh
diff --git a/meta/recipes-core/initrdscripts/files/init-install-testfs.sh b/yocto-poky/meta/recipes-core/initrdscripts/files/init-install-testfs.sh
index ac6216052..ac6216052 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-testfs.sh
+++ b/yocto-poky/meta/recipes-core/initrdscripts/files/init-install-testfs.sh
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/yocto-poky/meta/recipes-core/initrdscripts/files/init-install.sh
index f9e9768e4..f9e9768e4 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/yocto-poky/meta/recipes-core/initrdscripts/files/init-install.sh
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/yocto-poky/meta/recipes-core/initrdscripts/files/init-live.sh
index d852c5737..d852c5737 100644
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/yocto-poky/meta/recipes-core/initrdscripts/files/init-live.sh
diff --git a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
index 7ae7969f5..7ae7969f5 100644
--- a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
+++ b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/debug b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/debug
index 00bfd7d3f..00bfd7d3f 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework/debug
+++ b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/debug
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/e2fs b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/e2fs
index 29f801a7b..29f801a7b 100755
--- a/meta/recipes-core/initrdscripts/initramfs-framework/e2fs
+++ b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/e2fs
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/finish b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/finish
index d09bbb8be..d09bbb8be 100755
--- a/meta/recipes-core/initrdscripts/initramfs-framework/finish
+++ b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/finish
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/init b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/init
index 204f2379a..204f2379a 100755
--- a/meta/recipes-core/initrdscripts/initramfs-framework/init
+++ b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/init
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/mdev b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/mdev
index a5df1d717..a5df1d717 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework/mdev
+++ b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/mdev
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/udev b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/udev
index bb462dc44..bb462dc44 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework/udev
+++ b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/udev
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
index 6c37b9aef..6c37b9aef 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
+++ b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
index 57b30254a..57b30254a 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
+++ b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb
index c03bd2d76..c03bd2d76 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb
+++ b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb
index 32c1fce76..32c1fce76 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb
+++ b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb
index 937bfd4d3..937bfd4d3 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb
+++ b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
index 88b3b3019..88b3b3019 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
+++ b/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch
index 1ee8181f1..1ee8181f1 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/arm/alignment.sh b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/arm/alignment.sh
index b577b9a03..b577b9a03 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/arm/alignment.sh
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/arm/alignment.sh
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/banner.sh b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/banner.sh
index 9e2b09125..9e2b09125 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/banner.sh
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/banner.sh
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
index df553bc07..df553bc07 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh
index 62869451b..62869451b 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh
index dfee2afaa..dfee2afaa 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/devpts b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/devpts
index 4a0978b40..4a0978b40 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/devpts
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/devpts
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/devpts.sh b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/devpts.sh
index c6043fb1e..c6043fb1e 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/devpts.sh
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/devpts.sh
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh
index a97b0681e..a97b0681e 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/functions b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/functions
index 01ad1edd3..01ad1edd3 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/functions
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/functions
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/halt b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/halt
index a56f73421..a56f73421 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/halt
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/halt
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh
index 95287cc13..95287cc13 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/logrotate-dmesg.conf b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/logrotate-dmesg.conf
index 6f46e4216..6f46e4216 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/logrotate-dmesg.conf
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/logrotate-dmesg.conf
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh
index 94bae420c..94bae420c 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh
index fe6c19605..fe6c19605 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index 904037eea..904037eea 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh
index 1a0328d63..1a0328d63 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/reboot b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/reboot
index 087d8d5da..087d8d5da 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/reboot
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/reboot
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/rmnologin.sh b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/rmnologin.sh
index 76de3418a..76de3418a 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/rmnologin.sh
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/rmnologin.sh
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
index b038fc59d..b038fc59d 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sendsigs b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/sendsigs
index 34e1b7714..34e1b7714 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/sendsigs
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/sendsigs
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/single b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/single
index da82d178a..da82d178a 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/single
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/single
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sushell b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/sushell
index c319d95bf..c319d95bf 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/sushell
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/sushell
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
index 0a52c90da..0a52c90da 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/umountfs b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/umountfs
index 61324c630..61324c630 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/umountfs
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/umountfs
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh
index af075407f..af075407f 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/urandom b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/urandom
index af1625b5f..af1625b5f 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/urandom
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/urandom
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/volatiles
index 297245d0e..297245d0e 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/volatiles
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/volatiles
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/yocto-poky/meta/recipes-core/initscripts/initscripts_1.0.bb
index f90de6e4d..f90de6e4d 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/yocto-poky/meta/recipes-core/initscripts/initscripts_1.0.bb
diff --git a/meta/recipes-core/jpeg/jpeg_9a.bb b/yocto-poky/meta/recipes-core/jpeg/jpeg_9a.bb
index ea2e65d61..ea2e65d61 100644
--- a/meta/recipes-core/jpeg/jpeg_9a.bb
+++ b/yocto-poky/meta/recipes-core/jpeg/jpeg_9a.bb
diff --git a/meta/recipes-core/kbd/kbd/0003-Only-inluclude-kernel-headers-with-glibc.patch b/yocto-poky/meta/recipes-core/kbd/kbd/0003-Only-inluclude-kernel-headers-with-glibc.patch
index 8bfcb0c7a..8bfcb0c7a 100644
--- a/meta/recipes-core/kbd/kbd/0003-Only-inluclude-kernel-headers-with-glibc.patch
+++ b/yocto-poky/meta/recipes-core/kbd/kbd/0003-Only-inluclude-kernel-headers-with-glibc.patch
diff --git a/meta/recipes-core/kbd/kbd/uclibc-stdarg.patch b/yocto-poky/meta/recipes-core/kbd/kbd/uclibc-stdarg.patch
index be7f324ac..be7f324ac 100644
--- a/meta/recipes-core/kbd/kbd/uclibc-stdarg.patch
+++ b/yocto-poky/meta/recipes-core/kbd/kbd/uclibc-stdarg.patch
diff --git a/meta/recipes-core/kbd/kbd_2.0.2.bb b/yocto-poky/meta/recipes-core/kbd/kbd_2.0.2.bb
index 49bb6c9a3..49bb6c9a3 100644
--- a/meta/recipes-core/kbd/kbd_2.0.2.bb
+++ b/yocto-poky/meta/recipes-core/kbd/kbd_2.0.2.bb
diff --git a/meta/recipes-core/libcgroup/libcgroup_0.41.bb b/yocto-poky/meta/recipes-core/libcgroup/libcgroup_0.41.bb
index 52ba1d760..52ba1d760 100644
--- a/meta/recipes-core/libcgroup/libcgroup_0.41.bb
+++ b/yocto-poky/meta/recipes-core/libcgroup/libcgroup_0.41.bb
diff --git a/meta/recipes-core/libxml/libxml2.inc b/yocto-poky/meta/recipes-core/libxml/libxml2.inc
index 310d5bbc5..310d5bbc5 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2.inc
diff --git a/meta/recipes-core/libxml/libxml2/0001-CVE-2015-1819-Enforce-the-reader-to-run-in-constant-.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/0001-CVE-2015-1819-Enforce-the-reader-to-run-in-constant-.patch
index 96d58f9dd..96d58f9dd 100644
--- a/meta/recipes-core/libxml/libxml2/0001-CVE-2015-1819-Enforce-the-reader-to-run-in-constant-.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/0001-CVE-2015-1819-Enforce-the-reader-to-run-in-constant-.patch
diff --git a/meta/recipes-core/libxml/libxml2/0001-CVE-2015-5312-Another-entity-expansion-issue.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/0001-CVE-2015-5312-Another-entity-expansion-issue.patch
index 979618d2c..979618d2c 100644
--- a/meta/recipes-core/libxml/libxml2/0001-CVE-2015-5312-Another-entity-expansion-issue.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/0001-CVE-2015-5312-Another-entity-expansion-issue.patch
diff --git a/meta/recipes-core/libxml/libxml2/0001-CVE-2015-7497-Avoid-an-heap-buffer-overflow-in-xmlDi.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/0001-CVE-2015-7497-Avoid-an-heap-buffer-overflow-in-xmlDi.patch
index 955c96195..955c96195 100644
--- a/meta/recipes-core/libxml/libxml2/0001-CVE-2015-7497-Avoid-an-heap-buffer-overflow-in-xmlDi.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/0001-CVE-2015-7497-Avoid-an-heap-buffer-overflow-in-xmlDi.patch
diff --git a/meta/recipes-core/libxml/libxml2/0001-CVE-2015-7500-Fix-memory-access-error-due-to-incorre.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/0001-CVE-2015-7500-Fix-memory-access-error-due-to-incorre.patch
index b4860791b..b4860791b 100644
--- a/meta/recipes-core/libxml/libxml2/0001-CVE-2015-7500-Fix-memory-access-error-due-to-incorre.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/0001-CVE-2015-7500-Fix-memory-access-error-due-to-incorre.patch
diff --git a/meta/recipes-core/libxml/libxml2/0001-CVE-2015-8035-Fix-XZ-compression-support-loop.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/0001-CVE-2015-8035-Fix-XZ-compression-support-loop.patch
index 710735570..710735570 100644
--- a/meta/recipes-core/libxml/libxml2/0001-CVE-2015-8035-Fix-XZ-compression-support-loop.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/0001-CVE-2015-8035-Fix-XZ-compression-support-loop.patch
diff --git a/meta/recipes-core/libxml/libxml2/0001-CVE-2015-8242-Buffer-overead-with-HTML-parser-in-pus.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/0001-CVE-2015-8242-Buffer-overead-with-HTML-parser-in-pus.patch
index 73531b3c1..73531b3c1 100644
--- a/meta/recipes-core/libxml/libxml2/0001-CVE-2015-8242-Buffer-overead-with-HTML-parser-in-pus.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/0001-CVE-2015-8242-Buffer-overead-with-HTML-parser-in-pus.patch
diff --git a/meta/recipes-core/libxml/libxml2/0001-Fix-a-bug-on-name-parsing-at-the-end-of-current-inpu.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/0001-Fix-a-bug-on-name-parsing-at-the-end-of-current-inpu.patch
index a86b9ee86..a86b9ee86 100644
--- a/meta/recipes-core/libxml/libxml2/0001-Fix-a-bug-on-name-parsing-at-the-end-of-current-inpu.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/0001-Fix-a-bug-on-name-parsing-at-the-end-of-current-inpu.patch
diff --git a/meta/recipes-core/libxml/libxml2/0001-threads-Define-pthread-definitions-for-glibc-complia.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/0001-threads-Define-pthread-definitions-for-glibc-complia.patch
index c653a81af..c653a81af 100644
--- a/meta/recipes-core/libxml/libxml2/0001-threads-Define-pthread-definitions-for-glibc-complia.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/0001-threads-Define-pthread-definitions-for-glibc-complia.patch
diff --git a/meta/recipes-core/libxml/libxml2/72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.patch
index 10a8112b5..10a8112b5 100644
--- a/meta/recipes-core/libxml/libxml2/72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.patch
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-7498-Avoid-processing-entities-after-encoding-conversion-.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-7498-Avoid-processing-entities-after-encoding-conversion-.patch
index 47ba8970e..47ba8970e 100644
--- a/meta/recipes-core/libxml/libxml2/CVE-2015-7498-Avoid-processing-entities-after-encoding-conversion-.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-7498-Avoid-processing-entities-after-encoding-conversion-.patch
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-7499-1-Add-xmlHaltParser-to-stop-the-parser.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-7499-1-Add-xmlHaltParser-to-stop-the-parser.patch
index e39ec65cd..e39ec65cd 100644
--- a/meta/recipes-core/libxml/libxml2/CVE-2015-7499-1-Add-xmlHaltParser-to-stop-the-parser.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-7499-1-Add-xmlHaltParser-to-stop-the-parser.patch
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-7499-2-Detect-incoherency-on-GROW.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-7499-2-Detect-incoherency-on-GROW.patch
index aff392095..aff392095 100644
--- a/meta/recipes-core/libxml/libxml2/CVE-2015-7499-2-Detect-incoherency-on-GROW.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-7499-2-Detect-incoherency-on-GROW.patch
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-7941-1-Stop-parsing-on-entities-boundaries-errors.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-7941-1-Stop-parsing-on-entities-boundaries-errors.patch
index 11da9f9bd..11da9f9bd 100644
--- a/meta/recipes-core/libxml/libxml2/CVE-2015-7941-1-Stop-parsing-on-entities-boundaries-errors.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-7941-1-Stop-parsing-on-entities-boundaries-errors.patch
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-7941-2-Cleanup-conditional-section-error-handling.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-7941-2-Cleanup-conditional-section-error-handling.patch
index b7bd96053..b7bd96053 100644
--- a/meta/recipes-core/libxml/libxml2/CVE-2015-7941-2-Cleanup-conditional-section-error-handling.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-7941-2-Cleanup-conditional-section-error-handling.patch
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-7942-2-Fix-an-error-in-previous-Conditional-section-patch.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-7942-2-Fix-an-error-in-previous-Conditional-section-patch.patch
index 34b60362c..34b60362c 100644
--- a/meta/recipes-core/libxml/libxml2/CVE-2015-7942-2-Fix-an-error-in-previous-Conditional-section-patch.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-7942-2-Fix-an-error-in-previous-Conditional-section-patch.patch
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-7942-Another-variation-of-overflow-in-Conditional-section.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-7942-Another-variation-of-overflow-in-Conditional-section.patch
index 40082ec07..40082ec07 100644
--- a/meta/recipes-core/libxml/libxml2/CVE-2015-7942-Another-variation-of-overflow-in-Conditional-section.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-7942-Another-variation-of-overflow-in-Conditional-section.patch
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-8241.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-8241.patch
index 89a46ad17..89a46ad17 100644
--- a/meta/recipes-core/libxml/libxml2/CVE-2015-8241.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-8241.patch
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-8317-Fail-parsing-early-on-if-encoding-conversion-failed.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-8317-Fail-parsing-early-on-if-encoding-conversion-failed.patch
index 59425cbfc..59425cbfc 100644
--- a/meta/recipes-core/libxml/libxml2/CVE-2015-8317-Fail-parsing-early-on-if-encoding-conversion-failed.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-8317-Fail-parsing-early-on-if-encoding-conversion-failed.patch
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-8710.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-8710.patch
index be06cc22c..be06cc22c 100644
--- a/meta/recipes-core/libxml/libxml2/CVE-2015-8710.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/CVE-2015-8710.patch
diff --git a/meta/recipes-core/libxml/libxml2/ansidecl.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/ansidecl.patch
index 2452d780d..2452d780d 100644
--- a/meta/recipes-core/libxml/libxml2/ansidecl.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/ansidecl.patch
diff --git a/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch
index 2f8079b05..2f8079b05 100644
--- a/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch
diff --git a/meta/recipes-core/libxml/libxml2/libxml-64bit.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/libxml-64bit.patch
index 1147017b6..1147017b6 100644
--- a/meta/recipes-core/libxml/libxml2/libxml-64bit.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/libxml-64bit.patch
diff --git a/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch
index 0fc84070e..0fc84070e 100644
--- a/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch
diff --git a/meta/recipes-core/libxml/libxml2/libxml2-CVE-2014-0191-fix.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/libxml2-CVE-2014-0191-fix.patch
index 1c05ae649..1c05ae649 100644
--- a/meta/recipes-core/libxml/libxml2/libxml2-CVE-2014-0191-fix.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/libxml2-CVE-2014-0191-fix.patch
diff --git a/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch
index e83c8325e..e83c8325e 100644
--- a/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch
diff --git a/meta/recipes-core/libxml/libxml2/run-ptest b/yocto-poky/meta/recipes-core/libxml/libxml2/run-ptest
index 473d0b67a..473d0b67a 100644
--- a/meta/recipes-core/libxml/libxml2/run-ptest
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/run-ptest
diff --git a/meta/recipes-core/libxml/libxml2/runtest.patch b/yocto-poky/meta/recipes-core/libxml/libxml2/runtest.patch
index 397ab20c3..397ab20c3 100644
--- a/meta/recipes-core/libxml/libxml2/runtest.patch
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2/runtest.patch
diff --git a/meta/recipes-core/libxml/libxml2_2.9.2.bb b/yocto-poky/meta/recipes-core/libxml/libxml2_2.9.2.bb
index 79a395cea..79a395cea 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.2.bb
+++ b/yocto-poky/meta/recipes-core/libxml/libxml2_2.9.2.bb
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/yocto-poky/meta/recipes-core/meta/buildtools-tarball.bb
index 840434ccd..840434ccd 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/yocto-poky/meta/recipes-core/meta/buildtools-tarball.bb
diff --git a/meta/recipes-core/meta/meta-environment-extsdk.bb b/yocto-poky/meta/recipes-core/meta/meta-environment-extsdk.bb
index d9e596143..d9e596143 100644
--- a/meta/recipes-core/meta/meta-environment-extsdk.bb
+++ b/yocto-poky/meta/recipes-core/meta/meta-environment-extsdk.bb
diff --git a/meta/recipes-core/meta/meta-environment.bb b/yocto-poky/meta/recipes-core/meta/meta-environment.bb
index 49d45f6ec..49d45f6ec 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/yocto-poky/meta/recipes-core/meta/meta-environment.bb
diff --git a/meta/recipes-core/meta/meta-ide-support.bb b/yocto-poky/meta/recipes-core/meta/meta-ide-support.bb
index 86c57cda2..86c57cda2 100644
--- a/meta/recipes-core/meta/meta-ide-support.bb
+++ b/yocto-poky/meta/recipes-core/meta/meta-ide-support.bb
diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/yocto-poky/meta/recipes-core/meta/meta-toolchain.bb
index ba9fd8880..ba9fd8880 100644
--- a/meta/recipes-core/meta/meta-toolchain.bb
+++ b/yocto-poky/meta/recipes-core/meta/meta-toolchain.bb
diff --git a/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb b/yocto-poky/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb
index 904173489..904173489 100644
--- a/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb
+++ b/yocto-poky/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb
diff --git a/meta/recipes-core/meta/package-index.bb b/yocto-poky/meta/recipes-core/meta/package-index.bb
index 3c46b4997..3c46b4997 100644
--- a/meta/recipes-core/meta/package-index.bb
+++ b/yocto-poky/meta/recipes-core/meta/package-index.bb
diff --git a/meta/recipes-core/meta/signing-keys.bb b/yocto-poky/meta/recipes-core/meta/signing-keys.bb
index cc401f3b6..cc401f3b6 100644
--- a/meta/recipes-core/meta/signing-keys.bb
+++ b/yocto-poky/meta/recipes-core/meta/signing-keys.bb
diff --git a/meta/recipes-core/meta/uninative-tarball.bb b/yocto-poky/meta/recipes-core/meta/uninative-tarball.bb
index 21f3bd985..21f3bd985 100644
--- a/meta/recipes-core/meta/uninative-tarball.bb
+++ b/yocto-poky/meta/recipes-core/meta/uninative-tarball.bb
diff --git a/meta/recipes-core/ncurses/ncurses-5.9/config.cache b/yocto-poky/meta/recipes-core/ncurses/ncurses-5.9/config.cache
index 6a9217d5b..6a9217d5b 100644
--- a/meta/recipes-core/ncurses/ncurses-5.9/config.cache
+++ b/yocto-poky/meta/recipes-core/ncurses/ncurses-5.9/config.cache
diff --git a/meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch b/yocto-poky/meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch
index cba89d26f..cba89d26f 100644
--- a/meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch
+++ b/yocto-poky/meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/yocto-poky/meta/recipes-core/ncurses/ncurses.inc
index ffd80ee7c..ffd80ee7c 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/yocto-poky/meta/recipes-core/ncurses/ncurses.inc
diff --git a/meta/recipes-core/ncurses/ncurses_5.9.bb b/yocto-poky/meta/recipes-core/ncurses/ncurses_5.9.bb
index 54d27a951..54d27a951 100644
--- a/meta/recipes-core/ncurses/ncurses_5.9.bb
+++ b/yocto-poky/meta/recipes-core/ncurses/ncurses_5.9.bb
diff --git a/meta/recipes-core/ncurses/site_config/headers b/yocto-poky/meta/recipes-core/ncurses/site_config/headers
index 087b7bfd5..087b7bfd5 100644
--- a/meta/recipes-core/ncurses/site_config/headers
+++ b/yocto-poky/meta/recipes-core/ncurses/site_config/headers
diff --git a/meta/recipes-core/netbase/netbase/hosts b/yocto-poky/meta/recipes-core/netbase/netbase/hosts
index 2f332451b..2f332451b 100644
--- a/meta/recipes-core/netbase/netbase/hosts
+++ b/yocto-poky/meta/recipes-core/netbase/netbase/hosts
diff --git a/meta/recipes-core/netbase/netbase/netbase-add-rpcbind-as-an-alias-to-sunrpc.patch b/yocto-poky/meta/recipes-core/netbase/netbase/netbase-add-rpcbind-as-an-alias-to-sunrpc.patch
index 35ce21e36..35ce21e36 100644
--- a/meta/recipes-core/netbase/netbase/netbase-add-rpcbind-as-an-alias-to-sunrpc.patch
+++ b/yocto-poky/meta/recipes-core/netbase/netbase/netbase-add-rpcbind-as-an-alias-to-sunrpc.patch
diff --git a/meta/recipes-core/netbase/netbase_5.3.bb b/yocto-poky/meta/recipes-core/netbase/netbase_5.3.bb
index ccd89ff84..ccd89ff84 100644
--- a/meta/recipes-core/netbase/netbase_5.3.bb
+++ b/yocto-poky/meta/recipes-core/netbase/netbase_5.3.bb
diff --git a/meta/recipes-core/os-release/os-release.bb b/yocto-poky/meta/recipes-core/os-release/os-release.bb
index c690b82b2..c690b82b2 100644
--- a/meta/recipes-core/os-release/os-release.bb
+++ b/yocto-poky/meta/recipes-core/os-release/os-release.bb
diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/yocto-poky/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
index 0c6a530be..0c6a530be 100644
--- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
+++ b/yocto-poky/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-base.bb
index 9e40b2852..9e40b2852 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-base.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index 09f537372..09f537372 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
index 74ed24751..74ed24751 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
+++ b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb
index e7b013d40..e7b013d40 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb
+++ b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
index 1882d3ad1..1882d3ad1 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
+++ b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index 3badd0ecf..3badd0ecf 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
index e99946f0a..e99946f0a 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
+++ b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
index 32d20e621..32d20e621 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
+++ b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
index 6997f396b..6997f396b 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
+++ b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
index 82347b975..82347b975 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
+++ b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 80f593379..80f593379 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index 95b3988b3..95b3988b3 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
index 180dd96f7..180dd96f7 100644
--- a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
+++ b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index d38be264c..d38be264c 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/yocto-poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
diff --git a/meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch b/yocto-poky/meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch
index 93b3c6bc7..93b3c6bc7 100644
--- a/meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch
+++ b/yocto-poky/meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch
diff --git a/meta/recipes-core/psplash/files/psplash-init b/yocto-poky/meta/recipes-core/psplash/files/psplash-init
index 66c85e933..66c85e933 100755
--- a/meta/recipes-core/psplash/files/psplash-init
+++ b/yocto-poky/meta/recipes-core/psplash/files/psplash-init
diff --git a/meta/recipes-core/psplash/files/psplash-poky-img.h b/yocto-poky/meta/recipes-core/psplash/files/psplash-poky-img.h
index 8d56aa020..8d56aa020 100644
--- a/meta/recipes-core/psplash/files/psplash-poky-img.h
+++ b/yocto-poky/meta/recipes-core/psplash/files/psplash-poky-img.h
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/yocto-poky/meta/recipes-core/psplash/psplash_git.bb
index b3b64799a..b3b64799a 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/yocto-poky/meta/recipes-core/psplash/psplash_git.bb
diff --git a/meta/recipes-core/readline/files/config-dirent-symbols.patch b/yocto-poky/meta/recipes-core/readline/files/config-dirent-symbols.patch
index cfff03c0f..cfff03c0f 100644
--- a/meta/recipes-core/readline/files/config-dirent-symbols.patch
+++ b/yocto-poky/meta/recipes-core/readline/files/config-dirent-symbols.patch
diff --git a/meta/recipes-core/readline/files/norpath.patch b/yocto-poky/meta/recipes-core/readline/files/norpath.patch
index 5d71582b7..5d71582b7 100644
--- a/meta/recipes-core/readline/files/norpath.patch
+++ b/yocto-poky/meta/recipes-core/readline/files/norpath.patch
diff --git a/meta/recipes-core/readline/readline-5.2/configure-fix.patch b/yocto-poky/meta/recipes-core/readline/readline-5.2/configure-fix.patch
index be60a9861..be60a9861 100644
--- a/meta/recipes-core/readline/readline-5.2/configure-fix.patch
+++ b/yocto-poky/meta/recipes-core/readline/readline-5.2/configure-fix.patch
diff --git a/meta/recipes-core/readline/readline-5.2/fix-redundant-rpath.patch b/yocto-poky/meta/recipes-core/readline/readline-5.2/fix-redundant-rpath.patch
index 3166b470f..3166b470f 100644
--- a/meta/recipes-core/readline/readline-5.2/fix-redundant-rpath.patch
+++ b/yocto-poky/meta/recipes-core/readline/readline-5.2/fix-redundant-rpath.patch
diff --git a/meta/recipes-core/readline/readline-6.3/configure-fix.patch b/yocto-poky/meta/recipes-core/readline/readline-6.3/configure-fix.patch
index ef3104f8a..ef3104f8a 100644
--- a/meta/recipes-core/readline/readline-6.3/configure-fix.patch
+++ b/yocto-poky/meta/recipes-core/readline/readline-6.3/configure-fix.patch
diff --git a/meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch b/yocto-poky/meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch
index 98a9d810b..98a9d810b 100644
--- a/meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch
+++ b/yocto-poky/meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch
diff --git a/meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch b/yocto-poky/meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch
index 54d1ac6eb..54d1ac6eb 100644
--- a/meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch
+++ b/yocto-poky/meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch
diff --git a/meta/recipes-core/readline/readline.inc b/yocto-poky/meta/recipes-core/readline/readline.inc
index 3f662c307..3f662c307 100644
--- a/meta/recipes-core/readline/readline.inc
+++ b/yocto-poky/meta/recipes-core/readline/readline.inc
diff --git a/meta/recipes-core/readline/readline_5.2.bb b/yocto-poky/meta/recipes-core/readline/readline_5.2.bb
index c1007a231..c1007a231 100644
--- a/meta/recipes-core/readline/readline_5.2.bb
+++ b/yocto-poky/meta/recipes-core/readline/readline_5.2.bb
diff --git a/meta/recipes-core/readline/readline_6.3.bb b/yocto-poky/meta/recipes-core/readline/readline_6.3.bb
index fc362ae5a..fc362ae5a 100644
--- a/meta/recipes-core/readline/readline_6.3.bb
+++ b/yocto-poky/meta/recipes-core/readline/readline_6.3.bb
diff --git a/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/obsolete_automake_macros.patch b/yocto-poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/obsolete_automake_macros.patch
index 9d828d702..9d828d702 100644
--- a/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/obsolete_automake_macros.patch
+++ b/yocto-poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/obsolete_automake_macros.patch
diff --git a/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch b/yocto-poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch
index 82e725e2a..82e725e2a 100644
--- a/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch
+++ b/yocto-poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch
diff --git a/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch b/yocto-poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch
index 1a35b7897..1a35b7897 100644
--- a/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch
+++ b/yocto-poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch
diff --git a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb b/yocto-poky/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
index b9f40f433..b9f40f433 100644
--- a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
+++ b/yocto-poky/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/yocto-poky/meta/recipes-core/systemd/systemd-compat-units.bb
index 0b8ff09b2..0b8ff09b2 100644
--- a/meta/recipes-core/systemd/systemd-compat-units.bb
+++ b/yocto-poky/meta/recipes-core/systemd/systemd-compat-units.bb
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/yocto-poky/meta/recipes-core/systemd/systemd-serialgetty.bb
index 768b1308f..768b1308f 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty.bb
+++ b/yocto-poky/meta/recipes-core/systemd/systemd-serialgetty.bb
diff --git a/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service b/yocto-poky/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
index 182167bef..182167bef 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
+++ b/yocto-poky/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
diff --git a/meta/recipes-core/systemd/systemd-systemctl-native.bb b/yocto-poky/meta/recipes-core/systemd/systemd-systemctl-native.bb
index fbdc9c0a1..fbdc9c0a1 100644
--- a/meta/recipes-core/systemd/systemd-systemctl-native.bb
+++ b/yocto-poky/meta/recipes-core/systemd/systemd-systemctl-native.bb
diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/yocto-poky/meta/recipes-core/systemd/systemd-systemctl/systemctl
index 6e163bd5c..6e163bd5c 100755
--- a/meta/recipes-core/systemd/systemd-systemctl/systemctl
+++ b/yocto-poky/meta/recipes-core/systemd/systemd-systemctl/systemctl
diff --git a/meta/recipes-core/systemd/systemd/00-create-volatile.conf b/yocto-poky/meta/recipes-core/systemd/systemd/00-create-volatile.conf
index 87cbe1e7d..87cbe1e7d 100644
--- a/meta/recipes-core/systemd/systemd/00-create-volatile.conf
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/00-create-volatile.conf
diff --git a/meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch b/yocto-poky/meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch
index 76ce4b781..76ce4b781 100644
--- a/meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch
diff --git a/meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch b/yocto-poky/meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch
index b6ab5effc..b6ab5effc 100644
--- a/meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch
diff --git a/meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/yocto-poky/meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch
index 0e20fd054..0e20fd054 100644
--- a/meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch
diff --git a/meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch b/yocto-poky/meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch
index 8078da9bb..8078da9bb 100644
--- a/meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch
diff --git a/meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch b/yocto-poky/meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch
index 55a0088c6..55a0088c6 100644
--- a/meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch
diff --git a/meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch b/yocto-poky/meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch
index 631dd7746..631dd7746 100644
--- a/meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch
diff --git a/meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch b/yocto-poky/meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch
index b8ab7c4e7..b8ab7c4e7 100644
--- a/meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch
diff --git a/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch b/yocto-poky/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
index 3f4d4de08..3f4d4de08 100644
--- a/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
diff --git a/meta/recipes-core/systemd/systemd/0009-sysv-generator-add-support-for-executing-scripts-und.patch b/yocto-poky/meta/recipes-core/systemd/systemd/0009-sysv-generator-add-support-for-executing-scripts-und.patch
index 9ea3e83e5..9ea3e83e5 100644
--- a/meta/recipes-core/systemd/systemd/0009-sysv-generator-add-support-for-executing-scripts-und.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/0009-sysv-generator-add-support-for-executing-scripts-und.patch
diff --git a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch b/yocto-poky/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch
index ed7ff5b09..ed7ff5b09 100644
--- a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch
diff --git a/meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch b/yocto-poky/meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch
index e562bca10..e562bca10 100644
--- a/meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch
diff --git a/meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch b/yocto-poky/meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch
index 68b45a9a5..68b45a9a5 100644
--- a/meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch
diff --git a/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch b/yocto-poky/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
index fe2ba5328..fe2ba5328 100644
--- a/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
diff --git a/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch b/yocto-poky/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
index 6308cc73a..6308cc73a 100644
--- a/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
diff --git a/meta/recipes-core/systemd/systemd/0022-Use-getenv-when-secure-versions-are-not-available.patch b/yocto-poky/meta/recipes-core/systemd/systemd/0022-Use-getenv-when-secure-versions-are-not-available.patch
index 30e38173e..30e38173e 100644
--- a/meta/recipes-core/systemd/systemd/0022-Use-getenv-when-secure-versions-are-not-available.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/0022-Use-getenv-when-secure-versions-are-not-available.patch
diff --git a/meta/recipes-core/systemd/systemd/init b/yocto-poky/meta/recipes-core/systemd/systemd/init
index ea52be482..ea52be482 100644
--- a/meta/recipes-core/systemd/systemd/init
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/init
diff --git a/meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch b/yocto-poky/meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch
index c7e171152..c7e171152 100644
--- a/meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch
diff --git a/meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch b/yocto-poky/meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch
index 8975b05e0..8975b05e0 100644
--- a/meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch
diff --git a/meta/recipes-core/systemd/systemd/run-ptest b/yocto-poky/meta/recipes-core/systemd/systemd/run-ptest
index a2d61c289..a2d61c289 100644
--- a/meta/recipes-core/systemd/systemd/run-ptest
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/run-ptest
diff --git a/meta/recipes-core/systemd/systemd/touchscreen.rules b/yocto-poky/meta/recipes-core/systemd/systemd/touchscreen.rules
index d83fd1673..d83fd1673 100644
--- a/meta/recipes-core/systemd/systemd/touchscreen.rules
+++ b/yocto-poky/meta/recipes-core/systemd/systemd/touchscreen.rules
diff --git a/meta/recipes-core/systemd/systemd_225.bb b/yocto-poky/meta/recipes-core/systemd/systemd_225.bb
index 18c244812..18c244812 100644
--- a/meta/recipes-core/systemd/systemd_225.bb
+++ b/yocto-poky/meta/recipes-core/systemd/systemd_225.bb
diff --git a/meta/recipes-core/sysvinit/sysvinit-2.88dsf/crypt-lib.patch b/yocto-poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/crypt-lib.patch
index 7b342901e..7b342901e 100644
--- a/meta/recipes-core/sysvinit/sysvinit-2.88dsf/crypt-lib.patch
+++ b/yocto-poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/crypt-lib.patch
diff --git a/meta/recipes-core/sysvinit/sysvinit-2.88dsf/install.patch b/yocto-poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/install.patch
index 6c4225a67..6c4225a67 100644
--- a/meta/recipes-core/sysvinit/sysvinit-2.88dsf/install.patch
+++ b/yocto-poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/install.patch
diff --git a/meta/recipes-core/sysvinit/sysvinit-2.88dsf/pidof-add-m-option.patch b/yocto-poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/pidof-add-m-option.patch
index 5b5dfdc00..5b5dfdc00 100644
--- a/meta/recipes-core/sysvinit/sysvinit-2.88dsf/pidof-add-m-option.patch
+++ b/yocto-poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/pidof-add-m-option.patch
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab/inittab b/yocto-poky/meta/recipes-core/sysvinit/sysvinit-inittab/inittab
index 6abbdf455..6abbdf455 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab/inittab
+++ b/yocto-poky/meta/recipes-core/sysvinit/sysvinit-inittab/inittab
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/yocto-poky/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index 49b1326a2..49b1326a2 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/yocto-poky/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
diff --git a/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch b/yocto-poky/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch
index f35c15cb3..f35c15cb3 100644
--- a/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch
+++ b/yocto-poky/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch
diff --git a/meta/recipes-core/sysvinit/sysvinit/01_bootlogd b/yocto-poky/meta/recipes-core/sysvinit/sysvinit/01_bootlogd
index a689d92d6..a689d92d6 100644
--- a/meta/recipes-core/sysvinit/sysvinit/01_bootlogd
+++ b/yocto-poky/meta/recipes-core/sysvinit/sysvinit/01_bootlogd
diff --git a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init b/yocto-poky/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
index df5aa430c..df5aa430c 100755
--- a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
+++ b/yocto-poky/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
diff --git a/meta/recipes-core/sysvinit/sysvinit/rc b/yocto-poky/meta/recipes-core/sysvinit/sysvinit/rc
index 7ca41ae1a..7ca41ae1a 100755
--- a/meta/recipes-core/sysvinit/sysvinit/rc
+++ b/yocto-poky/meta/recipes-core/sysvinit/sysvinit/rc
diff --git a/meta/recipes-core/sysvinit/sysvinit/rcS b/yocto-poky/meta/recipes-core/sysvinit/sysvinit/rcS
index 080b04f32..080b04f32 100755
--- a/meta/recipes-core/sysvinit/sysvinit/rcS
+++ b/yocto-poky/meta/recipes-core/sysvinit/sysvinit/rcS
diff --git a/meta/recipes-core/sysvinit/sysvinit/rcS-default b/yocto-poky/meta/recipes-core/sysvinit/sysvinit/rcS-default
index 709cdf6ec..709cdf6ec 100644
--- a/meta/recipes-core/sysvinit/sysvinit/rcS-default
+++ b/yocto-poky/meta/recipes-core/sysvinit/sysvinit/rcS-default
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/yocto-poky/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
index 5dfe39e23..5dfe39e23 100644
--- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
+++ b/yocto-poky/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
diff --git a/meta/recipes-core/uclibc/site_config/funcs b/yocto-poky/meta/recipes-core/uclibc/site_config/funcs
index ccc85392d..ccc85392d 100644
--- a/meta/recipes-core/uclibc/site_config/funcs
+++ b/yocto-poky/meta/recipes-core/uclibc/site_config/funcs
diff --git a/meta/recipes-core/uclibc/site_config/headers b/yocto-poky/meta/recipes-core/uclibc/site_config/headers
index 609ab5379..609ab5379 100644
--- a/meta/recipes-core/uclibc/site_config/headers
+++ b/yocto-poky/meta/recipes-core/uclibc/site_config/headers
diff --git a/meta/recipes-core/uclibc/site_config/types b/yocto-poky/meta/recipes-core/uclibc/site_config/types
index 178bd85a0..178bd85a0 100644
--- a/meta/recipes-core/uclibc/site_config/types
+++ b/yocto-poky/meta/recipes-core/uclibc/site_config/types
diff --git a/meta/recipes-core/uclibc/uclibc-config.inc b/yocto-poky/meta/recipes-core/uclibc/uclibc-config.inc
index 8b9e41c64..8b9e41c64 100644
--- a/meta/recipes-core/uclibc/uclibc-config.inc
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-config.inc
diff --git a/meta/recipes-core/uclibc/uclibc-git.inc b/yocto-poky/meta/recipes-core/uclibc/uclibc-git.inc
index b7184794d..b7184794d 100644
--- a/meta/recipes-core/uclibc/uclibc-git.inc
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git.inc
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-Disable-lrount_tes-function.patch b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0001-Disable-lrount_tes-function.patch
index 506f146a7..506f146a7 100644
--- a/meta/recipes-core/uclibc/uclibc-git/0001-Disable-lrount_tes-function.patch
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0001-Disable-lrount_tes-function.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-fcntl-Add-AT_EMPTY_PATH-for-all-and-O_PATH-for-arm.patch b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0001-fcntl-Add-AT_EMPTY_PATH-for-all-and-O_PATH-for-arm.patch
index 6942db462..6942db462 100644
--- a/meta/recipes-core/uclibc/uclibc-git/0001-fcntl-Add-AT_EMPTY_PATH-for-all-and-O_PATH-for-arm.patch
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0001-fcntl-Add-AT_EMPTY_PATH-for-all-and-O_PATH-for-arm.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-gcc5-optimizes-away-the-write-only-static-functions-.patch b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0001-gcc5-optimizes-away-the-write-only-static-functions-.patch
index e622f87ba..e622f87ba 100644
--- a/meta/recipes-core/uclibc/uclibc-git/0001-gcc5-optimizes-away-the-write-only-static-functions-.patch
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0001-gcc5-optimizes-away-the-write-only-static-functions-.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-wire-in-syncfs.patch b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0001-wire-in-syncfs.patch
index 079ad6b3b..079ad6b3b 100644
--- a/meta/recipes-core/uclibc/uclibc-git/0001-wire-in-syncfs.patch
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0001-wire-in-syncfs.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/0002-Add-implementation-for-copysignl-for-ppc.patch b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0002-Add-implementation-for-copysignl-for-ppc.patch
index d4275c997..d4275c997 100644
--- a/meta/recipes-core/uclibc/uclibc-git/0002-Add-implementation-for-copysignl-for-ppc.patch
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0002-Add-implementation-for-copysignl-for-ppc.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/0003-Add-argp-implementation.patch b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0003-Add-argp-implementation.patch
index ee9448337..ee9448337 100644
--- a/meta/recipes-core/uclibc/uclibc-git/0003-Add-argp-implementation.patch
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0003-Add-argp-implementation.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/0004-Dont-support-localised-optimizations-this-helps-to-h.patch b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0004-Dont-support-localised-optimizations-this-helps-to-h.patch
index 629e13c76..629e13c76 100644
--- a/meta/recipes-core/uclibc/uclibc-git/0004-Dont-support-localised-optimizations-this-helps-to-h.patch
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0004-Dont-support-localised-optimizations-this-helps-to-h.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/0005-Always-use-O2-for-compiling-fork.c.patch b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0005-Always-use-O2-for-compiling-fork.c.patch
index ad9b246ab..ad9b246ab 100644
--- a/meta/recipes-core/uclibc/uclibc-git/0005-Always-use-O2-for-compiling-fork.c.patch
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0005-Always-use-O2-for-compiling-fork.c.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/0006-ldso-limited-support-for-ORIGIN-in-rpath.patch b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0006-ldso-limited-support-for-ORIGIN-in-rpath.patch
index f0d87371b..f0d87371b 100644
--- a/meta/recipes-core/uclibc/uclibc-git/0006-ldso-limited-support-for-ORIGIN-in-rpath.patch
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0006-ldso-limited-support-for-ORIGIN-in-rpath.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/0007-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0007-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch
index ee932c380..ee932c380 100644
--- a/meta/recipes-core/uclibc/uclibc-git/0007-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/0007-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/CVE-2016-2224.patch b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/CVE-2016-2224.patch
index 218b60a85..218b60a85 100644
--- a/meta/recipes-core/uclibc/uclibc-git/CVE-2016-2224.patch
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/CVE-2016-2224.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/CVE-2016-2225.patch b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/CVE-2016-2225.patch
index 0217e4bf5..0217e4bf5 100644
--- a/meta/recipes-core/uclibc/uclibc-git/CVE-2016-2225.patch
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/CVE-2016-2225.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/locale.cfg b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/locale.cfg
index fc6643516..fc6643516 100644
--- a/meta/recipes-core/uclibc/uclibc-git/locale.cfg
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/locale.cfg
diff --git a/meta/recipes-core/uclibc/uclibc-git/obstack.cfg b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/obstack.cfg
index 36bf9d6e4..36bf9d6e4 100644
--- a/meta/recipes-core/uclibc/uclibc-git/obstack.cfg
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/obstack.cfg
diff --git a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
index 3827b66e9..3827b66e9 100644
--- a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
diff --git a/meta/recipes-core/uclibc/uclibc-git/uClibc.machine b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/uClibc.machine
index 595f444da..595f444da 100644
--- a/meta/recipes-core/uclibc/uclibc-git/uClibc.machine
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-git/uClibc.machine
diff --git a/meta/recipes-core/uclibc/uclibc-initial_git.bb b/yocto-poky/meta/recipes-core/uclibc/uclibc-initial_git.bb
index c937ccb10..c937ccb10 100644
--- a/meta/recipes-core/uclibc/uclibc-initial_git.bb
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-initial_git.bb
diff --git a/meta/recipes-core/uclibc/uclibc-package.inc b/yocto-poky/meta/recipes-core/uclibc/uclibc-package.inc
index c1815f9a3..c1815f9a3 100644
--- a/meta/recipes-core/uclibc/uclibc-package.inc
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc-package.inc
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/yocto-poky/meta/recipes-core/uclibc/uclibc.inc
index 533aa3d95..533aa3d95 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc.inc
diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/yocto-poky/meta/recipes-core/uclibc/uclibc_git.bb
index fd02b3d61..fd02b3d61 100644
--- a/meta/recipes-core/uclibc/uclibc_git.bb
+++ b/yocto-poky/meta/recipes-core/uclibc/uclibc_git.bb
diff --git a/meta/recipes-core/udev/udev-extraconf/automount.rules b/yocto-poky/meta/recipes-core/udev/udev-extraconf/automount.rules
index 62578ea63..62578ea63 100644
--- a/meta/recipes-core/udev/udev-extraconf/automount.rules
+++ b/yocto-poky/meta/recipes-core/udev/udev-extraconf/automount.rules
diff --git a/meta/recipes-core/udev/udev-extraconf/autonet.rules b/yocto-poky/meta/recipes-core/udev/udev-extraconf/autonet.rules
index 19676aa13..19676aa13 100644
--- a/meta/recipes-core/udev/udev-extraconf/autonet.rules
+++ b/yocto-poky/meta/recipes-core/udev/udev-extraconf/autonet.rules
diff --git a/meta/recipes-core/udev/udev-extraconf/localextra.rules b/yocto-poky/meta/recipes-core/udev/udev-extraconf/localextra.rules
index 3d51d3e39..3d51d3e39 100644
--- a/meta/recipes-core/udev/udev-extraconf/localextra.rules
+++ b/yocto-poky/meta/recipes-core/udev/udev-extraconf/localextra.rules
diff --git a/meta/recipes-core/udev/udev-extraconf/mount.blacklist b/yocto-poky/meta/recipes-core/udev/udev-extraconf/mount.blacklist
index e49349428..e49349428 100644
--- a/meta/recipes-core/udev/udev-extraconf/mount.blacklist
+++ b/yocto-poky/meta/recipes-core/udev/udev-extraconf/mount.blacklist
diff --git a/meta/recipes-core/udev/udev-extraconf/mount.sh b/yocto-poky/meta/recipes-core/udev/udev-extraconf/mount.sh
index 3eea91085..3eea91085 100644
--- a/meta/recipes-core/udev/udev-extraconf/mount.sh
+++ b/yocto-poky/meta/recipes-core/udev/udev-extraconf/mount.sh
diff --git a/meta/recipes-core/udev/udev-extraconf/network.sh b/yocto-poky/meta/recipes-core/udev/udev-extraconf/network.sh
index 3ee92714a..3ee92714a 100644
--- a/meta/recipes-core/udev/udev-extraconf/network.sh
+++ b/yocto-poky/meta/recipes-core/udev/udev-extraconf/network.sh
diff --git a/meta/recipes-core/udev/udev-extraconf_1.1.bb b/yocto-poky/meta/recipes-core/udev/udev-extraconf_1.1.bb
index 6fbd92548..6fbd92548 100644
--- a/meta/recipes-core/udev/udev-extraconf_1.1.bb
+++ b/yocto-poky/meta/recipes-core/udev/udev-extraconf_1.1.bb
diff --git a/meta/recipes-core/udev/udev.inc b/yocto-poky/meta/recipes-core/udev/udev.inc
index c378ae3cd..c378ae3cd 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/yocto-poky/meta/recipes-core/udev/udev.inc
diff --git a/meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch b/yocto-poky/meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch
index 41deafa91..41deafa91 100644
--- a/meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch
+++ b/yocto-poky/meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch
diff --git a/meta/recipes-core/udev/udev/add-install-ptest.patch b/yocto-poky/meta/recipes-core/udev/udev/add-install-ptest.patch
index bfc2e9409..bfc2e9409 100644
--- a/meta/recipes-core/udev/udev/add-install-ptest.patch
+++ b/yocto-poky/meta/recipes-core/udev/udev/add-install-ptest.patch
diff --git a/meta/recipes-core/udev/udev/avoid-mouse-autosuspend.patch b/yocto-poky/meta/recipes-core/udev/udev/avoid-mouse-autosuspend.patch
index 2c31b33b0..2c31b33b0 100644
--- a/meta/recipes-core/udev/udev/avoid-mouse-autosuspend.patch
+++ b/yocto-poky/meta/recipes-core/udev/udev/avoid-mouse-autosuspend.patch
diff --git a/meta/recipes-core/udev/udev/devfs-udev.rules b/yocto-poky/meta/recipes-core/udev/udev/devfs-udev.rules
index 0ba1ad4e7..0ba1ad4e7 100644
--- a/meta/recipes-core/udev/udev/devfs-udev.rules
+++ b/yocto-poky/meta/recipes-core/udev/udev/devfs-udev.rules
diff --git a/meta/recipes-core/udev/udev/fix_rule-syntax-regex-ptest.patch b/yocto-poky/meta/recipes-core/udev/udev/fix_rule-syntax-regex-ptest.patch
index 593c46ce0..593c46ce0 100644
--- a/meta/recipes-core/udev/udev/fix_rule-syntax-regex-ptest.patch
+++ b/yocto-poky/meta/recipes-core/udev/udev/fix_rule-syntax-regex-ptest.patch
diff --git a/meta/recipes-core/udev/udev/init b/yocto-poky/meta/recipes-core/udev/udev/init
index 0ab028b39..0ab028b39 100644
--- a/meta/recipes-core/udev/udev/init
+++ b/yocto-poky/meta/recipes-core/udev/udev/init
diff --git a/meta/recipes-core/udev/udev/links.conf b/yocto-poky/meta/recipes-core/udev/udev/links.conf
index 8fff922db..8fff922db 100644
--- a/meta/recipes-core/udev/udev/links.conf
+++ b/yocto-poky/meta/recipes-core/udev/udev/links.conf
diff --git a/meta/recipes-core/udev/udev/local.rules b/yocto-poky/meta/recipes-core/udev/udev/local.rules
index d502cdd6b..d502cdd6b 100644
--- a/meta/recipes-core/udev/udev/local.rules
+++ b/yocto-poky/meta/recipes-core/udev/udev/local.rules
diff --git a/meta/recipes-core/udev/udev/permissions.rules b/yocto-poky/meta/recipes-core/udev/udev/permissions.rules
index 205b73329..205b73329 100644
--- a/meta/recipes-core/udev/udev/permissions.rules
+++ b/yocto-poky/meta/recipes-core/udev/udev/permissions.rules
diff --git a/meta/recipes-core/udev/udev/run-ptest b/yocto-poky/meta/recipes-core/udev/udev/run-ptest
index 0e39806b0..0e39806b0 100644
--- a/meta/recipes-core/udev/udev/run-ptest
+++ b/yocto-poky/meta/recipes-core/udev/udev/run-ptest
diff --git a/meta/recipes-core/udev/udev/run.rules b/yocto-poky/meta/recipes-core/udev/udev/run.rules
index 75d71375b..75d71375b 100644
--- a/meta/recipes-core/udev/udev/run.rules
+++ b/yocto-poky/meta/recipes-core/udev/udev/run.rules
diff --git a/meta/recipes-core/udev/udev/udev-cache b/yocto-poky/meta/recipes-core/udev/udev/udev-cache
index dcfff1cb4..dcfff1cb4 100644
--- a/meta/recipes-core/udev/udev/udev-cache
+++ b/yocto-poky/meta/recipes-core/udev/udev/udev-cache
diff --git a/meta/recipes-core/udev/udev/udev-cache.default b/yocto-poky/meta/recipes-core/udev/udev/udev-cache.default
index a3b732698..a3b732698 100644
--- a/meta/recipes-core/udev/udev/udev-cache.default
+++ b/yocto-poky/meta/recipes-core/udev/udev/udev-cache.default
diff --git a/meta/recipes-core/udev/udev/udev.rules b/yocto-poky/meta/recipes-core/udev/udev/udev.rules
index a19d4a0bf..a19d4a0bf 100644
--- a/meta/recipes-core/udev/udev/udev.rules
+++ b/yocto-poky/meta/recipes-core/udev/udev/udev.rules
diff --git a/meta/recipes-core/udev/udev_182.bb b/yocto-poky/meta/recipes-core/udev/udev_182.bb
index b21635203..b21635203 100644
--- a/meta/recipes-core/udev/udev_182.bb
+++ b/yocto-poky/meta/recipes-core/udev/udev_182.bb
diff --git a/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch b/yocto-poky/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch
index fb443ff15..fb443ff15 100644
--- a/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch
+++ b/yocto-poky/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch
diff --git a/meta/recipes-core/update-rc.d/update-rc.d/check-if-symlinks-are-valid.patch b/yocto-poky/meta/recipes-core/update-rc.d/update-rc.d/check-if-symlinks-are-valid.patch
index 075171a5a..075171a5a 100644
--- a/meta/recipes-core/update-rc.d/update-rc.d/check-if-symlinks-are-valid.patch
+++ b/yocto-poky/meta/recipes-core/update-rc.d/update-rc.d/check-if-symlinks-are-valid.patch
diff --git a/meta/recipes-core/update-rc.d/update-rc.d/fix-to-handle-priority-numbers-correctly.patch b/yocto-poky/meta/recipes-core/update-rc.d/update-rc.d/fix-to-handle-priority-numbers-correctly.patch
index 85bc234a2..85bc234a2 100644
--- a/meta/recipes-core/update-rc.d/update-rc.d/fix-to-handle-priority-numbers-correctly.patch
+++ b/yocto-poky/meta/recipes-core/update-rc.d/update-rc.d/fix-to-handle-priority-numbers-correctly.patch
diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb b/yocto-poky/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
index c15cb7803..c15cb7803 100644
--- a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
+++ b/yocto-poky/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/yocto-poky/meta/recipes-core/util-linux/util-linux.inc
index 594108f68..594108f68 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/yocto-poky/meta/recipes-core/util-linux/util-linux.inc
diff --git a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch b/yocto-poky/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
index a5b1ff12e..a5b1ff12e 100644
--- a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
+++ b/yocto-poky/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
diff --git a/meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch b/yocto-poky/meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch
index adb271ce0..adb271ce0 100644
--- a/meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch
+++ b/yocto-poky/meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch
diff --git a/meta/recipes-core/util-linux/util-linux/runuser-l.pamd b/yocto-poky/meta/recipes-core/util-linux/util-linux/runuser-l.pamd
index 4b368ccf5..4b368ccf5 100644
--- a/meta/recipes-core/util-linux/util-linux/runuser-l.pamd
+++ b/yocto-poky/meta/recipes-core/util-linux/util-linux/runuser-l.pamd
diff --git a/meta/recipes-core/util-linux/util-linux/runuser.pamd b/yocto-poky/meta/recipes-core/util-linux/util-linux/runuser.pamd
index 48d133b9e..48d133b9e 100644
--- a/meta/recipes-core/util-linux/util-linux/runuser.pamd
+++ b/yocto-poky/meta/recipes-core/util-linux/util-linux/runuser.pamd
diff --git a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch b/yocto-poky/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
index 5031a7313..5031a7313 100644
--- a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
+++ b/yocto-poky/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch b/yocto-poky/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch
index 68bf22de8..68bf22de8 100644
--- a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch
+++ b/yocto-poky/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch b/yocto-poky/meta/recipes-core/util-linux/util-linux/util-linux-native.patch
index 1f496dee2..1f496dee2 100644
--- a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch
+++ b/yocto-poky/meta/recipes-core/util-linux/util-linux/util-linux-native.patch
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-ng-2.16-mount_lock_path.patch b/yocto-poky/meta/recipes-core/util-linux/util-linux/util-linux-ng-2.16-mount_lock_path.patch
index 5773d7ea1..5773d7ea1 100644
--- a/meta/recipes-core/util-linux/util-linux/util-linux-ng-2.16-mount_lock_path.patch
+++ b/yocto-poky/meta/recipes-core/util-linux/util-linux/util-linux-ng-2.16-mount_lock_path.patch
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch b/yocto-poky/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
index 6717a75a9..6717a75a9 100644
--- a/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
+++ b/yocto-poky/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
diff --git a/meta/recipes-core/util-linux/util-linux_2.26.2.bb b/yocto-poky/meta/recipes-core/util-linux/util-linux_2.26.2.bb
index e09fdfaf5..e09fdfaf5 100644
--- a/meta/recipes-core/util-linux/util-linux_2.26.2.bb
+++ b/yocto-poky/meta/recipes-core/util-linux/util-linux_2.26.2.bb
diff --git a/meta/recipes-core/volatile-binds/files/COPYING.MIT b/yocto-poky/meta/recipes-core/volatile-binds/files/COPYING.MIT
index 7e7d57413..7e7d57413 100644
--- a/meta/recipes-core/volatile-binds/files/COPYING.MIT
+++ b/yocto-poky/meta/recipes-core/volatile-binds/files/COPYING.MIT
diff --git a/meta/recipes-core/volatile-binds/files/mount-copybind b/yocto-poky/meta/recipes-core/volatile-binds/files/mount-copybind
index 2aeaf84dd..2aeaf84dd 100755
--- a/meta/recipes-core/volatile-binds/files/mount-copybind
+++ b/yocto-poky/meta/recipes-core/volatile-binds/files/mount-copybind
diff --git a/meta/recipes-core/volatile-binds/files/volatile-binds.service.in b/yocto-poky/meta/recipes-core/volatile-binds/files/volatile-binds.service.in
index b23355a71..b23355a71 100644
--- a/meta/recipes-core/volatile-binds/files/volatile-binds.service.in
+++ b/yocto-poky/meta/recipes-core/volatile-binds/files/volatile-binds.service.in
diff --git a/meta/recipes-core/volatile-binds/volatile-binds.bb b/yocto-poky/meta/recipes-core/volatile-binds/volatile-binds.bb
index fee7275e3..fee7275e3 100644
--- a/meta/recipes-core/volatile-binds/volatile-binds.bb
+++ b/yocto-poky/meta/recipes-core/volatile-binds/volatile-binds.bb
diff --git a/meta/recipes-core/zlib/site_config/headers b/yocto-poky/meta/recipes-core/zlib/site_config/headers
index 50268918a..50268918a 100644
--- a/meta/recipes-core/zlib/site_config/headers
+++ b/yocto-poky/meta/recipes-core/zlib/site_config/headers
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/Makefile-runtests.patch b/yocto-poky/meta/recipes-core/zlib/zlib-1.2.8/Makefile-runtests.patch
index 61eea8238..61eea8238 100644
--- a/meta/recipes-core/zlib/zlib-1.2.8/Makefile-runtests.patch
+++ b/yocto-poky/meta/recipes-core/zlib/zlib-1.2.8/Makefile-runtests.patch
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch b/yocto-poky/meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch
index 19c40b745..19c40b745 100644
--- a/meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch
+++ b/yocto-poky/meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/remove.ldconfig.call.patch b/yocto-poky/meta/recipes-core/zlib/zlib-1.2.8/remove.ldconfig.call.patch
index 403b4825c..403b4825c 100644
--- a/meta/recipes-core/zlib/zlib-1.2.8/remove.ldconfig.call.patch
+++ b/yocto-poky/meta/recipes-core/zlib/zlib-1.2.8/remove.ldconfig.call.patch
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/run-ptest b/yocto-poky/meta/recipes-core/zlib/zlib-1.2.8/run-ptest
index 884d9dc69..884d9dc69 100644
--- a/meta/recipes-core/zlib/zlib-1.2.8/run-ptest
+++ b/yocto-poky/meta/recipes-core/zlib/zlib-1.2.8/run-ptest
diff --git a/meta/recipes-core/zlib/zlib_1.2.8.bb b/yocto-poky/meta/recipes-core/zlib/zlib_1.2.8.bb
index 9470adb1b..9470adb1b 100644
--- a/meta/recipes-core/zlib/zlib_1.2.8.bb
+++ b/yocto-poky/meta/recipes-core/zlib/zlib_1.2.8.bb
diff --git a/meta/recipes-devtools/apt/apt-native.inc b/yocto-poky/meta/recipes-devtools/apt/apt-native.inc
index 27cc9ff0b..27cc9ff0b 100644
--- a/meta/recipes-devtools/apt/apt-native.inc
+++ b/yocto-poky/meta/recipes-devtools/apt/apt-native.inc
diff --git a/meta/recipes-devtools/apt/apt-native_1.0.10.1.bb b/yocto-poky/meta/recipes-devtools/apt/apt-native_1.0.10.1.bb
index 1e660da74..1e660da74 100644
--- a/meta/recipes-devtools/apt/apt-native_1.0.10.1.bb
+++ b/yocto-poky/meta/recipes-devtools/apt/apt-native_1.0.10.1.bb
diff --git a/meta/recipes-devtools/apt/apt-package.inc b/yocto-poky/meta/recipes-devtools/apt/apt-package.inc
index a553aa21f..a553aa21f 100644
--- a/meta/recipes-devtools/apt/apt-package.inc
+++ b/yocto-poky/meta/recipes-devtools/apt/apt-package.inc
diff --git a/meta/recipes-devtools/apt/apt.inc b/yocto-poky/meta/recipes-devtools/apt/apt.inc
index 3248b9a7b..3248b9a7b 100644
--- a/meta/recipes-devtools/apt/apt.inc
+++ b/yocto-poky/meta/recipes-devtools/apt/apt.inc
diff --git a/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch b/yocto-poky/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
index d33069b73..d33069b73 100644
--- a/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
+++ b/yocto-poky/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
diff --git a/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch b/yocto-poky/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch
index beea56d2a..beea56d2a 100644
--- a/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch
+++ b/yocto-poky/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch
diff --git a/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch b/yocto-poky/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch
index 7c42ff07b..7c42ff07b 100644
--- a/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch
+++ b/yocto-poky/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch
diff --git a/meta/recipes-devtools/apt/apt/disable-configure-in-makefile.patch b/yocto-poky/meta/recipes-devtools/apt/apt/disable-configure-in-makefile.patch
index 7c2f64e3e..7c2f64e3e 100644
--- a/meta/recipes-devtools/apt/apt/disable-configure-in-makefile.patch
+++ b/yocto-poky/meta/recipes-devtools/apt/apt/disable-configure-in-makefile.patch
diff --git a/meta/recipes-devtools/apt/apt/disable-test.patch b/yocto-poky/meta/recipes-devtools/apt/apt/disable-test.patch
index 676795dc8..676795dc8 100644
--- a/meta/recipes-devtools/apt/apt/disable-test.patch
+++ b/yocto-poky/meta/recipes-devtools/apt/apt/disable-test.patch
diff --git a/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch b/yocto-poky/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch
index 801ae6ddd..801ae6ddd 100644
--- a/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch
+++ b/yocto-poky/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch
diff --git a/meta/recipes-devtools/apt/apt/makerace.patch b/yocto-poky/meta/recipes-devtools/apt/apt/makerace.patch
index 46e3161b6..46e3161b6 100644
--- a/meta/recipes-devtools/apt/apt/makerace.patch
+++ b/yocto-poky/meta/recipes-devtools/apt/apt/makerace.patch
diff --git a/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch b/yocto-poky/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch
index a0996d4d4..a0996d4d4 100644
--- a/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch
+++ b/yocto-poky/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch
diff --git a/meta/recipes-devtools/apt/apt/noconfigure.patch b/yocto-poky/meta/recipes-devtools/apt/apt/noconfigure.patch
index ebc67203b..ebc67203b 100644
--- a/meta/recipes-devtools/apt/apt/noconfigure.patch
+++ b/yocto-poky/meta/recipes-devtools/apt/apt/noconfigure.patch
diff --git a/meta/recipes-devtools/apt/apt/nodoc.patch b/yocto-poky/meta/recipes-devtools/apt/apt/nodoc.patch
index 449e42df4..449e42df4 100644
--- a/meta/recipes-devtools/apt/apt/nodoc.patch
+++ b/yocto-poky/meta/recipes-devtools/apt/apt/nodoc.patch
diff --git a/meta/recipes-devtools/apt/apt/truncate-filename.patch b/yocto-poky/meta/recipes-devtools/apt/apt/truncate-filename.patch
index db1c42b66..db1c42b66 100644
--- a/meta/recipes-devtools/apt/apt/truncate-filename.patch
+++ b/yocto-poky/meta/recipes-devtools/apt/apt/truncate-filename.patch
diff --git a/meta/recipes-devtools/apt/apt/use-host.patch b/yocto-poky/meta/recipes-devtools/apt/apt/use-host.patch
index b30fcff0d..b30fcff0d 100644
--- a/meta/recipes-devtools/apt/apt/use-host.patch
+++ b/yocto-poky/meta/recipes-devtools/apt/apt/use-host.patch
diff --git a/meta/recipes-devtools/apt/apt_1.0.10.1.bb b/yocto-poky/meta/recipes-devtools/apt/apt_1.0.10.1.bb
index bf77e2a30..bf77e2a30 100644
--- a/meta/recipes-devtools/apt/apt_1.0.10.1.bb
+++ b/yocto-poky/meta/recipes-devtools/apt/apt_1.0.10.1.bb
diff --git a/meta/recipes-devtools/apt/files/apt.conf b/yocto-poky/meta/recipes-devtools/apt/files/apt.conf
index 03351356b..03351356b 100644
--- a/meta/recipes-devtools/apt/files/apt.conf
+++ b/yocto-poky/meta/recipes-devtools/apt/files/apt.conf
diff --git a/meta/recipes-devtools/apt/files/db_linking_hack.patch b/yocto-poky/meta/recipes-devtools/apt/files/db_linking_hack.patch
index a61d4b07c..a61d4b07c 100644
--- a/meta/recipes-devtools/apt/files/db_linking_hack.patch
+++ b/yocto-poky/meta/recipes-devtools/apt/files/db_linking_hack.patch
diff --git a/meta/recipes-devtools/apt/files/environment.patch b/yocto-poky/meta/recipes-devtools/apt/files/environment.patch
index 9a0303803..9a0303803 100644
--- a/meta/recipes-devtools/apt/files/environment.patch
+++ b/yocto-poky/meta/recipes-devtools/apt/files/environment.patch
diff --git a/meta/recipes-devtools/apt/files/no-curl.patch b/yocto-poky/meta/recipes-devtools/apt/files/no-curl.patch
index 30238faad..30238faad 100644
--- a/meta/recipes-devtools/apt/files/no-curl.patch
+++ b/yocto-poky/meta/recipes-devtools/apt/files/no-curl.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/yocto-poky/meta/recipes-devtools/autoconf/autoconf.inc
index 78b77e8c9..78b77e8c9 100644
--- a/meta/recipes-devtools/autoconf/autoconf.inc
+++ b/yocto-poky/meta/recipes-devtools/autoconf/autoconf.inc
diff --git a/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
index d1bd3a2a3..d1bd3a2a3 100644
--- a/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
+++ b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch
index 5ff18c235..5ff18c235 100644
--- a/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch
+++ b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch
index 31326f0bc..31326f0bc 100644
--- a/meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch
+++ b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch
index b5e8174ef..b5e8174ef 100644
--- a/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch
+++ b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch
index 73394d7d5..73394d7d5 100644
--- a/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch
+++ b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf/config_site.patch b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/config_site.patch
index 9f044404d..9f044404d 100644
--- a/meta/recipes-devtools/autoconf/autoconf/config_site.patch
+++ b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/config_site.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch
index 65df88f8f..65df88f8f 100644
--- a/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch
+++ b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf/preferbash.patch b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/preferbash.patch
index fa76ee9bd..fa76ee9bd 100644
--- a/meta/recipes-devtools/autoconf/autoconf/preferbash.patch
+++ b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/preferbash.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch
index 978a401f0..978a401f0 100644
--- a/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch
+++ b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch
index 55d2e2fe7..55d2e2fe7 100644
--- a/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch
+++ b/yocto-poky/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.69.bb b/yocto-poky/meta/recipes-devtools/autoconf/autoconf_2.69.bb
index 809007f35..809007f35 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.69.bb
+++ b/yocto-poky/meta/recipes-devtools/autoconf/autoconf_2.69.bb
diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.5.bb b/yocto-poky/meta/recipes-devtools/autogen/autogen-native_5.18.5.bb
index 2a2851283..2a2851283 100644
--- a/meta/recipes-devtools/autogen/autogen-native_5.18.5.bb
+++ b/yocto-poky/meta/recipes-devtools/autogen/autogen-native_5.18.5.bb
diff --git a/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch b/yocto-poky/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch
index 3d4c1d604..3d4c1d604 100644
--- a/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch
+++ b/yocto-poky/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch
diff --git a/meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch b/yocto-poky/meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch
index e56da7b1d..e56da7b1d 100644
--- a/meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch
+++ b/yocto-poky/meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch
diff --git a/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch b/yocto-poky/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch
index de126ed1f..de126ed1f 100644
--- a/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch
+++ b/yocto-poky/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch
diff --git a/meta/recipes-devtools/automake/automake.inc b/yocto-poky/meta/recipes-devtools/automake/automake.inc
index a1debd8d5..a1debd8d5 100644
--- a/meta/recipes-devtools/automake/automake.inc
+++ b/yocto-poky/meta/recipes-devtools/automake/automake.inc
diff --git a/meta/recipes-devtools/automake/automake/buildtest.patch b/yocto-poky/meta/recipes-devtools/automake/automake/buildtest.patch
index 1dd533784..1dd533784 100644
--- a/meta/recipes-devtools/automake/automake/buildtest.patch
+++ b/yocto-poky/meta/recipes-devtools/automake/automake/buildtest.patch
diff --git a/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch b/yocto-poky/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch
index f8334a721..f8334a721 100644
--- a/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch
+++ b/yocto-poky/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch
diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/yocto-poky/meta/recipes-devtools/automake/automake/python-libdir.patch
index 47541bded..47541bded 100644
--- a/meta/recipes-devtools/automake/automake/python-libdir.patch
+++ b/yocto-poky/meta/recipes-devtools/automake/automake/python-libdir.patch
diff --git a/meta/recipes-devtools/automake/automake_1.15.bb b/yocto-poky/meta/recipes-devtools/automake/automake_1.15.bb
index c33dc2267..c33dc2267 100644
--- a/meta/recipes-devtools/automake/automake_1.15.bb
+++ b/yocto-poky/meta/recipes-devtools/automake/automake_1.15.bb
diff --git a/meta/recipes-devtools/binutils/binutils-2.25.1.inc b/yocto-poky/meta/recipes-devtools/binutils/binutils-2.25.1.inc
index f3817fafb..f3817fafb 100644
--- a/meta/recipes-devtools/binutils/binutils-2.25.1.inc
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils-2.25.1.inc
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/yocto-poky/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
index ae1464227..ae1464227 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.25.1.bb b/yocto-poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.25.1.bb
index 5dbaa0301..5dbaa0301 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.25.1.bb
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.25.1.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross.inc b/yocto-poky/meta/recipes-devtools/binutils/binutils-cross.inc
index fd3d80149..fd3d80149 100644
--- a/meta/recipes-devtools/binutils/binutils-cross.inc
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils-cross.inc
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.25.1.bb b/yocto-poky/meta/recipes-devtools/binutils/binutils-cross_2.25.1.bb
index fbd1f7d25..fbd1f7d25 100644
--- a/meta/recipes-devtools/binutils/binutils-cross_2.25.1.bb
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils-cross_2.25.1.bb
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.25.1.bb b/yocto-poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.25.1.bb
index 788106f9e..788106f9e 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.25.1.bb
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.25.1.bb
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/yocto-poky/meta/recipes-devtools/binutils/binutils.inc
index a304867d2..a304867d2 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils.inc
diff --git a/meta/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch
index 1e80c1f79..1e80c1f79 100644
--- a/meta/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch
diff --git a/meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch
index 34e21d144..34e21d144 100644
--- a/meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch
diff --git a/meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch
index f5ce7674d..f5ce7674d 100644
--- a/meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch
diff --git a/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
index e3cd2a4d6..e3cd2a4d6 100644
--- a/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
diff --git a/meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch
index 9bbd93e97..9bbd93e97 100644
--- a/meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch
diff --git a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
index 62967efb1..62967efb1 100644
--- a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
diff --git a/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
index a037634cc..a037634cc 100644
--- a/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
diff --git a/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
index 0ae68fcd7..0ae68fcd7 100644
--- a/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
diff --git a/meta/recipes-devtools/binutils/binutils/0009-Upstream-Status-Inappropriate-distribution-codesourc.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/0009-Upstream-Status-Inappropriate-distribution-codesourc.patch
index f800796d9..f800796d9 100644
--- a/meta/recipes-devtools/binutils/binutils/0009-Upstream-Status-Inappropriate-distribution-codesourc.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/0009-Upstream-Status-Inappropriate-distribution-codesourc.patch
diff --git a/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
index 5451e743d..5451e743d 100644
--- a/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
diff --git a/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
index d9d57eee4..d9d57eee4 100644
--- a/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
diff --git a/meta/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch
index c56ff915b..c56ff915b 100644
--- a/meta/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch
diff --git a/meta/recipes-devtools/binutils/binutils/0013-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/0013-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch
index aee01c0b4..aee01c0b4 100644
--- a/meta/recipes-devtools/binutils/binutils/0013-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/0013-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch
diff --git a/meta/recipes-devtools/binutils/binutils/0014-gold-arm-Skip-pic-check-for-R_ARM_REL32.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/0014-gold-arm-Skip-pic-check-for-R_ARM_REL32.patch
index e02430251..e02430251 100644
--- a/meta/recipes-devtools/binutils/binutils/0014-gold-arm-Skip-pic-check-for-R_ARM_REL32.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/0014-gold-arm-Skip-pic-check-for-R_ARM_REL32.patch
diff --git a/meta/recipes-devtools/binutils/binutils/0015-Fix-dynamic-list-so-that-symbols-not-in-the-list-are.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/0015-Fix-dynamic-list-so-that-symbols-not-in-the-list-are.patch
index ee49c3863..ee49c3863 100644
--- a/meta/recipes-devtools/binutils/binutils/0015-Fix-dynamic-list-so-that-symbols-not-in-the-list-are.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/0015-Fix-dynamic-list-so-that-symbols-not-in-the-list-are.patch
diff --git a/meta/recipes-devtools/binutils/binutils/add-thunderx-support-for-gas.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/add-thunderx-support-for-gas.patch
index 0f6875e4f..0f6875e4f 100644
--- a/meta/recipes-devtools/binutils/binutils/add-thunderx-support-for-gas.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/add-thunderx-support-for-gas.patch
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-octeon3.patch b/yocto-poky/meta/recipes-devtools/binutils/binutils/binutils-octeon3.patch
index 4e8c69f3e..4e8c69f3e 100644
--- a/meta/recipes-devtools/binutils/binutils/binutils-octeon3.patch
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils/binutils-octeon3.patch
diff --git a/meta/recipes-devtools/binutils/binutils_2.25.1.bb b/yocto-poky/meta/recipes-devtools/binutils/binutils_2.25.1.bb
index 6f42671ed..6f42671ed 100644
--- a/meta/recipes-devtools/binutils/binutils_2.25.1.bb
+++ b/yocto-poky/meta/recipes-devtools/binutils/binutils_2.25.1.bb
diff --git a/meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch
index ba1a4bab4..ba1a4bab4 100644
--- a/meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/yocto-poky/meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch b/yocto-poky/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch
index 9543a56f1..9543a56f1 100644
--- a/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch
+++ b/yocto-poky/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch
diff --git a/meta/recipes-devtools/bison/bison/bison-2.3_m4.patch b/yocto-poky/meta/recipes-devtools/bison/bison/bison-2.3_m4.patch
index 348ce1d2b..348ce1d2b 100644
--- a/meta/recipes-devtools/bison/bison/bison-2.3_m4.patch
+++ b/yocto-poky/meta/recipes-devtools/bison/bison/bison-2.3_m4.patch
diff --git a/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch b/yocto-poky/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch
index ac16c5770..ac16c5770 100644
--- a/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch
+++ b/yocto-poky/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch
diff --git a/meta/recipes-devtools/bison/bison/m4.patch b/yocto-poky/meta/recipes-devtools/bison/bison/m4.patch
index d139da5e7..d139da5e7 100644
--- a/meta/recipes-devtools/bison/bison/m4.patch
+++ b/yocto-poky/meta/recipes-devtools/bison/bison/m4.patch
diff --git a/meta/recipes-devtools/bison/bison_2.3.bb b/yocto-poky/meta/recipes-devtools/bison/bison_2.3.bb
index 182e8802b..182e8802b 100644
--- a/meta/recipes-devtools/bison/bison_2.3.bb
+++ b/yocto-poky/meta/recipes-devtools/bison/bison_2.3.bb
diff --git a/meta/recipes-devtools/bison/bison_3.0.4.bb b/yocto-poky/meta/recipes-devtools/bison/bison_3.0.4.bb
index 708e9a3fd..708e9a3fd 100644
--- a/meta/recipes-devtools/bison/bison_3.0.4.bb
+++ b/yocto-poky/meta/recipes-devtools/bison/bison_3.0.4.bb
diff --git a/meta/recipes-devtools/bootchart2/bootchart2/bootchartd_stop.sh b/yocto-poky/meta/recipes-devtools/bootchart2/bootchart2/bootchartd_stop.sh
index 21a78877a..21a78877a 100644
--- a/meta/recipes-devtools/bootchart2/bootchart2/bootchartd_stop.sh
+++ b/yocto-poky/meta/recipes-devtools/bootchart2/bootchart2/bootchartd_stop.sh
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb b/yocto-poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb
index 4b0a98068..4b0a98068 100644
--- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb
+++ b/yocto-poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch b/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
index bbc53c6fe..bbc53c6fe 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
+++ b/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.1.2.bb b/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.1.2.bb
index 37c622baf..37c622baf 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.1.2.bb
+++ b/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.1.2.bb
diff --git a/meta/recipes-devtools/build-compare/build-compare_git.bb b/yocto-poky/meta/recipes-devtools/build-compare/build-compare_git.bb
index 676f11dd8..676f11dd8 100644
--- a/meta/recipes-devtools/build-compare/build-compare_git.bb
+++ b/yocto-poky/meta/recipes-devtools/build-compare/build-compare_git.bb
diff --git a/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch b/yocto-poky/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch
index 5c15218c8..5c15218c8 100644
--- a/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch
+++ b/yocto-poky/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch
diff --git a/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch b/yocto-poky/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch
index 7dda1acbf..7dda1acbf 100644
--- a/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch
+++ b/yocto-poky/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch
diff --git a/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch b/yocto-poky/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch
index cff3a9e23..cff3a9e23 100644
--- a/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch
+++ b/yocto-poky/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch
diff --git a/meta/recipes-devtools/ccache/ccache.inc b/yocto-poky/meta/recipes-devtools/ccache/ccache.inc
index 69aa64e5e..69aa64e5e 100644
--- a/meta/recipes-devtools/ccache/ccache.inc
+++ b/yocto-poky/meta/recipes-devtools/ccache/ccache.inc
diff --git a/meta/recipes-devtools/ccache/ccache_3.2.3.bb b/yocto-poky/meta/recipes-devtools/ccache/ccache_3.2.3.bb
index 97f557a9b..97f557a9b 100644
--- a/meta/recipes-devtools/ccache/ccache_3.2.3.bb
+++ b/yocto-poky/meta/recipes-devtools/ccache/ccache_3.2.3.bb
diff --git a/meta/recipes-devtools/ccache/files/0001-Fix-regression-in-recent-change-related-to-zlib-in-n.patch b/yocto-poky/meta/recipes-devtools/ccache/files/0001-Fix-regression-in-recent-change-related-to-zlib-in-n.patch
index f5bd9aaec..f5bd9aaec 100644
--- a/meta/recipes-devtools/ccache/files/0001-Fix-regression-in-recent-change-related-to-zlib-in-n.patch
+++ b/yocto-poky/meta/recipes-devtools/ccache/files/0001-Fix-regression-in-recent-change-related-to-zlib-in-n.patch
diff --git a/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch b/yocto-poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch
index 837cfadf6..837cfadf6 100644
--- a/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch
+++ b/yocto-poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch
diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a31.bb b/yocto-poky/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a31.bb
index d0f36e23d..d0f36e23d 100644
--- a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a31.bb
+++ b/yocto-poky/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a31.bb
diff --git a/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch b/yocto-poky/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch
index f96f104fa..f96f104fa 100644
--- a/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch
+++ b/yocto-poky/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch
diff --git a/meta/recipes-devtools/chrpath/chrpath_0.16.bb b/yocto-poky/meta/recipes-devtools/chrpath/chrpath_0.16.bb
index 0a3b06e73..0a3b06e73 100644
--- a/meta/recipes-devtools/chrpath/chrpath_0.16.bb
+++ b/yocto-poky/meta/recipes-devtools/chrpath/chrpath_0.16.bb
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.3.1.bb b/yocto-poky/meta/recipes-devtools/cmake/cmake-native_3.3.1.bb
index cb4e749d7..cb4e749d7 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.3.1.bb
+++ b/yocto-poky/meta/recipes-devtools/cmake/cmake-native_3.3.1.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/yocto-poky/meta/recipes-devtools/cmake/cmake.inc
index 57e93ac07..57e93ac07 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/yocto-poky/meta/recipes-devtools/cmake/cmake.inc
diff --git a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake b/yocto-poky/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake
index 60014bbf2..60014bbf2 100644
--- a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake
+++ b/yocto-poky/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake
diff --git a/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch b/yocto-poky/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch
index bf3671259..bf3671259 100644
--- a/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch
+++ b/yocto-poky/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch
diff --git a/meta/recipes-devtools/cmake/cmake/dont-run-cross-binaries.patch b/yocto-poky/meta/recipes-devtools/cmake/cmake/dont-run-cross-binaries.patch
index 0c059f12e..0c059f12e 100644
--- a/meta/recipes-devtools/cmake/cmake/dont-run-cross-binaries.patch
+++ b/yocto-poky/meta/recipes-devtools/cmake/cmake/dont-run-cross-binaries.patch
diff --git a/meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh b/yocto-poky/meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh
index 0eb56b66f..0eb56b66f 100644
--- a/meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh
+++ b/yocto-poky/meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh
diff --git a/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch b/yocto-poky/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch
index 80fc277fa..80fc277fa 100644
--- a/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch
+++ b/yocto-poky/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch
diff --git a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch b/yocto-poky/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
index 15cbca89d..15cbca89d 100644
--- a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
+++ b/yocto-poky/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
diff --git a/meta/recipes-devtools/cmake/cmake_3.3.1.bb b/yocto-poky/meta/recipes-devtools/cmake/cmake_3.3.1.bb
index 2f188f071..2f188f071 100644
--- a/meta/recipes-devtools/cmake/cmake_3.3.1.bb
+++ b/yocto-poky/meta/recipes-devtools/cmake/cmake_3.3.1.bb
diff --git a/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.22.bb b/yocto-poky/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.22.bb
index 6f73564b4..6f73564b4 100644
--- a/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.22.bb
+++ b/yocto-poky/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.22.bb
diff --git a/meta/recipes-devtools/devel-config/distcc-config.bb b/yocto-poky/meta/recipes-devtools/devel-config/distcc-config.bb
index cb7830b99..cb7830b99 100644
--- a/meta/recipes-devtools/devel-config/distcc-config.bb
+++ b/yocto-poky/meta/recipes-devtools/devel-config/distcc-config.bb
diff --git a/meta/recipes-devtools/devel-config/distcc-config/distcc.sh b/yocto-poky/meta/recipes-devtools/devel-config/distcc-config/distcc.sh
index b4205931d..b4205931d 100644
--- a/meta/recipes-devtools/devel-config/distcc-config/distcc.sh
+++ b/yocto-poky/meta/recipes-devtools/devel-config/distcc-config/distcc.sh
diff --git a/meta/recipes-devtools/devel-config/nfs-export-root.bb b/yocto-poky/meta/recipes-devtools/devel-config/nfs-export-root.bb
index 169d00581..169d00581 100644
--- a/meta/recipes-devtools/devel-config/nfs-export-root.bb
+++ b/yocto-poky/meta/recipes-devtools/devel-config/nfs-export-root.bb
diff --git a/meta/recipes-devtools/devel-config/nfs-export-root/exports b/yocto-poky/meta/recipes-devtools/devel-config/nfs-export-root/exports
index 1353c5ad8..1353c5ad8 100644
--- a/meta/recipes-devtools/devel-config/nfs-export-root/exports
+++ b/yocto-poky/meta/recipes-devtools/devel-config/nfs-export-root/exports
diff --git a/meta/recipes-devtools/diffstat/diffstat/run-ptest b/yocto-poky/meta/recipes-devtools/diffstat/diffstat/run-ptest
index a936b3d3f..a936b3d3f 100644
--- a/meta/recipes-devtools/diffstat/diffstat/run-ptest
+++ b/yocto-poky/meta/recipes-devtools/diffstat/diffstat/run-ptest
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.60.bb b/yocto-poky/meta/recipes-devtools/diffstat/diffstat_1.60.bb
index 25ba4dac4..25ba4dac4 100644
--- a/meta/recipes-devtools/diffstat/diffstat_1.60.bb
+++ b/yocto-poky/meta/recipes-devtools/diffstat/diffstat_1.60.bb
diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb b/yocto-poky/meta/recipes-devtools/distcc/distcc_3.1.bb
index f8879c87c..f8879c87c 100644
--- a/meta/recipes-devtools/distcc/distcc_3.1.bb
+++ b/yocto-poky/meta/recipes-devtools/distcc/distcc_3.1.bb
diff --git a/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch b/yocto-poky/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch
index b17ec9c95..b17ec9c95 100644
--- a/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch
+++ b/yocto-poky/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch
diff --git a/meta/recipes-devtools/distcc/files/default b/yocto-poky/meta/recipes-devtools/distcc/files/default
index 63c4159b9..63c4159b9 100644
--- a/meta/recipes-devtools/distcc/files/default
+++ b/yocto-poky/meta/recipes-devtools/distcc/files/default
diff --git a/meta/recipes-devtools/distcc/files/distcc b/yocto-poky/meta/recipes-devtools/distcc/files/distcc
index e36f0fa69..e36f0fa69 100755
--- a/meta/recipes-devtools/distcc/files/distcc
+++ b/yocto-poky/meta/recipes-devtools/distcc/files/distcc
diff --git a/meta/recipes-devtools/distcc/files/distcc.service b/yocto-poky/meta/recipes-devtools/distcc/files/distcc.service
index 0253ddf52..0253ddf52 100644
--- a/meta/recipes-devtools/distcc/files/distcc.service
+++ b/yocto-poky/meta/recipes-devtools/distcc/files/distcc.service
diff --git a/meta/recipes-devtools/distcc/files/distccmon-gnome.desktop b/yocto-poky/meta/recipes-devtools/distcc/files/distccmon-gnome.desktop
index 7b5d85ce4..7b5d85ce4 100644
--- a/meta/recipes-devtools/distcc/files/distccmon-gnome.desktop
+++ b/yocto-poky/meta/recipes-devtools/distcc/files/distccmon-gnome.desktop
diff --git a/meta/recipes-devtools/distcc/files/separatebuilddir.patch b/yocto-poky/meta/recipes-devtools/distcc/files/separatebuilddir.patch
index b9e3e42dd..b9e3e42dd 100644
--- a/meta/recipes-devtools/distcc/files/separatebuilddir.patch
+++ b/yocto-poky/meta/recipes-devtools/distcc/files/separatebuilddir.patch
diff --git a/meta/recipes-devtools/dmidecode/dmidecode_2.12.bb b/yocto-poky/meta/recipes-devtools/dmidecode/dmidecode_2.12.bb
index 4c165560d..4c165560d 100644
--- a/meta/recipes-devtools/dmidecode/dmidecode_2.12.bb
+++ b/yocto-poky/meta/recipes-devtools/dmidecode/dmidecode_2.12.bb
diff --git a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb b/yocto-poky/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
index 461b48f4c..461b48f4c 100644
--- a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
+++ b/yocto-poky/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native_3.1.bb b/yocto-poky/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native_3.1.bb
index a7df4f976..a7df4f976 100644
--- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native_3.1.bb
+++ b/yocto-poky/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native_3.1.bb
diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native_4.1.bb b/yocto-poky/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native_4.1.bb
index 88c939636..88c939636 100644
--- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native_4.1.bb
+++ b/yocto-poky/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native_4.1.bb
diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb b/yocto-poky/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb
index ae723c74f..ae723c74f 100644
--- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb
+++ b/yocto-poky/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb
diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc b/yocto-poky/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
index af5098796..af5098796 100644
--- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
+++ b/yocto-poky/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
diff --git a/meta/recipes-devtools/docbook-sgml-dtd/files/LICENSE-OASIS b/yocto-poky/meta/recipes-devtools/docbook-sgml-dtd/files/LICENSE-OASIS
index 6da7f5b8c..6da7f5b8c 100644
--- a/meta/recipes-devtools/docbook-sgml-dtd/files/LICENSE-OASIS
+++ b/yocto-poky/meta/recipes-devtools/docbook-sgml-dtd/files/LICENSE-OASIS
diff --git a/meta/recipes-devtools/docbook-utils/docbook-utils-0.6.14/re.patch b/yocto-poky/meta/recipes-devtools/docbook-utils/docbook-utils-0.6.14/re.patch
index db079d68f..db079d68f 100644
--- a/meta/recipes-devtools/docbook-utils/docbook-utils-0.6.14/re.patch
+++ b/yocto-poky/meta/recipes-devtools/docbook-utils/docbook-utils-0.6.14/re.patch
diff --git a/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb b/yocto-poky/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
index c3a5f3b42..c3a5f3b42 100644
--- a/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
+++ b/yocto-poky/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/LICENSE-OASIS b/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/LICENSE-OASIS
index 6da7f5b8c..6da7f5b8c 100644
--- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/LICENSE-OASIS
+++ b/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/LICENSE-OASIS
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch b/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch
index 59703609c..59703609c 100644
--- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch
+++ b/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml.xml b/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml.xml
index b71f559ef..b71f559ef 100644
--- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml.xml
+++ b/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml.xml
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb b/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
index de1bc3970..de1bc3970 100644
--- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
+++ b/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch b/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch
index 0559a5c0d..0559a5c0d 100644
--- a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch
+++ b/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml b/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml
index a1a576a2e..a1a576a2e 100644
--- a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml
+++ b/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb b/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb
index 2a1bdc47f..2a1bdc47f 100644
--- a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb
+++ b/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/0001-Include-fcntl.h-for-getting-loff_t-definition.patch b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/0001-Include-fcntl.h-for-getting-loff_t-definition.patch
index 06f5b7a96..06f5b7a96 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools/0001-Include-fcntl.h-for-getting-loff_t-definition.patch
+++ b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/0001-Include-fcntl.h-for-getting-loff_t-definition.patch
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/alignment_hack.patch b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/alignment_hack.patch
index b46b2db0a..b46b2db0a 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools/alignment_hack.patch
+++ b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/alignment_hack.patch
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/dosfstools-msdos_fs-types.patch b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/dosfstools-msdos_fs-types.patch
index 35abd1a2b..35abd1a2b 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools/dosfstools-msdos_fs-types.patch
+++ b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/dosfstools-msdos_fs-types.patch
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/fix_populated_dosfs_creation.patch b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/fix_populated_dosfs_creation.patch
index 9d7f7321a..9d7f7321a 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools/fix_populated_dosfs_creation.patch
+++ b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/fix_populated_dosfs_creation.patch
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/include-linux-types.patch b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/include-linux-types.patch
index ab5c8cf8c..ab5c8cf8c 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools/include-linux-types.patch
+++ b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/include-linux-types.patch
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-bootcode.patch b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-bootcode.patch
index ae21bee78..ae21bee78 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-bootcode.patch
+++ b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-bootcode.patch
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-dir.patch b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-dir.patch
index 3ba4711d1..3ba4711d1 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-dir.patch
+++ b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-dir.patch
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/msdos_fat12_undefined.patch b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/msdos_fat12_undefined.patch
index 11e8a7594..11e8a7594 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools/msdos_fat12_undefined.patch
+++ b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/msdos_fat12_undefined.patch
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/nofat32_autoselect.patch b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/nofat32_autoselect.patch
index 848a76b99..848a76b99 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools/nofat32_autoselect.patch
+++ b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools/nofat32_autoselect.patch
diff --git a/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb
index beec488c0..beec488c0 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb
+++ b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb
diff --git a/meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb
index ac131cb72..ac131cb72 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb
+++ b/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools_3.0.28.bb
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/yocto-poky/meta/recipes-devtools/dpkg/dpkg.inc
index 6eec2cde9..6eec2cde9 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/yocto-poky/meta/recipes-devtools/dpkg/dpkg.inc
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-When-running-do_package_write_deb-we-have-trees-of-h.patch b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0001-When-running-do_package_write_deb-we-have-trees-of-h.patch
index 6967ef498..6967ef498 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0001-When-running-do_package_write_deb-we-have-trees-of-h.patch
+++ b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0001-When-running-do_package_write_deb-we-have-trees-of-h.patch
diff --git a/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch
index 231a6a290..231a6a290 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch
+++ b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch
diff --git a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
index 9f77c6c99..9f77c6c99 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
+++ b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
diff --git a/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch
index 56c85c773..56c85c773 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch
+++ b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch
diff --git a/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch
index 96e96f277..96e96f277 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch
+++ b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch
diff --git a/meta/recipes-devtools/dpkg/dpkg/CVE-2015-0860.patch b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/CVE-2015-0860.patch
index 1f259d34d..1f259d34d 100644
--- a/meta/recipes-devtools/dpkg/dpkg/CVE-2015-0860.patch
+++ b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/CVE-2015-0860.patch
diff --git a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
index af275dec1..af275dec1 100644
--- a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
+++ b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
diff --git a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
index cad4c0f0a..cad4c0f0a 100644
--- a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
+++ b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
diff --git a/meta/recipes-devtools/dpkg/dpkg/dpkg-configure.service b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/dpkg-configure.service
index f0b0789e4..f0b0789e4 100644
--- a/meta/recipes-devtools/dpkg/dpkg/dpkg-configure.service
+++ b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/dpkg-configure.service
diff --git a/meta/recipes-devtools/dpkg/dpkg/fix-abs-redefine.patch b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/fix-abs-redefine.patch
index e73311c29..e73311c29 100644
--- a/meta/recipes-devtools/dpkg/dpkg/fix-abs-redefine.patch
+++ b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/fix-abs-redefine.patch
diff --git a/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch
index d56b8a69a..d56b8a69a 100644
--- a/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch
+++ b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch
diff --git a/meta/recipes-devtools/dpkg/dpkg/noman.patch b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/noman.patch
index d30c15018..d30c15018 100644
--- a/meta/recipes-devtools/dpkg/dpkg/noman.patch
+++ b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/noman.patch
diff --git a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch
index 4f408ff77..4f408ff77 100644
--- a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch
+++ b/yocto-poky/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.18.2.bb b/yocto-poky/meta/recipes-devtools/dpkg/dpkg_1.18.2.bb
index 2fc096db4..2fc096db4 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.18.2.bb
+++ b/yocto-poky/meta/recipes-devtools/dpkg/dpkg_1.18.2.bb
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index bcd9ba759..bcd9ba759 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsprogs-fix-cross-compilation-problem.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsprogs-fix-cross-compilation-problem.patch
index 73043bedd..73043bedd 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsprogs-fix-cross-compilation-problem.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsprogs-fix-cross-compilation-problem.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch
index 72f77cc6b..72f77cc6b 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-mke2fs-add-the-ability-to-copy-files-from-a-given-di.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-mke2fs-add-the-ability-to-copy-files-from-a-given-di.patch
index 9ea413ef5..9ea413ef5 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-mke2fs-add-the-ability-to-copy-files-from-a-given-di.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-mke2fs-add-the-ability-to-copy-files-from-a-given-di.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0002-misc-create_inode.c-copy-files-recursively.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0002-misc-create_inode.c-copy-files-recursively.patch
index 9bff644ea..9bff644ea 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0002-misc-create_inode.c-copy-files-recursively.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0002-misc-create_inode.c-copy-files-recursively.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0003-misc-create_inode.c-create-special-file.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0003-misc-create_inode.c-create-special-file.patch
index 3847b6e5c..3847b6e5c 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0003-misc-create_inode.c-create-special-file.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0003-misc-create_inode.c-create-special-file.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0004-misc-create_inode.c-create-symlink.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0004-misc-create_inode.c-create-symlink.patch
index 83d198c75..83d198c75 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0004-misc-create_inode.c-create-symlink.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0004-misc-create_inode.c-create-symlink.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0005-misc-create_inode.c-copy-regular-file.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0005-misc-create_inode.c-copy-regular-file.patch
index 7935cd84f..7935cd84f 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0005-misc-create_inode.c-copy-regular-file.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0005-misc-create_inode.c-copy-regular-file.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0006-misc-create_inode.c-create-directory.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0006-misc-create_inode.c-create-directory.patch
index 5c7ca9c37..5c7ca9c37 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0006-misc-create_inode.c-create-directory.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0006-misc-create_inode.c-create-directory.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch
index f296393b4..f296393b4 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0008-mke2fs.c-add-an-option-d-root-directory.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0008-mke2fs.c-add-an-option-d-root-directory.patch
index 1f98673f3..1f98673f3 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0008-mke2fs.c-add-an-option-d-root-directory.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0008-mke2fs.c-add-an-option-d-root-directory.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0009-misc-create_inode.c-handle-hardlinks.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0009-misc-create_inode.c-handle-hardlinks.patch
index a330ee45a..a330ee45a 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0009-misc-create_inode.c-handle-hardlinks.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0009-misc-create_inode.c-handle-hardlinks.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0010-debugfs-use-the-functions-in-misc-create_inode.c.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0010-debugfs-use-the-functions-in-misc-create_inode.c.patch
index 2a6ca8f9a..2a6ca8f9a 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0010-debugfs-use-the-functions-in-misc-create_inode.c.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0010-debugfs-use-the-functions-in-misc-create_inode.c.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0011-mke2fs.8.in-update-the-manual-for-the-d-option.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0011-mke2fs.8.in-update-the-manual-for-the-d-option.patch
index ddd2cb8b4..ddd2cb8b4 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0011-mke2fs.8.in-update-the-manual-for-the-d-option.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0011-mke2fs.8.in-update-the-manual-for-the-d-option.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0012-Fix-musl-build-failures.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0012-Fix-musl-build-failures.patch
index 0b8008dfc..0b8008dfc 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0012-Fix-musl-build-failures.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0012-Fix-musl-build-failures.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch
index 4de67c970..4de67c970 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/acinclude.m4 b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/acinclude.m4
index c0bd7dbde..c0bd7dbde 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/acinclude.m4
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/acinclude.m4
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/cache_inode.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/cache_inode.patch
index f9ef8e5f2..f9ef8e5f2 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/cache_inode.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/cache_inode.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/copy-in-create-hardlinks-with-the-correct-directory-.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/copy-in-create-hardlinks-with-the-correct-directory-.patch
index f54969357..f54969357 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/copy-in-create-hardlinks-with-the-correct-directory-.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/copy-in-create-hardlinks-with-the-correct-directory-.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/fix-icache.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/fix-icache.patch
index d38cc4d3f..d38cc4d3f 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/fix-icache.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/fix-icache.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch
index cba0ce004..cba0ce004 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir.patch
index aa7a2981b..aa7a2981b 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
index b8a53e913..b8a53e913 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
index 830e9d57a..830e9d57a 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch
index f3e6eb778..f3e6eb778 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
index 1ac251324..1ac251324 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
index a8edeefc9..a8edeefc9 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
+++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/arm_backend.diff b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/arm_backend.diff
index d4e4675ad..d4e4675ad 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/arm_backend.diff
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/arm_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/elf_additions.diff b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/elf_additions.diff
index 5baa70900..5baa70900 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/elf_additions.diff
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/elf_additions.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/elf_begin.c-CVE-2014-9447-fix.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/elf_begin.c-CVE-2014-9447-fix.patch
index 84e8ddcca..84e8ddcca 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/elf_begin.c-CVE-2014-9447-fix.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/elf_begin.c-CVE-2014-9447-fix.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/elfutils-ar-c-fix-num-passed-to-memset.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/elfutils-ar-c-fix-num-passed-to-memset.patch
index b619619ec..b619619ec 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/elfutils-ar-c-fix-num-passed-to-memset.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/elfutils-ar-c-fix-num-passed-to-memset.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/elfutils-fsize.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/elfutils-fsize.patch
index 0ff353d0d..0ff353d0d 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/elfutils-fsize.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/elfutils-fsize.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/fix-build-gcc-4.8.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/fix-build-gcc-4.8.patch
index 0e2869020..0e2869020 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/fix-build-gcc-4.8.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/fix-build-gcc-4.8.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/fix_for_gcc-4.7.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/fix_for_gcc-4.7.patch
index bd634b441..bd634b441 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/fix_for_gcc-4.7.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/fix_for_gcc-4.7.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/hppa_backend.diff b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/hppa_backend.diff
index a86b97c68..a86b97c68 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/hppa_backend.diff
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/hppa_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/i386_dis.h b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/i386_dis.h
index a5cc01f91..a5cc01f91 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/i386_dis.h
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/i386_dis.h
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/m68k_backend.diff b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/m68k_backend.diff
index 5b621f92f..5b621f92f 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/m68k_backend.diff
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/m68k_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/mips_backend.diff b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/mips_backend.diff
index 3f81a75b1..3f81a75b1 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/mips_backend.diff
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/mips_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch
index 2b5dad368..2b5dad368 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/redhat-portability.diff b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/redhat-portability.diff
index b8a912c41..b8a912c41 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/redhat-portability.diff
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/redhat-portability.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/redhat-robustify.diff b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/redhat-robustify.diff
index cd398549d..cd398549d 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/redhat-robustify.diff
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/redhat-robustify.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/remove-unused.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/remove-unused.patch
index 6a1979148..6a1979148 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/remove-unused.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/remove-unused.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/testsuite-ignore-elflint.diff b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/testsuite-ignore-elflint.diff
index d792d5fd7..d792d5fd7 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/testsuite-ignore-elflint.diff
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/testsuite-ignore-elflint.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/uclibc-support-for-elfutils-0.148.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/uclibc-support-for-elfutils-0.148.patch
index 3cf16ac92..3cf16ac92 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/uclibc-support-for-elfutils-0.148.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/uclibc-support-for-elfutils-0.148.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/x86_64_dis.h b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/x86_64_dis.h
index a0198bed9..a0198bed9 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.148/x86_64_dis.h
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.148/x86_64_dis.h
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch
index 3754c1c36..3754c1c36 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.163/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/0001-fix-a-stack-usage-warning.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/0001-fix-a-stack-usage-warning.patch
index 6923bf705..6923bf705 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.163/0001-fix-a-stack-usage-warning.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/0001-fix-a-stack-usage-warning.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/0001-remove-the-unneed-checking.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/0001-remove-the-unneed-checking.patch
index 5be92d705..5be92d705 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.163/0001-remove-the-unneed-checking.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/0001-remove-the-unneed-checking.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/arm_backend.diff b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/arm_backend.diff
index c97c4e470..c97c4e470 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.163/arm_backend.diff
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/arm_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/arm_func_value.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/arm_func_value.patch
index 2fe4df68b..2fe4df68b 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.163/arm_func_value.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/arm_func_value.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/arm_unwind_ret_mask.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/arm_unwind_ret_mask.patch
index 8abb36bb4..8abb36bb4 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.163/arm_unwind_ret_mask.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/arm_unwind_ret_mask.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/fixheadercheck.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/fixheadercheck.patch
index 5de3b24c8..5de3b24c8 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.163/fixheadercheck.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/fixheadercheck.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/hppa_backend.diff b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/hppa_backend.diff
index d51a72007..d51a72007 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.163/hppa_backend.diff
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/hppa_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/m68k_backend.diff b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/m68k_backend.diff
index f5b566f2d..f5b566f2d 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.163/m68k_backend.diff
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/m68k_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/mips_backend.diff b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/mips_backend.diff
index d73a3f286..d73a3f286 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.163/mips_backend.diff
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/mips_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/mips_readelf_w.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/mips_readelf_w.patch
index 8e669e719..8e669e719 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.163/mips_readelf_w.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/mips_readelf_w.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/non_linux.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/non_linux.patch
index 35b1b389f..35b1b389f 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.163/non_linux.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/non_linux.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/redhat-portability.diff b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/redhat-portability.diff
index a0ff07d39..a0ff07d39 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.163/redhat-portability.diff
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/redhat-portability.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/scanf-format.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/scanf-format.patch
index c08519cf5..c08519cf5 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.163/scanf-format.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/scanf-format.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/testsuite-ignore-elflint.diff b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/testsuite-ignore-elflint.diff
index eae5796de..eae5796de 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.163/testsuite-ignore-elflint.diff
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/testsuite-ignore-elflint.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/uclibc-support-for-elfutils-0.161.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/uclibc-support-for-elfutils-0.161.patch
index f1533bfd3..f1533bfd3 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.163/uclibc-support-for-elfutils-0.161.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils-0.163/uclibc-support-for-elfutils-0.161.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils/Fix_elf_cvt_gunhash.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils/Fix_elf_cvt_gunhash.patch
index f861e8990..f861e8990 100644
--- a/meta/recipes-devtools/elfutils/elfutils/Fix_elf_cvt_gunhash.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils/Fix_elf_cvt_gunhash.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils/dso-link-change.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils/dso-link-change.patch
index d0cd3ed6f..d0cd3ed6f 100644
--- a/meta/recipes-devtools/elfutils/elfutils/dso-link-change.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils/dso-link-change.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils/mempcpy.patch b/yocto-poky/meta/recipes-devtools/elfutils/elfutils/mempcpy.patch
index 24e31fa5b..24e31fa5b 100644
--- a/meta/recipes-devtools/elfutils/elfutils/mempcpy.patch
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils/mempcpy.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.148.bb b/yocto-poky/meta/recipes-devtools/elfutils/elfutils_0.148.bb
index 0d8490dee..0d8490dee 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.148.bb
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils_0.148.bb
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.163.bb b/yocto-poky/meta/recipes-devtools/elfutils/elfutils_0.163.bb
index e39181363..e39181363 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.163.bb
+++ b/yocto-poky/meta/recipes-devtools/elfutils/elfutils_0.163.bb
diff --git a/meta/recipes-devtools/expect/expect/0001-configure.in.patch b/yocto-poky/meta/recipes-devtools/expect/expect/0001-configure.in.patch
index 7595a254a..7595a254a 100644
--- a/meta/recipes-devtools/expect/expect/0001-configure.in.patch
+++ b/yocto-poky/meta/recipes-devtools/expect/expect/0001-configure.in.patch
diff --git a/meta/recipes-devtools/expect/expect/0001-expect-install-scripts-without-using-the-fixline1-tc.patch b/yocto-poky/meta/recipes-devtools/expect/expect/0001-expect-install-scripts-without-using-the-fixline1-tc.patch
index 274ad8635..274ad8635 100644
--- a/meta/recipes-devtools/expect/expect/0001-expect-install-scripts-without-using-the-fixline1-tc.patch
+++ b/yocto-poky/meta/recipes-devtools/expect/expect/0001-expect-install-scripts-without-using-the-fixline1-tc.patch
diff --git a/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch b/yocto-poky/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch
index dc4c6ba40..dc4c6ba40 100644
--- a/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch
+++ b/yocto-poky/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch
diff --git a/meta/recipes-devtools/expect/expect/01-example-shebang.patch b/yocto-poky/meta/recipes-devtools/expect/expect/01-example-shebang.patch
index 8597f3138..8597f3138 100644
--- a/meta/recipes-devtools/expect/expect/01-example-shebang.patch
+++ b/yocto-poky/meta/recipes-devtools/expect/expect/01-example-shebang.patch
diff --git a/meta/recipes-devtools/expect/expect_5.45.bb b/yocto-poky/meta/recipes-devtools/expect/expect_5.45.bb
index 3c2aab417..3c2aab417 100644
--- a/meta/recipes-devtools/expect/expect_5.45.bb
+++ b/yocto-poky/meta/recipes-devtools/expect/expect_5.45.bb
diff --git a/meta/recipes-devtools/fdisk/gptfdisk_1.0.0.bb b/yocto-poky/meta/recipes-devtools/fdisk/gptfdisk_1.0.0.bb
index f4b0e32aa..f4b0e32aa 100644
--- a/meta/recipes-devtools/fdisk/gptfdisk_1.0.0.bb
+++ b/yocto-poky/meta/recipes-devtools/fdisk/gptfdisk_1.0.0.bb
diff --git a/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch b/yocto-poky/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch
index 8a16b2cf7..8a16b2cf7 100644
--- a/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch
+++ b/yocto-poky/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch
diff --git a/meta/recipes-devtools/file/file/debian-742262.patch b/yocto-poky/meta/recipes-devtools/file/file/debian-742262.patch
index 1ef485e93..1ef485e93 100644
--- a/meta/recipes-devtools/file/file/debian-742262.patch
+++ b/yocto-poky/meta/recipes-devtools/file/file/debian-742262.patch
diff --git a/meta/recipes-devtools/file/file/host-file.patch b/yocto-poky/meta/recipes-devtools/file/file/host-file.patch
index a7efbdcbc..a7efbdcbc 100644
--- a/meta/recipes-devtools/file/file/host-file.patch
+++ b/yocto-poky/meta/recipes-devtools/file/file/host-file.patch
diff --git a/meta/recipes-devtools/file/file_5.24.bb b/yocto-poky/meta/recipes-devtools/file/file_5.24.bb
index d04f1218a..d04f1218a 100644
--- a/meta/recipes-devtools/file/file_5.24.bb
+++ b/yocto-poky/meta/recipes-devtools/file/file_5.24.bb
diff --git a/meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch b/yocto-poky/meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch
index 032833ae7..032833ae7 100644
--- a/meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch
+++ b/yocto-poky/meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch
diff --git a/meta/recipes-devtools/flex/files/run-ptest b/yocto-poky/meta/recipes-devtools/flex/files/run-ptest
index bffba16f7..bffba16f7 100755
--- a/meta/recipes-devtools/flex/files/run-ptest
+++ b/yocto-poky/meta/recipes-devtools/flex/files/run-ptest
diff --git a/meta/recipes-devtools/flex/flex.inc b/yocto-poky/meta/recipes-devtools/flex/flex.inc
index a4a26e278..a4a26e278 100644
--- a/meta/recipes-devtools/flex/flex.inc
+++ b/yocto-poky/meta/recipes-devtools/flex/flex.inc
diff --git a/meta/recipes-devtools/flex/flex_2.5.39.bb b/yocto-poky/meta/recipes-devtools/flex/flex_2.5.39.bb
index 7485743b2..7485743b2 100644
--- a/meta/recipes-devtools/flex/flex_2.5.39.bb
+++ b/yocto-poky/meta/recipes-devtools/flex/flex_2.5.39.bb
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8.inc
index b3e1c332e..b3e1c332e 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8.inc
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
index e58801167..e58801167 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0002-uclibc-conf.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0002-uclibc-conf.patch
index dda3b1041..dda3b1041 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0002-uclibc-conf.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0002-uclibc-conf.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0003-gcc-uclibc-locale-ctype_touplow_t.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0003-gcc-uclibc-locale-ctype_touplow_t.patch
index 7098e9950..7098e9950 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0003-gcc-uclibc-locale-ctype_touplow_t.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0003-gcc-uclibc-locale-ctype_touplow_t.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0004-uclibc-locale.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0004-uclibc-locale.patch
index 49f5f338e..49f5f338e 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0004-uclibc-locale.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0004-uclibc-locale.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0005-uclibc-locale-no__x.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0005-uclibc-locale-no__x.patch
index dcbbfe454..dcbbfe454 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0005-uclibc-locale-no__x.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0005-uclibc-locale-no__x.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0006-uclibc-locale-wchar_fix.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0006-uclibc-locale-wchar_fix.patch
index 3406859e1..3406859e1 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0006-uclibc-locale-wchar_fix.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0006-uclibc-locale-wchar_fix.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0007-uclibc-locale-update.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0007-uclibc-locale-update.patch
index 58511233d..58511233d 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0007-uclibc-locale-update.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0007-uclibc-locale-update.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0008-missing-execinfo_h.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0008-missing-execinfo_h.patch
index 282380934..282380934 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0008-missing-execinfo_h.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0008-missing-execinfo_h.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0009-c99-snprintf.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0009-c99-snprintf.patch
index 7168778df..7168778df 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0009-c99-snprintf.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0009-c99-snprintf.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0010-c99-complex-ugly-hack.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0010-c99-complex-ugly-hack.patch
index b628571e5..b628571e5 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0010-c99-complex-ugly-hack.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0010-c99-complex-ugly-hack.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0011-index_macro.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0011-index_macro.patch
index 8ee79b09b..8ee79b09b 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0011-index_macro.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0011-index_macro.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0012-libmudflap-susv3-legacy.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0012-libmudflap-susv3-legacy.patch
index 968d45e84..968d45e84 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0012-libmudflap-susv3-legacy.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0012-libmudflap-susv3-legacy.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0013-libstdc-namespace.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0013-libstdc-namespace.patch
index 4a3efdebd..4a3efdebd 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0013-libstdc-namespace.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0013-libstdc-namespace.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0014-sh-pr24836.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0014-sh-pr24836.patch
index cb8fd525b..cb8fd525b 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0014-sh-pr24836.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0014-sh-pr24836.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch
index 1081222f6..1081222f6 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0016-gcc-poison-system-directories.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0016-gcc-poison-system-directories.patch
index c955e4920..c955e4920 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0016-gcc-poison-system-directories.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0016-gcc-poison-system-directories.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0017-gcc-poison-dir-extend.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0017-gcc-poison-dir-extend.patch
index 9e81efd4d..9e81efd4d 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0017-gcc-poison-dir-extend.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0017-gcc-poison-dir-extend.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0018-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0018-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
index a28cafdf9..a28cafdf9 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0018-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0018-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0019-64-bit-multilib-hack.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0019-64-bit-multilib-hack.patch
index a975cfb13..a975cfb13 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0019-64-bit-multilib-hack.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0019-64-bit-multilib-hack.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0020-optional-libstdc.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0020-optional-libstdc.patch
index eff021eb9..eff021eb9 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0020-optional-libstdc.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0020-optional-libstdc.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0021-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0021-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
index eb3c61f12..eb3c61f12 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0021-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0021-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0022-COLLECT_GCC_OPTIONS.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0022-COLLECT_GCC_OPTIONS.patch
index 40c8abffa..40c8abffa 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0022-COLLECT_GCC_OPTIONS.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0022-COLLECT_GCC_OPTIONS.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
index 9e4435cf5..9e4435cf5 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0024-PR-target-32219.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0024-PR-target-32219.patch
index b47d841a7..b47d841a7 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0024-PR-target-32219.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0024-PR-target-32219.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0025-fortran-cross-compile-hack.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0025-fortran-cross-compile-hack.patch
index 0e7914d5c..0e7914d5c 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0025-fortran-cross-compile-hack.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0025-fortran-cross-compile-hack.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0026-libgcc-sjlj-check.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0026-libgcc-sjlj-check.patch
index d4efab956..d4efab956 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0026-libgcc-sjlj-check.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0026-libgcc-sjlj-check.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0027-cpp-honor-sysroot.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0027-cpp-honor-sysroot.patch
index 05e95219f..05e95219f 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0027-cpp-honor-sysroot.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0027-cpp-honor-sysroot.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0028-MIPS64-Default-to-N64-ABI.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0028-MIPS64-Default-to-N64-ABI.patch
index 263872069..263872069 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0028-MIPS64-Default-to-N64-ABI.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0028-MIPS64-Default-to-N64-ABI.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
index 0aa6d926b..0aa6d926b 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0030-gcc-Fix-argument-list-too-long-error.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0030-gcc-Fix-argument-list-too-long-error.patch
index 2ceaff64f..2ceaff64f 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0030-gcc-Fix-argument-list-too-long-error.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0030-gcc-Fix-argument-list-too-long-error.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0031-Disable-sdt.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0031-Disable-sdt.patch
index 2c1d5e086..2c1d5e086 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0031-Disable-sdt.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0031-Disable-sdt.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0032-libtool.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0032-libtool.patch
index 3b3d1b621..3b3d1b621 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0032-libtool.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0032-libtool.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
index 199984d65..199984d65 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch
index 66b9f89a1..66b9f89a1 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0035-wcast-qual-PR-55383.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0035-wcast-qual-PR-55383.patch
index be4cf4a73..be4cf4a73 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0035-wcast-qual-PR-55383.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0035-wcast-qual-PR-55383.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0038-gcc-4.8-build-args.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0038-gcc-4.8-build-args.patch
index 7c8290f71..7c8290f71 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0038-gcc-4.8-build-args.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0038-gcc-4.8-build-args.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0040-fix-g++-sysroot.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0040-fix-g++-sysroot.patch
index d50aa5c9b..d50aa5c9b 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0040-fix-g++-sysroot.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0040-fix-g++-sysroot.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0041-libtool-avoid-libdir.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0041-libtool-avoid-libdir.patch
index 2dd9610a2..2dd9610a2 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0041-libtool-avoid-libdir.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0041-libtool-avoid-libdir.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0042-pr57748.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0042-pr57748.patch
index 5356f722d..5356f722d 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0042-pr57748.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0042-pr57748.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0043-cpp.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0043-cpp.patch
index eaf8646f9..eaf8646f9 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0043-cpp.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0043-cpp.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0044-gengtypes.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0044-gengtypes.patch
index e38761d4c..e38761d4c 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0044-gengtypes.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0044-gengtypes.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0046-libatomic-deptracking.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0046-libatomic-deptracking.patch
index 6ea4f4276..6ea4f4276 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0046-libatomic-deptracking.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0046-libatomic-deptracking.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0047-repomembug.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0047-repomembug.patch
index 9afd55cbd..9afd55cbd 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0047-repomembug.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0047-repomembug.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
index b98f8ff01..b98f8ff01 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0051-gcc-483-universal-initializer-no-warning.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0051-gcc-483-universal-initializer-no-warning.patch
index fde227b8a..fde227b8a 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0051-gcc-483-universal-initializer-no-warning.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/0051-gcc-483-universal-initializer-no-warning.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/target-gcc-includedir.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/target-gcc-includedir.patch
index f48c66dca..f48c66dca 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/target-gcc-includedir.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.8/target-gcc-includedir.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9.inc
index 95b553cb8..95b553cb8 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9.inc
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
index e58801167..e58801167 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0002-uclibc-conf.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0002-uclibc-conf.patch
index dda3b1041..dda3b1041 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0002-uclibc-conf.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0002-uclibc-conf.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0003-gcc-uclibc-locale-ctype_touplow_t.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0003-gcc-uclibc-locale-ctype_touplow_t.patch
index 7098e9950..7098e9950 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0003-gcc-uclibc-locale-ctype_touplow_t.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0003-gcc-uclibc-locale-ctype_touplow_t.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0004-uclibc-locale.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0004-uclibc-locale.patch
index 49f5f338e..49f5f338e 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0004-uclibc-locale.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0004-uclibc-locale.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0005-uclibc-locale-no__x.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0005-uclibc-locale-no__x.patch
index dcbbfe454..dcbbfe454 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0005-uclibc-locale-no__x.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0005-uclibc-locale-no__x.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0006-uclibc-locale-wchar_fix.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0006-uclibc-locale-wchar_fix.patch
index 3406859e1..3406859e1 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0006-uclibc-locale-wchar_fix.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0006-uclibc-locale-wchar_fix.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0007-uclibc-locale-update.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0007-uclibc-locale-update.patch
index 58511233d..58511233d 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0007-uclibc-locale-update.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0007-uclibc-locale-update.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0008-missing-execinfo_h.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0008-missing-execinfo_h.patch
index 282380934..282380934 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0008-missing-execinfo_h.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0008-missing-execinfo_h.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0009-c99-snprintf.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0009-c99-snprintf.patch
index 7168778df..7168778df 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0009-c99-snprintf.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0009-c99-snprintf.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0010-c99-complex-ugly-hack.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0010-c99-complex-ugly-hack.patch
index b628571e5..b628571e5 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0010-c99-complex-ugly-hack.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0010-c99-complex-ugly-hack.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0011-index_macro.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0011-index_macro.patch
index 8ee79b09b..8ee79b09b 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0011-index_macro.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0011-index_macro.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0013-libstdc-namespace.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0013-libstdc-namespace.patch
index 4a3efdebd..4a3efdebd 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0013-libstdc-namespace.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0013-libstdc-namespace.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0014-sh-pr24836.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0014-sh-pr24836.patch
index cb8fd525b..cb8fd525b 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0014-sh-pr24836.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0014-sh-pr24836.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch
index 37c46fc2e..37c46fc2e 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0016-gcc-poison-system-directories.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0016-gcc-poison-system-directories.patch
index 475ef96b9..475ef96b9 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0016-gcc-poison-system-directories.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0016-gcc-poison-system-directories.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0017-gcc-poison-dir-extend.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0017-gcc-poison-dir-extend.patch
index 9e81efd4d..9e81efd4d 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0017-gcc-poison-dir-extend.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0017-gcc-poison-dir-extend.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0018-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0018-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
index a28cafdf9..a28cafdf9 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0018-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0018-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0019-64-bit-multilib-hack.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0019-64-bit-multilib-hack.patch
index 058be0c40..058be0c40 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0019-64-bit-multilib-hack.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0019-64-bit-multilib-hack.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0020-optional-libstdc.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0020-optional-libstdc.patch
index 5b466140d..5b466140d 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0020-optional-libstdc.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0020-optional-libstdc.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0021-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0021-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
index eb3c61f12..eb3c61f12 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0021-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0021-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0022-COLLECT_GCC_OPTIONS.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0022-COLLECT_GCC_OPTIONS.patch
index 40c8abffa..40c8abffa 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0022-COLLECT_GCC_OPTIONS.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0022-COLLECT_GCC_OPTIONS.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
index fddfe9e5e..fddfe9e5e 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0023-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0024-PR-target-32219.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0024-PR-target-32219.patch
index 45acf7fd2..45acf7fd2 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0024-PR-target-32219.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0024-PR-target-32219.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0025-fortran-cross-compile-hack.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0025-fortran-cross-compile-hack.patch
index 0e7914d5c..0e7914d5c 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0025-fortran-cross-compile-hack.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0025-fortran-cross-compile-hack.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0026-libgcc-sjlj-check.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0026-libgcc-sjlj-check.patch
index d4efab956..d4efab956 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0026-libgcc-sjlj-check.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0026-libgcc-sjlj-check.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0027-cpp-honor-sysroot.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0027-cpp-honor-sysroot.patch
index 05e95219f..05e95219f 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0027-cpp-honor-sysroot.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0027-cpp-honor-sysroot.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0028-MIPS64-Default-to-N64-ABI.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0028-MIPS64-Default-to-N64-ABI.patch
index 263872069..263872069 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0028-MIPS64-Default-to-N64-ABI.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0028-MIPS64-Default-to-N64-ABI.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
index 969d290ad..969d290ad 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0030-gcc-Fix-argument-list-too-long-error.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0030-gcc-Fix-argument-list-too-long-error.patch
index 2ceaff64f..2ceaff64f 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0030-gcc-Fix-argument-list-too-long-error.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0030-gcc-Fix-argument-list-too-long-error.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0031-Disable-sdt.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0031-Disable-sdt.patch
index 2c1d5e086..2c1d5e086 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0031-Disable-sdt.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0031-Disable-sdt.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0032-libtool.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0032-libtool.patch
index 3b3d1b621..3b3d1b621 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0032-libtool.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0032-libtool.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
index b236c37a5..b236c37a5 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch
index 66b9f89a1..66b9f89a1 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0040-fix-g++-sysroot.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0040-fix-g++-sysroot.patch
index d50aa5c9b..d50aa5c9b 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0040-fix-g++-sysroot.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0040-fix-g++-sysroot.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0041-libtool-avoid-libdir.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0041-libtool-avoid-libdir.patch
index 2dd9610a2..2dd9610a2 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0041-libtool-avoid-libdir.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0041-libtool-avoid-libdir.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0043-cpp.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0043-cpp.patch
index eaf8646f9..eaf8646f9 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0043-cpp.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0043-cpp.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0044-gengtypes.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0044-gengtypes.patch
index e38761d4c..e38761d4c 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0044-gengtypes.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0044-gengtypes.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0046-libatomic-deptracking.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0046-libatomic-deptracking.patch
index 6ea4f4276..6ea4f4276 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0046-libatomic-deptracking.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0046-libatomic-deptracking.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0047-repomembug.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0047-repomembug.patch
index 9afd55cbd..9afd55cbd 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0047-repomembug.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0047-repomembug.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
index b98f8ff01..b98f8ff01 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0050-Revert-Use-dbx_reg_number-for-spanning-registers.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0050-Revert-Use-dbx_reg_number-for-spanning-registers.patch
index aead6f67b..aead6f67b 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0050-Revert-Use-dbx_reg_number-for-spanning-registers.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0050-Revert-Use-dbx_reg_number-for-spanning-registers.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0051-eabispe.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0051-eabispe.patch
index 55e38903f..55e38903f 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0051-eabispe.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0051-eabispe.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0052-Add-target-hook-to-override-DWARF2-frame-register-si.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0052-Add-target-hook-to-override-DWARF2-frame-register-si.patch
index f6958b32c..f6958b32c 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0052-Add-target-hook-to-override-DWARF2-frame-register-si.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0052-Add-target-hook-to-override-DWARF2-frame-register-si.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0053-gcc-fix-segfault-from-calling-free-on-non-malloc-d-a.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0053-gcc-fix-segfault-from-calling-free-on-non-malloc-d-a.patch
index 23b445c9e..23b445c9e 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0053-gcc-fix-segfault-from-calling-free-on-non-malloc-d-a.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0053-gcc-fix-segfault-from-calling-free-on-non-malloc-d-a.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0054-gcc-Makefile.in-fix-parallel-building-failure.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0054-gcc-Makefile.in-fix-parallel-building-failure.patch
index 7e8efa1e8..7e8efa1e8 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0054-gcc-Makefile.in-fix-parallel-building-failure.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0054-gcc-Makefile.in-fix-parallel-building-failure.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0055-dwarf-reg-processing-helper.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0055-dwarf-reg-processing-helper.patch
index 557dab0f3..557dab0f3 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0055-dwarf-reg-processing-helper.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0055-dwarf-reg-processing-helper.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0056-define-default-cfa-register-mapping.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0056-define-default-cfa-register-mapping.patch
index 3b6c94c49..3b6c94c49 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0056-define-default-cfa-register-mapping.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0056-define-default-cfa-register-mapping.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0057-aarch64-config.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0057-aarch64-config.patch
index f29559698..f29559698 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0057-aarch64-config.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0057-aarch64-config.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0058-gcc-r212171.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0058-gcc-r212171.patch
index d442ba8a8..d442ba8a8 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0058-gcc-r212171.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0058-gcc-r212171.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0059-gcc-PR-rtl-optimization-63348.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0059-gcc-PR-rtl-optimization-63348.patch
index de827cbda..de827cbda 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0059-gcc-PR-rtl-optimization-63348.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0059-gcc-PR-rtl-optimization-63348.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch
index 75a9fdd44..75a9fdd44 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0061-target-gcc-includedir.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0061-target-gcc-includedir.patch
index f48c66dca..f48c66dca 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0061-target-gcc-includedir.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0061-target-gcc-includedir.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0062-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0062-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
index c48bd4847..c48bd4847 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0062-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0062-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch
index f9efa4537..f9efa4537 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0064-handle-target-sysroot-multilib.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0064-handle-target-sysroot-multilib.patch
index 53569847f..53569847f 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0064-handle-target-sysroot-multilib.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0064-handle-target-sysroot-multilib.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0065-gcc-483-universal-initializer-no-warning.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0065-gcc-483-universal-initializer-no-warning.patch
index fde227b8a..fde227b8a 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0065-gcc-483-universal-initializer-no-warning.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-4.9/0065-gcc-483-universal-initializer-no-warning.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2.inc b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2.inc
index a6b385ac6..a6b385ac6 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2.inc
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
index 2c766f425..2c766f425 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0002-uclibc-conf.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0002-uclibc-conf.patch
index 69d33a0d6..69d33a0d6 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0002-uclibc-conf.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0002-uclibc-conf.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0003-gcc-uclibc-locale-ctype_touplow_t.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0003-gcc-uclibc-locale-ctype_touplow_t.patch
index bca254d5a..bca254d5a 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0003-gcc-uclibc-locale-ctype_touplow_t.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0003-gcc-uclibc-locale-ctype_touplow_t.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0004-uclibc-locale.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0004-uclibc-locale.patch
index 03947a798..03947a798 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0004-uclibc-locale.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0004-uclibc-locale.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0005-uclibc-locale-no__x.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0005-uclibc-locale-no__x.patch
index ac053eabd..ac053eabd 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0005-uclibc-locale-no__x.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0005-uclibc-locale-no__x.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0006-uclibc-locale-wchar_fix.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0006-uclibc-locale-wchar_fix.patch
index 9112a2b1a..9112a2b1a 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0006-uclibc-locale-wchar_fix.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0006-uclibc-locale-wchar_fix.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0007-uclibc-locale-update.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0007-uclibc-locale-update.patch
index 728b79082..728b79082 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0007-uclibc-locale-update.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0007-uclibc-locale-update.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0008-missing-execinfo_h.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0008-missing-execinfo_h.patch
index b2f6b1853..b2f6b1853 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0008-missing-execinfo_h.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0008-missing-execinfo_h.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0009-c99-snprintf.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0009-c99-snprintf.patch
index 525b2a1c4..525b2a1c4 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0009-c99-snprintf.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0009-c99-snprintf.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0010-gcc-poison-system-directories.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0010-gcc-poison-system-directories.patch
index 4e02ef83c..4e02ef83c 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0010-gcc-poison-system-directories.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0010-gcc-poison-system-directories.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0011-gcc-poison-dir-extend.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0011-gcc-poison-dir-extend.patch
index 067d9852d..067d9852d 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0011-gcc-poison-dir-extend.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0011-gcc-poison-dir-extend.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
index befca73ac..befca73ac 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0013-64-bit-multilib-hack.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0013-64-bit-multilib-hack.patch
index 67c066123..67c066123 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0013-64-bit-multilib-hack.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0013-64-bit-multilib-hack.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0014-optional-libstdc.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0014-optional-libstdc.patch
index 374fe4388..374fe4388 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0014-optional-libstdc.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0014-optional-libstdc.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
index 6cf1e3dd2..6cf1e3dd2 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0016-COLLECT_GCC_OPTIONS.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0016-COLLECT_GCC_OPTIONS.patch
index 359de35ad..359de35ad 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0016-COLLECT_GCC_OPTIONS.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0016-COLLECT_GCC_OPTIONS.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
index 850613176..850613176 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0018-fortran-cross-compile-hack.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0018-fortran-cross-compile-hack.patch
index da73392ca..da73392ca 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0018-fortran-cross-compile-hack.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0018-fortran-cross-compile-hack.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0019-libgcc-sjlj-check.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0019-libgcc-sjlj-check.patch
index ec5394a41..ec5394a41 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0019-libgcc-sjlj-check.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0019-libgcc-sjlj-check.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0020-cpp-honor-sysroot.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0020-cpp-honor-sysroot.patch
index 71bc68b5c..71bc68b5c 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0020-cpp-honor-sysroot.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0020-cpp-honor-sysroot.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0021-MIPS64-Default-to-N64-ABI.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0021-MIPS64-Default-to-N64-ABI.patch
index caad4899f..caad4899f 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0021-MIPS64-Default-to-N64-ABI.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0021-MIPS64-Default-to-N64-ABI.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
index 54520d091..54520d091 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0023-gcc-Fix-argument-list-too-long-error.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0023-gcc-Fix-argument-list-too-long-error.patch
index b337df5b0..b337df5b0 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0023-gcc-Fix-argument-list-too-long-error.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0023-gcc-Fix-argument-list-too-long-error.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0024-Disable-sdt.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0024-Disable-sdt.patch
index 9f219ca6d..9f219ca6d 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0024-Disable-sdt.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0024-Disable-sdt.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0025-libtool.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0025-libtool.patch
index b8977d64f..b8977d64f 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0025-libtool.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0025-libtool.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
index a8a652aaf..a8a652aaf 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch
index 445da37d7..445da37d7 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
index 4902e903b..4902e903b 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0029-export-CPP.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0029-export-CPP.patch
index 0a05ae59e..0a05ae59e 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0029-export-CPP.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0029-export-CPP.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
index 873dca971..873dca971 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
index f06cba882..f06cba882 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0032-Ensure-target-gcc-headers-can-be-included.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0032-Ensure-target-gcc-headers-can-be-included.patch
index 45133062a..45133062a 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0032-Ensure-target-gcc-headers-can-be-included.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0032-Ensure-target-gcc-headers-can-be-included.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
index 519e413d6..519e413d6 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch
index 207cd7cba..207cd7cba 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch
index b75f385f4..b75f385f4 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
index b691946b0..b691946b0 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0037-pr65779.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0037-pr65779.patch
index 1424673df..1424673df 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0037-pr65779.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0037-pr65779.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0038-fix-g++-sysroot.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0038-fix-g++-sysroot.patch
index f024dd5a2..f024dd5a2 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0038-fix-g++-sysroot.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0038-fix-g++-sysroot.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch
index 2f025c6d0..2f025c6d0 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0040-nativesdk-gcc-support.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0040-nativesdk-gcc-support.patch
index fd81ae244..fd81ae244 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0040-nativesdk-gcc-support.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0040-nativesdk-gcc-support.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0041-handle-target-sysroot-multilib.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0041-handle-target-sysroot-multilib.patch
index 53569847f..53569847f 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0041-handle-target-sysroot-multilib.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0041-handle-target-sysroot-multilib.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0042-cxxflags-for-build.patch b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0042-cxxflags-for-build.patch
index 1105e29f6..1105e29f6 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0042-cxxflags-for-build.patch
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-5.2/0042-cxxflags-for-build.patch
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/yocto-poky/meta/recipes-devtools/gcc/gcc-common.inc
index 6f2f224a1..6f2f224a1 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-common.inc
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/yocto-poky/meta/recipes-devtools/gcc/gcc-configure-common.inc
index cee6f4a58..cee6f4a58 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-configure-common.inc
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 54e488105..54e488105 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb
index bf53c5cd7..bf53c5cd7 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.9.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-canadian_4.9.bb
index bf53c5cd7..bf53c5cd7 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.9.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-canadian_4.9.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_5.2.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-canadian_5.2.bb
index bf53c5cd7..bf53c5cd7 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_5.2.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-canadian_5.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index c0fa139a8..c0fa139a8 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-initial.inc
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial_4.8.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-initial_4.8.bb
index 4c73e5ce6..4c73e5ce6 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial_4.8.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-initial_4.8.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial_4.9.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-initial_4.9.bb
index 4c73e5ce6..4c73e5ce6 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial_4.9.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-initial_4.9.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial_5.2.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-initial_5.2.bb
index 4c73e5ce6..4c73e5ce6 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial_5.2.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-initial_5.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross.inc
index aa1063303..aa1063303 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross.inc
diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.8.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross_4.8.bb
index b43cca0c5..b43cca0c5 100644
--- a/meta/recipes-devtools/gcc/gcc-cross_4.8.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross_4.8.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.9.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross_4.9.bb
index b43cca0c5..b43cca0c5 100644
--- a/meta/recipes-devtools/gcc/gcc-cross_4.9.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross_4.9.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross_5.2.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross_5.2.bb
index b43cca0c5..b43cca0c5 100644
--- a/meta/recipes-devtools/gcc/gcc-cross_5.2.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-cross_5.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc b/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
index 7d2599cb6..7d2599cb6 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.8.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.8.bb
index fd90e1140..fd90e1140 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.8.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.8.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.9.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.9.bb
index fd90e1140..fd90e1140 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.9.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.9.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_5.2.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk-initial_5.2.bb
index fd90e1140..fd90e1140 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_5.2.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk-initial_5.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk.inc b/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk.inc
index 53f880f39..53f880f39 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk.inc
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_4.8.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk_4.8.bb
index 40a6c4fef..40a6c4fef 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk_4.8.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk_4.8.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_4.9.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk_4.9.bb
index 40a6c4fef..40a6c4fef 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk_4.9.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk_4.9.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_5.2.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk_5.2.bb
index 40a6c4fef..40a6c4fef 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk_5.2.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk_5.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/yocto-poky/meta/recipes-devtools/gcc/gcc-multilib-config.inc
index 1c0a45a36..1c0a45a36 100644
--- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-multilib-config.inc
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/yocto-poky/meta/recipes-devtools/gcc/gcc-runtime.inc
index 690d78012..690d78012 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-runtime.inc
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_4.8.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-runtime_4.8.bb
index 497d69168..497d69168 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime_4.8.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-runtime_4.8.bb
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_4.9.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-runtime_4.9.bb
index 497d69168..497d69168 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime_4.9.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-runtime_4.9.bb
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_5.2.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-runtime_5.2.bb
index 8f31e7792..8f31e7792 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime_5.2.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-runtime_5.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers.inc b/yocto-poky/meta/recipes-devtools/gcc/gcc-sanitizers.inc
index c987ccb58..c987ccb58 100644
--- a/meta/recipes-devtools/gcc/gcc-sanitizers.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-sanitizers.inc
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_4.8.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-sanitizers_4.8.bb
index 601f66602..601f66602 100644
--- a/meta/recipes-devtools/gcc/gcc-sanitizers_4.8.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-sanitizers_4.8.bb
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_4.9.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-sanitizers_4.9.bb
index 601f66602..601f66602 100644
--- a/meta/recipes-devtools/gcc/gcc-sanitizers_4.9.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-sanitizers_4.9.bb
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_5.2.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-sanitizers_5.2.bb
index 601f66602..601f66602 100644
--- a/meta/recipes-devtools/gcc/gcc-sanitizers_5.2.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-sanitizers_5.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-shared-source.inc b/yocto-poky/meta/recipes-devtools/gcc/gcc-shared-source.inc
index aac4b4931..aac4b4931 100644
--- a/meta/recipes-devtools/gcc/gcc-shared-source.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-shared-source.inc
diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/yocto-poky/meta/recipes-devtools/gcc/gcc-source.inc
index 794fd4de2..794fd4de2 100644
--- a/meta/recipes-devtools/gcc/gcc-source.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-source.inc
diff --git a/meta/recipes-devtools/gcc/gcc-source_4.8.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-source_4.8.bb
index b890fa33e..b890fa33e 100644
--- a/meta/recipes-devtools/gcc/gcc-source_4.8.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-source_4.8.bb
diff --git a/meta/recipes-devtools/gcc/gcc-source_4.9.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-source_4.9.bb
index b890fa33e..b890fa33e 100644
--- a/meta/recipes-devtools/gcc/gcc-source_4.9.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-source_4.9.bb
diff --git a/meta/recipes-devtools/gcc/gcc-source_5.2.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc-source_5.2.bb
index b890fa33e..b890fa33e 100644
--- a/meta/recipes-devtools/gcc/gcc-source_5.2.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-source_5.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/yocto-poky/meta/recipes-devtools/gcc/gcc-target.inc
index d62c15afd..d62c15afd 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc-target.inc
diff --git a/meta/recipes-devtools/gcc/gcc_4.8.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc_4.8.bb
index 2c618dfb9..2c618dfb9 100644
--- a/meta/recipes-devtools/gcc/gcc_4.8.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc_4.8.bb
diff --git a/meta/recipes-devtools/gcc/gcc_4.9.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc_4.9.bb
index a9dc612fb..a9dc612fb 100644
--- a/meta/recipes-devtools/gcc/gcc_4.9.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc_4.9.bb
diff --git a/meta/recipes-devtools/gcc/gcc_5.2.bb b/yocto-poky/meta/recipes-devtools/gcc/gcc_5.2.bb
index b0a523cae..b0a523cae 100644
--- a/meta/recipes-devtools/gcc/gcc_5.2.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/gcc_5.2.bb
diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/yocto-poky/meta/recipes-devtools/gcc/libgcc-common.inc
index b09ea657e..b09ea657e 100644
--- a/meta/recipes-devtools/gcc/libgcc-common.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/libgcc-common.inc
diff --git a/meta/recipes-devtools/gcc/libgcc-initial.inc b/yocto-poky/meta/recipes-devtools/gcc/libgcc-initial.inc
index 4e92f002f..4e92f002f 100644
--- a/meta/recipes-devtools/gcc/libgcc-initial.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/libgcc-initial.inc
diff --git a/meta/recipes-devtools/gcc/libgcc-initial_4.8.bb b/yocto-poky/meta/recipes-devtools/gcc/libgcc-initial_4.8.bb
index 19f253fce..19f253fce 100644
--- a/meta/recipes-devtools/gcc/libgcc-initial_4.8.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/libgcc-initial_4.8.bb
diff --git a/meta/recipes-devtools/gcc/libgcc-initial_4.9.bb b/yocto-poky/meta/recipes-devtools/gcc/libgcc-initial_4.9.bb
index 19f253fce..19f253fce 100644
--- a/meta/recipes-devtools/gcc/libgcc-initial_4.9.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/libgcc-initial_4.9.bb
diff --git a/meta/recipes-devtools/gcc/libgcc-initial_5.2.bb b/yocto-poky/meta/recipes-devtools/gcc/libgcc-initial_5.2.bb
index 19f253fce..19f253fce 100644
--- a/meta/recipes-devtools/gcc/libgcc-initial_5.2.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/libgcc-initial_5.2.bb
diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/yocto-poky/meta/recipes-devtools/gcc/libgcc.inc
index 95fa3f40b..95fa3f40b 100644
--- a/meta/recipes-devtools/gcc/libgcc.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/libgcc.inc
diff --git a/meta/recipes-devtools/gcc/libgcc_4.8.bb b/yocto-poky/meta/recipes-devtools/gcc/libgcc_4.8.bb
index a5152f28e..a5152f28e 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.8.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/libgcc_4.8.bb
diff --git a/meta/recipes-devtools/gcc/libgcc_4.9.bb b/yocto-poky/meta/recipes-devtools/gcc/libgcc_4.9.bb
index a5152f28e..a5152f28e 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.9.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/libgcc_4.9.bb
diff --git a/meta/recipes-devtools/gcc/libgcc_5.2.bb b/yocto-poky/meta/recipes-devtools/gcc/libgcc_5.2.bb
index a5152f28e..a5152f28e 100644
--- a/meta/recipes-devtools/gcc/libgcc_5.2.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/libgcc_5.2.bb
diff --git a/meta/recipes-devtools/gcc/libgfortran.inc b/yocto-poky/meta/recipes-devtools/gcc/libgfortran.inc
index e42843d2f..e42843d2f 100644
--- a/meta/recipes-devtools/gcc/libgfortran.inc
+++ b/yocto-poky/meta/recipes-devtools/gcc/libgfortran.inc
diff --git a/meta/recipes-devtools/gcc/libgfortran_4.8.bb b/yocto-poky/meta/recipes-devtools/gcc/libgfortran_4.8.bb
index 71dd8b4bd..71dd8b4bd 100644
--- a/meta/recipes-devtools/gcc/libgfortran_4.8.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/libgfortran_4.8.bb
diff --git a/meta/recipes-devtools/gcc/libgfortran_4.9.bb b/yocto-poky/meta/recipes-devtools/gcc/libgfortran_4.9.bb
index 71dd8b4bd..71dd8b4bd 100644
--- a/meta/recipes-devtools/gcc/libgfortran_4.9.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/libgfortran_4.9.bb
diff --git a/meta/recipes-devtools/gcc/libgfortran_5.2.bb b/yocto-poky/meta/recipes-devtools/gcc/libgfortran_5.2.bb
index 71dd8b4bd..71dd8b4bd 100644
--- a/meta/recipes-devtools/gcc/libgfortran_5.2.bb
+++ b/yocto-poky/meta/recipes-devtools/gcc/libgfortran_5.2.bb
diff --git a/meta/recipes-devtools/gdb/gdb-7.9.1.inc b/yocto-poky/meta/recipes-devtools/gdb/gdb-7.9.1.inc
index 1ca95afdc..1ca95afdc 100644
--- a/meta/recipes-devtools/gdb/gdb-7.9.1.inc
+++ b/yocto-poky/meta/recipes-devtools/gdb/gdb-7.9.1.inc
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/yocto-poky/meta/recipes-devtools/gdb/gdb-common.inc
index 166ba8eea..166ba8eea 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/yocto-poky/meta/recipes-devtools/gdb/gdb-common.inc
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/yocto-poky/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
index 4fd60a615..4fd60a615 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
+++ b/yocto-poky/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bb b/yocto-poky/meta/recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bb
index 301035940..301035940 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bb
+++ b/yocto-poky/meta/recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bb
diff --git a/meta/recipes-devtools/gdb/gdb-cross.inc b/yocto-poky/meta/recipes-devtools/gdb/gdb-cross.inc
index 6e44778cd..6e44778cd 100644
--- a/meta/recipes-devtools/gdb/gdb-cross.inc
+++ b/yocto-poky/meta/recipes-devtools/gdb/gdb-cross.inc
diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.9.1.bb b/yocto-poky/meta/recipes-devtools/gdb/gdb-cross_7.9.1.bb
index 3a95cfb03..3a95cfb03 100644
--- a/meta/recipes-devtools/gdb/gdb-cross_7.9.1.bb
+++ b/yocto-poky/meta/recipes-devtools/gdb/gdb-cross_7.9.1.bb
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/yocto-poky/meta/recipes-devtools/gdb/gdb.inc
index 88c0213b4..88c0213b4 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/yocto-poky/meta/recipes-devtools/gdb/gdb.inc
diff --git a/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch b/yocto-poky/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch
index 6996c183b..6996c183b 100644
--- a/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch
+++ b/yocto-poky/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch
diff --git a/meta/recipes-devtools/gdb/gdb/0002-Change-order-of-CFLAGS.patch b/yocto-poky/meta/recipes-devtools/gdb/gdb/0002-Change-order-of-CFLAGS.patch
index bccb45fda..bccb45fda 100644
--- a/meta/recipes-devtools/gdb/gdb/0002-Change-order-of-CFLAGS.patch
+++ b/yocto-poky/meta/recipes-devtools/gdb/gdb/0002-Change-order-of-CFLAGS.patch
diff --git a/meta/recipes-devtools/gdb/gdb/0003-Add-support-for-Renesas-SH-sh4-architecture.patch b/yocto-poky/meta/recipes-devtools/gdb/gdb/0003-Add-support-for-Renesas-SH-sh4-architecture.patch
index 4a3e22c44..4a3e22c44 100644
--- a/meta/recipes-devtools/gdb/gdb/0003-Add-support-for-Renesas-SH-sh4-architecture.patch
+++ b/yocto-poky/meta/recipes-devtools/gdb/gdb/0003-Add-support-for-Renesas-SH-sh4-architecture.patch
diff --git a/meta/recipes-devtools/gdb/gdb/fix-detection-of-64-bit-PPC-inferior-in-gdbserver.patch b/yocto-poky/meta/recipes-devtools/gdb/gdb/fix-detection-of-64-bit-PPC-inferior-in-gdbserver.patch
index 285435230..285435230 100644
--- a/meta/recipes-devtools/gdb/gdb/fix-detection-of-64-bit-PPC-inferior-in-gdbserver.patch
+++ b/yocto-poky/meta/recipes-devtools/gdb/gdb/fix-detection-of-64-bit-PPC-inferior-in-gdbserver.patch
diff --git a/meta/recipes-devtools/gdb/gdb_7.9.1.bb b/yocto-poky/meta/recipes-devtools/gdb/gdb_7.9.1.bb
index cd52e27d5..cd52e27d5 100644
--- a/meta/recipes-devtools/gdb/gdb_7.9.1.bb
+++ b/yocto-poky/meta/recipes-devtools/gdb/gdb_7.9.1.bb
diff --git a/meta/recipes-devtools/git/git-2.5.0/0008-CVE-2015-7545-1.patch b/yocto-poky/meta/recipes-devtools/git/git-2.5.0/0008-CVE-2015-7545-1.patch
index b552c099f..b552c099f 100644
--- a/meta/recipes-devtools/git/git-2.5.0/0008-CVE-2015-7545-1.patch
+++ b/yocto-poky/meta/recipes-devtools/git/git-2.5.0/0008-CVE-2015-7545-1.patch
diff --git a/meta/recipes-devtools/git/git-2.5.0/0009-CVE-2015-7545-2.patch b/yocto-poky/meta/recipes-devtools/git/git-2.5.0/0009-CVE-2015-7545-2.patch
index 8000e26d7..8000e26d7 100644
--- a/meta/recipes-devtools/git/git-2.5.0/0009-CVE-2015-7545-2.patch
+++ b/yocto-poky/meta/recipes-devtools/git/git-2.5.0/0009-CVE-2015-7545-2.patch
diff --git a/meta/recipes-devtools/git/git-2.5.0/0010-CVE-2015-7545-3.patch b/yocto-poky/meta/recipes-devtools/git/git-2.5.0/0010-CVE-2015-7545-3.patch
index b6edc9d7c..b6edc9d7c 100644
--- a/meta/recipes-devtools/git/git-2.5.0/0010-CVE-2015-7545-3.patch
+++ b/yocto-poky/meta/recipes-devtools/git/git-2.5.0/0010-CVE-2015-7545-3.patch
diff --git a/meta/recipes-devtools/git/git-2.5.0/0011-CVE-2015-7545-4.patch b/yocto-poky/meta/recipes-devtools/git/git-2.5.0/0011-CVE-2015-7545-4.patch
index 44dcd1e33..44dcd1e33 100644
--- a/meta/recipes-devtools/git/git-2.5.0/0011-CVE-2015-7545-4.patch
+++ b/yocto-poky/meta/recipes-devtools/git/git-2.5.0/0011-CVE-2015-7545-4.patch
diff --git a/meta/recipes-devtools/git/git-2.5.0/0012-CVE-2015-7545-5.patch b/yocto-poky/meta/recipes-devtools/git/git-2.5.0/0012-CVE-2015-7545-5.patch
index 76d66bad9..76d66bad9 100644
--- a/meta/recipes-devtools/git/git-2.5.0/0012-CVE-2015-7545-5.patch
+++ b/yocto-poky/meta/recipes-devtools/git/git-2.5.0/0012-CVE-2015-7545-5.patch
diff --git a/meta/recipes-devtools/git/git.inc b/yocto-poky/meta/recipes-devtools/git/git.inc
index 4da4a2754..4da4a2754 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/yocto-poky/meta/recipes-devtools/git/git.inc
diff --git a/meta/recipes-devtools/git/git_2.5.0.bb b/yocto-poky/meta/recipes-devtools/git/git_2.5.0.bb
index 792f25838..792f25838 100644
--- a/meta/recipes-devtools/git/git_2.5.0.bb
+++ b/yocto-poky/meta/recipes-devtools/git/git_2.5.0.bb
diff --git a/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch b/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch
index 2094116f0..2094116f0 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch
+++ b/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch
diff --git a/meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in b/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in
index d4908fc4f..d4908fc4f 100755
--- a/meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in
+++ b/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in
diff --git a/meta/recipes-devtools/gnu-config/gnu-config/musl-support.patch b/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config/musl-support.patch
index 3147435a6..3147435a6 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config/musl-support.patch
+++ b/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config/musl-support.patch
diff --git a/meta/recipes-devtools/gnu-config/gnu-config/uclibc.patch b/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config/uclibc.patch
index 75fe10082..75fe10082 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config/uclibc.patch
+++ b/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config/uclibc.patch
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb b/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb
index eb7e420a0..eb7e420a0 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb
+++ b/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb
index 3d5f2b8c1..3d5f2b8c1 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb
+++ b/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb
diff --git a/meta/recipes-devtools/guile/files/arm_aarch64.patch b/yocto-poky/meta/recipes-devtools/guile/files/arm_aarch64.patch
index f1788b62f..f1788b62f 100644
--- a/meta/recipes-devtools/guile/files/arm_aarch64.patch
+++ b/yocto-poky/meta/recipes-devtools/guile/files/arm_aarch64.patch
diff --git a/meta/recipes-devtools/guile/files/arm_endianness.patch b/yocto-poky/meta/recipes-devtools/guile/files/arm_endianness.patch
index ea4328b81..ea4328b81 100644
--- a/meta/recipes-devtools/guile/files/arm_endianness.patch
+++ b/yocto-poky/meta/recipes-devtools/guile/files/arm_endianness.patch
diff --git a/meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch b/yocto-poky/meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch
index 43238a7d2..43238a7d2 100644
--- a/meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch
+++ b/yocto-poky/meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch
diff --git a/meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch b/yocto-poky/meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
index 34be3b96e..34be3b96e 100644
--- a/meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
+++ b/yocto-poky/meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
diff --git a/meta/recipes-devtools/guile/files/guile_2.0.6_fix_sed_error.patch b/yocto-poky/meta/recipes-devtools/guile/files/guile_2.0.6_fix_sed_error.patch
index e5dc22637..e5dc22637 100644
--- a/meta/recipes-devtools/guile/files/guile_2.0.6_fix_sed_error.patch
+++ b/yocto-poky/meta/recipes-devtools/guile/files/guile_2.0.6_fix_sed_error.patch
diff --git a/meta/recipes-devtools/guile/files/libguile-Makefile.am-hook.patch b/yocto-poky/meta/recipes-devtools/guile/files/libguile-Makefile.am-hook.patch
index 290b9d447..290b9d447 100644
--- a/meta/recipes-devtools/guile/files/libguile-Makefile.am-hook.patch
+++ b/yocto-poky/meta/recipes-devtools/guile/files/libguile-Makefile.am-hook.patch
diff --git a/meta/recipes-devtools/guile/files/libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch b/yocto-poky/meta/recipes-devtools/guile/files/libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch
index e50059a7e..e50059a7e 100644
--- a/meta/recipes-devtools/guile/files/libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch
+++ b/yocto-poky/meta/recipes-devtools/guile/files/libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch
diff --git a/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch b/yocto-poky/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch
index d3e312f77..d3e312f77 100644
--- a/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch
+++ b/yocto-poky/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch
diff --git a/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch b/yocto-poky/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch
index e20148628..e20148628 100644
--- a/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch
+++ b/yocto-poky/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch
diff --git a/meta/recipes-devtools/guile/files/workaround-ice-ssa-corruption.patch b/yocto-poky/meta/recipes-devtools/guile/files/workaround-ice-ssa-corruption.patch
index 6c348384a..6c348384a 100644
--- a/meta/recipes-devtools/guile/files/workaround-ice-ssa-corruption.patch
+++ b/yocto-poky/meta/recipes-devtools/guile/files/workaround-ice-ssa-corruption.patch
diff --git a/meta/recipes-devtools/guile/guile_2.0.11.bb b/yocto-poky/meta/recipes-devtools/guile/guile_2.0.11.bb
index 98b465bfd..98b465bfd 100644
--- a/meta/recipes-devtools/guile/guile_2.0.11.bb
+++ b/yocto-poky/meta/recipes-devtools/guile/guile_2.0.11.bb
diff --git a/meta/recipes-devtools/guilt/files/guilt-bash.patch b/yocto-poky/meta/recipes-devtools/guilt/files/guilt-bash.patch
index 70a439e81..70a439e81 100644
--- a/meta/recipes-devtools/guilt/files/guilt-bash.patch
+++ b/yocto-poky/meta/recipes-devtools/guilt/files/guilt-bash.patch
diff --git a/meta/recipes-devtools/guilt/guilt-native_git.bb b/yocto-poky/meta/recipes-devtools/guilt/guilt-native_git.bb
index b63c68c4d..b63c68c4d 100644
--- a/meta/recipes-devtools/guilt/guilt-native_git.bb
+++ b/yocto-poky/meta/recipes-devtools/guilt/guilt-native_git.bb
diff --git a/meta/recipes-devtools/help2man/help2man-native_1.47.1.bb b/yocto-poky/meta/recipes-devtools/help2man/help2man-native_1.47.1.bb
index bc6d50eb3..bc6d50eb3 100644
--- a/meta/recipes-devtools/help2man/help2man-native_1.47.1.bb
+++ b/yocto-poky/meta/recipes-devtools/help2man/help2man-native_1.47.1.bb
diff --git a/meta/recipes-devtools/i2c-tools/files/Module.mk b/yocto-poky/meta/recipes-devtools/i2c-tools/files/Module.mk
index fcaf72f22..fcaf72f22 100644
--- a/meta/recipes-devtools/i2c-tools/files/Module.mk
+++ b/yocto-poky/meta/recipes-devtools/i2c-tools/files/Module.mk
diff --git a/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb b/yocto-poky/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb
index 042695bdc..042695bdc 100644
--- a/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb
+++ b/yocto-poky/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb
diff --git a/meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb b/yocto-poky/meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb
index f8f4aef39..f8f4aef39 100644
--- a/meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb
+++ b/yocto-poky/meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb
diff --git a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env b/yocto-poky/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
index 7e4dbc414..7e4dbc414 100755
--- a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
+++ b/yocto-poky/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
diff --git a/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb b/yocto-poky/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb
index 6b356b0d4..6b356b0d4 100644
--- a/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb
+++ b/yocto-poky/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/yocto-poky/meta/recipes-devtools/installer/adt-installer/adt_installer
index b8cfb2e5c..b8cfb2e5c 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/yocto-poky/meta/recipes-devtools/installer/adt-installer/adt_installer
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/yocto-poky/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
index 867fbd107..867fbd107 100644
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
+++ b/yocto-poky/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
diff --git a/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf b/yocto-poky/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf
index ba627b3f3..ba627b3f3 100644
--- a/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf
+++ b/yocto-poky/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf
diff --git a/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf b/yocto-poky/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf
index 10504a92e..10504a92e 100644
--- a/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf
+++ b/yocto-poky/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/yocto-poky/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
index 6f5fb4999..6f5fb4999 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/yocto-poky/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/yocto-poky/meta/recipes-devtools/installer/adt-installer/scripts/data_define
index cfd671613..cfd671613 100644
--- a/meta/recipes-devtools/installer/adt-installer/scripts/data_define
+++ b/yocto-poky/meta/recipes-devtools/installer/adt-installer/scripts/data_define
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs b/yocto-poky/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs
index d1a595b26..d1a595b26 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs
+++ b/yocto-poky/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/util b/yocto-poky/meta/recipes-devtools/installer/adt-installer/scripts/util
index 9be751727..9be751727 100644
--- a/meta/recipes-devtools/installer/adt-installer/scripts/util
+++ b/yocto-poky/meta/recipes-devtools/installer/adt-installer/scripts/util
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/yocto-poky/meta/recipes-devtools/installer/adt-installer_1.0.bb
index 4c2f0971a..4c2f0971a 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/yocto-poky/meta/recipes-devtools/installer/adt-installer_1.0.bb
diff --git a/meta/recipes-devtools/installer/files/wget_cache.patch b/yocto-poky/meta/recipes-devtools/installer/files/wget_cache.patch
index 9117510f1..9117510f1 100644
--- a/meta/recipes-devtools/installer/files/wget_cache.patch
+++ b/yocto-poky/meta/recipes-devtools/installer/files/wget_cache.patch
diff --git a/meta/recipes-devtools/intltool/intltool.inc b/yocto-poky/meta/recipes-devtools/intltool/intltool.inc
index be7770420..be7770420 100644
--- a/meta/recipes-devtools/intltool/intltool.inc
+++ b/yocto-poky/meta/recipes-devtools/intltool/intltool.inc
diff --git a/meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch b/yocto-poky/meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch
index 06c938b7e..06c938b7e 100644
--- a/meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch
+++ b/yocto-poky/meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch
diff --git a/meta/recipes-devtools/intltool/intltool/noperlcheck.patch b/yocto-poky/meta/recipes-devtools/intltool/intltool/noperlcheck.patch
index 853ee1a43..853ee1a43 100644
--- a/meta/recipes-devtools/intltool/intltool/noperlcheck.patch
+++ b/yocto-poky/meta/recipes-devtools/intltool/intltool/noperlcheck.patch
diff --git a/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch b/yocto-poky/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch
index eb52172e1..eb52172e1 100644
--- a/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch
+++ b/yocto-poky/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch
diff --git a/meta/recipes-devtools/intltool/intltool/remove-xml-check.patch b/yocto-poky/meta/recipes-devtools/intltool/intltool/remove-xml-check.patch
index fc69e37b4..fc69e37b4 100644
--- a/meta/recipes-devtools/intltool/intltool/remove-xml-check.patch
+++ b/yocto-poky/meta/recipes-devtools/intltool/intltool/remove-xml-check.patch
diff --git a/meta/recipes-devtools/intltool/intltool/use-nativeperl.patch b/yocto-poky/meta/recipes-devtools/intltool/intltool/use-nativeperl.patch
index 5f5fed385..5f5fed385 100644
--- a/meta/recipes-devtools/intltool/intltool/use-nativeperl.patch
+++ b/yocto-poky/meta/recipes-devtools/intltool/intltool/use-nativeperl.patch
diff --git a/meta/recipes-devtools/intltool/intltool_0.51.0.bb b/yocto-poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb
index d520d43c1..d520d43c1 100644
--- a/meta/recipes-devtools/intltool/intltool_0.51.0.bb
+++ b/yocto-poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb
diff --git a/meta/recipes-devtools/json-c/json-c/0001-json_tokener-requires-INF-and-NAN.patch b/yocto-poky/meta/recipes-devtools/json-c/json-c/0001-json_tokener-requires-INF-and-NAN.patch
index d29d9118d..d29d9118d 100644
--- a/meta/recipes-devtools/json-c/json-c/0001-json_tokener-requires-INF-and-NAN.patch
+++ b/yocto-poky/meta/recipes-devtools/json-c/json-c/0001-json_tokener-requires-INF-and-NAN.patch
diff --git a/meta/recipes-devtools/json-c/json-c_0.12.bb b/yocto-poky/meta/recipes-devtools/json-c/json-c_0.12.bb
index cfef03d2e..cfef03d2e 100644
--- a/meta/recipes-devtools/json-c/json-c_0.12.bb
+++ b/yocto-poky/meta/recipes-devtools/json-c/json-c_0.12.bb
diff --git a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb b/yocto-poky/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb
index 48a2f935b..48a2f935b 100644
--- a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb
+++ b/yocto-poky/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/yocto-poky/meta/recipes-devtools/libtool/libtool-2.4.6.inc
index de06ccb25..de06ccb25 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.6.inc
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool-2.4.6.inc
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb b/yocto-poky/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb
index 847880270..847880270 100644
--- a/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb b/yocto-poky/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb
index 4c5218ade..4c5218ade 100644
--- a/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb
diff --git a/meta/recipes-devtools/libtool/libtool/0001-libtool-Fix-support-for-NIOS2-processor.patch b/yocto-poky/meta/recipes-devtools/libtool/libtool/0001-libtool-Fix-support-for-NIOS2-processor.patch
index bbd36d8dc..bbd36d8dc 100644
--- a/meta/recipes-devtools/libtool/libtool/0001-libtool-Fix-support-for-NIOS2-processor.patch
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool/0001-libtool-Fix-support-for-NIOS2-processor.patch
diff --git a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch b/yocto-poky/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
index fd4084c85..fd4084c85 100644
--- a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
diff --git a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch b/yocto-poky/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
index 5c9f8cc9c..5c9f8cc9c 100644
--- a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
diff --git a/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch b/yocto-poky/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch
index 1bd95980c..1bd95980c 100644
--- a/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch
diff --git a/meta/recipes-devtools/libtool/libtool/fix-rpath.patch b/yocto-poky/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
index a2ec9473e..a2ec9473e 100644
--- a/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
diff --git a/meta/recipes-devtools/libtool/libtool/fixinstall.patch b/yocto-poky/meta/recipes-devtools/libtool/libtool/fixinstall.patch
index 8f343bf43..8f343bf43 100644
--- a/meta/recipes-devtools/libtool/libtool/fixinstall.patch
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool/fixinstall.patch
diff --git a/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch b/yocto-poky/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch
index b2239fbad..b2239fbad 100644
--- a/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch
diff --git a/meta/recipes-devtools/libtool/libtool/norm-rpath.patch b/yocto-poky/meta/recipes-devtools/libtool/libtool/norm-rpath.patch
index 1e4c65e02..1e4c65e02 100644
--- a/meta/recipes-devtools/libtool/libtool/norm-rpath.patch
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool/norm-rpath.patch
diff --git a/meta/recipes-devtools/libtool/libtool/prefix.patch b/yocto-poky/meta/recipes-devtools/libtool/libtool/prefix.patch
index a73df2e4a..a73df2e4a 100644
--- a/meta/recipes-devtools/libtool/libtool/prefix.patch
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool/prefix.patch
diff --git a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch b/yocto-poky/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
index ad2b11053..ad2b11053 100644
--- a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
diff --git a/meta/recipes-devtools/libtool/libtool/trailingslash.patch b/yocto-poky/meta/recipes-devtools/libtool/libtool/trailingslash.patch
index e8824d7db..e8824d7db 100644
--- a/meta/recipes-devtools/libtool/libtool/trailingslash.patch
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool/trailingslash.patch
diff --git a/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch b/yocto-poky/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch
index b633bc41b..b633bc41b 100644
--- a/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch
diff --git a/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch b/yocto-poky/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch
index 6af99f327..6af99f327 100644
--- a/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.6.bb b/yocto-poky/meta/recipes-devtools/libtool/libtool_2.4.6.bb
index 45f1b2f3a..45f1b2f3a 100644
--- a/meta/recipes-devtools/libtool/libtool_2.4.6.bb
+++ b/yocto-poky/meta/recipes-devtools/libtool/libtool_2.4.6.bb
diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb b/yocto-poky/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb
index 508eade32..508eade32 100644
--- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb
+++ b/yocto-poky/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb b/yocto-poky/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
index a8a90fc82..a8a90fc82 100644
--- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
+++ b/yocto-poky/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch b/yocto-poky/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch
index 490b36799..490b36799 100644
--- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch
+++ b/yocto-poky/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch b/yocto-poky/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch
index 50c8a8f3f..50c8a8f3f 100644
--- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch
+++ b/yocto-poky/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch b/yocto-poky/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch
index b62895c67..b62895c67 100644
--- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch
+++ b/yocto-poky/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch b/yocto-poky/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch
index 8d784110d..8d784110d 100644
--- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch
+++ b/yocto-poky/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch
diff --git a/meta/recipes-devtools/m4/m4-1.4.17.inc b/yocto-poky/meta/recipes-devtools/m4/m4-1.4.17.inc
index 8ea4e0490..8ea4e0490 100644
--- a/meta/recipes-devtools/m4/m4-1.4.17.inc
+++ b/yocto-poky/meta/recipes-devtools/m4/m4-1.4.17.inc
diff --git a/meta/recipes-devtools/m4/m4-1.4.9.inc b/yocto-poky/meta/recipes-devtools/m4/m4-1.4.9.inc
index aab2c1efa..aab2c1efa 100644
--- a/meta/recipes-devtools/m4/m4-1.4.9.inc
+++ b/yocto-poky/meta/recipes-devtools/m4/m4-1.4.9.inc
diff --git a/meta/recipes-devtools/m4/m4-native_1.4.17.bb b/yocto-poky/meta/recipes-devtools/m4/m4-native_1.4.17.bb
index 06d8aa244..06d8aa244 100644
--- a/meta/recipes-devtools/m4/m4-native_1.4.17.bb
+++ b/yocto-poky/meta/recipes-devtools/m4/m4-native_1.4.17.bb
diff --git a/meta/recipes-devtools/m4/m4.inc b/yocto-poky/meta/recipes-devtools/m4/m4.inc
index 4a83929f0..4a83929f0 100644
--- a/meta/recipes-devtools/m4/m4.inc
+++ b/yocto-poky/meta/recipes-devtools/m4/m4.inc
diff --git a/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch
index ba1a4bab4..ba1a4bab4 100644
--- a/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/yocto-poky/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-devtools/m4/m4/ac_config_links.patch b/yocto-poky/meta/recipes-devtools/m4/m4/ac_config_links.patch
index 275c0b2e7..275c0b2e7 100644
--- a/meta/recipes-devtools/m4/m4/ac_config_links.patch
+++ b/yocto-poky/meta/recipes-devtools/m4/m4/ac_config_links.patch
diff --git a/meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch b/yocto-poky/meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch
index 98774535d..98774535d 100644
--- a/meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch
+++ b/yocto-poky/meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch
diff --git a/meta/recipes-devtools/m4/m4/make.patch b/yocto-poky/meta/recipes-devtools/m4/m4/make.patch
index 79fb41512..79fb41512 100644
--- a/meta/recipes-devtools/m4/m4/make.patch
+++ b/yocto-poky/meta/recipes-devtools/m4/m4/make.patch
diff --git a/meta/recipes-devtools/m4/m4/remove-gets.patch b/yocto-poky/meta/recipes-devtools/m4/m4/remove-gets.patch
index effb353f1..effb353f1 100644
--- a/meta/recipes-devtools/m4/m4/remove-gets.patch
+++ b/yocto-poky/meta/recipes-devtools/m4/m4/remove-gets.patch
diff --git a/meta/recipes-devtools/m4/m4_1.4.17.bb b/yocto-poky/meta/recipes-devtools/m4/m4_1.4.17.bb
index b12c0adf3..b12c0adf3 100644
--- a/meta/recipes-devtools/m4/m4_1.4.17.bb
+++ b/yocto-poky/meta/recipes-devtools/m4/m4_1.4.17.bb
diff --git a/meta/recipes-devtools/m4/m4_1.4.9.bb b/yocto-poky/meta/recipes-devtools/m4/m4_1.4.9.bb
index b12c0adf3..b12c0adf3 100644
--- a/meta/recipes-devtools/m4/m4_1.4.9.bb
+++ b/yocto-poky/meta/recipes-devtools/m4/m4_1.4.9.bb
diff --git a/meta/recipes-devtools/make/make-3.81/make_fix_for_automake-1.12.patch b/yocto-poky/meta/recipes-devtools/make/make-3.81/make_fix_for_automake-1.12.patch
index 9b2e96431..9b2e96431 100644
--- a/meta/recipes-devtools/make/make-3.81/make_fix_for_automake-1.12.patch
+++ b/yocto-poky/meta/recipes-devtools/make/make-3.81/make_fix_for_automake-1.12.patch
diff --git a/meta/recipes-devtools/make/make-3.81/makeinfo.patch b/yocto-poky/meta/recipes-devtools/make/make-3.81/makeinfo.patch
index 5dd760467..5dd760467 100644
--- a/meta/recipes-devtools/make/make-3.81/makeinfo.patch
+++ b/yocto-poky/meta/recipes-devtools/make/make-3.81/makeinfo.patch
diff --git a/meta/recipes-devtools/make/make.inc b/yocto-poky/meta/recipes-devtools/make/make.inc
index 57ea605b9..57ea605b9 100644
--- a/meta/recipes-devtools/make/make.inc
+++ b/yocto-poky/meta/recipes-devtools/make/make.inc
diff --git a/meta/recipes-devtools/make/make_3.81.bb b/yocto-poky/meta/recipes-devtools/make/make_3.81.bb
index b8a79b0eb..b8a79b0eb 100644
--- a/meta/recipes-devtools/make/make_3.81.bb
+++ b/yocto-poky/meta/recipes-devtools/make/make_3.81.bb
diff --git a/meta/recipes-devtools/make/make_4.1.bb b/yocto-poky/meta/recipes-devtools/make/make_4.1.bb
index a1b0d7c45..a1b0d7c45 100644
--- a/meta/recipes-devtools/make/make_4.1.bb
+++ b/yocto-poky/meta/recipes-devtools/make/make_4.1.bb
diff --git a/meta/recipes-devtools/makedevs/makedevs/COPYING.patch b/yocto-poky/meta/recipes-devtools/makedevs/makedevs/COPYING.patch
index 3a8902b97..3a8902b97 100644
--- a/meta/recipes-devtools/makedevs/makedevs/COPYING.patch
+++ b/yocto-poky/meta/recipes-devtools/makedevs/makedevs/COPYING.patch
diff --git a/meta/recipes-devtools/makedevs/makedevs/makedevs.c b/yocto-poky/meta/recipes-devtools/makedevs/makedevs/makedevs.c
index 771f33ef5..771f33ef5 100644
--- a/meta/recipes-devtools/makedevs/makedevs/makedevs.c
+++ b/yocto-poky/meta/recipes-devtools/makedevs/makedevs/makedevs.c
diff --git a/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb b/yocto-poky/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
index 92d5870f4..92d5870f4 100644
--- a/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
+++ b/yocto-poky/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
diff --git a/meta/recipes-devtools/mkelfimage/mkelfimage/cross-compile.patch b/yocto-poky/meta/recipes-devtools/mkelfimage/mkelfimage/cross-compile.patch
index 769270972..769270972 100644
--- a/meta/recipes-devtools/mkelfimage/mkelfimage/cross-compile.patch
+++ b/yocto-poky/meta/recipes-devtools/mkelfimage/mkelfimage/cross-compile.patch
diff --git a/meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch b/yocto-poky/meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch
index 756a65cd9..756a65cd9 100644
--- a/meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch
+++ b/yocto-poky/meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch
diff --git a/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb b/yocto-poky/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb
index e1c33a631..e1c33a631 100644
--- a/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb
+++ b/yocto-poky/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb
diff --git a/meta/recipes-devtools/mklibs/files/ac_init_fix.patch b/yocto-poky/meta/recipes-devtools/mklibs/files/ac_init_fix.patch
index 422af1042..422af1042 100644
--- a/meta/recipes-devtools/mklibs/files/ac_init_fix.patch
+++ b/yocto-poky/meta/recipes-devtools/mklibs/files/ac_init_fix.patch
diff --git a/meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch b/yocto-poky/meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
index 7d6d62e77..7d6d62e77 100644
--- a/meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
+++ b/yocto-poky/meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
diff --git a/meta/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch b/yocto-poky/meta/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch
index d27a48916..d27a48916 100644
--- a/meta/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch
+++ b/yocto-poky/meta/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch
diff --git a/meta/recipes-devtools/mklibs/files/fix_cross_compile.patch b/yocto-poky/meta/recipes-devtools/mklibs/files/fix_cross_compile.patch
index 13e4606b8..13e4606b8 100644
--- a/meta/recipes-devtools/mklibs/files/fix_cross_compile.patch
+++ b/yocto-poky/meta/recipes-devtools/mklibs/files/fix_cross_compile.patch
diff --git a/meta/recipes-devtools/mklibs/files/show-GNU-unique-symbols-as-provided-symbols.patch b/yocto-poky/meta/recipes-devtools/mklibs/files/show-GNU-unique-symbols-as-provided-symbols.patch
index bc56593e6..bc56593e6 100644
--- a/meta/recipes-devtools/mklibs/files/show-GNU-unique-symbols-as-provided-symbols.patch
+++ b/yocto-poky/meta/recipes-devtools/mklibs/files/show-GNU-unique-symbols-as-provided-symbols.patch
diff --git a/meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch b/yocto-poky/meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch
index 75500a029..75500a029 100644
--- a/meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch
+++ b/yocto-poky/meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch
diff --git a/meta/recipes-devtools/mklibs/mklibs-native_0.1.40.bb b/yocto-poky/meta/recipes-devtools/mklibs/mklibs-native_0.1.40.bb
index 59fec29a0..59fec29a0 100644
--- a/meta/recipes-devtools/mklibs/mklibs-native_0.1.40.bb
+++ b/yocto-poky/meta/recipes-devtools/mklibs/mklibs-native_0.1.40.bb
diff --git a/meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch b/yocto-poky/meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch
index 1724de5c6..1724de5c6 100644
--- a/meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch
+++ b/yocto-poky/meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch
diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/yocto-poky/meta/recipes-devtools/mmc/mmc-utils_git.bb
index 546f7f216..546f7f216 100644
--- a/meta/recipes-devtools/mmc/mmc-utils_git.bb
+++ b/yocto-poky/meta/recipes-devtools/mmc/mmc-utils_git.bb
diff --git a/meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch b/yocto-poky/meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch
index 2d36158f5..2d36158f5 100644
--- a/meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch
+++ b/yocto-poky/meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch
diff --git a/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch b/yocto-poky/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
index 57d6a30d8..57d6a30d8 100644
--- a/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
+++ b/yocto-poky/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
diff --git a/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch b/yocto-poky/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch
index 05f1629d5..05f1629d5 100644
--- a/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch
+++ b/yocto-poky/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch
diff --git a/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch b/yocto-poky/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch
index 7207cfcb3..7207cfcb3 100644
--- a/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch
+++ b/yocto-poky/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/yocto-poky/meta/recipes-devtools/mtd/mtd-utils_git.bb
index 17dca7760..17dca7760 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/yocto-poky/meta/recipes-devtools/mtd/mtd-utils_git.bb
diff --git a/meta/recipes-devtools/mtools/mtools/fix-broken-lz.patch b/yocto-poky/meta/recipes-devtools/mtools/mtools/fix-broken-lz.patch
index cb454917f..cb454917f 100644
--- a/meta/recipes-devtools/mtools/mtools/fix-broken-lz.patch
+++ b/yocto-poky/meta/recipes-devtools/mtools/mtools/fix-broken-lz.patch
diff --git a/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch b/yocto-poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
index 2e2873a4f..2e2873a4f 100644
--- a/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
+++ b/yocto-poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
diff --git a/meta/recipes-devtools/mtools/mtools/mtools.patch b/yocto-poky/meta/recipes-devtools/mtools/mtools/mtools.patch
index 15a32088d..15a32088d 100644
--- a/meta/recipes-devtools/mtools/mtools/mtools.patch
+++ b/yocto-poky/meta/recipes-devtools/mtools/mtools/mtools.patch
diff --git a/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch b/yocto-poky/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch
index 9cb3e39f5..9cb3e39f5 100644
--- a/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch
+++ b/yocto-poky/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch
diff --git a/meta/recipes-devtools/mtools/mtools/no-x11.patch b/yocto-poky/meta/recipes-devtools/mtools/mtools/no-x11.patch
index 705b62944..705b62944 100644
--- a/meta/recipes-devtools/mtools/mtools/no-x11.patch
+++ b/yocto-poky/meta/recipes-devtools/mtools/mtools/no-x11.patch
diff --git a/meta/recipes-devtools/mtools/mtools_3.9.9.bb b/yocto-poky/meta/recipes-devtools/mtools/mtools_3.9.9.bb
index c284a71b4..c284a71b4 100644
--- a/meta/recipes-devtools/mtools/mtools_3.9.9.bb
+++ b/yocto-poky/meta/recipes-devtools/mtools/mtools_3.9.9.bb
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.18.bb b/yocto-poky/meta/recipes-devtools/mtools/mtools_4.0.18.bb
index 24c9d4931..24c9d4931 100644
--- a/meta/recipes-devtools/mtools/mtools_4.0.18.bb
+++ b/yocto-poky/meta/recipes-devtools/mtools/mtools_4.0.18.bb
diff --git a/meta/recipes-devtools/nasm/nasm_2.11.08.bb b/yocto-poky/meta/recipes-devtools/nasm/nasm_2.11.08.bb
index e0724e68a..e0724e68a 100644
--- a/meta/recipes-devtools/nasm/nasm_2.11.08.bb
+++ b/yocto-poky/meta/recipes-devtools/nasm/nasm_2.11.08.bb
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch b/yocto-poky/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch
index 6b40afdad..6b40afdad 100644
--- a/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch
+++ b/yocto-poky/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch b/yocto-poky/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch
index 968b9b47c..968b9b47c 100644
--- a/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch
+++ b/yocto-poky/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch b/yocto-poky/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
index b47fd4655..b47fd4655 100644
--- a/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
+++ b/yocto-poky/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch b/yocto-poky/meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch
index 1a23a4a68..1a23a4a68 100644
--- a/meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch
+++ b/yocto-poky/meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch b/yocto-poky/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch
index 073af46fc..073af46fc 100644
--- a/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch
+++ b/yocto-poky/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch
diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/yocto-poky/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
index fa7aa62eb..fa7aa62eb 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/yocto-poky/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
diff --git a/meta/recipes-devtools/opensp/opensp-1.5.2/obsolete_automake_macros.patch b/yocto-poky/meta/recipes-devtools/opensp/opensp-1.5.2/obsolete_automake_macros.patch
index 42218a6d6..42218a6d6 100644
--- a/meta/recipes-devtools/opensp/opensp-1.5.2/obsolete_automake_macros.patch
+++ b/yocto-poky/meta/recipes-devtools/opensp/opensp-1.5.2/obsolete_automake_macros.patch
diff --git a/meta/recipes-devtools/opensp/opensp_1.5.2.bb b/yocto-poky/meta/recipes-devtools/opensp/opensp_1.5.2.bb
index 60a7d2e47..60a7d2e47 100644
--- a/meta/recipes-devtools/opensp/opensp_1.5.2.bb
+++ b/yocto-poky/meta/recipes-devtools/opensp/opensp_1.5.2.bb
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch b/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
index 4dddb08c9..4dddb08c9 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
+++ b/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 5f518d22d..5f518d22d 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
diff --git a/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb b/yocto-poky/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb
index ace3de4f4..ace3de4f4 100644
--- a/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb
+++ b/yocto-poky/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb
diff --git a/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb b/yocto-poky/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb
index 18d6abdde..18d6abdde 100644
--- a/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb
+++ b/yocto-poky/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb
diff --git a/meta/recipes-devtools/opkg/opkg/0001-libopkg-include-stdio.h-for-getting-FILE-defined.patch b/yocto-poky/meta/recipes-devtools/opkg/opkg/0001-libopkg-include-stdio.h-for-getting-FILE-defined.patch
index acc133864..acc133864 100644
--- a/meta/recipes-devtools/opkg/opkg/0001-libopkg-include-stdio.h-for-getting-FILE-defined.patch
+++ b/yocto-poky/meta/recipes-devtools/opkg/opkg/0001-libopkg-include-stdio.h-for-getting-FILE-defined.patch
diff --git a/meta/recipes-devtools/opkg/opkg/0001-opkg_archive-add-support-for-empty-compressed-files.patch b/yocto-poky/meta/recipes-devtools/opkg/opkg/0001-opkg_archive-add-support-for-empty-compressed-files.patch
index dabd196d2..dabd196d2 100644
--- a/meta/recipes-devtools/opkg/opkg/0001-opkg_archive-add-support-for-empty-compressed-files.patch
+++ b/yocto-poky/meta/recipes-devtools/opkg/opkg/0001-opkg_archive-add-support-for-empty-compressed-files.patch
diff --git a/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch b/yocto-poky/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
index 255021b4b..255021b4b 100644
--- a/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
+++ b/yocto-poky/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
diff --git a/meta/recipes-devtools/opkg/opkg/0001-string_util-New-file-with-bin_to_hex-function.patch b/yocto-poky/meta/recipes-devtools/opkg/opkg/0001-string_util-New-file-with-bin_to_hex-function.patch
index fb3ac462d..fb3ac462d 100644
--- a/meta/recipes-devtools/opkg/opkg/0001-string_util-New-file-with-bin_to_hex-function.patch
+++ b/yocto-poky/meta/recipes-devtools/opkg/opkg/0001-string_util-New-file-with-bin_to_hex-function.patch
diff --git a/meta/recipes-devtools/opkg/opkg/0002-md5-Add-md5_to_string-function.patch b/yocto-poky/meta/recipes-devtools/opkg/opkg/0002-md5-Add-md5_to_string-function.patch
index 3b823c693..3b823c693 100644
--- a/meta/recipes-devtools/opkg/opkg/0002-md5-Add-md5_to_string-function.patch
+++ b/yocto-poky/meta/recipes-devtools/opkg/opkg/0002-md5-Add-md5_to_string-function.patch
diff --git a/meta/recipes-devtools/opkg/opkg/0003-sha256-Add-sha256_to_string-function.patch b/yocto-poky/meta/recipes-devtools/opkg/opkg/0003-sha256-Add-sha256_to_string-function.patch
index 16e82d741..16e82d741 100644
--- a/meta/recipes-devtools/opkg/opkg/0003-sha256-Add-sha256_to_string-function.patch
+++ b/yocto-poky/meta/recipes-devtools/opkg/opkg/0003-sha256-Add-sha256_to_string-function.patch
diff --git a/meta/recipes-devtools/opkg/opkg/0004-opkg_download-Use-short-cache-file-name.patch b/yocto-poky/meta/recipes-devtools/opkg/opkg/0004-opkg_download-Use-short-cache-file-name.patch
index 7ea661dcf..7ea661dcf 100644
--- a/meta/recipes-devtools/opkg/opkg/0004-opkg_download-Use-short-cache-file-name.patch
+++ b/yocto-poky/meta/recipes-devtools/opkg/opkg/0004-opkg_download-Use-short-cache-file-name.patch
diff --git a/meta/recipes-devtools/opkg/opkg/opkg-configure.service b/yocto-poky/meta/recipes-devtools/opkg/opkg/opkg-configure.service
index 8e74026ec..8e74026ec 100644
--- a/meta/recipes-devtools/opkg/opkg/opkg-configure.service
+++ b/yocto-poky/meta/recipes-devtools/opkg/opkg/opkg-configure.service
diff --git a/meta/recipes-devtools/opkg/opkg/opkg.conf b/yocto-poky/meta/recipes-devtools/opkg/opkg/opkg.conf
index c2e9e92f9..c2e9e92f9 100644
--- a/meta/recipes-devtools/opkg/opkg/opkg.conf
+++ b/yocto-poky/meta/recipes-devtools/opkg/opkg/opkg.conf
diff --git a/meta/recipes-devtools/opkg/opkg_0.3.0.bb b/yocto-poky/meta/recipes-devtools/opkg/opkg_0.3.0.bb
index 5ad3e92cf..5ad3e92cf 100644
--- a/meta/recipes-devtools/opkg/opkg_0.3.0.bb
+++ b/yocto-poky/meta/recipes-devtools/opkg/opkg_0.3.0.bb
diff --git a/meta/recipes-devtools/orc/orc_0.4.23.bb b/yocto-poky/meta/recipes-devtools/orc/orc_0.4.23.bb
index d4257c3f8..d4257c3f8 100644
--- a/meta/recipes-devtools/orc/orc_0.4.23.bb
+++ b/yocto-poky/meta/recipes-devtools/orc/orc_0.4.23.bb
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
index ed67c501c..ed67c501c 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
+++ b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
index 804a62731..804a62731 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
+++ b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
index 13cbb5989..13cbb5989 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
+++ b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
index bc5e111ee..bc5e111ee 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
+++ b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch
index 04222cbf7..04222cbf7 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch
+++ b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
index 4dfc1370c..4dfc1370c 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
+++ b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
index 4bc91b86e..4bc91b86e 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
+++ b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
index d806b5fb7..d806b5fb7 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
+++ b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
index 08926ba6b..08926ba6b 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
+++ b/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
diff --git a/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb b/yocto-poky/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb
index e83186005..e83186005 100644
--- a/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb
+++ b/yocto-poky/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb
diff --git a/meta/recipes-devtools/patch/patch.inc b/yocto-poky/meta/recipes-devtools/patch/patch.inc
index cbfb8cfcf..cbfb8cfcf 100644
--- a/meta/recipes-devtools/patch/patch.inc
+++ b/yocto-poky/meta/recipes-devtools/patch/patch.inc
diff --git a/meta/recipes-devtools/patch/patch/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-devtools/patch/patch/0001-Unset-need_charset_alias-when-building-for-musl.patch
index ba1a4bab4..ba1a4bab4 100644
--- a/meta/recipes-devtools/patch/patch/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/yocto-poky/meta/recipes-devtools/patch/patch/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-devtools/patch/patch/debian.patch b/yocto-poky/meta/recipes-devtools/patch/patch/debian.patch
index 1a0764659..1a0764659 100644
--- a/meta/recipes-devtools/patch/patch/debian.patch
+++ b/yocto-poky/meta/recipes-devtools/patch/patch/debian.patch
diff --git a/meta/recipes-devtools/patch/patch/global-reject-file.diff b/yocto-poky/meta/recipes-devtools/patch/patch/global-reject-file.diff
index bb7ca7912..bb7ca7912 100644
--- a/meta/recipes-devtools/patch/patch/global-reject-file.diff
+++ b/yocto-poky/meta/recipes-devtools/patch/patch/global-reject-file.diff
diff --git a/meta/recipes-devtools/patch/patch/install.patch b/yocto-poky/meta/recipes-devtools/patch/patch/install.patch
index 0354ec8f0..0354ec8f0 100644
--- a/meta/recipes-devtools/patch/patch/install.patch
+++ b/yocto-poky/meta/recipes-devtools/patch/patch/install.patch
diff --git a/meta/recipes-devtools/patch/patch/unified-reject-files.diff b/yocto-poky/meta/recipes-devtools/patch/patch/unified-reject-files.diff
index 4b59212db..4b59212db 100644
--- a/meta/recipes-devtools/patch/patch/unified-reject-files.diff
+++ b/yocto-poky/meta/recipes-devtools/patch/patch/unified-reject-files.diff
diff --git a/meta/recipes-devtools/patch/patch_2.5.9.bb b/yocto-poky/meta/recipes-devtools/patch/patch_2.5.9.bb
index c29b24075..c29b24075 100644
--- a/meta/recipes-devtools/patch/patch_2.5.9.bb
+++ b/yocto-poky/meta/recipes-devtools/patch/patch_2.5.9.bb
diff --git a/meta/recipes-devtools/patch/patch_2.7.5.bb b/yocto-poky/meta/recipes-devtools/patch/patch_2.7.5.bb
index f3fcf5e86..f3fcf5e86 100644
--- a/meta/recipes-devtools/patch/patch_2.7.5.bb
+++ b/yocto-poky/meta/recipes-devtools/patch/patch_2.7.5.bb
diff --git a/meta/recipes-devtools/patchelf/patchelf_0.8.bb b/yocto-poky/meta/recipes-devtools/patchelf/patchelf_0.8.bb
index c1b87f553..c1b87f553 100644
--- a/meta/recipes-devtools/patchelf/patchelf_0.8.bb
+++ b/yocto-poky/meta/recipes-devtools/patchelf/patchelf_0.8.bb
diff --git a/meta/recipes-devtools/pax-utils/pax-utils_1.0.5.bb b/yocto-poky/meta/recipes-devtools/pax-utils/pax-utils_1.0.5.bb
index 0716a08a4..0716a08a4 100644
--- a/meta/recipes-devtools/pax-utils/pax-utils_1.0.5.bb
+++ b/yocto-poky/meta/recipes-devtools/pax-utils/pax-utils_1.0.5.bb
diff --git a/meta/recipes-devtools/perl/liberror-perl_0.17024.bb b/yocto-poky/meta/recipes-devtools/perl/liberror-perl_0.17024.bb
index 6ae0e7e6f..6ae0e7e6f 100644
--- a/meta/recipes-devtools/perl/liberror-perl_0.17024.bb
+++ b/yocto-poky/meta/recipes-devtools/perl/liberror-perl_0.17024.bb
diff --git a/meta/recipes-devtools/perl/liburi-perl_1.60.bb b/yocto-poky/meta/recipes-devtools/perl/liburi-perl_1.60.bb
index 8809a44fc..8809a44fc 100644
--- a/meta/recipes-devtools/perl/liburi-perl_1.60.bb
+++ b/yocto-poky/meta/recipes-devtools/perl/liburi-perl_1.60.bb
diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb b/yocto-poky/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb
index 9ccd41739..9ccd41739 100644
--- a/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb
+++ b/yocto-poky/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb
diff --git a/meta/recipes-devtools/perl/libxml-perl_0.08.bb b/yocto-poky/meta/recipes-devtools/perl/libxml-perl_0.08.bb
index 2c01976ca..2c01976ca 100644
--- a/meta/recipes-devtools/perl/libxml-perl_0.08.bb
+++ b/yocto-poky/meta/recipes-devtools/perl/libxml-perl_0.08.bb
diff --git a/meta/recipes-devtools/perl/libxml-simple-perl_2.20.bb b/yocto-poky/meta/recipes-devtools/perl/libxml-simple-perl_2.20.bb
index 4721b4b32..4721b4b32 100644
--- a/meta/recipes-devtools/perl/libxml-simple-perl_2.20.bb
+++ b/yocto-poky/meta/recipes-devtools/perl/libxml-simple-perl_2.20.bb
diff --git a/meta/recipes-devtools/perl/perl-native_5.22.0.bb b/yocto-poky/meta/recipes-devtools/perl/perl-native_5.22.0.bb
index b4dda3128..b4dda3128 100644
--- a/meta/recipes-devtools/perl/perl-native_5.22.0.bb
+++ b/yocto-poky/meta/recipes-devtools/perl/perl-native_5.22.0.bb
diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/yocto-poky/meta/recipes-devtools/perl/perl-ptest.inc
index 948ea7cdd..948ea7cdd 100644
--- a/meta/recipes-devtools/perl/perl-ptest.inc
+++ b/yocto-poky/meta/recipes-devtools/perl/perl-ptest.inc
diff --git a/meta/recipes-devtools/perl/perl-rdepends_5.22.0.inc b/yocto-poky/meta/recipes-devtools/perl/perl-rdepends_5.22.0.inc
index 7f886f34a..7f886f34a 100644
--- a/meta/recipes-devtools/perl/perl-rdepends_5.22.0.inc
+++ b/yocto-poky/meta/recipes-devtools/perl/perl-rdepends_5.22.0.inc
diff --git a/meta/recipes-devtools/perl/perl.inc b/yocto-poky/meta/recipes-devtools/perl/perl.inc
index 0d9716c23..0d9716c23 100644
--- a/meta/recipes-devtools/perl/perl.inc
+++ b/yocto-poky/meta/recipes-devtools/perl/perl.inc
diff --git a/meta/recipes-devtools/perl/perl/Configure-multilib.patch b/yocto-poky/meta/recipes-devtools/perl/perl/Configure-multilib.patch
index 9625b0b84..9625b0b84 100644
--- a/meta/recipes-devtools/perl/perl/Configure-multilib.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/Configure-multilib.patch
diff --git a/meta/recipes-devtools/perl/perl/MM_Unix.pm.patch b/yocto-poky/meta/recipes-devtools/perl/perl/MM_Unix.pm.patch
index eb92ccb67..eb92ccb67 100644
--- a/meta/recipes-devtools/perl/perl/MM_Unix.pm.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/MM_Unix.pm.patch
diff --git a/meta/recipes-devtools/perl/perl/Makefile.SH.patch b/yocto-poky/meta/recipes-devtools/perl/perl/Makefile.SH.patch
index 3de233128..3de233128 100644
--- a/meta/recipes-devtools/perl/perl/Makefile.SH.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/Makefile.SH.patch
diff --git a/meta/recipes-devtools/perl/perl/Makefile.patch b/yocto-poky/meta/recipes-devtools/perl/perl/Makefile.patch
index 858e2e10f..858e2e10f 100644
--- a/meta/recipes-devtools/perl/perl/Makefile.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/Makefile.patch
diff --git a/meta/recipes-devtools/perl/perl/config.sh b/yocto-poky/meta/recipes-devtools/perl/perl/config.sh
index 9fb50423b..9fb50423b 100644
--- a/meta/recipes-devtools/perl/perl/config.sh
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/config.sh
diff --git a/meta/recipes-devtools/perl/perl/config.sh-32 b/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-32
index 7259a0c6a..7259a0c6a 100644
--- a/meta/recipes-devtools/perl/perl/config.sh-32
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-32
diff --git a/meta/recipes-devtools/perl/perl/config.sh-32-be b/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-32-be
index a59a9abb5..a59a9abb5 100644
--- a/meta/recipes-devtools/perl/perl/config.sh-32-be
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-32-be
diff --git a/meta/recipes-devtools/perl/perl/config.sh-32-le b/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-32-le
index 10e422656..10e422656 100644
--- a/meta/recipes-devtools/perl/perl/config.sh-32-le
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-32-le
diff --git a/meta/recipes-devtools/perl/perl/config.sh-64 b/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-64
index 6929d3a09..6929d3a09 100644
--- a/meta/recipes-devtools/perl/perl/config.sh-64
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-64
diff --git a/meta/recipes-devtools/perl/perl/config.sh-64-be b/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-64-be
index c08ce3c43..c08ce3c43 100644
--- a/meta/recipes-devtools/perl/perl/config.sh-64-be
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-64-be
diff --git a/meta/recipes-devtools/perl/perl/config.sh-64-le b/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-64-le
index 277d2a9be..277d2a9be 100644
--- a/meta/recipes-devtools/perl/perl/config.sh-64-le
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-64-le
diff --git a/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch b/yocto-poky/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch
index a00ad61d9..a00ad61d9 100644
--- a/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch
diff --git a/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff
index a63b96831..a63b96831 100644
--- a/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
index 6b5295045..6b5295045 100644
--- a/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff
index 280bf1170..280bf1170 100644
--- a/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff
index 601ee4c30..601ee4c30 100644
--- a/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/doc_info.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/doc_info.diff
index fbea2ee22..fbea2ee22 100644
--- a/meta/recipes-devtools/perl/perl/debian/doc_info.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/doc_info.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff
index e074b20fd..e074b20fd 100644
--- a/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/errno_ver.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/errno_ver.diff
index bcb59c69e..bcb59c69e 100644
--- a/meta/recipes-devtools/perl/perl/debian/errno_ver.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/errno_ver.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff
index adb4bd991..adb4bd991 100644
--- a/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/fakeroot.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fakeroot.diff
index ec461cfe5..ec461cfe5 100644
--- a/meta/recipes-devtools/perl/perl/debian/fakeroot.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fakeroot.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/find_html2text.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/find_html2text.diff
index d319e7518..d319e7518 100644
--- a/meta/recipes-devtools/perl/perl/debian/find_html2text.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/find_html2text.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/document_makemaker_ccflags.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/document_makemaker_ccflags.diff
index 61a92712e..61a92712e 100644
--- a/meta/recipes-devtools/perl/perl/debian/fixes/document_makemaker_ccflags.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/document_makemaker_ccflags.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff
index 525f962c1..525f962c1 100644
--- a/meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff
index 3c31972c6..3c31972c6 100644
--- a/meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff
index b5564fdbc..b5564fdbc 100644
--- a/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/pod_man_reproducible_date.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/pod_man_reproducible_date.diff
index 7c9ca867a..7c9ca867a 100644
--- a/meta/recipes-devtools/perl/perl/debian/fixes/pod_man_reproducible_date.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/pod_man_reproducible_date.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/podman-empty-date.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-empty-date.diff
index 7ebbf9c60..7ebbf9c60 100644
--- a/meta/recipes-devtools/perl/perl/debian/fixes/podman-empty-date.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-empty-date.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/podman-pipe.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-pipe.diff
index 1a6036116..1a6036116 100644
--- a/meta/recipes-devtools/perl/perl/debian/fixes/podman-pipe.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-pipe.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc-docs.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc-docs.diff
index 0cdfeffd1..0cdfeffd1 100644
--- a/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc-docs.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc-docs.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc.diff
index fbd7b9db9..fbd7b9db9 100644
--- a/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/respect_umask.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/respect_umask.diff
index d1b498b52..d1b498b52 100644
--- a/meta/recipes-devtools/perl/perl/debian/fixes/respect_umask.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/respect_umask.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/instmodsh_doc.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/instmodsh_doc.diff
index a62c746e9..a62c746e9 100644
--- a/meta/recipes-devtools/perl/perl/debian/instmodsh_doc.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/instmodsh_doc.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/ld_run_path.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/ld_run_path.diff
index d80f86c21..d80f86c21 100644
--- a/meta/recipes-devtools/perl/perl/debian/ld_run_path.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/ld_run_path.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/libnet_config_path.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/libnet_config_path.diff
index 54ef9640e..54ef9640e 100644
--- a/meta/recipes-devtools/perl/perl/debian/libnet_config_path.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/libnet_config_path.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/libperl_embed_doc.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/libperl_embed_doc.diff
index 76b805451..76b805451 100644
--- a/meta/recipes-devtools/perl/perl/debian/libperl_embed_doc.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/libperl_embed_doc.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff
index fd471ed7a..fd471ed7a 100644
--- a/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/makemaker-pasthru.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/makemaker-pasthru.diff
index fa0f9daf9..fa0f9daf9 100644
--- a/meta/recipes-devtools/perl/perl/debian/makemaker-pasthru.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/makemaker-pasthru.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/makemaker_customized.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/makemaker_customized.diff
index b1b4cb9a6..b1b4cb9a6 100644
--- a/meta/recipes-devtools/perl/perl/debian/makemaker_customized.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/makemaker_customized.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/mod_paths.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/mod_paths.diff
index ae1590760..ae1590760 100644
--- a/meta/recipes-devtools/perl/perl/debian/mod_paths.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/mod_paths.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff
index b911fd276..b911fd276 100644
--- a/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/patchlevel.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/patchlevel.diff
index 8656b027e..8656b027e 100644
--- a/meta/recipes-devtools/perl/perl/debian/patchlevel.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/patchlevel.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/perl5db-x-terminal-emulator.patch b/yocto-poky/meta/recipes-devtools/perl/perl/debian/perl5db-x-terminal-emulator.patch
index 533952cac..533952cac 100644
--- a/meta/recipes-devtools/perl/perl/debian/perl5db-x-terminal-emulator.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/perl5db-x-terminal-emulator.patch
diff --git a/meta/recipes-devtools/perl/perl/debian/perlivp.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/perlivp.diff
index 2c1eab970..2c1eab970 100644
--- a/meta/recipes-devtools/perl/perl/debian/perlivp.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/perlivp.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/pod2man-customized.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/pod2man-customized.diff
index 6270b8731..6270b8731 100644
--- a/meta/recipes-devtools/perl/perl/debian/pod2man-customized.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/pod2man-customized.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/prefix_changes.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/prefix_changes.diff
index c41efbe3e..c41efbe3e 100644
--- a/meta/recipes-devtools/perl/perl/debian/prefix_changes.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/prefix_changes.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/prune_libs.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/prune_libs.diff
index b4443f647..b4443f647 100644
--- a/meta/recipes-devtools/perl/perl/debian/prune_libs.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/prune_libs.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/regen-skip.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/regen-skip.diff
index 8a3fc9912..8a3fc9912 100644
--- a/meta/recipes-devtools/perl/perl/debian/regen-skip.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/regen-skip.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/skip-kfreebsd-crash.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/skip-kfreebsd-crash.diff
index ecfc0bc62..ecfc0bc62 100644
--- a/meta/recipes-devtools/perl/perl/debian/skip-kfreebsd-crash.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/skip-kfreebsd-crash.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/skip-upstream-git-tests.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/skip-upstream-git-tests.diff
index 4c87104cc..4c87104cc 100644
--- a/meta/recipes-devtools/perl/perl/debian/skip-upstream-git-tests.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/skip-upstream-git-tests.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff
index cb3145776..cb3145776 100644
--- a/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff
diff --git a/meta/recipes-devtools/perl/perl/debian/writable_site_dirs.diff b/yocto-poky/meta/recipes-devtools/perl/perl/debian/writable_site_dirs.diff
index 53adc2f4d..53adc2f4d 100644
--- a/meta/recipes-devtools/perl/perl/debian/writable_site_dirs.diff
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/debian/writable_site_dirs.diff
diff --git a/meta/recipes-devtools/perl/perl/dynaloaderhack.patch b/yocto-poky/meta/recipes-devtools/perl/perl/dynaloaderhack.patch
index 3df593346..3df593346 100644
--- a/meta/recipes-devtools/perl/perl/dynaloaderhack.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/dynaloaderhack.patch
diff --git a/meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch b/yocto-poky/meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch
index 994ef7013..994ef7013 100644
--- a/meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch
diff --git a/meta/recipes-devtools/perl/perl/ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch b/yocto-poky/meta/recipes-devtools/perl/perl/ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch
index 6b05b877f..6b05b877f 100644
--- a/meta/recipes-devtools/perl/perl/ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch
diff --git a/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch b/yocto-poky/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch
index 69ac43477..69ac43477 100644
--- a/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch
diff --git a/meta/recipes-devtools/perl/perl/generate-sh.patch b/yocto-poky/meta/recipes-devtools/perl/perl/generate-sh.patch
index 27f6e691c..27f6e691c 100644
--- a/meta/recipes-devtools/perl/perl/generate-sh.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/generate-sh.patch
diff --git a/meta/recipes-devtools/perl/perl/installperl.patch b/yocto-poky/meta/recipes-devtools/perl/perl/installperl.patch
index 456012376..456012376 100644
--- a/meta/recipes-devtools/perl/perl/installperl.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/installperl.patch
diff --git a/meta/recipes-devtools/perl/perl/letgcc-find-errno.patch b/yocto-poky/meta/recipes-devtools/perl/perl/letgcc-find-errno.patch
index 5161e4c8b..5161e4c8b 100644
--- a/meta/recipes-devtools/perl/perl/letgcc-find-errno.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/letgcc-find-errno.patch
diff --git a/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch b/yocto-poky/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch
index de6f65294..de6f65294 100644
--- a/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch
diff --git a/meta/recipes-devtools/perl/perl/native-nopacklist.patch b/yocto-poky/meta/recipes-devtools/perl/perl/native-nopacklist.patch
index 5482dcb79..5482dcb79 100644
--- a/meta/recipes-devtools/perl/perl/native-nopacklist.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/native-nopacklist.patch
diff --git a/meta/recipes-devtools/perl/perl/native-perlinc.patch b/yocto-poky/meta/recipes-devtools/perl/perl/native-perlinc.patch
index f0bb1f659..f0bb1f659 100644
--- a/meta/recipes-devtools/perl/perl/native-perlinc.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/native-perlinc.patch
diff --git a/meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch b/yocto-poky/meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch
index 7dd904140..7dd904140 100644
--- a/meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch
diff --git a/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch b/yocto-poky/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch
index d912d0031..d912d0031 100644
--- a/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch
diff --git a/meta/recipes-devtools/perl/perl/perl-configpm-switch.patch b/yocto-poky/meta/recipes-devtools/perl/perl/perl-configpm-switch.patch
index c6cc15c93..c6cc15c93 100644
--- a/meta/recipes-devtools/perl/perl/perl-configpm-switch.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/perl-configpm-switch.patch
diff --git a/meta/recipes-devtools/perl/perl/perl-configure.sh b/yocto-poky/meta/recipes-devtools/perl/perl/perl-configure.sh
index e72ce49f9..e72ce49f9 100755
--- a/meta/recipes-devtools/perl/perl/perl-configure.sh
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/perl-configure.sh
diff --git a/meta/recipes-devtools/perl/perl/perl-dynloader.patch b/yocto-poky/meta/recipes-devtools/perl/perl/perl-dynloader.patch
index 035beba66..035beba66 100644
--- a/meta/recipes-devtools/perl/perl/perl-dynloader.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/perl-dynloader.patch
diff --git a/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch b/yocto-poky/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch
index aa83fca5a..aa83fca5a 100644
--- a/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch
diff --git a/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch b/yocto-poky/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch
index efbc55df2..efbc55df2 100644
--- a/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch
diff --git a/meta/recipes-devtools/perl/perl/perl-moreconfig.patch b/yocto-poky/meta/recipes-devtools/perl/perl/perl-moreconfig.patch
index 59ce85a7a..59ce85a7a 100644
--- a/meta/recipes-devtools/perl/perl/perl-moreconfig.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/perl-moreconfig.patch
diff --git a/meta/recipes-devtools/perl/perl/run-ptest b/yocto-poky/meta/recipes-devtools/perl/perl/run-ptest
index 1e2dd1b66..1e2dd1b66 100644
--- a/meta/recipes-devtools/perl/perl/run-ptest
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/run-ptest
diff --git a/meta/recipes-devtools/perl/perl/t-run-switches.t-perl5-perl.patch b/yocto-poky/meta/recipes-devtools/perl/perl/t-run-switches.t-perl5-perl.patch
index 03fdf4ab9..03fdf4ab9 100644
--- a/meta/recipes-devtools/perl/perl/t-run-switches.t-perl5-perl.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/t-run-switches.t-perl5-perl.patch
diff --git a/meta/recipes-devtools/perl/perl/test/dist-threads-t-join.t-adjust-ps-option.patch b/yocto-poky/meta/recipes-devtools/perl/perl/test/dist-threads-t-join.t-adjust-ps-option.patch
index c8293c3d6..c8293c3d6 100644
--- a/meta/recipes-devtools/perl/perl/test/dist-threads-t-join.t-adjust-ps-option.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/test/dist-threads-t-join.t-adjust-ps-option.patch
diff --git a/meta/recipes-devtools/perl/perl/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch b/yocto-poky/meta/recipes-devtools/perl/perl/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch
index ce577fe5f..ce577fe5f 100644
--- a/meta/recipes-devtools/perl/perl/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch
+++ b/yocto-poky/meta/recipes-devtools/perl/perl/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch
diff --git a/meta/recipes-devtools/perl/perl_5.22.0.bb b/yocto-poky/meta/recipes-devtools/perl/perl_5.22.0.bb
index 9df8d043e..9df8d043e 100644
--- a/meta/recipes-devtools/perl/perl_5.22.0.bb
+++ b/yocto-poky/meta/recipes-devtools/perl/perl_5.22.0.bb
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index 55ab5c41f..55ab5c41f 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig.inc
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch b/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch
index 01c62472c..01c62472c 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch
+++ b/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in b/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in
index 5e44bb435..5e44bb435 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in
+++ b/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
index eaa511a8b..eaa511a8b 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
+++ b/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
diff --git a/meta/recipes-devtools/postinst-intercept/nativesdk-postinst-intercept_1.0.bb b/yocto-poky/meta/recipes-devtools/postinst-intercept/nativesdk-postinst-intercept_1.0.bb
index 7dc45c68f..7dc45c68f 100644
--- a/meta/recipes-devtools/postinst-intercept/nativesdk-postinst-intercept_1.0.bb
+++ b/yocto-poky/meta/recipes-devtools/postinst-intercept/nativesdk-postinst-intercept_1.0.bb
diff --git a/meta/recipes-devtools/prelink/prelink/macros.prelink b/yocto-poky/meta/recipes-devtools/prelink/prelink/macros.prelink
index cb1669588..cb1669588 100644
--- a/meta/recipes-devtools/prelink/prelink/macros.prelink
+++ b/yocto-poky/meta/recipes-devtools/prelink/prelink/macros.prelink
diff --git a/meta/recipes-devtools/prelink/prelink/prelink.conf b/yocto-poky/meta/recipes-devtools/prelink/prelink/prelink.conf
index 562f23c59..562f23c59 100644
--- a/meta/recipes-devtools/prelink/prelink/prelink.conf
+++ b/yocto-poky/meta/recipes-devtools/prelink/prelink/prelink.conf
diff --git a/meta/recipes-devtools/prelink/prelink/prelink.cron.daily b/yocto-poky/meta/recipes-devtools/prelink/prelink/prelink.cron.daily
index 0b3c07322..0b3c07322 100644
--- a/meta/recipes-devtools/prelink/prelink/prelink.cron.daily
+++ b/yocto-poky/meta/recipes-devtools/prelink/prelink/prelink.cron.daily
diff --git a/meta/recipes-devtools/prelink/prelink/prelink.default b/yocto-poky/meta/recipes-devtools/prelink/prelink/prelink.default
index d8802f820..d8802f820 100644
--- a/meta/recipes-devtools/prelink/prelink/prelink.default
+++ b/yocto-poky/meta/recipes-devtools/prelink/prelink/prelink.default
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/yocto-poky/meta/recipes-devtools/prelink/prelink_git.bb
index e223ef689..e223ef689 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/yocto-poky/meta/recipes-devtools/prelink/prelink_git.bb
diff --git a/meta/recipes-devtools/pseudo/files/fallback-group b/yocto-poky/meta/recipes-devtools/pseudo/files/fallback-group
index 81bf73231..81bf73231 100644
--- a/meta/recipes-devtools/pseudo/files/fallback-group
+++ b/yocto-poky/meta/recipes-devtools/pseudo/files/fallback-group
diff --git a/meta/recipes-devtools/pseudo/files/fallback-passwd b/yocto-poky/meta/recipes-devtools/pseudo/files/fallback-passwd
index c1458dc0f..c1458dc0f 100644
--- a/meta/recipes-devtools/pseudo/files/fallback-passwd
+++ b/yocto-poky/meta/recipes-devtools/pseudo/files/fallback-passwd
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/yocto-poky/meta/recipes-devtools/pseudo/pseudo.inc
index fe12258fd..fe12258fd 100644
--- a/meta/recipes-devtools/pseudo/pseudo.inc
+++ b/yocto-poky/meta/recipes-devtools/pseudo/pseudo.inc
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.6.7.bb b/yocto-poky/meta/recipes-devtools/pseudo/pseudo_1.6.7.bb
index b8c20ad65..b8c20ad65 100644
--- a/meta/recipes-devtools/pseudo/pseudo_1.6.7.bb
+++ b/yocto-poky/meta/recipes-devtools/pseudo/pseudo_1.6.7.bb
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.7.4.bb b/yocto-poky/meta/recipes-devtools/pseudo/pseudo_1.7.4.bb
index d68e0af7d..d68e0af7d 100644
--- a/meta/recipes-devtools/pseudo/pseudo_1.7.4.bb
+++ b/yocto-poky/meta/recipes-devtools/pseudo/pseudo_1.7.4.bb
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/yocto-poky/meta/recipes-devtools/pseudo/pseudo_git.bb
index eb666c064..eb666c064 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/yocto-poky/meta/recipes-devtools/pseudo/pseudo_git.bb
diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc b/yocto-poky/meta/recipes-devtools/python/python-2.7-manifest.inc
index dd8d82521..dd8d82521 100644
--- a/meta/recipes-devtools/python/python-2.7-manifest.inc
+++ b/yocto-poky/meta/recipes-devtools/python/python-2.7-manifest.inc
diff --git a/meta/recipes-devtools/python/python-3.4-manifest.inc b/yocto-poky/meta/recipes-devtools/python/python-3.4-manifest.inc
index 97070b6fa..97070b6fa 100644
--- a/meta/recipes-devtools/python/python-3.4-manifest.inc
+++ b/yocto-poky/meta/recipes-devtools/python/python-3.4-manifest.inc
diff --git a/meta/recipes-devtools/python/python-async_0.6.2.bb b/yocto-poky/meta/recipes-devtools/python/python-async_0.6.2.bb
index 5a17a1a00..5a17a1a00 100644
--- a/meta/recipes-devtools/python/python-async_0.6.2.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-async_0.6.2.bb
diff --git a/meta/recipes-devtools/python/python-dbus_1.2.0.bb b/yocto-poky/meta/recipes-devtools/python/python-dbus_1.2.0.bb
index b314dce1c..b314dce1c 100644
--- a/meta/recipes-devtools/python/python-dbus_1.2.0.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-dbus_1.2.0.bb
diff --git a/meta/recipes-devtools/python/python-docutils_0.12.bb b/yocto-poky/meta/recipes-devtools/python/python-docutils_0.12.bb
index 8cda88d27..8cda88d27 100644
--- a/meta/recipes-devtools/python/python-docutils_0.12.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-docutils_0.12.bb
diff --git a/meta/recipes-devtools/python/python-git_1.0.1.bb b/yocto-poky/meta/recipes-devtools/python/python-git_1.0.1.bb
index a78d7c83c..a78d7c83c 100644
--- a/meta/recipes-devtools/python/python-git_1.0.1.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-git_1.0.1.bb
diff --git a/meta/recipes-devtools/python/python-gitdb_0.6.4.bb b/yocto-poky/meta/recipes-devtools/python/python-gitdb_0.6.4.bb
index f0083bdb1..f0083bdb1 100644
--- a/meta/recipes-devtools/python/python-gitdb_0.6.4.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-gitdb_0.6.4.bb
diff --git a/meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch b/yocto-poky/meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
index 2575306be..2575306be 100644
--- a/meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
diff --git a/meta/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch b/yocto-poky/meta/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch
index 4960ed466..4960ed466 100644
--- a/meta/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch
diff --git a/meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch b/yocto-poky/meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
index 9ecc63a0d..9ecc63a0d 100644
--- a/meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
diff --git a/meta/recipes-devtools/python/python-imaging_1.1.7.bb b/yocto-poky/meta/recipes-devtools/python/python-imaging_1.1.7.bb
index a67832827..a67832827 100644
--- a/meta/recipes-devtools/python/python-imaging_1.1.7.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-imaging_1.1.7.bb
diff --git a/meta/recipes-devtools/python/python-mako_1.0.1.bb b/yocto-poky/meta/recipes-devtools/python/python-mako_1.0.1.bb
index 5d42b0ca3..5d42b0ca3 100644
--- a/meta/recipes-devtools/python/python-mako_1.0.1.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-mako_1.0.1.bb
diff --git a/meta/recipes-devtools/python/python-native/10-distutils-fix-swig-parameter.patch b/yocto-poky/meta/recipes-devtools/python/python-native/10-distutils-fix-swig-parameter.patch
index a39247ce7..a39247ce7 100644
--- a/meta/recipes-devtools/python/python-native/10-distutils-fix-swig-parameter.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-native/10-distutils-fix-swig-parameter.patch
diff --git a/meta/recipes-devtools/python/python-native/11-distutils-never-modify-shebang-line.patch b/yocto-poky/meta/recipes-devtools/python/python-native/11-distutils-never-modify-shebang-line.patch
index c92469b9b..c92469b9b 100644
--- a/meta/recipes-devtools/python/python-native/11-distutils-never-modify-shebang-line.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-native/11-distutils-never-modify-shebang-line.patch
diff --git a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch b/yocto-poky/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
index f89aaff7b..f89aaff7b 100644
--- a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
diff --git a/meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch b/yocto-poky/meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch
index 5279e7c3b..5279e7c3b 100644
--- a/meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch
diff --git a/meta/recipes-devtools/python/python-native/debug.patch b/yocto-poky/meta/recipes-devtools/python/python-native/debug.patch
index 5ec10d6b2..5ec10d6b2 100644
--- a/meta/recipes-devtools/python/python-native/debug.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-native/debug.patch
diff --git a/meta/recipes-devtools/python/python-native/multilib.patch b/yocto-poky/meta/recipes-devtools/python/python-native/multilib.patch
index 8ca89e7c5..8ca89e7c5 100644
--- a/meta/recipes-devtools/python/python-native/multilib.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-native/multilib.patch
diff --git a/meta/recipes-devtools/python/python-native/nohostlibs.patch b/yocto-poky/meta/recipes-devtools/python/python-native/nohostlibs.patch
index 8a452e94d..8a452e94d 100644
--- a/meta/recipes-devtools/python/python-native/nohostlibs.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-native/nohostlibs.patch
diff --git a/meta/recipes-devtools/python/python-native/revert_use_of_sysconfigdata.patch b/yocto-poky/meta/recipes-devtools/python/python-native/revert_use_of_sysconfigdata.patch
index 202aaf106..202aaf106 100644
--- a/meta/recipes-devtools/python/python-native/revert_use_of_sysconfigdata.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-native/revert_use_of_sysconfigdata.patch
diff --git a/meta/recipes-devtools/python/python-native/unixccompiler.patch b/yocto-poky/meta/recipes-devtools/python/python-native/unixccompiler.patch
index 450282912..450282912 100644
--- a/meta/recipes-devtools/python/python-native/unixccompiler.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-native/unixccompiler.patch
diff --git a/meta/recipes-devtools/python/python-native_2.7.9.bb b/yocto-poky/meta/recipes-devtools/python/python-native_2.7.9.bb
index 34f5c2914..34f5c2914 100644
--- a/meta/recipes-devtools/python/python-native_2.7.9.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-native_2.7.9.bb
diff --git a/meta/recipes-devtools/python/python-nose_1.3.6.bb b/yocto-poky/meta/recipes-devtools/python/python-nose_1.3.6.bb
index d6e8fc1ed..d6e8fc1ed 100644
--- a/meta/recipes-devtools/python/python-nose_1.3.6.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-nose_1.3.6.bb
diff --git a/meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h
index be57ac27b..be57ac27b 100644
--- a/meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/aarch64/config.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/aarch64/config.h
index c30b868f2..c30b868f2 100644
--- a/meta/recipes-devtools/python/python-numpy/aarch64/config.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/aarch64/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/arm/config.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/arm/config.h
index 17ef186d5..17ef186d5 100644
--- a/meta/recipes-devtools/python/python-numpy/arm/config.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/arm/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/arm/numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/arm/numpyconfig.h
index c4bf6547f..c4bf6547f 100644
--- a/meta/recipes-devtools/python/python-numpy/arm/numpyconfig.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/arm/numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/armeb/config.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/armeb/config.h
index 17ef186d5..17ef186d5 100644
--- a/meta/recipes-devtools/python/python-numpy/armeb/config.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/armeb/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/armeb/numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/armeb/numpyconfig.h
index c4bf6547f..c4bf6547f 100644
--- a/meta/recipes-devtools/python/python-numpy/armeb/numpyconfig.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/armeb/numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/mips/_numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips/_numpyconfig.h
index c0c42851b..c0c42851b 100644
--- a/meta/recipes-devtools/python/python-numpy/mips/_numpyconfig.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips/_numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/mips/config.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips/config.h
index 2f6135adc..2f6135adc 100644
--- a/meta/recipes-devtools/python/python-numpy/mips/config.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/mips64/_numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips64/_numpyconfig.h
index be57ac27b..be57ac27b 100644
--- a/meta/recipes-devtools/python/python-numpy/mips64/_numpyconfig.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips64/_numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/mips64/config.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips64/config.h
index c30b868f2..c30b868f2 100644
--- a/meta/recipes-devtools/python/python-numpy/mips64/config.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips64/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/mips64n32/_numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips64n32/_numpyconfig.h
index be57ac27b..be57ac27b 100644
--- a/meta/recipes-devtools/python/python-numpy/mips64n32/_numpyconfig.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips64n32/_numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/mips64n32/config.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips64n32/config.h
index c30b868f2..c30b868f2 100644
--- a/meta/recipes-devtools/python/python-numpy/mips64n32/config.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips64n32/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/mipsel/config.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/mipsel/config.h
index 17ef186d5..17ef186d5 100644
--- a/meta/recipes-devtools/python/python-numpy/mipsel/config.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/mipsel/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/mipsel/numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/mipsel/numpyconfig.h
index c4bf6547f..c4bf6547f 100644
--- a/meta/recipes-devtools/python/python-numpy/mipsel/numpyconfig.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/mipsel/numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/no-host-paths.patch b/yocto-poky/meta/recipes-devtools/python/python-numpy/no-host-paths.patch
index d74503680..d74503680 100644
--- a/meta/recipes-devtools/python/python-numpy/no-host-paths.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/no-host-paths.patch
diff --git a/meta/recipes-devtools/python/python-numpy/powerpc/_numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/powerpc/_numpyconfig.h
index 73cbfb1ba..73cbfb1ba 100644
--- a/meta/recipes-devtools/python/python-numpy/powerpc/_numpyconfig.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/powerpc/_numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/powerpc/config.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/powerpc/config.h
index f65d39d5d..f65d39d5d 100644
--- a/meta/recipes-devtools/python/python-numpy/powerpc/config.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/powerpc/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/powerpc64/_numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/powerpc64/_numpyconfig.h
index be57ac27b..be57ac27b 100644
--- a/meta/recipes-devtools/python/python-numpy/powerpc64/_numpyconfig.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/powerpc64/_numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/powerpc64/config.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/powerpc64/config.h
index c30b868f2..c30b868f2 100644
--- a/meta/recipes-devtools/python/python-numpy/powerpc64/config.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/powerpc64/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/x86-64/_numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/x86-64/_numpyconfig.h
index be57ac27b..be57ac27b 100644
--- a/meta/recipes-devtools/python/python-numpy/x86-64/_numpyconfig.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/x86-64/_numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy/x86-64/config.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/x86-64/config.h
index 0ce63b7d2..0ce63b7d2 100644
--- a/meta/recipes-devtools/python/python-numpy/x86-64/config.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/x86-64/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/x86/config.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/x86/config.h
index 08e41e3d9..08e41e3d9 100644
--- a/meta/recipes-devtools/python/python-numpy/x86/config.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/x86/config.h
diff --git a/meta/recipes-devtools/python/python-numpy/x86/numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/x86/numpyconfig.h
index ff7938cd9..ff7938cd9 100644
--- a/meta/recipes-devtools/python/python-numpy/x86/numpyconfig.h
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/x86/numpyconfig.h
diff --git a/meta/recipes-devtools/python/python-numpy_1.7.0.bb b/yocto-poky/meta/recipes-devtools/python/python-numpy_1.7.0.bb
index 81cdfde2b..81cdfde2b 100644
--- a/meta/recipes-devtools/python/python-numpy_1.7.0.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-numpy_1.7.0.bb
diff --git a/meta/recipes-devtools/python/python-pexpect_3.3.bb b/yocto-poky/meta/recipes-devtools/python/python-pexpect_3.3.bb
index cd80aeb2f..cd80aeb2f 100644
--- a/meta/recipes-devtools/python/python-pexpect_3.3.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-pexpect_3.3.bb
diff --git a/meta/recipes-devtools/python/python-pycairo_1.10.0.bb b/yocto-poky/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
index 70fe25c1a..70fe25c1a 100644
--- a/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
diff --git a/meta/recipes-devtools/python/python-pycurl/no-static-link.patch b/yocto-poky/meta/recipes-devtools/python/python-pycurl/no-static-link.patch
index c5349ee57..c5349ee57 100644
--- a/meta/recipes-devtools/python/python-pycurl/no-static-link.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-pycurl/no-static-link.patch
diff --git a/meta/recipes-devtools/python/python-pycurl_7.19.5.1.bb b/yocto-poky/meta/recipes-devtools/python/python-pycurl_7.19.5.1.bb
index 0d0effef6..0d0effef6 100644
--- a/meta/recipes-devtools/python/python-pycurl_7.19.5.1.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-pycurl_7.19.5.1.bb
diff --git a/meta/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch b/yocto-poky/meta/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch
index c2591123b..c2591123b 100644
--- a/meta/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch
diff --git a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb b/yocto-poky/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
index 81d37b49c..81d37b49c 100644
--- a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
diff --git a/meta/recipes-devtools/python/python-pygtk/acinclude.m4 b/yocto-poky/meta/recipes-devtools/python/python-pygtk/acinclude.m4
index 53518fb2e..53518fb2e 100644
--- a/meta/recipes-devtools/python/python-pygtk/acinclude.m4
+++ b/yocto-poky/meta/recipes-devtools/python/python-pygtk/acinclude.m4
diff --git a/meta/recipes-devtools/python/python-pygtk/add-gtk-types.defs-into-gdk.c-dependence.patch b/yocto-poky/meta/recipes-devtools/python/python-pygtk/add-gtk-types.defs-into-gdk.c-dependence.patch
index df0f9cd6c..df0f9cd6c 100644
--- a/meta/recipes-devtools/python/python-pygtk/add-gtk-types.defs-into-gdk.c-dependence.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-pygtk/add-gtk-types.defs-into-gdk.c-dependence.patch
diff --git a/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch b/yocto-poky/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch
index 16c0e8e77..16c0e8e77 100644
--- a/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch
diff --git a/meta/recipes-devtools/python/python-pygtk/fix-pygtk-2.0.pc.patch b/yocto-poky/meta/recipes-devtools/python/python-pygtk/fix-pygtk-2.0.pc.patch
index b6156540b..b6156540b 100644
--- a/meta/recipes-devtools/python/python-pygtk/fix-pygtk-2.0.pc.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-pygtk/fix-pygtk-2.0.pc.patch
diff --git a/meta/recipes-devtools/python/python-pygtk/nodocs.patch b/yocto-poky/meta/recipes-devtools/python/python-pygtk/nodocs.patch
index f07309a7b..f07309a7b 100644
--- a/meta/recipes-devtools/python/python-pygtk/nodocs.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-pygtk/nodocs.patch
diff --git a/meta/recipes-devtools/python/python-pygtk/prevent_to_get_display_during_import.patch b/yocto-poky/meta/recipes-devtools/python/python-pygtk/prevent_to_get_display_during_import.patch
index 833038e7f..833038e7f 100644
--- a/meta/recipes-devtools/python/python-pygtk/prevent_to_get_display_during_import.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-pygtk/prevent_to_get_display_during_import.patch
diff --git a/meta/recipes-devtools/python/python-pygtk/python-pygtk2/acinclude.m4 b/yocto-poky/meta/recipes-devtools/python/python-pygtk/python-pygtk2/acinclude.m4
index 53518fb2e..53518fb2e 100644
--- a/meta/recipes-devtools/python/python-pygtk/python-pygtk2/acinclude.m4
+++ b/yocto-poky/meta/recipes-devtools/python/python-pygtk/python-pygtk2/acinclude.m4
diff --git a/meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch b/yocto-poky/meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch
index 3ed954eee..3ed954eee 100644
--- a/meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch
diff --git a/meta/recipes-devtools/python/python-pygtk_2.24.0.bb b/yocto-poky/meta/recipes-devtools/python/python-pygtk_2.24.0.bb
index 79b3110e3..79b3110e3 100644
--- a/meta/recipes-devtools/python/python-pygtk_2.24.0.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-pygtk_2.24.0.bb
diff --git a/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb b/yocto-poky/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb
index e8ef1aa12..e8ef1aa12 100644
--- a/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb
diff --git a/meta/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch b/yocto-poky/meta/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch
index c58c3280e..c58c3280e 100644
--- a/meta/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch
diff --git a/meta/recipes-devtools/python/python-pyrex_0.9.9.bb b/yocto-poky/meta/recipes-devtools/python/python-pyrex_0.9.9.bb
index c4dd2e69b..c4dd2e69b 100644
--- a/meta/recipes-devtools/python/python-pyrex_0.9.9.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-pyrex_0.9.9.bb
diff --git a/meta/recipes-devtools/python/python-scons-native_2.3.6.bb b/yocto-poky/meta/recipes-devtools/python/python-scons-native_2.3.6.bb
index dae89ab5d..dae89ab5d 100644
--- a/meta/recipes-devtools/python/python-scons-native_2.3.6.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-scons-native_2.3.6.bb
diff --git a/meta/recipes-devtools/python/python-scons_2.3.6.bb b/yocto-poky/meta/recipes-devtools/python/python-scons_2.3.6.bb
index c4ad7d39b..c4ad7d39b 100644
--- a/meta/recipes-devtools/python/python-scons_2.3.6.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-scons_2.3.6.bb
diff --git a/meta/recipes-devtools/python/python-setuptools_18.2.bb b/yocto-poky/meta/recipes-devtools/python/python-setuptools_18.2.bb
index 1de2b2e92..1de2b2e92 100644
--- a/meta/recipes-devtools/python/python-setuptools_18.2.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-setuptools_18.2.bb
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-add-for-rpm-ignoresize-check.patch b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-add-for-rpm-ignoresize-check.patch
index 8a27f2583..8a27f2583 100644
--- a/meta/recipes-devtools/python/python-smartpm/smart-add-for-rpm-ignoresize-check.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-add-for-rpm-ignoresize-check.patch
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-already-installed-message.patch b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-already-installed-message.patch
index 9055555cd..9055555cd 100644
--- a/meta/recipes-devtools/python/python-smartpm/smart-already-installed-message.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-already-installed-message.patch
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-attempt-fix.patch b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-attempt-fix.patch
index 6e672b332..6e672b332 100644
--- a/meta/recipes-devtools/python/python-smartpm/smart-attempt-fix.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-attempt-fix.patch
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch
index ec98e03c0..ec98e03c0 100644
--- a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-cache.py-getPackages-matches-name-version.patch b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-cache.py-getPackages-matches-name-version.patch
index 225b02f96..225b02f96 100644
--- a/meta/recipes-devtools/python/python-smartpm/smart-cache.py-getPackages-matches-name-version.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-cache.py-getPackages-matches-name-version.patch
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-channelsdir.patch b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-channelsdir.patch
index e621b3387..e621b3387 100644
--- a/meta/recipes-devtools/python/python-smartpm/smart-channelsdir.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-channelsdir.patch
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-improve-error-reporting.patch b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-improve-error-reporting.patch
index b82265b3f..b82265b3f 100644
--- a/meta/recipes-devtools/python/python-smartpm/smart-improve-error-reporting.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-improve-error-reporting.patch
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-recommends.patch b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-recommends.patch
index d607fc475..d607fc475 100644
--- a/meta/recipes-devtools/python/python-smartpm/smart-recommends.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-recommends.patch
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-rpm4-fixes.patch b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-rpm4-fixes.patch
index 708ffe67d..708ffe67d 100644
--- a/meta/recipes-devtools/python/python-smartpm/smart-rpm4-fixes.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-rpm4-fixes.patch
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-set-noprogress-for-pycurl.patch b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-set-noprogress-for-pycurl.patch
index 2885998ac..2885998ac 100644
--- a/meta/recipes-devtools/python/python-smartpm/smart-set-noprogress-for-pycurl.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smart-set-noprogress-for-pycurl.patch
diff --git a/meta/recipes-devtools/python/python-smartpm/smartpm-rpm5-nodig.patch b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smartpm-rpm5-nodig.patch
index fefb29a66..fefb29a66 100644
--- a/meta/recipes-devtools/python/python-smartpm/smartpm-rpm5-nodig.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python-smartpm/smartpm-rpm5-nodig.patch
diff --git a/meta/recipes-devtools/python/python-smartpm_git.bb b/yocto-poky/meta/recipes-devtools/python/python-smartpm_git.bb
index d6c378bcf..d6c378bcf 100644
--- a/meta/recipes-devtools/python/python-smartpm_git.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-smartpm_git.bb
diff --git a/meta/recipes-devtools/python/python-smmap_0.9.0.bb b/yocto-poky/meta/recipes-devtools/python/python-smmap_0.9.0.bb
index b658be84c..b658be84c 100644
--- a/meta/recipes-devtools/python/python-smmap_0.9.0.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python-smmap_0.9.0.bb
diff --git a/meta/recipes-devtools/python/python.inc b/yocto-poky/meta/recipes-devtools/python/python.inc
index 4d428f3d0..4d428f3d0 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/yocto-poky/meta/recipes-devtools/python/python.inc
diff --git a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch b/yocto-poky/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
index 1257ca655..1257ca655 100644
--- a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
diff --git a/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch b/yocto-poky/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch
index 650ceb595..650ceb595 100644
--- a/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch
diff --git a/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch b/yocto-poky/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch
index 5cc874246..5cc874246 100644
--- a/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch
diff --git a/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch b/yocto-poky/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch
index e452cb6ac..e452cb6ac 100644
--- a/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch
diff --git a/meta/recipes-devtools/python/python/add-md5module-support.patch b/yocto-poky/meta/recipes-devtools/python/python/add-md5module-support.patch
index 33fea7755..33fea7755 100644
--- a/meta/recipes-devtools/python/python/add-md5module-support.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/add-md5module-support.patch
diff --git a/meta/recipes-devtools/python/python/avoid_parallel_make_races_on_pgen.patch b/yocto-poky/meta/recipes-devtools/python/python/avoid_parallel_make_races_on_pgen.patch
index e9bae324f..e9bae324f 100644
--- a/meta/recipes-devtools/python/python/avoid_parallel_make_races_on_pgen.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/avoid_parallel_make_races_on_pgen.patch
diff --git a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch b/yocto-poky/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch
index 208c57c82..208c57c82 100644
--- a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch
diff --git a/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch b/yocto-poky/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch
index 337e0e3e2..337e0e3e2 100644
--- a/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch
diff --git a/meta/recipes-devtools/python/python/builddir.patch b/yocto-poky/meta/recipes-devtools/python/python/builddir.patch
index ad629a022..ad629a022 100644
--- a/meta/recipes-devtools/python/python/builddir.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/builddir.patch
diff --git a/meta/recipes-devtools/python/python/cgi_py.patch b/yocto-poky/meta/recipes-devtools/python/python/cgi_py.patch
index de504f9dc..de504f9dc 100644
--- a/meta/recipes-devtools/python/python/cgi_py.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/cgi_py.patch
diff --git a/meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch b/yocto-poky/meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch
index 2b62db382..2b62db382 100644
--- a/meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch
diff --git a/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch b/yocto-poky/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch
index 669112dab..669112dab 100644
--- a/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch
diff --git a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch b/yocto-poky/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch
index e4262d9ef..e4262d9ef 100644
--- a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch
diff --git a/meta/recipes-devtools/python/python/host_include_contamination.patch b/yocto-poky/meta/recipes-devtools/python/python/host_include_contamination.patch
index e0aafb218..e0aafb218 100644
--- a/meta/recipes-devtools/python/python/host_include_contamination.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/host_include_contamination.patch
diff --git a/meta/recipes-devtools/python/python/multilib.patch b/yocto-poky/meta/recipes-devtools/python/python/multilib.patch
index 0bfa0d2cf..0bfa0d2cf 100644
--- a/meta/recipes-devtools/python/python/multilib.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/multilib.patch
diff --git a/meta/recipes-devtools/python/python/parallel-makeinst-create-bindir.patch b/yocto-poky/meta/recipes-devtools/python/python/parallel-makeinst-create-bindir.patch
index 951cb466f..951cb466f 100644
--- a/meta/recipes-devtools/python/python/parallel-makeinst-create-bindir.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/parallel-makeinst-create-bindir.patch
diff --git a/meta/recipes-devtools/python/python/python-2.7.3-remove-bsdb-rpath.patch b/yocto-poky/meta/recipes-devtools/python/python/python-2.7.3-remove-bsdb-rpath.patch
index 216be0a44..216be0a44 100644
--- a/meta/recipes-devtools/python/python/python-2.7.3-remove-bsdb-rpath.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/python-2.7.3-remove-bsdb-rpath.patch
diff --git a/meta/recipes-devtools/python/python/run-ptest b/yocto-poky/meta/recipes-devtools/python/python/run-ptest
index a2f9eed44..a2f9eed44 100644
--- a/meta/recipes-devtools/python/python/run-ptest
+++ b/yocto-poky/meta/recipes-devtools/python/python/run-ptest
diff --git a/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch b/yocto-poky/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch
index dacb552ec..dacb552ec 100644
--- a/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch
diff --git a/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch b/yocto-poky/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
index 6ccdb948b..6ccdb948b 100644
--- a/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
diff --git a/meta/recipes-devtools/python/python/setuptweaks.patch b/yocto-poky/meta/recipes-devtools/python/python/setuptweaks.patch
index 3a91b1916..3a91b1916 100644
--- a/meta/recipes-devtools/python/python/setuptweaks.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/setuptweaks.patch
diff --git a/meta/recipes-devtools/python/python/sitecustomize.py b/yocto-poky/meta/recipes-devtools/python/python/sitecustomize.py
index 273901898..273901898 100644
--- a/meta/recipes-devtools/python/python/sitecustomize.py
+++ b/yocto-poky/meta/recipes-devtools/python/python/sitecustomize.py
diff --git a/meta/recipes-devtools/python/python/use_sysroot_ncurses_instead_of_host.patch b/yocto-poky/meta/recipes-devtools/python/python/use_sysroot_ncurses_instead_of_host.patch
index 2c657861c..2c657861c 100644
--- a/meta/recipes-devtools/python/python/use_sysroot_ncurses_instead_of_host.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python/use_sysroot_ncurses_instead_of_host.patch
diff --git a/meta/recipes-devtools/python/python3-native_3.4.3.bb b/yocto-poky/meta/recipes-devtools/python/python3-native_3.4.3.bb
index 464ff0580..464ff0580 100644
--- a/meta/recipes-devtools/python/python3-native_3.4.3.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python3-native_3.4.3.bb
diff --git a/meta/recipes-devtools/python/python3-pip_6.1.1.bb b/yocto-poky/meta/recipes-devtools/python/python3-pip_6.1.1.bb
index 7bfc30e2a..7bfc30e2a 100644
--- a/meta/recipes-devtools/python/python3-pip_6.1.1.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python3-pip_6.1.1.bb
diff --git a/meta/recipes-devtools/python/python3-setuptools_18.2.bb b/yocto-poky/meta/recipes-devtools/python/python3-setuptools_18.2.bb
index dc0ac80d7..dc0ac80d7 100644
--- a/meta/recipes-devtools/python/python3-setuptools_18.2.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python3-setuptools_18.2.bb
diff --git a/meta/recipes-devtools/python/python3/000-cross-compile.patch b/yocto-poky/meta/recipes-devtools/python/python3/000-cross-compile.patch
index 2506a590c..2506a590c 100644
--- a/meta/recipes-devtools/python/python3/000-cross-compile.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/000-cross-compile.patch
diff --git a/meta/recipes-devtools/python/python3/0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch b/yocto-poky/meta/recipes-devtools/python/python3/0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch
index dd6b24fe9..dd6b24fe9 100644
--- a/meta/recipes-devtools/python/python3/0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch
diff --git a/meta/recipes-devtools/python/python3/020-dont-compile-python-files.patch b/yocto-poky/meta/recipes-devtools/python/python3/020-dont-compile-python-files.patch
index 03ef28694..03ef28694 100644
--- a/meta/recipes-devtools/python/python3/020-dont-compile-python-files.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/020-dont-compile-python-files.patch
diff --git a/meta/recipes-devtools/python/python3/03-fix-tkinter-detection.patch b/yocto-poky/meta/recipes-devtools/python/python3/03-fix-tkinter-detection.patch
index fddfd2b2f..fddfd2b2f 100644
--- a/meta/recipes-devtools/python/python3/03-fix-tkinter-detection.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/03-fix-tkinter-detection.patch
diff --git a/meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch b/yocto-poky/meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch
index 6beac7b80..6beac7b80 100644
--- a/meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch
diff --git a/meta/recipes-devtools/python/python3/04-default-is-optimized.patch b/yocto-poky/meta/recipes-devtools/python/python3/04-default-is-optimized.patch
index 3b8f264a5..3b8f264a5 100644
--- a/meta/recipes-devtools/python/python3/04-default-is-optimized.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/04-default-is-optimized.patch
diff --git a/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch b/yocto-poky/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch
index 789929b71..789929b71 100644
--- a/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch
diff --git a/meta/recipes-devtools/python/python3/080-distutils-dont_adjust_files.patch b/yocto-poky/meta/recipes-devtools/python/python3/080-distutils-dont_adjust_files.patch
index b96419a63..b96419a63 100644
--- a/meta/recipes-devtools/python/python3/080-distutils-dont_adjust_files.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/080-distutils-dont_adjust_files.patch
diff --git a/meta/recipes-devtools/python/python3/110-enable-zlib.patch b/yocto-poky/meta/recipes-devtools/python/python3/110-enable-zlib.patch
index fb92a1916..fb92a1916 100644
--- a/meta/recipes-devtools/python/python3/110-enable-zlib.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/110-enable-zlib.patch
diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/yocto-poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
index bf02df202..bf02df202 100644
--- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
diff --git a/meta/recipes-devtools/python/python3/130-readline-setup.patch b/yocto-poky/meta/recipes-devtools/python/python3/130-readline-setup.patch
index c805652d6..c805652d6 100644
--- a/meta/recipes-devtools/python/python3/130-readline-setup.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/130-readline-setup.patch
diff --git a/meta/recipes-devtools/python/python3/150-fix-setupterm.patch b/yocto-poky/meta/recipes-devtools/python/python3/150-fix-setupterm.patch
index 78d7c7867..78d7c7867 100644
--- a/meta/recipes-devtools/python/python3/150-fix-setupterm.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/150-fix-setupterm.patch
diff --git a/meta/recipes-devtools/python/python3/avoid-ncursesw-include-path.patch b/yocto-poky/meta/recipes-devtools/python/python3/avoid-ncursesw-include-path.patch
index f29ae5337..f29ae5337 100644
--- a/meta/recipes-devtools/python/python3/avoid-ncursesw-include-path.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/avoid-ncursesw-include-path.patch
diff --git a/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch b/yocto-poky/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch
index 208c57c82..208c57c82 100644
--- a/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch
diff --git a/meta/recipes-devtools/python/python3/cgi_py.patch b/yocto-poky/meta/recipes-devtools/python/python3/cgi_py.patch
index de504f9dc..de504f9dc 100644
--- a/meta/recipes-devtools/python/python3/cgi_py.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/cgi_py.patch
diff --git a/meta/recipes-devtools/python/python3/fix_for_using_different_libdir.patch b/yocto-poky/meta/recipes-devtools/python/python3/fix_for_using_different_libdir.patch
index cd1a978eb..cd1a978eb 100644
--- a/meta/recipes-devtools/python/python3/fix_for_using_different_libdir.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/fix_for_using_different_libdir.patch
diff --git a/meta/recipes-devtools/python/python3/host_include_contamination.patch b/yocto-poky/meta/recipes-devtools/python/python3/host_include_contamination.patch
index ef2054d9a..ef2054d9a 100644
--- a/meta/recipes-devtools/python/python3/host_include_contamination.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/host_include_contamination.patch
diff --git a/meta/recipes-devtools/python/python3/makerace.patch b/yocto-poky/meta/recipes-devtools/python/python3/makerace.patch
index d8a68923a..d8a68923a 100644
--- a/meta/recipes-devtools/python/python3/makerace.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/makerace.patch
diff --git a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch b/yocto-poky/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
index b3e986089..b3e986089 100644
--- a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
diff --git a/meta/recipes-devtools/python/python3/python-config.patch b/yocto-poky/meta/recipes-devtools/python/python3/python-config.patch
index f23b8b7df..f23b8b7df 100644
--- a/meta/recipes-devtools/python/python3/python-config.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/python-config.patch
diff --git a/meta/recipes-devtools/python/python3/python3-setup.py-no-host-headers-libs.patch b/yocto-poky/meta/recipes-devtools/python/python3/python3-setup.py-no-host-headers-libs.patch
index 2bc8b8c46..2bc8b8c46 100644
--- a/meta/recipes-devtools/python/python3/python3-setup.py-no-host-headers-libs.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/python3-setup.py-no-host-headers-libs.patch
diff --git a/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch b/yocto-poky/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
index 74490d93a..74490d93a 100644
--- a/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
diff --git a/meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch b/yocto-poky/meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch
index fc2e12dfe..fc2e12dfe 100644
--- a/meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch
diff --git a/meta/recipes-devtools/python/python3/setup.py-find-libraries-in-staging-dirs.patch b/yocto-poky/meta/recipes-devtools/python/python3/setup.py-find-libraries-in-staging-dirs.patch
index f26bd38b0..f26bd38b0 100644
--- a/meta/recipes-devtools/python/python3/setup.py-find-libraries-in-staging-dirs.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/setup.py-find-libraries-in-staging-dirs.patch
diff --git a/meta/recipes-devtools/python/python3/setuptweaks.patch b/yocto-poky/meta/recipes-devtools/python/python3/setuptweaks.patch
index 3a91b1916..3a91b1916 100644
--- a/meta/recipes-devtools/python/python3/setuptweaks.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/setuptweaks.patch
diff --git a/meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch b/yocto-poky/meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch
index 802b1c720..802b1c720 100644
--- a/meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch
diff --git a/meta/recipes-devtools/python/python3/sitecustomize.py b/yocto-poky/meta/recipes-devtools/python/python3/sitecustomize.py
index 4c8b5e2ba..4c8b5e2ba 100644
--- a/meta/recipes-devtools/python/python3/sitecustomize.py
+++ b/yocto-poky/meta/recipes-devtools/python/python3/sitecustomize.py
diff --git a/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch b/yocto-poky/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch
index de07643f2..de07643f2 100644
--- a/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch
diff --git a/meta/recipes-devtools/python/python3/sysroot-include-headers.patch b/yocto-poky/meta/recipes-devtools/python/python3/sysroot-include-headers.patch
index 785b5567f..785b5567f 100644
--- a/meta/recipes-devtools/python/python3/sysroot-include-headers.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/sysroot-include-headers.patch
diff --git a/meta/recipes-devtools/python/python3/unixccompiler.patch b/yocto-poky/meta/recipes-devtools/python/python3/unixccompiler.patch
index 7b90f1388..7b90f1388 100644
--- a/meta/recipes-devtools/python/python3/unixccompiler.patch
+++ b/yocto-poky/meta/recipes-devtools/python/python3/unixccompiler.patch
diff --git a/meta/recipes-devtools/python/python3_3.4.3.bb b/yocto-poky/meta/recipes-devtools/python/python3_3.4.3.bb
index f61d278d7..f61d278d7 100644
--- a/meta/recipes-devtools/python/python3_3.4.3.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python3_3.4.3.bb
diff --git a/meta/recipes-devtools/python/python_2.7.9.bb b/yocto-poky/meta/recipes-devtools/python/python_2.7.9.bb
index f7e2f272f..f7e2f272f 100644
--- a/meta/recipes-devtools/python/python_2.7.9.bb
+++ b/yocto-poky/meta/recipes-devtools/python/python_2.7.9.bb
diff --git a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb b/yocto-poky/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
index 51d1c5969..51d1c5969 100644
--- a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
+++ b/yocto-poky/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
diff --git a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb b/yocto-poky/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb
index 8d27c4db6..8d27c4db6 100644
--- a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb
diff --git a/meta/recipes-devtools/qemu/qemu-helper/raw2flash.c b/yocto-poky/meta/recipes-devtools/qemu/qemu-helper/raw2flash.c
index 19faf629b..19faf629b 100644
--- a/meta/recipes-devtools/qemu/qemu-helper/raw2flash.c
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu-helper/raw2flash.c
diff --git a/meta/recipes-devtools/qemu/qemu-helper/tunctl.c b/yocto-poky/meta/recipes-devtools/qemu/qemu-helper/tunctl.c
index 16e24a2ad..16e24a2ad 100644
--- a/meta/recipes-devtools/qemu/qemu-helper/tunctl.c
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu-helper/tunctl.c
diff --git a/meta/recipes-devtools/qemu/qemu-targets.inc b/yocto-poky/meta/recipes-devtools/qemu/qemu-targets.inc
index 5c3565544..5c3565544 100644
--- a/meta/recipes-devtools/qemu/qemu-targets.inc
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu-targets.inc
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/yocto-poky/meta/recipes-devtools/qemu/qemu.inc
index abbace870..b17da2f23 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu.inc
@@ -40,6 +40,12 @@ do_configure_prepend_class-native() {
 	BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "")
 	if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then
 		export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH
+		# link with system dbus on Ubuntu 15.10
+		# FIXME: remove below 4 lines when oe dbus is upgraded
+		if [ -r /etc/lsb-release -a "$(lsb_release -is)$(lsb_release -rs)" = "Ubuntu15.10" ] ; then
+			libs=$(PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_PATH=$BHOST_PKGCONFIG_PATH PATH=/usr/bin:/bin pkg-config --libs dbus-1 || echo "")
+			[ -n "$libs" ] && export LDFLAGS="$libs $LDFLAGS"
+		fi
 	fi
 }
 
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2015-7295_1.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2015-7295_1.patch
index d7ae8713c..d7ae8713c 100644
--- a/meta/recipes-devtools/qemu/qemu/CVE-2015-7295_1.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2015-7295_1.patch
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2015-7295_2.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2015-7295_2.patch
index 45dfab36e..45dfab36e 100644
--- a/meta/recipes-devtools/qemu/qemu/CVE-2015-7295_2.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2015-7295_2.patch
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2015-7295_3.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2015-7295_3.patch
index 74442e32f..74442e32f 100644
--- a/meta/recipes-devtools/qemu/qemu/CVE-2015-7295_3.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2015-7295_3.patch
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2015-7504.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2015-7504.patch
index 90a7947ab..90a7947ab 100644
--- a/meta/recipes-devtools/qemu/qemu/CVE-2015-7504.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2015-7504.patch
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2015-7512.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2015-7512.patch
index 50b8a6cee..50b8a6cee 100644
--- a/meta/recipes-devtools/qemu/qemu/CVE-2015-7512.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2015-7512.patch
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2015-8345.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2015-8345.patch
index 310b458a0..310b458a0 100644
--- a/meta/recipes-devtools/qemu/qemu/CVE-2015-8345.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2015-8345.patch
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2015-8504.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2015-8504.patch
index 9e660217f..9e660217f 100644
--- a/meta/recipes-devtools/qemu/qemu/CVE-2015-8504.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2015-8504.patch
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2016-1568.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2016-1568.patch
index 9c40ffb5f..9c40ffb5f 100644
--- a/meta/recipes-devtools/qemu/qemu/CVE-2016-1568.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2016-1568.patch
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2016-2197.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2016-2197.patch
index 946435c43..946435c43 100644
--- a/meta/recipes-devtools/qemu/qemu/CVE-2016-2197.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2016-2197.patch
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2016-2198.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2016-2198.patch
index f1201f061..f1201f061 100644
--- a/meta/recipes-devtools/qemu/qemu/CVE-2016-2198.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/CVE-2016-2198.patch
diff --git a/meta/recipes-devtools/qemu/qemu/Qemu-Arm-versatilepb-Add-memory-size-checking.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/Qemu-Arm-versatilepb-Add-memory-size-checking.patch
index 1a6cf5119..1a6cf5119 100644
--- a/meta/recipes-devtools/qemu/qemu/Qemu-Arm-versatilepb-Add-memory-size-checking.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/Qemu-Arm-versatilepb-Add-memory-size-checking.patch
diff --git a/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch
index a99f72098..a99f72098 100644
--- a/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch
diff --git a/meta/recipes-devtools/qemu/qemu/configure-fix-Darwin-target-detection.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/configure-fix-Darwin-target-detection.patch
index 59cdc1c30..59cdc1c30 100644
--- a/meta/recipes-devtools/qemu/qemu/configure-fix-Darwin-target-detection.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/configure-fix-Darwin-target-detection.patch
diff --git a/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_cpu_kick_thread_debugging.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_cpu_kick_thread_debugging.patch
index 682213254..682213254 100644
--- a/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_cpu_kick_thread_debugging.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_cpu_kick_thread_debugging.patch
diff --git a/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_mutex_lock_iothread-fix-race-condition-a.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_mutex_lock_iothread-fix-race-condition-a.patch
index 45dffabc3..45dffabc3 100644
--- a/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_mutex_lock_iothread-fix-race-condition-a.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_mutex_lock_iothread-fix-race-condition-a.patch
diff --git a/meta/recipes-devtools/qemu/qemu/disable-grabs.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/disable-grabs.patch
index 41726b1c8..41726b1c8 100644
--- a/meta/recipes-devtools/qemu/qemu/disable-grabs.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/disable-grabs.patch
diff --git a/meta/recipes-devtools/qemu/qemu/exclude-some-arm-EABI-obsolete-syscalls.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/exclude-some-arm-EABI-obsolete-syscalls.patch
index 171bda7e9..171bda7e9 100644
--- a/meta/recipes-devtools/qemu/qemu/exclude-some-arm-EABI-obsolete-syscalls.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/exclude-some-arm-EABI-obsolete-syscalls.patch
diff --git a/meta/recipes-devtools/qemu/qemu/fix-libcap-header-issue-on-some-distro.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/fix-libcap-header-issue-on-some-distro.patch
index 13a6ea23b..13a6ea23b 100644
--- a/meta/recipes-devtools/qemu/qemu/fix-libcap-header-issue-on-some-distro.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/fix-libcap-header-issue-on-some-distro.patch
diff --git a/meta/recipes-devtools/qemu/qemu/no-valgrind.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/no-valgrind.patch
index 91f728042..91f728042 100644
--- a/meta/recipes-devtools/qemu/qemu/no-valgrind.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/no-valgrind.patch
diff --git a/meta/recipes-devtools/qemu/qemu/powerpc_rom.bin b/yocto-poky/meta/recipes-devtools/qemu/qemu/powerpc_rom.bin
index c4044296c..c4044296c 100644
--- a/meta/recipes-devtools/qemu/qemu/powerpc_rom.bin
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/powerpc_rom.bin
diff --git a/meta/recipes-devtools/qemu/qemu/qemu-enlarge-env-entry-size.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/qemu-enlarge-env-entry-size.patch
index c7425ab8d..c7425ab8d 100644
--- a/meta/recipes-devtools/qemu/qemu/qemu-enlarge-env-entry-size.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/qemu-enlarge-env-entry-size.patch
diff --git a/meta/recipes-devtools/qemu/qemu/run-ptest b/yocto-poky/meta/recipes-devtools/qemu/qemu/run-ptest
index f4b8e97e1..f4b8e97e1 100644
--- a/meta/recipes-devtools/qemu/qemu/run-ptest
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/run-ptest
diff --git a/meta/recipes-devtools/qemu/qemu/smc91c111_fix.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/smc91c111_fix.patch
index e37e77734..e37e77734 100644
--- a/meta/recipes-devtools/qemu/qemu/smc91c111_fix.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/smc91c111_fix.patch
diff --git a/meta/recipes-devtools/qemu/qemu/smc91c111_fix1.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/smc91c111_fix1.patch
index bd1223a44..bd1223a44 100644
--- a/meta/recipes-devtools/qemu/qemu/smc91c111_fix1.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/smc91c111_fix1.patch
diff --git a/meta/recipes-devtools/qemu/qemu/smc91c111_fix2.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/smc91c111_fix2.patch
index 018aed5f8..018aed5f8 100644
--- a/meta/recipes-devtools/qemu/qemu/smc91c111_fix2.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/smc91c111_fix2.patch
diff --git a/meta/recipes-devtools/qemu/qemu/smc91c111_fix3.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/smc91c111_fix3.patch
index 9e865f7f0..9e865f7f0 100644
--- a/meta/recipes-devtools/qemu/qemu/smc91c111_fix3.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/smc91c111_fix3.patch
diff --git a/meta/recipes-devtools/qemu/qemu/wacom.patch b/yocto-poky/meta/recipes-devtools/qemu/qemu/wacom.patch
index cd06aa4ac..cd06aa4ac 100644
--- a/meta/recipes-devtools/qemu/qemu/wacom.patch
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu/wacom.patch
diff --git a/meta/recipes-devtools/qemu/qemu_2.4.0.bb b/yocto-poky/meta/recipes-devtools/qemu/qemu_2.4.0.bb
index 8d47b16e6..8d47b16e6 100644
--- a/meta/recipes-devtools/qemu/qemu_2.4.0.bb
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemu_2.4.0.bb
diff --git a/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb b/yocto-poky/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb
index 7f4c6d934..7f4c6d934 100644
--- a/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb
+++ b/yocto-poky/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb
diff --git a/meta/recipes-devtools/quilt/quilt-native.inc b/yocto-poky/meta/recipes-devtools/quilt/quilt-native.inc
index 5c4b0a217..5c4b0a217 100644
--- a/meta/recipes-devtools/quilt/quilt-native.inc
+++ b/yocto-poky/meta/recipes-devtools/quilt/quilt-native.inc
diff --git a/meta/recipes-devtools/quilt/quilt-native_0.64.bb b/yocto-poky/meta/recipes-devtools/quilt/quilt-native_0.64.bb
index 6bc7dcdb7..6bc7dcdb7 100644
--- a/meta/recipes-devtools/quilt/quilt-native_0.64.bb
+++ b/yocto-poky/meta/recipes-devtools/quilt/quilt-native_0.64.bb
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/yocto-poky/meta/recipes-devtools/quilt/quilt.inc
index 837b36ba8..837b36ba8 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/yocto-poky/meta/recipes-devtools/quilt/quilt.inc
diff --git a/meta/recipes-devtools/quilt/quilt/Makefile b/yocto-poky/meta/recipes-devtools/quilt/quilt/Makefile
index 7b3ac8a49..7b3ac8a49 100644
--- a/meta/recipes-devtools/quilt/quilt/Makefile
+++ b/yocto-poky/meta/recipes-devtools/quilt/quilt/Makefile
diff --git a/meta/recipes-devtools/quilt/quilt/aclocal.patch b/yocto-poky/meta/recipes-devtools/quilt/quilt/aclocal.patch
index daf44295e..daf44295e 100644
--- a/meta/recipes-devtools/quilt/quilt/aclocal.patch
+++ b/yocto-poky/meta/recipes-devtools/quilt/quilt/aclocal.patch
diff --git a/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch b/yocto-poky/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
index 672155bb6..672155bb6 100644
--- a/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
+++ b/yocto-poky/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
diff --git a/meta/recipes-devtools/quilt/quilt/install.patch b/yocto-poky/meta/recipes-devtools/quilt/quilt/install.patch
index e2a7af655..e2a7af655 100644
--- a/meta/recipes-devtools/quilt/quilt/install.patch
+++ b/yocto-poky/meta/recipes-devtools/quilt/quilt/install.patch
diff --git a/meta/recipes-devtools/quilt/quilt/run-ptest b/yocto-poky/meta/recipes-devtools/quilt/quilt/run-ptest
index 958a9df5b..958a9df5b 100755
--- a/meta/recipes-devtools/quilt/quilt/run-ptest
+++ b/yocto-poky/meta/recipes-devtools/quilt/quilt/run-ptest
diff --git a/meta/recipes-devtools/quilt/quilt_0.64.bb b/yocto-poky/meta/recipes-devtools/quilt/quilt_0.64.bb
index 00f900a11..00f900a11 100644
--- a/meta/recipes-devtools/quilt/quilt_0.64.bb
+++ b/yocto-poky/meta/recipes-devtools/quilt/quilt_0.64.bb
diff --git a/meta/recipes-devtools/remake/remake.inc b/yocto-poky/meta/recipes-devtools/remake/remake.inc
index df889fcf9..df889fcf9 100644
--- a/meta/recipes-devtools/remake/remake.inc
+++ b/yocto-poky/meta/recipes-devtools/remake/remake.inc
diff --git a/meta/recipes-devtools/remake/remake/version-remake.texi.patch b/yocto-poky/meta/recipes-devtools/remake/remake/version-remake.texi.patch
index fa6329e06..fa6329e06 100644
--- a/meta/recipes-devtools/remake/remake/version-remake.texi.patch
+++ b/yocto-poky/meta/recipes-devtools/remake/remake/version-remake.texi.patch
diff --git a/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb b/yocto-poky/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb
index c61913d05..c61913d05 100644
--- a/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb
+++ b/yocto-poky/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb
diff --git a/meta/recipes-devtools/rpm/rpm-4.11.2/add_RPMSENSE_MISSINGOK_to_rpmmodule.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/add_RPMSENSE_MISSINGOK_to_rpmmodule.patch
index b87787041..b87787041 100644
--- a/meta/recipes-devtools/rpm/rpm-4.11.2/add_RPMSENSE_MISSINGOK_to_rpmmodule.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/add_RPMSENSE_MISSINGOK_to_rpmmodule.patch
diff --git a/meta/recipes-devtools/rpm/rpm-4.11.2/disable_shortcircuited.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/disable_shortcircuited.patch
index 7a646de37..7a646de37 100644
--- a/meta/recipes-devtools/rpm/rpm-4.11.2/disable_shortcircuited.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/disable_shortcircuited.patch
diff --git a/meta/recipes-devtools/rpm/rpm-4.11.2/fix_libdir.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/fix_libdir.patch
index be0626c8b..be0626c8b 100644
--- a/meta/recipes-devtools/rpm/rpm-4.11.2/fix_libdir.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/fix_libdir.patch
diff --git a/meta/recipes-devtools/rpm/rpm-4.11.2/pythondeps.sh b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/pythondeps.sh
index 083b174f1..083b174f1 100755
--- a/meta/recipes-devtools/rpm/rpm-4.11.2/pythondeps.sh
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/pythondeps.sh
diff --git a/meta/recipes-devtools/rpm/rpm-4.11.2/remove-db3-from-configure.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/remove-db3-from-configure.patch
index 2640e54b5..2640e54b5 100644
--- a/meta/recipes-devtools/rpm/rpm-4.11.2/remove-db3-from-configure.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/remove-db3-from-configure.patch
diff --git a/meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch
index f1ecab7b0..f1ecab7b0 100644
--- a/meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch
diff --git a/meta/recipes-devtools/rpm/rpm-4.11.2/rpm-scriptetexechelp.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/rpm-scriptetexechelp.patch
index 9333dea44..9333dea44 100644
--- a/meta/recipes-devtools/rpm/rpm-4.11.2/rpm-scriptetexechelp.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/rpm-scriptetexechelp.patch
diff --git a/meta/recipes-devtools/rpm/rpm-4.11.2/support-suggests-tag.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/support-suggests-tag.patch
index 3da608573..3da608573 100644
--- a/meta/recipes-devtools/rpm/rpm-4.11.2/support-suggests-tag.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/support-suggests-tag.patch
diff --git a/meta/recipes-devtools/rpm/rpm-4.11.2/use-pkgconfig-for-python.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/use-pkgconfig-for-python.patch
index 8d84cf8a1..8d84cf8a1 100644
--- a/meta/recipes-devtools/rpm/rpm-4.11.2/use-pkgconfig-for-python.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/use-pkgconfig-for-python.patch
diff --git a/meta/recipes-devtools/rpm/rpm/0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch
index 23bc3361d..23bc3361d 100644
--- a/meta/recipes-devtools/rpm/rpm/0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch
diff --git a/meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch
index 7894a4263..7894a4263 100644
--- a/meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch
diff --git a/meta/recipes-devtools/rpm/rpm/dbconvert.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/dbconvert.patch
index 1fdbf0908..1fdbf0908 100644
--- a/meta/recipes-devtools/rpm/rpm/dbconvert.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/dbconvert.patch
diff --git a/meta/recipes-devtools/rpm/rpm/debugedit-segv.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/debugedit-segv.patch
index beef5edd9..beef5edd9 100644
--- a/meta/recipes-devtools/rpm/rpm/debugedit-segv.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/debugedit-segv.patch
diff --git a/meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch
index f7c31006b..f7c31006b 100644
--- a/meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch
diff --git a/meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
index 976af486f..976af486f 100644
--- a/meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
diff --git a/meta/recipes-devtools/rpm/rpm/header-include-fix.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/header-include-fix.patch
index 5ffb187ff..5ffb187ff 100644
--- a/meta/recipes-devtools/rpm/rpm/header-include-fix.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/header-include-fix.patch
diff --git a/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch
index 8fab9eb42..8fab9eb42 100644
--- a/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch
diff --git a/meta/recipes-devtools/rpm/rpm/no-ldflags-in-pkgconfig.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/no-ldflags-in-pkgconfig.patch
index 410623fab..410623fab 100644
--- a/meta/recipes-devtools/rpm/rpm/no-ldflags-in-pkgconfig.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/no-ldflags-in-pkgconfig.patch
diff --git a/meta/recipes-devtools/rpm/rpm/perfile_rpmdeps.sh b/yocto-poky/meta/recipes-devtools/rpm/rpm/perfile_rpmdeps.sh
index b72c9f026..b72c9f026 100755
--- a/meta/recipes-devtools/rpm/rpm/perfile_rpmdeps.sh
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/perfile_rpmdeps.sh
diff --git a/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch
index a538a60bb..a538a60bb 100644
--- a/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch
diff --git a/meta/recipes-devtools/rpm/rpm/pythondeps.sh b/yocto-poky/meta/recipes-devtools/rpm/rpm/pythondeps.sh
index 083b174f1..083b174f1 100755
--- a/meta/recipes-devtools/rpm/rpm/pythondeps.sh
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/pythondeps.sh
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-CVE-2013-6435.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-CVE-2013-6435.patch
index b107e8f04..b107e8f04 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-CVE-2013-6435.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-CVE-2013-6435.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-CVE-2014-8118.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-CVE-2014-8118.patch
index bf1795ca4..bf1795ca4 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-CVE-2014-8118.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-CVE-2014-8118.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch
index 8771235d3..8771235d3 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch
index 41ab498a0..41ab498a0 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-check-rootpath-reasonableness.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-check-rootpath-reasonableness.patch
index 3d8d645a7..3d8d645a7 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-check-rootpath-reasonableness.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-check-rootpath-reasonableness.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch
index c86937653..c86937653 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch
index 77020a34d..77020a34d 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch
index 16b8e30a1..16b8e30a1 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-debug-platform.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-debug-platform.patch
index 2eb6e0f26..2eb6e0f26 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-debug-platform.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-debug-platform.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch
index 8b5f8d66c..8b5f8d66c 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch
index b1db6fff7..b1db6fff7 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch
index 27a0a8df8..27a0a8df8 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-hardlink-segfault-fix.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-hardlink-segfault-fix.patch
index 5deb2323e..5deb2323e 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-hardlink-segfault-fix.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-hardlink-segfault-fix.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch
index 042e412ed..042e412ed 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch
index 3153f7a38..3153f7a38 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch
index 790a66217..790a66217 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-lua-fix-print.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-lua-fix-print.patch
index 7ab49e97e..7ab49e97e 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-lua-fix-print.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-lua-fix-print.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-lua.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-lua.patch
index a9930d670..a9930d670 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-lua.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-lua.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch
index 07a0cfa30..07a0cfa30 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-macros.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-macros.patch
index c7ab2d2bb..c7ab2d2bb 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-macros.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-macros.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
index ab6ed2c3a..ab6ed2c3a 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch
index 58182296c..58182296c 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-opendb-before-verifyscript-to-avoid-null-point.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-opendb-before-verifyscript-to-avoid-null-point.patch
index 07d586a3a..07d586a3a 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-opendb-before-verifyscript-to-avoid-null-point.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-opendb-before-verifyscript-to-avoid-null-point.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch
index 691aba9ea..691aba9ea 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch
index c15e12405..c15e12405 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch
index 9cd02a0f9..9cd02a0f9 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch
index 5d182ad9f..5d182ad9f 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch
index f26a6e79d..f26a6e79d 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-platform.patch
index 11fd03903..11fd03903 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-platform.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
index fed54e5f1..fed54e5f1 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-py-init.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-py-init.patch
index 07d407d36..07d407d36 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-py-init.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-py-init.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-realpath.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-realpath.patch
index a810123ba..a810123ba 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-realpath.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-realpath.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch
index 59fe524df..59fe524df 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch
index 769016b56..769016b56 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch
index 56a243d5f..56a243d5f 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch
index d8feed73f..d8feed73f 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
index f825372e8..f825372e8 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch
index ec38b95f2..ec38b95f2 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-tag-generate-endian-conversion-fix.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-tag-generate-endian-conversion-fix.patch
index 683275cb1..683275cb1 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-tag-generate-endian-conversion-fix.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-tag-generate-endian-conversion-fix.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch
index cb85bebfc..cb85bebfc 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch
index 713f84ee2..713f84ee2 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm2cpio b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm2cpio
index 6bcef6a4c..6bcef6a4c 100755
--- a/meta/recipes-devtools/rpm/rpm/rpm2cpio
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm2cpio
diff --git a/meta/recipes-devtools/rpm/rpm/rpmatch.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpmatch.patch
index 20d13aa08..20d13aa08 100644
--- a/meta/recipes-devtools/rpm/rpm/rpmatch.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpmatch.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch
index 9bdd1d490..9bdd1d490 100644
--- a/meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch
index f08bd688f..f08bd688f 100644
--- a/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch
diff --git a/meta/recipes-devtools/rpm/rpm/uclibc-support.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/uclibc-support.patch
index 8870adb9e..8870adb9e 100644
--- a/meta/recipes-devtools/rpm/rpm/uclibc-support.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/uclibc-support.patch
diff --git a/meta/recipes-devtools/rpm/rpm/verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch
index 71045aebc..71045aebc 100644
--- a/meta/recipes-devtools/rpm/rpm/verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm/verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch
diff --git a/meta/recipes-devtools/rpm/rpm_4.11.2.bb b/yocto-poky/meta/recipes-devtools/rpm/rpm_4.11.2.bb
index f4a2110ae..f4a2110ae 100644
--- a/meta/recipes-devtools/rpm/rpm_4.11.2.bb
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm_4.11.2.bb
diff --git a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb b/yocto-poky/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
index 951b2517f..951b2517f 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/yocto-poky/meta/recipes-devtools/rpm/rpm_5.4.14.bb
index 73b3734d5..73b3734d5 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpm_5.4.14.bb
diff --git a/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c b/yocto-poky/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
index c0b4d567f..c0b4d567f 100644
--- a/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
diff --git a/meta/recipes-devtools/rpm/rpmresolve_1.0.bb b/yocto-poky/meta/recipes-devtools/rpm/rpmresolve_1.0.bb
index 04a55fd48..04a55fd48 100644
--- a/meta/recipes-devtools/rpm/rpmresolve_1.0.bb
+++ b/yocto-poky/meta/recipes-devtools/rpm/rpmresolve_1.0.bb
diff --git a/meta/recipes-devtools/rsync/files/acinclude.m4 b/yocto-poky/meta/recipes-devtools/rsync/files/acinclude.m4
index 735b41dec..735b41dec 100644
--- a/meta/recipes-devtools/rsync/files/acinclude.m4
+++ b/yocto-poky/meta/recipes-devtools/rsync/files/acinclude.m4
diff --git a/meta/recipes-devtools/rsync/files/rsyncd.conf b/yocto-poky/meta/recipes-devtools/rsync/files/rsyncd.conf
index 845f5b33f..845f5b33f 100644
--- a/meta/recipes-devtools/rsync/files/rsyncd.conf
+++ b/yocto-poky/meta/recipes-devtools/rsync/files/rsyncd.conf
diff --git a/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch b/yocto-poky/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch
index f054452f3..f054452f3 100644
--- a/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch
+++ b/yocto-poky/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch
diff --git a/meta/recipes-devtools/rsync/rsync-2.6.9/rsyncd.conf b/yocto-poky/meta/recipes-devtools/rsync/rsync-2.6.9/rsyncd.conf
index 845f5b33f..845f5b33f 100644
--- a/meta/recipes-devtools/rsync/rsync-2.6.9/rsyncd.conf
+++ b/yocto-poky/meta/recipes-devtools/rsync/rsync-2.6.9/rsyncd.conf
diff --git a/meta/recipes-devtools/rsync/rsync-3.1.1/0001-Complain-if-an-inc-recursive-path-is-not-right-for-i.patch b/yocto-poky/meta/recipes-devtools/rsync/rsync-3.1.1/0001-Complain-if-an-inc-recursive-path-is-not-right-for-i.patch
index 5ece5420a..5ece5420a 100644
--- a/meta/recipes-devtools/rsync/rsync-3.1.1/0001-Complain-if-an-inc-recursive-path-is-not-right-for-i.patch
+++ b/yocto-poky/meta/recipes-devtools/rsync/rsync-3.1.1/0001-Complain-if-an-inc-recursive-path-is-not-right-for-i.patch
diff --git a/meta/recipes-devtools/rsync/rsync-3.1.1/rsync.git-eac858085.patch b/yocto-poky/meta/recipes-devtools/rsync/rsync-3.1.1/rsync.git-eac858085.patch
index 1fcac490a..1fcac490a 100644
--- a/meta/recipes-devtools/rsync/rsync-3.1.1/rsync.git-eac858085.patch
+++ b/yocto-poky/meta/recipes-devtools/rsync/rsync-3.1.1/rsync.git-eac858085.patch
diff --git a/meta/recipes-devtools/rsync/rsync.inc b/yocto-poky/meta/recipes-devtools/rsync/rsync.inc
index c65f27031..c65f27031 100644
--- a/meta/recipes-devtools/rsync/rsync.inc
+++ b/yocto-poky/meta/recipes-devtools/rsync/rsync.inc
diff --git a/meta/recipes-devtools/rsync/rsync_2.6.9.bb b/yocto-poky/meta/recipes-devtools/rsync/rsync_2.6.9.bb
index 6854c77f7..6854c77f7 100644
--- a/meta/recipes-devtools/rsync/rsync_2.6.9.bb
+++ b/yocto-poky/meta/recipes-devtools/rsync/rsync_2.6.9.bb
diff --git a/meta/recipes-devtools/rsync/rsync_3.1.1.bb b/yocto-poky/meta/recipes-devtools/rsync/rsync_3.1.1.bb
index c74cdda94..c74cdda94 100644
--- a/meta/recipes-devtools/rsync/rsync_3.1.1.bb
+++ b/yocto-poky/meta/recipes-devtools/rsync/rsync_3.1.1.bb
diff --git a/meta/recipes-devtools/ruby/ruby.inc b/yocto-poky/meta/recipes-devtools/ruby/ruby.inc
index 17aa7899b..17aa7899b 100644
--- a/meta/recipes-devtools/ruby/ruby.inc
+++ b/yocto-poky/meta/recipes-devtools/ruby/ruby.inc
diff --git a/meta/recipes-devtools/ruby/ruby/extmk.patch b/yocto-poky/meta/recipes-devtools/ruby/ruby/extmk.patch
index 8b6845034..8b6845034 100644
--- a/meta/recipes-devtools/ruby/ruby/extmk.patch
+++ b/yocto-poky/meta/recipes-devtools/ruby/ruby/extmk.patch
diff --git a/meta/recipes-devtools/ruby/ruby_2.2.2.bb b/yocto-poky/meta/recipes-devtools/ruby/ruby_2.2.2.bb
index 78c943cc6..78c943cc6 100644
--- a/meta/recipes-devtools/ruby/ruby_2.2.2.bb
+++ b/yocto-poky/meta/recipes-devtools/ruby/ruby_2.2.2.bb
diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts b/yocto-poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts
index 53a8e1db0..53a8e1db0 100755
--- a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts
+++ b/yocto-poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts
diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.init b/yocto-poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.init
index 473a1f7f6..473a1f7f6 100644
--- a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.init
+++ b/yocto-poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.init
diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service b/yocto-poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service
index 85a043949..85a043949 100644
--- a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service
+++ b/yocto-poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service
diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb b/yocto-poky/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
index 11c94e57d..11c94e57d 100644
--- a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
+++ b/yocto-poky/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
diff --git a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch b/yocto-poky/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch
index 1f39b0330..1f39b0330 100644
--- a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch
+++ b/yocto-poky/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch
diff --git a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch b/yocto-poky/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch
index 54b3f5449..54b3f5449 100644
--- a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch
+++ b/yocto-poky/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch
diff --git a/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb b/yocto-poky/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb
index 597536570..597536570 100644
--- a/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb
+++ b/yocto-poky/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb
diff --git a/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb b/yocto-poky/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb
index 6098673a3..6098673a3 100644
--- a/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb
+++ b/yocto-poky/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb
diff --git a/meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb b/yocto-poky/meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb
index 5e3460ff3..5e3460ff3 100644
--- a/meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb
+++ b/yocto-poky/meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-mksquashfs.c-get-inline-functions-work-with-C99.patch b/yocto-poky/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-mksquashfs.c-get-inline-functions-work-with-C99.patch
index a5bab0544..a5bab0544 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-mksquashfs.c-get-inline-functions-work-with-C99.patch
+++ b/yocto-poky/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-mksquashfs.c-get-inline-functions-work-with-C99.patch
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/yocto-poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
index 7aebd00e0..7aebd00e0 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
+++ b/yocto-poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
diff --git a/meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch b/yocto-poky/meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch
index 085395990..085395990 100644
--- a/meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch
+++ b/yocto-poky/meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch
diff --git a/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch b/yocto-poky/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch
index d9346a8b7..d9346a8b7 100644
--- a/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch
+++ b/yocto-poky/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch
diff --git a/meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch b/yocto-poky/meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch
index 0b072fe53..0b072fe53 100644
--- a/meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch
+++ b/yocto-poky/meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch
diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/yocto-poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
index f3603012f..f3603012f 100644
--- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
+++ b/yocto-poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
diff --git a/meta/recipes-devtools/strace/strace/git-version-gen b/yocto-poky/meta/recipes-devtools/strace/strace/git-version-gen
index 8fee74e12..8fee74e12 100755
--- a/meta/recipes-devtools/strace/strace/git-version-gen
+++ b/yocto-poky/meta/recipes-devtools/strace/strace/git-version-gen
diff --git a/meta/recipes-devtools/strace/strace/run-ptest b/yocto-poky/meta/recipes-devtools/strace/strace/run-ptest
index 133cf92d0..133cf92d0 100755
--- a/meta/recipes-devtools/strace/strace/run-ptest
+++ b/yocto-poky/meta/recipes-devtools/strace/strace/run-ptest
diff --git a/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch b/yocto-poky/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
index e48e4b31b..e48e4b31b 100644
--- a/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
+++ b/yocto-poky/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
diff --git a/meta/recipes-devtools/strace/strace_4.10.bb b/yocto-poky/meta/recipes-devtools/strace/strace_4.10.bb
index 20b7e3d0a..20b7e3d0a 100644
--- a/meta/recipes-devtools/strace/strace_4.10.bb
+++ b/yocto-poky/meta/recipes-devtools/strace/strace_4.10.bb
diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/disable_macos.patch b/yocto-poky/meta/recipes-devtools/subversion/subversion-1.8.13/disable_macos.patch
index ec3be496f..ec3be496f 100644
--- a/meta/recipes-devtools/subversion/subversion-1.8.13/disable_macos.patch
+++ b/yocto-poky/meta/recipes-devtools/subversion/subversion-1.8.13/disable_macos.patch
diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch b/yocto-poky/meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch
index 5cd572bfc..5cd572bfc 100644
--- a/meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch
+++ b/yocto-poky/meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch
diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch b/yocto-poky/meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch
index 140e52262..140e52262 100644
--- a/meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch
+++ b/yocto-poky/meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch
diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/subversion-CVE-2015-3184.patch b/yocto-poky/meta/recipes-devtools/subversion/subversion-1.8.13/subversion-CVE-2015-3184.patch
index 0663bd271..0663bd271 100644
--- a/meta/recipes-devtools/subversion/subversion-1.8.13/subversion-CVE-2015-3184.patch
+++ b/yocto-poky/meta/recipes-devtools/subversion/subversion-1.8.13/subversion-CVE-2015-3184.patch
diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/subversion-CVE-2015-3187.patch b/yocto-poky/meta/recipes-devtools/subversion/subversion-1.8.13/subversion-CVE-2015-3187.patch
index 494e11c6c..494e11c6c 100644
--- a/meta/recipes-devtools/subversion/subversion-1.8.13/subversion-CVE-2015-3187.patch
+++ b/yocto-poky/meta/recipes-devtools/subversion/subversion-1.8.13/subversion-CVE-2015-3187.patch
diff --git a/meta/recipes-devtools/subversion/subversion_1.8.13.bb b/yocto-poky/meta/recipes-devtools/subversion/subversion_1.8.13.bb
index 68934b7e0..68934b7e0 100644
--- a/meta/recipes-devtools/subversion/subversion_1.8.13.bb
+++ b/yocto-poky/meta/recipes-devtools/subversion/subversion_1.8.13.bb
diff --git a/meta/recipes-devtools/swabber/swabber-native_git.bb b/yocto-poky/meta/recipes-devtools/swabber/swabber-native_git.bb
index 2f313bb46..2f313bb46 100644
--- a/meta/recipes-devtools/swabber/swabber-native_git.bb
+++ b/yocto-poky/meta/recipes-devtools/swabber/swabber-native_git.bb
diff --git a/meta/recipes-devtools/swig/swig.inc b/yocto-poky/meta/recipes-devtools/swig/swig.inc
index 9821fa560..9821fa560 100644
--- a/meta/recipes-devtools/swig/swig.inc
+++ b/yocto-poky/meta/recipes-devtools/swig/swig.inc
diff --git a/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch b/yocto-poky/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
index 81df3e264..81df3e264 100644
--- a/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
+++ b/yocto-poky/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
diff --git a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/yocto-poky/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
index 1b1128aca..1b1128aca 100644
--- a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
+++ b/yocto-poky/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
diff --git a/meta/recipes-devtools/swig/swig_3.0.6.bb b/yocto-poky/meta/recipes-devtools/swig/swig_3.0.6.bb
index 2a0917e4e..2a0917e4e 100644
--- a/meta/recipes-devtools/swig/swig_3.0.6.bb
+++ b/yocto-poky/meta/recipes-devtools/swig/swig_3.0.6.bb
diff --git a/meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch
index 3ab787527..3ab787527 100644
--- a/meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch
+++ b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch
diff --git a/meta/recipes-devtools/syslinux/syslinux/0002-linux-syslinux-implement-open_ext2_fs.patch b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0002-linux-syslinux-implement-open_ext2_fs.patch
index 77cf06045..77cf06045 100644
--- a/meta/recipes-devtools/syslinux/syslinux/0002-linux-syslinux-implement-open_ext2_fs.patch
+++ b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0002-linux-syslinux-implement-open_ext2_fs.patch
diff --git a/meta/recipes-devtools/syslinux/syslinux/0003-linux-syslinux-implement-install_to_ext2.patch b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0003-linux-syslinux-implement-install_to_ext2.patch
index 84ba10526..84ba10526 100644
--- a/meta/recipes-devtools/syslinux/syslinux/0003-linux-syslinux-implement-install_to_ext2.patch
+++ b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0003-linux-syslinux-implement-install_to_ext2.patch
diff --git a/meta/recipes-devtools/syslinux/syslinux/0004-linux-syslinux-add-ext_file_read-and-ext_file_write.patch b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0004-linux-syslinux-add-ext_file_read-and-ext_file_write.patch
index 64b56d92e..64b56d92e 100644
--- a/meta/recipes-devtools/syslinux/syslinux/0004-linux-syslinux-add-ext_file_read-and-ext_file_write.patch
+++ b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0004-linux-syslinux-add-ext_file_read-and-ext_file_write.patch
diff --git a/meta/recipes-devtools/syslinux/syslinux/0005-linux-syslinux-implement-handle_adv_on_ext.patch b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0005-linux-syslinux-implement-handle_adv_on_ext.patch
index 829e7c4ca..829e7c4ca 100644
--- a/meta/recipes-devtools/syslinux/syslinux/0005-linux-syslinux-implement-handle_adv_on_ext.patch
+++ b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0005-linux-syslinux-implement-handle_adv_on_ext.patch
diff --git a/meta/recipes-devtools/syslinux/syslinux/0006-linux-syslinux-implement-write_to_ext-and-add-syslin.patch b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0006-linux-syslinux-implement-write_to_ext-and-add-syslin.patch
index cba87252a..cba87252a 100644
--- a/meta/recipes-devtools/syslinux/syslinux/0006-linux-syslinux-implement-write_to_ext-and-add-syslin.patch
+++ b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0006-linux-syslinux-implement-write_to_ext-and-add-syslin.patch
diff --git a/meta/recipes-devtools/syslinux/syslinux/0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch
index 391381191..391381191 100644
--- a/meta/recipes-devtools/syslinux/syslinux/0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch
+++ b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch
diff --git a/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch
index 2400c98d6..2400c98d6 100644
--- a/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch
+++ b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch
diff --git a/meta/recipes-devtools/syslinux/syslinux/0009-linux-syslinux-implement-install_bootblock.patch b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0009-linux-syslinux-implement-install_bootblock.patch
index cd89d9248..cd89d9248 100644
--- a/meta/recipes-devtools/syslinux/syslinux/0009-linux-syslinux-implement-install_bootblock.patch
+++ b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0009-linux-syslinux-implement-install_bootblock.patch
diff --git a/meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch
index 6279258c2..6279258c2 100644
--- a/meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch
+++ b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch
diff --git a/meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch
index 443c1ccc5..443c1ccc5 100644
--- a/meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch
+++ b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch
diff --git a/meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch
index 312b1e8ae..312b1e8ae 100644
--- a/meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch
+++ b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch
diff --git a/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch
index c0714b517..c0714b517 100644
--- a/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch
+++ b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch
diff --git a/meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch
index 7c003e165..7c003e165 100644
--- a/meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch
+++ b/yocto-poky/meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch
diff --git a/meta/recipes-devtools/syslinux/syslinux_6.03.bb b/yocto-poky/meta/recipes-devtools/syslinux/syslinux_6.03.bb
index 8534528d7..8534528d7 100644
--- a/meta/recipes-devtools/syslinux/syslinux_6.03.bb
+++ b/yocto-poky/meta/recipes-devtools/syslinux/syslinux_6.03.bb
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch
index 5d704567c..5d704567c 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch
+++ b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init
index 6303280aa..6303280aa 100755
--- a/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init
+++ b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service
index fd9a6c4d5..fd9a6c4d5 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service
+++ b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
index f8fd39042..f8fd39042 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
+++ b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/yocto-poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
index c8530e1f5..c8530e1f5 100644
--- a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
+++ b/yocto-poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
diff --git a/meta/recipes-devtools/tcltk/tcl/fix-configure.patch b/yocto-poky/meta/recipes-devtools/tcltk/tcl/fix-configure.patch
index b692a0ebe..b692a0ebe 100644
--- a/meta/recipes-devtools/tcltk/tcl/fix-configure.patch
+++ b/yocto-poky/meta/recipes-devtools/tcltk/tcl/fix-configure.patch
diff --git a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch b/yocto-poky/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
index be273419a..be273419a 100644
--- a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
+++ b/yocto-poky/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
diff --git a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch b/yocto-poky/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
index c60eb7537..c60eb7537 100644
--- a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
+++ b/yocto-poky/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
diff --git a/meta/recipes-devtools/tcltk/tcl/no_packages.patch b/yocto-poky/meta/recipes-devtools/tcltk/tcl/no_packages.patch
index ab6cc4316..ab6cc4316 100644
--- a/meta/recipes-devtools/tcltk/tcl/no_packages.patch
+++ b/yocto-poky/meta/recipes-devtools/tcltk/tcl/no_packages.patch
diff --git a/meta/recipes-devtools/tcltk/tcl/run-ptest b/yocto-poky/meta/recipes-devtools/tcltk/tcl/run-ptest
index dadba655f..dadba655f 100644
--- a/meta/recipes-devtools/tcltk/tcl/run-ptest
+++ b/yocto-poky/meta/recipes-devtools/tcltk/tcl/run-ptest
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/yocto-poky/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
index 96276eab0..96276eab0 100644
--- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
+++ b/yocto-poky/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch b/yocto-poky/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
index 16f7c8051..16f7c8051 100644
--- a/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
+++ b/yocto-poky/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.4.bb b/yocto-poky/meta/recipes-devtools/tcltk/tcl_8.6.4.bb
index 8e92b3e24..8e92b3e24 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.4.bb
+++ b/yocto-poky/meta/recipes-devtools/tcltk/tcl_8.6.4.bb
diff --git a/meta/recipes-devtools/unfs3/unfs3/alternate_rpc_ports.patch b/yocto-poky/meta/recipes-devtools/unfs3/unfs3/alternate_rpc_ports.patch
index ff745d477..ff745d477 100644
--- a/meta/recipes-devtools/unfs3/unfs3/alternate_rpc_ports.patch
+++ b/yocto-poky/meta/recipes-devtools/unfs3/unfs3/alternate_rpc_ports.patch
diff --git a/meta/recipes-devtools/unfs3/unfs3/fix_compile_warning.patch b/yocto-poky/meta/recipes-devtools/unfs3/unfs3/fix_compile_warning.patch
index aada01411..aada01411 100644
--- a/meta/recipes-devtools/unfs3/unfs3/fix_compile_warning.patch
+++ b/yocto-poky/meta/recipes-devtools/unfs3/unfs3/fix_compile_warning.patch
diff --git a/meta/recipes-devtools/unfs3/unfs3/fix_pid_race_parent_writes_child_pid.patch b/yocto-poky/meta/recipes-devtools/unfs3/unfs3/fix_pid_race_parent_writes_child_pid.patch
index 46b187e5f..46b187e5f 100644
--- a/meta/recipes-devtools/unfs3/unfs3/fix_pid_race_parent_writes_child_pid.patch
+++ b/yocto-poky/meta/recipes-devtools/unfs3/unfs3/fix_pid_race_parent_writes_child_pid.patch
diff --git a/meta/recipes-devtools/unfs3/unfs3/fix_warnings.patch b/yocto-poky/meta/recipes-devtools/unfs3/unfs3/fix_warnings.patch
index cda8655b9..cda8655b9 100644
--- a/meta/recipes-devtools/unfs3/unfs3/fix_warnings.patch
+++ b/yocto-poky/meta/recipes-devtools/unfs3/unfs3/fix_warnings.patch
diff --git a/meta/recipes-devtools/unfs3/unfs3/relative_max_socket_path_len.patch b/yocto-poky/meta/recipes-devtools/unfs3/unfs3/relative_max_socket_path_len.patch
index 219dd35ae..219dd35ae 100644
--- a/meta/recipes-devtools/unfs3/unfs3/relative_max_socket_path_len.patch
+++ b/yocto-poky/meta/recipes-devtools/unfs3/unfs3/relative_max_socket_path_len.patch
diff --git a/meta/recipes-devtools/unfs3/unfs3/rename_fh_cache.patch b/yocto-poky/meta/recipes-devtools/unfs3/unfs3/rename_fh_cache.patch
index e6d89530f..e6d89530f 100644
--- a/meta/recipes-devtools/unfs3/unfs3/rename_fh_cache.patch
+++ b/yocto-poky/meta/recipes-devtools/unfs3/unfs3/rename_fh_cache.patch
diff --git a/meta/recipes-devtools/unfs3/unfs3/tcp_no_delay.patch b/yocto-poky/meta/recipes-devtools/unfs3/unfs3/tcp_no_delay.patch
index b3521c63e..b3521c63e 100644
--- a/meta/recipes-devtools/unfs3/unfs3/tcp_no_delay.patch
+++ b/yocto-poky/meta/recipes-devtools/unfs3/unfs3/tcp_no_delay.patch
diff --git a/meta/recipes-devtools/unfs3/unfs3/unfs3_parallel_build.patch b/yocto-poky/meta/recipes-devtools/unfs3/unfs3/unfs3_parallel_build.patch
index 6f64dd5b3..6f64dd5b3 100644
--- a/meta/recipes-devtools/unfs3/unfs3/unfs3_parallel_build.patch
+++ b/yocto-poky/meta/recipes-devtools/unfs3/unfs3/unfs3_parallel_build.patch
diff --git a/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb b/yocto-poky/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb
index 51308955d..51308955d 100644
--- a/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb
+++ b/yocto-poky/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb
diff --git a/meta/recipes-devtools/unifdef/unifdef_2.10.bb b/yocto-poky/meta/recipes-devtools/unifdef/unifdef_2.10.bb
index b8a007984..b8a007984 100644
--- a/meta/recipes-devtools/unifdef/unifdef_2.10.bb
+++ b/yocto-poky/meta/recipes-devtools/unifdef/unifdef_2.10.bb
diff --git a/meta/recipes-devtools/vala/vala.inc b/yocto-poky/meta/recipes-devtools/vala/vala.inc
index 63056fde4..63056fde4 100644
--- a/meta/recipes-devtools/vala/vala.inc
+++ b/yocto-poky/meta/recipes-devtools/vala/vala.inc
diff --git a/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch b/yocto-poky/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
index ac9dc8c83..ac9dc8c83 100644
--- a/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
+++ b/yocto-poky/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
diff --git a/meta/recipes-devtools/vala/vala_0.28.0.bb b/yocto-poky/meta/recipes-devtools/vala/vala_0.28.0.bb
index 120906c1a..120906c1a 100644
--- a/meta/recipes-devtools/vala/vala_0.28.0.bb
+++ b/yocto-poky/meta/recipes-devtools/vala/vala_0.28.0.bb
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-Enable-rt_sigpending-syscall-on-ppc64-linux.patch b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-Enable-rt_sigpending-syscall-on-ppc64-linux.patch
index 56bb5f55f..56bb5f55f 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-Enable-rt_sigpending-syscall-on-ppc64-linux.patch
+++ b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-Enable-rt_sigpending-syscall-on-ppc64-linux.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
index 07774f38a..07774f38a 100644
--- a/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
+++ b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind/add-ptest.patch b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/add-ptest.patch
index 225f84305..225f84305 100644
--- a/meta/recipes-devtools/valgrind/valgrind/add-ptest.patch
+++ b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/add-ptest.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind/enable.building.on.4.x.kernel.patch b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/enable.building.on.4.x.kernel.patch
index 300f2f19f..300f2f19f 100644
--- a/meta/recipes-devtools/valgrind/valgrind/enable.building.on.4.x.kernel.patch
+++ b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/enable.building.on.4.x.kernel.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
index b054d05f7..b054d05f7 100644
--- a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
+++ b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind/force-nostabs.patch b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/force-nostabs.patch
index 849dfc50f..849dfc50f 100644
--- a/meta/recipes-devtools/valgrind/valgrind/force-nostabs.patch
+++ b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/force-nostabs.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind/glibc.patch b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/glibc.patch
index 863499d69..863499d69 100644
--- a/meta/recipes-devtools/valgrind/valgrind/glibc.patch
+++ b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/glibc.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind/pass-maltivec-only-if-it-supported.patch b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/pass-maltivec-only-if-it-supported.patch
index f8167cb2f..f8167cb2f 100644
--- a/meta/recipes-devtools/valgrind/valgrind/pass-maltivec-only-if-it-supported.patch
+++ b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/pass-maltivec-only-if-it-supported.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-arm-variant-specific.patch b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/remove-arm-variant-specific.patch
index 2319ab98c..2319ab98c 100644
--- a/meta/recipes-devtools/valgrind/valgrind/remove-arm-variant-specific.patch
+++ b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/remove-arm-variant-specific.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-ppc-tests-failing-build.patch b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/remove-ppc-tests-failing-build.patch
index 1c640ffb7..1c640ffb7 100644
--- a/meta/recipes-devtools/valgrind/valgrind/remove-ppc-tests-failing-build.patch
+++ b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/remove-ppc-tests-failing-build.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind/run-ptest b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/run-ptest
index f9a72ec4a..f9a72ec4a 100755
--- a/meta/recipes-devtools/valgrind/valgrind/run-ptest
+++ b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/run-ptest
diff --git a/meta/recipes-devtools/valgrind/valgrind/sepbuildfix.patch b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/sepbuildfix.patch
index 5db0ef8a3..5db0ef8a3 100644
--- a/meta/recipes-devtools/valgrind/valgrind/sepbuildfix.patch
+++ b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/sepbuildfix.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch
index f72e9ca03..f72e9ca03 100644
--- a/meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch
+++ b/yocto-poky/meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb b/yocto-poky/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb
index 86ba979ea..86ba979ea 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb
+++ b/yocto-poky/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb
diff --git a/meta/recipes-devtools/xmlto/files/catalog.xml b/yocto-poky/meta/recipes-devtools/xmlto/files/catalog.xml
index 6b8833d87..6b8833d87 100644
--- a/meta/recipes-devtools/xmlto/files/catalog.xml
+++ b/yocto-poky/meta/recipes-devtools/xmlto/files/catalog.xml
diff --git a/meta/recipes-devtools/xmlto/xmlto-0.0.26/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch b/yocto-poky/meta/recipes-devtools/xmlto/xmlto-0.0.26/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch
index 6d547a6c9..6d547a6c9 100644
--- a/meta/recipes-devtools/xmlto/xmlto-0.0.26/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch
+++ b/yocto-poky/meta/recipes-devtools/xmlto/xmlto-0.0.26/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch
diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb b/yocto-poky/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb
index a7a01830a..a7a01830a 100644
--- a/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb
+++ b/yocto-poky/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb
diff --git a/meta/recipes-devtools/yasm/yasm_1.3.0.bb b/yocto-poky/meta/recipes-devtools/yasm/yasm_1.3.0.bb
index 78702ed20..78702ed20 100644
--- a/meta/recipes-devtools/yasm/yasm_1.3.0.bb
+++ b/yocto-poky/meta/recipes-devtools/yasm/yasm_1.3.0.bb
diff --git a/meta/recipes-devtools/zisofs-tools/zisofs-tools-native_1.0.8.bb b/yocto-poky/meta/recipes-devtools/zisofs-tools/zisofs-tools-native_1.0.8.bb
index 021c05839..021c05839 100644
--- a/meta/recipes-devtools/zisofs-tools/zisofs-tools-native_1.0.8.bb
+++ b/yocto-poky/meta/recipes-devtools/zisofs-tools/zisofs-tools-native_1.0.8.bb
diff --git a/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch b/yocto-poky/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch
index 53ae28b5e..53ae28b5e 100644
--- a/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch
+++ b/yocto-poky/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch
diff --git a/meta/recipes-extended/at/at/atd.init b/yocto-poky/meta/recipes-extended/at/at/atd.init
index eca379b3c..eca379b3c 100644
--- a/meta/recipes-extended/at/at/atd.init
+++ b/yocto-poky/meta/recipes-extended/at/at/atd.init
diff --git a/meta/recipes-extended/at/at/atd.service b/yocto-poky/meta/recipes-extended/at/at/atd.service
index 6dc844504..6dc844504 100644
--- a/meta/recipes-extended/at/at/atd.service
+++ b/yocto-poky/meta/recipes-extended/at/at/atd.service
diff --git a/meta/recipes-extended/at/at/configure-add-enable-pam.patch b/yocto-poky/meta/recipes-extended/at/at/configure-add-enable-pam.patch
index 1e5efef12..1e5efef12 100644
--- a/meta/recipes-extended/at/at/configure-add-enable-pam.patch
+++ b/yocto-poky/meta/recipes-extended/at/at/configure-add-enable-pam.patch
diff --git a/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch b/yocto-poky/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch
index d5ef0032b..d5ef0032b 100644
--- a/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch
+++ b/yocto-poky/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch
diff --git a/meta/recipes-extended/at/at/fix_parallel_build_error.patch b/yocto-poky/meta/recipes-extended/at/at/fix_parallel_build_error.patch
index 66ff3e1c1..66ff3e1c1 100644
--- a/meta/recipes-extended/at/at/fix_parallel_build_error.patch
+++ b/yocto-poky/meta/recipes-extended/at/at/fix_parallel_build_error.patch
diff --git a/meta/recipes-extended/at/at/makefile-fix-parallel.patch b/yocto-poky/meta/recipes-extended/at/at/makefile-fix-parallel.patch
index 932a4c0bf..932a4c0bf 100644
--- a/meta/recipes-extended/at/at/makefile-fix-parallel.patch
+++ b/yocto-poky/meta/recipes-extended/at/at/makefile-fix-parallel.patch
diff --git a/meta/recipes-extended/at/at/pam.conf.patch b/yocto-poky/meta/recipes-extended/at/at/pam.conf.patch
index b5ceb9ae8..b5ceb9ae8 100644
--- a/meta/recipes-extended/at/at/pam.conf.patch
+++ b/yocto-poky/meta/recipes-extended/at/at/pam.conf.patch
diff --git a/meta/recipes-extended/at/at/posixtm.c b/yocto-poky/meta/recipes-extended/at/at/posixtm.c
index 5514ba4fe..5514ba4fe 100644
--- a/meta/recipes-extended/at/at/posixtm.c
+++ b/yocto-poky/meta/recipes-extended/at/at/posixtm.c
diff --git a/meta/recipes-extended/at/at/posixtm.h b/yocto-poky/meta/recipes-extended/at/at/posixtm.h
index e91749d73..e91749d73 100644
--- a/meta/recipes-extended/at/at/posixtm.h
+++ b/yocto-poky/meta/recipes-extended/at/at/posixtm.h
diff --git a/meta/recipes-extended/at/at_3.1.16.bb b/yocto-poky/meta/recipes-extended/at/at_3.1.16.bb
index 0512bcb83..0512bcb83 100644
--- a/meta/recipes-extended/at/at_3.1.16.bb
+++ b/yocto-poky/meta/recipes-extended/at/at_3.1.16.bb
diff --git a/meta/recipes-extended/augeas/augeas.inc b/yocto-poky/meta/recipes-extended/augeas/augeas.inc
index 23d12cadf..23d12cadf 100644
--- a/meta/recipes-extended/augeas/augeas.inc
+++ b/yocto-poky/meta/recipes-extended/augeas/augeas.inc
diff --git a/meta/recipes-extended/augeas/augeas/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-extended/augeas/augeas/0001-Unset-need_charset_alias-when-building-for-musl.patch
index 9a19876aa..9a19876aa 100644
--- a/meta/recipes-extended/augeas/augeas/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/yocto-poky/meta/recipes-extended/augeas/augeas/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-extended/augeas/augeas/add-missing-argz-conditional.patch b/yocto-poky/meta/recipes-extended/augeas/augeas/add-missing-argz-conditional.patch
index abbdbaa63..abbdbaa63 100644
--- a/meta/recipes-extended/augeas/augeas/add-missing-argz-conditional.patch
+++ b/yocto-poky/meta/recipes-extended/augeas/augeas/add-missing-argz-conditional.patch
diff --git a/meta/recipes-extended/augeas/augeas/sepbuildfix.patch b/yocto-poky/meta/recipes-extended/augeas/augeas/sepbuildfix.patch
index b82a3ee2c..b82a3ee2c 100644
--- a/meta/recipes-extended/augeas/augeas/sepbuildfix.patch
+++ b/yocto-poky/meta/recipes-extended/augeas/augeas/sepbuildfix.patch
diff --git a/meta/recipes-extended/augeas/augeas_1.4.0.bb b/yocto-poky/meta/recipes-extended/augeas/augeas_1.4.0.bb
index 1064ad4f4..1064ad4f4 100644
--- a/meta/recipes-extended/augeas/augeas_1.4.0.bb
+++ b/yocto-poky/meta/recipes-extended/augeas/augeas_1.4.0.bb
diff --git a/meta/recipes-extended/bash/bash-3.2.48/build-tests.patch b/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/build-tests.patch
index 91341ee69..91341ee69 100644
--- a/meta/recipes-extended/bash/bash-3.2.48/build-tests.patch
+++ b/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/build-tests.patch
diff --git a/meta/recipes-extended/bash/bash-3.2.48/dont-include-target-CFLAGS-in-host-LDFLAGS.patch b/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/dont-include-target-CFLAGS-in-host-LDFLAGS.patch
index ee756dc9e..ee756dc9e 100644
--- a/meta/recipes-extended/bash/bash-3.2.48/dont-include-target-CFLAGS-in-host-LDFLAGS.patch
+++ b/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/dont-include-target-CFLAGS-in-host-LDFLAGS.patch
diff --git a/meta/recipes-extended/bash/bash-3.2.48/mkbuiltins_have_stringize.patch b/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/mkbuiltins_have_stringize.patch
index c4229a7ed..c4229a7ed 100644
--- a/meta/recipes-extended/bash/bash-3.2.48/mkbuiltins_have_stringize.patch
+++ b/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/mkbuiltins_have_stringize.patch
diff --git a/meta/recipes-extended/bash/bash-3.2.48/run-ptest b/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/run-ptest
index 8dd3b9981..8dd3b9981 100644
--- a/meta/recipes-extended/bash/bash-3.2.48/run-ptest
+++ b/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/run-ptest
diff --git a/meta/recipes-extended/bash/bash-3.2.48/test-output.patch b/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/test-output.patch
index 2b09b7d97..2b09b7d97 100644
--- a/meta/recipes-extended/bash/bash-3.2.48/test-output.patch
+++ b/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/test-output.patch
diff --git a/meta/recipes-extended/bash/bash.inc b/yocto-poky/meta/recipes-extended/bash/bash.inc
index 020409fb6..020409fb6 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/yocto-poky/meta/recipes-extended/bash/bash.inc
diff --git a/meta/recipes-extended/bash/bash/build-tests.patch b/yocto-poky/meta/recipes-extended/bash/bash/build-tests.patch
index 73a81b60d..73a81b60d 100644
--- a/meta/recipes-extended/bash/bash/build-tests.patch
+++ b/yocto-poky/meta/recipes-extended/bash/bash/build-tests.patch
diff --git a/meta/recipes-extended/bash/bash/execute_cmd.patch b/yocto-poky/meta/recipes-extended/bash/bash/execute_cmd.patch
index 81f8f0a9c..81f8f0a9c 100644
--- a/meta/recipes-extended/bash/bash/execute_cmd.patch
+++ b/yocto-poky/meta/recipes-extended/bash/bash/execute_cmd.patch
diff --git a/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch b/yocto-poky/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch
index a9391d6ca..a9391d6ca 100644
--- a/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch
+++ b/yocto-poky/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch
diff --git a/meta/recipes-extended/bash/bash/run-ptest b/yocto-poky/meta/recipes-extended/bash/bash/run-ptest
index e3f813381..e3f813381 100644
--- a/meta/recipes-extended/bash/bash/run-ptest
+++ b/yocto-poky/meta/recipes-extended/bash/bash/run-ptest
diff --git a/meta/recipes-extended/bash/bash/test-output.patch b/yocto-poky/meta/recipes-extended/bash/bash/test-output.patch
index 2b09b7d97..2b09b7d97 100644
--- a/meta/recipes-extended/bash/bash/test-output.patch
+++ b/yocto-poky/meta/recipes-extended/bash/bash/test-output.patch
diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb b/yocto-poky/meta/recipes-extended/bash/bash_3.2.48.bb
index d42b292b0..d42b292b0 100644
--- a/meta/recipes-extended/bash/bash_3.2.48.bb
+++ b/yocto-poky/meta/recipes-extended/bash/bash_3.2.48.bb
diff --git a/meta/recipes-extended/bash/bash_4.3.30.bb b/yocto-poky/meta/recipes-extended/bash/bash_4.3.30.bb
index 811e61c79..811e61c79 100644
--- a/meta/recipes-extended/bash/bash_4.3.30.bb
+++ b/yocto-poky/meta/recipes-extended/bash/bash_4.3.30.bb
diff --git a/meta/recipes-extended/bc/bc_1.06.bb b/yocto-poky/meta/recipes-extended/bc/bc_1.06.bb
index d8c8a860f..d8c8a860f 100644
--- a/meta/recipes-extended/bc/bc_1.06.bb
+++ b/yocto-poky/meta/recipes-extended/bc/bc_1.06.bb
diff --git a/meta/recipes-extended/bc/files/fix-segment-fault.patch b/yocto-poky/meta/recipes-extended/bc/files/fix-segment-fault.patch
index 20c0da2eb..20c0da2eb 100644
--- a/meta/recipes-extended/bc/files/fix-segment-fault.patch
+++ b/yocto-poky/meta/recipes-extended/bc/files/fix-segment-fault.patch
diff --git a/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch b/yocto-poky/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch
index fee368dac..fee368dac 100644
--- a/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch
+++ b/yocto-poky/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch
diff --git a/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch b/yocto-poky/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch
index d08aba5f0..d08aba5f0 100644
--- a/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch
+++ b/yocto-poky/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch
diff --git a/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch b/yocto-poky/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch
index d7ed0b9f4..d7ed0b9f4 100644
--- a/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch
+++ b/yocto-poky/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch
diff --git a/meta/recipes-extended/blktool/blktool_4-7.bb b/yocto-poky/meta/recipes-extended/blktool/blktool_4-7.bb
index 679196be1..679196be1 100644
--- a/meta/recipes-extended/blktool/blktool_4-7.bb
+++ b/yocto-poky/meta/recipes-extended/blktool/blktool_4-7.bb
diff --git a/meta/recipes-extended/byacc/byacc.inc b/yocto-poky/meta/recipes-extended/byacc/byacc.inc
index f9f8d6b5f..f9f8d6b5f 100644
--- a/meta/recipes-extended/byacc/byacc.inc
+++ b/yocto-poky/meta/recipes-extended/byacc/byacc.inc
diff --git a/meta/recipes-extended/byacc/byacc/byacc-open.patch b/yocto-poky/meta/recipes-extended/byacc/byacc/byacc-open.patch
index 005831130..005831130 100644
--- a/meta/recipes-extended/byacc/byacc/byacc-open.patch
+++ b/yocto-poky/meta/recipes-extended/byacc/byacc/byacc-open.patch
diff --git a/meta/recipes-extended/byacc/byacc_20150711.bb b/yocto-poky/meta/recipes-extended/byacc/byacc_20150711.bb
index e5b5451f2..e5b5451f2 100644
--- a/meta/recipes-extended/byacc/byacc_20150711.bb
+++ b/yocto-poky/meta/recipes-extended/byacc/byacc_20150711.bb
diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am b/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am
index 1d163b6c9..1d163b6c9 100644
--- a/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am
+++ b/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am
diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac b/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac
index 47ee576a8..47ee576a8 100644
--- a/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac
+++ b/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac
diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/fix-bunzip2-qt-returns-0-for-corrupt-archives.patch b/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/fix-bunzip2-qt-returns-0-for-corrupt-archives.patch
index ece90d94e..ece90d94e 100644
--- a/meta/recipes-extended/bzip2/bzip2-1.0.6/fix-bunzip2-qt-returns-0-for-corrupt-archives.patch
+++ b/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/fix-bunzip2-qt-returns-0-for-corrupt-archives.patch
diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/run-ptest b/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/run-ptest
index 3b20fce1e..3b20fce1e 100644
--- a/meta/recipes-extended/bzip2/bzip2-1.0.6/run-ptest
+++ b/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/run-ptest
diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb b/yocto-poky/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
index d7b8c0655..d7b8c0655 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
+++ b/yocto-poky/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
diff --git a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb b/yocto-poky/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb
index 7fd34aa05..7fd34aa05 100644
--- a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb
+++ b/yocto-poky/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb
diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/yocto-poky/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
index 488847ac4..488847ac4 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
+++ b/yocto-poky/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
diff --git a/meta/recipes-extended/cpio/cpio-2.11/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-extended/cpio/cpio-2.11/0001-Unset-need_charset_alias-when-building-for-musl.patch
index 6ae213942..6ae213942 100644
--- a/meta/recipes-extended/cpio/cpio-2.11/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/yocto-poky/meta/recipes-extended/cpio/cpio-2.11/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-extended/cpio/cpio-2.11/cpio-CVE-2015-1197.patch b/yocto-poky/meta/recipes-extended/cpio/cpio-2.11/cpio-CVE-2015-1197.patch
index b54afb867..b54afb867 100644
--- a/meta/recipes-extended/cpio/cpio-2.11/cpio-CVE-2015-1197.patch
+++ b/yocto-poky/meta/recipes-extended/cpio/cpio-2.11/cpio-CVE-2015-1197.patch
diff --git a/meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch b/yocto-poky/meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch
index 89cd3cfa5..89cd3cfa5 100644
--- a/meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch
+++ b/yocto-poky/meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch
diff --git a/meta/recipes-extended/cpio/cpio-2.11/remove-gets.patch b/yocto-poky/meta/recipes-extended/cpio/cpio-2.11/remove-gets.patch
index b4d113d3a..b4d113d3a 100644
--- a/meta/recipes-extended/cpio/cpio-2.11/remove-gets.patch
+++ b/yocto-poky/meta/recipes-extended/cpio/cpio-2.11/remove-gets.patch
diff --git a/meta/recipes-extended/cpio/cpio-2.11/statdef.patch b/yocto-poky/meta/recipes-extended/cpio/cpio-2.11/statdef.patch
index a6b8e82a0..a6b8e82a0 100644
--- a/meta/recipes-extended/cpio/cpio-2.11/statdef.patch
+++ b/yocto-poky/meta/recipes-extended/cpio/cpio-2.11/statdef.patch
diff --git a/meta/recipes-extended/cpio/cpio-2.8/avoid_heap_overflow.patch b/yocto-poky/meta/recipes-extended/cpio/cpio-2.8/avoid_heap_overflow.patch
index 49a7cf52a..49a7cf52a 100644
--- a/meta/recipes-extended/cpio/cpio-2.8/avoid_heap_overflow.patch
+++ b/yocto-poky/meta/recipes-extended/cpio/cpio-2.8/avoid_heap_overflow.patch
diff --git a/meta/recipes-extended/cpio/cpio-2.8/fix-memory-overrun.patch b/yocto-poky/meta/recipes-extended/cpio/cpio-2.8/fix-memory-overrun.patch
index 0148e7079..0148e7079 100644
--- a/meta/recipes-extended/cpio/cpio-2.8/fix-memory-overrun.patch
+++ b/yocto-poky/meta/recipes-extended/cpio/cpio-2.8/fix-memory-overrun.patch
diff --git a/meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch b/yocto-poky/meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch
index e16585dd3..e16585dd3 100644
--- a/meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch
+++ b/yocto-poky/meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch
diff --git a/meta/recipes-extended/cpio/cpio-2.8/statdef.patch b/yocto-poky/meta/recipes-extended/cpio/cpio-2.8/statdef.patch
index a00799fea..a00799fea 100644
--- a/meta/recipes-extended/cpio/cpio-2.8/statdef.patch
+++ b/yocto-poky/meta/recipes-extended/cpio/cpio-2.8/statdef.patch
diff --git a/meta/recipes-extended/cpio/cpio_2.11.bb b/yocto-poky/meta/recipes-extended/cpio/cpio_2.11.bb
index c5d92bfaa..c5d92bfaa 100644
--- a/meta/recipes-extended/cpio/cpio_2.11.bb
+++ b/yocto-poky/meta/recipes-extended/cpio/cpio_2.11.bb
diff --git a/meta/recipes-extended/cpio/cpio_2.8.bb b/yocto-poky/meta/recipes-extended/cpio/cpio_2.8.bb
index 3f97dbe2c..3f97dbe2c 100644
--- a/meta/recipes-extended/cpio/cpio_2.8.bb
+++ b/yocto-poky/meta/recipes-extended/cpio/cpio_2.8.bb
diff --git a/meta/recipes-extended/cpio/cpio_v2.inc b/yocto-poky/meta/recipes-extended/cpio/cpio_v2.inc
index 8520ff267..8520ff267 100644
--- a/meta/recipes-extended/cpio/cpio_v2.inc
+++ b/yocto-poky/meta/recipes-extended/cpio/cpio_v2.inc
diff --git a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch b/yocto-poky/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch
index adbe7dfff..adbe7dfff 100644
--- a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch
+++ b/yocto-poky/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch
diff --git a/meta/recipes-extended/cracklib/cracklib/0002-craklib-fix-testnum-and-teststr-failed.patch b/yocto-poky/meta/recipes-extended/cracklib/cracklib/0002-craklib-fix-testnum-and-teststr-failed.patch
index 6210e8212..6210e8212 100644
--- a/meta/recipes-extended/cracklib/cracklib/0002-craklib-fix-testnum-and-teststr-failed.patch
+++ b/yocto-poky/meta/recipes-extended/cracklib/cracklib/0002-craklib-fix-testnum-and-teststr-failed.patch
diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb b/yocto-poky/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
index c0ffe3316..c0ffe3316 100644
--- a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
+++ b/yocto-poky/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
diff --git a/meta/recipes-extended/cronie/cronie/crond.init b/yocto-poky/meta/recipes-extended/cronie/cronie/crond.init
index 53b8514ca..53b8514ca 100755
--- a/meta/recipes-extended/cronie/cronie/crond.init
+++ b/yocto-poky/meta/recipes-extended/cronie/cronie/crond.init
diff --git a/meta/recipes-extended/cronie/cronie/crond.service b/yocto-poky/meta/recipes-extended/cronie/cronie/crond.service
index d435a6eb3..d435a6eb3 100644
--- a/meta/recipes-extended/cronie/cronie/crond.service
+++ b/yocto-poky/meta/recipes-extended/cronie/cronie/crond.service
diff --git a/meta/recipes-extended/cronie/cronie/crond_pam_config.patch b/yocto-poky/meta/recipes-extended/cronie/cronie/crond_pam_config.patch
index 675872c3c..675872c3c 100644
--- a/meta/recipes-extended/cronie/cronie/crond_pam_config.patch
+++ b/yocto-poky/meta/recipes-extended/cronie/cronie/crond_pam_config.patch
diff --git a/meta/recipes-extended/cronie/cronie/crontab b/yocto-poky/meta/recipes-extended/cronie/cronie/crontab
index 22c4feb2d..22c4feb2d 100644
--- a/meta/recipes-extended/cronie/cronie/crontab
+++ b/yocto-poky/meta/recipes-extended/cronie/cronie/crontab
diff --git a/meta/recipes-extended/cronie/cronie_1.5.0.bb b/yocto-poky/meta/recipes-extended/cronie/cronie_1.5.0.bb
index 697501ac1..697501ac1 100644
--- a/meta/recipes-extended/cronie/cronie_1.5.0.bb
+++ b/yocto-poky/meta/recipes-extended/cronie/cronie_1.5.0.bb
diff --git a/meta/recipes-extended/cups/cups.inc b/yocto-poky/meta/recipes-extended/cups/cups.inc
index 2c34da98d..2c34da98d 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/yocto-poky/meta/recipes-extended/cups/cups.inc
diff --git a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch b/yocto-poky/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
index 5379eb6aa..5379eb6aa 100644
--- a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
+++ b/yocto-poky/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
diff --git a/meta/recipes-extended/cups/cups/cups.path b/yocto-poky/meta/recipes-extended/cups/cups/cups.path
index de8cc57c2..de8cc57c2 100644
--- a/meta/recipes-extended/cups/cups/cups.path
+++ b/yocto-poky/meta/recipes-extended/cups/cups/cups.path
diff --git a/meta/recipes-extended/cups/cups/cups.service b/yocto-poky/meta/recipes-extended/cups/cups/cups.service
index 7d3e83986..7d3e83986 100644
--- a/meta/recipes-extended/cups/cups/cups.service
+++ b/yocto-poky/meta/recipes-extended/cups/cups/cups.service
diff --git a/meta/recipes-extended/cups/cups/cups.socket b/yocto-poky/meta/recipes-extended/cups/cups/cups.socket
index 33148705d..33148705d 100644
--- a/meta/recipes-extended/cups/cups/cups.socket
+++ b/yocto-poky/meta/recipes-extended/cups/cups/cups.socket
diff --git a/meta/recipes-extended/cups/cups/cups_serverbin.patch b/yocto-poky/meta/recipes-extended/cups/cups/cups_serverbin.patch
index f7b44a7bc..f7b44a7bc 100644
--- a/meta/recipes-extended/cups/cups/cups_serverbin.patch
+++ b/yocto-poky/meta/recipes-extended/cups/cups/cups_serverbin.patch
diff --git a/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch b/yocto-poky/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch
index 696f1374d..696f1374d 100644
--- a/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch
+++ b/yocto-poky/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch
diff --git a/meta/recipes-extended/cups/cups_2.0.4.bb b/yocto-poky/meta/recipes-extended/cups/cups_2.0.4.bb
index bad73b34f..bad73b34f 100644
--- a/meta/recipes-extended/cups/cups_2.0.4.bb
+++ b/yocto-poky/meta/recipes-extended/cups/cups_2.0.4.bb
diff --git a/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb b/yocto-poky/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb
index 65a99fc28..65a99fc28 100644
--- a/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb
+++ b/yocto-poky/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb
diff --git a/meta/recipes-extended/diffutils/diffutils-2.8.1/diffutils_fix_for_automake-1.12.patch b/yocto-poky/meta/recipes-extended/diffutils/diffutils-2.8.1/diffutils_fix_for_automake-1.12.patch
index cc05d1dc0..cc05d1dc0 100644
--- a/meta/recipes-extended/diffutils/diffutils-2.8.1/diffutils_fix_for_automake-1.12.patch
+++ b/yocto-poky/meta/recipes-extended/diffutils/diffutils-2.8.1/diffutils_fix_for_automake-1.12.patch
diff --git a/meta/recipes-extended/diffutils/diffutils-3.3/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.3/0001-Unset-need_charset_alias-when-building-for-musl.patch
index ba1a4bab4..ba1a4bab4 100644
--- a/meta/recipes-extended/diffutils/diffutils-3.3/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.3/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-extended/diffutils/diffutils-3.3/run-ptest b/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.3/run-ptest
index 695c5e8a7..695c5e8a7 100644
--- a/meta/recipes-extended/diffutils/diffutils-3.3/run-ptest
+++ b/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.3/run-ptest
diff --git a/meta/recipes-extended/diffutils/diffutils.inc b/yocto-poky/meta/recipes-extended/diffutils/diffutils.inc
index 243341aa9..243341aa9 100644
--- a/meta/recipes-extended/diffutils/diffutils.inc
+++ b/yocto-poky/meta/recipes-extended/diffutils/diffutils.inc
diff --git a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb b/yocto-poky/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
index bf425bbb3..bf425bbb3 100644
--- a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
+++ b/yocto-poky/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
diff --git a/meta/recipes-extended/diffutils/diffutils_3.3.bb b/yocto-poky/meta/recipes-extended/diffutils/diffutils_3.3.bb
index 5008690ea..5008690ea 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.3.bb
+++ b/yocto-poky/meta/recipes-extended/diffutils/diffutils_3.3.bb
diff --git a/meta/recipes-extended/ed/ed_0.5.bb b/yocto-poky/meta/recipes-extended/ed/ed_0.5.bb
index 143e63654..143e63654 100644
--- a/meta/recipes-extended/ed/ed_0.5.bb
+++ b/yocto-poky/meta/recipes-extended/ed/ed_0.5.bb
diff --git a/meta/recipes-extended/ed/ed_1.9.bb b/yocto-poky/meta/recipes-extended/ed/ed_1.9.bb
index 8e94eedea..8e94eedea 100644
--- a/meta/recipes-extended/ed/ed_1.9.bb
+++ b/yocto-poky/meta/recipes-extended/ed/ed_1.9.bb
diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/yocto-poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
index bf66267e8..bf66267e8 100644
--- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
+++ b/yocto-poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
diff --git a/meta/recipes-extended/ethtool/ethtool/run-ptest b/yocto-poky/meta/recipes-extended/ethtool/ethtool/run-ptest
index 1e245da11..1e245da11 100644
--- a/meta/recipes-extended/ethtool/ethtool/run-ptest
+++ b/yocto-poky/meta/recipes-extended/ethtool/ethtool/run-ptest
diff --git a/meta/recipes-extended/ethtool/ethtool_4.0.bb b/yocto-poky/meta/recipes-extended/ethtool/ethtool_4.0.bb
index 13f2b1cf5..13f2b1cf5 100644
--- a/meta/recipes-extended/ethtool/ethtool_4.0.bb
+++ b/yocto-poky/meta/recipes-extended/ethtool/ethtool_4.0.bb
diff --git a/meta/recipes-extended/findutils/findutils-4.2.31/findutils-fix-doc-build-error.patch b/yocto-poky/meta/recipes-extended/findutils/findutils-4.2.31/findutils-fix-doc-build-error.patch
index 2076e4409..2076e4409 100644
--- a/meta/recipes-extended/findutils/findutils-4.2.31/findutils-fix-doc-build-error.patch
+++ b/yocto-poky/meta/recipes-extended/findutils/findutils-4.2.31/findutils-fix-doc-build-error.patch
diff --git a/meta/recipes-extended/findutils/findutils-4.2.31/findutils_fix_for_automake-1.12.patch b/yocto-poky/meta/recipes-extended/findutils/findutils-4.2.31/findutils_fix_for_automake-1.12.patch
index 2d0ddb43f..2d0ddb43f 100644
--- a/meta/recipes-extended/findutils/findutils-4.2.31/findutils_fix_for_automake-1.12.patch
+++ b/yocto-poky/meta/recipes-extended/findutils/findutils-4.2.31/findutils_fix_for_automake-1.12.patch
diff --git a/meta/recipes-extended/findutils/findutils-4.2.31/gnulib-extension.patch b/yocto-poky/meta/recipes-extended/findutils/findutils-4.2.31/gnulib-extension.patch
index 65bd64277..65bd64277 100644
--- a/meta/recipes-extended/findutils/findutils-4.2.31/gnulib-extension.patch
+++ b/yocto-poky/meta/recipes-extended/findutils/findutils-4.2.31/gnulib-extension.patch
diff --git a/meta/recipes-extended/findutils/findutils.inc b/yocto-poky/meta/recipes-extended/findutils/findutils.inc
index 37c84cc59..37c84cc59 100644
--- a/meta/recipes-extended/findutils/findutils.inc
+++ b/yocto-poky/meta/recipes-extended/findutils/findutils.inc
diff --git a/meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
index 8729e1b44..8729e1b44 100644
--- a/meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/yocto-poky/meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-extended/findutils/findutils_4.2.31.bb b/yocto-poky/meta/recipes-extended/findutils/findutils_4.2.31.bb
index 7dee01883..7dee01883 100644
--- a/meta/recipes-extended/findutils/findutils_4.2.31.bb
+++ b/yocto-poky/meta/recipes-extended/findutils/findutils_4.2.31.bb
diff --git a/meta/recipes-extended/findutils/findutils_4.5.14.bb b/yocto-poky/meta/recipes-extended/findutils/findutils_4.5.14.bb
index a58a82f0e..a58a82f0e 100644
--- a/meta/recipes-extended/findutils/findutils_4.5.14.bb
+++ b/yocto-poky/meta/recipes-extended/findutils/findutils_4.5.14.bb
diff --git a/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8327.patch b/yocto-poky/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8327.patch
index aaedc88aa..aaedc88aa 100644
--- a/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8327.patch
+++ b/yocto-poky/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8327.patch
diff --git a/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8560.patch b/yocto-poky/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8560.patch
index dc973c459..dc973c459 100644
--- a/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8560.patch
+++ b/yocto-poky/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8560.patch
diff --git a/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb b/yocto-poky/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb
index 58ef1f5b0..58ef1f5b0 100644
--- a/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb
+++ b/yocto-poky/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb
diff --git a/meta/recipes-extended/gawk/gawk-3.1.5/gawk-3.1.5_fix_for_automake-1.12.patch b/yocto-poky/meta/recipes-extended/gawk/gawk-3.1.5/gawk-3.1.5_fix_for_automake-1.12.patch
index b3e7987ce..b3e7987ce 100644
--- a/meta/recipes-extended/gawk/gawk-3.1.5/gawk-3.1.5_fix_for_automake-1.12.patch
+++ b/yocto-poky/meta/recipes-extended/gawk/gawk-3.1.5/gawk-3.1.5_fix_for_automake-1.12.patch
diff --git a/meta/recipes-extended/gawk/gawk-4.1.3/run-ptest b/yocto-poky/meta/recipes-extended/gawk/gawk-4.1.3/run-ptest
index d23f0bf6d..d23f0bf6d 100644
--- a/meta/recipes-extended/gawk/gawk-4.1.3/run-ptest
+++ b/yocto-poky/meta/recipes-extended/gawk/gawk-4.1.3/run-ptest
diff --git a/meta/recipes-extended/gawk/gawk_3.1.5.bb b/yocto-poky/meta/recipes-extended/gawk/gawk_3.1.5.bb
index c7af4a9b7..c7af4a9b7 100644
--- a/meta/recipes-extended/gawk/gawk_3.1.5.bb
+++ b/yocto-poky/meta/recipes-extended/gawk/gawk_3.1.5.bb
diff --git a/meta/recipes-extended/gawk/gawk_4.1.3.bb b/yocto-poky/meta/recipes-extended/gawk/gawk_4.1.3.bb
index d1a88e45a..d1a88e45a 100644
--- a/meta/recipes-extended/gawk/gawk_4.1.3.bb
+++ b/yocto-poky/meta/recipes-extended/gawk/gawk_4.1.3.bb
diff --git a/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h
index a05de29de..a05de29de 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h
index e8772cd95..e8772cd95 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h
index 359097f35..359097f35 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch
index d97d4ecd7..d97d4ecd7 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch
diff --git a/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
index a1c9368cc..a1c9368cc 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
index e28a949bf..e28a949bf 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch
index bc29be507..bc29be507 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
index 797b8947c..797b8947c 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch
index d78648200..d78648200 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch
index 9158117d0..9158117d0 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch
diff --git a/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h
index 5817b7a6d..5817b7a6d 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/i686 b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/i686
index 87aaca590..87aaca590 120000
--- a/meta/recipes-extended/ghostscript/ghostscript/i686
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/i686
diff --git a/meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h
index 63232fdfa..63232fdfa 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h
index 3ec810168..3ec810168 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/mips/objarch.h b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mips/objarch.h
index b8b637cca..b8b637cca 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/mips/objarch.h
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mips/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/mips64/objarch.h b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mips64/objarch.h
index 0d0a16bfa..0d0a16bfa 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/mips64/objarch.h
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mips64/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/mips64el/objarch.h b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mips64el/objarch.h
index a05de29de..a05de29de 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/mips64el/objarch.h
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mips64el/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/mips64eln32/objarch.h b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mips64eln32/objarch.h
index a05de29de..a05de29de 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/mips64eln32/objarch.h
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mips64eln32/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/mips64n32/objarch.h b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mips64n32/objarch.h
index 0d0a16bfa..0d0a16bfa 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/mips64n32/objarch.h
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mips64n32/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/mipsel/objarch.h b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mipsel/objarch.h
index 29f90ddf8..29f90ddf8 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/mipsel/objarch.h
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mipsel/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/png_mak.patch b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/png_mak.patch
index da900ead3..da900ead3 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/png_mak.patch
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/png_mak.patch
diff --git a/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h
index 359097f35..359097f35 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h
index 0d0a16bfa..0d0a16bfa 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h
index a05de29de..a05de29de 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.16.bb b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript_9.16.bb
index d584c49b0..d584c49b0 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.16.bb
+++ b/yocto-poky/meta/recipes-extended/ghostscript/ghostscript_9.16.bb
diff --git a/meta/recipes-extended/gperf/gperf.inc b/yocto-poky/meta/recipes-extended/gperf/gperf.inc
index a8ce230f6..a8ce230f6 100644
--- a/meta/recipes-extended/gperf/gperf.inc
+++ b/yocto-poky/meta/recipes-extended/gperf/gperf.inc
diff --git a/meta/recipes-extended/gperf/gperf_3.0.3.bb b/yocto-poky/meta/recipes-extended/gperf/gperf_3.0.3.bb
index 772886121..772886121 100644
--- a/meta/recipes-extended/gperf/gperf_3.0.3.bb
+++ b/yocto-poky/meta/recipes-extended/gperf/gperf_3.0.3.bb
diff --git a/meta/recipes-extended/gperf/gperf_3.0.4.bb b/yocto-poky/meta/recipes-extended/gperf/gperf_3.0.4.bb
index 64003fc0b..64003fc0b 100644
--- a/meta/recipes-extended/gperf/gperf_3.0.4.bb
+++ b/yocto-poky/meta/recipes-extended/gperf/gperf_3.0.4.bb
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/Makevars b/yocto-poky/meta/recipes-extended/grep/grep-2.5.1a/Makevars
index 8b09f53b0..8b09f53b0 100644
--- a/meta/recipes-extended/grep/grep-2.5.1a/Makevars
+++ b/yocto-poky/meta/recipes-extended/grep/grep-2.5.1a/Makevars
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch b/yocto-poky/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch
index 5a4149cfc..5a4149cfc 100644
--- a/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch
+++ b/yocto-poky/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/fix64-int-to-pointer.patch b/yocto-poky/meta/recipes-extended/grep/grep-2.5.1a/fix64-int-to-pointer.patch
index 3b91520fb..3b91520fb 100644
--- a/meta/recipes-extended/grep/grep-2.5.1a/fix64-int-to-pointer.patch
+++ b/yocto-poky/meta/recipes-extended/grep/grep-2.5.1a/fix64-int-to-pointer.patch
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/gettext.patch b/yocto-poky/meta/recipes-extended/grep/grep-2.5.1a/gettext.patch
index 57463355a..57463355a 100644
--- a/meta/recipes-extended/grep/grep-2.5.1a/gettext.patch
+++ b/yocto-poky/meta/recipes-extended/grep/grep-2.5.1a/gettext.patch
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/grep-CVE-2012-5667.patch b/yocto-poky/meta/recipes-extended/grep/grep-2.5.1a/grep-CVE-2012-5667.patch
index 059d0687b..059d0687b 100644
--- a/meta/recipes-extended/grep/grep-2.5.1a/grep-CVE-2012-5667.patch
+++ b/yocto-poky/meta/recipes-extended/grep/grep-2.5.1a/grep-CVE-2012-5667.patch
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/grep-egrep-fgrep-Fix-LSB-NG-cases.patch b/yocto-poky/meta/recipes-extended/grep/grep-2.5.1a/grep-egrep-fgrep-Fix-LSB-NG-cases.patch
index 327ee5640..327ee5640 100644
--- a/meta/recipes-extended/grep/grep-2.5.1a/grep-egrep-fgrep-Fix-LSB-NG-cases.patch
+++ b/yocto-poky/meta/recipes-extended/grep/grep-2.5.1a/grep-egrep-fgrep-Fix-LSB-NG-cases.patch
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/grep_fix_for_automake-1.12.patch b/yocto-poky/meta/recipes-extended/grep/grep-2.5.1a/grep_fix_for_automake-1.12.patch
index 3ccce5fc3..3ccce5fc3 100644
--- a/meta/recipes-extended/grep/grep-2.5.1a/grep_fix_for_automake-1.12.patch
+++ b/yocto-poky/meta/recipes-extended/grep/grep-2.5.1a/grep_fix_for_automake-1.12.patch
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/uclibc-fix.patch b/yocto-poky/meta/recipes-extended/grep/grep-2.5.1a/uclibc-fix.patch
index de054fc75..de054fc75 100644
--- a/meta/recipes-extended/grep/grep-2.5.1a/uclibc-fix.patch
+++ b/yocto-poky/meta/recipes-extended/grep/grep-2.5.1a/uclibc-fix.patch
diff --git a/meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch
index ba1a4bab4..ba1a4bab4 100644
--- a/meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/yocto-poky/meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-extended/grep/grep/grep-fix-CVE-2015-1345.patch b/yocto-poky/meta/recipes-extended/grep/grep/grep-fix-CVE-2015-1345.patch
index e88a9880f..e88a9880f 100644
--- a/meta/recipes-extended/grep/grep/grep-fix-CVE-2015-1345.patch
+++ b/yocto-poky/meta/recipes-extended/grep/grep/grep-fix-CVE-2015-1345.patch
diff --git a/meta/recipes-extended/grep/grep_2.21.bb b/yocto-poky/meta/recipes-extended/grep/grep_2.21.bb
index c51147b57..c51147b57 100644
--- a/meta/recipes-extended/grep/grep_2.21.bb
+++ b/yocto-poky/meta/recipes-extended/grep/grep_2.21.bb
diff --git a/meta/recipes-extended/grep/grep_2.5.1a.bb b/yocto-poky/meta/recipes-extended/grep/grep_2.5.1a.bb
index 5a2da2832..5a2da2832 100644
--- a/meta/recipes-extended/grep/grep_2.5.1a.bb
+++ b/yocto-poky/meta/recipes-extended/grep/grep_2.5.1a.bb
diff --git a/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch b/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch
index 559ae7289..559ae7289 100644
--- a/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch
+++ b/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch
diff --git a/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch b/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch
index c24eff9af..c24eff9af 100644
--- a/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch
+++ b/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch
diff --git a/meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch b/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch
index e3f1aa6a4..e3f1aa6a4 100644
--- a/meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch
+++ b/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch
diff --git a/meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch b/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch
index 409c1a5a1..409c1a5a1 100644
--- a/meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch
+++ b/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch
diff --git a/meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch
index b61b43281..b61b43281 100644
--- a/meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/yocto-poky/meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch b/yocto-poky/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
index c73328a18..c73328a18 100644
--- a/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
+++ b/yocto-poky/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
diff --git a/meta/recipes-extended/groff/groff_1.18.1.4.bb b/yocto-poky/meta/recipes-extended/groff/groff_1.18.1.4.bb
index bd786a30a..bd786a30a 100644
--- a/meta/recipes-extended/groff/groff_1.18.1.4.bb
+++ b/yocto-poky/meta/recipes-extended/groff/groff_1.18.1.4.bb
diff --git a/meta/recipes-extended/groff/groff_1.22.3.bb b/yocto-poky/meta/recipes-extended/groff/groff_1.22.3.bb
index 4bffa814f..4bffa814f 100644
--- a/meta/recipes-extended/groff/groff_1.22.3.bb
+++ b/yocto-poky/meta/recipes-extended/groff/groff_1.22.3.bb
diff --git a/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch b/yocto-poky/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch
index d9e8d212b..d9e8d212b 100644
--- a/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch
+++ b/yocto-poky/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch
diff --git a/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch b/yocto-poky/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch
index 6b2f69870..6b2f69870 100644
--- a/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch
+++ b/yocto-poky/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch
diff --git a/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch b/yocto-poky/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch
index 92863d6c4..92863d6c4 100644
--- a/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch
+++ b/yocto-poky/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch
diff --git a/meta/recipes-extended/gzip/gzip.inc b/yocto-poky/meta/recipes-extended/gzip/gzip.inc
index 58e5e0c53..58e5e0c53 100644
--- a/meta/recipes-extended/gzip/gzip.inc
+++ b/yocto-poky/meta/recipes-extended/gzip/gzip.inc
diff --git a/meta/recipes-extended/gzip/gzip_1.3.12.bb b/yocto-poky/meta/recipes-extended/gzip/gzip_1.3.12.bb
index e4062827b..e4062827b 100644
--- a/meta/recipes-extended/gzip/gzip_1.3.12.bb
+++ b/yocto-poky/meta/recipes-extended/gzip/gzip_1.3.12.bb
diff --git a/meta/recipes-extended/gzip/gzip_1.6.bb b/yocto-poky/meta/recipes-extended/gzip/gzip_1.6.bb
index b347f0bb8..b347f0bb8 100644
--- a/meta/recipes-extended/gzip/gzip_1.6.bb
+++ b/yocto-poky/meta/recipes-extended/gzip/gzip_1.6.bb
diff --git a/meta/recipes-extended/hdparm/hdparm_9.48.bb b/yocto-poky/meta/recipes-extended/hdparm/hdparm_9.48.bb
index 8267fd902..8267fd902 100644
--- a/meta/recipes-extended/hdparm/hdparm_9.48.bb
+++ b/yocto-poky/meta/recipes-extended/hdparm/hdparm_9.48.bb
diff --git a/meta/recipes-extended/images/core-image-full-cmdline.bb b/yocto-poky/meta/recipes-extended/images/core-image-full-cmdline.bb
index 4d69073d9..4d69073d9 100644
--- a/meta/recipes-extended/images/core-image-full-cmdline.bb
+++ b/yocto-poky/meta/recipes-extended/images/core-image-full-cmdline.bb
diff --git a/meta/recipes-extended/images/core-image-kernel-dev.bb b/yocto-poky/meta/recipes-extended/images/core-image-kernel-dev.bb
index 6b636ed08..6b636ed08 100644
--- a/meta/recipes-extended/images/core-image-kernel-dev.bb
+++ b/yocto-poky/meta/recipes-extended/images/core-image-kernel-dev.bb
diff --git a/meta/recipes-extended/images/core-image-lsb-dev.bb b/yocto-poky/meta/recipes-extended/images/core-image-lsb-dev.bb
index d2dc9e2b5..d2dc9e2b5 100644
--- a/meta/recipes-extended/images/core-image-lsb-dev.bb
+++ b/yocto-poky/meta/recipes-extended/images/core-image-lsb-dev.bb
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/yocto-poky/meta/recipes-extended/images/core-image-lsb-sdk.bb
index c3b6e7c82..c3b6e7c82 100644
--- a/meta/recipes-extended/images/core-image-lsb-sdk.bb
+++ b/yocto-poky/meta/recipes-extended/images/core-image-lsb-sdk.bb
diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/yocto-poky/meta/recipes-extended/images/core-image-lsb.bb
index ab61c6e6d..ab61c6e6d 100644
--- a/meta/recipes-extended/images/core-image-lsb.bb
+++ b/yocto-poky/meta/recipes-extended/images/core-image-lsb.bb
diff --git a/meta/recipes-extended/images/core-image-testmaster-initramfs.bb b/yocto-poky/meta/recipes-extended/images/core-image-testmaster-initramfs.bb
index 563260d3b..563260d3b 100644
--- a/meta/recipes-extended/images/core-image-testmaster-initramfs.bb
+++ b/yocto-poky/meta/recipes-extended/images/core-image-testmaster-initramfs.bb
diff --git a/meta/recipes-extended/images/core-image-testmaster.bb b/yocto-poky/meta/recipes-extended/images/core-image-testmaster.bb
index 78295c5f0..78295c5f0 100644
--- a/meta/recipes-extended/images/core-image-testmaster.bb
+++ b/yocto-poky/meta/recipes-extended/images/core-image-testmaster.bb
diff --git a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch b/yocto-poky/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch
index ab609e27e..ab609e27e 100644
--- a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch
+++ b/yocto-poky/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch
diff --git a/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch b/yocto-poky/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch
index 7a003d912..7a003d912 100644
--- a/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch
+++ b/yocto-poky/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch
diff --git a/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch b/yocto-poky/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch
index 89ad8f666..89ad8f666 100644
--- a/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch
+++ b/yocto-poky/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch
diff --git a/meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch b/yocto-poky/meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch
index 24ee29e2d..24ee29e2d 100644
--- a/meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch
+++ b/yocto-poky/meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch
diff --git a/meta/recipes-extended/iptables/iptables_1.4.21.bb b/yocto-poky/meta/recipes-extended/iptables/iptables_1.4.21.bb
index deea5e514..deea5e514 100644
--- a/meta/recipes-extended/iptables/iptables_1.4.21.bb
+++ b/yocto-poky/meta/recipes-extended/iptables/iptables_1.4.21.bb
diff --git a/meta/recipes-extended/iputils/files/debian/targets.diff b/yocto-poky/meta/recipes-extended/iputils/files/debian/targets.diff
index 2cb5576c6..2cb5576c6 100644
--- a/meta/recipes-extended/iputils/files/debian/targets.diff
+++ b/yocto-poky/meta/recipes-extended/iputils/files/debian/targets.diff
diff --git a/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff b/yocto-poky/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff
index d3b18868c..d3b18868c 100644
--- a/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff
+++ b/yocto-poky/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff
diff --git a/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch b/yocto-poky/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch
index b9cd82ee8..b9cd82ee8 100644
--- a/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch
+++ b/yocto-poky/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch
diff --git a/meta/recipes-extended/iputils/files/nsgmls-path-fix.patch b/yocto-poky/meta/recipes-extended/iputils/files/nsgmls-path-fix.patch
index 92bf946f2..92bf946f2 100644
--- a/meta/recipes-extended/iputils/files/nsgmls-path-fix.patch
+++ b/yocto-poky/meta/recipes-extended/iputils/files/nsgmls-path-fix.patch
diff --git a/meta/recipes-extended/iputils/iputils_s20121221.bb b/yocto-poky/meta/recipes-extended/iputils/iputils_s20121221.bb
index e87a32a7d..e87a32a7d 100644
--- a/meta/recipes-extended/iputils/iputils_s20121221.bb
+++ b/yocto-poky/meta/recipes-extended/iputils/iputils_s20121221.bb
diff --git a/meta/recipes-extended/less/less_479.bb b/yocto-poky/meta/recipes-extended/less/less_479.bb
index 618954b0f..618954b0f 100644
--- a/meta/recipes-extended/less/less_479.bb
+++ b/yocto-poky/meta/recipes-extended/less/less_479.bb
diff --git a/meta/recipes-extended/libaio/libaio/00_arches.patch b/yocto-poky/meta/recipes-extended/libaio/libaio/00_arches.patch
index 9d6447d98..9d6447d98 100644
--- a/meta/recipes-extended/libaio/libaio/00_arches.patch
+++ b/yocto-poky/meta/recipes-extended/libaio/libaio/00_arches.patch
diff --git a/meta/recipes-extended/libaio/libaio/destdir.patch b/yocto-poky/meta/recipes-extended/libaio/libaio/destdir.patch
index dad9601c4..dad9601c4 100644
--- a/meta/recipes-extended/libaio/libaio/destdir.patch
+++ b/yocto-poky/meta/recipes-extended/libaio/libaio/destdir.patch
diff --git a/meta/recipes-extended/libaio/libaio/generic-arch-dectection-for-padding-defines.patch b/yocto-poky/meta/recipes-extended/libaio/libaio/generic-arch-dectection-for-padding-defines.patch
index bba7e554a..bba7e554a 100644
--- a/meta/recipes-extended/libaio/libaio/generic-arch-dectection-for-padding-defines.patch
+++ b/yocto-poky/meta/recipes-extended/libaio/libaio/generic-arch-dectection-for-padding-defines.patch
diff --git a/meta/recipes-extended/libaio/libaio/libaio_fix_for_mips_syscalls.patch b/yocto-poky/meta/recipes-extended/libaio/libaio/libaio_fix_for_mips_syscalls.patch
index 9c6850c08..9c6850c08 100644
--- a/meta/recipes-extended/libaio/libaio/libaio_fix_for_mips_syscalls.patch
+++ b/yocto-poky/meta/recipes-extended/libaio/libaio/libaio_fix_for_mips_syscalls.patch
diff --git a/meta/recipes-extended/libaio/libaio/libaio_fix_for_x32.patch b/yocto-poky/meta/recipes-extended/libaio/libaio/libaio_fix_for_x32.patch
index 508f5a12f..508f5a12f 100644
--- a/meta/recipes-extended/libaio/libaio/libaio_fix_for_x32.patch
+++ b/yocto-poky/meta/recipes-extended/libaio/libaio/libaio_fix_for_x32.patch
diff --git a/meta/recipes-extended/libaio/libaio/system-linkage.patch b/yocto-poky/meta/recipes-extended/libaio/libaio/system-linkage.patch
index 0b1f47569..0b1f47569 100644
--- a/meta/recipes-extended/libaio/libaio/system-linkage.patch
+++ b/yocto-poky/meta/recipes-extended/libaio/libaio/system-linkage.patch
diff --git a/meta/recipes-extended/libaio/libaio_0.3.110.bb b/yocto-poky/meta/recipes-extended/libaio/libaio_0.3.110.bb
index 2adfa0aa4..2adfa0aa4 100644
--- a/meta/recipes-extended/libaio/libaio_0.3.110.bb
+++ b/yocto-poky/meta/recipes-extended/libaio/libaio_0.3.110.bb
diff --git a/meta/recipes-extended/libarchive/libarchive/libarchive-CVE-2013-0211.patch b/yocto-poky/meta/recipes-extended/libarchive/libarchive/libarchive-CVE-2013-0211.patch
index 126f80e04..126f80e04 100644
--- a/meta/recipes-extended/libarchive/libarchive/libarchive-CVE-2013-0211.patch
+++ b/yocto-poky/meta/recipes-extended/libarchive/libarchive/libarchive-CVE-2013-0211.patch
diff --git a/meta/recipes-extended/libarchive/libarchive/libarchive-CVE-2015-2304.patch b/yocto-poky/meta/recipes-extended/libarchive/libarchive/libarchive-CVE-2015-2304.patch
index 4ca779c40..4ca779c40 100644
--- a/meta/recipes-extended/libarchive/libarchive/libarchive-CVE-2015-2304.patch
+++ b/yocto-poky/meta/recipes-extended/libarchive/libarchive/libarchive-CVE-2015-2304.patch
diff --git a/meta/recipes-extended/libarchive/libarchive/mkdir.patch b/yocto-poky/meta/recipes-extended/libarchive/libarchive/mkdir.patch
index 509a2957a..509a2957a 100644
--- a/meta/recipes-extended/libarchive/libarchive/mkdir.patch
+++ b/yocto-poky/meta/recipes-extended/libarchive/libarchive/mkdir.patch
diff --git a/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch b/yocto-poky/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch
index 346af9135..346af9135 100644
--- a/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch
+++ b/yocto-poky/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch
diff --git a/meta/recipes-extended/libarchive/libarchive_3.1.2.bb b/yocto-poky/meta/recipes-extended/libarchive/libarchive_3.1.2.bb
index 716db9aff..716db9aff 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.1.2.bb
+++ b/yocto-poky/meta/recipes-extended/libarchive/libarchive_3.1.2.bb
diff --git a/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch b/yocto-poky/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
index 3476bb959..3476bb959 100644
--- a/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
+++ b/yocto-poky/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
diff --git a/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch b/yocto-poky/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
index 0863530f2..0863530f2 100644
--- a/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
+++ b/yocto-poky/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
diff --git a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/yocto-poky/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
index 20afd257b..20afd257b 100644
--- a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
+++ b/yocto-poky/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
diff --git a/meta/recipes-extended/libidn/libidn_0.6.14.bb b/yocto-poky/meta/recipes-extended/libidn/libidn_0.6.14.bb
index 4df1d08d8..4df1d08d8 100644
--- a/meta/recipes-extended/libidn/libidn_0.6.14.bb
+++ b/yocto-poky/meta/recipes-extended/libidn/libidn_0.6.14.bb
diff --git a/meta/recipes-extended/libidn/libidn_1.30.bb b/yocto-poky/meta/recipes-extended/libidn/libidn_1.30.bb
index 723474715..723474715 100644
--- a/meta/recipes-extended/libidn/libidn_1.30.bb
+++ b/yocto-poky/meta/recipes-extended/libidn/libidn_1.30.bb
diff --git a/meta/recipes-extended/libtirpc/libtirpc/libtirpc-0.2.1-fortify.patch b/yocto-poky/meta/recipes-extended/libtirpc/libtirpc/libtirpc-0.2.1-fortify.patch
index 4a785d344..4a785d344 100644
--- a/meta/recipes-extended/libtirpc/libtirpc/libtirpc-0.2.1-fortify.patch
+++ b/yocto-poky/meta/recipes-extended/libtirpc/libtirpc/libtirpc-0.2.1-fortify.patch
diff --git a/meta/recipes-extended/libtirpc/libtirpc/remove-des-uclibc.patch b/yocto-poky/meta/recipes-extended/libtirpc/libtirpc/remove-des-uclibc.patch
index 553b1ffb8..553b1ffb8 100644
--- a/meta/recipes-extended/libtirpc/libtirpc/remove-des-uclibc.patch
+++ b/yocto-poky/meta/recipes-extended/libtirpc/libtirpc/remove-des-uclibc.patch
diff --git a/meta/recipes-extended/libtirpc/libtirpc/va_list.patch b/yocto-poky/meta/recipes-extended/libtirpc/libtirpc/va_list.patch
index 855d15b58..855d15b58 100644
--- a/meta/recipes-extended/libtirpc/libtirpc/va_list.patch
+++ b/yocto-poky/meta/recipes-extended/libtirpc/libtirpc/va_list.patch
diff --git a/meta/recipes-extended/libtirpc/libtirpc_0.2.5.bb b/yocto-poky/meta/recipes-extended/libtirpc/libtirpc_0.2.5.bb
index 330b82991..330b82991 100644
--- a/meta/recipes-extended/libtirpc/libtirpc_0.2.5.bb
+++ b/yocto-poky/meta/recipes-extended/libtirpc/libtirpc_0.2.5.bb
diff --git a/meta/recipes-extended/libuser/libuser_0.62.bb b/yocto-poky/meta/recipes-extended/libuser/libuser_0.62.bb
index c4ed45959..c4ed45959 100644
--- a/meta/recipes-extended/libuser/libuser_0.62.bb
+++ b/yocto-poky/meta/recipes-extended/libuser/libuser_0.62.bb
diff --git a/meta/recipes-extended/lighttpd/lighttpd/0001-mod_cgi-buffers-data-without-bound.patch b/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/0001-mod_cgi-buffers-data-without-bound.patch
index a9df1744a..a9df1744a 100644
--- a/meta/recipes-extended/lighttpd/lighttpd/0001-mod_cgi-buffers-data-without-bound.patch
+++ b/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/0001-mod_cgi-buffers-data-without-bound.patch
diff --git a/meta/recipes-extended/lighttpd/lighttpd/index.html.lighttpd b/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/index.html.lighttpd
index f5f1c377b..f5f1c377b 100644
--- a/meta/recipes-extended/lighttpd/lighttpd/index.html.lighttpd
+++ b/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/index.html.lighttpd
diff --git a/meta/recipes-extended/lighttpd/lighttpd/lighttpd b/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd
index bf89a60b7..bf89a60b7 100644
--- a/meta/recipes-extended/lighttpd/lighttpd/lighttpd
+++ b/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd
diff --git a/meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf b/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf
index 6e8402d24..6e8402d24 100644
--- a/meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf
+++ b/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf
diff --git a/meta/recipes-extended/lighttpd/lighttpd/lighttpd.service b/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd.service
index 66a907aa1..66a907aa1 100644
--- a/meta/recipes-extended/lighttpd/lighttpd/lighttpd.service
+++ b/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd.service
diff --git a/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch b/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch
index e395f928c..e395f928c 100644
--- a/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch
+++ b/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.36.bb b/yocto-poky/meta/recipes-extended/lighttpd/lighttpd_1.4.36.bb
index 67b6e3749..67b6e3749 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.36.bb
+++ b/yocto-poky/meta/recipes-extended/lighttpd/lighttpd_1.4.36.bb
diff --git a/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch b/yocto-poky/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
index 2e931a287..2e931a287 100644
--- a/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
+++ b/yocto-poky/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
diff --git a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch b/yocto-poky/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
index 793d70259..793d70259 100644
--- a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
+++ b/yocto-poky/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
diff --git a/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch b/yocto-poky/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch
index 50d037d5a..50d037d5a 100644
--- a/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch
+++ b/yocto-poky/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch
diff --git a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb b/yocto-poky/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
index 5f1a601ae..5f1a601ae 100644
--- a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
+++ b/yocto-poky/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
diff --git a/meta/recipes-extended/lsb/lsb/init-functions b/yocto-poky/meta/recipes-extended/lsb/lsb/init-functions
index 7c1dce24c..7c1dce24c 100755
--- a/meta/recipes-extended/lsb/lsb/init-functions
+++ b/yocto-poky/meta/recipes-extended/lsb/lsb/init-functions
diff --git a/meta/recipes-extended/lsb/lsb/lsb_killproc b/yocto-poky/meta/recipes-extended/lsb/lsb/lsb_killproc
index 866c1a9c6..866c1a9c6 100755
--- a/meta/recipes-extended/lsb/lsb/lsb_killproc
+++ b/yocto-poky/meta/recipes-extended/lsb/lsb/lsb_killproc
diff --git a/meta/recipes-extended/lsb/lsb/lsb_log_message b/yocto-poky/meta/recipes-extended/lsb/lsb/lsb_log_message
index 10343b081..10343b081 100755
--- a/meta/recipes-extended/lsb/lsb/lsb_log_message
+++ b/yocto-poky/meta/recipes-extended/lsb/lsb/lsb_log_message
diff --git a/meta/recipes-extended/lsb/lsb/lsb_pidofproc b/yocto-poky/meta/recipes-extended/lsb/lsb/lsb_pidofproc
index 6d1fd0f24..6d1fd0f24 100755
--- a/meta/recipes-extended/lsb/lsb/lsb_pidofproc
+++ b/yocto-poky/meta/recipes-extended/lsb/lsb/lsb_pidofproc
diff --git a/meta/recipes-extended/lsb/lsb/lsb_start_daemon b/yocto-poky/meta/recipes-extended/lsb/lsb/lsb_start_daemon
index de62c2344..de62c2344 100755
--- a/meta/recipes-extended/lsb/lsb/lsb_start_daemon
+++ b/yocto-poky/meta/recipes-extended/lsb/lsb/lsb_start_daemon
diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/yocto-poky/meta/recipes-extended/lsb/lsb_4.1.bb
index c9f6a8bd9..c9f6a8bd9 100644
--- a/meta/recipes-extended/lsb/lsb_4.1.bb
+++ b/yocto-poky/meta/recipes-extended/lsb/lsb_4.1.bb
diff --git a/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch b/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch
index 0809c9be9..0809c9be9 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch
+++ b/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch
diff --git a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
index a756d047e..a756d047e 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
+++ b/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.64.bb b/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts_9.64.bb
index 150f6f230..150f6f230 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts_9.64.bb
+++ b/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts_9.64.bb
diff --git a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh b/yocto-poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
index b9971a17d..b9971a17d 100644
--- a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
+++ b/yocto-poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
diff --git a/meta/recipes-extended/lsb/lsbtest/packages_list b/yocto-poky/meta/recipes-extended/lsb/lsbtest/packages_list
index 27d8352d9..27d8352d9 100644
--- a/meta/recipes-extended/lsb/lsbtest/packages_list
+++ b/yocto-poky/meta/recipes-extended/lsb/lsbtest/packages_list
diff --git a/meta/recipes-extended/lsb/lsbtest/session b/yocto-poky/meta/recipes-extended/lsb/lsbtest/session
index 85ca2efe9..85ca2efe9 100644
--- a/meta/recipes-extended/lsb/lsbtest/session
+++ b/yocto-poky/meta/recipes-extended/lsb/lsbtest/session
diff --git a/meta/recipes-extended/lsb/lsbtest_1.0.bb b/yocto-poky/meta/recipes-extended/lsb/lsbtest_1.0.bb
index ea12502dc..ea12502dc 100644
--- a/meta/recipes-extended/lsb/lsbtest_1.0.bb
+++ b/yocto-poky/meta/recipes-extended/lsb/lsbtest_1.0.bb
diff --git a/meta/recipes-extended/lsof/lsof_4.89.bb b/yocto-poky/meta/recipes-extended/lsof/lsof_4.89.bb
index 9b7de9aad..9b7de9aad 100644
--- a/meta/recipes-extended/lsof/lsof_4.89.bb
+++ b/yocto-poky/meta/recipes-extended/lsof/lsof_4.89.bb
diff --git a/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch b/yocto-poky/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
index 1b4d2324a..1b4d2324a 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
+++ b/yocto-poky/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
diff --git a/meta/recipes-extended/ltp/ltp/0001-ltp-vma03-fix-the-alginment-of-page-size.patch b/yocto-poky/meta/recipes-extended/ltp/ltp/0001-ltp-vma03-fix-the-alginment-of-page-size.patch
index 905eafb99..905eafb99 100644
--- a/meta/recipes-extended/ltp/ltp/0001-ltp-vma03-fix-the-alginment-of-page-size.patch
+++ b/yocto-poky/meta/recipes-extended/ltp/ltp/0001-ltp-vma03-fix-the-alginment-of-page-size.patch
diff --git a/meta/recipes-extended/ltp/ltp/0001-replace-inline-with-static-inline-for-gcc-5.x.patch b/yocto-poky/meta/recipes-extended/ltp/ltp/0001-replace-inline-with-static-inline-for-gcc-5.x.patch
index 0b594dc55..0b594dc55 100644
--- a/meta/recipes-extended/ltp/ltp/0001-replace-inline-with-static-inline-for-gcc-5.x.patch
+++ b/yocto-poky/meta/recipes-extended/ltp/ltp/0001-replace-inline-with-static-inline-for-gcc-5.x.patch
diff --git a/meta/recipes-extended/ltp/ltp/add-knob-for-numa.patch b/yocto-poky/meta/recipes-extended/ltp/ltp/add-knob-for-numa.patch
index 064f00ae3..064f00ae3 100644
--- a/meta/recipes-extended/ltp/ltp/add-knob-for-numa.patch
+++ b/yocto-poky/meta/recipes-extended/ltp/ltp/add-knob-for-numa.patch
diff --git a/meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch b/yocto-poky/meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch
index 36ff4c775..36ff4c775 100644
--- a/meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch
+++ b/yocto-poky/meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch
diff --git a/meta/recipes-extended/ltp/ltp/ltp-Do-not-link-against-libfl.patch b/yocto-poky/meta/recipes-extended/ltp/ltp/ltp-Do-not-link-against-libfl.patch
index 20fd4c369..20fd4c369 100644
--- a/meta/recipes-extended/ltp/ltp/ltp-Do-not-link-against-libfl.patch
+++ b/yocto-poky/meta/recipes-extended/ltp/ltp/ltp-Do-not-link-against-libfl.patch
diff --git a/meta/recipes-extended/ltp/ltp/make-setregid02-work.patch b/yocto-poky/meta/recipes-extended/ltp/ltp/make-setregid02-work.patch
index 4836010bd..4836010bd 100644
--- a/meta/recipes-extended/ltp/ltp/make-setregid02-work.patch
+++ b/yocto-poky/meta/recipes-extended/ltp/ltp/make-setregid02-work.patch
diff --git a/meta/recipes-extended/ltp/ltp_20150420.bb b/yocto-poky/meta/recipes-extended/ltp/ltp_20150420.bb
index ed46b5e09..ed46b5e09 100644
--- a/meta/recipes-extended/ltp/ltp_20150420.bb
+++ b/yocto-poky/meta/recipes-extended/ltp/ltp_20150420.bb
diff --git a/meta/recipes-extended/mailx/files/0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch b/yocto-poky/meta/recipes-extended/mailx/files/0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch
index 77da33321..77da33321 100644
--- a/meta/recipes-extended/mailx/files/0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch
+++ b/yocto-poky/meta/recipes-extended/mailx/files/0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch
diff --git a/meta/recipes-extended/mailx/files/0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch b/yocto-poky/meta/recipes-extended/mailx/files/0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch
index 6bad433ea..6bad433ea 100644
--- a/meta/recipes-extended/mailx/files/0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch
+++ b/yocto-poky/meta/recipes-extended/mailx/files/0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch
diff --git a/meta/recipes-extended/mailx/files/0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch b/yocto-poky/meta/recipes-extended/mailx/files/0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch
index 13b73ae59..13b73ae59 100644
--- a/meta/recipes-extended/mailx/files/0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch
+++ b/yocto-poky/meta/recipes-extended/mailx/files/0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch
diff --git a/meta/recipes-extended/mailx/files/0011-outof-Introduce-expandaddr-flag.patch b/yocto-poky/meta/recipes-extended/mailx/files/0011-outof-Introduce-expandaddr-flag.patch
index 5d616458b..5d616458b 100644
--- a/meta/recipes-extended/mailx/files/0011-outof-Introduce-expandaddr-flag.patch
+++ b/yocto-poky/meta/recipes-extended/mailx/files/0011-outof-Introduce-expandaddr-flag.patch
diff --git a/meta/recipes-extended/mailx/files/0012-unpack-Disable-option-processing-for-email-addresses.patch b/yocto-poky/meta/recipes-extended/mailx/files/0012-unpack-Disable-option-processing-for-email-addresses.patch
index 8cdbfd8b0..8cdbfd8b0 100644
--- a/meta/recipes-extended/mailx/files/0012-unpack-Disable-option-processing-for-email-addresses.patch
+++ b/yocto-poky/meta/recipes-extended/mailx/files/0012-unpack-Disable-option-processing-for-email-addresses.patch
diff --git a/meta/recipes-extended/mailx/files/0013-fio.c-Unconditionally-require-wordexp-support.patch b/yocto-poky/meta/recipes-extended/mailx/files/0013-fio.c-Unconditionally-require-wordexp-support.patch
index 5558d8639..5558d8639 100644
--- a/meta/recipes-extended/mailx/files/0013-fio.c-Unconditionally-require-wordexp-support.patch
+++ b/yocto-poky/meta/recipes-extended/mailx/files/0013-fio.c-Unconditionally-require-wordexp-support.patch
diff --git a/meta/recipes-extended/mailx/files/0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch b/yocto-poky/meta/recipes-extended/mailx/files/0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch
index f65cfa8ca..f65cfa8ca 100644
--- a/meta/recipes-extended/mailx/files/0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch
+++ b/yocto-poky/meta/recipes-extended/mailx/files/0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch
diff --git a/meta/recipes-extended/mailx/files/0015-usr-sbin-sendmail.patch b/yocto-poky/meta/recipes-extended/mailx/files/0015-usr-sbin-sendmail.patch
index 2b5991425..2b5991425 100644
--- a/meta/recipes-extended/mailx/files/0015-usr-sbin-sendmail.patch
+++ b/yocto-poky/meta/recipes-extended/mailx/files/0015-usr-sbin-sendmail.patch
diff --git a/meta/recipes-extended/mailx/files/explicitly.disable.krb5.support.patch b/yocto-poky/meta/recipes-extended/mailx/files/explicitly.disable.krb5.support.patch
index b74fd0472..b74fd0472 100644
--- a/meta/recipes-extended/mailx/files/explicitly.disable.krb5.support.patch
+++ b/yocto-poky/meta/recipes-extended/mailx/files/explicitly.disable.krb5.support.patch
diff --git a/meta/recipes-extended/mailx/mailx_12.5-5.bb b/yocto-poky/meta/recipes-extended/mailx/mailx_12.5-5.bb
index c87c58258..c87c58258 100644
--- a/meta/recipes-extended/mailx/mailx_12.5-5.bb
+++ b/yocto-poky/meta/recipes-extended/mailx/mailx_12.5-5.bb
diff --git a/meta/recipes-extended/man-pages/man-pages_4.02.bb b/yocto-poky/meta/recipes-extended/man-pages/man-pages_4.02.bb
index 1b90a44f9..1b90a44f9 100644
--- a/meta/recipes-extended/man-pages/man-pages_4.02.bb
+++ b/yocto-poky/meta/recipes-extended/man-pages/man-pages_4.02.bb
diff --git a/meta/recipes-extended/man/man/configure_sed.patch b/yocto-poky/meta/recipes-extended/man/man/configure_sed.patch
index d49e6831d..d49e6831d 100644
--- a/meta/recipes-extended/man/man/configure_sed.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/configure_sed.patch
diff --git a/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
index 6f834bd01..6f834bd01 100644
--- a/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
diff --git a/meta/recipes-extended/man/man/man-1.5h1-gencat.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
index 044b14c50..044b14c50 100644
--- a/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
diff --git a/meta/recipes-extended/man/man/man-1.5h1-make.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5h1-make.patch
index 8631eb2c5..8631eb2c5 100644
--- a/meta/recipes-extended/man/man/man-1.5h1-make.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5h1-make.patch
diff --git a/meta/recipes-extended/man/man/man-1.5i2-initial.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5i2-initial.patch
index fe56c0706..fe56c0706 100644
--- a/meta/recipes-extended/man/man/man-1.5i2-initial.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5i2-initial.patch
diff --git a/meta/recipes-extended/man/man/man-1.5i2-newline.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5i2-newline.patch
index 611df5d25..611df5d25 100644
--- a/meta/recipes-extended/man/man/man-1.5i2-newline.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5i2-newline.patch
diff --git a/meta/recipes-extended/man/man/man-1.5i2-overflow.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
index 52d2881a8..52d2881a8 100644
--- a/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
diff --git a/meta/recipes-extended/man/man/man-1.5j-i18n.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5j-i18n.patch
index 2ae09c0ea..2ae09c0ea 100644
--- a/meta/recipes-extended/man/man/man-1.5j-i18n.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5j-i18n.patch
diff --git a/meta/recipes-extended/man/man/man-1.5j-nocache.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5j-nocache.patch
index 751dddd53..751dddd53 100644
--- a/meta/recipes-extended/man/man/man-1.5j-nocache.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5j-nocache.patch
diff --git a/meta/recipes-extended/man/man/man-1.5j-utf8.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5j-utf8.patch
index 33d3e4c97..33d3e4c97 100644
--- a/meta/recipes-extended/man/man/man-1.5j-utf8.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5j-utf8.patch
diff --git a/meta/recipes-extended/man/man/man-1.5k-confpath.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5k-confpath.patch
index b5746c2df..b5746c2df 100644
--- a/meta/recipes-extended/man/man/man-1.5k-confpath.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5k-confpath.patch
diff --git a/meta/recipes-extended/man/man/man-1.5k-nonascii.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
index d662d9b6a..d662d9b6a 100644
--- a/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
diff --git a/meta/recipes-extended/man/man/man-1.5k-sofix.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5k-sofix.patch
index 50b925288..50b925288 100644
--- a/meta/recipes-extended/man/man/man-1.5k-sofix.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5k-sofix.patch
diff --git a/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
index 051299906..051299906 100644
--- a/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
diff --git a/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
index bc97f56b9..bc97f56b9 100644
--- a/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
diff --git a/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
index c85ff1d8c..c85ff1d8c 100644
--- a/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
diff --git a/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
index 8af78eab7..8af78eab7 100644
--- a/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
diff --git a/meta/recipes-extended/man/man/man-1.5m2-tv_fhs.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-tv_fhs.patch
index fe66d7599..fe66d7599 100644
--- a/meta/recipes-extended/man/man/man-1.5m2-tv_fhs.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-tv_fhs.patch
diff --git a/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
index e321325d6..e321325d6 100644
--- a/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
diff --git a/meta/recipes-extended/man/man/man-1.6e-mandirs.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
index b240064c9..b240064c9 100644
--- a/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
diff --git a/meta/recipes-extended/man/man/man-1.6e-new_sections.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
index fb9773c64..fb9773c64 100644
--- a/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
diff --git a/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
index 1d1cb0c72..1d1cb0c72 100644
--- a/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
diff --git a/meta/recipes-extended/man/man/man-1.6e-security.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.6e-security.patch
index 312a882f0..312a882f0 100644
--- a/meta/recipes-extended/man/man/man-1.6e-security.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.6e-security.patch
diff --git a/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch
index 568f74210..568f74210 100644
--- a/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch
diff --git a/meta/recipes-extended/man/man/man-1.6e-whatis2.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
index fc4ed3135..fc4ed3135 100644
--- a/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
diff --git a/meta/recipes-extended/man/man/man-1.6g-whatis3.patch b/yocto-poky/meta/recipes-extended/man/man/man-1.6g-whatis3.patch
index 633445685..633445685 100644
--- a/meta/recipes-extended/man/man/man-1.6g-whatis3.patch
+++ b/yocto-poky/meta/recipes-extended/man/man/man-1.6g-whatis3.patch
diff --git a/meta/recipes-extended/man/man/man.1.gz b/yocto-poky/meta/recipes-extended/man/man/man.1.gz
index c36804515..c36804515 100644
--- a/meta/recipes-extended/man/man/man.1.gz
+++ b/yocto-poky/meta/recipes-extended/man/man/man.1.gz
diff --git a/meta/recipes-extended/man/man/man.7.gz b/yocto-poky/meta/recipes-extended/man/man/man.7.gz
index e85af8242..e85af8242 100644
--- a/meta/recipes-extended/man/man/man.7.gz
+++ b/yocto-poky/meta/recipes-extended/man/man/man.7.gz
diff --git a/meta/recipes-extended/man/man/man.conf b/yocto-poky/meta/recipes-extended/man/man/man.conf
index fc10be275..fc10be275 100644
--- a/meta/recipes-extended/man/man/man.conf
+++ b/yocto-poky/meta/recipes-extended/man/man/man.conf
diff --git a/meta/recipes-extended/man/man/manpath.5.gz b/yocto-poky/meta/recipes-extended/man/man/manpath.5.gz
index c012ff897..c012ff897 100644
--- a/meta/recipes-extended/man/man/manpath.5.gz
+++ b/yocto-poky/meta/recipes-extended/man/man/manpath.5.gz
diff --git a/meta/recipes-extended/man/man_1.6g.bb b/yocto-poky/meta/recipes-extended/man/man_1.6g.bb
index fa4736b29..fa4736b29 100644
--- a/meta/recipes-extended/man/man_1.6g.bb
+++ b/yocto-poky/meta/recipes-extended/man/man_1.6g.bb
diff --git a/meta/recipes-extended/mc/mc/mc-CTRL.patch b/yocto-poky/meta/recipes-extended/mc/mc/mc-CTRL.patch
index ee4ba9f26..ee4ba9f26 100644
--- a/meta/recipes-extended/mc/mc/mc-CTRL.patch
+++ b/yocto-poky/meta/recipes-extended/mc/mc/mc-CTRL.patch
diff --git a/meta/recipes-extended/mc/mc_4.7.5.2.bb b/yocto-poky/meta/recipes-extended/mc/mc_4.7.5.2.bb
index b47eb0232..b47eb0232 100644
--- a/meta/recipes-extended/mc/mc_4.7.5.2.bb
+++ b/yocto-poky/meta/recipes-extended/mc/mc_4.7.5.2.bb
diff --git a/meta/recipes-extended/mc/mc_4.8.14.bb b/yocto-poky/meta/recipes-extended/mc/mc_4.8.14.bb
index 3b6c2ffec..3b6c2ffec 100644
--- a/meta/recipes-extended/mc/mc_4.8.14.bb
+++ b/yocto-poky/meta/recipes-extended/mc/mc_4.8.14.bb
diff --git a/meta/recipes-extended/mdadm/files/0001-Fix-typo-in-comparision.patch b/yocto-poky/meta/recipes-extended/mdadm/files/0001-Fix-typo-in-comparision.patch
index df70b1cf4..df70b1cf4 100644
--- a/meta/recipes-extended/mdadm/files/0001-Fix-typo-in-comparision.patch
+++ b/yocto-poky/meta/recipes-extended/mdadm/files/0001-Fix-typo-in-comparision.patch
diff --git a/meta/recipes-extended/mdadm/files/gcc-4.9.patch b/yocto-poky/meta/recipes-extended/mdadm/files/gcc-4.9.patch
index 54bf1d79a..54bf1d79a 100644
--- a/meta/recipes-extended/mdadm/files/gcc-4.9.patch
+++ b/yocto-poky/meta/recipes-extended/mdadm/files/gcc-4.9.patch
diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch b/yocto-poky/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch
index 3b3db0a7f..3b3db0a7f 100644
--- a/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch
+++ b/yocto-poky/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch
diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch b/yocto-poky/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
index c656d073e..c656d073e 100644
--- a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
+++ b/yocto-poky/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
diff --git a/meta/recipes-extended/mdadm/files/run-ptest b/yocto-poky/meta/recipes-extended/mdadm/files/run-ptest
index 5b276090f..5b276090f 100644
--- a/meta/recipes-extended/mdadm/files/run-ptest
+++ b/yocto-poky/meta/recipes-extended/mdadm/files/run-ptest
diff --git a/meta/recipes-extended/mdadm/mdadm_3.3.4.bb b/yocto-poky/meta/recipes-extended/mdadm/mdadm_3.3.4.bb
index 11981670e..11981670e 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.3.4.bb
+++ b/yocto-poky/meta/recipes-extended/mdadm/mdadm_3.3.4.bb
diff --git a/meta/recipes-extended/mingetty/mingetty_1.08.bb b/yocto-poky/meta/recipes-extended/mingetty/mingetty_1.08.bb
index 3c16228b0..3c16228b0 100644
--- a/meta/recipes-extended/mingetty/mingetty_1.08.bb
+++ b/yocto-poky/meta/recipes-extended/mingetty/mingetty_1.08.bb
diff --git a/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch b/yocto-poky/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch
index fec67fdd3..fec67fdd3 100644
--- a/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch
+++ b/yocto-poky/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch
diff --git a/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch b/yocto-poky/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch
index bd8261c97..bd8261c97 100644
--- a/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch
+++ b/yocto-poky/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch
diff --git a/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch b/yocto-poky/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch
index f5c08896f..f5c08896f 100644
--- a/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch
+++ b/yocto-poky/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch
diff --git a/meta/recipes-extended/minicom/minicom_2.7.bb b/yocto-poky/meta/recipes-extended/minicom/minicom_2.7.bb
index 1575cfbc7..1575cfbc7 100644
--- a/meta/recipes-extended/minicom/minicom_2.7.bb
+++ b/yocto-poky/meta/recipes-extended/minicom/minicom_2.7.bb
diff --git a/meta/recipes-extended/mktemp/files/disable-strip.patch b/yocto-poky/meta/recipes-extended/mktemp/files/disable-strip.patch
index e06869e3a..e06869e3a 100644
--- a/meta/recipes-extended/mktemp/files/disable-strip.patch
+++ b/yocto-poky/meta/recipes-extended/mktemp/files/disable-strip.patch
diff --git a/meta/recipes-extended/mktemp/files/fix-parallel-make.patch b/yocto-poky/meta/recipes-extended/mktemp/files/fix-parallel-make.patch
index f3b6dcc34..f3b6dcc34 100644
--- a/meta/recipes-extended/mktemp/files/fix-parallel-make.patch
+++ b/yocto-poky/meta/recipes-extended/mktemp/files/fix-parallel-make.patch
diff --git a/meta/recipes-extended/mktemp/mktemp_1.7.bb b/yocto-poky/meta/recipes-extended/mktemp/mktemp_1.7.bb
index fe238eea3..fe238eea3 100644
--- a/meta/recipes-extended/mktemp/mktemp_1.7.bb
+++ b/yocto-poky/meta/recipes-extended/mktemp/mktemp_1.7.bb
diff --git a/meta/recipes-extended/msmtp/msmtp_1.6.2.bb b/yocto-poky/meta/recipes-extended/msmtp/msmtp_1.6.2.bb
index f9bf5631b..f9bf5631b 100644
--- a/meta/recipes-extended/msmtp/msmtp_1.6.2.bb
+++ b/yocto-poky/meta/recipes-extended/msmtp/msmtp_1.6.2.bb
diff --git a/meta/recipes-extended/net-tools/net-tools/ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch b/yocto-poky/meta/recipes-extended/net-tools/net-tools/ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch
index 06f81420e..06f81420e 100644
--- a/meta/recipes-extended/net-tools/net-tools/ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch
+++ b/yocto-poky/meta/recipes-extended/net-tools/net-tools/ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch
diff --git a/meta/recipes-extended/net-tools/net-tools/net-tools-config.h b/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-config.h
index 6d39c2a8c..6d39c2a8c 100644
--- a/meta/recipes-extended/net-tools/net-tools/net-tools-config.h
+++ b/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-config.h
diff --git a/meta/recipes-extended/net-tools/net-tools/net-tools-config.make b/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-config.make
index ec516f27e..ec516f27e 100644
--- a/meta/recipes-extended/net-tools/net-tools/net-tools-config.make
+++ b/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-config.make
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/yocto-poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
index aefc1e6e7..aefc1e6e7 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
+++ b/yocto-poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
diff --git a/meta/recipes-extended/newt/files/cross_ar.patch b/yocto-poky/meta/recipes-extended/newt/files/cross_ar.patch
index 03007aa4f..03007aa4f 100644
--- a/meta/recipes-extended/newt/files/cross_ar.patch
+++ b/yocto-poky/meta/recipes-extended/newt/files/cross_ar.patch
diff --git a/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch b/yocto-poky/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch
index b0a1e8c10..b0a1e8c10 100644
--- a/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch
+++ b/yocto-poky/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch
diff --git a/meta/recipes-extended/newt/files/remove_slang_include.patch b/yocto-poky/meta/recipes-extended/newt/files/remove_slang_include.patch
index a2634ec75..a2634ec75 100644
--- a/meta/recipes-extended/newt/files/remove_slang_include.patch
+++ b/yocto-poky/meta/recipes-extended/newt/files/remove_slang_include.patch
diff --git a/meta/recipes-extended/newt/libnewt-python_0.52.18.bb b/yocto-poky/meta/recipes-extended/newt/libnewt-python_0.52.18.bb
index 94a41a38e..94a41a38e 100644
--- a/meta/recipes-extended/newt/libnewt-python_0.52.18.bb
+++ b/yocto-poky/meta/recipes-extended/newt/libnewt-python_0.52.18.bb
diff --git a/meta/recipes-extended/newt/libnewt_0.52.18.bb b/yocto-poky/meta/recipes-extended/newt/libnewt_0.52.18.bb
index 302e418a9..302e418a9 100644
--- a/meta/recipes-extended/newt/libnewt_0.52.18.bb
+++ b/yocto-poky/meta/recipes-extended/newt/libnewt_0.52.18.bb
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/yocto-poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
index 1d7e6089e..1d7e6089e 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
+++ b/yocto-poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/yocto-poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index ce823858c..ce823858c 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/yocto-poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
diff --git a/meta/recipes-extended/pam/libpam/99_pam b/yocto-poky/meta/recipes-extended/pam/libpam/99_pam
index 97e990d10..97e990d10 100644
--- a/meta/recipes-extended/pam/libpam/99_pam
+++ b/yocto-poky/meta/recipes-extended/pam/libpam/99_pam
diff --git a/meta/recipes-extended/pam/libpam/crypt_configure.patch b/yocto-poky/meta/recipes-extended/pam/libpam/crypt_configure.patch
index bec82a5f1..bec82a5f1 100644
--- a/meta/recipes-extended/pam/libpam/crypt_configure.patch
+++ b/yocto-poky/meta/recipes-extended/pam/libpam/crypt_configure.patch
diff --git a/meta/recipes-extended/pam/libpam/fixsepbuild.patch b/yocto-poky/meta/recipes-extended/pam/libpam/fixsepbuild.patch
index 8a9c3b2fa..8a9c3b2fa 100644
--- a/meta/recipes-extended/pam/libpam/fixsepbuild.patch
+++ b/yocto-poky/meta/recipes-extended/pam/libpam/fixsepbuild.patch
diff --git a/meta/recipes-extended/pam/libpam/libpam-xtests-remove-bash-dependency.patch b/yocto-poky/meta/recipes-extended/pam/libpam/libpam-xtests-remove-bash-dependency.patch
index 680029ae0..680029ae0 100644
--- a/meta/recipes-extended/pam/libpam/libpam-xtests-remove-bash-dependency.patch
+++ b/yocto-poky/meta/recipes-extended/pam/libpam/libpam-xtests-remove-bash-dependency.patch
diff --git a/meta/recipes-extended/pam/libpam/libpam-xtests.patch b/yocto-poky/meta/recipes-extended/pam/libpam/libpam-xtests.patch
index be687457f..be687457f 100644
--- a/meta/recipes-extended/pam/libpam/libpam-xtests.patch
+++ b/yocto-poky/meta/recipes-extended/pam/libpam/libpam-xtests.patch
diff --git a/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch b/yocto-poky/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch
index 5e551ac48..5e551ac48 100644
--- a/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch
+++ b/yocto-poky/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch
diff --git a/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch b/yocto-poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch
index f1834f6ce..f1834f6ce 100644
--- a/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch
+++ b/yocto-poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch
diff --git a/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch b/yocto-poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch
index 3241e8295..3241e8295 100644
--- a/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch
+++ b/yocto-poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch
diff --git a/meta/recipes-extended/pam/libpam/pam.d/common-account b/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-account
index 316b17337..316b17337 100644
--- a/meta/recipes-extended/pam/libpam/pam.d/common-account
+++ b/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-account
diff --git a/meta/recipes-extended/pam/libpam/pam.d/common-auth b/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-auth
index 460b69f19..460b69f19 100644
--- a/meta/recipes-extended/pam/libpam/pam.d/common-auth
+++ b/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-auth
diff --git a/meta/recipes-extended/pam/libpam/pam.d/common-password b/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-password
index 389605732..389605732 100644
--- a/meta/recipes-extended/pam/libpam/pam.d/common-password
+++ b/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-password
diff --git a/meta/recipes-extended/pam/libpam/pam.d/common-session b/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-session
index a4a551f71..a4a551f71 100644
--- a/meta/recipes-extended/pam/libpam/pam.d/common-session
+++ b/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-session
diff --git a/meta/recipes-extended/pam/libpam/pam.d/common-session-noninteractive b/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-session-noninteractive
index b110bb2b4..b110bb2b4 100644
--- a/meta/recipes-extended/pam/libpam/pam.d/common-session-noninteractive
+++ b/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-session-noninteractive
diff --git a/meta/recipes-extended/pam/libpam/pam.d/other b/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/other
index ec970ecbe..ec970ecbe 100644
--- a/meta/recipes-extended/pam/libpam/pam.d/other
+++ b/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/other
diff --git a/meta/recipes-extended/pam/libpam/use-utmpx.patch b/yocto-poky/meta/recipes-extended/pam/libpam/use-utmpx.patch
index dd04bbb84..dd04bbb84 100644
--- a/meta/recipes-extended/pam/libpam/use-utmpx.patch
+++ b/yocto-poky/meta/recipes-extended/pam/libpam/use-utmpx.patch
diff --git a/meta/recipes-extended/pam/libpam_1.2.1.bb b/yocto-poky/meta/recipes-extended/pam/libpam_1.2.1.bb
index 035335656..035335656 100644
--- a/meta/recipes-extended/pam/libpam_1.2.1.bb
+++ b/yocto-poky/meta/recipes-extended/pam/libpam_1.2.1.bb
diff --git a/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch b/yocto-poky/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch
index b0376cefc..b0376cefc 100644
--- a/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch
+++ b/yocto-poky/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch
diff --git a/meta/recipes-extended/parted/files/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-extended/parted/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
index ba1a4bab4..ba1a4bab4 100644
--- a/meta/recipes-extended/parted/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/yocto-poky/meta/recipes-extended/parted/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-extended/parted/files/Makefile b/yocto-poky/meta/recipes-extended/parted/files/Makefile
index ee90be081..ee90be081 100644
--- a/meta/recipes-extended/parted/files/Makefile
+++ b/yocto-poky/meta/recipes-extended/parted/files/Makefile
diff --git a/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch b/yocto-poky/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch
index 68ab715f3..68ab715f3 100644
--- a/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch
+++ b/yocto-poky/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch
diff --git a/meta/recipes-extended/parted/files/fix-doc-mandir.patch b/yocto-poky/meta/recipes-extended/parted/files/fix-doc-mandir.patch
index 0711d4e29..0711d4e29 100644
--- a/meta/recipes-extended/parted/files/fix-doc-mandir.patch
+++ b/yocto-poky/meta/recipes-extended/parted/files/fix-doc-mandir.patch
diff --git a/meta/recipes-extended/parted/files/no_check.patch b/yocto-poky/meta/recipes-extended/parted/files/no_check.patch
index 58d8db442..58d8db442 100644
--- a/meta/recipes-extended/parted/files/no_check.patch
+++ b/yocto-poky/meta/recipes-extended/parted/files/no_check.patch
diff --git a/meta/recipes-extended/parted/files/run-ptest b/yocto-poky/meta/recipes-extended/parted/files/run-ptest
index 695c5e8a7..695c5e8a7 100644
--- a/meta/recipes-extended/parted/files/run-ptest
+++ b/yocto-poky/meta/recipes-extended/parted/files/run-ptest
diff --git a/meta/recipes-extended/parted/files/syscalls.patch b/yocto-poky/meta/recipes-extended/parted/files/syscalls.patch
index e9bbe9a95..e9bbe9a95 100644
--- a/meta/recipes-extended/parted/files/syscalls.patch
+++ b/yocto-poky/meta/recipes-extended/parted/files/syscalls.patch
diff --git a/meta/recipes-extended/parted/parted_3.2.bb b/yocto-poky/meta/recipes-extended/parted/parted_3.2.bb
index ff8ae097c..ff8ae097c 100644
--- a/meta/recipes-extended/parted/parted_3.2.bb
+++ b/yocto-poky/meta/recipes-extended/parted/parted_3.2.bb
diff --git a/meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch b/yocto-poky/meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch
index 88779c3bb..88779c3bb 100644
--- a/meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch
+++ b/yocto-poky/meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch
diff --git a/meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch b/yocto-poky/meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch
index 80878f38b..80878f38b 100644
--- a/meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch
+++ b/yocto-poky/meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch
diff --git a/meta/recipes-extended/pax/pax_3.4.bb b/yocto-poky/meta/recipes-extended/pax/pax_3.4.bb
index ad04871a8..ad04871a8 100644
--- a/meta/recipes-extended/pax/pax_3.4.bb
+++ b/yocto-poky/meta/recipes-extended/pax/pax_3.4.bb
diff --git a/meta/recipes-extended/pbzip2/pbzip2_1.1.12.bb b/yocto-poky/meta/recipes-extended/pbzip2/pbzip2_1.1.12.bb
index 0330981af..0330981af 100644
--- a/meta/recipes-extended/pbzip2/pbzip2_1.1.12.bb
+++ b/yocto-poky/meta/recipes-extended/pbzip2/pbzip2_1.1.12.bb
diff --git a/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb b/yocto-poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb
index 170e7ecde..170e7ecde 100644
--- a/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb
+++ b/yocto-poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb
diff --git a/meta/recipes-extended/perl/libtimedate-perl_2.30.bb b/yocto-poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb
index c8fcde45f..c8fcde45f 100644
--- a/meta/recipes-extended/perl/libtimedate-perl_2.30.bb
+++ b/yocto-poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb
diff --git a/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.11.bb b/yocto-poky/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.11.bb
index 9a9e71011..9a9e71011 100644
--- a/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.11.bb
+++ b/yocto-poky/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.11.bb
diff --git a/meta/recipes-extended/perl/libxml-sax-base-perl_1.08.bb b/yocto-poky/meta/recipes-extended/perl/libxml-sax-base-perl_1.08.bb
index 14a337057..14a337057 100644
--- a/meta/recipes-extended/perl/libxml-sax-base-perl_1.08.bb
+++ b/yocto-poky/meta/recipes-extended/perl/libxml-sax-base-perl_1.08.bb
diff --git a/meta/recipes-extended/perl/libxml-sax-perl_0.99.bb b/yocto-poky/meta/recipes-extended/perl/libxml-sax-perl_0.99.bb
index 45d396639..45d396639 100644
--- a/meta/recipes-extended/perl/libxml-sax-perl_0.99.bb
+++ b/yocto-poky/meta/recipes-extended/perl/libxml-sax-perl_0.99.bb
diff --git a/meta/recipes-extended/pigz/pigz.inc b/yocto-poky/meta/recipes-extended/pigz/pigz.inc
index cb8991dcd..cb8991dcd 100644
--- a/meta/recipes-extended/pigz/pigz.inc
+++ b/yocto-poky/meta/recipes-extended/pigz/pigz.inc
diff --git a/meta/recipes-extended/pigz/pigz/link-order.patch b/yocto-poky/meta/recipes-extended/pigz/pigz/link-order.patch
index 4becc0e3f..4becc0e3f 100644
--- a/meta/recipes-extended/pigz/pigz/link-order.patch
+++ b/yocto-poky/meta/recipes-extended/pigz/pigz/link-order.patch
diff --git a/meta/recipes-extended/pigz/pigz_2.3.3.bb b/yocto-poky/meta/recipes-extended/pigz/pigz_2.3.3.bb
index 080be2bbc..080be2bbc 100644
--- a/meta/recipes-extended/pigz/pigz_2.3.3.bb
+++ b/yocto-poky/meta/recipes-extended/pigz/pigz_2.3.3.bb
diff --git a/meta/recipes-extended/procps/procps/fix-configure.patch b/yocto-poky/meta/recipes-extended/procps/procps/fix-configure.patch
index 934ae8095..934ae8095 100644
--- a/meta/recipes-extended/procps/procps/fix-configure.patch
+++ b/yocto-poky/meta/recipes-extended/procps/procps/fix-configure.patch
diff --git a/meta/recipes-extended/procps/procps/sysctl.conf b/yocto-poky/meta/recipes-extended/procps/procps/sysctl.conf
index 34e7488bf..34e7488bf 100644
--- a/meta/recipes-extended/procps/procps/sysctl.conf
+++ b/yocto-poky/meta/recipes-extended/procps/procps/sysctl.conf
diff --git a/meta/recipes-extended/procps/procps_3.3.10.bb b/yocto-poky/meta/recipes-extended/procps/procps_3.3.10.bb
index dcfaba71f..dcfaba71f 100644
--- a/meta/recipes-extended/procps/procps_3.3.10.bb
+++ b/yocto-poky/meta/recipes-extended/procps/procps_3.3.10.bb
diff --git a/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch b/yocto-poky/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
index e57d60f6a..e57d60f6a 100644
--- a/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
+++ b/yocto-poky/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
diff --git a/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch b/yocto-poky/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch
index c8afcac8a..c8afcac8a 100644
--- a/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch
+++ b/yocto-poky/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch
diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/yocto-poky/meta/recipes-extended/psmisc/psmisc.inc
index 68e06561f..68e06561f 100644
--- a/meta/recipes-extended/psmisc/psmisc.inc
+++ b/yocto-poky/meta/recipes-extended/psmisc/psmisc.inc
diff --git a/meta/recipes-extended/psmisc/psmisc_22.21.bb b/yocto-poky/meta/recipes-extended/psmisc/psmisc_22.21.bb
index 66aba9ec5..66aba9ec5 100644
--- a/meta/recipes-extended/psmisc/psmisc_22.21.bb
+++ b/yocto-poky/meta/recipes-extended/psmisc/psmisc_22.21.bb
diff --git a/meta/recipes-extended/quota/quota/config-tcpwrappers.patch b/yocto-poky/meta/recipes-extended/quota/quota/config-tcpwrappers.patch
index 5f47fbd18..5f47fbd18 100644
--- a/meta/recipes-extended/quota/quota/config-tcpwrappers.patch
+++ b/yocto-poky/meta/recipes-extended/quota/quota/config-tcpwrappers.patch
diff --git a/meta/recipes-extended/quota/quota/fcntl.patch b/yocto-poky/meta/recipes-extended/quota/quota/fcntl.patch
index 27e60fd07..27e60fd07 100644
--- a/meta/recipes-extended/quota/quota/fcntl.patch
+++ b/yocto-poky/meta/recipes-extended/quota/quota/fcntl.patch
diff --git a/meta/recipes-extended/quota/quota/remove_non_posix_types.patch b/yocto-poky/meta/recipes-extended/quota/quota/remove_non_posix_types.patch
index 06ff13cb9..06ff13cb9 100644
--- a/meta/recipes-extended/quota/quota/remove_non_posix_types.patch
+++ b/yocto-poky/meta/recipes-extended/quota/quota/remove_non_posix_types.patch
diff --git a/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch b/yocto-poky/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch
index 9ca2ffc0d..9ca2ffc0d 100644
--- a/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch
+++ b/yocto-poky/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch
diff --git a/meta/recipes-extended/quota/quota_4.02.bb b/yocto-poky/meta/recipes-extended/quota/quota_4.02.bb
index 673d58428..673d58428 100644
--- a/meta/recipes-extended/quota/quota_4.02.bb
+++ b/yocto-poky/meta/recipes-extended/quota/quota_4.02.bb
diff --git a/meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch
index eeef9f152..eeef9f152 100644
--- a/meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch
+++ b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch
diff --git a/meta/recipes-extended/rpcbind/rpcbind/cve-2015-7236.patch b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/cve-2015-7236.patch
index f156290bf..f156290bf 100644
--- a/meta/recipes-extended/rpcbind/rpcbind/cve-2015-7236.patch
+++ b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/cve-2015-7236.patch
diff --git a/meta/recipes-extended/rpcbind/rpcbind/init.d b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/init.d
index 67499aa82..67499aa82 100644
--- a/meta/recipes-extended/rpcbind/rpcbind/init.d
+++ b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/init.d
diff --git a/meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch
index 9c72a1bdf..9c72a1bdf 100644
--- a/meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch
+++ b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch
diff --git a/meta/recipes-extended/rpcbind/rpcbind/remove-sys-queue.patch b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/remove-sys-queue.patch
index 84fc974fd..84fc974fd 100644
--- a/meta/recipes-extended/rpcbind/rpcbind/remove-sys-queue.patch
+++ b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/remove-sys-queue.patch
diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
index 2a4dfbcfb..2a4dfbcfb 100644
--- a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
+++ b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
index b3ae2541a..b3ae2541a 100644
--- a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
+++ b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.socket b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.socket
index d63c1d972..d63c1d972 100644
--- a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.socket
+++ b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.socket
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
index ecd3ba8a5..ecd3ba8a5 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
+++ b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
diff --git a/meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch b/yocto-poky/meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch
index 2bc9a59be..2bc9a59be 100644
--- a/meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch
+++ b/yocto-poky/meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch
diff --git a/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch b/yocto-poky/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
index 40ecef00b..40ecef00b 100644
--- a/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
+++ b/yocto-poky/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
diff --git a/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch b/yocto-poky/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
index b5d71cc1b..b5d71cc1b 100644
--- a/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
+++ b/yocto-poky/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
diff --git a/meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch b/yocto-poky/meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch
index e184aa1f3..e184aa1f3 100644
--- a/meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch
+++ b/yocto-poky/meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch
diff --git a/meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch b/yocto-poky/meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch
index 248bf087e..248bf087e 100644
--- a/meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch
+++ b/yocto-poky/meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch
diff --git a/meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch b/yocto-poky/meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch
index cc62c12e0..cc62c12e0 100644
--- a/meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch
+++ b/yocto-poky/meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch
diff --git a/meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch b/yocto-poky/meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch
index d7e55a445..d7e55a445 100644
--- a/meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch
+++ b/yocto-poky/meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch
diff --git a/meta/recipes-extended/screen/screen/fix-parallel-make.patch b/yocto-poky/meta/recipes-extended/screen/screen/fix-parallel-make.patch
index e0caf5d83..e0caf5d83 100644
--- a/meta/recipes-extended/screen/screen/fix-parallel-make.patch
+++ b/yocto-poky/meta/recipes-extended/screen/screen/fix-parallel-make.patch
diff --git a/meta/recipes-extended/screen/screen/screen.pam b/yocto-poky/meta/recipes-extended/screen/screen/screen.pam
index ff657fa07..ff657fa07 100644
--- a/meta/recipes-extended/screen/screen/screen.pam
+++ b/yocto-poky/meta/recipes-extended/screen/screen/screen.pam
diff --git a/meta/recipes-extended/screen/screen_4.3.1.bb b/yocto-poky/meta/recipes-extended/screen/screen_4.3.1.bb
index 00d878b2c..00d878b2c 100644
--- a/meta/recipes-extended/screen/screen_4.3.1.bb
+++ b/yocto-poky/meta/recipes-extended/screen/screen_4.3.1.bb
diff --git a/meta/recipes-extended/sed/sed-4.1.2/Makevars b/yocto-poky/meta/recipes-extended/sed/sed-4.1.2/Makevars
index 8b09f53b0..8b09f53b0 100644
--- a/meta/recipes-extended/sed/sed-4.1.2/Makevars
+++ b/yocto-poky/meta/recipes-extended/sed/sed-4.1.2/Makevars
diff --git a/meta/recipes-extended/sed/sed-4.1.2/fix_return_type.patch b/yocto-poky/meta/recipes-extended/sed/sed-4.1.2/fix_return_type.patch
index 836551ea1..836551ea1 100644
--- a/meta/recipes-extended/sed/sed-4.1.2/fix_return_type.patch
+++ b/yocto-poky/meta/recipes-extended/sed/sed-4.1.2/fix_return_type.patch
diff --git a/meta/recipes-extended/sed/sed-4.1.2/sed-4.1.2_fix_for_automake-1.12.patch b/yocto-poky/meta/recipes-extended/sed/sed-4.1.2/sed-4.1.2_fix_for_automake-1.12.patch
index 80594068a..80594068a 100644
--- a/meta/recipes-extended/sed/sed-4.1.2/sed-4.1.2_fix_for_automake-1.12.patch
+++ b/yocto-poky/meta/recipes-extended/sed/sed-4.1.2/sed-4.1.2_fix_for_automake-1.12.patch
diff --git a/meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch
index ba1a4bab4..ba1a4bab4 100644
--- a/meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/yocto-poky/meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-extended/sed/sed-4.2.2/run-ptest b/yocto-poky/meta/recipes-extended/sed/sed-4.2.2/run-ptest
index 7c0f62770..7c0f62770 100644
--- a/meta/recipes-extended/sed/sed-4.2.2/run-ptest
+++ b/yocto-poky/meta/recipes-extended/sed/sed-4.2.2/run-ptest
diff --git a/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch b/yocto-poky/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch
index 105e8b745..105e8b745 100644
--- a/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch
+++ b/yocto-poky/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch
diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/yocto-poky/meta/recipes-extended/sed/sed_4.1.2.bb
index 40e3a53ce..40e3a53ce 100644
--- a/meta/recipes-extended/sed/sed_4.1.2.bb
+++ b/yocto-poky/meta/recipes-extended/sed/sed_4.1.2.bb
diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb b/yocto-poky/meta/recipes-extended/sed/sed_4.2.2.bb
index 5aa7d8a07..5aa7d8a07 100644
--- a/meta/recipes-extended/sed/sed_4.2.2.bb
+++ b/yocto-poky/meta/recipes-extended/sed/sed_4.2.2.bb
diff --git a/meta/recipes-extended/shadow/files/0001-Do-not-read-login.defs-before-doing-chroot.patch b/yocto-poky/meta/recipes-extended/shadow/files/0001-Do-not-read-login.defs-before-doing-chroot.patch
index 828b95a57..828b95a57 100644
--- a/meta/recipes-extended/shadow/files/0001-Do-not-read-login.defs-before-doing-chroot.patch
+++ b/yocto-poky/meta/recipes-extended/shadow/files/0001-Do-not-read-login.defs-before-doing-chroot.patch
diff --git a/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch b/yocto-poky/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch
index 85dde8e1b..85dde8e1b 100644
--- a/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch
+++ b/yocto-poky/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch
diff --git a/meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch b/yocto-poky/meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch
index 68da25f40..68da25f40 100644
--- a/meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch
+++ b/yocto-poky/meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch
diff --git a/meta/recipes-extended/shadow/files/check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch b/yocto-poky/meta/recipes-extended/shadow/files/check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch
index 185590cab..185590cab 100644
--- a/meta/recipes-extended/shadow/files/check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch
+++ b/yocto-poky/meta/recipes-extended/shadow/files/check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch
diff --git a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch b/yocto-poky/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch
index 4fa3d184e..4fa3d184e 100644
--- a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch
+++ b/yocto-poky/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch
diff --git a/meta/recipes-extended/shadow/files/disable-syslog.patch b/yocto-poky/meta/recipes-extended/shadow/files/disable-syslog.patch
index 1943fd6fa..1943fd6fa 100644
--- a/meta/recipes-extended/shadow/files/disable-syslog.patch
+++ b/yocto-poky/meta/recipes-extended/shadow/files/disable-syslog.patch
diff --git a/meta/recipes-extended/shadow/files/fix-installation-failure-with-subids-disabled.patch b/yocto-poky/meta/recipes-extended/shadow/files/fix-installation-failure-with-subids-disabled.patch
index 02cb91aaf..02cb91aaf 100644
--- a/meta/recipes-extended/shadow/files/fix-installation-failure-with-subids-disabled.patch
+++ b/yocto-poky/meta/recipes-extended/shadow/files/fix-installation-failure-with-subids-disabled.patch
diff --git a/meta/recipes-extended/shadow/files/login.defs_shadow-sysroot b/yocto-poky/meta/recipes-extended/shadow/files/login.defs_shadow-sysroot
index 8a68dd341..8a68dd341 100644
--- a/meta/recipes-extended/shadow/files/login.defs_shadow-sysroot
+++ b/yocto-poky/meta/recipes-extended/shadow/files/login.defs_shadow-sysroot
diff --git a/meta/recipes-extended/shadow/files/login_defs_pam.sed b/yocto-poky/meta/recipes-extended/shadow/files/login_defs_pam.sed
index 0a1f3be4a..0a1f3be4a 100644
--- a/meta/recipes-extended/shadow/files/login_defs_pam.sed
+++ b/yocto-poky/meta/recipes-extended/shadow/files/login_defs_pam.sed
diff --git a/meta/recipes-extended/shadow/files/pam.d/chfn b/yocto-poky/meta/recipes-extended/shadow/files/pam.d/chfn
index baf7698bb..baf7698bb 100644
--- a/meta/recipes-extended/shadow/files/pam.d/chfn
+++ b/yocto-poky/meta/recipes-extended/shadow/files/pam.d/chfn
diff --git a/meta/recipes-extended/shadow/files/pam.d/chpasswd b/yocto-poky/meta/recipes-extended/shadow/files/pam.d/chpasswd
index 9e3efa68b..9e3efa68b 100644
--- a/meta/recipes-extended/shadow/files/pam.d/chpasswd
+++ b/yocto-poky/meta/recipes-extended/shadow/files/pam.d/chpasswd
diff --git a/meta/recipes-extended/shadow/files/pam.d/chsh b/yocto-poky/meta/recipes-extended/shadow/files/pam.d/chsh
index 8fb169f64..8fb169f64 100644
--- a/meta/recipes-extended/shadow/files/pam.d/chsh
+++ b/yocto-poky/meta/recipes-extended/shadow/files/pam.d/chsh
diff --git a/meta/recipes-extended/shadow/files/pam.d/login b/yocto-poky/meta/recipes-extended/shadow/files/pam.d/login
index b34005853..b34005853 100644
--- a/meta/recipes-extended/shadow/files/pam.d/login
+++ b/yocto-poky/meta/recipes-extended/shadow/files/pam.d/login
diff --git a/meta/recipes-extended/shadow/files/pam.d/newusers b/yocto-poky/meta/recipes-extended/shadow/files/pam.d/newusers
index 4aa3dde48..4aa3dde48 100644
--- a/meta/recipes-extended/shadow/files/pam.d/newusers
+++ b/yocto-poky/meta/recipes-extended/shadow/files/pam.d/newusers
diff --git a/meta/recipes-extended/shadow/files/pam.d/passwd b/yocto-poky/meta/recipes-extended/shadow/files/pam.d/passwd
index f53499243..f53499243 100644
--- a/meta/recipes-extended/shadow/files/pam.d/passwd
+++ b/yocto-poky/meta/recipes-extended/shadow/files/pam.d/passwd
diff --git a/meta/recipes-extended/shadow/files/pam.d/su b/yocto-poky/meta/recipes-extended/shadow/files/pam.d/su
index 8d590a32e..8d590a32e 100644
--- a/meta/recipes-extended/shadow/files/pam.d/su
+++ b/yocto-poky/meta/recipes-extended/shadow/files/pam.d/su
diff --git a/meta/recipes-extended/shadow/files/securetty b/yocto-poky/meta/recipes-extended/shadow/files/securetty
index 2be341a21..2be341a21 100644
--- a/meta/recipes-extended/shadow/files/securetty
+++ b/yocto-poky/meta/recipes-extended/shadow/files/securetty
diff --git a/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch b/yocto-poky/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch
index a7bb0a929..a7bb0a929 100644
--- a/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch
+++ b/yocto-poky/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch
diff --git a/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch b/yocto-poky/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
index 15f8044fa..15f8044fa 100644
--- a/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
+++ b/yocto-poky/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
diff --git a/meta/recipes-extended/shadow/files/usermod-fix-compilation-failure-with-subids-disabled.patch b/yocto-poky/meta/recipes-extended/shadow/files/usermod-fix-compilation-failure-with-subids-disabled.patch
index 37dc153fc..37dc153fc 100644
--- a/meta/recipes-extended/shadow/files/usermod-fix-compilation-failure-with-subids-disabled.patch
+++ b/yocto-poky/meta/recipes-extended/shadow/files/usermod-fix-compilation-failure-with-subids-disabled.patch
diff --git a/meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb b/yocto-poky/meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb
index c78f888cf..c78f888cf 100644
--- a/meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb
+++ b/yocto-poky/meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb
diff --git a/meta/recipes-extended/shadow/shadow-sysroot_4.2.1.bb b/yocto-poky/meta/recipes-extended/shadow/shadow-sysroot_4.2.1.bb
index 697569c47..697569c47 100644
--- a/meta/recipes-extended/shadow/shadow-sysroot_4.2.1.bb
+++ b/yocto-poky/meta/recipes-extended/shadow/shadow-sysroot_4.2.1.bb
diff --git a/meta/recipes-extended/shadow/shadow.inc b/yocto-poky/meta/recipes-extended/shadow/shadow.inc
index 4313ffe95..4313ffe95 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/yocto-poky/meta/recipes-extended/shadow/shadow.inc
diff --git a/meta/recipes-extended/shadow/shadow_4.2.1.bb b/yocto-poky/meta/recipes-extended/shadow/shadow_4.2.1.bb
index 5675cb8cc..5675cb8cc 100644
--- a/meta/recipes-extended/shadow/shadow_4.2.1.bb
+++ b/yocto-poky/meta/recipes-extended/shadow/shadow_4.2.1.bb
diff --git a/meta/recipes-extended/slang/slang/0001-Fix-error-conflicting-types-for-posix_close.patch b/yocto-poky/meta/recipes-extended/slang/slang/0001-Fix-error-conflicting-types-for-posix_close.patch
index 57ebfe432..57ebfe432 100644
--- a/meta/recipes-extended/slang/slang/0001-Fix-error-conflicting-types-for-posix_close.patch
+++ b/yocto-poky/meta/recipes-extended/slang/slang/0001-Fix-error-conflicting-types-for-posix_close.patch
diff --git a/meta/recipes-extended/slang/slang/change-char-type-to-signed-char-in-macros.patch b/yocto-poky/meta/recipes-extended/slang/slang/change-char-type-to-signed-char-in-macros.patch
index 2ea1ffda5..2ea1ffda5 100644
--- a/meta/recipes-extended/slang/slang/change-char-type-to-signed-char-in-macros.patch
+++ b/yocto-poky/meta/recipes-extended/slang/slang/change-char-type-to-signed-char-in-macros.patch
diff --git a/meta/recipes-extended/slang/slang/fix-check-pcre.patch b/yocto-poky/meta/recipes-extended/slang/slang/fix-check-pcre.patch
index 0c1553a66..0c1553a66 100644
--- a/meta/recipes-extended/slang/slang/fix-check-pcre.patch
+++ b/yocto-poky/meta/recipes-extended/slang/slang/fix-check-pcre.patch
diff --git a/meta/recipes-extended/slang/slang/rpathfix.patch b/yocto-poky/meta/recipes-extended/slang/slang/rpathfix.patch
index 50cac9264..50cac9264 100644
--- a/meta/recipes-extended/slang/slang/rpathfix.patch
+++ b/yocto-poky/meta/recipes-extended/slang/slang/rpathfix.patch
diff --git a/meta/recipes-extended/slang/slang/slang-fix-the-iconv-existence-checking.patch b/yocto-poky/meta/recipes-extended/slang/slang/slang-fix-the-iconv-existence-checking.patch
index 958fe983c..958fe983c 100644
--- a/meta/recipes-extended/slang/slang/slang-fix-the-iconv-existence-checking.patch
+++ b/yocto-poky/meta/recipes-extended/slang/slang/slang-fix-the-iconv-existence-checking.patch
diff --git a/meta/recipes-extended/slang/slang/sprintf-bug-concerning-8-bit-characters.patch b/yocto-poky/meta/recipes-extended/slang/slang/sprintf-bug-concerning-8-bit-characters.patch
index 420001b08..420001b08 100644
--- a/meta/recipes-extended/slang/slang/sprintf-bug-concerning-8-bit-characters.patch
+++ b/yocto-poky/meta/recipes-extended/slang/slang/sprintf-bug-concerning-8-bit-characters.patch
diff --git a/meta/recipes-extended/slang/slang_2.2.4.bb b/yocto-poky/meta/recipes-extended/slang/slang_2.2.4.bb
index 5122f53da..5122f53da 100644
--- a/meta/recipes-extended/slang/slang_2.2.4.bb
+++ b/yocto-poky/meta/recipes-extended/slang/slang_2.2.4.bb
diff --git a/meta/recipes-extended/stat/stat-3.3/fix-error-return.patch b/yocto-poky/meta/recipes-extended/stat/stat-3.3/fix-error-return.patch
index 032995db8..032995db8 100644
--- a/meta/recipes-extended/stat/stat-3.3/fix-error-return.patch
+++ b/yocto-poky/meta/recipes-extended/stat/stat-3.3/fix-error-return.patch
diff --git a/meta/recipes-extended/stat/stat_3.3.bb b/yocto-poky/meta/recipes-extended/stat/stat_3.3.bb
index 651831e31..651831e31 100644
--- a/meta/recipes-extended/stat/stat_3.3.bb
+++ b/yocto-poky/meta/recipes-extended/stat/stat_3.3.bb
diff --git a/meta/recipes-extended/stress/files/texinfo.patch b/yocto-poky/meta/recipes-extended/stress/files/texinfo.patch
index 5ac595192..5ac595192 100644
--- a/meta/recipes-extended/stress/files/texinfo.patch
+++ b/yocto-poky/meta/recipes-extended/stress/files/texinfo.patch
diff --git a/meta/recipes-extended/stress/stress_1.0.4.bb b/yocto-poky/meta/recipes-extended/stress/stress_1.0.4.bb
index 4b7e4bab7..4b7e4bab7 100644
--- a/meta/recipes-extended/stress/stress_1.0.4.bb
+++ b/yocto-poky/meta/recipes-extended/stress/stress_1.0.4.bb
diff --git a/meta/recipes-extended/sudo/files/sudo.pam b/yocto-poky/meta/recipes-extended/sudo/files/sudo.pam
index 5bc26e702..5bc26e702 100644
--- a/meta/recipes-extended/sudo/files/sudo.pam
+++ b/yocto-poky/meta/recipes-extended/sudo/files/sudo.pam
diff --git a/meta/recipes-extended/sudo/sudo.inc b/yocto-poky/meta/recipes-extended/sudo/sudo.inc
index a25876b7f..a25876b7f 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/yocto-poky/meta/recipes-extended/sudo/sudo.inc
diff --git a/meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch b/yocto-poky/meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch
index eb36cd49b..eb36cd49b 100644
--- a/meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch
+++ b/yocto-poky/meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch
diff --git a/meta/recipes-extended/sudo/sudo/0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch b/yocto-poky/meta/recipes-extended/sudo/sudo/0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch
index 2418689da..2418689da 100644
--- a/meta/recipes-extended/sudo/sudo/0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch
+++ b/yocto-poky/meta/recipes-extended/sudo/sudo/0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch
diff --git a/meta/recipes-extended/sudo/sudo_1.8.14p3.bb b/yocto-poky/meta/recipes-extended/sudo/sudo_1.8.14p3.bb
index b93112fa3..b93112fa3 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.14p3.bb
+++ b/yocto-poky/meta/recipes-extended/sudo/sudo_1.8.14p3.bb
diff --git a/meta/recipes-extended/sysklogd/files/no-strip-install.patch b/yocto-poky/meta/recipes-extended/sysklogd/files/no-strip-install.patch
index 00fba7101..00fba7101 100644
--- a/meta/recipes-extended/sysklogd/files/no-strip-install.patch
+++ b/yocto-poky/meta/recipes-extended/sysklogd/files/no-strip-install.patch
diff --git a/meta/recipes-extended/sysklogd/files/no-vectorization.patch b/yocto-poky/meta/recipes-extended/sysklogd/files/no-vectorization.patch
index c1cc042c9..c1cc042c9 100644
--- a/meta/recipes-extended/sysklogd/files/no-vectorization.patch
+++ b/yocto-poky/meta/recipes-extended/sysklogd/files/no-vectorization.patch
diff --git a/meta/recipes-extended/sysklogd/files/sysklogd b/yocto-poky/meta/recipes-extended/sysklogd/files/sysklogd
index 258f88280..258f88280 100755
--- a/meta/recipes-extended/sysklogd/files/sysklogd
+++ b/yocto-poky/meta/recipes-extended/sysklogd/files/sysklogd
diff --git a/meta/recipes-extended/sysklogd/files/syslog.conf b/yocto-poky/meta/recipes-extended/sysklogd/files/syslog.conf
index 0849de126..0849de126 100644
--- a/meta/recipes-extended/sysklogd/files/syslog.conf
+++ b/yocto-poky/meta/recipes-extended/sysklogd/files/syslog.conf
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/yocto-poky/meta/recipes-extended/sysklogd/sysklogd.inc
index bcf8aa7a9..bcf8aa7a9 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/yocto-poky/meta/recipes-extended/sysklogd/sysklogd.inc
diff --git a/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb b/yocto-poky/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb
index 975ecc2b6..975ecc2b6 100644
--- a/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb
+++ b/yocto-poky/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/yocto-poky/meta/recipes-extended/sysstat/sysstat.inc
index 5c761fa69..5c761fa69 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/yocto-poky/meta/recipes-extended/sysstat/sysstat.inc
diff --git a/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch b/yocto-poky/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch
index c12652307..c12652307 100644
--- a/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch
+++ b/yocto-poky/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch
diff --git a/meta/recipes-extended/sysstat/sysstat/99_sysstat b/yocto-poky/meta/recipes-extended/sysstat/sysstat/99_sysstat
index 0b0ec30de..0b0ec30de 100644
--- a/meta/recipes-extended/sysstat/sysstat/99_sysstat
+++ b/yocto-poky/meta/recipes-extended/sysstat/sysstat/99_sysstat
diff --git a/meta/recipes-extended/sysstat/sysstat/sysstat.service b/yocto-poky/meta/recipes-extended/sysstat/sysstat/sysstat.service
index aff07109f..aff07109f 100644
--- a/meta/recipes-extended/sysstat/sysstat/sysstat.service
+++ b/yocto-poky/meta/recipes-extended/sysstat/sysstat/sysstat.service
diff --git a/meta/recipes-extended/sysstat/sysstat_11.1.5.bb b/yocto-poky/meta/recipes-extended/sysstat/sysstat_11.1.5.bb
index bff861617..bff861617 100644
--- a/meta/recipes-extended/sysstat/sysstat_11.1.5.bb
+++ b/yocto-poky/meta/recipes-extended/sysstat/sysstat_11.1.5.bb
diff --git a/meta/recipes-extended/tar/tar-1.17/avoid_heap_overflow.patch b/yocto-poky/meta/recipes-extended/tar/tar-1.17/avoid_heap_overflow.patch
index da2ae3cb0..da2ae3cb0 100644
--- a/meta/recipes-extended/tar/tar-1.17/avoid_heap_overflow.patch
+++ b/yocto-poky/meta/recipes-extended/tar/tar-1.17/avoid_heap_overflow.patch
diff --git a/meta/recipes-extended/tar/tar-1.17/gcc43build.patch b/yocto-poky/meta/recipes-extended/tar/tar-1.17/gcc43build.patch
index f8059a0a8..f8059a0a8 100644
--- a/meta/recipes-extended/tar/tar-1.17/gcc43build.patch
+++ b/yocto-poky/meta/recipes-extended/tar/tar-1.17/gcc43build.patch
diff --git a/meta/recipes-extended/tar/tar-1.17/m4extensions.patch b/yocto-poky/meta/recipes-extended/tar/tar-1.17/m4extensions.patch
index 30534c29c..30534c29c 100644
--- a/meta/recipes-extended/tar/tar-1.17/m4extensions.patch
+++ b/yocto-poky/meta/recipes-extended/tar/tar-1.17/m4extensions.patch
diff --git a/meta/recipes-extended/tar/tar.inc b/yocto-poky/meta/recipes-extended/tar/tar.inc
index 93e4da114..93e4da114 100644
--- a/meta/recipes-extended/tar/tar.inc
+++ b/yocto-poky/meta/recipes-extended/tar/tar.inc
diff --git a/meta/recipes-extended/tar/tar/remove-gets.patch b/yocto-poky/meta/recipes-extended/tar/tar/remove-gets.patch
index 0b8be39ee..0b8be39ee 100644
--- a/meta/recipes-extended/tar/tar/remove-gets.patch
+++ b/yocto-poky/meta/recipes-extended/tar/tar/remove-gets.patch
diff --git a/meta/recipes-extended/tar/tar_1.17.bb b/yocto-poky/meta/recipes-extended/tar/tar_1.17.bb
index b9ca2063d..b9ca2063d 100644
--- a/meta/recipes-extended/tar/tar_1.17.bb
+++ b/yocto-poky/meta/recipes-extended/tar/tar_1.17.bb
diff --git a/meta/recipes-extended/tar/tar_1.28.bb b/yocto-poky/meta/recipes-extended/tar/tar_1.28.bb
index 881600039..881600039 100644
--- a/meta/recipes-extended/tar/tar_1.28.bb
+++ b/yocto-poky/meta/recipes-extended/tar/tar_1.28.bb
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff
index 16d6719cb..16d6719cb 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch
index 9a735bff6..9a735bff6 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch
index 9e188027f..9e188027f 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch
index 725f4b595..725f4b595 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch
index 96d47c39f..96d47c39f 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch
index 226106f4f..226106f4f 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
index 260e8d313..260e8d313 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
index e8289e44d..e8289e44d 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch
index bd1396bc7..bd1396bc7 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch
index eb5685c57..eb5685c57 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch
index 3ca687411..3ca687411 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch
index 308737797..308737797 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch
index 4cc554fc3..4cc554fc3 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
index 3ba214d24..3ba214d24 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch
index 797352579..797352579 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch
index 19bd7d3c0..19bd7d3c0 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch
index 7650600ab..7650600ab 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch
index 5875b81b2..5875b81b2 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff
index 723f4f136..723f4f136 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8 b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8
index 875616b9e..875616b9e 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch
index fc2afeef1..fc2afeef1 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch
index 9d7ea042b..9d7ea042b 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch
index 76dd6340b..76dd6340b 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch
index 8e46df8e1..8e46df8e1 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch
index be29bdcfa..be29bdcfa 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/try-from.8 b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/try-from.8
index 9c8f30543..9c8f30543 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/try-from.8
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/try-from.8
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
index 263047828..263047828 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
diff --git a/meta/recipes-extended/texi2html/texi2html_5.0.bb b/yocto-poky/meta/recipes-extended/texi2html/texi2html_5.0.bb
index eac289e3b..eac289e3b 100644
--- a/meta/recipes-extended/texi2html/texi2html_5.0.bb
+++ b/yocto-poky/meta/recipes-extended/texi2html/texi2html_5.0.bb
diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/yocto-poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
index b5420a3e5..b5420a3e5 100644
--- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
+++ b/yocto-poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/COPYING b/yocto-poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/COPYING
index 531cbe723..531cbe723 100644
--- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/COPYING
+++ b/yocto-poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/COPYING
diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py b/yocto-poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py
index 8b7033ecc..8b7033ecc 100644
--- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py
+++ b/yocto-poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py
diff --git a/meta/recipes-extended/texinfo/texinfo-4.8/check-locale-h.patch b/yocto-poky/meta/recipes-extended/texinfo/texinfo-4.8/check-locale-h.patch
index f4d66600a..f4d66600a 100644
--- a/meta/recipes-extended/texinfo/texinfo-4.8/check-locale-h.patch
+++ b/yocto-poky/meta/recipes-extended/texinfo/texinfo-4.8/check-locale-h.patch
diff --git a/meta/recipes-extended/texinfo/texinfo-4.8/do-compile-native-tools.patch b/yocto-poky/meta/recipes-extended/texinfo/texinfo-4.8/do-compile-native-tools.patch
index 81ebe26cf..81ebe26cf 100644
--- a/meta/recipes-extended/texinfo/texinfo-4.8/do-compile-native-tools.patch
+++ b/yocto-poky/meta/recipes-extended/texinfo/texinfo-4.8/do-compile-native-tools.patch
diff --git a/meta/recipes-extended/texinfo/texinfo-4.8/using-native-makeinfo.patch b/yocto-poky/meta/recipes-extended/texinfo/texinfo-4.8/using-native-makeinfo.patch
index 2297051dd..2297051dd 100644
--- a/meta/recipes-extended/texinfo/texinfo-4.8/using-native-makeinfo.patch
+++ b/yocto-poky/meta/recipes-extended/texinfo/texinfo-4.8/using-native-makeinfo.patch
diff --git a/meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch
index c7338aa47..c7338aa47 100644
--- a/meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/yocto-poky/meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch b/yocto-poky/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch
index ab6f1658a..ab6f1658a 100644
--- a/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch
+++ b/yocto-poky/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch
diff --git a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch b/yocto-poky/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
index 0ce47ecdb..0ce47ecdb 100644
--- a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
+++ b/yocto-poky/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
diff --git a/meta/recipes-extended/texinfo/texinfo/link-zip.patch b/yocto-poky/meta/recipes-extended/texinfo/texinfo/link-zip.patch
index 0b6e9fd7e..0b6e9fd7e 100644
--- a/meta/recipes-extended/texinfo/texinfo/link-zip.patch
+++ b/yocto-poky/meta/recipes-extended/texinfo/texinfo/link-zip.patch
diff --git a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch b/yocto-poky/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
index 41bd220ba..41bd220ba 100644
--- a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
+++ b/yocto-poky/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
diff --git a/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch b/yocto-poky/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch
index 5b7f32d9a..5b7f32d9a 100644
--- a/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch
+++ b/yocto-poky/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch
diff --git a/meta/recipes-extended/texinfo/texinfo_4.8.bb b/yocto-poky/meta/recipes-extended/texinfo/texinfo_4.8.bb
index 13678e093..13678e093 100644
--- a/meta/recipes-extended/texinfo/texinfo_4.8.bb
+++ b/yocto-poky/meta/recipes-extended/texinfo/texinfo_4.8.bb
diff --git a/meta/recipes-extended/texinfo/texinfo_6.0.bb b/yocto-poky/meta/recipes-extended/texinfo/texinfo_6.0.bb
index a8702cfca..a8702cfca 100644
--- a/meta/recipes-extended/texinfo/texinfo_6.0.bb
+++ b/yocto-poky/meta/recipes-extended/texinfo/texinfo_6.0.bb
diff --git a/meta/recipes-extended/time/time-1.7/debian.patch b/yocto-poky/meta/recipes-extended/time/time-1.7/debian.patch
index 23ea0e3eb..23ea0e3eb 100644
--- a/meta/recipes-extended/time/time-1.7/debian.patch
+++ b/yocto-poky/meta/recipes-extended/time/time-1.7/debian.patch
diff --git a/meta/recipes-extended/time/time.inc b/yocto-poky/meta/recipes-extended/time/time.inc
index 85862177b..85862177b 100644
--- a/meta/recipes-extended/time/time.inc
+++ b/yocto-poky/meta/recipes-extended/time/time.inc
diff --git a/meta/recipes-extended/time/time_1.7.bb b/yocto-poky/meta/recipes-extended/time/time_1.7.bb
index 92c5353d0..92c5353d0 100644
--- a/meta/recipes-extended/time/time_1.7.bb
+++ b/yocto-poky/meta/recipes-extended/time/time_1.7.bb
diff --git a/meta/recipes-extended/tzcode/tzcode-native_2016a.bb b/yocto-poky/meta/recipes-extended/tzcode/tzcode-native_2016a.bb
index 76f97f0b5..76f97f0b5 100644
--- a/meta/recipes-extended/tzcode/tzcode-native_2016a.bb
+++ b/yocto-poky/meta/recipes-extended/tzcode/tzcode-native_2016a.bb
diff --git a/meta/recipes-extended/tzdata/tzdata_2016a.bb b/yocto-poky/meta/recipes-extended/tzdata/tzdata_2016a.bb
index 6ba5f81b1..6ba5f81b1 100644
--- a/meta/recipes-extended/tzdata/tzdata_2016a.bb
+++ b/yocto-poky/meta/recipes-extended/tzdata/tzdata_2016a.bb
diff --git a/meta/recipes-extended/unzip/unzip/06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch b/yocto-poky/meta/recipes-extended/unzip/unzip/06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch
index 9ba3c1dc6..9ba3c1dc6 100644
--- a/meta/recipes-extended/unzip/unzip/06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch
+++ b/yocto-poky/meta/recipes-extended/unzip/unzip/06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch
diff --git a/meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch b/yocto-poky/meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch
index e137f0dc7..e137f0dc7 100644
--- a/meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch
+++ b/yocto-poky/meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch
diff --git a/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch b/yocto-poky/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
index edc7d515b..edc7d515b 100644
--- a/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
+++ b/yocto-poky/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
diff --git a/meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch b/yocto-poky/meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch
index d0c1db392..d0c1db392 100644
--- a/meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch
+++ b/yocto-poky/meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch
diff --git a/meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch b/yocto-poky/meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch
index ea93823cb..ea93823cb 100644
--- a/meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch
+++ b/yocto-poky/meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch
diff --git a/meta/recipes-extended/unzip/unzip/CVE-2015-7697.patch b/yocto-poky/meta/recipes-extended/unzip/unzip/CVE-2015-7697.patch
index da6898833..da6898833 100644
--- a/meta/recipes-extended/unzip/unzip/CVE-2015-7697.patch
+++ b/yocto-poky/meta/recipes-extended/unzip/unzip/CVE-2015-7697.patch
diff --git a/meta/recipes-extended/unzip/unzip/avoid-strip.patch b/yocto-poky/meta/recipes-extended/unzip/unzip/avoid-strip.patch
index 8f30e4267..8f30e4267 100644
--- a/meta/recipes-extended/unzip/unzip/avoid-strip.patch
+++ b/yocto-poky/meta/recipes-extended/unzip/unzip/avoid-strip.patch
diff --git a/meta/recipes-extended/unzip/unzip/cve-2014-9636.patch b/yocto-poky/meta/recipes-extended/unzip/unzip/cve-2014-9636.patch
index 0a0bfbbb1..0a0bfbbb1 100644
--- a/meta/recipes-extended/unzip/unzip/cve-2014-9636.patch
+++ b/yocto-poky/meta/recipes-extended/unzip/unzip/cve-2014-9636.patch
diff --git a/meta/recipes-extended/unzip/unzip/define-ldflags.patch b/yocto-poky/meta/recipes-extended/unzip/unzip/define-ldflags.patch
index 659c6e331..659c6e331 100644
--- a/meta/recipes-extended/unzip/unzip/define-ldflags.patch
+++ b/yocto-poky/meta/recipes-extended/unzip/unzip/define-ldflags.patch
diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/yocto-poky/meta/recipes-extended/unzip/unzip_6.0.bb
index b38632378..b38632378 100644
--- a/meta/recipes-extended/unzip/unzip_6.0.bb
+++ b/yocto-poky/meta/recipes-extended/unzip/unzip_6.0.bb
diff --git a/meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch b/yocto-poky/meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch
index 14ab9c56a..14ab9c56a 100644
--- a/meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch
+++ b/yocto-poky/meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch
diff --git a/meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch b/yocto-poky/meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch
index 2fad3a112..2fad3a112 100644
--- a/meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch
+++ b/yocto-poky/meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch
diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch b/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch
index 36f2968f5..36f2968f5 100644
--- a/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch
+++ b/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch
diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog-init.patch b/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-init.patch
index 0fa8ee97c..0fa8ee97c 100644
--- a/meta/recipes-extended/watchdog/watchdog/watchdog-init.patch
+++ b/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-init.patch
diff --git a/meta/recipes-extended/watchdog/watchdog_5.14.bb b/yocto-poky/meta/recipes-extended/watchdog/watchdog_5.14.bb
index 9ec0a8e84..9ec0a8e84 100644
--- a/meta/recipes-extended/watchdog/watchdog_5.14.bb
+++ b/yocto-poky/meta/recipes-extended/watchdog/watchdog_5.14.bb
diff --git a/meta/recipes-extended/wget/wget.inc b/yocto-poky/meta/recipes-extended/wget/wget.inc
index 049b898d3..049b898d3 100644
--- a/meta/recipes-extended/wget/wget.inc
+++ b/yocto-poky/meta/recipes-extended/wget/wget.inc
diff --git a/meta/recipes-extended/wget/wget/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-extended/wget/wget/0001-Unset-need_charset_alias-when-building-for-musl.patch
index 0b3c6f555..0b3c6f555 100644
--- a/meta/recipes-extended/wget/wget/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/yocto-poky/meta/recipes-extended/wget/wget/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-extended/wget/wget/fix_makefile.patch b/yocto-poky/meta/recipes-extended/wget/wget/fix_makefile.patch
index eaa2e7e8c..eaa2e7e8c 100644
--- a/meta/recipes-extended/wget/wget/fix_makefile.patch
+++ b/yocto-poky/meta/recipes-extended/wget/wget/fix_makefile.patch
diff --git a/meta/recipes-extended/wget/wget_1.16.3.bb b/yocto-poky/meta/recipes-extended/wget/wget_1.16.3.bb
index 5c34a42df..5c34a42df 100644
--- a/meta/recipes-extended/wget/wget_1.16.3.bb
+++ b/yocto-poky/meta/recipes-extended/wget/wget_1.16.3.bb
diff --git a/meta/recipes-extended/which/which-2.18/automake-foreign.patch b/yocto-poky/meta/recipes-extended/which/which-2.18/automake-foreign.patch
index 495cdc6cf..495cdc6cf 100644
--- a/meta/recipes-extended/which/which-2.18/automake-foreign.patch
+++ b/yocto-poky/meta/recipes-extended/which/which-2.18/automake-foreign.patch
diff --git a/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch b/yocto-poky/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch
index fb9b1a408..fb9b1a408 100644
--- a/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch
+++ b/yocto-poky/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch
diff --git a/meta/recipes-extended/which/which-2.21/automake.patch b/yocto-poky/meta/recipes-extended/which/which-2.21/automake.patch
index 4d0f2e4d7..4d0f2e4d7 100644
--- a/meta/recipes-extended/which/which-2.21/automake.patch
+++ b/yocto-poky/meta/recipes-extended/which/which-2.21/automake.patch
diff --git a/meta/recipes-extended/which/which_2.18.bb b/yocto-poky/meta/recipes-extended/which/which_2.18.bb
index eb6cc9967..eb6cc9967 100644
--- a/meta/recipes-extended/which/which_2.18.bb
+++ b/yocto-poky/meta/recipes-extended/which/which_2.18.bb
diff --git a/meta/recipes-extended/which/which_2.21.bb b/yocto-poky/meta/recipes-extended/which/which_2.21.bb
index a7687f6fe..a7687f6fe 100644
--- a/meta/recipes-extended/which/which_2.21.bb
+++ b/yocto-poky/meta/recipes-extended/which/which_2.21.bb
diff --git a/meta/recipes-extended/xdg-utils/xdg-utils/0001-Reinstate-xdg-terminal.patch b/yocto-poky/meta/recipes-extended/xdg-utils/xdg-utils/0001-Reinstate-xdg-terminal.patch
index 4cd1bafbb..4cd1bafbb 100644
--- a/meta/recipes-extended/xdg-utils/xdg-utils/0001-Reinstate-xdg-terminal.patch
+++ b/yocto-poky/meta/recipes-extended/xdg-utils/xdg-utils/0001-Reinstate-xdg-terminal.patch
diff --git a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.0-rc1.bb b/yocto-poky/meta/recipes-extended/xdg-utils/xdg-utils_1.1.0-rc1.bb
index 46f1e3c6e..46f1e3c6e 100644
--- a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.0-rc1.bb
+++ b/yocto-poky/meta/recipes-extended/xdg-utils/xdg-utils_1.1.0-rc1.bb
diff --git a/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch b/yocto-poky/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch
index cd6e6c107..cd6e6c107 100644
--- a/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch
+++ b/yocto-poky/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch
diff --git a/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch b/yocto-poky/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch
index 8e59cdcaa..8e59cdcaa 100644
--- a/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch
+++ b/yocto-poky/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch
diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd-CVE-2013-4342.patch b/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd-CVE-2013-4342.patch
index 0542dbe83..0542dbe83 100644
--- a/meta/recipes-extended/xinetd/xinetd/xinetd-CVE-2013-4342.patch
+++ b/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd-CVE-2013-4342.patch
diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch b/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch
index 2365ca123..2365ca123 100644
--- a/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch
+++ b/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch
diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd.conf b/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd.conf
index 9e6ea2577..9e6ea2577 100644
--- a/meta/recipes-extended/xinetd/xinetd/xinetd.conf
+++ b/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd.conf
diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd.default b/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd.default
index 20a38e3f3..20a38e3f3 100644
--- a/meta/recipes-extended/xinetd/xinetd/xinetd.default
+++ b/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd.default
diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd.init b/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd.init
index 777c2c8b4..777c2c8b4 100644
--- a/meta/recipes-extended/xinetd/xinetd/xinetd.init
+++ b/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd.init
diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd.service b/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd.service
index d5fdc5bc2..d5fdc5bc2 100644
--- a/meta/recipes-extended/xinetd/xinetd/xinetd.service
+++ b/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd.service
diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb b/yocto-poky/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
index ffc03e5c7..ffc03e5c7 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
+++ b/yocto-poky/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
diff --git a/meta/recipes-extended/xz/xz_5.2.1.bb b/yocto-poky/meta/recipes-extended/xz/xz_5.2.1.bb
index cf7fba656..cf7fba656 100644
--- a/meta/recipes-extended/xz/xz_5.2.1.bb
+++ b/yocto-poky/meta/recipes-extended/xz/xz_5.2.1.bb
diff --git a/meta/recipes-extended/zip/zip.inc b/yocto-poky/meta/recipes-extended/zip/zip.inc
index 6221c5e13..6221c5e13 100644
--- a/meta/recipes-extended/zip/zip.inc
+++ b/yocto-poky/meta/recipes-extended/zip/zip.inc
diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/yocto-poky/meta/recipes-extended/zip/zip_3.0.bb
index 1e961101b..1e961101b 100644
--- a/meta/recipes-extended/zip/zip_3.0.bb
+++ b/yocto-poky/meta/recipes-extended/zip/zip_3.0.bb
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb b/yocto-poky/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb
index c3745c0ed..c3745c0ed 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb
+++ b/yocto-poky/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb
diff --git a/meta/recipes-gnome/epiphany/files/0001-yelp.m4-drop-the-check-for-itstool.patch b/yocto-poky/meta/recipes-gnome/epiphany/files/0001-yelp.m4-drop-the-check-for-itstool.patch
index 2585d7f74..2585d7f74 100644
--- a/meta/recipes-gnome/epiphany/files/0001-yelp.m4-drop-the-check-for-itstool.patch
+++ b/yocto-poky/meta/recipes-gnome/epiphany/files/0001-yelp.m4-drop-the-check-for-itstool.patch
diff --git a/meta/recipes-gnome/gcr/gcr_3.16.0.bb b/yocto-poky/meta/recipes-gnome/gcr/gcr_3.16.0.bb
index e50b3a815..e50b3a815 100644
--- a/meta/recipes-gnome/gcr/gcr_3.16.0.bb
+++ b/yocto-poky/meta/recipes-gnome/gcr/gcr_3.16.0.bb
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-pixops-Be-more-careful-about-integer-overflow.patch b/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-pixops-Be-more-careful-about-integer-overflow.patch
index fe7c1d501..fe7c1d501 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-pixops-Be-more-careful-about-integer-overflow.patch
+++ b/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-pixops-Be-more-careful-about-integer-overflow.patch
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2015-7674.patch b/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2015-7674.patch
index d516e88ab..d516e88ab 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2015-7674.patch
+++ b/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2015-7674.patch
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch b/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch
index edbdced43..edbdced43 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch
+++ b/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch b/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
index 70146c618..70146c618 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
+++ b/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch b/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch
index ecca62a71..ecca62a71 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch
+++ b/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/run-ptest b/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/run-ptest
index 8f9072386..8f9072386 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/run-ptest
+++ b/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/run-ptest
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb b/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb
index dcd01b14e..dcd01b14e 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb
+++ b/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb b/yocto-poky/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb
index 3765697f2..3765697f2 100644
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb
+++ b/yocto-poky/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch b/yocto-poky/meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch
index 446f9c9ab..446f9c9ab 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch
+++ b/yocto-poky/meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb b/yocto-poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb
index 0d7fa0cd6..0d7fa0cd6 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb
+++ b/yocto-poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb
diff --git a/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch b/yocto-poky/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch
index 59a7ca780..59a7ca780 100644
--- a/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch
+++ b/yocto-poky/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch
diff --git a/meta/recipes-gnome/gnome/gconf/unable-connect-dbus.patch b/yocto-poky/meta/recipes-gnome/gnome/gconf/unable-connect-dbus.patch
index f758a4bcc..f758a4bcc 100644
--- a/meta/recipes-gnome/gnome/gconf/unable-connect-dbus.patch
+++ b/yocto-poky/meta/recipes-gnome/gnome/gconf/unable-connect-dbus.patch
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.6.bb b/yocto-poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb
index 17fdafa96..17fdafa96 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.6.bb
+++ b/yocto-poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb
diff --git a/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb b/yocto-poky/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb
index 80b7033ee..80b7033ee 100644
--- a/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb
+++ b/yocto-poky/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils.inc
index 8adfac7d7..8adfac7d7 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc
+++ b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils.inc
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
index 416d69864..416d69864 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
+++ b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
index 0e196c063..0e196c063 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
+++ b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
index 9346494e9..9346494e9 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
+++ b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
index 78cc005f9..78cc005f9 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
+++ b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
diff --git a/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch b/yocto-poky/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch
index 09034255d..09034255d 100644
--- a/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch
+++ b/yocto-poky/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch
diff --git a/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb b/yocto-poky/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb
index a31eb5571..a31eb5571 100644
--- a/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb
+++ b/yocto-poky/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch b/yocto-poky/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch
index 0261f58c9..0261f58c9 100644
--- a/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch
+++ b/yocto-poky/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch
diff --git a/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb b/yocto-poky/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
index 95581b297..95581b297 100644
--- a/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
+++ b/yocto-poky/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
diff --git a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.16.1.bb b/yocto-poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.16.1.bb
index f2f2c75b3..f2f2c75b3 100644
--- a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.16.1.bb
+++ b/yocto-poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.16.1.bb
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/yocto-poky/meta/recipes-gnome/gtk+/gtk+.inc
index a197b9d96..a197b9d96 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/yocto-poky/meta/recipes-gnome/gtk+/gtk+.inc
diff --git a/meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch b/yocto-poky/meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch
index 74e479fd1..74e479fd1 100644
--- a/meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch
+++ b/yocto-poky/meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch b/yocto-poky/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch
index 1ae728e70..1ae728e70 100644
--- a/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch
+++ b/yocto-poky/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch b/yocto-poky/meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch
index 96e1f5fea..96e1f5fea 100644
--- a/meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch
+++ b/yocto-poky/meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+/toggle-font.diff b/yocto-poky/meta/recipes-gnome/gtk+/gtk+/toggle-font.diff
index 340d12008..340d12008 100644
--- a/meta/recipes-gnome/gtk+/gtk+/toggle-font.diff
+++ b/yocto-poky/meta/recipes-gnome/gtk+/gtk+/toggle-font.diff
diff --git a/meta/recipes-gnome/gtk+/gtk+/xsettings.patch b/yocto-poky/meta/recipes-gnome/gtk+/gtk+/xsettings.patch
index d0a970ad4..d0a970ad4 100644
--- a/meta/recipes-gnome/gtk+/gtk+/xsettings.patch
+++ b/yocto-poky/meta/recipes-gnome/gtk+/gtk+/xsettings.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/yocto-poky/meta/recipes-gnome/gtk+/gtk+3.inc
index 22a40d8f0..22a40d8f0 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/yocto-poky/meta/recipes-gnome/gtk+/gtk+3.inc
diff --git a/meta/recipes-gnome/gtk+/gtk+3/Do-not-try-to-initialize-GL-without-libGL.patch b/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/Do-not-try-to-initialize-GL-without-libGL.patch
index c8c480c5e..c8c480c5e 100644
--- a/meta/recipes-gnome/gtk+/gtk+3/Do-not-try-to-initialize-GL-without-libGL.patch
+++ b/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/Do-not-try-to-initialize-GL-without-libGL.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch b/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch
index 32d8a8479..32d8a8479 100644
--- a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch
+++ b/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch b/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch
index 3b4beeb71..3b4beeb71 100644
--- a/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch
+++ b/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb b/yocto-poky/meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb
index 381e60750..381e60750 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb
+++ b/yocto-poky/meta/recipes-gnome/gtk+/gtk+3_3.16.6.bb
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.28.bb b/yocto-poky/meta/recipes-gnome/gtk+/gtk+_2.24.28.bb
index e34377366..e34377366 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.28.bb
+++ b/yocto-poky/meta/recipes-gnome/gtk+/gtk+_2.24.28.bb
diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.6.bb b/yocto-poky/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.6.bb
index cba381574..cba381574 100644
--- a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.6.bb
+++ b/yocto-poky/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.6.bb
diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch b/yocto-poky/meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch
index 237f80375..237f80375 100644
--- a/meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch
+++ b/yocto-poky/meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch
diff --git a/meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb b/yocto-poky/meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
index 40f324352..40f324352 100644
--- a/meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
+++ b/yocto-poky/meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch b/yocto-poky/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch
index f0b878d37..f0b878d37 100644
--- a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch
+++ b/yocto-poky/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch b/yocto-poky/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch
index 5c557ba68..5c557ba68 100644
--- a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch
+++ b/yocto-poky/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/yocto-poky/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
index 7c3a87e87..7c3a87e87 100644
--- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
+++ b/yocto-poky/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
diff --git a/meta/recipes-gnome/gtk-theme-torturer/gtk-theme-torturer_git.bb b/yocto-poky/meta/recipes-gnome/gtk-theme-torturer/gtk-theme-torturer_git.bb
index b67806def..b67806def 100644
--- a/meta/recipes-gnome/gtk-theme-torturer/gtk-theme-torturer_git.bb
+++ b/yocto-poky/meta/recipes-gnome/gtk-theme-torturer/gtk-theme-torturer_git.bb
diff --git a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.15.bb b/yocto-poky/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.15.bb
index a704632ca..a704632ca 100644
--- a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.15.bb
+++ b/yocto-poky/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.15.bb
diff --git a/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb b/yocto-poky/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb
index 4908ac08a..4908ac08a 100644
--- a/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb
+++ b/yocto-poky/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb
diff --git a/meta/recipes-gnome/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch b/yocto-poky/meta/recipes-gnome/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch
index db96e6354..db96e6354 100644
--- a/meta/recipes-gnome/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch
+++ b/yocto-poky/meta/recipes-gnome/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch
diff --git a/meta/recipes-gnome/libffi/libffi/fix-libffi.la-location.patch b/yocto-poky/meta/recipes-gnome/libffi/libffi/fix-libffi.la-location.patch
index 775bffc66..775bffc66 100644
--- a/meta/recipes-gnome/libffi/libffi/fix-libffi.la-location.patch
+++ b/yocto-poky/meta/recipes-gnome/libffi/libffi/fix-libffi.la-location.patch
diff --git a/meta/recipes-gnome/libffi/libffi_3.2.1.bb b/yocto-poky/meta/recipes-gnome/libffi/libffi_3.2.1.bb
index fd916caf7..fd916caf7 100644
--- a/meta/recipes-gnome/libffi/libffi_3.2.1.bb
+++ b/yocto-poky/meta/recipes-gnome/libffi/libffi_3.2.1.bb
diff --git a/meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch b/yocto-poky/meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch
index c5d586465..c5d586465 100644
--- a/meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch
+++ b/yocto-poky/meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch
diff --git a/meta/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch b/yocto-poky/meta/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch
index dc4c092fd..dc4c092fd 100644
--- a/meta/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch
+++ b/yocto-poky/meta/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch
diff --git a/meta/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch b/yocto-poky/meta/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch
index b5b2ec453..b5b2ec453 100644
--- a/meta/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch
+++ b/yocto-poky/meta/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch
diff --git a/meta/recipes-gnome/libglade/libglade_2.6.4.bb b/yocto-poky/meta/recipes-gnome/libglade/libglade_2.6.4.bb
index 553e19c60..553e19c60 100644
--- a/meta/recipes-gnome/libglade/libglade_2.6.4.bb
+++ b/yocto-poky/meta/recipes-gnome/libglade/libglade_2.6.4.bb
diff --git a/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb b/yocto-poky/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb
index 41d188cad..41d188cad 100644
--- a/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb
+++ b/yocto-poky/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb
diff --git a/meta/recipes-gnome/librsvg/librsvg/CVE-2015-7558_1.patch b/yocto-poky/meta/recipes-gnome/librsvg/librsvg/CVE-2015-7558_1.patch
index a3ba41f50..a3ba41f50 100644
--- a/meta/recipes-gnome/librsvg/librsvg/CVE-2015-7558_1.patch
+++ b/yocto-poky/meta/recipes-gnome/librsvg/librsvg/CVE-2015-7558_1.patch
diff --git a/meta/recipes-gnome/librsvg/librsvg/CVE-2015-7558_2.patch b/yocto-poky/meta/recipes-gnome/librsvg/librsvg/CVE-2015-7558_2.patch
index 9f6820ef9..9f6820ef9 100644
--- a/meta/recipes-gnome/librsvg/librsvg/CVE-2015-7558_2.patch
+++ b/yocto-poky/meta/recipes-gnome/librsvg/librsvg/CVE-2015-7558_2.patch
diff --git a/meta/recipes-gnome/librsvg/librsvg/CVE-2015-7558_3.patch b/yocto-poky/meta/recipes-gnome/librsvg/librsvg/CVE-2015-7558_3.patch
index dd67ab768..dd67ab768 100644
--- a/meta/recipes-gnome/librsvg/librsvg/CVE-2015-7558_3.patch
+++ b/yocto-poky/meta/recipes-gnome/librsvg/librsvg/CVE-2015-7558_3.patch
diff --git a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch b/yocto-poky/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch
index e6af481ef..e6af481ef 100644
--- a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch
+++ b/yocto-poky/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.10.bb b/yocto-poky/meta/recipes-gnome/librsvg/librsvg_2.40.10.bb
index cb8a73c40..cb8a73c40 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.40.10.bb
+++ b/yocto-poky/meta/recipes-gnome/librsvg/librsvg_2.40.10.bb
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb b/yocto-poky/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb
index 8fc00181f..8fc00181f 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb
+++ b/yocto-poky/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb
diff --git a/meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb b/yocto-poky/meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb
index 3ee1ae98a..3ee1ae98a 100644
--- a/meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb
+++ b/yocto-poky/meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb
diff --git a/meta/recipes-graphics/builder/builder_0.1.bb b/yocto-poky/meta/recipes-graphics/builder/builder_0.1.bb
index bb729fce2..bb729fce2 100644
--- a/meta/recipes-graphics/builder/builder_0.1.bb
+++ b/yocto-poky/meta/recipes-graphics/builder/builder_0.1.bb
diff --git a/meta/recipes-graphics/builder/files/builder_hob_start.sh b/yocto-poky/meta/recipes-graphics/builder/files/builder_hob_start.sh
index b394b0905..b394b0905 100644
--- a/meta/recipes-graphics/builder/files/builder_hob_start.sh
+++ b/yocto-poky/meta/recipes-graphics/builder/files/builder_hob_start.sh
diff --git a/meta/recipes-graphics/builder/files/please_wait_dialog.py b/yocto-poky/meta/recipes-graphics/builder/files/please_wait_dialog.py
index fd2381bc8..fd2381bc8 100644
--- a/meta/recipes-graphics/builder/files/please_wait_dialog.py
+++ b/yocto-poky/meta/recipes-graphics/builder/files/please_wait_dialog.py
diff --git a/meta/recipes-graphics/cairo/cairo-fpu.inc b/yocto-poky/meta/recipes-graphics/cairo/cairo-fpu.inc
index ef72e8904..ef72e8904 100644
--- a/meta/recipes-graphics/cairo/cairo-fpu.inc
+++ b/yocto-poky/meta/recipes-graphics/cairo/cairo-fpu.inc
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/yocto-poky/meta/recipes-graphics/cairo/cairo.inc
index 45651bad2..45651bad2 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/yocto-poky/meta/recipes-graphics/cairo/cairo.inc
diff --git a/meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch b/yocto-poky/meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch
index 955b7d4ef..955b7d4ef 100644
--- a/meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch
+++ b/yocto-poky/meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch
diff --git a/meta/recipes-graphics/cairo/cairo_1.14.2.bb b/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.2.bb
index 75cde0ad7..75cde0ad7 100644
--- a/meta/recipes-graphics/cairo/cairo_1.14.2.bb
+++ b/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.2.bb
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0.inc
index da21cee8b..da21cee8b 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0.inc
+++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0.inc
diff --git a/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
index 3b6a70ef0..3b6a70ef0 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
+++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
diff --git a/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch
index f5c18c582..f5c18c582 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch
+++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch
diff --git a/meta/recipes-graphics/clutter/clutter-1.0/run-ptest b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-ptest
index 98877e522..98877e522 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0/run-ptest
+++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-ptest
diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.22.4.bb b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.22.4.bb
index 418cdfd37..418cdfd37 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0_1.22.4.bb
+++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.22.4.bb
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc b/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
index d4fed7127..d4fed7127 100644
--- a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
+++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch b/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch
index 0b26b990d..0b26b990d 100644
--- a/meta/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch
+++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0/enable-tests.patch b/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0/enable-tests.patch
index b3aec392e..b3aec392e 100644
--- a/meta/recipes-graphics/clutter/clutter-gst-3.0/enable-tests.patch
+++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0/enable-tests.patch
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.8.bb b/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.8.bb
index 319a955d3..319a955d3 100644
--- a/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.8.bb
+++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.8.bb
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
index 45898b4d6..45898b4d6 100644
--- a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
+++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.2.bb b/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.2.bb
index 530ea18c3..530ea18c3 100644
--- a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.2.bb
+++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.2.bb
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0.inc
index 3da31c85f..3da31c85f 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0.inc
diff --git a/meta/recipes-graphics/cogl/cogl-1.0/cogl-framebuffer-gl-Work-again-on-GLESv2.patch b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0/cogl-framebuffer-gl-Work-again-on-GLESv2.patch
index 8e839579f..8e839579f 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0/cogl-framebuffer-gl-Work-again-on-GLESv2.patch
+++ b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0/cogl-framebuffer-gl-Work-again-on-GLESv2.patch
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.20.0.bb b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0_1.20.0.bb
index d20b814e8..d20b814e8 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0_1.20.0.bb
+++ b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0_1.20.0.bb
diff --git a/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch b/yocto-poky/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch
index 0717ea6f8..0717ea6f8 100644
--- a/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch
+++ b/yocto-poky/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch
diff --git a/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb b/yocto-poky/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb
index 9c3e8bf3d..9c3e8bf3d 100644
--- a/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb
+++ b/yocto-poky/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/yocto-poky/meta/recipes-graphics/directfb/directfb.inc
index cbd401483..cbd401483 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/yocto-poky/meta/recipes-graphics/directfb/directfb.inc
diff --git a/meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch b/yocto-poky/meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch
index 76e0f7530..76e0f7530 100644
--- a/meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch
+++ b/yocto-poky/meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch
diff --git a/meta/recipes-graphics/directfb/directfb/bashism.patch b/yocto-poky/meta/recipes-graphics/directfb/directfb/bashism.patch
index 2ef4e9385..2ef4e9385 100644
--- a/meta/recipes-graphics/directfb/directfb/bashism.patch
+++ b/yocto-poky/meta/recipes-graphics/directfb/directfb/bashism.patch
diff --git a/meta/recipes-graphics/directfb/directfb/configurefix.patch b/yocto-poky/meta/recipes-graphics/directfb/directfb/configurefix.patch
index dd8c01905..dd8c01905 100644
--- a/meta/recipes-graphics/directfb/directfb/configurefix.patch
+++ b/yocto-poky/meta/recipes-graphics/directfb/directfb/configurefix.patch
diff --git a/meta/recipes-graphics/directfb/directfb/fusion.patch b/yocto-poky/meta/recipes-graphics/directfb/directfb/fusion.patch
index 1f81a6796..1f81a6796 100644
--- a/meta/recipes-graphics/directfb/directfb/fusion.patch
+++ b/yocto-poky/meta/recipes-graphics/directfb/directfb/fusion.patch
diff --git a/meta/recipes-graphics/directfb/directfb_1.7.7.bb b/yocto-poky/meta/recipes-graphics/directfb/directfb_1.7.7.bb
index c6c070eda..c6c070eda 100644
--- a/meta/recipes-graphics/directfb/directfb_1.7.7.bb
+++ b/yocto-poky/meta/recipes-graphics/directfb/directfb_1.7.7.bb
diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch b/yocto-poky/meta/recipes-graphics/drm/libdrm/installtests.patch
index 1175daef9..1175daef9 100644
--- a/meta/recipes-graphics/drm/libdrm/installtests.patch
+++ b/yocto-poky/meta/recipes-graphics/drm/libdrm/installtests.patch
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.62.bb b/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.62.bb
index ea6305e51..ea6305e51 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.62.bb
+++ b/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.62.bb
diff --git a/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb b/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb
index 455d31e87..455d31e87 100644
--- a/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb
+++ b/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb
diff --git a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb b/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb
index 3427fdf42..3427fdf42 100644
--- a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb
+++ b/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb
diff --git a/meta/recipes-graphics/eglinfo/eglinfo.inc b/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo.inc
index b87688af7..b87688af7 100644
--- a/meta/recipes-graphics/eglinfo/eglinfo.inc
+++ b/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo.inc
diff --git a/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch b/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch
index fca1e6594..fca1e6594 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch
+++ b/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb b/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb
index 9bbff208c..9bbff208c 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb
+++ b/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb
diff --git a/meta/recipes-graphics/freetype/freetype_2.6.bb b/yocto-poky/meta/recipes-graphics/freetype/freetype_2.6.bb
index 70599c67a..70599c67a 100644
--- a/meta/recipes-graphics/freetype/freetype_2.6.bb
+++ b/yocto-poky/meta/recipes-graphics/freetype/freetype_2.6.bb
diff --git a/meta/recipes-graphics/fstests/fstests_git.bb b/yocto-poky/meta/recipes-graphics/fstests/fstests_git.bb
index 95c33f410..95c33f410 100644
--- a/meta/recipes-graphics/fstests/fstests_git.bb
+++ b/yocto-poky/meta/recipes-graphics/fstests/fstests_git.bb
diff --git a/meta/recipes-graphics/glew/glew/autotools.patch b/yocto-poky/meta/recipes-graphics/glew/glew/autotools.patch
index 7dfe087d5..7dfe087d5 100644
--- a/meta/recipes-graphics/glew/glew/autotools.patch
+++ b/yocto-poky/meta/recipes-graphics/glew/glew/autotools.patch
diff --git a/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch b/yocto-poky/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch
index 70a99aeee..70a99aeee 100644
--- a/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch
+++ b/yocto-poky/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch
diff --git a/meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch b/yocto-poky/meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch
index 0707efba2..0707efba2 100644
--- a/meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch
+++ b/yocto-poky/meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch
diff --git a/meta/recipes-graphics/glew/glew_1.12.0.bb b/yocto-poky/meta/recipes-graphics/glew/glew_1.12.0.bb
index eb28c4d4f..eb28c4d4f 100644
--- a/meta/recipes-graphics/glew/glew_1.12.0.bb
+++ b/yocto-poky/meta/recipes-graphics/glew/glew_1.12.0.bb
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.0.2.bb b/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.0.2.bb
index 670bd98e1..670bd98e1 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.0.2.bb
+++ b/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.0.2.bb
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/yocto-poky/meta/recipes-graphics/images/core-image-clutter.bb
index b0f25cf1b..b0f25cf1b 100644
--- a/meta/recipes-graphics/images/core-image-clutter.bb
+++ b/yocto-poky/meta/recipes-graphics/images/core-image-clutter.bb
diff --git a/meta/recipes-graphics/images/core-image-directfb.bb b/yocto-poky/meta/recipes-graphics/images/core-image-directfb.bb
index 5641195e8..5641195e8 100644
--- a/meta/recipes-graphics/images/core-image-directfb.bb
+++ b/yocto-poky/meta/recipes-graphics/images/core-image-directfb.bb
diff --git a/meta/recipes-graphics/images/core-image-weston.bb b/yocto-poky/meta/recipes-graphics/images/core-image-weston.bb
index 52e271dac..52e271dac 100644
--- a/meta/recipes-graphics/images/core-image-weston.bb
+++ b/yocto-poky/meta/recipes-graphics/images/core-image-weston.bb
diff --git a/meta/recipes-graphics/images/core-image-x11.bb b/yocto-poky/meta/recipes-graphics/images/core-image-x11.bb
index 8455bb8ca..8455bb8ca 100644
--- a/meta/recipes-graphics/images/core-image-x11.bb
+++ b/yocto-poky/meta/recipes-graphics/images/core-image-x11.bb
diff --git a/meta/recipes-graphics/libepoxy/libepoxy/0001-select-platforms-based-on-configuration-results.patch b/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/0001-select-platforms-based-on-configuration-results.patch
index 674c8e833..674c8e833 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy/0001-select-platforms-based-on-configuration-results.patch
+++ b/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/0001-select-platforms-based-on-configuration-results.patch
diff --git a/meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch b/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch
index 262d6845f..262d6845f 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch
+++ b/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch
diff --git a/meta/recipes-graphics/libepoxy/libepoxy/no-need-for-python3.patch b/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/no-need-for-python3.patch
index 4b8fea58d..4b8fea58d 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy/no-need-for-python3.patch
+++ b/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/no-need-for-python3.patch
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_git.bb b/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_git.bb
index ad1729383..ad1729383 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_git.bb
+++ b/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_git.bb
diff --git a/meta/recipes-graphics/libfakekey/libfakekey_git.bb b/yocto-poky/meta/recipes-graphics/libfakekey/libfakekey_git.bb
index c60ddea74..c60ddea74 100644
--- a/meta/recipes-graphics/libfakekey/libfakekey_git.bb
+++ b/yocto-poky/meta/recipes-graphics/libfakekey/libfakekey_git.bb
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch b/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch
index 8cd507f79..8cd507f79 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch
+++ b/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb b/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
index f2eb67560..f2eb67560 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
+++ b/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch b/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch
index 3f9763953..3f9763953 100644
--- a/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch
+++ b/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch b/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch
index f98b92752..f98b92752 100644
--- a/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch
+++ b/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch b/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch
index 913baa92a..913baa92a 100644
--- a/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch
+++ b/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/yocto-poky/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index c0d5c6a96..c0d5c6a96 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/yocto-poky/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb b/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb
index f138f9761..f138f9761 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb
+++ b/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license
index 628de9830..628de9830 100644
--- a/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license
+++ b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch
index 64b7efac2..64b7efac2 100644
--- a/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch
+++ b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch
index d08d0d5b9..d08d0d5b9 100644
--- a/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch
+++ b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch
index 905d08e61..905d08e61 100644
--- a/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch
+++ b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
index 670d9fcb9..670d9fcb9 100644
--- a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
+++ b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
diff --git a/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session b/yocto-poky/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session
index 4d6caa0c5..4d6caa0c5 100644
--- a/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session
+++ b/yocto-poky/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session
diff --git a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb b/yocto-poky/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
index cbaf05436..cbaf05436 100644
--- a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
+++ b/yocto-poky/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig b/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig
index 239da8f57..239da8f57 100644
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig
+++ b/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
index 422d25595..422d25595 100644
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
+++ b/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
diff --git a/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb b/yocto-poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb
index ab909f736..ab909f736 100644
--- a/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb
+++ b/yocto-poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb
diff --git a/meta/recipes-graphics/mesa/libglu_9.0.0.bb b/yocto-poky/meta/recipes-graphics/mesa/libglu_9.0.0.bb
index 010998d92..010998d92 100644
--- a/meta/recipes-graphics/mesa/libglu_9.0.0.bb
+++ b/yocto-poky/meta/recipes-graphics/mesa/libglu_9.0.0.bb
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch
index 93ee9c286..93ee9c286 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch
+++ b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch
index c96af12ac..c96af12ac 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch
+++ b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
index 6b58c2b77..6b58c2b77 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
+++ b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch
index f77b97f3e..f77b97f3e 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch
+++ b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch
index aac2a3729..aac2a3729 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch
+++ b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch
index 12e0805f1..12e0805f1 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch
+++ b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch
index 89d2fac4f..89d2fac4f 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch
+++ b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch
index a6085754d..a6085754d 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch
+++ b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch
index 1262dee23..1262dee23 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch
+++ b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch
index 04e1b446f..04e1b446f 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch
+++ b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
index 0094f556f..0094f556f 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
+++ b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb b/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb
index fc2bca998..fc2bca998 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb
+++ b/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/yocto-poky/meta/recipes-graphics/mesa/mesa.inc
index af7a2c47f..af7a2c47f 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/yocto-poky/meta/recipes-graphics/mesa/mesa.inc
diff --git a/meta/recipes-graphics/mesa/mesa_10.6.3.bb b/yocto-poky/meta/recipes-graphics/mesa/mesa_10.6.3.bb
index 8c55064fd..8c55064fd 100644
--- a/meta/recipes-graphics/mesa/mesa_10.6.3.bb
+++ b/yocto-poky/meta/recipes-graphics/mesa/mesa_10.6.3.bb
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/yocto-poky/meta/recipes-graphics/mesa/mesa_git.bb
index c0345178c..c0345178c 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/yocto-poky/meta/recipes-graphics/mesa/mesa_git.bb
diff --git a/meta/recipes-graphics/mini-x-session/files/mini-x-session b/yocto-poky/meta/recipes-graphics/mini-x-session/files/mini-x-session
index dca655a91..dca655a91 100644
--- a/meta/recipes-graphics/mini-x-session/files/mini-x-session
+++ b/yocto-poky/meta/recipes-graphics/mini-x-session/files/mini-x-session
diff --git a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb b/yocto-poky/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
index 4e89d631c..4e89d631c 100644
--- a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
+++ b/yocto-poky/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
diff --git a/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch b/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch
index 3c8a83202..3c8a83202 100644
--- a/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch
+++ b/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch
diff --git a/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch b/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch
index 82c93dd60..82c93dd60 100644
--- a/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch
+++ b/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch
diff --git a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb b/yocto-poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
index ce35b61eb..ce35b61eb 100644
--- a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
+++ b/yocto-poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
diff --git a/meta/recipes-graphics/mx/mx.inc b/yocto-poky/meta/recipes-graphics/mx/mx.inc
index ee7f18623..ee7f18623 100644
--- a/meta/recipes-graphics/mx/mx.inc
+++ b/yocto-poky/meta/recipes-graphics/mx/mx.inc
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
index 9d67e5f89..9d67e5f89 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
+++ b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
index 53dc0ae19..53dc0ae19 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
+++ b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
index 17301a052..17301a052 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
+++ b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
index c53f1b758..c53f1b758 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
+++ b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
index 3537d8cbb..3537d8cbb 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
+++ b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
diff --git a/meta/recipes-graphics/pango/pango.inc b/yocto-poky/meta/recipes-graphics/pango/pango.inc
index df0fdf679..df0fdf679 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/yocto-poky/meta/recipes-graphics/pango/pango.inc
diff --git a/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch b/yocto-poky/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch
index ad414ddf3..ad414ddf3 100644
--- a/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch
+++ b/yocto-poky/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch
diff --git a/meta/recipes-graphics/pango/pango/run-ptest b/yocto-poky/meta/recipes-graphics/pango/pango/run-ptest
index fa87a7577..fa87a7577 100644
--- a/meta/recipes-graphics/pango/pango/run-ptest
+++ b/yocto-poky/meta/recipes-graphics/pango/pango/run-ptest
diff --git a/meta/recipes-graphics/pango/pango_1.36.8.bb b/yocto-poky/meta/recipes-graphics/pango/pango_1.36.8.bb
index f4e425040..f4e425040 100644
--- a/meta/recipes-graphics/pango/pango_1.36.8.bb
+++ b/yocto-poky/meta/recipes-graphics/pango/pango_1.36.8.bb
diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch b/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch
index c27cc04f0..c27cc04f0 100644
--- a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch
+++ b/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb
index 55ad78c09..55ad78c09 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb
diff --git a/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c b/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c
index 41cebc58a..41cebc58a 100644
--- a/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c
+++ b/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c
diff --git a/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb b/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
index 0e1a7928f..0e1a7928f 100644
--- a/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
+++ b/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
diff --git a/meta/recipes-graphics/startup-notification/startup-notification-0.12/obsolete_automake_macros.patch b/yocto-poky/meta/recipes-graphics/startup-notification/startup-notification-0.12/obsolete_automake_macros.patch
index 9e86f2b2e..9e86f2b2e 100644
--- a/meta/recipes-graphics/startup-notification/startup-notification-0.12/obsolete_automake_macros.patch
+++ b/yocto-poky/meta/recipes-graphics/startup-notification/startup-notification-0.12/obsolete_automake_macros.patch
diff --git a/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb b/yocto-poky/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb
index 6c1b93cd0..6c1b93cd0 100644
--- a/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb
+++ b/yocto-poky/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb
diff --git a/meta/recipes-graphics/tslib/tslib/ts.conf b/yocto-poky/meta/recipes-graphics/tslib/tslib/ts.conf
index 1b0da937e..1b0da937e 100644
--- a/meta/recipes-graphics/tslib/tslib/ts.conf
+++ b/yocto-poky/meta/recipes-graphics/tslib/tslib/ts.conf
diff --git a/meta/recipes-graphics/tslib/tslib/tslib.sh b/yocto-poky/meta/recipes-graphics/tslib/tslib/tslib.sh
index 7068e8d92..7068e8d92 100644
--- a/meta/recipes-graphics/tslib/tslib/tslib.sh
+++ b/yocto-poky/meta/recipes-graphics/tslib/tslib/tslib.sh
diff --git a/meta/recipes-graphics/tslib/tslib_1.1.bb b/yocto-poky/meta/recipes-graphics/tslib/tslib_1.1.bb
index 6d8c7dd7e..6d8c7dd7e 100644
--- a/meta/recipes-graphics/tslib/tslib_1.1.bb
+++ b/yocto-poky/meta/recipes-graphics/tslib/tslib_1.1.bb
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf b/yocto-poky/meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf
index 06094503c..06094503c 100644
--- a/meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf
+++ b/yocto-poky/meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb b/yocto-poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
index bda82e7ef..bda82e7ef 100644
--- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
+++ b/yocto-poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
diff --git a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb b/yocto-poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
index b2e4cef39..b2e4cef39 100644
--- a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
+++ b/yocto-poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
diff --git a/meta/recipes-graphics/waffle/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch b/yocto-poky/meta/recipes-graphics/waffle/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch
index a0c826ed9..a0c826ed9 100644
--- a/meta/recipes-graphics/waffle/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch
+++ b/yocto-poky/meta/recipes-graphics/waffle/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch
diff --git a/meta/recipes-graphics/waffle/waffle_1.5.1.bb b/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.1.bb
index af8402053..af8402053 100644
--- a/meta/recipes-graphics/waffle/waffle_1.5.1.bb
+++ b/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.1.bb
diff --git a/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch b/yocto-poky/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch
index df5ebcca0..df5ebcca0 100644
--- a/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch
+++ b/yocto-poky/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch
diff --git a/meta/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch b/yocto-poky/meta/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch
index 97c63bd37..97c63bd37 100644
--- a/meta/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch
+++ b/yocto-poky/meta/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch
diff --git a/meta/recipes-graphics/wayland/libinput_0.21.0.bb b/yocto-poky/meta/recipes-graphics/wayland/libinput_0.21.0.bb
index ac5a24982..ac5a24982 100644
--- a/meta/recipes-graphics/wayland/libinput_0.21.0.bb
+++ b/yocto-poky/meta/recipes-graphics/wayland/libinput_0.21.0.bb
diff --git a/meta/recipes-graphics/wayland/mtdev_1.1.5.bb b/yocto-poky/meta/recipes-graphics/wayland/mtdev_1.1.5.bb
index ccd0ebbfc..ccd0ebbfc 100644
--- a/meta/recipes-graphics/wayland/mtdev_1.1.5.bb
+++ b/yocto-poky/meta/recipes-graphics/wayland/mtdev_1.1.5.bb
diff --git a/meta/recipes-graphics/wayland/wayland/always-build-scanner.patch b/yocto-poky/meta/recipes-graphics/wayland/wayland/always-build-scanner.patch
index 5e0e6bf12..5e0e6bf12 100644
--- a/meta/recipes-graphics/wayland/wayland/always-build-scanner.patch
+++ b/yocto-poky/meta/recipes-graphics/wayland/wayland/always-build-scanner.patch
diff --git a/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch b/yocto-poky/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch
index cd8bc5584..cd8bc5584 100644
--- a/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch
+++ b/yocto-poky/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch
diff --git a/meta/recipes-graphics/wayland/wayland_1.8.1.bb b/yocto-poky/meta/recipes-graphics/wayland/wayland_1.8.1.bb
index 0f9a0aa02..0f9a0aa02 100644
--- a/meta/recipes-graphics/wayland/wayland_1.8.1.bb
+++ b/yocto-poky/meta/recipes-graphics/wayland/wayland_1.8.1.bb
diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/yocto-poky/meta/recipes-graphics/wayland/weston-init.bb
index 38b78bcd0..38b78bcd0 100644
--- a/meta/recipes-graphics/wayland/weston-init.bb
+++ b/yocto-poky/meta/recipes-graphics/wayland/weston-init.bb
diff --git a/meta/recipes-graphics/wayland/weston-init/init b/yocto-poky/meta/recipes-graphics/wayland/weston-init/init
index 2e938f430..2e938f430 100644
--- a/meta/recipes-graphics/wayland/weston-init/init
+++ b/yocto-poky/meta/recipes-graphics/wayland/weston-init/init
diff --git a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/yocto-poky/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
index 148848d8d..148848d8d 100644
--- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
+++ b/yocto-poky/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
diff --git a/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch b/yocto-poky/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch
index 68ba38ba8..68ba38ba8 100644
--- a/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch
+++ b/yocto-poky/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch
diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch b/yocto-poky/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch
index 35e6d6ff5..35e6d6ff5 100644
--- a/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch
+++ b/yocto-poky/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch
diff --git a/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch b/yocto-poky/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch
index ad07d4fc2..ad07d4fc2 100644
--- a/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch
+++ b/yocto-poky/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch
diff --git a/meta/recipes-graphics/wayland/weston/parallelmake.patch b/yocto-poky/meta/recipes-graphics/wayland/weston/parallelmake.patch
index 42b5efbc3..42b5efbc3 100644
--- a/meta/recipes-graphics/wayland/weston/parallelmake.patch
+++ b/yocto-poky/meta/recipes-graphics/wayland/weston/parallelmake.patch
diff --git a/meta/recipes-graphics/wayland/weston/weston.desktop b/yocto-poky/meta/recipes-graphics/wayland/weston/weston.desktop
index 1086ae8bf..1086ae8bf 100644
--- a/meta/recipes-graphics/wayland/weston/weston.desktop
+++ b/yocto-poky/meta/recipes-graphics/wayland/weston/weston.desktop
diff --git a/meta/recipes-graphics/wayland/weston/weston.png b/yocto-poky/meta/recipes-graphics/wayland/weston/weston.png
index ea8b7e0e2..ea8b7e0e2 100644
--- a/meta/recipes-graphics/wayland/weston/weston.png
+++ b/yocto-poky/meta/recipes-graphics/wayland/weston/weston.png
diff --git a/meta/recipes-graphics/wayland/weston_1.8.0.bb b/yocto-poky/meta/recipes-graphics/wayland/weston_1.8.0.bb
index 342c604b9..342c604b9 100644
--- a/meta/recipes-graphics/wayland/weston_1.8.0.bb
+++ b/yocto-poky/meta/recipes-graphics/wayland/weston_1.8.0.bb
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults
index f5b69dd51..f5b69dd51 100644
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults
+++ b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver
index 73570dfeb..73570dfeb 100644
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver
+++ b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession
index 0b73127ae..0b73127ae 100644
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession
+++ b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh
index a9d102c74..a9d102c74 100644
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh
+++ b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh
index 91594b9e3..91594b9e3 100644
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh
+++ b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh
index 3d7008ca4..3d7008ca4 100644
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh
+++ b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh
index b936dedf3..b936dedf3 100644
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh
+++ b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap
index 05a13fa3c..05a13fa3c 100644
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap
+++ b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap
diff --git a/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch
index eff975e34..eff975e34 100644
--- a/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch
+++ b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch
diff --git a/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/yocto-poky/meta/recipes-graphics/x11-common/x11-common_0.1.bb
index 156b32948..156b32948 100644
--- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb
+++ b/yocto-poky/meta/recipes-graphics/x11-common/x11-common_0.1.bb
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index b68d40e1b..b68d40e1b 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
+++ b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/Xusername b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/Xusername
index 7060e5ec1..7060e5ec1 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/Xusername
+++ b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/Xusername
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch
index eff975e34..eff975e34 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch
+++ b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
index bfa0a8d6c..bfa0a8d6c 100755
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
+++ b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf
index 3c0582a87..3c0582a87 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf
+++ b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service
index 62d979f1d..62d979f1d 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service
+++ b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service
diff --git a/meta/recipes-graphics/x11vnc/files/endian-fix.patch b/yocto-poky/meta/recipes-graphics/x11vnc/files/endian-fix.patch
index f2a538bf6..f2a538bf6 100644
--- a/meta/recipes-graphics/x11vnc/files/endian-fix.patch
+++ b/yocto-poky/meta/recipes-graphics/x11vnc/files/endian-fix.patch
diff --git a/meta/recipes-graphics/x11vnc/files/starting-fix.patch b/yocto-poky/meta/recipes-graphics/x11vnc/files/starting-fix.patch
index f62e405dd..f62e405dd 100644
--- a/meta/recipes-graphics/x11vnc/files/starting-fix.patch
+++ b/yocto-poky/meta/recipes-graphics/x11vnc/files/starting-fix.patch
diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/yocto-poky/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
index ec0241fb2..ec0241fb2 100644
--- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
+++ b/yocto-poky/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch b/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
index cfac55c7b..cfac55c7b 100644
--- a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
+++ b/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch b/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
index 5028fd6bf..5028fd6bf 100644
--- a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
+++ b/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
index 5e668abd4..5e668abd4 100644
--- a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput b/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
index 9633fc5f3..9633fc5f3 100644
--- a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
+++ b/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
index 65348c376..65348c376 100644
--- a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
+++ b/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh b/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh
index 529072678..529072678 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh
+++ b/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch b/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
index 86982924a..86982924a 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
+++ b/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
index a9de3d7ef..a9de3d7ef 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
diff --git a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb b/yocto-poky/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb
index a453e2487..a453e2487 100644
--- a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb
diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb b/yocto-poky/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb
index 31cf18676..31cf18676 100644
--- a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb
diff --git a/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb b/yocto-poky/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb
index 87268046e..87268046e 100644
--- a/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb
diff --git a/meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb b/yocto-poky/meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb
index 4e9355880..4e9355880 100644
--- a/meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb
diff --git a/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb
index b173f4fe8..b173f4fe8 100644
--- a/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb
diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch b/yocto-poky/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch
index 1e8199cc6..1e8199cc6 100644
--- a/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch
diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb
index af04bb6e3..af04bb6e3 100644
--- a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb
diff --git a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch b/yocto-poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
index 6130959f8..6130959f8 100644
--- a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
diff --git a/meta/recipes-graphics/xorg-app/xev_1.2.2.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb
index f151b579e..f151b579e 100644
--- a/meta/recipes-graphics/xorg-app/xev_1.2.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb
diff --git a/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb
index 84d0cb804..84d0cb804 100644
--- a/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb
diff --git a/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb
index 825737f39..825737f39 100644
--- a/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb
diff --git a/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb
index 93185188e..93185188e 100644
--- a/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb
diff --git a/meta/recipes-graphics/xorg-app/xinput_1.6.1.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xinput_1.6.1.bb
index 5befcc82d..5befcc82d 100644
--- a/meta/recipes-graphics/xorg-app/xinput_1.6.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xinput_1.6.1.bb
diff --git a/meta/recipes-graphics/xorg-app/xkbcomp_1.3.0.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xkbcomp_1.3.0.bb
index efac0699c..efac0699c 100644
--- a/meta/recipes-graphics/xorg-app/xkbcomp_1.3.0.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xkbcomp_1.3.0.bb
diff --git a/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb
index 2deac6a05..2deac6a05 100644
--- a/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb
diff --git a/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/yocto-poky/meta/recipes-graphics/xorg-app/xorg-app-common.inc
index 3529cb26e..3529cb26e 100644
--- a/meta/recipes-graphics/xorg-app/xorg-app-common.inc
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xorg-app-common.inc
diff --git a/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb
index d78bf0451..d78bf0451 100644
--- a/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb
diff --git a/meta/recipes-graphics/xorg-app/xrandr_1.4.3.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xrandr_1.4.3.bb
index 41bd42069..41bd42069 100644
--- a/meta/recipes-graphics/xorg-app/xrandr_1.4.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xrandr_1.4.3.bb
diff --git a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch b/yocto-poky/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
index 97d13a30d..97d13a30d 100644
--- a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
diff --git a/meta/recipes-graphics/xorg-app/xset_1.2.3.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xset_1.2.3.bb
index f683b7603..f683b7603 100644
--- a/meta/recipes-graphics/xorg-app/xset_1.2.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xset_1.2.3.bb
diff --git a/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb
index 2965ef7f8..2965ef7f8 100644
--- a/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb
diff --git a/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb
index 0c23d1943..0c23d1943 100644
--- a/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb
index 66428df55..66428df55 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.1.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.1.bb
index 6fe51accb..6fe51accb 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.1.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
index dfb08f724..dfb08f724 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch
index 6930864ed..6930864ed 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.1.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.1.bb
index 1f0b78a15..1f0b78a15 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.1.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
index d79a2e4dd..d79a2e4dd 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
index 19c122fdf..19c122fdf 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
index 140f633b4..140f633b4 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb
index 8615b48da..8615b48da 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.3.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.3.bb
index c49847760..c49847760 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.3.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb
index 52e9bd1df..52e9bd1df 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch
index 8a5dd39ae..8a5dd39ae 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
index dda508dcf..dda508dcf 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch
index 589d52e0f..589d52e0f 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch
index 0e675ee9f..0e675ee9f 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb
index a2f145659..a2f145659 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch
index 41e77d3f1..41e77d3f1 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
index 76682ed57..76682ed57 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch
index c4cf16eb0..c4cf16eb0 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch
index 9fb01d438..9fb01d438 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
index 683a98983..683a98983 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
index 67ea7c1a5..67ea7c1a5 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-blacklist-tv-out.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-blacklist-tv-out.patch
index b0ac9a44c..b0ac9a44c 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-blacklist-tv-out.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-blacklist-tv-out.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0005-Attempt-to-fix-VRFB.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0005-Attempt-to-fix-VRFB.patch
index 67b284023..67b284023 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0005-Attempt-to-fix-VRFB.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0005-Attempt-to-fix-VRFB.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0006-omapfb-port-to-new-xserver-video-API.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0006-omapfb-port-to-new-xserver-video-API.patch
index d56729987..d56729987 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0006-omapfb-port-to-new-xserver-video-API.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0006-omapfb-port-to-new-xserver-video-API.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch
index dc0b9b3f4..dc0b9b3f4 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index 0eeb870b3..0eeb870b3 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.4.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.4.bb
index fa251b50e..fa251b50e 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.4.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.4.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
index 6039d089a..6039d089a 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb
index 89b98eefc..89b98eefc 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index 7ddd1c7da..7ddd1c7da 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
index fbec0643f..fbec0643f 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
index 38281e0f2..38281e0f2 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
+++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
diff --git a/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch b/yocto-poky/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch
index f330c185a..f330c185a 100644
--- a/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch
diff --git a/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb b/yocto-poky/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb
index 90846d818..90846d818 100644
--- a/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb
diff --git a/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch b/yocto-poky/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch
index 0b9fb8ccc..0b9fb8ccc 100644
--- a/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch
diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb b/yocto-poky/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
index 15e101596..15e101596 100644
--- a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
diff --git a/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb b/yocto-poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb
index 228512498..228512498 100644
--- a/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb
diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc
index d5267f59a..d5267f59a 100644
--- a/meta/recipes-graphics/xorg-font/xorg-font-common.inc
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
index 9bcd1b2fa..9bcd1b2fa 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz
index 8bc8570a4..8bc8570a4 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz
index 8fa829015..8fa829015 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz
index bb1c5e138..bb1c5e138 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz
index 842fa1b41..842fa1b41 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz
index cd119b66d..cd119b66d 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz
index 25fe84a0e..25fe84a0e 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz
index e362c70ce..e362c70ce 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz
index 176a7591c..176a7591c 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz
index a4faf1a6c..a4faf1a6c 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz
index 96ddd1525..96ddd1525 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz
index 541a2ad2c..541a2ad2c 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz
index a4986f406..a4986f406 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz
index 3f89abe77..3f89abe77 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz
index 432b53622..432b53622 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz
index e7fcb898e..e7fcb898e 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz
index 2df635537..2df635537 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz
index a263c5dd3..a263c5dd3 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz
index a1a7d37e6..a1a7d37e6 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz
index a148e99bc..a148e99bc 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz
index 8791b8ca3..8791b8ca3 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz
index 860450868..860450868 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz
index f28b1f1c4..f28b1f1c4 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz
index fd1e6cfe9..fd1e6cfe9 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz
index 672b75942..672b75942 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz
index d90a4330d..d90a4330d 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz
index 775e7c18b..775e7c18b 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz
index ac12fd98a..ac12fd98a 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz
index 42bbd5221..42bbd5221 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz
index 690d31f86..690d31f86 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz
index d4c3184c7..d4c3184c7 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz
index 884b5130c..884b5130c 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz
index cbb1a9d70..cbb1a9d70 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz
index 78c8580cf..78c8580cf 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz
index 0e90f3ee1..0e90f3ee1 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz
index bd1273e1f..bd1273e1f 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz
index 5100b429a..5100b429a 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz
index ec5bbed29..ec5bbed29 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz
index 06c835ee6..06c835ee6 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz
index 478541c2a..478541c2a 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz
index 1c593ce0c..1c593ce0c 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz
index 335cf5fc3..335cf5fc3 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz
index 099423e64..099423e64 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz
index 4a546ddb1..4a546ddb1 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz
index 72eb72bbe..72eb72bbe 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir
index 0a2718f7b..0a2718f7b 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir
+++ b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir
diff --git a/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb
index e623cee42..e623cee42 100644
--- a/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb
diff --git a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb
index a181f05c2..a181f05c2 100644
--- a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb
diff --git a/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb
index 5049b7ee0..5049b7ee0 100644
--- a/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch
index e92fc0d95..e92fc0d95 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch
index 16d69a82a..16d69a82a 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch
index f513c8e59..f513c8e59 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
index f53285824..f53285824 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb
index ffa6a609f..ffa6a609f 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb
diff --git a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb
index 5514c7f5e..5514c7f5e 100644
--- a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb
diff --git a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb
index 192513636..192513636 100644
--- a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.3.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.3.bb
index c0d014825..c0d014825 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.3.bb
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11.inc
index b04eafbdf..b04eafbdf 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11.inc
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
index 744cedc77..744cedc77 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
diff --git a/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
index c1b6cde53..c1b6cde53 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
index a7c3984fd..a7c3984fd 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
index c6347f5be..c6347f5be 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch
index f2abf7c7a..f2abf7c7a 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb
index 8e531c745..8e531c745 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb
index 2ef8bfa8b..2ef8bfa8b 100644
--- a/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
index d6148834a..d6148834a 100644
--- a/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
diff --git a/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb
index 455e869c7..455e869c7 100644
--- a/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxcb.inc b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb.inc
index e40ae77ab..e40ae77ab 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb.inc
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb.inc
diff --git a/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch
index 5641c0fe9..5641c0fe9 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch
diff --git a/meta/recipes-graphics/xorg-lib/libxcb/gcc-mips-pr68302-mips-workaround.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/gcc-mips-pr68302-mips-workaround.patch
index 698d038f9..698d038f9 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb/gcc-mips-pr68302-mips-workaround.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/gcc-mips-pr68302-mips-workaround.patch
diff --git a/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch
index 46297c33c..46297c33c 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb
index c16270210..c16270210 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_git.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_git.bb
index 186636e1e..186636e1e 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb_git.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_git.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch
index 60331f6e7..60331f6e7 100644
--- a/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch
diff --git a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb
index 70257194a..70257194a 100644
--- a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb
index a8e4f24b6..a8e4f24b6 100644
--- a/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb
index c3d70043c..c3d70043c 100644
--- a/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb
index f4e30d93d..f4e30d93d 100644
--- a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb
index efa8b65ac..efa8b65ac 100644
--- a/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxext_git.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_git.bb
index b799186ef..b799186ef 100644
--- a/meta/recipes-graphics/xorg-lib/libxext_git.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_git.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb
index 6e2740c9a..6e2740c9a 100644
--- a/meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb
index 1b6e33c71..1b6e33c71 100644
--- a/meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb
index a967cdc58..a967cdc58 100644
--- a/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxi_1.7.4.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxi_1.7.4.bb
index 07033a3e7..07033a3e7 100644
--- a/meta/recipes-graphics/xorg-lib/libxi_1.7.4.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxi_1.7.4.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb
index 027c8043d..027c8043d 100644
--- a/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb
index a166b5760..a166b5760 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb
index 39a344cca..39a344cca 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb
index 003baec6e..003baec6e 100644
--- a/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb
index 545874cdd..545874cdd 100644
--- a/meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxrandr_1.5.0.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxrandr_1.5.0.bb
index abbbae552..abbbae552 100644
--- a/meta/recipes-graphics/xorg-lib/libxrandr_1.5.0.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxrandr_1.5.0.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxrender_0.9.9.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.9.bb
index 9fde04061..9fde04061 100644
--- a/meta/recipes-graphics/xorg-lib/libxrender_0.9.9.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.9.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxres_1.0.7.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxres_1.0.7.bb
index 8c04c44f8..8c04c44f8 100644
--- a/meta/recipes-graphics/xorg-lib/libxres_1.0.7.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxres_1.0.7.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb
index 354e5de7f..354e5de7f 100644
--- a/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb
index ae34b1fe4..ae34b1fe4 100644
--- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch
index ce6c756df..ce6c756df 100644
--- a/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch
diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb
index c1ed0bb31..c1ed0bb31 100644
--- a/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxtst_1.2.2.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.2.bb
index 1b0bcf391..1b0bcf391 100644
--- a/meta/recipes-graphics/xorg-lib/libxtst_1.2.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.2.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxv_1.0.10.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxv_1.0.10.bb
index f02b8b64f..f02b8b64f 100644
--- a/meta/recipes-graphics/xorg-lib/libxv_1.0.10.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxv_1.0.10.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxvmc_1.0.9.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxvmc_1.0.9.bb
index 41e8498a6..41e8498a6 100644
--- a/meta/recipes-graphics/xorg-lib/libxvmc_1.0.9.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxvmc_1.0.9.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb
index 695a39637..695a39637 100644
--- a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb
index af6f1f76a..af6f1f76a 100644
--- a/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb
index 35f87d271..35f87d271 100644
--- a/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb
diff --git a/meta/recipes-graphics/xorg-lib/pixman/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
index 4569dca01..4569dca01 100644
--- a/meta/recipes-graphics/xorg-lib/pixman/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
diff --git a/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch
index a60df5fc0..a60df5fc0 100644
--- a/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch
diff --git a/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch
index b52a5707d..b52a5707d 100644
--- a/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch
diff --git a/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch
index 14a5fd209..14a5fd209 100644
--- a/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb
index 317a568bd..317a568bd 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb
index 91464b6c9..91464b6c9 100644
--- a/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb
index bca64ed61..bca64ed61 100644
--- a/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb
index 25c22e5fa..25c22e5fa 100644
--- a/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb
index 39f138329..39f138329 100644
--- a/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util.inc b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util.inc
index 99d04f9d4..99d04f9d4 100644
--- a/meta/recipes-graphics/xorg-lib/xcb-util.inc
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util.inc
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb
index 206f07a65..206f07a65 100644
--- a/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb
diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb
index f41699039..f41699039 100644
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb
diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/yocto-poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
index 09df0109c..09df0109c 100644
--- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb
index d5b7f1a2c..d5b7f1a2c 100644
--- a/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb
diff --git a/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb
index f798a4353..f798a4353 100644
--- a/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb
diff --git a/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch b/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch
index ff8cb25cd..ff8cb25cd 100644
--- a/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch
diff --git a/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb
index b88d15792..b88d15792 100644
--- a/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb
diff --git a/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb
index adfee2630..adfee2630 100644
--- a/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb
diff --git a/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb
index 75d026810..75d026810 100644
--- a/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb
diff --git a/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb
index d960e5d4c..d960e5d4c 100644
--- a/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb
diff --git a/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb
index f4c40c571..f4c40c571 100644
--- a/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb
diff --git a/meta/recipes-graphics/xorg-proto/dri2proto_git.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/dri2proto_git.bb
index 9074f48d4..9074f48d4 100644
--- a/meta/recipes-graphics/xorg-proto/dri2proto_git.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/dri2proto_git.bb
diff --git a/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb
index bed97b3f4..bed97b3f4 100644
--- a/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb
diff --git a/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb
index 39fb88d84..39fb88d84 100644
--- a/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb
diff --git a/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb
index 27fc28174..27fc28174 100644
--- a/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb
diff --git a/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb
index eb03d33c2..eb03d33c2 100644
--- a/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb
diff --git a/meta/recipes-graphics/xorg-proto/inputproto_2.3.1.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.1.bb
index 7e8e0c155..7e8e0c155 100644
--- a/meta/recipes-graphics/xorg-proto/inputproto_2.3.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.1.bb
diff --git a/meta/recipes-graphics/xorg-proto/inputproto_git.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_git.bb
index 6520f3bb0..6520f3bb0 100644
--- a/meta/recipes-graphics/xorg-proto/inputproto_git.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_git.bb
diff --git a/meta/recipes-graphics/xorg-proto/kbproto_1.0.7.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/kbproto_1.0.7.bb
index 46f5c92b6..46f5c92b6 100644
--- a/meta/recipes-graphics/xorg-proto/kbproto_1.0.7.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/kbproto_1.0.7.bb
diff --git a/meta/recipes-graphics/xorg-proto/presentproto_git.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/presentproto_git.bb
index dbb6f32bc..dbb6f32bc 100644
--- a/meta/recipes-graphics/xorg-proto/presentproto_git.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/presentproto_git.bb
diff --git a/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb
index b59e52513..b59e52513 100644
--- a/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb
diff --git a/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb
index ad2317c26..ad2317c26 100644
--- a/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb
diff --git a/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
index ff800ec83..ff800ec83 100644
--- a/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
diff --git a/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
index 08b610aea..08b610aea 100644
--- a/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
diff --git a/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb
index ab07f518c..ab07f518c 100644
--- a/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb
diff --git a/meta/recipes-graphics/xorg-proto/videoproto_2.3.2.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.2.bb
index 53aa7593b..53aa7593b 100644
--- a/meta/recipes-graphics/xorg-proto/videoproto_2.3.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.2.bb
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto.inc b/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto.inc
index 2e1b57bae..2e1b57bae 100644
--- a/meta/recipes-graphics/xorg-proto/xcb-proto.inc
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto.inc
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.11.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.11.bb
index 5bc5a112e..5bc5a112e 100644
--- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.11.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.11.bb
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_git.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_git.bb
index 2ea4d0421..2ea4d0421 100644
--- a/meta/recipes-graphics/xorg-proto/xcb-proto_git.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_git.bb
diff --git a/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb
index 0751b94c9..0751b94c9 100644
--- a/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb
diff --git a/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb
index dd0bd951b..dd0bd951b 100644
--- a/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb
diff --git a/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
index 86f3ce328..86f3ce328 100644
--- a/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
diff --git a/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb
index b3f9210cc..b3f9210cc 100644
--- a/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb
diff --git a/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb
index d4663ea88..d4663ea88 100644
--- a/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb
diff --git a/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb
index 0f31900a9..0f31900a9 100644
--- a/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb
diff --git a/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb
index d00774ece..d00774ece 100644
--- a/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb
diff --git a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc b/yocto-poky/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
index 7a417c974..7a417c974 100644
--- a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
diff --git a/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch b/yocto-poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch
index 540ad27d4..540ad27d4 100644
--- a/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch
diff --git a/meta/recipes-graphics/xorg-proto/xproto_7.0.28.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xproto_7.0.28.bb
index 7427a7d53..7427a7d53 100644
--- a/meta/recipes-graphics/xorg-proto/xproto_7.0.28.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-proto/xproto_7.0.28.bb
diff --git a/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb b/yocto-poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb
index ccf2f4b45..ccf2f4b45 100644
--- a/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb
diff --git a/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb b/yocto-poky/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb
index 84a967a81..84a967a81 100644
--- a/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb
diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.19.0.bb b/yocto-poky/meta/recipes-graphics/xorg-util/util-macros_1.19.0.bb
index 26cf50f2f..26cf50f2f 100644
--- a/meta/recipes-graphics/xorg-util/util-macros_1.19.0.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-util/util-macros_1.19.0.bb
diff --git a/meta/recipes-graphics/xorg-util/xorg-util-common.inc b/yocto-poky/meta/recipes-graphics/xorg-util/xorg-util-common.inc
index 18d022c49..18d022c49 100644
--- a/meta/recipes-graphics/xorg-util/xorg-util-common.inc
+++ b/yocto-poky/meta/recipes-graphics/xorg-util/xorg-util-common.inc
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf
index 7ceb6fd63..7ceb6fd63 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf
+++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
index 629ae214e..629ae214e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
+++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf
index e6c8b514e..e6c8b514e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf
+++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf
index 629ae214e..629ae214e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf
+++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf
index 629ae214e..629ae214e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf
+++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf
index 629ae214e..629ae214e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf
+++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
index bbda9eaa6..bbda9eaa6 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
+++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
index bbda9eaa6..bbda9eaa6 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
+++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
index e69de29bb..e69de29bb 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
+++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
index e07c204c7..e07c204c7 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 9881c942b..9881c942b 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch
index 21e4ed4d2..21e4ed4d2 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
index ec0eea6ca..ec0eea6ca 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
+++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
index 3039d303d..3039d303d 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
+++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
diff --git a/meta/recipes-graphics/xrestop/xrestop_0.4.bb b/yocto-poky/meta/recipes-graphics/xrestop/xrestop_0.4.bb
index ce5df0393..ce5df0393 100644
--- a/meta/recipes-graphics/xrestop/xrestop_0.4.bb
+++ b/yocto-poky/meta/recipes-graphics/xrestop/xrestop_0.4.bb
diff --git a/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh b/yocto-poky/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh
index fa43617bd..fa43617bd 100644
--- a/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh
+++ b/yocto-poky/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh
diff --git a/meta/recipes-graphics/xtscal/xtscal/change-cross.patch b/yocto-poky/meta/recipes-graphics/xtscal/xtscal/change-cross.patch
index 1da771786..1da771786 100644
--- a/meta/recipes-graphics/xtscal/xtscal/change-cross.patch
+++ b/yocto-poky/meta/recipes-graphics/xtscal/xtscal/change-cross.patch
diff --git a/meta/recipes-graphics/xtscal/xtscal/cleanup.patch b/yocto-poky/meta/recipes-graphics/xtscal/xtscal/cleanup.patch
index f7b0854c3..f7b0854c3 100644
--- a/meta/recipes-graphics/xtscal/xtscal/cleanup.patch
+++ b/yocto-poky/meta/recipes-graphics/xtscal/xtscal/cleanup.patch
diff --git a/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch b/yocto-poky/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch
index 3e4533f78..3e4533f78 100644
--- a/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch
+++ b/yocto-poky/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch
diff --git a/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb b/yocto-poky/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb
index 4bfddf06b..4bfddf06b 100644
--- a/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb
+++ b/yocto-poky/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb
diff --git a/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb b/yocto-poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb
index 9b3c9e0c0..9b3c9e0c0 100644
--- a/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb
+++ b/yocto-poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb
diff --git a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch b/yocto-poky/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
index 037d16134..037d16134 100644
--- a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
+++ b/yocto-poky/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/yocto-poky/meta/recipes-kernel/blktrace/blktrace_git.bb
index 5b0be425e..5b0be425e 100644
--- a/meta/recipes-kernel/blktrace/blktrace_git.bb
+++ b/yocto-poky/meta/recipes-kernel/blktrace/blktrace_git.bb
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb b/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb
index a33841d09..a33841d09 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb
+++ b/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.7.bb b/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev-module_1.7.bb
index 5cd52eb87..5cd52eb87 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.7.bb
+++ b/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev-module_1.7.bb
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.7.bb b/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev-tests_1.7.bb
index be59a4af2..be59a4af2 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.7.bb
+++ b/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev-tests_1.7.bb
diff --git a/meta/recipes-kernel/cryptodev/cryptodev_1.7.inc b/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev_1.7.inc
index cca69254c..cca69254c 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev_1.7.inc
+++ b/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev_1.7.inc
diff --git a/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch b/yocto-poky/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
index 3f0298b0b..3f0298b0b 100644
--- a/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
+++ b/yocto-poky/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
diff --git a/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch b/yocto-poky/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
index a580fc68e..a580fc68e 100644
--- a/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
+++ b/yocto-poky/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
diff --git a/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch b/yocto-poky/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch
index 74c897253..74c897253 100644
--- a/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch
+++ b/yocto-poky/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch
diff --git a/meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch b/yocto-poky/meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch
index f5ab8b4f9..f5ab8b4f9 100644
--- a/meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch
+++ b/yocto-poky/meta/recipes-kernel/cryptodev/files/0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch
diff --git a/meta/recipes-kernel/dtc/dtc.inc b/yocto-poky/meta/recipes-kernel/dtc/dtc.inc
index 0c409b0c0..0c409b0c0 100644
--- a/meta/recipes-kernel/dtc/dtc.inc
+++ b/yocto-poky/meta/recipes-kernel/dtc/dtc.inc
diff --git a/meta/recipes-kernel/dtc/dtc/make_install.patch b/yocto-poky/meta/recipes-kernel/dtc/dtc/make_install.patch
index 1120617e7..1120617e7 100644
--- a/meta/recipes-kernel/dtc/dtc/make_install.patch
+++ b/yocto-poky/meta/recipes-kernel/dtc/dtc/make_install.patch
diff --git a/meta/recipes-kernel/dtc/dtc_git.bb b/yocto-poky/meta/recipes-kernel/dtc/dtc_git.bb
index 4446142a3..4446142a3 100644
--- a/meta/recipes-kernel/dtc/dtc_git.bb
+++ b/yocto-poky/meta/recipes-kernel/dtc/dtc_git.bb
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/yocto-poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 445d03a87..445d03a87 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/yocto-poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
diff --git a/meta/recipes-kernel/kexec/kexec-tools.inc b/yocto-poky/meta/recipes-kernel/kexec/kexec-tools.inc
index 7797a2573..7797a2573 100644
--- a/meta/recipes-kernel/kexec/kexec-tools.inc
+++ b/yocto-poky/meta/recipes-kernel/kexec/kexec-tools.inc
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Pass-r-directly-to-linker.patch b/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Pass-r-directly-to-linker.patch
index bfd077daf..bfd077daf 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Pass-r-directly-to-linker.patch
+++ b/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Pass-r-directly-to-linker.patch
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch b/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch
index dc97d930e..dc97d930e 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch
+++ b/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch
diff --git a/meta/recipes-kernel/kexec/kexec-tools/kexec-aarch64.patch b/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kexec-aarch64.patch
index b03f58257..b03f58257 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/kexec-aarch64.patch
+++ b/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kexec-aarch64.patch
diff --git a/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch b/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
index e198eb6e9..e198eb6e9 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
+++ b/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
diff --git a/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch b/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch
index 26d18eb6f..26d18eb6f 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch
+++ b/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.10.bb b/yocto-poky/meta/recipes-kernel/kexec/kexec-tools_2.0.10.bb
index ffdb983a4..ffdb983a4 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.10.bb
+++ b/yocto-poky/meta/recipes-kernel/kexec/kexec-tools_2.0.10.bb
diff --git a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb b/yocto-poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
index 8acb3a858..8acb3a858 100644
--- a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
+++ b/yocto-poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/yocto-poky/meta/recipes-kernel/kmod/kmod-native_git.bb
index f0e274ed7..f0e274ed7 100644
--- a/meta/recipes-kernel/kmod/kmod-native_git.bb
+++ b/yocto-poky/meta/recipes-kernel/kmod/kmod-native_git.bb
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/yocto-poky/meta/recipes-kernel/kmod/kmod.inc
index 71ffdf88d..71ffdf88d 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/yocto-poky/meta/recipes-kernel/kmod/kmod.inc
diff --git a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch b/yocto-poky/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
index b722183b6..b722183b6 100644
--- a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
+++ b/yocto-poky/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
diff --git a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch b/yocto-poky/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
index feafcb9b7..feafcb9b7 100644
--- a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
+++ b/yocto-poky/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
diff --git a/meta/recipes-kernel/kmod/kmod/depmod-search.conf b/yocto-poky/meta/recipes-kernel/kmod/kmod/depmod-search.conf
index 527c0bb6e..527c0bb6e 100644
--- a/meta/recipes-kernel/kmod/kmod/depmod-search.conf
+++ b/yocto-poky/meta/recipes-kernel/kmod/kmod/depmod-search.conf
diff --git a/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch b/yocto-poky/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
index 8161d6128..8161d6128 100644
--- a/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
+++ b/yocto-poky/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
diff --git a/meta/recipes-kernel/kmod/kmod/ptest.patch b/yocto-poky/meta/recipes-kernel/kmod/kmod/ptest.patch
index 831dbcb90..831dbcb90 100644
--- a/meta/recipes-kernel/kmod/kmod/ptest.patch
+++ b/yocto-poky/meta/recipes-kernel/kmod/kmod/ptest.patch
diff --git a/meta/recipes-kernel/kmod/kmod/run-ptest b/yocto-poky/meta/recipes-kernel/kmod/kmod/run-ptest
index 598dd2cb5..598dd2cb5 100755
--- a/meta/recipes-kernel/kmod/kmod/run-ptest
+++ b/yocto-poky/meta/recipes-kernel/kmod/kmod/run-ptest
diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/yocto-poky/meta/recipes-kernel/kmod/kmod_git.bb
index e0bb95c8f..e0bb95c8f 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/yocto-poky/meta/recipes-kernel/kmod/kmod_git.bb
diff --git a/meta/recipes-kernel/latencytop/latencytop-0.5/0001-Rectify-the-function-signatures-to-fix-prototype-mis.patch b/yocto-poky/meta/recipes-kernel/latencytop/latencytop-0.5/0001-Rectify-the-function-signatures-to-fix-prototype-mis.patch
index b24813346..b24813346 100644
--- a/meta/recipes-kernel/latencytop/latencytop-0.5/0001-Rectify-the-function-signatures-to-fix-prototype-mis.patch
+++ b/yocto-poky/meta/recipes-kernel/latencytop/latencytop-0.5/0001-Rectify-the-function-signatures-to-fix-prototype-mis.patch
diff --git a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync.patch b/yocto-poky/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync.patch
index 7848ccf2a..7848ccf2a 100644
--- a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync.patch
+++ b/yocto-poky/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync.patch
diff --git a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch b/yocto-poky/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
index 0cf217fa0..0cf217fa0 100644
--- a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
+++ b/yocto-poky/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
diff --git a/meta/recipes-kernel/latencytop/latencytop_0.5.bb b/yocto-poky/meta/recipes-kernel/latencytop/latencytop_0.5.bb
index f31f1bb7a..f31f1bb7a 100644
--- a/meta/recipes-kernel/latencytop/latencytop_0.5.bb
+++ b/yocto-poky/meta/recipes-kernel/latencytop/latencytop_0.5.bb
diff --git a/meta/recipes-kernel/libpfm/files/0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch b/yocto-poky/meta/recipes-kernel/libpfm/files/0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch
index d59a7f7d8..d59a7f7d8 100644
--- a/meta/recipes-kernel/libpfm/files/0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch
+++ b/yocto-poky/meta/recipes-kernel/libpfm/files/0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch
diff --git a/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb b/yocto-poky/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb
index 2dfda90b9..2dfda90b9 100644
--- a/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb
+++ b/yocto-poky/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/yocto-poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 0878ab1a8..0878ab1a8 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/yocto-poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
index 566bc1e61..566bc1e61 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb b/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb
index d816e5e78..d816e5e78 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb
+++ b/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/yocto-poky/meta/recipes-kernel/linux/kernel-devsrc.bb
index 196c8c7a2..196c8c7a2 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/yocto-poky/meta/recipes-kernel/linux/kernel-devsrc.bb
diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/yocto-poky/meta/recipes-kernel/linux/linux-dtb.inc
index ee3a5e1b9..ee3a5e1b9 100644
--- a/meta/recipes-kernel/linux/linux-dtb.inc
+++ b/yocto-poky/meta/recipes-kernel/linux/linux-dtb.inc
diff --git a/meta/recipes-kernel/linux/linux-dummy.bb b/yocto-poky/meta/recipes-kernel/linux/linux-dummy.bb
index cc0e4e64a..cc0e4e64a 100644
--- a/meta/recipes-kernel/linux/linux-dummy.bb
+++ b/yocto-poky/meta/recipes-kernel/linux/linux-dummy.bb
diff --git a/meta/recipes-kernel/linux/linux-dummy/COPYING.GPL b/yocto-poky/meta/recipes-kernel/linux/linux-dummy/COPYING.GPL
index d511905c1..d511905c1 100644
--- a/meta/recipes-kernel/linux/linux-dummy/COPYING.GPL
+++ b/yocto-poky/meta/recipes-kernel/linux/linux-dummy/COPYING.GPL
diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-dev.bb
index afe482ac6..afe482ac6 100644
--- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
+++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-dev.bb
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
index bfeabbec0..bfeabbec0 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
+++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
index b441bf681..b441bf681 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
+++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
index e13cb80ce..e13cb80ce 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
+++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
index a6a58a2ed..a6a58a2ed 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
+++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
index 4caa2523b..4caa2523b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
+++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/yocto-poky/meta/recipes-kernel/linux/linux-yocto.inc
index 81ffa24d0..81ffa24d0 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto.inc
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto_3.14.bb
index db93d23db..db93d23db 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb
+++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto_3.14.bb
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.19.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto_3.19.bb
index baa575b11..baa575b11 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.19.bb
+++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto_3.19.bb
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.1.bb
index 1bb7336b5..1bb7336b5 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb
+++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.1.bb
diff --git a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch b/yocto-poky/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch
index 3e2c4e1e6..3e2c4e1e6 100644
--- a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch
+++ b/yocto-poky/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch
diff --git a/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb b/yocto-poky/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb
index 536be41e3..536be41e3 100644
--- a/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb
+++ b/yocto-poky/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb
diff --git a/meta/recipes-kernel/lttng/lttng-modules_git.bb b/yocto-poky/meta/recipes-kernel/lttng/lttng-modules_git.bb
index 54544fee0..54544fee0 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_git.bb
+++ b/yocto-poky/meta/recipes-kernel/lttng/lttng-modules_git.bb
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-sessiond-disable-match-app-event-by-name.patch b/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-sessiond-disable-match-app-event-by-name.patch
index ac1f34bfa..ac1f34bfa 100644
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-sessiond-disable-match-app-event-by-name.patch
+++ b/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-sessiond-disable-match-app-event-by-name.patch
diff --git a/meta/recipes-kernel/lttng/lttng-tools/extern-decls.patch b/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/extern-decls.patch
index 199ef5761..199ef5761 100644
--- a/meta/recipes-kernel/lttng/lttng-tools/extern-decls.patch
+++ b/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/extern-decls.patch
diff --git a/meta/recipes-kernel/lttng/lttng-tools/lttng-tools-Fix-live-timer-calculation-error.patch b/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/lttng-tools-Fix-live-timer-calculation-error.patch
index 4719d9548..4719d9548 100644
--- a/meta/recipes-kernel/lttng/lttng-tools/lttng-tools-Fix-live-timer-calculation-error.patch
+++ b/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/lttng-tools-Fix-live-timer-calculation-error.patch
diff --git a/meta/recipes-kernel/lttng/lttng-tools/run-ptest b/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/run-ptest
index e758815c7..e758815c7 100755
--- a/meta/recipes-kernel/lttng/lttng-tools/run-ptest
+++ b/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/run-ptest
diff --git a/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch b/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch
index 958bce48e..958bce48e 100644
--- a/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch
+++ b/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch
diff --git a/meta/recipes-kernel/lttng/lttng-tools/runtest.patch b/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/runtest.patch
index 545a5dc08..545a5dc08 100644
--- a/meta/recipes-kernel/lttng/lttng-tools/runtest.patch
+++ b/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/runtest.patch
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb b/yocto-poky/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb
index 909acc37a..909acc37a 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb
+++ b/yocto-poky/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb
diff --git a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-Fix-live-timer-calculation-error.patch b/yocto-poky/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-Fix-live-timer-calculation-error.patch
index 03120fe5d..03120fe5d 100644
--- a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-Fix-live-timer-calculation-error.patch
+++ b/yocto-poky/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-Fix-live-timer-calculation-error.patch
diff --git a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch b/yocto-poky/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch
index b68a9899c..b68a9899c 100644
--- a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch
+++ b/yocto-poky/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch
diff --git a/meta/recipes-kernel/lttng/lttng-ust_git.bb b/yocto-poky/meta/recipes-kernel/lttng/lttng-ust_git.bb
index ae4afd3d8..ae4afd3d8 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_git.bb
+++ b/yocto-poky/meta/recipes-kernel/lttng/lttng-ust_git.bb
diff --git a/meta/recipes-kernel/modutils-initscripts/files/PD.patch b/yocto-poky/meta/recipes-kernel/modutils-initscripts/files/PD.patch
index 21ac49cbd..21ac49cbd 100644
--- a/meta/recipes-kernel/modutils-initscripts/files/PD.patch
+++ b/yocto-poky/meta/recipes-kernel/modutils-initscripts/files/PD.patch
diff --git a/meta/recipes-kernel/modutils-initscripts/files/modutils.sh b/yocto-poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh
index a78adf572..a78adf572 100755
--- a/meta/recipes-kernel/modutils-initscripts/files/modutils.sh
+++ b/yocto-poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh
diff --git a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/yocto-poky/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
index db670cfbb..db670cfbb 100644
--- a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
+++ b/yocto-poky/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
diff --git a/meta/recipes-kernel/oprofile/oprofile.inc b/yocto-poky/meta/recipes-kernel/oprofile/oprofile.inc
index 6ec56e7b3..6ec56e7b3 100644
--- a/meta/recipes-kernel/oprofile/oprofile.inc
+++ b/yocto-poky/meta/recipes-kernel/oprofile/oprofile.inc
diff --git a/meta/recipes-kernel/oprofile/oprofile/acinclude.m4 b/yocto-poky/meta/recipes-kernel/oprofile/oprofile/acinclude.m4
index 95ecd91b5..95ecd91b5 100644
--- a/meta/recipes-kernel/oprofile/oprofile/acinclude.m4
+++ b/yocto-poky/meta/recipes-kernel/oprofile/oprofile/acinclude.m4
diff --git a/meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch b/yocto-poky/meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch
index b9bb6c577..b9bb6c577 100644
--- a/meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch
+++ b/yocto-poky/meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch
diff --git a/meta/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch b/yocto-poky/meta/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch
index aefa9548e..aefa9548e 100644
--- a/meta/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch
+++ b/yocto-poky/meta/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch
diff --git a/meta/recipes-kernel/oprofile/oprofile/root-home-dir.patch b/yocto-poky/meta/recipes-kernel/oprofile/oprofile/root-home-dir.patch
index 20fc5e503..20fc5e503 100644
--- a/meta/recipes-kernel/oprofile/oprofile/root-home-dir.patch
+++ b/yocto-poky/meta/recipes-kernel/oprofile/oprofile/root-home-dir.patch
diff --git a/meta/recipes-kernel/oprofile/oprofile/run-ptest b/yocto-poky/meta/recipes-kernel/oprofile/oprofile/run-ptest
index 4814be652..4814be652 100644
--- a/meta/recipes-kernel/oprofile/oprofile/run-ptest
+++ b/yocto-poky/meta/recipes-kernel/oprofile/oprofile/run-ptest
diff --git a/meta/recipes-kernel/oprofile/oprofile_1.1.0.bb b/yocto-poky/meta/recipes-kernel/oprofile/oprofile_1.1.0.bb
index 92a94ad0d..92a94ad0d 100644
--- a/meta/recipes-kernel/oprofile/oprofile_1.1.0.bb
+++ b/yocto-poky/meta/recipes-kernel/oprofile/oprofile_1.1.0.bb
diff --git a/meta/recipes-kernel/oprofile/oprofileui-server/init b/yocto-poky/meta/recipes-kernel/oprofile/oprofileui-server/init
index 2544ea4ac..2544ea4ac 100755
--- a/meta/recipes-kernel/oprofile/oprofileui-server/init
+++ b/yocto-poky/meta/recipes-kernel/oprofile/oprofileui-server/init
diff --git a/meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service b/yocto-poky/meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service
index 1a2cbe62e..1a2cbe62e 100644
--- a/meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service
+++ b/yocto-poky/meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service
diff --git a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb b/yocto-poky/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
index cc3477bc7..cc3477bc7 100644
--- a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
+++ b/yocto-poky/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
diff --git a/meta/recipes-kernel/oprofile/oprofileui.inc b/yocto-poky/meta/recipes-kernel/oprofile/oprofileui.inc
index 8fcf014a9..8fcf014a9 100644
--- a/meta/recipes-kernel/oprofile/oprofileui.inc
+++ b/yocto-poky/meta/recipes-kernel/oprofile/oprofileui.inc
diff --git a/meta/recipes-kernel/oprofile/oprofileui_git.bb b/yocto-poky/meta/recipes-kernel/oprofile/oprofileui_git.bb
index 86f3d8e50..86f3d8e50 100644
--- a/meta/recipes-kernel/oprofile/oprofileui_git.bb
+++ b/yocto-poky/meta/recipes-kernel/oprofile/oprofileui_git.bb
diff --git a/meta/recipes-kernel/perf/perf-features.inc b/yocto-poky/meta/recipes-kernel/perf/perf-features.inc
index b8859ab7d..b8859ab7d 100644
--- a/meta/recipes-kernel/perf/perf-features.inc
+++ b/yocto-poky/meta/recipes-kernel/perf/perf-features.inc
diff --git a/meta/recipes-kernel/perf/perf.bb b/yocto-poky/meta/recipes-kernel/perf/perf.bb
index 22bd3c820..22bd3c820 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/yocto-poky/meta/recipes-kernel/perf/perf.bb
diff --git a/meta/recipes-kernel/powertop/powertop_2.7.bb b/yocto-poky/meta/recipes-kernel/powertop/powertop_2.7.bb
index 5ba07e9ab..5ba07e9ab 100644
--- a/meta/recipes-kernel/powertop/powertop_2.7.bb
+++ b/yocto-poky/meta/recipes-kernel/powertop/powertop_2.7.bb
diff --git a/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch b/yocto-poky/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
index dcc2cbe67..dcc2cbe67 100644
--- a/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
+++ b/yocto-poky/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
diff --git a/meta/recipes-kernel/sysprof/files/rmb-arm.patch b/yocto-poky/meta/recipes-kernel/sysprof/files/rmb-arm.patch
index c53ac6427..c53ac6427 100644
--- a/meta/recipes-kernel/sysprof/files/rmb-arm.patch
+++ b/yocto-poky/meta/recipes-kernel/sysprof/files/rmb-arm.patch
diff --git a/meta/recipes-kernel/sysprof/files/rmb-mips.patch b/yocto-poky/meta/recipes-kernel/sysprof/files/rmb-mips.patch
index e055b8ad8..e055b8ad8 100644
--- a/meta/recipes-kernel/sysprof/files/rmb-mips.patch
+++ b/yocto-poky/meta/recipes-kernel/sysprof/files/rmb-mips.patch
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/yocto-poky/meta/recipes-kernel/sysprof/sysprof_git.bb
index 7d87efe7d..7d87efe7d 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/yocto-poky/meta/recipes-kernel/sysprof/sysprof_git.bb
diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/yocto-poky/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
index 758908bff..758908bff 100644
--- a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
+++ b/yocto-poky/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
diff --git a/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch b/yocto-poky/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch
index b4f2fbc06..b4f2fbc06 100644
--- a/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch
+++ b/yocto-poky/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch
diff --git a/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch b/yocto-poky/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
index 33a89940a..33a89940a 100644
--- a/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
+++ b/yocto-poky/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
diff --git a/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch b/yocto-poky/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch
index 988cda4f0..988cda4f0 100644
--- a/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch
+++ b/yocto-poky/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch
diff --git a/meta/recipes-kernel/systemtap/systemtap/system_map_location.patch b/yocto-poky/meta/recipes-kernel/systemtap/systemtap/system_map_location.patch
index 013af5c3a..013af5c3a 100644
--- a/meta/recipes-kernel/systemtap/systemtap/system_map_location.patch
+++ b/yocto-poky/meta/recipes-kernel/systemtap/systemtap/system_map_location.patch
diff --git a/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch b/yocto-poky/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch
index 28a7eae40..28a7eae40 100644
--- a/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch
+++ b/yocto-poky/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/yocto-poky/meta/recipes-kernel/systemtap/systemtap_git.bb
index d0dd42a64..d0dd42a64 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/yocto-poky/meta/recipes-kernel/systemtap/systemtap_git.bb
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/yocto-poky/meta/recipes-kernel/systemtap/systemtap_git.inc
index 59a578daa..59a578daa 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/yocto-poky/meta/recipes-kernel/systemtap/systemtap_git.inc
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb b/yocto-poky/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
index 563182c89..563182c89 100644
--- a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
+++ b/yocto-poky/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd.inc b/yocto-poky/meta/recipes-kernel/trace-cmd/trace-cmd.inc
index 87e4a9c60..87e4a9c60 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd.inc
+++ b/yocto-poky/meta/recipes-kernel/trace-cmd/trace-cmd.inc
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch b/yocto-poky/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch
index 320db6a32..320db6a32 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch
+++ b/yocto-poky/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb b/yocto-poky/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
index b1ac7892d..b1ac7892d 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
+++ b/yocto-poky/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
diff --git a/meta/recipes-lsb4/libpng/libpng12_1.2.53.bb b/yocto-poky/meta/recipes-lsb4/libpng/libpng12_1.2.53.bb
index 24f6affa2..24f6affa2 100644
--- a/meta/recipes-lsb4/libpng/libpng12_1.2.53.bb
+++ b/yocto-poky/meta/recipes-lsb4/libpng/libpng12_1.2.53.bb
diff --git a/meta/recipes-lsb4/perl/libclass-isa-perl_0.36.bb b/yocto-poky/meta/recipes-lsb4/perl/libclass-isa-perl_0.36.bb
index f93841dc7..f93841dc7 100644
--- a/meta/recipes-lsb4/perl/libclass-isa-perl_0.36.bb
+++ b/yocto-poky/meta/recipes-lsb4/perl/libclass-isa-perl_0.36.bb
diff --git a/meta/recipes-lsb4/perl/libdumpvalue-perl_1.17.bb b/yocto-poky/meta/recipes-lsb4/perl/libdumpvalue-perl_1.17.bb
index 9a7461463..9a7461463 100644
--- a/meta/recipes-lsb4/perl/libdumpvalue-perl_1.17.bb
+++ b/yocto-poky/meta/recipes-lsb4/perl/libdumpvalue-perl_1.17.bb
diff --git a/meta/recipes-lsb4/perl/libenv-perl_1.04.bb b/yocto-poky/meta/recipes-lsb4/perl/libenv-perl_1.04.bb
index dd8e1159e..dd8e1159e 100644
--- a/meta/recipes-lsb4/perl/libenv-perl_1.04.bb
+++ b/yocto-poky/meta/recipes-lsb4/perl/libenv-perl_1.04.bb
diff --git a/meta/recipes-lsb4/perl/libfile-checktree-perl_4.41.bb b/yocto-poky/meta/recipes-lsb4/perl/libfile-checktree-perl_4.41.bb
index ce37c72ca..ce37c72ca 100644
--- a/meta/recipes-lsb4/perl/libfile-checktree-perl_4.41.bb
+++ b/yocto-poky/meta/recipes-lsb4/perl/libfile-checktree-perl_4.41.bb
diff --git a/meta/recipes-lsb4/perl/libi18n-collate-perl_1.02.bb b/yocto-poky/meta/recipes-lsb4/perl/libi18n-collate-perl_1.02.bb
index f1839e0cf..f1839e0cf 100644
--- a/meta/recipes-lsb4/perl/libi18n-collate-perl_1.02.bb
+++ b/yocto-poky/meta/recipes-lsb4/perl/libi18n-collate-perl_1.02.bb
diff --git a/meta/recipes-lsb4/perl/libpod-plainer-perl_1.04.bb b/yocto-poky/meta/recipes-lsb4/perl/libpod-plainer-perl_1.04.bb
index a3e58f031..a3e58f031 100644
--- a/meta/recipes-lsb4/perl/libpod-plainer-perl_1.04.bb
+++ b/yocto-poky/meta/recipes-lsb4/perl/libpod-plainer-perl_1.04.bb
diff --git a/meta/recipes-multimedia/alsa/alsa-fpu.inc b/yocto-poky/meta/recipes-multimedia/alsa/alsa-fpu.inc
index 50402307c..50402307c 100644
--- a/meta/recipes-multimedia/alsa/alsa-fpu.inc
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-fpu.inc
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch
index 583bc3daa..583bc3daa 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch
index 75a6eb8a3..75a6eb8a3 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb b/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb
index 730f42740..730f42740 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch
index c70c72cb7..c70c72cb7 100644
--- a/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins/0001-include-speexdsp_types.h-not-speex_types.h.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins/0001-include-speexdsp_types.h-not-speex_types.h.patch
index e5199fb85..e5199fb85 100644
--- a/meta/recipes-multimedia/alsa/alsa-plugins/0001-include-speexdsp_types.h-not-speex_types.h.patch
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins/0001-include-speexdsp_types.h-not-speex_types.h.patch
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb b/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb
index c928618c8..c928618c8 100644
--- a/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/0001-as10k1-Make-output_tram_line-static-inline.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/0001-as10k1-Make-output_tram_line-static-inline.patch
index d049a30d2..d049a30d2 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools/0001-as10k1-Make-output_tram_line-static-inline.patch
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/0001-as10k1-Make-output_tram_line-static-inline.patch
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch
index 59391d690..59391d690 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/gitcompile_hdajacksensetest b/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/gitcompile_hdajacksensetest
index 58328bd3a..58328bd3a 100755
--- a/meta/recipes-multimedia/alsa/alsa-tools/gitcompile_hdajacksensetest
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/gitcompile_hdajacksensetest
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch
index c95760961..c95760961 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb b/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb
index fdf396e3f..fdf396e3f 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.0.29.bb b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.0.29.bb
index a98f9b90b..a98f9b90b 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.0.29.bb
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.0.29.bb
diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
index e99dd515f..e99dd515f 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
diff --git a/meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch
index 5df004aea..5df004aea 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch
diff --git a/meta/recipes-multimedia/alsa/alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch
index f67283db7..f67283db7 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb
index 97fe4b2fe..97fe4b2fe 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb
+++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb
diff --git a/meta/recipes-multimedia/flac/flac_1.3.1.bb b/yocto-poky/meta/recipes-multimedia/flac/flac_1.3.1.bb
index f25271f87..f25271f87 100644
--- a/meta/recipes-multimedia/flac/flac_1.3.1.bb
+++ b/yocto-poky/meta/recipes-multimedia/flac/flac_1.3.1.bb
diff --git a/meta/recipes-multimedia/gstreamer/gst-player/Add-error-signal-emission-for-missing-plugins.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gst-player/Add-error-signal-emission-for-missing-plugins.patch
index 712d46daa..712d46daa 100644
--- a/meta/recipes-multimedia/gstreamer/gst-player/Add-error-signal-emission-for-missing-plugins.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gst-player/Add-error-signal-emission-for-missing-plugins.patch
diff --git a/meta/recipes-multimedia/gstreamer/gst-player/Fix-pause-play.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gst-player/Fix-pause-play.patch
index 783c42ad7..783c42ad7 100644
--- a/meta/recipes-multimedia/gstreamer/gst-player/Fix-pause-play.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gst-player/Fix-pause-play.patch
diff --git a/meta/recipes-multimedia/gstreamer/gst-player/filechooser.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gst-player/filechooser.patch
index 7bf1b034b..7bf1b034b 100644
--- a/meta/recipes-multimedia/gstreamer/gst-player/filechooser.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gst-player/filechooser.patch
diff --git a/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop b/yocto-poky/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop
index 9fd207b38..9fd207b38 100644
--- a/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop
diff --git a/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch
index 2cd18bbc9..2cd18bbc9 100644
--- a/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch
diff --git a/meta/recipes-multimedia/gstreamer/gst-player_git.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gst-player_git.bb
index 985024256..985024256 100644
--- a/meta/recipes-multimedia/gstreamer/gst-player_git.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gst-player_git.bb
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc b/yocto-poky/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
index cb1be06d0..cb1be06d0 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
index 84e6e95d3..84e6e95d3 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch
index 1d99ad125..1d99ad125 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch
index ccadea4d5..ccadea4d5 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb
index 5d74a2e57..5d74a2e57 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb
index bf1b87e6d..bf1b87e6d 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
index 3ef10c372..3ef10c372 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
index 26c13361f..26c13361f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-omx-fixed-type-error-in-printf-call.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-omx-fixed-type-error-in-printf-call.patch
index a428ac9c9..a428ac9c9 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-omx-fixed-type-error-in-printf-call.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-omx-fixed-type-error-in-printf-call.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.2.0.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.2.0.bb
index fe7c91cb3..fe7c91cb3 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.2.0.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.2.0.bb
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb
index 99c84668e..99c84668e 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index b4f01afe5..b4f01afe5 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch
index 042a32c04..042a32c04 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-glimagesink-Downrank-to-marginal.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-glimagesink-Downrank-to-marginal.patch
index f677603eb..f677603eb 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-glimagesink-Downrank-to-marginal.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-glimagesink-Downrank-to-marginal.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch
index d52afd5d5..d52afd5d5 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.5.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.5.bb
index 687366924..687366924 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.5.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.5.bb
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
index 309505f7d..309505f7d 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
index 4909b10d5..4909b10d5 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-basetextoverlay-make-memory-copy-when-video-buffer-s.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-basetextoverlay-make-memory-copy-when-video-buffer-s.patch
index 03dca956a..03dca956a 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-basetextoverlay-make-memory-copy-when-video-buffer-s.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-basetextoverlay-make-memory-copy-when-video-buffer-s.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-video-frame-Don-t-ref-buffers-twice-when-mapping.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-video-frame-Don-t-ref-buffers-twice-when-mapping.patch
index 3db4724fe..3db4724fe 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-video-frame-Don-t-ref-buffers-twice-when-mapping.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-video-frame-Don-t-ref-buffers-twice-when-mapping.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-gstplaysink-don-t-set-async-of-custom-text-sink-to-f.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-gstplaysink-don-t-set-async-of-custom-text-sink-to-f.patch
index 39c146aad..39c146aad 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-gstplaysink-don-t-set-async-of-custom-text-sink-to-f.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-gstplaysink-don-t-set-async-of-custom-text-sink-to-f.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-video-frame-Add-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-video-frame-Add-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch
index c465b5cee..c465b5cee 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-video-frame-Add-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-video-frame-Add-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch
index 9fbebd570..9fbebd570 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-videofilter-Use-new-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-videofilter-Use-new-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch
index 132bf06f7..132bf06f7 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-videofilter-Use-new-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-videofilter-Use-new-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch
index 7813915d8..7813915d8 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/do-not-change-eos-event-to-gap-event-if.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/do-not-change-eos-event-to-gap-event-if.patch
index aa55de10e..aa55de10e 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/do-not-change-eos-event-to-gap-event-if.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/do-not-change-eos-event-to-gap-event-if.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/do-not-change-eos-event-to-gap-event2.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/do-not-change-eos-event-to-gap-event2.patch
index f24bc7cd6..f24bc7cd6 100755
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/do-not-change-eos-event-to-gap-event2.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/do-not-change-eos-event-to-gap-event2.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/do-not-change-eos-event-to-gap-event3.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/do-not-change-eos-event-to-gap-event3.patch
index 731be686d..731be686d 100755
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/do-not-change-eos-event-to-gap-event3.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/do-not-change-eos-event-to-gap-event3.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/encodebin-Need-more-buffers-in-output-queue-for-bett.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/encodebin-Need-more-buffers-in-output-queue-for-bett.patch
index 325671721..325671721 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/encodebin-Need-more-buffers-in-output-queue-for-bett.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/encodebin-Need-more-buffers-in-output-queue-for-bett.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/fix-id3demux-utf16-to-utf8-issue.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/fix-id3demux-utf16-to-utf8-issue.patch
index ef3f75fba..ef3f75fba 100755
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/fix-id3demux-utf16-to-utf8-issue.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/fix-id3demux-utf16-to-utf8-issue.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
index 284abbe94..284abbe94 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/handle-audio-video-decoder-error.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/handle-audio-video-decoder-error.patch
index 833ce72bb..833ce72bb 100755
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/handle-audio-video-decoder-error.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/handle-audio-video-decoder-error.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/taglist-not-send-to-down-stream-if-all-the-frame-cor.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/taglist-not-send-to-down-stream-if-all-the-frame-cor.patch
index 62a52b038..62a52b038 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/taglist-not-send-to-down-stream-if-all-the-frame-cor.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/taglist-not-send-to-down-stream-if-all-the-frame-cor.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/videobuffer_updata_alignment_update.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/videobuffer_updata_alignment_update.patch
index 8cfda955a..8cfda955a 100755
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/videobuffer_updata_alignment_update.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/videobuffer_updata_alignment_update.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/videoencoder-Keep-sticky-events-around-when-doing-a-soft-.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/videoencoder-Keep-sticky-events-around-when-doing-a-soft-.patch
index b47696911..b47696911 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/videoencoder-Keep-sticky-events-around-when-doing-a-soft-.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/videoencoder-Keep-sticky-events-around-when-doing-a-soft-.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.4.5.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.4.5.bb
index b09c2cb58..b09c2cb58 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.4.5.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.4.5.bb
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
index fbe3a42cd..fbe3a42cd 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
index edaafe842..edaafe842 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch
index d1973d439..d1973d439 100755
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/decrease_asteriskh263_rank.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/decrease_asteriskh263_rank.patch
index 288631bf7..288631bf7 100755
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/decrease_asteriskh263_rank.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/decrease_asteriskh263_rank.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.4.5.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.4.5.bb
index 943ab6039..943ab6039 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.4.5.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.4.5.bb
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb
index 2c0e0efe6..2c0e0efe6 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
index 63ba31632..63ba31632 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.4.5.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.4.5.bb
index 25cb28c06..25cb28c06 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.4.5.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.4.5.bb
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb
index dcf5ffc3c..dcf5ffc3c 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
index f1783b768..f1783b768 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
index 28a9420f8..28a9420f8 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.4.5.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.4.5.bb
index bb9b42b53..bb9b42b53 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.4.5.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.4.5.bb
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
index be8aa8f9c..be8aa8f9c 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-Fix-crash-with-gst-inspect.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-Fix-crash-with-gst-inspect.patch
index 94f5cc56e..94f5cc56e 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-Fix-crash-with-gst-inspect.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-Fix-crash-with-gst-inspect.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gstinfo-Shorten-__FILE__-on-all-platforms.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gstinfo-Shorten-__FILE__-on-all-platforms.patch
index 8213c4b8b..8213c4b8b 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gstinfo-Shorten-__FILE__-on-all-platforms.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gstinfo-Shorten-__FILE__-on-all-platforms.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-basesink-Fix-QoS-lateness-checking-if-subclass-imple.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-basesink-Fix-QoS-lateness-checking-if-subclass-imple.patch
index 1505cbefc..1505cbefc 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-basesink-Fix-QoS-lateness-checking-if-subclass-imple.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-basesink-Fix-QoS-lateness-checking-if-subclass-imple.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-basesink-Shouldn-t-drop-buffer-when-sync-false.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-basesink-Shouldn-t-drop-buffer-when-sync-false.patch
index d682ee60c..d682ee60c 100755
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-basesink-Shouldn-t-drop-buffer-when-sync-false.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-basesink-Shouldn-t-drop-buffer-when-sync-false.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/inputselector-sticky-events-haven-t-send-out-when-ac-1-4-1.patch b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/inputselector-sticky-events-haven-t-send-out-when-ac-1-4-1.patch
index f50ce6ff2..f50ce6ff2 100755
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/inputselector-sticky-events-haven-t-send-out-when-ac-1-4-1.patch
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/inputselector-sticky-events-haven-t-send-out-when-ac-1-4-1.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.5.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.5.bb
index 73a4a9927..73a4a9927 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.5.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.5.bb
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb
index cb00d319a..cb00d319a 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb
+++ b/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb
diff --git a/meta/recipes-multimedia/lame/lame/lame-3.99.5_fix_for_automake-1.12.x.patch b/yocto-poky/meta/recipes-multimedia/lame/lame/lame-3.99.5_fix_for_automake-1.12.x.patch
index 571a1d07a..571a1d07a 100644
--- a/meta/recipes-multimedia/lame/lame/lame-3.99.5_fix_for_automake-1.12.x.patch
+++ b/yocto-poky/meta/recipes-multimedia/lame/lame/lame-3.99.5_fix_for_automake-1.12.x.patch
diff --git a/meta/recipes-multimedia/lame/lame/no-gtk1.patch b/yocto-poky/meta/recipes-multimedia/lame/lame/no-gtk1.patch
index e88d7f1bb..e88d7f1bb 100644
--- a/meta/recipes-multimedia/lame/lame/no-gtk1.patch
+++ b/yocto-poky/meta/recipes-multimedia/lame/lame/no-gtk1.patch
diff --git a/meta/recipes-multimedia/lame/lame_3.99.5.bb b/yocto-poky/meta/recipes-multimedia/lame/lame_3.99.5.bb
index 047761153..047761153 100644
--- a/meta/recipes-multimedia/lame/lame_3.99.5.bb
+++ b/yocto-poky/meta/recipes-multimedia/lame/lame_3.99.5.bb
diff --git a/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch b/yocto-poky/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch
index 5168100f3..5168100f3 100644
--- a/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch
+++ b/yocto-poky/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch
diff --git a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb b/yocto-poky/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
index 94b66b189..94b66b189 100644
--- a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
+++ b/yocto-poky/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
diff --git a/meta/recipes-multimedia/libav/libav.inc b/yocto-poky/meta/recipes-multimedia/libav/libav.inc
index d3f4b1b55..d3f4b1b55 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/yocto-poky/meta/recipes-multimedia/libav/libav.inc
diff --git a/meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch b/yocto-poky/meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch
index 1e31caa90..1e31caa90 100644
--- a/meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch
+++ b/yocto-poky/meta/recipes-multimedia/libav/libav/libav-fix-CVE-2014-9676.patch
diff --git a/meta/recipes-multimedia/libav/libav_9.18.bb b/yocto-poky/meta/recipes-multimedia/libav/libav_9.18.bb
index 210a649da..210a649da 100644
--- a/meta/recipes-multimedia/libav/libav_9.18.bb
+++ b/yocto-poky/meta/recipes-multimedia/libav/libav_9.18.bb
diff --git a/meta/recipes-multimedia/libav/libpostproc_git.bb b/yocto-poky/meta/recipes-multimedia/libav/libpostproc_git.bb
index 4aaa50f91..4aaa50f91 100644
--- a/meta/recipes-multimedia/libav/libpostproc_git.bb
+++ b/yocto-poky/meta/recipes-multimedia/libav/libpostproc_git.bb
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch b/yocto-poky/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
index 38d40c363..38d40c363 100644
--- a/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
+++ b/yocto-poky/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch b/yocto-poky/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch
index 2845fb1d3..2845fb1d3 100644
--- a/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch
+++ b/yocto-poky/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/yocto-poky/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
index 05a8a4763..05a8a4763 100644
--- a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
+++ b/yocto-poky/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
diff --git a/meta/recipes-multimedia/libmad/libmad/add-pkgconfig.patch b/yocto-poky/meta/recipes-multimedia/libmad/libmad/add-pkgconfig.patch
index b49dc8c98..b49dc8c98 100644
--- a/meta/recipes-multimedia/libmad/libmad/add-pkgconfig.patch
+++ b/yocto-poky/meta/recipes-multimedia/libmad/libmad/add-pkgconfig.patch
diff --git a/meta/recipes-multimedia/libmad/libmad/automake-foreign.patch b/yocto-poky/meta/recipes-multimedia/libmad/libmad/automake-foreign.patch
index 3e544248d..3e544248d 100644
--- a/meta/recipes-multimedia/libmad/libmad/automake-foreign.patch
+++ b/yocto-poky/meta/recipes-multimedia/libmad/libmad/automake-foreign.patch
diff --git a/meta/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch b/yocto-poky/meta/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch
index 01c7aa3c8..01c7aa3c8 100644
--- a/meta/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch
+++ b/yocto-poky/meta/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch
diff --git a/meta/recipes-multimedia/libmad/libmad/no-force-mem.patch b/yocto-poky/meta/recipes-multimedia/libmad/libmad/no-force-mem.patch
index d5e6d206e..d5e6d206e 100644
--- a/meta/recipes-multimedia/libmad/libmad/no-force-mem.patch
+++ b/yocto-poky/meta/recipes-multimedia/libmad/libmad/no-force-mem.patch
diff --git a/meta/recipes-multimedia/libmad/libmad/obsolete_automake_macros.patch b/yocto-poky/meta/recipes-multimedia/libmad/libmad/obsolete_automake_macros.patch
index cc87d299e..cc87d299e 100644
--- a/meta/recipes-multimedia/libmad/libmad/obsolete_automake_macros.patch
+++ b/yocto-poky/meta/recipes-multimedia/libmad/libmad/obsolete_automake_macros.patch
diff --git a/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb b/yocto-poky/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
index 9e08b16da..9e08b16da 100644
--- a/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
+++ b/yocto-poky/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
diff --git a/meta/recipes-multimedia/libogg/libogg_1.3.2.bb b/yocto-poky/meta/recipes-multimedia/libogg/libogg_1.3.2.bb
index 0142e0f4f..0142e0f4f 100644
--- a/meta/recipes-multimedia/libogg/libogg_1.3.2.bb
+++ b/yocto-poky/meta/recipes-multimedia/libogg/libogg_1.3.2.bb
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch b/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch
index 876e80ef7..876e80ef7 100644
--- a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch
+++ b/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch b/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch
index f408e4a62..f408e4a62 100644
--- a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch
+++ b/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch b/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch
index 787953a99..787953a99 100644
--- a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch
+++ b/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch b/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch
index dbe8c41f7..dbe8c41f7 100644
--- a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch
+++ b/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch b/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch
index 483ca1328..483ca1328 100644
--- a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch
+++ b/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch
diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb b/yocto-poky/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
index 40d6df8b6..40d6df8b6 100644
--- a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
+++ b/yocto-poky/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
diff --git a/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8126_1.patch b/yocto-poky/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8126_1.patch
index 25fe1364d..25fe1364d 100644
--- a/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8126_1.patch
+++ b/yocto-poky/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8126_1.patch
diff --git a/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8126_2.patch b/yocto-poky/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8126_2.patch
index 4aa917084..4aa917084 100644
--- a/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8126_2.patch
+++ b/yocto-poky/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8126_2.patch
diff --git a/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8126_3.patch b/yocto-poky/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8126_3.patch
index 0e0ad2320..0e0ad2320 100644
--- a/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8126_3.patch
+++ b/yocto-poky/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8126_3.patch
diff --git a/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8126_4.patch b/yocto-poky/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8126_4.patch
index 2622630d1..2622630d1 100644
--- a/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8126_4.patch
+++ b/yocto-poky/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8126_4.patch
diff --git a/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8472.patch b/yocto-poky/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8472.patch
index 404f012b0..404f012b0 100644
--- a/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8472.patch
+++ b/yocto-poky/meta/recipes-multimedia/libpng/libpng-1.6.17/CVE-2015-8472.patch
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.17.bb b/yocto-poky/meta/recipes-multimedia/libpng/libpng_1.6.17.bb
index cc288c7f9..cc288c7f9 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.6.17.bb
+++ b/yocto-poky/meta/recipes-multimedia/libpng/libpng_1.6.17.bb
diff --git a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.8.bb b/yocto-poky/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.8.bb
index f06935c8b..f06935c8b 100644
--- a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.8.bb
+++ b/yocto-poky/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.8.bb
diff --git a/meta/recipes-multimedia/libsndfile/files/0001-src-sd2.c-Fix-segfault-in-SD2-RSRC-parser.patch b/yocto-poky/meta/recipes-multimedia/libsndfile/files/0001-src-sd2.c-Fix-segfault-in-SD2-RSRC-parser.patch
index cd48710fb..cd48710fb 100644
--- a/meta/recipes-multimedia/libsndfile/files/0001-src-sd2.c-Fix-segfault-in-SD2-RSRC-parser.patch
+++ b/yocto-poky/meta/recipes-multimedia/libsndfile/files/0001-src-sd2.c-Fix-segfault-in-SD2-RSRC-parser.patch
diff --git a/meta/recipes-multimedia/libsndfile/files/0001-src-sd2.c-Fix-two-potential-buffer-read-overflows.patch b/yocto-poky/meta/recipes-multimedia/libsndfile/files/0001-src-sd2.c-Fix-two-potential-buffer-read-overflows.patch
index fa6473d4f..fa6473d4f 100644
--- a/meta/recipes-multimedia/libsndfile/files/0001-src-sd2.c-Fix-two-potential-buffer-read-overflows.patch
+++ b/yocto-poky/meta/recipes-multimedia/libsndfile/files/0001-src-sd2.c-Fix-two-potential-buffer-read-overflows.patch
diff --git a/meta/recipes-multimedia/libsndfile/files/libsndfile-fix-CVE-2014-9756.patch b/yocto-poky/meta/recipes-multimedia/libsndfile/files/libsndfile-fix-CVE-2014-9756.patch
index b54b3ba66..b54b3ba66 100644
--- a/meta/recipes-multimedia/libsndfile/files/libsndfile-fix-CVE-2014-9756.patch
+++ b/yocto-poky/meta/recipes-multimedia/libsndfile/files/libsndfile-fix-CVE-2014-9756.patch
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb b/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb
index be875c227..be875c227 100644
--- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb
+++ b/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb
diff --git a/meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch b/yocto-poky/meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch
index 359f3d1a7..359f3d1a7 100644
--- a/meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch
+++ b/yocto-poky/meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch
diff --git a/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb b/yocto-poky/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb
index 18cb168c5..18cb168c5 100644
--- a/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb
+++ b/yocto-poky/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2015-8781.patch b/yocto-poky/meta/recipes-multimedia/libtiff/files/CVE-2015-8781.patch
index bdbe69695..bdbe69695 100644
--- a/meta/recipes-multimedia/libtiff/files/CVE-2015-8781.patch
+++ b/yocto-poky/meta/recipes-multimedia/libtiff/files/CVE-2015-8781.patch
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch b/yocto-poky/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
index cf37fd388..cf37fd388 100644
--- a/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
+++ b/yocto-poky/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
diff --git a/meta/recipes-multimedia/libtiff/files/libtool2.patch b/yocto-poky/meta/recipes-multimedia/libtiff/files/libtool2.patch
index 457202eae..457202eae 100644
--- a/meta/recipes-multimedia/libtiff/files/libtool2.patch
+++ b/yocto-poky/meta/recipes-multimedia/libtiff/files/libtool2.patch
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.4.bb b/yocto-poky/meta/recipes-multimedia/libtiff/tiff_4.0.4.bb
index f1f5a7e8e..f1f5a7e8e 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.4.bb
+++ b/yocto-poky/meta/recipes-multimedia/libtiff/tiff_4.0.4.bb
diff --git a/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb b/yocto-poky/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb
index 636e0f307..636e0f307 100644
--- a/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb
+++ b/yocto-poky/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb
diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec-0.4.1/altivec_h_needed.patch b/yocto-poky/meta/recipes-multimedia/mpeg2dec/mpeg2dec-0.4.1/altivec_h_needed.patch
index 7dc56436f..7dc56436f 100644
--- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec-0.4.1/altivec_h_needed.patch
+++ b/yocto-poky/meta/recipes-multimedia/mpeg2dec/mpeg2dec-0.4.1/altivec_h_needed.patch
diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb b/yocto-poky/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
index cede2bf10..cede2bf10 100644
--- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
+++ b/yocto-poky/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 5b806d761..5b806d761 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-card-add-pa_card_profile.ports.patch b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-card-add-pa_card_profile.ports.patch
index 97b2e4064..97b2e4064 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-card-add-pa_card_profile.ports.patch
+++ b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-card-add-pa_card_profile.ports.patch
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-client-conf-Add-allow-autospawn-for-root.patch b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-client-conf-Add-allow-autospawn-for-root.patch
index d19eb7c19..d19eb7c19 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-client-conf-Add-allow-autospawn-for-root.patch
+++ b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-client-conf-Add-allow-autospawn-for-root.patch
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-conf-parser-add-support-for-.d-directories.patch b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-conf-parser-add-support-for-.d-directories.patch
index a9f1b2acf..a9f1b2acf 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-conf-parser-add-support-for-.d-directories.patch
+++ b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-conf-parser-add-support-for-.d-directories.patch
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch
index 85559950e..85559950e 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch
+++ b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0002-alsa-bluetooth-fail-if-user-requested-profile-doesn-.patch b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0002-alsa-bluetooth-fail-if-user-requested-profile-doesn-.patch
index c3f217bc6..c3f217bc6 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0002-alsa-bluetooth-fail-if-user-requested-profile-doesn-.patch
+++ b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0002-alsa-bluetooth-fail-if-user-requested-profile-doesn-.patch
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0003-card-move-profile-selection-after-pa_card_new.patch b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0003-card-move-profile-selection-after-pa_card_new.patch
index 9585f3d52..9585f3d52 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0003-card-move-profile-selection-after-pa_card_new.patch
+++ b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0003-card-move-profile-selection-after-pa_card_new.patch
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0004-alsa-set-availability-for-some-unavailable-profiles.patch b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0004-alsa-set-availability-for-some-unavailable-profiles.patch
index bb318aa06..bb318aa06 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0004-alsa-set-availability-for-some-unavailable-profiles.patch
+++ b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0004-alsa-set-availability-for-some-unavailable-profiles.patch
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/fix-git-version-gen.patch b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/fix-git-version-gen.patch
index ed9425040..ed9425040 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio/fix-git-version-gen.patch
+++ b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/fix-git-version-gen.patch
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/volatiles.04_pulse b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/volatiles.04_pulse
index 5b1998032..5b1998032 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio/volatiles.04_pulse
+++ b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/volatiles.04_pulse
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb
index ec629aa02..ec629aa02 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb
+++ b/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb
diff --git a/meta/recipes-multimedia/sbc/sbc_1.3.bb b/yocto-poky/meta/recipes-multimedia/sbc/sbc_1.3.bb
index 2d7f31bc1..2d7f31bc1 100644
--- a/meta/recipes-multimedia/sbc/sbc_1.3.bb
+++ b/yocto-poky/meta/recipes-multimedia/sbc/sbc_1.3.bb
diff --git a/meta/recipes-multimedia/speex/speex_1.2rc2.bb b/yocto-poky/meta/recipes-multimedia/speex/speex_1.2rc2.bb
index f7d23dbd7..f7d23dbd7 100644
--- a/meta/recipes-multimedia/speex/speex_1.2rc2.bb
+++ b/yocto-poky/meta/recipes-multimedia/speex/speex_1.2rc2.bb
diff --git a/meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch b/yocto-poky/meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch
index c7067daaa..c7067daaa 100644
--- a/meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch
+++ b/yocto-poky/meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch
diff --git a/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb b/yocto-poky/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb
index 6b1acedbe..6b1acedbe 100644
--- a/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb
+++ b/yocto-poky/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb
diff --git a/meta/recipes-multimedia/tremor/tremor/obsolete_automake_macros.patch b/yocto-poky/meta/recipes-multimedia/tremor/tremor/obsolete_automake_macros.patch
index 7e5102903..7e5102903 100644
--- a/meta/recipes-multimedia/tremor/tremor/obsolete_automake_macros.patch
+++ b/yocto-poky/meta/recipes-multimedia/tremor/tremor/obsolete_automake_macros.patch
diff --git a/meta/recipes-multimedia/tremor/tremor/tremor-arm-thumb2.patch b/yocto-poky/meta/recipes-multimedia/tremor/tremor/tremor-arm-thumb2.patch
index 204954222..204954222 100644
--- a/meta/recipes-multimedia/tremor/tremor/tremor-arm-thumb2.patch
+++ b/yocto-poky/meta/recipes-multimedia/tremor/tremor/tremor-arm-thumb2.patch
diff --git a/meta/recipes-multimedia/tremor/tremor_20150107.bb b/yocto-poky/meta/recipes-multimedia/tremor/tremor_20150107.bb
index 937894a73..937894a73 100644
--- a/meta/recipes-multimedia/tremor/tremor_20150107.bb
+++ b/yocto-poky/meta/recipes-multimedia/tremor/tremor_20150107.bb
diff --git a/meta/recipes-multimedia/webp/libwebp_0.4.3.bb b/yocto-poky/meta/recipes-multimedia/webp/libwebp_0.4.3.bb
index c4b80f6cf..c4b80f6cf 100644
--- a/meta/recipes-multimedia/webp/libwebp_0.4.3.bb
+++ b/yocto-poky/meta/recipes-multimedia/webp/libwebp_0.4.3.bb
diff --git a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch b/yocto-poky/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
index bf72fca68..bf72fca68 100644
--- a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
+++ b/yocto-poky/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/yocto-poky/meta/recipes-multimedia/x264/x264_git.bb
index 0a6990980..0a6990980 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/yocto-poky/meta/recipes-multimedia/x264/x264_git.bb
diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/yocto-poky/meta/recipes-qt/images/qt4e-demo-image.bb
index 445184865..445184865 100644
--- a/meta/recipes-qt/images/qt4e-demo-image.bb
+++ b/yocto-poky/meta/recipes-qt/images/qt4e-demo-image.bb
diff --git a/meta/recipes-qt/meta/meta-toolchain-qt.bb b/yocto-poky/meta/recipes-qt/meta/meta-toolchain-qt.bb
index a10103a39..a10103a39 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qt.bb
+++ b/yocto-poky/meta/recipes-qt/meta/meta-toolchain-qt.bb
diff --git a/meta/recipes-qt/meta/meta-toolchain-qt.inc b/yocto-poky/meta/recipes-qt/meta/meta-toolchain-qt.inc
index 7e75d93b1..7e75d93b1 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qt.inc
+++ b/yocto-poky/meta/recipes-qt/meta/meta-toolchain-qt.inc
diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/yocto-poky/meta/recipes-qt/meta/meta-toolchain-qte.bb
index 9113f48ed..9113f48ed 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qte.bb
+++ b/yocto-poky/meta/recipes-qt/meta/meta-toolchain-qte.bb
diff --git a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qt-toolchain-host.bb b/yocto-poky/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qt-toolchain-host.bb
index b95cc5e59..b95cc5e59 100644
--- a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qt-toolchain-host.bb
+++ b/yocto-poky/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qt-toolchain-host.bb
diff --git a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qt-toolchain-host.inc b/yocto-poky/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qt-toolchain-host.inc
index a3c275fd9..a3c275fd9 100644
--- a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qt-toolchain-host.inc
+++ b/yocto-poky/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qt-toolchain-host.inc
diff --git a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb b/yocto-poky/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
index 296e4b803..296e4b803 100644
--- a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
+++ b/yocto-poky/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/yocto-poky/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
index b81f8a3b3..b81f8a3b3 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
+++ b/yocto-poky/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb b/yocto-poky/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
index eb5fa1ffe..eb5fa1ffe 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
+++ b/yocto-poky/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb b/yocto-poky/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
index 772c151d2..772c151d2 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
+++ b/yocto-poky/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc b/yocto-poky/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc
index e09782dab..e09782dab 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc
+++ b/yocto-poky/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb b/yocto-poky/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
index 92ed237d3..92ed237d3 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
+++ b/yocto-poky/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
diff --git a/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch b/yocto-poky/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch
index d8b2b2347..d8b2b2347 100644
--- a/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch
+++ b/yocto-poky/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch
diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/yocto-poky/meta/recipes-qt/qt-apps/fotowall_0.9.bb
index 3af026525..3af026525 100644
--- a/meta/recipes-qt/qt-apps/fotowall_0.9.bb
+++ b/yocto-poky/meta/recipes-qt/qt-apps/fotowall_0.9.bb
diff --git a/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch b/yocto-poky/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch
index 2bb5bb11c..2bb5bb11c 100644
--- a/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch
+++ b/yocto-poky/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.8.6.bb b/yocto-poky/meta/recipes-qt/qt-apps/qmmp_0.8.6.bb
index e68ad0f18..e68ad0f18 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.8.6.bb
+++ b/yocto-poky/meta/recipes-qt/qt-apps/qmmp_0.8.6.bb
diff --git a/meta/recipes-qt/qt-apps/quicky_0.4.bb b/yocto-poky/meta/recipes-qt/qt-apps/quicky_0.4.bb
index bcaa562db..bcaa562db 100644
--- a/meta/recipes-qt/qt-apps/quicky_0.4.bb
+++ b/yocto-poky/meta/recipes-qt/qt-apps/quicky_0.4.bb
diff --git a/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init b/yocto-poky/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
index 21f0273e2..21f0273e2 100644
--- a/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
+++ b/yocto-poky/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
diff --git a/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb b/yocto-poky/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
index aa1b0b62f..aa1b0b62f 100644
--- a/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
+++ b/yocto-poky/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
diff --git a/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb b/yocto-poky/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb
index ff3f3da2b..ff3f3da2b 100644
--- a/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb
+++ b/yocto-poky/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/yocto-poky/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index 077008bb8..077008bb8 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/yocto-poky/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.7.bb b/yocto-poky/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.7.bb
index 90ba07c9e..90ba07c9e 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.7.bb
+++ b/yocto-poky/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.7.bb
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7.inc b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7.inc
index d165514bf..d165514bf 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7.inc
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7.inc
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index d8b0a09d1..d8b0a09d1 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
index 98fc88738..98fc88738 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
index ecaea51e0..ecaea51e0 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
index 1eb8a5843..1eb8a5843 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
index 1a8f2b7f9..1a8f2b7f9 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
index 90ebf7509..90ebf7509 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
index 1d23c929f..1d23c929f 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
index ec07f4140..ec07f4140 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0009-qmake-fix-source-file-references-in-qmake.pri.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0009-qmake-fix-source-file-references-in-qmake.pri.patch
index 45b8c10fb..45b8c10fb 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0009-qmake-fix-source-file-references-in-qmake.pri.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0009-qmake-fix-source-file-references-in-qmake.pri.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
index ca6a0b8d8..ca6a0b8d8 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0011-freetype-host-includes.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0011-freetype-host-includes.patch
index e0879c561..e0879c561 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0011-freetype-host-includes.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0011-freetype-host-includes.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0012-Add-2bpp-support.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0012-Add-2bpp-support.patch
index 8e411f342..8e411f342 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0012-Add-2bpp-support.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0012-Add-2bpp-support.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch
index 762cdaf97..762cdaf97 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0013-configure-add-crossarch-option.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0014-translations-fix-phony-translation-linking-error.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0014-translations-fix-phony-translation-linking-error.patch
index 66724a8ec..66724a8ec 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0014-translations-fix-phony-translation-linking-error.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0014-translations-fix-phony-translation-linking-error.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0015-configure-add-nostrip-for-debug-packages.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0015-configure-add-nostrip-for-debug-packages.patch
index b5db49128..b5db49128 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0015-configure-add-nostrip-for-debug-packages.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0015-configure-add-nostrip-for-debug-packages.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0016-configure-eval-QMAKE_CXX.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0016-configure-eval-QMAKE_CXX.patch
index 9c3de47b4..9c3de47b4 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0016-configure-eval-QMAKE_CXX.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0016-configure-eval-QMAKE_CXX.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
index 947196666..947196666 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0018-configure-make-pulseaudio-a-configurable-option.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0018-configure-make-pulseaudio-a-configurable-option.patch
index 19cdd4c57..19cdd4c57 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0018-configure-make-pulseaudio-a-configurable-option.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0018-configure-make-pulseaudio-a-configurable-option.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
index a83d2470a..a83d2470a 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0021-configure-make-qt4-native-work-with-long-building-pa.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0021-configure-make-qt4-native-work-with-long-building-pa.patch
index dbc90227a..dbc90227a 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0021-configure-make-qt4-native-work-with-long-building-pa.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0021-configure-make-qt4-native-work-with-long-building-pa.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0027-tools.pro-disable-qmeegographicssystemhelper.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0027-tools.pro-disable-qmeegographicssystemhelper.patch
index 6e30aeed0..6e30aeed0 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0027-tools.pro-disable-qmeegographicssystemhelper.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0027-tools.pro-disable-qmeegographicssystemhelper.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0030-aarch64_arm64_qatomic_support.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0030-aarch64_arm64_qatomic_support.patch
index ba4c2a6b4..ba4c2a6b4 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0030-aarch64_arm64_qatomic_support.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0030-aarch64_arm64_qatomic_support.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0031-aarch64_arm64_mkspecs.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0031-aarch64_arm64_mkspecs.patch
index a01e7ada9..a01e7ada9 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0031-aarch64_arm64_mkspecs.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0031-aarch64_arm64_mkspecs.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0032-aarch64_add_header.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0032-aarch64_add_header.patch
index 178f784e1..178f784e1 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0032-aarch64_add_header.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0032-aarch64_add_header.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0033-configure-support-c-0x-standard-for-directfd.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0033-configure-support-c-0x-standard-for-directfd.patch
index f3face575..f3face575 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0033-configure-support-c-0x-standard-for-directfd.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0033-configure-support-c-0x-standard-for-directfd.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0034-Fix-kmap2qmap-build-with-clang.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0034-Fix-kmap2qmap-build-with-clang.patch
index f47a1d9c3..f47a1d9c3 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0034-Fix-kmap2qmap-build-with-clang.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/0034-Fix-kmap2qmap-build-with-clang.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/Fix-QWSLock-invalid-argument-logs.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/Fix-QWSLock-invalid-argument-logs.patch
index 1f5f00f71..1f5f00f71 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/Fix-QWSLock-invalid-argument-logs.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/Fix-QWSLock-invalid-argument-logs.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/add_check_for_aarch64_32.patch b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/add_check_for_aarch64_32.patch
index ad5103dd0..ad5103dd0 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/add_check_for_aarch64_32.patch
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/add_check_for_aarch64_32.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/g++.conf b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/g++.conf
index be78c249e..be78c249e 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/g++.conf
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/g++.conf
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/linux.conf b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/linux.conf
index 86703813c..86703813c 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/linux.conf
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/linux.conf
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/qte.sh b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/qte.sh
index 21d6ecbd6..21d6ecbd6 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7/qte.sh
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-4.8.7/qte.sh
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/yocto-poky/meta/recipes-qt/qt4/qt4-embedded.inc
index a76906579..a76906579 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-embedded.inc
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.7.bb b/yocto-poky/meta/recipes-qt/qt4/qt4-embedded_4.8.7.bb
index 1435d857c..1435d857c 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.8.7.bb
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-embedded_4.8.7.bb
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/yocto-poky/meta/recipes-qt/qt4/qt4-native.inc
index 2a41f8ab2..2a41f8ab2 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-native.inc
diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.7.bb b/yocto-poky/meta/recipes-qt/qt4/qt4-native_4.8.7.bb
index 494d66319..494d66319 100644
--- a/meta/recipes-qt/qt4/qt4-native_4.8.7.bb
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-native_4.8.7.bb
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/yocto-poky/meta/recipes-qt/qt4/qt4-x11-free.inc
index f6a173739..f6a173739 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-x11-free.inc
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.7.bb b/yocto-poky/meta/recipes-qt/qt4/qt4-x11-free_4.8.7.bb
index 5cb5e6817..5cb5e6817 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.8.7.bb
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4-x11-free_4.8.7.bb
diff --git a/meta/recipes-qt/qt4/qt4.inc b/yocto-poky/meta/recipes-qt/qt4/qt4.inc
index 2058e54d3..2058e54d3 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4.inc
diff --git a/meta/recipes-qt/qt4/qt4_arch.inc b/yocto-poky/meta/recipes-qt/qt4/qt4_arch.inc
index e94c2847b..e94c2847b 100644
--- a/meta/recipes-qt/qt4/qt4_arch.inc
+++ b/yocto-poky/meta/recipes-qt/qt4/qt4_arch.inc
diff --git a/meta/recipes-rt/README b/yocto-poky/meta/recipes-rt/README
index 7d7558de4..7d7558de4 100644
--- a/meta/recipes-rt/README
+++ b/yocto-poky/meta/recipes-rt/README
diff --git a/meta/recipes-rt/images/core-image-rt-sdk.bb b/yocto-poky/meta/recipes-rt/images/core-image-rt-sdk.bb
index db7d58183..db7d58183 100644
--- a/meta/recipes-rt/images/core-image-rt-sdk.bb
+++ b/yocto-poky/meta/recipes-rt/images/core-image-rt-sdk.bb
diff --git a/meta/recipes-rt/images/core-image-rt.bb b/yocto-poky/meta/recipes-rt/images/core-image-rt.bb
index cab6f8b74..cab6f8b74 100644
--- a/meta/recipes-rt/images/core-image-rt.bb
+++ b/yocto-poky/meta/recipes-rt/images/core-image-rt.bb
diff --git a/meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch b/yocto-poky/meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch
index 8b493eb1f..8b493eb1f 100644
--- a/meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch
+++ b/yocto-poky/meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch
diff --git a/meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch b/yocto-poky/meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch
index bc6136f1d..bc6136f1d 100644
--- a/meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch
+++ b/yocto-poky/meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch
diff --git a/meta/recipes-rt/rt-tests/files/Makefile-fix-gzip-command.patch b/yocto-poky/meta/recipes-rt/rt-tests/files/Makefile-fix-gzip-command.patch
index 0a35ddc74..0a35ddc74 100644
--- a/meta/recipes-rt/rt-tests/files/Makefile-fix-gzip-command.patch
+++ b/yocto-poky/meta/recipes-rt/rt-tests/files/Makefile-fix-gzip-command.patch
diff --git a/meta/recipes-rt/rt-tests/files/fix-re-install-failure.patch b/yocto-poky/meta/recipes-rt/rt-tests/files/fix-re-install-failure.patch
index e38ec92c0..e38ec92c0 100644
--- a/meta/recipes-rt/rt-tests/files/fix-re-install-failure.patch
+++ b/yocto-poky/meta/recipes-rt/rt-tests/files/fix-re-install-failure.patch
diff --git a/meta/recipes-rt/rt-tests/files/hackbench-fix-error-check.patch b/yocto-poky/meta/recipes-rt/rt-tests/files/hackbench-fix-error-check.patch
index d17fdff45..d17fdff45 100644
--- a/meta/recipes-rt/rt-tests/files/hackbench-fix-error-check.patch
+++ b/yocto-poky/meta/recipes-rt/rt-tests/files/hackbench-fix-error-check.patch
diff --git a/meta/recipes-rt/rt-tests/files/rt_bmark.py b/yocto-poky/meta/recipes-rt/rt-tests/files/rt_bmark.py
index e2280e43e..e2280e43e 100755
--- a/meta/recipes-rt/rt-tests/files/rt_bmark.py
+++ b/yocto-poky/meta/recipes-rt/rt-tests/files/rt_bmark.py
diff --git a/meta/recipes-rt/rt-tests/files/run-ptest b/yocto-poky/meta/recipes-rt/rt-tests/files/run-ptest
index 8e6d3e358..8e6d3e358 100644
--- a/meta/recipes-rt/rt-tests/files/run-ptest
+++ b/yocto-poky/meta/recipes-rt/rt-tests/files/run-ptest
diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_0.92.bb b/yocto-poky/meta/recipes-rt/rt-tests/hwlatdetect_0.92.bb
index 8319eb987..8319eb987 100644
--- a/meta/recipes-rt/rt-tests/hwlatdetect_0.92.bb
+++ b/yocto-poky/meta/recipes-rt/rt-tests/hwlatdetect_0.92.bb
diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/yocto-poky/meta/recipes-rt/rt-tests/rt-tests.inc
index 871db136c..871db136c 100644
--- a/meta/recipes-rt/rt-tests/rt-tests.inc
+++ b/yocto-poky/meta/recipes-rt/rt-tests/rt-tests.inc
diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.92.bb b/yocto-poky/meta/recipes-rt/rt-tests/rt-tests_0.92.bb
index fbe2f669e..fbe2f669e 100644
--- a/meta/recipes-rt/rt-tests/rt-tests_0.92.bb
+++ b/yocto-poky/meta/recipes-rt/rt-tests/rt-tests_0.92.bb
diff --git a/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc b/yocto-poky/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc
index fa6b2b2e7..fa6b2b2e7 100644
--- a/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc
+++ b/yocto-poky/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc
diff --git a/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb b/yocto-poky/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb
index da4d98ad4..da4d98ad4 100644
--- a/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb
+++ b/yocto-poky/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb
diff --git a/meta/recipes-sato/images/core-image-sato-dev.bb b/yocto-poky/meta/recipes-sato/images/core-image-sato-dev.bb
index 7fa69d099..7fa69d099 100644
--- a/meta/recipes-sato/images/core-image-sato-dev.bb
+++ b/yocto-poky/meta/recipes-sato/images/core-image-sato-dev.bb
diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk.bb
index 62836f94d..62836f94d 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk.bb
+++ b/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk.bb
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/yocto-poky/meta/recipes-sato/images/core-image-sato.bb
index e3246d2b6..e3246d2b6 100644
--- a/meta/recipes-sato/images/core-image-sato.bb
+++ b/yocto-poky/meta/recipes-sato/images/core-image-sato.bb
diff --git a/meta/recipes-sato/leafpad/files/leafpad.desktop b/yocto-poky/meta/recipes-sato/leafpad/files/leafpad.desktop
index c7e2d5bb5..c7e2d5bb5 100644
--- a/meta/recipes-sato/leafpad/files/leafpad.desktop
+++ b/yocto-poky/meta/recipes-sato/leafpad/files/leafpad.desktop
diff --git a/meta/recipes-sato/leafpad/files/owl-menu.patch b/yocto-poky/meta/recipes-sato/leafpad/files/owl-menu.patch
index 2ebf74a6f..2ebf74a6f 100644
--- a/meta/recipes-sato/leafpad/files/owl-menu.patch
+++ b/yocto-poky/meta/recipes-sato/leafpad/files/owl-menu.patch
diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/yocto-poky/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
index 093b89f77..093b89f77 100644
--- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
+++ b/yocto-poky/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
diff --git a/meta/recipes-sato/libowl/libowl_git.bb b/yocto-poky/meta/recipes-sato/libowl/libowl_git.bb
index 9cc47dbd5..9cc47dbd5 100644
--- a/meta/recipes-sato/libowl/libowl_git.bb
+++ b/yocto-poky/meta/recipes-sato/libowl/libowl_git.bb
diff --git a/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch b/yocto-poky/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
index 825694962..825694962 100644
--- a/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
+++ b/yocto-poky/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb b/yocto-poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb
index 5f73a4c48..5f73a4c48 100644
--- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb
+++ b/yocto-poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb
diff --git a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb b/yocto-poky/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
index 1979cbb76..1979cbb76 100644
--- a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
+++ b/yocto-poky/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb b/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
index 318d2e080..318d2e080 100644
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
+++ b/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
diff --git a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh b/yocto-poky/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
index 6cf188b2d..6cf188b2d 100644
--- a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
+++ b/yocto-poky/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
diff --git a/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch b/yocto-poky/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch
index 18b6c4174..18b6c4174 100644
--- a/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch
+++ b/yocto-poky/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/yocto-poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
index 0d321d399..0d321d399 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
+++ b/yocto-poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
diff --git a/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch b/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch
index 45ba9a031..45ba9a031 100644
--- a/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch
+++ b/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/yocto-poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
index 4ed7368fd..4ed7368fd 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
+++ b/yocto-poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
index 42ce483d3..42ce483d3 100644
--- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
+++ b/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
index 76de18ae9..76de18ae9 100644
--- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
+++ b/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb b/yocto-poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb
index c8cbd57a6..c8cbd57a6 100644
--- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb
+++ b/yocto-poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc b/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc
index d947e1ab0..d947e1ab0 100644
--- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc
+++ b/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb b/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
index f6786dda5..f6786dda5 100644
--- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
+++ b/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb b/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb
index 0d3569de9..0d3569de9 100644
--- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb
+++ b/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index 6679db8ac..6679db8ac 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
diff --git a/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png b/yocto-poky/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png
index b8e559456..b8e559456 100644
--- a/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png
+++ b/yocto-poky/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png
diff --git a/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png b/yocto-poky/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png
index 05921a668..05921a668 100644
--- a/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png
+++ b/yocto-poky/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png
diff --git a/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png b/yocto-poky/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png
index ce77a8e62..ce77a8e62 100644
--- a/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png
+++ b/yocto-poky/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png
diff --git a/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png b/yocto-poky/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png
index bfe4bad56..bfe4bad56 100644
--- a/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png
+++ b/yocto-poky/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png
diff --git a/meta/recipes-sato/pcmanfm/files/no-desktop.patch b/yocto-poky/meta/recipes-sato/pcmanfm/files/no-desktop.patch
index 103d6d14a..103d6d14a 100644
--- a/meta/recipes-sato/pcmanfm/files/no-desktop.patch
+++ b/yocto-poky/meta/recipes-sato/pcmanfm/files/no-desktop.patch
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb b/yocto-poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb
index b63db875d..b63db875d 100644
--- a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb
+++ b/yocto-poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb
diff --git a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato/50-sato.conf b/yocto-poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato/50-sato.conf
index 97492e7a5..97492e7a5 100644
--- a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato/50-sato.conf
+++ b/yocto-poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato/50-sato.conf
diff --git a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb b/yocto-poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb
index e27339fb4..e27339fb4 100644
--- a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb
+++ b/yocto-poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb
diff --git a/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch b/yocto-poky/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch
index f43d1df6c..f43d1df6c 100644
--- a/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch
+++ b/yocto-poky/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch
diff --git a/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch b/yocto-poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch
index d246feeb0..d246feeb0 100644
--- a/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch
+++ b/yocto-poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch
diff --git a/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch b/yocto-poky/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch
index 7e2c3ab75..7e2c3ab75 100644
--- a/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch
+++ b/yocto-poky/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch
diff --git a/meta/recipes-sato/puzzles/oh-puzzles_git.bb b/yocto-poky/meta/recipes-sato/puzzles/oh-puzzles_git.bb
index 9876fe0fd..9876fe0fd 100644
--- a/meta/recipes-sato/puzzles/oh-puzzles_git.bb
+++ b/yocto-poky/meta/recipes-sato/puzzles/oh-puzzles_git.bb
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb
index 95826c1b6..95826c1b6 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
index 04a43c079..04a43c079 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
+++ b/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop b/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop
index 882ea4113..882ea4113 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop
+++ b/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.png b/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.png
index e56fa2e9c..e56fa2e9c 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.png
+++ b/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.png
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/xwc.patch b/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/xwc.patch
index 16efeef49..16efeef49 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/xwc.patch
+++ b/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/xwc.patch
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb b/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb
index 3480ec74b..3480ec74b 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb
+++ b/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb b/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb
index 7049495e6..7049495e6 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb
+++ b/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch b/yocto-poky/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch
index 2c176ee90..2c176ee90 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch
+++ b/yocto-poky/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb b/yocto-poky/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
index ced735f00..ced735f00 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
+++ b/yocto-poky/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb b/yocto-poky/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
index 8794032d2..8794032d2 100644
--- a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
+++ b/yocto-poky/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
diff --git a/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh b/yocto-poky/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh
index 95374135f..95374135f 100644
--- a/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh
+++ b/yocto-poky/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh
diff --git a/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch b/yocto-poky/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
index baf06d6b8..baf06d6b8 100644
--- a/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
+++ b/yocto-poky/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
diff --git a/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch b/yocto-poky/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
index 594374467..594374467 100644
--- a/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
+++ b/yocto-poky/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_git.bb b/yocto-poky/meta/recipes-sato/settings-daemon/settings-daemon_git.bb
index c0615530a..c0615530a 100644
--- a/meta/recipes-sato/settings-daemon/settings-daemon_git.bb
+++ b/yocto-poky/meta/recipes-sato/settings-daemon/settings-daemon_git.bb
diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb b/yocto-poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
index ebdd6d123..ebdd6d123 100644
--- a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
+++ b/yocto-poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop b/yocto-poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop
index 662659afc..662659afc 100644
--- a/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop
+++ b/yocto-poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop
diff --git a/meta/recipes-sato/webkit/files/0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch b/yocto-poky/meta/recipes-sato/webkit/files/0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch
index 28b342053..28b342053 100644
--- a/meta/recipes-sato/webkit/files/0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch
+++ b/yocto-poky/meta/recipes-sato/webkit/files/0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch
diff --git a/meta/recipes-sato/webkit/webkitgtk/gcc5.patch b/yocto-poky/meta/recipes-sato/webkit/webkitgtk/gcc5.patch
index 5951a81f3..5951a81f3 100644
--- a/meta/recipes-sato/webkit/webkitgtk/gcc5.patch
+++ b/yocto-poky/meta/recipes-sato/webkit/webkitgtk/gcc5.patch
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb b/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
index e29666ae7..e29666ae7 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
+++ b/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
diff --git a/meta/recipes-support/apr/apr-util/configfix.patch b/yocto-poky/meta/recipes-support/apr/apr-util/configfix.patch
index dbb114880..dbb114880 100644
--- a/meta/recipes-support/apr/apr-util/configfix.patch
+++ b/yocto-poky/meta/recipes-support/apr/apr-util/configfix.patch
diff --git a/meta/recipes-support/apr/apr-util/configure_fixes.patch b/yocto-poky/meta/recipes-support/apr/apr-util/configure_fixes.patch
index 91e244ce2..91e244ce2 100644
--- a/meta/recipes-support/apr/apr-util/configure_fixes.patch
+++ b/yocto-poky/meta/recipes-support/apr/apr-util/configure_fixes.patch
diff --git a/meta/recipes-support/apr/apr-util/run-ptest b/yocto-poky/meta/recipes-support/apr/apr-util/run-ptest
index ae19a1d11..ae19a1d11 100644
--- a/meta/recipes-support/apr/apr-util/run-ptest
+++ b/yocto-poky/meta/recipes-support/apr/apr-util/run-ptest
diff --git a/meta/recipes-support/apr/apr-util_1.5.4.bb b/yocto-poky/meta/recipes-support/apr/apr-util_1.5.4.bb
index a36f13db5..a36f13db5 100644
--- a/meta/recipes-support/apr/apr-util_1.5.4.bb
+++ b/yocto-poky/meta/recipes-support/apr/apr-util_1.5.4.bb
diff --git a/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch b/yocto-poky/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch
index 6805b8b6e..6805b8b6e 100644
--- a/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch
+++ b/yocto-poky/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch
diff --git a/meta/recipes-support/apr/apr/cleanup.patch b/yocto-poky/meta/recipes-support/apr/apr/cleanup.patch
index b6784e015..b6784e015 100644
--- a/meta/recipes-support/apr/apr/cleanup.patch
+++ b/yocto-poky/meta/recipes-support/apr/apr/cleanup.patch
diff --git a/meta/recipes-support/apr/apr/configfix.patch b/yocto-poky/meta/recipes-support/apr/apr/configfix.patch
index 605c4f632..605c4f632 100644
--- a/meta/recipes-support/apr/apr/configfix.patch
+++ b/yocto-poky/meta/recipes-support/apr/apr/configfix.patch
diff --git a/meta/recipes-support/apr/apr/configure_fixes.patch b/yocto-poky/meta/recipes-support/apr/apr/configure_fixes.patch
index 051400059..051400059 100644
--- a/meta/recipes-support/apr/apr/configure_fixes.patch
+++ b/yocto-poky/meta/recipes-support/apr/apr/configure_fixes.patch
diff --git a/meta/recipes-support/apr/apr/run-ptest b/yocto-poky/meta/recipes-support/apr/apr/run-ptest
index ae19a1d11..ae19a1d11 100644
--- a/meta/recipes-support/apr/apr/run-ptest
+++ b/yocto-poky/meta/recipes-support/apr/apr/run-ptest
diff --git a/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch b/yocto-poky/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch
index 9569645b8..9569645b8 100644
--- a/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch
+++ b/yocto-poky/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch
diff --git a/meta/recipes-support/apr/apr_1.5.2.bb b/yocto-poky/meta/recipes-support/apr/apr_1.5.2.bb
index 1c61e84e5..1c61e84e5 100644
--- a/meta/recipes-support/apr/apr_1.5.2.bb
+++ b/yocto-poky/meta/recipes-support/apr/apr_1.5.2.bb
diff --git a/meta/recipes-support/aspell/aspell_0.60.6.1.bb b/yocto-poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb
index 7cf17d65d..7cf17d65d 100644
--- a/meta/recipes-support/aspell/aspell_0.60.6.1.bb
+++ b/yocto-poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb
diff --git a/meta/recipes-support/atk/at-spi2-atk_2.16.0.bb b/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.16.0.bb
index 7d95fdbd8..7d95fdbd8 100644
--- a/meta/recipes-support/atk/at-spi2-atk_2.16.0.bb
+++ b/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.16.0.bb
diff --git a/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch b/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch
index 69a51d566..69a51d566 100644
--- a/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch
+++ b/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch
diff --git a/meta/recipes-support/atk/at-spi2-core_2.16.0.bb b/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.16.0.bb
index 7c12b5428..7c12b5428 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.16.0.bb
+++ b/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.16.0.bb
diff --git a/meta/recipes-support/atk/atk_2.16.0.bb b/yocto-poky/meta/recipes-support/atk/atk_2.16.0.bb
index 0f8f9b520..0f8f9b520 100644
--- a/meta/recipes-support/atk/atk_2.16.0.bb
+++ b/yocto-poky/meta/recipes-support/atk/atk_2.16.0.bb
diff --git a/meta/recipes-support/attr/acl.inc b/yocto-poky/meta/recipes-support/attr/acl.inc
index b2bc8bac2..b2bc8bac2 100644
--- a/meta/recipes-support/attr/acl.inc
+++ b/yocto-poky/meta/recipes-support/attr/acl.inc
diff --git a/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch b/yocto-poky/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch
index cf765fdbb..cf765fdbb 100644
--- a/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch
+++ b/yocto-poky/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch
diff --git a/meta/recipes-support/attr/acl/add-missing-configure.ac.patch b/yocto-poky/meta/recipes-support/attr/acl/add-missing-configure.ac.patch
index eb6979fa3..eb6979fa3 100644
--- a/meta/recipes-support/attr/acl/add-missing-configure.ac.patch
+++ b/yocto-poky/meta/recipes-support/attr/acl/add-missing-configure.ac.patch
diff --git a/meta/recipes-support/attr/acl/run-ptest b/yocto-poky/meta/recipes-support/attr/acl/run-ptest
index 3b31cc99a..3b31cc99a 100644
--- a/meta/recipes-support/attr/acl/run-ptest
+++ b/yocto-poky/meta/recipes-support/attr/acl/run-ptest
diff --git a/meta/recipes-support/attr/acl_2.2.52.bb b/yocto-poky/meta/recipes-support/attr/acl_2.2.52.bb
index ecdbdb6b7..ecdbdb6b7 100644
--- a/meta/recipes-support/attr/acl_2.2.52.bb
+++ b/yocto-poky/meta/recipes-support/attr/acl_2.2.52.bb
diff --git a/meta/recipes-support/attr/attr.inc b/yocto-poky/meta/recipes-support/attr/attr.inc
index 28c750f98..28c750f98 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/yocto-poky/meta/recipes-support/attr/attr.inc
diff --git a/meta/recipes-support/attr/attr_2.4.47.bb b/yocto-poky/meta/recipes-support/attr/attr_2.4.47.bb
index ad40c9b72..ad40c9b72 100644
--- a/meta/recipes-support/attr/attr_2.4.47.bb
+++ b/yocto-poky/meta/recipes-support/attr/attr_2.4.47.bb
diff --git a/meta/recipes-support/attr/ea-acl.inc b/yocto-poky/meta/recipes-support/attr/ea-acl.inc
index 370e16f4a..370e16f4a 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/yocto-poky/meta/recipes-support/attr/ea-acl.inc
diff --git a/meta/recipes-support/attr/files/attr-Missing-configure.ac.patch b/yocto-poky/meta/recipes-support/attr/files/attr-Missing-configure.ac.patch
index 20fcc3cee..20fcc3cee 100644
--- a/meta/recipes-support/attr/files/attr-Missing-configure.ac.patch
+++ b/yocto-poky/meta/recipes-support/attr/files/attr-Missing-configure.ac.patch
diff --git a/meta/recipes-support/attr/files/relative-libdir.patch b/yocto-poky/meta/recipes-support/attr/files/relative-libdir.patch
index b72bf184d..b72bf184d 100644
--- a/meta/recipes-support/attr/files/relative-libdir.patch
+++ b/yocto-poky/meta/recipes-support/attr/files/relative-libdir.patch
diff --git a/meta/recipes-support/attr/files/run-ptest b/yocto-poky/meta/recipes-support/attr/files/run-ptest
index a6c6867f2..a6c6867f2 100644
--- a/meta/recipes-support/attr/files/run-ptest
+++ b/yocto-poky/meta/recipes-support/attr/files/run-ptest
diff --git a/meta/recipes-support/bdwgc/bdwgc/0001-fix-build-with-musl.patch b/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0001-fix-build-with-musl.patch
index ab907fca0..ab907fca0 100644
--- a/meta/recipes-support/bdwgc/bdwgc/0001-fix-build-with-musl.patch
+++ b/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0001-fix-build-with-musl.patch
diff --git a/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb b/yocto-poky/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb
index 95e358f8e..95e358f8e 100644
--- a/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb
+++ b/yocto-poky/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb
diff --git a/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch b/yocto-poky/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch
index b3298ce2d..b3298ce2d 100644
--- a/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch
+++ b/yocto-poky/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch
diff --git a/meta/recipes-support/beecrypt/beecrypt/beecrypt-enable-ptest-support.patch b/yocto-poky/meta/recipes-support/beecrypt/beecrypt/beecrypt-enable-ptest-support.patch
index 3e5513fce..3e5513fce 100644
--- a/meta/recipes-support/beecrypt/beecrypt/beecrypt-enable-ptest-support.patch
+++ b/yocto-poky/meta/recipes-support/beecrypt/beecrypt/beecrypt-enable-ptest-support.patch
diff --git a/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch b/yocto-poky/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
index 91b1fa6ef..91b1fa6ef 100644
--- a/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
+++ b/yocto-poky/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
diff --git a/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch b/yocto-poky/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch
index 8144e39be..8144e39be 100644
--- a/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch
+++ b/yocto-poky/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch
diff --git a/meta/recipes-support/beecrypt/beecrypt/fix-security.patch b/yocto-poky/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
index 6cb0c0020..6cb0c0020 100644
--- a/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
+++ b/yocto-poky/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
diff --git a/meta/recipes-support/beecrypt/beecrypt/run-ptest b/yocto-poky/meta/recipes-support/beecrypt/beecrypt/run-ptest
index 2ee294d99..2ee294d99 100644
--- a/meta/recipes-support/beecrypt/beecrypt/run-ptest
+++ b/yocto-poky/meta/recipes-support/beecrypt/beecrypt/run-ptest
diff --git a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb b/yocto-poky/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
index 1e626f154..1e626f154 100644
--- a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
+++ b/yocto-poky/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
diff --git a/meta/recipes-support/boost/bjam-native_1.58.0.bb b/yocto-poky/meta/recipes-support/boost/bjam-native_1.58.0.bb
index 32646d707..32646d707 100644
--- a/meta/recipes-support/boost/bjam-native_1.58.0.bb
+++ b/yocto-poky/meta/recipes-support/boost/bjam-native_1.58.0.bb
diff --git a/meta/recipes-support/boost/boost-1.58.0.inc b/yocto-poky/meta/recipes-support/boost/boost-1.58.0.inc
index b47d09133..b47d09133 100644
--- a/meta/recipes-support/boost/boost-1.58.0.inc
+++ b/yocto-poky/meta/recipes-support/boost/boost-1.58.0.inc
diff --git a/meta/recipes-support/boost/boost.inc b/yocto-poky/meta/recipes-support/boost/boost.inc
index 3288e845f..3288e845f 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/yocto-poky/meta/recipes-support/boost/boost.inc
diff --git a/meta/recipes-support/boost/boost/arm-intrinsics.patch b/yocto-poky/meta/recipes-support/boost/boost/arm-intrinsics.patch
index fe85c69a8..fe85c69a8 100644
--- a/meta/recipes-support/boost/boost/arm-intrinsics.patch
+++ b/yocto-poky/meta/recipes-support/boost/boost/arm-intrinsics.patch
diff --git a/meta/recipes-support/boost/boost_1.58.0.bb b/yocto-poky/meta/recipes-support/boost/boost_1.58.0.bb
index c09d5f431..c09d5f431 100644
--- a/meta/recipes-support/boost/boost_1.58.0.bb
+++ b/yocto-poky/meta/recipes-support/boost/boost_1.58.0.bb
diff --git a/meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch b/yocto-poky/meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch
index 329b4c361..329b4c361 100644
--- a/meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch
+++ b/yocto-poky/meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch
diff --git a/meta/recipes-support/boost/files/0002-Don-t-pass-m32-m64-where-it-s-not-supported.patch b/yocto-poky/meta/recipes-support/boost/files/0002-Don-t-pass-m32-m64-where-it-s-not-supported.patch
index ecf7e550f..ecf7e550f 100644
--- a/meta/recipes-support/boost/files/0002-Don-t-pass-m32-m64-where-it-s-not-supported.patch
+++ b/yocto-poky/meta/recipes-support/boost/files/0002-Don-t-pass-m32-m64-where-it-s-not-supported.patch
diff --git a/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch b/yocto-poky/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch
index 9f8b7eac0..9f8b7eac0 100644
--- a/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch
+++ b/yocto-poky/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch
diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch b/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch
index 4b4b287d4..4b4b287d4 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch
+++ b/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch
diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch b/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch
index bf027233d..bf027233d 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch
+++ b/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch
diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch b/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch
index 792b4030b..792b4030b 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch
+++ b/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch
diff --git a/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch b/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch
index f8b0791be..f8b0791be 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch
+++ b/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch
diff --git a/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch b/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
index a113fa8b1..a113fa8b1 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
+++ b/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb b/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb
index 716e3dfca..716e3dfca 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb
+++ b/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb
diff --git a/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch b/yocto-poky/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch
index ad879d466..ad879d466 100644
--- a/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch
+++ b/yocto-poky/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch
diff --git a/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch b/yocto-poky/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch
index f2f9b9c68..f2f9b9c68 100644
--- a/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch
+++ b/yocto-poky/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch
diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/yocto-poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb
index 66a892a7d..66a892a7d 100644
--- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb
+++ b/yocto-poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb
diff --git a/meta/recipes-support/createrepo/createrepo/createrepo-dbpath.patch b/yocto-poky/meta/recipes-support/createrepo/createrepo/createrepo-dbpath.patch
index 72755981a..72755981a 100644
--- a/meta/recipes-support/createrepo/createrepo/createrepo-dbpath.patch
+++ b/yocto-poky/meta/recipes-support/createrepo/createrepo/createrepo-dbpath.patch
diff --git a/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch b/yocto-poky/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch
index bc7200d07..bc7200d07 100644
--- a/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch
+++ b/yocto-poky/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch
diff --git a/meta/recipes-support/createrepo/createrepo/dumpMetadata-disable-signature-validation.patch b/yocto-poky/meta/recipes-support/createrepo/createrepo/dumpMetadata-disable-signature-validation.patch
index 905531f84..905531f84 100644
--- a/meta/recipes-support/createrepo/createrepo/dumpMetadata-disable-signature-validation.patch
+++ b/yocto-poky/meta/recipes-support/createrepo/createrepo/dumpMetadata-disable-signature-validation.patch
diff --git a/meta/recipes-support/createrepo/createrepo/fix-native-install.patch b/yocto-poky/meta/recipes-support/createrepo/createrepo/fix-native-install.patch
index d8202a4f7..d8202a4f7 100644
--- a/meta/recipes-support/createrepo/createrepo/fix-native-install.patch
+++ b/yocto-poky/meta/recipes-support/createrepo/createrepo/fix-native-install.patch
diff --git a/meta/recipes-support/createrepo/createrepo/python-scripts-should-use-interpreter-from-env.patch b/yocto-poky/meta/recipes-support/createrepo/createrepo/python-scripts-should-use-interpreter-from-env.patch
index 80205a150..80205a150 100644
--- a/meta/recipes-support/createrepo/createrepo/python-scripts-should-use-interpreter-from-env.patch
+++ b/yocto-poky/meta/recipes-support/createrepo/createrepo/python-scripts-should-use-interpreter-from-env.patch
diff --git a/meta/recipes-support/createrepo/createrepo/recommends.patch b/yocto-poky/meta/recipes-support/createrepo/createrepo/recommends.patch
index dc5de2b5b..dc5de2b5b 100644
--- a/meta/recipes-support/createrepo/createrepo/recommends.patch
+++ b/yocto-poky/meta/recipes-support/createrepo/createrepo/recommends.patch
diff --git a/meta/recipes-support/createrepo/createrepo/rpm-createsolvedb.py b/yocto-poky/meta/recipes-support/createrepo/createrepo/rpm-createsolvedb.py
index a5b61bade..a5b61bade 100755
--- a/meta/recipes-support/createrepo/createrepo/rpm-createsolvedb.py
+++ b/yocto-poky/meta/recipes-support/createrepo/createrepo/rpm-createsolvedb.py
diff --git a/meta/recipes-support/createrepo/createrepo_0.4.11.bb b/yocto-poky/meta/recipes-support/createrepo/createrepo_0.4.11.bb
index 5f9ecf65f..5f9ecf65f 100644
--- a/meta/recipes-support/createrepo/createrepo_0.4.11.bb
+++ b/yocto-poky/meta/recipes-support/createrepo/createrepo_0.4.11.bb
diff --git a/meta/recipes-support/curl/curl/CVE-2016-0754.patch b/yocto-poky/meta/recipes-support/curl/curl/CVE-2016-0754.patch
index f0402de08..f0402de08 100644
--- a/meta/recipes-support/curl/curl/CVE-2016-0754.patch
+++ b/yocto-poky/meta/recipes-support/curl/curl/CVE-2016-0754.patch
diff --git a/meta/recipes-support/curl/curl/CVE-2016-0755.patch b/yocto-poky/meta/recipes-support/curl/curl/CVE-2016-0755.patch
index 44b9d9a3f..44b9d9a3f 100644
--- a/meta/recipes-support/curl/curl/CVE-2016-0755.patch
+++ b/yocto-poky/meta/recipes-support/curl/curl/CVE-2016-0755.patch
diff --git a/meta/recipes-support/curl/curl/configure_ac.patch b/yocto-poky/meta/recipes-support/curl/curl/configure_ac.patch
index b8bd304d7..b8bd304d7 100644
--- a/meta/recipes-support/curl/curl/configure_ac.patch
+++ b/yocto-poky/meta/recipes-support/curl/curl/configure_ac.patch
diff --git a/meta/recipes-support/curl/curl/pkgconfig_fix.patch b/yocto-poky/meta/recipes-support/curl/curl/pkgconfig_fix.patch
index 5d8769d52..5d8769d52 100644
--- a/meta/recipes-support/curl/curl/pkgconfig_fix.patch
+++ b/yocto-poky/meta/recipes-support/curl/curl/pkgconfig_fix.patch
diff --git a/meta/recipes-support/curl/curl_7.44.0.bb b/yocto-poky/meta/recipes-support/curl/curl_7.44.0.bb
index 419ed8365..419ed8365 100644
--- a/meta/recipes-support/curl/curl_7.44.0.bb
+++ b/yocto-poky/meta/recipes-support/curl/curl_7.44.0.bb
diff --git a/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch b/yocto-poky/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch
index 329bff5d3..329bff5d3 100644
--- a/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch
+++ b/yocto-poky/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch
diff --git a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch b/yocto-poky/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
index 34e8db84d..34e8db84d 100644
--- a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
+++ b/yocto-poky/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
diff --git a/meta/recipes-support/db/db/fix-parallel-build.patch b/yocto-poky/meta/recipes-support/db/db/fix-parallel-build.patch
index 2c7f1e186..2c7f1e186 100644
--- a/meta/recipes-support/db/db/fix-parallel-build.patch
+++ b/yocto-poky/meta/recipes-support/db/db/fix-parallel-build.patch
diff --git a/meta/recipes-support/db/db_5.3.28.bb b/yocto-poky/meta/recipes-support/db/db_5.3.28.bb
index e8b814e06..e8b814e06 100644
--- a/meta/recipes-support/db/db_5.3.28.bb
+++ b/yocto-poky/meta/recipes-support/db/db_5.3.28.bb
diff --git a/meta/recipes-support/db/db_6.0.30.bb b/yocto-poky/meta/recipes-support/db/db_6.0.30.bb
index d49df62b9..d49df62b9 100644
--- a/meta/recipes-support/db/db_6.0.30.bb
+++ b/yocto-poky/meta/recipes-support/db/db_6.0.30.bb
diff --git a/meta/recipes-support/debianutils/debianutils_4.5.1.bb b/yocto-poky/meta/recipes-support/debianutils/debianutils_4.5.1.bb
index 6b665fb2c..6b665fb2c 100644
--- a/meta/recipes-support/debianutils/debianutils_4.5.1.bb
+++ b/yocto-poky/meta/recipes-support/debianutils/debianutils_4.5.1.bb
diff --git a/meta/recipes-support/enchant/enchant_1.6.0.bb b/yocto-poky/meta/recipes-support/enchant/enchant_1.6.0.bb
index 97a47614c..97a47614c 100644
--- a/meta/recipes-support/enchant/enchant_1.6.0.bb
+++ b/yocto-poky/meta/recipes-support/enchant/enchant_1.6.0.bb
diff --git a/meta/recipes-support/gdbm/files/ptest.patch b/yocto-poky/meta/recipes-support/gdbm/files/ptest.patch
index 65236fb48..65236fb48 100644
--- a/meta/recipes-support/gdbm/files/ptest.patch
+++ b/yocto-poky/meta/recipes-support/gdbm/files/ptest.patch
diff --git a/meta/recipes-support/gdbm/files/run-ptest b/yocto-poky/meta/recipes-support/gdbm/files/run-ptest
index 615da8444..615da8444 100755
--- a/meta/recipes-support/gdbm/files/run-ptest
+++ b/yocto-poky/meta/recipes-support/gdbm/files/run-ptest
diff --git a/meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch b/yocto-poky/meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch
index d3cb43b9b..d3cb43b9b 100644
--- a/meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch
+++ b/yocto-poky/meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch
diff --git a/meta/recipes-support/gdbm/gdbm-1.8.3/libtool-mode.patch b/yocto-poky/meta/recipes-support/gdbm/gdbm-1.8.3/libtool-mode.patch
index 0f9d04f4a..0f9d04f4a 100644
--- a/meta/recipes-support/gdbm/gdbm-1.8.3/libtool-mode.patch
+++ b/yocto-poky/meta/recipes-support/gdbm/gdbm-1.8.3/libtool-mode.patch
diff --git a/meta/recipes-support/gdbm/gdbm-1.8.3/makefile.patch b/yocto-poky/meta/recipes-support/gdbm/gdbm-1.8.3/makefile.patch
index 369145c41..369145c41 100644
--- a/meta/recipes-support/gdbm/gdbm-1.8.3/makefile.patch
+++ b/yocto-poky/meta/recipes-support/gdbm/gdbm-1.8.3/makefile.patch
diff --git a/meta/recipes-support/gdbm/gdbm_1.11.bb b/yocto-poky/meta/recipes-support/gdbm/gdbm_1.11.bb
index adf8c5bd3..adf8c5bd3 100644
--- a/meta/recipes-support/gdbm/gdbm_1.11.bb
+++ b/yocto-poky/meta/recipes-support/gdbm/gdbm_1.11.bb
diff --git a/meta/recipes-support/gdbm/gdbm_1.8.3.bb b/yocto-poky/meta/recipes-support/gdbm/gdbm_1.8.3.bb
index af01b6c40..af01b6c40 100644
--- a/meta/recipes-support/gdbm/gdbm_1.8.3.bb
+++ b/yocto-poky/meta/recipes-support/gdbm/gdbm_1.8.3.bb
diff --git a/meta/recipes-support/gmp/gmp-4.2.1/Use-__gnu_inline__-attribute.patch b/yocto-poky/meta/recipes-support/gmp/gmp-4.2.1/Use-__gnu_inline__-attribute.patch
index 627d71aba..627d71aba 100644
--- a/meta/recipes-support/gmp/gmp-4.2.1/Use-__gnu_inline__-attribute.patch
+++ b/yocto-poky/meta/recipes-support/gmp/gmp-4.2.1/Use-__gnu_inline__-attribute.patch
diff --git a/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch b/yocto-poky/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch
index 63aed05ec..63aed05ec 100644
--- a/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch
+++ b/yocto-poky/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch
diff --git a/meta/recipes-support/gmp/gmp-6.0.0/amd64.patch b/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/amd64.patch
index 564d12d42..564d12d42 100644
--- a/meta/recipes-support/gmp/gmp-6.0.0/amd64.patch
+++ b/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/amd64.patch
diff --git a/meta/recipes-support/gmp/gmp-6.0.0/append_user_provided_flags.patch b/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/append_user_provided_flags.patch
index ae1386c4c..ae1386c4c 100644
--- a/meta/recipes-support/gmp/gmp-6.0.0/append_user_provided_flags.patch
+++ b/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/append_user_provided_flags.patch
diff --git a/meta/recipes-support/gmp/gmp-6.0.0/configure.patch b/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/configure.patch
index 349da3c6b..349da3c6b 100644
--- a/meta/recipes-support/gmp/gmp-6.0.0/configure.patch
+++ b/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/configure.patch
diff --git a/meta/recipes-support/gmp/gmp-6.0.0/gmp-6.0.0-ppc64.patch b/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/gmp-6.0.0-ppc64.patch
index 1113b41ec..1113b41ec 100644
--- a/meta/recipes-support/gmp/gmp-6.0.0/gmp-6.0.0-ppc64.patch
+++ b/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/gmp-6.0.0-ppc64.patch
diff --git a/meta/recipes-support/gmp/gmp-6.0.0/use-includedir.patch b/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/use-includedir.patch
index 74904a253..74904a253 100644
--- a/meta/recipes-support/gmp/gmp-6.0.0/use-includedir.patch
+++ b/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/use-includedir.patch
diff --git a/meta/recipes-support/gmp/gmp.inc b/yocto-poky/meta/recipes-support/gmp/gmp.inc
index 6752a39d1..6752a39d1 100644
--- a/meta/recipes-support/gmp/gmp.inc
+++ b/yocto-poky/meta/recipes-support/gmp/gmp.inc
diff --git a/meta/recipes-support/gmp/gmp_4.2.1.bb b/yocto-poky/meta/recipes-support/gmp/gmp_4.2.1.bb
index bfc6a380e..bfc6a380e 100644
--- a/meta/recipes-support/gmp/gmp_4.2.1.bb
+++ b/yocto-poky/meta/recipes-support/gmp/gmp_4.2.1.bb
diff --git a/meta/recipes-support/gmp/gmp_6.0.0.bb b/yocto-poky/meta/recipes-support/gmp/gmp_6.0.0.bb
index 19b63e568..19b63e568 100644
--- a/meta/recipes-support/gmp/gmp_6.0.0.bb
+++ b/yocto-poky/meta/recipes-support/gmp/gmp_6.0.0.bb
diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch b/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch
index 840666f30..840666f30 100644
--- a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch
+++ b/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch
diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb b/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb
index 482de99d4..482de99d4 100644
--- a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb
+++ b/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4242.patch b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4242.patch
index c9addca28..c9addca28 100644
--- a/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4242.patch
+++ b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4242.patch
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4351.patch b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4351.patch
index b29ede423..b29ede423 100644
--- a/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4351.patch
+++ b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4351.patch
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4576.patch b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4576.patch
index b1a22f585..b1a22f585 100644
--- a/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4576.patch
+++ b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4576.patch
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/GnuPG1-CVE-2012-6085.patch b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/GnuPG1-CVE-2012-6085.patch
index 8b5d9a169..8b5d9a169 100644
--- a/meta/recipes-support/gnupg/gnupg-1.4.7/GnuPG1-CVE-2012-6085.patch
+++ b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/GnuPG1-CVE-2012-6085.patch
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch
index e005ac658..e005ac658 100644
--- a/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch
+++ b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/curl_typeof_fix_backport.patch b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/curl_typeof_fix_backport.patch
index e5fb24aa6..e5fb24aa6 100644
--- a/meta/recipes-support/gnupg/gnupg-1.4.7/curl_typeof_fix_backport.patch
+++ b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/curl_typeof_fix_backport.patch
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch
index 2855cab24..2855cab24 100644
--- a/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch
+++ b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch
index 9a03b2b70..9a03b2b70 100644
--- a/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch
+++ b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch
diff --git a/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch b/yocto-poky/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch
index 7af1955d5..7af1955d5 100644
--- a/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch
+++ b/yocto-poky/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch
diff --git a/meta/recipes-support/gnupg/gnupg/pkgconfig.patch b/yocto-poky/meta/recipes-support/gnupg/gnupg/pkgconfig.patch
index f958603ca..f958603ca 100644
--- a/meta/recipes-support/gnupg/gnupg/pkgconfig.patch
+++ b/yocto-poky/meta/recipes-support/gnupg/gnupg/pkgconfig.patch
diff --git a/meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch b/yocto-poky/meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch
index c6dbf1b75..c6dbf1b75 100644
--- a/meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch
+++ b/yocto-poky/meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch
diff --git a/meta/recipes-support/gnupg/gnupg_1.4.7.bb b/yocto-poky/meta/recipes-support/gnupg/gnupg_1.4.7.bb
index 6999f81f8..6999f81f8 100644
--- a/meta/recipes-support/gnupg/gnupg_1.4.7.bb
+++ b/yocto-poky/meta/recipes-support/gnupg/gnupg_1.4.7.bb
diff --git a/meta/recipes-support/gnupg/gnupg_2.1.7.bb b/yocto-poky/meta/recipes-support/gnupg/gnupg_2.1.7.bb
index 48c7c9622..48c7c9622 100644
--- a/meta/recipes-support/gnupg/gnupg_2.1.7.bb
+++ b/yocto-poky/meta/recipes-support/gnupg/gnupg_2.1.7.bb
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/yocto-poky/meta/recipes-support/gnutls/gnutls.inc
index e9b138a03..e9b138a03 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/yocto-poky/meta/recipes-support/gnutls/gnutls.inc
diff --git a/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch b/yocto-poky/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
index 44a9934b5..44a9934b5 100644
--- a/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
+++ b/yocto-poky/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
diff --git a/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch b/yocto-poky/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch
index 5e452c52e..5e452c52e 100644
--- a/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch
+++ b/yocto-poky/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch
diff --git a/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch b/yocto-poky/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch
index 0e1b7c8f7..0e1b7c8f7 100644
--- a/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch
+++ b/yocto-poky/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch
diff --git a/meta/recipes-support/gnutls/gnutls_3.3.17.1.bb b/yocto-poky/meta/recipes-support/gnutls/gnutls_3.3.17.1.bb
index 018579752..018579752 100644
--- a/meta/recipes-support/gnutls/gnutls_3.3.17.1.bb
+++ b/yocto-poky/meta/recipes-support/gnutls/gnutls_3.3.17.1.bb
diff --git a/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch b/yocto-poky/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch
index 2ac89f3b3..2ac89f3b3 100644
--- a/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch
+++ b/yocto-poky/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch
diff --git a/meta/recipes-support/gnutls/libtasn1_4.5.bb b/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.5.bb
index f874574c5..f874574c5 100644
--- a/meta/recipes-support/gnutls/libtasn1_4.5.bb
+++ b/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.5.bb
diff --git a/meta/recipes-support/gpgme/gpgme/gpgme.pc b/yocto-poky/meta/recipes-support/gpgme/gpgme/gpgme.pc
index 30a4d56d6..30a4d56d6 100644
--- a/meta/recipes-support/gpgme/gpgme/gpgme.pc
+++ b/yocto-poky/meta/recipes-support/gpgme/gpgme/gpgme.pc
diff --git a/meta/recipes-support/gpgme/gpgme/pkgconfig.patch b/yocto-poky/meta/recipes-support/gpgme/gpgme/pkgconfig.patch
index e2f1f4ffb..e2f1f4ffb 100644
--- a/meta/recipes-support/gpgme/gpgme/pkgconfig.patch
+++ b/yocto-poky/meta/recipes-support/gpgme/gpgme/pkgconfig.patch
diff --git a/meta/recipes-support/gpgme/gpgme_1.5.4.bb b/yocto-poky/meta/recipes-support/gpgme/gpgme_1.5.4.bb
index 1598377d6..1598377d6 100644
--- a/meta/recipes-support/gpgme/gpgme_1.5.4.bb
+++ b/yocto-poky/meta/recipes-support/gpgme/gpgme_1.5.4.bb
diff --git a/meta/recipes-support/icu/icu.inc b/yocto-poky/meta/recipes-support/icu/icu.inc
index cc6f222a5..cc6f222a5 100644
--- a/meta/recipes-support/icu/icu.inc
+++ b/yocto-poky/meta/recipes-support/icu/icu.inc
diff --git a/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/yocto-poky/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
index 2968d571b..2968d571b 100644
--- a/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
+++ b/yocto-poky/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
diff --git a/meta/recipes-support/icu/icu/fix-install-manx.patch b/yocto-poky/meta/recipes-support/icu/icu/fix-install-manx.patch
index ec63f50c4..ec63f50c4 100644
--- a/meta/recipes-support/icu/icu/fix-install-manx.patch
+++ b/yocto-poky/meta/recipes-support/icu/icu/fix-install-manx.patch
diff --git a/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch b/yocto-poky/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch
index 6e4065922..6e4065922 100644
--- a/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch
+++ b/yocto-poky/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch
diff --git a/meta/recipes-support/icu/icu_55.1.bb b/yocto-poky/meta/recipes-support/icu/icu_55.1.bb
index e91b6f3ab..e91b6f3ab 100644
--- a/meta/recipes-support/icu/icu_55.1.bb
+++ b/yocto-poky/meta/recipes-support/icu/icu_55.1.bb
diff --git a/meta/recipes-support/iso-codes/iso-codes_3.58.bb b/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.58.bb
index 7112e461b..7112e461b 100644
--- a/meta/recipes-support/iso-codes/iso-codes_3.58.bb
+++ b/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.58.bb
diff --git a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch b/yocto-poky/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
index b6ccdda6a..b6ccdda6a 100644
--- a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
+++ b/yocto-poky/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
diff --git a/meta/recipes-support/libassuan/libassuan_2.2.1.bb b/yocto-poky/meta/recipes-support/libassuan/libassuan_2.2.1.bb
index 75ae43f02..75ae43f02 100644
--- a/meta/recipes-support/libassuan/libassuan_2.2.1.bb
+++ b/yocto-poky/meta/recipes-support/libassuan/libassuan_2.2.1.bb
diff --git a/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb b/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb
index 4d0e299f4..4d0e299f4 100644
--- a/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb
+++ b/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb
diff --git a/meta/recipes-support/libbsd/files/CVE-2016-2090.patch b/yocto-poky/meta/recipes-support/libbsd/files/CVE-2016-2090.patch
index 2eaae1386..2eaae1386 100644
--- a/meta/recipes-support/libbsd/files/CVE-2016-2090.patch
+++ b/yocto-poky/meta/recipes-support/libbsd/files/CVE-2016-2090.patch
diff --git a/meta/recipes-support/libbsd/libbsd_0.7.0.bb b/yocto-poky/meta/recipes-support/libbsd/libbsd_0.7.0.bb
index 8d9a708a1..8d9a708a1 100644
--- a/meta/recipes-support/libbsd/libbsd_0.7.0.bb
+++ b/yocto-poky/meta/recipes-support/libbsd/libbsd_0.7.0.bb
diff --git a/meta/recipes-support/libcap-ng/libcap-ng/python.patch b/yocto-poky/meta/recipes-support/libcap-ng/libcap-ng/python.patch
index 59591eb46..59591eb46 100644
--- a/meta/recipes-support/libcap-ng/libcap-ng/python.patch
+++ b/yocto-poky/meta/recipes-support/libcap-ng/libcap-ng/python.patch
diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb b/yocto-poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb
index a31d5dc43..a31d5dc43 100644
--- a/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb
+++ b/yocto-poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb
diff --git a/meta/recipes-support/libcap/libcap_2.24.bb b/yocto-poky/meta/recipes-support/libcap/libcap_2.24.bb
index 36b94ee74..36b94ee74 100644
--- a/meta/recipes-support/libcap/libcap_2.24.bb
+++ b/yocto-poky/meta/recipes-support/libcap/libcap_2.24.bb
diff --git a/meta/recipes-support/libcheck/libcheck_0.10.0.bb b/yocto-poky/meta/recipes-support/libcheck/libcheck_0.10.0.bb
index c0b459f66..c0b459f66 100644
--- a/meta/recipes-support/libcheck/libcheck_0.10.0.bb
+++ b/yocto-poky/meta/recipes-support/libcheck/libcheck_0.10.0.bb
diff --git a/meta/recipes-support/libcroco/libcroco_0.6.8.bb b/yocto-poky/meta/recipes-support/libcroco/libcroco_0.6.8.bb
index 2b1b91063..2b1b91063 100644
--- a/meta/recipes-support/libcroco/libcroco_0.6.8.bb
+++ b/yocto-poky/meta/recipes-support/libcroco/libcroco_0.6.8.bb
diff --git a/meta/recipes-support/libdaemon/libdaemon/fix-includes.patch b/yocto-poky/meta/recipes-support/libdaemon/libdaemon/fix-includes.patch
index 1027ae8e6..1027ae8e6 100644
--- a/meta/recipes-support/libdaemon/libdaemon/fix-includes.patch
+++ b/yocto-poky/meta/recipes-support/libdaemon/libdaemon/fix-includes.patch
diff --git a/meta/recipes-support/libdaemon/libdaemon_0.14.bb b/yocto-poky/meta/recipes-support/libdaemon/libdaemon_0.14.bb
index 070ee1890..070ee1890 100644
--- a/meta/recipes-support/libdaemon/libdaemon_0.14.bb
+++ b/yocto-poky/meta/recipes-support/libdaemon/libdaemon_0.14.bb
diff --git a/meta/recipes-support/libevdev/libevdev_1.4.2.bb b/yocto-poky/meta/recipes-support/libevdev/libevdev_1.4.2.bb
index f851305c5..f851305c5 100644
--- a/meta/recipes-support/libevdev/libevdev_1.4.2.bb
+++ b/yocto-poky/meta/recipes-support/libevdev/libevdev_1.4.2.bb
diff --git a/meta/recipes-support/libevent/libevent/run-ptest b/yocto-poky/meta/recipes-support/libevent/libevent/run-ptest
index d521688e7..d521688e7 100644
--- a/meta/recipes-support/libevent/libevent/run-ptest
+++ b/yocto-poky/meta/recipes-support/libevent/libevent/run-ptest
diff --git a/meta/recipes-support/libevent/libevent_2.0.22.bb b/yocto-poky/meta/recipes-support/libevent/libevent_2.0.22.bb
index 58c263c4d..58c263c4d 100644
--- a/meta/recipes-support/libevent/libevent_2.0.22.bb
+++ b/yocto-poky/meta/recipes-support/libevent/libevent_2.0.22.bb
diff --git a/meta/recipes-support/libexif/libexif_0.6.21.bb b/yocto-poky/meta/recipes-support/libexif/libexif_0.6.21.bb
index cff4caede..cff4caede 100644
--- a/meta/recipes-support/libexif/libexif_0.6.21.bb
+++ b/yocto-poky/meta/recipes-support/libexif/libexif_0.6.21.bb
diff --git a/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch b/yocto-poky/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch
index 69a51d566..69a51d566 100644
--- a/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch
+++ b/yocto-poky/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch
diff --git a/meta/recipes-support/libfm/libfm-extra_1.2.3.bb b/yocto-poky/meta/recipes-support/libfm/libfm-extra_1.2.3.bb
index 36752692b..36752692b 100644
--- a/meta/recipes-support/libfm/libfm-extra_1.2.3.bb
+++ b/yocto-poky/meta/recipes-support/libfm/libfm-extra_1.2.3.bb
diff --git a/meta/recipes-support/libfm/libfm_1.2.3.bb b/yocto-poky/meta/recipes-support/libfm/libfm_1.2.3.bb
index e9ff6569c..e9ff6569c 100644
--- a/meta/recipes-support/libfm/libfm_1.2.3.bb
+++ b/yocto-poky/meta/recipes-support/libfm/libfm_1.2.3.bb
diff --git a/meta/recipes-support/libgcrypt/files/CVE-2015-7511_1.patch b/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2015-7511_1.patch
index 14c25b9ad..14c25b9ad 100644
--- a/meta/recipes-support/libgcrypt/files/CVE-2015-7511_1.patch
+++ b/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2015-7511_1.patch
diff --git a/meta/recipes-support/libgcrypt/files/CVE-2015-7511_2.patch b/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2015-7511_2.patch
index 8093a18cf..8093a18cf 100644
--- a/meta/recipes-support/libgcrypt/files/CVE-2015-7511_2.patch
+++ b/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2015-7511_2.patch
diff --git a/meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch b/yocto-poky/meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch
index 67ddfc640..67ddfc640 100644
--- a/meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch
+++ b/yocto-poky/meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch
diff --git a/meta/recipes-support/libgcrypt/files/fix-ICE-failure-on-mips-with-option-O-and-g.patch b/yocto-poky/meta/recipes-support/libgcrypt/files/fix-ICE-failure-on-mips-with-option-O-and-g.patch
index 582e62f70..582e62f70 100644
--- a/meta/recipes-support/libgcrypt/files/fix-ICE-failure-on-mips-with-option-O-and-g.patch
+++ b/yocto-poky/meta/recipes-support/libgcrypt/files/fix-ICE-failure-on-mips-with-option-O-and-g.patch
diff --git a/meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch b/yocto-poky/meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
index a3e540369..a3e540369 100644
--- a/meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
+++ b/yocto-poky/meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt.inc
index 683be780f..683be780f 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt.inc
+++ b/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt.inc
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.6.3.bb b/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.6.3.bb
index db89faf80..db89faf80 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.6.3.bb
+++ b/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.6.3.bb
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-libgpg-error-Add-nios2-support.patch b/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error/0001-libgpg-error-Add-nios2-support.patch
index dab1c13b6..dab1c13b6 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error/0001-libgpg-error-Add-nios2-support.patch
+++ b/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error/0001-libgpg-error-Add-nios2-support.patch
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
index 9ffeedbe5..9ffeedbe5 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
+++ b/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.19.bb b/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.19.bb
index c69930a92..c69930a92 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.19.bb
+++ b/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.19.bb
diff --git a/meta/recipes-support/libical/libical_1.0.0.bb b/yocto-poky/meta/recipes-support/libical/libical_1.0.0.bb
index be6b635ca..be6b635ca 100644
--- a/meta/recipes-support/libical/libical_1.0.0.bb
+++ b/yocto-poky/meta/recipes-support/libical/libical_1.0.0.bb
diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch b/yocto-poky/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
index 3cbf549d4..3cbf549d4 100644
--- a/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
+++ b/yocto-poky/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch b/yocto-poky/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
index fb07f7366..fb07f7366 100644
--- a/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
+++ b/yocto-poky/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
diff --git a/meta/recipes-support/libiconv/libiconv-1.14/add-relocatable-module.patch b/yocto-poky/meta/recipes-support/libiconv/libiconv-1.14/add-relocatable-module.patch
index 6af377b4c..6af377b4c 100644
--- a/meta/recipes-support/libiconv/libiconv-1.14/add-relocatable-module.patch
+++ b/yocto-poky/meta/recipes-support/libiconv/libiconv-1.14/add-relocatable-module.patch
diff --git a/meta/recipes-support/libiconv/libiconv-1.14/autoconf.patch b/yocto-poky/meta/recipes-support/libiconv/libiconv-1.14/autoconf.patch
index 5d34ce7c0..5d34ce7c0 100644
--- a/meta/recipes-support/libiconv/libiconv-1.14/autoconf.patch
+++ b/yocto-poky/meta/recipes-support/libiconv/libiconv-1.14/autoconf.patch
diff --git a/meta/recipes-support/libiconv/libiconv_1.11.1.bb b/yocto-poky/meta/recipes-support/libiconv/libiconv_1.11.1.bb
index 6ce4b96e3..6ce4b96e3 100644
--- a/meta/recipes-support/libiconv/libiconv_1.11.1.bb
+++ b/yocto-poky/meta/recipes-support/libiconv/libiconv_1.11.1.bb
diff --git a/meta/recipes-support/libiconv/libiconv_1.14.bb b/yocto-poky/meta/recipes-support/libiconv/libiconv_1.14.bb
index 1b6fe09bb..1b6fe09bb 100644
--- a/meta/recipes-support/libiconv/libiconv_1.14.bb
+++ b/yocto-poky/meta/recipes-support/libiconv/libiconv_1.14.bb
diff --git a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch b/yocto-poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
index d28dfd9eb..d28dfd9eb 100644
--- a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
+++ b/yocto-poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
diff --git a/meta/recipes-support/libksba/libksba_1.3.3.bb b/yocto-poky/meta/recipes-support/libksba/libksba_1.3.3.bb
index bc2116419..bc2116419 100644
--- a/meta/recipes-support/libksba/libksba_1.3.3.bb
+++ b/yocto-poky/meta/recipes-support/libksba/libksba_1.3.3.bb
diff --git a/meta/recipes-support/libmpc/libmpc.inc b/yocto-poky/meta/recipes-support/libmpc/libmpc.inc
index b3742543d..b3742543d 100644
--- a/meta/recipes-support/libmpc/libmpc.inc
+++ b/yocto-poky/meta/recipes-support/libmpc/libmpc.inc
diff --git a/meta/recipes-support/libmpc/libmpc_1.0.3.bb b/yocto-poky/meta/recipes-support/libmpc/libmpc_1.0.3.bb
index f3e5a18ea..f3e5a18ea 100644
--- a/meta/recipes-support/libmpc/libmpc_1.0.3.bb
+++ b/yocto-poky/meta/recipes-support/libmpc/libmpc_1.0.3.bb
diff --git a/meta/recipes-support/libnl/libnl/fix-pc-file.patch b/yocto-poky/meta/recipes-support/libnl/libnl/fix-pc-file.patch
index fe8b833a1..fe8b833a1 100644
--- a/meta/recipes-support/libnl/libnl/fix-pc-file.patch
+++ b/yocto-poky/meta/recipes-support/libnl/libnl/fix-pc-file.patch
diff --git a/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch b/yocto-poky/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
index 79aa0bdf1..79aa0bdf1 100644
--- a/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
+++ b/yocto-poky/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
diff --git a/meta/recipes-support/libnl/libnl_3.2.25.bb b/yocto-poky/meta/recipes-support/libnl/libnl_3.2.25.bb
index 97814fb13..97814fb13 100644
--- a/meta/recipes-support/libnl/libnl_3.2.25.bb
+++ b/yocto-poky/meta/recipes-support/libnl/libnl_3.2.25.bb
diff --git a/meta/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch b/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch
index aff1cb184..aff1cb184 100644
--- a/meta/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch
+++ b/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch
diff --git a/meta/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch b/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch
index c8e3c1f72..c8e3c1f72 100644
--- a/meta/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch
+++ b/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch
diff --git a/meta/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch b/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch
index 473380e9f..473380e9f 100644
--- a/meta/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch
+++ b/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch
diff --git a/meta/recipes-support/liboil/liboil-0.3.17/no-tests.patch b/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/no-tests.patch
index 892d44131..892d44131 100644
--- a/meta/recipes-support/liboil/liboil-0.3.17/no-tests.patch
+++ b/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/no-tests.patch
diff --git a/meta/recipes-support/liboil/liboil_0.3.17.bb b/yocto-poky/meta/recipes-support/liboil/liboil_0.3.17.bb
index 03b778521..03b778521 100644
--- a/meta/recipes-support/liboil/liboil_0.3.17.bb
+++ b/yocto-poky/meta/recipes-support/liboil/liboil_0.3.17.bb
diff --git a/meta/recipes-support/libpcre/libpcre/Makefile b/yocto-poky/meta/recipes-support/libpcre/libpcre/Makefile
index 708d807d0..708d807d0 100644
--- a/meta/recipes-support/libpcre/libpcre/Makefile
+++ b/yocto-poky/meta/recipes-support/libpcre/libpcre/Makefile
diff --git a/meta/recipes-support/libpcre/libpcre/fix-pcre-name-collision.patch b/yocto-poky/meta/recipes-support/libpcre/libpcre/fix-pcre-name-collision.patch
index 89b44f6aa..89b44f6aa 100644
--- a/meta/recipes-support/libpcre/libpcre/fix-pcre-name-collision.patch
+++ b/yocto-poky/meta/recipes-support/libpcre/libpcre/fix-pcre-name-collision.patch
diff --git a/meta/recipes-support/libpcre/libpcre/pcre-cross.patch b/yocto-poky/meta/recipes-support/libpcre/libpcre/pcre-cross.patch
index 83880f709..83880f709 100644
--- a/meta/recipes-support/libpcre/libpcre/pcre-cross.patch
+++ b/yocto-poky/meta/recipes-support/libpcre/libpcre/pcre-cross.patch
diff --git a/meta/recipes-support/libpcre/libpcre/run-ptest b/yocto-poky/meta/recipes-support/libpcre/libpcre/run-ptest
index 990d4a12a..990d4a12a 100644
--- a/meta/recipes-support/libpcre/libpcre/run-ptest
+++ b/yocto-poky/meta/recipes-support/libpcre/libpcre/run-ptest
diff --git a/meta/recipes-support/libpcre/libpcre_8.38.bb b/yocto-poky/meta/recipes-support/libpcre/libpcre_8.38.bb
index c5676073e..c5676073e 100644
--- a/meta/recipes-support/libpcre/libpcre_8.38.bb
+++ b/yocto-poky/meta/recipes-support/libpcre/libpcre_8.38.bb
diff --git a/meta/recipes-support/libproxy/libproxy/0001-test-Include-sys-select.h-for-select.patch b/yocto-poky/meta/recipes-support/libproxy/libproxy/0001-test-Include-sys-select.h-for-select.patch
index 5ae52f2d4..5ae52f2d4 100644
--- a/meta/recipes-support/libproxy/libproxy/0001-test-Include-sys-select.h-for-select.patch
+++ b/yocto-poky/meta/recipes-support/libproxy/libproxy/0001-test-Include-sys-select.h-for-select.patch
diff --git a/meta/recipes-support/libproxy/libproxy_0.4.11.bb b/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.11.bb
index 06d0b9ba9..06d0b9ba9 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.11.bb
+++ b/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.11.bb
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb b/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb
index 044db31f4..044db31f4 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb
+++ b/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb
diff --git a/meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch
index 2aeacb868..2aeacb868 100644
--- a/meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/yocto-poky/meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch b/yocto-poky/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch
index d4489165b..d4489165b 100644
--- a/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch
+++ b/yocto-poky/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch
diff --git a/meta/recipes-support/libunistring/libunistring_0.9.5.bb b/yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.5.bb
index 45cf63330..45cf63330 100644
--- a/meta/recipes-support/libunistring/libunistring_0.9.5.bb
+++ b/yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.5.bb
diff --git a/meta/recipes-support/libunwind/libunwind-1.1/0001-Invalid-dwarf-opcodes-can-cause-references-beyond-th.patch b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/0001-Invalid-dwarf-opcodes-can-cause-references-beyond-th.patch
index af972f84e..af972f84e 100644
--- a/meta/recipes-support/libunwind/libunwind-1.1/0001-Invalid-dwarf-opcodes-can-cause-references-beyond-th.patch
+++ b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/0001-Invalid-dwarf-opcodes-can-cause-references-beyond-th.patch
diff --git a/meta/recipes-support/libunwind/libunwind-1.1/AArch64-port.patch b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/AArch64-port.patch
index 228ec322d..228ec322d 100644
--- a/meta/recipes-support/libunwind/libunwind-1.1/AArch64-port.patch
+++ b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/AArch64-port.patch
diff --git a/meta/recipes-support/libunwind/libunwind-1.1/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch
index d55250281..d55250281 100644
--- a/meta/recipes-support/libunwind/libunwind-1.1/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch
+++ b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch
diff --git a/meta/recipes-support/libunwind/libunwind-1.1/Fix-test-case-link-failure-on-PowerPC-systems-with-Altivec.patch b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/Fix-test-case-link-failure-on-PowerPC-systems-with-Altivec.patch
index dc0f5c1b4..dc0f5c1b4 100644
--- a/meta/recipes-support/libunwind/libunwind-1.1/Fix-test-case-link-failure-on-PowerPC-systems-with-Altivec.patch
+++ b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/Fix-test-case-link-failure-on-PowerPC-systems-with-Altivec.patch
diff --git a/meta/recipes-support/libunwind/libunwind-1.1/Link-libunwind-to-libgcc_s-rather-than-libgcc.patch b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/Link-libunwind-to-libgcc_s-rather-than-libgcc.patch
index 0e55c91b8..0e55c91b8 100644
--- a/meta/recipes-support/libunwind/libunwind-1.1/Link-libunwind-to-libgcc_s-rather-than-libgcc.patch
+++ b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/Link-libunwind-to-libgcc_s-rather-than-libgcc.patch
diff --git a/meta/recipes-support/libunwind/libunwind-1.1/Support-building-with-older-compilers.patch b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/Support-building-with-older-compilers.patch
index 268b702dc..268b702dc 100644
--- a/meta/recipes-support/libunwind/libunwind-1.1/Support-building-with-older-compilers.patch
+++ b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/Support-building-with-older-compilers.patch
diff --git a/meta/recipes-support/libunwind/libunwind.inc b/yocto-poky/meta/recipes-support/libunwind/libunwind.inc
index 6660af22c..6660af22c 100644
--- a/meta/recipes-support/libunwind/libunwind.inc
+++ b/yocto-poky/meta/recipes-support/libunwind/libunwind.inc
diff --git a/meta/recipes-support/libunwind/libunwind_1.1.bb b/yocto-poky/meta/recipes-support/libunwind/libunwind_1.1.bb
index aa62bcc66..aa62bcc66 100644
--- a/meta/recipes-support/libunwind/libunwind_1.1.bb
+++ b/yocto-poky/meta/recipes-support/libunwind/libunwind_1.1.bb
diff --git a/meta/recipes-support/liburcu/liburcu/0001-uatomic-Specify-complete-types-for-atomic-function-c.patch b/yocto-poky/meta/recipes-support/liburcu/liburcu/0001-uatomic-Specify-complete-types-for-atomic-function-c.patch
index 5ad0bbd15..5ad0bbd15 100644
--- a/meta/recipes-support/liburcu/liburcu/0001-uatomic-Specify-complete-types-for-atomic-function-c.patch
+++ b/yocto-poky/meta/recipes-support/liburcu/liburcu/0001-uatomic-Specify-complete-types-for-atomic-function-c.patch
diff --git a/meta/recipes-support/liburcu/liburcu/Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch b/yocto-poky/meta/recipes-support/liburcu/liburcu/Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch
index 535a7384c..535a7384c 100644
--- a/meta/recipes-support/liburcu/liburcu/Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch
+++ b/yocto-poky/meta/recipes-support/liburcu/liburcu/Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch
diff --git a/meta/recipes-support/liburcu/liburcu/aarch64.patch b/yocto-poky/meta/recipes-support/liburcu/liburcu/aarch64.patch
index c6cc8c2fd..c6cc8c2fd 100644
--- a/meta/recipes-support/liburcu/liburcu/aarch64.patch
+++ b/yocto-poky/meta/recipes-support/liburcu/liburcu/aarch64.patch
diff --git a/meta/recipes-support/liburcu/liburcu_0.8.7.bb b/yocto-poky/meta/recipes-support/liburcu/liburcu_0.8.7.bb
index a7f4f51b5..a7f4f51b5 100644
--- a/meta/recipes-support/liburcu/liburcu_0.8.7.bb
+++ b/yocto-poky/meta/recipes-support/liburcu/liburcu_0.8.7.bb
diff --git a/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch b/yocto-poky/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch
index b88440dec..b88440dec 100644
--- a/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch
+++ b/yocto-poky/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch
diff --git a/meta/recipes-support/libusb/libusb-compat_0.1.5.bb b/yocto-poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb
index 646872cb9..646872cb9 100644
--- a/meta/recipes-support/libusb/libusb-compat_0.1.5.bb
+++ b/yocto-poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb
diff --git a/meta/recipes-support/libusb/libusb1_1.0.19.bb b/yocto-poky/meta/recipes-support/libusb/libusb1_1.0.19.bb
index a20e1fcdb..a20e1fcdb 100644
--- a/meta/recipes-support/libusb/libusb1_1.0.19.bb
+++ b/yocto-poky/meta/recipes-support/libusb/libusb1_1.0.19.bb
diff --git a/meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch b/yocto-poky/meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch
index e4d09c2ac..e4d09c2ac 100644
--- a/meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch
+++ b/yocto-poky/meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch
diff --git a/meta/recipes-support/libxslt/libxslt/pkgconfig.patch b/yocto-poky/meta/recipes-support/libxslt/libxslt/pkgconfig.patch
index 89d14c944..89d14c944 100644
--- a/meta/recipes-support/libxslt/libxslt/pkgconfig.patch
+++ b/yocto-poky/meta/recipes-support/libxslt/libxslt/pkgconfig.patch
diff --git a/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch b/yocto-poky/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
index 16a801010..16a801010 100644
--- a/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
+++ b/yocto-poky/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.28.bb b/yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.28.bb
index 87fabecda..87fabecda 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.28.bb
+++ b/yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.28.bb
diff --git a/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch b/yocto-poky/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch
index 3c4a00ef3..3c4a00ef3 100644
--- a/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch
+++ b/yocto-poky/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch
diff --git a/meta/recipes-support/libyaml/libyaml_0.1.6.bb b/yocto-poky/meta/recipes-support/libyaml/libyaml_0.1.6.bb
index b0155774d..b0155774d 100644
--- a/meta/recipes-support/libyaml/libyaml_0.1.6.bb
+++ b/yocto-poky/meta/recipes-support/libyaml/libyaml_0.1.6.bb
diff --git a/meta/recipes-support/lz4/lz4.bb b/yocto-poky/meta/recipes-support/lz4/lz4.bb
index 18e56d04c..18e56d04c 100644
--- a/meta/recipes-support/lz4/lz4.bb
+++ b/yocto-poky/meta/recipes-support/lz4/lz4.bb
diff --git a/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch b/yocto-poky/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch
index db3a70e80..db3a70e80 100644
--- a/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch
+++ b/yocto-poky/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch
diff --git a/meta/recipes-support/lzo/lzo/acinclude.m4 b/yocto-poky/meta/recipes-support/lzo/lzo/acinclude.m4
index c4d2ccd5b..c4d2ccd5b 100644
--- a/meta/recipes-support/lzo/lzo/acinclude.m4
+++ b/yocto-poky/meta/recipes-support/lzo/lzo/acinclude.m4
diff --git a/meta/recipes-support/lzo/lzo/run-ptest b/yocto-poky/meta/recipes-support/lzo/lzo/run-ptest
index 2ea7745f7..2ea7745f7 100644
--- a/meta/recipes-support/lzo/lzo/run-ptest
+++ b/yocto-poky/meta/recipes-support/lzo/lzo/run-ptest
diff --git a/meta/recipes-support/lzo/lzo_2.09.bb b/yocto-poky/meta/recipes-support/lzo/lzo_2.09.bb
index 2978617bb..2978617bb 100644
--- a/meta/recipes-support/lzo/lzo_2.09.bb
+++ b/yocto-poky/meta/recipes-support/lzo/lzo_2.09.bb
diff --git a/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch b/yocto-poky/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch
index 867b88b30..867b88b30 100644
--- a/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch
+++ b/yocto-poky/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch
diff --git a/meta/recipes-support/lzop/lzop/acinclude.m4 b/yocto-poky/meta/recipes-support/lzop/lzop/acinclude.m4
index 0029c19c7..0029c19c7 100644
--- a/meta/recipes-support/lzop/lzop/acinclude.m4
+++ b/yocto-poky/meta/recipes-support/lzop/lzop/acinclude.m4
diff --git a/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch b/yocto-poky/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch
index 739be8231..739be8231 100644
--- a/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch
+++ b/yocto-poky/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch
diff --git a/meta/recipes-support/lzop/lzop_1.03.bb b/yocto-poky/meta/recipes-support/lzop/lzop_1.03.bb
index 07d628908..07d628908 100644
--- a/meta/recipes-support/lzop/lzop_1.03.bb
+++ b/yocto-poky/meta/recipes-support/lzop/lzop_1.03.bb
diff --git a/meta/recipes-support/mpfr/mpfr-3.1.3/long-long-thumb.patch b/yocto-poky/meta/recipes-support/mpfr/mpfr-3.1.3/long-long-thumb.patch
index ca7100eb2..ca7100eb2 100644
--- a/meta/recipes-support/mpfr/mpfr-3.1.3/long-long-thumb.patch
+++ b/yocto-poky/meta/recipes-support/mpfr/mpfr-3.1.3/long-long-thumb.patch
diff --git a/meta/recipes-support/mpfr/mpfr.inc b/yocto-poky/meta/recipes-support/mpfr/mpfr.inc
index 7f3f9175d..7f3f9175d 100644
--- a/meta/recipes-support/mpfr/mpfr.inc
+++ b/yocto-poky/meta/recipes-support/mpfr/mpfr.inc
diff --git a/meta/recipes-support/mpfr/mpfr_3.1.3.bb b/yocto-poky/meta/recipes-support/mpfr/mpfr_3.1.3.bb
index af19b5451..af19b5451 100644
--- a/meta/recipes-support/mpfr/mpfr_3.1.3.bb
+++ b/yocto-poky/meta/recipes-support/mpfr/mpfr_3.1.3.bb
diff --git a/meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch b/yocto-poky/meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch
index 459f5e385..459f5e385 100644
--- a/meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch
+++ b/yocto-poky/meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch
diff --git a/meta/recipes-support/neon/neon/pkgconfig.patch b/yocto-poky/meta/recipes-support/neon/neon/pkgconfig.patch
index 239dba8e2..239dba8e2 100644
--- a/meta/recipes-support/neon/neon/pkgconfig.patch
+++ b/yocto-poky/meta/recipes-support/neon/neon/pkgconfig.patch
diff --git a/meta/recipes-support/neon/neon_0.30.1.bb b/yocto-poky/meta/recipes-support/neon/neon_0.30.1.bb
index 0244314a6..0244314a6 100644
--- a/meta/recipes-support/neon/neon_0.30.1.bb
+++ b/yocto-poky/meta/recipes-support/neon/neon_0.30.1.bb
diff --git a/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch b/yocto-poky/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
index 23da77792..23da77792 100644
--- a/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
+++ b/yocto-poky/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
diff --git a/meta/recipes-support/nettle/files/run-ptest b/yocto-poky/meta/recipes-support/nettle/files/run-ptest
index b90bed66d..b90bed66d 100644
--- a/meta/recipes-support/nettle/files/run-ptest
+++ b/yocto-poky/meta/recipes-support/nettle/files/run-ptest
diff --git a/meta/recipes-support/nettle/nettle-3.1.1/CVE-2015-8803_8805.patch b/yocto-poky/meta/recipes-support/nettle/nettle-3.1.1/CVE-2015-8803_8805.patch
index b4ff228f6..b4ff228f6 100644
--- a/meta/recipes-support/nettle/nettle-3.1.1/CVE-2015-8803_8805.patch
+++ b/yocto-poky/meta/recipes-support/nettle/nettle-3.1.1/CVE-2015-8803_8805.patch
diff --git a/meta/recipes-support/nettle/nettle-3.1.1/CVE-2015-8804.patch b/yocto-poky/meta/recipes-support/nettle/nettle-3.1.1/CVE-2015-8804.patch
index 1d34db735..1d34db735 100644
--- a/meta/recipes-support/nettle/nettle-3.1.1/CVE-2015-8804.patch
+++ b/yocto-poky/meta/recipes-support/nettle/nettle-3.1.1/CVE-2015-8804.patch
diff --git a/meta/recipes-support/nettle/nettle.inc b/yocto-poky/meta/recipes-support/nettle/nettle.inc
index fafff6d8d..fafff6d8d 100644
--- a/meta/recipes-support/nettle/nettle.inc
+++ b/yocto-poky/meta/recipes-support/nettle/nettle.inc
diff --git a/meta/recipes-support/nettle/nettle_2.7.1.bb b/yocto-poky/meta/recipes-support/nettle/nettle_2.7.1.bb
index ae2574a23..ae2574a23 100644
--- a/meta/recipes-support/nettle/nettle_2.7.1.bb
+++ b/yocto-poky/meta/recipes-support/nettle/nettle_2.7.1.bb
diff --git a/meta/recipes-support/nettle/nettle_3.1.1.bb b/yocto-poky/meta/recipes-support/nettle/nettle_3.1.1.bb
index 4a40e9ae5..4a40e9ae5 100644
--- a/meta/recipes-support/nettle/nettle_3.1.1.bb
+++ b/yocto-poky/meta/recipes-support/nettle/nettle_3.1.1.bb
diff --git a/meta/recipes-support/npth/npth/pkgconfig.patch b/yocto-poky/meta/recipes-support/npth/npth/pkgconfig.patch
index b6a12e730..b6a12e730 100644
--- a/meta/recipes-support/npth/npth/pkgconfig.patch
+++ b/yocto-poky/meta/recipes-support/npth/npth/pkgconfig.patch
diff --git a/meta/recipes-support/npth/npth_1.2.bb b/yocto-poky/meta/recipes-support/npth/npth_1.2.bb
index 1b3962e64..1b3962e64 100644
--- a/meta/recipes-support/npth/npth_1.2.bb
+++ b/yocto-poky/meta/recipes-support/npth/npth_1.2.bb
diff --git a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/yocto-poky/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
index c2b7258e5..c2b7258e5 100644
--- a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
+++ b/yocto-poky/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
diff --git a/meta/recipes-support/nspr/nspr/nspr.pc.in b/yocto-poky/meta/recipes-support/nspr/nspr/nspr.pc.in
index c37d0bcbd..c37d0bcbd 100644
--- a/meta/recipes-support/nspr/nspr/nspr.pc.in
+++ b/yocto-poky/meta/recipes-support/nspr/nspr/nspr.pc.in
diff --git a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/yocto-poky/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
index a7e7853de..a7e7853de 100644
--- a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
+++ b/yocto-poky/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
diff --git a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/yocto-poky/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch
index bde715c5d..bde715c5d 100644
--- a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch
+++ b/yocto-poky/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch
diff --git a/meta/recipes-support/nspr/nspr_4.10.8.bb b/yocto-poky/meta/recipes-support/nspr/nspr_4.10.8.bb
index bc6001888..bc6001888 100644
--- a/meta/recipes-support/nspr/nspr_4.10.8.bb
+++ b/yocto-poky/meta/recipes-support/nspr/nspr_4.10.8.bb
diff --git a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb b/yocto-poky/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
index bbce9e9af..bbce9e9af 100644
--- a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
+++ b/yocto-poky/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
diff --git a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/yocto-poky/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch
index 547594d5b..547594d5b 100644
--- a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch
+++ b/yocto-poky/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch
diff --git a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/yocto-poky/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
index 866de07ea..866de07ea 100644
--- a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
+++ b/yocto-poky/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
diff --git a/meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch b/yocto-poky/meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch
index f0b3550bf..f0b3550bf 100644
--- a/meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch
+++ b/yocto-poky/meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch
diff --git a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/yocto-poky/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch
index 7661dc93a..7661dc93a 100644
--- a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch
+++ b/yocto-poky/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch
diff --git a/meta/recipes-support/nss/nss/nss.pc.in b/yocto-poky/meta/recipes-support/nss/nss/nss.pc.in
index 200f635c6..200f635c6 100644
--- a/meta/recipes-support/nss/nss/nss.pc.in
+++ b/yocto-poky/meta/recipes-support/nss/nss/nss.pc.in
diff --git a/meta/recipes-support/nss/nss/signlibs.sh b/yocto-poky/meta/recipes-support/nss/nss/signlibs.sh
index a74e499f8..a74e499f8 100644
--- a/meta/recipes-support/nss/nss/signlibs.sh
+++ b/yocto-poky/meta/recipes-support/nss/nss/signlibs.sh
diff --git a/meta/recipes-support/nss/nss_3.19.2.bb b/yocto-poky/meta/recipes-support/nss/nss_3.19.2.bb
index 23a4a1f8d..23a4a1f8d 100644
--- a/meta/recipes-support/nss/nss_3.19.2.bb
+++ b/yocto-poky/meta/recipes-support/nss/nss_3.19.2.bb
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb b/yocto-poky/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb
index ee7795117..ee7795117 100644
--- a/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb
+++ b/yocto-poky/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb
diff --git a/meta/recipes-support/pinentry/pinentry_0.9.2.bb b/yocto-poky/meta/recipes-support/pinentry/pinentry_0.9.2.bb
index d6b713020..d6b713020 100644
--- a/meta/recipes-support/pinentry/pinentry_0.9.2.bb
+++ b/yocto-poky/meta/recipes-support/pinentry/pinentry_0.9.2.bb
diff --git a/meta/recipes-support/popt/popt/disable_tests.patch b/yocto-poky/meta/recipes-support/popt/popt/disable_tests.patch
index 016cf66a2..016cf66a2 100644
--- a/meta/recipes-support/popt/popt/disable_tests.patch
+++ b/yocto-poky/meta/recipes-support/popt/popt/disable_tests.patch
diff --git a/meta/recipes-support/popt/popt/pkgconfig_fix.patch b/yocto-poky/meta/recipes-support/popt/popt/pkgconfig_fix.patch
index 0bddbf8c9..0bddbf8c9 100644
--- a/meta/recipes-support/popt/popt/pkgconfig_fix.patch
+++ b/yocto-poky/meta/recipes-support/popt/popt/pkgconfig_fix.patch
diff --git a/meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch b/yocto-poky/meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch
index 91bca96a5..91bca96a5 100644
--- a/meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch
+++ b/yocto-poky/meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch
diff --git a/meta/recipes-support/popt/popt_1.16.bb b/yocto-poky/meta/recipes-support/popt/popt_1.16.bb
index cb13a815e..cb13a815e 100644
--- a/meta/recipes-support/popt/popt_1.16.bb
+++ b/yocto-poky/meta/recipes-support/popt/popt_1.16.bb
diff --git a/meta/recipes-support/ptest-runner/files/ptest-runner b/yocto-poky/meta/recipes-support/ptest-runner/files/ptest-runner
index c618f1148..c618f1148 100644
--- a/meta/recipes-support/ptest-runner/files/ptest-runner
+++ b/yocto-poky/meta/recipes-support/ptest-runner/files/ptest-runner
diff --git a/meta/recipes-support/ptest-runner/ptest-runner_1.0.bb b/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_1.0.bb
index bc1b0a4d4..bc1b0a4d4 100644
--- a/meta/recipes-support/ptest-runner/ptest-runner_1.0.bb
+++ b/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_1.0.bb
diff --git a/meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch b/yocto-poky/meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch
index 67a28ab77..67a28ab77 100644
--- a/meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch
+++ b/yocto-poky/meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch
diff --git a/meta/recipes-support/pth/files/pth-fix-parallel.patch b/yocto-poky/meta/recipes-support/pth/files/pth-fix-parallel.patch
index 08edaff15..08edaff15 100644
--- a/meta/recipes-support/pth/files/pth-fix-parallel.patch
+++ b/yocto-poky/meta/recipes-support/pth/files/pth-fix-parallel.patch
diff --git a/meta/recipes-support/pth/pth_2.0.7.bb b/yocto-poky/meta/recipes-support/pth/pth_2.0.7.bb
index 9037769b7..9037769b7 100644
--- a/meta/recipes-support/pth/pth_2.0.7.bb
+++ b/yocto-poky/meta/recipes-support/pth/pth_2.0.7.bb
diff --git a/meta/recipes-support/serf/serf/env.patch b/yocto-poky/meta/recipes-support/serf/serf/env.patch
index 9d073e9ab..9d073e9ab 100644
--- a/meta/recipes-support/serf/serf/env.patch
+++ b/yocto-poky/meta/recipes-support/serf/serf/env.patch
diff --git a/meta/recipes-support/serf/serf/norpath.patch b/yocto-poky/meta/recipes-support/serf/serf/norpath.patch
index 380f5d00d..380f5d00d 100644
--- a/meta/recipes-support/serf/serf/norpath.patch
+++ b/yocto-poky/meta/recipes-support/serf/serf/norpath.patch
diff --git a/meta/recipes-support/serf/serf_1.3.8.bb b/yocto-poky/meta/recipes-support/serf/serf_1.3.8.bb
index b5059d546..b5059d546 100644
--- a/meta/recipes-support/serf/serf_1.3.8.bb
+++ b/yocto-poky/meta/recipes-support/serf/serf_1.3.8.bb
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info.inc
index 6eedb6d3f..6eedb6d3f 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info.inc
+++ b/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info.inc
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
index 3c9f1ea43..3c9f1ea43 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
+++ b/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
index 84c4d0373..84c4d0373 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
+++ b/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_1.4.bb b/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.4.bb
index 8c4fde806..8c4fde806 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_1.4.bb
+++ b/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.4.bb
diff --git a/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch b/yocto-poky/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
index e3bfd5f65..e3bfd5f65 100644
--- a/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
+++ b/yocto-poky/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/yocto-poky/meta/recipes-support/sqlite/sqlite3.inc
index 2e3791bfc..2e3791bfc 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/yocto-poky/meta/recipes-support/sqlite/sqlite3.inc
diff --git a/meta/recipes-support/sqlite/sqlite3_3.8.10.2.bb b/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.8.10.2.bb
index c72ad50f6..c72ad50f6 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.8.10.2.bb
+++ b/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.8.10.2.bb
diff --git a/meta/recipes-support/taglib/taglib_1.9.1.bb b/yocto-poky/meta/recipes-support/taglib/taglib_1.9.1.bb
index 1f278144e..1f278144e 100644
--- a/meta/recipes-support/taglib/taglib_1.9.1.bb
+++ b/yocto-poky/meta/recipes-support/taglib/taglib_1.9.1.bb
diff --git a/meta/recipes-support/user-creation/files/system-xuser.conf b/yocto-poky/meta/recipes-support/user-creation/files/system-xuser.conf
index d42e3d1f5..d42e3d1f5 100644
--- a/meta/recipes-support/user-creation/files/system-xuser.conf
+++ b/yocto-poky/meta/recipes-support/user-creation/files/system-xuser.conf
diff --git a/meta/recipes-support/user-creation/xuser-account_0.1.bb b/yocto-poky/meta/recipes-support/user-creation/xuser-account_0.1.bb
index 13ba67733..13ba67733 100644
--- a/meta/recipes-support/user-creation/xuser-account_0.1.bb
+++ b/yocto-poky/meta/recipes-support/user-creation/xuser-account_0.1.bb
diff --git a/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch b/yocto-poky/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
index 240777180..240777180 100644
--- a/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
+++ b/yocto-poky/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
diff --git a/meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch b/yocto-poky/meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch
index 6763d3754..6763d3754 100644
--- a/meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch
+++ b/yocto-poky/meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch
diff --git a/meta/recipes-support/vte/vte.inc b/yocto-poky/meta/recipes-support/vte/vte.inc
index 07b9e10dc..07b9e10dc 100644
--- a/meta/recipes-support/vte/vte.inc
+++ b/yocto-poky/meta/recipes-support/vte/vte.inc
diff --git a/meta/recipes-support/vte/vte_0.28.2.bb b/yocto-poky/meta/recipes-support/vte/vte_0.28.2.bb
index 8b4e7f71d..8b4e7f71d 100644
--- a/meta/recipes-support/vte/vte_0.28.2.bb
+++ b/yocto-poky/meta/recipes-support/vte/vte_0.28.2.bb
diff --git a/meta/recipes.txt b/yocto-poky/meta/recipes.txt
index 705386d11..705386d11 100644
--- a/meta/recipes.txt
+++ b/yocto-poky/meta/recipes.txt
diff --git a/meta/site/arm-32 b/yocto-poky/meta/site/arm-32
index 81fd8d310..81fd8d310 100644
--- a/meta/site/arm-32
+++ b/yocto-poky/meta/site/arm-32
diff --git a/meta/site/arm-64 b/yocto-poky/meta/site/arm-64
index 90c09b2d5..90c09b2d5 100644
--- a/meta/site/arm-64
+++ b/yocto-poky/meta/site/arm-64
diff --git a/meta/site/arm-common b/yocto-poky/meta/site/arm-common
index 12e5d4592..12e5d4592 100644
--- a/meta/site/arm-common
+++ b/yocto-poky/meta/site/arm-common
diff --git a/meta/site/arm-darwin b/yocto-poky/meta/site/arm-darwin
index 09ff097aa..09ff097aa 100644
--- a/meta/site/arm-darwin
+++ b/yocto-poky/meta/site/arm-darwin
diff --git a/meta/site/arm-darwin8 b/yocto-poky/meta/site/arm-darwin8
index 09ff097aa..09ff097aa 100644
--- a/meta/site/arm-darwin8
+++ b/yocto-poky/meta/site/arm-darwin8
diff --git a/meta/site/arm-linux b/yocto-poky/meta/site/arm-linux
index 14b1889e7..14b1889e7 100644
--- a/meta/site/arm-linux
+++ b/yocto-poky/meta/site/arm-linux
diff --git a/meta/site/arm-linux-uclibc b/yocto-poky/meta/site/arm-linux-uclibc
index 6ae7c6e09..6ae7c6e09 100644
--- a/meta/site/arm-linux-uclibc
+++ b/yocto-poky/meta/site/arm-linux-uclibc
diff --git a/meta/site/armeb-linux b/yocto-poky/meta/site/armeb-linux
index 6521ff584..6521ff584 100644
--- a/meta/site/armeb-linux
+++ b/yocto-poky/meta/site/armeb-linux
diff --git a/meta/site/armeb-linux-uclibc b/yocto-poky/meta/site/armeb-linux-uclibc
index 731e857dc..731e857dc 100644
--- a/meta/site/armeb-linux-uclibc
+++ b/yocto-poky/meta/site/armeb-linux-uclibc
diff --git a/meta/site/common b/yocto-poky/meta/site/common
index 5ccc14f8c..5ccc14f8c 100644
--- a/meta/site/common
+++ b/yocto-poky/meta/site/common
diff --git a/meta/site/common-darwin b/yocto-poky/meta/site/common-darwin
index 7d2d89874..7d2d89874 100644
--- a/meta/site/common-darwin
+++ b/yocto-poky/meta/site/common-darwin
diff --git a/meta/site/common-glibc b/yocto-poky/meta/site/common-glibc
index 1443f8e52..1443f8e52 100644
--- a/meta/site/common-glibc
+++ b/yocto-poky/meta/site/common-glibc
diff --git a/meta/site/common-linux b/yocto-poky/meta/site/common-linux
index 8b5be68be..8b5be68be 100644
--- a/meta/site/common-linux
+++ b/yocto-poky/meta/site/common-linux
diff --git a/meta/site/common-mingw b/yocto-poky/meta/site/common-mingw
index f337c36e7..f337c36e7 100644
--- a/meta/site/common-mingw
+++ b/yocto-poky/meta/site/common-mingw
diff --git a/meta/site/common-musl b/yocto-poky/meta/site/common-musl
index 26fc10331..26fc10331 100644
--- a/meta/site/common-musl
+++ b/yocto-poky/meta/site/common-musl
diff --git a/meta/site/common-uclibc b/yocto-poky/meta/site/common-uclibc
index 26fc10331..26fc10331 100644
--- a/meta/site/common-uclibc
+++ b/yocto-poky/meta/site/common-uclibc
diff --git a/meta/site/endian-big b/yocto-poky/meta/site/endian-big
index b99e96c20..b99e96c20 100644
--- a/meta/site/endian-big
+++ b/yocto-poky/meta/site/endian-big
diff --git a/meta/site/endian-little b/yocto-poky/meta/site/endian-little
index 858db76b3..858db76b3 100644
--- a/meta/site/endian-little
+++ b/yocto-poky/meta/site/endian-little
diff --git a/meta/site/ix86-common b/yocto-poky/meta/site/ix86-common
index 5cd2ce262..5cd2ce262 100644
--- a/meta/site/ix86-common
+++ b/yocto-poky/meta/site/ix86-common
diff --git a/meta/site/mips-common b/yocto-poky/meta/site/mips-common
index 89d72cba4..89d72cba4 100644
--- a/meta/site/mips-common
+++ b/yocto-poky/meta/site/mips-common
diff --git a/meta/site/mips-linux b/yocto-poky/meta/site/mips-linux
index 72a54f95e..72a54f95e 100644
--- a/meta/site/mips-linux
+++ b/yocto-poky/meta/site/mips-linux
diff --git a/meta/site/mips-linux-uclibc b/yocto-poky/meta/site/mips-linux-uclibc
index b23363e15..b23363e15 100644
--- a/meta/site/mips-linux-uclibc
+++ b/yocto-poky/meta/site/mips-linux-uclibc
diff --git a/meta/site/mips64-linux b/yocto-poky/meta/site/mips64-linux
index ed0fbbe65..ed0fbbe65 100644
--- a/meta/site/mips64-linux
+++ b/yocto-poky/meta/site/mips64-linux
diff --git a/meta/site/mips64-linux-uclibc b/yocto-poky/meta/site/mips64-linux-uclibc
index cbba5525f..cbba5525f 100644
--- a/meta/site/mips64-linux-uclibc
+++ b/yocto-poky/meta/site/mips64-linux-uclibc
diff --git a/meta/site/mips64el-linux b/yocto-poky/meta/site/mips64el-linux
index 8b61eb0f3..8b61eb0f3 100644
--- a/meta/site/mips64el-linux
+++ b/yocto-poky/meta/site/mips64el-linux
diff --git a/meta/site/mips64el-linux-uclibc b/yocto-poky/meta/site/mips64el-linux-uclibc
index 6a0499d10..6a0499d10 100644
--- a/meta/site/mips64el-linux-uclibc
+++ b/yocto-poky/meta/site/mips64el-linux-uclibc
diff --git a/meta/site/mipsel-linux b/yocto-poky/meta/site/mipsel-linux
index 696b1beeb..696b1beeb 100644
--- a/meta/site/mipsel-linux
+++ b/yocto-poky/meta/site/mipsel-linux
diff --git a/meta/site/mipsel-linux-uclibc b/yocto-poky/meta/site/mipsel-linux-uclibc
index f921cda4a..f921cda4a 100644
--- a/meta/site/mipsel-linux-uclibc
+++ b/yocto-poky/meta/site/mipsel-linux-uclibc
diff --git a/meta/site/native b/yocto-poky/meta/site/native
index 7dfb1cbee..7dfb1cbee 100644
--- a/meta/site/native
+++ b/yocto-poky/meta/site/native
diff --git a/meta/site/nios2-linux b/yocto-poky/meta/site/nios2-linux
index 9e53e5db2..9e53e5db2 100644
--- a/meta/site/nios2-linux
+++ b/yocto-poky/meta/site/nios2-linux
diff --git a/meta/site/powerpc-common b/yocto-poky/meta/site/powerpc-common
index efa299c66..efa299c66 100644
--- a/meta/site/powerpc-common
+++ b/yocto-poky/meta/site/powerpc-common
diff --git a/meta/site/powerpc-darwin b/yocto-poky/meta/site/powerpc-darwin
index 085f50b03..085f50b03 100644
--- a/meta/site/powerpc-darwin
+++ b/yocto-poky/meta/site/powerpc-darwin
diff --git a/meta/site/powerpc-linux b/yocto-poky/meta/site/powerpc-linux
index a9f89cb5d..a9f89cb5d 100644
--- a/meta/site/powerpc-linux
+++ b/yocto-poky/meta/site/powerpc-linux
diff --git a/meta/site/powerpc32-linux b/yocto-poky/meta/site/powerpc32-linux
index e3929ac67..e3929ac67 100644
--- a/meta/site/powerpc32-linux
+++ b/yocto-poky/meta/site/powerpc32-linux
diff --git a/meta/site/powerpc64-linux b/yocto-poky/meta/site/powerpc64-linux
index d64e230af..d64e230af 100644
--- a/meta/site/powerpc64-linux
+++ b/yocto-poky/meta/site/powerpc64-linux
diff --git a/meta/site/sh-common b/yocto-poky/meta/site/sh-common
index bde416a2c..bde416a2c 100644
--- a/meta/site/sh-common
+++ b/yocto-poky/meta/site/sh-common
diff --git a/meta/site/sparc-linux b/yocto-poky/meta/site/sparc-linux
index 49d0d9a3d..49d0d9a3d 100644
--- a/meta/site/sparc-linux
+++ b/yocto-poky/meta/site/sparc-linux
diff --git a/meta/site/x32-linux b/yocto-poky/meta/site/x32-linux
index 36ee68b3d..36ee68b3d 100644
--- a/meta/site/x32-linux
+++ b/yocto-poky/meta/site/x32-linux
diff --git a/meta/site/x86_64-linux b/yocto-poky/meta/site/x86_64-linux
index 573a9070e..573a9070e 100644
--- a/meta/site/x86_64-linux
+++ b/yocto-poky/meta/site/x86_64-linux
diff --git a/meta/site/x86_64-linux-uclibc b/yocto-poky/meta/site/x86_64-linux-uclibc
index 2d269f78f..2d269f78f 100644
--- a/meta/site/x86_64-linux-uclibc
+++ b/yocto-poky/meta/site/x86_64-linux-uclibc
diff --git a/yocto-poky/oe-init-build-env b/yocto-poky/oe-init-build-env
new file mode 100755
index 000000000..6fee5f72a
--- /dev/null
+++ b/yocto-poky/oe-init-build-env
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+# OE Build Environment Setup Script
+#
+# Copyright (C) 2006-2011 Linux Foundation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+#
+# Normally this is called as '. ./oe-init-build-env builddir'
+#
+# This works in most shells (not dash), but not all of them pass arg1 when
+# being sourced.   To workaround the shell limitation use "set arg1" prior 
+# to sourcing this script.
+#
+if [ -n "$BASH_SOURCE" ]; then
+   OEROOT="`dirname $BASH_SOURCE`"
+elif [ -n "$ZSH_NAME" ]; then
+   OEROOT="`dirname $0`"
+else
+   OEROOT="`pwd`"
+fi
+if [ -n "$BBSERVER" ]; then
+   unset BBSERVER
+fi
+THIS_SCRIPT=$OEROOT/oe-init-build-env
+
+if [ -z "$ZSH_NAME" ] && [ "$0" = "$THIS_SCRIPT" ]; then
+   echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'"
+   exit 1
+fi
+
+OEROOT=`readlink -f "$OEROOT"`
+export OEROOT
+. $OEROOT/scripts/oe-buildenv-internal && \
+     $OEROOT/scripts/oe-setup-builddir && \
+     [ -n "$BUILDDIR" ] && cd "$BUILDDIR"
+unset OEROOT
+unset BBPATH
+unset THIS_SCRIPT
+
+# Shutdown any bitbake server if the BBSERVER variable is not set
+if [ -z "$BBSERVER" ] && [ -f bitbake.lock ] ; then
+    grep ":" bitbake.lock > /dev/null && BBSERVER=`cat bitbake.lock` bitbake --status-only
+    if [ $? = 0 ] ; then
+	echo "Shutting down bitbake memory resident server with bitbake -m"
+	BBSERVER=`cat bitbake.lock` bitbake -m
+    fi
+fi
+
diff --git a/yocto-poky/oe-init-build-env-memres b/yocto-poky/oe-init-build-env-memres
new file mode 100755
index 000000000..c1dc4fe3e
--- /dev/null
+++ b/yocto-poky/oe-init-build-env-memres
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# OE Build Environment Setup Script
+#
+# Copyright (C) 2006-2011 Linux Foundation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+#
+# Normally this is called as '. ./oe-init-build-env builddir <portnumber> <builddir>'
+#
+# This works in most shells (not dash), but not all of them pass arg1 when
+# being sourced.   To workaround the shell limitation use "set arg1" prior 
+# to sourcing this script.
+#
+if [ -z "$1" ]; then
+    echo "No port specified, using dynamically selected port"
+    port=-1
+else
+    port=$1
+    shift
+fi
+
+if [ -n "$BASH_SOURCE" ]; then
+  OEROOT="`dirname $BASH_SOURCE`"
+elif [ -n "$ZSH_NAME" ]; then
+  OEROOT="`dirname $0`"
+else
+  OEROOT="`pwd`"
+fi
+if [ -n "$BBSERVER" ]; then
+  unset BBSERVER
+fi
+
+THIS_SCRIPT=$OEROOT/oe-init-build-env-memres
+if [ -z "$ZSH_NAME" ] && [ "x$0" = "x$THIS_SCRIPT" ]; then
+   echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'"
+   exit 1
+fi
+
+OEROOT=`readlink -f "$OEROOT"`
+export OEROOT
+. $OEROOT/scripts/oe-buildenv-internal && \
+    $OEROOT/scripts/oe-setup-builddir && \
+    [ -n "$BUILDDIR" ] && cd $BUILDDIR
+unset OEROOT
+unset BBPATH
+unset THIS_SCRIPT
+
+res=1
+if [ -e bitbake.lock ] && grep : bitbake.lock > /dev/null ; then
+    BBSERVER=`cat bitbake.lock` bitbake --status-only
+    res=$?
+fi
+
+if [ $res != 0 ] ; then
+    bitbake --server-only -t xmlrpc -B localhost:$port
+fi
+
+if [ $port = -1 ] ; then
+    export BBSERVER=localhost:-1
+    echo "Bitbake server started on demand as needed, use bitbake -m to shut it down"
+else
+    export BBSERVER=`cat bitbake.lock`
+
+    if [ $res = 0 ] ; then
+	echo "Using existing bitbake server at: $BBSERVER, use bitbake -m to shut it down"
+    else
+	echo "Bitbake server started at: $BBSERVER, use bitbake -m to shut it down"
+    fi
+    unset res
+fi
diff --git a/scripts/README b/yocto-poky/scripts/README
index 1b8d12724..1b8d12724 100644
--- a/scripts/README
+++ b/yocto-poky/scripts/README
diff --git a/scripts/bitbake-prserv-tool b/yocto-poky/scripts/bitbake-prserv-tool
index 28c2416bf..28c2416bf 100755
--- a/scripts/bitbake-prserv-tool
+++ b/yocto-poky/scripts/bitbake-prserv-tool
diff --git a/scripts/bitbake-whatchanged b/yocto-poky/scripts/bitbake-whatchanged
index 55cfe4b23..55cfe4b23 100755
--- a/scripts/bitbake-whatchanged
+++ b/yocto-poky/scripts/bitbake-whatchanged
diff --git a/scripts/buildhistory-collect-srcrevs b/yocto-poky/scripts/buildhistory-collect-srcrevs
index 58a270803..58a270803 100755
--- a/scripts/buildhistory-collect-srcrevs
+++ b/yocto-poky/scripts/buildhistory-collect-srcrevs
diff --git a/scripts/buildhistory-diff b/yocto-poky/scripts/buildhistory-diff
index dfebcddf7..dfebcddf7 100755
--- a/scripts/buildhistory-diff
+++ b/yocto-poky/scripts/buildhistory-diff
diff --git a/scripts/cleanup-workdir b/yocto-poky/scripts/cleanup-workdir
index a7f5a3a66..a7f5a3a66 100755
--- a/scripts/cleanup-workdir
+++ b/yocto-poky/scripts/cleanup-workdir
diff --git a/scripts/combo-layer b/yocto-poky/scripts/combo-layer
index 7435a176b..7435a176b 100755
--- a/scripts/combo-layer
+++ b/yocto-poky/scripts/combo-layer
diff --git a/scripts/combo-layer-hook-default.sh b/yocto-poky/scripts/combo-layer-hook-default.sh
index 1e3a3b9bc..1e3a3b9bc 100755
--- a/scripts/combo-layer-hook-default.sh
+++ b/yocto-poky/scripts/combo-layer-hook-default.sh
diff --git a/scripts/combo-layer.conf.example b/yocto-poky/scripts/combo-layer.conf.example
index 90e2b5872..90e2b5872 100644
--- a/scripts/combo-layer.conf.example
+++ b/yocto-poky/scripts/combo-layer.conf.example
diff --git a/scripts/contrib/bb-perf/bb-matrix-plot.sh b/yocto-poky/scripts/contrib/bb-perf/bb-matrix-plot.sh
index 136a25570..136a25570 100755
--- a/scripts/contrib/bb-perf/bb-matrix-plot.sh
+++ b/yocto-poky/scripts/contrib/bb-perf/bb-matrix-plot.sh
diff --git a/scripts/contrib/bb-perf/bb-matrix.sh b/yocto-poky/scripts/contrib/bb-perf/bb-matrix.sh
index 106456584..106456584 100755
--- a/scripts/contrib/bb-perf/bb-matrix.sh
+++ b/yocto-poky/scripts/contrib/bb-perf/bb-matrix.sh
diff --git a/scripts/contrib/bb-perf/buildstats.sh b/yocto-poky/scripts/contrib/bb-perf/buildstats.sh
index 96158a965..96158a965 100755
--- a/scripts/contrib/bb-perf/buildstats.sh
+++ b/yocto-poky/scripts/contrib/bb-perf/buildstats.sh
diff --git a/scripts/contrib/bbvars.py b/yocto-poky/scripts/contrib/bbvars.py
index 0896d6444..0896d6444 100755
--- a/scripts/contrib/bbvars.py
+++ b/yocto-poky/scripts/contrib/bbvars.py
diff --git a/scripts/contrib/build-perf-test.sh b/yocto-poky/scripts/contrib/build-perf-test.sh
index cdd7885dc..cdd7885dc 100755
--- a/scripts/contrib/build-perf-test.sh
+++ b/yocto-poky/scripts/contrib/build-perf-test.sh
diff --git a/scripts/contrib/ddimage b/yocto-poky/scripts/contrib/ddimage
index a503f11d0..a503f11d0 100755
--- a/scripts/contrib/ddimage
+++ b/yocto-poky/scripts/contrib/ddimage
diff --git a/scripts/contrib/devtool-stress.py b/yocto-poky/scripts/contrib/devtool-stress.py
index 4b35fc9d0..4b35fc9d0 100755
--- a/scripts/contrib/devtool-stress.py
+++ b/yocto-poky/scripts/contrib/devtool-stress.py
diff --git a/scripts/contrib/dialog-power-control b/yocto-poky/scripts/contrib/dialog-power-control
index 7550ea53b..7550ea53b 100755
--- a/scripts/contrib/dialog-power-control
+++ b/yocto-poky/scripts/contrib/dialog-power-control
diff --git a/scripts/contrib/documentation-audit.sh b/yocto-poky/scripts/contrib/documentation-audit.sh
index 2144aac93..2144aac93 100755
--- a/scripts/contrib/documentation-audit.sh
+++ b/yocto-poky/scripts/contrib/documentation-audit.sh
diff --git a/scripts/contrib/graph-tool b/yocto-poky/scripts/contrib/graph-tool
index 6dc7d337f..6dc7d337f 100755
--- a/scripts/contrib/graph-tool
+++ b/yocto-poky/scripts/contrib/graph-tool
diff --git a/scripts/contrib/list-packageconfig-flags.py b/yocto-poky/scripts/contrib/list-packageconfig-flags.py
index 2f3b8b06a..2f3b8b06a 100755
--- a/scripts/contrib/list-packageconfig-flags.py
+++ b/yocto-poky/scripts/contrib/list-packageconfig-flags.py
diff --git a/scripts/contrib/mkefidisk.sh b/yocto-poky/scripts/contrib/mkefidisk.sh
index cd4de0533..cd4de0533 100755
--- a/scripts/contrib/mkefidisk.sh
+++ b/yocto-poky/scripts/contrib/mkefidisk.sh
diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/yocto-poky/scripts/contrib/python/generate-manifest-2.7.py
index 936522efc..936522efc 100755
--- a/scripts/contrib/python/generate-manifest-2.7.py
+++ b/yocto-poky/scripts/contrib/python/generate-manifest-2.7.py
diff --git a/scripts/contrib/python/generate-manifest-3.4.py b/yocto-poky/scripts/contrib/python/generate-manifest-3.4.py
index ca2fa6117..ca2fa6117 100755
--- a/scripts/contrib/python/generate-manifest-3.4.py
+++ b/yocto-poky/scripts/contrib/python/generate-manifest-3.4.py
diff --git a/scripts/contrib/serdevtry b/yocto-poky/scripts/contrib/serdevtry
index 74bd7b716..74bd7b716 100755
--- a/scripts/contrib/serdevtry
+++ b/yocto-poky/scripts/contrib/serdevtry
diff --git a/scripts/contrib/test_build_time.sh b/yocto-poky/scripts/contrib/test_build_time.sh
index 9e5725ae5..9e5725ae5 100755
--- a/scripts/contrib/test_build_time.sh
+++ b/yocto-poky/scripts/contrib/test_build_time.sh
diff --git a/scripts/contrib/test_build_time_worker.sh b/yocto-poky/scripts/contrib/test_build_time_worker.sh
index 8e20a9ea7..8e20a9ea7 100755
--- a/scripts/contrib/test_build_time_worker.sh
+++ b/yocto-poky/scripts/contrib/test_build_time_worker.sh
diff --git a/scripts/contrib/verify-homepage.py b/yocto-poky/scripts/contrib/verify-homepage.py
index 86cc82bca..86cc82bca 100755
--- a/scripts/contrib/verify-homepage.py
+++ b/yocto-poky/scripts/contrib/verify-homepage.py
diff --git a/scripts/cp-noerror b/yocto-poky/scripts/cp-noerror
index 28eb90d4a..28eb90d4a 100755
--- a/scripts/cp-noerror
+++ b/yocto-poky/scripts/cp-noerror
diff --git a/scripts/create-pull-request b/yocto-poky/scripts/create-pull-request
index 19ba58869..19ba58869 100755
--- a/scripts/create-pull-request
+++ b/yocto-poky/scripts/create-pull-request
diff --git a/scripts/crosstap b/yocto-poky/scripts/crosstap
index 58317cf91..58317cf91 100755
--- a/scripts/crosstap
+++ b/yocto-poky/scripts/crosstap
diff --git a/scripts/devtool b/yocto-poky/scripts/devtool
index e4d9db301..e4d9db301 100755
--- a/scripts/devtool
+++ b/yocto-poky/scripts/devtool
diff --git a/scripts/gen-lockedsig-cache b/yocto-poky/scripts/gen-lockedsig-cache
index 6aa361400..6aa361400 100755
--- a/scripts/gen-lockedsig-cache
+++ b/yocto-poky/scripts/gen-lockedsig-cache
diff --git a/scripts/gen-site-config b/yocto-poky/scripts/gen-site-config
index 7da7a0bd8..7da7a0bd8 100755
--- a/scripts/gen-site-config
+++ b/yocto-poky/scripts/gen-site-config
diff --git a/scripts/hob b/yocto-poky/scripts/hob
index 8d33ab178..8d33ab178 100755
--- a/scripts/hob
+++ b/yocto-poky/scripts/hob
diff --git a/scripts/lib/bsp/__init__.py b/yocto-poky/scripts/lib/bsp/__init__.py
index 8bbb6e153..8bbb6e153 100644
--- a/scripts/lib/bsp/__init__.py
+++ b/yocto-poky/scripts/lib/bsp/__init__.py
diff --git a/scripts/lib/bsp/engine.py b/yocto-poky/scripts/lib/bsp/engine.py
index d0d5d726a..d0d5d726a 100644
--- a/scripts/lib/bsp/engine.py
+++ b/yocto-poky/scripts/lib/bsp/engine.py
diff --git a/scripts/lib/bsp/help.py b/yocto-poky/scripts/lib/bsp/help.py
index 4cce100d1..4cce100d1 100644
--- a/scripts/lib/bsp/help.py
+++ b/yocto-poky/scripts/lib/bsp/help.py
diff --git a/scripts/lib/bsp/kernel.py b/yocto-poky/scripts/lib/bsp/kernel.py
index ba68b60fc..ba68b60fc 100644
--- a/scripts/lib/bsp/kernel.py
+++ b/yocto-poky/scripts/lib/bsp/kernel.py
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/.gitignore b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/.gitignore
index e69de29bb..e69de29bb 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/.gitignore
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/.gitignore
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/machine.conf b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/machine.conf
index 588367a05..588367a05 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/machine.conf
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/machine.conf
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/xserver-xf86-config/machine.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/xserver-xf86-config/machine.noinstall
index b442d02d5..b442d02d5 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/xserver-xf86-config/machine.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/xserver-xf86-config/machine.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/xserver-xf86-config/machine/xorg.conf b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/xserver-xf86-config/machine/xorg.conf
index bc52893e2..bc52893e2 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/xserver-xf86-config/machine/xorg.conf
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/xserver-xf86-config/machine/xorg.conf
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 30830031e..30830031e 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files.noinstall
index 1e0d92c55..1e0d92c55 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-non_hardware.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-non_hardware.cfg
index 9bfc90c6f..9bfc90c6f 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-non_hardware.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-non_hardware.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-preempt-rt.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-preempt-rt.scc
index ea6966ca4..ea6966ca4 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-preempt-rt.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.scc
index 405972d98..405972d98 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-tiny.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-tiny.scc
index 921b7e7e9..921b7e7e9 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-tiny.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-tiny.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-user-config.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-user-config.cfg
index 47489e44e..47489e44e 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-user-config.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-user-config.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-user-features.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-user-features.scc
index 582759e61..582759e61 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-user-features.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-user-features.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-user-patches.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-user-patches.scc
index 97f747fa0..97f747fa0 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-user-patches.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.cfg
index a2e1ae0f7..a2e1ae0f7 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.scc
index 828400df4..828400df4 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/kernel-list.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/kernel-list.noinstall
index 7676ca883..7676ca883 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/kernel-list.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/kernel-list.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-dev.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-dev.bbappend
index c336007eb..c336007eb 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-dev.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
index c56e9e56f..c56e9e56f 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
index 15b9b1b92..15b9b1b92 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
index caefcfc26..caefcfc26 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
index 0a47a4e37..0a47a4e37 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 5af490dc5..5af490dc5 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_3.19.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_3.19.bbappend
index c327d16d7..c327d16d7 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_3.19.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_3.19.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.1.bbappend
index 2d3d073f7..2d3d073f7 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.1.bbappend
diff --git a/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/COPYING.MIT b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/COPYING.MIT
new file mode 100644
index 000000000..fb950dc69
--- /dev/null
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/COPYING.MIT
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.
diff --git a/scripts/lib/bsp/substrate/target/arch/common/README b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/README
index 928659f30..928659f30 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/README
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/README
diff --git a/scripts/lib/bsp/substrate/target/arch/common/README.sources b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/README.sources
index 3c4cb7b43..3c4cb7b43 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/README.sources
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/README.sources
diff --git a/scripts/lib/bsp/substrate/target/arch/common/binary/.gitignore b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/binary/.gitignore
index e69de29bb..e69de29bb 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/binary/.gitignore
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/binary/.gitignore
diff --git a/scripts/lib/bsp/substrate/target/arch/common/conf/layer.conf b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/conf/layer.conf
index 5529f4595..5529f4595 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/conf/layer.conf
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/conf/layer.conf
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor/machine.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor/machine.noinstall
index b442d02d5..b442d02d5 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor/machine.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor/machine.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor/machine/machconfig b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor/machine/machconfig
index 3b85d3821..3b85d3821 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor/machine/machconfig
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor/machine/machconfig
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor_0.0.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 6d4804d12..6d4804d12 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor_0.0.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/kernel-list.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/kernel-list.noinstall
index 663dddbb0..663dddbb0 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/kernel-list.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/kernel-list.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb
index fda955b5e..fda955b5e 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.noinstall
index 017d206c2..017d206c2 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/defconfig b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/defconfig
index ceb0ffa30..ceb0ffa30 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/defconfig
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/defconfig
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine-user-config.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine-user-config.cfg
index 922309d5a..922309d5a 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine-user-config.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine-user-config.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine-user-patches.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine-user-patches.scc
index 6d1138f42..6d1138f42 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine-user-patches.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.cfg
index 1ba8201f1..1ba8201f1 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.scc
index 0b6b41337..0b6b41337 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf
index 1739ab3cf..1739ab3cf 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/machine.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/machine.noinstall
index b442d02d5..b442d02d5 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/machine.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/machine.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/machine/xorg.conf b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/machine/xorg.conf
index ac9a0f1bb..ac9a0f1bb 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/machine/xorg.conf
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config/machine/xorg.conf
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 30830031e..30830031e 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files.noinstall
index 1e0d92c55..1e0d92c55 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-preempt-rt.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-preempt-rt.scc
index 7146e235a..7146e235a 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-preempt-rt.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.scc
index 67a54be87..67a54be87 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-tiny.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-tiny.scc
index 91373b3a5..91373b3a5 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-tiny.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-tiny.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-user-config.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-user-config.cfg
index 69efdcc75..69efdcc75 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-user-config.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-user-config.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-user-features.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-user-features.scc
index 85be26de9..85be26de9 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-user-features.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-user-features.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-user-patches.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-user-patches.scc
index 4c59daac4..4c59daac4 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-user-patches.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.cfg
index 3b168b7e3..3b168b7e3 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.scc
index 3d32f111b..3d32f111b 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/kernel-list.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/kernel-list.noinstall
index 7676ca883..7676ca883 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/kernel-list.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/kernel-list.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-dev.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-dev.bbappend
index c336007eb..c336007eb 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-dev.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
index c56e9e56f..c56e9e56f 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
index 15b9b1b92..15b9b1b92 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
index caefcfc26..caefcfc26 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
index 0a47a4e37..0a47a4e37 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 41325ca80..41325ca80 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_3.19.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_3.19.bbappend
index b471742dc..b471742dc 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_3.19.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_3.19.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.1.bbappend
index 761b9c66c..761b9c66c 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.1.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/layer/COPYING.MIT b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/COPYING.MIT
index 89de35479..89de35479 100644
--- a/scripts/lib/bsp/substrate/target/arch/layer/COPYING.MIT
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/COPYING.MIT
diff --git a/scripts/lib/bsp/substrate/target/arch/layer/README b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/README
index 943dfc441..943dfc441 100644
--- a/scripts/lib/bsp/substrate/target/arch/layer/README
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/README
diff --git a/scripts/lib/bsp/substrate/target/arch/layer/conf/layer.conf b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/conf/layer.conf
index bdffe1719..bdffe1719 100644
--- a/scripts/lib/bsp/substrate/target/arch/layer/conf/layer.conf
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/conf/layer.conf
diff --git a/scripts/lib/bsp/substrate/target/arch/layer/layer-questions.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/layer-questions.noinstall
index e2a89c3b5..e2a89c3b5 100644
--- a/scripts/lib/bsp/substrate/target/arch/layer/layer-questions.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/layer-questions.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example-bbappend.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example-bbappend.noinstall
index 3594e6583..3594e6583 100644
--- a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example-bbappend.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example-bbappend.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example-bbappend/example-bbappend/example-bbappend-version.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example-bbappend/example-bbappend/example-bbappend-version.bbappend
index 353133080..353133080 100644
--- a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example-bbappend/example-bbappend/example-bbappend-version.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example-bbappend/example-bbappend/example-bbappend-version.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example-bbappend/example-bbappend/example-bbappend-version.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example-bbappend/example-bbappend/example-bbappend-version.noinstall
index 46df8a8e0..46df8a8e0 100644
--- a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example-bbappend/example-bbappend/example-bbappend-version.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example-bbappend/example-bbappend/example-bbappend-version.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example-bbappend/example-bbappend/example-bbappend-version/example.patch b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example-bbappend/example-bbappend/example-bbappend-version/example.patch
index 2000a34da..2000a34da 100644
--- a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example-bbappend/example-bbappend/example-bbappend-version/example.patch
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example-bbappend/example-bbappend/example-bbappend-version/example.patch
diff --git a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example.noinstall
index b0069b1a5..b0069b1a5 100644
--- a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example/example/example-recipe-0.1.bb b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example/example/example-recipe-0.1.bb
index 5fbf59443..5fbf59443 100644
--- a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example/example/example-recipe-0.1.bb
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example/example/example-recipe-0.1.bb
diff --git a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example/example/example-recipe-0.1.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example/example/example-recipe-0.1.noinstall
index c319c19c5..c319c19c5 100644
--- a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example/example/example-recipe-0.1.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example/example/example-recipe-0.1.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example/example/example-recipe-0.1/example.patch b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example/example/example-recipe-0.1/example.patch
index 2000a34da..2000a34da 100644
--- a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example/example/example-recipe-0.1/example.patch
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example/example/example-recipe-0.1/example.patch
diff --git a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example/example/example-recipe-0.1/helloworld.c b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example/example/example-recipe-0.1/helloworld.c
index 71f2e46b4..71f2e46b4 100644
--- a/scripts/lib/bsp/substrate/target/arch/layer/recipes-example/example/example-recipe-0.1/helloworld.c
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/layer/recipes-example/example/example-recipe-0.1/helloworld.c
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/.gitignore b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/.gitignore
index e69de29bb..e69de29bb 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/.gitignore
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/.gitignore
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/machine.conf b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/machine.conf
index b319d626f..b319d626f 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/machine.conf
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/machine.conf
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files.noinstall
index 1e0d92c55..1e0d92c55 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-preempt-rt.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-preempt-rt.scc
index a128255b3..a128255b3 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-preempt-rt.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-standard.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-standard.scc
index 7c9dc52d2..7c9dc52d2 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-standard.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-standard.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-tiny.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-tiny.scc
index 64f395bbc..64f395bbc 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-tiny.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-tiny.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-user-config.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-user-config.cfg
index 47489e44e..47489e44e 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-user-config.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-user-config.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-user-features.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-user-features.scc
index 85be26de9..85be26de9 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-user-features.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-user-features.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-user-patches.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-user-patches.scc
index 97f747fa0..97f747fa0 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-user-patches.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.cfg
index 2fe476691..2fe476691 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.scc
index f39dc3edf..f39dc3edf 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/kernel-list.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/kernel-list.noinstall
index 7676ca883..7676ca883 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/kernel-list.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/kernel-list.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-dev.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-dev.bbappend
index c336007eb..c336007eb 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-dev.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
index c56e9e56f..c56e9e56f 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
index 7c6bc7fdf..7c6bc7fdf 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
index 7f203794e..7f203794e 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
index 0a47a4e37..0a47a4e37 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 5af490dc5..5af490dc5 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.19.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.19.bbappend
index c327d16d7..c327d16d7 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.19.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.19.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.1.bbappend
index 1e99a04dc..1e99a04dc 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.1.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/.gitignore b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/.gitignore
index e69de29bb..e69de29bb 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/.gitignore
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/.gitignore
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/conf/machine/machine.conf b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/conf/machine/machine.conf
index 3afc5e093..3afc5e093 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/conf/machine/machine.conf
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/conf/machine/machine.conf
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files.noinstall
index 1e0d92c55..1e0d92c55 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-preempt-rt.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-preempt-rt.scc
index a128255b3..a128255b3 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-preempt-rt.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc
index 7c9dc52d2..7c9dc52d2 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-tiny.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-tiny.scc
index 64f395bbc..64f395bbc 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-tiny.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-tiny.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-user-config.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-user-config.cfg
index 69efdcc75..69efdcc75 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-user-config.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-user-config.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-user-features.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-user-features.scc
index 85be26de9..85be26de9 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-user-features.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-user-features.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-user-patches.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-user-patches.scc
index 4c59daac4..4c59daac4 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-user-patches.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.cfg
index 0cc906bbf..0cc906bbf 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.scc
index f39dc3edf..f39dc3edf 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/kernel-list.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/kernel-list.noinstall
index 7676ca883..7676ca883 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/kernel-list.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/kernel-list.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-dev.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-dev.bbappend
index c336007eb..c336007eb 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-dev.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
index c56e9e56f..c56e9e56f 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
index 7c6bc7fdf..7c6bc7fdf 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
index 7f203794e..7f203794e 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
index 0a47a4e37..0a47a4e37 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 858d5fcaa..858d5fcaa 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_3.19.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_3.19.bbappend
index f08453147..f08453147 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_3.19.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_3.19.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.1.bbappend
index 01a046c75..01a046c75 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.1.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/.gitignore b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/.gitignore
index e69de29bb..e69de29bb 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/.gitignore
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/.gitignore
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/machine.conf b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/machine.conf
index 018146fc0..018146fc0 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/machine.conf
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/machine.conf
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files.noinstall
index 1e0d92c55..1e0d92c55 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-preempt-rt.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-preempt-rt.scc
index 91ccfb830..91ccfb830 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-preempt-rt.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc
index 89b344fea..89b344fea 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-tiny.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-tiny.scc
index 2701fd8b5..2701fd8b5 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-tiny.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-tiny.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-user-config.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-user-config.cfg
index 47489e44e..47489e44e 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-user-config.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-user-config.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-user-features.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-user-features.scc
index 582759e61..582759e61 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-user-features.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-user-features.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-user-patches.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-user-patches.scc
index 97f747fa0..97f747fa0 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-user-patches.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.cfg
index 5bfe1fe4b..5bfe1fe4b 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.scc
index 7aac8b080..7aac8b080 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/kernel-list.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/kernel-list.noinstall
index 7676ca883..7676ca883 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/kernel-list.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/kernel-list.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-dev.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-dev.bbappend
index c336007eb..c336007eb 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-dev.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
index 4700d9802..4700d9802 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
index 15b9b1b92..15b9b1b92 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
index caefcfc26..caefcfc26 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
index 0a47a4e37..0a47a4e37 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 6f1e7b0a4..6f1e7b0a4 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.19.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.19.bbappend
index 44086af80..44086af80 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.19.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.19.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.1.bbappend
index 1e99a04dc..1e99a04dc 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.1.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/machine.conf b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/machine.conf
index 67e1cbd99..67e1cbd99 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/machine.conf
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/machine.conf
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-core/init-ifupdown/init-ifupdown/machine.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-core/init-ifupdown/init-ifupdown/machine.noinstall
index b442d02d5..b442d02d5 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-core/init-ifupdown/init-ifupdown/machine.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-core/init-ifupdown/init-ifupdown/machine.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-core/init-ifupdown/init-ifupdown/machine/interfaces b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-core/init-ifupdown/init-ifupdown/machine/interfaces
index 16967763e..16967763e 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-core/init-ifupdown/init-ifupdown/machine/interfaces
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-core/init-ifupdown/init-ifupdown/machine/interfaces
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
index 72d991c7e..72d991c7e 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/machine.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/machine.noinstall
index b442d02d5..b442d02d5 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/machine.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/machine.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/machine/xorg.conf b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/machine/xorg.conf
index 3bdde79e6..3bdde79e6 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/machine/xorg.conf
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config/machine/xorg.conf
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 72d991c7e..72d991c7e 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files.noinstall
index 0fb5283a8..0fb5283a8 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-preempt-rt.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-preempt-rt.scc
index a81b858c0..a81b858c0 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-preempt-rt.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc
index 14554da28..14554da28 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-tiny.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-tiny.scc
index 41d4c6f40..41d4c6f40 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-tiny.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-tiny.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-user-config.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-user-config.cfg
index 69efdcc75..69efdcc75 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-user-config.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-user-config.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-user-features.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-user-features.scc
index 582759e61..582759e61 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-user-features.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-user-features.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-user-patches.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-user-patches.scc
index 4c59daac4..4c59daac4 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-user-patches.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine.cfg
index d560784b5..d560784b5 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine.scc
index 8301e05f7..8301e05f7 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/kernel-list.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/kernel-list.noinstall
index 7676ca883..7676ca883 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/kernel-list.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/kernel-list.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-dev.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-dev.bbappend
index 355528595..355528595 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-dev.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
index 9e5aa976c..9e5aa976c 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
index 1faac4443..1faac4443 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
index 51fc7d0aa..51fc7d0aa 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
index 14ee16f32..14ee16f32 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_3.14.bbappend
index fbaed33b1..fbaed33b1 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_3.19.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_3.19.bbappend
index 7b590ad3d..7b590ad3d 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_3.19.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_3.19.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend
index 82bb970cf..82bb970cf 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/.gitignore b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/.gitignore
index e69de29bb..e69de29bb 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/.gitignore
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/.gitignore
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/machine.conf b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/machine.conf
index e4b825104..e4b825104 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/machine.conf
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/machine.conf
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/xserver-xf86-config/machine.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/xserver-xf86-config/machine.noinstall
index b442d02d5..b442d02d5 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/xserver-xf86-config/machine.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/xserver-xf86-config/machine.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/xserver-xf86-config/machine/xorg.conf b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/xserver-xf86-config/machine/xorg.conf
index ac9a0f1bb..ac9a0f1bb 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/xserver-xf86-config/machine/xorg.conf
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/xserver-xf86-config/machine/xorg.conf
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 30830031e..30830031e 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files.noinstall
index 1e0d92c55..1e0d92c55 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-preempt-rt.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-preempt-rt.scc
index bbeeecd6b..bbeeecd6b 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-preempt-rt.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc
index 9c9cc9025..9c9cc9025 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-tiny.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-tiny.scc
index b53706f8c..b53706f8c 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-tiny.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-tiny.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-user-config.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-user-config.cfg
index 47489e44e..47489e44e 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-user-config.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-user-config.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-user-features.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-user-features.scc
index 582759e61..582759e61 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-user-features.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-user-features.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-user-patches.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-user-patches.scc
index 97f747fa0..97f747fa0 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-user-patches.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.cfg b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.cfg
index 3290ddefe..3290ddefe 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.cfg
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.cfg
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.scc b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.scc
index 9b7c291a8..9b7c291a8 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.scc
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/kernel-list.noinstall b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/kernel-list.noinstall
index dbbe9342f..dbbe9342f 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/kernel-list.noinstall
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/kernel-list.noinstall
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-dev.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-dev.bbappend
index c336007eb..c336007eb 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-dev.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
index 4700d9802..4700d9802 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
index 15b9b1b92..15b9b1b92 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
index caefcfc26..caefcfc26 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
index 0a47a4e37..0a47a4e37 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_3.14.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 62a99d54b..62a99d54b 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_3.14.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_3.19.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_3.19.bbappend
index a5dd37da9..a5dd37da9 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_3.19.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_3.19.bbappend
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.1.bbappend b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.1.bbappend
index 8d0bc9713..8d0bc9713 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.1.bbappend
diff --git a/scripts/lib/bsp/tags.py b/yocto-poky/scripts/lib/bsp/tags.py
index 371942788..371942788 100644
--- a/scripts/lib/bsp/tags.py
+++ b/yocto-poky/scripts/lib/bsp/tags.py
diff --git a/scripts/lib/devtool/__init__.py b/yocto-poky/scripts/lib/devtool/__init__.py
index 50604e6e0..50604e6e0 100644
--- a/scripts/lib/devtool/__init__.py
+++ b/yocto-poky/scripts/lib/devtool/__init__.py
diff --git a/scripts/lib/devtool/build-image.py b/yocto-poky/scripts/lib/devtool/build-image.py
index e53239dd2..e53239dd2 100644
--- a/scripts/lib/devtool/build-image.py
+++ b/yocto-poky/scripts/lib/devtool/build-image.py
diff --git a/scripts/lib/devtool/build.py b/yocto-poky/scripts/lib/devtool/build.py
index 9b58858a6..9b58858a6 100644
--- a/scripts/lib/devtool/build.py
+++ b/yocto-poky/scripts/lib/devtool/build.py
diff --git a/scripts/lib/devtool/deploy.py b/yocto-poky/scripts/lib/devtool/deploy.py
index c90c6b1f7..c90c6b1f7 100644
--- a/scripts/lib/devtool/deploy.py
+++ b/yocto-poky/scripts/lib/devtool/deploy.py
diff --git a/scripts/lib/devtool/package.py b/yocto-poky/scripts/lib/devtool/package.py
index b8d84235c..b8d84235c 100644
--- a/scripts/lib/devtool/package.py
+++ b/yocto-poky/scripts/lib/devtool/package.py
diff --git a/scripts/lib/devtool/runqemu.py b/yocto-poky/scripts/lib/devtool/runqemu.py
index 5282afba6..5282afba6 100644
--- a/scripts/lib/devtool/runqemu.py
+++ b/yocto-poky/scripts/lib/devtool/runqemu.py
diff --git a/scripts/lib/devtool/sdk.py b/yocto-poky/scripts/lib/devtool/sdk.py
index f15a6a9ed..f15a6a9ed 100644
--- a/scripts/lib/devtool/sdk.py
+++ b/yocto-poky/scripts/lib/devtool/sdk.py
diff --git a/scripts/lib/devtool/search.py b/yocto-poky/scripts/lib/devtool/search.py
index c2f420c33..c2f420c33 100644
--- a/scripts/lib/devtool/search.py
+++ b/yocto-poky/scripts/lib/devtool/search.py
diff --git a/scripts/lib/devtool/standard.py b/yocto-poky/scripts/lib/devtool/standard.py
index 5464d7b1f..5464d7b1f 100644
--- a/scripts/lib/devtool/standard.py
+++ b/yocto-poky/scripts/lib/devtool/standard.py
diff --git a/scripts/lib/devtool/upgrade.py b/yocto-poky/scripts/lib/devtool/upgrade.py
index 6bac44bb5..6bac44bb5 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/yocto-poky/scripts/lib/devtool/upgrade.py
diff --git a/scripts/lib/recipetool/__init__.py b/yocto-poky/scripts/lib/recipetool/__init__.py
index e69de29bb..e69de29bb 100644
--- a/scripts/lib/recipetool/__init__.py
+++ b/yocto-poky/scripts/lib/recipetool/__init__.py
diff --git a/scripts/lib/recipetool/append.py b/yocto-poky/scripts/lib/recipetool/append.py
index 7fe411520..7fe411520 100644
--- a/scripts/lib/recipetool/append.py
+++ b/yocto-poky/scripts/lib/recipetool/append.py
diff --git a/scripts/lib/recipetool/create.py b/yocto-poky/scripts/lib/recipetool/create.py
index 8305e4364..8305e4364 100644
--- a/scripts/lib/recipetool/create.py
+++ b/yocto-poky/scripts/lib/recipetool/create.py
diff --git a/scripts/lib/recipetool/create_buildsys.py b/yocto-poky/scripts/lib/recipetool/create_buildsys.py
index 931ef3b33..931ef3b33 100644
--- a/scripts/lib/recipetool/create_buildsys.py
+++ b/yocto-poky/scripts/lib/recipetool/create_buildsys.py
diff --git a/scripts/lib/recipetool/create_buildsys_python.py b/yocto-poky/scripts/lib/recipetool/create_buildsys_python.py
index e0af2a0f5..e0af2a0f5 100644
--- a/scripts/lib/recipetool/create_buildsys_python.py
+++ b/yocto-poky/scripts/lib/recipetool/create_buildsys_python.py
diff --git a/scripts/lib/recipetool/newappend.py b/yocto-poky/scripts/lib/recipetool/newappend.py
index 77b74cb73..77b74cb73 100644
--- a/scripts/lib/recipetool/newappend.py
+++ b/yocto-poky/scripts/lib/recipetool/newappend.py
diff --git a/scripts/lib/scriptpath.py b/yocto-poky/scripts/lib/scriptpath.py
index d00317e18..d00317e18 100644
--- a/scripts/lib/scriptpath.py
+++ b/yocto-poky/scripts/lib/scriptpath.py
diff --git a/scripts/lib/scriptutils.py b/yocto-poky/scripts/lib/scriptutils.py
index e79a195b1..e79a195b1 100644
--- a/scripts/lib/scriptutils.py
+++ b/yocto-poky/scripts/lib/scriptutils.py
diff --git a/scripts/lib/wic/3rdparty/pykickstart/__init__.py b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/__init__.py
index e69de29bb..e69de29bb 100644
--- a/scripts/lib/wic/3rdparty/pykickstart/__init__.py
+++ b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/__init__.py
diff --git a/scripts/lib/wic/3rdparty/pykickstart/base.py b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/base.py
index e6c8f56f9..e6c8f56f9 100644
--- a/scripts/lib/wic/3rdparty/pykickstart/base.py
+++ b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/base.py
diff --git a/scripts/lib/wic/3rdparty/pykickstart/commands/__init__.py b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/commands/__init__.py
index 2d9455093..2d9455093 100644
--- a/scripts/lib/wic/3rdparty/pykickstart/commands/__init__.py
+++ b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/commands/__init__.py
diff --git a/scripts/lib/wic/3rdparty/pykickstart/commands/bootloader.py b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/commands/bootloader.py
index c2b552f68..c2b552f68 100644
--- a/scripts/lib/wic/3rdparty/pykickstart/commands/bootloader.py
+++ b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/commands/bootloader.py
diff --git a/scripts/lib/wic/3rdparty/pykickstart/commands/partition.py b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/commands/partition.py
index b564b1a7a..b564b1a7a 100644
--- a/scripts/lib/wic/3rdparty/pykickstart/commands/partition.py
+++ b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/commands/partition.py
diff --git a/scripts/lib/wic/3rdparty/pykickstart/constants.py b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/constants.py
index 5e12fc80e..5e12fc80e 100644
--- a/scripts/lib/wic/3rdparty/pykickstart/constants.py
+++ b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/constants.py
diff --git a/scripts/lib/wic/3rdparty/pykickstart/errors.py b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/errors.py
index a234d99d4..a234d99d4 100644
--- a/scripts/lib/wic/3rdparty/pykickstart/errors.py
+++ b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/errors.py
diff --git a/scripts/lib/wic/3rdparty/pykickstart/handlers/__init__.py b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/handlers/__init__.py
index e69de29bb..e69de29bb 100644
--- a/scripts/lib/wic/3rdparty/pykickstart/handlers/__init__.py
+++ b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/handlers/__init__.py
diff --git a/scripts/lib/wic/3rdparty/pykickstart/handlers/control.py b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/handlers/control.py
index 8dc80d1eb..8dc80d1eb 100644
--- a/scripts/lib/wic/3rdparty/pykickstart/handlers/control.py
+++ b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/handlers/control.py
diff --git a/scripts/lib/wic/3rdparty/pykickstart/handlers/f16.py b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/handlers/f16.py
index 3c52f8d75..3c52f8d75 100644
--- a/scripts/lib/wic/3rdparty/pykickstart/handlers/f16.py
+++ b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/handlers/f16.py
diff --git a/scripts/lib/wic/3rdparty/pykickstart/ko.py b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/ko.py
index 1350d19c7..1350d19c7 100644
--- a/scripts/lib/wic/3rdparty/pykickstart/ko.py
+++ b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/ko.py
diff --git a/scripts/lib/wic/3rdparty/pykickstart/options.py b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/options.py
index ebc23eda6..ebc23eda6 100644
--- a/scripts/lib/wic/3rdparty/pykickstart/options.py
+++ b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/options.py
diff --git a/scripts/lib/wic/3rdparty/pykickstart/parser.py b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/parser.py
index 9c9674bf7..9c9674bf7 100644
--- a/scripts/lib/wic/3rdparty/pykickstart/parser.py
+++ b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/parser.py
diff --git a/scripts/lib/wic/3rdparty/pykickstart/sections.py b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/sections.py
index 44df856b8..44df856b8 100644
--- a/scripts/lib/wic/3rdparty/pykickstart/sections.py
+++ b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/sections.py
diff --git a/scripts/lib/wic/3rdparty/pykickstart/version.py b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/version.py
index 8a8e6aad2..8a8e6aad2 100644
--- a/scripts/lib/wic/3rdparty/pykickstart/version.py
+++ b/yocto-poky/scripts/lib/wic/3rdparty/pykickstart/version.py
diff --git a/scripts/lib/wic/__init__.py b/yocto-poky/scripts/lib/wic/__init__.py
index 63c1d9c84..63c1d9c84 100644
--- a/scripts/lib/wic/__init__.py
+++ b/yocto-poky/scripts/lib/wic/__init__.py
diff --git a/scripts/lib/wic/__version__.py b/yocto-poky/scripts/lib/wic/__version__.py
index 5452a4671..5452a4671 100644
--- a/scripts/lib/wic/__version__.py
+++ b/yocto-poky/scripts/lib/wic/__version__.py
diff --git a/scripts/lib/wic/canned-wks/directdisk-gpt.wks b/yocto-poky/scripts/lib/wic/canned-wks/directdisk-gpt.wks
index ea01cf375..ea01cf375 100644
--- a/scripts/lib/wic/canned-wks/directdisk-gpt.wks
+++ b/yocto-poky/scripts/lib/wic/canned-wks/directdisk-gpt.wks
diff --git a/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks b/yocto-poky/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks
index 8a81f8f51..8a81f8f51 100644
--- a/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks
+++ b/yocto-poky/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks
diff --git a/scripts/lib/wic/canned-wks/directdisk.wks b/yocto-poky/scripts/lib/wic/canned-wks/directdisk.wks
index af4c9eada..af4c9eada 100644
--- a/scripts/lib/wic/canned-wks/directdisk.wks
+++ b/yocto-poky/scripts/lib/wic/canned-wks/directdisk.wks
diff --git a/scripts/lib/wic/canned-wks/mkefidisk.wks b/yocto-poky/scripts/lib/wic/canned-wks/mkefidisk.wks
index 696e94e3d..696e94e3d 100644
--- a/scripts/lib/wic/canned-wks/mkefidisk.wks
+++ b/yocto-poky/scripts/lib/wic/canned-wks/mkefidisk.wks
diff --git a/scripts/lib/wic/canned-wks/mkgummidisk.wks b/yocto-poky/scripts/lib/wic/canned-wks/mkgummidisk.wks
index 66a22f60b..66a22f60b 100644
--- a/scripts/lib/wic/canned-wks/mkgummidisk.wks
+++ b/yocto-poky/scripts/lib/wic/canned-wks/mkgummidisk.wks
diff --git a/scripts/lib/wic/canned-wks/mkhybridiso.wks b/yocto-poky/scripts/lib/wic/canned-wks/mkhybridiso.wks
index 9d34e9b47..9d34e9b47 100644
--- a/scripts/lib/wic/canned-wks/mkhybridiso.wks
+++ b/yocto-poky/scripts/lib/wic/canned-wks/mkhybridiso.wks
diff --git a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks b/yocto-poky/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
index 8fc38b54d..8fc38b54d 100644
--- a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
+++ b/yocto-poky/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
diff --git a/scripts/lib/wic/canned-wks/sdimage-bootpart.wks b/yocto-poky/scripts/lib/wic/canned-wks/sdimage-bootpart.wks
index 7ffd632f4..7ffd632f4 100644
--- a/scripts/lib/wic/canned-wks/sdimage-bootpart.wks
+++ b/yocto-poky/scripts/lib/wic/canned-wks/sdimage-bootpart.wks
diff --git a/scripts/lib/wic/conf.py b/yocto-poky/scripts/lib/wic/conf.py
index 1d4363a52..1d4363a52 100644
--- a/scripts/lib/wic/conf.py
+++ b/yocto-poky/scripts/lib/wic/conf.py
diff --git a/scripts/lib/wic/config/wic.conf b/yocto-poky/scripts/lib/wic/config/wic.conf
index a51bcb55e..a51bcb55e 100644
--- a/scripts/lib/wic/config/wic.conf
+++ b/yocto-poky/scripts/lib/wic/config/wic.conf
diff --git a/scripts/lib/wic/creator.py b/yocto-poky/scripts/lib/wic/creator.py
index 523129728..523129728 100644
--- a/scripts/lib/wic/creator.py
+++ b/yocto-poky/scripts/lib/wic/creator.py
diff --git a/scripts/lib/wic/engine.py b/yocto-poky/scripts/lib/wic/engine.py
index 76b93e82f..76b93e82f 100644
--- a/scripts/lib/wic/engine.py
+++ b/yocto-poky/scripts/lib/wic/engine.py
diff --git a/scripts/lib/wic/help.py b/yocto-poky/scripts/lib/wic/help.py
index 9a778b69d..9a778b69d 100644
--- a/scripts/lib/wic/help.py
+++ b/yocto-poky/scripts/lib/wic/help.py
diff --git a/scripts/lib/wic/imager/__init__.py b/yocto-poky/scripts/lib/wic/imager/__init__.py
index e69de29bb..e69de29bb 100644
--- a/scripts/lib/wic/imager/__init__.py
+++ b/yocto-poky/scripts/lib/wic/imager/__init__.py
diff --git a/scripts/lib/wic/imager/baseimager.py b/yocto-poky/scripts/lib/wic/imager/baseimager.py
index acbe94858..acbe94858 100644
--- a/scripts/lib/wic/imager/baseimager.py
+++ b/yocto-poky/scripts/lib/wic/imager/baseimager.py
diff --git a/scripts/lib/wic/imager/direct.py b/yocto-poky/scripts/lib/wic/imager/direct.py
index d5603fa91..d5603fa91 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/yocto-poky/scripts/lib/wic/imager/direct.py
diff --git a/scripts/lib/wic/kickstart/__init__.py b/yocto-poky/scripts/lib/wic/kickstart/__init__.py
index c9b0e51f3..c9b0e51f3 100644
--- a/scripts/lib/wic/kickstart/__init__.py
+++ b/yocto-poky/scripts/lib/wic/kickstart/__init__.py
diff --git a/scripts/lib/wic/kickstart/custom_commands/__init__.py b/yocto-poky/scripts/lib/wic/kickstart/custom_commands/__init__.py
index e4ae40622..e4ae40622 100644
--- a/scripts/lib/wic/kickstart/custom_commands/__init__.py
+++ b/yocto-poky/scripts/lib/wic/kickstart/custom_commands/__init__.py
diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/yocto-poky/scripts/lib/wic/kickstart/custom_commands/partition.py
index eee25a493..eee25a493 100644
--- a/scripts/lib/wic/kickstart/custom_commands/partition.py
+++ b/yocto-poky/scripts/lib/wic/kickstart/custom_commands/partition.py
diff --git a/scripts/lib/wic/kickstart/custom_commands/wicboot.py b/yocto-poky/scripts/lib/wic/kickstart/custom_commands/wicboot.py
index a3e1852be..a3e1852be 100644
--- a/scripts/lib/wic/kickstart/custom_commands/wicboot.py
+++ b/yocto-poky/scripts/lib/wic/kickstart/custom_commands/wicboot.py
diff --git a/scripts/lib/wic/msger.py b/yocto-poky/scripts/lib/wic/msger.py
index b73755422..b73755422 100644
--- a/scripts/lib/wic/msger.py
+++ b/yocto-poky/scripts/lib/wic/msger.py
diff --git a/scripts/lib/wic/plugin.py b/yocto-poky/scripts/lib/wic/plugin.py
index ccfdfcb93..ccfdfcb93 100644
--- a/scripts/lib/wic/plugin.py
+++ b/yocto-poky/scripts/lib/wic/plugin.py
diff --git a/scripts/lib/wic/pluginbase.py b/yocto-poky/scripts/lib/wic/pluginbase.py
index ee8fe95c6..ee8fe95c6 100644
--- a/scripts/lib/wic/pluginbase.py
+++ b/yocto-poky/scripts/lib/wic/pluginbase.py
diff --git a/scripts/lib/wic/plugins/imager/direct_plugin.py b/yocto-poky/scripts/lib/wic/plugins/imager/direct_plugin.py
index 6d3f46cc6..6d3f46cc6 100644
--- a/scripts/lib/wic/plugins/imager/direct_plugin.py
+++ b/yocto-poky/scripts/lib/wic/plugins/imager/direct_plugin.py
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/yocto-poky/scripts/lib/wic/plugins/source/bootimg-efi.py
index fa63c6abd..fa63c6abd 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/yocto-poky/scripts/lib/wic/plugins/source/bootimg-efi.py
diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/yocto-poky/scripts/lib/wic/plugins/source/bootimg-partition.py
index bc2ca0f6f..bc2ca0f6f 100644
--- a/scripts/lib/wic/plugins/source/bootimg-partition.py
+++ b/yocto-poky/scripts/lib/wic/plugins/source/bootimg-partition.py
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/yocto-poky/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index 96ed54dba..96ed54dba 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/yocto-poky/scripts/lib/wic/plugins/source/bootimg-pcbios.py
diff --git a/scripts/lib/wic/plugins/source/fsimage.py b/yocto-poky/scripts/lib/wic/plugins/source/fsimage.py
index f894e8936..f894e8936 100644
--- a/scripts/lib/wic/plugins/source/fsimage.py
+++ b/yocto-poky/scripts/lib/wic/plugins/source/fsimage.py
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/yocto-poky/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index 9472d8abb..9472d8abb 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/yocto-poky/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/yocto-poky/scripts/lib/wic/plugins/source/rawcopy.py
index f0691baa9..f0691baa9 100644
--- a/scripts/lib/wic/plugins/source/rawcopy.py
+++ b/yocto-poky/scripts/lib/wic/plugins/source/rawcopy.py
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/yocto-poky/scripts/lib/wic/plugins/source/rootfs.py
index a90712b24..a90712b24 100644
--- a/scripts/lib/wic/plugins/source/rootfs.py
+++ b/yocto-poky/scripts/lib/wic/plugins/source/rootfs.py
diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/yocto-poky/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
index 76e7b033f..76e7b033f 100644
--- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
+++ b/yocto-poky/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
diff --git a/scripts/lib/wic/test b/yocto-poky/scripts/lib/wic/test
index 9daeafb98..9daeafb98 100644
--- a/scripts/lib/wic/test
+++ b/yocto-poky/scripts/lib/wic/test
diff --git a/scripts/lib/wic/utils/__init__.py b/yocto-poky/scripts/lib/wic/utils/__init__.py
index e69de29bb..e69de29bb 100644
--- a/scripts/lib/wic/utils/__init__.py
+++ b/yocto-poky/scripts/lib/wic/utils/__init__.py
diff --git a/scripts/lib/wic/utils/errors.py b/yocto-poky/scripts/lib/wic/utils/errors.py
index d1b514dd9..d1b514dd9 100644
--- a/scripts/lib/wic/utils/errors.py
+++ b/yocto-poky/scripts/lib/wic/utils/errors.py
diff --git a/scripts/lib/wic/utils/fs_related.py b/yocto-poky/scripts/lib/wic/utils/fs_related.py
index 2e74461a4..2e74461a4 100644
--- a/scripts/lib/wic/utils/fs_related.py
+++ b/yocto-poky/scripts/lib/wic/utils/fs_related.py
diff --git a/scripts/lib/wic/utils/misc.py b/yocto-poky/scripts/lib/wic/utils/misc.py
index 9d750694d..9d750694d 100644
--- a/scripts/lib/wic/utils/misc.py
+++ b/yocto-poky/scripts/lib/wic/utils/misc.py
diff --git a/scripts/lib/wic/utils/oe/__init__.py b/yocto-poky/scripts/lib/wic/utils/oe/__init__.py
index 0a81575a7..0a81575a7 100644
--- a/scripts/lib/wic/utils/oe/__init__.py
+++ b/yocto-poky/scripts/lib/wic/utils/oe/__init__.py
diff --git a/scripts/lib/wic/utils/oe/misc.py b/yocto-poky/scripts/lib/wic/utils/oe/misc.py
index c6d2e5f20..c6d2e5f20 100644
--- a/scripts/lib/wic/utils/oe/misc.py
+++ b/yocto-poky/scripts/lib/wic/utils/oe/misc.py
diff --git a/scripts/lib/wic/utils/partitionedfs.py b/yocto-poky/scripts/lib/wic/utils/partitionedfs.py
index 5a103bbc7..5a103bbc7 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/yocto-poky/scripts/lib/wic/utils/partitionedfs.py
diff --git a/scripts/lib/wic/utils/runner.py b/yocto-poky/scripts/lib/wic/utils/runner.py
index 7431917ff..7431917ff 100644
--- a/scripts/lib/wic/utils/runner.py
+++ b/yocto-poky/scripts/lib/wic/utils/runner.py
diff --git a/scripts/lib/wic/utils/syslinux.py b/yocto-poky/scripts/lib/wic/utils/syslinux.py
index aace2863c..aace2863c 100644
--- a/scripts/lib/wic/utils/syslinux.py
+++ b/yocto-poky/scripts/lib/wic/utils/syslinux.py
diff --git a/scripts/lnr b/yocto-poky/scripts/lnr
index 9dacebe09..9dacebe09 100755
--- a/scripts/lnr
+++ b/yocto-poky/scripts/lnr
diff --git a/scripts/multilib_header_wrapper.h b/yocto-poky/scripts/multilib_header_wrapper.h
index 5a8754088..5a8754088 100644
--- a/scripts/multilib_header_wrapper.h
+++ b/yocto-poky/scripts/multilib_header_wrapper.h
diff --git a/scripts/native-intercept/chown b/yocto-poky/scripts/native-intercept/chown
index 4f43271c2..4f43271c2 100755
--- a/scripts/native-intercept/chown
+++ b/yocto-poky/scripts/native-intercept/chown
diff --git a/scripts/oe-buildenv-internal b/yocto-poky/scripts/oe-buildenv-internal
index 9ed272153..9ed272153 100755
--- a/scripts/oe-buildenv-internal
+++ b/yocto-poky/scripts/oe-buildenv-internal
diff --git a/scripts/oe-find-native-sysroot b/yocto-poky/scripts/oe-find-native-sysroot
index 81d62b888..81d62b888 100755
--- a/scripts/oe-find-native-sysroot
+++ b/yocto-poky/scripts/oe-find-native-sysroot
diff --git a/scripts/oe-git-proxy b/yocto-poky/scripts/oe-git-proxy
index d2e9f925b..d2e9f925b 100755
--- a/scripts/oe-git-proxy
+++ b/yocto-poky/scripts/oe-git-proxy
diff --git a/scripts/oe-pkgdata-util b/yocto-poky/scripts/oe-pkgdata-util
index cb19cc4ae..cb19cc4ae 100755
--- a/scripts/oe-pkgdata-util
+++ b/yocto-poky/scripts/oe-pkgdata-util
diff --git a/scripts/oe-publish-sdk b/yocto-poky/scripts/oe-publish-sdk
index ee4169a00..ee4169a00 100755
--- a/scripts/oe-publish-sdk
+++ b/yocto-poky/scripts/oe-publish-sdk
diff --git a/scripts/oe-selftest b/yocto-poky/scripts/oe-selftest
index 91e2dd282..91e2dd282 100755
--- a/scripts/oe-selftest
+++ b/yocto-poky/scripts/oe-selftest
diff --git a/scripts/oe-setup-builddir b/yocto-poky/scripts/oe-setup-builddir
index 2598ba852..2598ba852 100755
--- a/scripts/oe-setup-builddir
+++ b/yocto-poky/scripts/oe-setup-builddir
diff --git a/scripts/oe-setup-rpmrepo b/yocto-poky/scripts/oe-setup-rpmrepo
index 917b98b98..917b98b98 100755
--- a/scripts/oe-setup-rpmrepo
+++ b/yocto-poky/scripts/oe-setup-rpmrepo
diff --git a/scripts/oe-trim-schemas b/yocto-poky/scripts/oe-trim-schemas
index 29fb3a1b6..29fb3a1b6 100755
--- a/scripts/oe-trim-schemas
+++ b/yocto-poky/scripts/oe-trim-schemas
diff --git a/scripts/oepydevshell-internal.py b/yocto-poky/scripts/oepydevshell-internal.py
index f7b2e4e0b..f7b2e4e0b 100755
--- a/scripts/oepydevshell-internal.py
+++ b/yocto-poky/scripts/oepydevshell-internal.py
diff --git a/scripts/opkg-query-helper.py b/yocto-poky/scripts/opkg-query-helper.py
index 2fb1a7897..2fb1a7897 100755
--- a/scripts/opkg-query-helper.py
+++ b/yocto-poky/scripts/opkg-query-helper.py
diff --git a/scripts/postinst-intercepts/postinst_intercept b/yocto-poky/scripts/postinst-intercepts/postinst_intercept
index b18e806d4..b18e806d4 100755
--- a/scripts/postinst-intercepts/postinst_intercept
+++ b/yocto-poky/scripts/postinst-intercepts/postinst_intercept
diff --git a/scripts/postinst-intercepts/update_font_cache b/yocto-poky/scripts/postinst-intercepts/update_font_cache
index 0deab3c11..0deab3c11 100644
--- a/scripts/postinst-intercepts/update_font_cache
+++ b/yocto-poky/scripts/postinst-intercepts/update_font_cache
diff --git a/scripts/postinst-intercepts/update_icon_cache b/yocto-poky/scripts/postinst-intercepts/update_icon_cache
index 9cf2a72a0..9cf2a72a0 100644
--- a/scripts/postinst-intercepts/update_icon_cache
+++ b/yocto-poky/scripts/postinst-intercepts/update_icon_cache
diff --git a/scripts/postinst-intercepts/update_pixbuf_cache b/yocto-poky/scripts/postinst-intercepts/update_pixbuf_cache
index a8b400106..a8b400106 100644
--- a/scripts/postinst-intercepts/update_pixbuf_cache
+++ b/yocto-poky/scripts/postinst-intercepts/update_pixbuf_cache
diff --git a/scripts/pybootchartgui/AUTHORS b/yocto-poky/scripts/pybootchartgui/AUTHORS
index 672b7e952..672b7e952 100644
--- a/scripts/pybootchartgui/AUTHORS
+++ b/yocto-poky/scripts/pybootchartgui/AUTHORS
diff --git a/scripts/pybootchartgui/COPYING b/yocto-poky/scripts/pybootchartgui/COPYING
index ed87acf94..ed87acf94 100644
--- a/scripts/pybootchartgui/COPYING
+++ b/yocto-poky/scripts/pybootchartgui/COPYING
diff --git a/scripts/pybootchartgui/MAINTAINERS b/yocto-poky/scripts/pybootchartgui/MAINTAINERS
index c65e1315f..c65e1315f 100644
--- a/scripts/pybootchartgui/MAINTAINERS
+++ b/yocto-poky/scripts/pybootchartgui/MAINTAINERS
diff --git a/scripts/pybootchartgui/NEWS b/yocto-poky/scripts/pybootchartgui/NEWS
index 7c5b2fc3a..7c5b2fc3a 100644
--- a/scripts/pybootchartgui/NEWS
+++ b/yocto-poky/scripts/pybootchartgui/NEWS
diff --git a/scripts/pybootchartgui/README.pybootchart b/yocto-poky/scripts/pybootchartgui/README.pybootchart
index 8642e6467..8642e6467 100644
--- a/scripts/pybootchartgui/README.pybootchart
+++ b/yocto-poky/scripts/pybootchartgui/README.pybootchart
diff --git a/scripts/pybootchartgui/pybootchartgui.py b/yocto-poky/scripts/pybootchartgui/pybootchartgui.py
index 7ce1a5be4..7ce1a5be4 100755
--- a/scripts/pybootchartgui/pybootchartgui.py
+++ b/yocto-poky/scripts/pybootchartgui/pybootchartgui.py
diff --git a/scripts/pybootchartgui/pybootchartgui/__init__.py b/yocto-poky/scripts/pybootchartgui/pybootchartgui/__init__.py
index e69de29bb..e69de29bb 100644
--- a/scripts/pybootchartgui/pybootchartgui/__init__.py
+++ b/yocto-poky/scripts/pybootchartgui/pybootchartgui/__init__.py
diff --git a/scripts/pybootchartgui/pybootchartgui/batch.py b/yocto-poky/scripts/pybootchartgui/pybootchartgui/batch.py
index 05c714e95..05c714e95 100644
--- a/scripts/pybootchartgui/pybootchartgui/batch.py
+++ b/yocto-poky/scripts/pybootchartgui/pybootchartgui/batch.py
diff --git a/scripts/pybootchartgui/pybootchartgui/draw.py b/yocto-poky/scripts/pybootchartgui/pybootchartgui/draw.py
index 8c574be50..8c574be50 100644
--- a/scripts/pybootchartgui/pybootchartgui/draw.py
+++ b/yocto-poky/scripts/pybootchartgui/pybootchartgui/draw.py
diff --git a/scripts/pybootchartgui/pybootchartgui/gui.py b/yocto-poky/scripts/pybootchartgui/pybootchartgui/gui.py
index 7fedd232d..7fedd232d 100644
--- a/scripts/pybootchartgui/pybootchartgui/gui.py
+++ b/yocto-poky/scripts/pybootchartgui/pybootchartgui/gui.py
diff --git a/scripts/pybootchartgui/pybootchartgui/main.py b/yocto-poky/scripts/pybootchartgui/pybootchartgui/main.py
index b45ae0a3d..b45ae0a3d 120000
--- a/scripts/pybootchartgui/pybootchartgui/main.py
+++ b/yocto-poky/scripts/pybootchartgui/pybootchartgui/main.py
diff --git a/scripts/pybootchartgui/pybootchartgui/main.py.in b/yocto-poky/scripts/pybootchartgui/pybootchartgui/main.py.in
index 21bb0be3a..21bb0be3a 100644
--- a/scripts/pybootchartgui/pybootchartgui/main.py.in
+++ b/yocto-poky/scripts/pybootchartgui/pybootchartgui/main.py.in
diff --git a/scripts/pybootchartgui/pybootchartgui/parsing.py b/yocto-poky/scripts/pybootchartgui/pybootchartgui/parsing.py
index d423b9f77..d423b9f77 100644
--- a/scripts/pybootchartgui/pybootchartgui/parsing.py
+++ b/yocto-poky/scripts/pybootchartgui/pybootchartgui/parsing.py
diff --git a/scripts/pybootchartgui/pybootchartgui/process_tree.py b/yocto-poky/scripts/pybootchartgui/pybootchartgui/process_tree.py
index cf88110b1..cf88110b1 100644
--- a/scripts/pybootchartgui/pybootchartgui/process_tree.py
+++ b/yocto-poky/scripts/pybootchartgui/pybootchartgui/process_tree.py
diff --git a/scripts/pybootchartgui/pybootchartgui/samples.py b/yocto-poky/scripts/pybootchartgui/pybootchartgui/samples.py
index 015d743aa..015d743aa 100644
--- a/scripts/pybootchartgui/pybootchartgui/samples.py
+++ b/yocto-poky/scripts/pybootchartgui/pybootchartgui/samples.py
diff --git a/scripts/pybootchartgui/pybootchartgui/tests/parser_test.py b/yocto-poky/scripts/pybootchartgui/pybootchartgui/tests/parser_test.py
index 00fb3bf79..00fb3bf79 100644
--- a/scripts/pybootchartgui/pybootchartgui/tests/parser_test.py
+++ b/yocto-poky/scripts/pybootchartgui/pybootchartgui/tests/parser_test.py
diff --git a/scripts/pybootchartgui/pybootchartgui/tests/process_tree_test.py b/yocto-poky/scripts/pybootchartgui/pybootchartgui/tests/process_tree_test.py
index 6f46a1c03..6f46a1c03 100644
--- a/scripts/pybootchartgui/pybootchartgui/tests/process_tree_test.py
+++ b/yocto-poky/scripts/pybootchartgui/pybootchartgui/tests/process_tree_test.py
diff --git a/scripts/pythondeps b/yocto-poky/scripts/pythondeps
index ff92e747e..ff92e747e 100755
--- a/scripts/pythondeps
+++ b/yocto-poky/scripts/pythondeps
diff --git a/scripts/recipetool b/yocto-poky/scripts/recipetool
index 87fb35ed7..87fb35ed7 100755
--- a/scripts/recipetool
+++ b/yocto-poky/scripts/recipetool
diff --git a/scripts/relocate_sdk.py b/yocto-poky/scripts/relocate_sdk.py
index 992db5c47..992db5c47 100755
--- a/scripts/relocate_sdk.py
+++ b/yocto-poky/scripts/relocate_sdk.py
diff --git a/scripts/rootfs_rpm-extract-postinst.awk b/yocto-poky/scripts/rootfs_rpm-extract-postinst.awk
index 8f2836b32..8f2836b32 100644
--- a/scripts/rootfs_rpm-extract-postinst.awk
+++ b/yocto-poky/scripts/rootfs_rpm-extract-postinst.awk
diff --git a/scripts/rpm2cpio.sh b/yocto-poky/scripts/rpm2cpio.sh
index 5df8c0f70..5df8c0f70 100755
--- a/scripts/rpm2cpio.sh
+++ b/yocto-poky/scripts/rpm2cpio.sh
diff --git a/scripts/runqemu b/yocto-poky/scripts/runqemu
index e01d276f7..e01d276f7 100755
--- a/scripts/runqemu
+++ b/yocto-poky/scripts/runqemu
diff --git a/scripts/runqemu-addptable2image b/yocto-poky/scripts/runqemu-addptable2image
index f0195ad8a..f0195ad8a 100755
--- a/scripts/runqemu-addptable2image
+++ b/yocto-poky/scripts/runqemu-addptable2image
diff --git a/scripts/runqemu-export-rootfs b/yocto-poky/scripts/runqemu-export-rootfs
index 3dee13116..3dee13116 100755
--- a/scripts/runqemu-export-rootfs
+++ b/yocto-poky/scripts/runqemu-export-rootfs
diff --git a/scripts/runqemu-extract-sdk b/yocto-poky/scripts/runqemu-extract-sdk
index 32ddd485b..32ddd485b 100755
--- a/scripts/runqemu-extract-sdk
+++ b/yocto-poky/scripts/runqemu-extract-sdk
diff --git a/scripts/runqemu-gen-tapdevs b/yocto-poky/scripts/runqemu-gen-tapdevs
index d3b27be29..d3b27be29 100755
--- a/scripts/runqemu-gen-tapdevs
+++ b/yocto-poky/scripts/runqemu-gen-tapdevs
diff --git a/scripts/runqemu-ifdown b/yocto-poky/scripts/runqemu-ifdown
index 8f66cfa2a..8f66cfa2a 100755
--- a/scripts/runqemu-ifdown
+++ b/yocto-poky/scripts/runqemu-ifdown
diff --git a/scripts/runqemu-ifup b/yocto-poky/scripts/runqemu-ifup
index d9bd89412..d9bd89412 100755
--- a/scripts/runqemu-ifup
+++ b/yocto-poky/scripts/runqemu-ifup
diff --git a/scripts/runqemu-internal b/yocto-poky/scripts/runqemu-internal
index 3b0e54c86..3b0e54c86 100755
--- a/scripts/runqemu-internal
+++ b/yocto-poky/scripts/runqemu-internal
diff --git a/scripts/runqemu.README b/yocto-poky/scripts/runqemu.README
index 5908d831a..5908d831a 100644
--- a/scripts/runqemu.README
+++ b/yocto-poky/scripts/runqemu.README
diff --git a/scripts/send-error-report b/yocto-poky/scripts/send-error-report
index 1a1b96580..1a1b96580 100755
--- a/scripts/send-error-report
+++ b/yocto-poky/scripts/send-error-report
diff --git a/scripts/send-pull-request b/yocto-poky/scripts/send-pull-request
index 575549db3..575549db3 100755
--- a/scripts/send-pull-request
+++ b/yocto-poky/scripts/send-pull-request
diff --git a/scripts/sstate-cache-management.sh b/yocto-poky/scripts/sstate-cache-management.sh
index 2286765eb..2286765eb 100755
--- a/scripts/sstate-cache-management.sh
+++ b/yocto-poky/scripts/sstate-cache-management.sh
diff --git a/scripts/sstate-diff-machines.sh b/yocto-poky/scripts/sstate-diff-machines.sh
index 056aa0a04..056aa0a04 100755
--- a/scripts/sstate-diff-machines.sh
+++ b/yocto-poky/scripts/sstate-diff-machines.sh
diff --git a/scripts/sstate-sysroot-cruft.sh b/yocto-poky/scripts/sstate-sysroot-cruft.sh
index f62485eaa..f62485eaa 100755
--- a/scripts/sstate-sysroot-cruft.sh
+++ b/yocto-poky/scripts/sstate-sysroot-cruft.sh
diff --git a/scripts/swabber-strace-attach b/yocto-poky/scripts/swabber-strace-attach
index bb0391a7c..bb0391a7c 100755
--- a/scripts/swabber-strace-attach
+++ b/yocto-poky/scripts/swabber-strace-attach
diff --git a/scripts/sysroot-relativelinks.py b/yocto-poky/scripts/sysroot-relativelinks.py
index ac26367e7..ac26367e7 100755
--- a/scripts/sysroot-relativelinks.py
+++ b/yocto-poky/scripts/sysroot-relativelinks.py
diff --git a/scripts/test-dependencies.sh b/yocto-poky/scripts/test-dependencies.sh
index 0170947f0..0170947f0 100755
--- a/scripts/test-dependencies.sh
+++ b/yocto-poky/scripts/test-dependencies.sh
diff --git a/scripts/test-reexec b/yocto-poky/scripts/test-reexec
index 9eaa96e75..9eaa96e75 100755
--- a/scripts/test-reexec
+++ b/yocto-poky/scripts/test-reexec
diff --git a/scripts/test-remote-image b/yocto-poky/scripts/test-remote-image
index f3a44ebe5..f3a44ebe5 100755
--- a/scripts/test-remote-image
+++ b/yocto-poky/scripts/test-remote-image
diff --git a/scripts/tiny/dirsize.py b/yocto-poky/scripts/tiny/dirsize.py
index 40ff4ab89..40ff4ab89 100755
--- a/scripts/tiny/dirsize.py
+++ b/yocto-poky/scripts/tiny/dirsize.py
diff --git a/scripts/tiny/ksize.py b/yocto-poky/scripts/tiny/ksize.py
index 4006f2f6f..4006f2f6f 100755
--- a/scripts/tiny/ksize.py
+++ b/yocto-poky/scripts/tiny/ksize.py
diff --git a/scripts/wic b/yocto-poky/scripts/wic
index 7ad2b191c..7ad2b191c 100755
--- a/scripts/wic
+++ b/yocto-poky/scripts/wic
diff --git a/scripts/wipe-sysroot b/yocto-poky/scripts/wipe-sysroot
index c22d39a40..c22d39a40 100755
--- a/scripts/wipe-sysroot
+++ b/yocto-poky/scripts/wipe-sysroot
diff --git a/scripts/yocto-bsp b/yocto-poky/scripts/yocto-bsp
index 2d9453fbe..2d9453fbe 100755
--- a/scripts/yocto-bsp
+++ b/yocto-poky/scripts/yocto-bsp
diff --git a/scripts/yocto-kernel b/yocto-poky/scripts/yocto-kernel
index c9b2821e0..c9b2821e0 100755
--- a/scripts/yocto-kernel
+++ b/yocto-poky/scripts/yocto-kernel
diff --git a/scripts/yocto-layer b/yocto-poky/scripts/yocto-layer
index 53d2aabd3..53d2aabd3 100755
--- a/scripts/yocto-layer
+++ b/yocto-poky/scripts/yocto-layer